# This is a BitKeeper generated diff -Nru style patch. # # drivers/net/sungem.c # 2004/02/20 01:11:45-08:00 benh@kernel.crashing.org +12 -1 # Be careful about memory ordering in sungem driver # # ChangeSet # 2004/02/19 22:48:46-08:00 torvalds@ppc970.osdl.org # Include the header file for DMA mapping. # # You know you want it. Give it to me. # # drivers/usb/host/ehci-hcd.c # 2004/02/19 22:48:41-08:00 torvalds@ppc970.osdl.org +1 -0 # Include the header file for DMA mapping. # # ChangeSet # 2004/02/19 22:14:58-08:00 cpg@puchol.com # [PATCH] initial support for transmeta's efficeon processors # # This implements the initial support for the AGP gart in Transmeta's # Efficeon processors. # # This code is based on linus' code from a while ago. Peter and I adapted # it for the current kernel. # # The note at the top indicates how it was tested, known issues, and so # forth. It is working quite well, and we'll work to fix the minor issues # and test it some more with s3, more cards, other southbridges, etc., # next. # # drivers/char/agp/efficeon-agp.c # 2004/02/18 16:02:05-08:00 cpg@puchol.com +467 -0 # initial support for transmeta's efficeon processors # # include/linux/pci_ids.h # 2004/02/18 16:02:05-08:00 cpg@puchol.com +3 -0 # initial support for transmeta's efficeon processors # # drivers/char/agp/efficeon-agp.c # 2004/02/18 16:02:05-08:00 cpg@puchol.com +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/char/agp/efficeon-agp.c # # drivers/char/agp/Makefile # 2004/02/18 16:02:05-08:00 cpg@puchol.com +1 -0 # initial support for transmeta's efficeon processors # # drivers/char/agp/Kconfig # 2004/02/18 16:02:05-08:00 cpg@puchol.com +10 -0 # initial support for transmeta's efficeon processors # # ChangeSet # 2004/02/19 21:43:37-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] fix /proc/ide/ for IDE PCI modules # # Make IDE PCI drivers register /proc/ide/ entries themselves. # # include/linux/ide.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +6 -12 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/via82cxxx.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/via82cxxx.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/triflex.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -9 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/triflex.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/slc90e66.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/slc90e66.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/sis5513.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/sis5513.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/siimage.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -20 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/siimage.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/serverworks.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/serverworks.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/sc1200.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/sc1200.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/piix.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/piix.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/pdc202xx_old.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -19 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/pdc202xx_old.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/pdc202xx_new.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -19 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/pdc202xx_new.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/hpt366.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/hpt366.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/hpt34x.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/hpt34x.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/cs5530.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/cs5530.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/cs5520.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/cs5520.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/cmd64x.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -19 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/cmd64x.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/amd74xx.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/amd74xx.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +3 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/alim15x3.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/alim15x3.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/aec62xx.h # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -18 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/pci/aec62xx.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/ide.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +6 -0 # fix /proc/ide/ for IDE PCI modules # # drivers/ide/ide-proc.c # 2004/02/18 17:14:51-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +9 -54 # fix /proc/ide/ for IDE PCI modules # # ChangeSet # 2004/02/19 21:43:26-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] remove unused ide_end_taskfile() # # Additionally ide_end_drive_cmd() contains all functionality of this function. # # include/linux/ide.h # 2004/02/18 17:12:33-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -3 # remove unused ide_end_taskfile() # # drivers/ide/ide-taskfile.c # 2004/02/18 17:12:33-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -60 # remove unused ide_end_taskfile() # # drivers/ide/ide-io.c # 2004/02/18 17:12:33-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -2 # remove unused ide_end_taskfile() # # drivers/ide/ide-disk.c # 2004/02/18 17:12:33-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -7 # remove unused ide_end_taskfile() # # ChangeSet # 2004/02/19 21:43:17-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] remove dead/unfinished taskfile version of ide_cmd_ioctl() # # drivers/ide/ide-taskfile.c # 2004/02/18 17:11:21-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -65 # remove dead/unfinished taskfile version of ide_cmd_ioctl() # # ChangeSet # 2004/02/19 21:43:08-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] remove bogus comment and code from ide_unregister_driver() # # When ide_remove_proc_entries() is called, driver specific /proc/ide/hdx/ # entries have been already removed by ->cleanup()->ide_unregister_subdriver(). # # drivers/ide/ide.c # 2004/02/18 17:10:43-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -6 # remove bogus comment and code from ide_unregister_driver() # # ChangeSet # 2004/02/19 21:42:59-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] kill default_flushcache() and ide_drive_t->flushcache # # include/linux/ide.h # 2004/02/18 17:10:22-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -1 # kill default_flushcache() and ide_drive_t->flushcache # # drivers/ide/ide.c # 2004/02/18 17:10:22-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -15 # kill default_flushcache() and ide_drive_t->flushcache # # drivers/ide/ide-disk.c # 2004/02/18 17:10:22-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -1 # kill default_flushcache() and ide_drive_t->flushcache # # ChangeSet # 2004/02/19 21:42:50-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] kill default_shutdown() and ide_drive_t->shutdown # # include/linux/ide.h # 2004/02/18 17:09:37-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -1 # kill default_shutdown() and ide_drive_t->shutdown # # drivers/ide/ide.c # 2004/02/18 17:09:37-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +2 -18 # kill default_shutdown() and ide_drive_t->shutdown # # ChangeSet # 2004/02/19 21:42:40-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] kill useless IDE_SUBDRIVER_VERSION # # include/linux/ide.h # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -3 # kill useless IDE_SUBDRIVER_VERSION # # drivers/scsi/ide-scsi.c # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -2 # kill useless IDE_SUBDRIVER_VERSION # # drivers/ide/ide.c # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +6 -6 # kill useless IDE_SUBDRIVER_VERSION # # drivers/ide/ide-tape.c # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # kill useless IDE_SUBDRIVER_VERSION # # drivers/ide/ide-floppy.c # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # kill useless IDE_SUBDRIVER_VERSION # # drivers/ide/ide-disk.c # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # kill useless IDE_SUBDRIVER_VERSION # # drivers/ide/ide-default.c # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -2 # kill useless IDE_SUBDRIVER_VERSION # # drivers/ide/ide-cd.c # 2004/02/18 17:09:06-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +1 -1 # kill useless IDE_SUBDRIVER_VERSION # # ChangeSet # 2004/02/19 21:42:31-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] keep documentation of kernel parameters in one place only # # drivers/ide/ide.c # 2004/02/18 17:08:03-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +2 -70 # keep documentation of kernel parameters in one place only # # Documentation/ide.txt # 2004/02/18 17:08:03-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +3 -2 # keep documentation of kernel parameters in one place only # # ChangeSet # 2004/02/19 21:42:22-08:00 B.Zolnierkiewicz@elka.pw.edu.pl # [PATCH] remove dead kernel parameters # # Remove "hdx=flash" (ignored since 2.5.63) and "hdx=slow" # (ignored since 2.5.41) kernel parameters. # # Also remove "slow" entry from /proc/ide/hdx/settings # and "ata_flash", "nobios" and "slow" fields from ide_drive_t. # # include/linux/ide.h # 2004/02/18 16:41:29-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -3 # remove dead kernel parameters # # drivers/ide/ide.c # 2004/02/18 16:41:29-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +2 -16 # remove dead kernel parameters # # drivers/ide/ide-probe.c # 2004/02/18 16:41:22-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +2 -20 # remove dead kernel parameters # # Documentation/ide.txt # 2004/02/18 16:41:22-08:00 B.Zolnierkiewicz@elka.pw.edu.pl +0 -7 # remove dead kernel parameters # # ChangeSet # 2004/02/19 21:42:12-08:00 akpm@osdl.org # [PATCH] x86_64 uniproc build fix # # From: Andi Kleen # # This fixes some more problems introduced by the IA32e merge on x86-64 # # - Make it compile on UP again. # - Let the microcode driver build as a module # # arch/x86_64/kernel/x8664_ksyms.c # 2004/02/19 13:09:39-08:00 akpm@osdl.org +2 -0 # x86_64 uniproc build fix # # arch/x86_64/kernel/setup.c # 2004/02/19 13:09:26-08:00 akpm@osdl.org +2 -0 # x86_64 uniproc build fix # # arch/x86_64/kernel/Makefile # 2004/02/19 13:09:26-08:00 akpm@osdl.org +1 -1 # x86_64 uniproc build fix # # ChangeSet # 2004/02/19 21:42:02-08:00 akpm@osdl.org # [PATCH] smbfs: remove debug code # # Remove an unneeded WSET() which snuck in there. # # fs/smbfs/smbiod.c # 2004/02/19 13:08:09-08:00 akpm@osdl.org +0 -1 # smbfs: remove debug code # # ChangeSet # 2004/02/19 21:41:53-08:00 akpm@osdl.org # [PATCH] Fix the display of max-ever-used-stack in sysrq-T output # # The sysrq-T output currently tries to display the mimimum amount of free # stack which each task has ever had available. It has been busted for years, # because we forgot to zero out the stack when it is first created. # # Fix that up, adding a conig option for it. # # If the option is disabled, or the arch is not x86 then the free stack usage # will display as zero. # # kernel/sched.c # 2004/02/19 13:08:09-08:00 akpm@osdl.org +10 -1 # Fix the display of max-ever-used-stack in sysrq-T output # # include/asm-i386/thread_info.h # 2004/02/19 13:08:09-08:00 akpm@osdl.org +14 -1 # Fix the display of max-ever-used-stack in sysrq-T output # # arch/i386/Kconfig # 2004/02/19 13:08:09-08:00 akpm@osdl.org +9 -0 # Fix the display of max-ever-used-stack in sysrq-T output # # ChangeSet # 2004/02/19 21:41:44-08:00 akpm@osdl.org # [PATCH] v850 ptrace.c task_struct leak # # From: Herbert Poetzl # # sys_ptrace() for v850, if pid == 1, doesn't put the struct task_struct # (child), the following patch should fix that ... # # arch/v850/kernel/ptrace.c # 2004/02/19 13:08:08-08:00 akpm@osdl.org +1 -1 # v850 ptrace.c task_struct leak # # ChangeSet # 2004/02/19 21:41:35-08:00 akpm@osdl.org # [PATCH] ppc64 compile fix # # From: Arjan van de Ven # # fix obvious non-C-standard stubs on ppc64 # # include/asm-ppc64/system.h # 2004/02/19 13:01:04-08:00 akpm@osdl.org +6 -6 # ppc64 compile fix # # ChangeSet # 2004/02/19 21:36:48-08:00 benh@kernel.crashing.org # [PATCH] Fix a DMA underrun problem with pmac IDE # # This fixes the behaviour of the pmac "macio" IDE driver when a DMA # transfer happen to get less data out of the device than expected when # setting up the DMA commands (the device underruns). This is very common # with recent ATAPI stuffs and used to cause problem & disable DMA. This # patch fixes the way we handle that condition, thus also fixing DVD # burning on a bunch of recent pmacs. # # drivers/ide/ppc/pmac.c # 2004/02/17 22:20:23-08:00 benh@kernel.crashing.org +28 -23 # Fix a DMA underrun problem with pmac IDE # # ChangeSet # 2004/02/19 21:36:39-08:00 benh@kernel.crashing.org # [PATCH] Be careful about memory ordering in sungem driver # # Some barriers between setting up the DMA regions and writing the # descriptor addresses would be most useful. # # I had some in my 2.4 version but they got lost someway, probably me not # properly merging with davem at this point. The 970 is definitely more # agressive at re-ordering stores than previous CPUs... # # Here is a patch adding some (probably too much, but better safe than # sorry). # # ChangeSet # 2004/02/19 22:56:14-05:00 jgarzik@redhat.com # Merge redhat.com:/spare/repo/netdev-2.6/e100-2 # into redhat.com:/spare/repo/net-drivers-2.5 # # drivers/net/Makefile # 2004/02/19 22:56:08-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/Kconfig # 2004/02/19 22:56:08-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/02/19 17:12:16-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/host/ehci-dbg.c # 2004/02/19 17:12:11-08:00 greg@kroah.com +0 -0 # Auto merged # # ChangeSet # 2004/02/19 16:25:15-08:00 torvalds@ppc970.osdl.org # Merge http://lia64.bkbits.net/to-linus-2.5 # into ppc970.osdl.org:/home/torvalds/v2.5/linux # # arch/ia64/sn/kernel/irq.c # 2004/02/19 16:25:12-08:00 torvalds@ppc970.osdl.org +0 -0 # Auto merged # # ChangeSet # 2004/02/19 16:19:27-08:00 greg@kroah.com # USB storage: sync up with some missing unusual_devs entries that were in my tree. # # drivers/usb/storage/unusual_devs.h # 2004/02/19 16:19:13-08:00 greg@kroah.com +18 -0 # USB storage: sync up with some missing unusual_devs entries that were in my tree. # # ChangeSet # 2004/02/19 15:42:36-08:00 Andries.Brouwer@cwi.nl # [PATCH] USB: add comments to sddr09.c # # People ask how to write the CIS on a SmartMedia card using an sddr09 # reader/writer. The patch below documents the required command (but does # not add the code). # # Two years ago or so I used this to fix the CIS on a card that my camera no # longer wanted to accept. A Linux utility to do this might be useful, but # the problem always is that we do not really have a good mechanism. # # How does one tell a driver that it has to do something special? Add yet # another ioctl? # # drivers/usb/storage/sddr09.c # 2004/01/25 03:12:23-08:00 Andries.Brouwer@cwi.nl +29 -0 # USB: add comments to sddr09.c # # ChangeSet # 2004/02/19 15:35:35-08:00 greg@kroah.com # [PATCH] USB: fix up compile errors in uhci driver. # # drivers/usb/host/uhci-hcd.c # 2004/02/19 07:31:38-08:00 greg@kroah.com +2 -2 # USB: fix up compile errors in uhci driver. # # ChangeSet # 2004/02/19 15:34:39-08:00 stern@rowland.harvard.edu # [PATCH] USB: Use driver-model logging in the UHCI driver # # The main item in this patch is the conversion of the UHCI driver from # using the old usb.h logging macros to the new driver-model dev_xxx # macros. # # There are a few other minor changes too: updated version number, author, # copyright, and maintainer information, removed some unneeded error # messages, added some line breaks, added a convenience macro for the device # pointer. # # drivers/usb/host/uhci-hub.c # 2004/02/19 08:15:06-08:00 stern@rowland.harvard.edu +4 -5 # USB: Use driver-model logging in the UHCI driver # # drivers/usb/host/uhci-hcd.h # 2004/02/19 08:15:06-08:00 stern@rowland.harvard.edu +1 -1 # USB: Use driver-model logging in the UHCI driver # # drivers/usb/host/uhci-hcd.c # 2004/02/19 08:15:06-08:00 stern@rowland.harvard.edu +62 -55 # USB: Use driver-model logging in the UHCI driver # # ChangeSet # 2004/02/19 15:34:09-08:00 stern@rowland.harvard.edu # [PATCH] USB: Repair unusual_devs.h entry # # On Fri, 20 Feb 2004, Gustavo Guillermo wrote: # # > Ok, I tested the patch, The camera works, just as in the old Kernel, # > Thanks, I'm including as an atachment the /proc/bus/usb/devices from # > kernel 2.4.x and 2.6.x, and the kernel log for 2.4.x, but ooops, I forgot # > to biold 2.4.x with full debug, if someone need it I will do. # > # > Please include this FIX in the Next Release. # # Greg, I now feel confident that this patch should be applied. # # drivers/usb/storage/unusual_devs.h # 2004/02/17 02:42:58-08:00 stern@rowland.harvard.edu +1 -1 # USB: Repair unusual_devs.h entry # # ChangeSet # 2004/02/19 15:32:56-08:00 stern@rowland.harvard.edu # [PATCH] USB: Another unusual_devs.h update # # On Thu, 19 Feb 2004, Agustin De Igartua wrote: # # > Initializing USB Mass Storage driver... # > usb-storage: This device (04e6,0002,0100 S 06 P 50) has unneeded SubClass and Protocol entries in unusual_devs.h # > Please send a copy of this message to scsi0 : SCSI emulation for USB Mass Storage devices # # Thank you for sending this in. Greg, here's the patch. # # drivers/usb/storage/unusual_devs.h # 2004/02/19 04:01:34-08:00 stern@rowland.harvard.edu +1 -1 # USB: Another unusual_devs.h update # # ChangeSet # 2004/02/19 11:28:05-08:00 davidm@tiger.hpl.hp.com # ia64: Back-port from libunwind: fix off-by-one error in kernel-unwinder. # # There are no known failures due to this bug, but it's clearly a bug and # given the right compiler, it could trigger and lead to bad stack traces etc. # # # arch/ia64/kernel/unwind.c # 2004/02/19 11:27:59-08:00 davidm@tiger.hpl.hp.com +1 -1 # (compile_reg): Fix off-by-one error. # # ChangeSet # 2004/02/19 11:06:58-08:00 pfg@sgi.com # [PATCH] ia64: cleanup SN2 pci_bus_cvlink.c # # I incorporated (at least in spirit I hope) hch's suggestions on the fixup code # put in some kfrees that I was missing and static for sn_alloc_pci_sysdata # (thanks Bartlomiej Zolnierkiewicz). White space clean up. # # arch/ia64/sn/io/machvec/pci_bus_cvlink.c # 2004/02/19 04:06:34-08:00 pfg@sgi.com +161 -172 # ia64: cleanup SN2 pci_bus_cvlink.c # # ChangeSet # 2004/02/19 10:50:29-08:00 mort@sgi.com # [PATCH] ia64: clean up SN2 setup.c # # Cleanup the SN setup.c file. Add __init and static to functions where # required. # # arch/ia64/sn/kernel/setup.c # 2004/02/14 23:22:40-08:00 mort@sgi.com +4 -4 # ia64: clean up SN2 setup.c # # ChangeSet # 2004/02/19 10:49:01-08:00 mort@sgi.com # [PATCH] ia64: SN2 header file cleanups # # Here is a patch to clean up some of the Altix header files and includes. # # I've run the patch past the appropriate people at SGI and they seem happy # with the changes. # # include/asm-ia64/sn/sn2/sn_private.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +1 -0 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/sgi.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/module.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -6 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/leds.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +1 -4 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/iograph.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +4 -30 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/ioerror_handling.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +1 -84 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/ioconfig_bus.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +6 -6 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/ioc4.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +1 -761 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/io.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -2 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/intr.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/driver.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -4 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/dmamap.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -10 # ia64: SN2 header file cleanups # # include/asm-ia64/sn/clksupport.h # 2004/02/13 07:00:22-08:00 mort@sgi.com +4 -5 # ia64: SN2 header file cleanups # # arch/ia64/sn/kernel/irq.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/xswitch.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/shuberror.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/shub_intr.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/shub.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/pcibr/pcibr_rrb.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/pcibr/pcibr_config.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/ml_SN_init.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/klconflib.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -2 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/geo_op.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/sn2/bte_error.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/machvec/pci_bus_cvlink.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/io.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +0 -1 # ia64: SN2 header file cleanups # # arch/ia64/sn/io/drivers/ioconfig_bus.c # 2004/02/13 07:00:22-08:00 mort@sgi.com +1 -0 # ia64: SN2 header file cleanups # # ChangeSet # 2004/02/19 10:47:27-08:00 pfg@sgi.com # [PATCH] ia64: on SN2, skip init_platform_hubinfo() if on the simulator # # # arch/ia64/sn/io/sn2/ml_SN_init.c # 2004/02/09 09:37:20-08:00 pfg@sgi.com +5 -1 # ia64: on SN2, skip init_platform_hubinfo() if on the simulator # # ChangeSet # 2004/02/19 10:46:32-08:00 pfg@sgi.com # [PATCH] ia64: on SN2, use the pda to count interrupts # # # arch/ia64/sn/io/sn2/ml_SN_intr.c # 2004/02/09 09:37:16-08:00 pfg@sgi.com +3 -3 # ia64: on SN2, use the pda to count interrupts # # ChangeSet # 2004/02/19 08:40:04-08:00 akpm@osdl.org # [PATCH] show_task() is not SMP safe # # From: Arnd Bergmann # # Christian Bornträger noticed that the kernel can crash after -T. It # appears that the show_task function gets called for all tasks, which does # not work if one of the tasks is running in a system call on another CPU. # In that case the result of thread_saved_pc and show_stack is undefined and # likely to cause a crash. # # For tasks running in user space on other CPUs, show_task() is probably # harmless, but I'm not sure if that's true on all architectures. # # The patch below is still racy for tasks that are about to sleep, but it # demonstrates the problem. # # kernel/sched.c # 2004/02/18 22:54:13-08:00 akpm@osdl.org +6 -5 # show_task() is not SMP safe # # ChangeSet # 2004/02/19 08:39:53-08:00 akpm@osdl.org # [PATCH] show_task() fix and cleanup # # show_task() is preinting negative numbers for free stack due to arithmetic # against the wrong pointer. # # Fix that up, and clean up a few related things. # # show_task still has bogus code which atempts to work out how much stack the # task has ever used - it cannot work because we don't actually zero out the # stack pages when allocating them. We should fix that, or take it out. # # kernel/sched.c # 2004/02/18 22:54:12-08:00 akpm@osdl.org +9 -16 # show_task() fix and cleanup # # include/linux/sched.h # 2004/02/18 22:54:12-08:00 akpm@osdl.org +1 -0 # show_task() fix and cleanup # # ChangeSet # 2004/02/19 08:39:43-08:00 akpm@osdl.org # [PATCH] print some x86 build options during oopses # # I find this handy sometimes: it makes the oops output include info as to # whether the user has selected CONFIG_PREEMPT, CONFIG_SMP or, particularly, # CONFIG_DEBUG_PAGEALLOC. It can save one email round-trip. # # arch/i386/kernel/traps.c # 2004/02/18 22:54:11-08:00 akpm@osdl.org +15 -0 # print some x86 build options during oopses # # ChangeSet # 2004/02/19 08:39:33-08:00 akpm@osdl.org # [PATCH] config option for irqbalance # # From: "Martin J. Bligh" # # Make irqbalance into a config option - some people (jgarzik, arjan, etc) # wanted to be able to disable it and do things from userspace instead. This # patch allows each camp to do their own thing, which seems fair ;-) # # arch/i386/kernel/io_apic.c # 2004/02/18 22:54:10-08:00 akpm@osdl.org +5 -3 # config option for irqbalance # # arch/i386/Kconfig # 2004/02/18 22:54:10-08:00 akpm@osdl.org +8 -0 # config option for irqbalance # # ChangeSet # 2004/02/19 08:39:22-08:00 akpm@osdl.org # [PATCH] ia32: disallow NUMA on PC subarch # # From: "Martin J. Bligh" # # Disallow NUMA on the i386 PC subarch (it doesn't work, nor was it intended # to). # # arch/i386/Kconfig # 2004/02/18 22:54:09-08:00 akpm@osdl.org +1 -1 # ia32: disallow NUMA on PC subarch # # ChangeSet # 2004/02/19 08:39:12-08:00 akpm@osdl.org # [PATCH] ia32: pfn_to_nid fix # # From: "Martin J. Bligh" # # Makes sure pfn_to_nid is defined for all combinations of subarches, and that # it's defined before it's used so we don't run into implicit declaration # problems. # # include/linux/mmzone.h # 2004/02/18 22:54:09-08:00 akpm@osdl.org +1 -0 # ia32: pfn_to_nid fix # # include/asm-i386/mmzone.h # 2004/02/18 22:54:09-08:00 akpm@osdl.org +42 -39 # ia32: pfn_to_nid fix # # ChangeSet # 2004/02/19 08:39:02-08:00 akpm@osdl.org # [PATCH] fix pfn_valid on ia32 discontigmem # # From: "Martin J. Bligh" # # Fix pfn_valid for architctures with discontiguous memory. This only # changes the NUMA definition, and it leaves the NUMA-Q definition as was, # because it's faster that way, it's in hotpaths, and our memory is always # contiguous. # # include/asm-i386/mmzone.h # 2004/02/18 22:54:08-08:00 akpm@osdl.org +12 -7 # fix pfn_valid on ia32 discontigmem # # ChangeSet # 2004/02/19 08:38:51-08:00 akpm@osdl.org # [PATCH] fix access() POSIX compliance # # From: Andreas Gruenbacher # # The fix for permission() that makes it compliant with POSIX.1-2001 # apparently was lost. Here is the patch I sent before. (The relevant lines # from the standard text are cited in # http://www.ussg.iu.edu/hypermail/linux/kernel/0310.2/0286.html. The fix # proposed in that posting did not handle directories without execute # permissions correctly.) # # # Make permission check conform to POSIX.1-2001 # # The access(2) function does not conform to POSIX.1-2001: For root # and a file with no permissions, access(file, MAY_READ|MAY_EXEC) # returns 0 (it should return -1). # # fs/xfs/xfs_inode.c # 2004/02/18 22:54:07-08:00 akpm@osdl.org +2 -1 # fix access() POSIX compliance # # fs/namei.c # 2004/02/18 22:54:07-08:00 akpm@osdl.org +2 -1 # fix access() POSIX compliance # # fs/jfs/acl.c # 2004/02/18 22:54:07-08:00 akpm@osdl.org +2 -1 # fix access() POSIX compliance # # fs/ext3/acl.c # 2004/02/18 22:54:07-08:00 akpm@osdl.org +2 -1 # fix access() POSIX compliance # # fs/ext2/acl.c # 2004/02/18 22:54:07-08:00 akpm@osdl.org +2 -1 # fix access() POSIX compliance # # ChangeSet # 2004/02/19 08:38:40-08:00 akpm@osdl.org # [PATCH] gcc-3.5: bonding # # drivers/net/bonding/bond_alb.c: In function `bond_alb_xmit': # drivers/net/bonding/bond_alb.c:1188: error: invalid lvalue in assignment # # drivers/net/bonding/bond_alb.c # 2004/02/18 22:54:07-08:00 akpm@osdl.org +4 -1 # gcc-3.5: bonding # # ChangeSet # 2004/02/19 08:38:29-08:00 akpm@osdl.org # [PATCH] use noinline for rest_init() # # gcc-3.4 incorretly inlines rest_init() into start_kernel(), causing things to # crash when the .text.init section gets unloaded. Use noinline to prevent # that. # # init/main.c # 2004/02/18 22:54:06-08:00 akpm@osdl.org +3 -1 # use noinline for rest_init() # # ChangeSet # 2004/02/19 08:38:18-08:00 akpm@osdl.org # [PATCH] Add noinline attribute # # From: Andi Kleen # # This patch adds the `noinline' function attribute. It can be used to # explicitly tell the compiler to not inline functions. # # We need this due to what is, IMO, a bug present in gcc-3.4 and current # gcc-3.5 CVS: the compiler is inlining init/main.c:rest_init() inside # init/main.c:start_kernel(), despite the fact that thay are declared to be # placed in different text sections. # # include/linux/compiler.h # 2004/02/18 22:54:05-08:00 akpm@osdl.org +4 -0 # Add noinline attribute # # include/linux/compiler-gcc3.h # 2004/02/18 22:54:05-08:00 akpm@osdl.org +4 -0 # Add noinline attribute # # ChangeSet # 2004/02/19 08:38:07-08:00 akpm@osdl.org # [PATCH] Use -funit-at-a-time on ia32 # # From: Andi Kleen # # The upcomming gcc 3.4 has a new compilation mode called unit-at-a-time. # What it does is to first load the whole file into memory and then generate # the output. This allows it to use a better inlining strategy, drop unused # static functions and use -mregparm automatically for static functions. # # It does not seem to compile significantly slower. # # This is also available in some of the 3.3 based "hammer branch" # compilers used in distributions (at least in SuSE and Mandrake) # # Some tests show impressive .text shrinkage from unit-at-a-time. # # e.g. here is the same kernel compiled with -fno-unit-at-a-time and # -funit-at-a-time with a gcc 3.4 snapshot. The gains are really # impressive: # # text data bss dec hex filename # 4129346 708629 207240 5045215 4cfbdf vmlinux-nounitatatime # 3999250 674853 207208 4881311 4a7b9f vmlinux-unitatatime # # .text shrinks by over 130KB!. And .data shrinks too. # # At first look the numbers look nearly too good to be true, but they have been # verified with several configurations and seem to be real. It looks like # we have a lot of stupid inlines or dead functions. I'm really not # sure why it is that much better. But it's hard to argue with hard # numbers. # # [A bloat-o-meter comparision between the two vmlinuxes can be found in # http://www.firstfloor.org/~andi/unit-vs-no-unit.gz . It doesn't show # any obvious candidates unfortunately, just lots of small changes] # # With the gcc 3.3-hammer from SuSE 9.0 the gains are a bit smaller, but # still noticeable (>100KB on .text) # # This patch enables -funit-at-a-time on ia32 if the compiler is gcc-3.4 or # later. We had several reports of gcc-3.3 producing very early lockups. # # arch/x86_64/Makefile # 2004/02/18 22:54:04-08:00 akpm@osdl.org +4 -1 # Use -funit-at-a-time on ia32 # # arch/i386/Makefile # 2004/02/18 22:54:04-08:00 akpm@osdl.org +4 -0 # Use -funit-at-a-time on ia32 # # ChangeSet # 2004/02/19 08:37:55-08:00 akpm@osdl.org # [PATCH] Add CONFIG for -mregparm=3 # # From: Andi Kleen , me. # # Using -mregparm=3 shrinks the kernel further: # # (compiled with gcc 3.4, without -funit-at-a-time, using the later and # together with -Os shrinks .text even more, making over 700KB difference) # # 4129346 708629 207240 5045215 4cfbdf vmlinux # 3892905 708629 207240 4808774 496046 vmlinux-regparm # # This one helps even more, >236KB .text difference. Clearly worth # the effort. # # This patch adds an option to use -mregparm=3 while compiling the kernel. I # did an LTP run and it showed no additional failures over an non regparm # kernel. # # According to some gcc developers it should be safe to use in all gccs that # are still supports (2.95 and up) # # I didn't make it the default because it will break all binary only modules # (although they can be fixed by adding a wrapper that calls them with # "asmlinkage"). Actually it may be a good idea to make this default with # 2.7.1 or somesuch. # # We add new kbuild infrastructure: the command # # scripts/gcc-version.sh $(CC) # # will print out the version of gcc in a canonical 4-digit form suitable for # performing numerical tests against. # DESC # arch/i386/Makefile,scripts/gcc-version.sh,Makefile small fixes # EDESC # From: Serge Belyshev <33554432@mtu-net.ru> # # arch/i386/Makefile: # * omitted $(KBUILD_SRC)/ in script call. # # scripts/gcc-version.sh: # * GNU tail no longer supports 'tail -1' syntax. # # We should consider adding -fweb option: # # vanilla: # $ size vmlinux # text data bss dec hex filename # 3056270 526780 386056 3969106 3c9052 vmlinux # # with -fweb: # $ size vmlinux # text data bss dec hex filename # 3049523 526780 386056 3962359 3c75f7 vmlinux # # Also note 0.1 ... 1.0% speedup in various benchmarks. # This option is not enabled by default at -O2 because it # (like -fomit-frame-pointer) makes debugging impossible. # # scripts/gcc-version.sh # 2004/02/18 22:54:04-08:00 akpm@osdl.org +14 -0 # Add CONFIG for -mregparm=3 # # include/asm-i386/module.h # 2004/02/18 22:54:04-08:00 akpm@osdl.org +7 -1 # Add CONFIG for -mregparm=3 # # arch/i386/Makefile # 2004/02/18 22:54:04-08:00 akpm@osdl.org +5 -0 # Add CONFIG for -mregparm=3 # # arch/i386/Kconfig # 2004/02/18 22:54:04-08:00 akpm@osdl.org +13 -0 # Add CONFIG for -mregparm=3 # # scripts/gcc-version.sh # 2004/02/18 22:54:04-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/scripts/gcc-version.sh # # ChangeSet # 2004/02/19 08:37:44-08:00 akpm@osdl.org # [PATCH] page_add_rmap(): remove meaningless test # # Remove page validity test. I had a warning in there for a few weeks, no # reports of it happening. # # mm/rmap.c # 2004/02/18 22:54:03-08:00 akpm@osdl.org +1 -1 # page_add_rmap(): remove meaningless test # # ChangeSet # 2004/02/19 08:37:32-08:00 akpm@osdl.org # [PATCH] slab: hexdump for check_poison # # From: Manfred Spraul # # The patch is designed improve the diagnostics which are presented when the # slab memory poison detector triggers. # # # check_poison_obj checks for write accesses after kfree by comparing the # object contents with the poison value. The current implementation contains # several flaws: # # - it accepts both POISON_BEFORE and POISON_AFTER. check_poison_obj is # only called with POISON_AFTER poison bytes. Fix: only accept # POISON_AFTER. # # - the output is unreadable. Fix: use hexdump. # # - if a large objects is corrupted, then the relevant lines can scroll of # the screen/dmesg buffer. Fix: line limit. # # - it can access addresses behind the end of the object, which can oops # with CONFIG_DEBUG_PAGEALLOC. Fix: bounds checks. # # Additionally, the patch contains the following changes: # # - rename POISON_BEFORE and POISON_AFTER to POISON_FREE and POISON_INUSE. # The old names are ambiguous. # # - use the new hexdump object function in ptrinfo. # # - store_stackinfo was called with wrong parameters: it should store # caller, i.e. __builtin_return_address(0), not POISON_AFTER in the # object. # # - dump both the object before and after the corrupted one, not just the # one after. # # Example output: # <<< # Slab corruption: start=194e708c, len=2048 # Redzone: 0x5a2cf071/0x5a2cf071. # Last user: [<02399d7c>](dummy_init_module+0x1c/0xb0) # 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 7b # 030: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 63 # Prev obj: start=194e6880, len=2048 # Redzone: 0x5a2cf071/0x5a2cf071. # Last user: [<00000000>](0x0) # 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b # 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b # <<< # # mm/slab.c # 2004/02/18 22:54:02-08:00 akpm@osdl.org +98 -60 # slab: hexdump for check_poison # # ChangeSet # 2004/02/19 08:37:22-08:00 akpm@osdl.org # [PATCH] prevent ptrace from altering page permissions # # From: Roland McGrath # # Under some circumstances, ptrace PEEK/POKE_TEXT can cause page permissions # to be permanently changed. Thsi causes changes in application behaviour # when run under gdb. # # Fix that by only marking the pte as writeable if the vma is marked for # writing. A write fault thus unshares the page but doesn't necessarily make # it writeable. # # mm/memory.c # 2004/02/18 22:54:01-08:00 akpm@osdl.org +32 -6 # prevent ptrace from altering page permissions # # ChangeSet # 2004/02/19 08:37:12-08:00 akpm@osdl.org # [PATCH] slab: print slab name in kmem_cache_init() # # Print the name of the offending slab if we're going to go BUG in # kmem_cache_init(). # # mm/slab.c # 2004/02/18 22:54:00-08:00 akpm@osdl.org +4 -1 # slab: print slab name in kmem_cache_init() # # ChangeSet # 2004/02/19 08:37:00-08:00 akpm@osdl.org # [PATCH] ramdisk cleanup # # Fairly pointless coding-style cleanups which I've been sitting on for ages. # The ramdisk driver is still buggy: it drops pagecache when unmounted. I # still need to fix this. # # Apparently it also displays data corruption under load even when not # unmounted. # # drivers/block/rd.c # 2004/02/18 22:53:59-08:00 akpm@osdl.org +36 -27 # ramdisk cleanup # # ChangeSet # 2004/02/18 22:15:10-08:00 gerg@snapgear.com # [PATCH] fixes to ColdFire/5407 startup code # # Correct the cache setup bits for the 5407. This enables the write # buffers properly (despite what the previous comment said). This # combined with fixed cache flushing code provides a nice performance # boost on the 5407. # # Also fix the ROMfs setup to only move the ROMfs region if it is actually # configured. # # arch/m68knommu/platform/5407/MOTOROLA/crt0_ram.S # 2004/02/18 16:43:18-08:00 gerg@snapgear.com +9 -1 # fixes to ColdFire/5407 startup code # # ChangeSet # 2004/02/18 21:45:08-08:00 gerg@snapgear.com # [PATCH] add m68k elf relocation types to elf.h # # Added ELF relocation type defines. These are needed by the module # loading code for m68knommu. # # include/asm-m68knommu/elf.h # 2004/02/18 16:47:00-08:00 gerg@snapgear.com +27 -0 # add m68k elf relocation types to elf.h # # ChangeSet # 2004/02/18 21:41:28-08:00 gerg@snapgear.com # [PATCH] allow configuration for shared flat binary support # # This adds the configuration option to enable the uClinux shared flat # binary support. The code support is already in the binfmt_load code, # just the config option is missing. # # fs/Kconfig.binfmt # 2004/02/18 16:46:02-08:00 gerg@snapgear.com +6 -0 # allow configuration for shared flat binary support # # ChangeSet # 2004/02/18 21:41:19-08:00 gerg@snapgear.com # [PATCH] fix memory leaks in binfmt_flat loader # # Fix a number of memory leaks in the uClinux binfmt_flat loader. All are # related to not cleaning up properly on failure conditions. # # fs/binfmt_flat.c # 2004/02/18 21:07:37-08:00 gerg@snapgear.com +20 -12 # fix memory leaks in binfmt_flat loader # # ChangeSet # 2004/02/18 21:00:18-08:00 akpm@osdl.org # [PATCH] aio sysctl parms # # From: Janet Morgan # # It looks like aio_nr and aio_max_nr were intended to be sysctl parameters. # # kernel/sysctl.c # 2004/02/18 19:43:21-08:00 akpm@osdl.org +16 -0 # aio sysctl parms # # include/linux/sysctl.h # 2004/02/18 19:43:21-08:00 akpm@osdl.org +2 -0 # aio sysctl parms # # include/linux/aio.h # 2004/02/18 19:43:21-08:00 akpm@osdl.org +2 -1 # aio sysctl parms # # Documentation/sysctl/fs.txt # 2004/02/18 19:43:21-08:00 akpm@osdl.org +10 -0 # aio sysctl parms # # Documentation/filesystems/proc.txt # 2004/02/18 19:43:21-08:00 akpm@osdl.org +9 -0 # aio sysctl parms # # ChangeSet # 2004/02/18 21:00:09-08:00 akpm@osdl.org # [PATCH] mark ftape un-removable # # From: Christoph Hellwig # # I've just grepped over the tree for reamining MOD_INC_USE_COUNT users, and # ftape is a really horrible one, it relies on MOD_{INC,DEV}_USE_COUNT in the # most horrible places + it's own bookkepping and the <= 2.4 may unload # hooks. And although I don't have the hardware I can guarantee it doesn't # work as expected. # # So let's just remove the module_exit handler and mark it unremovable, if # someone wants to fix up ftape later it's fine with me, but it's a really # scary driver.. # # drivers/char/ftape/compressor/zftape-compress.c # 2004/02/18 19:43:21-08:00 akpm@osdl.org +1 -44 # mark ftape un-removable # # ChangeSet # 2004/02/18 21:00:00-08:00 akpm@osdl.org # [PATCH] Add C99 initializers to arch/i386/pci/fixup.c # # From: "Art Haas" # # Here's a small patch that adds C99 initializers to the file. # # arch/i386/pci/fixup.c # 2004/02/18 19:43:20-08:00 akpm@osdl.org +103 -18 # Add C99 initializers to arch/i386/pci/fixup.c # # ChangeSet # 2004/02/18 20:59:51-08:00 akpm@osdl.org # [PATCH] crc32.c copyright fix # # From: Matt Domsch # # Patch below applies to both 2.4.25 and 2.6.3, and replaces the public # domain statement and non-warranty with the GPL, as is permitted by the code # being in the public domain, and is done with legal advice. # # lib/crc32.c # 2004/02/18 19:43:20-08:00 akpm@osdl.org +8 -9 # crc32.c copyright fix # # ChangeSet # 2004/02/18 20:59:42-08:00 akpm@osdl.org # [PATCH] tuner driver fixes # # From: Gerd Knorr # # "options tuner type=2" is just there for historical reasons and should # only be used/needed if the main driver doesn't allow to configure the # tuner type. I'm not sure whenever I can remove that altogether without # breaking anything. There are several users of the tuner module, some # outside the standard kernel tree ... # # > > if (type < TUNERS) { # > > + t->type = type; # > > printk("tuner: type forced to %d (%s) [insmod]\n", # > > t->type,tuners[t->type].name); # > > set_type(client,type); # # That is wrong, it will break in other corner cases, it may cause the # set_type() function not doing the initializations. # # The prink can also be dropped because set_type does that too. The patch # below removes that. It also makes the kernel messages a bit more verbose # and adds support for two new tuners. # # include/media/tuner.h # 2004/02/18 19:43:19-08:00 akpm@osdl.org +3 -1 # tuner driver fixes # # drivers/media/video/tuner.c # 2004/02/18 19:43:19-08:00 akpm@osdl.org +17 -11 # tuner driver fixes # # ChangeSet # 2004/02/18 20:59:33-08:00 akpm@osdl.org # [PATCH] wireless/Kconfig enable/select complete replacement # # From: mcgrof@studorgs.rutgers.edu (Luis R. Rodriguez) # # Complete the migration from Kconfig's undocumented "enable" to "select". # # drivers/net/wireless/Kconfig # 2004/02/18 19:43:19-08:00 akpm@osdl.org +2 -2 # wireless/Kconfig enable/select complete replacement # # ChangeSet # 2004/02/18 20:59:24-08:00 akpm@osdl.org # [PATCH] Fix sprintf modifiers in usr/gen_init_cpio.c for cygwin # # From: Pragnesh Sampat # # The file initramfs_data.cpio is slightly different when generated on # cygwin, compared to linux, which causes the kernel to panic with the # message "no cpio magic" (See Documentation/early-userspace/README). # # The problem in cpio generation is due to the difference in sprintf # modifiers on cygwin. The code uses "%08ZX" for strlen of a device node. # printf man pages discourages "Z" and has 'z' instead. Both of these are # not available on cygwin sprintf (at least some versions of cygwin). The # net result of all of this is that the generated file literally contains # "ZX" and then the strlen after that and messes up that 110 offset etc. The # file is 516 bytes long on the system that I tested and on linux it is 512 # bytes. # # The fix below just uses "%08X" for that field. # # usr/gen_init_cpio.c # 2004/02/18 19:43:18-08:00 akpm@osdl.org +8 -8 # Fix sprintf modifiers in usr/gen_init_cpio.c for cygwin # # ChangeSet # 2004/02/18 20:59:15-08:00 akpm@osdl.org # [PATCH] smbfs: support the loop driver # # From: Urban Widmark # # Add the necessary bits for loop-over-smbfs. # # fs/smbfs/smbiod.c # 2004/02/18 19:43:18-08:00 akpm@osdl.org +3 -0 # smbfs: support the loop driver # # fs/smbfs/request.c # 2004/02/18 19:43:18-08:00 akpm@osdl.org +6 -0 # smbfs: support the loop driver # # fs/smbfs/proc.c # 2004/02/18 19:43:18-08:00 akpm@osdl.org +0 -6 # smbfs: support the loop driver # # fs/smbfs/file.c # 2004/02/18 19:43:18-08:00 akpm@osdl.org +22 -0 # smbfs: support the loop driver # # ChangeSet # 2004/02/18 20:59:06-08:00 akpm@osdl.org # [PATCH] Codingstyle update # # From: Michael Frank # # Documentation/CodingStyle # 2004/02/18 19:43:17-08:00 akpm@osdl.org +215 -58 # Codingstyle update # # ChangeSet # 2004/02/18 20:58:57-08:00 akpm@osdl.org # [PATCH] Remove overenthusiastic BUG in smp_boot_cpus # # From: "Martin J. Bligh" # # There's no real need to BUG and stop the system from booting if the BIOS # spec'ed apicid for the boot CPU isn't correct - we can continue perfectly # well with the real one. # # arch/i386/kernel/smpboot.c # 2004/02/18 19:43:17-08:00 akpm@osdl.org +1 -2 # Remove overenthusiastic BUG in smp_boot_cpus # # ChangeSet # 2004/02/18 20:58:48-08:00 akpm@osdl.org # [PATCH] sf16fmr2 radio card driver # # From: "ZIGLIO, Frediano, VF-IT" # # Add a new driver for the SF16FMR2 Radio card. # # drivers/media/radio/radio-sf16fmr2.c # 2004/02/18 19:43:16-08:00 akpm@osdl.org +447 -0 # sf16fmr2 radio card driver # # drivers/media/radio/Makefile # 2004/02/18 19:43:16-08:00 akpm@osdl.org +1 -0 # sf16fmr2 radio card driver # # drivers/media/radio/Kconfig # 2004/02/18 19:43:16-08:00 akpm@osdl.org +14 -0 # sf16fmr2 radio card driver # # drivers/media/radio/radio-sf16fmr2.c # 2004/02/18 19:43:16-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/media/radio/radio-sf16fmr2.c # # ChangeSet # 2004/02/18 20:58:38-08:00 akpm@osdl.org # [PATCH] Inefficient TLB flush fix # # From: Martin Hicks # # This is a patch based on one that Jack Steiner sent to the ia64 list in # November. The original thread can be found at: # # http://marc.theaimsgroup.com/?l=linux-ia64&m=106869606922555&w=2 # # I created the little wrapper function that was requested. I think the only # other arch, other than ia64, that doesn't at least include asm-generic/tlb.h # is arm. # # # Something appears broken in TLB flushing on IA64 (& possibly other # architectures). Functionally, it works but performance is bad on systems # with large cpu counts. # # The result is that TLB flushing in exit_mmap() is frequently being done via # IPIs to all cpus rather than with a "ptc" instruction or with a new # context.. # # mm/memory.c # 2004/02/18 19:43:15-08:00 akpm@osdl.org +2 -1 # Inefficient TLB flush fix # # include/asm-ia64/tlb.h # 2004/02/18 19:43:15-08:00 akpm@osdl.org +6 -0 # Inefficient TLB flush fix # # include/asm-generic/tlb.h # 2004/02/18 19:43:15-08:00 akpm@osdl.org +5 -0 # Inefficient TLB flush fix # # include/asm-arm/tlb.h # 2004/02/18 19:43:15-08:00 akpm@osdl.org +6 -0 # Inefficient TLB flush fix # # ChangeSet # 2004/02/18 20:58:29-08:00 akpm@osdl.org # [PATCH] menuconfig: fix the check for ncurses-devel # # From: Sam Ravnborg # # Corrected check for missing ncurses-devel when executing "make menuconfig". # Now tell user to install 'ncurses-devel' if check fails. # # scripts/lxdialog/Makefile # 2004/02/18 19:43:15-08:00 akpm@osdl.org +4 -6 # menuconfig: fix the check for ncurses-devel # # ChangeSet # 2004/02/18 20:58:20-08:00 akpm@osdl.org # [PATCH] Fix make rpm when using RH9 or Fedora.. # # From: Thomas Davis # # Doing a 'make rpm' will fail with the current RH9/Fedora RPM macros. # # The failure message is this: # # Processing files: kernel-debuginfo-2.6.3rc1mm1-12 # error: Could not open %files file /usr/src/redhat/BUILD/kernel-2.6.3rc1mm1/debugfiles.list: No such file or directory # # The fix is this patch: # # scripts/mkspec # 2004/02/18 19:43:14-08:00 akpm@osdl.org +1 -0 # Fix make rpm when using RH9 or Fedora.. # # ChangeSet # 2004/02/18 20:58:11-08:00 akpm@osdl.org # [PATCH] dm-crypt # # From: Christophe Saout # # Adds a crypto module for device-mapper. The intent here is to remove # cryptoloop ASAP, to pull the remapping gunk out of the loops driver and to # migrate people onto dm-crypt. It is on-disk compatible with existing # cryptolop installations. # # See http://www.saout.de/misc/dm-crypt/ for usage details. # # drivers/md/dm-crypt.c # 2004/02/18 19:43:14-08:00 akpm@osdl.org +777 -0 # dm-crypt # # drivers/md/dm-crypt.c # 2004/02/18 19:43:14-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/md/dm-crypt.c # # drivers/md/Makefile # 2004/02/18 19:43:14-08:00 akpm@osdl.org +1 -0 # dm-crypt # # drivers/md/Kconfig # 2004/02/18 19:43:14-08:00 akpm@osdl.org +18 -0 # dm-crypt # # ChangeSet # 2004/02/18 20:58:01-08:00 akpm@osdl.org # [PATCH] Disable bootmem warning # # From: Andi Kleen # # Make the "hm, page reserved twice" message dependent on CONFIG_DEBUG_BOOTMEM. # # mm/bootmem.c # 2004/02/18 19:43:13-08:00 akpm@osdl.org +4 -1 # Disable bootmem warning # # ChangeSet # 2004/02/18 20:57:52-08:00 akpm@osdl.org # [PATCH] ide-tape: remove obsolete onstream support # # From: Willem Riede # # # The onstream drives, be they scsi, atapi, ieee1394 or usb, are supported by the # osst driver. When the drives were new, code was introduced in ide-tape # independently, but never really maintained since. There are issues with the # drives I found and dealt with in osst, that ide-tape doesn't address. # # So this code in ide-tape is both redundant and imperfect. I assumed from # http://marc.theaimsgroup.com/?l=linux-kernel&m=107550547613846&w=2 that there # was buy in for removing it. # # When this patch is applied, ide-tape will refuse to attach to an onstream DI # drive, and will write to syslog to use ide-scsi + osst instead. # # drivers/ide/ide-tape.c # 2004/02/18 19:43:13-08:00 akpm@osdl.org +31 -1631 # ide-tape: remove obsolete onstream support # # ChangeSet # 2004/02/18 20:57:43-08:00 akpm@osdl.org # [PATCH] do_swap_page() return value fix # # From: BlaisorBlade # # An exhausted do_swap_page() should return VM_FAULT_OOM rather than -ENOMEM. # # mm/memory.c # 2004/02/18 19:43:12-08:00 akpm@osdl.org +1 -1 # do_swap_page() return value fix # # ChangeSet # 2004/02/18 20:57:34-08:00 akpm@osdl.org # [PATCH] slab: remove extraneous printk # # From: "David S. Miller" # # From: YOSHIFUJI Hideaki # # If I create some kmem cache on 64-bit with like 3 u32's in it, it should # silently just work and not warn. # # mm/slab.c # 2004/02/18 20:00:31-08:00 akpm@osdl.org +2 -3 # slab: remove extraneous printk # # ChangeSet # 2004/02/18 20:57:25-08:00 akpm@osdl.org # [PATCH] Fix race in epoll_ctl(EPOLL_CTL_MOD) # # From: Davide Libenzi # # A potential race can happen in epoll_ctl(EPOLL_CTL_MOD) where an event can # happen in between f_op->poll() and the lock on ep->lock (we cannot call # f_op->poll() inside a lock, and the f_op->poll() callback does not carry # any info at the current time - missing wake_up_info() already ;). In that # case the event would be removed. We can easily leave the event inside the # ready list and have the ep_send_events() logic do the job for us at later # time. (Thanks to david.lee@teracruz.com for reporting the thing, since it # shouldn't have been a nice one ;) # # fs/eventpoll.c # 2004/02/18 19:43:11-08:00 akpm@osdl.org +1 -2 # Fix race in epoll_ctl(EPOLL_CTL_MOD) # # ChangeSet # 2004/02/18 20:57:16-08:00 akpm@osdl.org # [PATCH] add clock_was_set() to all architectures # # From: Anton Blanchard # # Add clock_was_set to all architectures. I'm disappointed this wasnt done by # whoever wrote the code. # # (It is a callback which the arch-specific RTC-updating code must make when # someone sets the time). # # arch/v850/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/um/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/sparc64/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/sparc/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/s390/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/ppc64/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/ppc/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/parisc/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/mips/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -1 # add clock_was_set() to all architectures # # arch/m68knommu/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/m68k/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/h8300/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/cris/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/arm26/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # arch/alpha/kernel/time.c # 2004/02/18 19:43:10-08:00 akpm@osdl.org +1 -0 # add clock_was_set() to all architectures # # ChangeSet # 2004/02/18 20:57:07-08:00 akpm@osdl.org # [PATCH] Module headers cleanup # # From: Brian Gerst # # Cleans up some leftovers from the old module loader: # # - Remove unused defines from modules.h # # - Remove unused file modsetver.h # # include/asm-parisc/module.h # 2004/02/18 19:43:10-08:00 akpm@osdl.org +0 -5 # Module headers cleanup # # include/asm-h8300/module.h # 2004/02/18 19:43:10-08:00 akpm@osdl.org +0 -5 # Module headers cleanup # # include/asm-arm26/module.h # 2004/02/18 19:43:10-08:00 akpm@osdl.org +0 -5 # Module headers cleanup # # BitKeeper/deleted/.del-modsetver.h~59f44c7fa618daf5 # 2004/02/18 20:57:02-08:00 akpm@osdl.org +0 -0 # Delete: include/linux/modsetver.h # # ChangeSet # 2004/02/18 20:56:58-08:00 akpm@osdl.org # [PATCH] Documentation on how to debug modules # # From: Alex Goddard # # How to debug module loading problems. The wording is a slightly changed # version of what Rusty said. # # Documentation/debugging-modules.txt # 2004/02/18 19:43:09-08:00 akpm@osdl.org +18 -0 # Documentation on how to debug modules # # Documentation/debugging-modules.txt # 2004/02/18 19:43:09-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/Documentation/debugging-modules.txt # # ChangeSet # 2004/02/18 20:56:48-08:00 akpm@osdl.org # [PATCH] Fix __release_region() race # # From: MAEDA Naoaki # # I am testing PCI hot-plug in 2.6.2 kernel, but sometimes a struct resource # tree in kernel/resource.c was broken if multiple hot-plug requests are # issued at the same time. # # The reason is lots of drivers call release_region() on hot removal, and # __release_region(), which is invoked by release_region() macro, changes the # tree without holding a writer lock for resource_lock. # # I think __release_region() must hold a writer lock as well as # __request_region() does. # # A following patch fixes the issue in my environment. # # kernel/resource.c # 2004/02/18 19:43:09-08:00 akpm@osdl.org +6 -0 # Fix __release_region() race # # ChangeSet # 2004/02/18 20:56:39-08:00 akpm@osdl.org # [PATCH] remove max_anon limit # # From: Tim Hockin # # Remove the max_anon via dynamically allocation. We also change the # idr_pre_get() interface to take a gfp mask, which should have always been # there. # # lib/idr.c # 2004/02/18 19:43:08-08:00 akpm@osdl.org +6 -6 # remove max_anon limit # # kernel/posix-timers.c # 2004/02/18 19:43:08-08:00 akpm@osdl.org +1 -1 # remove max_anon limit # # init/main.c # 2004/02/18 19:43:08-08:00 akpm@osdl.org +1 -0 # remove max_anon limit # # include/linux/idr.h # 2004/02/18 19:43:08-08:00 akpm@osdl.org +1 -1 # remove max_anon limit # # include/linux/fs.h # 2004/02/18 19:43:08-08:00 akpm@osdl.org +1 -0 # remove max_anon limit # # fs/super.c # 2004/02/18 19:43:08-08:00 akpm@osdl.org +20 -8 # remove max_anon limit # # ChangeSet # 2004/02/18 20:56:30-08:00 akpm@osdl.org # [PATCH] oprofile: add Pentium Mobile support # # From: Philippe Elie # # From: Will Cohen # # Add oprofile support for Pentium Mobile (P6 core). Pentium Mobile needs to # unmask LVPTC vector, since it doesn't hurt other P6 core based cpus we do # it unconditionally for all these. # # This patch require userspace tools >= 0.8 (only in sourceforge cvs currently) # # arch/i386/oprofile/op_model_ppro.c # 2004/02/18 19:43:07-08:00 akpm@osdl.org +5 -0 # oprofile: add Pentium Mobile support # # arch/i386/oprofile/nmi_int.c # 2004/02/18 19:43:07-08:00 akpm@osdl.org +3 -1 # oprofile: add Pentium Mobile support # # ChangeSet # 2004/02/18 20:56:21-08:00 akpm@osdl.org # [PATCH] oprofile: ARM infrastructure # # From: Philippe Elie # # From: Zwane Mwaikambo # # This patch adds infrastructure code and enables ARM to utilise the timer # int oprofile driver. There is PMU code under development for the XScale # but that is still forthcoming. In the meantime you can use the timer int # driver with an updated Oprofile-CVS userspace (SF is a bit slow, please # allow 24hrs). # # arch/arm/oprofile/Makefile # 2004/02/18 19:43:07-08:00 akpm@osdl.org +9 -0 # oprofile: ARM infrastructure # # arch/arm/oprofile/Kconfig # 2004/02/18 19:43:07-08:00 akpm@osdl.org +23 -0 # oprofile: ARM infrastructure # # drivers/oprofile/timer_int.c # 2004/02/18 19:43:07-08:00 akpm@osdl.org +0 -1 # oprofile: ARM infrastructure # # arch/arm/oprofile/init.c # 2004/02/18 19:43:07-08:00 akpm@osdl.org +22 -0 # oprofile: ARM infrastructure # # arch/arm/oprofile/Makefile # 2004/02/18 19:43:07-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/arch/arm/oprofile/Makefile # # arch/arm/oprofile/Kconfig # 2004/02/18 19:43:07-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/arch/arm/oprofile/Kconfig # # arch/arm/kernel/time.c # 2004/02/18 19:43:07-08:00 akpm@osdl.org +3 -0 # oprofile: ARM infrastructure # # arch/arm/Makefile # 2004/02/18 19:43:07-08:00 akpm@osdl.org +1 -0 # oprofile: ARM infrastructure # # arch/arm/Kconfig # 2004/02/18 19:43:07-08:00 akpm@osdl.org +2 -0 # oprofile: ARM infrastructure # # arch/arm/oprofile/init.c # 2004/02/18 19:43:07-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/arch/arm/oprofile/init.c # # ChangeSet # 2004/02/18 20:56:11-08:00 akpm@osdl.org # [PATCH] Oprofile: fix nmi_timer_int detection # # From: Philippe Elie # # From: Zwane Mwaikambo # # The nmi_timer_int oprofile driver was enabling itself unconditionally if an # SMP kernel was being used on a UP system without an IOAPIC. # # Tested on a P5 using NMI timer int driver and UP system using timer int # driver both running an SMP kernel. # # 2004-02-11 Zwane Mwaikambo # # * arch/i386/kernel/nmi.c: export nmi_active # * arch/i386/oprofile/nmi_timer_int.c: use it to check if owe can use # an nmi interrupt # # arch/x86_64/kernel/nmi.c # 2004/02/18 19:43:06-08:00 akpm@osdl.org +2 -1 # Oprofile: fix nmi_timer_int detection # # arch/i386/oprofile/nmi_timer_int.c # 2004/02/18 19:43:06-08:00 akpm@osdl.org +5 -1 # Oprofile: fix nmi_timer_int detection # # arch/i386/kernel/nmi.c # 2004/02/18 19:43:06-08:00 akpm@osdl.org +2 -1 # Oprofile: fix nmi_timer_int detection # # ChangeSet # 2004/02/18 20:56:02-08:00 akpm@osdl.org # [PATCH] 3c59x: bring back the `enable_wol' option # # Some machines appear to have BIOS problems which are causing 3c59x adapters # to come up in a powered-off state when WOL and PM are enabled. # # So bring back the 2.4 `enable_wol' module option which disables wake-on-lan # unless the user specifically asked for it. # # drivers/net/3c59x.c # 2004/02/18 19:43:06-08:00 akpm@osdl.org +17 -4 # 3c59x: bring back the `enable_wol' option # # Documentation/networking/vortex.txt # 2004/02/18 19:43:06-08:00 akpm@osdl.org +13 -0 # 3c59x: bring back the `enable_wol' option # # ChangeSet # 2004/02/18 20:55:53-08:00 akpm@osdl.org # [PATCH] cleanup patch that prepares for 4Kb stacks # # From: Arjan van de Ven # # I have 4Kb stacks + IRQ stacks working in my tree. The biggest part of the # 4K-stacks work is changing hardcoded 8Kb assumptions to the proper, # pre-existing define for this. That part of the patch is appropriate in # general, even when 4Kb stacks might not be. # # include/asm-i386/thread_info.h # 2004/02/18 19:43:05-08:00 akpm@osdl.org +6 -3 # cleanup patch that prepares for 4Kb stacks # # arch/i386/kernel/traps.c # 2004/02/18 19:43:05-08:00 akpm@osdl.org +1 -1 # cleanup patch that prepares for 4Kb stacks # # arch/i386/kernel/process.c # 2004/02/18 19:43:05-08:00 akpm@osdl.org +4 -2 # cleanup patch that prepares for 4Kb stacks # # arch/i386/kernel/irq.c # 2004/02/18 19:43:05-08:00 akpm@osdl.org +1 -1 # cleanup patch that prepares for 4Kb stacks # # arch/i386/kernel/head.S # 2004/02/18 19:43:05-08:00 akpm@osdl.org +3 -1 # cleanup patch that prepares for 4Kb stacks # # arch/i386/kernel/entry.S # 2004/02/18 19:43:05-08:00 akpm@osdl.org +2 -2 # cleanup patch that prepares for 4Kb stacks # # ChangeSet # 2004/02/18 20:55:44-08:00 akpm@osdl.org # [PATCH] fix display of NBD in /proc/partitions # # The recent change to /proc/partitions which prevents it from displaying # removeable media accidentally caused 128 NBD and 16 ramdisk partitions to # appear in /proc/partitions instead. # # So add a specific gendisk flag which says "don't show me in /proc/partitions" # and use that. # # include/linux/genhd.h # 2004/02/18 19:43:04-08:00 akpm@osdl.org +5 -4 # fix display of NBD in /proc/partitions # # drivers/block/rd.c # 2004/02/18 19:43:04-08:00 akpm@osdl.org +1 -0 # fix display of NBD in /proc/partitions # # drivers/block/nbd.c # 2004/02/18 19:43:04-08:00 akpm@osdl.org +1 -0 # fix display of NBD in /proc/partitions # # drivers/block/genhd.c # 2004/02/18 19:43:04-08:00 akpm@osdl.org +3 -2 # fix display of NBD in /proc/partitions # # ChangeSet # 2004/02/18 20:55:35-08:00 akpm@osdl.org # [PATCH] skip offline CPUs in show_free_areas # # From: Christoph Hellwig # # Don't try to display the per-cpu information for CPUs which aren't there. # # mm/page_alloc.c # 2004/02/18 19:43:04-08:00 akpm@osdl.org +7 -1 # skip offline CPUs in show_free_areas # # ChangeSet # 2004/02/18 20:55:26-08:00 akpm@osdl.org # [PATCH] off_t in nfsd_commit needs to be loff_t # # From: Neil Brown , # # From: Miquel van Smoorenburg # # While I was stress-testing NFS/XFS on 2.6.1/2.6.2-rc, I found that # sometimes my "dd" would exit with: # # # dd if=/dev/zero bs=4096 > /mnt/file # dd: writing `standard output': Invalid argument # 1100753+0 records in # 1100752+0 records out # # After adding some debug printk's to the server and client code and some # tcpdump-ing, I found that the NFSERR_INVAL was returned by nfsd_commit on # the server. # # Turns out that the "offset" argument is off_t instead of loff_t. It isn't # used at all (unfortunately), but it _is_ checked for sanity, so that's # where the error came from. # # include/linux/nfsd/nfsd.h # 2004/02/18 19:43:03-08:00 akpm@osdl.org +1 -1 # off_t in nfsd_commit needs to be loff_t # # fs/nfsd/vfs.c # 2004/02/18 19:43:03-08:00 akpm@osdl.org +1 -1 # off_t in nfsd_commit needs to be loff_t # # fs/nfsd/nfs3proc.c # 2004/02/18 19:43:03-08:00 akpm@osdl.org +2 -2 # off_t in nfsd_commit needs to be loff_t # # ChangeSet # 2004/02/18 20:55:17-08:00 akpm@osdl.org # [PATCH] drivers/char/vt possible race # # From: Benjamin Herrenschmidt # # I falled again on the crash in con_do_write() with driver->data beeing # NULL. It happens during boot, when userland is playing open/close games # with tty's, I was intentionally typing keys like mad during boot trying to # trigger another problem when this one poped up. # # Looking at the code, I'm not sure how protected we are by the above (tty) # layer, paulus told me to not rely on anything like locking coming from # there, so I decided to extend the scope of the console semaphore one more # bit to cover races between calls to con_open, con_close and con_write. # Note that in con_do_write, I intentionally drop the semaphore to avoid # keeping it held when waiting on the local buffer, and I added some sanity # checks on tty->driver_data with some printk's in case we still have an open # race by the tty layer. At least, now, the couple vc_allocated & # tty->driver_data should be protected though. # # drivers/char/vt.c # 2004/02/18 19:43:03-08:00 akpm@osdl.org +29 -5 # drivers/char/vt possible race # # ChangeSet # 2004/02/18 20:55:08-08:00 akpm@osdl.org # [PATCH] /proc thread visibility fixes # # From: Kingsley Cheung # # Is is possible to examine the data of tasks currently existing in the system # which are not threads of the same thread group. # # For example, the only task in the group where init is group leader is itself: # # gen2 02:50:44 ~: ls /proc/1/task # 1 # # However, I can then read the contents of 'stat' for any other task in the # system: # # gen2 02:49:45 ~: cat /proc/1/task/$$/stat # 1669 (bash) S 1668 1669 1669 34816 1730 256 1480 6479 12 4 8 5 5 17 15 0 1 0 # +8065 3252224 451 4294967295 134512640 134955932 3221225104 3221222840 # +4294960144 0 65536 3686404 1266761467 3222442959 0 0 17 0 0 0 # # I had a look at fs/proc/base.c and found that the 'lookup' functions for # these directories were checking that the task in question existed, but # overlooked the following: # # 1. In the function proc_pid_lookup, a check is required to ensure that # the task in question is a thread group leader. Without the check, any # task can have its data retrieved accordingly. Consider the following. # There is a multithreaded process 1777. # # gen2 23:22:47 /proc/1777: ls task # 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 # # However, I can read the stat file for its thread 1778 as follows: # # gen2 23:22:50 /proc/1777: cat /proc/1778/stat # 1778 (multithreadtest) T 1777 1777 1672 34816 1672 64 0 0 0 0 14 17 0 0 15 0 12 0 8871 24727552 104 4294967295 134512640 134515104 3221222496 1077365276 4294960144 0 0 0 0 3222479248 0 0 -1 1 0 0 # # But 1778 is not meant to show up in /proc/, as intended right?: # # gen2 23:22:56 /proc/1777: ls /proc/ # 1 1365 1661 1793 881 dma kcore scsi # 10 1371 1662 18 9 driver kmsg self # 1014 1372 1663 2 909 execdomains loadavg slabinfo # 1032 14 1664 3 963 fb locks stat # 1062 15 1665 4 966 filesystems mdstat swaps # 1066 16 1666 5 buddyinfo fs meminfo sys # 1067 1605 1669 6 bus ide misc sysrq-trigger # 1087 1610 1670 7 cmdline interrupts modules sysvipc # 1095 1611 1671 736 cpuinfo iomem mounts tty # 11 1641 1672 8 crypto ioports mtrr uptime # 12 1658 17 807 devices irq net version # 13 1660 1777 810 diskstats kallsyms partitions vmstat # # 2. The other part of the bug is in the function proc_task_lookup. Here # there needs to be a check that the task X is indeed a thread of the # thread group Y when we read /proc//task/. # # Right now, this check does not exist, which allows for any existing # task to have its data read from another thread group directory. The # following reads the stat directory of my bash shell from the thread # group 1. # # gen2 23:28:07 ~: cd /proc/1 # gen2 23:28:10 /proc/1: ls # auxv cwd exe maps mounts stat status wchan # cmdline environ fd mem root statm task # gen2 23:28:11 /proc/1: ls task # 1 # gen2 23:28:27 /proc/1: cat task/$$/stat # 1671 (bash) S 1670 1671 1671 34817 1802 256 1953 8101 12 4 10 6 9 26 15 0 1 0 5789 3252224 454 4294967295 134512640 134955932 3221225104 3221222840 4294960144 0 65536 3686404 1266761467 3222442959 0 0 17 0 0 0 # # fs/proc/base.c # 2004/02/18 19:43:02-08:00 akpm@osdl.org +13 -9 # /proc thread visibility fixes # # ChangeSet # 2004/02/18 20:54:59-08:00 akpm@osdl.org # [PATCH] Minor cross-compile issues # # From: Pratik Solanki # # - Fix include path for build.c so that it finds asm/boot.h. # /usr/include/asm/boot.h may not be present when cross-compiling on a # non-Linux machine. # # - $(CONFIG_SHELL) instead of sh. # # init/Makefile # 2004/02/18 19:43:02-08:00 akpm@osdl.org +1 -1 # Minor cross-compile issues # # arch/i386/boot/Makefile # 2004/02/18 19:43:02-08:00 akpm@osdl.org +2 -0 # Minor cross-compile issues # # ChangeSet # 2004/02/18 20:54:50-08:00 akpm@osdl.org # [PATCH] cpufreq_scale() fixes # # From: Dominik Brodowski # # Use do_div on 32-bit archs in cpufreq_scale, and native "/" on 64-bit # archs. # # include/linux/cpufreq.h # 2004/02/18 19:43:01-08:00 akpm@osdl.org +11 -11 # cpufreq_scale() fixes # # ChangeSet # 2004/02/18 20:54:41-08:00 akpm@osdl.org # [PATCH] defer panic for too many items in boot parameter line # # From: Werner Almesberger # # When passing too many unrecognized boot command line options (which become # arguments or environment variables), the 2.6 kernel panics (unlike 2.4, # which just ignores the extra items). Unfortunately, this happens before # the console is initialized, so all you get is a kernel that dies quickly, # for no apparent reason. # # This is particularly irritating if using UML with # init=something wi th a lot of ar gu men t s # # The patch below delays the panic until after console_init. # # (akpm: I mainly added this in because we have other places where the # panic-later-on machinery is needed). # # init/main.c # 2004/02/18 19:43:01-08:00 akpm@osdl.org +14 -4 # defer panic for too many items in boot parameter line # # ChangeSet # 2004/02/18 20:54:32-08:00 akpm@osdl.org # [PATCH] adfs: remove a kernel 2.2 #ifdef # # From: Adrian Bunk # # The patch below removes a kernel 2.2 #ifdef from fs/adfs/adfs.h . # # Note that this #ifdef was only present in the header, the implementation # of adfs_bmap was already removed. # # fs/adfs/adfs.h # 2004/02/18 19:43:00-08:00 akpm@osdl.org +0 -4 # adfs: remove a kernel 2.2 #ifdef # # ChangeSet # 2004/02/18 20:54:23-08:00 akpm@osdl.org # [PATCH] kbuild documentation fix # # From: Ryan Boder # # Explains how to compile external modules in # Documentation/kbuild/modules.txt. # # Documentation/kbuild/modules.txt # 2004/02/18 19:43:00-08:00 akpm@osdl.org +44 -4 # kbuild documentation fix # # ChangeSet # 2004/02/18 20:54:14-08:00 akpm@osdl.org # [PATCH] remove kernel 2.2 #ifdef's from {i,}stallion.h # # From: Adrian Bunk # # The patch below removeskernel 2.2 #ifdef's from {i,}stallion.h . # # include/linux/stallion.h # 2004/02/18 19:42:59-08:00 akpm@osdl.org +0 -5 # remove kernel 2.2 #ifdef's from {i,}stallion.h # # include/linux/istallion.h # 2004/02/18 19:42:59-08:00 akpm@osdl.org +0 -6 # remove kernel 2.2 #ifdef's from {i,}stallion.h # # ChangeSet # 2004/02/18 20:54:05-08:00 akpm@osdl.org # [PATCH] OSS: remove #ifdef's for kernel 2.0 # # From: Adrian Bunk # # The patch below removes two #ifdef's for kernel 2.0 from OSS. # # sound/oss/os.h # 2004/02/18 19:42:59-08:00 akpm@osdl.org +0 -4 # OSS: remove #ifdef's for kernel 2.0 # # sound/oss/msnd.c # 2004/02/18 19:42:59-08:00 akpm@osdl.org +4 -15 # OSS: remove #ifdef's for kernel 2.0 # # ChangeSet # 2004/02/18 20:53:55-08:00 akpm@osdl.org # [PATCH] Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # From: Joe Korty # # Rename bitmap_snprintf() to bitmap_scnprintf() and cpumask_snprintf() to # cpumask_scnprintf(), as these functions now belong to the scnprintf family # of functions. # # lib/bitmap.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +3 -3 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # include/linux/cpumask.h # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # include/linux/bitmap.h # 2004/02/18 19:42:58-08:00 akpm@osdl.org +1 -1 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # drivers/pci/probe.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +1 -1 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # drivers/base/node.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +1 -1 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/x86_64/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/um/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/sparc64/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +1 -1 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/ppc64/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/ppc/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/mips/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/ia64/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/i386/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # arch/alpha/kernel/irq.c # 2004/02/18 19:42:58-08:00 akpm@osdl.org +2 -2 # Rename bitmap_snprintf() and cpumask_snprintf() to *_scnprintf() # # ChangeSet # 2004/02/18 20:53:46-08:00 akpm@osdl.org # [PATCH] MCE fixes and cleanups # # Andi notes that the # # smp_call_function(foo); # foo(); # # in there is incorrect on preemptible kernels. # # Fix that by using on_each_cpu(), which takes care of such things. # # Also, remove the open-coded timer from here. We have # schedule_delayed_work(). # # And remove the `timerset' variable, which doesn't do anything. # # arch/i386/kernel/cpu/mcheck/non-fatal.c # 2004/02/18 19:42:57-08:00 akpm@osdl.org +11 -30 # MCE fixes and cleanups # # ChangeSet # 2004/02/18 20:53:37-08:00 akpm@osdl.org # [PATCH] Fix printk level on non fatal MCEs # # From: Andi Kleen # # For various reasons non fatal Machine Checks can happen on Athlons (e.g. # we have reports that laptops like to trigger them on suspend/resume) # # They are not necessarily fatal and often only minor hardware glitches. # # But what's annoying is that they're KERN_EMERG and pollute your console and # scare the user into writing confused kernel bug reports. # # This patch just replaces the KERN_EMERGs with KERN_INFO for now. Longer # term I think it would be better to log this stuff into a separate log. # # arch/i386/kernel/cpu/mcheck/non-fatal.c # 2004/02/18 19:42:57-08:00 akpm@osdl.org +4 -2 # Fix printk level on non fatal MCEs # # ChangeSet # 2004/02/18 20:53:28-08:00 akpm@osdl.org # [PATCH] 8259 timer ack fix # # From: "Maciej W. Rozycki" # # Fix up the 8259 ack handling for buggy SMM firmware. # # See http://www.ussg.iu.edu/hypermail/linux/kernel/0203.2/0956.html # # Apparently the embedded 8259A-compatible core is not fully functional. # This patch lets the I/O APIC-driven NMI watchdog to function correctly. # Credit to Ross Dickson for discovering this. # # arch/i386/kernel/io_apic.c # 2004/02/18 19:42:56-08:00 akpm@osdl.org +16 -4 # 8259 timer ack fix # # ChangeSet # 2004/02/18 20:53:19-08:00 akpm@osdl.org # [PATCH] dm: drop BIO_SEG_VALID bit # # From: Joe Thornber # # I just noticed that bio_clone copies the BIO_SEG_VALID bit from the original # bio when it was set. When we modify bi_idx or bi_vcnt afterwards the segment # counts are invalid and the bit must be dropped (though it is fairly unlikely # that it has already been set). [Christophe Saout] # # drivers/md/dm.c # 2004/02/18 19:42:56-08:00 akpm@osdl.org +1 -0 # dm: drop BIO_SEG_VALID bit # # ChangeSet # 2004/02/18 20:53:10-08:00 akpm@osdl.org # [PATCH] dm: Remove redundant spin lock in dec_pending() # # From: Joe Thornber # # Remove redundant spin lock in dec_pending() # # drivers/md/dm.c # 2004/02/18 19:42:55-08:00 akpm@osdl.org +1 -7 # dm: Remove redundant spin lock in dec_pending() # # ChangeSet # 2004/02/18 20:53:01-08:00 akpm@osdl.org # [PATCH] dm: Zero size target sanity check # # From: Joe Thornber # # Add sanity check to dm_table_add_target() against zero length targets. # [Christophe Saout] # # drivers/md/dm-table.c # 2004/02/18 19:42:55-08:00 akpm@osdl.org +5 -0 # dm: Zero size target sanity check # # ChangeSet # 2004/02/18 20:52:52-08:00 akpm@osdl.org # [PATCH] dm: Correct GFP flag in dm_table_create() # # From: Joe Thornber # # For some reason dm_table_create() was allocating GFP_NOIO rather than # GFP_KERNEL. # # drivers/md/dm-table.c # 2004/02/18 19:42:54-08:00 akpm@osdl.org +1 -1 # dm: Correct GFP flag in dm_table_create() # # ChangeSet # 2004/02/18 20:52:43-08:00 akpm@osdl.org # [PATCH] dm: Tidy up the error path for alloc_dev() # # From: Joe Thornber # # Tidy up the error path for alloc_dev() # # drivers/md/dm.c # 2004/02/18 19:42:54-08:00 akpm@osdl.org +18 -21 # dm: Tidy up the error path for alloc_dev() # # ChangeSet # 2004/02/18 20:52:34-08:00 akpm@osdl.org # [PATCH] dm: Maintain ordering when deferring bios # # From: Joe Thornber # # Make sure that we maintain ordering when deferring bios. # # drivers/md/dm-bio-list.h # 2004/02/18 19:42:53-08:00 akpm@osdl.org +68 -0 # dm: Maintain ordering when deferring bios # # drivers/md/dm.c # 2004/02/18 19:42:53-08:00 akpm@osdl.org +4 -5 # dm: Maintain ordering when deferring bios # # drivers/md/dm-bio-list.h # 2004/02/18 19:42:53-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/md/dm-bio-list.h # # ChangeSet # 2004/02/18 20:52:25-08:00 akpm@osdl.org # [PATCH] dm: Get rid of struct dm_deferred_io in dm.c # # From: Joe Thornber # # Remove struct dm_deferred_io from dm.c. [Christophe Saout] # # drivers/md/dm.c # 2004/02/18 19:42:53-08:00 akpm@osdl.org +9 -32 # dm: Get rid of struct dm_deferred_io in dm.c # # ChangeSet # 2004/02/18 20:52:16-08:00 akpm@osdl.org # [PATCH] dm: Move to_bytes() and to_sectors() into dm.h # # From: Joe Thornber # # Move to_bytes() and to_sectors() into dm.h # # drivers/md/dm.h # 2004/02/18 19:42:52-08:00 akpm@osdl.org +10 -0 # dm: Move to_bytes() and to_sectors() into dm.h # # drivers/md/dm.c # 2004/02/18 19:42:52-08:00 akpm@osdl.org +0 -9 # dm: Move to_bytes() and to_sectors() into dm.h # # ChangeSet # 2004/02/18 20:52:07-08:00 akpm@osdl.org # [PATCH] dm: Export dm_vcalloc() # # From: Joe Thornber # # Export dm_vcalloc() # # drivers/md/dm.h # 2004/02/18 19:42:52-08:00 akpm@osdl.org +2 -0 # dm: Export dm_vcalloc() # # drivers/md/dm-table.c # 2004/02/18 19:42:52-08:00 akpm@osdl.org +2 -1 # dm: Export dm_vcalloc() # # ChangeSet # 2004/02/18 20:51:58-08:00 akpm@osdl.org # [PATCH] md: Allow partitioning of MD devices. # # From: NeilBrown # # With this patch, md used two major numbers for arrays. # # One Major is number 9 with name 'md' have unpartitioned md arrays, one per # minor number. # # The other Major is allocated dynamically with name 'mdp' and had on array for # every 64 minors, allowing for upto 63 partitions. # # The arrays under one major are completely separate from the arrays under the # other. # # The preferred name for devices with the new major are of the form: # # /dev/md/d1p3 # partion 3 of device 1 - minor 67 # # When a paritioned md device is assembled, the partitions are not recognised # until after the whole-array device is opened again. A future version of # mdadm will perform this open so that the need will be transparent. # # include/linux/raid/md_k.h # 2004/02/18 19:42:51-08:00 akpm@osdl.org +3 -10 # md: Allow partitioning of MD devices. # # drivers/md/raid6main.c # 2004/02/18 19:42:51-08:00 akpm@osdl.org +1 -1 # md: Allow partitioning of MD devices. # # drivers/md/raid5.c # 2004/02/18 19:42:51-08:00 akpm@osdl.org +1 -1 # md: Allow partitioning of MD devices. # # drivers/md/md.c # 2004/02/18 19:42:51-08:00 akpm@osdl.org +75 -30 # md: Allow partitioning of MD devices. # # ChangeSet # 2004/02/18 20:51:49-08:00 akpm@osdl.org # [PATCH] md: Dynamically limit size of bio requests used for raid1 resync # # From: NeilBrown # # Currently raid1 uses PAGE_SIZE read/write requests for resync, as it doesn't # know how to honour per-device restrictions. This patch uses to bio_add_page # to honour those restrictions and ups the limit on request size to 64K. This # has a measurable impact on rebuild speed (25M/s -> 60M/s) # # drivers/md/raid1.c # 2004/02/18 19:42:51-08:00 akpm@osdl.org +96 -87 # md: Dynamically limit size of bio requests used for raid1 resync # # ChangeSet # 2004/02/18 20:51:40-08:00 akpm@osdl.org # [PATCH] md: Avoid unnecessary bio allocation during raid1 resync # # From: NeilBrown # # For each resync request, we allocate a "r1_bio" which has a bio "master_bio" # attached that goes largely unused. We also allocate a read_bio which is # used. This patch removes the read_bio and just uses the master_bio instead. # # This fixes a bug wherein bi_bdev of the master_bio wasn't being set, but was # being used. # # We also introduce a new "sectors" field into the r1_bio as we can no-longer # rely in master_bio->bi_sectors. # # include/linux/raid/raid1.h # 2004/02/18 19:42:50-08:00 akpm@osdl.org +1 -0 # md: Avoid unnecessary bio allocation during raid1 resync # # drivers/md/raid1.c # 2004/02/18 19:42:50-08:00 akpm@osdl.org +18 -19 # md: Avoid unnecessary bio allocation during raid1 resync # # ChangeSet # 2004/02/18 20:51:31-08:00 akpm@osdl.org # [PATCH] md: Remove some un-needed fields from r1bio_s # # From: NeilBrown # # next_r1 is never used, so it can just go. # # read_bio isn't needed as we can easily use one of the pointers in the # write_bios array - write_bios[->read_disk]. So rename "write_bios" to "bios" # and store the pointer to the read bio in there. # # include/linux/raid/raid1.h # 2004/02/18 19:42:50-08:00 akpm@osdl.org +2 -4 # md: Remove some un-needed fields from r1bio_s # # drivers/md/raid1.c # 2004/02/18 19:42:50-08:00 akpm@osdl.org +19 -36 # md: Remove some un-needed fields from r1bio_s # # ChangeSet # 2004/02/18 20:51:22-08:00 akpm@osdl.org # [PATCH] md: Discard the cmd field from r1_bio structure # # From: NeilBrown # # The only time it is really needed is to differentiate a retry-on-fail from a # write-after-read-for-resync request to raid1d. So we use a bit in 'state' # for that. # # include/linux/raid/raid1.h # 2004/02/18 19:42:49-08:00 akpm@osdl.org +2 -3 # md: Discard the cmd field from r1_bio structure # # drivers/md/raid1.c # 2004/02/18 19:42:49-08:00 akpm@osdl.org +19 -24 # md: Discard the cmd field from r1_bio structure # # ChangeSet # 2004/02/18 20:51:13-08:00 akpm@osdl.org # [PATCH] md: Split read and write end_request handlers # # From: NeilBrown # # Instead of having a single end_request handler that must determine whether it # was a read or a write request, we have two separate handlers, which makes # each of them easier to follow. # # drivers/md/raid1.c # 2004/02/18 19:42:49-08:00 akpm@osdl.org +65 -35 # md: Split read and write end_request handlers # # ChangeSet # 2004/02/18 20:51:04-08:00 akpm@osdl.org # [PATCH] md: Print "deprecated" warning when START_ARRAY is used. # # From: NeilBrown # # The "START_ARRAY" ioctl depends on major/minor numbers (as stored in the raid # superblock) are stable over reboots, which is increasingly untrue. # # There are better ways to start an array (e.g. with mdadm) so we mark the # ioctl as deprecated for 2.6, and will remove it in 2.7. # # drivers/md/md.c # 2004/02/18 19:42:48-08:00 akpm@osdl.org +8 -0 # md: Print "deprecated" warning when START_ARRAY is used. # # ChangeSet # 2004/02/18 20:50:55-08:00 akpm@osdl.org # [PATCH] kNFSd:fix build problems in nfs w/o proc_fs on 2.6.0-test5 # # From: NeilBrown # # From: Stephen Hemminger # Date: Fri, 12 Sep 2003 11:31:06 -0700 # # NFS won't build w/o CONFIG_PROC_FS. Looks like typo's (or a C++ # programmer) in stats.h # # include/linux/sunrpc/stats.h # 2004/02/18 19:42:48-08:00 akpm@osdl.org +4 -3 # kNFSd:fix build problems in nfs w/o proc_fs on 2.6.0-test5 # # ChangeSet # 2004/02/18 20:50:46-08:00 akpm@osdl.org # [PATCH] kNFSd: convert NFS /proc interfaces to seq_file # # From: NeilBrown # # From: shemminger@osdl.org Sat Sep 6 09:19:50 2003 # Date: Fri, 5 Sep 2003 16:19:30 -0700 # # Converts /proc/net/rpc/nfs and /proc/net/rpc/nfsd to use the simpler # seq_file interface. # # net/sunrpc/sunrpc_syms.c # 2004/02/18 19:42:47-08:00 akpm@osdl.org +1 -2 # kNFSd: convert NFS /proc interfaces to seq_file # # net/sunrpc/stats.c # 2004/02/18 19:42:47-08:00 akpm@osdl.org +49 -57 # kNFSd: convert NFS /proc interfaces to seq_file # # include/linux/sunrpc/stats.h # 2004/02/18 19:42:47-08:00 akpm@osdl.org +9 -10 # kNFSd: convert NFS /proc interfaces to seq_file # # fs/nfsd/stats.c # 2004/02/18 19:42:47-08:00 akpm@osdl.org +25 -42 # kNFSd: convert NFS /proc interfaces to seq_file # # ChangeSet # 2004/02/18 20:50:37-08:00 akpm@osdl.org # [PATCH] kNFSd: ip_map_init does a kmalloc which isn't checked... # # From: NeilBrown # # There is no way to return an error from a cache init routine, so instead we # make sure to pre-allocate the memory needed, and free it after the lookup # if the lookup failed. # # net/sunrpc/svcauth_unix.c # 2004/02/18 19:42:46-08:00 akpm@osdl.org +10 -3 # kNFSd: ip_map_init does a kmalloc which isn't checked... # # ChangeSet # 2004/02/18 20:50:28-08:00 akpm@osdl.org # [PATCH] kNFSd: Allow sunrpc/svc cache init function to modify the "key" # # From: NeilBrown # # When adding a item to a sunrpc/svc cache that contains kmalloced data it is # usefully to move the malloced data out of the key object into the new cache # object rather than copying (as then we would need to cope with kmalloc # failure and such). This means modifying the original. # # If the kmalloced data forms part of the key, then we must not move the data # out until after the key isn't needed any more. So this patch moves the # call to "INIT" on a new item (which fills in the key) to *after* the item # has been found (or not), and also makes sure we only call the HASH function # once. # # Thanks to "J. Bruce Fields" # # also # # 1/ remove unnecessary assignment # 2/ fix comments that lag behind implementation. # # net/sunrpc/svcauth.c # 2004/02/18 19:42:46-08:00 akpm@osdl.org +7 -1 # kNFSd: Allow sunrpc/svc cache init function to modify the "key" # # include/linux/sunrpc/cache.h # 2004/02/18 19:42:46-08:00 akpm@osdl.org +8 -5 # kNFSd: Allow sunrpc/svc cache init function to modify the "key" # # ChangeSet # 2004/02/18 20:50:19-08:00 akpm@osdl.org # [PATCH] kNFSd: Fix possible scheduling_while_atomic in cache.c # # From: NeilBrown # # We currently call cache_put, which can schedule(), under a spin_lock. This # patch moves that call outside the spinlock. # # net/sunrpc/cache.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +8 -5 # kNFSd: Fix possible scheduling_while_atomic in cache.c # # ChangeSet # 2004/02/18 20:50:10-08:00 akpm@osdl.org # [PATCH] #if versus #ifdef cleanup # # From: Valdis.Kletnieks@vt.edu # # 15 changes of #if to #ifdef and 2 places CONFIG_FOO should be # defined(CONFIG_FOO). This gets rid of spurious warnings if you build with # "-Wundef" so you get a warning if you have a preprocessor command like: # # #if CONFIG_ETRAX_DS1302_RSTBIT == 27 # # and you'll be told if it's substituting a zero rather than silent # weirdness and unexpected code generation. # # net/ipv6/af_inet6.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # lib/crc32.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # include/asm-sh/kmap_types.h # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # include/asm-sh/hardirq.h # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # include/asm-mips/topology.h # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # include/asm-mips/pgtable-32.h # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # include/asm-mips/hardirq.h # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # include/asm-i386/module.h # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # drivers/net/tulip/de4x5.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +2 -2 # #if versus #ifdef cleanup # # drivers/net/depca.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +2 -2 # #if versus #ifdef cleanup # # drivers/mtd/maps/solutionengine.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # drivers/char/mem.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +0 -2 # #if versus #ifdef cleanup # # arch/ia64/sn/kernel/irq.c # 2004/02/18 19:42:45-08:00 akpm@osdl.org +1 -1 # #if versus #ifdef cleanup # # ChangeSet # 2004/02/18 20:50:01-08:00 akpm@osdl.org # [PATCH] MIPS: New 2.6 serial drivers # # From: Ralf Baechle # # Three new MIPS-specific serial drivers. ip22.c is derived from the sparc # zilog driver; guess we should write a generic Zilog driver somewhen ... # # drivers/serial/ip22zilog.h # 2004/02/18 19:42:44-08:00 akpm@osdl.org +281 -0 # MIPS: New 2.6 serial drivers # # drivers/serial/ip22zilog.c # 2004/02/18 19:42:44-08:00 akpm@osdl.org +1307 -0 # MIPS: New 2.6 serial drivers # # drivers/serial/dz.h # 2004/02/18 19:42:44-08:00 akpm@osdl.org +118 -0 # MIPS: New 2.6 serial drivers # # drivers/serial/dz.c # 2004/02/18 19:42:44-08:00 akpm@osdl.org +827 -0 # MIPS: New 2.6 serial drivers # # drivers/serial/au1x00_uart.c # 2004/02/18 19:42:44-08:00 akpm@osdl.org +1393 -0 # MIPS: New 2.6 serial drivers # # drivers/serial/ip22zilog.h # 2004/02/18 19:42:44-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/serial/ip22zilog.h # # drivers/serial/ip22zilog.c # 2004/02/18 19:42:44-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/serial/ip22zilog.c # # drivers/serial/dz.h # 2004/02/18 19:42:44-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/serial/dz.h # # drivers/serial/dz.c # 2004/02/18 19:42:44-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/serial/dz.c # # drivers/serial/au1x00_uart.c # 2004/02/18 19:42:44-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/serial/au1x00_uart.c # # drivers/serial/Makefile # 2004/02/18 19:42:44-08:00 akpm@osdl.org +3 -0 # MIPS: New 2.6 serial drivers # # drivers/serial/Kconfig # 2004/02/18 19:42:44-08:00 akpm@osdl.org +51 -0 # MIPS: New 2.6 serial drivers # # ChangeSet # 2004/02/18 20:49:52-08:00 akpm@osdl.org # [PATCH] Enable coredumps > 2GB # # From: Andi Kleen # # Some x86-64 users were complaining that coredumps >2GB don't work. # # This will enable large coredump for everybody. Apparently the 32bit # gdb/binutils cannot handle them, but I hear the binutils people are working # on fixing that. I doubt it will harm people - unreadable coredumps are not # worse than no coredump and it won't make any difference in space usage if # you get a 1.99GB or a 2.5GB coredump. So just enable it unconditionally. # If it should be really a problem for 32bit the rlimit defaults in # resource.h could be changed. # # For file systems that don't support O_LARGEFILE you should just get an # truncated coredumps for big address spaces. # # fs/exec.c # 2004/02/18 19:42:43-08:00 akpm@osdl.org +1 -1 # Enable coredumps > 2GB # # ChangeSet # 2004/02/18 20:49:43-08:00 akpm@osdl.org # [PATCH] devfs: race fixes and cleanup # # From: Andrey Borzenkov # # - use struct nameidata in devfs_d_revalidate_wait to detect when it is # called without i_sem hold; take i_sem on parent in this case. This # prevents both deadlock with devfs_lookup by allowing it to drop i_sem # consistently and oops in d_instantiate by ensuring that it always runs # protected # # - remove dead code that deals with major number allocation. The only # remaining user was devfs itself and patch changes it to # # - use register_chardev to get device number for internal /dev/.devfsd and # /dev/.statd. # # - remove dead auto allocation flag as well # # - remove code that does module get on dev open - it is handled by fops_get. # Use init_special_inode consistently # # - get rid of struct cdev_type and bdev_type - both have just single dev_t # now # # fs/devfs/util.c # 2004/02/18 19:42:43-08:00 akpm@osdl.org +0 -159 # devfs: race fixes and cleanup # # fs/devfs/base.c # 2004/02/18 19:42:43-08:00 akpm@osdl.org +198 -206 # devfs: race fixes and cleanup # # BitKeeper/deleted/.del-internal.h~68afd32bc49d8c13 # 2004/02/18 20:49:38-08:00 akpm@osdl.org +0 -0 # Delete: fs/devfs/internal.h # # ChangeSet # 2004/02/18 20:49:34-08:00 akpm@osdl.org # [PATCH] snprintf fixes # # From: Juergen Quade # # Lots of places in the kernel are using [v]snprintf wrongly: they assume it # returns the number of characters copied. It doesn't. It returns the # number of characters which _would_ have been copied had the buffer not been # filled up. # # So create new functions vscnprintf() and scnprintf() which have the # expected (sane) semaptics, and migrate callers over to using them. # # sound/core/info.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # security/selinux/selinuxfs.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +3 -3 # snprintf fixes # # net/atm/clip.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # lib/vsprintf.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +74 -13 # snprintf fixes # # lib/bitmap.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # kernel/printk.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # include/linux/kernel.h # 2004/02/18 19:42:41-08:00 akpm@osdl.org +3 -0 # snprintf fixes # # drivers/usb/misc/speedtch.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # drivers/usb/host/ohci-dbg.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +13 -13 # snprintf fixes # # drivers/usb/host/ehci-dbg.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +26 -26 # snprintf fixes # # drivers/usb/gadget/pxa2xx_udc.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +12 -12 # snprintf fixes # # drivers/usb/gadget/net2280.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +16 -16 # snprintf fixes # # drivers/usb/gadget/goku_udc.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +8 -8 # snprintf fixes # # drivers/scsi/scsi_debug.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +9 -10 # snprintf fixes # # drivers/s390/cio/device.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +4 -4 # snprintf fixes # # drivers/s390/char/tape_core.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +7 -7 # snprintf fixes # # drivers/pci/hotplug.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +4 -4 # snprintf fixes # # drivers/parisc/dino.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # drivers/net/wan/comx-hw-munich.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +53 -53 # snprintf fixes # # drivers/media/video/videocodec.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +4 -4 # snprintf fixes # # drivers/md/dm-stripe.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +2 -2 # snprintf fixes # # drivers/cpufreq/proc_intf.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # drivers/cpufreq/cpufreq.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +3 -3 # snprintf fixes # # drivers/char/viocons.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # drivers/char/sn_serial.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # drivers/base/dmapool.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +2 -2 # snprintf fixes # # arch/x86_64/kernel/early_printk.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # arch/sparc64/prom/printf.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # arch/sparc/prom/printf.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +1 -1 # snprintf fixes # # arch/ppc64/kernel/rtas-proc.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +8 -7 # snprintf fixes # # arch/ppc64/kernel/lparcfg.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +34 -34 # snprintf fixes # # arch/i386/kernel/edd.c # 2004/02/18 19:42:41-08:00 akpm@osdl.org +36 -36 # snprintf fixes # # ChangeSet # 2004/02/18 20:49:23-08:00 akpm@osdl.org # [PATCH] bd_set_size i_size handling # # We need to hold i_sem while running i_size_write(). But that seems like a # lot of fuss and deadlock potential. So just write the dang thing. # # fs/block_dev.c # 2004/02/18 19:42:40-08:00 akpm@osdl.org +2 -1 # bd_set_size i_size handling # # ChangeSet # 2004/02/18 20:49:14-08:00 akpm@osdl.org # [PATCH] Mark intermezzo as broken # # The NGROUPS changes broke it, and we're not sure how to fixit, and nobody # appears to be working on or testing intermezzo. # # fs/Kconfig # 2004/02/18 19:42:40-08:00 akpm@osdl.org +4 -1 # Mark intermezzo as broken # # ChangeSet # 2004/02/18 20:49:05-08:00 akpm@osdl.org # [PATCH] NGROUPS 2.6.2rc2 + fixups # # From: Tim Hockin , # Neil Brown , # me # # New groups infrastructure. task->groups and task->ngroups are replaced by # task->group_info. Group)info is a refcounted, dynamic struct with an array # of pages. This allows for large numbers of groups. The current limit of # 32 groups has been raised to 64k groups. It can be raised more by changing # the NGROUPS_MAX constant in limits.h # # security/selinux/hooks.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +1 -1 # NGROUPS 2.6.2rc2 + fixups # # security/dummy.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +1 -1 # NGROUPS 2.6.2rc2 + fixups # # net/sunrpc/svcauth_unix.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +2 -2 # NGROUPS 2.6.2rc2 + fixups # # net/sunrpc/auth_unix.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +4 -4 # NGROUPS 2.6.2rc2 + fixups # # net/sunrpc/auth.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +21 -14 # NGROUPS 2.6.2rc2 + fixups # # kernel/uid16.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +61 -23 # NGROUPS 2.6.2rc2 + fixups # # kernel/sys.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +207 -35 # NGROUPS 2.6.2rc2 + fixups # # kernel/fork.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +3 -0 # NGROUPS 2.6.2rc2 + fixups # # include/linux/sunrpc/svcauth.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +2 -1 # NGROUPS 2.6.2rc2 + fixups # # include/linux/sunrpc/auth.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +1 -2 # NGROUPS 2.6.2rc2 + fixups # # include/linux/security.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +6 -7 # NGROUPS 2.6.2rc2 + fixups # # include/linux/sched.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +28 -2 # NGROUPS 2.6.2rc2 + fixups # # include/linux/nfsd/auth.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +1 -1 # NGROUPS 2.6.2rc2 + fixups # # include/linux/limits.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +1 -1 # NGROUPS 2.6.2rc2 + fixups # # include/linux/init_task.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +3 -0 # NGROUPS 2.6.2rc2 + fixups # # include/asm-x86_64/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-v850/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-um/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-sparc64/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-sparc/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-sh/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-s390/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-ppc64/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-ppc/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-parisc/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-mips/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-m68knommu/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-m68k/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-ia64/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-i386/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-h8300/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-cris/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-arm26/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-arm/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # include/asm-alpha/param.h # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -4 # NGROUPS 2.6.2rc2 + fixups # # fs/proc/array.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +4 -2 # NGROUPS 2.6.2rc2 + fixups # # fs/nfsd/nfs4state.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +1 -1 # NGROUPS 2.6.2rc2 + fixups # # fs/nfsd/auth.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +32 -12 # NGROUPS 2.6.2rc2 + fixups # # arch/sparc64/kernel/sys_sparc32.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +59 -18 # NGROUPS 2.6.2rc2 + fixups # # arch/s390/kernel/compat_linux.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +59 -18 # NGROUPS 2.6.2rc2 + fixups # # arch/mips/kernel/sysirix.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +1 -1 # NGROUPS 2.6.2rc2 + fixups # # arch/ia64/ia32/sys_ia32.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +68 -27 # NGROUPS 2.6.2rc2 + fixups # # ChangeSet # 2004/02/18 20:48:54-08:00 akpm@osdl.org # [PATCH] bonding alias revert and documentation fix # # From: Rusty Russell # # Jeff Garzik disliked the bonding driver knowing it was called "bond0". # Remove that alias, and revert documentation. # # drivers/net/bonding/bond_main.c # 2004/02/18 19:42:38-08:00 akpm@osdl.org +0 -1 # bonding alias revert and documentation fix # # Documentation/networking/bonding.txt # 2004/02/18 19:42:38-08:00 akpm@osdl.org +7 -2 # bonding alias revert and documentation fix # # ChangeSet # 2004/02/18 20:48:45-08:00 akpm@osdl.org # [PATCH] add some more MODULE_ALIASes # # From: Rusty Russell # # New MODULE_ALIASes in: # 1) arch/i386/kernel/microcode.c # 2) drivers/char/genrtc.c # 3) drivers/ide/ide-tape.c # 4) drivers/net/bonding/bond_main.c # 5) drivers/net/bsd_comp.c # 6) drivers/net/ppp_deflate.c # 7) drivers/net/ppp_generic.c # # drivers/net/ppp_generic.c # 2004/02/18 19:42:37-08:00 akpm@osdl.org +1 -0 # add some more MODULE_ALIASes # # drivers/net/ppp_deflate.c # 2004/02/18 19:42:37-08:00 akpm@osdl.org +2 -0 # add some more MODULE_ALIASes # # drivers/net/bsd_comp.c # 2004/02/18 19:42:37-08:00 akpm@osdl.org +1 -0 # add some more MODULE_ALIASes # # drivers/net/bonding/bond_main.c # 2004/02/18 19:42:37-08:00 akpm@osdl.org +1 -0 # add some more MODULE_ALIASes # # drivers/ide/ide-tape.c # 2004/02/18 19:42:37-08:00 akpm@osdl.org +1 -0 # add some more MODULE_ALIASes # # drivers/char/genrtc.c # 2004/02/18 19:42:37-08:00 akpm@osdl.org +1 -1 # add some more MODULE_ALIASes # # arch/i386/kernel/microcode.c # 2004/02/18 19:42:37-08:00 akpm@osdl.org +1 -0 # add some more MODULE_ALIASes # # ChangeSet # 2004/02/18 20:48:35-08:00 akpm@osdl.org # [PATCH] Documentation: remove /etc/modules.conf refs # # From: Rusty Russell # # Someone complained about the number of references to /etc/modules.conf in # the documentation. While fixing them up (and examples where changed), # removed those which are redundant due to MODULE_ALIAS. # # sound/core/seq/seq_dummy.c # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # net/Kconfig # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -10 # Documentation: remove /etc/modules.conf refs # # drivers/scsi/scsi.c # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # drivers/scsi/qla2xxx/qla_os.c # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # drivers/scsi/aic7xxx/aic7xxx_osm.c # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # drivers/scsi/aic7xxx/aic79xx_osm.c # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # drivers/net/wan/Kconfig # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -1 # Documentation: remove /etc/modules.conf refs # # drivers/media/dvb/Kconfig # 2004/02/18 19:42:35-08:00 akpm@osdl.org +3 -2 # Documentation: remove /etc/modules.conf refs # # drivers/char/isicom.c # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # drivers/char/ip2/ip2.h # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # drivers/char/Kconfig # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/video4linux/meye.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/video4linux/bttv/README # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/video4linux/bttv/Modules.conf # 2004/02/18 19:42:35-08:00 akpm@osdl.org +3 -0 # Documentation: remove /etc/modules.conf refs # # Documentation/video4linux/bttv/Modprobe.conf # 2004/02/18 19:42:35-08:00 akpm@osdl.org +11 -0 # Documentation: remove /etc/modules.conf refs # # Documentation/video4linux/Zoran # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/video4linux/CQcam.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/usb/scanner.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/Wavefront # 2004/02/18 19:42:35-08:00 akpm@osdl.org +3 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/README.modules # 2004/02/18 19:42:35-08:00 akpm@osdl.org +8 -8 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/PAS16 # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/Opti # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/OPL3-SA2 # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/Maestro3 # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/MAD16 # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -3 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/Introduction # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/CMI8330 # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/AudioExcelDSP16 # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/sound/oss/AWE32 # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/sonypi.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/scsi/osst.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/scsi/aic7xxx.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/scsi/aic79xx.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/s390/3270.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/rocket.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/parport.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/networking/vortex.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +5 -5 # Documentation: remove /etc/modules.conf refs # # Documentation/networking/tuntap.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +3 -6 # Documentation: remove /etc/modules.conf refs # # Documentation/networking/sk98lin.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/networking/ltpc.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/networking/dl2k.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +5 -5 # Documentation: remove /etc/modules.conf refs # # Documentation/networking/bonding.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +7 -15 # Documentation: remove /etc/modules.conf refs # # Documentation/networking/baycom.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/ide.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +2 -3 # Documentation: remove /etc/modules.conf refs # # Documentation/hayes-esp.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # arch/m68k/Kconfig # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -2 # Documentation: remove /etc/modules.conf refs # # arch/i386/Kconfig # 2004/02/18 19:42:35-08:00 akpm@osdl.org +0 -2 # Documentation: remove /etc/modules.conf refs # # Documentation/video4linux/bttv/Modprobe.conf # 2004/02/18 19:42:35-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/Documentation/video4linux/bttv/Modprobe.conf # # Documentation/ftape.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/fb/intel810.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/digiboard.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +4 -4 # Documentation: remove /etc/modules.conf refs # # Documentation/crypto/api-intro.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +1 -1 # Documentation: remove /etc/modules.conf refs # # Documentation/computone.txt # 2004/02/18 19:42:35-08:00 akpm@osdl.org +6 -6 # Documentation: remove /etc/modules.conf refs # # Documentation/Changes # 2004/02/18 19:42:35-08:00 akpm@osdl.org +0 -18 # Documentation: remove /etc/modules.conf refs # # ChangeSet # 2004/02/18 20:48:24-08:00 akpm@osdl.org # [PATCH] AMD Elan is a different subarch # # From: Adrian Bunk # # - AMD Elan is a different subarch, you can't configure a kernel that runs # on both the AMD Elan and other i386 CPUs # # - added optimizing CFLAGS for the AMD Elan # # include/asm-i386/timex.h # 2004/02/18 19:42:34-08:00 akpm@osdl.org +1 -1 # AMD Elan is a different subarch # # arch/i386/kernel/cpu/cpufreq/Kconfig # 2004/02/18 19:42:34-08:00 akpm@osdl.org +1 -1 # AMD Elan is a different subarch # # arch/i386/boot/setup.S # 2004/02/18 19:42:34-08:00 akpm@osdl.org +1 -1 # AMD Elan is a different subarch # # arch/i386/Makefile # 2004/02/18 19:42:34-08:00 akpm@osdl.org +3 -0 # AMD Elan is a different subarch # # arch/i386/Kconfig # 2004/02/18 19:42:34-08:00 akpm@osdl.org +15 -2 # AMD Elan is a different subarch # # ChangeSet # 2004/02/18 20:48:15-08:00 akpm@osdl.org # [PATCH] gcc 2.95 supports -march=k6 (no need for check_gcc) # # From: Adrian Bunk # # gcc 2.95 supports -march=k6 (no need for check_gcc) # # arch/i386/Makefile # 2004/02/18 19:42:33-08:00 akpm@osdl.org +1 -1 # gcc 2.95 supports -march=k6 (no need for check_gcc) # # ChangeSet # 2004/02/18 20:48:05-08:00 akpm@osdl.org # [PATCH] add Pentium M and Pentium-4 M options # # From: Adrian Bunk # # add Pentium M and Pentium-4 M options: # # - add MPENTIUMM (equivalent to PENTIUMIII except for a bigger # X86_L1_CACHE_SHIFT) # # - document that MPENTIUM4 is the right choice for a Pentium-4 M # # include/asm-i386/module.h # 2004/02/18 19:42:33-08:00 akpm@osdl.org +2 -0 # add Pentium M and Pentium-4 M options # # arch/i386/Makefile # 2004/02/18 19:42:33-08:00 akpm@osdl.org +1 -0 # add Pentium M and Pentium-4 M options # # arch/i386/Kconfig # 2004/02/18 19:42:33-08:00 akpm@osdl.org +17 -11 # add Pentium M and Pentium-4 M options # # ChangeSet # 2004/02/18 20:47:56-08:00 akpm@osdl.org # [PATCH] Limit hashtable sizes # # From: "Chen, Kenneth W" # # The issue of exceedingly large hash tables has been discussed on the # mailing list a while back, but seems to slip through the cracks. # # What we found is it's not a problem for x86 (and most other # architectures) because __get_free_pages won't be able to get anything # beyond order MAX_ORDER-1 (10) which means at most those hash tables are # 4MB each (assume 4K page size). However, on ia64, in order to support # larger hugeTLB page size, the MAX_ORDER is bumped up to 18, which now # means a 2GB upper limits enforced by the page allocator (assume 16K page # size). PPC64 is another example that bumps up MAX_ORDER. # # Last time I checked, the tcp ehash table is taking a whooping (insane!) # 2GB on one of our large machine. dentry and inode hash tables also take # considerable amount of memory. # # Setting the size of these tables is difficult: they need to be constrained on # many-zone ia64 machines, but this could cause significant performance # problems when there are (for example) 100 million dentries in cache. # Large-memory machines which do not slice that memory up into huge numbers of # zones do not need to run the risk of this slowdown. # # So the sizing algorithms remain essentially unchanged, and boot-time options # are provided which permit the tables to be scaled down. # # net/ipv4/tcp.c # 2004/02/18 19:42:32-08:00 akpm@osdl.org +14 -0 # Limit hashtable sizes # # net/ipv4/route.c # 2004/02/18 19:42:32-08:00 akpm@osdl.org +14 -1 # Limit hashtable sizes # # fs/inode.c # 2004/02/18 19:42:32-08:00 akpm@osdl.org +17 -3 # Limit hashtable sizes # # fs/dcache.c # 2004/02/18 19:42:32-08:00 akpm@osdl.org +17 -5 # Limit hashtable sizes # # Documentation/kernel-parameters.txt # 2004/02/18 19:42:32-08:00 akpm@osdl.org +12 -0 # Limit hashtable sizes # # ChangeSet # 2004/02/18 20:47:47-08:00 akpm@osdl.org # [PATCH] Use CPU_UP_PREPARE properly # # From: Rusty Russell # # The cpu hotplug code actually provides two notifiers: CPU_UP_PREPARE # which preceeds the online and can fail, and CPU_ONLINE which can't. # # Current usage is only done at boot, so this distinction doesn't # matter, but it's a bad example to set. This also means that the # migration threads do not have to be higher priority than the # others, since they are ready to go before any CPU_ONLINE callbacks # are done. # # This patch is experimental but fairly straight foward: I haven't been # able to test it since extracting it from the hotplug cpu code, so it's # possible I screwed something up. # # kernel/softirq.c # 2004/02/18 19:42:32-08:00 akpm@osdl.org +12 -3 # Use CPU_UP_PREPARE properly # # kernel/sched.c # 2004/02/18 19:42:32-08:00 akpm@osdl.org +16 -10 # Use CPU_UP_PREPARE properly # # ChangeSet # 2004/02/18 20:47:38-08:00 akpm@osdl.org # [PATCH] Remove More Unneccessary CPU Notifiers # # From: Rusty Russell # # Three more removed CPU notifiers extracted from the hotplug CPU patch. # # kernel/softirq.c: the tasklet cpu prepration callback is useless: # the vectors are already initialized to NULL. Even with the hotplug # CPU patches, they're of little or no use. # # fs/buffer.c: once again, they are already initialized to zero. # # mm/page_alloc.c: once again, already initialized to zero. # # mm/page_alloc.c # 2004/02/18 19:42:31-08:00 akpm@osdl.org +0 -25 # Remove More Unneccessary CPU Notifiers # # kernel/softirq.c # 2004/02/18 19:42:31-08:00 akpm@osdl.org +0 -28 # Remove More Unneccessary CPU Notifiers # # fs/buffer.c # 2004/02/18 19:42:31-08:00 akpm@osdl.org +0 -30 # Remove More Unneccessary CPU Notifiers # # ChangeSet # 2004/02/18 20:47:29-08:00 akpm@osdl.org # [PATCH] Minor workqueue.c cleanup # # From: Rusty Russell # # Move duplicated code to __queue_work(), and don't set the CPU for # queue_delayed_work() until the timer goes off. The second one only has an # effect on CONFIG_HOTPLUG_CPU where the CPU goes down and the timer goes off # on a different CPU than it was scheduled on. # # kernel/workqueue.c # 2004/02/18 19:42:30-08:00 akpm@osdl.org +20 -24 # Minor workqueue.c cleanup # # ChangeSet # 2004/02/18 20:47:20-08:00 akpm@osdl.org # [PATCH] Remove kstat cpu notifiers # # From: Rusty Russell # # Some well-meaning person put a notifier in for CPUs to update the kstat # structures in sched.c. However, it does nothing, and even with the full # hotplug CPU patch, it still does nothing. # # Simple counters very rarely need anything done when CPUs come up or go # down. If you have per-cpu caches, or per-cpu threads, you need to do # something. But very rarely for stats. # # kernel/sched.c # 2004/02/18 19:42:30-08:00 akpm@osdl.org +0 -34 # Remove kstat cpu notifiers # # ChangeSet # 2004/02/18 20:47:11-08:00 akpm@osdl.org # [PATCH] kthread primitive # # From: Rusty Russell # # These two patches provide the framework for stopping kernel threads to # allow hotplug CPU. This one just adds kthread.c and kthread.h, next # one uses it. # # Most importantly, adds a Monty Python quote to the kernel. # # Details: # # The hotplug CPU code introduces two major problems: # # 1) Threads which previously never stopped (migration thread, # ksoftirqd, keventd) have to be stopped cleanly as CPUs go offline. # 2) Threads which previously never had to be created now have # to be created when a CPU goes online. # # Unfortunately, stopping a thread is fairly baroque, involving memory # barriers, a completion and spinning until the task is actually dead # (for example, complete_and_exit() must be used if inside a module). # # There are also three problems in starting a thread: # 1) Doing it from a random process context risks environment contamination: # better to do it from keventd to guarantee a clean environment, a-la # call_usermodehelper. # 2) Getting the task struct without races is a hard: see kernel/sched.c # migration_call(), kernel/workqueue.c create_workqueue_thread(). # 3) There are races in starting a thread for a CPU which is not yet # online: migration thread does a complex dance at the moment for # a similar reason (there may be no migration thread to migrate us). # # Place all this logic in some primitives to make life easier: # kthread_create() and kthread_stop(). These primitives require no # extra data-structures in the caller: they operate on normal "struct # task_struct"s. # # Other changes: # # - Expose keventd_up(), as keventd and migration threads will use kthread to # launch, and kthread normally uses workqueues and must recognize this case. # # - Kthreads created at boot before "keventd" are spawned directly. However, # this means that they don't have all signals blocked, and hence can be # killed. The simplest solution is to always explicitly block all signals in # the kthread. # # - Change over the migration threads, the workqueue threads and the # ksoftirqd threads to use kthread. # # - module.c currently spawns threads directly to stop the machine, so a # module can be atomically tested for removal. # # - Unfortunately, this means that the current task is manipulated (which # races with set_cpus_allowed, for example), and it can't set its priority # artificially high. Using a kernel thread can solve this cleanly, and with # kthread_run, it's simple. # # - kthreads use keventd, so they inherit its cpus_allowed mask. Unset it. # All current users set it explicity anyway, but it's nice to fix. # # - call_usermode_helper uses keventd, so the process created inherits its # cpus_allowed mask. Unset it. # # - Prevent errors in boot when cpus_possible() contains a cpu which is not # online (ie. a cpu didn't come up). This doesn't happen on x86, since a # boot failure makes that CPU no longer possible (hacky, but it works). # # - When the cpu fails to come up, some callbacks do kthread_stop(), which # doesn't work without keventd (which hasn't started yet). Call it directly, # and take care that it restores signal state (note: do_sigaction does a # flush on blocked signals, so we don't need to repeat it). # # kernel/kthread.c # 2004/02/18 19:42:29-08:00 akpm@osdl.org +163 -0 # kthread primitive # # include/linux/kthread.h # 2004/02/18 19:42:29-08:00 akpm@osdl.org +81 -0 # kthread primitive # # kernel/workqueue.c # 2004/02/18 19:42:29-08:00 akpm@osdl.org +26 -39 # kthread primitive # # kernel/softirq.c # 2004/02/18 19:42:29-08:00 akpm@osdl.org +10 -12 # kthread primitive # # kernel/sched.c # 2004/02/18 19:42:29-08:00 akpm@osdl.org +18 -42 # kthread primitive # # kernel/module.c # 2004/02/18 19:42:29-08:00 akpm@osdl.org +88 -71 # kthread primitive # # kernel/kthread.c # 2004/02/18 19:42:29-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/kernel/kthread.c # # kernel/kmod.c # 2004/02/18 19:42:29-08:00 akpm@osdl.org +4 -0 # kthread primitive # # kernel/Makefile # 2004/02/18 19:42:29-08:00 akpm@osdl.org +2 -1 # kthread primitive # # include/linux/workqueue.h # 2004/02/18 19:42:29-08:00 akpm@osdl.org +1 -0 # kthread primitive # # include/linux/sched.h # 2004/02/18 19:42:29-08:00 akpm@osdl.org +2 -0 # kthread primitive # # include/linux/kthread.h # 2004/02/18 19:42:29-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/include/linux/kthread.h # # ChangeSet # 2004/02/18 20:47:01-08:00 akpm@osdl.org # [PATCH] ACPI PM timer # # From: Dominik Brodowski , # John Stultz , # Dmitry Torokhov # # Add the ACPI Powermanagement Timer as x86 kernel timing source. Unlike the # Time Stamp Counter, it is a reliable timing source which does not get # affected by aggressive powermanagement features like CPU frequency scaling. # # Some ideas and some code are based on Arjan van de Ven's implementation for # 2.4, and on R. Byron Moore's drivers/acpi/hardware/hwtimer.c. # # # We also replace the loop based delay_pmtmr with a TSC based delay_pmtmr, # which resolves a number of issues caused by the loop based delay. Unsynced # TSCs as well frequency changing TSCs will effect the length of __delay(), but # it seems this method works best. # # arch/i386/kernel/timers/timer_pm.c # 2004/02/18 19:42:28-08:00 akpm@osdl.org +217 -0 # ACPI PM timer # # include/asm-i386/timer.h # 2004/02/18 19:42:28-08:00 akpm@osdl.org +4 -0 # ACPI PM timer # # drivers/acpi/Kconfig # 2004/02/18 19:42:28-08:00 akpm@osdl.org +18 -0 # ACPI PM timer # # arch/i386/kernel/timers/timer_pm.c # 2004/02/18 19:42:28-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/arch/i386/kernel/timers/timer_pm.c # # arch/i386/kernel/timers/timer_cyclone.c # 2004/02/18 19:42:28-08:00 akpm@osdl.org +1 -20 # ACPI PM timer # # arch/i386/kernel/timers/timer.c # 2004/02/18 19:42:28-08:00 akpm@osdl.org +3 -0 # ACPI PM timer # # arch/i386/kernel/timers/common.c # 2004/02/18 19:42:28-08:00 akpm@osdl.org +20 -0 # ACPI PM timer # # arch/i386/kernel/timers/Makefile # 2004/02/18 19:42:28-08:00 akpm@osdl.org +1 -0 # ACPI PM timer # # arch/i386/kernel/acpi/boot.c # 2004/02/18 19:42:28-08:00 akpm@osdl.org +35 -0 # ACPI PM timer # # Documentation/kernel-parameters.txt # 2004/02/18 19:42:28-08:00 akpm@osdl.org +1 -1 # ACPI PM timer # # ChangeSet # 2004/02/18 20:46:52-08:00 akpm@osdl.org # [PATCH] loop: remove redundant initialisation # # From: "Yury V. Umanets" # # This removes a redundant assignment in loop. # # drivers/block/loop.c # 2004/02/18 19:42:28-08:00 akpm@osdl.org +0 -1 # loop: remove redundant initialisation # # ChangeSet # 2004/02/18 20:46:43-08:00 akpm@osdl.org # [PATCH] loop.c doesn't fail init gracefully # # From: BlaisorBlade # # loop_init doesn't fail gracefully for two reasons: # # 1) If initialization of loop driver fails, we have an call to # devfs_add("loop") without any devfs_remove; I add that. # # 2) On lwn.net 2.6 kernel docs, Jonathan Corbet says: "If you are calling # add_disk() in your driver initialization routine, you should not fail # the initialization process after the first call." # # So I make loop.c conform to this request by moving add_disk after all # memory allocations. # # drivers/block/loop.c # 2004/02/18 19:42:27-08:00 akpm@osdl.org +5 -1 # loop.c doesn't fail init gracefully # # ChangeSet # 2004/02/18 20:46:34-08:00 akpm@osdl.org # [PATCH] loop: BIO handling fix # # From: Ben Slusky # # One more patch --- this fixes a minor bio handling bug in the filebacked # code path. I'd fixed it incidentally in the loop-recycle patch. # # I don't think you could actually see damage from this bug unless you # run device mapper on top of loop devices, but still this is the correct # behavior. # # drivers/block/loop.c # 2004/02/18 19:42:27-08:00 akpm@osdl.org +6 -10 # loop: BIO handling fix # # ChangeSet # 2004/02/18 20:46:25-08:00 akpm@osdl.org # [PATCH] remove useless highmem bounce from loop/cryptoloop # # From: Ben Slusky # # The attached patch changes the loop device transfer functions (including # cryptoloop transfers) to accept page/offset pairs instead of virtual # addresses, and removes the redundant kmaps in do_lo_send, do_lo_receive, # and loop_transfer_bio. Per Andrew Morton's request a while back. # # include/linux/loop.h # 2004/02/18 19:42:26-08:00 akpm@osdl.org +7 -4 # remove useless highmem bounce from loop/cryptoloop # # drivers/block/loop.c # 2004/02/18 19:42:26-08:00 akpm@osdl.org +50 -35 # remove useless highmem bounce from loop/cryptoloop # # drivers/block/cryptoloop.c # 2004/02/18 19:42:26-08:00 akpm@osdl.org +48 -32 # remove useless highmem bounce from loop/cryptoloop # # ChangeSet # 2004/02/18 20:46:16-08:00 akpm@osdl.org # [PATCH] loop: remove the bio remapping capability # # This patch removes the loop feature wherein we remap BIOs for block-backed # loop. So file-backed and block-backed loop are handled identically. # # It cleans up the code a lot and fixes the low-on-memory lockups which # block-backed loop currently suffers. # # What we lose is the journalling ordering guarantees which # exts-on-loop-on-blockdev had. But dm-crypt provides that. # # include/linux/loop.h # 2004/02/18 19:42:26-08:00 akpm@osdl.org +1 -2 # loop: remove the bio remapping capability # # drivers/block/loop.c # 2004/02/18 19:42:26-08:00 akpm@osdl.org +8 -201 # loop: remove the bio remapping capability # # ChangeSet # 2004/02/18 20:46:08-08:00 akpm@osdl.org # [PATCH] ppc64: iseries IRQ fix # # From: Stephen Rothwell # # This patch lets 2.6.3-rc4 build and boot on an PPC64 iSeries box (at least # for my configuration). The veth.o bit in the networking Makefile got there # by accident and should be removed anyway ... # # There is more to make it work properly (note the "Temporary hack"), but # this gets us closer. # # drivers/net/Makefile # 2004/02/18 19:42:25-08:00 akpm@osdl.org +0 -1 # ppc64: iseries IRQ fix # # arch/ppc64/kernel/iSeries_setup.c # 2004/02/18 19:42:25-08:00 akpm@osdl.org +0 -1 # ppc64: iseries IRQ fix # # arch/ppc64/kernel/iSeries_pci.c # 2004/02/18 19:42:25-08:00 akpm@osdl.org +0 -1 # ppc64: iseries IRQ fix # # arch/ppc64/kernel/iSeries_irq.c # 2004/02/18 19:42:25-08:00 akpm@osdl.org +6 -16 # ppc64: iseries IRQ fix # # ChangeSet # 2004/02/18 20:45:59-08:00 akpm@osdl.org # [PATCH] ppc64: fix debugger() warnings # # From: Anton Blanchard # # Fix compile warnings and add some type safety to debugger macros. # # include/asm-ppc64/system.h # 2004/02/18 19:42:25-08:00 akpm@osdl.org +6 -6 # ppc64: fix debugger() warnings # # ChangeSet # 2004/02/18 20:45:50-08:00 akpm@osdl.org # [PATCH] ppc64: fix saved_command_line/cmd_line lengths # # From: Anton Blanchard # # cmd_line was twice the size of saved_command_line but we did a strcpy from # the larger into the smaller. Create COMMAND_LINE_SIZE and use it. # # include/asm-ppc64/machdep.h # 2004/02/18 19:42:24-08:00 akpm@osdl.org +2 -1 # ppc64: fix saved_command_line/cmd_line lengths # # include/asm-ppc/machdep.h # 2004/02/18 19:42:24-08:00 akpm@osdl.org +2 -1 # ppc64: fix saved_command_line/cmd_line lengths # # arch/ppc64/kernel/setup.c # 2004/02/18 19:42:24-08:00 akpm@osdl.org +3 -3 # ppc64: fix saved_command_line/cmd_line lengths # # arch/ppc/kernel/setup.c # 2004/02/18 19:42:24-08:00 akpm@osdl.org +4 -4 # ppc64: fix saved_command_line/cmd_line lengths # # ChangeSet # 2004/02/18 20:45:41-08:00 akpm@osdl.org # [PATCH] ppc64: Fix prom.c warnings # # arch/ppc64/kernel/prom.c:200: warning: missing braces around initializer # arch/ppc64/kernel/prom.c:200: warning: (near initialization for `hmt_thread_data[0]') # arch/ppc64/kernel/prom.c: In function `prom_hold_cpus': # arch/ppc64/kernel/prom.c:1090: warning: implicit declaration of function `_get_PIR' # # arch/ppc64/kernel/prom.c # 2004/02/18 19:42:24-08:00 akpm@osdl.org +2 -1 # ppc64: Fix prom.c warnings # # ChangeSet # 2004/02/18 20:45:32-08:00 akpm@osdl.org # [PATCH] msg.h needs list.h # # msg.h uses list_head. (I'm not sure what config actually required this, but # it is legit). # # include/linux/msg.h # 2004/02/18 19:42:23-08:00 akpm@osdl.org +1 -0 # msg.h needs list.h # # ChangeSet # 2004/02/18 20:45:23-08:00 akpm@osdl.org # [PATCH] Remove BDEV_RAW and friends # # These no longer do anything. # # This patch changes modules API. It was acked by Arjan@RH and Hubert@Suse. # # kernel/power/swsusp.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +2 -2 # Remove BDEV_RAW and friends # # kernel/power/pmdisk.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +2 -2 # Remove BDEV_RAW and friends # # include/linux/fs.h # 2004/02/18 19:42:22-08:00 akpm@osdl.org +5 -6 # Remove BDEV_RAW and friends # # fs/xfs/linux/xfs_super.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +2 -2 # Remove BDEV_RAW and friends # # fs/super.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +3 -3 # Remove BDEV_RAW and friends # # fs/reiserfs/journal.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +2 -2 # Remove BDEV_RAW and friends # # fs/partitions/check.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +2 -2 # Remove BDEV_RAW and friends # # fs/jfs/jfs_logmgr.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +3 -4 # Remove BDEV_RAW and friends # # fs/ext3/super.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +3 -3 # Remove BDEV_RAW and friends # # fs/block_dev.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +15 -18 # Remove BDEV_RAW and friends # # drivers/s390/block/dasd_genhd.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +2 -2 # Remove BDEV_RAW and friends # # drivers/mtd/devices/blkmtd.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +5 -5 # Remove BDEV_RAW and friends # # drivers/md/md.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +3 -3 # Remove BDEV_RAW and friends # # drivers/md/dm-table.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +3 -3 # Remove BDEV_RAW and friends # # drivers/char/raw.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +3 -3 # Remove BDEV_RAW and friends # # drivers/block/rd.c # 2004/02/18 19:42:22-08:00 akpm@osdl.org +1 -1 # Remove BDEV_RAW and friends # # ChangeSet # 2004/02/18 20:45:13-08:00 akpm@osdl.org # [PATCH] early printk tweaks # # - Use __pa() around the VGA base address: more friendly for the 4g/4g split. # # - Use cpu_relax() rather than open-coding rep_nop(). # # - Default to 9600 baud # # - Move documentation to Documentation/kernel-parameters.txt # # - Make CONFIG_EARLY_PRINTK disableable if CONFIG_EMBEDDED # # arch/x86_64/kernel/head64.c # 2004/02/18 19:42:21-08:00 akpm@osdl.org +2 -2 # early printk tweaks # # arch/x86_64/kernel/early_printk.c # 2004/02/18 19:42:21-08:00 akpm@osdl.org +30 -30 # early printk tweaks # # arch/x86_64/Kconfig # 2004/02/18 19:42:21-08:00 akpm@osdl.org +8 -6 # early printk tweaks # # arch/i386/kernel/setup.c # 2004/02/18 19:42:21-08:00 akpm@osdl.org +2 -1 # early printk tweaks # # arch/i386/Kconfig # 2004/02/18 19:42:21-08:00 akpm@osdl.org +11 -1 # early printk tweaks # # Documentation/kernel-parameters.txt # 2004/02/18 19:42:21-08:00 akpm@osdl.org +2 -2 # early printk tweaks # # ChangeSet # 2004/02/18 20:45:04-08:00 akpm@osdl.org # [PATCH] ia32 early printk # # From: Andi Kleen # # Implement VGA and serial early printk on x86. We just include the x86_64 # version. # # arch/i386/kernel/early_printk.c # 2004/02/18 19:42:21-08:00 akpm@osdl.org +2 -0 # ia32 early printk # # arch/x86_64/kernel/early_printk.c # 2004/02/18 19:42:21-08:00 akpm@osdl.org +4 -0 # ia32 early printk # # arch/i386/kernel/setup.c # 2004/02/18 19:42:21-08:00 akpm@osdl.org +12 -0 # ia32 early printk # # arch/i386/kernel/early_printk.c # 2004/02/18 19:42:21-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/arch/i386/kernel/early_printk.c # # arch/i386/kernel/Makefile # 2004/02/18 19:42:21-08:00 akpm@osdl.org +1 -0 # ia32 early printk # # arch/i386/Kconfig # 2004/02/18 19:42:21-08:00 akpm@osdl.org +3 -0 # ia32 early printk # # Documentation/kernel-parameters.txt # 2004/02/18 19:42:21-08:00 akpm@osdl.org +17 -0 # ia32 early printk # # ChangeSet # 2004/02/18 20:44:55-08:00 akpm@osdl.org # [PATCH] Fix for PPP activ/passiv filter # # From: Karsten Keil # # I found a bug in the PPPIOCSPASS PPPIOCSACTIVE IOCTL implementation in # kernel 2.5/2.6. # # The current pppd code use a empty filter (uprog.len=0) to detach the filter # in the kernel, but this code was removed in 2.5.71 while fixing a compiler # warning. # # Here the new patch, also with better limit checking. # # The second patch check for flen == 0 in the filter check too, since later # in this code a filter[flen - 1] access is done, which is not so funny with # flen 0. Maybe it's not really needed anymore, since with the first patch # it would not longer called with flen=0. # # paulus says: # # It looks correct. Previously we had (and in 2.4 we still have) # # if (uprog.len > 0 && uprog.len < 65536) { # ... # # which gave warnings since uprog.len is unsigned short. So someone # decided that both parts of the condition were redundant. # # net/core/filter.c # 2004/02/18 19:42:20-08:00 akpm@osdl.org +1 -1 # Fix for PPP activ/passiv filter # # drivers/net/ppp_generic.c # 2004/02/18 19:42:20-08:00 akpm@osdl.org +18 -13 # Fix for PPP activ/passiv filter # # ChangeSet # 2004/02/18 20:44:45-08:00 akpm@osdl.org # [PATCH] i4l: hisax deadlock fix # # From: Karsten Keil # # This patch fix a deadlock in HiSax (reported from David Woodhouse # ). upper layer was called back while holding the card # lock fix is to move the wakeup call into BH handler to avoid direct # callbacks. # # drivers/isdn/hisax/w6692.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +10 -5 # i4l: hisax deadlock fix # # drivers/isdn/hisax/netjet.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +10 -5 # i4l: hisax deadlock fix # # drivers/isdn/hisax/jade_irq.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +9 -4 # i4l: hisax deadlock fix # # drivers/isdn/hisax/isdnl2.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +4 -4 # i4l: hisax deadlock fix # # drivers/isdn/hisax/isdnl1.h # 2004/02/18 19:42:19-08:00 akpm@osdl.org +4 -3 # i4l: hisax deadlock fix # # drivers/isdn/hisax/isdnl1.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +19 -2 # i4l: hisax deadlock fix # # drivers/isdn/hisax/isar.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +9 -4 # i4l: hisax deadlock fix # # drivers/isdn/hisax/ipacx.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +27 -24 # i4l: hisax deadlock fix # # drivers/isdn/hisax/hscx_irq.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +9 -4 # i4l: hisax deadlock fix # # drivers/isdn/hisax/hisax.h # 2004/02/18 19:42:19-08:00 akpm@osdl.org +7 -3 # i4l: hisax deadlock fix # # drivers/isdn/hisax/hfc_sx.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +10 -5 # i4l: hisax deadlock fix # # drivers/isdn/hisax/hfc_pci.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +20 -10 # i4l: hisax deadlock fix # # drivers/isdn/hisax/hfc_2bs0.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +9 -3 # i4l: hisax deadlock fix # # drivers/isdn/hisax/hfc_2bds0.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +9 -4 # i4l: hisax deadlock fix # # drivers/isdn/hisax/elsa_ser.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +9 -5 # i4l: hisax deadlock fix # # drivers/isdn/hisax/diva.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +10 -5 # i4l: hisax deadlock fix # # drivers/isdn/hisax/config.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +8 -3 # i4l: hisax deadlock fix # # drivers/isdn/hisax/callc.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +8 -8 # i4l: hisax deadlock fix # # drivers/isdn/hisax/avm_pci.c # 2004/02/18 19:42:19-08:00 akpm@osdl.org +10 -5 # i4l: hisax deadlock fix # # ChangeSet # 2004/02/18 20:44:35-08:00 akpm@osdl.org # [PATCH] ISDN udpate # # From: Karsten Keil # # - new port of 2.4 I4L core to 2.6 # # - new port of 2.4 I4L HiSax to 2.6 # # - fixes for I4L CAPI subsystem to make it stable in 2.6 # # - fix parameter handling of AVM ISA cards (calle) # # - cleanup ISDN config variables # # - SMP in act2000 and pcbit driver # # - remove check_region in act2000 # # - mark hysdn, isdnloop and divert as BROKEN_ON_SMP # # include/linux/isdnif.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +23 -1 # ISDN udpate # # include/linux/isdn_ppp.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +166 -50 # ISDN udpate # # include/linux/isdn/capilli.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +17 -1 # ISDN udpate # # include/linux/isdn.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +300 -68 # ISDN udpate # # include/linux/concap.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +2 -1 # ISDN udpate # # drivers/isdn/tpam/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/sc/timer.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +25 -24 # ISDN udpate # # drivers/isdn/sc/shmem.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +31 -29 # ISDN udpate # # drivers/isdn/sc/packet.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +60 -47 # ISDN udpate # # drivers/isdn/sc/message.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +36 -35 # ISDN udpate # # drivers/isdn/sc/ioctl.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +78 -57 # ISDN udpate # # drivers/isdn/sc/interrupt.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +41 -29 # ISDN udpate # # drivers/isdn/sc/init.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +55 -47 # ISDN udpate # # drivers/isdn/sc/hardware.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/sc/event.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +5 -5 # ISDN udpate # # drivers/isdn/sc/command.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +41 -40 # ISDN udpate # # drivers/isdn/sc/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/pcbit/pcbit.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/pcbit/layer2.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +15 -28 # ISDN udpate # # drivers/isdn/pcbit/edss1.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +3 -5 # ISDN udpate # # drivers/isdn/pcbit/drv.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -0 # ISDN udpate # # drivers/isdn/pcbit/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/icn/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/i4l/isdn_x25iface.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +7 -4 # ISDN udpate # # drivers/isdn/i4l/isdn_x25iface.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +13 -18 # ISDN udpate # # drivers/isdn/i4l/isdn_v110.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +8 -14 # ISDN udpate # # drivers/isdn/i4l/isdn_v110.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +100 -88 # ISDN udpate # # drivers/isdn/i4l/isdn_ttyfax.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +4 -1 # ISDN udpate # # drivers/isdn/i4l/isdn_ttyfax.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +68 -24 # ISDN udpate # # drivers/isdn/i4l/isdn_tty.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +17 -23 # ISDN udpate # # drivers/isdn/i4l/isdn_tty.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +575 -586 # ISDN udpate # # drivers/isdn/i4l/isdn_ppp.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +32 -46 # ISDN udpate # # drivers/isdn/i4l/isdn_ppp.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +2570 -932 # ISDN udpate # # drivers/isdn/i4l/isdn_net.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +182 -8 # ISDN udpate # # drivers/isdn/i4l/isdn_net.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +3163 -90 # ISDN udpate # # drivers/isdn/i4l/isdn_concap.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +5 -3 # ISDN udpate # # drivers/isdn/i4l/isdn_concap.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +10 -153 # ISDN udpate # # drivers/isdn/i4l/isdn_common.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +19 -121 # ISDN udpate # # drivers/isdn/i4l/isdn_common.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1792 -1924 # ISDN udpate # # drivers/isdn/i4l/isdn_audio.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +4 -1 # ISDN udpate # # drivers/isdn/i4l/isdn_audio.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +93 -71 # ISDN udpate # # drivers/isdn/i4l/Makefile # 2004/02/18 19:42:12-08:00 akpm@osdl.org +8 -9 # ISDN udpate # # drivers/isdn/i4l/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +27 -21 # ISDN udpate # # drivers/isdn/hysdn/hysdn_proclog.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +3 -3 # ISDN udpate # # drivers/isdn/hysdn/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/hisax/w6692.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +4 -1 # ISDN udpate # # drivers/isdn/hisax/w6692.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +607 -264 # ISDN udpate # # drivers/isdn/hisax/telespci.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +219 -153 # ISDN udpate # # drivers/isdn/hisax/teles_cs.c # 2004/02/18 20:44:27-08:00 akpm@osdl.org +549 -0 # # drivers/isdn/hisax/teles3.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +320 -236 # ISDN udpate # # drivers/isdn/hisax/teles0.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +244 -135 # ISDN udpate # # drivers/isdn/hisax/teleint.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +127 -120 # ISDN udpate # # drivers/isdn/hisax/tei.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +17 -33 # ISDN udpate # # drivers/isdn/hisax/st5481_usb.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +5 -5 # ISDN udpate # # drivers/isdn/hisax/st5481_init.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +4 -5 # ISDN udpate # # drivers/isdn/hisax/st5481_d.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +14 -14 # ISDN udpate # # drivers/isdn/hisax/st5481_b.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +26 -17 # ISDN udpate # # drivers/isdn/hisax/st5481.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +15 -15 # ISDN udpate # # drivers/isdn/hisax/sportster.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +136 -109 # ISDN udpate # # drivers/isdn/hisax/sedlbauer_cs.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +24 -7 # ISDN udpate # # drivers/isdn/hisax/sedlbauer.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +541 -531 # ISDN udpate # # drivers/isdn/hisax/saphir.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +161 -112 # ISDN udpate # # drivers/isdn/hisax/s0box.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +147 -95 # ISDN udpate # # drivers/isdn/hisax/q931.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +35 -36 # ISDN udpate # # drivers/isdn/hisax/nj_u.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +151 -102 # ISDN udpate # # drivers/isdn/hisax/nj_s.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +182 -121 # ISDN udpate # # drivers/isdn/hisax/niccy.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +216 -159 # ISDN udpate # # drivers/isdn/hisax/netjet.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +6 -8 # ISDN udpate # # drivers/isdn/hisax/netjet.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +110 -118 # ISDN udpate # # drivers/isdn/hisax/mic.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +155 -92 # ISDN udpate # # drivers/isdn/hisax/l3ni1.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +201 -211 # ISDN udpate # # drivers/isdn/hisax/l3dss1.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +214 -224 # ISDN udpate # # drivers/isdn/hisax/l3_1tr6.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +77 -81 # ISDN udpate # # drivers/isdn/hisax/jade_irq.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +131 -36 # ISDN udpate # # drivers/isdn/hisax/jade.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +3 -4 # ISDN udpate # # drivers/isdn/hisax/jade.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +144 -106 # ISDN udpate # # drivers/isdn/hisax/ix1_micro.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +178 -127 # ISDN udpate # # drivers/isdn/hisax/isurf.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +155 -127 # ISDN udpate # # drivers/isdn/hisax/isdnl3.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +19 -19 # ISDN udpate # # drivers/isdn/hisax/isdnl2.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +114 -103 # ISDN udpate # # drivers/isdn/hisax/isdnl1.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +4 -570 # ISDN udpate # # drivers/isdn/hisax/isdnl1.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +31 -51 # ISDN udpate # # drivers/isdn/hisax/isdnhdlc.h # 2004/02/18 20:44:27-08:00 akpm@osdl.org +72 -0 # # drivers/isdn/hisax/isdnhdlc.c # 2004/02/18 20:44:27-08:00 akpm@osdl.org +669 -0 # # drivers/isdn/hisax/isar.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +10 -2 # ISDN udpate # # drivers/isdn/hisax/isar.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +361 -212 # ISDN udpate # # drivers/isdn/hisax/isac.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +6 -4 # ISDN udpate # # drivers/isdn/hisax/isac.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +255 -140 # ISDN udpate # # drivers/isdn/hisax/ipacx.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +3 -5 # ISDN udpate # # drivers/isdn/hisax/ipacx.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +497 -237 # ISDN udpate # # drivers/isdn/hisax/ipac.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -76 # ISDN udpate # # drivers/isdn/hisax/icc.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +5 -3 # ISDN udpate # # drivers/isdn/hisax/hisax_cfg.h # 2004/02/18 20:44:27-08:00 akpm@osdl.org +64 -0 # # drivers/isdn/hisax/hfc_usb.c # 2004/02/18 20:44:27-08:00 akpm@osdl.org +1667 -0 # # drivers/isdn/hisax/Makefile # 2004/02/18 19:42:12-08:00 akpm@osdl.org +15 -13 # ISDN udpate # # drivers/isdn/hisax/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +30 -17 # ISDN udpate # # drivers/isdn/Makefile # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +7 -7 # ISDN udpate # # drivers/Makefile # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/hisax/teles_cs.c # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/isdn/hisax/teles_cs.c # # drivers/isdn/hisax/isdnhdlc.h # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/isdn/hisax/isdnhdlc.h # # drivers/isdn/hisax/isdnhdlc.c # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/isdn/hisax/isdnhdlc.c # # drivers/isdn/hisax/icc.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +259 -142 # ISDN udpate # # drivers/isdn/hisax/hscx_irq.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +164 -103 # ISDN udpate # # drivers/isdn/hisax/hscx.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +5 -9 # ISDN udpate # # drivers/isdn/hisax/hscx.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +148 -121 # ISDN udpate # # drivers/isdn/hisax/hisax_isac.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +8 -8 # ISDN udpate # # drivers/isdn/hisax/hisax_isac.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +4 -4 # ISDN udpate # # drivers/isdn/hisax/hisax_fcpcipnp.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +11 -10 # ISDN udpate # # drivers/isdn/hisax/hisax_fcpcipnp.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +118 -99 # ISDN udpate # # drivers/isdn/hisax/hisax_debug.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/hisax/hisax_cfg.h # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/isdn/hisax/hisax_cfg.h # # drivers/isdn/hisax/hisax.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +442 -329 # ISDN udpate # # drivers/isdn/hisax/hfcscard.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +132 -136 # ISDN udpate # # drivers/isdn/hisax/hfc_usb.c # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # BitKeeper file /home/torvalds/v2.5/linux/drivers/isdn/hisax/hfc_usb.c # # drivers/isdn/hisax/hfc_sx.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +420 -203 # ISDN udpate # # drivers/isdn/hisax/hfc_pci.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +23 -25 # ISDN udpate # # drivers/isdn/hisax/hfc_pci.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +507 -240 # ISDN udpate # # drivers/isdn/hisax/hfc_2bs0.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -2 # ISDN udpate # # drivers/isdn/hisax/hfc_2bs0.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +92 -86 # ISDN udpate # # drivers/isdn/hisax/hfc_2bds0.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +2 -2 # ISDN udpate # # drivers/isdn/hisax/hfc_2bds0.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +274 -95 # ISDN udpate # # drivers/isdn/hisax/gazel.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +513 -364 # ISDN udpate # # drivers/isdn/hisax/enternow_pci.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +205 -158 # ISDN udpate # # drivers/isdn/hisax/enternow.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +9 -0 # ISDN udpate # # drivers/isdn/hisax/elsa_ser.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +65 -77 # ISDN udpate # # drivers/isdn/hisax/elsa_cs.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +25 -7 # ISDN udpate # # drivers/isdn/hisax/elsa.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +640 -570 # ISDN udpate # # drivers/isdn/hisax/diva.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +854 -474 # ISDN udpate # # drivers/isdn/hisax/config.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +336 -566 # ISDN udpate # # drivers/isdn/hisax/callc.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +100 -135 # ISDN udpate # # drivers/isdn/hisax/bkm_a8.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +256 -103 # ISDN udpate # # drivers/isdn/hisax/bkm_a4t.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +192 -173 # ISDN udpate # # drivers/isdn/hisax/avma1_cs.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +51 -50 # ISDN udpate # # drivers/isdn/hisax/avm_pci.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +391 -274 # ISDN udpate # # drivers/isdn/hisax/avm_a1p.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +130 -125 # ISDN udpate # # drivers/isdn/hisax/avm_a1.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +189 -114 # ISDN udpate # # drivers/isdn/hisax/asuscom.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +270 -201 # ISDN udpate # # drivers/isdn/hisax/arcofi.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +6 -19 # ISDN udpate # # drivers/isdn/hisax/amd7930_fn.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +17 -4 # ISDN udpate # # drivers/isdn/hisax/amd7930_fn.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +113 -132 # ISDN udpate # # drivers/isdn/hardware/eicon/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/hardware/avm/t1pci.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +27 -2 # ISDN udpate # # drivers/isdn/hardware/avm/t1isa.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +73 -22 # ISDN udpate # # drivers/isdn/hardware/avm/c4.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +67 -17 # ISDN udpate # # drivers/isdn/hardware/avm/b1pcmcia.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +38 -1 # ISDN udpate # # drivers/isdn/hardware/avm/b1pci.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +43 -2 # ISDN udpate # # drivers/isdn/hardware/avm/b1isa.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +47 -9 # ISDN udpate # # drivers/isdn/hardware/avm/b1dma.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +34 -16 # ISDN udpate # # drivers/isdn/hardware/avm/b1.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +31 -20 # ISDN udpate # # drivers/isdn/hardware/avm/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/hardware/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -24 # ISDN udpate # # drivers/isdn/capi/kcapi_proc.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +69 -2 # ISDN udpate # # drivers/isdn/capi/kcapi.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +5 -2 # ISDN udpate # # drivers/isdn/capi/kcapi.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +120 -7 # ISDN udpate # # drivers/isdn/capi/capifs.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +3 -3 # ISDN udpate # # drivers/isdn/capi/capifs.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +81 -128 # ISDN udpate # # drivers/isdn/capi/capidrv.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +14 -4 # ISDN udpate # # drivers/isdn/capi/capi.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +22 -18 # ISDN udpate # # drivers/isdn/capi/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # drivers/isdn/act2000/module.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +24 -28 # ISDN udpate # # drivers/isdn/act2000/capi.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +2 -3 # ISDN udpate # # drivers/isdn/act2000/capi.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +4 -6 # ISDN udpate # # drivers/isdn/act2000/act2000_isa.c # 2004/02/18 19:42:12-08:00 akpm@osdl.org +10 -13 # ISDN udpate # # drivers/isdn/act2000/act2000.h # 2004/02/18 19:42:12-08:00 akpm@osdl.org +26 -24 # ISDN udpate # # drivers/isdn/act2000/Kconfig # 2004/02/18 19:42:12-08:00 akpm@osdl.org +1 -1 # ISDN udpate # # BitKeeper/deleted/.del-isdn_ppp_vj.h~b6a2bb5de2c0ea97 # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ppp_vj.h # # BitKeeper/deleted/.del-isdn_ppp_vj.c~16e30fdbc5007821 # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ppp_vj.c # # BitKeeper/deleted/.del-isdn_ppp_mp.h~9d5f9a2592c3030f # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ppp_mp.h # # BitKeeper/deleted/.del-fsm.h~df80c0c3a20f6309 # 2004/02/18 20:44:27-08:00 akpm@osdl.org +0 -0 # Delete: include/linux/isdn/fsm.h # # BitKeeper/deleted/.del-rawhdlc.h~1afc6d34b2872e # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/rawhdlc.h # # BitKeeper/deleted/.del-rawhdlc.c~159110ae54202095 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/rawhdlc.c # # BitKeeper/deleted/.del-md5sums.asc~e89f19eb5296dcf3 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/md5sums.asc # # BitKeeper/deleted/.del-isdn_ppp_mp.c~295bd265c90f0a1 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ppp_mp.c # # BitKeeper/deleted/.del-isdn_ppp_ccp.h~1b7eab15b8385d67 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ppp_ccp.h # # BitKeeper/deleted/.del-isdn_ppp_ccp.c~87883bb074ad6fc0 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ppp_ccp.c # # BitKeeper/deleted/.del-isdn_net_lib.h~872c970d7316cd8b # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_net_lib.h # # BitKeeper/deleted/.del-isdn_net_lib.c~d7285ba4ce9ae41c # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_net_lib.c # # BitKeeper/deleted/.del-isdn_fsm.c~bca6817be24d7b18 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_fsm.c # # BitKeeper/deleted/.del-isdn_ciscohdlck.h~f78e4e1efb048809 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ciscohdlck.h # # BitKeeper/deleted/.del-isdn_ciscohdlck.c~8a401ce52b9a03fd # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/i4l/isdn_ciscohdlck.c # # BitKeeper/deleted/.del-ipac.c~eeac457c2f6ccccb # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/ipac.c # # BitKeeper/deleted/.del-hisax_hscx.h~9c7d02ee53b5de77 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/hisax_hscx.h # # BitKeeper/deleted/.del-hisax_hscx.c~ad12a2a2f72c749a # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/hisax_hscx.c # # BitKeeper/deleted/.del-hisax_hfcpci.h~348482271a5520c1 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/hisax_hfcpci.h # # BitKeeper/deleted/.del-hisax_hfcpci.c~d92ab2a91deafaf8 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/hisax_hfcpci.c # # BitKeeper/deleted/.del-hisax_fcclassic.h~d32aaf5a11100487 # 2004/02/18 20:44:26-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/hisax_fcclassic.h # # BitKeeper/deleted/.del-hisax_fcclassic.c~4d7163f18e8eab2a # 2004/02/18 20:44:25-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/hisax_fcclassic.c # # BitKeeper/deleted/.del-cert.c~5efb3f80e4e90681 # 2004/02/18 20:44:25-08:00 akpm@osdl.org +0 -0 # Delete: drivers/isdn/hisax/cert.c # # ChangeSet # 2004/02/19 02:48:43+00:00 davej@redhat.com # [CPUFREQ] Add extra __init markers to longrun driver. # Caught by Randy Dunlap. # longrun_cpu_init() only gets called during startup, and calls # other __init routines. # # arch/i386/kernel/cpu/cpufreq/longrun.c # 2004/02/19 02:48:38+00:00 davej@redhat.com +1 -1 # [CPUFREQ] Add extra __init markers to longrun driver. # Caught by Randy Dunlap. # longrun_cpu_init() only gets called during startup, and calls # other __init routines. # # ChangeSet # 2004/02/19 02:46:52+00:00 davej@redhat.com # [CPUFREQ] Add extra __init markers to longhaul driver. # Caught by Randy Dunlap. # longhaul_cpu_init only gets called during startup, and calls # other __init routines. # # arch/i386/kernel/cpu/cpufreq/longhaul.c # 2004/02/19 02:46:47+00:00 davej@redhat.com +2 -2 # [CPUFREQ] Add extra __init marker to longhaul driver. # Caught by Randy Dunlap. # longhaul_cpu_init only gets called during startup, and calls # other __init routines. # # ChangeSet # 2004/02/18 19:52:03-05:00 akpm@osdl.org # [PATCH] tulip printk warning fix # # Don't assume the size of a dma_addr_t # # drivers/net/tulip/interrupt.c # 2004/02/18 10:43:06-05:00 akpm@osdl.org +2 -2 # tulip printk warning fix # # ChangeSet # 2004/02/18 19:34:42-05:00 romieu@fr.zoreil.com # [PATCH] 2.6.3 - drivers/net/sis190.c - Tx desc overflow # # Tx descriptor overflow - take II. # # Assume tp->dirty_tx = NUM_TX_DESC/2, tp->cur_tx = NUM_TX_DESC - 1, # watch "entry" go beyond NUM_TX_DESC. Actually this is where the same # bug in r8169 driver comes from. # # drivers/net/sis190.c # 2004/02/18 18:52:32-05:00 romieu@fr.zoreil.com +3 -3 # 2.6.3 - drivers/net/sis190.c - Tx desc overflow # # ChangeSet # 2004/02/18 19:29:38-05:00 rddunlap@osdl.org # [PATCH] tr/3c359: handle kmalloc failures during init # # From: Pablo Menichini # and maximilian attems # # # while looking at kj mails from 200212 and 200301 # this patch slept through # originally from: Pablo Menichini # rediffed and compile tested # patch applies on plain 2.6.0 # # maximilian attems # # handle kmalloc failures during init # # diff -puN drivers/net/tokenring/3c359.c~tr3c_kmalloc drivers/net/tokenring/3c359.c # # # linux-261-bk4-kj1-rddunlap/drivers/net/tokenring/3c359.c | 13 +++++++++++++ # 1 files changed, 13 insertions(+) # # drivers/net/tokenring/3c359.c # 2004/01/16 19:03:29-05:00 rddunlap@osdl.org +13 -0 # tr/3c359: handle kmalloc failures during init # # ChangeSet # 2004/02/18 19:29:31-05:00 brazilnut@us.ibm.com # [PATCH] 2.6.3 pcnet32.c transmit hang fix # # The transmit routine will stop interrupting and hang, causing the # tx_timeout routine to attempt to restart the device when the 32-bit # cur_tx counter wraps below dirty_tx. If the device had called # netif_stop_queue it will never call netif_wake_queue in the interrupt # routine (at least on an IA32 system) due to 32-bit wrap around arithmetic. # # On my IA32 system 'dirty_tx > lp->cur_tx - TX_RING_SIZE + 2' would # always evaluate to false when dirty and cur_tx were less than 15, # preventing netif_wake_queue to be called. # # By starting dirty_tx and cur_tx at 0xfffffff0 (to reduce test time) I # found that once cur_tx wrapped to zero, that transmitted buffers would # never be unmapped or freed because 'while (dirty_tx < lp->cur_tx) {' # was not true. cur_tx would keep incrementing (in start_xmit) but dirty_tx # would not (in pcnet32_interrupt), thus leaking skb's and pci map entries. # On PPC machines, the system would quickly run out of pci maps. # # Fix tested on PPC and IA32. # # drivers/net/pcnet32.c # 2004/02/18 10:36:59-05:00 brazilnut@us.ibm.com +12 -8 # 2.6.3 pcnet32.c transmit hang fix # # ChangeSet # 2004/02/18 19:29:24-05:00 rddunlap@osdl.org # [PATCH] depca: remove double semi-colon # # description: remove double semi-colon typo; # # drivers/net/depca.c # 2004/01/25 19:48:45-05:00 rddunlap@osdl.org +1 -1 # [PATCH[ depca: remove double semi-colon # # ChangeSet # 2004/02/18 16:27:29-08:00 davem@nuts.davemloft.net # [SELINUX]: Forgot to add these in previous commit. # # security/selinux/netlink.c # 2004/02/18 16:27:12-08:00 davem@nuts.davemloft.net +113 -0 # [SELINUX]: Forgot to add these in previous commit. # # security/selinux/netlink.c # 2004/02/18 16:27:12-08:00 davem@nuts.davemloft.net +0 -0 # BitKeeper file /disk1/BK/net-2.6/security/selinux/netlink.c # # include/linux/selinux_netlink.h # 2004/02/18 16:27:11-08:00 davem@nuts.davemloft.net +37 -0 # [SELINUX]: Forgot to add these in previous commit. # # include/linux/selinux_netlink.h # 2004/02/18 16:27:11-08:00 davem@nuts.davemloft.net +0 -0 # BitKeeper file /disk1/BK/net-2.6/include/linux/selinux_netlink.h # # ChangeSet # 2004/02/18 16:23:41-08:00 jmorris@redhat.com # [SELINUX]: Event notifications via netlink. # # security/selinux/ss/services.c # 2004/02/18 16:23:22-08:00 jmorris@redhat.com +3 -0 # [SELINUX]: Event notifications via netlink. # # security/selinux/selinuxfs.c # 2004/02/18 16:23:22-08:00 jmorris@redhat.com +3 -0 # [SELINUX]: Event notifications via netlink. # # security/selinux/Makefile # 2004/02/18 16:23:22-08:00 jmorris@redhat.com +1 -1 # [SELINUX]: Event notifications via netlink. # # include/linux/netlink.h # 2004/02/18 16:23:22-08:00 jmorris@redhat.com +1 -0 # [SELINUX]: Event notifications via netlink. # # ChangeSet # 2004/02/18 19:12:30-05:00 jhf@rivenstone.net # [netdrvr sis900] fix multicast bug # # drivers/net/sis900.c # 2004/02/18 19:12:26-05:00 jhf@rivenstone.net +1 -1 # [netdrvr sis900] fix multicast bug # # ChangeSet # 2004/02/18 18:59:35-05:00 shmulik.hen@intel.com # [PATCH] Add VLAN support in ALB mode # # Add capability to tag self generated ARP packets that are required # for receive load balancing in bonding. VLAN Id's are saved and used # each time a new IP connection is established since 8021q currently # supports IP binding. # # Update module version and comment blocks. # # drivers/net/bonding/bonding.h # 2004/01/21 11:56:28-05:00 shmulik.hen@intel.com +2 -2 # Add VLAN support in ALB mode # # drivers/net/bonding/bond_main.c # 2004/01/21 11:56:28-05:00 shmulik.hen@intel.com +9 -1 # Add VLAN support in ALB mode # # drivers/net/bonding/bond_alb.h # 2004/01/21 11:56:28-05:00 shmulik.hen@intel.com +2 -0 # Add VLAN support in ALB mode # # drivers/net/bonding/bond_alb.c # 2004/01/21 11:56:28-05:00 shmulik.hen@intel.com +81 -10 # Add VLAN support in ALB mode # # ChangeSet # 2004/02/18 18:59:27-05:00 shmulik.hen@intel.com # [PATCH] Add VLAN support in TLB mode # # Add capability to tag self generated learning packets that are # required to speed up port selection in the switch after a fail # over in bonding since some switches will only update their MAC # tables from tagged packets when VLAN support is turned on. All # VLAN Id's that have been configured on top of the bond interface # will be used in cyclic order. # # drivers/net/bonding/bonding.h # 2004/01/21 11:56:24-05:00 shmulik.hen@intel.com +1 -0 # Add VLAN support in TLB mode # # drivers/net/bonding/bond_main.c # 2004/01/21 11:56:24-05:00 shmulik.hen@intel.com +41 -0 # Add VLAN support in TLB mode # # drivers/net/bonding/bond_alb.h # 2004/01/21 11:56:24-05:00 shmulik.hen@intel.com +2 -1 # Add VLAN support in TLB mode # # drivers/net/bonding/bond_alb.c # 2004/01/21 11:56:24-05:00 shmulik.hen@intel.com +32 -2 # Add VLAN support in TLB mode # # ChangeSet # 2004/02/18 18:59:20-05:00 shmulik.hen@intel.com # [PATCH] Add support for HW accel. slaves # # Now that David Miller accepted the first half of this set into 2.6, # I'm resending the last half to you for inclusion in netdev-2.6. # # Tested against latest netdev-2.6. Summary: # # Change the bond interface to publish full VLAN hardware acceleration # offloading capabilities, and add capability in all xmit functions to # take special care for VLAN HW accel. tagged skb's that are going out # through a slave that is not offloading capable. # # Add a mechanism to collect and save the VLAN Id's that have been # added on top of a bond interface, and propagate the register/add/kill # operations to the slaves. # # Add blocking mechanism to prevent adding VLAN interfaces on top of a # bond that contains VLAN challenged slaves and to prevent adding VLAN # challenged slaves to a bond that already has VLAN interfaces on top # of it. # # Add a section about VLAN to Documentation/networking/bonding.txt and # also correct some minor spelling/grammer errors. # # drivers/net/bonding/bonding.h # 2004/01/21 11:56:19-05:00 shmulik.hen@intel.com +9 -0 # Add support for HW accel. slaves # # drivers/net/bonding/bond_main.c # 2004/01/21 11:56:19-05:00 shmulik.hen@intel.com +474 -62 # Add support for HW accel. slaves # # drivers/net/bonding/bond_alb.c # 2004/01/21 11:56:19-05:00 shmulik.hen@intel.com +8 -9 # Add support for HW accel. slaves # # drivers/net/bonding/bond_3ad.c # 2004/01/21 11:56:19-05:00 shmulik.hen@intel.com +12 -16 # Add support for HW accel. slaves # # Documentation/networking/bonding.txt # 2004/01/21 11:56:19-05:00 shmulik.hen@intel.com +40 -16 # Add support for HW accel. slaves # # ChangeSet # 2004/02/18 18:49:32-05:00 pe1rxq@amsat.org # [PATCH] 6pack reinit bug # # This patch is the same as to mkiss a while ago, the current code triggers a # bug when reattaching a network device. # # drivers/net/hamradio/6pack.c # 2004/02/06 13:32:46-05:00 pe1rxq@amsat.org +10 -10 # 6pack reinit bug # # ChangeSet # 2004/02/18 18:49:25-05:00 mlindner@syskonnect.de # [PATCH] [kernel 2.6] sk98lin: Insert revision version and date # # to uniquely identify the files, it's necessary to add the version of # each file. Please, don't remove the revision infos. It's really # important for us. # # Patch 2/2 # [SK98LIN]: Insert revision version and date [back] into the files # # drivers/net/sk98lin/skxmac2.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skvpd.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/sktimer.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +3 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skrlmt.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skqueue.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +3 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skproc.c # 2004/02/13 03:55:53-05:00 mlindner@syskonnect.de +2 -1 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/sklm80.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/ski2c.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skgesirq.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skgepnmi.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +3 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skgemib.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skgeinit.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -1 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skgehwt.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skdim.c # 2004/02/13 03:55:53-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skcsum.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/skaddr.c # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/xmac_ii.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skvpd.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/sktypes.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/sktimer.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skrlmt.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skqueue.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +6 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/ski2c.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgesirq.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgepnmi.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgepnm2.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgeinit.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgei2c.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgehwt.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgehw.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skgedrv.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skerror.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skdrv1st.h # 2004/02/13 03:55:53-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skdebug.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skcsum.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/skaddr.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # drivers/net/sk98lin/h/lm80.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +2 -0 # [kernel 2.6] sk98lin: Insert revision version and date # # ChangeSet # 2004/02/18 18:49:16-05:00 mlindner@syskonnect.de # [PATCH] sk98lin: Added Support for Belkin adapter # # Patch 1/2 # [SK98LIN]: Added Support for Belkin adapter # [SK98LIN]: Don't handle Yukon2 cards at the moment # # drivers/net/sk98lin/skge.c # 2004/02/13 03:55:53-05:00 mlindner@syskonnect.de +8 -1 # [kernel 2.6] sk98lin: Added Support for Belkin adapter # # drivers/net/sk98lin/h/skversion.h # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +6 -4 # [kernel 2.6] sk98lin: Added Support for Belkin adapter # # drivers/net/sk98lin/h/skdrv2nd.h # 2004/02/13 03:55:53-05:00 mlindner@syskonnect.de +9 -1 # [kernel 2.6] sk98lin: Added Support for Belkin adapter # # drivers/net/Kconfig # 2004/02/13 03:55:51-05:00 mlindner@syskonnect.de +3 -0 # [kernel 2.6] sk98lin: Added Support for Belkin adapter # # Documentation/networking/sk98lin.txt # 2004/02/13 03:55:50-05:00 mlindner@syskonnect.de +3 -3 # [kernel 2.6] sk98lin: Added Support for Belkin adapter # # ChangeSet # 2004/02/18 18:49:09-05:00 brazilnut@us.ibm.com # [PATCH] 2.6.3 pcnet32.c SLAB_DEBUG length error fix # # The pcnet32 driver uses the incorrect length (of zero) in # pci_[un]map_single for receive buffers. This is seen with SLAB_DEBUG # enabled. # # Tested in IA32 system. If this patch is not applied after my previous # one hunks #1, #3, and #5 will have an offset of -2 lines. # # drivers/net/pcnet32.c # 2004/02/18 10:14:33-05:00 brazilnut@us.ibm.com +10 -7 # 2.6.3 pcnet32.c SLAB_DEBUG length error fix # # ChangeSet # 2004/02/18 18:49:02-05:00 shemminger@osdl.org # [PATCH] hp100 pci probe problem # # Jean discovered problem with my hp100 PCI changes. # This should fix the problem... The multi-bus probe logic error handling was # botched. # # He validated it; so please apply # # drivers/net/hp100.c # 2004/02/18 07:39:41-05:00 shemminger@osdl.org +16 -3 # hp100 pci probe problem # # ChangeSet # 2004/02/18 18:48:55-05:00 brazilnut@us.ibm.com # [PATCH] 2.6.3 pcnet32.c bus master arbitration failure fix # # Here is the first of several individual patches to 2.6.3 for the pcnet32 # driver. # # The driver did not properly serialize accesses to chip registers, resulting # in reading/writing the wrong register. This patch eliminates this problem # and gets rid of the cause of the symptom of 'bus master arbitration failure'. # # It was easier to use generic_mii_ioctl than modify the current pcnet32_ioctl # routine with the necessary locks. This has been re-tested on an IA32 system. # # drivers/net/pcnet32.c # 2004/02/18 07:35:33-05:00 brazilnut@us.ibm.com +24 -24 # 2.6.3 pcnet32.c bus master arbitration failure fix # # ChangeSet # 2004/02/18 15:26:52-08:00 johnstul@us.ibm.com # [PATCH] ia64: add support for time-interpolation via IBM EXA Cyclone timer # # This patch provides access to the cyclone time source found on IBM EXA # based systems (x450 and x455). This is needed on multi-node systems # where the CPU ITCs are not synchronized, causing possible time # inconsistencies. # # This release fixes one last minor think-o and ran overnight without any # time inconsistencies (when used in conjunction w/ the # time-interpolator-fix_A0 patch). # # include/asm-ia64/cyclone.h # 2004/02/18 07:10:58-08:00 johnstul@us.ibm.com +15 -0 # ia64: add support for time-interpolation via IBM EXA Cyclone timer # # include/asm-ia64/cyclone.h # 2004/02/18 07:10:58-08:00 johnstul@us.ibm.com +0 -0 # BitKeeper file /data1/bk/lia64/to-linus-2.5/include/asm-ia64/cyclone.h # # arch/ia64/kernel/acpi.c # 2004/02/18 07:10:58-08:00 johnstul@us.ibm.com +22 -0 # ia64: add support for time-interpolation via IBM EXA Cyclone timer # # arch/ia64/kernel/Makefile # 2004/02/18 07:10:58-08:00 johnstul@us.ibm.com +1 -0 # ia64: add support for time-interpolation via IBM EXA Cyclone timer # # arch/ia64/Kconfig # 2004/02/18 07:10:58-08:00 johnstul@us.ibm.com +6 -0 # ia64: add support for time-interpolation via IBM EXA Cyclone timer # # arch/ia64/kernel/cyclone.c # 2004/02/18 07:10:58-08:00 johnstul@us.ibm.com +158 -0 # ia64: add support for time-interpolation via IBM EXA Cyclone timer # # arch/ia64/kernel/cyclone.c # 2004/02/18 07:10:58-08:00 johnstul@us.ibm.com +0 -0 # BitKeeper file /data1/bk/lia64/to-linus-2.5/arch/ia64/kernel/cyclone.c # # ChangeSet # 2004/02/18 15:23:41-08:00 torvalds@home.osdl.org # Fix up the microcode update on regular 32-bit x86. Our wrmsr() # is a bit unforgiving and really doesn't like 64-bit values. # # We should possibly make wrmsr() automatically truncate the # arguments, but regardless we should just fix microcode.c. # # arch/i386/kernel/microcode.c # 2004/02/18 15:23:36-08:00 torvalds@home.osdl.org +3 -2 # Fix up the microcode update on regular 32-bit x86. Our wrmsr() # is a bit unforgiving and really doesn't like 64-bit values. # # We should possibly make wrmsr() automatically truncate the # arguments, but regardless we should just fix microcode.c. # # ChangeSet # 2004/02/18 15:05:21-08:00 stern@rowland.harvard.edu # [PATCH] USB: More UHCI root hub code improvements # # This adds some minor improvements to the UHCI root hub code. The only # important change is that it handles the overcurrent indicator bits on VIA # controllers properly; they are reported using the opposite sense from # Intel controllers. # # # # Report the OverCurrent status bits in the /proc debugging file # and spontaneously change the use of whitespace. # # Remove unused variable in uhci_hub_status_data(). # # Report OverCurrent status for VIA controllers properly (the # meaning of the status bit is inverted with respect to Intel # controllers). # # Save the port status I/O address in a variable rather than # recalculating it many times. # # Merge code for handling SetHubFeature and ClearHubFeature since # we don't implement either one. # # Remove some unnecessary comments. # # Remove redundant min_t calculation. # # drivers/usb/host/uhci-hub.c # 2004/02/18 06:50:31-08:00 stern@rowland.harvard.edu +26 -28 # USB: More UHCI root hub code improvements # # drivers/usb/host/uhci-debug.c # 2004/02/18 06:50:31-08:00 stern@rowland.harvard.edu +12 -10 # USB: More UHCI root hub code improvements # # ChangeSet # 2004/02/18 15:05:01-08:00 stern@rowland.harvard.edu # [PATCH] USB: Improve UHCI root hub code: descriptor, OC bits, etc. # # This patch is from David Brownell. # # UHCI root hub updates ... minor bugfixes and cleanups, improving # conformance with the USB hub specification. # # - UHCI doesn't support any kind of power switching; so modify the # hub descriptor to stop claiming it does! Likewise fail attempts # to disable power on any port. # # - Intel defined both overcurrent status overcurrent-change bits, but # the current code only knows about one. Modify hub descriptor to # report per-port overcurrent protection; and use both bits. # # - Modify the port status set/clear macros to know about the bits # that must always be written as zero, and the write-to-clear bits. # Update callers which wrote "set" instead of "clear". # # - Rewrote code returning port status; magic numbers are gone. # # - Driver can't really support 8 root hub ports; don't try. # # Also moves the #define DEBUG earlier so that it can kick in any of # the various debug macros ... like pr_debug() and dev_dbg(). # # drivers/usb/host/uhci-hub.c # 2004/02/18 05:56:23-08:00 stern@rowland.harvard.edu +62 -32 # USB: Improve UHCI root hub code: descriptor, OC bits, etc. # # drivers/usb/host/uhci-hcd.h # 2004/02/18 05:56:23-08:00 stern@rowland.harvard.edu +8 -1 # USB: Improve UHCI root hub code: descriptor, OC bits, etc. # # drivers/usb/host/uhci-hcd.c # 2004/02/18 05:56:23-08:00 stern@rowland.harvard.edu +6 -6 # USB: Improve UHCI root hub code: descriptor, OC bits, etc. # # ChangeSet # 2004/02/18 13:18:53-08:00 kaber@trash.net # [PKTSCHED]: Use queue limit of 1 when tx_queue_len is zero. # # net/sched/sch_gred.c # 2004/02/18 13:18:40-08:00 kaber@trash.net +1 -1 # [PKTSCHED]: Use queue limit of 1 when tx_queue_len is zero. # # net/sched/sch_fifo.c # 2004/02/18 13:18:40-08:00 kaber@trash.net +4 -2 # [PKTSCHED]: Use queue limit of 1 when tx_queue_len is zero. # # ChangeSet # 2004/02/18 13:17:51-08:00 david-b@pacbell.net # [PATCH] USB: ehci-hcd, scheduler handles TT collisions (3/3) # # [USB] ehci-hcd detects microframe transaction scheduling collisions # # This detects TT schedule collisions for split periodic transactions # on USB 2.0 hubs, handling both isochronous and interrupt transfers # but not supporting the "wrap around to the next frame" modes for # either transfer type. # # The ISO scheduler is modified to use that support for full speed # transfers ... though nothing will yet ask it to do that. # # It also tracks schedule depth, to help avoid accepting ISO URBs # which need more time than currently remains unscheduled. # # drivers/usb/host/ehci.h # 2004/02/16 07:09:31-08:00 david-b@pacbell.net +5 -1 # USB: ehci-hcd, scheduler handles TT collisions (3/3) # # drivers/usb/host/ehci-sched.c # 2004/02/16 07:09:32-08:00 david-b@pacbell.net +262 -52 # USB: ehci-hcd, scheduler handles TT collisions (3/3) # # ChangeSet # 2004/02/18 13:17:29-08:00 david-b@pacbell.net # [PATCH] USB: ehci-hcd, fullspeed iso data structures (2/3) # # [USB] ehci, rename some iso data structures # # Rename some data and functions used by EHCI to manage ISO transactions, # since they currently assume only high speed transfers. Much of the same # infrastructure will be used for full speed ISO, with split transactions. # # drivers/usb/host/ehci-sched.c # 2004/02/13 09:47:20-08:00 david-b@pacbell.net +70 -66 # USB: ehci-hcd, fullspeed iso data structures (2/3) # # drivers/usb/host/ehci.h # 2004/02/13 09:42:00-08:00 david-b@pacbell.net +14 -11 # USB: ehci-hcd, fullspeed iso data structures (2/3) # # ChangeSet # 2004/02/18 13:17:05-08:00 david-b@pacbell.net # [PATCH] USB: ehci-hcd, fullspeed iso data structures (1/3) # # [USB] start ehci split transaction support # # Updates split ISO transaction descriptor structure, add bitmask #defines; # it's groundwork for full speed ISO support in EHCI. Updates periodic # schedule scanning, and bandwidth calculations accordingly. # # Fixes bandwidth calculation to behave when the periodic schedule has # entries of multiple types ... as will be more common as ISO support # starts to be used here. # # drivers/usb/host/ehci.h # 2004/02/12 12:40:15-08:00 david-b@pacbell.net +26 -13 # USB: ehci-hcd, fullspeed iso data structures (1/3) # # drivers/usb/host/ehci-sched.c # 2004/02/12 12:32:50-08:00 david-b@pacbell.net +27 -15 # USB: ehci-hcd, fullspeed iso data structures (1/3) # # ChangeSet # 2004/02/18 13:16:10-08:00 davem@nuts.davemloft.net # [DECNET]: Make second arg to dn_alloc_send_skb a size_t pointer. # # net/decnet/dn_nsp_out.c # 2004/02/18 13:15:52-08:00 davem@nuts.davemloft.net +1 -1 # [DECNET]: Make second arg to dn_alloc_send_skb a size_t pointer. # # include/net/dn_nsp.h # 2004/02/18 13:15:52-08:00 davem@nuts.davemloft.net +1 -1 # [DECNET]: Make second arg to dn_alloc_send_skb a size_t pointer. # # ChangeSet # 2004/02/18 13:13:22-08:00 davem@nuts.davemloft.net # [BLUETOOTH]: Use min_t to avoid warning in rfcomm sock.c # # net/bluetooth/rfcomm/sock.c # 2004/02/18 13:13:06-08:00 davem@nuts.davemloft.net +1 -1 # [BLUETOOTH]: Use min_t to avoid warning in rfcomm sock.c # # ChangeSet # 2004/02/18 13:13:04-08:00 david-b@pacbell.net # [PATCH] USB: usbtest, two more protocol cases # # [USB] usbtest, two more control queueing subtests # # From Alan Stern. This adds two more "short control read" test cases, # both padding the "expected" transfer to end-of-packet. We need both # hosts and devices/gadgets to behave correctly here. # # drivers/usb/misc/usbtest.c # 2004/02/15 04:37:32-08:00 david-b@pacbell.net +18 -1 # USB: usbtest, two more protocol cases # # ChangeSet # 2004/02/18 13:12:46-08:00 david-b@pacbell.net # [PATCH] USB: usbcore, avoid RNDIS configs # # [USB] usbcore avoids RNDIS configuration. # # Modifies the "choose a configuration" heuristic to recognize the other # case that 2.4 handled: RNDIS, a MSFT protocol that's sometimes used as # the first/default configuration (as specified by MSFT) on cable modems. # CDC Ethernet is vendor-neutral, and preferred (except by MSFT). # # The initial version didn't catch RNDIS because it cloaks its ethernet # links as a kind of CDC ACM (modem) device. # # drivers/usb/core/usb.c # 2004/02/18 02:55:27-08:00 david-b@pacbell.net +10 -3 # USB: usbcore, avoid RNDIS configs # # ChangeSet # 2004/02/18 13:12:22-08:00 david-b@pacbell.net # [PATCH] USB: usbcore, hub driver enables TT-per-port mode # # [USB] hub driver turns on multi-TT mode # # This turns on the multi-tt mode in hubs that support it; the Cypress # "TetraHub" products are appearing at retail now, complete with some # of the first Mini-B connectors I've seen shipping. # # This will be important for hooking up lots of full speed isochronous # devices (audio, video, etc). # # drivers/usb/core/hub.c # 2004/02/18 03:00:29-08:00 david-b@pacbell.net +7 -2 # USB: usbcore, hub driver enables TT-per-port mode # # ChangeSet # 2004/02/18 13:11:47-08:00 david-b@pacbell.net # [PATCH] USB: usbcore, scatterlist cleanups # # [USB] minor usb_sg_wait() cleanups # # - count urb completions correctly when there's a non-recoverable # fault during scatterlist submission ... prevents a hang (seen # only with already-faulty usb-storage devices). # # - don't local_irq_{save,restore}() when not needed # # ChangeSet # 2004/02/18 13:11:42-08:00 davem@nuts.davemloft.net # [APPLETALK]: Use '%Z' for size_t. # # drivers/usb/core/message.c # 2004/01/12 05:05:56-08:00 david-b@pacbell.net +16 -10 # USB: usbcore, scatterlist cleanups # # net/appletalk/ddp.c # 2004/02/18 13:11:23-08:00 davem@nuts.davemloft.net +2 -2 # [APPLETALK]: Use '%Z' for size_t. # # ChangeSet # 2004/02/18 13:06:55-08:00 wensong@linux-vs.org # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_xmit.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -3 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_wrr.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_wlc.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_sync.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -5 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_sh.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_sed.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_sched.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -3 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_rr.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_proto_tcp.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +1 -2 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_proto_icmp.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -5 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_proto_esp.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -5 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_proto_ah.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -5 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_proto.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_nq.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_lc.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_lblcr.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +2 -6 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_lblc.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +2 -6 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_ftp.c # 2004/02/18 13:03:53-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_dh.c # 2004/02/18 13:03:52-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_ctl.c # 2004/02/18 13:03:52-08:00 wensong@linux-vs.org +0 -3 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_core.c # 2004/02/18 13:03:52-08:00 wensong@linux-vs.org +0 -4 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_conn.c # 2004/02/18 13:03:52-08:00 wensong@linux-vs.org +0 -3 # [IPVS] tidy up the header files to include # # net/ipv4/ipvs/ip_vs_app.c # 2004/02/18 13:03:52-08:00 wensong@linux-vs.org +0 -6 # [IPVS] tidy up the header files to include # # ChangeSet # 2004/02/18 11:54:48-08:00 pfg@sgi.com # [PATCH] ia64: add "platform_data" to struct pci_controller, update SN2 accordingly # # Here's a small mod for Altix. It breaks up our 'pci fixup' function and # has some other smallish clean ups. # # For the ia64 crowd I've added 'platform_data' to struct pci_controller. # # include/asm-ia64/sn/pci/pci_bus_cvlink.h # 2004/02/05 02:17:40-08:00 pfg@sgi.com +9 -5 # ia64: add "platform_data" to struct pci_controller, update SN2 accordingly # # include/asm-ia64/pci.h # 2004/02/05 02:17:40-08:00 pfg@sgi.com +2 -0 # ia64: add "platform_data" to struct pci_controller, update SN2 accordingly # # arch/ia64/sn/io/sn2/pic.c # 2004/02/05 02:17:40-08:00 pfg@sgi.com +8 -0 # ia64: add "platform_data" to struct pci_controller, update SN2 accordingly # # arch/ia64/sn/io/machvec/pci_dma.c # 2004/02/05 02:17:40-08:00 pfg@sgi.com +3 -3 # ia64: add "platform_data" to struct pci_controller, update SN2 accordingly # # arch/ia64/sn/io/machvec/pci_bus_cvlink.c # 2004/02/05 02:17:40-08:00 pfg@sgi.com +248 -163 # ia64: add "platform_data" to struct pci_controller, update SN2 accordingly # # ChangeSet # 2004/02/18 11:47:46-08:00 maeda.naoaki@jp.fujitsu.com # [PATCH] ia64: fix possible memory leak in PCI alloc_resource() # # # arch/ia64/pci/pci.c # 2004/02/17 23:36:14-08:00 maeda.naoaki@jp.fujitsu.com +3 -1 # ia64: fix possible memory leak in PCI alloc_resource() # # ChangeSet # 2004/02/18 11:44:46-08:00 ak@suse.de # [PATCH] Allow P4 oprofile code for x86-64 # # P4 support was previously ifdefed out for x86-64, remove that. # # arch/i386/oprofile/nmi_int.c # 2004/02/17 18:14:37-08:00 ak@suse.de +0 -7 # Allow P4 oprofile code for x86-64 # # ChangeSet # 2004/02/18 11:44:38-08:00 ak@suse.de # [PATCH] Enable Intel AGP on x86-64 # # Enable the Intel AGP driver for x86-64 too. # # drivers/char/agp/Kconfig # 2004/02/17 18:14:37-08:00 ak@suse.de +1 -1 # Enable Intel AGP on x86-64 # # ChangeSet # 2004/02/18 11:44:30-08:00 ak@suse.de # [PATCH] Update i386 microcode driver for x86-64 # # The microcode driver needs to support 64bit physical addresses too. # # arch/i386/kernel/microcode.c # 2004/02/17 18:14:37-08:00 ak@suse.de +2 -1 # Update i386 microcode driver for x86-64 # # ChangeSet # 2004/02/18 11:44:21-08:00 ak@suse.de # [PATCH] Intel x86-64 support merge # # This has all the x86-64 specific changes for Intel Prescott/Nocona # support. # # It requires a few minor changes outside arch/x86_64, which I am sending # separately. # # This patch is needed to boot an 64bit kernel on a 64-bit capable # Prescott machine. # # The ugliest part is probably the swiotlb code. In fact the code for # that is not even included, but just reused from IA64. swiotlb # implements the PCI DMA API using bounce buffering. I don't like this at # all, but there was no other way to support non DAC capable hardware # (like IDE or USB) on machines with >3GB. Please redirect all flames for # that to the Intel chipset designers. # # ChangeLog: # - Add Kconfig options for PSC # - Add support to reuse microcode driver from i386 (Suresh B Siddha) # - Try to optimize for the selected CPU # - Fix early CPUID check for Intel CPUs (Suresh B Siddha) # - Fix GDT to use the configured cache line size for padding # - Support monitor/mwait idle loop # - Support HyperThreading # - Support Intel CPUID flags # - Remove all 3dnow prefetches # - Add alternative() for the prefetchw prefetch inline. # - Include P4 driver in oprofile # - Support Intel NOPs in alternative # # include/asm-x86_64/system.h # 2004/02/17 18:14:37-08:00 ak@suse.de +50 -0 # Intel x86-64 support merge # # include/asm-x86_64/smp.h # 2004/02/17 18:14:37-08:00 ak@suse.de +2 -1 # Intel x86-64 support merge # # include/asm-x86_64/segment.h # 2004/02/17 18:14:37-08:00 ak@suse.de +3 -1 # Intel x86-64 support merge # # include/asm-x86_64/proto.h # 2004/02/17 18:14:37-08:00 ak@suse.de +5 -0 # Intel x86-64 support merge # # include/asm-x86_64/processor.h # 2004/02/17 18:14:37-08:00 ak@suse.de +86 -35 # Intel x86-64 support merge # # include/asm-x86_64/pci.h # 2004/02/17 18:14:37-08:00 ak@suse.de +32 -0 # Intel x86-64 support merge # # include/asm-x86_64/msr.h # 2004/02/17 18:14:37-08:00 ak@suse.de +122 -0 # Intel x86-64 support merge # # include/asm-x86_64/cpufeature.h # 2004/02/17 18:14:37-08:00 ak@suse.de +7 -2 # Intel x86-64 support merge # # arch/x86_64/oprofile/Makefile # 2004/02/17 18:14:37-08:00 ak@suse.de +3 -3 # Intel x86-64 support merge # # arch/x86_64/mm/init.c # 2004/02/17 18:14:37-08:00 ak@suse.de +7 -0 # Intel x86-64 support merge # # arch/x86_64/lib/csum-copy.S # 2004/02/17 18:14:37-08:00 ak@suse.de +1 -12 # Intel x86-64 support merge # # arch/x86_64/lib/copy_page.S # 2004/02/17 18:14:37-08:00 ak@suse.de +1 -8 # Intel x86-64 support merge # # arch/x86_64/kernel/x8664_ksyms.c # 2004/02/17 18:14:37-08:00 ak@suse.de +2 -0 # Intel x86-64 support merge # # arch/x86_64/kernel/smpboot.c # 2004/02/17 18:14:37-08:00 ak@suse.de +34 -0 # Intel x86-64 support merge # # arch/x86_64/kernel/setup.c # 2004/02/17 18:14:37-08:00 ak@suse.de +212 -5 # Intel x86-64 support merge # # arch/x86_64/kernel/process.c # 2004/02/17 18:14:37-08:00 ak@suse.de +46 -0 # Intel x86-64 support merge # # arch/x86_64/kernel/pci-gart.c # 2004/02/17 18:14:37-08:00 ak@suse.de +30 -2 # Intel x86-64 support merge # # arch/x86_64/kernel/head.S # 2004/02/17 18:14:37-08:00 ak@suse.de +7 -12 # Intel x86-64 support merge # # arch/x86_64/kernel/aperture.c # 2004/02/17 18:14:37-08:00 ak@suse.de +4 -0 # Intel x86-64 support merge # # arch/x86_64/kernel/Makefile # 2004/02/17 18:14:37-08:00 ak@suse.de +4 -1 # Intel x86-64 support merge # # arch/x86_64/boot/setup.S # 2004/02/17 18:14:37-08:00 ak@suse.de +16 -6 # Intel x86-64 support merge # # arch/x86_64/Makefile # 2004/02/17 19:42:21-08:00 ak@suse.de +4 -0 # Intel x86-64 support merge # # arch/x86_64/Kconfig # 2004/02/17 18:14:37-08:00 ak@suse.de +34 -3 # Intel x86-64 support merge # # ChangeSet # 2004/02/18 08:56:10-08:00 torvalds@home.osdl.org # Merge bk://kernel.bkbits.net/davem/net-2.6 # into home.osdl.org:/home/torvalds/v2.5/linux # # net/ipv6/ip6_tunnel.c # 2004/02/18 08:56:08-08:00 torvalds@home.osdl.org +0 -0 # Auto merged # # ChangeSet # 2004/02/17 23:01:27-08:00 mbligh@aracnet.com # [NET]: Ditch TSO in loopback driver, it's had enough testing. # # drivers/net/loopback.c # 2004/02/17 22:58:03-08:00 mbligh@aracnet.com +1 -1 # [NET]: Ditch TSO in loopback driver, it's had enough testing. # # ChangeSet # 2004/02/17 19:16:03-08:00 davem@nuts.davemloft.net # Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work # into nuts.davemloft.net:/disk1/BK/net-2.6 # # net/sctp/Kconfig # 2004/02/17 19:15:56-08:00 davem@nuts.davemloft.net +0 -0 # Auto merged # # ChangeSet # 2004/02/17 19:06:26-08:00 ja@ssi.bg # [IPV4]: Add sophisticated ARP reply control via arp_ignore sysctl. # # net/ipv4/devinet.c # 2004/02/17 19:03:26-08:00 ja@ssi.bg +87 -1 # [IPV4]: Add sophisticated ARP reply control via arp_ignore sysctl. # # net/ipv4/arp.c # 2004/02/17 19:03:26-08:00 ja@ssi.bg +42 -2 # [IPV4]: Add sophisticated ARP reply control via arp_ignore sysctl. # # include/linux/sysctl.h # 2004/02/17 19:03:26-08:00 ja@ssi.bg +1 -0 # [IPV4]: Add sophisticated ARP reply control via arp_ignore sysctl. # # include/linux/inetdevice.h # 2004/02/17 19:03:26-08:00 ja@ssi.bg +3 -0 # [IPV4]: Add sophisticated ARP reply control via arp_ignore sysctl. # # Documentation/networking/ip-sysctl.txt # 2004/02/17 19:03:26-08:00 ja@ssi.bg +18 -0 # [IPV4]: Add sophisticated ARP reply control via arp_ignore sysctl. # # ChangeSet # 2004/02/17 17:37:27-08:00 sri@us.ibm.com # [SCTP] Force enable Crypto options that are needed by SCTP config. # # net/sctp/Kconfig # 2004/02/17 17:37:13-08:00 sri@us.ibm.com +8 -2 # [SCTP] Force enable Crypto options that are needed by SCTP config. # # ChangeSet # 2004/02/17 17:16:30-08:00 dsaxena@plexity.net # [PATCH] USB: Fix USB host code to use generic DMA API # # drivers/usb/host/uhci-hcd.h # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +2 -2 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/uhci-hcd.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +25 -20 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ohci.h # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +6 -6 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ohci-sa1111.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +6 -10 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ohci-q.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +2 -2 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ohci-pci.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +24 -21 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ohci-omap.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +4 -8 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ohci-mem.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +10 -10 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ohci-hcd.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +6 -2 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ehci.h # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +5 -5 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ehci-sched.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +2 -2 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ehci-q.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +1 -1 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ehci-mem.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +22 -18 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ehci-hcd.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +10 -8 # USB: Fix USB host code to use generic DMA API # # drivers/usb/host/ehci-dbg.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +5 -5 # USB: Fix USB host code to use generic DMA API # # drivers/usb/core/hcd.h # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +2 -5 # USB: Fix USB host code to use generic DMA API # # drivers/usb/core/hcd.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +20 -18 # USB: Fix USB host code to use generic DMA API # # drivers/usb/core/hcd-pci.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +16 -15 # USB: Fix USB host code to use generic DMA API # # drivers/usb/core/buffer.c # 2004/02/11 03:42:39-08:00 dsaxena@plexity.net +14 -9 # USB: Fix USB host code to use generic DMA API # # ChangeSet # 2004/02/17 20:06:21-05:00 jgarzik@redhat.com # Merge redhat.com:/spare/repo/netdev-2.6/netdev-alloc-6 # into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-7 # # net/ipv6/sit.c # 2004/02/17 20:06:10-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # net/ipv4/ipip.c # 2004/02/17 20:06:10-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # net/ipv4/ip_gre.c # 2004/02/17 20:06:10-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/usb/net/usbnet.c # 2004/02/17 20:06:10-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/02/17 20:03:31-05:00 jgarzik@redhat.com # Hand-merge pc300_tty.c conflicts with netdev. # # drivers/net/wan/pc300_tty.c # 2004/02/17 20:03:26-05:00 jgarzik@redhat.com +2 -4 # Hand-merge pc300_tty.c conflicts with netdev. # # ChangeSet # 2004/02/17 16:47:56-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: unusual_devs.h fixup # # On 15 Feb 2004, Frank D. Cringle wrote: # # > Hi, # > # > my syslog requests that I send this message. See below regarding # > usb-storage: This device ... has an unneeded SubClass entry in unusual_devs.h # # > Feb 15 00:11:16 dagger usb-storage: This device (07cf,1001,1000 S 05 P 00) has an unneeded SubClass entry in unusual_devs.h # > Feb 15 00:11:16 dagger Please send a copy of this message to # # Thank you for sending this in. # # Greg, it looks like an earlier patch changed too much. Here is the fix. # Also included in this patch: # # Moved several entries that were in the wrong positions. # # Removed an entry (0x08ca, 0x2011) that could never be used # because the preceding entry always would take precedence. # # drivers/usb/storage/unusual_devs.h # 2004/02/17 08:45:59-08:00 stern@rowland.harvard.edu +32 -32 # USB Storage: unusual_devs.h fixup # # ChangeSet # 2004/02/17 16:45:15-08:00 mdharm-usb@one-eyed-alien.net # [PATCH] USB Storage: Fix small endian-ness bug # # This patch fixes up a small endian-ness bug from mid-January. # # drivers/usb/storage/sddr09.c # 2004/02/16 06:42:57-08:00 mdharm-usb@one-eyed-alien.net +1 -1 # USB Storage: Fix small endian-ness bug # # ChangeSet # 2004/02/17 16:45:00-08:00 mdharm-usb@one-eyed-alien.net # [PATCH] USB Storage: Reduce unsolicited auto-sense # # This patch (a regeneration of as185) reduces the amount of auto-sensing we # do even further. It also zeros-out the sense buffer in those cases where # we do auto-sense and get back no error. # # drivers/usb/storage/transport.c # 2004/02/14 13:38:17-08:00 mdharm-usb@one-eyed-alien.net +12 -22 # USB Storage: Reduce unsolicited auto-sense # # ChangeSet # 2004/02/17 16:44:43-08:00 mdharm-usb@one-eyed-alien.net # [PATCH] USB Storage: Save the SCSI residue value when auto-sensing # # This patch (a regeneration of as173) saves the residue value of a command # when doing an auto-sense. # # Not that it really matters much -- almost nobody looks at that value. But # it's definately incorrect the way it is, and this fixes it. # # drivers/usb/storage/transport.c # 2004/02/14 13:28:40-08:00 mdharm-usb@one-eyed-alien.net +4 -0 # USB Storage: Save the SCSI residue value when auto-sensing # # ChangeSet # 2004/02/17 16:44:27-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: Reduce auto-sensing for CB transport # # This patch addresses a problem common among digital cameras that use the # CB transport. Namely, too much auto-sensing confuses them; particularly # auto-sensing after INQUIRY. # # I've made some traces of a Windows 2000 driver to see what it does (data # sent to Andries Brouwer for inclusion on his web site; I'll announce # when it's ready for viewing). Basically, it almost never sends REQUEST # SENSE unless it received a STALL from the device. # # That's a pretty bogus way to operate, because it means that Windows has no # way to tell when the device has finished executing a command if the # command doesn't involve an IN transfer. Even after a lengthy WRITE, # Windows continues to transmit more commands without regard for whether or # not they will get overwritten in the device's internal buffer (and hence # not executed). Indeed, exactly that happened with some of the commands in # one of my traces. # # To be safe, we must follow every non-IN transfer with an auto-sense, but # IN transfers that don't stall can be considered to have succeeded. # That's what this patch does. It reduces auto-sensing by a considerable # factor, probably close to half. It also fixes the problem with INQUIRY, # since INQUIRY involves an IN data transfer. # # drivers/usb/storage/transport.c # 2004/01/12 06:48:57-08:00 stern@rowland.harvard.edu +5 -14 # USB Storage: Reduce auto-sensing for CB transport # # ChangeSet # 2004/02/17 16:44:14-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: Treat STALL as failure for CB[I] # # I recall something like this had to be changed a while ago, but it looks # like it's still not right. A STALL during either the command or data # phase of a CB[I] command should indicate a failure. # # drivers/usb/storage/transport.c # 2003/12/17 02:34:28-08:00 stern@rowland.harvard.edu +8 -0 # USB Storage: Treat STALL as failure for CB[I] # # ChangeSet # 2004/02/17 16:43:54-08:00 stern@rowland.harvard.edu # [PATCH] USB Storage: Handle excess 0-length data packets # # This patch is an attempt to cope with Genesys Logic's, shall we say, # creative approach to implementing the USB protocols. Their high-speed # mass storage devices sometimes add an excess 0-length packet to the end of # a data phase transmission. Of course we don't read that packet as part of # the data phase; we see it as a 0-length CSW message. The real CSW follows # immediately after. (Or sometimes a STALL follows immediately after, with # the real CSW coming after that!) # # The patch checks the results of the first attempt to read the CSW. If it # sees a normal packet (not a STALL) with length 0, it retries the read. # Reports from two users indicate that it improves the performance of their # USB-2 DVD drives. # # drivers/usb/storage/transport.c # 2003/12/15 07:11:03-08:00 stern@rowland.harvard.edu +12 -1 # USB Storage: Handle excess 0-length data packets # # ChangeSet # 2004/02/17 16:22:07-08:00 stern@rowland.harvard.edu # [PATCH] USB: Mask "HC Halted" bit in the UHCI status register # # Contrary to the UHCI specification document, in real controllers the "HC # Halted" bit in the status register cannot be cleared by writing a 1. It # will persist for as long as the controller is halted. Hence the bit needs # to be masked away before checking whether or not the controller initiated # an interrupt. # # Without this patch, other devices sharing the same IRQ line might not get # serviced while the host controller is suspended, because the always-on # status bit would cause the UHCI driver to report that it had handled the # interrupt. # # drivers/usb/host/uhci-hcd.c # 2004/02/17 08:44:58-08:00 stern@rowland.harvard.edu +3 -2 # USB: Mask "HC Halted" bit in the UHCI status register # # ChangeSet # 2004/02/17 16:21:51-08:00 stern@rowland.harvard.edu # [PATCH] USB: Simplify locking in UHCI # # This patch is an amalgam of 9 contributions from Stephen Hemminger. It # begins the process of straightening out the use of semaphores and locking # in the UHCI driver by removing unneeded irqsaves and irqrestores. It # also removes an unnecessary list node and makes a couple of other small # changes. # # # # clear_next_interrupt only called in IRQ context don't need irqsave/restore # # Since uhci_finish_completion is only called from IRQ routine, # the irqsave/irqrestore is redundant and unnecessary. # # UHCI transfer_result is only called from IRQ context # so irqsave/restore is unnecessary here. # # uhci_finish_urb is always called from irq so # no need for irqsave/irqrestore. # # uhci_add_complete only called from IRQ context # # The complete_list element in the urb private data is redundant, # since it is only used when the urb is on the complete list. # And given the state transitions, an urb can't be on the complete list # and any other list (remove, or urb_list). # Therefore just use urb_list to link the complete_list # # Use list_move_tail to move between remove (or urb_list) and the complete_list. # # Save irq state in uhci_stop so that the irqsave/irqrestore's # in all the free_pending and remove_pending code can be eliminated. # # Since uhci_stop now saves IRQ state, the free/remove pending routines # no longer need irqsave/irqrestore. # # drivers/usb/host/uhci-hcd.h # 2004/02/17 07:37:36-08:00 stern@rowland.harvard.edu +0 -1 # USB: Simplify locking in UHCI # # drivers/usb/host/uhci-hcd.c # 2004/02/17 07:40:25-08:00 stern@rowland.harvard.edu +30 -45 # USB: Simplify locking in UHCI # # drivers/usb/host/uhci-debug.c # 2004/02/17 07:37:36-08:00 stern@rowland.harvard.edu +1 -1 # USB: Simplify locking in UHCI # # ChangeSet # 2004/02/17 16:21:33-08:00 stern@rowland.harvard.edu # [PATCH] USB: ERRBUF_LEN compiling error when PAGE_SIZE=64KB on IA64 # # Randy, thanks for forwarding this to me. # # > Johannes, # > # > When I compile base kernel 2.6.1 with PAGE_SIZE=64KB on an IA64 # > platform, there is an error. # > CC init/version.o # > LD init/built-in.o # > LD .tmp_vmlinux1 # > drivers/built-in.o(.init.text+0x168a2): In function `uhci_hcd_init': # > : undefined reference to `__you_cannot_kmalloc_that_much' # > make: *** [.tmp_vmlinux1] Error 1 # > # > That's because ERRBUF_LEN (equal to PAGE_SIZE*8) is too long when # > PAGE_SIZE=64KB. Actually, there was a similar error found by Tony. See # > http://marc.theaimsgroup.com/?l=linux-ia64&m=105604765306485&w=2. # > # > Could you change the definition of ERRBUF_LEN to a fixed value? For # > example, 32*1024? # > # > Yanmin # # Yanmin, I'm the new maintainer for the UHCI driver. Yep, that's a # definite error. This will fix it. # # Also included in this patch: change some confusing references from "high # speed" to "full speed" and add proper hyphenation. # # drivers/usb/host/uhci-hcd.h # 2004/02/16 06:41:17-08:00 stern@rowland.harvard.edu +6 -6 # USB: ERRBUF_LEN compiling error when PAGE_SIZE=64KB on IA64 # # drivers/usb/host/uhci-hcd.c # 2004/02/16 06:41:17-08:00 stern@rowland.harvard.edu +6 -6 # USB: ERRBUF_LEN compiling error when PAGE_SIZE=64KB on IA64 # # ChangeSet # 2004/02/17 16:21:17-08:00 stern@rowland.harvard.edu # [PATCH] USB: Even out distribution of UHCI interrupt transfers # # This patch evens out the distribution of interrupt transfers for the UHCI # driver. It insures that no frame must handle interrupt queues for more # than two different periods, thus improving the bandwidth utilization. # # It also simplifies the initialization code by replacing a multi-nested # "if" statement with a simple bit-operation (thanks to Eric Piel for # suggesting this approach). # # ChangeSet # 2004/02/17 16:21:15-08:00 davem@nuts.davemloft.net # [TG3]: Bump driver version and reldate. # # drivers/usb/host/uhci-hcd.c # 2004/02/16 06:26:19-08:00 stern@rowland.harvard.edu +31 -35 # USB: Even out distribution of UHCI interrupt transfers # # drivers/usb/host/uhci-debug.c # 2004/02/16 06:26:19-08:00 stern@rowland.harvard.edu +4 -3 # USB: Even out distribution of UHCI interrupt transfers # # drivers/net/tg3.c # 2004/02/17 16:21:03-08:00 davem@nuts.davemloft.net +2 -2 # [TG3]: Bump driver version and reldate. # # ChangeSet # 2004/02/17 16:20:54-08:00 stern@rowland.harvard.edu # [PATCH] USB: Remove unneeded and error-provoking variable in UHCI # # This patch removes an unneeded "status" field from the UHCI driver's # URB-private data structure. The driver had been storing the status of # completed URBs there rather than in the URBs themselves. This not only is # wasteful of space but is also a cause of bugs, since the USB core relies # on urb->status for proper synchronization with the driver. # # The patch also takes care of a number of small things that have been # bugging me for ages: # # Close a small loophole by allowing an URB to be unlinked even # before the uhci_urb_enqueue() procedure has started. # # Remove some fossil code from back when interrupt URBs were # automagically resubmitted. # # Giveback unlinked URBs in the order they were unlinked. # # Don't set urb->status for dequeued URBs; the core has already # set it for us. # # Rename uhci_remove_pending_qhs to uhci_remove_pending_urbps. # (That has _really_ bothered me!) # # drivers/usb/host/uhci-hcd.h # 2004/02/10 07:48:36-08:00 stern@rowland.harvard.edu +0 -2 # USB: Remove unneeded and error-provoking variable in UHCI # # drivers/usb/host/uhci-hcd.c # 2004/02/10 08:29:52-08:00 stern@rowland.harvard.edu +15 -35 # USB: Remove unneeded and error-provoking variable in UHCI # # drivers/usb/host/uhci-debug.c # 2004/02/10 07:48:02-08:00 stern@rowland.harvard.edu +2 -2 # USB: Remove unneeded and error-provoking variable in UHCI # # ChangeSet # 2004/02/17 16:17:02-08:00 davem@nuts.davemloft.net # [TG3]: Fix early chip programming in tg3_setup_copper_phy(). # # 1) First action must be to set MAC_EVENT to zero. # 2) Do not forget to clear MI_COMPLETION/LNKSTATE_CHANGED # status bits in MAC_STATUS register. # # This fixes the bug wherein the link does not come up at all # at the first ifup done after tg3 module load. # # drivers/net/tg3.c # 2004/02/17 16:16:50-08:00 davem@nuts.davemloft.net +5 -1 # [TG3]: Fix early chip programming in tg3_setup_copper_phy(). # # 1) First action must be to set MAC_EVENT to zero. # 2) Do not forget to clear MI_COMPLETION/LNKSTATE_CHANGED # status bits in MAC_STATUS register. # # This fixes the bug wherein the link does not come up at all # at the first ifup done after tg3 module load. # # ChangeSet # 2004/02/17 16:10:36-08:00 domen@coderock.org # [PATCH] USB: some stv680 fixes # # - swapRGB is already initialized to 0 # - change "swapRGB_on == 1" to match in-source documentation # - submit urb with GFP_ATOMIC (interrupt context) - this made driver # unusable because of "might_sleep" messages. # - group some "case"s # - release vdev on fail # - remove "kfree(0)" checking # # drivers/usb/media/stv680.c # 2004/02/15 07:55:26-08:00 domen@coderock.org +6 -10 # USB: some stv680 fixes # # ChangeSet # 2004/02/17 16:08:12-08:00 davem@nuts.davemloft.net # [TG3]: Two more PHY bug workaround, plus fix DMA test on big-endian. # # drivers/net/tg3.h # 2004/02/17 16:08:00-08:00 davem@nuts.davemloft.net +5 -0 # [TG3]: Two more PHY bug workaround, plus fix DMA test on big-endian. # # drivers/net/tg3.c # 2004/02/17 16:08:00-08:00 davem@nuts.davemloft.net +20 -2 # [TG3]: Two more PHY bug workaround, plus fix DMA test on big-endian. # # ChangeSet # 2004/02/16 22:49:24-08:00 dlstevens@us.ibm.com # [IPV6]: Add sysctl to force MLD version. # # net/ipv6/mcast.c # 2004/02/16 22:49:11-08:00 dlstevens@us.ibm.com +4 -2 # [IPV6]: Add sysctl to force MLD version. # # net/ipv6/addrconf.c # 2004/02/16 22:49:11-08:00 dlstevens@us.ibm.com +11 -1 # [IPV6]: Add sysctl to force MLD version. # # include/linux/sysctl.h # 2004/02/16 22:49:11-08:00 dlstevens@us.ibm.com +2 -1 # [IPV6]: Add sysctl to force MLD version. # # include/linux/ipv6.h # 2004/02/16 22:49:11-08:00 dlstevens@us.ibm.com +2 -0 # [IPV6]: Add sysctl to force MLD version. # # ChangeSet # 2004/02/16 16:59:10-08:00 abbotti@mev.co.uk # [PATCH] USB: ftdi_sio new PIDs and name fix for sysfs # # This patch adds a couple of new PIDs for the ftdi_sio driver and # changes the name of the USB-UIRT device to avoid the "/" character, # as that appears as a directory separator in the sysfs namespace. # # drivers/usb/serial/ftdi_sio.h # 2004/02/10 04:30:41-08:00 abbotti@mev.co.uk +4 -0 # USB: ftdi_sio new PIDs and name fix for sysfs # # drivers/usb/serial/ftdi_sio.c # 2004/02/10 04:30:41-08:00 abbotti@mev.co.uk +12 -1 # USB: ftdi_sio new PIDs and name fix for sysfs # # ChangeSet # 2004/02/16 16:55:03-08:00 pmarques@grupopie.com # [PATCH] USB: fix usblp.c # # The line that IMHO triggers the bug is this: # # "writecount += usblp->writeurb->transfer_buffer_length;" # # It uses "usblp->writeurb->transfer_buffer_length" before initializing it, # assuming that it will be zero on the first run. If it is not zero, but instead # random *negative* garbage from memory, the loop will start printing endless data # from user-space data. # # drivers/usb/class/usblp.c # 2004/02/09 07:03:32-08:00 pmarques@grupopie.com +8 -12 # USB: fix usblp.c # # ChangeSet # 2004/02/16 16:52:13-08:00 david-b@pacbell.net # [PATCH] USB: EHCI updates (mostly periodic schedule scanning) # # [USB] EHCI updates # # Update periodic schedule scanning # - fix shutdown sometimes-hangs (Bernd Porr) # - resolve the "whole frame at once" FIXME # - try harder to avoid rescanning # - don't delegate interrupt qh handling to a buggy helper routine # - describe more of the relevant iso tuning parameters # # One-liners: # - URB_NO_INTERRUPT hint affects ISO # - show correct data toggle in sysfs debug files # - FIXME is resolved by Linus' 20msec delay # # drivers/usb/host/ehci-sched.c # 2004/02/16 08:50:52-08:00 david-b@pacbell.net +32 -64 # USB: EHCI updates (mostly periodic schedule scanning) # # drivers/usb/host/ehci-hub.c # 2004/02/16 08:50:52-08:00 david-b@pacbell.net +1 -1 # USB: EHCI updates (mostly periodic schedule scanning) # # drivers/usb/host/ehci-dbg.c # 2004/02/16 08:50:52-08:00 david-b@pacbell.net +1 -1 # USB: EHCI updates (mostly periodic schedule scanning) # # ChangeSet # 2004/02/16 14:36:24+00:00 davej@redhat.com # [CPUFREQ] bump copyrights. # # arch/i386/kernel/cpu/cpufreq/powernow-k7.c # 2004/02/16 14:36:17+00:00 davej@redhat.com +1 -1 # [CPUFREQ] bump copyrights. # # arch/i386/kernel/cpu/cpufreq/longhaul.c # 2004/02/16 14:36:17+00:00 davej@redhat.com +1 -1 # [CPUFREQ] bump copyrights. # # ChangeSet # 2004/02/15 21:10:42-08:00 sri@us.ibm.com # [SCTP] Revert back to use kmalloc() for ssnmap allocs of sizes < 128K. # # net/sctp/ssnmap.c # 2004/02/15 21:09:58-08:00 sri@us.ibm.com +19 -8 # [SCTP] Revert back to use kmalloc() for ssnmap allocs of sizes < 128K. # # ChangeSet # 2004/02/14 14:58:30-08:00 grundler@parisc-linux.org # [TG3]: Define MBOX_WRITE_REORDER flag to zero on non-x86. # # drivers/net/tg3.h # 2004/02/14 14:58:17-08:00 grundler@parisc-linux.org +4 -0 # [TG3]: Define MBOX_WRITE_REORDER flag to zero on non-x86. # # ChangeSet # 2004/02/14 14:46:44-08:00 hch@lst.de # [SUNGEM]: Kill unused variable on ppc. # # drivers/net/sungem.c # 2004/02/14 14:46:32-08:00 hch@lst.de +0 -1 # [SUNGEM]: Kill unused variable on ppc. # # ChangeSet # 2004/02/14 14:36:44-08:00 wensong@linux-vs.org # [IPVS] update the version number of code to 1.2.0 # # include/net/ip_vs.h # 2004/02/14 14:36:32-08:00 wensong@linux-vs.org +1 -1 # [IPVS] update the version number of code to 1.2.0 # # ChangeSet # 2004/02/14 12:51:56-08:00 wensong@linux-vs.org # [IPVS] retry to run kernel_thread when memory is temporarily exhausted # # net/ipv4/ipvs/ip_vs_sync.c # 2004/02/14 12:51:44-08:00 wensong@linux-vs.org +21 -8 # [IPVS] retry to run kernel_thread when memory is temporarily exhausted # # ChangeSet # 2004/02/14 12:51:17-08:00 wensong@linux-vs.org # [IPVS] remove the superfluous call of waitpid in sync code # # net/ipv4/ipvs/ip_vs_sync.c # 2004/02/14 12:51:05-08:00 wensong@linux-vs.org +0 -9 # [IPVS] remove the superfluous call of waitpid in sync code # # ChangeSet # 2004/02/14 12:47:58-08:00 petri.koistinen@iki.fi # [WAN]: Kconfig clean-up and update URL links. # # drivers/net/wan/Kconfig # 2004/02/14 12:47:46-08:00 petri.koistinen@iki.fi +299 -273 # [WAN]: Kconfig clean-up and update URL links. # # ChangeSet # 2004/02/14 12:41:51-08:00 romieu@fr.zoreil.com # [IRDA]: In stir4200 driver, defer netif_start_queue() until device opening succeeds. # # drivers/net/irda/stir4200.c # 2004/02/14 12:41:39-08:00 romieu@fr.zoreil.com +2 -2 # [IRDA]: In stir4200 driver, defer netif_start_queue() until device opening succeeds. # # ChangeSet # 2004/02/14 12:41:16-08:00 romieu@fr.zoreil.com # [IRDA]: Fix error return status in stir4200 driver. # # If stir_reset() succeeds, stir_net_open() must not return a # success status code for every failure until irlap_open(). # # drivers/net/irda/stir4200.c # 2004/02/14 12:36:52-08:00 romieu@fr.zoreil.com +2 -1 # [IRDA]: Fix error return status in stir4200 driver. # # If stir_reset() succeeds, stir_net_open() must not return a # success status code for every failure until irlap_open(). # # ChangeSet # 2004/02/13 23:20:47-08:00 ja@ssi.bg # [IPV4]: Add configurable restriction of local IP announcements in ARP requests. # # net/ipv4/devinet.c # 2004/02/13 23:20:35-08:00 ja@ssi.bg +9 -1 # [IPV4]: Add configurable restriction of local IP announcements in ARP requests. # # net/ipv4/arp.c # 2004/02/13 23:20:35-08:00 ja@ssi.bg +28 -3 # [IPV4]: Add configurable restriction of local IP announcements in ARP requests. # # include/linux/sysctl.h # 2004/02/13 23:20:35-08:00 ja@ssi.bg +1 -0 # [IPV4]: Add configurable restriction of local IP announcements in ARP requests. # # include/linux/inetdevice.h # 2004/02/13 23:20:35-08:00 ja@ssi.bg +2 -0 # [IPV4]: Add configurable restriction of local IP announcements in ARP requests. # # Documentation/networking/ip-sysctl.txt # 2004/02/13 23:20:35-08:00 ja@ssi.bg +31 -0 # [IPV4]: Add configurable restriction of local IP announcements in ARP requests. # # ChangeSet # 2004/02/13 23:13:01-08:00 grundler@parisc-linux.org # [TG3]: Abstract out mailbox workarounds into tw32_{rx,tw}_mbox(). # # drivers/net/tg3.c # 2004/02/13 23:12:45-08:00 grundler@parisc-linux.org +37 -54 # [TG3]: Abstract out mailbox workarounds into tw32_{rx,tw}_mbox(). # # ChangeSet # 2004/02/13 23:06:58-08:00 herbert@gondor.apana.org.au # [IPSEC]: Move hardware headers for decaped packets. # # Move the hardware header so that it appears next to the payload for AF_PACKET # sockets. # # net/ipv6/xfrm6_input.c # 2004/02/13 23:06:45-08:00 herbert@gondor.apana.org.au +17 -8 # [IPSEC]: Move hardware headers for decaped packets. # # Move the hardware header so that it appears next to the payload for AF_PACKET # sockets. # # net/ipv4/xfrm4_input.c # 2004/02/13 23:06:45-08:00 herbert@gondor.apana.org.au +13 -5 # [IPSEC]: Move hardware headers for decaped packets. # # Move the hardware header so that it appears next to the payload for AF_PACKET # sockets. # # net/core/dev.c # 2004/02/13 23:06:45-08:00 herbert@gondor.apana.org.au +1 -0 # [IPSEC]: Move hardware headers for decaped packets. # # Move the hardware header so that it appears next to the payload for AF_PACKET # sockets. # # include/linux/skbuff.h # 2004/02/13 23:06:45-08:00 herbert@gondor.apana.org.au +3 -0 # [IPSEC]: Move hardware headers for decaped packets. # # Move the hardware header so that it appears next to the payload for AF_PACKET # sockets. # # ChangeSet # 2004/02/13 23:05:21-08:00 davem@nuts.davemloft.net # [IRDA]: Forgot to add stir4200.c in previous commit. # # drivers/net/irda/stir4200.c # 2004/02/13 23:05:04-08:00 davem@nuts.davemloft.net +1282 -0 # [IRDA]: Forgot to add stir4200.c in previous commit. # # drivers/net/irda/stir4200.c # 2004/02/13 23:05:04-08:00 davem@nuts.davemloft.net +0 -0 # BitKeeper file /disk1/BK/net-2.6/drivers/net/irda/stir4200.c # # ChangeSet # 2004/02/13 23:04:17-08:00 jt@bougret.hpl.hp.com # [IRDA]: Add stir4200 driver. # # After a long maturation, this is time to send you the latest # version of the stir4200 USB driver. Initially started by Paul Stewart, # modified by Martin Diehl and me, and later partially rewriten by # Stephen Hemminger. # The hardware has many quirks. This is the first version that # work reliably at SIR and mostly work at FIR. We may never get optimal # operation from this hardware due to its pecularities, but at least its # now usable. # # drivers/net/irda/Makefile # 2004/02/13 23:01:36-08:00 jt@bougret.hpl.hp.com +1 -0 # [IRDA]: Add stir4200 driver. # # After a long maturation, this is time to send you the latest # version of the stir4200 USB driver. Initially started by Paul Stewart, # modified by Martin Diehl and me, and later partially rewriten by # Stephen Hemminger. # The hardware has many quirks. This is the first version that # work reliably at SIR and mostly work at FIR. We may never get optimal # operation from this hardware due to its pecularities, but at least its # now usable. # # drivers/net/irda/Kconfig # 2004/02/13 23:01:36-08:00 jt@bougret.hpl.hp.com +16 -0 # [IRDA]: Add stir4200 driver. # # After a long maturation, this is time to send you the latest # version of the stir4200 USB driver. Initially started by Paul Stewart, # modified by Martin Diehl and me, and later partially rewriten by # Stephen Hemminger. # The hardware has many quirks. This is the first version that # work reliably at SIR and mostly work at FIR. We may never get optimal # operation from this hardware due to its pecularities, but at least its # now usable. # # ChangeSet # 2004/02/13 12:27:20-05:00 jgarzik@redhat.com # [libata] catch, and ack, spurious DMA interrupts # # Hardware issue on Intel ICH5 requires an additional ack sequence # over and above the normal IDE DMA interrupt ack requirements. Issue # described in post to freebsd list: # http://www.mail-archive.com/freebsd-stable@freebsd.org/msg58421.html # # Since the bug workaround only requires a single additional PIO or # MMIO read in the interrupt handler, it is applied to all chipsets # using the standard libata interrupt handler. # # Credit for research the issue, creating the patch, and testing the # patch all go to Jon Burgess. # # drivers/scsi/libata-core.c # 2004/02/13 12:25:47-05:00 jgarzik@redhat.com +36 -0 # [libata] catch, and ack, spurious DMA interrupts # # Hardware issue on Intel ICH5 requires an additional ack sequence # over and above the normal IDE DMA interrupt ack requirements. Issue # described in post to freebsd list: # http://www.mail-archive.com/freebsd-stable@freebsd.org/msg58421.html # # Since the bug workaround only requires a single additional PIO or # MMIO read in the interrupt handler, it is applied to all chipsets # using the standard libata interrupt handler. # # Credit for research the issue, creating the patch, and testing the # patch all go to Jon Burgess. # # ChangeSet # 2004/02/13 12:13:32+00:00 davej@redhat.com # [CPUFREQ] Update URL. # # MAINTAINERS # 2004/02/13 12:13:26+00:00 davej@redhat.com +1 -1 # [CPUFREQ] Update URL. # # ChangeSet # 2004/02/12 12:05:24-08:00 davem@nuts.davemloft.net # [IPV6]: Kill 64-bit warnings in ndisc.c # # net/ipv6/ndisc.c # 2004/02/12 12:05:08-08:00 davem@nuts.davemloft.net +1 -1 # [IPV6]: Kill 64-bit warnings in ndisc.c # # ChangeSet # 2004/02/12 11:58:30-08:00 dlstevens@us.ibm.com # [IPV6]: Except MLD packets from source filtering. # # Co-authored with Yoshfuji Hideaki. # # net/ipv6/mcast.c # 2004/02/12 11:58:18-08:00 dlstevens@us.ibm.com +28 -1 # [IPV6]: Except MLD packets from source filtering. # # Co-authored with Yoshfuji Hideaki. # # net/ipv6/ip6_input.c # 2004/02/12 11:58:18-08:00 dlstevens@us.ibm.com +19 -14 # [IPV6]: Except MLD packets from source filtering. # # Co-authored with Yoshfuji Hideaki. # # include/net/addrconf.h # 2004/02/12 11:58:18-08:00 dlstevens@us.ibm.com +1 -0 # [IPV6]: Except MLD packets from source filtering. # # Co-authored with Yoshfuji Hideaki. # # ChangeSet # 2004/02/12 09:23:55-06:00 shaggy@austin.ibm.com # JFS: Don't do filename translation by default # # Due to its roots in OS/2, JFS has always tried to convert pathnames # into unicode. Unfortunately, it never had a reliable idea of what # the incoming character set was, so it defaulted to CONFIG_NLS_DEFAULT. # # This behavior was confusing and many users have requested that JFS # have a more sane behavior. This patch changes the default behavior # to store the incoming bytes directly without translation. This is # consistent with the behavior when the default value of # CONFIG_NLS_DEFAULT (iso8859-1) was defined. The default behavior # can be overridden by using the iocharset mount option. # # fs/jfs/super.c # 2004/02/12 09:23:49-06:00 shaggy@austin.ibm.com +2 -4 # Don't do file name translation by default # # fs/jfs/jfs_unicode.c # 2004/02/12 09:23:49-06:00 shaggy@austin.ibm.com +31 -17 # Don't do file name translation by default # # Documentation/filesystems/jfs.txt # 2004/02/12 09:23:49-06:00 shaggy@austin.ibm.com +3 -16 # Make default treatment of filenames sane -- only translate if # iocharset mount option present. Also get rid of out-of-date todo # list. # # ChangeSet # 2004/02/11 22:04:26-08:00 petri.koistinen@iki.fi # [HAMRADIO]: Fix URLs in Kconfig. # # drivers/net/hamradio/Kconfig # 2004/02/11 22:04:14-08:00 petri.koistinen@iki.fi +8 -5 # [HAMRADIO]: Fix URLs in Kconfig. # # ChangeSet # 2004/02/11 22:03:43-08:00 petri.koistinen@iki.fi # [IRDA]: Fix URLs in Kconfig. # # drivers/net/irda/Kconfig # 2004/02/11 22:03:31-08:00 petri.koistinen@iki.fi +1 -1 # [IRDA]: Fix URLs in Kconfig. # # ChangeSet # 2004/02/11 21:10:23-08:00 yoshfuji@linux-ipv6.org # [IPV6]: Kill remaining in6_u.u6_addrX uses. # # net/ipv6/netfilter/ip6t_eui64.c # 2004/02/11 21:10:04-08:00 yoshfuji@linux-ipv6.org +1 -1 # [IPV6]: Kill remaining in6_u.u6_addrX uses. # # net/ipv6/addrconf.c # 2004/02/11 21:10:04-08:00 yoshfuji@linux-ipv6.org +1 -1 # [IPV6]: Kill remaining in6_u.u6_addrX uses. # # ChangeSet # 2004/02/11 19:44:47-08:00 kas@informatics.muni.cz # [NET]: Do not send negative 2nd arg to skb_put(). # # With help from Yoshfuji Hideaki. # # net/ipv4/fib_rules.c # 2004/02/11 19:44:24-08:00 kas@informatics.muni.cz +1 -1 # [NET]: Do not send negative 2nd arg to skb_put(). # # With help from Yoshfuji Hideaki. # # net/decnet/dn_rules.c # 2004/02/11 19:44:24-08:00 kas@informatics.muni.cz +1 -1 # [NET]: Do not send negative 2nd arg to skb_put(). # # With help from Yoshfuji Hideaki. # # ChangeSet # 2004/02/11 19:31:09-08:00 miguel@cetuc.puc-rio.br # [NET_SCHED]: Fix slot leakage in SFQ scheduler. # # net/sched/sch_sfq.c # 2004/02/11 19:30:57-08:00 miguel@cetuc.puc-rio.br +1 -0 # [NET_SCHED]: Fix slot leakage in SFQ scheduler. # # ChangeSet # 2004/02/11 12:20:49-08:00 brazilnut@us.ibm.com # [NET]: Fix ethtool oops if device support get but not set ringparam. # # net/core/ethtool.c # 2004/02/11 12:20:37-08:00 brazilnut@us.ibm.com +1 -1 # [NET]: Fix ethtool oops if device support get but not set ringparam. # # ChangeSet # 2004/02/11 12:18:35-08:00 yoshfuji@linux-ipv6.org # [IPV6]: Spelling corrections, and remove some XXX's # # net/ipv6/route.c # 2004/02/11 12:18:23-08:00 yoshfuji@linux-ipv6.org +1 -1 # [IPV6]: Spelling corrections, and remove some XXX's # # net/ipv6/raw.c # 2004/02/11 12:18:23-08:00 yoshfuji@linux-ipv6.org +3 -3 # [IPV6]: Spelling corrections, and remove some XXX's # # net/ipv6/ndisc.c # 2004/02/11 12:18:22-08:00 yoshfuji@linux-ipv6.org +2 -2 # [IPV6]: Spelling corrections, and remove some XXX's # # net/ipv6/ip6_tunnel.c # 2004/02/11 12:18:22-08:00 yoshfuji@linux-ipv6.org +1 -1 # [IPV6]: Spelling corrections, and remove some XXX's # # net/ipv6/ip6_fib.c # 2004/02/11 12:18:22-08:00 yoshfuji@linux-ipv6.org +1 -1 # [IPV6]: Spelling corrections, and remove some XXX's # # net/ipv6/exthdrs.c # 2004/02/11 12:18:22-08:00 yoshfuji@linux-ipv6.org +1 -1 # [IPV6]: Spelling corrections, and remove some XXX's # # net/ipv6/addrconf.c # 2004/02/11 12:18:22-08:00 yoshfuji@linux-ipv6.org +1 -1 # [IPV6]: Spelling corrections, and remove some XXX's # # ChangeSet # 2004/02/11 12:16:41-08:00 grundler@parisc-linux.org # [PKTGEN]: Fix unintentional unaligned access. # # net/core/pktgen.c # 2004/02/11 12:16:29-08:00 grundler@parisc-linux.org +12 -6 # [PKTGEN]: Fix unintentional unaligned access. # # ChangeSet # 2004/02/11 12:14:10-08:00 yoshfuji@linux-ipv6.org # [IPV6]: Clean up ndisc printks. # # net/ipv6/ndisc.c # 2004/02/11 12:13:47-08:00 yoshfuji@linux-ipv6.org +104 -77 # [IPV6]: Clean up ndisc printks. # # ChangeSet # 2004/02/11 13:35:46-06:00 shaggy@austin.ibm.com # JFS: get_UCSname does not need nls_tab argument # # This is a minor code cleanup. get_UCSname can get nls_tab by # following the dentry to the superblock. This makes the calling code # simpler and prettier. # # fs/jfs/namei.c # 2004/02/11 13:35:41-06:00 shaggy@austin.ibm.com +10 -13 # get_UCSname doesn't need nls_tab argument # # fs/jfs/jfs_unicode.h # 2004/02/11 13:35:41-06:00 shaggy@austin.ibm.com +1 -2 # get_UCSname doesn't need nls_tab argument # # fs/jfs/jfs_unicode.c # 2004/02/11 13:35:41-06:00 shaggy@austin.ibm.com +3 -3 # get_UCSname doesn't need nls_tab argument # # ChangeSet # 2004/02/11 11:20:02-08:00 linux@kodeaffe.de # [NET]: Mention tuxmobil.org in drivers/net/Kconfig. # # drivers/net/Kconfig # 2004/02/11 11:19:50-08:00 linux@kodeaffe.de +2 -1 # [NET]: Mention tuxmobil.org in drivers/net/Kconfig. # # ChangeSet # 2004/02/11 10:42:16-08:00 grundler@parisc-linux.org # [TG3]: Reset GRC, if necessary, before DMA test. # # With help from Michael Chan. # # drivers/net/tg3.c # 2004/02/11 10:41:56-08:00 grundler@parisc-linux.org +16 -1 # [TG3]: Reset GRC, if necessary, before DMA test. # # With help from Michael Chan. # # ChangeSet # 2004/02/11 10:38:41-08:00 yoshfuji@linux-ipv6.org # [NET]: Kill bogus kmem cache alignment in neigh_table_init(). # # net/core/neighbour.c # 2004/02/11 10:38:29-08:00 yoshfuji@linux-ipv6.org +1 -2 # [NET]: Kill bogus kmem cache alignment in neigh_table_init(). # # ChangeSet # 2004/02/11 10:37:48-08:00 kazunori@miyazawa.org # [IPV6]: Unify ipv6 output routine. # # net/ipv6/xfrm6_policy.c # 2004/02/11 10:34:58-08:00 kazunori@miyazawa.org +1 -11 # [IPV6]: Unify ipv6 output routine. # # net/ipv6/route.c # 2004/02/11 10:34:58-08:00 kazunori@miyazawa.org +5 -4 # [IPV6]: Unify ipv6 output routine. # # net/ipv6/ndisc.c # 2004/02/11 10:34:58-08:00 kazunori@miyazawa.org +3 -58 # [IPV6]: Unify ipv6 output routine. # # include/net/ipv6.h # 2004/02/11 10:34:58-08:00 kazunori@miyazawa.org +1 -0 # [IPV6]: Unify ipv6 output routine. # # include/net/ip6_route.h # 2004/02/11 10:34:58-08:00 kazunori@miyazawa.org +1 -0 # [IPV6]: Unify ipv6 output routine. # # include/linux/ipv6_route.h # 2004/02/11 10:34:58-08:00 kazunori@miyazawa.org +0 -1 # [IPV6]: Unify ipv6 output routine. # # ChangeSet # 2004/02/08 13:09:03-08:00 willy@debian.org # [TG32]: Use pci_get_slot() to find 5704 peers, to handle domains properly. # # drivers/net/tg3.c # 2004/02/08 13:06:21-08:00 willy@debian.org +13 -12 # [TG32]: Use pci_get_slot() to find 5704 peers, to handle domains properly. # # ChangeSet # 2004/02/07 00:05:44-05:00 jgarzik@redhat.com # Merge # # drivers/net/wireless/airo.c # 2004/02/07 00:05:40-05:00 jgarzik@redhat.com +0 -0 # SCCS merged # # net/ipv6/sit.c # 2004/02/07 00:04:18-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # net/ipv6/ip6_tunnel.c # 2004/02/07 00:04:18-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/usb/net/usbnet.c # 2004/02/07 00:04:18-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/pppoe.c # 2004/02/07 00:04:18-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/acenic.c # 2004/02/07 00:04:18-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/02/07 00:00:35-05:00 jgarzik@redhat.com # Merge redhat.com:/spare/repo/linux-2.5 # into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-6 # # drivers/net/wan/pc300_drv.c # 2004/02/07 00:00:24-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/02/06 23:38:05-05:00 jgarzik@redhat.com # Merge redhat.com:/spare/repo/linux-2.5 # into redhat.com:/spare/repo/netdev-2.6/e100-2 # # drivers/net/Makefile # 2004/02/06 23:37:57-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/Kconfig # 2004/02/06 23:37:57-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/01/19 18:58:13-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan] apply hdlc cleanups to new driver pci200syn # # drivers/net/wan/pci200syn.c # 2004/01/19 18:58:08-05:00 viro@parcelfarce.linux.theplanet.co.uk +31 -19 # [wan] apply hdlc cleanups to new driver pci200syn # # ChangeSet # 2004/01/19 18:44:37-05:00 jgarzik@redhat.com # Merge redhat.com:/spare/repo/netdev-2.6/netdev-alloc-6 # into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-7 # # net/ipv4/ipmr.c # 2004/01/19 18:44:26-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # net/bluetooth/bnep/core.c # 2004/01/19 18:44:26-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/s390/net/qeth.c # 2004/01/19 18:44:26-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/s390/net/netiucv.c # 2004/01/19 18:44:26-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/s390/net/lcs.c # 2004/01/19 18:44:26-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/wireless/wl3501_cs.c # 2004/01/19 18:44:26-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/wireless/airo.c # 2004/01/19 18:44:26-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/wan/lapbether.c # 2004/01/19 18:44:25-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/01/19 18:41:32-05:00 jgarzik@redhat.com # Merge redhat.com:/spare/repo/netdev-2.6/netdev-alloc-5 # into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-6 # # drivers/net/wan/pc300_drv.c # 2004/01/19 18:41:21-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/wan/lapbether.c # 2004/01/19 18:41:21-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/wan/farsync.c # 2004/01/19 18:41:21-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/01/19 18:11:34-05:00 jgarzik@redhat.com # Merge redhat.com:/spare/repo/netdev-2.6/e100-1 # into redhat.com:/spare/repo/netdev-2.6/e100-2 # # drivers/net/Makefile # 2004/01/19 18:11:23-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # drivers/net/Kconfig # 2004/01/19 18:11:23-05:00 jgarzik@redhat.com +0 -0 # Auto merged # # ChangeSet # 2004/01/13 15:30:03-05:00 scott.feldman@intel.com # [netdrvr e100] copyright + trailing blanks + misc # # * Misc: 2004 copyright, remove trailing white space, remove some # unused symbols. # # drivers/net/e100.c # 2004/01/09 19:50:02-05:00 scott.feldman@intel.com +86 -95 # copyright + trailing blanks + misc # # ChangeSet # 2004/01/13 15:29:55-05:00 scott.feldman@intel.com # [netdrvr e100] fix slab corruption # # * Addresses two problems, both resulting in slab corruption: 1) # driver indicating skb while HW is still DMA'ing (ouch!), 2) # driver not stopping receiver activity before downing i/f. # Fix is 1) wait for RNR (receiver-no-resources) interrupt # before restarting receiver, 2) reseting HW to stop receiver # before stopping i/f. # # This issue was also reproducible with eepro100. You need to turn off # the copybreak, and reduce the number of descriptors to 4. Then bang on # it with pktgen with 60-byte packets, with slab debugging enabled. # # For e100-3.0.x, the issue was a lot easier to reproduce with NAPI, # because NAPI polls independently of where the HW is at, so it's easier # for us to catch HW in the middle of finishing off the last Rx (as # it runs out of resources) and asking HW if it's idle. Checking the # RU status is not-reliable! That's the problem, and the mistake both # eepro100 and e100-3.0.x were making. # # The solution is rely on RNR interrupts as the only indicator that HW is # truly done, and then we're ready to restart the RU. We should only get # RNR interrupts when we overrun the Rx ring. With NAPI, if the ring is # overrun, we'll post RNR, but not restart the RU until we're out of # polling. Without NAPI, we'll restart the RU as soon as we get RNR. # # I ran some 24-hour tests with and without NAPI (with 4 descriptors) # and didn't get any corruption. Prior to this patch, I would get many # errors about slab corruption. # # Also, the patch is larger than you might expect, but I initially thought # I was doing something wrong with managing the ring, so I that # code using old fashion double-link list. The ring management wasn't the # problem, after all, but I prefer the old-fashion d-link implementation # as it's easier to read. # # drivers/net/e100.c # 2004/01/09 19:44:59-05:00 scott.feldman@intel.com +85 -100 # fix slab corruption # # ChangeSet # 2004/01/12 17:27:00-05:00 jgarzik@redhat.com # Eliminate ancient and unused include/linux/{if_pppvar,ppp}.h. # # Well, unused except for one silly constant in isdn_ppp.c. # # include/linux/isdn.h # 2004/01/12 17:26:56-05:00 jgarzik@redhat.com +0 -1 # Eliminate ancient and unused include/linux/{if_pppvar,ppp}.h. # # Well, unused except for one silly constant in isdn_ppp.c. # # drivers/net/pppoe.c # 2004/01/12 17:26:56-05:00 jgarzik@redhat.com +0 -1 # Eliminate ancient and unused include/linux/{if_pppvar,ppp}.h. # # Well, unused except for one silly constant in isdn_ppp.c. # # drivers/isdn/i4l/isdn_ppp.c # 2004/01/12 17:26:56-05:00 jgarzik@redhat.com +3 -0 # Eliminate ancient and unused include/linux/{if_pppvar,ppp}.h. # # Well, unused except for one silly constant in isdn_ppp.c. # # BitKeeper/deleted/.del-ppp.h~2ed9a29f82d978a2 # 2004/01/11 15:45:49-05:00 jgarzik@redhat.com +0 -0 # Delete: include/linux/ppp.h # # BitKeeper/deleted/.del-if_pppvar.h~c9982735aed95c5b # 2004/01/11 15:45:29-05:00 jgarzik@redhat.com +0 -0 # Delete: include/linux/if_pppvar.h # # ChangeSet # 2004/01/11 01:19:14-05:00 viro@parcelfarce.linux.theplanet.co.uk # Remove unused and invalid 'struct ppp' definition from if_pppvar.h. # # include/linux/if_pppvar.h # 2004/01/11 01:19:09-05:00 viro@parcelfarce.linux.theplanet.co.uk +0 -68 # Remove unused and invalid 'struct ppp' definition from if_pppvar.h. # # ChangeSet # 2004/01/10 20:16:19-05:00 shemminger@osdl.org # [PATCH] bugfixes for dgrs.c # # Update the RightSwitch dgrs.c driver for net-drivers-2.5-exp (2.6.1-rc3) # to resolve some of the outstanding cruft there. Al may have a better/newer patch. # # * Don't copy net_device structure on slave device! This won't work # because of state variables in structure. # * make sure and request_regions before doing i/o to the card # * use cpu_relax rather than barrier while spin waiting # * don't use dev->init to do the probing work because hard to get unwind # correct # * Use new pci/eisa probing model, don't search the bus directly # Beneficial side effect, don't need to keep on device list anymore. # * Be more careful about releaseing resources in error paths # # Compiled and module loaded/unloaded, but don't have this hardware. # # drivers/net/dgrs.c # 2004/01/08 11:44:05-05:00 shemminger@osdl.org +218 -145 # bugfixes for dgrs.c # # ChangeSet # 2004/01/10 19:24:27-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr s390/qeth] Alloc fixes # # drivers/s390/net/qeth.c # 2004/01/10 19:24:23-05:00 viro@parcelfarce.linux.theplanet.co.uk +23 -31 # [netdrvr s390/qeth] Alloc fixes # # ChangeSet # 2004/01/10 19:23:59-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr shaper] fix double-free # # Fix for double-free (we do explicit free_netdev() after unregister_netdev() # in shaper.c) # # drivers/net/shaper.c # 2004/01/10 19:23:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +0 -1 # [netdrvr shaper] fix double-free # # Fix for double-free (we do explicit free_netdev() after unregister_netdev() # in shaper.c) # # ChangeSet # 2004/01/10 19:23:34-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr dvb/dvb_net] fixes # # Don't leave dvbnet->device[...] dangling after we free the sucker # # drivers/media/dvb/dvb-core/dvb_net.c # 2004/01/10 19:23:30-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -1 # [netdrvr dvb/dvb_net] fixes # # Don't leave dvbnet->device[...] dangling after we free the sucker # # ChangeSet # 2004/01/10 19:22:49-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr arch/uml] leak fix # # arch/um/drivers/net_kern.c # 2004/01/10 19:22:44-05:00 viro@parcelfarce.linux.theplanet.co.uk +5 -1 # [netdrvr arch/uml] leak fix # # ChangeSet # 2004/01/10 19:21:37-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr saa9730] fix double-free # # Fixed double-free in saa9730.c (caller of that function does free_netdev() # itself if we return an error). # # drivers/net/saa9730.c # 2004/01/10 19:21:33-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -1 # [netdrvr saa9730] fix double-free # # Fixed double-free in saa9730.c (caller of that function does free_netdev() # itself if we return an error). # # ChangeSet # 2004/01/10 19:21:02-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr arm/am79c961] Fix for IO-before-request_region race # # drivers/net/arm/am79c961a.c # 2004/01/10 19:20:58-05:00 viro@parcelfarce.linux.theplanet.co.uk +5 -5 # [netdrvr arm/am79c961] Fix for IO-before-request_region race # # ChangeSet # 2004/01/10 19:20:29-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan] leak fixes in hostess_sv11, lapbether # # drivers/net/wan/lapbether.c # 2004/01/10 19:20:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -0 # [wan] leak fixes in hostess_sv11, lapbether # # drivers/net/wan/hostess_sv11.c # 2004/01/10 19:20:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -2 # [wan] leak fixes in hostess_sv11, lapbether # # ChangeSet # 2004/01/10 19:19:40-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr s390/lcs] Leak fix # # lcs_cleanup_channel() is not enough there, we need full # lcs_cleanup_card() (e.g. to free netdev) # # drivers/s390/net/lcs.c # 2004/01/10 19:19:36-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -2 # [netdrvr s390/lcs] Leak fix # # lcs_cleanup_channel() is not enough there, we need full # lcs_cleanup_card() (e.g. to free netdev) # # ChangeSet # 2004/01/10 19:19:11-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wireless orinoco] check alloc_etherdev for failure # # drivers/net/wireless/orinoco.c # 2004/01/10 19:19:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -0 # [wireless orinoco] check alloc_etherdev for failure # # ChangeSet # 2004/01/10 19:18:42-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr apne] resource leak fix # # drivers/net/apne.c # 2004/01/10 19:18:38-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -0 # [netdrvr apne] resource leak fix # # ChangeSet # 2004/01/10 19:18:06-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr 3c509] Leak fixed # # drivers/net/3c509.c # 2004/01/10 19:18:02-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -0 # [netdrvr 3c509] Leak fixed # # ChangeSet # 2004/01/10 19:17:33-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr acenic] Race and leak fixes # # drivers/net/acenic.c # 2004/01/10 19:17:29-05:00 viro@parcelfarce.linux.theplanet.co.uk +8 -7 # [netdrvr acenic] Race and leak fixes # # ChangeSet # 2004/01/10 19:16:58-05:00 viro@parcelfarce.linux.theplanet.co.uk # [all over] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/irda/irlan/irlan_eth.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/irda/irlan/irlan_common.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/ipv6/sit.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/ipv6/ip6_tunnel.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/ipv4/ipmr.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/ipv4/ipip.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/ipv4/ip_gre.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/bluetooth/bnep/core.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/atm/lec.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # net/8021q/vlan.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/usb/net/usbnet.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/usb/net/rtl8150.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/usb/net/pegasus.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/usb/net/kaweth.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/usb/net/catc.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/s390/net/lcs.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/net/wireless/wl3501_cs.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/net/wan/hdlc_fr.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -2 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/net/wan/dlci.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/net/tokenring/3c359.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/net/fc/iph5526.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/net/appletalk/cops.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # drivers/message/fusion/mptlan.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # arch/ppc/8xx_io/fec.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # arch/ppc/8xx_io/enet.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # arch/ppc/8260_io/fcc_enet.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # arch/ppc/8260_io/enet.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # arch/ia64/hp/sim/simeth.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # arch/cris/arch-v10/drivers/ethernet.c # 2004/01/10 19:16:53-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [netdrvr] more kfree -> free_netdev # # Remaining kfree -> free_netdev replacements (easy part of free_netdev() fixes) # # ChangeSet # 2004/01/10 19:16:08-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr isa-skeleton] cleanups and fixes # # isa-skeleton.c got the same changes as actual ISA drivers - dynamic allocation, # leak fixes, clobbering fixes, fix for IO-before-request_region(). # # drivers/net/isa-skeleton.c # 2004/01/10 19:16:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +79 -54 # [netdrvr isa-skeleton] cleanups and fixes # # isa-skeleton.c got the same changes as actual ISA drivers - dynamic allocation, # leak fixes, clobbering fixes, fix for IO-before-request_region(). # # ChangeSet # 2004/01/10 19:15:29-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan sdla] Fixed leaks and double-free # # drivers/net/wan/sdla.c # 2004/01/10 19:15:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +87 -107 # [wan sdla] Fixed leaks and double-free # # ChangeSet # 2004/01/10 19:15:06-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr fec] switched to sane allocation. It still leaks on failure exits, though. # # drivers/net/fec.c # 2004/01/10 19:15:01-05:00 viro@parcelfarce.linux.theplanet.co.uk +24 -15 # [netdrvr fec] switched to sane allocation. It still leaks on failure exits, though. # # ChangeSet # 2004/01/10 19:14:14-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr s390/netiucv] partially sanitized wrt allocation # # drivers/s390/net/netiucv.c # 2004/01/10 19:14:09-05:00 viro@parcelfarce.linux.theplanet.co.uk +28 -17 # [netdrvr s390/netiucv] partially sanitized wrt allocation # # ChangeSet # 2004/01/10 19:13:39-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wireless airo] switched to sane allocation. # # drivers/net/wireless/airo.c # 2004/01/10 19:13:35-05:00 viro@parcelfarce.linux.theplanet.co.uk +11 -16 # [wireless airo] switched to sane allocation. # # ChangeSet # 2004/01/10 19:09:14-05:00 viro@parcelfarce.linux.theplanet.co.uk # [netdrvr tun] Killed bogus ->init() # # drivers/net/tun.c # 2004/01/10 19:09:09-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -7 # [netdrvr tun] Killed bogus ->init() # # ChangeSet # 2004/01/10 19:08:47-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan sealevel] Plugged a leak # # drivers/net/wan/sealevel.c # 2004/01/10 19:08:42-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -0 # [wan sealevel] Plugged a leak # # ChangeSet # 2004/01/10 19:08:20-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan sbni] sane net_device allocation; plug a bunch of leaks # # Plugged a bunch of leaks in sbni. Replaced check_region() with intended # request_region() in pci probe (BTW, that bugger should be turned into # normal PCI driver at some point). # # drivers/net/wan/sbni.c # 2004/01/10 19:08:16-05:00 viro@parcelfarce.linux.theplanet.co.uk +28 -9 # [wan sbni] sane net_device allocation; plug a bunch of leaks # # Plugged a bunch of leaks in sbni. Replaced check_region() with intended # request_region() in pci probe (BTW, that bugger should be turned into # normal PCI driver at some point). # # ChangeSet # 2004/01/10 19:07:29-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hostess_sv11] sane net_device allocation # # Sane allocation in sv11. Switched it to SET_MODULE_OWNER(), while we are # at it. Fixed a leak on exit and destroy-before-unregister race. # # drivers/net/wan/hostess_sv11.c # 2004/01/10 19:07:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +17 -15 # [wan hostess_sv11] sane net_device allocation # # Sane allocation in sv11. Switched it to SET_MODULE_OWNER(), while we are # at it. Fixed a leak on exit and destroy-before-unregister race. # # ChangeSet # 2004/01/10 19:06:53-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc_fr] Switched allocation of net_device to alloc_netdev(). # # drivers/net/wan/hdlc_fr.c # 2004/01/10 19:06:48-05:00 viro@parcelfarce.linux.theplanet.co.uk +18 -15 # [wan hdlc_fr] Switched allocation of net_device to alloc_netdev(). # # ChangeSet # 2004/01/10 19:06:22-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # include/linux/hdlc.h # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -8 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # drivers/net/wan/wanxl.c # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # drivers/net/wan/pc300_drv.c # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # drivers/net/wan/n2.c # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # drivers/net/wan/hdlc_generic.c # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +25 -6 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # drivers/net/wan/farsync.c # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -4 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # drivers/net/wan/dscc4.c # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -3 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # drivers/net/wan/c101.c # 2004/01/10 19:06:17-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] kill embedding of struct net_device # # Now we can kill the embedding of net_device into hdlc_device. Indeed, # all instances of hdlc_device are created by alloc_hdlcdev() and nothing # uses hdlc->netdev directly. So we can # * remove hdlc->netdev # * have alloc_hdlcdev() implemented via alloc_netdev() with the rest # of hdlc_device as private part of net_device. # * replace free_hdlcdev() with free_netdev(). # * have dev_to_hdlc(dev) simply return netdev_priv(dev). # # ChangeSet # 2004/01/10 19:05:38-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] removal hdlc_to_dev() # # No more users, we may remove it. # # include/linux/hdlc.h # 2004/01/10 19:05:33-05:00 viro@parcelfarce.linux.theplanet.co.uk +0 -5 # [wan hdlc] removal hdlc_to_dev() # # No more users, we may remove it. # # ChangeSet # 2004/01/10 19:05:06-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan dscc4] embedded struct removal # # Killed embedded hdlc in dscc4 (same as for other drivers). Fixed a # setup-after-registration race. # # That was the last user of hdlc_to_dev(); killed. # # drivers/net/wan/dscc4.c # 2004/01/10 19:05:01-05:00 viro@parcelfarce.linux.theplanet.co.uk +32 -18 # [wan dscc4] embedded struct removal # # Killed embedded hdlc in dscc4 (same as for other drivers). Fixed a # setup-after-registration race. # # That was the last user of hdlc_to_dev(); killed. # # ChangeSet # 2004/01/10 19:03:28-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan farsync] embedded struct hdlc_device removal # # Removed embedded hdlc in farsync (same as for wanxl and friends). # setup-after-registration race fixed. # # drivers/net/wan/farsync.c # 2004/01/10 19:03:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +59 -41 # [wan farsync] embedded struct hdlc_device removal # # Removed embedded hdlc in farsync (same as for wanxl and friends). # setup-after-registration race fixed. # # ChangeSet # 2004/01/10 19:02:41-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan pc300] use alloc_hdlcdev()/free_hdlcdev(). Leak fixed # # drivers/net/wan/pc300_drv.c # 2004/01/10 19:02:36-05:00 viro@parcelfarce.linux.theplanet.co.uk +5 -3 # [wan pc300] use alloc_hdlcdev()/free_hdlcdev(). Leak fixed # # ChangeSet # 2004/01/10 19:02:00-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] kill embedded struct in various drivers # # Killed embedded hdlc in hd6457x.c derivatives (same as wanxl in previous # patch) # # drivers/net/wan/n2.c # 2004/01/10 19:01:55-05:00 viro@parcelfarce.linux.theplanet.co.uk +15 -2 # [wan hdlc] kill embedded struct in various drivers # # Killed embedded hdlc in hd6457x.c derivatives (same as wanxl in previous # patch) # # drivers/net/wan/hd6457x.c # 2004/01/10 19:01:55-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] kill embedded struct in various drivers # # Killed embedded hdlc in hd6457x.c derivatives (same as wanxl in previous # patch) # # drivers/net/wan/c101.c # 2004/01/10 19:01:55-05:00 viro@parcelfarce.linux.theplanet.co.uk +12 -1 # [wan hdlc] kill embedded struct in various drivers # # Killed embedded hdlc in hd6457x.c derivatives (same as wanxl in previous # patch) # # ChangeSet # 2004/01/10 19:01:23-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] new private struct pointer in hdlc_device, and helpers for it # # New field in hdlc_device: void *priv; # New helpers: # struct net_device *alloc_hdlcdev(priv) allocates hdlc, sets ->priv and # returns pointer to hdlc->netdev # free_hdlcdev(dev) takes such pointer and frees its hdlc. # # wanxl switched to use of those; instead of embedding hdlc into card->ports[] # we allocate it separately right after card had been allocated and store pointer # to hdlc->netdev in card->ports[]->dev. Freeing is done just before freeing # card. Pointer back to card->ports[] is stored in hdlc->priv. port_to_dev() # and dev_to_port() rewritten in the obvious way; by now the rest of driver # doesn't care whether hdlc is embedded or not - everything uses port_to_dev() # and dev_to_port(). # # That killed embedded hdlc replacing it with pointer to net_device. Fairly # similar work will be done in the next few patches for other drivers. # # Additionally, setup-after-register and free_irq()-before-unregister races # had been fixed. # # include/linux/hdlc.h # 2004/01/10 19:01:18-05:00 viro@parcelfarce.linux.theplanet.co.uk +7 -0 # [wan hdlc] new private struct pointer in hdlc_device, and helpers for it # # New field in hdlc_device: void *priv; # New helpers: # struct net_device *alloc_hdlcdev(priv) allocates hdlc, sets ->priv and # returns pointer to hdlc->netdev # free_hdlcdev(dev) takes such pointer and frees its hdlc. # # wanxl switched to use of those; instead of embedding hdlc into card->ports[] # we allocate it separately right after card had been allocated and store pointer # to hdlc->netdev in card->ports[]->dev. Freeing is done just before freeing # card. Pointer back to card->ports[] is stored in hdlc->priv. port_to_dev() # and dev_to_port() rewritten in the obvious way; by now the rest of driver # doesn't care whether hdlc is embedded or not - everything uses port_to_dev() # and dev_to_port(). # # That killed embedded hdlc replacing it with pointer to net_device. Fairly # similar work will be done in the next few patches for other drivers. # # Additionally, setup-after-register and free_irq()-before-unregister races # had been fixed. # # drivers/net/wan/wanxl.c # 2004/01/10 19:01:18-05:00 viro@parcelfarce.linux.theplanet.co.uk +48 -33 # [wan hdlc] new private struct pointer in hdlc_device, and helpers for it # # New field in hdlc_device: void *priv; # New helpers: # struct net_device *alloc_hdlcdev(priv) allocates hdlc, sets ->priv and # returns pointer to hdlc->netdev # free_hdlcdev(dev) takes such pointer and frees its hdlc. # # wanxl switched to use of those; instead of embedding hdlc into card->ports[] # we allocate it separately right after card had been allocated and store pointer # to hdlc->netdev in card->ports[]->dev. Freeing is done just before freeing # card. Pointer back to card->ports[] is stored in hdlc->priv. port_to_dev() # and dev_to_port() rewritten in the obvious way; by now the rest of driver # doesn't care whether hdlc is embedded or not - everything uses port_to_dev() # and dev_to_port(). # # That killed embedded hdlc replacing it with pointer to net_device. Fairly # similar work will be done in the next few patches for other drivers. # # Additionally, setup-after-register and free_irq()-before-unregister races # had been fixed. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 19:01:18-05:00 viro@parcelfarce.linux.theplanet.co.uk +10 -1 # [wan hdlc] new private struct pointer in hdlc_device, and helpers for it # # New field in hdlc_device: void *priv; # New helpers: # struct net_device *alloc_hdlcdev(priv) allocates hdlc, sets ->priv and # returns pointer to hdlc->netdev # free_hdlcdev(dev) takes such pointer and frees its hdlc. # # wanxl switched to use of those; instead of embedding hdlc into card->ports[] # we allocate it separately right after card had been allocated and store pointer # to hdlc->netdev in card->ports[]->dev. Freeing is done just before freeing # card. Pointer back to card->ports[] is stored in hdlc->priv. port_to_dev() # and dev_to_port() rewritten in the obvious way; by now the rest of driver # doesn't care whether hdlc is embedded or not - everything uses port_to_dev() # and dev_to_port(). # # That killed embedded hdlc replacing it with pointer to net_device. Fairly # similar work will be done in the next few patches for other drivers. # # Additionally, setup-after-register and free_irq()-before-unregister races # had been fixed. # # ChangeSet # 2004/01/10 19:00:10-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # include/linux/hdlc.h # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # drivers/net/wan/wanxl.c # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # drivers/net/wan/pc300_drv.c # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # drivers/net/wan/n2.c # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +5 -5 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # drivers/net/wan/farsync.c # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # drivers/net/wan/dscc4.c # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -4 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # drivers/net/wan/c101.c # 2004/01/10 19:00:06-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch register_hdlc_device() to take net_device arg # # register_hdlc_device()/unregister_hdlc_device() switched to net_device. # Now all remaining callers of hdlc_to_dev() are isolated and we can # start killing them. # # ChangeSet # 2004/01/10 18:57:37-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan dscc4] Uses of ->hdlc and hdlc_to_dev() encapsulated into dscc4_to_dev(). # # drivers/net/wan/dscc4.c # 2004/01/10 18:57:33-05:00 viro@parcelfarce.linux.theplanet.co.uk +12 -7 # [wan dscc4] Uses of ->hdlc and hdlc_to_dev() encapsulated into dscc4_to_dev(). # # ChangeSet # 2004/01/10 18:56:58-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # include/linux/hdlc.h # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -0 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/wanxl.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +7 -8 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/pc300_tty.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -3 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/pc300_drv.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +5 -5 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/hdlc_raw_eth.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/hd6457x.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -6 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/farsync.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +5 -5 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/dscc4.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -4 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # drivers/net/wan/c101.c # 2004/01/10 18:56:54-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] new hdlc_stats() helper # # New inlined helper - hdlc_stats(). A lot of places had it spelled out; # replaced with calls. # # ChangeSet # 2004/01/10 18:56:26-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan pc300] more direct use of net_device # # In pc300 replaced dev->hdlc with dev->dev (hdlc to net_device). Killed a # bunch of ugliness in pc300_tty.c, killed hdlc_to_dev() uses. # # drivers/net/wan/pc300_tty.c # 2004/01/10 18:56:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +18 -22 # [wan pc300] more direct use of net_device # # In pc300 replaced dev->hdlc with dev->dev (hdlc to net_device). Killed a # bunch of ugliness in pc300_tty.c, killed hdlc_to_dev() uses. # # drivers/net/wan/pc300_drv.c # 2004/01/10 18:56:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +19 -28 # [wan pc300] more direct use of net_device # # In pc300 replaced dev->hdlc with dev->dev (hdlc to net_device). Killed a # bunch of ugliness in pc300_tty.c, killed hdlc_to_dev() uses. # # drivers/net/wan/pc300.h # 2004/01/10 18:56:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan pc300] more direct use of net_device # # In pc300 replaced dev->hdlc with dev->dev (hdlc to net_device). Killed a # bunch of ugliness in pc300_tty.c, killed hdlc_to_dev() uses. # # ChangeSet # 2004/01/10 18:55:30-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] switch internal ioctl dispatch to net_device # # Switched remaining ioctls to net_device, killed a bunch of hdlc_to_dev() # and killed hdlc_to_name(). # # include/linux/hdlc.h # 2004/01/10 18:55:25-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -9 # [wan hdlc] switch internal ioctl dispatch to net_device # # Switched remaining ioctls to net_device, killed a bunch of hdlc_to_dev() # and killed hdlc_to_name(). # # drivers/net/wan/hdlc_raw_eth.c # 2004/01/10 18:55:25-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch internal ioctl dispatch to net_device # # Switched remaining ioctls to net_device, killed a bunch of hdlc_to_dev() # and killed hdlc_to_name(). # # drivers/net/wan/hdlc_raw.c # 2004/01/10 18:55:25-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch internal ioctl dispatch to net_device # # Switched remaining ioctls to net_device, killed a bunch of hdlc_to_dev() # and killed hdlc_to_name(). # # drivers/net/wan/hdlc_ppp.c # 2004/01/10 18:55:25-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] switch internal ioctl dispatch to net_device # # Switched remaining ioctls to net_device, killed a bunch of hdlc_to_dev() # and killed hdlc_to_name(). # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:55:25-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -6 # [wan hdlc] switch internal ioctl dispatch to net_device # # Switched remaining ioctls to net_device, killed a bunch of hdlc_to_dev() # and killed hdlc_to_name(). # # ChangeSet # 2004/01/10 18:54:53-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan wanxl] eliminated hdlc_to_name() uses and a bunch of port->hdlc ones. # # drivers/net/wan/wanxl.c # 2004/01/10 18:54:49-05:00 viro@parcelfarce.linux.theplanet.co.uk +28 -32 # [wan wanxl] eliminated hdlc_to_name() uses and a bunch of port->hdlc ones. # # ChangeSet # 2004/01/10 18:54:24-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc_x25] eliminated hdlc_to_dev() and hdlc_to_name() uses. # # include/linux/hdlc.h # 2004/01/10 18:54:19-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc_x25] eliminated hdlc_to_dev() and hdlc_to_name() uses. # # drivers/net/wan/hdlc_x25.c # 2004/01/10 18:54:19-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -5 # [wan hdlc_x25] eliminated hdlc_to_dev() and hdlc_to_name() uses. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:54:19-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc_x25] eliminated hdlc_to_dev() and hdlc_to_name() uses. # # ChangeSet # 2004/01/10 18:53:51-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] hdlc_fr: eliminated ->netdev, hdlc_to_dev() and hdlc_to_name() uses. # # include/linux/hdlc.h # 2004/01/10 18:53:47-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] hdlc_fr: eliminated ->netdev, hdlc_to_dev() and hdlc_to_name() uses. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:53:47-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] hdlc_fr: eliminated ->netdev, hdlc_to_dev() and hdlc_to_name() uses. # # drivers/net/wan/hdlc_fr.c # 2004/01/10 18:53:47-05:00 viro@parcelfarce.linux.theplanet.co.uk +64 -55 # [wan hdlc] hdlc_fr: eliminated ->netdev, hdlc_to_dev() and hdlc_to_name() uses. # # ChangeSet # 2004/01/10 18:53:17-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] hdlc_cisco: killed ->netdev, hdlc_to_name() and hdlc_to_dev() uses. # # include/linux/hdlc.h # 2004/01/10 18:53:12-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_cisco: killed ->netdev, hdlc_to_name() and hdlc_to_dev() uses. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:53:12-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] hdlc_cisco: killed ->netdev, hdlc_to_name() and hdlc_to_dev() uses. # # drivers/net/wan/hdlc_cisco.c # 2004/01/10 18:53:12-05:00 viro@parcelfarce.linux.theplanet.co.uk +22 -21 # [wan hdlc] hdlc_cisco: killed ->netdev, hdlc_to_name() and hdlc_to_dev() uses. # # ChangeSet # 2004/01/10 18:52:47-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] hdlc->proto.*() switched to net_device. # Eliminated a bunch of ->netdev and hdlc_to_dev() uses. # # include/linux/hdlc.h # 2004/01/10 18:52:43-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -4 # [wan hdlc] hdlc->proto.*() switched to net_device. # Eliminated a bunch of ->netdev and hdlc_to_dev() uses. # # drivers/net/wan/hdlc_x25.c # 2004/01/10 18:52:43-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -4 # [wan hdlc] hdlc->proto.*() switched to net_device. # Eliminated a bunch of ->netdev and hdlc_to_dev() uses. # # drivers/net/wan/hdlc_ppp.c # 2004/01/10 18:52:43-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -4 # [wan hdlc] hdlc->proto.*() switched to net_device. # Eliminated a bunch of ->netdev and hdlc_to_dev() uses. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:52:43-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -6 # [wan hdlc] hdlc->proto.*() switched to net_device. # Eliminated a bunch of ->netdev and hdlc_to_dev() uses. # # drivers/net/wan/hdlc_fr.c # 2004/01/10 18:52:43-05:00 viro@parcelfarce.linux.theplanet.co.uk +8 -5 # [wan hdlc] hdlc->proto.*() switched to net_device. # Eliminated a bunch of ->netdev and hdlc_to_dev() uses. # # drivers/net/wan/hdlc_cisco.c # 2004/01/10 18:52:43-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -5 # [wan hdlc] hdlc->proto.*() switched to net_device. # Eliminated a bunch of ->netdev and hdlc_to_dev() uses. # # ChangeSet # 2004/01/10 18:51:07-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan farsync] Eliminated a bunch of port->hdlc and hdlc_to_dev() uses # # drivers/net/wan/farsync.c # 2004/01/10 18:51:03-05:00 viro@parcelfarce.linux.theplanet.co.uk +34 -27 # [wan farsync] Eliminated a bunch of port->hdlc and hdlc_to_dev() uses # # ChangeSet # 2004/01/10 18:50:28-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] hdlc->attach() switched to net_device. # # include/linux/hdlc.h # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/wanxl.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -2 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/pc300_drv.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -3 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/hdlc_x25.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/hdlc_raw_eth.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/hdlc_raw.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/hdlc_ppp.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/hdlc_fr.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/hdlc_cisco.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/hd6457x.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +4 -15 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/farsync.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc->attach() switched to net_device. # # drivers/net/wan/dscc4.c # 2004/01/10 18:50:24-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -3 # [wan hdlc] hdlc->attach() switched to net_device. # # ChangeSet # 2004/01/10 18:49:55-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] hdlc_set_carrier() switched to net_device. # # include/linux/hdlc.h # 2004/01/10 18:49:50-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_set_carrier() switched to net_device. # # drivers/net/wan/wanxl.c # 2004/01/10 18:49:50-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_set_carrier() switched to net_device. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:49:50-05:00 viro@parcelfarce.linux.theplanet.co.uk +7 -6 # [wan hdlc] hdlc_set_carrier() switched to net_device. # # drivers/net/wan/hd6457x.c # 2004/01/10 18:49:50-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -3 # [wan hdlc] hdlc_set_carrier() switched to net_device. # # drivers/net/wan/c101.c # 2004/01/10 18:49:50-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -4 # [wan hdlc] hdlc_set_carrier() switched to net_device. # # ChangeSet # 2004/01/10 18:49:23-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] switch sca_xxx() to use net_device # # More hd6457x.c massage: sca_open(), sca_close(), sca_dump_rings() switched # to net_device. Bunch of hdlc_to_port() eliminated in favor of dev_to_port(). # # drivers/net/wan/n2.c # 2004/01/10 18:49:18-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -9 # [wan hdlc] switch sca_xxx() to use net_device # # More hd6457x.c massage: sca_open(), sca_close(), sca_dump_rings() switched # to net_device. Bunch of hdlc_to_port() eliminated in favor of dev_to_port(). # # drivers/net/wan/hd6457x.c # 2004/01/10 18:49:18-05:00 viro@parcelfarce.linux.theplanet.co.uk +11 -12 # [wan hdlc] switch sca_xxx() to use net_device # # More hd6457x.c massage: sca_open(), sca_close(), sca_dump_rings() switched # to net_device. Bunch of hdlc_to_port() eliminated in favor of dev_to_port(). # # drivers/net/wan/c101.c # 2004/01/10 18:49:18-05:00 viro@parcelfarce.linux.theplanet.co.uk +7 -10 # [wan hdlc] switch sca_xxx() to use net_device # # More hd6457x.c massage: sca_open(), sca_close(), sca_dump_rings() switched # to net_device. Bunch of hdlc_to_port() eliminated in favor of dev_to_port(). # # ChangeSet # 2004/01/10 18:48:26-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] new port_to_dev() helper # # New helper in hd6457x.c: port_to_dev(). A bunch of port->hdlc eliminated. # # drivers/net/wan/n2.c # 2004/01/10 18:48:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +10 -7 # [wan hdlc] new port_to_dev() helper # # New helper in hd6457x.c: port_to_dev(). A bunch of port->hdlc eliminated. # # drivers/net/wan/hd6457x.c # 2004/01/10 18:48:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +25 -15 # [wan hdlc] new port_to_dev() helper # # New helper in hd6457x.c: port_to_dev(). A bunch of port->hdlc eliminated. # # drivers/net/wan/c101.c # 2004/01/10 18:48:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +14 -10 # [wan hdlc] new port_to_dev() helper # # New helper in hd6457x.c: port_to_dev(). A bunch of port->hdlc eliminated. # # ChangeSet # 2004/01/10 18:47:42-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] hdlc_close() switched to net_device. # # include/linux/hdlc.h # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_close() switched to net_device. # # drivers/net/wan/wanxl.c # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_close() switched to net_device. # # drivers/net/wan/pc300_drv.c # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_close() switched to net_device. # # drivers/net/wan/n2.c # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_close() switched to net_device. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -1 # [wan hdlc] hdlc_close() switched to net_device. # # drivers/net/wan/farsync.c # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_close() switched to net_device. # # drivers/net/wan/dscc4.c # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -4 # [wan hdlc] hdlc_close() switched to net_device. # # drivers/net/wan/c101.c # 2004/01/10 18:47:37-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_close() switched to net_device. # # ChangeSet # 2004/01/10 18:44:19-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # include/linux/hdlc.h # 2004/01/10 18:44:15-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # drivers/net/wan/wanxl.c # 2004/01/10 18:44:15-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # drivers/net/wan/pc300_drv.c # 2004/01/10 18:44:15-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # drivers/net/wan/n2.c # 2004/01/10 18:44:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # drivers/net/wan/hdlc_generic.c # 2004/01/10 18:44:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -5 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # drivers/net/wan/farsync.c # 2004/01/10 18:44:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # drivers/net/wan/dscc4.c # 2004/01/10 18:44:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # drivers/net/wan/c101.c # 2004/01/10 18:44:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan hdlc] hdlc_open() switched to net_device # # Beginning of hdlc fixes. hdlc_open() switched from hdlc_device to net_device. # # ChangeSet # 2004/01/10 18:39:13-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # net/lapb/lapb_iface.c # 2004/01/10 18:39:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -2 # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # include/net/lapb.h # 2004/01/10 18:39:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +0 -1 # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # include/linux/lapb.h # 2004/01/10 18:39:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # drivers/net/wan/x25_asy.c # 2004/01/10 18:39:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # drivers/net/wan/lapbether.c # 2004/01/10 18:39:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -3 # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # drivers/net/wan/hdlc_x25.c # 2004/01/10 18:39:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # drivers/net/wan/comx-proto-lapb.c # 2004/01/10 18:39:04-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] kill now-unused custom token container # # Nothing is using lapb->token anymore; removed, along with the old "token" # argument of lapb_register(). # # ChangeSet # 2004/01/10 18:38:24-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan lapb] Printks switched from %p lapb->token to %p lapb->dev. # # net/lapb/lapb_timer.c # 2004/01/10 18:38:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +7 -7 # [wan lapb] Printks switched from %p lapb->token to %p lapb->dev. # # net/lapb/lapb_subr.c # 2004/01/10 18:38:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +3 -3 # [wan lapb] Printks switched from %p lapb->token to %p lapb->dev. # # net/lapb/lapb_out.c # 2004/01/10 18:38:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +6 -6 # [wan lapb] Printks switched from %p lapb->token to %p lapb->dev. # # net/lapb/lapb_in.c # 2004/01/10 18:38:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +63 -63 # [wan lapb] Printks switched from %p lapb->token to %p lapb->dev. # # net/lapb/lapb_iface.c # 2004/01/10 18:38:14-05:00 viro@parcelfarce.linux.theplanet.co.uk +5 -5 # [wan lapb] Printks switched from %p lapb->token to %p lapb->dev. # # ChangeSet # 2004/01/10 18:37:28-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan lapb] switch to use net_device instead of custom token # # lapb functions that used to take a token to select lapb_cb they'll deal with # are switched to getting net_device instead. Callbacks switched to using # lapb->dev instead of lapb->token. # # net/lapb/lapb_iface.c # 2004/01/10 18:37:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +25 -29 # [wan lapb] switch to use net_device instead of custom token # # lapb functions that used to take a token to select lapb_cb they'll deal with # are switched to getting net_device instead. Callbacks switched to using # lapb->dev instead of lapb->token. # # include/linux/lapb.h # 2004/01/10 18:37:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +13 -13 # [wan lapb] switch to use net_device instead of custom token # # lapb functions that used to take a token to select lapb_cb they'll deal with # are switched to getting net_device instead. Callbacks switched to using # lapb->dev instead of lapb->token. # # drivers/net/wan/x25_asy.c # 2004/01/10 18:37:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +12 -12 # [wan lapb] switch to use net_device instead of custom token # # lapb functions that used to take a token to select lapb_cb they'll deal with # are switched to getting net_device instead. Callbacks switched to using # lapb->dev instead of lapb->token. # # drivers/net/wan/lapbether.c # 2004/01/10 18:37:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +13 -18 # [wan lapb] switch to use net_device instead of custom token # # lapb functions that used to take a token to select lapb_cb they'll deal with # are switched to getting net_device instead. Callbacks switched to using # lapb->dev instead of lapb->token. # # drivers/net/wan/hdlc_x25.c # 2004/01/10 18:37:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +19 -21 # [wan lapb] switch to use net_device instead of custom token # # lapb functions that used to take a token to select lapb_cb they'll deal with # are switched to getting net_device instead. Callbacks switched to using # lapb->dev instead of lapb->token. # # drivers/net/wan/comx-proto-lapb.c # 2004/01/10 18:37:21-05:00 viro@parcelfarce.linux.theplanet.co.uk +23 -23 # [wan lapb] switch to use net_device instead of custom token # # lapb functions that used to take a token to select lapb_cb they'll deal with # are switched to getting net_device instead. Callbacks switched to using # lapb->dev instead of lapb->token. # # ChangeSet # 2004/01/10 18:36:15-05:00 viro@parcelfarce.linux.theplanet.co.uk # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # net/lapb/lapb_iface.c # 2004/01/10 18:36:10-05:00 viro@parcelfarce.linux.theplanet.co.uk +2 -1 # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # include/net/lapb.h # 2004/01/10 18:36:10-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -0 # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # include/linux/lapb.h # 2004/01/10 18:36:10-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # drivers/net/wan/x25_asy.c # 2004/01/10 18:36:10-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # drivers/net/wan/lapbether.c # 2004/01/10 18:36:10-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # drivers/net/wan/hdlc_x25.c # 2004/01/10 18:36:10-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # drivers/net/wan/comx-proto-lapb.c # 2004/01/10 18:36:10-05:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1 # [wan lapb] beginning of cleanups # # Beginning of lapb cleanups: lapb_register gets net_device along with the # "token" and it gets stored in lapb_cb (token argument will die later). # # ChangeSet # 2004/01/10 16:47:03-05:00 amir.noam@intel.com # [PATCH] [bonding 2.6] Use the per-bond values of all remaining parameters # # Change usage of the all remaining global parameters to the per-bond # values. # # drivers/net/bonding/bond_main.c # 2004/01/10 11:46:59-05:00 amir.noam@intel.com +71 -52 # [PATCH] [bonding 2.6] Use the per-bond values of all remaining parameters # # Change usage of the all remaining global parameters to the per-bond # values. # # ChangeSet # 2004/01/10 16:46:50-05:00 amir.noam@intel.com # [PATCH] [bonding 2.6] Use the per-bond value of the bond_mode parameter # # Change usage of the global 'bond_mode' parameter to the per-bond # value. # # drivers/net/bonding/bond_main.c # 2004/01/10 11:46:45-05:00 amir.noam@intel.com +76 -71 # [PATCH] [bonding 2.6] Use the per-bond value of the bond_mode parameter # # Change usage of the global 'bond_mode' parameter to the per-bond # value. # # ChangeSet # 2004/01/10 16:46:38-05:00 amir.noam@intel.com # [PATCH] [bonding 2.6] Save parameters in a per-bond data structure # # - Save the bonding parameters in a per-bond data structure. # - Move all handling of the insmod parameters to bond_check_params(). # - Fix the handling of some warning messages regarding parameter use. # # drivers/net/bonding/bonding.h # 2004/01/10 11:46:33-05:00 amir.noam@intel.com +16 -1 # [PATCH] [bonding 2.6] Save parameters in a per-bond data structure # # - Save the bonding parameters in a per-bond data structure. # - Move all handling of the insmod parameters to bond_check_params(). # - Fix the handling of some warning messages regarding parameter use. # # drivers/net/bonding/bond_main.c # 2004/01/10 11:46:33-05:00 amir.noam@intel.com +99 -75 # [PATCH] [bonding 2.6] Save parameters in a per-bond data structure # # - Save the bonding parameters in a per-bond data structure. # - Move all handling of the insmod parameters to bond_check_params(). # - Fix the handling of some warning messages regarding parameter use. # # ChangeSet # 2004/01/10 16:46:26-05:00 shmulik.hen@intel.com # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # include/linux/if_bonding.h # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +4 -1 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # drivers/net/bonding/bonding.h # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +3 -3 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # drivers/net/bonding/bond_main.c # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +6 -0 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # drivers/net/bonding/bond_alb.h # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +2 -2 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # drivers/net/bonding/bond_alb.c # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +5 -2 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # drivers/net/bonding/bond_3ad.h # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +2 -2 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # drivers/net/bonding/bond_3ad.c # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +2 -2 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # Documentation/networking/ifenslave.c # 2004/01/10 11:46:21-05:00 shmulik.hen@intel.com +2 -2 # [netdrvr bonding] trivial - Update comment blocks and version field # # Update comment blocks, version field and copyright years to match all # the recent changes that were accepted into 2.4/2.6. # # ChangeSet # 2004/01/10 16:45:35-05:00 amir.noam@intel.com # [PATCH] [bonding 2.6] Fix compilation warning in bond_alb.c # # The IPX_TYPE_* constants and ipxhdr.ipx_type are u8 values, so we # shouldn't use __constant_htons(). # # drivers/net/bonding/bond_alb.c # 2004/01/10 11:45:30-05:00 amir.noam@intel.com +1 -2 # [PATCH] [bonding 2.6] Fix compilation warning in bond_alb.c # # The IPX_TYPE_* constants and ipxhdr.ipx_type are u8 values, so we # shouldn't use __constant_htons(). # # ChangeSet # 2004/01/10 16:45:24-05:00 amir.noam@intel.com # [netdrvr bonding] fix build breakage # # drivers/net/bonding/bond_main.c # 2004/01/10 11:45:19-05:00 amir.noam@intel.com +2 -2 # [netdrvr bonding] fix build breakage # # ChangeSet # 2004/01/10 16:44:01-05:00 scott.feldman@intel.com # [netdrvr e100] netpoll + fixes to speed/duplex forced settings # # * Preserve forced speed/duplex settings during close/open sequence. # * Reset PHY when going from autoneg to forced speed/duplex settings # using ethtool. # * Add netpoll support. # # drivers/net/e100.c # 2004/01/10 11:43:54-05:00 scott.feldman@intel.com +56 -43 # [netdrvr e100] netpoll + fixes to speed/duplex forced settings # # * Preserve forced speed/duplex settings during close/open sequence. # * Reset PHY when going from autoneg to forced speed/duplex settings # using ethtool. # * Add netpoll support. # # ChangeSet # 2004/01/10 16:41:26-05:00 amir.noam@intel.com # [netdrvr bonding] Add support for slaves that use ethtool_ops # # When collecting link information from slaves via ETHTOOL, first try # using the relevant ethtool_ops functions. # # drivers/net/bonding/bond_main.c # 2004/01/10 11:41:21-05:00 amir.noam@intel.com +49 -24 # [netdrvr bonding] Add support for slaves that use ethtool_ops # # When collecting link information from slaves via ETHTOOL, first try # using the relevant ethtool_ops functions. # # ChangeSet # 2004/01/10 16:41:17-05:00 amir.noam@intel.com # [netdrvr bonding] Releasing the original active slave causes mac address duplication # # When releasing the active slave in TLB/ALB modes, # bond_alb_deinit_slave() must be called before trying to select a new # active slave. # # drivers/net/bonding/bond_main.c # 2004/01/10 11:41:12-05:00 amir.noam@intel.com +20 -14 # [netdrvr bonding] Releasing the original active slave causes mac address duplication # # When releasing the active slave in TLB/ALB modes, # bond_alb_deinit_slave() must be called before trying to select a new # active slave. # # ChangeSet # 2004/01/10 16:41:08-05:00 amir.noam@intel.com # [netdrvr bonding] Cannot remove and re-enslave the original active slave # # In TLB/ALB modes, when enslaving a slave that has the bond's mac # address, allow the operation if no other slave has that address. # # Should be applied after the cleanup patch set. # # drivers/net/bonding/bond_alb.c # 2004/01/10 11:41:03-05:00 amir.noam@intel.com +12 -1 # [netdrvr bonding] Cannot remove and re-enslave the original active slave # # In TLB/ALB modes, when enslaving a slave that has the bond's mac # address, allow the operation if no other slave has that address. # # Should be applied after the cleanup patch set. # # ChangeSet # 2004/01/10 16:25:23-05:00 jgarzik@redhat.com # [netdrvr e100] include linux/moduleparam.h # # Fixes build. # # drivers/net/e100.c # 2004/01/10 11:25:18-05:00 jgarzik@redhat.com +1 -0 # [netdrvr e100] include linux/moduleparam.h # # Fixes build. # # ChangeSet # 2004/01/10 16:19:08-05:00 scott.feldman@intel.com # [e100] ICH6 IDs + ia64 memcpy fix + module_param # # * Add ICH6 device IDs. Devices funcionally equivalent to supported ICH5 # devices, but new IDs. # * Fixed unaligned access to casted skb->data (Matt Willcox # [willy@debian.org]). # * MODULE_PARM -> module_param # * Bug printk after register_netdev to identify nic details. # * misc cleanups. # # drivers/net/e100.c # 2004/01/10 11:19:02-05:00 scott.feldman@intel.com +30 -22 # [e100] ICH6 IDs + ia64 memcpy fix + module_param # # * Add ICH6 device IDs. Devices funcionally equivalent to supported ICH5 # devices, but new IDs. # * Fixed unaligned access to casted skb->data (Matt Willcox # [willy@debian.org]). # * MODULE_PARM -> module_param # * Bug printk after register_netdev to identify nic details. # * misc cleanups. # # ChangeSet # 2004/01/10 15:56:28-05:00 scott.feldman@intel.com # [netdrvr] e100 version 3 (complete rewrite) # # drivers/net/Makefile # 2004/01/10 15:56:24-05:00 scott.feldman@intel.com +1 -1 # [netdrvr] e100 version 3 (complete rewrite) # # drivers/net/Kconfig # 2004/01/10 15:56:24-05:00 scott.feldman@intel.com +6 -1 # [netdrvr] e100 version 3 (complete rewrite) # # drivers/net/e100.c # 2004/01/10 15:55:36-05:00 jgarzik@redhat.com +2299 -0 # # drivers/net/e100.c # 2004/01/10 15:55:36-05:00 jgarzik@redhat.com +0 -0 # BitKeeper file /spare/repo/netdev-2.6/e100-2/drivers/net/e100.c # # BitKeeper/deleted/.del-Makefile~9f880007babd58ba # 2004/01/10 15:55:12-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/Makefile # # BitKeeper/deleted/.del-LICENSE~40a12f4e7633252 # 2004/01/10 15:55:12-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/LICENSE # # BitKeeper/deleted/.del-e100_ucode.h~384509176e82d05 # 2004/01/10 15:55:00-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_ucode.h # # BitKeeper/deleted/.del-e100_test.c~ebd1b417a1ab8572 # 2004/01/10 15:55:00-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_test.c # # BitKeeper/deleted/.del-e100_phy.h~f780fab579855857 # 2004/01/10 15:55:00-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_phy.h # # BitKeeper/deleted/.del-e100_phy.c~fdd23d9aa3ea8275 # 2004/01/10 15:55:00-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_phy.c # # BitKeeper/deleted/.del-e100_main.c~1f2323e5431e5b51 # 2004/01/10 15:55:00-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_main.c # # BitKeeper/deleted/.del-e100_eeprom.c~4da67b6cefb196d3 # 2004/01/10 15:55:00-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_eeprom.c # # BitKeeper/deleted/.del-e100.h~faef1250768c2f84 # 2004/01/10 15:55:00-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100.h # # BitKeeper/deleted/.del-e100_config.h~20873ac5a63b4a94 # 2004/01/10 15:54:59-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_config.h # # BitKeeper/deleted/.del-e100_config.c~8bcd39115026455b # 2004/01/10 15:54:59-05:00 jgarzik@redhat.com +0 -0 # Delete: drivers/net/e100/e100_config.c # diff -Nru a/Documentation/Changes b/Documentation/Changes --- a/Documentation/Changes Thu Feb 19 23:44:28 2004 +++ b/Documentation/Changes Thu Feb 19 23:44:28 2004 @@ -216,13 +216,6 @@ as root before you can use this. You'll probably also want to get the user-space microcode_ctl utility to use with this. -If you have compiled the driver as a module you may need to add -the following line: - -alias char-major-10-184 microcode - -to your /etc/modules.conf file. - Powertweak ---------- @@ -258,17 +251,6 @@ mknod /dev/ppp c 108 0 as root. - -If you build ppp support as modules, you will need the following in -your /etc/modules.conf file: - -alias char-major-108 ppp_generic -alias /dev/ppp ppp_generic -alias tty-ldisc-3 ppp_async -alias tty-ldisc-14 ppp_synctty -alias ppp-compress-21 bsd_comp -alias ppp-compress-24 ppp_deflate -alias ppp-compress-26 ppp_deflate If you use devfsd and build ppp support as modules, you will need the following in your /etc/devfsd.conf file: diff -Nru a/Documentation/CodingStyle b/Documentation/CodingStyle --- a/Documentation/CodingStyle Thu Feb 19 23:44:24 2004 +++ b/Documentation/CodingStyle Thu Feb 19 23:44:24 2004 @@ -1,42 +1,75 @@ - Linux kernel coding style + Linux kernel coding style This is a short document describing the preferred coding style for the linux kernel. Coding style is very personal, and I won't _force_ my views on anybody, but this is what goes for anything that I have to be able to maintain, and I'd prefer it for most other things too. Please -at least consider the points made here. +at least consider the points made here. First off, I'd suggest printing out a copy of the GNU coding standards, -and NOT read it. Burn them, it's a great symbolic gesture. +and NOT read it. Burn them, it's a great symbolic gesture. Anyway, here goes: Chapter 1: Indentation -Tabs are 8 characters, and thus indentations are also 8 characters. +Tabs are 8 characters, and thus indentations are also 8 characters. There are heretic movements that try to make indentations 4 (or even 2!) characters deep, and that is akin to trying to define the value of PI to -be 3. +be 3. Rationale: The whole idea behind indentation is to clearly define where a block of control starts and ends. Especially when you've been looking at your screen for 20 straight hours, you'll find it a lot easier to see -how the indentation works if you have large indentations. +how the indentation works if you have large indentations. Now, some people will claim that having 8-character indentations makes the code move too far to the right, and makes it hard to read on a 80-character terminal screen. The answer to that is that if you need more than 3 levels of indentation, you're screwed anyway, and should fix -your program. +your program. In short, 8-char indents make things easier to read, and have the added -benefit of warning you when you're nesting your functions too deep. -Heed that warning. +benefit of warning you when you're nesting your functions too deep. +Heed that warning. +Don't put multiple statements on a single line unless you have +something to hide: - Chapter 2: Placing Braces + if (condition) do_this; + do_something_everytime; + +Outside of comments, documentation and except in Kconfig, spaces are never +used for indentation, and the above example is deliberately broken. + +Get a decent editor and don't leave whitespace at the end of lines. + + + Chapter 2: Breaking long lines and strings + +Coding style is all about readability and maintainability using commonly +available tools. + +The limit on the length of lines is 80 columns and this is a hard limit. + +Statements longer than 80 columns will be broken into sensible chunks. +Descendants are always substantially shorter than the parent and are placed +substantially to the right. The same applies to function headers with a long +argument list. Long strings are as well broken into shorter strings. + +void fun(int a, int b, int c) +{ + if (condition) + printk(KERN_WARNING "Warning this is a long printk with " + "3 parameters a: %u b: %u " + "c: %u \n", a, b, c); + else + next_statement; +} + + Chapter 3: Placing Braces The other issue that always comes up in C styling is the placement of braces. Unlike the indent size, there are few technical reasons to @@ -59,7 +92,7 @@ Heretic people all over the world have claimed that this inconsistency is ... well ... inconsistent, but all right-thinking people know that (a) K&R are _right_ and (b) K&R are right. Besides, functions are -special anyway (you can't nest them in C). +special anyway (you can't nest them in C). Note that the closing brace is empty on a line of its own, _except_ in the cases where it is followed by a continuation of the same statement, @@ -79,60 +112,60 @@ } else { .... } - -Rationale: K&R. + +Rationale: K&R. Also, note that this brace-placement also minimizes the number of empty (or almost empty) lines, without any loss of readability. Thus, as the supply of new-lines on your screen is not a renewable resource (think 25-line terminal screens here), you have more empty lines to put -comments on. +comments on. - Chapter 3: Naming + Chapter 4: Naming C is a Spartan language, and so should your naming be. Unlike Modula-2 and Pascal programmers, C programmers do not use cute names like ThisVariableIsATemporaryCounter. A C programmer would call that variable "tmp", which is much easier to write, and not the least more -difficult to understand. +difficult to understand. HOWEVER, while mixed-case names are frowned upon, descriptive names for global variables are a must. To call a global function "foo" is a -shooting offense. +shooting offense. GLOBAL variables (to be used only if you _really_ need them) need to have descriptive names, as do global functions. If you have a function that counts the number of active users, you should call that -"count_active_users()" or similar, you should _not_ call it "cntusr()". +"count_active_users()" or similar, you should _not_ call it "cntusr()". Encoding the type of a function into the name (so-called Hungarian notation) is brain damaged - the compiler knows the types anyway and can check those, and it only confuses the programmer. No wonder MicroSoft -makes buggy programs. +makes buggy programs. LOCAL variable names should be short, and to the point. If you have -some random integer loop counter, it should probably be called "i". +some random integer loop counter, it should probably be called "i". Calling it "loop_counter" is non-productive, if there is no chance of it being mis-understood. Similarly, "tmp" can be just about any type of -variable that is used to hold a temporary value. +variable that is used to hold a temporary value. If you are afraid to mix up your local variable names, you have another -problem, which is called the function-growth-hormone-imbalance syndrome. -See next chapter. +problem, which is called the function-growth-hormone-imbalance syndrome. +See next chapter. - - Chapter 4: Functions + + Chapter 5: Functions Functions should be short and sweet, and do just one thing. They should fit on one or two screenfuls of text (the ISO/ANSI screen size is 80x24, -as we all know), and do one thing and do that well. +as we all know), and do one thing and do that well. The maximum length of a function is inversely proportional to the complexity and indentation level of that function. So, if you have a conceptually simple function that is just one long (but simple) case-statement, where you have to do lots of small things for a lot of -different cases, it's OK to have a longer function. +different cases, it's OK to have a longer function. However, if you have a complex function, and you suspect that a less-than-gifted first-year high-school student might not even @@ -140,41 +173,78 @@ maximum limits all the more closely. Use helper functions with descriptive names (you can ask the compiler to in-line them if you think it's performance-critical, and it will probably do a better job of it -than you would have done). +than you would have done). Another measure of the function is the number of local variables. They shouldn't exceed 5-10, or you're doing something wrong. Re-think the function, and split it into smaller pieces. A human brain can generally easily keep track of about 7 different things, anything more and it gets confused. You know you're brilliant, but maybe you'd like -to understand what you did 2 weeks from now. +to understand what you did 2 weeks from now. + + + Chapter 6: Centralized exiting of functions +Albeit deprecated by some people, the equivalent of the goto statement is +used frequently by compilers in form of the unconditional jump instruction. - Chapter 5: Commenting +The goto statement comes in handy when a function exits from multiple +locations and some common work such as cleanup has to be done. + +The rationale is: + +- unconditional statements are easier to understand and follow +- nesting is reduced +- errors by not updating individual exit points when making + modifications are prevented +- saves the compiler work to optimize redundant code away ;) + +int fun(int ) +{ + int result = 0; + char *buffer = kmalloc(SIZE); + + if (buffer == NULL) + return -ENOMEM; + + if (condition1) { + while (loop1) { + ... + } + result = 1; + goto out; + } + ... +out: + kfree(buffer); + return result; +} + + Chapter 7: Commenting Comments are good, but there is also a danger of over-commenting. NEVER try to explain HOW your code works in a comment: it's much better to write the code so that the _working_ is obvious, and it's a waste of -time to explain badly written code. +time to explain badly written code. -Generally, you want your comments to tell WHAT your code does, not HOW. +Generally, you want your comments to tell WHAT your code does, not HOW. Also, try to avoid putting comments inside a function body: if the function is so complex that you need to separately comment parts of it, -you should probably go back to chapter 4 for a while. You can make +you should probably go back to chapter 5 for a while. You can make small comments to note or warn about something particularly clever (or ugly), but try to avoid excess. Instead, put the comments at the head of the function, telling people what it does, and possibly WHY it does -it. +it. - Chapter 6: You've made a mess of it + Chapter 8: You've made a mess of it That's OK, we all do. You've probably been told by your long-time Unix user helper that "GNU emacs" automatically formats the C sources for you, and you've noticed that yes, it does do that, but the defaults it uses are less than desirable (in fact, they are worse than random typing - an infinite number of monkeys typing into GNU emacs would never -make a good program). +make a good program). So, you can either get rid of GNU emacs, or change it to use saner values. To do the latter, you can stick the following in your .emacs file: @@ -192,7 +262,7 @@ to add (setq auto-mode-alist (cons '("/usr/src/linux.*/.*\\.[ch]$" . linux-c-mode) - auto-mode-alist)) + auto-mode-alist)) to your .emacs file if you want to have linux-c-mode switched on automagically when you edit source files under /usr/src/linux. @@ -201,33 +271,36 @@ everything is lost: use "indent". Now, again, GNU indent has the same brain-dead settings that GNU emacs -has, which is why you need to give it a few command line options. +has, which is why you need to give it a few command line options. However, that's not too bad, because even the makers of GNU indent recognize the authority of K&R (the GNU people aren't evil, they are just severely misguided in this matter), so you just give indent the -options "-kr -i8" (stands for "K&R, 8 character indents"). +options "-kr -i8" (stands for "K&R, 8 character indents"), or use +"scripts/Lindent", which indents in the latest style. "indent" has a lot of options, and especially when it comes to comment -re-formatting you may want to take a look at the manual page. But -remember: "indent" is not a fix for bad programming. +re-formatting you may want to take a look at the man page. But +remember: "indent" is not a fix for bad programming. - Chapter 7: Configuration-files + Chapter 9: Configuration-files -For configuration options (arch/xxx/config.in, and all the Config.in files), +For configuration options (arch/xxx/Kconfig, and all the Kconfig files), somewhat different indentation is used. -An indention level of 3 is used in the code, while the text in the config- -options should have an indention-level of 2 to indicate dependencies. The -latter only applies to bool/tristate options. For other options, just use -common sense. An example: - -if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Apply nitroglycerine inside the keyboard (DANGEROUS)' CONFIG_BOOM - if [ "$CONFIG_BOOM" != "n" ]; then - bool ' Output nice messages when you explode' CONFIG_CHEER - fi -fi +Help text is indented with 2 spaces. + +if CONFIG_EXPERIMENTAL + tristate CONFIG_BOOM + default n + help + Apply nitroglycerine inside the keyboard (DANGEROUS) + bool CONFIG_CHEER + depends on CONFIG_BOOM + default y + help + Output nice messages when you explode +endif Generally, CONFIG_EXPERIMENTAL should surround all options not considered stable. All options that are known to trash data (experimental write- @@ -235,20 +308,20 @@ experimental options should be denoted (EXPERIMENTAL). - Chapter 8: Data structures + Chapter 10: Data structures Data structures that have visibility outside the single-threaded environment they are created and destroyed in should always have reference counts. In the kernel, garbage collection doesn't exist (and outside the kernel garbage collection is slow and inefficient), which -means that you absolutely _have_ to reference count all your uses. +means that you absolutely _have_ to reference count all your uses. Reference counting means that you can avoid locking, and allows multiple users to have access to the data structure in parallel - and not having to worry about the structure suddenly going away from under them just -because they slept or did something else for a while. +because they slept or did something else for a while. -Note that locking is _not_ a replacement for reference counting. +Note that locking is _not_ a replacement for reference counting. Locking is used to keep data structures coherent, while reference counting is a memory management technique. Usually both are needed, and they are not to be confused with each other. @@ -264,3 +337,87 @@ Remember: if another thread can find your data structure, and you don't have a reference count on it, you almost certainly have a bug. + + + Chapter 11: Macros, Enums, Inline functions and RTL + +Names of macros defining constants and labels in enums are capitalized. + +#define CONSTANT 0x12345 + +Enums are preferred when defining several related constants. + +CAPITALIZED macro names are appreciated but macros resembling functions +may be named in lower case. + +Generally, inline functions are preferable to macros resembling functions. + +Macros with multiple statements should be enclosed in a do - while block: + +#define macrofun(a,b,c) \ + do { \ + if (a == 5) \ + do_this(b,c); \ + } while (0) + +Things to avoid when using macros: + +1) macros that affect control flow: + +#define FOO(x) \ + do { \ + if (blah(x) < 0) \ + return -EBUGGERED; \ + } while(0) + +is a _very_ bad idea. It looks like a function call but exits the "calling" +function; don't break the internal parsers of those who will read the code. + +2) macros that depend on having a local variable with a magic name: + +#define FOO(val) bar(index, val) + +might look like a good thing, but it's confusing as hell when one reads the +code and it's prone to breakage from seemingly innocent changes. + +3) macros with arguments that are used as l-values: FOO(x) = y; will +bite you if somebody e.g. turns FOO into an inline function. + +4) forgetting about precedence: macros defining constants using expressions +must enclose the expression in parentheses. Beware of similar issues with +macros using parameters. + +#define CONSTANT 0x4000 +#define CONSTEXP (CONSTANT | 3) + +The cpp manual deals with macros exhaustively. The gcc internals manual also +covers RTL which is used frequently with assembly language in the kernel. + + + Chapter 12: Printing kernel messages + +Kernel developers like to be seen as literate. Do mind the spelling +of kernel messages to make a good impression. Do not use crippled +words like "dont" and use "do not" or "don't" instead. + +Kernel messages do not have to be terminated with a period. + +Printing numbers in parentheses (%d) adds no value and should be avoided. + + + Chapter 13: References + +The C Programming Language, Second Edition +by Brian W. Kernighan and Dennis M. Ritchie. +Prentice Hall, Inc., 1988. +ISBN 0-13-110362-8 (paperback), 0-13-110370-9 (hardback). + +The Practice of Programming +Brian W. Kernighan, Rob Pike +Addison-Wesley, 1999, ISBN 0-201-61586-X + +GNU manuals - where in compliance with K&R and this text - for cpp, gcc, +gcc internals and indent, all available from www.gnu.org. + +-- +Last updated on 16 February 2004 by a community effort on LKML. diff -Nru a/Documentation/computone.txt b/Documentation/computone.txt --- a/Documentation/computone.txt Thu Feb 19 23:44:27 2004 +++ b/Documentation/computone.txt Thu Feb 19 23:44:27 2004 @@ -41,11 +41,11 @@ Note the hardware address from the Computone ISA cards installed into the system. These are required for editing ip2.c or editing - /etc/modules.conf, or for specification on the modprobe + /etc/modprobe.conf, or for specification on the modprobe command line. - Note that the /etc/modules.conf file is named /etc/conf.modules - with older versions of the module utilities. + Note that the /etc/modules.conf should be used for older (pre-2.6) + kernels. Software - @@ -58,7 +58,7 @@ c) Set address on ISA cards then: edit /usr/src/linux/drivers/char/ip2.c if needed or - edit /etc/modules.conf if needed (module). + edit /etc/modprobe.conf if needed (module). or both to match this setting. d) Run "make modules" e) Run "make modules_install" @@ -145,11 +145,11 @@ selects polled mode). If no base addresses are specified the defaults in ip2.c are used. If you are autoloading the driver module with kerneld or kmod the base addresses and interrupt number must also be set in ip2.c -and recompile or just insert and options line in /etc/modules.conf or both. +and recompile or just insert and options line in /etc/modprobe.conf or both. The options line is equivalent to the command line and takes precidence over what is in ip2.c. -/etc/modules.conf sample: +/etc/modprobe.conf sample: options ip2 io=1,0x328 irq=1,10 alias char-major-71 ip2 alias char-major-72 ip2 diff -Nru a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt --- a/Documentation/crypto/api-intro.txt Thu Feb 19 23:44:26 2004 +++ b/Documentation/crypto/api-intro.txt Thu Feb 19 23:44:26 2004 @@ -68,7 +68,7 @@ CONFIGURATION NOTES As Triple DES is part of the DES module, for those using modular builds, -add the following line to /etc/modules.conf: +add the following line to /etc/modprobe.conf: alias des3_ede des diff -Nru a/Documentation/debugging-modules.txt b/Documentation/debugging-modules.txt --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/Documentation/debugging-modules.txt Thu Feb 19 23:44:29 2004 @@ -0,0 +1,18 @@ +Debugging Modules after 2.6.3 +----------------------------- + +In almost all distributions, the kernel asks for modules which don't +exist, such as "net-pf-10" or whatever. Changing "modprobe -q" to +"succeed" in this case is hacky and breaks some setups, and also we +want to know if it failed for the fallback code for old aliases in +fs/char_dev.c, for example. + +In the past a debugging message which would fill people's logs was +emitted. This debugging message has been removed. The correct way +of debugging module problems is something like this: + +echo '#! /bin/sh' > /tmp/modprobe +echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe +echo 'exec /sbin/modprobe "$@"' >> /tmp/modprobe +chmod a+x /tmp/modprobe +echo /tmp/modprobe > /proc/sys/kernel/modprobe diff -Nru a/Documentation/digiboard.txt b/Documentation/digiboard.txt --- a/Documentation/digiboard.txt Thu Feb 19 23:44:25 2004 +++ b/Documentation/digiboard.txt Thu Feb 19 23:44:25 2004 @@ -24,7 +24,7 @@ The pcxx driver can be configured using the command line feature while loading the kernel with LILO or LOADLIN or, if built as a module, with arguments to insmod and modprobe or with parameters in -/etc/modules.conf for modprobe and kerneld. +/etc/modprobe.conf for modprobe and kerneld. After configuring the driver you need to create the device special files as described in "Device file creation:" below and set the appropriate @@ -91,13 +91,13 @@ The remaining board still uses ttyD8-ttyD15 and cud8-cud15. -Example line for /etc/modules.conf for use with kerneld and as default +Example line for /etc/modprobe.conf for use with kerneld and as default parameters for modprobe: options pcxx io=0x200 numports=8 -For kerneld to work you will likely need to add these two lines to your -/etc/modules.conf: +For kmod to work you will likely need to add these two lines to your +/etc/modprobe.conf: alias char-major-22 pcxx alias char-major-23 pcxx diff -Nru a/Documentation/fb/intel810.txt b/Documentation/fb/intel810.txt --- a/Documentation/fb/intel810.txt Thu Feb 19 23:44:26 2004 +++ b/Documentation/fb/intel810.txt Thu Feb 19 23:44:26 2004 @@ -194,7 +194,7 @@ modprobe i810fb vram=2 xres=1024 bpp=8 hsync1=30 hsync2=55 vsync1=50 \ vsync2=85 accel=1 mtrr=1 -Or just add the following to /etc/modules.conf +Or just add the following to /etc/modprobe.conf options i810fb vram=2 xres=1024 bpp=16 hsync1=30 hsync2=55 vsync1=50 \ vsync2=85 accel=1 mtrr=1 diff -Nru a/Documentation/filesystems/jfs.txt b/Documentation/filesystems/jfs.txt --- a/Documentation/filesystems/jfs.txt Thu Feb 19 23:44:26 2004 +++ b/Documentation/filesystems/jfs.txt Thu Feb 19 23:44:26 2004 @@ -12,10 +12,9 @@ The following mount options are supported: iocharset=name Character set to use for converting from Unicode to - ASCII. The default is compiled into the kernel as - CONFIG_NLS_DEFAULT. Use iocharset=utf8 for UTF8 - translations. This requires CONFIG_NLS_UTF8 to be set - in the kernel .config file. + ASCII. The default is to do no conversion. Use + iocharset=utf8 for UTF8 translations. This requires + CONFIG_NLS_UTF8 to be set in the kernel .config file. resize=value Resize the volume to blocks. JFS only supports growing a volume, not shrinking it. This option is only @@ -35,18 +34,6 @@ errors=continue Keep going on a filesystem error. errors=remount-ro Default. Remount the filesystem read-only on an error. errors=panic Panic and halt the machine if an error occurs. - -JFS TODO list: - -Plans for our near term development items - - - enhance support for logfile on dedicated partition - -Longer term work items - - - implement defrag utility, for online defragmenting - - add quota support - - add support for block sizes (512,1024,2048) Please send bugs, comments, cards and letters to shaggy@austin.ibm.com. diff -Nru a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt --- a/Documentation/filesystems/proc.txt Thu Feb 19 23:44:24 2004 +++ b/Documentation/filesystems/proc.txt Thu Feb 19 23:44:24 2004 @@ -900,6 +900,15 @@ Every mounted file system needs a super block, so if you plan to mount lots of file systems, you may want to increase these numbers. +aio-nr and aio-max-nr +--------------------- + +aio-nr is the running total of the number of events specified on the +io_setup system call for all currently active aio contexts. If aio-nr +reaches aio-max-nr then io_setup will fail with EAGAIN. Note that +raising aio-max-nr does not result in the pre-allocation or re-sizing +of any kernel data structures. + 2.2 /proc/sys/fs/binfmt_misc - Miscellaneous binary formats ----------------------------------------------------------- diff -Nru a/Documentation/ftape.txt b/Documentation/ftape.txt --- a/Documentation/ftape.txt Thu Feb 19 23:44:23 2004 +++ b/Documentation/ftape.txt Thu Feb 19 23:44:23 2004 @@ -242,15 +242,15 @@ Module parameters can be specified either directly when invoking the program 'insmod' at the shell prompt: - insmod ftape.o ft_tracing=4 + modprobe ftape ft_tracing=4 - or by editing the file `/etc/modules.conf' in which case they take + or by editing the file `/etc/modprobe.conf' in which case they take effect each time when the module is loaded with `modprobe' (please refer to the respective manual pages). Thus, you should add a line options ftape ft_tracing=4 - to `/etc/modules.conf` if you intend to increase the debugging + to `/etc/modprobe.conf` if you intend to increase the debugging output of the driver. @@ -298,7 +298,7 @@ 5. Example module parameter setting ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ To do the same, but with ftape compiled as a loadable kernel - module, add the following line to `/etc/modules.conf': + module, add the following line to `/etc/modprobe.conf': options ftape ft_probe_fc10=1 ft_tracing=4 diff -Nru a/Documentation/hayes-esp.txt b/Documentation/hayes-esp.txt --- a/Documentation/hayes-esp.txt Thu Feb 19 23:44:23 2004 +++ b/Documentation/hayes-esp.txt Thu Feb 19 23:44:23 2004 @@ -109,7 +109,7 @@ insmod esp dma=3 trigger=512 The esp module can be automatically loaded when needed. To cause this to -happen, add the following lines to /etc/modules.conf (replacing the last line +happen, add the following lines to /etc/modprobe.conf (replacing the last line with options for your configuration): alias char-major-57 esp diff -Nru a/Documentation/ide.txt b/Documentation/ide.txt --- a/Documentation/ide.txt Thu Feb 19 23:44:26 2004 +++ b/Documentation/ide.txt Thu Feb 19 23:44:26 2004 @@ -198,12 +198,11 @@ can only be compiled into the kernel, and the core code (ide.c) can be compiled as a loadable module provided no chipset support is needed. -When using ide.c/ide-tape.c as modules in combination with kerneld, add: +When using ide.c as a module in combination with kmod, add: alias block-major-3 ide-probe - alias char-major-37 ide-tape -respectively to /etc/modules.conf. +to /etc/modprobe.conf. When ide.c is used as a module, you can pass command line parameters to the driver using the "options=" keyword to insmod, while replacing any ',' with @@ -231,9 +230,10 @@ "hdx=cyl,head,sect" : disk drive is present, with specified geometry - "hdx=remap" : remap access of sector 0 to sector 1 (for EZD) + "hdx=remap" : remap access of sector 0 to sector 1 (for EZDrive) - "hdx=remap63" : remap the drive: shift all by 63 sectors (for DM) + "hdx=remap63" : remap the drive: add 63 to all sector numbers + (for DM OnTrack) "hdx=autotune" : driver will attempt to tune interface speed to the fastest PIO mode supported, @@ -242,16 +242,9 @@ and quite likely to cause trouble with older/odd IDE drives. - "hdx=slow" : insert a huge pause after each access to the data - port. Should be used only as a last resort. - "hdx=swapdata" : when the drive is a disk, byte swap all data "hdx=bswap" : same as above.......... - - "hdx=flash" : allows for more than one ata_flash disk to be - registered. In most cases, only one device - will be present. "hdx=scsi" : the return of the ide-scsi flag, this is useful for allowing ide-floppy, ide-tape, and ide-cdrom|writers diff -Nru a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt --- a/Documentation/kbuild/modules.txt Thu Feb 19 23:44:27 2004 +++ b/Documentation/kbuild/modules.txt Thu Feb 19 23:44:27 2004 @@ -17,12 +17,52 @@ Compiling modules outside the official kernel --------------------------------------------- -Often modules are developed outside the official kernel. -To keep up with changes in the build system the most portable way -to compile a module outside the kernel is to use the following command-line: + +Often modules are developed outside the official kernel. To keep up +with changes in the build system the most portable way to compile a +module outside the kernel is to use the kernel build system, +kbuild. Use the following command-line: make -C path/to/kernel/src SUBDIRS=$PWD modules This requires that a makefile exits made in accordance to -Documentation/kbuild/makefiles.txt. +Documentation/kbuild/makefiles.txt. Read that file for more details on +the build system. + +The following is a short summary of how to write your Makefile to get +you up and running fast. Assuming your module will be called +yourmodule.ko, your code should be in yourmodule.c and your Makefile +should include + +obj-m := yourmodule.o + +If the code for your module is in multiple files that need to be +linked, you need to tell the build system which files to compile. In +the case of multiple files, none of these files can be named +yourmodule.c because doing so would cause a problem with the linking +step. Assuming your code exists in file1.c, file2.c, and file3.c and +you want to build yourmodule.ko from them, your Makefile should +include + +obj-m := yourmodule.o +yourmodule-objs := file1.o file2.o file3.o + +Now for a final example to put it all together. Assuming the +KERNEL_SOURCE environment variable is set to the directory where you +compiled the kernel, a simple Makefile that builds yourmodule.ko as +described above would look like + +# Tells the build system to build yourmodule.ko. +obj-m := yourmodule.o + +# Tells the build system to build these object files and link them as +# yourmodule.o, before building yourmodule.ko. This line can be left +# out if all the code for your module is in one file, yourmodule.c. If +# you are using multiple files, none of these files can be named +# yourmodule.c. +yourmodule-objs := file1.o file2.o file3.o +# Invokes the kernel build system to come back to the current +# directory and build yourmodule.ko. +default: + make -C ${KERNEL_SOURCE} SUBDIRS=`pwd` modules diff -Nru a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt Thu Feb 19 23:44:29 2004 +++ b/Documentation/kernel-parameters.txt Thu Feb 19 23:44:29 2004 @@ -237,7 +237,7 @@ Forces specified timesource (if avaliable) to be used when calculating gettimeofday(). If specicified timesource is not avalible, it defaults to PIT. - Format: { pit | tsc | cyclone | ... } + Format: { pit | tsc | cyclone | pmtmr } hpet= [IA-32,HPET] option to disable HPET and use PIT. Format: disable @@ -292,6 +292,9 @@ devfs= [DEVFS] See Documentation/filesystems/devfs/boot-options. + + dhash_entries= [KNL] + Set number of hash buckets for dentry cache. digi= [HW,SERIAL] IO parameters + enable/disable command. @@ -310,6 +313,23 @@ dtc3181e= [HW,SCSI] + earlyprintk= [x86, x86_64] + early_printk=vga + early_printk=serial[,ttySn[,baudrate]] + + Append ,keep to not disable it when the real console + takes over. + + Only vga or serial at a time, not both. + + Currently only ttyS0 and ttyS1 are supported. + + Interaction with the standard serial driver is not + very good. + + The VGA output is eventually overwritten by the real + console. + eata= [HW,SCSI] eda= [HW,PS2] @@ -424,6 +444,9 @@ idle= [HW] Format: idle=poll or idle=halt + ihash_entries= [KNL] + Set number of hash buckets for inode cache. + in2000= [HW,SCSI] See header of drivers/scsi/in2000.c. @@ -873,6 +896,9 @@ resume= [SWSUSP] Specify the partition device for software suspension + rhash_entries= [KNL,NET] + Set number of hash buckets for route cache + riscom8= [HW,SERIAL] Format: [,[,...]] @@ -1134,6 +1160,9 @@ 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 tipar= [HW] See header of drivers/char/tipar.c. diff -Nru a/Documentation/networking/baycom.txt b/Documentation/networking/baycom.txt --- a/Documentation/networking/baycom.txt Thu Feb 19 23:44:27 2004 +++ b/Documentation/networking/baycom.txt Thu Feb 19 23:44:27 2004 @@ -93,10 +93,10 @@ modems it should access at which ports. This can be done with the setbaycom utility. If you are only using one modem, you can also configure the driver from the insmod command line (or by means of an option line in -/etc/modules.conf). +/etc/modprobe.conf). Examples: - insmod baycom_ser_fdx mode="ser12*" iobase=0x3f8 irq=4 + modprobe baycom_ser_fdx mode="ser12*" iobase=0x3f8 irq=4 sethdlc -i bcsf0 -p mode "ser12*" io 0x3f8 irq 4 Both lines configure the first port to drive a ser12 modem at the first diff -Nru a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt --- a/Documentation/networking/bonding.txt Thu Feb 19 23:44:24 2004 +++ b/Documentation/networking/bonding.txt Thu Feb 19 23:44:24 2004 @@ -31,6 +31,7 @@ Frequently Asked Questions High Availability Promiscuous Sniffing notes +8021q VLAN support Limitations Resources and Links @@ -73,9 +74,9 @@ Bond Configuration ================== -You will need to add at least the following line to /etc/modules.conf +You will need to add at least the following line to /etc/modprobe.conf so the bonding driver will automatically load when the bond0 interface is -configured. Refer to the modules.conf manual page for specific modules.conf +configured. Refer to the modprobe.conf manual page for specific modprobe.conf syntax details. The Module Parameters section of this document describes each bonding driver parameter. @@ -132,18 +133,14 @@ appropriate rc directory. If you specifically need all network drivers loaded before the bonding driver, -adding the following line to modules.conf will cause the network driver for +adding the following line to modprobe.conf will cause the network driver for eth0 and eth1 to be loaded before the bonding driver. -probeall bond0 eth0 eth1 bonding +install bond0 /sbin/modprobe -a eth0 eth1 && /sbin/modprobe bonding Be careful not to reference bond0 itself at the end of the line, or modprobe will die in an endless recursive loop. -To have device characteristics (such as MTU size) propagate to slave devices, -set the bond characteristics before enslaving the device. The characteristics -are propagated during the enslave process. - If running SNMP agents, the bonding driver should be loaded before any network drivers participating in a bond. This requirement is due to the the interface index (ipAdEntIfIndex) being associated to the first interface found with a @@ -191,7 +188,7 @@ Optional parameters for the bonding driver can be supplied as command line arguments to the insmod command. Typically, these parameters are specified in -the file /etc/modules.conf (see the manual page for modules.conf). The +the file /etc/modprobe.conf (see the manual page for modprobe.conf). The available bonding driver parameters are listed below. If a parameter is not specified the default value is used. When initially configuring a bond, it is recommended "tail -f /var/log/messages" be run in a separate window to @@ -601,7 +598,7 @@ For ethernet cards not supporting MII status, the arp_interval and arp_ip_target parameters must be specified for bonding to work correctly. If packets have not been sent or received during the - specified arp_interval durration, an ARP request is sent to the + specified arp_interval duration, an ARP request is sent to the targets to generate send and receive traffic. If after this interval, either the successful send and/or receive count has not incremented, the next slave in the sequence will become the active @@ -669,16 +666,8 @@ that will be added. To restore your slaves' MAC addresses, you need to detach them - from the bond (`ifenslave -d bond0 eth0'), set them down - (`ifconfig eth0 down'), unload the drivers (`rmmod 3c59x', for - example) and reload them to get the MAC addresses from their - eeproms. If the driver is shared by several devices, you need - to turn them all down. Another solution is to look for the MAC - address at boot time (dmesg or tail /var/log/messages) and to - reset it by hand with ifconfig : - - # ifconfig eth0 down - # ifconfig eth0 hw ether 00:20:40:60:80:A0 + from the bond (`ifenslave -d bond0 eth0'). The bonding driver will then + restore the MAC addresses that the slaves had before they were enslaved. 9. Which transmit polices can be used? @@ -742,9 +731,8 @@ # modprobe bonding miimon=100 -Or, put the following lines in /etc/modules.conf: +Or, put the following line in /etc/modprobe.conf: - alias bond0 bonding options bond0 miimon=100 There are currently two policies for high availability. They are dependent on @@ -815,9 +803,8 @@ # modprobe bonding miimon=100 mode=1 -Or, put in your /etc/modules.conf : +Or, put in your /etc/modprobe.conf : - alias bond0 bonding options bond0 miimon=100 mode=active-backup Example 1: Using multiple host and multiple switches to build a "no single @@ -843,7 +830,7 @@ In this configuration, there is an ISL - Inter Switch Link (could be a trunk), several servers (host1, host2 ...) attached to both switches each, and one or -more ports to the outside world (port3...). One an only one slave on each host +more ports to the outside world (port3...). One and only one slave on each host is active at a time, while all links are still monitored (the system can detect a failure of active and backup links). @@ -919,7 +906,6 @@ must add the promisc flag there; it will be propagated down to the slave interfaces at ifenslave time; a full example might look like: - grep bond0 /etc/modules.conf || echo alias bond0 bonding >/etc/modules.conf ifconfig bond0 promisc up for if in eth1 eth2 ...;do ifconfig $if up @@ -931,6 +917,41 @@ interface, appropriately for its design functions in HA and channel capacity aggregating; but it works fine for unnumbered interfaces; just ignore all the warnings it emits. + + +8021q VLAN support +================== + +It is possible to configure VLAN devices over a bond interface using the 8021q +driver. However, only packets coming from the 8021q driver and passing through +bonding will be tagged by default. Self generated packets, like bonding's +learning packets or ARP packets generated by either ALB mode or the ARP +monitor mechanism, are tagged internally by bonding itself. As a result, +bonding has to "learn" what VLAN IDs are configured on top of it, and it uses +those IDs to tag self generated packets. + +For simplicity reasons, and to support the use of adapters that can do VLAN +hardware acceleration offloding, the bonding interface declares itself as +fully hardware offloaing capable, it gets the add_vid/kill_vid notifications +to gather the necessary information, and it propagates those actions to the +slaves. +In case of mixed adapter types, hardware accelerated tagged packets that should +go through an adapter that is not offloading capable are "un-accelerated" by the +bonding driver so the VLAN tag sits in the regular location. + +VLAN interfaces *must* be added on top of a bonding interface only after +enslaving at least one slave. This is because until the first slave is added the +bonding interface has a HW address of 00:00:00:00:00:00, which will be copied by +the VLAN interface when it is created. + +Notice that a problem would occur if all slaves are released from a bond that +still has VLAN interfaces on top of it. When later coming to add new slaves, the +bonding interface would get a HW address from the first slave, which might not +match that of the VLAN interfaces. It is recommended that either all VLANs are +removed and then re-added, or to manually set the bonding interface's HW +address so it matches the VLAN's. (Note: changing a VLAN interface's HW address +would set the underlying device -- i.e. the bonding interface -- to promiscouos +mode, which might not be what you want). Limitations diff -Nru a/Documentation/networking/dl2k.txt b/Documentation/networking/dl2k.txt --- a/Documentation/networking/dl2k.txt Thu Feb 19 23:44:26 2004 +++ b/Documentation/networking/dl2k.txt Thu Feb 19 23:44:26 2004 @@ -37,15 +37,15 @@ Install linux driver as following command: 1. make all -2. insmod dl2k.o +2. insmod dl2k.ko 3. ifconfig eth0 up 10.xxx.xxx.xxx netmask 255.0.0.0 ^^^^^^^^^^^^^^^\ ^^^^^^^^\ IP NETMASK Now eth0 should active, you can test it by "ping" or get more information by "ifconfig". If tested ok, continue the next step. -4. cp dl2k.o /lib/modules/`uname -r`/kernel/drivers/net -5. Add the following lines to /etc/modules.conf: +4. cp dl2k.ko /lib/modules/`uname -r`/kernel/drivers/net +5. Add the following line to /etc/modprobe.conf: alias eth0 dl2k 6. Run "netconfig" or "netconf" to create configuration script ifcfg-eth0 located at /etc/sysconfig/network-scripts or create it manually. @@ -154,8 +154,8 @@ ----------------- 1. Copy dl2k.o to the network modules directory, typically /lib/modules/2.x.x-xx/net or /lib/modules/2.x.x/kernel/drivers/net. - 2. Locate the boot module configuration file, most commonly modules.conf - or conf.modules in the /etc directory. Add the following lines: + 2. Locate the boot module configuration file, most commonly modprobe.conf + or modules.conf (for 2.4) in the /etc directory. Add the following lines: alias ethx dl2k options dl2k diff -Nru a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c --- a/Documentation/networking/ifenslave.c Thu Feb 19 23:44:23 2004 +++ b/Documentation/networking/ifenslave.c Thu Feb 19 23:44:23 2004 @@ -89,13 +89,13 @@ * while it is running. It was already set during enslave. To * simplify things, it is now handeled separately. * - * - 2003/09/24 - Shmulik Hen + * - 2003/12/01 - Shmulik Hen * - Code cleanup and style changes * set version to 1.1.0 */ #define APP_VERSION "1.1.0" -#define APP_RELDATE "Septemer 24, 2003" +#define APP_RELDATE "December 1, 2003" #define APP_NAME "ifenslave" static char *version = diff -Nru a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt --- a/Documentation/networking/ip-sysctl.txt Thu Feb 19 23:44:24 2004 +++ b/Documentation/networking/ip-sysctl.txt Thu Feb 19 23:44:24 2004 @@ -499,6 +499,55 @@ conf/{all,interface}/arp_filter is set to TRUE, it will be disabled otherwise +arp_announce - INTEGER + Define different restriction levels for announcing the local + source IP address from IP packets in ARP requests sent on + interface: + 0 - (default) Use any local address, configured on any interface + 1 - Try to avoid local addresses that are not in the target's + subnet for this interface. This mode is useful when target + hosts reachable via this interface require the source IP + address in ARP requests to be part of their logical network + configured on the receiving interface. When we generate the + request we will check all our subnets that include the + target IP and will preserve the source address if it is from + such subnet. If there is no such subnet we select source + address according to the rules for level 2. + 2 - Always use the best local address for this target. + In this mode we ignore the source address in the IP packet + and try to select local address that we prefer for talks with + the target host. Such local address is selected by looking + for primary IP addresses on all our subnets on the outgoing + interface that include the target IP address. If no suitable + local address is found we select the first local address + we have on the outgoing interface or on all other interfaces, + with the hope we will receive reply for our request and + even sometimes no matter the source IP address we announce. + + The max value from conf/{all,interface}/arp_announce is used. + + Increasing the restriction level gives more chance for + receiving answer from the resolved target while decreasing + the level announces more valid sender's information. + +arp_ignore - INTEGER + Define different modes for sending replies in response to + received ARP requests that resolve local target IP addresses: + 0 - (default): reply for any local target IP address, configured + on any interface + 1 - reply only if the target IP address is local address + configured on the incoming interface + 2 - reply only if the target IP address is local address + configured on the incoming interface and both with the + sender's IP address are part from same subnet on this interface + 3 - do not reply for local addresses configured with scope host, + only resolutions for global and link addresses are replied + 4-7 - reserved + 8 - do not reply for all local addresses + + The max value from conf/{all,interface}/arp_ignore is used + when ARP request is received on the {interface} + tag - INTEGER Allows you to write a number, which can be used as required. Default value is 0. diff -Nru a/Documentation/networking/ltpc.txt b/Documentation/networking/ltpc.txt --- a/Documentation/networking/ltpc.txt Thu Feb 19 23:44:27 2004 +++ b/Documentation/networking/ltpc.txt Thu Feb 19 23:44:27 2004 @@ -25,7 +25,7 @@ If you load the driver as a module, you can pass the parameters "io=", "irq=", and "dma=" on the command line with insmod or modprobe, or add -them as options in /etc/modules.conf: +them as options in /etc/modprobe.conf: alias lt0 ltpc # autoload the module when the interface is configured options ltpc io=0x240 irq=9 dma=1 diff -Nru a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt --- a/Documentation/networking/sk98lin.txt Thu Feb 19 23:44:26 2004 +++ b/Documentation/networking/sk98lin.txt Thu Feb 19 23:44:26 2004 @@ -1,10 +1,10 @@ -(C)Copyright 1999-2003 Marvell(R). +(C)Copyright 1999-2004 Marvell(R). All rights reserved =========================================================================== -sk98lin.txt created 15-Dec-2003 +sk98lin.txt created 13-Feb-2004 -Readme File for sk98lin v6.21 +Readme File for sk98lin v6.23 Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX This file contains @@ -174,7 +174,7 @@ to the driver module. If you use the kernel module loader, you can set driver parameters -in the file /etc/modules.conf (or old name: /etc/conf.modules). +in the file /etc/modprobe.conf (or /etc/modules.conf in 2.4 or earlier). To set the driver parameters in this file, proceed as follows: 1. Insert a line of the form : diff -Nru a/Documentation/networking/tuntap.txt b/Documentation/networking/tuntap.txt --- a/Documentation/networking/tuntap.txt Thu Feb 19 23:44:24 2004 +++ b/Documentation/networking/tuntap.txt Thu Feb 19 23:44:24 2004 @@ -45,13 +45,10 @@ bogus network interfaces to trick firewalls or administrators. Driver module autoloading - Make sure that "Kernel module loader" - module auto-loading support is enabled - in your kernel. - Add the following line to the /etc/modules.conf: - alias char-major-10-200 tun - and run - depmod -a + Make sure that "Kernel module loader" - module auto-loading + support is enabled in your kernel. The kernel should load it on + first access. Manual loading insert the module by hand: diff -Nru a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt --- a/Documentation/networking/vortex.txt Thu Feb 19 23:44:23 2004 +++ b/Documentation/networking/vortex.txt Thu Feb 19 23:44:23 2004 @@ -59,8 +59,8 @@ ================= There are several parameters which may be provided to the driver when -its module is loaded. These are usually placed in /etc/modules.conf -(used to be conf.modules). Example: +its module is loaded. These are usually placed in /etc/modprobe.conf +(/etc/modules.conf in 2.4). Example: options 3c59x debug=3 rx_copybreak=300 @@ -216,6 +216,19 @@ to increase this value on LANs which have very high collision rates. The default value is 5000 (5.0 seconds). +enable_wol=N1,N2,N3,... + + Enable Wake-on-LAN support for the relevant interface. Donald + Becker's `ether-wake' application may be used to wake suspended + machines. + + Also enables the NIC's power management support. + +global_enable_wol=N + + Sets enable_wol mode for all 3c59x NICs in the machine. Entries in + the `enable_wol' array above will override any setting of this. + Media selection --------------- @@ -413,9 +426,9 @@ 1) Increase the debug level. Usually this is done via: - a) modprobe driver.o debug=7 - b) In /etc/conf.modules (or modules.conf): - options driver_name debug=7 + a) modprobe driver debug=7 + b) In /etc/modprobe.conf (or /etc/modules.conf for 2.4): + options driver debug=7 2) Recreate the problem with the higher debug level, send all logs to the maintainer. diff -Nru a/Documentation/parport.txt b/Documentation/parport.txt --- a/Documentation/parport.txt Thu Feb 19 23:44:26 2004 +++ b/Documentation/parport.txt Thu Feb 19 23:44:26 2004 @@ -39,7 +39,7 @@ KMod ---- -If you use kmod, you will find it useful to edit /etc/modules.conf. +If you use kmod, you will find it useful to edit /etc/modprobe.conf. Here is an example of the lines that need to be added: alias parport_lowlevel parport_pc diff -Nru a/Documentation/rocket.txt b/Documentation/rocket.txt --- a/Documentation/rocket.txt Thu Feb 19 23:44:25 2004 +++ b/Documentation/rocket.txt Thu Feb 19 23:44:25 2004 @@ -43,7 +43,7 @@ If installed as a module, the module must be loaded. This can be done manually by entering "modprobe rocket". To have the module loaded automatically -upon system boot, edit the /etc/modules.conf file and add the line +upon system boot, edit the /etc/modprobe.conf file and add the line "alias char-major-46 rocket". In order to use the ports, their device names (nodes) must be created with mknod. diff -Nru a/Documentation/s390/3270.txt b/Documentation/s390/3270.txt --- a/Documentation/s390/3270.txt Thu Feb 19 23:44:24 2004 +++ b/Documentation/s390/3270.txt Thu Feb 19 23:44:24 2004 @@ -48,7 +48,7 @@ script and the resulting /tmp/mkdev3270. If you have chosen to make tub3270 a module, you add a line to -/etc/modules.conf. If you are working on a VM virtual machine, you +/etc/modprobe.conf. If you are working on a VM virtual machine, you can use DEF GRAF to define virtual 3270 devices. You may generate both 3270 and 3215 console support, or one or the @@ -60,7 +60,7 @@ In brief, these are the steps: 1. Install the tub3270 patch - 2. (If a module) add a line to /etc/modules.conf + 2. (If a module) add a line to /etc/modprobe.conf 3. (If VM) define devices with DEF GRAF 4. Reboot 5. Configure @@ -84,13 +84,13 @@ make modules_install 2. (Perform this step only if you have configured tub3270 as a - module.) Add a line to /etc/modules.conf to automatically + module.) Add a line to /etc/modprobe.conf to automatically load the driver when it's needed. With this line added, you will see login prompts appear on your 3270s as soon as boot is complete (or with emulated 3270s, as soon as you dial into your vm guest using the command "DIAL "). Since the line-mode major number is 227, the line to add to - /etc/modules.conf should be: + /etc/modprobe.conf should be: alias char-major-227 tub3270 3. Define graphic devices to your vm guest machine, if you diff -Nru a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt --- a/Documentation/scsi/aic79xx.txt Thu Feb 19 23:44:27 2004 +++ b/Documentation/scsi/aic79xx.txt Thu Feb 19 23:44:27 2004 @@ -210,7 +210,7 @@ INCORRECTLY CAN RENDER YOUR SYSTEM INOPERABLE. USE THEM WITH CAUTION. - Edit the file "modules.conf" in the directory /etc and add/edit a + Edit the file "modprobe.conf" in the directory /etc and add/edit a line containing 'options aic79xx aic79xx=[command[,command...]]' where 'command' is one or more of the following: ----------------------------------------------------------------- diff -Nru a/Documentation/scsi/aic7xxx.txt b/Documentation/scsi/aic7xxx.txt --- a/Documentation/scsi/aic7xxx.txt Thu Feb 19 23:44:24 2004 +++ b/Documentation/scsi/aic7xxx.txt Thu Feb 19 23:44:24 2004 @@ -186,7 +186,7 @@ INCORRECTLY CAN RENDER YOUR SYSTEM INOPERABLE. USE THEM WITH CAUTION. - Edit the file "modules.conf" in the directory /etc and add/edit a + Edit the file "modprobe.conf" in the directory /etc and add/edit a line containing 'options aic7xxx aic7xxx=[command[,command...]]' where 'command' is one or more of the following: ----------------------------------------------------------------- diff -Nru a/Documentation/scsi/osst.txt b/Documentation/scsi/osst.txt --- a/Documentation/scsi/osst.txt Thu Feb 19 23:44:27 2004 +++ b/Documentation/scsi/osst.txt Thu Feb 19 23:44:27 2004 @@ -67,7 +67,7 @@ If you want to have the module autoloaded on access to /dev/osst, you may add something like alias char-major-206 osst -to your /etc/modules.conf (old name: conf.modules). +to your /etc/modprobe.conf (before 2.6: modules.conf). You may find it convenient to create a symbolic link ln -s nosst0 /dev/tape diff -Nru a/Documentation/sonypi.txt b/Documentation/sonypi.txt --- a/Documentation/sonypi.txt Thu Feb 19 23:44:22 2004 +++ b/Documentation/sonypi.txt Thu Feb 19 23:44:22 2004 @@ -43,7 +43,7 @@ --------------- Several options can be passed to the sonypi driver, either by adding them -to /etc/modules.conf file, when the driver is compiled as a module or by +to /etc/modprobe.conf file, when the driver is compiled as a module or by adding the following to the kernel command line (in your bootloader): sonypi=minor[,verbose[,fnkeyinit[,camera[,compat[,mask[,useinput]]]]]] @@ -109,7 +109,7 @@ ----------- In order to automatically load the sonypi module on use, you can put those -lines in your /etc/modules.conf file: +lines in your /etc/modprobe.conf file: alias char-major-10-250 sonypi options sonypi minor=250 diff -Nru a/Documentation/sound/oss/AWE32 b/Documentation/sound/oss/AWE32 --- a/Documentation/sound/oss/AWE32 Thu Feb 19 23:44:26 2004 +++ b/Documentation/sound/oss/AWE32 Thu Feb 19 23:44:26 2004 @@ -47,12 +47,12 @@ Copy it to a directory of your choice, and unpack it there. -4) Edit /etc/modules.conf, and insert the following lines at the end of the +4) Edit /etc/modprobe.conf, and insert the following lines at the end of the file: alias sound-slot-0 sb alias sound-service-0-1 awe_wave - post-install awe_wave /usr/local/bin/sfxload PATH_TO_SOUND_BANK_FILE + install awe_wave /sbin/modprobe --first-time -i awe_wave && /usr/local/bin/sfxload PATH_TO_SOUND_BANK_FILE You will of course have to change "PATH_TO_SOUND_BANK_FILE" to the full path of of the sound bank file. That will enable the Sound Blaster and AWE diff -Nru a/Documentation/sound/oss/AudioExcelDSP16 b/Documentation/sound/oss/AudioExcelDSP16 --- a/Documentation/sound/oss/AudioExcelDSP16 Thu Feb 19 23:44:25 2004 +++ b/Documentation/sound/oss/AudioExcelDSP16 Thu Feb 19 23:44:25 2004 @@ -41,7 +41,7 @@ (0x300, 0x310, 0x320 or 0x330) mpu_irq MPU-401 irq line (5, 7, 9, 10 or 0) -The /etc/modules.conf will have lines like this: +The /etc/modprobe.conf will have lines like this: options opl3 io=0x388 options ad1848 io=0x530 irq=11 dma=3 @@ -51,11 +51,11 @@ ad1848 are the corresponding options for the MSS and OPL3 modules. Loading MSS and OPL3 needs to pre load the aedsp16 module to set up correctly -the sound card. Installation dependencies must be written in the modules.conf +the sound card. Installation dependencies must be written in the modprobe.conf file: -pre-install ad1848 modprobe aedsp16 -pre-install opl3 modprobe aedsp16 +install ad1848 /sbin/modprobe aedsp16 && /sbin/modprobe -i ad1848 +install opl3 /sbin/modprobe aedsp16 && /sbin/modprobe -i opl3 Then you must load the sound modules stack in this order: sound -> aedsp16 -> [ ad1848, opl3 ] diff -Nru a/Documentation/sound/oss/CMI8330 b/Documentation/sound/oss/CMI8330 --- a/Documentation/sound/oss/CMI8330 Thu Feb 19 23:44:23 2004 +++ b/Documentation/sound/oss/CMI8330 Thu Feb 19 23:44:23 2004 @@ -143,7 +143,7 @@ -Alma Chao suggests the following /etc/modules.conf: +Alma Chao suggests the following /etc/modprobe.conf: alias sound ad1848 alias synth0 opl3 diff -Nru a/Documentation/sound/oss/Introduction b/Documentation/sound/oss/Introduction --- a/Documentation/sound/oss/Introduction Thu Feb 19 23:44:29 2004 +++ b/Documentation/sound/oss/Introduction Thu Feb 19 23:44:29 2004 @@ -168,7 +168,7 @@ ========= If loading via modprobe, these common files are automatically loaded -when requested by modprobe. For example, my /etc/modules.conf contains: +when requested by modprobe. For example, my /etc/modprobe.conf contains: alias sound sb options sb io=0x240 irq=9 dma=3 dma16=5 mpu_io=0x300 @@ -228,7 +228,7 @@ driver, you should do the following: 1. remove sound modules (detailed above) -2. remove the sound modules from /etc/modules.conf +2. remove the sound modules from /etc/modprobe.conf 3. move the sound modules from /lib/modules//misc (for example, I make a /lib/modules//misc/tmp directory and copy the sound module files to that @@ -265,7 +265,7 @@ sb.o could be copied (or symlinked) to sb1.o for the second SoundBlaster. -2. Make a second entry in /etc/modules.conf, for example, +2. Make a second entry in /etc/modprobe.conf, for example, sound1 or sb1. This second entry should refer to the new module names for example sb1, and should include the I/O, etc. for the second sound card. @@ -369,7 +369,7 @@ 2) On the command line when using insmod or in a bash script using command line calls to load sound. -3) In /etc/modules.conf when using modprobe. +3) In /etc/modprobe.conf when using modprobe. 4) Via Red Hat's GPL'd /usr/sbin/sndconfig program (text based). diff -Nru a/Documentation/sound/oss/MAD16 b/Documentation/sound/oss/MAD16 --- a/Documentation/sound/oss/MAD16 Thu Feb 19 23:44:28 2004 +++ b/Documentation/sound/oss/MAD16 Thu Feb 19 23:44:28 2004 @@ -1,4 +1,5 @@ -(This recipe has been edited to update the configuration symbols.) +(This recipe has been edited to update the configuration symbols, + and change over to modprobe.conf for 2.6) From: Shaw Carruthers @@ -20,9 +21,9 @@ CONFIG_SOUND_MAD16=m CONFIG_SOUND_YM3812=m -modules.conf has: +modprobe.conf has: -alias char-major-14 mad16 +alias char-major-14-* mad16 options sb mad16=1 options mad16 io=0x530 irq=7 dma=0 dma16=1 && /usr/local/bin/aumix -w 15 -p 20 -m 0 -1 0 -2 0 -3 0 -i 0 diff -Nru a/Documentation/sound/oss/Maestro3 b/Documentation/sound/oss/Maestro3 --- a/Documentation/sound/oss/Maestro3 Thu Feb 19 23:44:27 2004 +++ b/Documentation/sound/oss/Maestro3 Thu Feb 19 23:44:27 2004 @@ -64,7 +64,7 @@ installed with the rest of the modules for the kernel on the system. Typically this will be in /lib/modules/ somewhere. 'alias sound-slot-0 maestro3' should also be added to your module configs (typically -/etc/modules.conf) if you're using modular OSS/Lite sound and want to +/etc/modprobe.conf) if you're using modular OSS/Lite sound and want to default to using a maestro3 chip. There are very few options to the driver. One is 'debug' which will diff -Nru a/Documentation/sound/oss/OPL3-SA2 b/Documentation/sound/oss/OPL3-SA2 --- a/Documentation/sound/oss/OPL3-SA2 Thu Feb 19 23:44:23 2004 +++ b/Documentation/sound/oss/OPL3-SA2 Thu Feb 19 23:44:23 2004 @@ -162,7 +162,7 @@ modprobe opl3 io=0x388 See the section "Automatic Module Loading" below for how to set up -/etc/modules.conf to automate this. +/etc/modprobe.conf to automate this. An important thing to remember that the opl3sa2 module's io argument is for it's own control port, which handles the card's master mixer for @@ -196,7 +196,7 @@ Lastly, if you're using modules and want to set up automatic module loading with kmod, the kernel module loader, here is the section I -currently use in my modules.conf file: +currently use in my modprobe.conf file: # Sound alias sound-slot-0 opl3sa2 diff -Nru a/Documentation/sound/oss/Opti b/Documentation/sound/oss/Opti --- a/Documentation/sound/oss/Opti Thu Feb 19 23:44:24 2004 +++ b/Documentation/sound/oss/Opti Thu Feb 19 23:44:24 2004 @@ -18,7 +18,7 @@ If you have another OS installed on your computer it is recommended that Linux and the other OS use the same resources. -Also, it is recommended that resources specified in /etc/modules.conf +Also, it is recommended that resources specified in /etc/modprobe.conf and resources specified in /etc/isapnp.conf agree. Compiling the sound driver @@ -68,9 +68,9 @@ Using kmod and autoloading the sound driver ------------------------------------------- Comment: as of linux-2.1.90 kmod is replacing kerneld. -The config file '/etc/modules.conf' is used as before. +The config file '/etc/modprobe.conf' is used as before. -This is the sound part of my /etc/modules.conf file. +This is the sound part of my /etc/modprobe.conf file. Following that I will explain each line. alias mixer0 mad16 @@ -80,7 +80,7 @@ options sb mad16=1 options mad16 irq=10 dma=0 dma16=1 io=0x530 joystick=1 cdtype=0 options opl3 io=0x388 -post-install mad16 /sbin/ad1848_mixer_reroute 14 8 15 3 16 6 +install mad16 /sbin/modprobe -i mad16 && /sbin/ad1848_mixer_reroute 14 8 15 3 16 6 If you have an MPU daughtercard or onboard MPU you will want to add to the "options mad16" line - eg diff -Nru a/Documentation/sound/oss/PAS16 b/Documentation/sound/oss/PAS16 --- a/Documentation/sound/oss/PAS16 Thu Feb 19 23:44:28 2004 +++ b/Documentation/sound/oss/PAS16 Thu Feb 19 23:44:28 2004 @@ -129,7 +129,7 @@ You can then get OPL3 functionality by issuing the command: insmod opl3 In addition, you must either add the following line to - /etc/modules.conf: + /etc/modprobe.conf: options opl3 io=0x388 or else add the following line to /etc/lilo.conf: opl3=0x388 @@ -159,5 +159,5 @@ append="pas2=0x388,10,3,-1,0,-1,-1,-1 opl3=0x388" If sound is built totally modular, the above options may be -specified in /etc/modules.conf for pas2.o, sb.o and opl3.o +specified in /etc/modprobe.conf for pas2, sb and opl3 respectively. diff -Nru a/Documentation/sound/oss/README.modules b/Documentation/sound/oss/README.modules --- a/Documentation/sound/oss/README.modules Thu Feb 19 23:44:27 2004 +++ b/Documentation/sound/oss/README.modules Thu Feb 19 23:44:27 2004 @@ -26,10 +26,10 @@ drivers/sound dir. Now one simply configures and makes one's kernel and modules in the usual way. - Then, add to your /etc/modules.conf something like: + Then, add to your /etc/modprobe.conf something like: -alias char-major-14 sb -post-install sb /sbin/modprobe "-k" "adlib_card" +alias char-major-14-* sb +install sb /sbin/modprobe -i sb && /sbin/modprobe adlib_card options sb io=0x220 irq=7 dma=1 dma16=5 mpu_io=0x330 options adlib_card io=0x388 # FM synthesizer @@ -65,12 +65,12 @@ Note that at present there is no way to configure the io, irq and other parameters for the modular drivers as one does for the wired drivers.. One needs to pass the modules the necessary parameters as arguments, either -with /etc/modules.conf or with command-line args to modprobe, e.g. +with /etc/modprobe.conf or with command-line args to modprobe, e.g. -modprobe -k sb io=0x220 irq=7 dma=1 dma16=5 mpu_io=0x330 -modprobe -k adlib_card io=0x388 +modprobe sb io=0x220 irq=7 dma=1 dma16=5 mpu_io=0x330 +modprobe adlib_card io=0x388 - recommend using /etc/modules.conf. + recommend using /etc/modprobe.conf. Persistent DMA Buffers: @@ -88,7 +88,7 @@ To make the sound driver use persistent DMA buffers we need to pass the sound.o module a "dmabuf=1" command-line argument. This is normally done -in /etc/modules.conf like so: +in /etc/modprobe.conf like so: options sound dmabuf=1 diff -Nru a/Documentation/sound/oss/Wavefront b/Documentation/sound/oss/Wavefront --- a/Documentation/sound/oss/Wavefront Thu Feb 19 23:44:23 2004 +++ b/Documentation/sound/oss/Wavefront Thu Feb 19 23:44:23 2004 @@ -189,16 +189,15 @@ 6) How do I configure my card ? ************************************************************ -You need to edit /etc/modules.conf. Here's mine (edited to show the +You need to edit /etc/modprobe.conf. Here's mine (edited to show the relevant details): # Sound system - alias char-major-14 wavefront + alias char-major-14-* wavefront alias synth0 wavefront alias mixer0 cs4232 alias audio0 cs4232 - pre-install wavefront modprobe "-k" "cs4232" - post-install wavefront modprobe "-k" "opl3" + install wavefront /sbin/modprobe cs4232 && /sbin/modprobe -i wavefront && /sbin/modprobe opl3 options wavefront io=0x200 irq=9 options cs4232 synthirq=9 synthio=0x200 io=0x530 irq=5 dma=1 dma2=0 options opl3 io=0x388 diff -Nru a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt --- a/Documentation/sysctl/fs.txt Thu Feb 19 23:44:22 2004 +++ b/Documentation/sysctl/fs.txt Thu Feb 19 23:44:22 2004 @@ -138,3 +138,13 @@ can have. You only need to increase super-max if you need to mount more filesystems than the current value in super-max allows you to. + +============================================================== + +aio-nr & aio-max-nr: + +aio-nr shows the current system-wide number of asynchronous io +requests. aio-max-nr allows you to change the maximum value +aio-nr can grow to. + +============================================================== diff -Nru a/Documentation/usb/scanner.txt b/Documentation/usb/scanner.txt --- a/Documentation/usb/scanner.txt Thu Feb 19 23:44:28 2004 +++ b/Documentation/usb/scanner.txt Thu Feb 19 23:44:28 2004 @@ -146,14 +146,14 @@ options scanner vendor=0x#### product=0x**** -to the /etc/modules.conf file replacing the #'s and the *'s with the +to the /etc/modprobe.conf file replacing the #'s and the *'s with the correct IDs. The IDs can be retrieved from the messages file or using "cat /proc/bus/usb/devices". If the default timeout is too low, i.e. there are frequent "timeout" messages, you may want to increase the timeout manually by using the parameter "read_timeout". The time is given in seconds. This is an example for -modules.conf with a timeout of 60 seconds: +modprobe.conf with a timeout of 60 seconds: options scanner read_timeout=60 diff -Nru a/Documentation/video4linux/CQcam.txt b/Documentation/video4linux/CQcam.txt --- a/Documentation/video4linux/CQcam.txt Thu Feb 19 23:44:28 2004 +++ b/Documentation/video4linux/CQcam.txt Thu Feb 19 23:44:28 2004 @@ -62,7 +62,7 @@ The configuration requires module configuration and device configuration. I like kmod or kerneld process with the -/etc/modules.conf file so the modules can automatically load/unload as +/etc/modprobe.conf file so the modules can automatically load/unload as they are used. The video devices could already exist, be generated using MAKEDEV, or need to be created. The following sections detail these procedures. @@ -71,15 +71,15 @@ 2.1 Module Configuration Using modules requires a bit of work to install and pass the -parameters. Understand that entries in /etc/modules.conf of: +parameters. Understand that entries in /etc/modprobe.conf of: alias parport_lowlevel parport_pc options parport_pc io=0x378 irq=none alias char-major-81 videodev alias char-major-81-0 c-qcam -will cause the kmod/kerneld/modprobe to do certain things. If you are -using kmod or kerneld, then a request for a 'char-major-81-0' will cause +will cause the kmod/modprobe to do certain things. If you are +using kmod, then a request for a 'char-major-81-0' will cause the 'c-qcam' module to load. If you have other video sources with modules, you might want to assign the different minor numbers to different modules. diff -Nru a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran --- a/Documentation/video4linux/Zoran Thu Feb 19 23:44:26 2004 +++ b/Documentation/video4linux/Zoran Thu Feb 19 23:44:26 2004 @@ -233,7 +233,7 @@ option with X being the card number as given in the previous section. To have more than one card, use card=X1[,X2[,X3,[X4[..]]]] -To automate this, add the following to your /etc/modules.conf: +To automate this, add the following to your /etc/modprobe.conf: options zr36067 card=X1[,X2[,X3[,X4[..]]]] alias char-major-81-0 zr36067 diff -Nru a/Documentation/video4linux/bttv/Modprobe.conf b/Documentation/video4linux/bttv/Modprobe.conf --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/Documentation/video4linux/bttv/Modprobe.conf Thu Feb 19 23:44:29 2004 @@ -0,0 +1,11 @@ +# i2c +alias char-major-89 i2c-dev +options i2c-core i2c_debug=1 +options i2c-algo-bit bit_test=1 + +# bttv +alias char-major-81 videodev +alias char-major-81-0 bttv +options bttv card=2 radio=1 +options tuner debug=1 + diff -Nru a/Documentation/video4linux/bttv/Modules.conf b/Documentation/video4linux/bttv/Modules.conf --- a/Documentation/video4linux/bttv/Modules.conf Thu Feb 19 23:44:25 2004 +++ b/Documentation/video4linux/bttv/Modules.conf Thu Feb 19 23:44:25 2004 @@ -1,3 +1,6 @@ +# For modern kernels (2.6 or above), this belongs in /etc/modprobe.conf +# For for 2.4 kernels or earlier, this belongs in /etc/modules.conf. + # i2c alias char-major-89 i2c-dev options i2c-core i2c_debug=1 diff -Nru a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README --- a/Documentation/video4linux/bttv/README Thu Feb 19 23:44:22 2004 +++ b/Documentation/video4linux/bttv/README Thu Feb 19 23:44:22 2004 @@ -22,7 +22,7 @@ cards is in CARDLIST.bttv If bttv takes very long to load (happens sometimes with the cheap -cards which have no tuner), try adding this to your modules.conf: +cards which have no tuner), try adding this to your modprobe.conf: options i2c-algo-bit bit_test=1 For the WinTV/PVR you need one firmware file from the driver CD: diff -Nru a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt --- a/Documentation/video4linux/meye.txt Thu Feb 19 23:44:27 2004 +++ b/Documentation/video4linux/meye.txt Thu Feb 19 23:44:27 2004 @@ -42,7 +42,7 @@ --------------- Several options can be passed to the meye driver, either by adding them -to /etc/modules.conf file, when the driver is compiled as a module, or +to /etc/modprobe.conf file, when the driver is compiled as a module, or by adding the following to the kernel command line (in your bootloader): meye=gbuffers[,gbufsize[,video_nr]] @@ -59,7 +59,7 @@ ----------- In order to automatically load the meye module on use, you can put those lines -in your /etc/modules.conf file: +in your /etc/modprobe.conf file: alias char-major-81 videodev alias char-major-81-0 meye diff -Nru a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS Thu Feb 19 23:44:26 2004 +++ b/MAINTAINERS Thu Feb 19 23:44:26 2004 @@ -521,7 +521,7 @@ P: Dave Jones M: davej@codemonkey.org.uk L: cpufreq@www.linux.org.uk -W: http://www.codemonkey.org.uk/cpufreq/ +W: http://www.codemonkey.org.uk/projects/cpufreq/ S: Maintained CPUID/MSR DRIVER diff -Nru a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c --- a/arch/alpha/kernel/irq.c Thu Feb 19 23:44:27 2004 +++ b/arch/alpha/kernel/irq.c Thu Feb 19 23:44:27 2004 @@ -252,7 +252,7 @@ irq_affinity_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -333,7 +333,7 @@ prof_cpu_mask_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c --- a/arch/alpha/kernel/time.c Thu Feb 19 23:44:25 2004 +++ b/arch/alpha/kernel/time.c Thu Feb 19 23:44:25 2004 @@ -503,6 +503,7 @@ time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/arm/Kconfig b/arch/arm/Kconfig --- a/arch/arm/Kconfig Thu Feb 19 23:44:25 2004 +++ b/arch/arm/Kconfig Thu Feb 19 23:44:25 2004 @@ -639,6 +639,8 @@ source "fs/Kconfig" +source "arch/arm/oprofile/Kconfig" + source "drivers/video/Kconfig" if ARCH_ACORN || ARCH_CLPS7500 || ARCH_TBOX || ARCH_SHARK || ARCH_SA1100 || PCI diff -Nru a/arch/arm/Makefile b/arch/arm/Makefile --- a/arch/arm/Makefile Thu Feb 19 23:44:24 2004 +++ b/arch/arm/Makefile Thu Feb 19 23:44:24 2004 @@ -116,6 +116,7 @@ core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) +drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ drivers-$(CONFIG_ARCH_CLPS7500) += drivers/acorn/char/ drivers-$(CONFIG_ARCH_L7200) += drivers/acorn/char/ diff -Nru a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c --- a/arch/arm/kernel/time.c Thu Feb 19 23:44:26 2004 +++ b/arch/arm/kernel/time.c Thu Feb 19 23:44:26 2004 @@ -85,6 +85,9 @@ */ static inline void do_profile(struct pt_regs *regs) { + + profile_hook(regs); + if (!user_mode(regs) && prof_buffer && current->pid) { diff -Nru a/arch/arm/oprofile/Kconfig b/arch/arm/oprofile/Kconfig --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/arm/oprofile/Kconfig Thu Feb 19 23:44:29 2004 @@ -0,0 +1,23 @@ + +menu "Profiling support" + depends on EXPERIMENTAL + +config PROFILING + bool "Profiling support (EXPERIMENTAL)" + help + Say Y here to enable the extended profiling support mechanisms used + by profilers such as OProfile. + + +config OPROFILE + tristate "OProfile system profiling (EXPERIMENTAL)" + depends on PROFILING + help + OProfile is a profiling system capable of profiling the + whole system, include the kernel, kernel modules, libraries, + and applications. + + If unsure, say N. + +endmenu + diff -Nru a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/arm/oprofile/Makefile Thu Feb 19 23:44:29 2004 @@ -0,0 +1,9 @@ +obj-$(CONFIG_OPROFILE) += oprofile.o + +DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ + oprof.o cpu_buffer.o buffer_sync.o \ + event_buffer.o oprofile_files.o \ + oprofilefs.o oprofile_stats.o \ + timer_int.o ) + +oprofile-y := $(DRIVER_OBJS) init.o diff -Nru a/arch/arm/oprofile/init.c b/arch/arm/oprofile/init.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/arm/oprofile/init.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,22 @@ +/** + * @file init.c + * + * @remark Copyright 2004 Oprofile Authors + * + * @author Zwane Mwaikambo + */ + +#include +#include +#include + +int oprofile_arch_init(struct oprofile_operations **ops) +{ + int ret = -ENODEV; + + return ret; +} + +void oprofile_arch_exit(void) +{ +} diff -Nru a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c --- a/arch/arm26/kernel/time.c Thu Feb 19 23:44:26 2004 +++ b/arch/arm26/kernel/time.c Thu Feb 19 23:44:26 2004 @@ -179,6 +179,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/cris/arch-v10/drivers/ethernet.c b/arch/cris/arch-v10/drivers/ethernet.c --- a/arch/cris/arch-v10/drivers/ethernet.c Thu Feb 19 23:44:25 2004 +++ b/arch/cris/arch-v10/drivers/ethernet.c Thu Feb 19 23:44:25 2004 @@ -482,7 +482,7 @@ /* Register device */ err = register_netdev(dev); if (err) { - kfree(dev); + free_netdev(dev); return err; } diff -Nru a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c --- a/arch/cris/kernel/time.c Thu Feb 19 23:44:25 2004 +++ b/arch/cris/kernel/time.c Thu Feb 19 23:44:25 2004 @@ -108,6 +108,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; local_irq_restore(flags); + clock_was_set(); return 0; } diff -Nru a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c --- a/arch/h8300/kernel/time.c Thu Feb 19 23:44:24 2004 +++ b/arch/h8300/kernel/time.c Thu Feb 19 23:44:24 2004 @@ -139,6 +139,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/i386/Kconfig b/arch/i386/Kconfig --- a/arch/i386/Kconfig Thu Feb 19 23:44:23 2004 +++ b/arch/i386/Kconfig Thu Feb 19 23:44:23 2004 @@ -43,6 +43,15 @@ help Choose this option if your computer is a standard PC or compatible. +config X86_ELAN + bool "AMD Elan" + help + Select this for an AMD Elan processor. + + Do not use this option for K6/Athlon/Opteron processors! + + If unsure, choose "PC-compatible" instead. + config X86_VOYAGER bool "Voyager (NCR)" help @@ -130,6 +139,8 @@ default y depends on SMP && X86_ES7000 && MPENTIUMIII +if !X86_ELAN + choice prompt "Processor family" default M686 @@ -222,14 +233,20 @@ extended prefetch instructions in addition to the Pentium II extensions. +config MPENTIUMM + bool "Pentium M" + help + Select this for Intel Pentium M (not Pentium-4 M) + notebook chips. + config MPENTIUM4 - bool "Pentium-4/Celeron(P4-based)/Xeon" + bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/Xeon" help - Select this for Intel Pentium 4 chips. This includes both - the Pentium 4 and P4-based Celeron chips. This option - enables compile flags optimized for the chip, uses the - correct cache shift, and applies any applicable Pentium III - optimizations. + Select this for Intel Pentium 4 chips. This includes the + Pentium 4, P4-based Celeron and Xeon, and Pentium-4 M + (not Pentium M) chips. This option enables compile flags + optimized for the chip, uses the correct cache shift, and + applies any applicable Pentium III optimizations. config MK6 bool "K6/K6-II/K6-III" @@ -312,6 +329,8 @@ when it has moderate overhead. This is intended for generic distributions kernels. +endif + # # Define implied options from the CPU selection here # @@ -328,9 +347,9 @@ config X86_L1_CACHE_SHIFT int default "7" if MPENTIUM4 || X86_GENERIC - default "4" if MELAN || M486 || M386 + default "4" if X86_ELAN || M486 || M386 default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 - default "6" if MK7 || MK8 + default "6" if MK7 || MK8 || MPENTIUMM config RWSEM_GENERIC_SPINLOCK bool @@ -374,22 +393,22 @@ config X86_ALIGNMENT_16 bool - depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 + depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 default y config X86_GOOD_APIC bool - depends on MK7 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 + depends on MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 default y config X86_INTEL_USERCOPY bool - depends on MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 + depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 default y config X86_USE_PPRO_CHECKSUM bool - depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 + depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 default y config X86_USE_3DNOW @@ -513,7 +532,7 @@ config X86_TSC bool - depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2) && !X86_NUMAQ + depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2) && !X86_NUMAQ default y config X86_MCE @@ -603,8 +622,6 @@ To compile this driver as a module, choose M here: the module will be called microcode. - If you use modprobe or kmod you may also want to add the line - 'alias char-major-10-184 microcode' to your /etc/modules.conf file. config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" @@ -701,7 +718,7 @@ # Common NUMA Features config NUMA bool "Numa Memory Allocation Support" - depends on SMP && HIGHMEM64G && (X86_PC || X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI)) + depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI)) default n if X86_PC default y if (X86_NUMAQ || X86_SUMMIT) @@ -809,6 +826,14 @@ anything about EFI). However, even with this option, the resultant kernel should continue to boot on existing non-EFI platforms. +config IRQBALANCE + bool "Enable kernel irq balancing" + depends on SMP + default y + help + The defalut yes will allow the kernel to do irq load balancing. + Saying no will keep the kernel from doing irq load balancing. + config HAVE_DEC_LOCK bool depends on (SMP || PREEMPT) && X86_CMPXCHG @@ -821,6 +846,19 @@ depends on (((X86_SUMMIT || X86_GENERICARCH) && NUMA) || (X86 && EFI)) default y +config REGPARM + bool "Use register arguments (EXPERIMENTAL)" + depends on EXPERIMENTAL + default n + help + Compile the kernel with -mregparm=3. This uses an different ABI + and passes the first three arguments of a function call in registers. + This will probably break binary only modules. + + This feature is only enabled for gcc-3.0 and later - earlier compilers + generate incorrect output with certain kernel constructs when + -mregparm=3 is used. + endmenu @@ -1177,9 +1215,31 @@ Say Y here if you are developing drivers or trying to debug and identify kernel problems. +config EARLY_PRINTK + bool "Early printk" if EMBEDDED + default y + help + Write kernel log output directly into the VGA buffer or to a serial + port. + + This is useful for kernel debugging when your machine crashes very + early before the console code is initialized. For normal operation + it is not recommended because it looks ugly and doesn't cooperate + with klogd/syslogd or the X server. You should normally N here, + unless you want to debug such a crash. + config DEBUG_STACKOVERFLOW bool "Check for stack overflows" depends on DEBUG_KERNEL + +config DEBUG_STACK_USAGE + bool "Stack utilization instrumentation" + depends on DEBUG_KERNEL + help + Enables the display of the minimum amount of free stack which each + task has ever had available in the sysrq-T and sysrq-P debug output. + + This option will slow down process creation somewhat. config DEBUG_SLAB bool "Debug memory allocations" diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile --- a/arch/i386/Makefile Thu Feb 19 23:44:24 2004 +++ b/arch/i386/Makefile Thu Feb 19 23:44:24 2004 @@ -34,8 +34,9 @@ cflags-$(CONFIG_M686) += -march=i686 cflags-$(CONFIG_MPENTIUMII) += $(call check_gcc,-march=pentium2,-march=i686) cflags-$(CONFIG_MPENTIUMIII) += $(call check_gcc,-march=pentium3,-march=i686) +cflags-$(CONFIG_MPENTIUMM) += $(call check_gcc,-march=pentium3,-march=i686) cflags-$(CONFIG_MPENTIUM4) += $(call check_gcc,-march=pentium4,-march=i686) -cflags-$(CONFIG_MK6) += $(call check_gcc,-march=k6,-march=i586) +cflags-$(CONFIG_MK6) += -march=k6 # Please note, that patches that add -march=athlon-xp and friends are pointless. # They make zero difference whatsosever to performance at this time. cflags-$(CONFIG_MK7) += $(call check_gcc,-march=athlon,-march=i686 $(align)-functions=4) @@ -46,6 +47,18 @@ cflags-$(CONFIG_MWINCHIP3D) += $(call check_gcc,-march=winchip2,-march=i586) cflags-$(CONFIG_MCYRIXIII) += $(call check_gcc,-march=c3,-march=i486) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0 cflags-$(CONFIG_MVIAC3_2) += $(call check_gcc,-march=c3-2,-march=i686) + +# AMD Elan support +cflags-$(CONFIG_X86_ELAN) += -march=i486 + +# -mregparm=3 works ok on gcc-3.0 and later +# +GCC_VERSION := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) +cflags-$(CONFIG_REGPARM) += $(shell if [ $(GCC_VERSION) -ge 0300 ] ; then echo "-mregparm=3"; fi ;) + +# Enable unit-at-a-time mode when possible. It shrinks the +# kernel considerably. +CFLAGS += $(call check_gcc,-funit-at-a-time,) CFLAGS += $(cflags-y) diff -Nru a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile --- a/arch/i386/boot/Makefile Thu Feb 19 23:44:24 2004 +++ b/arch/i386/boot/Makefile Thu Feb 19 23:44:24 2004 @@ -31,6 +31,8 @@ host-progs := tools/build +HOSTCFLAGS_build.o := -Iinclude + # --------------------------------------------------------------------------- $(obj)/zImage: IMAGE_OFFSET := 0x1000 diff -Nru a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S --- a/arch/i386/boot/setup.S Thu Feb 19 23:44:25 2004 +++ b/arch/i386/boot/setup.S Thu Feb 19 23:44:25 2004 @@ -776,7 +776,7 @@ # AMD Elan bug fix by Robert Schwebel. # -#if defined(CONFIG_MELAN) +#if defined(CONFIG_X86_ELAN) movb $0x02, %al # alternate A20 gate outb %al, $0x92 # this works on SC410/SC520 a20_elan_wait: diff -Nru a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile --- a/arch/i386/kernel/Makefile Thu Feb 19 23:44:23 2004 +++ b/arch/i386/kernel/Makefile Thu Feb 19 23:44:23 2004 @@ -31,6 +31,7 @@ obj-$(CONFIG_ACPI_SRAT) += srat.o obj-$(CONFIG_HPET_TIMER) += time_hpet.o obj-$(CONFIG_EFI) += efi.o efi_stub.o +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o EXTRA_AFLAGS := -traditional diff -Nru a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c --- a/arch/i386/kernel/acpi/boot.c Thu Feb 19 23:44:27 2004 +++ b/arch/i386/kernel/acpi/boot.c Thu Feb 19 23:44:27 2004 @@ -376,6 +376,37 @@ } #endif +/* detect the location of the ACPI PM Timer */ +#ifdef CONFIG_X86_PM_TIMER +extern u32 pmtmr_ioport; + +static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) +{ + struct fadt_descriptor_rev2 *fadt =0; + + fadt = (struct fadt_descriptor_rev2*) __acpi_map_table(phys,size); + if(!fadt) { + printk(KERN_WARNING PREFIX "Unable to map FADT\n"); + return 0; + } + + if (fadt->revision >= FADT2_REVISION_ID) { + /* FADT rev. 2 */ + if (fadt->xpm_tmr_blk.address_space_id != ACPI_ADR_SPACE_SYSTEM_IO) + return 0; + + pmtmr_ioport = fadt->xpm_tmr_blk.address; + } else { + /* FADT rev. 1 */ + pmtmr_ioport = fadt->V1_pm_tmr_blk; + } + if (pmtmr_ioport) + printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", pmtmr_ioport); + return 0; +} +#endif + + unsigned long __init acpi_find_rsdp (void) { @@ -447,6 +478,10 @@ acpi_disabled = 1; return result; } + +#ifdef CONFIG_X86_PM_TIMER + acpi_table_parse(ACPI_FADT, acpi_parse_fadt); +#endif #ifdef CONFIG_X86_LOCAL_APIC diff -Nru a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig --- a/arch/i386/kernel/cpu/cpufreq/Kconfig Thu Feb 19 23:44:23 2004 +++ b/arch/i386/kernel/cpu/cpufreq/Kconfig Thu Feb 19 23:44:23 2004 @@ -54,7 +54,7 @@ config ELAN_CPUFREQ tristate "AMD Elan" - depends on CPU_FREQ_TABLE && MELAN + depends on CPU_FREQ_TABLE && X86_ELAN ---help--- This adds the CPUFreq driver for AMD Elan SC400 and SC410 processors. diff -Nru a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c --- a/arch/i386/kernel/cpu/cpufreq/longhaul.c Thu Feb 19 23:44:22 2004 +++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c Thu Feb 19 23:44:22 2004 @@ -1,5 +1,5 @@ /* - * (C) 2001-2003 Dave Jones. + * (C) 2001-2004 Dave Jones. * (C) 2002 Padraig Brady. * * Licensed under the terms of the GNU GPL License version 2. @@ -186,6 +186,7 @@ return target; } + static int guess_fsb(int maxmult) { int speed = (cpu_khz/1000); @@ -203,7 +204,6 @@ } - static int __init longhaul_get_ranges (void) { struct cpuinfo_x86 *c = cpu_data; @@ -359,7 +359,7 @@ return 0; } -static int longhaul_cpu_init (struct cpufreq_policy *policy) +static int __init longhaul_cpu_init (struct cpufreq_policy *policy) { struct cpuinfo_x86 *c = cpu_data; char *cpuname=NULL; diff -Nru a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/i386/kernel/cpu/cpufreq/longrun.c --- a/arch/i386/kernel/cpu/cpufreq/longrun.c Thu Feb 19 23:44:27 2004 +++ b/arch/i386/kernel/cpu/cpufreq/longrun.c Thu Feb 19 23:44:27 2004 @@ -220,7 +220,7 @@ } -static int longrun_cpu_init(struct cpufreq_policy *policy) +static int __init longrun_cpu_init(struct cpufreq_policy *policy) { int result = 0; diff -Nru a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c --- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c Thu Feb 19 23:44:22 2004 +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c Thu Feb 19 23:44:22 2004 @@ -1,7 +1,7 @@ /* * AMD K7 Powernow driver. * (C) 2003 Dave Jones on behalf of SuSE Labs. - * (C) 2003 Dave Jones + * (C) 2003-2004 Dave Jones * * Licensed under the terms of the GNU GPL License version 2. * Based upon datasheets & sample CPUs kindly provided by AMD. diff -Nru a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c --- a/arch/i386/kernel/cpu/mcheck/non-fatal.c Thu Feb 19 23:44:23 2004 +++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c Thu Feb 19 23:44:23 2004 @@ -24,8 +24,6 @@ #include "mce.h" -static struct timer_list mce_timer; -static int timerset; static int firstbank; #define MCE_RATE 15*HZ /* timer rate is 15s */ @@ -35,14 +33,15 @@ u32 low, high; int i; - preempt_disable(); for (i=firstbank; i 1) - schedule_work (&mce_work); -#endif - mce_timer.expires = jiffies + MCE_RATE; - add_timer (&mce_timer); -} - static int __init init_nonfatal_mce_checker(void) { struct cpuinfo_x86 *c = &boot_cpu_data; @@ -91,17 +80,11 @@ else firstbank = 0; - if (timerset == 0) { - /* Set the timer to check for non-fatal - errors every MCE_RATE seconds */ - init_timer (&mce_timer); - mce_timer.expires = jiffies + MCE_RATE; - mce_timer.data = 0; - mce_timer.function = &mce_timerfunc; - add_timer (&mce_timer); - timerset = 1; - printk(KERN_INFO "Machine check exception polling timer started.\n"); - } + /* + * Check for non-fatal errors every MCE_RATE s + */ + schedule_delayed_work(&mce_work, MCE_RATE); + printk(KERN_INFO "Machine check exception polling timer started.\n"); return 0; } module_init(init_nonfatal_mce_checker); diff -Nru a/arch/i386/kernel/early_printk.c b/arch/i386/kernel/early_printk.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/i386/kernel/early_printk.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,2 @@ + +#include "../../x86_64/kernel/early_printk.c" diff -Nru a/arch/i386/kernel/edd.c b/arch/i386/kernel/edd.c --- a/arch/i386/kernel/edd.c Thu Feb 19 23:44:24 2004 +++ b/arch/i386/kernel/edd.c Thu Feb 19 23:44:24 2004 @@ -134,18 +134,18 @@ for (i = 0; i < 4; i++) { if (isprint(info->params.host_bus_type[i])) { - p += snprintf(p, left, "%c", info->params.host_bus_type[i]); + p += scnprintf(p, left, "%c", info->params.host_bus_type[i]); } else { - p += snprintf(p, left, " "); + p += scnprintf(p, left, " "); } } if (!strncmp(info->params.host_bus_type, "ISA", 3)) { - p += snprintf(p, left, "\tbase_address: %x\n", + p += scnprintf(p, left, "\tbase_address: %x\n", info->params.interface_path.isa.base_address); } else if (!strncmp(info->params.host_bus_type, "PCIX", 4) || !strncmp(info->params.host_bus_type, "PCI", 3)) { - p += snprintf(p, left, + p += scnprintf(p, left, "\t%02x:%02x.%d channel: %u\n", info->params.interface_path.pci.bus, info->params.interface_path.pci.slot, @@ -154,12 +154,12 @@ } else if (!strncmp(info->params.host_bus_type, "IBND", 4) || !strncmp(info->params.host_bus_type, "XPRS", 4) || !strncmp(info->params.host_bus_type, "HTPT", 4)) { - p += snprintf(p, left, + p += scnprintf(p, left, "\tTBD: %llx\n", info->params.interface_path.ibnd.reserved); } else { - p += snprintf(p, left, "\tunknown: %llx\n", + p += scnprintf(p, left, "\tunknown: %llx\n", info->params.interface_path.unknown.reserved); } return (p - buf); @@ -178,43 +178,43 @@ for (i = 0; i < 8; i++) { if (isprint(info->params.interface_type[i])) { - p += snprintf(p, left, "%c", info->params.interface_type[i]); + p += scnprintf(p, left, "%c", info->params.interface_type[i]); } else { - p += snprintf(p, left, " "); + p += scnprintf(p, left, " "); } } if (!strncmp(info->params.interface_type, "ATAPI", 5)) { - p += snprintf(p, left, "\tdevice: %u lun: %u\n", + p += scnprintf(p, left, "\tdevice: %u lun: %u\n", info->params.device_path.atapi.device, info->params.device_path.atapi.lun); } else if (!strncmp(info->params.interface_type, "ATA", 3)) { - p += snprintf(p, left, "\tdevice: %u\n", + p += scnprintf(p, left, "\tdevice: %u\n", info->params.device_path.ata.device); } else if (!strncmp(info->params.interface_type, "SCSI", 4)) { - p += snprintf(p, left, "\tid: %u lun: %llu\n", + p += scnprintf(p, left, "\tid: %u lun: %llu\n", info->params.device_path.scsi.id, info->params.device_path.scsi.lun); } else if (!strncmp(info->params.interface_type, "USB", 3)) { - p += snprintf(p, left, "\tserial_number: %llx\n", + p += scnprintf(p, left, "\tserial_number: %llx\n", info->params.device_path.usb.serial_number); } else if (!strncmp(info->params.interface_type, "1394", 4)) { - p += snprintf(p, left, "\teui: %llx\n", + p += scnprintf(p, left, "\teui: %llx\n", info->params.device_path.i1394.eui); } else if (!strncmp(info->params.interface_type, "FIBRE", 5)) { - p += snprintf(p, left, "\twwid: %llx lun: %llx\n", + p += scnprintf(p, left, "\twwid: %llx lun: %llx\n", info->params.device_path.fibre.wwid, info->params.device_path.fibre.lun); } else if (!strncmp(info->params.interface_type, "I2O", 3)) { - p += snprintf(p, left, "\tidentity_tag: %llx\n", + p += scnprintf(p, left, "\tidentity_tag: %llx\n", info->params.device_path.i2o.identity_tag); } else if (!strncmp(info->params.interface_type, "RAID", 4)) { - p += snprintf(p, left, "\tidentity_tag: %x\n", + p += scnprintf(p, left, "\tidentity_tag: %x\n", info->params.device_path.raid.array_number); } else if (!strncmp(info->params.interface_type, "SATA", 4)) { - p += snprintf(p, left, "\tdevice: %u\n", + p += scnprintf(p, left, "\tdevice: %u\n", info->params.device_path.sata.device); } else { - p += snprintf(p, left, "\tunknown: %llx %llx\n", + p += scnprintf(p, left, "\tunknown: %llx %llx\n", info->params.device_path.unknown.reserved1, info->params.device_path.unknown.reserved2); } @@ -256,7 +256,7 @@ return -EINVAL; } - p += snprintf(p, left, "0x%02x\n", info->version); + p += scnprintf(p, left, "0x%02x\n", info->version); return (p - buf); } @@ -264,7 +264,7 @@ edd_show_disk80_sig(struct edd_device *edev, char *buf) { char *p = buf; - p += snprintf(p, left, "0x%08x\n", edd_disk80_sig); + p += scnprintf(p, left, "0x%08x\n", edd_disk80_sig); return (p - buf); } @@ -278,16 +278,16 @@ } if (info->interface_support & EDD_EXT_FIXED_DISK_ACCESS) { - p += snprintf(p, left, "Fixed disk access\n"); + p += scnprintf(p, left, "Fixed disk access\n"); } if (info->interface_support & EDD_EXT_DEVICE_LOCKING_AND_EJECTING) { - p += snprintf(p, left, "Device locking and ejecting\n"); + p += scnprintf(p, left, "Device locking and ejecting\n"); } if (info->interface_support & EDD_EXT_ENHANCED_DISK_DRIVE_SUPPORT) { - p += snprintf(p, left, "Enhanced Disk Drive support\n"); + p += scnprintf(p, left, "Enhanced Disk Drive support\n"); } if (info->interface_support & EDD_EXT_64BIT_EXTENSIONS) { - p += snprintf(p, left, "64-bit extensions\n"); + p += scnprintf(p, left, "64-bit extensions\n"); } return (p - buf); } @@ -302,21 +302,21 @@ } if (info->params.info_flags & EDD_INFO_DMA_BOUNDARY_ERROR_TRANSPARENT) - p += snprintf(p, left, "DMA boundary error transparent\n"); + p += scnprintf(p, left, "DMA boundary error transparent\n"); if (info->params.info_flags & EDD_INFO_GEOMETRY_VALID) - p += snprintf(p, left, "geometry valid\n"); + p += scnprintf(p, left, "geometry valid\n"); if (info->params.info_flags & EDD_INFO_REMOVABLE) - p += snprintf(p, left, "removable\n"); + p += scnprintf(p, left, "removable\n"); if (info->params.info_flags & EDD_INFO_WRITE_VERIFY) - p += snprintf(p, left, "write verify\n"); + p += scnprintf(p, left, "write verify\n"); if (info->params.info_flags & EDD_INFO_MEDIA_CHANGE_NOTIFICATION) - p += snprintf(p, left, "media change notification\n"); + p += scnprintf(p, left, "media change notification\n"); if (info->params.info_flags & EDD_INFO_LOCKABLE) - p += snprintf(p, left, "lockable\n"); + p += scnprintf(p, left, "lockable\n"); if (info->params.info_flags & EDD_INFO_NO_MEDIA_PRESENT) - p += snprintf(p, left, "no media present\n"); + p += scnprintf(p, left, "no media present\n"); if (info->params.info_flags & EDD_INFO_USE_INT13_FN50) - p += snprintf(p, left, "use int13 fn50\n"); + p += scnprintf(p, left, "use int13 fn50\n"); return (p - buf); } @@ -329,7 +329,7 @@ return -EINVAL; } - p += snprintf(p, left, "0x%x\n", info->params.num_default_cylinders); + p += scnprintf(p, left, "0x%x\n", info->params.num_default_cylinders); return (p - buf); } @@ -342,7 +342,7 @@ return -EINVAL; } - p += snprintf(p, left, "0x%x\n", info->params.num_default_heads); + p += scnprintf(p, left, "0x%x\n", info->params.num_default_heads); return (p - buf); } @@ -355,7 +355,7 @@ return -EINVAL; } - p += snprintf(p, left, "0x%x\n", info->params.sectors_per_track); + p += scnprintf(p, left, "0x%x\n", info->params.sectors_per_track); return (p - buf); } @@ -368,7 +368,7 @@ return -EINVAL; } - p += snprintf(p, left, "0x%llx\n", info->params.number_of_sectors); + p += scnprintf(p, left, "0x%llx\n", info->params.number_of_sectors); return (p - buf); } diff -Nru a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S --- a/arch/i386/kernel/entry.S Thu Feb 19 23:44:24 2004 +++ b/arch/i386/kernel/entry.S Thu Feb 19 23:44:24 2004 @@ -515,8 +515,8 @@ /* Do not access memory above the end of our stack page, * it might not exist. */ - andl $0x1fff,%eax - cmpl $0x1fec,%eax + andl $(THREAD_SIZE-1),%eax + cmpl $(THREAD_SIZE-20),%eax popl %eax jae nmi_stack_correct cmpl $sysenter_entry,12(%esp) diff -Nru a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S --- a/arch/i386/kernel/head.S Thu Feb 19 23:44:23 2004 +++ b/arch/i386/kernel/head.S Thu Feb 19 23:44:23 2004 @@ -16,6 +16,8 @@ #include #include #include +#include + #define OLD_CL_MAGIC_ADDR 0x90020 #define OLD_CL_MAGIC 0xA33F @@ -325,7 +327,7 @@ ret ENTRY(stack_start) - .long init_thread_union+8192 + .long init_thread_union+THREAD_SIZE .long __BOOT_DS /* This is the default interrupt "handler" :-) */ diff -Nru a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c --- a/arch/i386/kernel/io_apic.c Thu Feb 19 23:44:24 2004 +++ b/arch/i386/kernel/io_apic.c Thu Feb 19 23:44:24 2004 @@ -280,7 +280,7 @@ spin_unlock_irqrestore(&ioapic_lock, flags); } -#if defined(CONFIG_SMP) +#if defined(CONFIG_IRQBALANCE) # include /* kernel_thread() */ # include /* kstat */ # include /* kmalloc() */ @@ -689,9 +689,11 @@ __initcall(balanced_irq_init); -#else /* !SMP */ +#else /* !CONFIG_IRQBALANCE */ static inline void move_irq(int irq) { } +#endif /* CONFIG_IRQBALANCE */ +#ifndef CONFIG_SMP void send_IPI_self(int vector) { unsigned int cfg; @@ -706,7 +708,7 @@ */ apic_write_around(APIC_ICR, cfg); } -#endif /* defined(CONFIG_SMP) */ +#endif /* !CONFIG_SMP */ /* @@ -2150,6 +2152,10 @@ { int pin1, pin2; int vector; + unsigned int ver; + + ver = apic_read(APIC_LVR); + ver = GET_APIC_VERSION(ver); /* * get/set the timer IRQ vector: @@ -2163,11 +2169,17 @@ * mode for the 8259A whenever interrupts are routed * through I/O APICs. Also IRQ0 has to be enabled in * the 8259A which implies the virtual wire has to be - * disabled in the local APIC. + * disabled in the local APIC. Finally timer interrupts + * need to be acknowledged manually in the 8259A for + * do_slow_timeoffset() and for the i82489DX when using + * the NMI watchdog. */ apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); init_8259A(1); - timer_ack = 1; + if (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)) + timer_ack = 1; + else + timer_ack = !cpu_has_tsc; enable_8259A_irq(0); pin1 = find_isa_irq_pin(0, mp_INT); @@ -2185,7 +2197,8 @@ disable_8259A_irq(0); setup_nmi(); enable_8259A_irq(0); - check_nmi_watchdog(); + if (check_nmi_watchdog() < 0); + timer_ack = !cpu_has_tsc; } return; } @@ -2208,7 +2221,8 @@ add_pin_to_irq(0, 0, pin2); if (nmi_watchdog == NMI_IO_APIC) { setup_nmi(); - check_nmi_watchdog(); + if (check_nmi_watchdog() < 0); + timer_ack = !cpu_has_tsc; } return; } diff -Nru a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c --- a/arch/i386/kernel/irq.c Thu Feb 19 23:44:23 2004 +++ b/arch/i386/kernel/irq.c Thu Feb 19 23:44:23 2004 @@ -435,7 +435,7 @@ long esp; __asm__ __volatile__("andl %%esp,%0" : - "=r" (esp) : "0" (8191)); + "=r" (esp) : "0" (THREAD_SIZE - 1)); if (unlikely(esp < (sizeof(struct thread_info) + 1024))) { printk("do_IRQ: stack overflow: %ld\n", esp - sizeof(struct thread_info)); @@ -927,7 +927,7 @@ static int irq_affinity_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -968,7 +968,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c --- a/arch/i386/kernel/microcode.c Thu Feb 19 23:44:23 2004 +++ b/arch/i386/kernel/microcode.c Thu Feb 19 23:44:23 2004 @@ -371,7 +371,9 @@ spin_lock_irqsave(µcode_update_lock, flags); /* write microcode via MSR 0x79 */ - wrmsr(MSR_IA32_UCODE_WRITE, (unsigned int)(uci->mc->bits), 0); + wrmsr(MSR_IA32_UCODE_WRITE, + (unsigned long) uci->mc->bits, + (unsigned long) uci->mc->bits >> 16 >> 16); wrmsr(MSR_IA32_UCODE_REV, 0, 0); __asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx"); @@ -507,3 +509,4 @@ module_init(microcode_init) module_exit(microcode_exit) +MODULE_ALIAS_MISCDEV(MICROCODE_MINOR); diff -Nru a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c --- a/arch/i386/kernel/nmi.c Thu Feb 19 23:44:25 2004 +++ b/arch/i386/kernel/nmi.c Thu Feb 19 23:44:25 2004 @@ -42,7 +42,7 @@ * be enabled * -1: the lapic NMI watchdog is disabled, but can be enabled */ -static int nmi_active; +int nmi_active; #define K7_EVNTSEL_ENABLE (1 << 22) #define K7_EVNTSEL_INT (1 << 20) @@ -462,6 +462,7 @@ } } +EXPORT_SYMBOL(nmi_active); EXPORT_SYMBOL(nmi_watchdog); EXPORT_SYMBOL(disable_lapic_nmi_watchdog); EXPORT_SYMBOL(enable_lapic_nmi_watchdog); diff -Nru a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c --- a/arch/i386/kernel/process.c Thu Feb 19 23:44:22 2004 +++ b/arch/i386/kernel/process.c Thu Feb 19 23:44:22 2004 @@ -637,6 +637,8 @@ extern void scheduling_functions_end_here(void); #define first_sched ((unsigned long) scheduling_functions_start_here) #define last_sched ((unsigned long) scheduling_functions_end_here) +#define top_esp (THREAD_SIZE - sizeof(unsigned long)) +#define top_ebp (THREAD_SIZE - 2*sizeof(unsigned long)) unsigned long get_wchan(struct task_struct *p) { @@ -647,12 +649,12 @@ return 0; stack_page = (unsigned long)p->thread_info; esp = p->thread.esp; - if (!stack_page || esp < stack_page || esp > 8188+stack_page) + if (!stack_page || esp < stack_page || esp > top_esp+stack_page) return 0; /* include/asm-i386/system.h:switch_to() pushes ebp last. */ ebp = *(unsigned long *) esp; do { - if (ebp < stack_page || ebp > 8184+stack_page) + if (ebp < stack_page || ebp > top_ebp+stack_page) return 0; eip = *(unsigned long *) (ebp+4); if (eip < first_sched || eip >= last_sched) diff -Nru a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c Thu Feb 19 23:44:25 2004 +++ b/arch/i386/kernel/setup.c Thu Feb 19 23:44:25 2004 @@ -1118,6 +1118,19 @@ #endif paging_init(); +#ifdef CONFIG_EARLY_PRINTK + { + char *s = strstr(*cmdline_p, "earlyprintk="); + if (s) { + extern void setup_early_printk(char *); + + setup_early_printk(s); + printk("early console enabled\n"); + } + } +#endif + + dmi_scan_machine(); #ifdef CONFIG_X86_GENERICARCH diff -Nru a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c --- a/arch/i386/kernel/smpboot.c Thu Feb 19 23:44:25 2004 +++ b/arch/i386/kernel/smpboot.c Thu Feb 19 23:44:25 2004 @@ -948,6 +948,7 @@ printk("CPU%d: ", 0); print_cpu_info(&cpu_data[0]); + boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID)); boot_cpu_logical_apicid = logical_smp_processor_id(); current_thread_info()->cpu = 0; @@ -1008,8 +1009,6 @@ setup_local_APIC(); map_cpu_to_logical_apicid(); - if (GET_APIC_ID(apic_read(APIC_ID)) != boot_cpu_physical_apicid) - BUG(); setup_portio_remap(); diff -Nru a/arch/i386/kernel/timers/Makefile b/arch/i386/kernel/timers/Makefile --- a/arch/i386/kernel/timers/Makefile Thu Feb 19 23:44:22 2004 +++ b/arch/i386/kernel/timers/Makefile Thu Feb 19 23:44:22 2004 @@ -6,3 +6,4 @@ obj-$(CONFIG_X86_CYCLONE_TIMER) += timer_cyclone.o obj-$(CONFIG_HPET_TIMER) += timer_hpet.o +obj-$(CONFIG_X86_PM_TIMER) += timer_pm.o diff -Nru a/arch/i386/kernel/timers/common.c b/arch/i386/kernel/timers/common.c --- a/arch/i386/kernel/timers/common.c Thu Feb 19 23:44:24 2004 +++ b/arch/i386/kernel/timers/common.c Thu Feb 19 23:44:24 2004 @@ -137,3 +137,23 @@ } #endif +/* calculate cpu_khz */ +void __init init_cpu_khz(void) +{ + if (cpu_has_tsc) { + unsigned long tsc_quotient = calibrate_tsc(); + if (tsc_quotient) { + /* report CPU clock rate in Hz. + * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) = + * clock/second. Our precision is about 100 ppm. + */ + { unsigned long eax=0, edx=1000; + __asm__("divl %2" + :"=a" (cpu_khz), "=d" (edx) + :"r" (tsc_quotient), + "0" (eax), "1" (edx)); + printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); + } + } + } +} diff -Nru a/arch/i386/kernel/timers/timer.c b/arch/i386/kernel/timers/timer.c --- a/arch/i386/kernel/timers/timer.c Thu Feb 19 23:44:28 2004 +++ b/arch/i386/kernel/timers/timer.c Thu Feb 19 23:44:28 2004 @@ -19,6 +19,9 @@ #ifdef CONFIG_HPET_TIMER &timer_hpet, #endif +#ifdef CONFIG_X86_PM_TIMER + &timer_pmtmr, +#endif &timer_tsc, &timer_pit, NULL, diff -Nru a/arch/i386/kernel/timers/timer_cyclone.c b/arch/i386/kernel/timers/timer_cyclone.c --- a/arch/i386/kernel/timers/timer_cyclone.c Thu Feb 19 23:44:26 2004 +++ b/arch/i386/kernel/timers/timer_cyclone.c Thu Feb 19 23:44:26 2004 @@ -212,26 +212,7 @@ } } - /* init cpu_khz. - * XXX - This should really be done elsewhere, - * and in a more generic fashion. -johnstul@us.ibm.com - */ - if (cpu_has_tsc) { - unsigned long tsc_quotient = calibrate_tsc(); - if (tsc_quotient) { - /* report CPU clock rate in Hz. - * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) = - * clock/second. Our precision is about 100 ppm. - */ - { unsigned long eax=0, edx=1000; - __asm__("divl %2" - :"=a" (cpu_khz), "=d" (edx) - :"r" (tsc_quotient), - "0" (eax), "1" (edx)); - printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); - } - } - } + init_cpu_khz(); /* Everything looks good! */ return 0; diff -Nru a/arch/i386/kernel/timers/timer_pm.c b/arch/i386/kernel/timers/timer_pm.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/i386/kernel/timers/timer_pm.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,217 @@ +/* + * (C) Dominik Brodowski 2003 + * + * Driver to use the Power Management Timer (PMTMR) available in some + * southbridges as primary timing source for the Linux kernel. + * + * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c, + * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4. + * + * This file is licensed under the GPL v2. + */ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +/* The I/O port the PMTMR resides at. + * The location is detected during setup_arch(), + * in arch/i386/acpi/boot.c */ +u32 pmtmr_ioport = 0; + + +/* value of the Power timer at last timer interrupt */ +static u32 offset_tick; +static u32 offset_delay; + +static unsigned long long monotonic_base; +static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED; + +#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ + +/*helper function to safely read acpi pm timesource*/ +static inline u32 read_pmtmr(void) +{ + u32 v1=0,v2=0,v3=0; + /* It has been reported that because of various broken + * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM time + * source is not latched, so you must read it multiple + * times to insure a safe value is read. + */ + do { + v1 = inl(pmtmr_ioport); + v2 = inl(pmtmr_ioport); + v3 = inl(pmtmr_ioport); + } while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) + || (v3 > v1 && v3 < v2)); + + /* mask the output to 24 bits */ + return v2 & ACPI_PM_MASK; +} + +static int init_pmtmr(char* override) +{ + u32 value1, value2; + unsigned int i; + + if (override[0] && strncmp(override,"pmtmr",5)) + return -ENODEV; + + if (!pmtmr_ioport) + return -ENODEV; + + /* we use the TSC for delay_pmtmr, so make sure it exists */ + if (!cpu_has_tsc) + return -ENODEV; + + /* "verify" this timing source */ + value1 = read_pmtmr(); + for (i = 0; i < 10000; i++) { + value2 = read_pmtmr(); + if (value2 == value1) + continue; + if (value2 > value1) + goto pm_good; + if ((value2 < value1) && ((value2) < 0xFFF)) + goto pm_good; + printk(KERN_INFO "PM-Timer had inconsistent results: 0x%#x, 0x%#x - aborting.\n", value1, value2); + return -EINVAL; + } + printk(KERN_INFO "PM-Timer had no reasonable result: 0x%#x - aborting.\n", value1); + return -ENODEV; + +pm_good: + init_cpu_khz(); + return 0; +} + +static inline u32 cyc2us(u32 cycles) +{ + /* The Power Management Timer ticks at 3.579545 ticks per microsecond. + * 1 / PM_TIMER_FREQUENCY == 0.27936511 =~ 286/1024 [error: 0.024%] + * + * Even with HZ = 100, delta is at maximum 35796 ticks, so it can + * easily be multiplied with 286 (=0x11E) without having to fear + * u32 overflows. + */ + cycles *= 286; + return (cycles >> 10); +} + +/* + * this gets called during each timer interrupt + * - Called while holding the writer xtime_lock + */ +static void mark_offset_pmtmr(void) +{ + u32 lost, delta, last_offset; + static int first_run = 1; + last_offset = offset_tick; + + write_seqlock(&monotonic_lock); + + offset_tick = read_pmtmr(); + + /* calculate tick interval */ + delta = (offset_tick - last_offset) & ACPI_PM_MASK; + + /* convert to usecs */ + delta = cyc2us(delta); + + /* update the monotonic base value */ + monotonic_base += delta * NSEC_PER_USEC; + write_sequnlock(&monotonic_lock); + + /* convert to ticks */ + delta += offset_delay; + lost = delta / (USEC_PER_SEC / HZ); + offset_delay = delta % (USEC_PER_SEC / HZ); + + + /* compensate for lost ticks */ + if (lost >= 2) + jiffies_64 += lost - 1; + + /* don't calculate delay for first run, + or if we've got less then a tick */ + if (first_run || (lost < 1)) { + first_run = 0; + offset_delay = 0; + } +} + + +static unsigned long long monotonic_clock_pmtmr(void) +{ + u32 last_offset, this_offset; + unsigned long long base, ret; + unsigned seq; + + + /* atomically read monotonic base & last_offset */ + do { + seq = read_seqbegin(&monotonic_lock); + last_offset = offset_tick; + base = monotonic_base; + } while (read_seqretry(&monotonic_lock, seq)); + + /* Read the pmtmr */ + this_offset = read_pmtmr(); + + /* convert to nanoseconds */ + ret = (this_offset - last_offset) & ACPI_PM_MASK; + ret = base + (cyc2us(ret) * NSEC_PER_USEC); + return ret; +} + +static void delay_pmtmr(unsigned long loops) +{ + unsigned long bclock, now; + + rdtscl(bclock); + do + { + rep_nop(); + rdtscl(now); + } while ((now-bclock) < loops); +} + + +/* + * get the offset (in microseconds) from the last call to mark_offset() + * - Called holding a reader xtime_lock + */ +static unsigned long get_offset_pmtmr(void) +{ + u32 now, offset, delta = 0; + + offset = offset_tick; + now = read_pmtmr(); + delta = (now - offset)&ACPI_PM_MASK; + + return (unsigned long) offset_delay + cyc2us(delta); +} + + +/* acpi timer_opts struct */ +struct timer_opts timer_pmtmr = { + .name = "pmtmr", + .init = init_pmtmr, + .mark_offset = mark_offset_pmtmr, + .get_offset = get_offset_pmtmr, + .monotonic_clock = monotonic_clock_pmtmr, + .delay = delay_pmtmr, +}; + + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Dominik Brodowski "); +MODULE_DESCRIPTION("Power Management Timer (PMTMR) as primary timing source for x86"); diff -Nru a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c --- a/arch/i386/kernel/traps.c Thu Feb 19 23:44:23 2004 +++ b/arch/i386/kernel/traps.c Thu Feb 19 23:44:23 2004 @@ -119,7 +119,7 @@ unsigned long esp = tsk->thread.esp; /* User space on another CPU? */ - if ((esp ^ (unsigned long)tsk->thread_info) & (PAGE_MASK<<1)) + if ((esp ^ (unsigned long)tsk->thread_info) & ~(THREAD_SIZE - 1)) return; show_trace(tsk, (unsigned long *)esp); } @@ -255,12 +255,27 @@ void die(const char * str, struct pt_regs * regs, long err) { static int die_counter; + int nl = 0; console_verbose(); spin_lock_irq(&die_lock); bust_spinlocks(1); handle_BUG(regs); printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); +#ifdef CONFIG_PREEMPT + printk("PREEMPT "); + nl = 1; +#endif +#ifdef CONFIG_SMP + printk("SMP "); + nl = 1; +#endif +#ifdef CONFIG_DEBUG_PAGEALLOC + printk("DEBUG_PAGEALLOC"); + nl = 1; +#endif + if (nl) + printk("\n"); show_registers(regs); bust_spinlocks(0); spin_unlock_irq(&die_lock); diff -Nru a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c --- a/arch/i386/oprofile/nmi_int.c Thu Feb 19 23:44:28 2004 +++ b/arch/i386/oprofile/nmi_int.c Thu Feb 19 23:44:28 2004 @@ -295,8 +295,6 @@ }; -#if !defined(CONFIG_X86_64) - static int __init p4_init(void) { __u8 cpu_model = current_cpu_data.x86_model; @@ -335,7 +333,9 @@ if (cpu_model > 0xd) return 0; - if (cpu_model > 5) { + if (cpu_model == 9) { + nmi_ops.cpu_type = "i386/p6_mobile"; + } else if (cpu_model > 5) { nmi_ops.cpu_type = "i386/piii"; } else if (cpu_model > 2) { nmi_ops.cpu_type = "i386/pii"; @@ -347,9 +347,6 @@ return 1; } -#endif /* !CONFIG_X86_64 */ - - /* in order to get driverfs right */ static int using_nmi; @@ -381,7 +378,6 @@ } break; -#if !defined(CONFIG_X86_64) case X86_VENDOR_INTEL: switch (family) { /* Pentium IV */ @@ -400,7 +396,6 @@ return -ENODEV; } break; -#endif /* !CONFIG_X86_64 */ default: return -ENODEV; diff -Nru a/arch/i386/oprofile/nmi_timer_int.c b/arch/i386/oprofile/nmi_timer_int.c --- a/arch/i386/oprofile/nmi_timer_int.c Thu Feb 19 23:44:24 2004 +++ b/arch/i386/oprofile/nmi_timer_int.c Thu Feb 19 23:44:24 2004 @@ -48,9 +48,13 @@ .cpu_type = "timer" }; - int __init nmi_timer_init(struct oprofile_operations ** ops) { + extern int nmi_active; + + if (nmi_active <= 0) + return -ENODEV; + *ops = &nmi_timer_ops; printk(KERN_INFO "oprofile: using NMI timer interrupt.\n"); return 0; diff -Nru a/arch/i386/oprofile/op_model_ppro.c b/arch/i386/oprofile/op_model_ppro.c --- a/arch/i386/oprofile/op_model_ppro.c Thu Feb 19 23:44:26 2004 +++ b/arch/i386/oprofile/op_model_ppro.c Thu Feb 19 23:44:26 2004 @@ -13,6 +13,7 @@ #include #include #include +#include #include "op_x86_model.h" #include "op_counter.h" @@ -100,6 +101,10 @@ CTR_WRITE(reset_value[i], msrs, i); } } + + /* Only P6 based Pentium M need to re-unmask the apic vector but it + * doesn't hurt other P6 variant */ + apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED); /* We can't work out if we really handled an interrupt. We * might have caught a *second* counter just after overflowing diff -Nru a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c --- a/arch/i386/pci/fixup.c Thu Feb 19 23:44:26 2004 +++ b/arch/i386/pci/fixup.c Thu Feb 19 23:44:26 2004 @@ -188,22 +188,107 @@ } struct pci_fixup pcibios_fixups[] = { - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454GX, pci_fixup_i450gx }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_UMC, PCI_DEVICE_ID_UMC_UM8886BF, pci_fixup_umc_ide }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, pci_fixup_ide_trash }, - { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, pci_fixup_latency }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5598, pci_fixup_latency }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, pci_fixup_piix4_acpi }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, pci_fixup_ide_trash }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_11, pci_fixup_ide_trash }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_9, pci_fixup_ide_trash }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, pci_fixup_via_northbridge_bug }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8622, pci_fixup_via_northbridge_bug }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, pci_fixup_via_northbridge_bug }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_via_northbridge_bug }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, pci_fixup_ncr53c810 }, - { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_fixup_transparent_bridge }, - { 0 } + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_DEVICE_ID_INTEL_82451NX, + .hook = pci_fixup_i450nx + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_DEVICE_ID_INTEL_82454GX, + .hook = pci_fixup_i450gx + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_UMC, + .device = PCI_DEVICE_ID_UMC_UM8886BF, + .hook = pci_fixup_umc_ide + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_SI, + .device = PCI_DEVICE_ID_SI_5513, + .hook = pci_fixup_ide_trash + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_ANY_ID, + .device = PCI_ANY_ID, + .hook = pci_fixup_ide_bases + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_SI, + .device = PCI_DEVICE_ID_SI_5597, + .hook = pci_fixup_latency + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_SI, + .device = PCI_DEVICE_ID_SI_5598, + .hook = pci_fixup_latency + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_DEVICE_ID_INTEL_82371AB_3, + .hook = pci_fixup_piix4_acpi + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_DEVICE_ID_INTEL_82801CA_10, + .hook = pci_fixup_ide_trash + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_DEVICE_ID_INTEL_82801CA_11, + .hook = pci_fixup_ide_trash + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_DEVICE_ID_INTEL_82801DB_9, + .hook = pci_fixup_ide_trash + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_VIA, + .device = PCI_DEVICE_ID_VIA_8363_0, + .hook = pci_fixup_via_northbridge_bug + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_VIA, + .device = PCI_DEVICE_ID_VIA_8622, + .hook = pci_fixup_via_northbridge_bug + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_VIA, + .device = PCI_DEVICE_ID_VIA_8361, + .hook = pci_fixup_via_northbridge_bug + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_VIA, + .device = PCI_DEVICE_ID_VIA_8367_0, + .hook = pci_fixup_via_northbridge_bug + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_NCR, + .device = PCI_DEVICE_ID_NCR_53C810, + .hook = pci_fixup_ncr53c810 + }, + { + .pass = PCI_FIXUP_HEADER, + .vendor = PCI_VENDOR_ID_INTEL, + .device = PCI_ANY_ID, + .hook = pci_fixup_transparent_bridge + }, + { .pass = 0 } }; diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig --- a/arch/ia64/Kconfig Thu Feb 19 23:44:28 2004 +++ b/arch/ia64/Kconfig Thu Feb 19 23:44:28 2004 @@ -245,6 +245,12 @@ Say Y here to enable machine check support for IA-64. If you're unsure, answer Y. +config IA64_CYCLONE + bool "Support Cyclone(EXA) Time Source" + help + Say Y here to enable support for IBM EXA Cyclone time source. + If you're unsure, answer N. + config PM bool "Power Management support" depends on IA64_GENERIC || IA64_DIG || IA64_HP_ZX1 diff -Nru a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c --- a/arch/ia64/hp/sim/simeth.c Thu Feb 19 23:44:26 2004 +++ b/arch/ia64/hp/sim/simeth.c Thu Feb 19 23:44:26 2004 @@ -224,7 +224,7 @@ err = register_netdev(dev); if (err) { - kfree(dev); + free_netdev(dev); return err; } diff -Nru a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c --- a/arch/ia64/ia32/sys_ia32.c Thu Feb 19 23:44:26 2004 +++ b/arch/ia64/ia32/sys_ia32.c Thu Feb 19 23:44:26 2004 @@ -2413,44 +2413,85 @@ return sys_lseek(fd, offset, whence); } -extern asmlinkage long sys_getgroups (int gidsetsize, gid_t *grouplist); +static int +groups16_to_user(short *grouplist, struct group_info *group_info) +{ + int i; + short group; + + for (i = 0; i < group_info->ngroups; i++) { + group = (short)GROUP_AT(group_info, i); + if (put_user(group, grouplist+i)) + return -EFAULT; + } + + return 0; +} + +static int +groups16_from_user(struct group_info *group_info, short *grouplist) +{ + int i; + short group; + + for (i = 0; i < group_info->ngroups; i++) { + if (get_user(group, grouplist+i)) + return -EFAULT; + GROUP_AT(group_info, i) = (gid_t)group; + } + + return 0; +} asmlinkage long sys32_getgroups16 (int gidsetsize, short *grouplist) { - mm_segment_t old_fs = get_fs(); - gid_t gl[NGROUPS]; - int ret, i; - - set_fs(KERNEL_DS); - ret = sys_getgroups(gidsetsize, gl); - set_fs(old_fs); - - if (gidsetsize && ret > 0 && ret <= NGROUPS) - for (i = 0; i < ret; i++, grouplist++) - if (put_user(gl[i], grouplist)) - return -EFAULT; - return ret; -} + int i; -extern asmlinkage long sys_setgroups (int gidsetsize, gid_t *grouplist); + if (gidsetsize < 0) + return -EINVAL; + + get_group_info(current->group_info); + i = current->group_info->ngroups; + if (gidsetsize) { + if (i > gidsetsize) { + i = -EINVAL; + goto out; + } + if (groups16_to_user(grouplist, current->group_info)) { + i = -EFAULT; + goto out; + } + } +out: + put_group_info(current->group_info); + return i; +} asmlinkage long sys32_setgroups16 (int gidsetsize, short *grouplist) { - mm_segment_t old_fs = get_fs(); - gid_t gl[NGROUPS]; - int ret, i; + struct group_info *group_info; + int retval; - if ((unsigned) gidsetsize > NGROUPS) + if (!capable(CAP_SETGID)) + return -EPERM; + if ((unsigned)gidsetsize > NGROUPS_MAX) return -EINVAL; - for (i = 0; i < gidsetsize; i++, grouplist++) - if (get_user(gl[i], grouplist)) - return -EFAULT; - set_fs(KERNEL_DS); - ret = sys_setgroups(gidsetsize, gl); - set_fs(old_fs); - return ret; + + group_info = groups_alloc(gidsetsize); + if (!group_info) + return -ENOMEM; + retval = groups16_from_user(group_info, grouplist); + if (retval) { + put_group_info(group_info); + return retval; + } + + retval = set_current_groups(group_info); + put_group_info(group_info); + + return retval; } asmlinkage long diff -Nru a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile --- a/arch/ia64/kernel/Makefile Thu Feb 19 23:44:28 2004 +++ b/arch/ia64/kernel/Makefile Thu Feb 19 23:44:28 2004 @@ -18,6 +18,7 @@ obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_SMP) += smp.o smpboot.o obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o +obj-$(CONFIG_IA64_CYCLONE) += cyclone.o # The gate DSO image is built using a special linker script. targets += gate.so gate-syms.o diff -Nru a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c --- a/arch/ia64/kernel/acpi.c Thu Feb 19 23:44:25 2004 +++ b/arch/ia64/kernel/acpi.c Thu Feb 19 23:44:25 2004 @@ -49,6 +49,8 @@ #include #include #include +#include +#include #define PREFIX "ACPI: " @@ -304,6 +306,22 @@ return 0; } +/* Hook from generic ACPI tables.c */ +void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) +{ + if (!strncmp(oem_id, "IBM", 3) && + (!strncmp(oem_table_id, "SERMOW", 6))){ + + /* Unfortunatly ITC_DRIFT is not yet part of the + * official SAL spec, so the ITC_DRIFT bit is not + * set by the BIOS on this hardware. + */ + sal_platform_features |= IA64_SAL_PLATFORM_FEATURE_ITC_DRIFT; + + /*Start cyclone clock*/ + cyclone_setup(0); + } +} static int __init acpi_parse_madt (unsigned long phys_addr, unsigned long size) @@ -327,6 +345,10 @@ ipi_base_addr = (unsigned long) ioremap(acpi_madt->lapic_address, 0); printk(KERN_INFO PREFIX "Local APIC address 0x%lx\n", ipi_base_addr); + + acpi_madt_oem_check(acpi_madt->header.oem_id, + acpi_madt->header.oem_table_id); + return 0; } diff -Nru a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/arch/ia64/kernel/cyclone.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,158 @@ +#include +#include +#include + +/* IBM Summit (EXA) Cyclone counter code*/ +#define CYCLONE_CBAR_ADDR 0xFEB00CD0 +#define CYCLONE_PMCC_OFFSET 0x51A0 +#define CYCLONE_MPMC_OFFSET 0x51D0 +#define CYCLONE_MPCS_OFFSET 0x51A8 +#define CYCLONE_TIMER_FREQ 100000000 + +int use_cyclone; +int __init cyclone_setup(char *str) +{ + use_cyclone = 1; + return 1; +} + +static u32* volatile cyclone_timer; /* Cyclone MPMC0 register */ +static u32 last_update_cyclone; + +static unsigned long offset_base; + +static unsigned long get_offset_cyclone(void) +{ + u32 now; + unsigned long offset; + + /* Read the cyclone timer */ + now = readl(cyclone_timer); + /* .. relative to previous update*/ + offset = now - last_update_cyclone; + + /* convert cyclone ticks to nanoseconds */ + offset = (offset*NSEC_PER_SEC)/CYCLONE_TIMER_FREQ; + + /* our adjusted time in nanoseconds */ + return offset_base + offset; +} + +static void update_cyclone(long delta_nsec) +{ + u32 now; + unsigned long offset; + + /* Read the cyclone timer */ + now = readl(cyclone_timer); + /* .. relative to previous update*/ + offset = now - last_update_cyclone; + + /* convert cyclone ticks to nanoseconds */ + offset = (offset*NSEC_PER_SEC)/CYCLONE_TIMER_FREQ; + + offset += offset_base; + + /* Be careful about signed/unsigned comparisons here: */ + if (delta_nsec < 0 || (unsigned long) delta_nsec < offset) + offset_base = offset - delta_nsec; + else + offset_base = 0; + + last_update_cyclone = now; +} + +static void reset_cyclone(void) +{ + offset_base = 0; + last_update_cyclone = readl(cyclone_timer); +} + +struct time_interpolator cyclone_interpolator = { + .get_offset = get_offset_cyclone, + .update = update_cyclone, + .reset = reset_cyclone, + .frequency = CYCLONE_TIMER_FREQ, + .drift = -100, +}; + +int __init init_cyclone_clock(void) +{ + u64* reg; + u64 base; /* saved cyclone base address */ + u64 offset; /* offset from pageaddr to cyclone_timer register */ + int i; + + if (!use_cyclone) + return -ENODEV; + + printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n"); + + /* find base address */ + offset = (CYCLONE_CBAR_ADDR); + reg = (u64*)ioremap_nocache(offset, sizeof(u64)); + if(!reg){ + printk(KERN_ERR "Summit chipset: Could not find valid CBAR register.\n"); + use_cyclone = 0; + return -ENODEV; + } + base = readq(reg); + if(!base){ + printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n"); + use_cyclone = 0; + return -ENODEV; + } + iounmap(reg); + + /* setup PMCC */ + offset = (base + CYCLONE_PMCC_OFFSET); + reg = (u64*)ioremap_nocache(offset, sizeof(u64)); + if(!reg){ + printk(KERN_ERR "Summit chipset: Could not find valid PMCC register.\n"); + use_cyclone = 0; + return -ENODEV; + } + writel(0x00000001,reg); + iounmap(reg); + + /* setup MPCS */ + offset = (base + CYCLONE_MPCS_OFFSET); + reg = (u64*)ioremap_nocache(offset, sizeof(u64)); + if(!reg){ + printk(KERN_ERR "Summit chipset: Could not find valid MPCS register.\n"); + use_cyclone = 0; + return -ENODEV; + } + writel(0x00000001,reg); + iounmap(reg); + + /* map in cyclone_timer */ + offset = (base + CYCLONE_MPMC_OFFSET); + cyclone_timer = (u32*)ioremap_nocache(offset, sizeof(u32)); + if(!cyclone_timer){ + printk(KERN_ERR "Summit chipset: Could not find valid MPMC register.\n"); + use_cyclone = 0; + return -ENODEV; + } + + /*quick test to make sure its ticking*/ + for(i=0; i<3; i++){ + u32 old = readl(cyclone_timer); + int stall = 100; + while(stall--) barrier(); + if(readl(cyclone_timer) == old){ + printk(KERN_ERR "Summit chipset: Counter not counting! DISABLED\n"); + iounmap(cyclone_timer); + cyclone_timer = 0; + use_cyclone = 0; + return -ENODEV; + } + } + /* initialize last tick */ + last_update_cyclone = readl(cyclone_timer); + register_time_interpolator(&cyclone_interpolator); + + return 0; +} + +__initcall(init_cyclone_clock); diff -Nru a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c --- a/arch/ia64/kernel/irq.c Thu Feb 19 23:44:27 2004 +++ b/arch/ia64/kernel/irq.c Thu Feb 19 23:44:27 2004 @@ -940,7 +940,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -1005,7 +1005,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c --- a/arch/ia64/kernel/unwind.c Thu Feb 19 23:44:29 2004 +++ b/arch/ia64/kernel/unwind.c Thu Feb 19 23:44:29 2004 @@ -1416,7 +1416,7 @@ case UNW_WHERE_FR: if (rval <= 5) - val = unw.preg_index[UNW_REG_F2 + (rval - 1)]; + val = unw.preg_index[UNW_REG_F2 + (rval - 2)]; else if (rval >= 16 && rval <= 31) val = unw.preg_index[UNW_REG_F16 + (rval - 16)]; else { diff -Nru a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c --- a/arch/ia64/pci/pci.c Thu Feb 19 23:44:25 2004 +++ b/arch/ia64/pci/pci.c Thu Feb 19 23:44:25 2004 @@ -153,8 +153,10 @@ res->end = end; res->flags = flags; - if (insert_resource(root, res)) + if (insert_resource(root, res)) { + kfree(res); return -EBUSY; + } return 0; } diff -Nru a/arch/ia64/sn/io/drivers/ioconfig_bus.c b/arch/ia64/sn/io/drivers/ioconfig_bus.c --- a/arch/ia64/sn/io/drivers/ioconfig_bus.c Thu Feb 19 23:44:26 2004 +++ b/arch/ia64/sn/io/drivers/ioconfig_bus.c Thu Feb 19 23:44:26 2004 @@ -16,6 +16,7 @@ #include +#include #include #include #include diff -Nru a/arch/ia64/sn/io/io.c b/arch/ia64/sn/io/io.c --- a/arch/ia64/sn/io/io.c Thu Feb 19 23:44:24 2004 +++ b/arch/ia64/sn/io/io.c Thu Feb 19 23:44:24 2004 @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c --- a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c Thu Feb 19 23:44:27 2004 +++ b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c Thu Feb 19 23:44:27 2004 @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -28,7 +27,7 @@ extern void register_pcibr_intr(int irq, pcibr_intr_t intr); -static void sn_dma_flush_init(unsigned long start, +static struct sn_flush_device_list *sn_dma_flush_init(unsigned long start, unsigned long end, int idx, int pin, int slot); extern int cbrick_type_get_nasid(nasid_t); @@ -54,7 +53,7 @@ } /* - * pci_bus_cvlink_init() - To be called once during initialization before + * pci_bus_cvlink_init() - To be called once during initialization before * SGI IO Infrastructure init is called. */ int @@ -74,7 +73,7 @@ } /* - * pci_bus_to_vertex() - Given a logical Linux Bus Number returns the associated + * pci_bus_to_vertex() - Given a logical Linux Bus Number returns the associated * pci bus vertex from the SGI IO Infrastructure. */ static inline vertex_hdl_t @@ -92,7 +91,7 @@ } /* - * devfn_to_vertex() - returns the vertex of the device given the bus, slot, + * devfn_to_vertex() - returns the vertex of the device given the bus, slot, * and function numbers. */ vertex_hdl_t @@ -133,8 +132,8 @@ * ../pci/1, ../pci/2 .. */ if (func == 0) { - sprintf(name, "%d", slot); - if (hwgraph_traverse(pci_bus, name, &device_vertex) == + sprintf(name, "%d", slot); + if (hwgraph_traverse(pci_bus, name, &device_vertex) == GRAPH_SUCCESS) { if (device_vertex) { return(device_vertex); @@ -156,19 +155,248 @@ return(device_vertex); } +/* + * sn_alloc_pci_sysdata() - This routine allocates a pci controller + * which is expected as the pci_dev and pci_bus sysdata by the Linux + * PCI infrastructure. + */ +static struct pci_controller * +sn_alloc_pci_sysdata(void) +{ + struct pci_controller *pci_sysdata; + + pci_sysdata = kmalloc(sizeof(*pci_sysdata), GFP_KERNEL); + if (!pci_sysdata) + return NULL; + + memset(pci_sysdata, 0, sizeof(*pci_sysdata)); + return pci_sysdata; +} + +/* + * sn_pci_fixup_bus() - This routine sets up a bus's resources + * consistent with the Linux PCI abstraction layer. + */ +static int __init +sn_pci_fixup_bus(struct pci_bus *bus) +{ + struct pci_controller *pci_sysdata; + struct sn_widget_sysdata *widget_sysdata; + + pci_sysdata = sn_alloc_pci_sysdata(); + if (!pci_sysdata) { + printk(KERN_WARNING "sn_pci_fixup_bus(): Unable to " + "allocate memory for pci_sysdata\n"); + return -ENOMEM; + } + widget_sysdata = kmalloc(sizeof(struct sn_widget_sysdata), + GFP_KERNEL); + if (!widget_sysdata) { + printk(KERN_WARNING "sn_pci_fixup_bus(): Unable to " + "allocate memory for widget_sysdata\n"); + kfree(pci_sysdata); + return -ENOMEM; + } + + widget_sysdata->vhdl = pci_bus_to_vertex(bus->number); + pci_sysdata->platform_data = (void *)widget_sysdata; + bus->sysdata = pci_sysdata; + return 0; +} + + +/* + * sn_pci_fixup_slot() - This routine sets up a slot's resources + * consistent with the Linux PCI abstraction layer. Resources acquired + * from our PCI provider include PIO maps to BAR space and interrupt + * objects. + */ +static int +sn_pci_fixup_slot(struct pci_dev *dev) +{ + extern int bit_pos_to_irq(int); + unsigned int irq; + int idx; + u16 cmd; + vertex_hdl_t vhdl; + unsigned long size; + struct pci_controller *pci_sysdata; + struct sn_device_sysdata *device_sysdata; + pciio_intr_line_t lines = 0; + vertex_hdl_t device_vertex; + pciio_provider_t *pci_provider; + pciio_intr_t intr_handle; + + /* Allocate a controller structure */ + pci_sysdata = sn_alloc_pci_sysdata(); + if (!pci_sysdata) { + printk(KERN_WARNING "sn_pci_fixup_slot: Unable to " + "allocate memory for pci_sysdata\n"); + return -ENOMEM; + } + + /* Set the device vertex */ + device_sysdata = kmalloc(sizeof(struct sn_device_sysdata), GFP_KERNEL); + if (!device_sysdata) { + printk(KERN_WARNING "sn_pci_fixup_slot: Unable to " + "allocate memory for device_sysdata\n"); + kfree(pci_sysdata); + return -ENOMEM; + } + + device_sysdata->vhdl = devfn_to_vertex(dev->bus->number, dev->devfn); + pci_sysdata->platform_data = (void *) device_sysdata; + dev->sysdata = pci_sysdata; + set_pci_provider(device_sysdata); + + pci_read_config_word(dev, PCI_COMMAND, &cmd); + + /* + * Set the resources address correctly. The assumption here + * is that the addresses in the resource structure has been + * read from the card and it was set in the card by our + * Infrastructure. NOTE: PIC and TIOCP don't have big-window + * upport for PCI I/O space. So by mapping the I/O space + * first we will attempt to use Device(x) registers for I/O + * BARs (which can't use big windows like MEM BARs can). + */ + vhdl = device_sysdata->vhdl; + + /* Allocate the IORESOURCE_IO space first */ + for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) { + unsigned long start, end, addr; + + device_sysdata->pio_map[idx] = NULL; + + if (!(dev->resource[idx].flags & IORESOURCE_IO)) + continue; + + start = dev->resource[idx].start; + end = dev->resource[idx].end; + size = end - start; + if (!size) + continue; + + addr = (unsigned long)pciio_pio_addr(vhdl, 0, + PCIIO_SPACE_WIN(idx), 0, size, + &device_sysdata->pio_map[idx], 0); + + if (!addr) { + dev->resource[idx].start = 0; + dev->resource[idx].end = 0; + printk("sn_pci_fixup(): pio map failure for " + "%s bar%d\n", dev->slot_name, idx); + } else { + addr |= __IA64_UNCACHED_OFFSET; + dev->resource[idx].start = addr; + dev->resource[idx].end = addr + size; + } + + if (dev->resource[idx].flags & IORESOURCE_IO) + cmd |= PCI_COMMAND_IO; + } + + /* Allocate the IORESOURCE_MEM space next */ + for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) { + unsigned long start, end, addr; + + if ((dev->resource[idx].flags & IORESOURCE_IO)) + continue; + + start = dev->resource[idx].start; + end = dev->resource[idx].end; + size = end - start; + if (!size) + continue; + + addr = (unsigned long)pciio_pio_addr(vhdl, 0, + PCIIO_SPACE_WIN(idx), 0, size, + &device_sysdata->pio_map[idx], 0); + + if (!addr) { + dev->resource[idx].start = 0; + dev->resource[idx].end = 0; + printk("sn_pci_fixup(): pio map failure for " + "%s bar%d\n", dev->slot_name, idx); + } else { + addr |= __IA64_UNCACHED_OFFSET; + dev->resource[idx].start = addr; + dev->resource[idx].end = addr + size; + } + + if (dev->resource[idx].flags & IORESOURCE_MEM) + cmd |= PCI_COMMAND_MEMORY; + } + + /* + * Update the Command Word on the Card. + */ + cmd |= PCI_COMMAND_MASTER; /* If the device doesn't support */ + /* bit gets dropped .. no harm */ + pci_write_config_word(dev, PCI_COMMAND, cmd); + + pci_read_config_byte(dev, PCI_INTERRUPT_PIN, (unsigned char *)&lines); + device_vertex = device_sysdata->vhdl; + pci_provider = device_sysdata->pci_provider; + device_sysdata->intr_handle = NULL; + + if (!lines) + return 0; + + irqpdaindr->curr = dev; + + intr_handle = (pci_provider->intr_alloc)(device_vertex, NULL, lines, device_vertex); + if (intr_handle == NULL) { + printk(KERN_WARNING "sn_pci_fixup: pcibr_intr_alloc() failed\n"); + kfree(pci_sysdata); + kfree(device_sysdata); + return -ENOMEM; + } + + device_sysdata->intr_handle = intr_handle; + irq = intr_handle->pi_irq; + irqpdaindr->device_dev[irq] = dev; + (pci_provider->intr_connect)(intr_handle, (intr_func_t)0, (intr_arg_t)0); + dev->irq = irq; + + register_pcibr_intr(irq, (pcibr_intr_t)intr_handle); + + for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) { + int ibits = ((pcibr_intr_t)intr_handle)->bi_ibits; + int i; + + size = dev->resource[idx].end - + dev->resource[idx].start; + if (size == 0) continue; + + for (i=0; i<8; i++) { + if (ibits & (1 << i) ) { + extern pcibr_info_t pcibr_info_get(vertex_hdl_t); + device_sysdata->dma_flush_list = + sn_dma_flush_init(dev->resource[idx].start, + dev->resource[idx].end, + idx, + i, + PCIBR_INFO_SLOT_GET_EXT(pcibr_info_get(device_sysdata->vhdl))); + } + } + } + return 0; +} + struct sn_flush_nasid_entry flush_nasid_list[MAX_NASIDS]; /* Initialize the data structures for flushing write buffers after a PIO read. - * The theory is: + * The theory is: * Take an unused int. pin and associate it with a pin that is in use. * After a PIO read, force an interrupt on the unused pin, forcing a write buffer flush - * on the in use pin. This will prevent the race condition between PIO read responses and + * on the in use pin. This will prevent the race condition between PIO read responses and * DMA writes. */ -static void +static struct sn_flush_device_list * sn_dma_flush_init(unsigned long start, unsigned long end, int idx, int pin, int slot) { - nasid_t nasid; + nasid_t nasid; unsigned long dnasid; int wid_num; int bus; @@ -187,7 +415,7 @@ sizeof(struct sn_flush_device_list *), GFP_KERNEL); if (!flush_nasid_list[nasid].widget_p) { printk(KERN_WARNING "sn_dma_flush_init: Cannot allocate memory for nasid list\n"); - return; + return NULL; } memset(flush_nasid_list[nasid].widget_p, 0, (HUB_WIDGET_ID_MAX+1) * sizeof(struct sn_flush_device_list *)); } @@ -197,8 +425,8 @@ itte = HUB_L(IIO_ITTE_GET(nasid, itte_index)); flush_nasid_list[nasid].iio_itte[bwin] = itte; - wid_num = (itte >> IIO_ITTE_WIDGET_SHIFT) & - IIO_ITTE_WIDGET_MASK; + wid_num = (itte >> IIO_ITTE_WIDGET_SHIFT) + & IIO_ITTE_WIDGET_MASK; bus = itte & IIO_ITTE_OFFSET_MASK; if (bus == 0x4 || bus == 0x8) { bus = 0; @@ -211,16 +439,16 @@ * because these are the IOC4 slots and we don't flush them. */ if (isIO9(nasid) && bus == 0 && (slot == 1 || slot == 4)) { - return; + return NULL; } if (flush_nasid_list[nasid].widget_p[wid_num] == NULL) { flush_nasid_list[nasid].widget_p[wid_num] = (struct sn_flush_device_list *)kmalloc( DEV_PER_WIDGET * sizeof (struct sn_flush_device_list), GFP_KERNEL); if (!flush_nasid_list[nasid].widget_p[wid_num]) { printk(KERN_WARNING "sn_dma_flush_init: Cannot allocate memory for nasid sub-list\n"); - return; + return NULL; } - memset(flush_nasid_list[nasid].widget_p[wid_num], 0, + memset(flush_nasid_list[nasid].widget_p[wid_num], 0, DEV_PER_WIDGET * sizeof (struct sn_flush_device_list)); p = &flush_nasid_list[nasid].widget_p[wid_num][0]; for (i=0; iflush_addr)); pcireg_bridge_intr_addr_set(b, 6, ((virt_to_phys(&p->flush_addr) & 0xfffffffff) | - (dnasid << 36) | (0xfUL << 48))); + (dnasid << 36) | (0xfUL << 48))); } else if (pin == 2) { /* 12160 SCSI device in IO9 */ p->force_int_addr = (unsigned long)pcireg_bridge_force_always_addr_get(b, 4); pcireg_bridge_intr_device_bit_set(b, (2<<12)); dnasid = NASID_GET(virt_to_phys(&p->flush_addr)); pcireg_bridge_intr_addr_set(b, 4, ((virt_to_phys(&p->flush_addr) & 0xfffffffff) | - (dnasid << 36) | (0xfUL << 48))); + (dnasid << 36) | (0xfUL << 48))); } else { /* slot == 6 */ p->force_int_addr = (unsigned long)pcireg_bridge_force_always_addr_get(b, 7); pcireg_bridge_intr_device_bit_set(b, (5<<21)); dnasid = NASID_GET(virt_to_phys(&p->flush_addr)); pcireg_bridge_intr_addr_set(b, 7, ((virt_to_phys(&p->flush_addr) & 0xfffffffff) | - (dnasid << 36) | (0xfUL << 48))); + (dnasid << 36) | (0xfUL << 48))); } } else { p->force_int_addr = (unsigned long)pcireg_bridge_force_always_addr_get(b, (pin +2)); @@ -301,239 +529,13 @@ dnasid = NASID_GET(virt_to_phys(&p->flush_addr)); pcireg_bridge_intr_addr_set(b, (pin + 2), ((virt_to_phys(&p->flush_addr) & 0xfffffffff) | - (dnasid << 36) | (0xfUL << 48))); - } -} - -/* - * sn_pci_fixup() - This routine is called when platform_pci_fixup() is - * invoked at the end of pcibios_init() to link the Linux pci - * infrastructure to SGI IO Infrasturcture - ia64/kernel/pci.c - * - * Other platform specific fixup can also be done here. - */ -static void __init -sn_pci_fixup(int arg) -{ - struct list_head *ln; - struct pci_bus *pci_bus = NULL; - struct pci_dev *device_dev = NULL; - struct sn_widget_sysdata *widget_sysdata; - struct sn_device_sysdata *device_sysdata; - pcibr_intr_t intr_handle; - pciio_provider_t *pci_provider; - vertex_hdl_t device_vertex; - pciio_intr_line_t lines = 0; - extern int numnodes; - int cnode; - - if (arg == 0) { -#ifdef CONFIG_PROC_FS - extern void register_sn_procfs(void); -#endif - extern void sgi_master_io_infr_init(void); - extern void sn_init_cpei_timer(void); - - sgi_master_io_infr_init(); - - for (cnode = 0; cnode < numnodes; cnode++) { - extern void intr_init_vecblk(cnodeid_t); - intr_init_vecblk(cnode); - } - - sn_init_cpei_timer(); - -#ifdef CONFIG_PROC_FS - register_sn_procfs(); -#endif - return; - } - - - done_probing = 1; - - /* - * Initialize the pci bus vertex in the pci_bus struct. - */ - for( ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) { - pci_bus = pci_bus_b(ln); - widget_sysdata = kmalloc(sizeof(struct sn_widget_sysdata), - GFP_KERNEL); - if (!widget_sysdata) { - printk(KERN_WARNING "sn_pci_fixup(): Unable to " - "allocate memory for widget_sysdata\n"); - return; - } - widget_sysdata->vhdl = pci_bus_to_vertex(pci_bus->number); - pci_bus->sysdata = (void *)widget_sysdata; - } - - /* - * set the root start and end so that drivers calling check_region() - * won't see a conflict - */ - -#ifdef CONFIG_IA64_SGI_SN_SIM - if (! IS_RUNNING_ON_SIMULATOR()) { - ioport_resource.start = 0xc000000000000000; - ioport_resource.end = 0xcfffffffffffffff; - } -#endif - - /* - * Set the root start and end for Mem Resource. - */ - iomem_resource.start = 0; - iomem_resource.end = 0xffffffffffffffff; - - /* - * Initialize the device vertex in the pci_dev struct. - */ - while ((device_dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, device_dev)) != NULL) { - unsigned int irq; - int idx; - u16 cmd; - vertex_hdl_t vhdl; - unsigned long size; - extern int bit_pos_to_irq(int); - - /* Set the device vertex */ - - device_sysdata = kmalloc(sizeof(struct sn_device_sysdata), - GFP_KERNEL); - if (!device_sysdata) { - printk(KERN_WARNING "sn_pci_fixup: Cannot allocate memory for device sysdata\n"); - return; - } - - device_sysdata->vhdl = devfn_to_vertex(device_dev->bus->number, device_dev->devfn); - device_dev->sysdata = (void *) device_sysdata; - set_pci_provider(device_sysdata); - - pci_read_config_word(device_dev, PCI_COMMAND, &cmd); - - /* - * Set the resources address correctly. The assumption here - * is that the addresses in the resource structure has been - * read from the card and it was set in the card by our - * Infrastructure .. - */ - vhdl = device_sysdata->vhdl; - /* Allocate the IORESOURCE_IO space first */ - for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) { - unsigned long start, end, addr; - - if (!(device_dev->resource[idx].flags & IORESOURCE_IO)) - continue; - - start = device_dev->resource[idx].start; - end = device_dev->resource[idx].end; - size = end - start; - if (!size) - continue; - - addr = (unsigned long)pciio_pio_addr(vhdl, 0, - PCIIO_SPACE_WIN(idx), 0, size, 0, 0); - if (!addr) { - device_dev->resource[idx].start = 0; - device_dev->resource[idx].end = 0; - printk("sn_pci_fixup(): pio map failure for " - "%s bar%d\n", device_dev->slot_name, idx); - } else { - addr |= __IA64_UNCACHED_OFFSET; - device_dev->resource[idx].start = addr; - device_dev->resource[idx].end = addr + size; - } - - if (device_dev->resource[idx].flags & IORESOURCE_IO) - cmd |= PCI_COMMAND_IO; - } - - /* Allocate the IORESOURCE_MEM space next */ - for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) { - unsigned long start, end, addr; - - if ((device_dev->resource[idx].flags & IORESOURCE_IO)) - continue; - - start = device_dev->resource[idx].start; - end = device_dev->resource[idx].end; - size = end - start; - if (!size) - continue; - - addr = (unsigned long)pciio_pio_addr(vhdl, 0, - PCIIO_SPACE_WIN(idx), 0, size, 0, 0); - if (!addr) { - device_dev->resource[idx].start = 0; - device_dev->resource[idx].end = 0; - printk("sn_pci_fixup(): pio map failure for " - "%s bar%d\n", device_dev->slot_name, idx); - } else { - addr |= __IA64_UNCACHED_OFFSET; - device_dev->resource[idx].start = addr; - device_dev->resource[idx].end = addr + size; - } - - if (device_dev->resource[idx].flags & IORESOURCE_MEM) - cmd |= PCI_COMMAND_MEMORY; - } - - /* - * Update the Command Word on the Card. - */ - cmd |= PCI_COMMAND_MASTER; /* If the device doesn't support */ - /* bit gets dropped .. no harm */ - pci_write_config_word(device_dev, PCI_COMMAND, cmd); - - pci_read_config_byte(device_dev, PCI_INTERRUPT_PIN, - (unsigned char *)&lines); - device_sysdata = (struct sn_device_sysdata *)device_dev->sysdata; - device_vertex = device_sysdata->vhdl; - pci_provider = device_sysdata->pci_provider; - - if (!lines) { - continue; - } - - irqpdaindr->curr = device_dev; - intr_handle = (pci_provider->intr_alloc)(device_vertex, NULL, lines, device_vertex); - - if (intr_handle == NULL) { - printk("sn_pci_fixup: pcibr_intr_alloc() failed\n"); - continue; - } - irq = intr_handle->bi_irq; - irqpdaindr->device_dev[irq] = device_dev; - (pci_provider->intr_connect)(intr_handle, (intr_func_t)0, (intr_arg_t)0); - device_dev->irq = irq; - register_pcibr_intr(irq, (pcibr_intr_t)intr_handle); - - for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) { - int ibits = intr_handle->bi_ibits; - int i; - - size = device_dev->resource[idx].end - - device_dev->resource[idx].start; - if (size == 0) - continue; - - for (i=0; i<8; i++) { - if (ibits & (1 << i) ) { - sn_dma_flush_init(device_dev->resource[idx].start, - device_dev->resource[idx].end, - idx, - i, - PCIBR_INFO_SLOT_GET_EXT(pcibr_info_get(device_sysdata->vhdl))); - } - } - } - + (dnasid << 36) | (0xfUL << 48))); } + return p; } /* - * linux_bus_cvlink() Creates a link between the Linux PCI Bus number + * linux_bus_cvlink() Creates a link between the Linux PCI Bus number * to the actual hardware component that it represents: * /dev/hw/linux/busnum/0 -> ../../../hw/module/001c01/slab/0/Ibrick/xtalk/15/pci * @@ -553,7 +555,7 @@ continue; sprintf(name, "%x", index); - (void) hwgraph_edge_add(linux_busnum, busnum_to_pcibr_vhdl[index], + (void) hwgraph_edge_add(linux_busnum, busnum_to_pcibr_vhdl[index], name); } } @@ -564,7 +566,7 @@ * Linux PCI Bus numbers are assigned from lowest module_id numbers * (rack/slot etc.) */ -static int +static int pci_bus_map_create(struct pcibr_list_s *softlistp, moduleid_t moduleid) { @@ -574,10 +576,10 @@ memset(moduleid_str, 0, 16); format_module_id(moduleid_str, moduleid, MODULE_FORMAT_BRIEF); - (void) ioconfig_get_busnum((char *)moduleid_str, &basebus_num); + (void) ioconfig_get_busnum((char *)moduleid_str, &basebus_num); /* - * Assign the correct bus number and also the nasid of this + * Assign the correct bus number and also the nasid of this * pci Xwidget. */ bus_number = basebus_num + pcibr_widget_to_bus(pci_bus); @@ -605,20 +607,20 @@ printk("pci_bus_map_create: Cannot allocate memory for ate maps\n"); return -1; } - memset(busnum_to_atedmamaps[bus_number], 0x0, + memset(busnum_to_atedmamaps[bus_number], 0x0, sizeof(struct pcibr_dmamap_s) * MAX_ATE_MAPS); return(0); } /* - * pci_bus_to_hcl_cvlink() - This routine is called after SGI IO Infrastructure + * pci_bus_to_hcl_cvlink() - This routine is called after SGI IO Infrastructure * initialization has completed to set up the mappings between PCI BRIDGE - * ASIC and logical pci bus numbers. + * ASIC and logical pci bus numbers. * * Must be called before pci_init() is invoked. */ int -pci_bus_to_hcl_cvlink(void) +pci_bus_to_hcl_cvlink(void) { int i; extern pcibr_list_p pcibr_list; @@ -635,7 +637,7 @@ /* Is this PCI bus associated with this moduleid? */ moduleid = NODE_MODULEID( - NASID_TO_COMPACT_NODEID(pcibr_soft->bs_nasid)); + NASID_TO_COMPACT_NODEID(pcibr_soft->bs_nasid)); if (modules[i]->id == moduleid) { struct pcibr_list_s *new_element; @@ -656,9 +658,9 @@ continue; } - /* - * BASEIO IObricks attached to a module have - * a higher priority than non BASEIO IOBricks + /* + * BASEIO IObricks attached to a module have + * a higher priority than non BASEIO IOBricks * when it comes to persistant pci bus * numbering, so put them on the front of the * list. @@ -674,7 +676,7 @@ softlistp = softlistp->bl_next; } - /* + /* * We now have a list of all the pci bridges associated with * the module_id, modules[i]. Call pci_bus_map_create() for * each pci bridge @@ -702,13 +704,26 @@ /* * Ugly hack to get PCI setup until we have a proper ACPI namespace. */ + +#define PCI_BUSES_TO_SCAN 256 + extern struct pci_ops sn_pci_ops; int __init sn_pci_init (void) { -# define PCI_BUSES_TO_SCAN 256 int i = 0; struct pci_controller *controller; + struct list_head *ln; + struct pci_bus *pci_bus = NULL; + struct pci_dev *pci_dev = NULL; + extern int numnodes; + int cnode, ret; +#ifdef CONFIG_PROC_FS + extern void register_sn_procfs(void); +#endif + extern void sgi_master_io_infr_init(void); + extern void sn_init_cpei_timer(void); + if (!ia64_platform_is("sn2") || IS_RUNNING_ON_SIMULATOR()) return 0; @@ -721,7 +736,19 @@ /* * set pci_raw_ops, etc. */ - sn_pci_fixup(0); + + sgi_master_io_infr_init(); + + for (cnode = 0; cnode < numnodes; cnode++) { + extern void intr_init_vecblk(cnodeid_t); + intr_init_vecblk(cnode); + } + + sn_init_cpei_timer(); + +#ifdef CONFIG_PROC_FS + register_sn_procfs(); +#endif controller = kmalloc(sizeof(struct pci_controller), GFP_KERNEL); if (controller) { @@ -734,7 +761,53 @@ /* * actually find devices and fill in hwgraph structs */ - sn_pci_fixup(1); + + done_probing = 1; + + /* + * Initialize the pci bus vertex in the pci_bus struct. + */ + for( ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) { + pci_bus = pci_bus_b(ln); + ret = sn_pci_fixup_bus(pci_bus); + if ( ret ) { + printk(KERN_WARNING + "sn_pci_fixup: sn_pci_fixup_bus fails : error %d\n", + ret); + return; + } + } + + /* + * set the root start and end so that drivers calling check_region() + * won't see a conflict + */ + +#ifdef CONFIG_IA64_SGI_SN_SIM + if (! IS_RUNNING_ON_SIMULATOR()) { + ioport_resource.start = 0xc000000000000000; + ioport_resource.end = 0xcfffffffffffffff; + } +#endif + + /* + * Set the root start and end for Mem Resource. + */ + iomem_resource.start = 0; + iomem_resource.end = 0xffffffffffffffff; + + /* + * Initialize the device vertex in the pci_dev struct. + */ + while ((pci_dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) { + ret = sn_pci_fixup_slot(pci_dev); + if ( ret ) { + printk(KERN_WARNING + "sn_pci_fixup: sn_pci_fixup_slot fails : error %d\n", + ret); + return; + } + } return 0; } diff -Nru a/arch/ia64/sn/io/machvec/pci_dma.c b/arch/ia64/sn/io/machvec/pci_dma.c --- a/arch/ia64/sn/io/machvec/pci_dma.c Thu Feb 19 23:44:24 2004 +++ b/arch/ia64/sn/io/machvec/pci_dma.c Thu Feb 19 23:44:24 2004 @@ -127,7 +127,7 @@ /* * Get hwgraph vertex for the device */ - device_sysdata = (struct sn_device_sysdata *) hwdev->sysdata; + device_sysdata = SN_DEVICE_SYSDATA(hwdev); vhdl = device_sysdata->vhdl; /* @@ -240,7 +240,7 @@ /* * Get the hwgraph vertex for the device */ - device_sysdata = (struct sn_device_sysdata *) hwdev->sysdata; + device_sysdata = SN_DEVICE_SYSDATA(hwdev); vhdl = device_sysdata->vhdl; /* @@ -367,7 +367,7 @@ /* * find vertex for the device */ - device_sysdata = (struct sn_device_sysdata *)hwdev->sysdata; + device_sysdata = SN_DEVICE_SYSDATA(hwdev); vhdl = device_sysdata->vhdl; /* diff -Nru a/arch/ia64/sn/io/sn2/bte_error.c b/arch/ia64/sn/io/sn2/bte_error.c --- a/arch/ia64/sn/io/sn2/bte_error.c Thu Feb 19 23:44:26 2004 +++ b/arch/ia64/sn/io/sn2/bte_error.c Thu Feb 19 23:44:26 2004 @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/geo_op.c b/arch/ia64/sn/io/sn2/geo_op.c --- a/arch/ia64/sn/io/sn2/geo_op.c Thu Feb 19 23:44:26 2004 +++ b/arch/ia64/sn/io/sn2/geo_op.c Thu Feb 19 23:44:26 2004 @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/klconflib.c b/arch/ia64/sn/io/sn2/klconflib.c --- a/arch/ia64/sn/io/sn2/klconflib.c Thu Feb 19 23:44:22 2004 +++ b/arch/ia64/sn/io/sn2/klconflib.c Thu Feb 19 23:44:22 2004 @@ -474,8 +474,6 @@ return(0); } -#include "asm/sn/sn_private.h" - /* * Format a module id for printing. * diff -Nru a/arch/ia64/sn/io/sn2/ml_SN_init.c b/arch/ia64/sn/io/sn2/ml_SN_init.c --- a/arch/ia64/sn/io/sn2/ml_SN_init.c Thu Feb 19 23:44:22 2004 +++ b/arch/ia64/sn/io/sn2/ml_SN_init.c Thu Feb 19 23:44:22 2004 @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include int maxcpus; @@ -69,12 +69,15 @@ } void -init_platform_hubinfo(nodepda_t **nodepdaindr) { +init_platform_hubinfo(nodepda_t **nodepdaindr) +{ cnodeid_t cnode; hubinfo_t hubinfo; nodepda_t *npda; extern int numionodes; + if (IS_RUNNING_ON_SIMULATOR()) + return; for (cnode = 0; cnode < numionodes; cnode++) { npda = nodepdaindr[cnode]; hubinfo = (hubinfo_t)npda->pdinfo; diff -Nru a/arch/ia64/sn/io/sn2/ml_SN_intr.c b/arch/ia64/sn/io/sn2/ml_SN_intr.c --- a/arch/ia64/sn/io/sn2/ml_SN_intr.c Thu Feb 19 23:44:27 2004 +++ b/arch/ia64/sn/io/sn2/ml_SN_intr.c Thu Feb 19 23:44:27 2004 @@ -30,6 +30,7 @@ #include #include #include +#include extern irqpda_t *irqpdaindr; extern cnodeid_t master_node_get(vertex_hdl_t vhdl); @@ -216,7 +217,6 @@ { cpuid_t cpu, best_cpu = CPU_NONE; int slice, min_count = 1000; - irqpda_t *irqs; for (slice = CPUS_PER_NODE - 1; slice >= 0; slice--) { int intrs; @@ -227,8 +227,7 @@ if (!cpu_online(cpu)) continue; - irqs = irqpdaindr; - intrs = irqs->num_irq_used; + intrs = pdacpu(cpu)->sn_num_irqs; if (min_count > intrs) { min_count = intrs; @@ -243,6 +242,7 @@ } } } + pdacpu(best_cpu)->sn_num_irqs++; return best_cpu; } diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c Thu Feb 19 23:44:23 2004 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_ate.c Thu Feb 19 23:44:23 2004 @@ -8,7 +8,6 @@ #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_config.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_config.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_config.c Thu Feb 19 23:44:27 2004 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_config.c Thu Feb 19 23:44:27 2004 @@ -8,7 +8,6 @@ #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c Thu Feb 19 23:44:27 2004 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c Thu Feb 19 23:44:27 2004 @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c Thu Feb 19 23:44:27 2004 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_reg.c Thu Feb 19 23:44:27 2004 @@ -8,7 +8,6 @@ #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_rrb.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_rrb.c --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_rrb.c Thu Feb 19 23:44:28 2004 +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_rrb.c Thu Feb 19 23:44:28 2004 @@ -8,7 +8,6 @@ #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/pic.c b/arch/ia64/sn/io/sn2/pic.c --- a/arch/ia64/sn/io/sn2/pic.c Thu Feb 19 23:44:26 2004 +++ b/arch/ia64/sn/io/sn2/pic.c Thu Feb 19 23:44:26 2004 @@ -90,10 +90,15 @@ peer_widget_info->w_efunc = 0; peer_widget_info->w_einfo = 0; peer_widget_info->w_name = kmalloc(strlen(peer_path) + 1, GFP_KERNEL); + if (!peer_widget_info->w_name) { + kfree(peer_widget_info); + return -ENOMEM; + } strcpy(peer_widget_info->w_name, peer_path); if (hwgraph_info_add_LBL(peer_conn_v, INFO_LBL_XWIDGET, (arbitrary_info_t)peer_widget_info) != GRAPH_SUCCESS) { + kfree(peer_widget_info->w_name); kfree(peer_widget_info); return 0; } @@ -359,6 +364,9 @@ s = dev_to_name(pcibr_vhdl, devnm, MAXDEVNAME); pcibr_soft->bs_name = kmalloc(strlen(s) + 1, GFP_KERNEL); + if (!pcibr_soft->bs_name) + return -ENOMEM; + strcpy(pcibr_soft->bs_name, s); pcibr_soft->bs_conn = xconn_vhdl; diff -Nru a/arch/ia64/sn/io/sn2/shub.c b/arch/ia64/sn/io/sn2/shub.c --- a/arch/ia64/sn/io/sn2/shub.c Thu Feb 19 23:44:25 2004 +++ b/arch/ia64/sn/io/sn2/shub.c Thu Feb 19 23:44:25 2004 @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/shub_intr.c b/arch/ia64/sn/io/sn2/shub_intr.c --- a/arch/ia64/sn/io/sn2/shub_intr.c Thu Feb 19 23:44:25 2004 +++ b/arch/ia64/sn/io/sn2/shub_intr.c Thu Feb 19 23:44:25 2004 @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/sn2/shuberror.c b/arch/ia64/sn/io/sn2/shuberror.c --- a/arch/ia64/sn/io/sn2/shuberror.c Thu Feb 19 23:44:28 2004 +++ b/arch/ia64/sn/io/sn2/shuberror.c Thu Feb 19 23:44:28 2004 @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/io/xswitch.c b/arch/ia64/sn/io/xswitch.c --- a/arch/ia64/sn/io/xswitch.c Thu Feb 19 23:44:23 2004 +++ b/arch/ia64/sn/io/xswitch.c Thu Feb 19 23:44:23 2004 @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff -Nru a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c --- a/arch/ia64/sn/kernel/irq.c Thu Feb 19 23:44:23 2004 +++ b/arch/ia64/sn/kernel/irq.c Thu Feb 19 23:44:23 2004 @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -121,7 +120,7 @@ static void sn_set_affinity_irq(unsigned int irq, unsigned long cpu) { -#if CONFIG_SMP +#ifdef CONFIG_SMP int redir = 0; struct sn_intr_list_t *p = sn_intr_list[irq]; pcibr_intr_t intr; diff -Nru a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c --- a/arch/ia64/sn/kernel/setup.c Thu Feb 19 23:44:24 2004 +++ b/arch/ia64/sn/kernel/setup.c Thu Feb 19 23:44:24 2004 @@ -85,6 +85,7 @@ u64 master_node_bedrock_address; static void sn_init_pdas(char **); +static void scan_for_ionodes(void); static nodepda_t *nodepdaindr[MAX_COMPACT_NODES]; @@ -131,7 +132,7 @@ * may not be initialized yet. */ -static int +static int __init pxm_to_nasid(int pxm) { int i; @@ -358,11 +359,10 @@ * * One time setup for Node Data Area. Called by sn_setup(). */ -void +void __init sn_init_pdas(char **cmdline_p) { cnodeid_t cnode; - void scan_for_ionodes(void); /* * Make sure that the PDA fits entirely in the same page as the @@ -498,7 +498,7 @@ * physical_node_map and the pda and increment numionodes. */ -void +static void __init scan_for_ionodes(void) { int nasid = 0; diff -Nru a/arch/m68k/Kconfig b/arch/m68k/Kconfig --- a/arch/m68k/Kconfig Thu Feb 19 23:44:26 2004 +++ b/arch/m68k/Kconfig Thu Feb 19 23:44:26 2004 @@ -1030,8 +1030,7 @@ precision in some cases. To compile this driver as a module, choose M here: the - module will be called genrtc. To load the module automatically - add 'alias char-major-10-135 genrtc' to your /etc/modules.conf + module will be called genrtc. config GEN_RTC_X bool "Extended RTC operation" diff -Nru a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c --- a/arch/m68k/kernel/time.c Thu Feb 19 23:44:23 2004 +++ b/arch/m68k/kernel/time.c Thu Feb 19 23:44:23 2004 @@ -174,6 +174,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c --- a/arch/m68knommu/kernel/time.c Thu Feb 19 23:44:26 2004 +++ b/arch/m68knommu/kernel/time.c Thu Feb 19 23:44:26 2004 @@ -199,6 +199,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/m68knommu/platform/5407/MOTOROLA/crt0_ram.S b/arch/m68knommu/platform/5407/MOTOROLA/crt0_ram.S --- a/arch/m68knommu/platform/5407/MOTOROLA/crt0_ram.S Thu Feb 19 23:44:27 2004 +++ b/arch/m68knommu/platform/5407/MOTOROLA/crt0_ram.S Thu Feb 19 23:44:27 2004 @@ -99,10 +99,12 @@ movec %d0, %ACR3 /* Enable cache */ - move.l #0xa4098400, %d0 /* Write buffer, dflt precise */ + move.l #0xb6088400, %d0 /* Enable caches */ movec %d0,%CACR nop + +#ifdef CONFIG_ROMFS_FS /* * Move ROM filesystem above bss :-) */ @@ -123,6 +125,12 @@ move.l %d0, -(%a1) cmp.l %a0, %a2 /* Check if at end */ bne _copy_romfs + +#else /* CONFIG_ROMFS_FS */ + lea.l _ebss, %a1 + move.l %a1, _ramstart +#endif /* CONFIG_ROMFS_FS */ + /* * Zero out the bss region. diff -Nru a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c --- a/arch/mips/kernel/irq.c Thu Feb 19 23:44:23 2004 +++ b/arch/mips/kernel/irq.c Thu Feb 19 23:44:23 2004 @@ -835,7 +835,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -873,7 +873,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c --- a/arch/mips/kernel/sysirix.c Thu Feb 19 23:44:28 2004 +++ b/arch/mips/kernel/sysirix.c Thu Feb 19 23:44:28 2004 @@ -368,7 +368,7 @@ retval = HZ; goto out; case 4: - retval = NGROUPS; + retval = NGROUPS_MAX; goto out; case 5: retval = NR_OPEN; diff -Nru a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c --- a/arch/mips/kernel/time.c Thu Feb 19 23:44:24 2004 +++ b/arch/mips/kernel/time.c Thu Feb 19 23:44:24 2004 @@ -132,7 +132,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); - + clock_was_set(); return 0; } diff -Nru a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c --- a/arch/parisc/kernel/time.c Thu Feb 19 23:44:24 2004 +++ b/arch/parisc/kernel/time.c Thu Feb 19 23:44:24 2004 @@ -230,6 +230,7 @@ time_esterror = NTP_PHASE_LIMIT; } write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } EXPORT_SYMBOL(do_settimeofday); diff -Nru a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c --- a/arch/ppc/8260_io/enet.c Thu Feb 19 23:44:22 2004 +++ b/arch/ppc/8260_io/enet.c Thu Feb 19 23:44:22 2004 @@ -851,7 +851,7 @@ err = register_netdev(dev); if (err) { - kfree(dev); + free_netdev(dev); return err; } diff -Nru a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c --- a/arch/ppc/8260_io/fcc_enet.c Thu Feb 19 23:44:25 2004 +++ b/arch/ppc/8260_io/fcc_enet.c Thu Feb 19 23:44:25 2004 @@ -1371,7 +1371,7 @@ err = register_netdev(dev); if (err) { - kfree(dev); + free_netdev(dev); return err; } diff -Nru a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c --- a/arch/ppc/8xx_io/enet.c Thu Feb 19 23:44:24 2004 +++ b/arch/ppc/8xx_io/enet.c Thu Feb 19 23:44:24 2004 @@ -949,7 +949,7 @@ err = register_netdev(dev); if (err) { - kfree(dev); + free_netdev(dev); return err; } diff -Nru a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c --- a/arch/ppc/8xx_io/fec.c Thu Feb 19 23:44:28 2004 +++ b/arch/ppc/8xx_io/fec.c Thu Feb 19 23:44:28 2004 @@ -1748,7 +1748,7 @@ err = register_netdev(dev); if (err) { - kfree(dev); + free_netdev(dev); return err; } diff -Nru a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c --- a/arch/ppc/kernel/irq.c Thu Feb 19 23:44:27 2004 +++ b/arch/ppc/kernel/irq.c Thu Feb 19 23:44:27 2004 @@ -575,7 +575,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -616,7 +616,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c --- a/arch/ppc/kernel/setup.c Thu Feb 19 23:44:28 2004 +++ b/arch/ppc/kernel/setup.c Thu Feb 19 23:44:28 2004 @@ -53,7 +53,7 @@ extern void power4_idle(void); extern boot_infos_t *boot_infos; -char saved_command_line[256]; +char saved_command_line[COMMAND_LINE_SIZE]; unsigned char aux_device_present; struct ide_machdep_calls ppc_ide_md; char *sysmap; @@ -501,7 +501,7 @@ ulong *data = rec->data; switch (rec->tag) { case BI_CMD_LINE: - memcpy(cmd_line, (void *)data, rec->size); + strlcpy(cmd_line, (void *)data, sizeof(cmd_line)); break; case BI_SYSMAP: sysmap = (char *)((data[0] >= (KERNELBASE)) ? data[0] : @@ -538,7 +538,7 @@ unsigned long r6, unsigned long r7) { #ifdef CONFIG_CMDLINE - strcpy(cmd_line, CONFIG_CMDLINE); + strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line)); #endif /* CONFIG_CMDLINE */ #ifdef CONFIG_6xx @@ -676,7 +676,7 @@ init_mm.brk = (unsigned long) klimit; /* Save unparsed command line copy for /proc/cmdline */ - strcpy(saved_command_line, cmd_line); + strlcpy(saved_command_line, cmd_line, sizeof(saved_command_line)); *cmdline_p = cmd_line; /* set up the bootmem stuff with available memory */ diff -Nru a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c --- a/arch/ppc/kernel/time.c Thu Feb 19 23:44:27 2004 +++ b/arch/ppc/kernel/time.c Thu Feb 19 23:44:27 2004 @@ -294,6 +294,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irqrestore(&xtime_lock, flags); + clock_was_set(); return 0; } diff -Nru a/arch/ppc64/kernel/iSeries_irq.c b/arch/ppc64/kernel/iSeries_irq.c --- a/arch/ppc64/kernel/iSeries_irq.c Thu Feb 19 23:44:27 2004 +++ b/arch/ppc64/kernel/iSeries_irq.c Thu Feb 19 23:44:27 2004 @@ -57,6 +57,7 @@ void iSeries_init_irq_desc(irq_desc_t *desc) { + desc->handler = &iSeries_IRQ_handler; } /* This is called by init_IRQ. set in ppc_md.init_IRQ by iSeries_setup.c */ @@ -87,22 +88,6 @@ #define IRQ_TO_IDSEL(irq) (((((irq) - 1) >> 3) & 7) + 1) #define IRQ_TO_FUNC(irq) (((irq) - 1) & 7) -/* - * This is called out of iSeries_scan_slot to assign the EADS slot - * to its IRQ number - */ -int __init iSeries_assign_IRQ(int irq, HvBusNumber busNumber, - HvSubBusNumber subBusNumber, HvAgentId deviceId) -{ - irq_desc_t *desc = get_real_irq_desc(irq); - - if (desc == NULL) - return -1; - desc->handler = &iSeries_IRQ_handler; - return 0; -} - - /* This is called by iSeries_activate_IRQs */ static unsigned int iSeries_startup_IRQ(unsigned int irq) { @@ -123,6 +108,11 @@ bus, subBus, deviceId, irq); return 0; } + +/* + * Temporary hack + */ +#define get_irq_desc(irq) &irq_desc[(irq)] /* * This is called out of iSeries_fixup to activate interrupt diff -Nru a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c --- a/arch/ppc64/kernel/iSeries_pci.c Thu Feb 19 23:44:28 2004 +++ b/arch/ppc64/kernel/iSeries_pci.c Thu Feb 19 23:44:28 2004 @@ -406,7 +406,6 @@ /* iSeries_allocate_IRQ.: 0x18.00.12(0xA3) */ Irq = iSeries_allocate_IRQ(Bus, 0, EADsIdSel); - iSeries_assign_IRQ(Irq, Bus, 0, EADsIdSel); PPCDBG(PPCDBG_BUSWALK, "PCI:- allocate and assign IRQ 0x%02X.%02X.%02X = 0x%02X\n", Bus, 0, EADsIdSel, Irq); diff -Nru a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c --- a/arch/ppc64/kernel/iSeries_setup.c Thu Feb 19 23:44:27 2004 +++ b/arch/ppc64/kernel/iSeries_setup.c Thu Feb 19 23:44:27 2004 @@ -315,7 +315,6 @@ ppc_md.setup_residual = iSeries_setup_residual; ppc_md.get_cpuinfo = iSeries_get_cpuinfo; ppc_md.init_IRQ = iSeries_init_IRQ; - ppc_md.init_irq_desc = iSeries_init_irq_desc; ppc_md.get_irq = iSeries_get_irq; ppc_md.init = NULL; diff -Nru a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c --- a/arch/ppc64/kernel/irq.c Thu Feb 19 23:44:24 2004 +++ b/arch/ppc64/kernel/irq.c Thu Feb 19 23:44:24 2004 @@ -664,7 +664,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -702,7 +702,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c --- a/arch/ppc64/kernel/lparcfg.c Thu Feb 19 23:44:23 2004 +++ b/arch/ppc64/kernel/lparcfg.c Thu Feb 19 23:44:23 2004 @@ -134,7 +134,7 @@ memset(buf, 0, size); shared = (int)(lpaca->xLpPacaPtr->xSharedProc); - n += snprintf(buf, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf, LPARCFG_BUFF_SIZE - n, "serial_number=%c%c%c%c%c%c%c\n", e2a(xItExtVpdPanel.mfgID[2]), e2a(xItExtVpdPanel.mfgID[3]), @@ -144,7 +144,7 @@ e2a(xItExtVpdPanel.systemSerial[4]), e2a(xItExtVpdPanel.systemSerial[5])); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_type=%c%c%c%c\n", e2a(xItExtVpdPanel.machineType[0]), e2a(xItExtVpdPanel.machineType[1]), @@ -152,23 +152,23 @@ e2a(xItExtVpdPanel.machineType[3])); lp_index = HvLpConfig_getLpIndex(); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_id=%d\n", (int)lp_index); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_active_processors=%d\n", (int)HvLpConfig_getSystemPhysicalProcessors()); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_potential_processors=%d\n", (int)HvLpConfig_getSystemPhysicalProcessors()); processors = (int)HvLpConfig_getPhysicalProcessors(); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_active_processors=%d\n", processors); max_processors = (int)HvLpConfig_getMaxPhysicalProcessors(); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_potential_processors=%d\n", max_processors); if(shared) { @@ -178,22 +178,22 @@ entitled_capacity = processors * 100; max_entitled_capacity = max_processors * 100; } - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_entitled_capacity=%d\n", entitled_capacity); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_max_entitled_capacity=%d\n", max_entitled_capacity); if(shared) { pool_id = HvLpConfig_getSharedPoolIndex(); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, "pool=%d\n", + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "pool=%d\n", (int)pool_id); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "pool_capacity=%d\n", (int)(HvLpConfig_getNumProcsInSharedPool(pool_id)*100)); } - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "shared_processor_mode=%d\n", shared); return 0; @@ -297,13 +297,13 @@ if(lp_index_ptr) lp_index = *lp_index_ptr; } - n = snprintf(buf, LPARCFG_BUFF_SIZE - n, + n = scnprintf(buf, LPARCFG_BUFF_SIZE - n, "serial_number=%s\n", system_id); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_type=%s\n", model); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_id=%d\n", (int)lp_index); rtas_node = find_path_device("/rtas"); @@ -317,74 +317,74 @@ if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { h_get_ppp(&h_entitled,&h_unallocated,&h_aggregation,&h_resource); #ifdef DEBUG - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "R4=0x%lx\n", h_entitled); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "R5=0x%lx\n", h_unallocated); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "R6=0x%lx\n", h_aggregation); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "R7=0x%lx\n", h_resource); #endif /* DEBUG */ } if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { system_potential_processors = get_splpar_potential_characteristics(); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_active_processors=%ld\n", (h_resource >> 2*8) & 0xffff); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_potential_processors=%d\n", system_potential_processors); } else { system_potential_processors = system_active_processors; - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_active_processors=%d\n", system_active_processors); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "system_potential_processors=%d\n", system_potential_processors); } processors = systemcfg->processorCount; - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_active_processors=%d\n", processors); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_potential_processors=%d\n", system_active_processors); /* max_entitled_capacity will come out of get_splpar_potential_characteristics() when that function is complete */ max_entitled_capacity = system_active_processors * 100; if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_entitled_capacity=%ld\n", h_entitled); } else { - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_entitled_capacity=%d\n", system_active_processors*100); } - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "partition_max_entitled_capacity=%d\n", max_entitled_capacity); shared = 0; - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "shared_processor_mode=%d\n", shared); if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "pool=%ld\n", (h_aggregation >> 0*8)&0xffff); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "pool_capacity=%ld\n", (h_resource >> 3*8) &0xffff); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "group=%ld\n", (h_aggregation >> 2*8)&0xffff); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "capped=%ld\n", (h_resource >> 6*8)&0x40); - n += snprintf(buf+n, LPARCFG_BUFF_SIZE - n, + n += scnprintf(buf+n, LPARCFG_BUFF_SIZE - n, "capacity_weight=%d\n", (int)(h_resource>>5*8)&0xFF); } return 0; diff -Nru a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c --- a/arch/ppc64/kernel/prom.c Thu Feb 19 23:44:27 2004 +++ b/arch/ppc64/kernel/prom.c Thu Feb 19 23:44:27 2004 @@ -186,12 +186,13 @@ extern char cmd_line[512]; /* XXX */ unsigned long dev_tree_size; +unsigned long _get_PIR(void); #ifdef CONFIG_HMT struct { unsigned int pir; unsigned int threadid; -} hmt_thread_data[NR_CPUS] = {0}; +} hmt_thread_data[NR_CPUS]; #endif /* CONFIG_HMT */ char testString[] = "LINUX\n"; diff -Nru a/arch/ppc64/kernel/rtas-proc.c b/arch/ppc64/kernel/rtas-proc.c --- a/arch/ppc64/kernel/rtas-proc.c Thu Feb 19 23:44:25 2004 +++ b/arch/ppc64/kernel/rtas-proc.c Thu Feb 19 23:44:25 2004 @@ -287,9 +287,9 @@ char stkbuf[40]; /* its small, its on stack */ int n, sn; if (power_on_time == 0) - n = snprintf(stkbuf, 40, "Power on time not set\n"); + n = scnprintf(stkbuf,sizeof(stkbuf),"Power on time not set\n"); else - n = snprintf(stkbuf, 40, "%lu\n", power_on_time); + n = scnprintf(stkbuf,sizeof(stkbuf),"%lu\n",power_on_time); sn = strlen (stkbuf) +1; if (*ppos >= sn) @@ -410,9 +410,10 @@ if (error != 0){ printk(KERN_WARNING "error: reading the clock returned: %s\n", ppc_rtas_process_error(error)); - n = snprintf (stkbuf, 40, "0"); + n = scnprintf (stkbuf, sizeof(stkbuf), "0"); } else { - n = snprintf (stkbuf, 40, "%lu\n", mktime(year, mon, day, hour, min, sec)); + n = scnprintf (stkbuf, sizeof(stkbuf), "%lu\n", + mktime(year, mon, day, hour, min, sec)); } kfree(ret); @@ -819,7 +820,7 @@ n += check_location_string(ret, buffer + n); n += sprintf ( buffer+n, " "); /* see how many characters we have printed */ - snprintf ( t, 50, "%s ", ret); + scnprintf(t, sizeof(t), "%s ", ret); pos += strlen(t); if (pos >= llen) pos=0; @@ -863,7 +864,7 @@ int n, sn; char stkbuf[40]; /* its small, its on stack */ - n = snprintf(stkbuf, 40, "%lu\n", rtas_tone_frequency); + n = scnprintf(stkbuf, 40, "%lu\n", rtas_tone_frequency); sn = strlen (stkbuf) +1; if (*ppos >= sn) @@ -917,7 +918,7 @@ int n, sn; char stkbuf[40]; /* its small, its on stack */ - n = snprintf(stkbuf, 40, "%lu\n", rtas_tone_volume); + n = scnprintf(stkbuf, 40, "%lu\n", rtas_tone_volume); sn = strlen (stkbuf) +1; if (*ppos >= sn) diff -Nru a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c --- a/arch/ppc64/kernel/setup.c Thu Feb 19 23:44:25 2004 +++ b/arch/ppc64/kernel/setup.c Thu Feb 19 23:44:25 2004 @@ -80,7 +80,7 @@ int powersave_nap; -char saved_command_line[256]; +char saved_command_line[COMMAND_LINE_SIZE]; unsigned char aux_device_present; void parse_cmd_line(unsigned long r3, unsigned long r4, unsigned long r5, @@ -536,7 +536,7 @@ for ( ; rec->tag != BI_LAST ; rec = bi_rec_next(rec) ) { switch (rec->tag) { case BI_CMD_LINE: - memcpy(cmd_line, (void *)rec->data, rec->size); + strlcpy(cmd_line, (void *)rec->data, sizeof(cmd_line)); break; case BI_SYSMAP: sysmap = __va(rec->data[0]); @@ -620,7 +620,7 @@ init_mm.brk = klimit; /* Save unparsed command line copy for /proc/cmdline */ - strcpy(saved_command_line, cmd_line); + strlcpy(saved_command_line, cmd_line, sizeof(saved_command_line)); *cmdline_p = cmd_line; /* set up the bootmem stuff with available memory */ diff -Nru a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c --- a/arch/ppc64/kernel/time.c Thu Feb 19 23:44:28 2004 +++ b/arch/ppc64/kernel/time.c Thu Feb 19 23:44:28 2004 @@ -418,6 +418,7 @@ } write_sequnlock_irqrestore(&xtime_lock, flags); + clock_was_set(); return 0; } diff -Nru a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c --- a/arch/s390/kernel/compat_linux.c Thu Feb 19 23:44:27 2004 +++ b/arch/s390/kernel/compat_linux.c Thu Feb 19 23:44:27 2004 @@ -190,40 +190,81 @@ return sys_setfsgid((gid_t)gid); } +static int groups16_to_user(u16 *grouplist, struct group_info *group_info) +{ + int i; + u16 group; + + for (i = 0; i < group_info->ngroups; i++) { + group = (u16)GROUP_AT(group_info, i); + if (put_user(group, grouplist+i)) + return -EFAULT; + } + + return 0; +} + +static int groups16_from_user(struct group_info *group_info, u16 *grouplist) +{ + int i; + u16 group; + + for (i = 0; i < group_info->ngroups; i++) { + if (get_user(group, grouplist+i)) + return -EFAULT; + GROUP_AT(group_info, i) = (gid_t)group; + } + + return 0; +} + asmlinkage long sys32_getgroups16(int gidsetsize, u16 *grouplist) { - u16 groups[NGROUPS]; - int i,j; + int i; if (gidsetsize < 0) return -EINVAL; - i = current->ngroups; + + get_group_info(current->group_info); + i = current->group_info->ngroups; if (gidsetsize) { - if (i > gidsetsize) - return -EINVAL; - for(j=0;jgroups[j]; - if (copy_to_user(grouplist, groups, sizeof(u16)*i)) - return -EFAULT; + if (i > gidsetsize) { + i = -EINVAL; + goto out; + } + if (groups16_to_user(grouplist, current->group_info)) { + i = -EFAULT; + goto out; + } } +out: + put_group_info(current->group_info); return i; } asmlinkage long sys32_setgroups16(int gidsetsize, u16 *grouplist) { - u16 groups[NGROUPS]; - int i; + struct group_info *group_info; + int retval; if (!capable(CAP_SETGID)) return -EPERM; - if ((unsigned) gidsetsize > NGROUPS) + if ((unsigned)gidsetsize > NGROUPS_MAX) return -EINVAL; - if (copy_from_user(groups, grouplist, gidsetsize * sizeof(u16))) - return -EFAULT; - for (i = 0 ; i < gidsetsize ; i++) - current->groups[i] = (gid_t)groups[i]; - current->ngroups = gidsetsize; - return 0; + + group_info = groups_alloc(gidsetsize); + if (!group_info) + return -ENOMEM; + retval = groups16_from_user(group_info, grouplist); + if (retval) { + put_group_info(group_info); + return retval; + } + + retval = set_current_groups(group_info); + put_group_info(group_info); + + return retval; } asmlinkage long sys32_getuid16(void) diff -Nru a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c --- a/arch/s390/kernel/time.c Thu Feb 19 23:44:22 2004 +++ b/arch/s390/kernel/time.c Thu Feb 19 23:44:22 2004 @@ -142,6 +142,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c --- a/arch/sparc/kernel/time.c Thu Feb 19 23:44:25 2004 +++ b/arch/sparc/kernel/time.c Thu Feb 19 23:44:25 2004 @@ -535,6 +535,7 @@ write_seqlock_irq(&xtime_lock); ret = bus_do_settimeofday(tv); write_sequnlock_irq(&xtime_lock); + clock_was_set(); return ret; } diff -Nru a/arch/sparc/prom/printf.c b/arch/sparc/prom/printf.c --- a/arch/sparc/prom/printf.c Thu Feb 19 23:44:23 2004 +++ b/arch/sparc/prom/printf.c Thu Feb 19 23:44:23 2004 @@ -39,7 +39,7 @@ int i; va_start(args, fmt); - i = vsnprintf(ppbuf, sizeof(ppbuf), fmt, args); + i = vscnprintf(ppbuf, sizeof(ppbuf), fmt, args); va_end(args); prom_write(ppbuf, i); diff -Nru a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c --- a/arch/sparc64/kernel/irq.c Thu Feb 19 23:44:28 2004 +++ b/arch/sparc64/kernel/irq.c Thu Feb 19 23:44:28 2004 @@ -1211,7 +1211,7 @@ if (cpus_empty(mask)) mask = cpu_online_map; - len = cpumask_snprintf(page, count, mask); + len = cpumask_scnprintf(page, count, mask); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c --- a/arch/sparc64/kernel/sys_sparc32.c Thu Feb 19 23:44:26 2004 +++ b/arch/sparc64/kernel/sys_sparc32.c Thu Feb 19 23:44:26 2004 @@ -179,40 +179,81 @@ return sys_setfsgid((gid_t)gid); } +static int groups16_to_user(u16 *grouplist, struct group_info *group_info) +{ + int i; + u16 group; + + for (i = 0; i < group_info->ngroups; i++) { + group = (u16)GROUP_AT(group_info, i); + if (put_user(group, grouplist+i)) + return -EFAULT; + } + + return 0; +} + +static int groups16_from_user(struct group_info *group_info, u16 *grouplist) +{ + int i; + u16 group; + + for (i = 0; i < group_info->ngroups; i++) { + if (get_user(group, grouplist+i)) + return -EFAULT; + GROUP_AT(group_info, i) = (gid_t)group; + } + + return 0; +} + asmlinkage long sys32_getgroups16(int gidsetsize, u16 *grouplist) { - u16 groups[NGROUPS]; - int i,j; + int i; if (gidsetsize < 0) return -EINVAL; - i = current->ngroups; + + get_group_info(current->group_info); + i = current->group_info->ngroups; if (gidsetsize) { - if (i > gidsetsize) - return -EINVAL; - for(j=0;jgroups[j]; - if (copy_to_user(grouplist, groups, sizeof(u16)*i)) - return -EFAULT; + if (i > gidsetsize) { + i = -EINVAL; + goto out; + } + if (groups16_to_user(grouplist, current->group_info)) { + i = -EFAULT; + goto out; + } } +out: + put_group_info(current->group_info); return i; } asmlinkage long sys32_setgroups16(int gidsetsize, u16 *grouplist) { - u16 groups[NGROUPS]; - int i; + struct group_info *group_info; + int retval; if (!capable(CAP_SETGID)) return -EPERM; - if ((unsigned) gidsetsize > NGROUPS) + if ((unsigned)gidsetsize > NGROUPS_MAX) return -EINVAL; - if (copy_from_user(groups, grouplist, gidsetsize * sizeof(u16))) - return -EFAULT; - for (i = 0 ; i < gidsetsize ; i++) - current->groups[i] = (gid_t)groups[i]; - current->ngroups = gidsetsize; - return 0; + + group_info = groups_alloc(gidsetsize); + if (!group_info) + return -ENOMEM; + retval = groups16_from_user(group_info, grouplist); + if (retval) { + put_group_info(group_info); + return retval; + } + + retval = set_current_groups(group_info); + put_group_info(group_info); + + return retval; } asmlinkage long sys32_getuid16(void) diff -Nru a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c --- a/arch/sparc64/kernel/time.c Thu Feb 19 23:44:25 2004 +++ b/arch/sparc64/kernel/time.c Thu Feb 19 23:44:25 2004 @@ -1126,6 +1126,7 @@ time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq(&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/sparc64/prom/printf.c b/arch/sparc64/prom/printf.c --- a/arch/sparc64/prom/printf.c Thu Feb 19 23:44:25 2004 +++ b/arch/sparc64/prom/printf.c Thu Feb 19 23:44:25 2004 @@ -40,7 +40,7 @@ int i; va_start(args, fmt); - i = vsnprintf(ppbuf, sizeof(ppbuf), fmt, args); + i = vscnprintf(ppbuf, sizeof(ppbuf), fmt, args); va_end(args); prom_write(ppbuf, i); diff -Nru a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c --- a/arch/um/drivers/net_kern.c Thu Feb 19 23:44:25 2004 +++ b/arch/um/drivers/net_kern.c Thu Feb 19 23:44:25 2004 @@ -358,8 +358,12 @@ rtnl_lock(); err = register_netdevice(dev); rtnl_unlock(); - if (err) + if (err) { + device->dev = NULL; + /* XXX: should we call ->remove() here? */ + free_netdev(dev); return 1; + } lp = dev->priv; INIT_LIST_HEAD(&lp->list); diff -Nru a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c --- a/arch/um/kernel/irq.c Thu Feb 19 23:44:27 2004 +++ b/arch/um/kernel/irq.c Thu Feb 19 23:44:27 2004 @@ -575,7 +575,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -613,7 +613,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/um/kernel/time.c b/arch/um/kernel/time.c --- a/arch/um/kernel/time.c Thu Feb 19 23:44:23 2004 +++ b/arch/um/kernel/time.c Thu Feb 19 23:44:23 2004 @@ -93,6 +93,7 @@ gettimeofday(tv, NULL); timeradd(tv, &local_offset, tv); time_unlock(flags); + clock_was_set(); } EXPORT_SYMBOL(do_gettimeofday); diff -Nru a/arch/v850/kernel/ptrace.c b/arch/v850/kernel/ptrace.c --- a/arch/v850/kernel/ptrace.c Thu Feb 19 23:44:25 2004 +++ b/arch/v850/kernel/ptrace.c Thu Feb 19 23:44:25 2004 @@ -141,7 +141,7 @@ rval = -EPERM; if (pid == 1) /* you may not mess with init */ - goto out; + goto out_tsk; if (request == PTRACE_ATTACH) { rval = ptrace_attach(child); diff -Nru a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c --- a/arch/v850/kernel/time.c Thu Feb 19 23:44:26 2004 +++ b/arch/v850/kernel/time.c Thu Feb 19 23:44:26 2004 @@ -193,6 +193,7 @@ time_esterror = NTP_PHASE_LIMIT; write_sequnlock_irq (&xtime_lock); + clock_was_set(); return 0; } diff -Nru a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig --- a/arch/x86_64/Kconfig Thu Feb 19 23:44:27 2004 +++ b/arch/x86_64/Kconfig Thu Feb 19 23:44:27 2004 @@ -48,12 +48,14 @@ bool default y help - Write kernel log output directly into the VGA buffer. This is useful - for kernel debugging when your machine crashes very early before - the console code is initialized. For normal operation it is not - recommended because it looks ugly and doesn't cooperate with - klogd/syslogd or the X server. You should normally N here, unless - you want to debug such a crash. + Write kernel log output directly into the VGA buffer or to a serial + port. + + This is useful for kernel debugging when your machine crashes very + early before the console code is initialized. For normal operation + it is not recommended because it looks ugly and doesn't cooperate + with klogd/syslogd or the X server. You should normally N here, + unless you want to debug such a crash. config HPET_TIMER bool @@ -89,6 +91,9 @@ help Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs. +config MPSC + bool "Prescott/Nocona" + config GENERIC_CPU bool "Generic-x86-64" help @@ -101,11 +106,13 @@ # config X86_L1_CACHE_BYTES int - default "64" + default "128" if GENERIC_CPU || MPSC + default "64" if MK8 config X86_L1_CACHE_SHIFT int - default "6" + default "7" if GENERIC_CPU || MPSC + default "6" if MK8 config X86_TSC bool @@ -115,6 +122,23 @@ bool default y +config MICROCODE + tristate "/dev/cpu/microcode - Intel CPU microcode support" + ---help--- + If you say Y here the 'File systems' section, you will be + able to update the microcode on Intel processors. You will + obviously need the actual microcode binary data itself which is + not shipped with the Linux kernel. + + For latest news and information on obtaining all the required + ingredients for this driver, check: + . + + To compile this driver as a module, choose M here: the + module will be called microcode. + If you use modprobe or kmod you may also want to add the line + 'alias char-major-10-184 microcode' to your /etc/modules.conf file. + config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" help @@ -132,6 +156,11 @@ with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to /dev/cpu/31/cpuid. +config X86_HT + bool + depends on SMP + default y + config MATH_EMULATION bool @@ -256,9 +285,13 @@ Normally the kernel will take the right choice by itself. If unsure say Y +config SWIOTLB + select GART_IOMMU + bool "Software IOTLB support" + config DUMMY_IOMMU bool - depends on !GART_IOMMU + depends on !GART_IOMMU && !SWIOTLB default y help Don't use IOMMU code. This will cause problems when you have more than 4GB diff -Nru a/arch/x86_64/Makefile b/arch/x86_64/Makefile --- a/arch/x86_64/Makefile Thu Feb 19 23:44:27 2004 +++ b/arch/x86_64/Makefile Thu Feb 19 23:44:27 2004 @@ -39,6 +39,10 @@ check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then echo "$(1)"; else echo "$(2)"; fi) +cflags-$(CONFIG_MK8) += $(call check_gcc,-march=k8,) +cflags-$(CONFIG_MPSC) += $(call check_gcc,-march=pentium4,) +CFLAGS += $(cflags-y) + CFLAGS += -mno-red-zone CFLAGS += -mcmodel=kernel CFLAGS += -pipe @@ -52,7 +56,10 @@ ifneq ($(CONFIG_DEBUG_INFO),y) CFLAGS += -fno-asynchronous-unwind-tables endif -#CFLAGS += $(call check_gcc,-funit-at-a-time,) + +# Enable unit-at-a-time mode when possible. It shrinks the +# kernel considerably. +CFLAGS += $(call check_gcc,-funit-at-a-time,) head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o diff -Nru a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S --- a/arch/x86_64/boot/setup.S Thu Feb 19 23:44:28 2004 +++ b/arch/x86_64/boot/setup.S Thu Feb 19 23:44:28 2004 @@ -292,8 +292,9 @@ /* minimum CPUID flags for x86-64 */ /* see http://www.x86-64.org/lists/discuss/msg02971.html */ #define SSE_MASK ((1<<25)|(1<<26)) -#define REQUIRED_MASK1 ((1<<0)|(1<<3)|(1<<4)|(1<<5)|(1<<6)|(1<<8)|(1<<11)| \ - (1<<13)|(1<<15)|(1<<24)|(1<<29)) +#define REQUIRED_MASK1 ((1<<0)|(1<<3)|(1<<4)|(1<<5)|(1<<6)|(1<<8)|\ + (1<<13)|(1<<15)|(1<<24)) +#define REQUIRED_MASK2 (1<<29) pushfl /* standard way to check for cpuid */ popl %eax @@ -305,10 +306,10 @@ popl %eax cmpl %eax,%ebx jz no_longmode /* cpu has no cpuid */ - movl $0x80000000,%eax + movl $0x0,%eax cpuid - cmpl $0x80000001,%eax - jb no_longmode /* no extended cpuid */ + cmpl $0x1,%eax + jb no_longmode /* no cpuid 1 */ xor %di,%di cmpl $0x68747541,%ebx /* AuthenticAMD */ jnz noamd @@ -318,11 +319,20 @@ jnz noamd mov $1,%di /* cpu is from AMD */ noamd: - movl $0x80000001,%eax + movl $0x1,%eax cpuid andl $REQUIRED_MASK1,%edx xorl $REQUIRED_MASK1,%edx jnz no_longmode + movl $0x80000000,%eax + cpuid + cmpl $0x80000001,%eax + jb no_longmode /* no extended cpuid */ + movl $0x80000001,%eax + cpuid + andl $REQUIRED_MASK2,%edx + xorl $REQUIRED_MASK2,%edx + jnz no_longmode sse_test: movl $1,%eax cpuid diff -Nru a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile --- a/arch/x86_64/kernel/Makefile Thu Feb 19 23:44:27 2004 +++ b/arch/x86_64/kernel/Makefile Thu Feb 19 23:44:27 2004 @@ -12,6 +12,7 @@ obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/ obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_MSR) += msr.o +obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o @@ -22,6 +23,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o obj-$(CONFIG_DUMMY_IOMMU) += pci-nommu.o pci-dma.o +obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_MODULES) += module.o @@ -30,4 +32,5 @@ bootflag-y += ../../i386/kernel/bootflag.o cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o topology-y += ../../i386/mach-default/topology.o - +swiotlb-$(CONFIG_SWIOTLB) += ../../ia64/lib/swiotlb.o +microcode-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/microcode.o diff -Nru a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c --- a/arch/x86_64/kernel/aperture.c Thu Feb 19 23:44:27 2004 +++ b/arch/x86_64/kernel/aperture.c Thu Feb 19 23:44:27 2004 @@ -24,6 +24,8 @@ #include #include +int iommu_aperture; + int fallback_aper_order __initdata = 1; /* 64MB */ int fallback_aper_force __initdata = 0; @@ -205,6 +207,8 @@ char name[30]; if (read_pci_config(0, num, 3, 0x00) != NB_ID_3) continue; + + iommu_aperture = 1;; aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; aper_size = (32 * 1024 * 1024) << aper_order; diff -Nru a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c --- a/arch/x86_64/kernel/early_printk.c Thu Feb 19 23:44:26 2004 +++ b/arch/x86_64/kernel/early_printk.c Thu Feb 19 23:44:26 2004 @@ -7,7 +7,11 @@ /* Simple VGA output */ +#ifdef __i386__ +#define VGABASE __pa(__PAGE_OFFSET + 0xb8000UL) +#else #define VGABASE 0xffffffff800b8000UL +#endif #define MAX_YPOS 25 #define MAX_XPOS 80 @@ -22,15 +26,14 @@ while ((c = *str++) != '\0' && n-- > 0) { if (current_ypos >= MAX_YPOS) { /* scroll 1 line up */ - for(k = 1, j = 0; k < MAX_YPOS; k++, j++) { - for(i = 0; i < MAX_XPOS; i++) { + for (k = 1, j = 0; k < MAX_YPOS; k++, j++) { + for (i = 0; i < MAX_XPOS; i++) { writew(readw(VGABASE + 2*(MAX_XPOS*k + i)), VGABASE + 2*(MAX_XPOS*j + i)); } } - for(i = 0; i < MAX_XPOS; i++) { + for (i = 0; i < MAX_XPOS; i++) writew(0x720, VGABASE + 2*(MAX_XPOS*j + i)); - } current_ypos = MAX_YPOS-1; } if (c == '\n') { @@ -38,7 +41,8 @@ current_ypos++; } else if (c != '\r') { writew(((0x7 << 8) | (unsigned short) c), - VGABASE + 2*(MAX_XPOS*current_ypos + current_xpos++)); + VGABASE + 2*(MAX_XPOS*current_ypos + + current_xpos++)); if (current_xpos >= MAX_XPOS) { current_xpos = 0; current_ypos++; @@ -78,7 +82,7 @@ { unsigned timeout = 0xffff; while ((inb(early_serial_base + LSR) & XMTRDY) == 0 && --timeout) - rep_nop(); + cpu_relax(); outb(ch, early_serial_base + TXR); return timeout ? 0 : -1; } @@ -93,10 +97,13 @@ } } +#define DEFAULT_BAUD 9600 + static __init void early_serial_init(char *opt) { unsigned char c; - unsigned divisor, baud = 38400; + unsigned divisor; + unsigned baud = DEFAULT_BAUD; char *s, *e; if (*opt == ',') @@ -109,25 +116,26 @@ early_serial_base = simple_strtoul(s, &e, 16); } else { static int bases[] = { 0x3f8, 0x2f8 }; - if (!strncmp(s,"ttyS",4)) - s+=4; - port = simple_strtoul(s, &e, 10); - if (port > 1 || s == e) - port = 0; - early_serial_base = bases[port]; - } + + if (!strncmp(s,"ttyS",4)) + s += 4; + port = simple_strtoul(s, &e, 10); + if (port > 1 || s == e) + port = 0; + early_serial_base = bases[port]; + } } - outb(0x3, early_serial_base + LCR); /* 8n1 */ - outb(0, early_serial_base + IER); /* no interrupt */ - outb(0, early_serial_base + FCR); /* no fifo */ - outb(0x3, early_serial_base + MCR); /* DTR + RTS */ + outb(0x3, early_serial_base + LCR); /* 8n1 */ + outb(0, early_serial_base + IER); /* no interrupt */ + outb(0, early_serial_base + FCR); /* no fifo */ + outb(0x3, early_serial_base + MCR); /* DTR + RTS */ s = strsep(&opt, ","); if (s != NULL) { baud = simple_strtoul(s, &e, 0); if (baud == 0 || s == e) - baud = 38400; + baud = DEFAULT_BAUD; } divisor = 115200 / baud; @@ -154,8 +162,9 @@ char buf[512]; int n; va_list ap; + va_start(ap,fmt); - n = vsnprintf(buf,512,fmt,ap); + n = vscnprintf(buf,512,fmt,ap); early_console->write(early_console,buf,n); va_end(ap); } @@ -170,6 +179,8 @@ if (early_console_initialized) return -1; + opt = strchr(opt, '=') + 1; + strlcpy(buf,opt,sizeof(buf)); space = strchr(buf, ' '); if (space) @@ -200,19 +211,12 @@ if (!early_console_initialized || !early_console) return; if (!keep_early) { - printk("disabling early console...\n"); + printk("disabling early console\n"); unregister_console(early_console); early_console_initialized = 0; } else { - printk("keeping early console.\n"); + printk("keeping early console\n"); } } -/* syntax: earlyprintk=vga - earlyprintk=serial[,ttySn[,baudrate]] - Append ,keep to not disable it when the real console takes over. - Only vga or serial at a time, not both. - Currently only ttyS0 and ttyS1 are supported. - Interaction with the standard serial driver is not very good. - The VGA output is eventually overwritten by the real console. */ -__setup("earlyprintk=", setup_early_printk); +__setup("earlyprintk=", setup_early_printk); diff -Nru a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S --- a/arch/x86_64/kernel/head.S Thu Feb 19 23:44:26 2004 +++ b/arch/x86_64/kernel/head.S Thu Feb 19 23:44:26 2004 @@ -16,6 +16,7 @@ #include #include #include +#include /* we are not able to switch in one step to the final KERNEL ADRESS SPACE * because we need identity-mapped pages on setup so define __START_KERNEL to @@ -322,7 +323,6 @@ .endr #endif -.align 64 /* cacheline aligned */ ENTRY(gdt_table32) .quad 0x0000000000000000 /* This one is magic */ .quad 0x0000000000000000 /* unused */ @@ -334,7 +334,7 @@ * Also sysret mandates a special GDT layout */ -.align 64 /* cacheline aligned, keep this synchronized with asm/desc.h */ +.align L1_CACHE_BYTES /* The TLS descriptors are currently at a different place compared to i386. Hopefully nobody expects them at a fixed place (Wine?) */ @@ -354,18 +354,13 @@ .quad 0 /* unused now */ .quad 0x00009a000000ffff /* __KERNEL16_CS - 16bit PM for S3 wakeup. */ /* base must be patched for real base address. */ - /* This should be a multiple of the cache line size */ gdt_end: - .globl gdt_end - - /* GDTs of other CPUs */ -#ifdef CONFIG_SMP - .rept NR_CPUS-1 - .quad 0,0,0,0,0,0,0,0,0,0,0 - .endr -#endif + /* asm/segment.h:GDT_ENTRIES must match this */ + /* This should be a multiple of the cache line size */ + /* GDTs of other CPUs: */ + .fill (L1_CACHE_BYTES * NR_CPUS) - (gdt_end - cpu_gdt_table) - .align 64 + .align L1_CACHE_BYTES ENTRY(idt_table) .rept 256 .quad 0 diff -Nru a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c --- a/arch/x86_64/kernel/head64.c Thu Feb 19 23:44:24 2004 +++ b/arch/x86_64/kernel/head64.c Thu Feb 19 23:44:24 2004 @@ -83,9 +83,9 @@ /* default console: */ if (!strstr(saved_command_line, "console=")) strcat(saved_command_line, " console=tty0"); - s = strstr(saved_command_line, "earlyprintk="); + s = strstr(saved_command_line, "earlyprintk="); if (s != NULL) - setup_early_printk(s+12); + setup_early_printk(s); #ifdef CONFIG_DISCONTIGMEM s = strstr(saved_command_line, "numa="); if (s != NULL) diff -Nru a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c --- a/arch/x86_64/kernel/irq.c Thu Feb 19 23:44:24 2004 +++ b/arch/x86_64/kernel/irq.c Thu Feb 19 23:44:24 2004 @@ -826,7 +826,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, irq_affinity[(long)data]); + int len = cpumask_scnprintf(page, count, irq_affinity[(long)data]); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); @@ -864,7 +864,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = cpumask_snprintf(page, count, *(cpumask_t *)data); + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); if (count - len < 2) return -EINVAL; len += sprintf(page + len, "\n"); diff -Nru a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c --- a/arch/x86_64/kernel/nmi.c Thu Feb 19 23:44:25 2004 +++ b/arch/x86_64/kernel/nmi.c Thu Feb 19 23:44:25 2004 @@ -39,7 +39,7 @@ * be enabled * -1: the lapic NMI watchdog is disabled, but can be enabled */ -static int nmi_active; +int nmi_active; /* oprofile uses this */ static int panic_on_timeout; unsigned int nmi_watchdog = NMI_LOCAL_APIC; @@ -380,6 +380,7 @@ nmi_callback = dummy_nmi_callback; } +EXPORT_SYMBOL(nmi_active); EXPORT_SYMBOL(nmi_watchdog); EXPORT_SYMBOL(disable_lapic_nmi_watchdog); EXPORT_SYMBOL(enable_lapic_nmi_watchdog); diff -Nru a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c --- a/arch/x86_64/kernel/pci-gart.c Thu Feb 19 23:44:24 2004 +++ b/arch/x86_64/kernel/pci-gart.c Thu Feb 19 23:44:24 2004 @@ -354,6 +354,11 @@ BUG_ON(dir == PCI_DMA_NONE); +#ifdef CONFIG_SWIOTLB + if (swiotlb) + return swiotlb_map_single(&dev->dev,addr,size,dir); +#endif + phys_mem = virt_to_phys(addr); if (!need_iommu(dev, phys_mem, size)) return phys_mem; @@ -460,6 +465,12 @@ BUG_ON(dir == PCI_DMA_NONE); if (nents == 0) return 0; + +#ifdef CONFIG_SWIOTLB + if (swiotlb) + return swiotlb_map_sg(&dev->dev,sg,nents,dir); +#endif + out = 0; start = 0; for (i = 0; i < nents; i++) { @@ -520,6 +531,14 @@ unsigned long iommu_page; int npages; int i; + +#ifdef CONFIG_SWIOTLB + if (swiotlb) { + swiotlb_unmap_single(&hwdev->dev,dma_addr,size,direction); + return; + } +#endif + if (dma_addr < iommu_bus_base + EMERGENCY_PAGES*PAGE_SIZE || dma_addr >= iommu_bus_base + iommu_size) return; @@ -570,7 +589,7 @@ return 0; } - if (no_iommu && (mask < (end_pfn << PAGE_SHIFT))) + if (no_iommu && (mask < (end_pfn << PAGE_SHIFT)) && !swiotlb) return 0; return 1; @@ -680,6 +699,7 @@ return 0; nommu: + /* Should not happen anymore */ printk(KERN_ERR "PCI-DMA: More than 4GB of RAM and no IOMMU\n" KERN_ERR "PCI-DMA: 32bit PCI IO may malfunction."); return -1; @@ -694,6 +714,7 @@ unsigned long iommu_start; struct pci_dev *dev; + #ifndef CONFIG_AGP_AMD64 no_agp = 1; #else @@ -704,7 +725,14 @@ (agp_copy_info(&info) < 0); #endif - if (no_iommu || (!force_iommu && end_pfn < 0xffffffff>>PAGE_SHIFT)) { + if (swiotlb) { + no_iommu = 1; + printk(KERN_INFO "PCI-DMA: Using SWIOTLB :-(\n"); + return -1; + } + + if (no_iommu || (!force_iommu && end_pfn < 0xffffffff>>PAGE_SHIFT) || + !iommu_aperture) { printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n"); no_iommu = 1; return -1; diff -Nru a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c --- a/arch/x86_64/kernel/process.c Thu Feb 19 23:44:25 2004 +++ b/arch/x86_64/kernel/process.c Thu Feb 19 23:44:25 2004 @@ -140,6 +140,52 @@ } } +/* + * This uses new MONITOR/MWAIT instructions on P4 processors with PNI, + * which can obviate IPI to trigger checking of need_resched. + * We execute MONITOR against need_resched and enter optimized wait state + * through MWAIT. Whenever someone changes need_resched, we would be woken + * up from MWAIT (without an IPI). + */ +static void mwait_idle(void) +{ + local_irq_enable(); + + if (!need_resched()) { + set_thread_flag(TIF_POLLING_NRFLAG); + do { + __monitor((void *)¤t_thread_info()->flags, 0, 0); + if (need_resched()) + break; + __mwait(0, 0); + } while (!need_resched()); + clear_thread_flag(TIF_POLLING_NRFLAG); + } +} + +void __init select_idle_routine(const struct cpuinfo_x86 *c) +{ + static int printed; + if (cpu_has(c, X86_FEATURE_MWAIT)) { + /* + * Skip, if setup has overridden idle. + * Also, take care of system with asymmetric CPUs. + * Use, mwait_idle only if all cpus support it. + * If not, we fallback to default_idle() + */ + if (!pm_idle) { + if (!printed) { + printk("using mwait in idle threads.\n"); + printed = 1; + } + pm_idle = mwait_idle; + } + return; + } + pm_idle = default_idle; + return; +} + static int __init idle_setup (char *str) { if (!strncmp(str, "poll", 4)) { diff -Nru a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c --- a/arch/x86_64/kernel/setup.c Thu Feb 19 23:44:22 2004 +++ b/arch/x86_64/kernel/setup.c Thu Feb 19 23:44:22 2004 @@ -76,6 +76,9 @@ unsigned long saved_video_mode; +int swiotlb; +EXPORT_SYMBOL(swiotlb); + /* * Setup options */ @@ -440,7 +443,6 @@ } } #endif - paging_init(); #ifndef CONFIG_SMP @@ -584,6 +586,193 @@ return r; } +static void __init detect_ht(void) +{ +#ifdef CONFIG_SMP + extern int phys_proc_id[NR_CPUS]; + + u32 eax, ebx, ecx, edx; + int index_lsb, index_msb, tmp; + int initial_apic_id; + int cpu = smp_processor_id(); + + cpuid(1, &eax, &ebx, &ecx, &edx); + smp_num_siblings = (ebx & 0xff0000) >> 16; + + if (smp_num_siblings == 1) { + printk(KERN_INFO "CPU: Hyper-Threading is disabled\n"); + } else if (smp_num_siblings > 1) { + index_lsb = 0; + index_msb = 31; + /* + * At this point we only support two siblings per + * processor package. + */ +#define NR_SIBLINGS 2 + if (smp_num_siblings != NR_SIBLINGS) { + printk(KERN_WARNING "CPU: Unsupported number of the siblings %d", smp_num_siblings); + smp_num_siblings = 1; + return; + } + tmp = smp_num_siblings; + while ((tmp & 1) == 0) { + tmp >>=1 ; + index_lsb++; + } + tmp = smp_num_siblings; + while ((tmp & 0x80000000 ) == 0) { + tmp <<=1 ; + index_msb--; + } + if (index_lsb != index_msb ) + index_msb++; + initial_apic_id = ebx >> 24 & 0xff; + phys_proc_id[cpu] = initial_apic_id >> index_msb; + + printk(KERN_INFO "CPU: Physical Processor ID: %d\n", + phys_proc_id[cpu]); + } +#endif +} + +#define LVL_1_INST 1 +#define LVL_1_DATA 2 +#define LVL_2 3 +#define LVL_3 4 +#define LVL_TRACE 5 + +struct _cache_table +{ + unsigned char descriptor; + char cache_type; + short size; +}; + +/* all the cache descriptor types we care about (no TLB or trace cache entries) */ +static struct _cache_table cache_table[] __initdata = +{ + { 0x06, LVL_1_INST, 8 }, + { 0x08, LVL_1_INST, 16 }, + { 0x0a, LVL_1_DATA, 8 }, + { 0x0c, LVL_1_DATA, 16 }, + { 0x22, LVL_3, 512 }, + { 0x23, LVL_3, 1024 }, + { 0x25, LVL_3, 2048 }, + { 0x29, LVL_3, 4096 }, + { 0x2c, LVL_1_DATA, 32 }, + { 0x30, LVL_1_INST, 32 }, + { 0x39, LVL_2, 128 }, + { 0x3b, LVL_2, 128 }, + { 0x3c, LVL_2, 256 }, + { 0x41, LVL_2, 128 }, + { 0x42, LVL_2, 256 }, + { 0x43, LVL_2, 512 }, + { 0x44, LVL_2, 1024 }, + { 0x45, LVL_2, 2048 }, + { 0x66, LVL_1_DATA, 8 }, + { 0x67, LVL_1_DATA, 16 }, + { 0x68, LVL_1_DATA, 32 }, + { 0x70, LVL_TRACE, 12 }, + { 0x71, LVL_TRACE, 16 }, + { 0x72, LVL_TRACE, 32 }, + { 0x79, LVL_2, 128 }, + { 0x7a, LVL_2, 256 }, + { 0x7b, LVL_2, 512 }, + { 0x7c, LVL_2, 1024 }, + { 0x82, LVL_2, 256 }, + { 0x83, LVL_2, 512 }, + { 0x84, LVL_2, 1024 }, + { 0x85, LVL_2, 2048 }, + { 0x86, LVL_2, 512 }, + { 0x87, LVL_2, 1024 }, + { 0x00, 0, 0} +}; + +static void __init init_intel(struct cpuinfo_x86 *c) +{ + /* Cache sizes */ + unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; + unsigned n; + + select_idle_routine(c); + if (c->cpuid_level > 1) { + /* supports eax=2 call */ + int i, j, n; + int regs[4]; + unsigned char *dp = (unsigned char *)regs; + + /* Number of times to iterate */ + n = cpuid_eax(2) & 0xFF; + + for ( i = 0 ; i < n ; i++ ) { + cpuid(2, ®s[0], ®s[1], ®s[2], ®s[3]); + + /* If bit 31 is set, this is an unknown format */ + for ( j = 0 ; j < 3 ; j++ ) { + if ( regs[j] < 0 ) regs[j] = 0; + } + + /* Byte 0 is level count, not a descriptor */ + for ( j = 1 ; j < 16 ; j++ ) { + unsigned char des = dp[j]; + unsigned char k = 0; + + /* look up this descriptor in the table */ + while (cache_table[k].descriptor != 0) + { + if (cache_table[k].descriptor == des) { + switch (cache_table[k].cache_type) { + case LVL_1_INST: + l1i += cache_table[k].size; + break; + case LVL_1_DATA: + l1d += cache_table[k].size; + break; + case LVL_2: + l2 += cache_table[k].size; + break; + case LVL_3: + l3 += cache_table[k].size; + break; + case LVL_TRACE: + trace += cache_table[k].size; + break; + } + + break; + } + + k++; + } + } + } + + if (trace) + printk (KERN_INFO "CPU: Trace cache: %dK uops", trace); + else if (l1i) + printk (KERN_INFO "CPU: L1 I cache: %dK", l1i); + if (l1d) + printk(", L1 D cache: %dK\n", l1d); + else + printk("\n"); + if (l2) + printk(KERN_INFO "CPU: L2 cache: %dK\n", l2); + if (l3) + printk(KERN_INFO "CPU: L3 cache: %dK\n", l3); + + c->x86_cache_size = l2 ? l2 : (l1i+l1d); + } + + if (cpu_has(c, X86_FEATURE_HT)) + detect_ht(); + + n = cpuid_eax(0x80000000); + if (n >= 0x80000008) { + unsigned eax = cpuid_eax(0x80000008); + c->x86_virt_bits = (eax >> 8) & 0xff; + c->x86_phys_bits = eax & 0xff; + } +} void __init get_cpu_vendor(struct cpuinfo_x86 *c) { @@ -591,6 +780,8 @@ if (!strcmp(v, "AuthenticAMD")) c->x86_vendor = X86_VENDOR_AMD; + else if (!strcmp(v, "GenuineIntel")) + c->x86_vendor = X86_VENDOR_INTEL; else c->x86_vendor = X86_VENDOR_UNKNOWN; } @@ -606,7 +797,7 @@ */ void __init identify_cpu(struct cpuinfo_x86 *c) { - int junk, i; + int i; u32 xlvl, tfms; c->loops_per_jiffy = loops_per_jiffy; @@ -630,7 +821,7 @@ /* Intel-defined flags: level 0x00000001 */ if (c->cpuid_level >= 0x00000001) { __u32 misc; - cpuid(0x00000001, &tfms, &misc, &junk, + cpuid(0x00000001, &tfms, &misc, &c->x86_capability[4], &c->x86_capability[0]); c->x86 = (tfms >> 8) & 0xf; c->x86_model = (tfms >> 4) & 0xf; @@ -679,9 +870,13 @@ init_amd(c); break; + case X86_VENDOR_INTEL: + init_intel(c); + break; + case X86_VENDOR_UNKNOWN: default: - /* Not much we can do here... */ + display_cacheinfo(c); break; } @@ -732,7 +927,7 @@ "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx", - "fxsr", "sse", "sse2", "ss", NULL, "tm", "ia64", NULL, + "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", NULL, /* AMD-defined */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -751,6 +946,12 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + + /* Intel-defined (#2) */ + "pni", NULL, NULL, "monitor", "ds_cpl", NULL, NULL, "tm2", + "est", NULL, "cid", NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; static char *x86_power_flags[] = { "ts", /* temperature sensor */ @@ -790,6 +991,14 @@ if (c->x86_cache_size >= 0) seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size); +#ifdef CONFIG_X86_HT + if (cpu_has_ht) { + extern int phys_proc_id[NR_CPUS]; + seq_printf(m, "physical id\t: %d\n", phys_proc_id[c - cpu_data]); + seq_printf(m, "siblings\t: %d\n", smp_num_siblings); + } +#endif + seq_printf(m, "fpu\t\t: yes\n" "fpu_exception\t: yes\n" diff -Nru a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c --- a/arch/x86_64/kernel/smpboot.c Thu Feb 19 23:44:28 2004 +++ b/arch/x86_64/kernel/smpboot.c Thu Feb 19 23:44:28 2004 @@ -53,6 +53,10 @@ #include #include +/* Number of siblings per CPU package */ +int smp_num_siblings = 1; +int phys_proc_id[NR_CPUS]; /* Package ID of each logical CPU */ + /* Bitmask of currently online CPUs */ cpumask_t cpu_online_map; @@ -66,6 +70,8 @@ /* Set when the idlers are all forked */ int smp_threads_ready; +int cpu_sibling_map[NR_CPUS] __cacheline_aligned; + /* * Trampoline 80x86 program as an array. */ @@ -855,6 +861,34 @@ bogosum/(500000/HZ), (bogosum/(5000/HZ))%100); Dprintk("Before bogocount - setting activated=1.\n"); + } + + /* + * If Hyper-Threading is avaialble, construct cpu_sibling_map[], so + * that we can tell the sibling CPU efficiently. + */ + if (cpu_has_ht && smp_num_siblings > 1) { + for (cpu = 0; cpu < NR_CPUS; cpu++) + cpu_sibling_map[cpu] = NO_PROC_ID; + + for (cpu = 0; cpu < NR_CPUS; cpu++) { + int i; + if (!cpu_isset(cpu, cpu_callout_map)) + continue; + + for (i = 0; i < NR_CPUS; i++) { + if (i == cpu || !cpu_isset(i, cpu_callout_map)) + continue; + if (phys_proc_id[cpu] == phys_proc_id[i]) { + cpu_sibling_map[cpu] = i; + break; + } + } + if (cpu_sibling_map[cpu] == NO_PROC_ID) { + smp_num_siblings = 1; + printk(KERN_WARNING "WARNING: No sibling found for CPU %d.\n", cpu); + } + } } Dprintk("Boot done.\n"); diff -Nru a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86_64/kernel/x8664_ksyms.c --- a/arch/x86_64/kernel/x8664_ksyms.c Thu Feb 19 23:44:23 2004 +++ b/arch/x86_64/kernel/x8664_ksyms.c Thu Feb 19 23:44:23 2004 @@ -194,6 +194,10 @@ EXPORT_SYMBOL(die_chain); +#ifdef CONFIG_SMP +EXPORT_SYMBOL(cpu_sibling_map); +#endif + extern void do_softirq_thunk(void); EXPORT_SYMBOL_NOVERS(do_softirq_thunk); diff -Nru a/arch/x86_64/lib/copy_page.S b/arch/x86_64/lib/copy_page.S --- a/arch/x86_64/lib/copy_page.S Thu Feb 19 23:44:24 2004 +++ b/arch/x86_64/lib/copy_page.S Thu Feb 19 23:44:24 2004 @@ -8,11 +8,6 @@ .globl copy_page .p2align 4 copy_page: - prefetch (%rsi) - prefetch 1*64(%rsi) - prefetchw (%rdi) - prefetchw 1*64(%rdi) - subq $3*8,%rsp movq %rbx,(%rsp) movq %r12,1*8(%rsp) @@ -32,7 +27,7 @@ movq 48 (%rsi), %r11 movq 56 (%rsi), %r12 - prefetch 5*64(%rsi) + prefetcht0 5*64(%rsi) movq %rax, (%rdi) movq %rbx, 8 (%rdi) @@ -42,8 +37,6 @@ movq %r10, 40 (%rdi) movq %r11, 48 (%rdi) movq %r12, 56 (%rdi) - - prefetchw 5*64(%rdi) leaq 64 (%rsi), %rsi leaq 64 (%rdi), %rdi diff -Nru a/arch/x86_64/lib/csum-copy.S b/arch/x86_64/lib/csum-copy.S --- a/arch/x86_64/lib/csum-copy.S Thu Feb 19 23:44:27 2004 +++ b/arch/x86_64/lib/csum-copy.S Thu Feb 19 23:44:27 2004 @@ -59,15 +59,6 @@ cmpl $3*64,%edx jle .Lignore - ignore - prefetch (%rdi) - ignore - prefetch 1*64(%rdi) - ignore - prefetchw (%rsi) - ignore - prefetchw 1*64(%rsi) - .Lignore: subq $7*8,%rsp movq %rbx,2*8(%rsp) @@ -115,7 +106,7 @@ movq 56(%rdi),%r13 ignore 2f - prefetch 5*64(%rdi) + prefetcht0 5*64(%rdi) 2: adcq %rbx,%rax adcq %r8,%rax @@ -146,8 +137,6 @@ dest movq %r13,56(%rsi) - ignore 3f - prefetchw 5*64(%rsi) 3: leaq 64(%rdi),%rdi diff -Nru a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c --- a/arch/x86_64/mm/init.c Thu Feb 19 23:44:23 2004 +++ b/arch/x86_64/mm/init.c Thu Feb 19 23:44:23 2004 @@ -402,6 +402,13 @@ int codesize, reservedpages, datasize, initsize; int tmp; +#ifdef CONFIG_SWIOTLB + if (!iommu_aperture && end_pfn >= 0xffffffff>>PAGE_SHIFT) { + swiotlb_init(); + swiotlb = 1; + } +#endif + /* How many end-of-memory variables you have, grandma! */ max_low_pfn = end_pfn; max_pfn = end_pfn; diff -Nru a/arch/x86_64/oprofile/Makefile b/arch/x86_64/oprofile/Makefile --- a/arch/x86_64/oprofile/Makefile Thu Feb 19 23:44:23 2004 +++ b/arch/x86_64/oprofile/Makefile Thu Feb 19 23:44:23 2004 @@ -1,7 +1,6 @@ # # oprofile for x86-64. -# Just reuse the one from i386. The Hammer performance counters -# are similar to Athlon. +# Just reuse the one from i386. # obj-$(CONFIG_OPROFILE) += oprofile.o @@ -13,7 +12,8 @@ timer_int.o ) OPROFILE-y := init.o -OPROFILE-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o +OPROFILE-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o op_model_p4.o \ + op_model_ppro.o OPROFILE-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o oprofile-y = $(DRIVER_OBJS) $(addprefix ../../i386/oprofile/, $(OPROFILE-y)) diff -Nru a/drivers/Makefile b/drivers/Makefile --- a/drivers/Makefile Thu Feb 19 23:44:27 2004 +++ b/drivers/Makefile Thu Feb 19 23:44:27 2004 @@ -45,7 +45,7 @@ obj-$(CONFIG_PHONE) += telephony/ obj-$(CONFIG_MD) += md/ obj-$(CONFIG_BT) += bluetooth/ -obj-$(CONFIG_ISDN_BOOL) += isdn/ +obj-$(CONFIG_ISDN) += isdn/ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ diff -Nru a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig --- a/drivers/acpi/Kconfig Thu Feb 19 23:44:28 2004 +++ b/drivers/acpi/Kconfig Thu Feb 19 23:44:28 2004 @@ -263,5 +263,23 @@ particular, many Toshiba laptops require this for correct operation of the AC module. +config X86_PM_TIMER + bool "Power Management Timer Support" + depends on X86 && ACPI + depends on ACPI_BOOT && EXPERIMENTAL + default n + help + The Power Management Timer is available on all ACPI-capable, + in most cases even if ACPI is unusable or blacklisted. + + This timing source is not affected by powermanagement features + like aggressive processor idling, throttling, frequency and/or + voltage scaling, unlike the commonly used Time Stamp Counter + (TSC) timing source. + + So, if you see messages like 'Losing too many ticks!' in the + kernel logs, and/or you are using a this on a notebook which + does not yet have an HPET, you should say "Y" here. + endmenu diff -Nru a/drivers/base/dmapool.c b/drivers/base/dmapool.c --- a/drivers/base/dmapool.c Thu Feb 19 23:44:28 2004 +++ b/drivers/base/dmapool.c Thu Feb 19 23:44:28 2004 @@ -52,7 +52,7 @@ next = buf; size = PAGE_SIZE; - temp = snprintf (next, size, "poolinfo - 0.1\n"); + temp = scnprintf(next, size, "poolinfo - 0.1\n"); size -= temp; next += temp; @@ -67,7 +67,7 @@ } /* per-pool info, no real statistics yet */ - temp = snprintf (next, size, "%-16s %4u %4Zu %4Zu %2u\n", + temp = scnprintf(next, size, "%-16s %4u %4Zu %4Zu %2u\n", pool->name, blocks, pages * pool->blocks_per_page, pool->size, pages); diff -Nru a/drivers/base/node.c b/drivers/base/node.c --- a/drivers/base/node.c Thu Feb 19 23:44:23 2004 +++ b/drivers/base/node.c Thu Feb 19 23:44:23 2004 @@ -23,7 +23,7 @@ /* FIXME - someone should pass us a buffer size (count) or * use seq_file or something to avoid buffer overrun risk. */ - len = cpumask_snprintf(buf, 99 /* XXX FIXME */, mask); + len = cpumask_scnprintf(buf, 99 /* XXX FIXME */, mask); len += sprintf(buf + len, "\n"); return len; } diff -Nru a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c --- a/drivers/block/cryptoloop.c Thu Feb 19 23:44:26 2004 +++ b/drivers/block/cryptoloop.c Thu Feb 19 23:44:26 2004 @@ -87,43 +87,49 @@ static int -cryptoloop_transfer_ecb(struct loop_device *lo, int cmd, char *raw_buf, - char *loop_buf, int size, sector_t IV) +cryptoloop_transfer_ecb(struct loop_device *lo, int cmd, + struct page *raw_page, unsigned raw_off, + struct page *loop_page, unsigned loop_off, + int size, sector_t IV) { struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data; struct scatterlist sg_out = { 0, }; struct scatterlist sg_in = { 0, }; encdec_ecb_t encdecfunc; - char const *in; - char *out; + struct page *in_page, *out_page; + unsigned in_offs, out_offs; if (cmd == READ) { - in = raw_buf; - out = loop_buf; + in_page = raw_page; + in_offs = raw_off; + out_page = loop_page; + out_offs = loop_off; encdecfunc = tfm->crt_u.cipher.cit_decrypt; } else { - in = loop_buf; - out = raw_buf; + in_page = loop_page; + in_offs = loop_off; + out_page = raw_page; + out_offs = raw_off; encdecfunc = tfm->crt_u.cipher.cit_encrypt; } while (size > 0) { const int sz = min(size, LOOP_IV_SECTOR_SIZE); - sg_in.page = virt_to_page(in); - sg_in.offset = (unsigned long)in & ~PAGE_MASK; + sg_in.page = in_page; + sg_in.offset = in_offs; sg_in.length = sz; - sg_out.page = virt_to_page(out); - sg_out.offset = (unsigned long)out & ~PAGE_MASK; + sg_out.page = out_page; + sg_out.offset = out_offs; sg_out.length = sz; encdecfunc(tfm, &sg_out, &sg_in, sz); size -= sz; - in += sz; - out += sz; + in_offs += sz; + out_offs += sz; } return 0; @@ -135,24 +141,30 @@ unsigned int nsg, u8 *iv); static int -cryptoloop_transfer_cbc(struct loop_device *lo, int cmd, char *raw_buf, - char *loop_buf, int size, sector_t IV) +cryptoloop_transfer_cbc(struct loop_device *lo, int cmd, + struct page *raw_page, unsigned raw_off, + struct page *loop_page, unsigned loop_off, + int size, sector_t IV) { struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data; struct scatterlist sg_out = { 0, }; struct scatterlist sg_in = { 0, }; encdec_cbc_t encdecfunc; - char const *in; - char *out; + struct page *in_page, *out_page; + unsigned in_offs, out_offs; if (cmd == READ) { - in = raw_buf; - out = loop_buf; + in_page = raw_page; + in_offs = raw_off; + out_page = loop_page; + out_offs = loop_off; encdecfunc = tfm->crt_u.cipher.cit_decrypt_iv; } else { - in = loop_buf; - out = raw_buf; + in_page = loop_page; + in_offs = loop_off; + out_page = raw_page; + out_offs = raw_off; encdecfunc = tfm->crt_u.cipher.cit_encrypt_iv; } @@ -161,39 +173,43 @@ u32 iv[4] = { 0, }; iv[0] = cpu_to_le32(IV & 0xffffffff); - sg_in.page = virt_to_page(in); - sg_in.offset = offset_in_page(in); + sg_in.page = in_page; + sg_in.offset = in_offs; sg_in.length = sz; - sg_out.page = virt_to_page(out); - sg_out.offset = offset_in_page(out); + sg_out.page = out_page; + sg_out.offset = out_offs; sg_out.length = sz; encdecfunc(tfm, &sg_out, &sg_in, sz, (u8 *)iv); IV++; size -= sz; - in += sz; - out += sz; + in_offs += sz; + out_offs += sz; } return 0; } static int -cryptoloop_transfer(struct loop_device *lo, int cmd, char *raw_buf, - char *loop_buf, int size, sector_t IV) +cryptoloop_transfer(struct loop_device *lo, int cmd, + struct page *raw_page, unsigned raw_off, + struct page *loop_page, unsigned loop_off, + int size, sector_t IV) { struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data; if(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB) { lo->transfer = cryptoloop_transfer_ecb; - return cryptoloop_transfer_ecb(lo, cmd, raw_buf, loop_buf, size, IV); + return cryptoloop_transfer_ecb(lo, cmd, raw_page, raw_off, + loop_page, loop_off, size, IV); } if(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_CBC) { lo->transfer = cryptoloop_transfer_cbc; - return cryptoloop_transfer_cbc(lo, cmd, raw_buf, loop_buf, size, IV); + return cryptoloop_transfer_cbc(lo, cmd, raw_page, raw_off, + loop_page, loop_off, size, IV); } /* This is not supposed to happen */ diff -Nru a/drivers/block/genhd.c b/drivers/block/genhd.c --- a/drivers/block/genhd.c Thu Feb 19 23:44:25 2004 +++ b/drivers/block/genhd.c Thu Feb 19 23:44:25 2004 @@ -262,8 +262,9 @@ /* Don't show non-partitionable removeable devices or empty devices */ if (!get_capacity(sgp) || - (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE)) - ) + (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE))) + return 0; + if (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO) return 0; /* show the full disk and all non-0 size partitions of it */ diff -Nru a/drivers/block/loop.c b/drivers/block/loop.c --- a/drivers/block/loop.c Thu Feb 19 23:44:26 2004 +++ b/drivers/block/loop.c Thu Feb 19 23:44:26 2004 @@ -76,24 +76,34 @@ /* * Transfer functions */ -static int transfer_none(struct loop_device *lo, int cmd, char *raw_buf, - char *loop_buf, int size, sector_t real_block) +static int transfer_none(struct loop_device *lo, int cmd, + struct page *raw_page, unsigned raw_off, + struct page *loop_page, unsigned loop_off, + int size, sector_t real_block) { - if (raw_buf != loop_buf) { - if (cmd == READ) - memcpy(loop_buf, raw_buf, size); - else - memcpy(raw_buf, loop_buf, size); - } + char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off; + char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off; + + if (cmd == READ) + memcpy(loop_buf, raw_buf, size); + else + memcpy(raw_buf, loop_buf, size); + kunmap_atomic(raw_buf, KM_USER0); + kunmap_atomic(loop_buf, KM_USER1); + cond_resched(); return 0; } -static int transfer_xor(struct loop_device *lo, int cmd, char *raw_buf, - char *loop_buf, int size, sector_t real_block) +static int transfer_xor(struct loop_device *lo, int cmd, + struct page *raw_page, unsigned raw_off, + struct page *loop_page, unsigned loop_off, + int size, sector_t real_block) { - char *in, *out, *key; - int i, keysize; + char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off; + char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off; + char *in, *out, *key; + int i, keysize; if (cmd == READ) { in = raw_buf; @@ -107,6 +117,10 @@ keysize = lo->lo_encrypt_key_size; for (i = 0; i < size; i++) *out++ = *in++ ^ key[(i & 511) % keysize]; + + kunmap_atomic(raw_buf, KM_USER0); + kunmap_atomic(loop_buf, KM_USER1); + cond_resched(); return 0; } @@ -162,13 +176,15 @@ } static inline int -lo_do_transfer(struct loop_device *lo, int cmd, char *rbuf, - char *lbuf, int size, sector_t rblock) +lo_do_transfer(struct loop_device *lo, int cmd, + struct page *rpage, unsigned roffs, + struct page *lpage, unsigned loffs, + int size, sector_t rblock) { if (!lo->transfer) return 0; - return lo->transfer(lo, cmd, rbuf, lbuf, size, rblock); + return lo->transfer(lo, cmd, rpage, roffs, lpage, loffs, size, rblock); } static int @@ -178,16 +194,15 @@ struct address_space *mapping = file->f_mapping; struct address_space_operations *aops = mapping->a_ops; struct page *page; - char *kaddr, *data; pgoff_t index; - unsigned size, offset; + unsigned size, offset, bv_offs; int len; int ret = 0; down(&mapping->host->i_sem); index = pos >> PAGE_CACHE_SHIFT; offset = pos & ((pgoff_t)PAGE_CACHE_SIZE - 1); - data = kmap(bvec->bv_page) + bvec->bv_offset; + bv_offs = bvec->bv_offset; len = bvec->bv_len; while (len > 0) { sector_t IV; @@ -204,25 +219,28 @@ goto fail; if (aops->prepare_write(file, page, offset, offset+size)) goto unlock; - kaddr = kmap(page); - transfer_result = lo_do_transfer(lo, WRITE, kaddr + offset, - data, size, IV); + transfer_result = lo_do_transfer(lo, WRITE, page, offset, + bvec->bv_page, bv_offs, + size, IV); if (transfer_result) { + char *kaddr; + /* * The transfer failed, but we still write the data to * keep prepare/commit calls balanced. */ printk(KERN_ERR "loop: transfer error block %llu\n", (unsigned long long)index); + kaddr = kmap_atomic(page, KM_USER0); memset(kaddr + offset, 0, size); + kunmap_atomic(kaddr, KM_USER0); } flush_dcache_page(page); - kunmap(page); if (aops->commit_write(file, page, offset, offset+size)) goto unlock; if (transfer_result) goto unlock; - data += size; + bv_offs += size; len -= size; offset = 0; index++; @@ -232,7 +250,6 @@ } up(&mapping->host->i_sem); out: - kunmap(bvec->bv_page); return ret; unlock: @@ -247,12 +264,10 @@ static int lo_send(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos) { - unsigned vecnr; - int ret = 0; - - for (vecnr = 0; vecnr < bio->bi_vcnt; vecnr++) { - struct bio_vec *bvec = &bio->bi_io_vec[vecnr]; + struct bio_vec *bvec; + int i, ret = 0; + bio_for_each_segment(bvec, bio, i) { ret = do_lo_send(lo, bvec, bsize, pos); if (ret < 0) break; @@ -263,7 +278,8 @@ struct lo_read_data { struct loop_device *lo; - char *data; + struct page *page; + unsigned offset; int bsize; }; @@ -271,7 +287,6 @@ lo_read_actor(read_descriptor_t *desc, struct page *page, unsigned long offset, unsigned long size) { - char *kaddr; unsigned long count = desc->count; struct lo_read_data *p = (struct lo_read_data*)desc->buf; struct loop_device *lo = p->lo; @@ -282,18 +297,16 @@ if (size > count) size = count; - kaddr = kmap(page); - if (lo_do_transfer(lo, READ, kaddr + offset, p->data, size, IV)) { + if (lo_do_transfer(lo, READ, page, offset, p->page, p->offset, size, IV)) { size = 0; printk(KERN_ERR "loop: transfer error block %ld\n", page->index); desc->error = -EINVAL; } - kunmap(page); desc->count = count - size; desc->written += size; - p->data += size; + p->offset += size; return size; } @@ -306,24 +319,22 @@ int retval; cookie.lo = lo; - cookie.data = kmap(bvec->bv_page) + bvec->bv_offset; + cookie.page = bvec->bv_page; + cookie.offset = bvec->bv_offset; cookie.bsize = bsize; file = lo->lo_backing_file; retval = file->f_op->sendfile(file, &pos, bvec->bv_len, lo_read_actor, &cookie); - kunmap(bvec->bv_page); return (retval < 0)? retval: 0; } static int lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos) { - unsigned vecnr; - int ret = 0; - - for (vecnr = 0; vecnr < bio->bi_vcnt; vecnr++) { - struct bio_vec *bvec = &bio->bi_io_vec[vecnr]; + struct bio_vec *bvec; + int i, ret = 0; + bio_for_each_segment(bvec, bio, i) { ret = do_lo_receive(lo, bvec, bsize, pos); if (ret < 0) break; @@ -345,23 +356,6 @@ return ret; } -static int loop_end_io_transfer(struct bio *, unsigned int, int); - -static void loop_put_buffer(struct bio *bio) -{ - /* - * check bi_end_io, may just be a remapped bio - */ - if (bio && bio->bi_end_io == loop_end_io_transfer) { - int i; - - for (i = 0; i < bio->bi_vcnt; i++) - __free_page(bio->bi_io_vec[i].bv_page); - - bio_put(bio); - } -} - /* * Add bio to back of pending list */ @@ -399,129 +393,8 @@ return bio; } -/* - * if this was a WRITE lo->transfer stuff has already been done. for READs, - * queue it for the loop thread and let it do the transfer out of - * bi_end_io context (we don't want to do decrypt of a page with irqs - * disabled) - */ -static int loop_end_io_transfer(struct bio *bio, unsigned int bytes_done, int err) -{ - struct bio *rbh = bio->bi_private; - struct loop_device *lo = rbh->bi_bdev->bd_disk->private_data; - - if (bio->bi_size) - return 1; - - if (err || bio_rw(bio) == WRITE) { - bio_endio(rbh, rbh->bi_size, err); - if (atomic_dec_and_test(&lo->lo_pending)) - up(&lo->lo_bh_mutex); - loop_put_buffer(bio); - } else - loop_add_bio(lo, bio); - - return 0; -} - -static struct bio *loop_copy_bio(struct bio *rbh) -{ - struct bio *bio; - struct bio_vec *bv; - int i; - - bio = bio_alloc(__GFP_NOWARN, rbh->bi_vcnt); - if (!bio) - return NULL; - - /* - * iterate iovec list and alloc pages - */ - __bio_for_each_segment(bv, rbh, i, 0) { - struct bio_vec *bbv = &bio->bi_io_vec[i]; - - bbv->bv_page = alloc_page(__GFP_NOWARN|__GFP_HIGHMEM); - if (bbv->bv_page == NULL) - goto oom; - - bbv->bv_len = bv->bv_len; - bbv->bv_offset = bv->bv_offset; - } - - bio->bi_vcnt = rbh->bi_vcnt; - bio->bi_size = rbh->bi_size; - - return bio; - -oom: - while (--i >= 0) - __free_page(bio->bi_io_vec[i].bv_page); - - bio_put(bio); - return NULL; -} - -static struct bio *loop_get_buffer(struct loop_device *lo, struct bio *rbh) -{ - struct bio *bio; - - /* - * When called on the page reclaim -> writepage path, this code can - * trivially consume all memory. So we drop PF_MEMALLOC to avoid - * stealing all the page reserves and throttle to the writeout rate. - * pdflush will have been woken by page reclaim. Let it do its work. - */ - do { - int flags = current->flags; - - current->flags &= ~PF_MEMALLOC; - bio = loop_copy_bio(rbh); - if (flags & PF_MEMALLOC) - current->flags |= PF_MEMALLOC; - - if (bio == NULL) - blk_congestion_wait(WRITE, HZ/10); - } while (bio == NULL); - - bio->bi_end_io = loop_end_io_transfer; - bio->bi_private = rbh; - bio->bi_sector = rbh->bi_sector + (lo->lo_offset >> 9); - bio->bi_rw = rbh->bi_rw; - bio->bi_bdev = lo->lo_device; - - return bio; -} - -static int loop_transfer_bio(struct loop_device *lo, - struct bio *to_bio, struct bio *from_bio) -{ - sector_t IV; - struct bio_vec *from_bvec, *to_bvec; - char *vto, *vfrom; - int ret = 0, i; - - IV = from_bio->bi_sector + (lo->lo_offset >> 9); - - __bio_for_each_segment(from_bvec, from_bio, i, 0) { - to_bvec = &to_bio->bi_io_vec[i]; - - kmap(from_bvec->bv_page); - kmap(to_bvec->bv_page); - vfrom = page_address(from_bvec->bv_page) + from_bvec->bv_offset; - vto = page_address(to_bvec->bv_page) + to_bvec->bv_offset; - ret |= lo_do_transfer(lo, bio_data_dir(to_bio), vto, vfrom, - from_bvec->bv_len, IV); - kunmap(from_bvec->bv_page); - kunmap(to_bvec->bv_page); - IV += from_bvec->bv_len >> 9; - } - - return ret; -} - static int loop_make_request(request_queue_t *q, struct bio *old_bio) { - struct bio *new_bio = NULL; struct loop_device *lo = q->queuedata; int rw = bio_rw(old_bio); @@ -543,31 +416,11 @@ printk(KERN_ERR "loop: unknown command (%x)\n", rw); goto err; } - - /* - * file backed, queue for loop_thread to handle - */ - if (lo->lo_flags & LO_FLAGS_DO_BMAP) { - loop_add_bio(lo, old_bio); - return 0; - } - - /* - * piggy old buffer on original, and submit for I/O - */ - new_bio = loop_get_buffer(lo, old_bio); - if (rw == WRITE) { - if (loop_transfer_bio(lo, new_bio, old_bio)) - goto err; - } - - generic_make_request(new_bio); + loop_add_bio(lo, old_bio); return 0; - err: if (atomic_dec_and_test(&lo->lo_pending)) up(&lo->lo_bh_mutex); - loop_put_buffer(new_bio); out: bio_io_error(old_bio, old_bio->bi_size); return 0; @@ -580,20 +433,8 @@ { int ret; - /* - * For block backed loop, we know this is a READ - */ - if (lo->lo_flags & LO_FLAGS_DO_BMAP) { - ret = do_bio_filebacked(lo, bio); - bio_endio(bio, bio->bi_size, ret); - } else { - struct bio *rbh = bio->bi_private; - - ret = loop_transfer_bio(lo, bio, rbh); - - bio_endio(rbh, rbh->bi_size, ret); - loop_put_buffer(bio); - } + ret = do_bio_filebacked(lo, bio); + bio_endio(bio, bio->bi_size, ret); } /* @@ -684,31 +525,23 @@ lo_flags |= LO_FLAGS_READ_ONLY; error = -EINVAL; - if (S_ISBLK(inode->i_mode)) { - lo_device = I_BDEV(inode); - if (lo_device == bdev) { - error = -EBUSY; - goto out_putf; - } - lo_blocksize = block_size(lo_device); - if (bdev_read_only(lo_device)) - lo_flags |= LO_FLAGS_READ_ONLY; - } else if (S_ISREG(inode->i_mode)) { + if (S_ISREG(inode->i_mode) || S_ISBLK(inode->i_mode)) { struct address_space_operations *aops = mapping->a_ops; /* * If we can't read - sorry. If we only can't write - well, * it's going to be read-only. */ - if (!inode->i_fop->sendfile) + if (!lo_file->f_op->sendfile) goto out_putf; if (!aops->prepare_write || !aops->commit_write) lo_flags |= LO_FLAGS_READ_ONLY; lo_blocksize = inode->i_blksize; - lo_flags |= LO_FLAGS_DO_BMAP; - } else + error = 0; + } else { goto out_putf; + } if (!(lo_file->f_mode & FMODE_WRITE)) lo_flags |= LO_FLAGS_READ_ONLY; @@ -738,21 +571,6 @@ blk_queue_make_request(lo->lo_queue, loop_make_request); lo->lo_queue->queuedata = lo; - /* - * we remap to a block device, make sure we correctly stack limits - */ - if (S_ISBLK(inode->i_mode)) { - request_queue_t *q = bdev_get_queue(lo_device); - - blk_queue_max_sectors(lo->lo_queue, q->max_sectors); - blk_queue_max_phys_segments(lo->lo_queue,q->max_phys_segments); - blk_queue_max_hw_segments(lo->lo_queue, q->max_hw_segments); - blk_queue_hardsect_size(lo->lo_queue, queue_hardsect_size(q)); - blk_queue_max_segment_size(lo->lo_queue, q->max_segment_size); - blk_queue_segment_boundary(lo->lo_queue, q->seg_boundary_mask); - blk_queue_merge_bvec(lo->lo_queue, q->merge_bvec_fn); - } - set_blocksize(bdev, lo_blocksize); kernel_thread(loop_thread, lo, CLONE_KERNEL); @@ -1196,7 +1014,6 @@ lo->lo_queue = blk_alloc_queue(GFP_KERNEL); if (!lo->lo_queue) goto out_mem4; - disks[i]->queue = lo->lo_queue; init_MUTEX(&lo->lo_ctl_mutex); init_MUTEX_LOCKED(&lo->lo_sem); init_MUTEX_LOCKED(&lo->lo_bh_mutex); @@ -1209,14 +1026,18 @@ sprintf(disk->devfs_name, "loop/%d", i); disk->private_data = lo; disk->queue = lo->lo_queue; - add_disk(disk); } + + /* We cannot fail after we call this, so another loop!*/ + for (i = 0; i < max_loop; i++) + add_disk(disks[i]); printk(KERN_INFO "loop: loaded (max %d devices)\n", max_loop); return 0; out_mem4: while (i--) blk_put_queue(loop_dev[i].lo_queue); + devfs_remove("loop"); i = max_loop; out_mem3: while (i--) diff -Nru a/drivers/block/nbd.c b/drivers/block/nbd.c --- a/drivers/block/nbd.c Thu Feb 19 23:44:23 2004 +++ b/drivers/block/nbd.c Thu Feb 19 23:44:23 2004 @@ -741,6 +741,7 @@ disk->first_minor = i; disk->fops = &nbd_fops; disk->private_data = &nbd_dev[i]; + disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; sprintf(disk->disk_name, "nbd%d", i); sprintf(disk->devfs_name, "nbd/%d", i); set_capacity(disk, 0x3ffffe); diff -Nru a/drivers/block/rd.c b/drivers/block/rd.c --- a/drivers/block/rd.c Thu Feb 19 23:44:26 2004 +++ b/drivers/block/rd.c Thu Feb 19 23:44:26 2004 @@ -1,15 +1,15 @@ /* * ramdisk.c - Multiple RAM disk driver - gzip-loading version - v. 0.8 beta. - * - * (C) Chad Page, Theodore Ts'o, et. al, 1995. + * + * (C) Chad Page, Theodore Ts'o, et. al, 1995. * * This RAM disk is designed to have filesystems created on it and mounted - * just like a regular floppy disk. - * + * just like a regular floppy disk. + * * It also does something suggested by Linus: use the buffer cache as the * RAM disk data. This makes it possible to dynamically allocate the RAM disk - * buffer - with some consequences I have to deal with as I write this. - * + * buffer - with some consequences I have to deal with as I write this. + * * This code is based on the original ramdisk.c, written mostly by * Theodore Ts'o (TYT) in 1991. The code was largely rewritten by * Chad Page to use the buffer cache to store the RAM disk data in @@ -33,7 +33,7 @@ * * Added initrd: Werner Almesberger & Hans Lermen, Feb '96 * - * 4/25/96 : Made RAM disk size a parameter (default is now 4 MB) + * 4/25/96 : Made RAM disk size a parameter (default is now 4 MB) * - Chad Page * * Add support for fs images split across >1 disk, Paul Gortmaker, Mar '98 @@ -60,7 +60,7 @@ #include /* The RAM disk size is now a parameter */ -#define NUM_RAMDISKS 16 /* This cannot be overridden (yet) */ +#define NUM_RAMDISKS 16 /* This cannot be overridden (yet) */ /* Various static variables go here. Most are used only in the RAM disk code. */ @@ -73,7 +73,7 @@ * Parameters for the boot-loading of the RAM disk. These are set by * init/main.c (from arguments to the kernel command line) or from the * architecture-specific setup routine (from the stored boot sector - * information). + * information). */ int rd_size = CONFIG_BLK_DEV_RAM_SIZE; /* Size of the RAM disks */ /* @@ -94,7 +94,7 @@ * 2000 Transmeta Corp. * aops copied from ramfs. */ -static int ramdisk_readpage(struct file *file, struct page * page) +static int ramdisk_readpage(struct file *file, struct page *page) { if (!PageUptodate(page)) { void *kaddr = kmap_atomic(page, KM_USER0); @@ -108,7 +108,8 @@ return 0; } -static int ramdisk_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to) +static int ramdisk_prepare_write(struct file *file, struct page *page, + unsigned offset, unsigned to) { if (!PageUptodate(page)) { void *kaddr = kmap_atomic(page, KM_USER0); @@ -122,7 +123,8 @@ return 0; } -static int ramdisk_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to) +static int ramdisk_commit_write(struct file *file, struct page *page, + unsigned offset, unsigned to) { return 0; } @@ -212,7 +214,7 @@ * 19-JAN-1998 Richard Gooch Added devfs support * */ -static int rd_make_request(request_queue_t * q, struct bio *bio) +static int rd_make_request(request_queue_t *q, struct bio *bio) { struct block_device *bdev = bio->bi_bdev; struct address_space * mapping = bdev->bd_inode->i_mapping; @@ -242,7 +244,8 @@ return 0; } -static int rd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) +static int rd_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) { int error; struct block_device *bdev = inode->i_bdev; @@ -250,9 +253,11 @@ if (cmd != BLKFLSBUF) return -EINVAL; - /* special: we want to release the ramdisk memory, - it's not like with the other blockdevices where - this ioctl only flushes away the buffer cache. */ + /* + * special: we want to release the ramdisk memory, it's not like with + * the other blockdevices where this ioctl only flushes away the buffer + * cache + */ error = -EBUSY; down(&bdev->bd_sem); if (bdev->bd_openers <= 2) { @@ -268,7 +273,7 @@ .memory_backed = 1, /* Does not contribute to dirty memory */ }; -static int rd_open(struct inode * inode, struct file * filp) +static int rd_open(struct inode *inode, struct file *filp) { unsigned unit = iminor(inode); @@ -295,33 +300,37 @@ .ioctl = rd_ioctl, }; -/* Before freeing the module, invalidate all of the protected buffers! */ -static void __exit rd_cleanup (void) +/* + * Before freeing the module, invalidate all of the protected buffers! + */ +static void __exit rd_cleanup(void) { int i; - for (i = 0 ; i < NUM_RAMDISKS; i++) { + for (i = 0; i < NUM_RAMDISKS; i++) { struct block_device *bdev = rd_bdev[i]; rd_bdev[i] = NULL; if (bdev) { invalidate_bdev(bdev, 1); - blkdev_put(bdev, BDEV_FILE); + blkdev_put(bdev); } del_gendisk(rd_disks[i]); put_disk(rd_disks[i]); } devfs_remove("rd"); - unregister_blkdev(RAMDISK_MAJOR, "ramdisk" ); + unregister_blkdev(RAMDISK_MAJOR, "ramdisk"); } -/* This is the registration and initialization section of the RAM disk driver */ -static int __init rd_init (void) +/* + * This is the registration and initialization section of the RAM disk driver + */ +static int __init rd_init(void) { int i; int err = -ENOMEM; if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 || - (rd_blocksize & (rd_blocksize-1))) { + (rd_blocksize & (rd_blocksize-1))) { printk("RAMDISK: wrong blocksize %d, reverting to defaults\n", rd_blocksize); rd_blocksize = BLOCK_SIZE; @@ -354,6 +363,7 @@ disk->first_minor = i; disk->fops = &rd_bd_op; disk->queue = rd_queue[i]; + disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; sprintf(disk->disk_name, "ram%d", i); sprintf(disk->devfs_name, "rd/%d", i); set_capacity(disk, rd_size * 2); @@ -362,8 +372,8 @@ /* rd_size is given in kB */ printk("RAMDISK driver initialized: " - "%d RAM disks of %dK size %d blocksize\n", - NUM_RAMDISKS, rd_size, rd_blocksize); + "%d RAM disks of %dK size %d blocksize\n", + NUM_RAMDISKS, rd_size, rd_blocksize); return 0; out_queue: diff -Nru a/drivers/char/Kconfig b/drivers/char/Kconfig --- a/drivers/char/Kconfig Thu Feb 19 23:44:22 2004 +++ b/drivers/char/Kconfig Thu Feb 19 23:44:22 2004 @@ -794,8 +794,7 @@ precision in some cases. To compile this driver as a module, choose M here: the - module will be called genrtc. To load the module automatically - add 'alias char-major-10-135 genrtc' to your /etc/modules.conf + module will be called genrtc. config GEN_RTC_X bool "Extended RTC operation" diff -Nru a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig --- a/drivers/char/agp/Kconfig Thu Feb 19 23:44:25 2004 +++ b/drivers/char/agp/Kconfig Thu Feb 19 23:44:25 2004 @@ -77,7 +77,7 @@ config AGP_INTEL tristate "Intel 440LX/BX/GX, I8xx and E7x05 chipset support" - depends on AGP && X86 && !X86_64 + depends on AGP && X86 help This option gives you AGP support for the GLX component of XFree86 4.x on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860, 875, @@ -150,4 +150,14 @@ help This option gives you AGP support for Apple machines with a UniNorth bridge. + +config AGP_EFFICEON + tristate "Transmeta Efficeon support" + depends on AGP && X86 && !X86_64 + help + This option fives you AGP support for the Transmeta Efficeon + series processors with integrated northbridges. + + You should say Y here if you use XFree86 3.3.6 or 4.x and want to + use GLX or DRI. If unsure, say Y. diff -Nru a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile --- a/drivers/char/agp/Makefile Thu Feb 19 23:44:24 2004 +++ b/drivers/char/agp/Makefile Thu Feb 19 23:44:24 2004 @@ -6,6 +6,7 @@ obj-$(CONFIG_AGP_AMD) += amd-k7-agp.o obj-$(CONFIG_AGP_AMD64) += amd64-agp.o obj-$(CONFIG_AGP_ALPHA_CORE) += alpha-agp.o +obj-$(CONFIG_AGP_EFFICEON) += efficeon-agp.o obj-$(CONFIG_AGP_HP_ZX1) += hp-agp.o obj-$(CONFIG_AGP_I460) += i460-agp.o obj-$(CONFIG_AGP_INTEL) += intel-agp.o diff -Nru a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/char/agp/efficeon-agp.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,467 @@ +/* + * Transmeta's Efficeon AGPGART driver. + * + * Based upon a diff by Linus around November '02. + * + * Ported to the 2.6 kernel by Carlos Puchol + * and H. Peter Anvin . + */ + +/* + * NOTE-cpg-040217: + * + * - when compiled as a module, after loading the module, + * it will refuse to unload, indicating it is in use, + * when it is not. + * - no s3 (suspend to ram) testing. + * - tested on the efficeon integrated nothbridge for tens + * of iterations of starting x and glxgears. + * - tested with radeon 9000 and radeon mobility m9 cards + * - tested with c3/c4 enabled (with the mobility m9 card) + */ + +#include +#include +#include +#include +#include +#include +#include +#include "agp.h" + +/* + * The real differences to the generic AGP code is + * in the GART mappings - a two-level setup with the + * first level being an on-chip 64-entry table. + * + * The page array is filled through the ATTPAGE register + * (Aperture Translation Table Page Register) at 0xB8. Bits: + * 31:20: physical page address + * 11:9: Page Attribute Table Index (PATI) + * must match the PAT index for the + * mapped pages (the 2nd level page table pages + * themselves should be just regular WB-cacheable, + * so this is normally zero.) + * 8: Present + * 7:6: reserved, write as zero + * 5:0: GATT directory index: which 1st-level entry + * + * The Efficeon AGP spec requires pages to be WB-cacheable + * but to be explicitly CLFLUSH'd after any changes. + */ +#define EFFICEON_ATTPAGE 0xb8 +#define EFFICEON_L1_SIZE 64 /* Number of PDE pages */ + +#define EFFICEON_PATI (0 << 9) +#define EFFICEON_PRESENT (1 << 8) + +static struct _efficeon_private { + unsigned long l1_table[EFFICEON_L1_SIZE]; +} efficeon_private; + +static struct gatt_mask efficeon_generic_masks[] = +{ + {.mask = 0x00000001, .type = 0} +}; + +static struct aper_size_info_lvl2 efficeon_generic_sizes[4] = +{ + {256, 65536, 0}, + {128, 32768, 32}, + {64, 16384, 48}, + {32, 8192, 56} +}; + +/* + * Control interfaces are largely identical to + * the legacy Intel 440BX.. + */ + +static int efficeon_fetch_size(void) +{ + int i; + u16 temp; + struct aper_size_info_lvl2 *values; + + pci_read_config_word(agp_bridge->dev, INTEL_APSIZE, &temp); + values = A_SIZE_LVL2(agp_bridge->driver->aperture_sizes); + + for (i = 0; i < agp_bridge->driver->num_aperture_sizes; i++) { + if (temp == values[i].size_value) { + agp_bridge->previous_size = + agp_bridge->current_size = (void *) (values + i); + agp_bridge->aperture_size_idx = i; + return values[i].size; + } + } + + return 0; +} + +static void efficeon_tlbflush(struct agp_memory * mem) +{ + printk(KERN_DEBUG PFX "efficeon_tlbflush()\n"); + pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x2200); + pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x2280); +} + +static void efficeon_cleanup(void) +{ + u16 temp; + struct aper_size_info_lvl2 *previous_size; + + printk(KERN_DEBUG PFX "efficeon_cleanup()\n"); + previous_size = A_SIZE_LVL2(agp_bridge->previous_size); + pci_read_config_word(agp_bridge->dev, INTEL_NBXCFG, &temp); + pci_write_config_word(agp_bridge->dev, INTEL_NBXCFG, temp & ~(1 << 9)); + pci_write_config_word(agp_bridge->dev, INTEL_APSIZE, + previous_size->size_value); +} + +static int efficeon_configure(void) +{ + u32 temp; + u16 temp2; + struct aper_size_info_lvl2 *current_size; + + printk(KERN_DEBUG PFX "efficeon_configure()\n"); + + current_size = A_SIZE_LVL2(agp_bridge->current_size); + + /* aperture size */ + pci_write_config_word(agp_bridge->dev, INTEL_APSIZE, + current_size->size_value); + + /* address to map to */ + pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp); + agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK); + + /* agpctrl */ + pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x2280); + + /* paccfg/nbxcfg */ + pci_read_config_word(agp_bridge->dev, INTEL_NBXCFG, &temp2); + pci_write_config_word(agp_bridge->dev, INTEL_NBXCFG, + (temp2 & ~(1 << 10)) | (1 << 9) | (1 << 11)); + /* clear any possible error conditions */ + pci_write_config_byte(agp_bridge->dev, INTEL_ERRSTS + 1, 7); + return 0; +} + +static int efficeon_free_gatt_table(void) +{ + int index, freed = 0; + + for (index = 0; index < EFFICEON_L1_SIZE; index++) { + unsigned long page = efficeon_private.l1_table[index]; + if (page) { + efficeon_private.l1_table[index] = 0; + ClearPageReserved(virt_to_page((char *)page)); + free_page(page); + freed++; + } + printk(KERN_DEBUG PFX "efficeon_free_gatt_table(%p, %02x, %08x)\n", + agp_bridge->dev, EFFICEON_ATTPAGE, index); + pci_write_config_dword(agp_bridge->dev, + EFFICEON_ATTPAGE, index); + } + printk(KERN_DEBUG PFX "efficeon_free_gatt_table() freed %d pages\n", freed); + return 0; +} + + +/* + * Since we don't need contigious memory we just try + * to get the gatt table once + */ + +#define GET_PAGE_DIR_OFF(addr) (addr >> 22) +#define GET_PAGE_DIR_IDX(addr) (GET_PAGE_DIR_OFF(addr) - \ + GET_PAGE_DIR_OFF(agp_bridge->gart_bus_addr)) +#define GET_GATT_OFF(addr) ((addr & 0x003ff000) >> 12) +#undef GET_GATT +#define GET_GATT(addr) (efficeon_private.gatt_pages[\ + GET_PAGE_DIR_IDX(addr)]->remapped) + +static int efficeon_create_gatt_table(void) +{ + int index; + const int pati = EFFICEON_PATI; + const int present = EFFICEON_PRESENT; + const int clflush_chunk = ((cpuid_ebx(1) >> 8) & 0xff) << 3; + int num_entries, l1_pages; + + num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries; + + printk(KERN_DEBUG PFX "efficeon_create_gatt_table(%d)\n", num_entries); + + /* There are 2^10 PTE pages per PDE page */ + BUG_ON(num_entries & 0x3ff); + l1_pages = num_entries >> 10; + + for (index = 0 ; index < l1_pages ; index++) { + int offset; + unsigned long page; + unsigned long value; + + page = efficeon_private.l1_table[index]; + BUG_ON(page); + + page = get_zeroed_page(GFP_KERNEL); + if (!page) { + efficeon_free_gatt_table(); + return -ENOMEM; + } + SetPageReserved(virt_to_page((char *)page)); + + for (offset = 0; offset < PAGE_SIZE; offset += clflush_chunk) + asm volatile("clflush %0" : : "m" (*(char *)(page+offset))); + + efficeon_private.l1_table[index] = page; + + value = __pa(page) | pati | present | index; + + pci_write_config_dword(agp_bridge->dev, + EFFICEON_ATTPAGE, value); + } + + return 0; +} + +static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int type) +{ + int i, count = mem->page_count, num_entries; + unsigned int *page, *last_page; + const int clflush_chunk = ((cpuid_ebx(1) >> 8) & 0xff) << 3; + const unsigned long clflush_mask = ~(clflush_chunk-1); + + printk(KERN_DEBUG PFX "efficeon_insert_memory(%lx, %d)\n", pg_start, count); + + num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries; + if ((pg_start + mem->page_count) > num_entries) + return -EINVAL; + if (type != 0 || mem->type != 0) + return -EINVAL; + + if (mem->is_flushed == FALSE) { + global_cache_flush(); + mem->is_flushed = TRUE; + } + + last_page = NULL; + for (i = 0; i < count; i++) { + int index = pg_start + i; + unsigned long insert = mem->memory[i]; + + page = (unsigned int *) efficeon_private.l1_table[index >> 10]; + + if (!page) + continue; + + page += (index & 0x3ff); + *page = insert; + + /* clflush is slow, so don't clflush until we have to */ + if ( last_page && + ((unsigned long)page^(unsigned long)last_page) & clflush_mask ) + asm volatile("clflush %0" : : "m" (*last_page)); + + last_page = page; + } + + if ( last_page ) + asm volatile("clflush %0" : : "m" (*last_page)); + + agp_bridge->driver->tlb_flush(mem); + return 0; +} + +static int efficeon_remove_memory(struct agp_memory * mem, off_t pg_start, int type) +{ + int i, count = mem->page_count, num_entries; + + printk(KERN_DEBUG PFX "efficeon_remove_memory(%lx, %d)\n", pg_start, count); + + num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries; + + if ((pg_start + mem->page_count) > num_entries) + return -EINVAL; + if (type != 0 || mem->type != 0) + return -EINVAL; + + for (i = 0; i < count; i++) { + int index = pg_start + i; + unsigned int *page = (unsigned int *) efficeon_private.l1_table[index >> 10]; + + if (!page) + continue; + page += (index & 0x3ff); + *page = 0; + } + agp_bridge->driver->tlb_flush(mem); + return 0; +} + +/* GATT entry: (physical address | 1) */ +static unsigned long efficeon_mask_memory(unsigned long addr, int type) +{ + /* Memory type is ignored */ + + return addr | agp_bridge->driver->masks[0].mask; +} + +struct agp_bridge_driver efficeon_driver = { + .owner = THIS_MODULE, + .aperture_sizes = efficeon_generic_sizes, + .size_type = LVL2_APER_SIZE, + .num_aperture_sizes = 4, + .configure = efficeon_configure, + .fetch_size = efficeon_fetch_size, + .cleanup = efficeon_cleanup, + .tlb_flush = efficeon_tlbflush, + .mask_memory = efficeon_mask_memory, + .masks = efficeon_generic_masks, + .agp_enable = agp_generic_enable, + .cache_flush = global_cache_flush, + + // Efficeon-specific GATT table setup / populate / teardown + .create_gatt_table = efficeon_create_gatt_table, + .free_gatt_table = efficeon_free_gatt_table, + .insert_memory = efficeon_insert_memory, + .remove_memory = efficeon_remove_memory, + .cant_use_aperture = 0, // 1 might be faster? + + // Generic + .alloc_by_type = agp_generic_alloc_by_type, + .free_by_type = agp_generic_free_by_type, + .agp_alloc_page = agp_generic_alloc_page, + .agp_destroy_page = agp_generic_destroy_page, +}; + + +static int agp_efficeon_resume(struct pci_dev *pdev) +{ + printk(KERN_DEBUG PFX "agp_efficeon_resume()\n"); + return efficeon_configure(); +} + +static int __devinit agp_efficeon_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct agp_bridge_data *bridge; + u8 cap_ptr; + struct resource *r; + + cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP); + if (!cap_ptr) + return -ENODEV; + + /* Probe for Efficeon controller */ + if (pdev->device != PCI_DEVICE_ID_EFFICEON) { + printk(KERN_ERR PFX "Unsupported Efficeon chipset (device id: %04x)\n", + pdev->device); + return -ENODEV; + } + + printk(KERN_INFO PFX "Detected Transmeta Efficeon TM8000 series chipset\n"); + + bridge = agp_alloc_bridge(); + if (!bridge) + return -ENOMEM; + + bridge->driver = &efficeon_driver; + bridge->dev = pdev; + bridge->capndx = cap_ptr; + + /* + * The following fixes the case where the BIOS has "forgotten" to + * provide an address range for the GART. + * 20030610 - hamish@zot.org + */ + r = &pdev->resource[0]; + if (!r->start && r->end) { + if(pci_assign_resource(pdev, 0)) { + printk(KERN_ERR PFX "could not assign resource 0\n"); + return (-ENODEV); + } + } + + /* + * If the device has not been properly setup, the following will catch + * the problem and should stop the system from crashing. + * 20030610 - hamish@zot.org + */ + if (pci_enable_device(pdev)) { + printk(KERN_ERR PFX "Unable to Enable PCI device\n"); + return (-ENODEV); + } + + /* Fill in the mode register */ + if (cap_ptr) { + pci_read_config_dword(pdev, + bridge->capndx+PCI_AGP_STATUS, + &bridge->mode); + } + + pci_set_drvdata(pdev, bridge); + return agp_add_bridge(bridge); +} + +static void __devexit agp_efficeon_remove(struct pci_dev *pdev) +{ + struct agp_bridge_data *bridge = pci_get_drvdata(pdev); + + agp_remove_bridge(bridge); + agp_put_bridge(bridge); +} + +static int agp_efficeon_suspend(struct pci_dev *dev, u32 state) +{ + return 0; +} + + +static struct pci_device_id agp_efficeon_pci_table[] = { + { + .class = (PCI_CLASS_BRIDGE_HOST << 8), + .class_mask = ~0, + .vendor = PCI_VENDOR_ID_TRANSMETA, + .device = PCI_ANY_ID, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + }, + { } +}; + +MODULE_DEVICE_TABLE(pci, agp_efficeon_pci_table); + +static struct pci_driver agp_efficeon_pci_driver = { + .name = "agpgart-efficeon", + .id_table = agp_efficeon_pci_table, + .probe = agp_efficeon_probe, + .remove = agp_efficeon_remove, + .suspend = agp_efficeon_suspend, + .resume = agp_efficeon_resume, +}; + +static int __init agp_efficeon_init(void) +{ + static int agp_initialised=0; + + if (agp_initialised == 1) + return 0; + agp_initialised=1; + + return pci_module_init(&agp_efficeon_pci_driver); +} + +static void __exit agp_efficeon_cleanup(void) +{ + pci_unregister_driver(&agp_efficeon_pci_driver); +} + +module_init(agp_efficeon_init); +module_exit(agp_efficeon_cleanup); + +MODULE_AUTHOR("Carlos Puchol "); +MODULE_LICENSE("GPL and additional rights"); diff -Nru a/drivers/char/ftape/compressor/zftape-compress.c b/drivers/char/ftape/compressor/zftape-compress.c --- a/drivers/char/ftape/compressor/zftape-compress.c Thu Feb 19 23:44:27 2004 +++ b/drivers/char/ftape/compressor/zftape-compress.c Thu Feb 19 23:44:27 2004 @@ -60,8 +60,6 @@ /* local variables */ -static int keep_module_locked = 1; - static void *zftc_wrk_mem = NULL; static __u8 *zftc_buf = NULL; static void *zftc_scratch_buf = NULL; @@ -268,10 +266,6 @@ static void zftc_lock(void) { - MOD_INC_USE_COUNT; /* sets MOD_VISITED and MOD_USED_ONCE, - * locking is done with can_unload() - */ - keep_module_locked = 1; } /* this function is needed for zftape_reset_position in zftape-io.c @@ -282,7 +276,6 @@ memset((void *)&cseg, '\0', sizeof(cseg)); zftc_stats(); - keep_module_locked = 0; TRACE_EXIT; } @@ -555,10 +548,6 @@ int buf_pos_write = pos->seg_byte_pos; TRACE_FUN(ft_t_flow); - keep_module_locked = 1; - MOD_INC_USE_COUNT; /* sets MOD_VISITED and MOD_USED_ONCE, - * locking is done with can_unload() - */ /* Note: we do not unlock the module because * there are some values cached in that `cseg' variable. We * don't don't want to use this information when being @@ -676,10 +665,6 @@ int remaining = to_do; TRACE_FUN(ft_t_flow); - keep_module_locked = 1; - MOD_INC_USE_COUNT; /* sets MOD_VISITED and MOD_USED_ONCE, - * locking is done with can_unload() - */ TRACE_CATCH(zft_allocate_cmpr_mem(volume->blk_sz),); if (pos->seg_byte_pos == 0) { /* new segment just read @@ -800,10 +785,6 @@ int fast_seek_trials = 0; TRACE_FUN(ft_t_flow); - keep_module_locked = 1; - MOD_INC_USE_COUNT; /* sets MOD_VISITED and MOD_USED_ONCE, - * locking is done with can_unload() - */ if (new_block_pos == 0) { pos->seg_pos = volume->start_seg; pos->seg_byte_pos = 0; @@ -1222,31 +1203,7 @@ */ int init_module(void) { - int result; - -#if 0 /* FIXME --RR */ - if (!mod_member_present(&__this_module, can_unload)) - return -EBUSY; - __this_module.can_unload = can_unload; -#endif - result = zft_compressor_init(); - keep_module_locked = 0; - return result; + return zft_compressor_init(); } -/* Called by modules package when removing the driver - */ -void cleanup_module(void) -{ - TRACE_FUN(ft_t_flow); - - if (zft_cmpr_unregister() != &cmpr_ops) { - TRACE(ft_t_info, "failed"); - } else { - TRACE(ft_t_info, "successful"); - } - zftc_cleanup(); - printk(KERN_INFO "zft-compressor successfully unloaded.\n"); - TRACE_EXIT; -} #endif /* MODULE */ diff -Nru a/drivers/char/genrtc.c b/drivers/char/genrtc.c --- a/drivers/char/genrtc.c Thu Feb 19 23:44:28 2004 +++ b/drivers/char/genrtc.c Thu Feb 19 23:44:28 2004 @@ -523,4 +523,4 @@ MODULE_AUTHOR("Richard Zidlicky"); MODULE_LICENSE("GPL"); - +MODULE_ALIAS_MISCDEV(RTC_MINOR); diff -Nru a/drivers/char/ip2/ip2.h b/drivers/char/ip2/ip2.h --- a/drivers/char/ip2/ip2.h Thu Feb 19 23:44:24 2004 +++ b/drivers/char/ip2/ip2.h Thu Feb 19 23:44:24 2004 @@ -59,7 +59,7 @@ * console warning. * When the driver is loaded as a module these setting can be overridden on the - * modprobe command line or on an option line in /etc/modules.conf. + * modprobe command line or on an option line in /etc/modprobe.conf. * If the driver is built-in the configuration must be * set here for ISA cards and address set to 1 and 2 for PCI and EISA. * @@ -80,7 +80,7 @@ /* this structure is zeroed out because the suggested method is to configure * the driver as a module, set up the parameters with an options line in - * /etc/modules.conf and load with modprobe, kerneld or kmod, the kernel + * /etc/modprobe.conf and load with modprobe or kmod, the kernel * module loader */ diff -Nru a/drivers/char/isicom.c b/drivers/char/isicom.c --- a/drivers/char/isicom.c Thu Feb 19 23:44:22 2004 +++ b/drivers/char/isicom.c Thu Feb 19 23:44:22 2004 @@ -29,7 +29,7 @@ * You can find the original tools for this direct from Multitech * ftp://ftp.multitech.com/ISI-Cards/ * - * Having installed the cards the module options (/etc/modules.conf) + * Having installed the cards the module options (/etc/modprobe.conf) * * options isicom io=card1,card2,card3,card4 irq=card1,card2,card3,card4 * diff -Nru a/drivers/char/mem.c b/drivers/char/mem.c --- a/drivers/char/mem.c Thu Feb 19 23:44:25 2004 +++ b/drivers/char/mem.c Thu Feb 19 23:44:25 2004 @@ -11,8 +11,6 @@ #include #include #include -#include -#include #include #include #include diff -Nru a/drivers/char/raw.c b/drivers/char/raw.c --- a/drivers/char/raw.c Thu Feb 19 23:44:26 2004 +++ b/drivers/char/raw.c Thu Feb 19 23:44:26 2004 @@ -60,7 +60,7 @@ if (!bdev) goto out; igrab(bdev->bd_inode); - err = blkdev_get(bdev, filp->f_mode, 0, BDEV_RAW); + err = blkdev_get(bdev, filp->f_mode, 0); if (err) goto out; err = bd_claim(bdev, raw_open); @@ -81,7 +81,7 @@ out2: bd_release(bdev); out1: - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); out: up(&raw_mutex); return err; @@ -106,7 +106,7 @@ up(&raw_mutex); bd_release(bdev); - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); return 0; } diff -Nru a/drivers/char/sn_serial.c b/drivers/char/sn_serial.c --- a/drivers/char/sn_serial.c Thu Feb 19 23:44:28 2004 +++ b/drivers/char/sn_serial.c Thu Feb 19 23:44:28 2004 @@ -259,7 +259,7 @@ va_list args; va_start(args, fmt); - printed_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args); + printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args); early_printk_sn_sal(printk_buf, printed_len); va_end(args); return printed_len; diff -Nru a/drivers/char/viocons.c b/drivers/char/viocons.c --- a/drivers/char/viocons.c Thu Feb 19 23:44:22 2004 +++ b/drivers/char/viocons.c Thu Feb 19 23:44:22 2004 @@ -149,7 +149,7 @@ spin_lock_irqsave(&consoleloglock, flags); va_start(args, fmt); - i = vsnprintf(buf, sizeof(buf) - 1, fmt, args); + i = vscnprintf(buf, sizeof(buf) - 1, fmt, args); va_end(args); buf[i++] = '\r'; HvCall_writeLogBuffer(buf, i); diff -Nru a/drivers/char/vt.c b/drivers/char/vt.c --- a/drivers/char/vt.c Thu Feb 19 23:44:27 2004 +++ b/drivers/char/vt.c Thu Feb 19 23:44:27 2004 @@ -1883,14 +1883,24 @@ int c, tc, ok, n = 0, draw_x = -1; unsigned int currcons; unsigned long draw_from = 0, draw_to = 0; - struct vt_struct *vt = (struct vt_struct *)tty->driver_data; + struct vt_struct *vt; u16 himask, charmask; const unsigned char *orig_buf = NULL; int orig_count; if (in_interrupt()) return count; - + + might_sleep(); + + acquire_console_sem(); + vt = (struct vt_struct *)tty->driver_data; + if (vt == NULL) { + printk(KERN_ERR "vt: argh, driver_data is NULL !\n"); + release_console_sem(); + return 0; + } + currcons = vt->vc_num; if (!vc_cons_allocated(currcons)) { /* could this happen? */ @@ -1899,13 +1909,16 @@ error = 1; printk("con_write: tty %d not allocated\n", currcons+1); } + release_console_sem(); return 0; } + release_console_sem(); orig_buf = buf; orig_count = count; if (from_user) { + down(&con_buf_sem); again: @@ -1929,6 +1942,13 @@ acquire_console_sem(); + vt = (struct vt_struct *)tty->driver_data; + if (vt == NULL) { + printk(KERN_ERR "vt: argh, driver_data _became_ NULL !\n"); + release_console_sem(); + goto out; + } + himask = hi_font_mask; charmask = himask ? 0x1ff : 0xff; @@ -2442,14 +2462,16 @@ acquire_console_sem(); i = vc_allocate(currcons); - release_console_sem(); - if (i) + if (i) { + release_console_sem(); return i; - + } vt_cons[currcons]->vc_num = currcons; tty->driver_data = vt_cons[currcons]; vc_cons[currcons].d->vc_tty = tty; + release_console_sem(); + if (!tty->winsize.ws_row && !tty->winsize.ws_col) { tty->winsize.ws_row = video_num_lines; tty->winsize.ws_col = video_num_columns; @@ -2467,10 +2489,12 @@ return; vcs_remove_devfs(tty); + acquire_console_sem(); vt = (struct vt_struct*)tty->driver_data; if (vt) vc_cons[vt->vc_num].d->vc_tty = NULL; tty->driver_data = 0; + release_console_sem(); } static void vc_init(unsigned int currcons, unsigned int rows, unsigned int cols, int do_clear) diff -Nru a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c --- a/drivers/cpufreq/cpufreq.c Thu Feb 19 23:44:23 2004 +++ b/drivers/cpufreq/cpufreq.c Thu Feb 19 23:44:23 2004 @@ -198,7 +198,7 @@ else if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) return sprintf(buf, "performance\n"); else if (policy->governor) - return snprintf(buf, CPUFREQ_NAME_LEN, "%s\n", policy->governor->name); + return scnprintf(buf, CPUFREQ_NAME_LEN, "%s\n", policy->governor->name); return -EINVAL; } @@ -234,7 +234,7 @@ */ static ssize_t show_scaling_driver (struct cpufreq_policy * policy, char *buf) { - return snprintf(buf, CPUFREQ_NAME_LEN, "%s\n", cpufreq_driver->name); + return scnprintf(buf, CPUFREQ_NAME_LEN, "%s\n", cpufreq_driver->name); } /** @@ -254,7 +254,7 @@ list_for_each_entry(t, &cpufreq_governor_list, governor_list) { if (i >= (ssize_t) ((PAGE_SIZE / sizeof(char)) - (CPUFREQ_NAME_LEN + 2))) goto out; - i += snprintf(&buf[i], CPUFREQ_NAME_LEN, "%s ", t->name); + i += scnprintf(&buf[i], CPUFREQ_NAME_LEN, "%s ", t->name); } out: i += sprintf(&buf[i], "\n"); diff -Nru a/drivers/cpufreq/proc_intf.c b/drivers/cpufreq/proc_intf.c --- a/drivers/cpufreq/proc_intf.c Thu Feb 19 23:44:23 2004 +++ b/drivers/cpufreq/proc_intf.c Thu Feb 19 23:44:23 2004 @@ -139,7 +139,7 @@ break; } } else - p += snprintf(p, CPUFREQ_NAME_LEN, "%s\n", policy.governor->name); + p += scnprintf(p, CPUFREQ_NAME_LEN, "%s\n", policy.governor->name); } end: len = (p - page); diff -Nru a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c --- a/drivers/ide/ide-cd.c Thu Feb 19 23:44:25 2004 +++ b/drivers/ide/ide-cd.c Thu Feb 19 23:44:25 2004 @@ -3517,7 +3517,7 @@ printk("%s: Can't allocate a cdrom structure\n", drive->name); goto failed; } - if (ide_register_subdriver(drive, &ide_cdrom_driver, IDE_SUBDRIVER_VERSION)) { + if (ide_register_subdriver(drive, &ide_cdrom_driver)) { printk("%s: Failed to register the driver with ide.c\n", drive->name); kfree(info); diff -Nru a/drivers/ide/ide-default.c b/drivers/ide/ide-default.c --- a/drivers/ide/ide-default.c Thu Feb 19 23:44:28 2004 +++ b/drivers/ide/ide-default.c Thu Feb 19 23:44:28 2004 @@ -51,8 +51,7 @@ static int idedefault_attach (ide_drive_t *drive) { - if (ide_register_subdriver(drive, - &idedefault_driver, IDE_SUBDRIVER_VERSION)) { + if (ide_register_subdriver(drive, &idedefault_driver)) { printk(KERN_ERR "ide-default: %s: Failed to register the " "driver with ide.c\n", drive->name); return 1; diff -Nru a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c --- a/drivers/ide/ide-disk.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/ide-disk.c Thu Feb 19 23:44:24 2004 @@ -834,13 +834,6 @@ ide_end_drive_cmd(drive, stat, err); return ide_stopped; } -#if 0 - else if (rq->flags & REQ_DRIVE_TASKFILE) { - rq->errors = 1; - ide_end_taskfile(drive, stat, err); - return ide_stopped; - } -#endif #ifdef CONFIG_IDE_TASKFILE_IO /* make rq completion pointers new submission pointers */ blk_rq_prep_restart(rq); @@ -1700,7 +1693,6 @@ .busy = 0, .supports_dsc_overlap = 0, .cleanup = idedisk_cleanup, - .flushcache = do_idedisk_flushcache, .do_request = ide_do_rw_disk, .sense = idedisk_dump_status, .error = idedisk_error, @@ -1829,7 +1821,7 @@ if (drive->media != ide_disk) goto failed; - if (ide_register_subdriver (drive, &idedisk_driver, IDE_SUBDRIVER_VERSION)) { + if (ide_register_subdriver(drive, &idedisk_driver)) { printk (KERN_ERR "ide-disk: %s: Failed to register the driver with ide.c\n", drive->name); goto failed; } diff -Nru a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c --- a/drivers/ide/ide-floppy.c Thu Feb 19 23:44:25 2004 +++ b/drivers/ide/ide-floppy.c Thu Feb 19 23:44:25 2004 @@ -2055,7 +2055,7 @@ printk (KERN_ERR "ide-floppy: %s: Can't allocate a floppy structure\n", drive->name); goto failed; } - if (ide_register_subdriver (drive, &idefloppy_driver, IDE_SUBDRIVER_VERSION)) { + if (ide_register_subdriver(drive, &idefloppy_driver)) { printk (KERN_ERR "ide-floppy: %s: Failed to register the driver with ide.c\n", drive->name); kfree (floppy); goto failed; diff -Nru a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c --- a/drivers/ide/ide-io.c Thu Feb 19 23:44:27 2004 +++ b/drivers/ide/ide-io.c Thu Feb 19 23:44:27 2004 @@ -300,7 +300,6 @@ if (rq->flags & REQ_DRIVE_TASKFILE) { rq->errors = 1; ide_end_drive_cmd(drive, stat, err); -// ide_end_taskfile(drive, stat, err); return ide_stopped; } @@ -387,7 +386,6 @@ if (rq->flags & REQ_DRIVE_TASKFILE) { rq->errors = 1; ide_end_drive_cmd(drive, BUSY_STAT, 0); -// ide_end_taskfile(drive, BUSY_STAT, 0); return ide_stopped; } diff -Nru a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c --- a/drivers/ide/ide-probe.c Thu Feb 19 23:44:26 2004 +++ b/drivers/ide/ide-probe.c Thu Feb 19 23:44:26 2004 @@ -237,27 +237,9 @@ */ if (id->config & (1<<7)) drive->removable = 1; - - /* - * Prevent long system lockup probing later for non-existant - * slave drive if the hwif is actually a flash memory card of - * some variety: - */ - drive->is_flash = 0; - if (drive_is_flashcard(drive)) { -#if 0 - /* The new IDE adapter widgets don't follow this heuristic - so we must nowdays just bite the bullet and take the - probe hit */ - ide_drive_t *mate = &hwif->drives[1^drive->select.b.unit]; - ide_drive_t *mate = &hwif->drives[1^drive->select.b.unit]; - if (!mate->ata_flash) { - mate->present = 0; - mate->noprobe = 1; - } -#endif + + if (drive_is_flashcard(drive)) drive->is_flash = 1; - } drive->media = ide_disk; printk("%s DISK drive\n", (drive->is_flash) ? "CFA" : "ATA" ); QUIRK_LIST(drive); diff -Nru a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c --- a/drivers/ide/ide-proc.c Thu Feb 19 23:44:25 2004 +++ b/drivers/ide/ide-proc.c Thu Feb 19 23:44:25 2004 @@ -109,17 +109,6 @@ return -EINVAL; } -static struct proc_dir_entry * proc_ide_root = NULL; - -#ifdef CONFIG_BLK_DEV_IDEPCI -#include -/* - * This is the list of registered PCI chipset driver data structures. - */ -static ide_pci_host_proc_t * ide_pci_host_proc_list; - -#endif /* CONFIG_BLK_DEV_IDEPCI */ - static int proc_ide_write_config (struct file *file, const char *buffer, unsigned long count, void *data) { @@ -787,27 +776,16 @@ } } +EXPORT_SYMBOL(create_proc_ide_interfaces); + #ifdef CONFIG_BLK_DEV_IDEPCI -void ide_pci_register_host_proc (ide_pci_host_proc_t *p) +void ide_pci_create_host_proc(const char *name, get_info_t *get_info) { - ide_pci_host_proc_t *tmp; - - if (!p) return; - p->next = NULL; - p->set = 1; - if (ide_pci_host_proc_list) { - tmp = ide_pci_host_proc_list; - while (tmp->next) tmp = tmp->next; - tmp->next = p; - } else - ide_pci_host_proc_list = p; + create_proc_info_entry(name, 0, proc_ide_root, get_info); } -EXPORT_SYMBOL(ide_pci_register_host_proc); - -#endif /* CONFIG_BLK_DEV_IDEPCI */ - -EXPORT_SYMBOL(create_proc_ide_interfaces); +EXPORT_SYMBOL_GPL(ide_pci_create_host_proc); +#endif void destroy_proc_ide_interfaces(void) { @@ -846,45 +824,22 @@ void proc_ide_create(void) { -#ifdef CONFIG_BLK_DEV_IDEPCI - ide_pci_host_proc_t *p = ide_pci_host_proc_list; -#endif /* CONFIG_BLK_DEV_IDEPCI */ struct proc_dir_entry *entry; - proc_ide_root = proc_mkdir("ide", 0); - if (!proc_ide_root) return; + + if (!proc_ide_root) + return; create_proc_ide_interfaces(); entry = create_proc_entry("drivers", 0, proc_ide_root); if (entry) entry->proc_fops = &ide_drivers_operations; - -#ifdef CONFIG_BLK_DEV_IDEPCI - while (p != NULL) - { - if (p->name != NULL && p->set == 1 && p->get_info != NULL) - { - p->parent = proc_ide_root; - create_proc_info_entry(p->name, 0, p->parent, p->get_info); - p->set = 2; - } - p = p->next; - } -#endif /* CONFIG_BLK_DEV_IDEPCI */ } EXPORT_SYMBOL(proc_ide_create); void proc_ide_destroy(void) { -#ifdef CONFIG_BLK_DEV_IDEPCI - ide_pci_host_proc_t *p; - - for (p = ide_pci_host_proc_list; p; p = p->next) { - if (p->set == 2) - remove_proc_entry(p->name, p->parent); - } -#endif /* CONFIG_BLK_DEV_IDEPCI */ remove_proc_entry("ide/drivers", proc_ide_root); destroy_proc_ide_interfaces(); remove_proc_entry("ide", 0); diff -Nru a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c --- a/drivers/ide/ide-tape.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/ide-tape.c Thu Feb 19 23:44:24 2004 @@ -451,18 +451,6 @@ #include /* - * OnStream support - */ -#define ONSTREAM_DEBUG (0) -#define OS_CONFIG_PARTITION (0xff) -#define OS_DATA_PARTITION (0) -#define OS_PARTITION_VERSION (1) -#define OS_EW 300 -#define OS_ADR_MINREV 2 - -#define OS_DATA_STARTFRAME1 20 -#define OS_DATA_ENDFRAME1 2980 -/* * partition */ typedef struct os_partition_s { @@ -498,87 +486,6 @@ os_dat_entry_t dat_list[16]; } os_dat_t; -/* - * Frame types - */ -#define OS_FRAME_TYPE_FILL (0) -#define OS_FRAME_TYPE_EOD (1 << 0) -#define OS_FRAME_TYPE_MARKER (1 << 1) -#define OS_FRAME_TYPE_HEADER (1 << 3) -#define OS_FRAME_TYPE_DATA (1 << 7) - -/* - * AUX - */ -typedef struct os_aux_s { - __u32 format_id; /* hardware compatibility AUX is based on */ - char application_sig[4]; /* driver used to write this media */ - __u32 hdwr; /* reserved */ - __u32 update_frame_cntr; /* for configuration frame */ - __u8 frame_type; - __u8 frame_type_reserved; - __u8 reserved_18_19[2]; - os_partition_t partition; - __u8 reserved_36_43[8]; - __u32 frame_seq_num; - __u32 logical_blk_num_high; - __u32 logical_blk_num; - os_dat_t dat; - __u8 reserved188_191[4]; - __u32 filemark_cnt; - __u32 phys_fm; - __u32 last_mark_addr; - __u8 reserved204_223[20]; - - /* - * __u8 app_specific[32]; - * - * Linux specific fields: - */ - __u32 next_mark_addr; /* when known, points to next marker */ - __u8 linux_specific[28]; - - __u8 reserved_256_511[256]; -} os_aux_t; - -typedef struct os_header_s { - char ident_str[8]; - __u8 major_rev; - __u8 minor_rev; - __u8 reserved10_15[6]; - __u8 par_num; - __u8 reserved1_3[3]; - os_partition_t partition; -} os_header_t; - -/* - * OnStream Tape Parameters Page - */ -typedef struct { - unsigned page_code :6; /* Page code - Should be 0x2b */ - unsigned reserved1_6 :1; - unsigned ps :1; - __u8 reserved2; - __u8 density; /* kbpi */ - __u8 reserved3,reserved4; - __u16 segtrk; /* segment of per track */ - __u16 trks; /* tracks per tape */ - __u8 reserved5,reserved6,reserved7,reserved8,reserved9,reserved10; -} onstream_tape_paramtr_page_t; - -/* - * OnStream ADRL frame - */ -#define OS_FRAME_SIZE (32 * 1024 + 512) -#define OS_DATA_SIZE (32 * 1024) -#define OS_AUX_SIZE (512) - -/* - * internal error codes for onstream - */ -#define OS_PART_ERROR 2 -#define OS_WRITE_ERROR 1 - #include /**************************** Tunable parameters *****************************/ @@ -842,7 +749,6 @@ struct request rq; /* The corresponding request */ struct idetape_bh *bh; /* The data buffers */ struct idetape_stage_s *next; /* Pointer to the next stage */ - os_aux_t *aux; /* OnStream aux ptr */ } idetape_stage_t; /* @@ -1037,52 +943,6 @@ char write_prot; /* - * OnStream flags - */ - /* the tape is an OnStream tape */ - int onstream; - /* OnStream raw access (32.5KB block size) */ - int raw; - /* current number of frames in internal buffer */ - int cur_frames; - /* max number of frames in internal buffer */ - int max_frames; - /* logical block number */ - int logical_blk_num; - /* write pass counter */ - __u16 wrt_pass_cntr; - /* update frame counter */ - __u32 update_frame_cntr; - struct completion *waiting; - /* write error recovery active */ - int onstream_write_error; - /* header frame verified ok */ - int header_ok; - /* reading linux-specific media */ - int linux_media; - int linux_media_version; - /* application signature */ - char application_sig[5]; - int filemark_cnt; - int first_mark_addr; - int last_mark_addr; - int eod_frame_addr; - unsigned long cmd_start_time; - unsigned long max_cmd_time; - unsigned capacity; - - /* - * Optimize the number of "buffer filling" - * mode sense commands. - */ - /* last time in which we issued fill cmd */ - unsigned long last_buffer_fill; - /* buffer fill command requested */ - int req_buffer_fill; - int writes_since_buffer_fill; - int reads_since_buffer_fill; - - /* * Limit the number of times a request can * be postponed, to avoid an infinite postpone * deadlock. @@ -1468,7 +1328,6 @@ * Function declarations * */ -static void idetape_onstream_mode_sense_tape_parameter_page(ide_drive_t *drive, int debug); static int idetape_chrdev_release (struct inode *inode, struct file *filp); static void idetape_write_release (ide_drive_t *drive, unsigned int minor); @@ -1659,13 +1518,6 @@ #endif /* IDETAPE_DEBUG_LOG_VERBOSE */ #endif /* IDETAPE_DEBUG_LOG */ - if (tape->onstream && result->sense_key == 2 && - result->asc == 0x53 && result->ascq == 2) { - clear_bit(PC_DMA_ERROR, &pc->flags); - ide_stall_queue(drive, HZ / 2); - return; - } - /* * Correct pc->actually_transferred by asking the tape. */ @@ -1706,7 +1558,7 @@ set_bit(PC_ABORT, &pc->flags); } if (!test_bit(PC_ABORT, &pc->flags) && - (tape->onstream || pc->actually_transferred)) + pc->actually_transferred) pc->retries = IDETAPE_MAX_PC_RETRIES + 1; } } @@ -1868,11 +1720,6 @@ int error; int remove_stage = 0; idetape_stage_t *active_stage; -#if ONSTREAM_DEBUG - idetape_stage_t *stage; - os_aux_t *aux; - unsigned char *p; -#endif #if IDETAPE_DEBUG_LOG if (tape->debug_level >= 4) @@ -1897,50 +1744,11 @@ tape->active_data_request = NULL; tape->nr_pending_stages--; if (rq->cmd[0] & REQ_IDETAPE_WRITE) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) { - if (tape->onstream) { - stage = tape->first_stage; - aux = stage->aux; - p = stage->bh->b_data; - if (ntohl(aux->logical_blk_num) < 11300 && ntohl(aux->logical_blk_num) > 11100) - printk(KERN_INFO "ide-tape: finished writing logical blk %u (data %x %x %x %x)\n", ntohl(aux->logical_blk_num), *p++, *p++, *p++, *p++); - } - } -#endif - if (tape->onstream && !tape->raw) { - if (tape->first_frame_position == OS_DATA_ENDFRAME1) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk("ide-tape: %s: skipping over config partition.\n", tape->name); -#endif - tape->onstream_write_error = OS_PART_ERROR; - if (tape->waiting) { - rq->waiting = NULL; - complete(tape->waiting); - } - } - } remove_stage = 1; if (error) { set_bit(IDETAPE_PIPELINE_ERROR, &tape->flags); if (error == IDETAPE_ERROR_EOD) idetape_abort_pipeline(drive, active_stage); - if (tape->onstream && !tape->raw && - error == IDETAPE_ERROR_GENERAL && - tape->sense.sense_key == 3) { - clear_bit(IDETAPE_PIPELINE_ERROR, &tape->flags); - printk(KERN_ERR "ide-tape: %s: write error, enabling error recovery\n", tape->name); - tape->onstream_write_error = OS_WRITE_ERROR; - remove_stage = 0; - tape->nr_pending_stages++; - tape->next_stage = tape->first_stage; - rq->current_nr_sectors = rq->nr_sectors; - if (tape->waiting) { - rq->waiting = NULL; - complete(tape->waiting); - } - } } } else if (rq->cmd[0] & REQ_IDETAPE_READ) { if (error == IDETAPE_ERROR_EOD) { @@ -1948,7 +1756,7 @@ idetape_abort_pipeline(drive, active_stage); } } - if (tape->next_stage != NULL && !tape->onstream_write_error) { + if (tape->next_stage != NULL) { idetape_active_next_stage(drive); /* @@ -1956,7 +1764,6 @@ */ (void) ide_do_drive_cmd(drive, tape->active_data_request, ide_end); } else if (!error) { - if (!tape->onstream) idetape_increase_max_pipeline_stages(drive); } } @@ -2089,7 +1896,6 @@ idetape_pc_t *pc = tape->pc; unsigned int temp; - unsigned long cmd_time; #if SIMULATE_ERRORS static int error_sim_count = 0; #endif @@ -2139,8 +1945,6 @@ /* No more interrupts */ if (!status.b.drq) { - cmd_time = (jiffies - tape->cmd_start_time) * 1000 / HZ; - tape->max_cmd_time = max(cmd_time, tape->max_cmd_time); #if IDETAPE_DEBUG_LOG if (tape->debug_level >= 2) printk(KERN_INFO "ide-tape: Packet command completed, %d bytes transferred\n", pc->actually_transferred); @@ -2178,8 +1982,7 @@ return idetape_retry_pc(drive); } pc->error = 0; - if (!tape->onstream && - test_bit(PC_WAIT_FOR_DSC, &pc->flags) && + if (test_bit(PC_WAIT_FOR_DSC, &pc->flags) && !status.b.dsc) { /* Media access command */ tape->dsc_polling_start = jiffies; @@ -2333,7 +2136,6 @@ "a packet command\n"); return ide_do_reset(drive); } - tape->cmd_start_time = jiffies; /* Set the interrupt routine */ ide_set_handler(drive, &idetape_pc_intr, IDETAPE_WAIT_CMD, NULL); #ifdef CONFIG_BLK_DEV_IDEDMA @@ -2383,12 +2185,6 @@ tape->name, pc->c[0], tape->sense_key, tape->asc, tape->ascq); - if (tape->onstream && - pc->c[0] == IDETAPE_READ_CMD && - tape->sense_key == 3 && - tape->asc == 0x11) - /* AJN-1: 11 should be 0x11 */ - printk(KERN_ERR "ide-tape: %s: enabling read error recovery\n", tape->name); } /* Giving up */ pc->error = IDETAPE_ERROR_GENERAL; @@ -2482,48 +2278,6 @@ pc->callback = &idetape_pc_callback; } -static ide_startstop_t idetape_onstream_buffer_fill_callback (ide_drive_t *drive) -{ - idetape_tape_t *tape = drive->driver_data; - - tape->max_frames = tape->pc->buffer[4 + 2]; - tape->cur_frames = tape->pc->buffer[4 + 3]; - if (tape->chrdev_direction == idetape_direction_write) - tape->tape_head = tape->buffer_head - tape->cur_frames; - else - tape->tape_head = tape->buffer_head + tape->cur_frames; - if (tape->tape_head != tape->last_tape_head) { - tape->last_tape_head = tape->tape_head; - tape->tape_still_time_begin = jiffies; - if (tape->tape_still_time > 200) - tape->measure_insert_time = 1; - } - tape->tape_still_time = (jiffies - tape->tape_still_time_begin) * 1000 / HZ; -#if USE_IOTRACE - IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, - tape->tape_head, tape->minor); -#endif -#if IDETAPE_DEBUG_LOG - if (tape->debug_level >= 1) - printk(KERN_INFO "ide-tape: buffer fill callback, %d/%d\n", - tape->cur_frames, tape->max_frames); -#endif - idetape_end_request(drive, tape->pc->error ? 0 : 1, 0); - return ide_stopped; -} - -static void idetape_queue_onstream_buffer_fill (ide_drive_t *drive) -{ - idetape_pc_t *pc; - struct request *rq; - - pc = idetape_next_pc_storage(drive); - rq = idetape_next_rq_storage(drive); - idetape_create_mode_sense_cmd(pc, IDETAPE_BUFFER_FILLING_PAGE); - pc->callback = idetape_onstream_buffer_fill_callback; - idetape_queue_pc_head(drive, pc, rq); -} - static void calculate_speeds(ide_drive_t *drive) { idetape_tape_t *tape = drive->driver_data; @@ -2579,8 +2333,6 @@ idetape_pc_t *pc = tape->pc; atapi_status_t status; - if (tape->onstream) - printk(KERN_INFO "ide-tape: bug: onstream, media_access_finished\n"); status.all = HWIF(drive)->INB(IDE_STATUS_REG); if (status.b.dsc) { if (status.b.check) { @@ -2641,7 +2393,6 @@ static void idetape_create_read_cmd(idetape_tape_t *tape, idetape_pc_t *pc, unsigned int length, struct idetape_bh *bh) { - struct idetape_bh *p = bh; idetape_init_pc(pc); pc->c[0] = IDETAPE_READ_CMD; put_unaligned(htonl(length), (unsigned int *) &pc->c[1]); @@ -2650,23 +2401,9 @@ pc->bh = bh; atomic_set(&bh->b_count, 0); pc->buffer = NULL; - if (tape->onstream) { - while (p) { - atomic_set(&p->b_count, 0); - p = p->b_reqnext; - } - } - if (!tape->onstream) { - pc->request_transfer = pc->buffer_size = length * tape->tape_block_size; - if (pc->request_transfer == tape->stage_size) - set_bit(PC_DMA_RECOMMENDED, &pc->flags); - } else { - if (length) { - pc->request_transfer = pc->buffer_size = 32768 + 512; - set_bit(PC_DMA_RECOMMENDED, &pc->flags); - } else - pc->request_transfer = 0; - } + pc->request_transfer = pc->buffer_size = length * tape->tape_block_size; + if (pc->request_transfer == tape->stage_size) + set_bit(PC_DMA_RECOMMENDED, &pc->flags); } static void idetape_create_read_buffer_cmd(idetape_tape_t *tape, idetape_pc_t *pc, unsigned int length, struct idetape_bh *bh) @@ -2692,35 +2429,19 @@ static void idetape_create_write_cmd(idetape_tape_t *tape, idetape_pc_t *pc, unsigned int length, struct idetape_bh *bh) { - struct idetape_bh *p = bh; - idetape_init_pc(pc); pc->c[0] = IDETAPE_WRITE_CMD; put_unaligned(htonl(length), (unsigned int *) &pc->c[1]); pc->c[1] = 1; pc->callback = &idetape_rw_callback; set_bit(PC_WRITING, &pc->flags); - if (tape->onstream) { - while (p) { - atomic_set(&p->b_count, p->b_size); - p = p->b_reqnext; - } - } pc->bh = bh; pc->b_data = bh->b_data; pc->b_count = atomic_read(&bh->b_count); pc->buffer = NULL; - if (!tape->onstream) { - pc->request_transfer = pc->buffer_size = length * tape->tape_block_size; - if (pc->request_transfer == tape->stage_size) - set_bit(PC_DMA_RECOMMENDED, &pc->flags); - } else { - if (length) { - pc->request_transfer = pc->buffer_size = 32768 + 512; - set_bit(PC_DMA_RECOMMENDED, &pc->flags); - } else - pc->request_transfer = 0; - } + pc->request_transfer = pc->buffer_size = length * tape->tape_block_size; + if (pc->request_transfer == tape->stage_size) + set_bit(PC_DMA_RECOMMENDED, &pc->flags); } /* @@ -2782,65 +2503,14 @@ */ status.all = HWIF(drive)->INB(IDE_STATUS_REG); - /* - * The OnStream tape drive doesn't support DSC. Assume - * that DSC is always set. - */ - if (tape->onstream) - status.b.dsc = 1; if (!drive->dsc_overlap && !(rq->cmd[0] & REQ_IDETAPE_PC2)) set_bit(IDETAPE_IGNORE_DSC, &tape->flags); - /* - * For the OnStream tape, check the current status of the tape - * internal buffer using data gathered from the buffer fill - * mode page, and postpone our request, effectively "disconnecting" - * from the IDE bus, in case the buffer is full (writing) or - * empty (reading), and there is a danger that our request will - * hold the IDE bus during actual media access. - */ if (tape->tape_still_time > 100 && tape->tape_still_time < 200) tape->measure_insert_time = 1; - if (tape->req_buffer_fill && - (rq->cmd[0] & (REQ_IDETAPE_WRITE | REQ_IDETAPE_READ))) { - tape->req_buffer_fill = 0; - tape->writes_since_buffer_fill = 0; - tape->reads_since_buffer_fill = 0; - tape->last_buffer_fill = jiffies; - idetape_queue_onstream_buffer_fill(drive); - if (time_after(jiffies, tape->insert_time)) - tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time); - return ide_stopped; - } if (time_after(jiffies, tape->insert_time)) tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time); calculate_speeds(drive); - if (tape->onstream && tape->max_frames && - (((rq->cmd[0] & REQ_IDETAPE_WRITE) && - ( tape->cur_frames == tape->max_frames || - ( tape->speed_control && tape->cur_frames > 5 && - (tape->insert_speed > tape->max_insert_speed || - (0 /* tape->cur_frames > 30 && tape->tape_still_time > 200 */) ) ) ) ) || - ((rq->cmd[0] & REQ_IDETAPE_READ) && - ( tape->cur_frames == 0 || - ( tape->speed_control && (tape->cur_frames < tape->max_frames - 5) && - tape->insert_speed > tape->max_insert_speed ) ) && rq->nr_sectors) ) ) { -#if IDETAPE_DEBUG_LOG - if (tape->debug_level >= 4) - printk(KERN_INFO "ide-tape: postponing request, " - "cmd %ld, cur %d, max %d\n", - rq->cmd[0], tape->cur_frames, tape->max_frames); -#endif - if (tape->postpone_cnt++ < 500) { - status.b.dsc = 0; - tape->req_buffer_fill = 1; - } -#if ONSTREAM_DEBUG - else if (tape->debug_level >= 4) - printk(KERN_INFO "ide-tape: %s: postpone_cnt %d\n", - tape->name, tape->postpone_cnt); -#endif - } if (!test_and_clear_bit(IDETAPE_IGNORE_DSC, &tape->flags) && !status.b.dsc) { if (postponed_rq == NULL) { @@ -2867,13 +2537,6 @@ IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor); #endif tape->postpone_cnt = 0; - tape->reads_since_buffer_fill++; - if (tape->onstream) { - if (tape->cur_frames - tape->reads_since_buffer_fill <= 0) - tape->req_buffer_fill = 1; - if (time_after(jiffies, tape->last_buffer_fill + 5 * HZ / 100)) - tape->req_buffer_fill = 1; - } pc = idetape_next_pc_storage(drive); idetape_create_read_cmd(tape, pc, rq->current_nr_sectors, (struct idetape_bh *)rq->special); goto out; @@ -2884,14 +2547,6 @@ IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor); #endif tape->postpone_cnt = 0; - tape->writes_since_buffer_fill++; - if (tape->onstream) { - if (tape->cur_frames + tape->writes_since_buffer_fill >= tape->max_frames) - tape->req_buffer_fill = 1; - if (time_after(jiffies, tape->last_buffer_fill + 5 * HZ / 100)) - tape->req_buffer_fill = 1; - calculate_speeds(drive); - } pc = idetape_next_pc_storage(drive); idetape_create_write_cmd(tape, pc, rq->current_nr_sectors, (struct idetape_bh *)rq->special); goto out; @@ -2995,8 +2650,6 @@ bh->b_size -= tape->excess_bh_size; if (full) atomic_sub(tape->excess_bh_size, &bh->b_count); - if (tape->onstream) - stage->aux = (os_aux_t *) (bh->b_data + bh->b_size - OS_AUX_SIZE); return stage; abort: __idetape_kfree_stage(stage); @@ -3093,14 +2746,10 @@ static void idetape_switch_buffers (idetape_tape_t *tape, idetape_stage_t *stage) { struct idetape_bh *tmp; - os_aux_t *tmp_aux; tmp = stage->bh; - tmp_aux = stage->aux; stage->bh = tape->merge_stage->bh; - stage->aux = tape->merge_stage->aux; tape->merge_stage->bh = tmp; - tape->merge_stage->aux = tmp_aux; idetape_init_merge_stage(tape); } @@ -3131,68 +2780,6 @@ } /* - * Initialize the OnStream AUX - */ -static void idetape_init_stage (ide_drive_t *drive, idetape_stage_t *stage, int frame_type, int logical_blk_num) -{ - idetape_tape_t *tape = drive->driver_data; - os_aux_t *aux = stage->aux; - os_partition_t *par = &aux->partition; - os_dat_t *dat = &aux->dat; - - if (!tape->onstream || tape->raw) - return; - memset(aux, 0, sizeof(*aux)); - aux->format_id = htonl(0); - memcpy(aux->application_sig, "LIN3", 4); - aux->hdwr = htonl(0); - aux->frame_type = frame_type; - - if (frame_type == OS_FRAME_TYPE_HEADER) { - aux->update_frame_cntr = htonl(tape->update_frame_cntr); - par->partition_num = OS_CONFIG_PARTITION; - par->par_desc_ver = OS_PARTITION_VERSION; - par->wrt_pass_cntr = htons(0xffff); - par->first_frame_addr = htonl(0); - par->last_frame_addr = htonl(0xbb7); /* 2999 */ - aux->frame_seq_num = htonl(0); - aux->logical_blk_num_high = htonl(0); - aux->logical_blk_num = htonl(0); - aux->next_mark_addr = htonl(tape->first_mark_addr); - } else { - aux->update_frame_cntr = htonl(0); - par->partition_num = OS_DATA_PARTITION; - par->par_desc_ver = OS_PARTITION_VERSION; - par->wrt_pass_cntr = htons(tape->wrt_pass_cntr); - par->first_frame_addr = htonl(OS_DATA_STARTFRAME1); - par->last_frame_addr = htonl(tape->capacity); - aux->frame_seq_num = htonl(logical_blk_num); - aux->logical_blk_num_high = htonl(0); - aux->logical_blk_num = htonl(logical_blk_num); - dat->dat_sz = 8; - dat->reserved1 = 0; - dat->entry_cnt = 1; - dat->reserved3 = 0; - if (frame_type == OS_FRAME_TYPE_DATA) - dat->dat_list[0].blk_sz = htonl(32 * 1024); - else - dat->dat_list[0].blk_sz = 0; - dat->dat_list[0].blk_cnt = htons(1); - if (frame_type == OS_FRAME_TYPE_MARKER) - dat->dat_list[0].flags = OS_DAT_FLAGS_MARK; - else - dat->dat_list[0].flags = OS_DAT_FLAGS_DATA; - dat->dat_list[0].reserved = 0; - } - /* shouldn't this be htonl ?? */ - aux->filemark_cnt = ntohl(tape->filemark_cnt); - /* shouldn't this be htonl ?? */ - aux->phys_fm = ntohl(0xffffffff); - /* shouldn't this be htonl ?? */ - aux->last_mark_addr = ntohl(tape->last_mark_addr); -} - -/* * idetape_wait_for_request installs a completion in a pending request * and sleeps until it is serviced. * @@ -3211,11 +2798,9 @@ } #endif /* IDETAPE_DEBUG_BUGS */ rq->waiting = &wait; - tape->waiting = &wait; spin_unlock_irq(&tape->spinlock); wait_for_completion(&wait); /* The stage and its struct request have been deallocated */ - tape->waiting = NULL; spin_lock_irq(&tape->spinlock); } @@ -3269,13 +2854,9 @@ */ static void idetape_create_write_filemark_cmd (ide_drive_t *drive, idetape_pc_t *pc,int write_filemark) { - idetape_tape_t *tape = drive->driver_data; - idetape_init_pc(pc); pc->c[0] = IDETAPE_WRITE_FILEMARK_CMD; - if (tape->onstream) - pc->c[1] = 1; /* Immed bit */ - pc->c[4] = write_filemark; /* not used for OnStream ?? */ + pc->c[4] = write_filemark; set_bit(PC_WAIT_FOR_DSC, &pc->flags); pc->callback = &idetape_pc_callback; } @@ -3318,16 +2899,9 @@ static void idetape_create_load_unload_cmd (ide_drive_t *drive, idetape_pc_t *pc,int cmd) { - idetape_tape_t *tape = drive->driver_data; - idetape_init_pc(pc); pc->c[0] = IDETAPE_LOAD_UNLOAD_CMD; pc->c[4] = cmd; - if (tape->onstream) { - pc->c[1] = 1; - if (cmd == !IDETAPE_LU_LOAD_MASK) - pc->c[4] = 4; - } set_bit(PC_WAIT_FOR_DSC, &pc->flags); pc->callback = &idetape_pc_callback; } @@ -3366,20 +2940,7 @@ static int idetape_queue_pc_tail (ide_drive_t *drive,idetape_pc_t *pc) { - idetape_tape_t *tape = drive->driver_data; - int rc; - - rc = __idetape_queue_pc_tail(drive, pc); - if (rc) - return rc; - if (tape->onstream && test_bit(PC_WAIT_FOR_DSC, &pc->flags)) { - /* AJN-4: Changed from 5 to 10 minutes; - * because retension takes approx. - * 8:20 with Onstream 30GB tape - */ - rc = idetape_wait_ready(drive, 60 * 10 * HZ); - } - return rc; + return __idetape_queue_pc_tail(drive, pc); } static int idetape_flush_tape_buffers (ide_drive_t *drive) @@ -3422,23 +2983,11 @@ static void idetape_create_locate_cmd (ide_drive_t *drive, idetape_pc_t *pc, unsigned int block, u8 partition, int skip) { - idetape_tape_t *tape = drive->driver_data; - idetape_init_pc(pc); pc->c[0] = IDETAPE_LOCATE_CMD; - if (tape->onstream) - pc->c[1] = 1; /* Immediate bit */ - else - pc->c[1] = 2; + pc->c[1] = 2; put_unaligned(htonl(block), (unsigned int *) &pc->c[3]); pc->c[8] = partition; - if (tape->onstream) - /* - * Set SKIP bit. - * In case of write error this will write buffered - * data in the drive to this new position! - */ - pc->c[9] = skip << 7; set_bit(PC_WAIT_FOR_DSC, &pc->flags); pc->callback = &idetape_pc_callback; } @@ -3539,10 +3088,6 @@ cnt = __idetape_discard_read_pipeline(drive); if (restore_position) { position = idetape_read_position(drive); -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: address %u, nr_stages %d\n", position, cnt); -#endif seek = position > cnt ? position - cnt : 0; if (idetape_position_tape(drive, seek, 0, 0)) { printk(KERN_INFO "ide-tape: %s: position_tape failed in discard_pipeline()\n", tape->name); @@ -3551,15 +3096,6 @@ } } -static void idetape_update_stats (ide_drive_t *drive) -{ - idetape_pc_t pc; - - idetape_create_mode_sense_cmd(&pc, IDETAPE_BUFFER_FILLING_PAGE); - pc.callback = idetape_onstream_buffer_fill_callback; - (void) idetape_queue_pc_tail(drive, &pc); -} - /* * idetape_queue_rw_tail generates a read/write request for the block * device interface and wait for it to be serviced. @@ -3584,8 +3120,6 @@ rq.special = (void *)bh; rq.sector = tape->first_frame_position; rq.nr_sectors = rq.current_nr_sectors = blocks; - if (tape->onstream) - tape->postpone_cnt = 600; (void) ide_do_drive_cmd(drive, &rq, ide_wait); if ((cmd & (REQ_IDETAPE_READ | REQ_IDETAPE_WRITE)) == 0) @@ -3599,108 +3133,6 @@ } /* - * Read back the drive's internal buffer contents, as a part - * of the write error recovery mechanism for old OnStream - * firmware revisions. - */ -static void idetape_onstream_read_back_buffer (ide_drive_t *drive) -{ - idetape_tape_t *tape = drive->driver_data; - int frames, i, logical_blk_num; - idetape_stage_t *stage, *first = NULL, *last = NULL; - os_aux_t *aux; - struct request *rq; - unsigned char *p; - unsigned long flags; - - idetape_update_stats(drive); - frames = tape->cur_frames; - logical_blk_num = ntohl(tape->first_stage->aux->logical_blk_num) - frames; - printk(KERN_INFO "ide-tape: %s: reading back %d frames from the drive's internal buffer\n", tape->name, frames); - for (i = 0; i < frames; i++) { - stage = __idetape_kmalloc_stage(tape, 0, 0); - if (!first) - first = stage; - aux = stage->aux; - p = stage->bh->b_data; - idetape_queue_rw_tail(drive, REQ_IDETAPE_READ_BUFFER, tape->capabilities.ctl, stage->bh); -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: read back logical block %d, data %x %x %x %x\n", tape->name, logical_blk_num, *p++, *p++, *p++, *p++); -#endif - rq = &stage->rq; - idetape_init_rq(rq, REQ_IDETAPE_WRITE); - rq->sector = tape->first_frame_position; - rq->nr_sectors = rq->current_nr_sectors = tape->capabilities.ctl; - idetape_init_stage(drive, stage, OS_FRAME_TYPE_DATA, logical_blk_num++); - stage->next = NULL; - if (last) - last->next = stage; - last = stage; - } - if (frames) { - spin_lock_irqsave(&tape->spinlock, flags); - last->next = tape->first_stage; - tape->next_stage = tape->first_stage = first; - tape->nr_stages += frames; - tape->nr_pending_stages += frames; - spin_unlock_irqrestore(&tape->spinlock, flags); - } - idetape_update_stats(drive); -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: frames left in buffer: %d\n", tape->name, tape->cur_frames); -#endif -} - -/* - * Error recovery algorithm for the OnStream tape. - */ -static void idetape_onstream_write_error_recovery (ide_drive_t *drive) -{ - idetape_tape_t *tape = drive->driver_data; - unsigned int block; - - if (tape->onstream_write_error == OS_WRITE_ERROR) { - printk(KERN_ERR "ide-tape: %s: onstream_write_error_recovery: detected physical bad block at %u, logical %u first frame %u last_frame %u bufblocks %u stages %u skipping %u frames\n", - tape->name, ntohl(tape->sense.information), tape->logical_blk_num, - tape->first_frame_position, tape->last_frame_position, - tape->blocks_in_buffer, tape->nr_stages, - (ntohl(tape->sense.command_specific) >> 16) & 0xff ); - block = ntohl(tape->sense.information) + ((ntohl(tape->sense.command_specific) >> 16) & 0xff); - idetape_update_stats(drive); - printk(KERN_ERR "ide-tape: %s: relocating %d buffered logical blocks to physical block %u\n", tape->name, tape->cur_frames, block); -#if 0 /* isn't once enough ??? MM */ - idetape_update_stats(drive); -#endif - if (tape->firmware_revision_num >= 106) - idetape_position_tape(drive, block, 0, 1); - else { - idetape_onstream_read_back_buffer(drive); - idetape_position_tape(drive, block, 0, 0); - } -#if 0 /* already done in idetape_position_tape MM */ - idetape_read_position(drive); -#endif -#if ONSTREAM_DEBUG - if (tape->debug_level >= 1) - printk(KERN_ERR "ide-tape: %s: positioning complete, cur_frames %d, pos %d, tape pos %d\n", tape->name, tape->cur_frames, tape->first_frame_position, tape->last_frame_position); -#endif - } else if (tape->onstream_write_error == OS_PART_ERROR) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 1) - printk(KERN_INFO "ide-tape: %s: skipping over config partition\n", tape->name); -#endif - idetape_flush_tape_buffers(drive); - block = idetape_read_position(drive); - if (block != OS_DATA_ENDFRAME1) - printk(KERN_ERR "ide-tape: warning, current position %d, expected %d\n", block, OS_DATA_ENDFRAME1); - idetape_position_tape(drive, 0xbb8, 0, 0); /* 3000 */ - } - tape->onstream_write_error = 0; -} - -/* * idetape_insert_pipeline_into_queue is used to start servicing the * pipeline stages, starting from tape->next_stage. */ @@ -3711,8 +3143,6 @@ if (tape->next_stage == NULL) return; if (!idetape_pipeline_active(tape)) { - if (tape->onstream_write_error) - idetape_onstream_write_error_recovery(drive); set_bit(IDETAPE_PIPELINE_ACTIVE, &tape->flags); idetape_active_next_stage(drive); (void) ide_do_drive_cmd(drive, tape->active_data_request, ide_end); @@ -3729,16 +3159,13 @@ static void idetape_create_rewind_cmd (ide_drive_t *drive, idetape_pc_t *pc) { - idetape_tape_t *tape = drive->driver_data; - idetape_init_pc(pc); pc->c[0] = IDETAPE_REWIND_CMD; - if (tape->onstream) - pc->c[1] = 1; set_bit(PC_WAIT_FOR_DSC, &pc->flags); pc->callback = &idetape_pc_callback; } +#if 0 static void idetape_create_mode_select_cmd (idetape_pc_t *pc, int length) { idetape_init_pc(pc); @@ -3749,6 +3176,7 @@ pc->request_transfer = 255; pc->callback = &idetape_pc_callback; } +#endif static void idetape_create_erase_cmd (idetape_pc_t *pc) { @@ -3769,82 +3197,6 @@ pc->callback = &idetape_pc_callback; } -/* - * Verify that we have the correct tape frame - */ -static int idetape_verify_stage (ide_drive_t *drive, idetape_stage_t *stage, int logical_blk_num, int quiet) -{ - idetape_tape_t *tape = drive->driver_data; - os_aux_t *aux = stage->aux; - os_partition_t *par = &aux->partition; - struct request *rq = &stage->rq; - struct idetape_bh *bh; - - if (!tape->onstream) - return 1; - if (tape->raw) { - if (rq->errors) { - bh = stage->bh; - while (bh) { - memset(bh->b_data, 0, bh->b_size); - bh = bh->b_reqnext; - } - strcpy(stage->bh->b_data, "READ ERROR ON FRAME"); - } - return 1; - } - if (rq->errors == IDETAPE_ERROR_GENERAL) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, read error\n", tape->name, tape->first_frame_position); - return 0; - } - if (rq->errors == IDETAPE_ERROR_EOD) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, eod\n", tape->name, tape->first_frame_position); - return 0; - } - if (ntohl(aux->format_id) != 0) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, format_id %u\n", tape->name, tape->first_frame_position, ntohl(aux->format_id)); - return 0; - } - if (memcmp(aux->application_sig, tape->application_sig, 4) != 0) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, incorrect application signature\n", tape->name, tape->first_frame_position); - return 0; - } - if (aux->frame_type != OS_FRAME_TYPE_DATA && - aux->frame_type != OS_FRAME_TYPE_EOD && - aux->frame_type != OS_FRAME_TYPE_MARKER) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, frame type %x\n", tape->name, tape->first_frame_position, aux->frame_type); - return 0; - } - if (par->partition_num != OS_DATA_PARTITION) { - if (!tape->linux_media || tape->linux_media_version != 2) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, partition num %d\n", tape->name, tape->first_frame_position, par->partition_num); - return 0; - } - } - if (par->par_desc_ver != OS_PARTITION_VERSION) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, partition version %d\n", tape->name, tape->first_frame_position, par->par_desc_ver); - return 0; - } - if (ntohs(par->wrt_pass_cntr) != tape->wrt_pass_cntr) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, wrt_pass_cntr %d (expected %d)(logical_blk_num %u)\n", tape->name, tape->first_frame_position, ntohs(par->wrt_pass_cntr), tape->wrt_pass_cntr, ntohl(aux->logical_blk_num)); - return 0; - } - if (aux->frame_seq_num != aux->logical_blk_num) { - printk(KERN_INFO "ide-tape: %s: skipping frame %d, seq != logical\n", tape->name, tape->first_frame_position); - return 0; - } - if (logical_blk_num != -1 && ntohl(aux->logical_blk_num) != logical_blk_num) { - if (!quiet) - printk(KERN_INFO "ide-tape: %s: skipping frame %d, logical_blk_num %u (expected %d)\n", tape->name, tape->first_frame_position, ntohl(aux->logical_blk_num), logical_blk_num); - return 0; - } - if (aux->frame_type == OS_FRAME_TYPE_MARKER) { - rq->errors = IDETAPE_ERROR_FILEMARK; - rq->current_nr_sectors = rq->nr_sectors; - } - return 1; -} - static void idetape_wait_first_stage (ide_drive_t *drive) { idetape_tape_t *tape = drive->driver_data; @@ -3909,8 +3261,6 @@ rq->nr_sectors = rq->current_nr_sectors = blocks; idetape_switch_buffers(tape, new_stage); - idetape_init_stage(drive, new_stage, OS_FRAME_TYPE_DATA, tape->logical_blk_num); - tape->logical_blk_num++; idetape_add_stage_tail(drive, new_stage); tape->pipeline_head++; #if USE_IOTRACE @@ -3924,15 +3274,6 @@ * writing anymore, wait for the pipeline to be full enough * (90%) before starting to service requests, so that we will * be able to keep up with the higher speeds of the tape. - * - * For the OnStream drive, we can query the number of pending - * frames in the drive's internal buffer. As long as the tape - * is still writing, it is better to write frames immediately - * rather than gather them in the pipeline. This will give the - * tape's firmware the ability to sense the current incoming - * data rate more accurately, and since the OnStream tape - * supports variable speeds, it can try to adjust itself to the - * incoming data rate. */ if (!idetape_pipeline_active(tape)) { if (tape->nr_stages >= tape->max_stages * 9 / 10 || @@ -3942,10 +3283,6 @@ tape->insert_size = 0; tape->insert_speed = 0; idetape_insert_pipeline_into_queue(drive); - } else if (tape->onstream) { - idetape_update_stats(drive); - if (tape->cur_frames > 5) - idetape_insert_pipeline_into_queue(drive); } } if (test_and_clear_bit(IDETAPE_PIPELINE_ERROR, &tape->flags)) @@ -4052,7 +3389,6 @@ tape->restart_speed_control_req = 0; tape->pipeline_head = 0; - tape->buffer_head = tape->tape_head = tape->cur_frames; tape->controlled_last_pipeline_head = tape->uncontrolled_last_pipeline_head = 0; tape->controlled_previous_pipeline_head = tape->uncontrolled_previous_pipeline_head = 0; tape->pipeline_head_speed = tape->controlled_pipeline_head_speed = 5000; @@ -4084,7 +3420,6 @@ if ((tape->merge_stage = __idetape_kmalloc_stage(tape, 0, 0)) == NULL) return -ENOMEM; tape->chrdev_direction = idetape_direction_read; - tape->logical_blk_num = 0; /* * Issue a read 0 command to ensure that DSC handshake @@ -4126,89 +3461,11 @@ tape->insert_size = 0; tape->insert_speed = 0; idetape_insert_pipeline_into_queue(drive); - } else if (tape->onstream) { - idetape_update_stats(drive); - if (tape->cur_frames < tape->max_frames - 5) - idetape_insert_pipeline_into_queue(drive); } } return 0; } -static int idetape_get_logical_blk (ide_drive_t *drive, int logical_blk_num, int max_stages, int quiet) -{ - idetape_tape_t *tape = drive->driver_data; - unsigned long flags; - int cnt = 0, x, position; - - /* - * Search and wait for the next logical tape block - */ - while (1) { - if (cnt++ > 1000) { /* AJN: was 100 */ - printk(KERN_INFO "ide-tape: %s: couldn't find logical block %d, aborting\n", tape->name, logical_blk_num); - return 0; - } - idetape_initiate_read(drive, max_stages); - if (tape->first_stage == NULL) { - if (tape->onstream) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 1) - printk(KERN_INFO "ide-tape: %s: first_stage == NULL, pipeline error %ld\n", tape->name, (long)test_bit(IDETAPE_PIPELINE_ERROR, &tape->flags)); -#endif - clear_bit(IDETAPE_PIPELINE_ERROR, &tape->flags); - position = idetape_read_position(drive); - printk(KERN_INFO "ide-tape: %s: blank block detected at %d\n", tape->name, position); - if (position >= 3000 && position < 3080) - /* Why is this check and number ??? MM */ - position += 32; - if (position >= OS_DATA_ENDFRAME1 && - position < 3000) - position = 3000; - else - /* - * compensate for write errors that - * generally skip 80 frames, expect - * around 20 read errors in a row... - */ - position += 60; - if (position >= OS_DATA_ENDFRAME1 && - position < 3000) - position = 3000; - printk(KERN_INFO "ide-tape: %s: positioning tape to block %d\n", tape->name, position); - - /* seems to be needed to correctly position - * at block 3000 MM - */ - if (position == 3000) - idetape_position_tape(drive, 0, 0, 0); - idetape_position_tape(drive, position, 0, 0); - cnt += 40; - continue; - } else - return 0; - } - idetape_wait_first_stage(drive); - if (idetape_verify_stage(drive, tape->first_stage, logical_blk_num, quiet)) - break; - if (tape->first_stage->rq.errors == IDETAPE_ERROR_EOD) - cnt--; - if (idetape_verify_stage(drive, tape->first_stage, -1, quiet)) { - x = ntohl(tape->first_stage->aux->logical_blk_num); - if (x > logical_blk_num) { - printk(KERN_ERR "ide-tape: %s: couldn't find logical block %d, aborting (block %d found)\n", tape->name, logical_blk_num, x); - return 0; - } - } - spin_lock_irqsave(&tape->spinlock, flags); - idetape_remove_stage_head(drive); - spin_unlock_irqrestore(&tape->spinlock, flags); - } - if (tape->onstream) - tape->logical_blk_num = ntohl(tape->first_stage->aux->logical_blk_num); - return 1; -} - /* * idetape_add_chrdev_read_request is called from idetape_chrdev_read * to service a character device read request and add read-ahead @@ -4233,48 +3490,30 @@ return 0; /* - * Wait for the next logical block to be available at the head + * Wait for the next block to be available at the head * of the pipeline */ - if (!idetape_get_logical_blk(drive, tape->logical_blk_num, tape->max_stages, 0)) { - if (tape->onstream) { - set_bit(IDETAPE_READ_ERROR, &tape->flags); - return 0; - } + idetape_initiate_read(drive, tape->max_stages); + if (tape->first_stage == NULL) { if (test_bit(IDETAPE_PIPELINE_ERROR, &tape->flags)) - return 0; + return 0; return idetape_queue_rw_tail(drive, REQ_IDETAPE_READ, blocks, tape->merge_stage->bh); } + idetape_wait_first_stage(drive); rq_ptr = &tape->first_stage->rq; bytes_read = tape->tape_block_size * (rq_ptr->nr_sectors - rq_ptr->current_nr_sectors); rq_ptr->nr_sectors = rq_ptr->current_nr_sectors = 0; - if (tape->onstream && !tape->raw && - tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: EOD reached\n", - tape->name); -#endif - return 0; - } if (rq_ptr->errors == IDETAPE_ERROR_EOD) return 0; else { idetape_switch_buffers(tape, tape->first_stage); - if (rq_ptr->errors == IDETAPE_ERROR_GENERAL) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 1) - printk(KERN_INFO "ide-tape: error detected, bytes_read %d\n", bytes_read); -#endif - } if (rq_ptr->errors == IDETAPE_ERROR_FILEMARK) set_bit(IDETAPE_FILEMARK, &tape->flags); spin_lock_irqsave(&tape->spinlock, flags); idetape_remove_stage_head(drive); spin_unlock_irqrestore(&tape->spinlock, flags); - tape->logical_blk_num++; tape->pipeline_head++; #if USE_IOTRACE IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor); @@ -4342,8 +3581,8 @@ { int retval; idetape_pc_t pc; - idetape_tape_t *tape = drive->driver_data; #if IDETAPE_DEBUG_LOG + idetape_tape_t *tape = drive->driver_data; if (tape->debug_level >= 2) printk(KERN_INFO "ide-tape: Reached idetape_rewind_tape\n"); #endif /* IDETAPE_DEBUG_LOG */ @@ -4357,7 +3596,6 @@ retval = idetape_queue_pc_tail(drive, &pc); if (retval) return retval; - tape->logical_blk_num = 0; return 0; } @@ -4406,168 +3644,6 @@ set_bit(IDETAPE_IGNORE_DSC, &tape->flags); } -static int idetape_onstream_space_over_filemarks_backward (ide_drive_t *drive,short mt_op,int mt_count) -{ - idetape_tape_t *tape = drive->driver_data; - int cnt = 0; - int last_mark_addr; - unsigned long flags; - - if (!idetape_get_logical_blk(drive, -1, 10, 0)) { - printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_bwd\n", tape->name); - return -EIO; - } - while (cnt != mt_count) { - last_mark_addr = ntohl(tape->first_stage->aux->last_mark_addr); - if (last_mark_addr == -1) - return -EIO; -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: positioning to last mark at %d\n", last_mark_addr); -#endif - idetape_position_tape(drive, last_mark_addr, 0, 0); - cnt++; - if (!idetape_get_logical_blk(drive, -1, 10, 0)) { - printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks\n", tape->name); - return -EIO; - } - if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_MARKER) { - printk(KERN_INFO "ide-tape: %s: expected to find marker at block %d, not found\n", tape->name, last_mark_addr); - return -EIO; - } - } - if (mt_op == MTBSFM) { - spin_lock_irqsave(&tape->spinlock, flags); - idetape_remove_stage_head(drive); - tape->logical_blk_num++; - spin_unlock_irqrestore(&tape->spinlock, flags); - } - return 0; -} - -/* - * ADRL 1.1 compatible "slow" space filemarks fwd version - * - * Just scans for the filemark sequentially. - */ -static int idetape_onstream_space_over_filemarks_forward_slow (ide_drive_t *drive,short mt_op,int mt_count) -{ - idetape_tape_t *tape = drive->driver_data; - int cnt = 0; - unsigned long flags; - - if (!idetape_get_logical_blk(drive, -1, 10, 0)) { - printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_fwd\n", tape->name); - return -EIO; - } - while (1) { - if (!idetape_get_logical_blk(drive, -1, 10, 0)) { - printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks\n", tape->name); - return -EIO; - } - if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_MARKER) - cnt++; - if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: space_fwd: EOD reached\n", tape->name); -#endif - return -EIO; - } - if (cnt == mt_count) - break; - spin_lock_irqsave(&tape->spinlock, flags); - idetape_remove_stage_head(drive); - spin_unlock_irqrestore(&tape->spinlock, flags); - } - if (mt_op == MTFSF) { - spin_lock_irqsave(&tape->spinlock, flags); - idetape_remove_stage_head(drive); - tape->logical_blk_num++; - spin_unlock_irqrestore(&tape->spinlock, flags); - } - return 0; -} - - -/* - * Fast linux specific version of OnStream FSF - */ -static int idetape_onstream_space_over_filemarks_forward_fast (ide_drive_t *drive,short mt_op,int mt_count) -{ - idetape_tape_t *tape = drive->driver_data; - int cnt = 0, next_mark_addr; - unsigned long flags; - - if (!idetape_get_logical_blk(drive, -1, 10, 0)) { - printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_fwd\n", tape->name); - return -EIO; - } - - /* - * Find nearest (usually previous) marker - */ - while (1) { - if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_MARKER) - break; - if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: space_fwd: EOD reached\n", tape->name); -#endif - return -EIO; - } - if (ntohl(tape->first_stage->aux->filemark_cnt) == 0) { - if (tape->first_mark_addr == -1) { - printk(KERN_INFO "ide-tape: %s: reverting to slow filemark space\n", tape->name); - return idetape_onstream_space_over_filemarks_forward_slow(drive, mt_op, mt_count); - } - idetape_position_tape(drive, tape->first_mark_addr, 0, 0); - if (!idetape_get_logical_blk(drive, -1, 10, 0)) { - printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_fwd_fast\n", tape->name); - return -EIO; - } - if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_MARKER) { - printk(KERN_INFO "ide-tape: %s: expected to find filemark at %d\n", tape->name, tape->first_mark_addr); - return -EIO; - } - } else { - if (idetape_onstream_space_over_filemarks_backward(drive, MTBSF, 1) < 0) - return -EIO; - mt_count++; - } - } - cnt++; - while (cnt != mt_count) { - next_mark_addr = ntohl(tape->first_stage->aux->next_mark_addr); - if (!next_mark_addr || next_mark_addr > tape->eod_frame_addr) { - printk(KERN_INFO "ide-tape: %s: reverting to slow filemark space\n", tape->name); - return idetape_onstream_space_over_filemarks_forward_slow(drive, mt_op, mt_count - cnt); -#if ONSTREAM_DEBUG - } else if (tape->debug_level >= 2) { - printk(KERN_INFO "ide-tape: positioning to next mark at %d\n", next_mark_addr); -#endif - } - idetape_position_tape(drive, next_mark_addr, 0, 0); - cnt++; - if (!idetape_get_logical_blk(drive, -1, 10, 0)) { - printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks\n", tape->name); - return -EIO; - } - if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_MARKER) { - printk(KERN_INFO "ide-tape: %s: expected to find marker at block %d, not found\n", tape->name, next_mark_addr); - return -EIO; - } - } - if (mt_op == MTFSF) { - spin_lock_irqsave(&tape->spinlock, flags); - idetape_remove_stage_head(drive); - tape->logical_blk_num++; - spin_unlock_irqrestore(&tape->spinlock, flags); - } - return 0; -} - /* * idetape_space_over_filemarks is now a bit more complicated than just * passing the command to the tape since we may have crossed some @@ -4583,25 +3659,7 @@ idetape_pc_t pc; unsigned long flags; int retval,count=0; - int speed_control; - if (tape->onstream) { - if (tape->raw) - return -EIO; - speed_control = tape->speed_control; - tape->speed_control = 0; - if (mt_op == MTFSF || mt_op == MTFSFM) { - if (tape->linux_media) - retval = idetape_onstream_space_over_filemarks_forward_fast(drive, mt_op, mt_count); - else - retval = idetape_onstream_space_over_filemarks_forward_slow(drive, mt_op, mt_count); - } else - retval = idetape_onstream_space_over_filemarks_backward(drive, mt_op, mt_count); - tape->speed_control = speed_control; - tape->restart_speed_control_req = 1; - return retval; - } - if (mt_count == 0) return 0; if (MTBSF == mt_op || MTBSFM == mt_op) { @@ -4700,10 +3758,6 @@ /* "A request was outside the capabilities of the device." */ return -ENXIO; } - if (tape->onstream && (count != tape->tape_block_size)) { - printk(KERN_ERR "ide-tape: %s: use %d bytes as block size (%Zd used)\n", tape->name, tape->tape_block_size, count); - return -EINVAL; - } #if IDETAPE_DEBUG_LOG if (tape->debug_level >= 3) printk(KERN_INFO "ide-tape: Reached idetape_chrdev_read, count %Zd\n", count); @@ -4753,179 +3807,15 @@ idetape_space_over_filemarks(drive, MTFSF, 1); return 0; } - if (tape->onstream && !actually_read && - test_and_clear_bit(IDETAPE_READ_ERROR, &tape->flags)) { - printk(KERN_ERR "ide-tape: %s: unrecovered read error on " - "logical block number %d, skipping\n", - tape->name, tape->logical_blk_num); - tape->logical_blk_num++; - return -EIO; - } return actually_read; } -static void idetape_update_last_marker (ide_drive_t *drive, int last_mark_addr, int next_mark_addr) -{ - idetape_tape_t *tape = drive->driver_data; - idetape_stage_t *stage; - os_aux_t *aux; - int position; - - if (!tape->onstream || tape->raw) - return; - if (last_mark_addr == -1) - return; - stage = __idetape_kmalloc_stage(tape, 0, 0); - if (stage == NULL) - return; - idetape_flush_tape_buffers(drive); - position = idetape_read_position(drive); -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: current position (2) %d, " - "lblk %d\n", position, tape->logical_blk_num); - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: current position (2) " - "tape block %d\n", tape->last_frame_position); -#endif - idetape_position_tape(drive, last_mark_addr, 0, 0); - if (!idetape_queue_rw_tail(drive, REQ_IDETAPE_READ, 1, stage->bh)) { - printk(KERN_INFO "ide-tape: %s: couldn't read last marker\n", - tape->name); - __idetape_kfree_stage(stage); - idetape_position_tape(drive, position, 0, 0); - return; - } - aux = stage->aux; - if (aux->frame_type != OS_FRAME_TYPE_MARKER) { - printk(KERN_INFO "ide-tape: %s: expected to find marker " - "at addr %d\n", tape->name, last_mark_addr); - __idetape_kfree_stage(stage); - idetape_position_tape(drive, position, 0, 0); - return; - } -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: writing back marker\n"); -#endif - aux->next_mark_addr = htonl(next_mark_addr); - idetape_position_tape(drive, last_mark_addr, 0, 0); - if (!idetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, 1, stage->bh)) { - printk(KERN_INFO "ide-tape: %s: couldn't write back marker " - "frame at %d\n", tape->name, last_mark_addr); - __idetape_kfree_stage(stage); - idetape_position_tape(drive, position, 0, 0); - return; - } - __idetape_kfree_stage(stage); - idetape_flush_tape_buffers(drive); - idetape_position_tape(drive, position, 0, 0); - return; -} - -static void idetape_write_filler (ide_drive_t *drive, int block, int cnt) -{ - idetape_tape_t *tape = drive->driver_data; - idetape_stage_t *stage; - int rc; - - if (!tape->onstream || tape->raw) - return; - stage = __idetape_kmalloc_stage(tape, 1, 1); - if (stage == NULL) - return; - idetape_init_stage(drive, stage, OS_FRAME_TYPE_FILL, 0); - idetape_wait_ready(drive, 60 * 5 * HZ); - rc = idetape_position_tape(drive, block, 0, 0); -#if ONSTREAM_DEBUG - printk(KERN_INFO "write_filler: positioning failed it returned %d\n", rc); -#endif - if (rc != 0) - /* don't write fillers if we cannot position the tape. */ - return; - - strcpy(stage->bh->b_data, "Filler"); - while (cnt--) { - if (!idetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, 1, stage->bh)) { - printk(KERN_INFO "ide-tape: %s: write_filler: " - "couldn't write header frame\n", tape->name); - __idetape_kfree_stage(stage); - return; - } - } - __idetape_kfree_stage(stage); -} - -static void __idetape_write_header (ide_drive_t *drive, int block, int cnt) -{ - idetape_tape_t *tape = drive->driver_data; - idetape_stage_t *stage; - os_header_t header; - - stage = __idetape_kmalloc_stage(tape, 1, 1); - if (stage == NULL) - return; - idetape_init_stage(drive, stage, OS_FRAME_TYPE_HEADER, tape->logical_blk_num); - idetape_wait_ready(drive, 60 * 5 * HZ); - idetape_position_tape(drive, block, 0, 0); - memset(&header, 0, sizeof(header)); - strcpy(header.ident_str, "ADR_SEQ"); - header.major_rev = 1; - header.minor_rev = OS_ADR_MINREV; - header.par_num = 1; - header.partition.partition_num = OS_DATA_PARTITION; - header.partition.par_desc_ver = OS_PARTITION_VERSION; - header.partition.first_frame_addr = htonl(OS_DATA_STARTFRAME1); - header.partition.last_frame_addr = htonl(tape->capacity); - header.partition.wrt_pass_cntr = htons(tape->wrt_pass_cntr); - header.partition.eod_frame_addr = htonl(tape->eod_frame_addr); - memcpy(stage->bh->b_data, &header, sizeof(header)); - while (cnt--) { - if (!idetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, 1, stage->bh)) { - printk(KERN_INFO "ide-tape: %s: couldn't write " - "header frame\n", tape->name); - __idetape_kfree_stage(stage); - return; - } - } - __idetape_kfree_stage(stage); - idetape_flush_tape_buffers(drive); -} - -static void idetape_write_header (ide_drive_t *drive, int locate_eod) -{ - idetape_tape_t *tape = drive->driver_data; - -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: writing tape header\n", - tape->name); -#endif - if (!tape->onstream || tape->raw) - return; - tape->update_frame_cntr++; - __idetape_write_header(drive, 5, 5); - __idetape_write_header(drive, 0xbae, 5); /* 2990 */ - if (locate_eod) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: locating back to eod " - "frame addr %d\n", tape->name, - tape->eod_frame_addr); -#endif - idetape_position_tape(drive, tape->eod_frame_addr, 0, 0); - } -} - static ssize_t idetape_chrdev_write (struct file *file, const char *buf, size_t count, loff_t *ppos) { - struct inode *inode = file->f_dentry->d_inode; ide_drive_t *drive = file->private_data; idetape_tape_t *tape = drive->driver_data; - unsigned int minor = iminor(inode); ssize_t retval, actually_written = 0; - int position; if (ppos != &file->f_pos) { /* "A request was outside the capabilities of the device." */ @@ -4942,28 +3832,6 @@ "count %Zd\n", count); #endif /* IDETAPE_DEBUG_LOG */ - if (tape->onstream) { - if (count != tape->tape_block_size) { - printk(KERN_ERR "ide-tape: %s: chrdev_write: use %d " - "bytes as block size (%Zd used)\n", - tape->name, tape->tape_block_size, count); - return -EINVAL; - } - /* - * Check if we reach the end of the tape. Just assume the whole - * pipeline is filled with write requests! - */ - if (tape->first_frame_position + tape->nr_stages >= tape->capacity - OS_EW) { -#if ONSTREAM_DEBUG - printk(KERN_INFO, "chrdev_write: Write truncated at " - "EOM early warning"); -#endif - if (tape->chrdev_direction == idetape_direction_write) - idetape_write_release(drive, minor); - return -ENOSPC; - } - } - /* Initialize write operation */ if (tape->chrdev_direction != idetape_direction_write) { if (tape->chrdev_direction == idetape_direction_read) @@ -4980,39 +3848,6 @@ tape->chrdev_direction = idetape_direction_write; idetape_init_merge_stage(tape); - if (tape->onstream) { - position = idetape_read_position(drive); - if (position <= OS_DATA_STARTFRAME1) { - tape->logical_blk_num = 0; - tape->wrt_pass_cntr++; -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: logical block num 0, setting eod to %d\n", tape->name, OS_DATA_STARTFRAME1); - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: allocating new write pass counter %d\n", tape->name, tape->wrt_pass_cntr); -#endif - tape->filemark_cnt = 0; - tape->eod_frame_addr = OS_DATA_STARTFRAME1; - tape->first_mark_addr = tape->last_mark_addr = -1; - idetape_write_header(drive, 1); - } -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: positioning " - "tape to eod at %d\n", - tape->name, tape->eod_frame_addr); -#endif - position = idetape_read_position(drive); - if (position != tape->eod_frame_addr) - idetape_position_tape(drive, tape->eod_frame_addr, 0, 0); -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: " - "first_frame_position %d\n", - tape->name, tape->first_frame_position); -#endif - } - /* * Issue a write 0 command to ensure that DSC handshake * is switched from completion mode to buffer available @@ -5029,11 +3864,6 @@ return retval; } } -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk("ide-tape: first_frame_position %d\n", - tape->first_frame_position); -#endif } if (count == 0) return (0); @@ -5078,88 +3908,14 @@ static int idetape_write_filemark (ide_drive_t *drive) { - idetape_tape_t *tape = drive->driver_data; - int last_mark_addr; idetape_pc_t pc; - if (!tape->onstream) { - /* Write a filemark */ - idetape_create_write_filemark_cmd(drive, &pc, 1); - if (idetape_queue_pc_tail(drive, &pc)) { - printk(KERN_ERR "ide-tape: Couldn't write a filemark\n"); - return -EIO; - } - } else if (!tape->raw) { - last_mark_addr = idetape_read_position(drive); - tape->merge_stage = __idetape_kmalloc_stage(tape, 1, 0); - if (tape->merge_stage != NULL) { - idetape_init_stage(drive, tape->merge_stage, OS_FRAME_TYPE_MARKER, tape->logical_blk_num); - idetape_pad_zeros(drive, tape->stage_size); - tape->logical_blk_num++; - __idetape_kfree_stage(tape->merge_stage); - tape->merge_stage = NULL; - } - if (tape->filemark_cnt) - idetape_update_last_marker(drive, tape->last_mark_addr, last_mark_addr); - tape->last_mark_addr = last_mark_addr; - if (tape->filemark_cnt++ == 0) - tape->first_mark_addr = last_mark_addr; - } - return 0; -} - -static void idetape_write_eod (ide_drive_t *drive) -{ - idetape_tape_t *tape = drive->driver_data; - - if (!tape->onstream || tape->raw) - return; - tape->merge_stage = __idetape_kmalloc_stage(tape, 1, 0); - if (tape->merge_stage != NULL) { - tape->eod_frame_addr = idetape_read_position(drive); - idetape_init_stage(drive, tape->merge_stage, OS_FRAME_TYPE_EOD, tape->logical_blk_num); - idetape_pad_zeros(drive, tape->stage_size); - __idetape_kfree_stage(tape->merge_stage); - tape->merge_stage = NULL; - } - return; -} - -int idetape_seek_logical_blk (ide_drive_t *drive, int logical_blk_num) -{ - idetape_tape_t *tape = drive->driver_data; - int estimated_address = logical_blk_num + 20; - int retries = 0; - int speed_control; - - speed_control = tape->speed_control; - tape->speed_control = 0; - if (logical_blk_num < 0) - logical_blk_num = 0; - if (idetape_get_logical_blk(drive, logical_blk_num, 10, 1)) - goto ok; - while (++retries < 10) { - idetape_discard_read_pipeline(drive, 0); - idetape_position_tape(drive, estimated_address, 0, 0); - if (idetape_get_logical_blk(drive, logical_blk_num, 10, 1)) - goto ok; - if (!idetape_get_logical_blk(drive, -1, 10, 1)) - goto error; - if (tape->logical_blk_num < logical_blk_num) - estimated_address += logical_blk_num - tape->logical_blk_num; - else - break; + /* Write a filemark */ + idetape_create_write_filemark_cmd(drive, &pc, 1); + if (idetape_queue_pc_tail(drive, &pc)) { + printk(KERN_ERR "ide-tape: Couldn't write a filemark\n"); + return -EIO; } -error: - tape->speed_control = speed_control; - tape->restart_speed_control_req = 1; - printk(KERN_INFO "ide-tape: %s: couldn't seek to logical block %d " - "(at %d), %d retries\n", tape->name, logical_blk_num, - tape->logical_blk_num, retries); - return -EIO; -ok: - tape->speed_control = speed_control; - tape->restart_speed_control_req = 1; return 0; } @@ -5266,8 +4022,6 @@ idetape_discard_read_pipeline(drive, 0); if (idetape_rewind_tape(drive)) return -EIO; - if (tape->onstream && !tape->raw) - return idetape_position_tape(drive, OS_DATA_STARTFRAME1, 0, 0); return 0; case MTLOAD: idetape_discard_read_pipeline(drive, 0); @@ -5298,50 +4052,13 @@ idetape_create_load_unload_cmd(drive, &pc,IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK); return (idetape_queue_pc_tail(drive, &pc)); case MTEOM: - if (tape->onstream) { -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: positioning tape to eod at %d\n", tape->name, tape->eod_frame_addr); -#endif - idetape_position_tape(drive, tape->eod_frame_addr, 0, 0); - if (!idetape_get_logical_blk(drive, -1, 10, 0)) - return -EIO; - if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_EOD) - return -EIO; - return 0; - } idetape_create_space_cmd(&pc, 0, IDETAPE_SPACE_TO_EOD); return (idetape_queue_pc_tail(drive, &pc)); case MTERASE: - if (tape->onstream) { - tape->eod_frame_addr = OS_DATA_STARTFRAME1; - tape->logical_blk_num = 0; - tape->first_mark_addr = tape->last_mark_addr = -1; - idetape_position_tape(drive, tape->eod_frame_addr, 0, 0); - idetape_write_eod(drive); - idetape_flush_tape_buffers(drive); - idetape_write_header(drive, 0); - /* - * write filler frames to the unused frames... - * REMOVE WHEN going to LIN4 application type... - */ - idetape_write_filler(drive, OS_DATA_STARTFRAME1 - 10, 10); - idetape_write_filler(drive, OS_DATA_ENDFRAME1, 10); - idetape_flush_tape_buffers(drive); - (void) idetape_rewind_tape(drive); - return 0; - } (void) idetape_rewind_tape(drive); idetape_create_erase_cmd(&pc); return (idetape_queue_pc_tail(drive, &pc)); case MTSETBLK: - if (tape->onstream) { - if (mt_count != tape->tape_block_size) { - printk(KERN_INFO "ide-tape: %s: MTSETBLK %d -- only %d bytes block size supported\n", tape->name, mt_count, tape->tape_block_size); - return -EINVAL; - } - return 0; - } if (mt_count) { if (mt_count < tape->tape_block_size || mt_count % tape->tape_block_size) return -EIO; @@ -5351,28 +4068,13 @@ set_bit(IDETAPE_DETECT_BS, &tape->flags); return 0; case MTSEEK: - if (!tape->onstream || tape->raw) { - idetape_discard_read_pipeline(drive, 0); - return idetape_position_tape(drive, mt_count * tape->user_bs_factor, tape->partition, 0); - } - return idetape_seek_logical_blk(drive, mt_count); + idetape_discard_read_pipeline(drive, 0); + return idetape_position_tape(drive, mt_count * tape->user_bs_factor, tape->partition, 0); case MTSETPART: idetape_discard_read_pipeline(drive, 0); - if (tape->onstream) - return -EIO; return (idetape_position_tape(drive, 0, mt_count, 0)); case MTFSR: case MTBSR: - if (tape->onstream) { - if (!idetape_get_logical_blk(drive, -1, 10, 0)) - return -EIO; - if (mt_op == MTFSR) - return idetape_seek_logical_blk(drive, tape->logical_blk_num + mt_count); - else { - idetape_discard_read_pipeline(drive, 0); - return idetape_seek_logical_blk(drive, tape->logical_blk_num - mt_count); - } - } case MTLOCK: if (!idetape_create_prevent_cmd(drive, &pc, 1)) return 0; @@ -5450,34 +4152,16 @@ case MTIOCGET: memset(&mtget, 0, sizeof (struct mtget)); mtget.mt_type = MT_ISSCSI2; - if (!tape->onstream || tape->raw) - mtget.mt_blkno = position / tape->user_bs_factor - block_offset; - else { - if (!idetape_get_logical_blk(drive, -1, 10, 0)) - mtget.mt_blkno = -1; - else - mtget.mt_blkno = tape->logical_blk_num; - } + mtget.mt_blkno = position / tape->user_bs_factor - block_offset; mtget.mt_dsreg = ((tape->tape_block_size * tape->user_bs_factor) << MT_ST_BLKSIZE_SHIFT) & MT_ST_BLKSIZE_MASK; - if (tape->onstream) { - mtget.mt_gstat |= GMT_ONLINE(0xffffffff); - if (tape->first_stage && tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD) - mtget.mt_gstat |= GMT_EOD(0xffffffff); - if (position <= OS_DATA_STARTFRAME1) - mtget.mt_gstat |= GMT_BOT(0xffffffff); - } else if (tape->drv_write_prot) { + if (tape->drv_write_prot) { mtget.mt_gstat |= GMT_WR_PROT(0xffffffff); } if (copy_to_user((char *) arg,(char *) &mtget, sizeof(struct mtget))) return -EFAULT; return 0; case MTIOCPOS: - if (tape->onstream && !tape->raw) { - if (!idetape_get_logical_blk(drive, -1, 10, 0)) - return -EIO; - mtpos.mt_blkno = tape->logical_blk_num; - } else - mtpos.mt_blkno = position / tape->user_bs_factor - block_offset; + mtpos.mt_blkno = position / tape->user_bs_factor - block_offset; if (copy_to_user((char *) arg,(char *) &mtpos, sizeof(struct mtpos))) return -EFAULT; return 0; @@ -5488,106 +4172,6 @@ } } -static int __idetape_analyze_headers (ide_drive_t *drive, int block) -{ - idetape_tape_t *tape = drive->driver_data; - idetape_stage_t *stage; - os_header_t *header; - os_aux_t *aux; - - if (!tape->onstream || tape->raw) { - tape->header_ok = tape->linux_media = 1; - return 1; - } - tape->header_ok = tape->linux_media = 0; - tape->update_frame_cntr = 0; - tape->wrt_pass_cntr = 0; - tape->eod_frame_addr = OS_DATA_STARTFRAME1; - tape->first_mark_addr = tape->last_mark_addr = -1; - stage = __idetape_kmalloc_stage(tape, 0, 0); - if (stage == NULL) - return 0; -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: reading header\n", tape->name); -#endif - idetape_position_tape(drive, block, 0, 0); - if (!idetape_queue_rw_tail(drive, REQ_IDETAPE_READ, 1, stage->bh)) { - printk(KERN_INFO "ide-tape: %s: couldn't read header frame\n", - tape->name); - __idetape_kfree_stage(stage); - return 0; - } - header = (os_header_t *) stage->bh->b_data; - aux = stage->aux; - if (strncmp(header->ident_str, "ADR_SEQ", 7) != 0) { - printk(KERN_INFO "ide-tape: %s: invalid header identification string\n", tape->name); - __idetape_kfree_stage(stage); - return 0; - } - if (header->major_rev != 1 || (header->minor_rev > OS_ADR_MINREV)) - printk(KERN_INFO "ide-tape: warning: revision %d.%d " - "detected (up to 1.%d supported)\n", - header->major_rev, header->minor_rev, OS_ADR_MINREV); - if (header->par_num != 1) - printk(KERN_INFO "ide-tape: warning: %d partitions defined, only one supported\n", header->par_num); - tape->wrt_pass_cntr = ntohs(header->partition.wrt_pass_cntr); - tape->eod_frame_addr = ntohl(header->partition.eod_frame_addr); - tape->filemark_cnt = ntohl(aux->filemark_cnt); - tape->first_mark_addr = ntohl(aux->next_mark_addr); - tape->last_mark_addr = ntohl(aux->last_mark_addr); - tape->update_frame_cntr = ntohl(aux->update_frame_cntr); - memcpy(tape->application_sig, aux->application_sig, 4); - tape->application_sig[4] = 0; - if (memcmp(tape->application_sig, "LIN", 3) == 0) { - tape->linux_media = 1; - tape->linux_media_version = tape->application_sig[3] - '0'; - if (tape->linux_media_version != 3) - printk(KERN_INFO "ide-tape: %s: Linux media version " - "%d detected (current 3)\n", - tape->name, tape->linux_media_version); - } else { - printk(KERN_INFO "ide-tape: %s: non Linux media detected " - "(%s)\n", tape->name, tape->application_sig); - tape->linux_media = 0; - } -#if ONSTREAM_DEBUG - if (tape->debug_level >= 2) - printk(KERN_INFO "ide-tape: %s: detected write pass counter " - "%d, eod frame addr %d\n", tape->name, - tape->wrt_pass_cntr, tape->eod_frame_addr); -#endif - __idetape_kfree_stage(stage); - return 1; -} - -static int idetape_analyze_headers (ide_drive_t *drive) -{ - idetape_tape_t *tape = drive->driver_data; - int position, block; - - if (!tape->onstream || tape->raw) { - tape->header_ok = tape->linux_media = 1; - return 1; - } - tape->header_ok = tape->linux_media = 0; - position = idetape_read_position(drive); - for (block = 5; block < 10; block++) - if (__idetape_analyze_headers(drive, block)) - goto ok; - for (block = 0xbae; block < 0xbb3; block++) /* 2990 - 2994 */ - if (__idetape_analyze_headers(drive, block)) - goto ok; - printk(KERN_ERR "ide-tape: %s: failed to find valid ADRL header\n", tape->name); - return 0; -ok: - if (position < OS_DATA_STARTFRAME1) - position = OS_DATA_STARTFRAME1; - idetape_position_tape(drive, position, 0, 0); - tape->header_ok = 1; - return 1; -} - static void idetape_get_blocksize_from_block_descriptor(ide_drive_t *drive); /* @@ -5613,16 +4197,6 @@ if (test_and_set_bit(IDETAPE_BUSY, &tape->flags)) return -EBUSY; - if (tape->onstream) { - if (minor & 64) { - tape->tape_block_size = tape->stage_size = 32768 + 512; - tape->raw = 1; - } else { - tape->tape_block_size = tape->stage_size = 32768; - tape->raw = 0; - } - idetape_onstream_mode_sense_tape_parameter_page(drive, tape->debug_level); - } retval = idetape_wait_ready(drive, 60 * HZ); if (retval) { clear_bit(IDETAPE_BUSY, &tape->flags); @@ -5657,7 +4231,6 @@ /* * Lock the tape drive door so user can't eject. - * Analyze headers for OnStream drives. */ if (tape->chrdev_direction == idetape_direction_none) { if (idetape_create_prevent_cmd(drive, &pc, 1)) { @@ -5666,9 +4239,7 @@ tape->door_locked = DOOR_LOCKED; } } - idetape_analyze_headers(drive); } - tape->max_frames = tape->cur_frames = tape->req_buffer_fill = 0; idetape_restart_speed_control(drive); tape->restart_speed_control_req = 0; return 0; @@ -5686,9 +4257,7 @@ tape->merge_stage = NULL; } idetape_write_filemark(drive); - idetape_write_eod(drive); idetape_flush_tape_buffers(drive); - idetape_write_header(drive, minor >= 128); idetape_flush_tape_buffers(drive); } @@ -5867,100 +4436,6 @@ } /* - * Notify vendor ID to the OnStream tape drive - */ -static void idetape_onstream_set_vendor (ide_drive_t *drive, char *vendor) -{ - idetape_pc_t pc; - idetape_mode_parameter_header_t *header; - - idetape_create_mode_select_cmd(&pc, sizeof(*header) + 8); - pc.buffer[0] = 3 + 8; /* Mode Data Length */ - pc.buffer[1] = 0; /* Medium Type - ignoring */ - pc.buffer[2] = 0; /* Reserved */ - pc.buffer[3] = 0; /* Block Descriptor Length */ - pc.buffer[4 + 0] = 0x36 | (1 << 7); - pc.buffer[4 + 1] = 6; - pc.buffer[4 + 2] = vendor[0]; - pc.buffer[4 + 3] = vendor[1]; - pc.buffer[4 + 4] = vendor[2]; - pc.buffer[4 + 5] = vendor[3]; - pc.buffer[4 + 6] = 0; - pc.buffer[4 + 7] = 0; - if (idetape_queue_pc_tail(drive, &pc)) - printk(KERN_ERR "ide-tape: Couldn't set vendor name to %s\n", vendor); - -} - -/* - * Various unused OnStream commands - */ -#if ONSTREAM_DEBUG -static void idetape_onstream_set_retries (ide_drive_t *drive, int retries) -{ - idetape_pc_t pc; - - idetape_create_mode_select_cmd(&pc, sizeof(idetape_mode_parameter_header_t) + 4); - pc.buffer[0] = 3 + 4; - pc.buffer[1] = 0; /* Medium Type - ignoring */ - pc.buffer[2] = 0; /* Reserved */ - pc.buffer[3] = 0; /* Block Descriptor Length */ - pc.buffer[4 + 0] = 0x2f | (1 << 7); - pc.buffer[4 + 1] = 2; - pc.buffer[4 + 2] = 4; - pc.buffer[4 + 3] = retries; - if (idetape_queue_pc_tail(drive, &pc)) - printk(KERN_ERR "ide-tape: Couldn't set retries to %d\n", retries); -} -#endif - -/* - * Configure 32.5KB block size. - */ -static void idetape_onstream_configure_block_size (ide_drive_t *drive) -{ - idetape_pc_t pc; - idetape_mode_parameter_header_t *header; - idetape_block_size_page_t *bs; - - /* - * Get the current block size from the block size mode page - */ - idetape_create_mode_sense_cmd(&pc, IDETAPE_BLOCK_SIZE_PAGE); - if (idetape_queue_pc_tail(drive, &pc)) - printk(KERN_ERR "ide-tape: can't get tape block size mode page\n"); - header = (idetape_mode_parameter_header_t *) pc.buffer; - bs = (idetape_block_size_page_t *) (pc.buffer + sizeof(idetape_mode_parameter_header_t) + header->bdl); - -#if IDETAPE_DEBUG_INFO - printk(KERN_INFO "ide-tape: 32KB play back: %s\n", bs->play32 ? "Yes" : "No"); - printk(KERN_INFO "ide-tape: 32.5KB play back: %s\n", bs->play32_5 ? "Yes" : "No"); - printk(KERN_INFO "ide-tape: 32KB record: %s\n", bs->record32 ? "Yes" : "No"); - printk(KERN_INFO "ide-tape: 32.5KB record: %s\n", bs->record32_5 ? "Yes" : "No"); -#endif /* IDETAPE_DEBUG_INFO */ - - /* - * Configure default auto columns mode, 32.5KB block size - */ - bs->one = 1; - bs->play32 = 0; - bs->play32_5 = 1; - bs->record32 = 0; - bs->record32_5 = 1; - idetape_create_mode_select_cmd(&pc, sizeof(*header) + sizeof(*bs)); - if (idetape_queue_pc_tail(drive, &pc)) - printk(KERN_ERR "ide-tape: Couldn't set tape block size mode page\n"); - -#if ONSTREAM_DEBUG - /* - * In debug mode, we want to see as many errors as possible - * to test the error recovery mechanism. - */ - idetape_onstream_set_retries(drive, 0); -#endif -} - -/* * Use INQUIRY to get the firmware revision */ static void idetape_get_inquiry_results (ide_drive_t *drive) @@ -5985,63 +4460,10 @@ r = tape->firmware_revision; if (*(r + 1) == '.') tape->firmware_revision_num = (*r - '0') * 100 + (*(r + 2) - '0') * 10 + *(r + 3) - '0'; - else if (tape->onstream) - tape->firmware_revision_num = (*r - '0') * 100 + (*(r + 1) - '0') * 10 + *(r + 2) - '0'; printk(KERN_INFO "ide-tape: %s <-> %s: %s %s rev %s\n", drive->name, tape->name, tape->vendor_id, tape->product_id, tape->firmware_revision); } /* - * Configure the OnStream ATAPI tape drive for default operation - */ -static void idetape_configure_onstream (ide_drive_t *drive) -{ - idetape_tape_t *tape = drive->driver_data; - - if (tape->firmware_revision_num < 105) { - printk(KERN_INFO "ide-tape: %s: Old OnStream firmware revision detected (%s)\n", tape->name, tape->firmware_revision); - printk(KERN_INFO "ide-tape: %s: An upgrade to version 1.05 or above is recommended\n", tape->name); - } - - /* - * Configure 32.5KB (data+aux) block size. - */ - idetape_onstream_configure_block_size(drive); - - /* - * Set vendor name to 'LIN3' for "Linux support version 3". - */ - idetape_onstream_set_vendor(drive, "LIN3"); -} - -/* - * idetape_get_mode_sense_parameters asks the tape about its various - * parameters. This may work for other drives to??? - */ -static void idetape_onstream_mode_sense_tape_parameter_page(ide_drive_t *drive, int debug) -{ - idetape_tape_t *tape = drive->driver_data; - idetape_pc_t pc; - idetape_mode_parameter_header_t *header; - onstream_tape_paramtr_page_t *prm; - - idetape_create_mode_sense_cmd(&pc, IDETAPE_PARAMTR_PAGE); - if (idetape_queue_pc_tail(drive, &pc)) { - printk(KERN_ERR "ide-tape: Can't get tape parameters page - probably no tape inserted in onstream drive\n"); - return; - } - header = (idetape_mode_parameter_header_t *) pc.buffer; - prm = (onstream_tape_paramtr_page_t *) (pc.buffer + sizeof(idetape_mode_parameter_header_t) + header->bdl); - - tape->capacity = ntohs(prm->segtrk) * ntohs(prm->trks); - if (debug) { - printk(KERN_INFO "ide-tape: %s <-> %s: Tape length %dMB (%d frames/track, %d tracks = %d blocks, density: %dKbpi)\n", - drive->name, tape->name, tape->capacity/32, ntohs(prm->segtrk), ntohs(prm->trks), tape->capacity, prm->density); - } - - return; -} - -/* * idetape_get_mode_sense_results asks the tape about its various * parameters. In particular, we will adjust our data transfer buffer * size to the recommended value as returned by the tape. @@ -6084,8 +4506,6 @@ tape->tape_block_size = 512; else if (capabilities->blk1024) tape->tape_block_size = 1024; - else if (tape->onstream && capabilities->blk32768) - tape->tape_block_size = 32768; #if IDETAPE_DEBUG_INFO printk(KERN_INFO "ide-tape: Dumping the results of the MODE SENSE packet command\n"); @@ -6169,18 +4589,6 @@ ide_add_setting(drive, "pipeline_head_speed_u",SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->uncontrolled_pipeline_head_speed, NULL); ide_add_setting(drive, "avg_speed", SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->avg_speed, NULL); ide_add_setting(drive, "debug_level",SETTING_RW, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->debug_level, NULL); - if (tape->onstream) { - ide_add_setting(drive, "cur_frames", SETTING_READ, -1, -1, TYPE_SHORT, 0, 0xffff, 1, 1, &tape->cur_frames, NULL); - ide_add_setting(drive, "max_frames", SETTING_READ, -1, -1, TYPE_SHORT, 0, 0xffff, 1, 1, &tape->max_frames, NULL); - ide_add_setting(drive, "insert_speed", SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->insert_speed, NULL); - ide_add_setting(drive, "speed_control",SETTING_RW, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->speed_control, NULL); - ide_add_setting(drive, "tape_still_time",SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->tape_still_time, NULL); - ide_add_setting(drive, "max_insert_speed",SETTING_RW, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->max_insert_speed, NULL); - ide_add_setting(drive, "insert_size", SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->insert_size, NULL); - ide_add_setting(drive, "capacity", SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->capacity, NULL); - ide_add_setting(drive, "first_frame", SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->first_frame_position, NULL); - ide_add_setting(drive, "logical_blk", SETTING_READ, -1, -1, TYPE_INT, 0, 0xffff, 1, 1, &tape->logical_blk_num, NULL); - } } /* @@ -6208,11 +4616,9 @@ drive->driver_data = tape; /* An ATAPI device ignores DRDY */ drive->ready_stat = 0; - if (strstr(drive->id->model, "OnStream DI-")) - tape->onstream = 1; drive->dsc_overlap = 1; #ifdef CONFIG_BLK_DEV_IDEPCI - if (!tape->onstream && HWIF(drive)->pci_dev != NULL) { + if (HWIF(drive)->pci_dev != NULL) { /* * These two ide-pci host adapters appear to need DSC overlap disabled. * This probably needs further analysis. @@ -6245,10 +4651,6 @@ idetape_get_inquiry_results(drive); idetape_get_mode_sense_results(drive); idetape_get_blocksize_from_block_descriptor(drive); - if (tape->onstream) { - idetape_onstream_mode_sense_tape_parameter_page(drive, 1); - idetape_configure_onstream(drive); - } tape->user_bs_factor = 1; tape->stage_size = tape->capabilities.ctl * tape->tape_block_size; while (tape->stage_size > 0xffff) { @@ -6257,8 +4659,6 @@ tape->stage_size = tape->capabilities.ctl * tape->tape_block_size; } stage_size = tape->stage_size; - if (tape->onstream) - stage_size = 32768 + 512; tape->pages_per_stage = stage_size / PAGE_SIZE; if (stage_size % PAGE_SIZE) { tape->pages_per_stage++; @@ -6454,7 +4854,7 @@ printk(KERN_ERR "ide-tape: %s: Can't allocate a tape structure\n", drive->name); goto failed; } - if (ide_register_subdriver (drive, &idetape_driver, IDE_SUBDRIVER_VERSION)) { + if (ide_register_subdriver(drive, &idetape_driver)) { printk(KERN_ERR "ide-tape: %s: Failed to register the driver with ide.c\n", drive->name); kfree(tape); goto failed; @@ -6502,3 +4902,4 @@ module_init(idetape_init); module_exit(idetape_exit); +MODULE_ALIAS_CHARDEV_MAJOR(IDETAPE_MAJOR); diff -Nru a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c --- a/drivers/ide/ide-taskfile.c Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/ide-taskfile.c Thu Feb 19 23:44:22 2004 @@ -219,66 +219,6 @@ EXPORT_SYMBOL(do_rw_taskfile); /* - * Clean up after success/failure of an explicit taskfile operation. - */ -void ide_end_taskfile (ide_drive_t *drive, u8 stat, u8 err) -{ - ide_hwif_t *hwif = HWIF(drive); - unsigned long flags; - struct request *rq; - ide_task_t *args; - task_ioreg_t command; - - spin_lock_irqsave(&ide_lock, flags); - rq = HWGROUP(drive)->rq; - spin_unlock_irqrestore(&ide_lock, flags); - args = (ide_task_t *) rq->special; - - command = args->tfRegister[IDE_COMMAND_OFFSET]; - - if (rq->errors == 0) - rq->errors = !OK_STAT(stat,READY_STAT,BAD_STAT); - - if (args->tf_in_flags.b.data) { - u16 data = hwif->INW(IDE_DATA_REG); - args->tfRegister[IDE_DATA_OFFSET] = (data) & 0xFF; - args->hobRegister[IDE_DATA_OFFSET_HOB] = (data >> 8) & 0xFF; - } - args->tfRegister[IDE_ERROR_OFFSET] = err; - args->tfRegister[IDE_NSECTOR_OFFSET] = hwif->INB(IDE_NSECTOR_REG); - args->tfRegister[IDE_SECTOR_OFFSET] = hwif->INB(IDE_SECTOR_REG); - args->tfRegister[IDE_LCYL_OFFSET] = hwif->INB(IDE_LCYL_REG); - args->tfRegister[IDE_HCYL_OFFSET] = hwif->INB(IDE_HCYL_REG); - args->tfRegister[IDE_SELECT_OFFSET] = hwif->INB(IDE_SELECT_REG); - args->tfRegister[IDE_STATUS_OFFSET] = stat; - if ((drive->id->command_set_2 & 0x0400) && - (drive->id->cfs_enable_2 & 0x0400) && - (drive->addressing == 1)) { - hwif->OUTB(drive->ctl|0x80, IDE_CONTROL_REG_HOB); - args->hobRegister[IDE_FEATURE_OFFSET_HOB] = hwif->INB(IDE_FEATURE_REG); - args->hobRegister[IDE_NSECTOR_OFFSET_HOB] = hwif->INB(IDE_NSECTOR_REG); - args->hobRegister[IDE_SECTOR_OFFSET_HOB] = hwif->INB(IDE_SECTOR_REG); - args->hobRegister[IDE_LCYL_OFFSET_HOB] = hwif->INB(IDE_LCYL_REG); - args->hobRegister[IDE_HCYL_OFFSET_HOB] = hwif->INB(IDE_HCYL_REG); - } - -#if 0 -/* taskfile_settings_update(drive, args, command); */ - - if (args->posthandler != NULL) - args->posthandler(drive, args); -#endif - - spin_lock_irqsave(&ide_lock, flags); - blkdev_dequeue_request(rq); - HWGROUP(drive)->rq = NULL; - end_that_request_last(rq); - spin_unlock_irqrestore(&ide_lock, flags); -} - -EXPORT_SYMBOL(ide_end_taskfile); - -/* * set_multmode_intr() is invoked on completion of a WIN_SETMULT cmd. */ ide_startstop_t set_multmode_intr (ide_drive_t *drive) @@ -1669,7 +1609,6 @@ */ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) { -#if 1 int err = 0; u8 args[4], *argbuf = args; u8 xfer_rate = 0; @@ -1720,70 +1659,6 @@ if (argsize > 4) kfree(argbuf); return err; - -#else - - int err = -EIO; - u8 args[4], *argbuf = args; - u8 xfer_rate = 0; - int argsize = 0; - ide_task_t tfargs; - - if (NULL == (void *) arg) { - struct request rq; - ide_init_drive_cmd(&rq); - return ide_do_drive_cmd(drive, &rq, ide_wait); - } - - if (copy_from_user(args, (void *)arg, 4)) - return -EFAULT; - - memset(&tfargs, 0, sizeof(ide_task_t)); - tfargs.tfRegister[IDE_FEATURE_OFFSET] = args[2]; - tfargs.tfRegister[IDE_NSECTOR_OFFSET] = args[3]; - tfargs.tfRegister[IDE_SECTOR_OFFSET] = args[1]; - tfargs.tfRegister[IDE_LCYL_OFFSET] = 0x00; - tfargs.tfRegister[IDE_HCYL_OFFSET] = 0x00; - tfargs.tfRegister[IDE_SELECT_OFFSET] = 0x00; - tfargs.tfRegister[IDE_COMMAND_OFFSET] = args[0]; - - if (args[3]) { - argsize = (SECTOR_WORDS * 4 * args[3]); - argbuf = kmalloc(argsize, GFP_KERNEL); - if (argbuf == NULL) - return -ENOMEM; - } - - if (set_transfer(drive, &tfargs)) { - xfer_rate = args[1]; - if (ide_ata66_check(drive, &tfargs)) - goto abort; - } - - tfargs.command_type = ide_cmd_type_parser(&tfargs); - err = ide_raw_taskfile(drive, &tfargs, argbuf); - - if (!err && xfer_rate) { - /* active-retuning-calls future */ - ide_set_xfer_rate(driver, xfer_rate); - ide_driveid_update(drive); - } -abort: - args[0] = tfargs.tfRegister[IDE_COMMAND_OFFSET]; - args[1] = tfargs.tfRegister[IDE_FEATURE_OFFSET]; - args[2] = tfargs.tfRegister[IDE_NSECTOR_OFFSET]; - args[3] = 0; - - if (copy_to_user((void *)arg, argbuf, 4)) - err = -EFAULT; - if (argbuf != NULL) { - if (copy_to_user((void *)arg, argbuf + 4, argsize)) - err = -EFAULT; - kfree(argbuf); - } - return err; - -#endif } EXPORT_SYMBOL(ide_cmd_ioctl); diff -Nru a/drivers/ide/ide.c b/drivers/ide/ide.c --- a/drivers/ide/ide.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/ide.c Thu Feb 19 23:44:24 2004 @@ -474,6 +474,8 @@ }; #ifdef CONFIG_PROC_FS +struct proc_dir_entry *proc_ide_root; + ide_proc_entry_t generic_subdriver_entries[] = { { "capacity", S_IFREG|S_IRUGO, proc_ide_read_capacity, NULL }, { NULL, 0, NULL, NULL } @@ -642,10 +644,9 @@ drive = &hwif->drives[unit]; if (!drive->present) continue; - if (drive->usage) - goto abort; - if (DRIVER(drive)->shutdown(drive)) + if (drive->usage || DRIVER(drive)->busy) goto abort; + drive->dead = 1; } hwif->present = 0; @@ -1392,7 +1393,6 @@ ide_add_setting(drive, "keepsettings", SETTING_RW, HDIO_GET_KEEPSETTINGS, HDIO_SET_KEEPSETTINGS, TYPE_BYTE, 0, 1, 1, 1, &drive->keep_settings, NULL); ide_add_setting(drive, "nice1", SETTING_RW, -1, -1, TYPE_BYTE, 0, 1, 1, 1, &drive->nice1, NULL); ide_add_setting(drive, "pio_mode", SETTING_WRITE, -1, HDIO_SET_PIO_MODE, TYPE_BYTE, 0, 255, 1, 1, NULL, set_pio_mode); - ide_add_setting(drive, "slow", SETTING_RW, -1, -1, TYPE_BYTE, 0, 1, 1, 1, &drive->slow, NULL); ide_add_setting(drive, "unmaskirq", drive->no_unmask ? SETTING_READ : SETTING_RW, HDIO_GET_UNMASKINTR, HDIO_SET_UNMASKINTR, TYPE_BYTE, 0, 1, 1, 1, &drive->unmask, NULL); ide_add_setting(drive, "using_dma", SETTING_RW, HDIO_GET_DMA, HDIO_SET_DMA, TYPE_BYTE, 0, 1, 1, 1, &drive->using_dma, set_using_dma); ide_add_setting(drive, "init_speed", SETTING_RW, -1, -1, TYPE_BYTE, 0, 70, 1, 1, &drive->init_speed, NULL); @@ -1786,83 +1786,9 @@ /* * ide_setup() gets called VERY EARLY during initialization, - * to handle kernel "command line" strings beginning with "hdx=" - * or "ide". Here is the complete set currently supported: + * to handle kernel "command line" strings beginning with "hdx=" or "ide". * - * "hdx=" is recognized for all "x" from "a" to "h", such as "hdc". - * "idex=" is recognized for all "x" from "0" to "3", such as "ide1". - * - * "hdx=noprobe" : drive may be present, but do not probe for it - * "hdx=none" : drive is NOT present, ignore cmos and do not probe - * "hdx=nowerr" : ignore the WRERR_STAT bit on this drive - * "hdx=cdrom" : drive is present, and is a cdrom drive - * "hdx=cyl,head,sect" : disk drive is present, with specified geometry - * "hdx=remap63" : add 63 to all sector numbers (for OnTrack DM) - * "hdx=remap" : remap 0->1 (for EZDrive) - * "hdx=autotune" : driver will attempt to tune interface speed - * to the fastest PIO mode supported, - * if possible for this drive only. - * Not fully supported by all chipset types, - * and quite likely to cause trouble with - * older/odd IDE drives. - * "hdx=slow" : insert a huge pause after each access to the data - * port. Should be used only as a last resort. - * - * "hdx=swapdata" : when the drive is a disk, byte swap all data - * "hdx=bswap" : same as above.......... - * "hdxlun=xx" : set the drive last logical unit. - * "hdx=flash" : allows for more than one ata_flash disk to be - * registered. In most cases, only one device - * will be present. - * "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. - * "idebus=xx" : inform IDE driver of VESA/PCI bus speed in MHz, - * where "xx" is between 20 and 66 inclusive, - * used when tuning chipset PIO modes. - * For PCI bus, 25 is correct for a P75 system, - * 30 is correct for P90,P120,P180 systems, - * and 33 is used for P100,P133,P166 systems. - * If in doubt, use idebus=33 for PCI. - * As for VLB, it is safest to not specify it. - * - * "idex=noprobe" : do not attempt to access/use this interface - * "idex=base" : probe for an interface at the addr specified, - * where "base" is usually 0x1f0 or 0x170 - * and "ctl" is assumed to be "base"+0x206 - * "idex=base,ctl" : specify both base and ctl - * "idex=base,ctl,irq" : specify base, ctl, and irq number - * "idex=autotune" : driver will attempt to tune interface speed - * to the fastest PIO mode supported, - * for all drives on this interface. - * Not fully supported by all chipset types, - * and quite likely to cause trouble with - * older/odd IDE drives. - * "idex=noautotune" : driver will NOT attempt to tune interface speed - * This is the default for most chipsets, - * except the cmd640. - * "idex=serialize" : do not overlap operations on idex and ide(x^1) - * "idex=four" : four drives on idex and ide(x^1) share same ports - * "idex=reset" : reset interface before first use - * "idex=dma" : enable DMA by default on both drives if possible - * "idex=ata66" : informs the interface that it has an 80c cable - * for chipsets that are ATA-66 capable, but - * the ablity to bit test for detection is - * currently unknown. - * "ide=reverse" : Formerly called to pci sub-system, but now local. - * - * The following are valid ONLY on ide0, (except dc4030) - * and the defaults for the base,ctl ports must not be altered. - * - * "ide0=dtc2278" : probe/support DTC2278 interface - * "ide0=ht6560b" : probe/support HT6560B interface - * "ide0=cmd640_vlb" : *REQUIRED* for VLB cards with the CMD640 chip - * (not for PCI -- automatically detected) - * "ide0=qd65xx" : probe/support qd65xx interface - * "ide0=ali14xx" : probe/support ali14xx chipsets (ALI M1439, M1443, M1445) - * "ide0=umc8672" : probe/support umc8672 chipsets - * "idex=dc4030" : probe/support Promise DC4030VL interface - * "ide=doubler" : probe/support IDE doublers on Amiga + * Remember to update Documentation/ide.txt if you change something here. */ int __init ide_setup (char *s) { @@ -1915,8 +1841,8 @@ if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) { const char *hd_words[] = { "none", "noprobe", "nowerr", "cdrom", "serialize", - "autotune", "noautotune", "slow", "swapdata", "bswap", - "flash", "remap", "remap63", "scsi", NULL }; + "autotune", "noautotune", "minus8", "swapdata", "bswap", + "minus11", "remap", "remap63", "scsi", NULL }; unit = s[2] - 'a'; hw = unit / MAX_DRIVES; unit = unit % MAX_DRIVES; @@ -1941,7 +1867,6 @@ } switch (match_parm(&s[3], hd_words, vals, 3)) { case -1: /* "none" */ - drive->nobios = 1; /* drop into "noprobe" */ case -2: /* "noprobe" */ drive->noprobe = 1; goto done; @@ -1963,16 +1888,10 @@ case -7: /* "noautotune" */ drive->autotune = IDE_TUNE_NOAUTO; goto done; - case -8: /* "slow" */ - drive->slow = 1; - goto done; case -9: /* "swapdata" */ case -10: /* "bswap" */ drive->bswap = 1; goto done; - case -11: /* "flash" */ - drive->ata_flash = 1; - goto done; case -12: /* "remap" */ drive->remap_0_to_1 = 1; goto done; @@ -2251,34 +2170,6 @@ return ide_unregister_subdriver(drive); } -/* - * Check if we can unregister the subdriver. Called with the - * request lock held. - */ - -static int default_shutdown(ide_drive_t *drive) -{ - if (drive->usage || DRIVER(drive)->busy) { - return 1; - } - drive->dead = 1; - return 0; -} - -/* - * Default function to use for the cache flush operation. This - * must be replaced for disk devices (see ATA specification - * documents on cache flush and drive suspend rules) - * - * If we have no device attached or the device is not writable - * this handler is sufficient. - */ - -static int default_flushcache (ide_drive_t *drive) -{ - return 0; -} - static ide_startstop_t default_do_request (ide_drive_t *drive, struct request *rq, sector_t block) { ide_end_request(drive, 0, 0); @@ -2341,8 +2232,6 @@ static void setup_driver_defaults (ide_driver_t *d) { if (d->cleanup == NULL) d->cleanup = default_cleanup; - if (d->shutdown == NULL) d->shutdown = default_shutdown; - if (d->flushcache == NULL) d->flushcache = default_flushcache; if (d->do_request == NULL) d->do_request = default_do_request; if (d->end_request == NULL) d->end_request = default_end_request; if (d->sense == NULL) d->sense = default_sense; @@ -2356,15 +2245,15 @@ d->start_power_step = default_start_power_step; } -int ide_register_subdriver (ide_drive_t *drive, ide_driver_t *driver, int version) +int ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver) { unsigned long flags; - - BUG_ON(drive->driver == NULL); - + + BUG_ON(!drive->driver); + spin_lock_irqsave(&ide_lock, flags); - if (version != IDE_SUBDRIVER_VERSION || !drive->present || - drive->driver != &idedefault_driver || drive->usage || drive->dead) { + if (!drive->present || drive->driver != &idedefault_driver || + drive->usage || drive->dead) { spin_unlock_irqrestore(&ide_lock, flags); return 1; } @@ -2477,12 +2366,6 @@ printk(KERN_ERR "%s: cleanup_module() called while still busy\n", drive->name); BUG(); } - /* We must remove proc entries defined in this module. - Otherwise we oops while accessing these entries */ -#ifdef CONFIG_PROC_FS - if (drive->proc) - ide_remove_proc_entries(drive->proc, driver->proc); -#endif ata_attach(drive); } } @@ -2520,6 +2403,10 @@ bus_register(&ide_bus_type); init_ide_data(); + +#ifdef CONFIG_PROC_FS + proc_ide_root = proc_mkdir("ide", 0); +#endif #ifdef CONFIG_BLK_DEV_ALI14XX if (probe_ali14xx) diff -Nru a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c --- a/drivers/ide/pci/aec62xx.c Thu Feb 19 23:44:27 2004 +++ b/drivers/ide/pci/aec62xx.c Thu Feb 19 23:44:27 2004 @@ -423,7 +423,7 @@ if (!aec62xx_proc) { aec62xx_proc = 1; - ide_pci_register_host_proc(&aec62xx_procs[0]); + ide_pci_create_host_proc("aec62xx", aec62xx_get_info); } #endif /* DISPLAY_AEC62XX_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/aec62xx.h b/drivers/ide/pci/aec62xx.h --- a/drivers/ide/pci/aec62xx.h Thu Feb 19 23:44:25 2004 +++ b/drivers/ide/pci/aec62xx.h Thu Feb 19 23:44:25 2004 @@ -70,24 +70,6 @@ #define BUSCLOCK(D) \ ((struct chipset_bus_clock_list_entry *) pci_get_drvdata((D))) -#if defined(DISPLAY_AEC62XX_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 aec62xx_proc; - -static int aec62xx_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t aec62xx_procs[] = { - { - .name = "aec62xx", - .set = 1, - .get_info = aec62xx_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_AEC62XX_TIMINGS && CONFIG_PROC_FS */ - static void init_setup_aec6x80(struct pci_dev *, ide_pci_device_t *); static void init_setup_aec62xx(struct pci_dev *, ide_pci_device_t *); static unsigned int init_chipset_aec62xx(struct pci_dev *, const char *); diff -Nru a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c --- a/drivers/ide/pci/alim15x3.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/alim15x3.c Thu Feb 19 23:44:24 2004 @@ -588,7 +588,7 @@ if (!ali_proc) { ali_proc = 1; bmide_dev = dev; - ide_pci_register_host_proc(&ali_procs[0]); + ide_pci_create_host_proc("ali", ali_get_info); } #endif /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS) */ diff -Nru a/drivers/ide/pci/alim15x3.h b/drivers/ide/pci/alim15x3.h --- a/drivers/ide/pci/alim15x3.h Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/pci/alim15x3.h Thu Feb 19 23:44:22 2004 @@ -7,24 +7,6 @@ #define DISPLAY_ALI_TIMINGS -#if defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 ali_proc; - -static int ali_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t ali_procs[] = { - { - .name = "ali", - .set = 1, - .get_info = ali_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_ALI_TIMINGS && CONFIG_PROC_FS */ - static unsigned int init_chipset_ali15x3(struct pci_dev *, const char *); static void init_hwif_common_ali15x3(ide_hwif_t *); static void init_hwif_ali15x3(ide_hwif_t *); diff -Nru a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c --- a/drivers/ide/pci/amd74xx.c Thu Feb 19 23:44:28 2004 +++ b/drivers/ide/pci/amd74xx.c Thu Feb 19 23:44:28 2004 @@ -88,6 +88,8 @@ #include #include +static u8 amd74xx_proc; + static unsigned char amd_udma2cyc[] = { 4, 6, 8, 10, 3, 2, 1, 15 }; static unsigned long amd_base; static struct pci_dev *bmide_dev; @@ -398,7 +400,7 @@ if (!amd74xx_proc) { amd_base = pci_resource_start(dev, 4); bmide_dev = dev; - ide_pci_register_host_proc(&amd74xx_procs[0]); + ide_pci_create_host_proc("amd74xx", amd74xx_get_info); amd74xx_proc = 1; } #endif /* DISPLAY_AMD_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/amd74xx.h b/drivers/ide/pci/amd74xx.h --- a/drivers/ide/pci/amd74xx.h Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/pci/amd74xx.h Thu Feb 19 23:44:22 2004 @@ -7,24 +7,6 @@ #define DISPLAY_AMD_TIMINGS -#if defined(DISPLAY_AMD_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 amd74xx_proc; - -static int amd74xx_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t amd74xx_procs[] = { - { - .name = "amd74xx", - .set = 1, - .get_info = amd74xx_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_AMD_TIMINGS) && defined(CONFIG_PROC_FS) */ - static unsigned int init_chipset_amd74xx(struct pci_dev *, const char *); static void init_hwif_amd74xx(ide_hwif_t *); diff -Nru a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c --- a/drivers/ide/pci/cmd64x.c Thu Feb 19 23:44:27 2004 +++ b/drivers/ide/pci/cmd64x.c Thu Feb 19 23:44:27 2004 @@ -667,7 +667,7 @@ if (!cmd64x_proc) { cmd64x_proc = 1; - ide_pci_register_host_proc(&cmd64x_procs[0]); + ide_pci_create_host_proc("cmd64x", cmd64x_get_info); } #endif /* DISPLAY_CMD64X_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/cmd64x.h b/drivers/ide/pci/cmd64x.h --- a/drivers/ide/pci/cmd64x.h Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/cmd64x.h Thu Feb 19 23:44:24 2004 @@ -60,25 +60,6 @@ #define UDIDETCR1 0x7B #define DTPR1 0x7C -#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 cmd64x_proc; - -static char * print_cmd64x_get_info(char *, struct pci_dev *, int); -static int cmd64x_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t cmd64x_procs[] = { - { - .name = "cmd64x", - .set = 1, - .get_info = cmd64x_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) */ - static unsigned int init_chipset_cmd64x(struct pci_dev *, const char *); static void init_hwif_cmd64x(ide_hwif_t *); diff -Nru a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c --- a/drivers/ide/pci/cs5520.c Thu Feb 19 23:44:23 2004 +++ b/drivers/ide/pci/cs5520.c Thu Feb 19 23:44:23 2004 @@ -196,7 +196,7 @@ if (!cs5520_proc) { cs5520_proc = 1; bmide_dev = dev; - ide_pci_register_host_proc(&cs5520_procs[0]); + ide_pci_create_host_proc("cs5520", cs5520_get_info); } #endif /* DISPLAY_CS5520_TIMINGS && CONFIG_PROC_FS */ return 0; diff -Nru a/drivers/ide/pci/cs5520.h b/drivers/ide/pci/cs5520.h --- a/drivers/ide/pci/cs5520.h Thu Feb 19 23:44:28 2004 +++ b/drivers/ide/pci/cs5520.h Thu Feb 19 23:44:28 2004 @@ -7,24 +7,6 @@ #define DISPLAY_CS5520_TIMINGS -#if defined(DISPLAY_CS5520_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 cs5520_proc; - -static int cs5520_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t cs5520_procs[] = { - { - .name = "cs5520", - .set = 1, - .get_info = cs5520_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_CS5520_TIMINGS) && defined(CONFIG_PROC_FS) */ - static unsigned int init_chipset_cs5520(struct pci_dev *, const char *); static void init_hwif_cs5520(ide_hwif_t *); static void cs5520_init_setup_dma(struct pci_dev *dev, struct ide_pci_device_s *d, ide_hwif_t *hwif); diff -Nru a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c --- a/drivers/ide/pci/cs5530.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/cs5530.c Thu Feb 19 23:44:24 2004 @@ -276,7 +276,7 @@ if (!cs5530_proc) { cs5530_proc = 1; bmide_dev = dev; - ide_pci_register_host_proc(&cs5530_procs[0]); + ide_pci_create_host_proc("cs5530", cs5530_get_info); } #endif /* DISPLAY_CS5530_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/cs5530.h b/drivers/ide/pci/cs5530.h --- a/drivers/ide/pci/cs5530.h Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/pci/cs5530.h Thu Feb 19 23:44:22 2004 @@ -7,24 +7,6 @@ #define DISPLAY_CS5530_TIMINGS -#if defined(DISPLAY_CS5530_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 cs5530_proc; - -static int cs5530_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t cs5530_procs[] = { - { - .name = "cs5530", - .set = 1, - .get_info = cs5530_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_CS5530_TIMINGS && CONFIG_PROC_FS */ - static unsigned int init_chipset_cs5530(struct pci_dev *, const char *); static void init_hwif_cs5530(ide_hwif_t *); diff -Nru a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c --- a/drivers/ide/pci/hpt34x.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/hpt34x.c Thu Feb 19 23:44:24 2004 @@ -282,7 +282,7 @@ if (!hpt34x_proc) { hpt34x_proc = 1; - ide_pci_register_host_proc(&hpt34x_procs[0]); + ide_pci_create_host_proc("hpt34x", hpt34x_get_info); } #endif /* DISPLAY_HPT34X_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/hpt34x.h b/drivers/ide/pci/hpt34x.h --- a/drivers/ide/pci/hpt34x.h Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/pci/hpt34x.h Thu Feb 19 23:44:22 2004 @@ -13,24 +13,6 @@ #undef DISPLAY_HPT34X_TIMINGS -#if defined(DISPLAY_HPT34X_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 hpt34x_proc; - -static int hpt34x_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t hpt34x_procs[] = { - { - .name = "hpt34x", - .set = 1, - .get_info = hpt34x_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_HPT34X_TIMINGS) && defined(CONFIG_PROC_FS) */ - static unsigned int init_chipset_hpt34x(struct pci_dev *, const char *); static void init_hwif_hpt34x(ide_hwif_t *); diff -Nru a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c --- a/drivers/ide/pci/hpt366.c Thu Feb 19 23:44:25 2004 +++ b/drivers/ide/pci/hpt366.c Thu Feb 19 23:44:25 2004 @@ -972,7 +972,7 @@ if (!hpt366_proc) { hpt366_proc = 1; - ide_pci_register_host_proc(&hpt366_procs[0]); + ide_pci_create_host_proc("hpt366", hpt366_get_info); } #endif /* DISPLAY_HPT366_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/hpt366.h b/drivers/ide/pci/hpt366.h --- a/drivers/ide/pci/hpt366.h Thu Feb 19 23:44:26 2004 +++ b/drivers/ide/pci/hpt366.h Thu Feb 19 23:44:26 2004 @@ -416,24 +416,6 @@ #define F_LOW_PCI_50 0x2d #define F_LOW_PCI_66 0x42 -#if defined(DISPLAY_HPT366_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 hpt366_proc; - -static int hpt366_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t hpt366_procs[] = { - { - .name = "hpt366", - .set = 1, - .get_info = hpt366_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_HPT366_TIMINGS) && defined(CONFIG_PROC_FS) */ - static void init_setup_hpt366(struct pci_dev *, ide_pci_device_t *); static void init_setup_hpt37x(struct pci_dev *, ide_pci_device_t *); static void init_setup_hpt374(struct pci_dev *, ide_pci_device_t *); diff -Nru a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c --- a/drivers/ide/pci/pdc202xx_new.c Thu Feb 19 23:44:27 2004 +++ b/drivers/ide/pci/pdc202xx_new.c Thu Feb 19 23:44:27 2004 @@ -574,7 +574,7 @@ if (!pdcnew_proc) { pdcnew_proc = 1; - ide_pci_register_host_proc(&pdcnew_procs[0]); + ide_pci_create_host_proc("pdcnew", pdcnew_get_info); } #endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/pdc202xx_new.h b/drivers/ide/pci/pdc202xx_new.h --- a/drivers/ide/pci/pdc202xx_new.h Thu Feb 19 23:44:23 2004 +++ b/drivers/ide/pci/pdc202xx_new.h Thu Feb 19 23:44:23 2004 @@ -164,25 +164,6 @@ #define DISPLAY_PDC202XX_TIMINGS -#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 pdcnew_proc; - -static int pdcnew_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t pdcnew_procs[] = { - { - .name = "pdcnew", - .set = 1, - .get_info = pdcnew_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */ - - static void init_setup_pdcnew(struct pci_dev *, ide_pci_device_t *); static void init_setup_pdc20270(struct pci_dev *, ide_pci_device_t *); static void init_setup_pdc20276(struct pci_dev *dev, ide_pci_device_t *d); diff -Nru a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c --- a/drivers/ide/pci/pdc202xx_old.c Thu Feb 19 23:44:28 2004 +++ b/drivers/ide/pci/pdc202xx_old.c Thu Feb 19 23:44:28 2004 @@ -707,7 +707,7 @@ if (!pdc202xx_proc) { pdc202xx_proc = 1; - ide_pci_register_host_proc(&pdc202xx_procs[0]); + ide_pci_create_host_proc("pdc202xx", pdc202xx_get_info); } #endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/pdc202xx_old.h b/drivers/ide/pci/pdc202xx_old.h --- a/drivers/ide/pci/pdc202xx_old.h Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/pci/pdc202xx_old.h Thu Feb 19 23:44:22 2004 @@ -199,25 +199,6 @@ #define DISPLAY_PDC202XX_TIMINGS -#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 pdc202xx_proc; - -static int pdc202xx_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t pdc202xx_procs[] = { - { - .name = "pdc202xx", - .set = 1, - .get_info = pdc202xx_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */ - - static void init_setup_pdc202ata4(struct pci_dev *dev, ide_pci_device_t *d); static void init_setup_pdc20265(struct pci_dev *, ide_pci_device_t *); static void init_setup_pdc202xx(struct pci_dev *, ide_pci_device_t *); diff -Nru a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c --- a/drivers/ide/pci/piix.c Thu Feb 19 23:44:23 2004 +++ b/drivers/ide/pci/piix.c Thu Feb 19 23:44:23 2004 @@ -636,7 +636,7 @@ if (!piix_proc) { piix_proc = 1; - ide_pci_register_host_proc(&piix_procs[0]); + ide_pci_create_host_proc("piix", piix_get_info); } #endif /* DISPLAY_PIIX_TIMINGS && CONFIG_PROC_FS */ return 0; diff -Nru a/drivers/ide/pci/piix.h b/drivers/ide/pci/piix.h --- a/drivers/ide/pci/piix.h Thu Feb 19 23:44:23 2004 +++ b/drivers/ide/pci/piix.h Thu Feb 19 23:44:23 2004 @@ -9,24 +9,6 @@ #define DISPLAY_PIIX_TIMINGS -#if defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 piix_proc; - -static int piix_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t piix_procs[] = { - { - .name = "piix", - .set = 1, - .get_info = piix_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) */ - static void init_setup_piix(struct pci_dev *, ide_pci_device_t *); static unsigned int __devinit init_chipset_piix(struct pci_dev *, const char *); static void init_hwif_piix(ide_hwif_t *); diff -Nru a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c --- a/drivers/ide/pci/sc1200.c Thu Feb 19 23:44:26 2004 +++ b/drivers/ide/pci/sc1200.c Thu Feb 19 23:44:26 2004 @@ -515,7 +515,7 @@ if (!bmide_dev) { sc1200_proc = 1; bmide_dev = dev; - ide_pci_register_host_proc(&sc1200_procs[0]); + ide_pci_create_host_proc("sc1200", sc1200_get_info); } #endif /* DISPLAY_SC1200_TIMINGS && CONFIG_PROC_FS */ return 0; diff -Nru a/drivers/ide/pci/sc1200.h b/drivers/ide/pci/sc1200.h --- a/drivers/ide/pci/sc1200.h Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/sc1200.h Thu Feb 19 23:44:24 2004 @@ -7,24 +7,6 @@ #define DISPLAY_SC1200_TIMINGS -#if defined(DISPLAY_SC1200_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 sc1200_proc; - -static int sc1200_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t sc1200_procs[] = { - { - .name = "sc1200", - .set = 1, - .get_info = sc1200_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_SC1200_TIMINGS && CONFIG_PROC_FS */ - static unsigned int init_chipset_sc1200(struct pci_dev *, const char *); static void init_hwif_sc1200(ide_hwif_t *); diff -Nru a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c --- a/drivers/ide/pci/serverworks.c Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/pci/serverworks.c Thu Feb 19 23:44:22 2004 @@ -621,7 +621,7 @@ if (!svwks_proc) { svwks_proc = 1; - ide_pci_register_host_proc(&svwks_procs[0]); + ide_pci_create_host_proc("svwks", svwks_get_info); } #endif /* DISPLAY_SVWKS_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/serverworks.h b/drivers/ide/pci/serverworks.h --- a/drivers/ide/pci/serverworks.h Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/serverworks.h Thu Feb 19 23:44:24 2004 @@ -23,24 +23,6 @@ #define DISPLAY_SVWKS_TIMINGS 1 -#if defined(DISPLAY_SVWKS_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 svwks_proc; - -static int svwks_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t svwks_procs[] = { -{ - .name = "svwks", - .set = 1, - .get_info = svwks_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_SVWKS_TIMINGS) && defined(CONFIG_PROC_FS) */ - static void init_setup_svwks(struct pci_dev *, ide_pci_device_t *); static void init_setup_csb6(struct pci_dev *, ide_pci_device_t *); static unsigned int init_chipset_svwks(struct pci_dev *, const char *); diff -Nru a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c --- a/drivers/ide/pci/siimage.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/siimage.c Thu Feb 19 23:44:24 2004 @@ -785,7 +785,7 @@ if (!siimage_proc) { siimage_proc = 1; - ide_pci_register_host_proc(&siimage_procs[0]); + ide_pci_create_host_proc("siimage", siimage_get_info); } #endif /* DISPLAY_SIIMAGE_TIMINGS && CONFIG_PROC_FS */ } diff -Nru a/drivers/ide/pci/siimage.h b/drivers/ide/pci/siimage.h --- a/drivers/ide/pci/siimage.h Thu Feb 19 23:44:25 2004 +++ b/drivers/ide/pci/siimage.h Thu Feb 19 23:44:25 2004 @@ -21,26 +21,6 @@ #define siiprintk(x...) #endif - -#if defined(DISPLAY_SIIMAGE_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static char * print_siimage_get_info(char *, struct pci_dev *, int); -static int siimage_get_info(char *, char **, off_t, int); - -static u8 siimage_proc; - -static ide_pci_host_proc_t siimage_procs[] = { - { - .name = "siimage", - .set = 1, - .get_info = siimage_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_SIIMAGE_TIMINGS && CONFIG_PROC_FS */ - static unsigned int init_chipset_siimage(struct pci_dev *, const char *); static void init_iops_siimage(ide_hwif_t *); static void init_hwif_siimage(ide_hwif_t *); diff -Nru a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c --- a/drivers/ide/pci/sis5513.c Thu Feb 19 23:44:25 2004 +++ b/drivers/ide/pci/sis5513.c Thu Feb 19 23:44:25 2004 @@ -881,7 +881,7 @@ if (!sis_proc) { sis_proc = 1; bmide_dev = dev; - ide_pci_register_host_proc(&sis_procs[0]); + ide_pci_create_host_proc("sis", sis_get_info); } #endif } diff -Nru a/drivers/ide/pci/sis5513.h b/drivers/ide/pci/sis5513.h --- a/drivers/ide/pci/sis5513.h Thu Feb 19 23:44:26 2004 +++ b/drivers/ide/pci/sis5513.h Thu Feb 19 23:44:26 2004 @@ -7,24 +7,6 @@ #define DISPLAY_SIS_TIMINGS -#if defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 sis_proc; - -static int sis_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t sis_procs[] = { -{ - .name = "sis", - .set = 1, - .get_info = sis_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) */ - static unsigned int init_chipset_sis5513(struct pci_dev *, const char *); static void init_hwif_sis5513(ide_hwif_t *); diff -Nru a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c --- a/drivers/ide/pci/slc90e66.c Thu Feb 19 23:44:27 2004 +++ b/drivers/ide/pci/slc90e66.c Thu Feb 19 23:44:27 2004 @@ -319,7 +319,7 @@ if (!slc90e66_proc) { slc90e66_proc = 1; bmide_dev = dev; - ide_pci_register_host_proc(&slc90e66_procs[0]); + ide_pci_create_host_proc("slc90e66", slc90e66_get_info); } #endif /* DISPLAY_SLC90E66_TIMINGS && CONFIG_PROC_FS */ return 0; diff -Nru a/drivers/ide/pci/slc90e66.h b/drivers/ide/pci/slc90e66.h --- a/drivers/ide/pci/slc90e66.h Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/slc90e66.h Thu Feb 19 23:44:24 2004 @@ -9,24 +9,6 @@ #define SLC90E66_DEBUG_DRIVE_INFO 0 -#if defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 slc90e66_proc; - -static int slc90e66_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t slc90e66_procs[] = { - { - .name = "slc90e66", - .set = 1, - .get_info = slc90e66_get_info, - .parent = NULL, - }, -}; -#endif /* defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS) */ - static unsigned int init_chipset_slc90e66(struct pci_dev *, const char *); static void init_hwif_slc90e66(ide_hwif_t *); diff -Nru a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c --- a/drivers/ide/pci/triflex.c Thu Feb 19 23:44:24 2004 +++ b/drivers/ide/pci/triflex.c Thu Feb 19 23:44:24 2004 @@ -212,7 +212,7 @@ const char *name) { #ifdef CONFIG_PROC_FS - ide_pci_register_host_proc(&triflex_proc); + ide_pci_create_host_proc("triflex", triflex_get_info); #endif return 0; } diff -Nru a/drivers/ide/pci/triflex.h b/drivers/ide/pci/triflex.h --- a/drivers/ide/pci/triflex.h Thu Feb 19 23:44:27 2004 +++ b/drivers/ide/pci/triflex.h Thu Feb 19 23:44:27 2004 @@ -14,15 +14,6 @@ static unsigned int __devinit init_chipset_triflex(struct pci_dev *, const char *); static void init_hwif_triflex(ide_hwif_t *); -#ifdef CONFIG_PROC_FS -static int triflex_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t triflex_proc = { - .name = "triflex", - .set = 1, - .get_info = triflex_get_info, -}; -#endif static ide_pci_device_t triflex_devices[] __devinitdata = { { diff -Nru a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c --- a/drivers/ide/pci/via82cxxx.c Thu Feb 19 23:44:22 2004 +++ b/drivers/ide/pci/via82cxxx.c Thu Feb 19 23:44:22 2004 @@ -567,7 +567,7 @@ via_base = pci_resource_start(dev, 4); bmide_dev = dev; isa_dev = isa; - ide_pci_register_host_proc(&via_procs[0]); + ide_pci_create_host_proc("via", via_get_info); via_proc = 1; } #endif /* DISPLAY_VIA_TIMINGS && CONFIG_PROC_FS */ diff -Nru a/drivers/ide/pci/via82cxxx.h b/drivers/ide/pci/via82cxxx.h --- a/drivers/ide/pci/via82cxxx.h Thu Feb 19 23:44:26 2004 +++ b/drivers/ide/pci/via82cxxx.h Thu Feb 19 23:44:26 2004 @@ -7,24 +7,6 @@ #define DISPLAY_VIA_TIMINGS -#if defined(DISPLAY_VIA_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include - -static u8 via_proc; - -static int via_get_info(char *, char **, off_t, int); - -static ide_pci_host_proc_t via_procs[] = { - { - .name = "via", - .set = 1, - .get_info = via_get_info, - .parent = NULL, - }, -}; -#endif /* DISPLAY_VIA_TIMINGS && CONFIG_PROC_FS */ - static unsigned int init_chipset_via82cxxx(struct pci_dev *, const char *); static void init_hwif_via82cxxx(ide_hwif_t *); diff -Nru a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c --- a/drivers/ide/ppc/pmac.c Thu Feb 19 23:44:23 2004 +++ b/drivers/ide/ppc/pmac.c Thu Feb 19 23:44:23 2004 @@ -55,7 +55,7 @@ #define IDE_PMAC_DEBUG -#define DMA_WAIT_TIMEOUT 100 +#define DMA_WAIT_TIMEOUT 50 typedef struct pmac_ide_hwif { unsigned long regbase; @@ -2026,8 +2026,11 @@ dstat = readl(&dma->status); writel(((RUN|WAKE|DEAD) << 16), &dma->control); pmac_ide_destroy_dmatable(drive); - /* verify good dma status */ - return (dstat & (RUN|DEAD|ACTIVE)) != RUN; + /* verify good dma status. we don't check for ACTIVE beeing 0. We should... + * in theory, but with ATAPI decices doing buffer underruns, that would + * cause us to disable DMA, which isn't what we want + */ + return (dstat & (RUN|DEAD)) != RUN; } /* @@ -2041,7 +2044,7 @@ { pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data; volatile struct dbdma_regs *dma; - unsigned long status; + unsigned long status, timeout; if (pmif == NULL) return 0; @@ -2057,17 +2060,8 @@ * - The dbdma fifo hasn't yet finished flushing to * to system memory when the disk interrupt occurs. * - * The trick here is to increment drive->waiting_for_dma, - * and return as if no interrupt occurred. If the counter - * reach a certain timeout value, we then return 1. If - * we really got the interrupt, it will happen right away - * again. - * Apple's solution here may be more elegant. They issue - * a DMA channel interrupt (a separate irq line) via a DBDMA - * NOP command just before the STOP, and wait for both the - * disk and DBDMA interrupts to have completed. */ - + /* If ACTIVE is cleared, the STOP command have passed and * transfer is complete. */ @@ -2079,15 +2073,26 @@ called while not waiting\n", HWIF(drive)->index); /* If dbdma didn't execute the STOP command yet, the - * active bit is still set */ - drive->waiting_for_dma++; - if (drive->waiting_for_dma >= DMA_WAIT_TIMEOUT) { - printk(KERN_WARNING "ide%d, timeout waiting \ - for dbdma command stop\n", HWIF(drive)->index); - return 1; - } - udelay(5); - return 0; + * active bit is still set. We consider that we aren't + * sharing interrupts (which is hopefully the case with + * those controllers) and so we just try to flush the + * channel for pending data in the fifo + */ + udelay(1); + writel((FLUSH << 16) | FLUSH, &dma->control); + timeout = 0; + for (;;) { + udelay(1); + status = readl(&dma->status); + if ((status & FLUSH) == 0) + break; + if (++timeout > 100) { + printk(KERN_WARNING "ide%d, ide_dma_test_irq \ + timeout flushing channel\n", HWIF(drive)->index); + break; + } + } + return 1; } static int __pmac diff -Nru a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig --- a/drivers/isdn/Kconfig Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/Kconfig Thu Feb 19 23:44:28 2004 @@ -4,8 +4,8 @@ menu "ISDN subsystem" -config ISDN_BOOL - bool "ISDN support" +config ISDN + tristate "ISDN support" depends on NET ---help--- ISDN ("Integrated Services Digital Networks", called RNIS in France) @@ -22,9 +22,9 @@ menu "Old ISDN4Linux" - depends on NET && ISDN_BOOL && BROKEN_ON_SMP + depends on NET && ISDN -config ISDN +config ISDN_I4L tristate "Old ISDN4Linux (obsolete)" ---help--- This driver allows you to use an ISDN-card for networking @@ -41,18 +41,18 @@ Therefore the old ISDN4Linux layer is becoming obsolete. It is still usable, though, if you select this option. -if ISDN +if ISDN_I4L source "drivers/isdn/i4l/Kconfig" endif endmenu comment "CAPI subsystem" - depends on NET && ISDN_BOOL + depends on NET && ISDN config ISDN_CAPI tristate "CAPI2.0 support" - depends on ISDN_BOOL + depends on ISDN help This provides the CAPI (Common ISDN Application Programming Interface, a standard making it easy for programs to access ISDN diff -Nru a/drivers/isdn/Makefile b/drivers/isdn/Makefile --- a/drivers/isdn/Makefile Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/Makefile Thu Feb 19 23:44:28 2004 @@ -2,7 +2,7 @@ # Object files in subdirectories -obj-$(CONFIG_ISDN) += i4l/ +obj-$(CONFIG_ISDN_I4L) += i4l/ obj-$(CONFIG_ISDN_CAPI) += capi/ obj-$(CONFIG_ISDN_CAPI) += hardware/ obj-$(CONFIG_ISDN_DIVERSION) += divert/ diff -Nru a/drivers/isdn/act2000/Kconfig b/drivers/isdn/act2000/Kconfig --- a/drivers/isdn/act2000/Kconfig Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/act2000/Kconfig Thu Feb 19 23:44:26 2004 @@ -3,7 +3,7 @@ # config ISDN_DRV_ACT2000 tristate "IBM Active 2000 support" - depends on ISDN && ISA + depends on ISDN_I4L && ISA help Say Y here if you have an IBM Active 2000 ISDN card. In order to use this card, additional firmware is necessary, which has to be loaded diff -Nru a/drivers/isdn/act2000/act2000.h b/drivers/isdn/act2000/act2000.h --- a/drivers/isdn/act2000/act2000.h Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/act2000/act2000.h Thu Feb 19 23:44:25 2004 @@ -147,34 +147,36 @@ * Per card driver data */ typedef struct act2000_card { - unsigned short port; /* Base-port-address */ - unsigned short irq; /* Interrupt */ - u_char ptype; /* Protocol type (1TR6 or Euro) */ - u_char bus; /* Cardtype (ISA, MCA, PCMCIA) */ - struct act2000_card *next; /* Pointer to next device struct */ - int myid; /* Driver-Nr. assigned by linklevel */ - unsigned long flags; /* Statusflags */ - unsigned long ilock; /* Semaphores for IRQ-Routines */ - struct sk_buff_head rcvq; /* Receive-Message queue */ - struct sk_buff_head sndq; /* Send-Message queue */ - struct sk_buff_head ackq; /* Data-Ack-Message queue */ - u_char *ack_msg; /* Ptr to User Data in User skb */ - __u16 need_b3ack; /* Flag: Need ACK for current skb */ - struct sk_buff *sbuf; /* skb which is currently sent */ - struct timer_list ptimer; /* Poll timer */ - struct work_struct snd_tq; /* Task struct for xmit bh */ - struct work_struct rcv_tq; /* Task struct for rcv bh */ - struct work_struct poll_tq; /* Task struct for polled rcv bh */ + unsigned short port; /* Base-port-address */ + unsigned short irq; /* Interrupt */ + u_char ptype; /* Protocol type (1TR6 or Euro) */ + u_char bus; /* Cardtype (ISA, MCA, PCMCIA) */ + struct act2000_card *next; /* Pointer to next device struct */ + spinlock_t lock; /* protect critical operations */ + int myid; /* Driver-Nr. assigned by linklevel */ + unsigned long flags; /* Statusflags */ + unsigned long ilock; /* Semaphores for IRQ-Routines */ + struct sk_buff_head rcvq; /* Receive-Message queue */ + struct sk_buff_head sndq; /* Send-Message queue */ + struct sk_buff_head ackq; /* Data-Ack-Message queue */ + u_char *ack_msg; /* Ptr to User Data in User skb */ + __u16 need_b3ack; /* Flag: Need ACK for current skb */ + struct sk_buff *sbuf; /* skb which is currently sent */ + struct timer_list ptimer; /* Poll timer */ + struct work_struct snd_tq; /* Task struct for xmit bh */ + struct work_struct rcv_tq; /* Task struct for rcv bh */ + struct work_struct poll_tq; /* Task struct for polled rcv bh */ msn_entry *msn_list; - unsigned short msgnum; /* Message number fur sending */ - act2000_chan bch[ACT2000_BCH]; /* B-Channel status/control */ - char status_buf[256]; /* Buffer for status messages */ + unsigned short msgnum; /* Message number for sending */ + spinlock_t mnlock; /* lock for msgnum */ + act2000_chan bch[ACT2000_BCH]; /* B-Channel status/control */ + char status_buf[256]; /* Buffer for status messages */ char *status_buf_read; char *status_buf_write; char *status_buf_end; - irq_data idat; /* Data used for IRQ handler */ - isdn_if interface; /* Interface to upper layer */ - char regname[35]; /* Name used for request_region */ + irq_data idat; /* Data used for IRQ handler */ + isdn_if interface; /* Interface to upper layer */ + char regname[35]; /* Name used for request_region */ } act2000_card; extern __inline__ void act2000_schedule_tx(act2000_card *card) diff -Nru a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c --- a/drivers/isdn/act2000/act2000_isa.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/act2000/act2000_isa.c Thu Feb 19 23:44:24 2004 @@ -21,10 +21,8 @@ static void act2000_isa_delay(long t) { - sti(); set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(t); - sti(); } /* @@ -64,8 +62,10 @@ { int ret = 0; - if (!check_region(portbase, ISA_REGION)) + if (request_region(portbase, ACT2000_PORTLEN, "act2000isa")) { ret = act2000_isa_reset(portbase); + release_region(portbase, ISA_REGION); + } return ret; } @@ -177,14 +177,13 @@ release_region(card->port, ISA_REGION); card->flags &= ~ACT2000_FLAGS_PVALID; } - if (!check_region(portbase, ISA_REGION)) { - if (request_region(portbase, ACT2000_PORTLEN, card->regname) == NULL) - return -EIO; + if (request_region(portbase, ACT2000_PORTLEN, card->regname) == NULL) + return -EBUSY; + else { card->port = portbase; card->flags |= ACT2000_FLAGS_PVALID; return 0; } - return -EBUSY; } /* @@ -195,8 +194,7 @@ { unsigned long flags; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); if (card->flags & ACT2000_FLAGS_IVALID) { free_irq(card->irq, NULL); irq2card_map[card->irq] = NULL; @@ -205,7 +203,7 @@ if (card->flags & ACT2000_FLAGS_PVALID) release_region(card->port, ISA_REGION); card->flags &= ~ACT2000_FLAGS_PVALID; - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); } static int @@ -316,8 +314,7 @@ if (test_and_set_bit(ACT2000_LOCK_TX, (void *) &card->ilock) != 0) return; while (1) { - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); if (!(card->sbuf)) { if ((card->sbuf = skb_dequeue(&card->sndq))) { card->ack_msg = card->sbuf->data; @@ -330,7 +327,7 @@ } } } - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); if (!(card->sbuf)) { /* No more data to send */ test_and_clear_bit(ACT2000_LOCK_TX, (void *) &card->ilock); diff -Nru a/drivers/isdn/act2000/capi.c b/drivers/isdn/act2000/capi.c --- a/drivers/isdn/act2000/capi.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/act2000/capi.c Thu Feb 19 23:44:28 2004 @@ -591,10 +591,9 @@ struct actcapi_msg *m; int ret = 0; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); skb = skb_peek(&card->ackq); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); if (!skb) { printk(KERN_WARNING "act2000: handle_ack nothing found!\n"); return 0; @@ -614,10 +613,9 @@ chan->queued = 0; return ret; } - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); tmp = skb_peek((struct sk_buff_head *)tmp); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); if ((tmp == skb) || (tmp == NULL)) { /* reached end of queue */ printk(KERN_WARNING "act2000: handle_ack nothing found!\n"); diff -Nru a/drivers/isdn/act2000/capi.h b/drivers/isdn/act2000/capi.h --- a/drivers/isdn/act2000/capi.h Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/act2000/capi.h Thu Feb 19 23:44:28 2004 @@ -336,12 +336,11 @@ unsigned long flags; unsigned short n; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->mnlock, flags); n = card->msgnum; card->msgnum++; card->msgnum &= 0x7fff; - restore_flags(flags); + spin_unlock_irqrestore(&card->mnlock, flags); return n; } #define DEBUG_MSG diff -Nru a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c --- a/drivers/isdn/act2000/module.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/act2000/module.c Thu Feb 19 23:44:27 2004 @@ -62,19 +62,18 @@ static void act2000_clear_msn(act2000_card *card) { - struct msn_entry *p = card->msn_list; - struct msn_entry *q; + struct msn_entry *p = card->msn_list; + struct msn_entry *q; unsigned long flags; - save_flags(flags); - cli(); - card->msn_list = NULL; - restore_flags(flags); - while (p) { - q = p->next; - kfree(p); - p = q; - } + spin_lock_irqsave(&card->lock, flags); + card->msn_list = NULL; + spin_unlock_irqrestore(&card->lock, flags); + while (p) { + q = p->next; + kfree(p); + p = q; + } } /* @@ -143,13 +142,12 @@ /* Delete a single MSN */ while (p) { if (p->eaz == eazmsn[0]) { - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); if (q) q->next = p->next; else card->msn_list = p->next; - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); kfree(p); printk(KERN_DEBUG "Mapping for EAZ %c deleted\n", @@ -165,10 +163,9 @@ while (p) { /* Found in list, replace MSN */ if (p->eaz == eazmsn[0]) { - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); strcpy(p->msn, &eazmsn[1]); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); printk(KERN_DEBUG "Mapping for EAZ %c changed to %s\n", eazmsn[0], @@ -184,10 +181,9 @@ p->eaz = eazmsn[0]; strcpy(p->msn, &eazmsn[1]); p->next = card->msn_list; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); card->msn_list = p; - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); printk(KERN_DEBUG "Mapping %c -> %s added\n", eazmsn[0], @@ -232,10 +228,9 @@ unsigned long flags; act2000_receive(card); - save_flags(flags); - cli(); - mod_timer(&card->ptimer, jiffies+3); - restore_flags(flags); + spin_lock_irqsave(&card->lock, flags); + mod_timer(&card->ptimer, jiffies+3); + spin_unlock_irqrestore(&card->lock, flags); } static int @@ -311,10 +306,9 @@ return -ENODEV; if (!(chan = find_channel(card, c->arg & 0x0f))) break; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); if (chan->fsm_state != ACT2000_STATE_NULL) { - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); printk(KERN_WARNING "Dial on channel with state %d\n", chan->fsm_state); return -EBUSY; @@ -325,7 +319,7 @@ tmp[0] = c->parm.setup.eazmsn[0]; chan->fsm_state = ACT2000_STATE_OCALL; chan->callref = 0xffff; - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); ret = actcapi_connect_req(card, chan, c->parm.setup.phone, tmp[0], c->parm.setup.si1, c->parm.setup.si2); @@ -580,6 +574,8 @@ return; } memset((char *) card, 0, sizeof(act2000_card)); + spin_lock_init(&card->lock); + spin_lock_init(&card->mnlock); skb_queue_head_init(&card->sndq); skb_queue_head_init(&card->rcvq); skb_queue_head_init(&card->ackq); diff -Nru a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig --- a/drivers/isdn/capi/Kconfig Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/capi/Kconfig Thu Feb 19 23:44:24 2004 @@ -44,7 +44,7 @@ config ISDN_CAPI_CAPIDRV tristate "CAPI2.0 capidrv interface support" - depends on ISDN_CAPI && ISDN + depends on ISDN_CAPI && ISDN_I4L help This option provides the glue code to hook up CAPI driven cards to the legacy isdn4linux link layer. If you have a card which is diff -Nru a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c --- a/drivers/isdn/capi/capi.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/capi/capi.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: capi.c,v 1.1.4.1.2.2 2001/12/21 15:00:17 kai Exp $ +/* $Id: capi.c,v 1.1.2.3 2004/01/16 21:09:26 keil Exp $ * * CAPI 2.0 Interface for Linux * @@ -44,7 +44,7 @@ #include "capifs.h" #endif -static char *revision = "$Revision: 1.1.4.1.2.2 $"; +static char *revision = "$Revision: 1.1.2.3 $"; MODULE_DESCRIPTION("CAPI4Linux: Userspace /dev/capi20 interface"); MODULE_AUTHOR("Carsten Paeth"); @@ -203,7 +203,7 @@ struct list_head *l; unsigned int minor = 0; unsigned long flags; - + mp = kmalloc(sizeof(*mp), GFP_ATOMIC); if (!mp) { printk(KERN_ERR "capi: can't alloc capiminor\n"); @@ -220,19 +220,24 @@ skb_queue_head_init(&mp->outqueue); write_lock_irqsave(&capiminor_list_lock, flags); - list_for_each(l, &capiminor_list) { - p = list_entry(l, struct capiminor, list); - if (p->minor > minor) { - mp->minor = minor; - list_add_tail(&mp->list, &p->list); - break; + if (list_empty(&capiminor_list)) { + list_add(&mp->list, &capiminor_list); + write_unlock_irqrestore(&capiminor_list_lock, flags); + } else { + list_for_each(l, &capiminor_list) { + p = list_entry(l, struct capiminor, list); + if (p->minor > minor) { + mp->minor = minor; + list_add_tail(&mp->list, &p->list); + break; + } + minor++; + } + write_unlock_irqrestore(&capiminor_list_lock, flags); + if (l == &capiminor_list) { + kfree(mp); + return NULL; } - minor++; - } - write_unlock_irqrestore(&capiminor_list_lock, flags); - if (l == &capiminor_list) { - kfree(mp); - return NULL; } return mp; } @@ -297,7 +302,7 @@ printk(KERN_DEBUG "set mp->nccip\n"); #endif #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE) - capifs_new_ncci(0, mp->minor, MKDEV(capi_ttymajor, mp->minor)); + capifs_new_ncci(mp->minor, MKDEV(capi_ttymajor, mp->minor)); #endif } #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ @@ -322,8 +327,7 @@ #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE if ((mp = np->minorp) != 0) { #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE) - capifs_free_ncci('r', mp->minor); - capifs_free_ncci(0, mp->minor); + capifs_free_ncci(mp->minor); #endif if (mp->tty) { mp->nccip = 0; diff -Nru a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c --- a/drivers/isdn/capi/capidrv.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/capi/capidrv.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: capidrv.c,v 1.39.6.7 2001/09/23 22:24:33 kai Exp $ +/* $Id: capidrv.c,v 1.1.2.2 2004/01/12 23:17:24 keil Exp $ * * ISDN4Linux Driver, using capi20 interface (kernelcapi) * @@ -34,7 +34,7 @@ #include #include "capidrv.h" -static char *revision = "$Revision: 1.39.6.7 $"; +static char *revision = "$Revision: 1.1.2.2 $"; static int debugmode = 0; MODULE_DESCRIPTION("CAPI4Linux: Interface to ISDN4Linux"); @@ -1263,6 +1263,10 @@ goto ignored; case CAPI_DATA_B3_CONF: /* ncci */ + if (cmsg->Info) { + printk(KERN_WARNING "CAPI_DATA_B3_CONF: Info %x - %s\n", + cmsg->Info, capi_info2str(cmsg->Info)); + } if (!(nccip = find_ncci(card, cmsg->adr.adrNCCI))) goto notfound; @@ -1368,7 +1372,7 @@ static void capidrv_recv_message(struct capi20_appl *ap, struct sk_buff *skb) { capi_message2cmsg(&s_cmsg, skb->data); - if (debugmode > 2) + if (debugmode > 3) printk(KERN_DEBUG "capidrv_signal: applid=%d %s\n", ap->applid, capi_cmsg2str(&s_cmsg)); @@ -1825,7 +1829,7 @@ id); return 0; } - if (debugmode > 1) + if (debugmode > 4) printk(KERN_DEBUG "capidrv-%d: sendbuf len=%d skb=%p doack=%d\n", card->contrnr, len, skb, doack); bchan = &card->bchans[channel % card->nbchan]; @@ -1866,6 +1870,9 @@ nccip->datahandle++; return len; } + if (debugmode > 3) + printk(KERN_DEBUG "capidrv-%d: sendbuf putmsg ret(%x) - %s\n", + card->contrnr, errcode, capi_info2str(errcode)); (void)capidrv_del_ack(nccip, datahandle); dev_kfree_skb(nskb); return errcode == CAPI_SENDQUEUEFULL ? 0 : -1; @@ -1876,6 +1883,9 @@ nccip->datahandle++; return len; } + if (debugmode > 3) + printk(KERN_DEBUG "capidrv-%d: sendbuf putmsg ret(%x) - %s\n", + card->contrnr, errcode, capi_info2str(errcode)); skb_pull(skb, msglen); (void)capidrv_del_ack(nccip, datahandle); return errcode == CAPI_SENDQUEUEFULL ? 0 : -1; diff -Nru a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c --- a/drivers/isdn/capi/capifs.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/capi/capifs.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: capifs.c,v 1.14.6.8 2001/09/23 22:24:33 kai Exp $ +/* $Id: capifs.c,v 1.1.2.3 2004/01/16 21:09:26 keil Exp $ * * Copyright 2000 by Carsten Paeth * @@ -20,99 +20,75 @@ MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); -static char *revision = "$Revision: 1.14.6.8 $"; +/* ------------------------------------------------------------------ */ + +static char *revision = "$Revision: 1.1.2.3 $"; + +/* ------------------------------------------------------------------ */ -struct options { +#define CAPIFS_SUPER_MAGIC (('C'<<8)|'N') + +static struct vfsmount *capifs_mnt; +static struct dentry *capifs_root; + +static struct { int setuid; int setgid; uid_t uid; gid_t gid; umode_t mode; -}; -static struct options options = {.mode = 0600}; - -#define CAPIFS_SUPER_MAGIC (('C'<<8)|'N') +} config = {.mode = 0600}; /* ------------------------------------------------------------------ */ - -static int capifs_parse_options(char *s, struct options *p) +static int capifs_remount(struct super_block *s, int *flags, char *data) { int setuid = 0; int setgid = 0; uid_t uid = 0; gid_t gid = 0; umode_t mode = 0600; - char *this_char, *value; + char *this_char; - if (!s) - return 0; - - while ((this_char = strsep(&s, ",")) != NULL) { + this_char = NULL; + while ((this_char = strsep(&data, ",")) != NULL) { + int n; + char dummy; if (!*this_char) continue; - if ((value = strchr(this_char,'=')) != NULL) - *value++ = 0; - if (!strcmp(this_char,"uid")) { - if (!value || !*value) - return 1; - uid = simple_strtoul(value,&value,0); - if (*value) - return 1; + if (sscanf(this_char, "uid=%i%c", &n, &dummy) == 1) { setuid = 1; - } - else if (!strcmp(this_char,"gid")) { - if (!value || !*value) - return 1; - gid = simple_strtoul(value,&value,0); - if (*value) - return 1; + uid = n; + } else if (sscanf(this_char, "gid=%i%c", &n, &dummy) == 1) { setgid = 1; + gid = n; + } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1) + mode = n & ~S_IFMT; + else { + printk("capifs: called with bogus options\n"); + return -EINVAL; } - else if (!strcmp(this_char,"mode")) { - if (!value || !*value) - return 1; - mode = simple_strtoul(value,&value,8); - if (*value) - return 1; - } - } - p->setuid = setuid; - p->setgid = setgid; - p->uid = uid; - p->gid = gid; - p->mode = mode & ~S_IFMT; - - return 0; -} - -static int capifs_remount(struct super_block *s, int *flags, char *data) -{ - struct options new; - if (capifs_parse_options(data, &new)) { - printk("capifs: called with bogus options\n"); - return -EINVAL; } - options = new; + config.setuid = setuid; + config.setgid = setgid; + config.uid = uid; + config.gid = gid; + config.mode = mode; return 0; } - static struct super_operations capifs_sops = { .statfs = simple_statfs, .remount_fs = capifs_remount, }; -static int capifs_fill_super(struct super_block *s, void *data, int silent) + +static int +capifs_fill_super(struct super_block *s, void *data, int silent) { struct inode * inode; - if (capifs_parse_options(data, &options)) { - printk("capifs: called with bogus options\n"); - return -EINVAL; - } - s->s_blocksize = 1024; s->s_blocksize_bits = 10; s->s_magic = CAPIFS_SUPER_MAGIC; @@ -120,24 +96,25 @@ inode = new_inode(s); if (!inode) - return -ENOMEM; + goto fail; + inode->i_ino = 1; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; inode->i_blocks = 0; inode->i_blksize = 1024; inode->i_uid = inode->i_gid = 0; - inode->i_ino = 1; inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; inode->i_op = &simple_dir_inode_operations; inode->i_fop = &simple_dir_operations; inode->i_nlink = 2; - s->s_root = d_alloc_root(inode); - if (!s->s_root) { - printk("capifs: get root dentry failed\n"); - iput(inode); - return -ENOMEM; - } - return 0; + capifs_root = s->s_root = d_alloc_root(inode); + if (s->s_root) + return 0; + + printk("capifs: get root dentry failed\n"); + iput(inode); +fail: + return -ENOMEM; } static struct super_block *capifs_get_sb(struct file_system_type *fs_type, @@ -153,78 +130,48 @@ .kill_sb = kill_anon_super, }; -static struct vfsmount *capifs_mnt; -static int entry_count; - -static int grab_instance(void) -{ - return simple_pin_fs("capifs", &capifs_mnt, &entry_count); -} - -static void drop_instance(void) -{ - return simple_release_fs(&capifs_mnt, &entry_count); -} - -static struct dentry *get_node(int type, int num) +static struct dentry *get_node(int num) { char s[10]; - int len; - struct dentry *root = capifs_mnt->mnt_root; - if (type) - len = sprintf(s, "%d", num); - else - len = sprintf(s, "%c%d", type, num); + struct dentry *root = capifs_root; down(&root->d_inode->i_sem); - return lookup_one_len(s, root, len); + return lookup_one_len(s, root, sprintf(s, "%d", num)); } -void capifs_new_ncci(char type, unsigned int num, dev_t device) +void capifs_new_ncci(unsigned int number, dev_t device) { - struct super_block *sb; struct dentry *dentry; - struct inode *inode; - - if (grab_instance() < 0) + struct inode *inode = new_inode(capifs_mnt->mnt_sb); + if (!inode) return; - sb = capifs_mnt->mnt_sb; - inode = new_inode(sb); - if (inode) { - inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; - inode->i_blocks = 0; - inode->i_blksize = 1024; - inode->i_uid = options.setuid ? options.uid : current->fsuid; - inode->i_gid = options.setgid ? options.gid : current->fsgid; - inode->i_nlink = 1; - init_special_inode(inode, S_IFCHR | options.mode, device); - dentry = get_node(type, num); - if (!IS_ERR(dentry) && !dentry->d_inode) { - grab_instance(); - d_instantiate(dentry, inode); - } else - iput(inode); - up(&sb->s_root->d_inode->i_sem); - } - drop_instance(); + inode->i_ino = number+2; + inode->i_blksize = 1024; + inode->i_uid = config.setuid ? config.uid : current->fsuid; + inode->i_gid = config.setgid ? config.gid : current->fsgid; + inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; + init_special_inode(inode, S_IFCHR|config.mode, device); + //inode->i_op = &capifs_file_inode_operations; + + dentry = get_node(number); + if (!IS_ERR(dentry) && !dentry->d_inode) + d_instantiate(dentry, inode); + up(&capifs_root->d_inode->i_sem); } -void capifs_free_ncci(char type, unsigned int num) +void capifs_free_ncci(unsigned int number) { - if (grab_instance() == 0) { - struct dentry *dentry = get_node(type, num); - if (!IS_ERR(dentry)) { - struct inode *inode = dentry->d_inode; - if (inode) { - inode->i_nlink--; - d_delete(dentry); - dput(dentry); - drop_instance(); - } + struct dentry *dentry = get_node(number); + + if (!IS_ERR(dentry)) { + struct inode *inode = dentry->d_inode; + if (inode) { + inode->i_nlink--; + d_delete(dentry); dput(dentry); } - up(&capifs_mnt->mnt_root->d_inode->i_sem); - drop_instance(); + dput(dentry); } + up(&capifs_root->d_inode->i_sem); } static int __init capifs_init(void) @@ -241,14 +188,20 @@ strcpy(rev, "1.0"); err = register_filesystem(&capifs_fs_type); + if (!err) { + capifs_mnt = kern_mount(&capifs_fs_type); + if (IS_ERR(capifs_mnt)) + err = PTR_ERR(capifs_mnt); + } if (!err) printk(KERN_NOTICE "capifs: Rev %s\n", rev); - return 0; + return err; } static void __exit capifs_exit(void) { unregister_filesystem(&capifs_fs_type); + mntput(capifs_mnt); } EXPORT_SYMBOL(capifs_new_ncci); diff -Nru a/drivers/isdn/capi/capifs.h b/drivers/isdn/capi/capifs.h --- a/drivers/isdn/capi/capifs.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/capi/capifs.h Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: capifs.h,v 1.2.6.2 2001/09/23 22:24:33 kai Exp $ +/* $Id: capifs.h,v 1.1.2.2 2004/01/16 21:09:26 keil Exp $ * * Copyright 2000 by Carsten Paeth * @@ -7,5 +7,5 @@ * */ -void capifs_new_ncci(char type, unsigned int num, dev_t device); -void capifs_free_ncci(char type, unsigned int num); +void capifs_new_ncci(unsigned int num, dev_t device); +void capifs_free_ncci(unsigned int num); diff -Nru a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c --- a/drivers/isdn/capi/kcapi.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/capi/kcapi.c Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: kcapi.c,v 1.21.6.8 2001/09/23 22:24:33 kai Exp $ +/* $Id: kcapi.c,v 1.1.2.4 2004/02/10 01:07:11 keil Exp $ * * Kernel CAPI 2.0 Module * @@ -31,7 +31,7 @@ #include #endif -static char *revision = "$Revision: 1.21.6.8 $"; +static char *revision = "$Revision: 1.1.2.4 $"; /* ------------------------------------------------------------- */ @@ -61,7 +61,7 @@ #define NCCI2CTRL(ncci) (((ncci) >> 24) & 0x7f) LIST_HEAD(capi_drivers); -spinlock_t capi_drivers_lock = SPIN_LOCK_UNLOCKED; +rwlock_t capi_drivers_list_lock = RW_LOCK_UNLOCKED; struct capi20_appl *capi_applications[CAPI_MAXAPPL]; struct capi_ctr *capi_cards[CAPI_MAXCONTR]; @@ -309,12 +309,10 @@ continue; } - if ( CAPIMSG_COMMAND(skb->data) == CAPI_DATA_B3 - && CAPIMSG_SUBCOMMAND(skb->data) == CAPI_IND) { + if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_IND) ap->nrecvdatapkt++; - } else { + else ap->nrecvctlpkt++; - } ap->recv_message(ap, skb); } } @@ -498,6 +496,28 @@ EXPORT_SYMBOL(detach_capi_ctr); +void register_capi_driver(struct capi_driver *driver) +{ + unsigned long flags; + + write_lock_irqsave(&capi_drivers_list_lock, flags); + list_add_tail(&driver->list, &capi_drivers); + write_unlock_irqrestore(&capi_drivers_list_lock, flags); +} + +EXPORT_SYMBOL(register_capi_driver); + +void unregister_capi_driver(struct capi_driver *driver) +{ + unsigned long flags; + + write_lock_irqsave(&capi_drivers_list_lock, flags); + list_del(&driver->list); + write_unlock_irqrestore(&capi_drivers_list_lock, flags); +} + +EXPORT_SYMBOL(unregister_capi_driver); + /* ------------------------------------------------------------- */ /* -------- CAPI2.0 Interface ---------------------------------- */ /* ------------------------------------------------------------- */ @@ -704,12 +724,68 @@ static int old_capi_manufacturer(unsigned int cmd, void *data) { avmb1_loadandconfigdef ldef; + avmb1_extcarddef cdef; avmb1_resetdef rdef; + capicardparams cparams; struct capi_ctr *card; + struct capi_driver *driver = 0; capiloaddata ldata; + struct list_head *l; + unsigned long flags; int retval; switch (cmd) { + case AVMB1_ADDCARD: + case AVMB1_ADDCARD_WITH_TYPE: + if (cmd == AVMB1_ADDCARD) { + if ((retval = copy_from_user((void *) &cdef, data, + sizeof(avmb1_carddef)))) + return retval; + cdef.cardtype = AVM_CARDTYPE_B1; + } else { + if ((retval = copy_from_user((void *) &cdef, data, + sizeof(avmb1_extcarddef)))) + return retval; + } + cparams.port = cdef.port; + cparams.irq = cdef.irq; + cparams.cardnr = cdef.cardnr; + + read_lock_irqsave(&capi_drivers_list_lock, flags); + switch (cdef.cardtype) { + case AVM_CARDTYPE_B1: + list_for_each(l, &capi_drivers) { + driver = list_entry(l, struct capi_driver, list); + if (strcmp(driver->name, "b1isa") == 0) + break; + } + break; + case AVM_CARDTYPE_T1: + list_for_each(l, &capi_drivers) { + driver = list_entry(l, struct capi_driver, list); + if (strcmp(driver->name, "t1isa") == 0) + break; + } + break; + default: + driver = 0; + break; + } + if (!driver) { + read_unlock_irqrestore(&capi_drivers_list_lock, flags); + printk(KERN_ERR "kcapi: driver not loaded.\n"); + return -EIO; + } + if (!driver->add_card) { + read_unlock_irqrestore(&capi_drivers_list_lock, flags); + printk(KERN_ERR "kcapi: driver has no add card function.\n"); + return -EIO; + } + + retval = driver->add_card(driver, &cparams); + read_unlock_irqrestore(&capi_drivers_list_lock, flags); + return retval; + case AVMB1_LOAD: case AVMB1_LOAD_AND_CONFIG: @@ -831,6 +907,43 @@ printk(KERN_INFO "kcapi: contr %d set trace=%d\n", card->cnr, card->traceflag); return 0; + } + case KCAPI_CMD_ADDCARD: + { + struct list_head *l; + struct capi_driver *driver = 0; + capicardparams cparams; + kcapi_carddef cdef; + int retval; + + if ((retval = copy_from_user((void *) &cdef, data, + sizeof(cdef)))) + return retval; + + cparams.port = cdef.port; + cparams.irq = cdef.irq; + cparams.membase = cdef.membase; + cparams.cardnr = cdef.cardnr; + cparams.cardtype = 0; + cdef.driver[sizeof(cdef.driver)-1] = 0; + + list_for_each(l, &capi_drivers) { + driver = list_entry(l, struct capi_driver, list); + if (strcmp(driver->name, cdef.driver) == 0) + break; + } + if (driver == 0) { + printk(KERN_ERR "kcapi: driver \"%s\" not loaded.\n", + cdef.driver); + return -ESRCH; + } + + if (!driver->add_card) { + printk(KERN_ERR "kcapi: driver \"%s\" has no add card function.\n", cdef.driver); + return -EIO; + } + + return driver->add_card(driver, &cparams); } default: diff -Nru a/drivers/isdn/capi/kcapi.h b/drivers/isdn/capi/kcapi.h --- a/drivers/isdn/capi/kcapi.h Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/capi/kcapi.h Thu Feb 19 23:44:27 2004 @@ -15,10 +15,13 @@ #include #include +#ifdef KCAPI_DEBUG #define DBG(format, arg...) do { \ printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ } while (0) - +#else +#define DBG(format, arg...) /* */ +#endif enum { CARD_DETECTED = 1, @@ -27,7 +30,7 @@ }; extern struct list_head capi_drivers; -extern spinlock_t capi_drivers_lock; +extern rwlock_t capi_drivers_list_lock; extern struct capi20_appl *capi_applications[CAPI_MAXAPPL]; extern struct capi_ctr *capi_cards[CAPI_MAXCONTR]; diff -Nru a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c --- a/drivers/isdn/capi/kcapi_proc.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/capi/kcapi_proc.c Thu Feb 19 23:44:25 2004 @@ -243,16 +243,84 @@ // --------------------------------------------------------------------------- + +static __inline__ struct capi_driver *capi_driver_get_idx(loff_t pos) +{ + struct capi_driver *drv = 0; + struct list_head *l; + loff_t i; + + i = 0; + list_for_each(l, &capi_drivers) { + drv = list_entry(l, struct capi_driver, list); + if (i++ == pos) + return drv; + } + return 0; +} + +static void *capi_driver_start(struct seq_file *seq, loff_t *pos) +{ + struct capi_driver *drv; + read_lock(&capi_drivers_list_lock); + drv = capi_driver_get_idx(*pos); + return drv; +} + +static void *capi_driver_next(struct seq_file *seq, void *v, loff_t *pos) +{ + struct capi_driver *drv = (struct capi_driver *)v; + ++*pos; + if (drv->list.next == &capi_drivers) return 0; + return list_entry(drv->list.next, struct capi_driver, list); +} + +static void capi_driver_stop(struct seq_file *seq, void *v) +{ + read_unlock(&capi_drivers_list_lock); +} + +static int capi_driver_show(struct seq_file *seq, void *v) +{ + struct capi_driver *drv = (struct capi_driver *)v; + seq_printf(seq, "%-32s %s\n", drv->name, drv->revision); + return 0; +} + +struct seq_operations seq_capi_driver_ops = { + .start = capi_driver_start, + .next = capi_driver_next, + .stop = capi_driver_stop, + .show = capi_driver_show, +}; + +static int +seq_capi_driver_open(struct inode *inode, struct file *file) +{ + int err; + err = seq_open(file, &seq_capi_driver_ops); + return err; +} + +static struct file_operations proc_driver_ops = { + .open = seq_capi_driver_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + +// --------------------------------------------------------------------------- + void __init kcapi_proc_init(void) { proc_mkdir("capi", NULL); proc_mkdir("capi/controllers", NULL); - proc_mkdir("capi/drivers", NULL); create_seq_entry("capi/controller", 0, &proc_controller_ops); create_seq_entry("capi/contrstats", 0, &proc_contrstats_ops); create_seq_entry("capi/applications", 0, &proc_applications_ops); create_seq_entry("capi/applstats", 0, &proc_applstats_ops); + create_seq_entry("capi/driver", 0, &proc_driver_ops); } void __exit @@ -263,7 +331,6 @@ remove_proc_entry("capi/contrstats", NULL); remove_proc_entry("capi/applications", NULL); remove_proc_entry("capi/applstats", NULL); - remove_proc_entry("capi/drivers", NULL); remove_proc_entry("capi/controllers", NULL); remove_proc_entry("capi", NULL); } diff -Nru a/drivers/isdn/hardware/Kconfig b/drivers/isdn/hardware/Kconfig --- a/drivers/isdn/hardware/Kconfig Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hardware/Kconfig Thu Feb 19 23:44:28 2004 @@ -2,32 +2,9 @@ # ISDN hardware drivers # comment "CAPI hardware drivers" - depends on NET && ISDN_BOOL && ISDN_CAPI + depends on NET && ISDN && ISDN_CAPI source "drivers/isdn/hardware/avm/Kconfig" source "drivers/isdn/hardware/eicon/Kconfig" - -comment "ISDN4Linux hardware drivers" - depends on NET && ISDN_BOOL && ISDN - -source "drivers/isdn/hisax/Kconfig" - - -menu "Active cards" - depends on NET && ISDN_BOOL && ISDN!=n - -source "drivers/isdn/icn/Kconfig" - -source "drivers/isdn/pcbit/Kconfig" - -source "drivers/isdn/sc/Kconfig" - -source "drivers/isdn/act2000/Kconfig" - -source "drivers/isdn/tpam/Kconfig" - -source "drivers/isdn/hysdn/Kconfig" - -endmenu diff -Nru a/drivers/isdn/hardware/avm/Kconfig b/drivers/isdn/hardware/avm/Kconfig --- a/drivers/isdn/hardware/avm/Kconfig Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hardware/avm/Kconfig Thu Feb 19 23:44:24 2004 @@ -3,7 +3,7 @@ # menu "Active AVM cards" - depends on NET && ISDN_BOOL && ISDN_CAPI!=n + depends on NET && ISDN && ISDN_CAPI!=n config CAPI_AVM bool "Support AVM cards" diff -Nru a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c --- a/drivers/isdn/hardware/avm/b1.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hardware/avm/b1.c Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: b1.c,v 1.1.4.1.2.1 2001/12/21 15:00:17 kai Exp $ +/* $Id: b1.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $ * * Common module for AVM B1 cards. * @@ -28,7 +28,7 @@ #include #include -static char *revision = "$Revision: 1.1.4.1.2.1 $"; +static char *revision = "$Revision: 1.1.2.2 $"; /* ------------------------------------------------------------- */ @@ -76,7 +76,7 @@ kfree(card); return 0; } - memset(cinfo, 0, sizeof(*cinfo)); + memset(cinfo, 0, sizeof(*cinfo) * nr_controllers); card->ctrlinfo = cinfo; for (i = 0; i < nr_controllers; i++) { @@ -308,14 +308,13 @@ return -EIO; } - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_setinterrupt(port, card->irq, card->cardtype); b1_put_byte(port, SEND_INIT); b1_put_word(port, CAPI_MAXAPPL); b1_put_word(port, AVM_NCCI_PER_CHANNEL*2); b1_put_word(port, ctrl->cnr - 1); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); return 0; } @@ -348,15 +347,14 @@ else nconn = ctrl->profile.nbchannel * -want; if (nconn == 0) nconn = ctrl->profile.nbchannel; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_put_byte(port, SEND_REGISTER); b1_put_word(port, appl); b1_put_word(port, 1024 * (nconn+1)); b1_put_word(port, nconn); b1_put_word(port, rp->datablkcnt); b1_put_word(port, rp->datablklen); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); } void b1_release_appl(struct capi_ctr *ctrl, u16 appl) @@ -368,11 +366,10 @@ capilib_release_appl(&cinfo->ncci_head, appl); - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_put_byte(port, SEND_RELEASE); b1_put_word(port, appl); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); } u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb) @@ -396,20 +393,18 @@ dlen = CAPIMSG_DATALEN(skb->data); - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_put_byte(port, SEND_DATA_B3_REQ); b1_put_slice(port, skb->data, len); b1_put_slice(port, skb->data + len, dlen); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); } else { retval = CAPI_NOERROR; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_put_byte(port, SEND_MESSAGE); b1_put_slice(port, skb->data, len); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); } out: dev_kfree_skb_any(skb); @@ -505,9 +500,14 @@ unsigned DataB3Len; unsigned NCCI; unsigned WindowSize; + unsigned long flags; + + spin_lock_irqsave(&card->lock, flags); - if (!b1_rx_full(card->port)) - return IRQ_NONE; + if (!b1_rx_full(card->port)) { + spin_unlock_irqrestore(&card->lock, flags); + return IRQ_NONE; + } b1cmd = b1_get_byte(card->port); @@ -518,6 +518,7 @@ ApplId = (unsigned) b1_get_word(card->port); MsgLen = b1_get_slice(card->port, card->msgbuf); DataB3Len = b1_get_slice(card->port, card->databuf); + spin_unlock_irqrestore(&card->lock, flags); if (MsgLen < 30) { /* not CAPI 64Bit */ memset(card->msgbuf+MsgLen, 0, 30-MsgLen); @@ -538,6 +539,7 @@ ApplId = (unsigned) b1_get_word(card->port); MsgLen = b1_get_slice(card->port, card->msgbuf); + spin_unlock_irqrestore(&card->lock, flags); if (!(skb = alloc_skb(MsgLen, GFP_ATOMIC))) { printk(KERN_ERR "%s: incoming packet dropped\n", card->name); @@ -557,6 +559,7 @@ ApplId = b1_get_word(card->port); NCCI = b1_get_word(card->port); WindowSize = b1_get_word(card->port); + spin_unlock_irqrestore(&card->lock, flags); capilib_new_ncci(&cinfo->ncci_head, ApplId, NCCI, WindowSize); @@ -566,6 +569,7 @@ ApplId = b1_get_word(card->port); NCCI = b1_get_word(card->port); + spin_unlock_irqrestore(&card->lock, flags); if (NCCI != 0xffffffff) capilib_free_ncci(&cinfo->ncci_head, ApplId, NCCI); @@ -574,16 +578,19 @@ case RECEIVE_START: /* b1_put_byte(card->port, SEND_POLLACK); */ + spin_unlock_irqrestore(&card->lock, flags); capi_ctr_resume_output(ctrl); break; case RECEIVE_STOP: + spin_unlock_irqrestore(&card->lock, flags); capi_ctr_suspend_output(ctrl); break; case RECEIVE_INIT: cinfo->versionlen = b1_get_slice(card->port, cinfo->versionbuf); + spin_unlock_irqrestore(&card->lock, flags); b1_parse_version(cinfo); printk(KERN_INFO "%s: %s-card (%s) now active\n", card->name, @@ -595,6 +602,7 @@ case RECEIVE_TASK_READY: ApplId = (unsigned) b1_get_word(card->port); MsgLen = b1_get_slice(card->port, card->msgbuf); + spin_unlock_irqrestore(&card->lock, flags); card->msgbuf[MsgLen] = 0; while ( MsgLen > 0 && ( card->msgbuf[MsgLen-1] == '\n' @@ -608,6 +616,7 @@ case RECEIVE_DEBUGMSG: MsgLen = b1_get_slice(card->port, card->msgbuf); + spin_unlock_irqrestore(&card->lock, flags); card->msgbuf[MsgLen] = 0; while ( MsgLen > 0 && ( card->msgbuf[MsgLen-1] == '\n' @@ -619,9 +628,11 @@ break; case 0xff: + spin_unlock_irqrestore(&card->lock, flags); printk(KERN_ERR "%s: card removed ?\n", card->name); return IRQ_NONE; default: + spin_unlock_irqrestore(&card->lock, flags); printk(KERN_ERR "%s: b1_interrupt: 0x%x ???\n", card->name, b1cmd); return IRQ_HANDLED; diff -Nru a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c --- a/drivers/isdn/hardware/avm/b1dma.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hardware/avm/b1dma.c Thu Feb 19 23:44:26 2004 @@ -1,4 +1,4 @@ -/* $Id: b1dma.c,v 1.1.4.1.2.1 2001/12/21 15:00:17 kai Exp $ +/* $Id: b1dma.c,v 1.1.2.3 2004/02/10 01:07:12 keil Exp $ * * Common module for AVM B1 cards that support dma with AMCC * @@ -28,11 +28,9 @@ #include #include -#if BITS_PER_LONG != 32 -#error FIXME: driver requires 32-bit platform -#endif +static char *revision = "$Revision: 1.1.2.3 $"; -static char *revision = "$Revision: 1.1.4.1.2.1 $"; +#undef CONFIG_B1DMA_DEBUG /* ------------------------------------------------------------- */ @@ -239,7 +237,7 @@ /* ------------------------------------------------------------- */ -int b1dma_detect(avmcard *card) +static int b1dma_detect(avmcard *card) { b1dma_writel(card, 0, AMCC_MCSR); mdelay(10); @@ -578,11 +576,16 @@ static void b1dma_handle_interrupt(avmcard *card) { - u32 status = b1dma_readl(card, AMCC_INTCSR); + u32 status; u32 newcsr; - if ((status & ANY_S5933_INT) == 0) + spin_lock(&card->lock); + + status = b1dma_readl(card, AMCC_INTCSR); + if ((status & ANY_S5933_INT) == 0) { + spin_unlock(&card->lock); return; + } newcsr = card->csr | (status & ALL_INT); if (status & TX_TC_INT) newcsr &= ~EN_TX_TC_INT; @@ -593,20 +596,28 @@ struct avmcard_dmainfo *dma = card->dma; u32 rxlen; if (card->dma->recvlen == 0) { - dma->recvlen = *((u32 *)dma->recvbuf.dmabuf); - rxlen = (dma->recvlen + 3) & ~3; - b1dma_writel(card, dma->recvbuf.dmaaddr+4, AMCC_RXPTR); - b1dma_writel(card, rxlen, AMCC_RXLEN); + rxlen = b1dma_readl(card, AMCC_RXLEN); + if (rxlen == 0) { + dma->recvlen = *((u32 *)dma->recvbuf.dmabuf); + rxlen = (dma->recvlen + 3) & ~3; + b1dma_writel(card, dma->recvbuf.dmaaddr+4, AMCC_RXPTR); + b1dma_writel(card, rxlen, AMCC_RXLEN); +#ifdef CONFIG_B1DMA_DEBUG + } else { + printk(KERN_ERR "%s: rx not complete (%d).\n", + card->name, rxlen); +#endif + } } else { + spin_unlock(&card->lock); b1dma_handle_rx(card); dma->recvlen = 0; + spin_lock(&card->lock); b1dma_writel(card, dma->recvbuf.dmaaddr, AMCC_RXPTR); b1dma_writel(card, 4, AMCC_RXLEN); } } - spin_lock(&card->lock); - if ((status & TX_TC_INT) != 0) { if (skb_queue_empty(&card->dma->send_queue)) card->csr &= ~EN_TX_TC_INT; @@ -736,18 +747,19 @@ { avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata); avmcard *card = cinfo->card; + unsigned long flags; + spin_lock_irqsave(&card->lock, flags); b1dma_reset(card); + spin_unlock_irqrestore(&card->lock, flags); memset(cinfo->version, 0, sizeof(cinfo->version)); capilib_release(&cinfo->ncci_head); capi_ctr_reseted(ctrl); } - /* ------------------------------------------------------------- */ - void b1dma_register_appl(struct capi_ctr *ctrl, u16 appl, capi_register_params *rp) @@ -844,6 +856,7 @@ int len = 0; char *s; u32 txoff, txlen, rxoff, rxlen, csr; + unsigned long flags; len += sprintf(page+len, "%-16s %s\n", "name", card->name); len += sprintf(page+len, "%-16s 0x%x\n", "io", card->port); @@ -896,6 +909,9 @@ } len += sprintf(page+len, "%-16s %s\n", "cardname", cinfo->cardname); + + spin_lock_irqsave(&card->lock, flags); + txoff = (dma_addr_t)b1dma_readl(card, AMCC_TXPTR)-card->dma->sendbuf.dmaaddr; txlen = b1dma_readl(card, AMCC_TXLEN); @@ -903,6 +919,8 @@ rxlen = b1dma_readl(card, AMCC_RXLEN); csr = b1dma_readl(card, AMCC_INTCSR); + + spin_unlock_irqrestore(&card->lock, flags); len += sprintf(page+len, "%-16s 0x%lx\n", "csr (cached)", (unsigned long)card->csr); diff -Nru a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c --- a/drivers/isdn/hardware/avm/b1isa.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hardware/avm/b1isa.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: b1isa.c,v 1.10.6.6 2001/09/23 22:24:33 kai Exp $ +/* $Id: b1isa.c,v 1.1.2.3 2004/02/10 01:07:12 keil Exp $ * * Module for AVM B1 ISA-card. * @@ -27,6 +27,10 @@ /* ------------------------------------------------------------- */ +static char *revision = "$Revision: 1.1.2.3 $"; + +/* ------------------------------------------------------------- */ + MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM B1 ISA card"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); @@ -56,7 +60,7 @@ static char *b1isa_procinfo(struct capi_ctr *ctrl); -static int __init b1isa_probe(struct pci_dev *pdev) +static int b1isa_probe(struct pci_dev *pdev) { avmctrl_info *cinfo; avmcard *card; @@ -108,6 +112,7 @@ b1_reset(card->port); b1_getrevision(card); + cinfo->capi_ctrl.owner = THIS_MODULE; cinfo->capi_ctrl.driver_name = "b1isa"; cinfo->capi_ctrl.driverdata = cinfo; cinfo->capi_ctrl.register_appl = b1_register_appl; @@ -118,7 +123,6 @@ cinfo->capi_ctrl.procinfo = b1isa_procinfo; cinfo->capi_ctrl.ctr_read_proc = b1ctl_read_proc; strcpy(cinfo->capi_ctrl.name, card->name); - cinfo->capi_ctrl.owner = THIS_MODULE; retval = attach_capi_ctr(&cinfo->capi_ctrl); if (retval) { @@ -170,23 +174,56 @@ MODULE_PARM_DESC(io, "I/O base address(es)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); +static int b1isa_add_card(struct capi_driver *driver, capicardparams *data) +{ + int i; + + for (i = 0; i < MAX_CARDS; i++) { + if (isa_dev[i].resource[0].start) + continue; + + isa_dev[i].resource[0].start = data->port; + isa_dev[i].irq = data->irq; + + if (b1isa_probe(&isa_dev[i]) == 0) + return 0; + } + return -ENODEV; +} + +static struct capi_driver capi_driver_b1isa = { + .name = "b1isa", + .revision = "1.0", + .add_card = b1isa_add_card, +}; + static int __init b1isa_init(void) { + char *p; + char rev[32]; int i; - int found = 0; + + if ((p = strchr(revision, ':')) != 0 && p[1]) { + strlcpy(rev, p + 2, 32); + if ((p = strchr(rev, '$')) != 0 && p > rev) + *(p-1) = 0; + } else + strcpy(rev, "1.0"); for (i = 0; i < MAX_CARDS; i++) { if (!io[i]) break; isa_dev[i].resource[0].start = io[i]; - isa_dev[i].irq_resource[0].start = irq[i]; + isa_dev[i].irq = irq[i]; - if (b1isa_probe(&isa_dev[i]) == 0) - found++; + if (b1isa_probe(&isa_dev[i]) != 0) + return -ENODEV; } - if (found == 0) - return -ENODEV; + + strlcpy(capi_driver_b1isa.revision, rev, 32); + register_capi_driver(&capi_driver_b1isa); + printk(KERN_INFO "b1isa: revision %s\n", rev); return 0; } @@ -201,6 +238,7 @@ b1isa_remove(&isa_dev[i]); } + unregister_capi_driver(&capi_driver_b1isa); } module_init(b1isa_init); diff -Nru a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c --- a/drivers/isdn/hardware/avm/b1pci.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/hardware/avm/b1pci.c Thu Feb 19 23:44:22 2004 @@ -1,4 +1,4 @@ -/* $Id: b1pci.c,v 1.1.4.1.2.1 2001/12/21 15:00:17 kai Exp $ +/* $Id: b1pci.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $ * * Module for AVM B1 PCI-card. * @@ -28,6 +28,10 @@ /* ------------------------------------------------------------- */ +static char *revision = "$Revision: 1.1.2.2 $"; + +/* ------------------------------------------------------------- */ + static struct pci_device_id b1pci_pci_tbl[] = { { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_B1, PCI_ANY_ID, PCI_ANY_ID }, { } /* Terminating entry */ @@ -362,13 +366,50 @@ .remove = __devexit_p(b1pci_pci_remove), }; +static struct capi_driver capi_driver_b1pci = { + .name = "b1pci", + .revision = "1.0", +}; +#ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4 +static struct capi_driver capi_driver_b1pciv4 = { + .name = "b1pciv4", + .revision = "1.0", +}; +#endif + static int __init b1pci_init(void) { - return pci_module_init(&b1pci_pci_driver); + char *p; + char rev[32]; + int err; + + if ((p = strchr(revision, ':')) != 0 && p[1]) { + strlcpy(rev, p + 2, 32); + if ((p = strchr(rev, '$')) != 0 && p > rev) + *(p-1) = 0; + } else + strcpy(rev, "1.0"); + + + err = pci_module_init(&b1pci_pci_driver); + if (!err) { + strlcpy(capi_driver_b1pci.revision, rev, 32); + register_capi_driver(&capi_driver_b1pci); +#ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4 + strlcpy(capi_driver_b1pciv4.revision, rev, 32); + register_capi_driver(&capi_driver_b1pciv4); +#endif + printk(KERN_INFO "b1pci: revision %s\n", rev); + } + return err; } static void __exit b1pci_exit(void) { + unregister_capi_driver(&capi_driver_b1pci); +#ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4 + unregister_capi_driver(&capi_driver_b1pciv4); +#endif pci_unregister_driver(&b1pci_pci_driver); } diff -Nru a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c --- a/drivers/isdn/hardware/avm/b1pcmcia.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/hardware/avm/b1pcmcia.c Thu Feb 19 23:44:22 2004 @@ -1,4 +1,4 @@ -/* $Id: b1pcmcia.c,v 1.12.6.5 2001/09/23 22:24:33 kai Exp $ +/* $Id: b1pcmcia.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $ * * Module for AVM B1/M1/M2 PCMCIA-card. * @@ -27,6 +27,10 @@ /* ------------------------------------------------------------- */ +static char *revision = "$Revision: 1.1.2.2 $"; + +/* ------------------------------------------------------------- */ + MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM PCMCIA cards"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); @@ -186,3 +190,36 @@ EXPORT_SYMBOL(b1pcmcia_addcard_m1); EXPORT_SYMBOL(b1pcmcia_addcard_m2); EXPORT_SYMBOL(b1pcmcia_delcard); + +static struct capi_driver capi_driver_b1pcmcia = { + .name = "b1pcmcia", + .revision = "1.0", +}; + +static int __init b1pcmcia_init(void) +{ + char *p; + char rev[32]; + int err; + + if ((p = strchr(revision, ':')) != 0 && p[1]) { + strlcpy(rev, p + 2, 32); + if ((p = strchr(rev, '$')) != 0 && p > rev) + *(p-1) = 0; + } else + strcpy(rev, "1.0"); + + strlcpy(capi_driver_b1pcmcia.revision, rev, 32); + register_capi_driver(&capi_driver_b1pcmcia); + printk(KERN_INFO "b1pci: revision %s\n", rev); + + return 0; +} + +static void __exit b1pcmcia_exit(void) +{ + unregister_capi_driver(&capi_driver_b1pcmcia); +} + +module_init(b1pcmcia_init); +module_exit(b1pcmcia_exit); diff -Nru a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c --- a/drivers/isdn/hardware/avm/c4.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hardware/avm/c4.c Thu Feb 19 23:44:25 2004 @@ -1,4 +1,4 @@ -/* $Id: c4.c,v 1.1.4.1.2.1 2001/12/21 15:00:17 kai Exp $ +/* $Id: c4.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $ * * Module for AVM C4 & C2 card. * @@ -34,6 +34,10 @@ /* ------------------------------------------------------------- */ +static char *revision = "$Revision: 1.1.2.2 $"; + +/* ------------------------------------------------------------- */ + static int suppress_pollack; static struct pci_device_id c4_pci_tbl[] = { @@ -404,18 +408,14 @@ static void c4_dispatch_tx(avmcard *card) { avmcard_dmainfo *dma = card->dma; - unsigned long flags; struct sk_buff *skb; u8 cmd, subcmd; u16 len; u32 txlen; void *p; - - save_flags(flags); - cli(); + if (card->csr & DBELL_DOWN_ARM) { /* tx busy */ - restore_flags(flags); return; } @@ -424,7 +424,6 @@ #ifdef CONFIG_C4_DEBUG printk(KERN_DEBUG "%s: tx underrun\n", card->name); #endif - restore_flags(flags); return; } @@ -470,7 +469,6 @@ c4outmeml(card->mbase+DOORBELL, DBELL_DOWN_ARM); - restore_flags(flags); dev_kfree_skb_any(skb); } @@ -664,11 +662,15 @@ static irqreturn_t c4_handle_interrupt(avmcard *card) { - u32 status = c4inmeml(card->mbase+DOORBELL); + u32 status; + + spin_lock(&card->lock); + status = c4inmeml(card->mbase+DOORBELL); if (status & DBELL_RESET_HOST) { u_int i; c4outmeml(card->mbase+PCI_OUT_INT_MASK, 0x0c); + spin_unlock(&card->lock); if (card->nlogcontr == 0) return IRQ_HANDLED; printk(KERN_ERR "%s: unexpected reset\n", card->name); @@ -683,8 +685,10 @@ } status &= (DBELL_UP_HOST | DBELL_DOWN_HOST); - if (!status) + if (!status) { + spin_unlock(&card->lock); return IRQ_HANDLED; + } c4outmeml(card->mbase+DOORBELL, status); if ((status & DBELL_UP_HOST) != 0) { @@ -705,6 +709,7 @@ c4_dispatch_tx(card); } } + spin_unlock(&card->lock); return IRQ_HANDLED; } @@ -767,6 +772,7 @@ static int queue_sendconfig(avmcard *card, char cval[4]) { struct sk_buff *skb; + unsigned long flags; void *p; skb = alloc_skb(3+4, GFP_ATOMIC); @@ -786,7 +792,10 @@ skb_put(skb, (u8 *)p - (u8 *)skb->data); skb_queue_tail(&card->dma->send_queue, skb); + + spin_lock_irqsave(&card->lock, flags); c4_dispatch_tx(card); + spin_unlock_irqrestore(&card->lock, flags); return 0; } @@ -835,7 +844,6 @@ { avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata); avmcard *card = cinfo->card; - unsigned long flags; int retval; if ((retval = c4_load_t4file(card, &data->firmware))) { @@ -845,9 +853,6 @@ return retval; } - save_flags(flags); - cli(); - card->csr = 0; c4outmeml(card->mbase+MBOX_UP_LEN, 0); c4outmeml(card->mbase+MBOX_DOWN_LEN, 0); @@ -862,7 +867,6 @@ c4outmeml(card->mbase+MBOX_UP_ADDR, card->dma->recvbuf.dmaaddr); c4outmeml(card->mbase+MBOX_UP_LEN, card->dma->recvbuf.size); c4outmeml(card->mbase+DOORBELL, DBELL_UP_ARM); - restore_flags(flags); if (data->configuration.len > 0 && data->configuration.data) { retval = c4_send_config(card, &data->configuration); @@ -885,9 +889,14 @@ avmcard *card = ((avmctrl_info *)(ctrl->driverdata))->card; avmctrl_info *cinfo; u_int i; + unsigned long flags; + + spin_lock_irqsave(&card->lock, flags); c4_reset(card); + spin_unlock_irqrestore(&card->lock, flags); + for (i=0; i < card->nr_controllers; i++) { cinfo = &card->ctrlinfo[i]; memset(cinfo->version, 0, sizeof(cinfo->version)); @@ -931,6 +940,7 @@ avmcard *card = cinfo->card; struct sk_buff *skb; int want = rp->level3cnt; + unsigned long flags; int nconn; void *p; @@ -958,7 +968,10 @@ skb_put(skb, (u8 *)p - (u8 *)skb->data); skb_queue_tail(&card->dma->send_queue, skb); + + spin_lock_irqsave(&card->lock, flags); c4_dispatch_tx(card); + spin_unlock_irqrestore(&card->lock, flags); } } @@ -968,6 +981,7 @@ { avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata); avmcard *card = cinfo->card; + unsigned long flags; struct sk_buff *skb; void *p; @@ -988,7 +1002,9 @@ skb_put(skb, (u8 *)p - (u8 *)skb->data); skb_queue_tail(&card->dma->send_queue, skb); + spin_lock_irqsave(&card->lock, flags); c4_dispatch_tx(card); + spin_unlock_irqrestore(&card->lock, flags); } } @@ -1000,6 +1016,7 @@ avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata); avmcard *card = cinfo->card; u16 retval = CAPI_NOERROR; + unsigned long flags; if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_REQ) { retval = capilib_data_b3_req(&cinfo->ncci_head, @@ -1009,7 +1026,9 @@ } if (retval == CAPI_NOERROR) { skb_queue_tail(&card->dma->send_queue, skb); + spin_lock_irqsave(&card->lock, flags); c4_dispatch_tx(card); + spin_unlock_irqrestore(&card->lock, flags); } else { dev_kfree_skb_any(skb); } @@ -1164,6 +1183,7 @@ for (i=0; i < nr_controllers ; i++) { cinfo = &card->ctrlinfo[i]; + cinfo->capi_ctrl.owner = THIS_MODULE; cinfo->capi_ctrl.driver_name = "c4"; cinfo->capi_ctrl.driverdata = cinfo; cinfo->capi_ctrl.register_appl = c4_register_appl; @@ -1174,7 +1194,6 @@ cinfo->capi_ctrl.procinfo = c4_procinfo; cinfo->capi_ctrl.ctr_read_proc = c4_read_proc; strcpy(cinfo->capi_ctrl.name, card->name); - cinfo->capi_ctrl.owner = THIS_MODULE; retval = attach_capi_ctr(&cinfo->capi_ctrl); if (retval) { @@ -1247,13 +1266,44 @@ .remove = c4_remove, }; +static struct capi_driver capi_driver_c2 = { + .name = "c2", + .revision = "1.0", +}; + +static struct capi_driver capi_driver_c4 = { + .name = "c4", + .revision = "1.0", +}; + static int __init c4_init(void) { - return pci_module_init(&c4_pci_driver); + char *p; + char rev[32]; + int err; + + if ((p = strchr(revision, ':')) != 0 && p[1]) { + strlcpy(rev, p + 2, 32); + if ((p = strchr(rev, '$')) != 0 && p > rev) + *(p-1) = 0; + } else + strcpy(rev, "1.0"); + + err = pci_module_init(&c4_pci_driver); + if (!err) { + strlcpy(capi_driver_c2.revision, rev, 32); + register_capi_driver(&capi_driver_c2); + strlcpy(capi_driver_c4.revision, rev, 32); + register_capi_driver(&capi_driver_c4); + printk(KERN_INFO "c4: revision %s\n", rev); + } + return err; } static void __exit c4_exit(void) { + unregister_capi_driver(&capi_driver_c2); + unregister_capi_driver(&capi_driver_c4); pci_unregister_driver(&c4_pci_driver); } diff -Nru a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c --- a/drivers/isdn/hardware/avm/t1isa.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hardware/avm/t1isa.c Thu Feb 19 23:44:26 2004 @@ -1,4 +1,4 @@ -/* $Id: t1isa.c,v 1.16.6.7 2001/09/23 22:24:34 kai Exp $ +/* $Id: t1isa.c,v 1.1.2.3 2004/02/10 01:07:12 keil Exp $ * * Module for AVM T1 HEMA-card. * @@ -29,6 +29,10 @@ /* ------------------------------------------------------------- */ +static char *revision = "$Revision: 1.1.2.3 $"; + +/* ------------------------------------------------------------- */ + MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM T1 HEMA ISA card"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); @@ -58,7 +62,6 @@ { unsigned char cregs[8]; unsigned char reverse_cardnr; - unsigned long flags; unsigned char dummy; int i; @@ -73,8 +76,12 @@ cregs[6] = 0; cregs[7] = 0; - save_flags(flags); - cli(); + /* + * no one else should use the ISA bus in this moment, + * but no function there to prevent this :-( + * save_flags(flags); cli(); + */ + /* board reset */ t1outp(base, T1_RESETBOARD, 0xf); mdelay(100); @@ -87,7 +94,7 @@ t1outp(base, HEMA_PAL_ID >> 4, cregs[0]); for(i=1;i<7;i++) t1outp(base, 0, cregs[i]); t1outp(base, ((base >> 4)) & 0x3, cregs[7]); - restore_flags(flags); + /* restore_flags(flags); */ mdelay(100); t1outp(base, T1_FASTLINK+T1_RESETLINK, 0); @@ -137,6 +144,9 @@ unsigned DataB3Len; unsigned NCCI; unsigned WindowSize; + unsigned long flags; + + spin_lock_irqsave(&card->lock, flags); while (b1_rx_full(card->port)) { @@ -149,6 +159,7 @@ ApplId = (unsigned) b1_get_word(card->port); MsgLen = t1_get_slice(card->port, card->msgbuf); DataB3Len = t1_get_slice(card->port, card->databuf); + spin_unlock_irqrestore(&card->lock, flags); if (MsgLen < 30) { /* not CAPI 64Bit */ memset(card->msgbuf+MsgLen, 0, 30-MsgLen); @@ -169,6 +180,7 @@ ApplId = (unsigned) b1_get_word(card->port); MsgLen = t1_get_slice(card->port, card->msgbuf); + spin_unlock_irqrestore(&card->lock, flags); if (!(skb = alloc_skb(MsgLen, GFP_ATOMIC))) { printk(KERN_ERR "%s: incoming packet dropped\n", card->name); @@ -188,6 +200,7 @@ ApplId = b1_get_word(card->port); NCCI = b1_get_word(card->port); WindowSize = b1_get_word(card->port); + spin_unlock_irqrestore(&card->lock, flags); capilib_new_ncci(&cinfo->ncci_head, ApplId, NCCI, WindowSize); @@ -197,6 +210,7 @@ ApplId = b1_get_word(card->port); NCCI = b1_get_word(card->port); + spin_unlock_irqrestore(&card->lock, flags); if (NCCI != 0xffffffff) capilib_free_ncci(&cinfo->ncci_head, ApplId, NCCI); @@ -205,16 +219,19 @@ case RECEIVE_START: b1_put_byte(card->port, SEND_POLLACK); + spin_unlock_irqrestore(&card->lock, flags); capi_ctr_resume_output(ctrl); break; case RECEIVE_STOP: + spin_unlock_irqrestore(&card->lock, flags); capi_ctr_suspend_output(ctrl); break; case RECEIVE_INIT: cinfo->versionlen = t1_get_slice(card->port, cinfo->versionbuf); + spin_unlock_irqrestore(&card->lock, flags); b1_parse_version(cinfo); printk(KERN_INFO "%s: %s-card (%s) now active\n", card->name, @@ -226,6 +243,7 @@ case RECEIVE_TASK_READY: ApplId = (unsigned) b1_get_word(card->port); MsgLen = t1_get_slice(card->port, card->msgbuf); + spin_unlock_irqrestore(&card->lock, flags); card->msgbuf[MsgLen] = 0; while ( MsgLen > 0 && ( card->msgbuf[MsgLen-1] == '\n' @@ -239,6 +257,7 @@ case RECEIVE_DEBUGMSG: MsgLen = t1_get_slice(card->port, card->msgbuf); + spin_unlock_irqrestore(&card->lock, flags); card->msgbuf[MsgLen] = 0; while ( MsgLen > 0 && ( card->msgbuf[MsgLen-1] == '\n' @@ -251,9 +270,11 @@ case 0xff: + spin_unlock_irqrestore(&card->lock, flags); printk(KERN_ERR "%s: card reseted ?\n", card->name); return IRQ_HANDLED; default: + spin_unlock_irqrestore(&card->lock, flags); printk(KERN_ERR "%s: b1_interrupt: 0x%x ???\n", card->name, b1cmd); return IRQ_NONE; @@ -296,14 +317,13 @@ return -EIO; } - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_setinterrupt(port, card->irq, card->cardtype); b1_put_byte(port, SEND_INIT); b1_put_word(port, CAPI_MAXAPPL); b1_put_word(port, AVM_NCCI_PER_CHANNEL*30); b1_put_word(port, ctrl->cnr - 1); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); return 0; } @@ -349,7 +369,7 @@ static u16 t1isa_send_message(struct capi_ctr *ctrl, struct sk_buff *skb); static char *t1isa_procinfo(struct capi_ctr *ctrl); -static int __init t1isa_probe(struct pci_dev *pdev, int cardnr) +static int t1isa_probe(struct pci_dev *pdev, int cardnr) { avmctrl_info *cinfo; avmcard *card; @@ -401,6 +421,7 @@ t1_disable_irq(card->port); b1_reset(card->port); + cinfo->capi_ctrl.owner = THIS_MODULE; cinfo->capi_ctrl.driver_name = "t1isa"; cinfo->capi_ctrl.driverdata = cinfo; cinfo->capi_ctrl.register_appl = b1_register_appl; @@ -411,7 +432,6 @@ cinfo->capi_ctrl.procinfo = t1isa_procinfo; cinfo->capi_ctrl.ctr_read_proc = b1ctl_read_proc; strcpy(cinfo->capi_ctrl.name, card->name); - cinfo->capi_ctrl.owner = THIS_MODULE; retval = attach_capi_ctr(&cinfo->capi_ctrl); if (retval) { @@ -456,20 +476,18 @@ dlen = CAPIMSG_DATALEN(skb->data); - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_put_byte(port, SEND_DATA_B3_REQ); t1_put_slice(port, skb->data, len); t1_put_slice(port, skb->data + len, dlen); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); } else { retval = CAPI_NOERROR; - save_flags(flags); - cli(); + spin_lock_irqsave(&card->lock, flags); b1_put_byte(port, SEND_MESSAGE); t1_put_slice(port, skb->data, len); - restore_flags(flags); + spin_unlock_irqrestore(&card->lock, flags); } out: dev_kfree_skb_any(skb); @@ -509,23 +527,56 @@ MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); MODULE_PARM_DESC(cardnr, "Card number(s) (as jumpered)"); +static int t1isa_add_card(struct capi_driver *driver, capicardparams *data) +{ + int i; + + for (i = 0; i < MAX_CARDS; i++) { + if (isa_dev[i].resource[0].start) + continue; + + isa_dev[i].resource[0].start = data->port; + isa_dev[i].irq = data->irq; + + if (t1isa_probe(&isa_dev[i], data->cardnr) == 0) + return 0; + } + return -ENODEV; +} + +static struct capi_driver capi_driver_t1isa = { + .name = "t1isa", + .revision = "1.0", + .add_card = t1isa_add_card, +}; + static int __init t1isa_init(void) { + char rev[32]; + char *p; int i; - int found = 0; + + if ((p = strchr(revision, ':')) != 0 && p[1]) { + strlcpy(rev, p + 2, 32); + if ((p = strchr(rev, '$')) != 0 && p > rev) + *(p-1) = 0; + } else + strcpy(rev, "1.0"); for (i = 0; i < MAX_CARDS; i++) { if (!io[i]) break; isa_dev[i].resource[0].start = io[i]; - isa_dev[i].irq_resource[0].start = irq[i]; + isa_dev[i].irq = irq[i]; - if (t1isa_probe(&isa_dev[i], cardnr[i]) == 0) - found++; + if (t1isa_probe(&isa_dev[i], cardnr[i]) != 0) + return -ENODEV; } - if (found == 0) - return -ENODEV; + + strlcpy(capi_driver_t1isa.revision, rev, 32); + register_capi_driver(&capi_driver_t1isa); + printk(KERN_INFO "t1isa: revision %s\n", rev); return 0; } diff -Nru a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c --- a/drivers/isdn/hardware/avm/t1pci.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hardware/avm/t1pci.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: t1pci.c,v 1.1.4.1.2.1 2001/12/21 15:00:17 kai Exp $ +/* $Id: t1pci.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $ * * Module for AVM T1 PCI-card. * @@ -30,6 +30,8 @@ #undef CONFIG_T1PCI_POLLDEBUG /* ------------------------------------------------------------- */ +static char *revision = "$Revision: 1.1.2.2 $"; +/* ------------------------------------------------------------- */ static struct pci_device_id t1pci_pci_tbl[] = { { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_T1, PCI_ANY_ID, PCI_ANY_ID }, @@ -221,13 +223,36 @@ .remove = t1pci_remove, }; +static struct capi_driver capi_driver_t1pci = { + .name = "t1pci", + .revision = "1.0", +}; + static int __init t1pci_init(void) { - return pci_module_init(&t1pci_pci_driver); + char *p; + char rev[32]; + int err; + + if ((p = strchr(revision, ':')) != 0 && p[1]) { + strlcpy(rev, p + 2, 32); + if ((p = strchr(rev, '$')) != 0 && p > rev) + *(p-1) = 0; + } else + strcpy(rev, "1.0"); + + err = pci_module_init(&t1pci_pci_driver); + if (!err) { + strlcpy(capi_driver_t1pci.revision, rev, 32); + register_capi_driver(&capi_driver_t1pci); + printk(KERN_INFO "t1pci: revision %s\n", rev); + } + return err; } static void __exit t1pci_exit(void) { + unregister_capi_driver(&capi_driver_t1pci); pci_unregister_driver(&t1pci_pci_driver); } diff -Nru a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig --- a/drivers/isdn/hardware/eicon/Kconfig Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hardware/eicon/Kconfig Thu Feb 19 23:44:25 2004 @@ -3,7 +3,7 @@ # menu "Active Eicon DIVA Server cards" - depends on NET && ISDN_BOOL && ISDN_CAPI!=n + depends on NET && ISDN && ISDN_CAPI!=n config CAPI_EICON bool "Support Eicon cards" diff -Nru a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig --- a/drivers/isdn/hisax/Kconfig Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/Kconfig Thu Feb 19 23:44:27 2004 @@ -1,6 +1,6 @@ menu "Passive cards" - depends on ISDN + depends on ISDN_I4L config ISDN_DRV_HISAX tristate "HiSax SiemensChipSet driver support" @@ -341,8 +341,8 @@ # bool ' TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU config HISAX_ENTERNOW_PCI - bool "Formula-n enter:now PCI card (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL + bool "Formula-n enter:now PCI card" + depends on PCI help This enables HiSax support for the Formula-n enter:now PCI ISDN card. @@ -365,6 +365,8 @@ the ST5481 USB driver currently. If in doubt, say yes. +comment "HiSax PCMCIA card service modules" + config HISAX_SEDLBAUER_CS tristate "Sedlbauer PCMCIA cards" depends on PCMCIA && HISAX_SEDLBAUER @@ -374,18 +376,26 @@ config HISAX_ELSA_CS tristate "ELSA PCMCIA MicroLink cards" - depends on PCMCIA + depends on PCMCIA && HISAX_ELSA help This enables the PCMCIA client driver for the Elsa PCMCIA MicroLink card. config HISAX_AVM_A1_CS tristate "AVM A1 PCMCIA cards" - depends on PCMCIA + depends on PCMCIA && ISDN_DRV_HISAX help This enables the PCMCIA client driver for the AVM A1 / Fritz!Card PCMCIA cards. +config HISAX_TELES_CS + tristate "TELES PCMCIA cards" + depends on PCMCIA && HISAX_16_3 + help + This enables the PCMCIA client driver for the Teles PCMCIA cards. + +comment "HiSax sub driver modules" + config HISAX_ST5481 tristate "ST5481 USB ISDN modem (EXPERIMENTAL)" depends on USB && EXPERIMENTAL @@ -393,6 +403,12 @@ This enables the driver for ST5481 based USB ISDN adapters, e.g. the BeWan Gazel 128 USB +config HISAX_HFCUSB + tristate "HFC USB based ISDN modems (EXPERIMENTAL)" + depends on USB && EXPERIMENTAL + help + This enables the driver for HFC USB based ISDN modems. + config HISAX_FRITZ_PCIPNP tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)" depends on EXPERIMENTAL @@ -402,18 +418,15 @@ (the latter also needs you to select "ISA Plug and Play support" from the menu "Plug and Play configuration") -config HISAX_FRITZ_CLASSIC - tristate "AVM Fritz!Card classic support (EXPERIMENTAL)" - depends on ISA && EXPERIMENTAL - help - This enables the driver for the AVM Fritz!Card classic, formerly - known as AVM A1. - -config HISAX_HFCPCI - tristate "HFC PCI support (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL - help - This enables the driver for CCD HFC PCI based cards. +config HISAX_HDLC + bool + depends on HISAX_ST5481 + default y + +config HISAX_AVM_A1_PCMCIA + bool + depends on HISAX_AVM_A1_CS + default y endif diff -Nru a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile --- a/drivers/isdn/hisax/Makefile Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/Makefile Thu Feb 19 23:44:24 2004 @@ -1,19 +1,23 @@ # Makefile for the hisax ISDN device driver +# The target object and module list name. + # Define maximum number of cards EXTRA_CFLAGS += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS) -# Each configuration option enables a list of files. - obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o obj-$(CONFIG_HISAX_AVM_A1_CS) += avma1_cs.o +obj-$(CONFIG_HISAX_TELES_CS) += teles_cs.o obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o +obj-$(CONFIG_HISAX_HFCUSB) += hfc_usb.o obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o -obj-$(CONFIG_HISAX_FRITZ_CLASSIC) += hisax_isac.o hisax_hscx.o hisax_fcclassic.o -obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_hfcpci.o + +ifdef CONFIG_HISAX_HDLC +obj-$(CONFIG_ISDN_DRV_HISAX) += isdnhdlc.o +endif # Multipart objects. @@ -21,7 +25,7 @@ st5481_b.o st5481_hdlc.o hisax-y := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \ - lmgr.o q931.o callc.o fsm.o cert.o + lmgr.o q931.o callc.o fsm.o hisax-$(CONFIG_HISAX_EURO) += l3dss1.o hisax-$(CONFIG_HISAX_NI1) += l3ni1.o hisax-$(CONFIG_HISAX_1TR6) += l3_1tr6.o @@ -33,12 +37,12 @@ hisax-$(CONFIG_HISAX_AVM_A1) += avm_a1.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_AVM_A1_PCMCIA) += avm_a1p.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_FRITZPCI) += avm_pci.o isac.o arcofi.o -hisax-$(CONFIG_HISAX_ELSA) += elsa.o isac.o arcofi.o hscx.o ipac.o +hisax-$(CONFIG_HISAX_ELSA) += elsa.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_IX1MICROR2) += ix1_micro.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_DIEHLDIVA) += diva.o isac.o arcofi.o hscx.o ipac.o ipacx.o -hisax-$(CONFIG_HISAX_ASUSCOM) += asuscom.o isac.o arcofi.o hscx.o ipac.o +hisax-$(CONFIG_HISAX_DIEHLDIVA) += diva.o isac.o arcofi.o hscx.o ipacx.o +hisax-$(CONFIG_HISAX_ASUSCOM) += asuscom.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_TELEINT) += teleint.o isac.o arcofi.o hfc_2bs0.o -hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o ipac.o \ +hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o \ isar.o hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_MIC) += mic.o isac.o arcofi.o hscx.o @@ -51,11 +55,9 @@ hisax-$(CONFIG_HISAX_ISURF) += isurf.o isac.o arcofi.o isar.o hisax-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t.o isac.o arcofi.o jade.o -hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o isac.o arcofi.o hscx.o ipac.o -hisax-$(CONFIG_HISAX_GAZEL) += gazel.o isac.o arcofi.o hscx.o ipac.o +hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o isac.o arcofi.o hscx.o +hisax-$(CONFIG_HISAX_GAZEL) += gazel.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_W6692) += w6692.o hisax-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow_pci.o amd7930_fn.o #hisax-$(CONFIG_HISAX_TESTEMU) += testemu.o -CERT = $(shell cd $(src); md5sum -c md5sums.asc > /dev/null 2> /dev/null ;echo $$?) -CFLAGS_cert.o = -DCERTIFICATION=$(CERT) diff -Nru a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c --- a/drivers/isdn/hisax/amd7930_fn.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/amd7930_fn.c Thu Feb 19 23:44:26 2004 @@ -62,42 +62,53 @@ static void Amd7930_new_ph(struct IsdnCardState *cs); -static inline u8 -HIBYTE(u16 w) -{ - return (w >> 8) & 0xff; -} +static WORD initAMD[] = { + 0x0100, -static inline u8 -LOBYTE(u16 w) -{ - return w & 0xff; -} + 0x00A5, 3, 0x01, 0x40, 0x58, // LPR, LMR1, LMR2 + 0x0086, 1, 0x0B, // DMR1 (D-Buffer TH-Interrupts on) + 0x0087, 1, 0xFF, // DMR2 + 0x0092, 1, 0x03, // EFCR (extended mode d-channel-fifo on) + 0x0090, 4, 0xFE, 0xFF, 0x02, 0x0F, // FRAR4, SRAR4, DMR3, DMR4 (address recognition ) + 0x0084, 2, 0x80, 0x00, // DRLR + 0x00C0, 1, 0x47, // PPCR1 + 0x00C8, 1, 0x01, // PPCR2 -static inline u8 -rByteAMD(struct IsdnCardState *cs, u8 reg) -{ - return cs->dc_hw_ops->read_reg(cs, reg); -} + 0x0102, + 0x0107, + 0x01A1, 1, + 0x0121, 1, + 0x0189, 2, -static inline void -wByteAMD(struct IsdnCardState *cs, u8 reg, u8 val) -{ - cs->dc_hw_ops->write_reg(cs, reg, val); -} + 0x0045, 4, 0x61, 0x72, 0x00, 0x00, // MCR1, MCR2, MCR3, MCR4 + 0x0063, 2, 0x08, 0x08, // GX + 0x0064, 2, 0x08, 0x08, // GR + 0x0065, 2, 0x99, 0x00, // GER + 0x0066, 2, 0x7C, 0x8B, // STG + 0x0067, 2, 0x00, 0x00, // FTGR1, FTGR2 + 0x0068, 2, 0x20, 0x20, // ATGR1, ATGR2 + 0x0069, 1, 0x4F, // MMR1 + 0x006A, 1, 0x00, // MMR2 + 0x006C, 1, 0x40, // MMR3 + 0x0021, 1, 0x02, // INIT + 0x00A3, 1, 0x40, // LMR1 -static void -wWordAMD(struct IsdnCardState *cs, u8 reg, u16 val) + 0xFFFF +}; + + +void /* macro wWordAMD */ +WriteWordAmd7930(struct IsdnCardState *cs, BYTE reg, WORD val) { wByteAMD(cs, 0x00, reg); wByteAMD(cs, 0x01, LOBYTE(val)); wByteAMD(cs, 0x01, HIBYTE(val)); } -static u16 -rWordAMD(struct IsdnCardState *cs, u8 reg) +WORD /* macro rWordAMD */ +ReadWordAmd7930(struct IsdnCardState *cs, BYTE reg) { - u16 res; + WORD res; /* direct access register */ if(reg < 8) { res = rByteAMD(cs, reg); @@ -112,20 +123,9 @@ return (res); } -static inline void -AmdIrqOff(struct IsdnCardState *cs) -{ - cs->dc.amd7930.setIrqMask(cs, 0); -} - -static inline void -AmdIrqOn(struct IsdnCardState *cs) -{ - cs->dc.amd7930.setIrqMask(cs, 1); -} static void -Amd7930_ph_command(struct IsdnCardState *cs, u8 command, char *s) +Amd7930_ph_command(struct IsdnCardState *cs, u_char command, char *s) { if (cs->debug & L1_DEB_ISAC) debugl1(cs, "AMD7930: %s: ph_command 0x%02X", s, command); @@ -136,7 +136,7 @@ -static u8 i430States[] = { +static BYTE i430States[] = { // to reset F3 F4 F5 F6 F7 F8 AR from 0x01, 0x02, 0x00, 0x00, 0x00, 0x07, 0x05, 0x00, // init 0x01, 0x02, 0x00, 0x00, 0x00, 0x07, 0x05, 0x00, // reset @@ -150,14 +150,14 @@ /* Row init - reset F3 F4 F5 F6 F7 F8 AR */ -static u8 stateHelper[] = { 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; +static BYTE stateHelper[] = { 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; static void Amd7930_get_state(struct IsdnCardState *cs) { - u8 lsr = rByteAMD(cs, 0xA1); + BYTE lsr = rByteAMD(cs, 0xA1); cs->dc.amd7930.ph_state = (lsr & 0x7) + 2; Amd7930_new_ph(cs); } @@ -167,8 +167,8 @@ static void Amd7930_new_ph(struct IsdnCardState *cs) { - u8 index = stateHelper[cs->dc.amd7930.old_state]*8 + stateHelper[cs->dc.amd7930.ph_state]-1; - u8 message = i430States[index]; + u_char index = stateHelper[cs->dc.amd7930.old_state]*8 + stateHelper[cs->dc.amd7930.ph_state]-1; + u_char message = i430States[index]; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "AMD7930: new_ph %d, old_ph %d, message %d, index %d", @@ -176,7 +176,7 @@ cs->dc.amd7930.old_state = cs->dc.amd7930.ph_state; - /* abort transmit if necessary */ + /* abort transmit if nessesary */ if ((message & 0xf0) && (cs->tx_skb)) { wByteAMD(cs, 0x21, 0xC2); wByteAMD(cs, 0x21, 0x02); @@ -232,9 +232,9 @@ static void -Amd7930_bh(void *data) +Amd7930_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; + struct PStack *stptr; if (!cs) @@ -244,7 +244,7 @@ debugl1(cs, "Amd7930: bh, D-Channel Busy cleared"); stptr = cs->stlist; while (stptr != NULL) { - stptr->l2.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); stptr = stptr->next; } } @@ -267,13 +267,12 @@ } } - static void Amd7930_empty_Dfifo(struct IsdnCardState *cs, int flag) { - u8 stat, der; - u8 *ptr; + BYTE stat, der; + BYTE *ptr; struct sk_buff *skb; @@ -317,7 +316,7 @@ QuickHex(t, cs->rcvbuf, cs->rcvidx); debugl1(cs, cs->dlog); } - /* moves received data in sk-buffer */ + /* moves recieved data in sk-buffer */ memcpy(skb_put(skb, cs->rcvidx), cs->rcvbuf, cs->rcvidx); skb_queue_tail(&cs->rq, skb); } @@ -327,10 +326,10 @@ /* throw damaged packets away, reset recieve-buffer, indicate RX */ ptr = cs->rcvbuf; cs->rcvidx = 0; - sched_d_event(cs, D_RCVBUFREADY); + schedule_event(cs, D_RCVBUFREADY); } } - /* Packet too long, overflow */ + /* Packet to long, overflow */ if(cs->rcvidx >= MAX_DFRAME_LEN_L1) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "AMD7930: empty_Dfifo L2-Framelength overrun"); @@ -346,9 +345,9 @@ Amd7930_fill_Dfifo(struct IsdnCardState *cs) { - u16 dtcrr, dtcrw, len, count; - u8 txstat, dmr3; - u8 *ptr, *deb_ptr; + WORD dtcrr, dtcrw, len, count; + BYTE txstat, dmr3; + BYTE *ptr, *deb_ptr; if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) debugl1(cs, "Amd7930: fill_Dfifo"); @@ -414,10 +413,10 @@ } -void Amd7930_interrupt(struct IsdnCardState *cs, u8 irflags) +void Amd7930_interrupt(struct IsdnCardState *cs, BYTE irflags) { - u8 dsr1, dsr2, lsr; - u16 der; + BYTE dsr1, dsr2, lsr; + WORD der; while (irflags) { @@ -443,7 +442,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); /* restart frame */ if (cs->tx_skb) { skb_push(cs->tx_skb, cs->tx_cnt); @@ -461,7 +460,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); /* restart TX-Frame */ if (cs->tx_skb) { skb_push(cs->tx_skb, cs->tx_cnt); @@ -482,7 +481,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); if (cs->tx_skb) { if (cs->tx_skb->len) Amd7930_fill_Dfifo(cs); @@ -511,7 +510,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); if (cs->tx_skb) { if (cs->debug & L1_DEB_ISAC) @@ -529,7 +528,7 @@ Amd7930_fill_Dfifo(cs); } else - sched_d_event(cs, D_XMTBUFREADY); + schedule_event(cs, D_XMTBUFREADY); /* AMD interrupts on */ AmdIrqOn(cs); } @@ -544,7 +543,7 @@ cs->dc.amd7930.ph_state = (lsr & 0x7) + 2; - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); /* AMD interrupts on */ AmdIrqOn(cs); } @@ -560,6 +559,7 @@ { struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; + u_long flags; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "Amd7930: l1hw called, pr: 0x%04X", pr); @@ -570,6 +570,7 @@ LogFrame(cs, skb->data, skb->len); if (cs->debug & DEB_DLOG_VERBOSE) dlogframe(cs, skb, 0); + spin_lock_irqsave(&cs->lock, flags); if (cs->tx_skb) { skb_queue_tail(&cs->sq, skb); #ifdef L2FRAME_DEBUG /* psa */ @@ -586,8 +587,10 @@ #endif Amd7930_fill_Dfifo(cs); } + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | INDICATION): + spin_lock_irqsave(&cs->lock, flags); if (cs->tx_skb) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "Amd7930: l1hw: l2l1 tx_skb exist this shouldn't happen"); @@ -606,6 +609,7 @@ Logl2Frame(cs, skb, "Amd7930: l1hw: PH_DATA_PULLED", 0); #endif Amd7930_fill_Dfifo(cs); + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | REQUEST): #ifdef L2FRAME_DEBUG /* psa */ @@ -614,21 +618,23 @@ #endif if (!cs->tx_skb) { test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); - st->l2.l1l2(st, PH_PULL | CONFIRM, NULL); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); } else test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (HW_RESET | REQUEST): - - if ((cs->dc.amd7930.ph_state == 8)) - /* b-channels off, PH-AR cleared - * change to F3 */ - Amd7930_ph_command(cs, 0x20, "HW_RESET REQEST"); //LMR1 bit 5 - else { - Amd7930_ph_command(cs, 0x40, "HW_RESET REQUEST"); - cs->dc.amd7930.ph_state = 2; - Amd7930_new_ph(cs); - } + spin_lock_irqsave(&cs->lock, flags); + if ((cs->dc.amd7930.ph_state == 8)) { + /* b-channels off, PH-AR cleared + * change to F3 */ + Amd7930_ph_command(cs, 0x20, "HW_RESET REQEST"); //LMR1 bit 5 + spin_unlock_irqrestore(&cs->lock, flags); + } else { + Amd7930_ph_command(cs, 0x40, "HW_RESET REQUEST"); + cs->dc.amd7930.ph_state = 2; + spin_unlock_irqrestore(&cs->lock, flags); + Amd7930_new_ph(cs); + } break; case (HW_ENABLE | REQUEST): cs->dc.amd7930.ph_state = 9; @@ -650,7 +656,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); break; default: if (cs->debug & L1_DEB_WARN) @@ -659,7 +665,7 @@ } } -static int +void setstack_Amd7930(struct PStack *st, struct IsdnCardState *cs) { @@ -667,21 +673,30 @@ debugl1(cs, "Amd7930: setstack called"); st->l1.l1hw = Amd7930_l1hw; - return 0; } + +void +DC_Close_Amd7930(struct IsdnCardState *cs) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "Amd7930: DC_Close called"); +} + + static void dbusy_timer_handler(struct IsdnCardState *cs) { + u_long flags; struct PStack *stptr; - u16 dtcr, der; - u8 dsr1, dsr2; + WORD dtcr, der; + BYTE dsr1, dsr2; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "Amd7930: dbusy_timer expired!"); if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { + spin_lock_irqsave(&cs->lock, flags); /* D Transmit Byte Count Register: * Counts down packet's number of Bytes, 0 if packet ready */ dtcr = rWordAMD(cs, 0x85); @@ -689,14 +704,15 @@ dsr2 = rByteAMD(cs, 0x07); der = rWordAMD(cs, 0x03); - if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "Amd7930: dbusy_timer_handler: DSR1=0x%02X, DSR2=0x%02X, DER=0x%04X, cs->tx_skb->len=%u, tx_stat=%u, dtcr=%u, cs->tx_cnt=%u", dsr1, dsr2, der, cs->tx_skb->len, cs->dc.amd7930.tx_xmtlen, dtcr, cs->tx_cnt); + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "Amd7930: dbusy_timer_handler: DSR1=0x%02X, DSR2=0x%02X, DER=0x%04X, cs->tx_skb->len=%u, tx_stat=%u, dtcr=%u, cs->tx_cnt=%u", dsr1, dsr2, der, cs->tx_skb->len, cs->dc.amd7930.tx_xmtlen, dtcr, cs->tx_cnt); - if ((int)(cs->dc.amd7930.tx_xmtlen - dtcr) < cs->tx_cnt) { /* D-Channel Busy */ + if ((cs->dc.amd7930.tx_xmtlen - dtcr) < cs->tx_cnt) { /* D-Channel Busy */ test_and_set_bit(FLG_L1_DBUSY, &cs->HW_Flags); stptr = cs->stlist; + spin_unlock_irqrestore(&cs->lock, flags); while (stptr != NULL) { - stptr->l2.l1l2(stptr, PH_PAUSE | INDICATION, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | INDICATION, NULL); stptr = stptr->next; } @@ -716,7 +732,8 @@ /* Transmitter reset, abort transmit */ wByteAMD(cs, 0x21, 0x82); wByteAMD(cs, 0x21, 0x02); - cs->card_ops->irq_func(cs->irq, cs, NULL); /* FIXME? */ + spin_unlock_irqrestore(&cs->lock, flags); + cs->irq_func(cs->irq, cs, NULL); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "Amd7930: dbusy_timer_handler: Transmitter reset"); @@ -724,59 +741,23 @@ } } -static u16 initAMD[] = { - 0x0100, - 0x00A5, 3, 0x01, 0x40, 0x58, // LPR, LMR1, LMR2 - 0x0086, 1, 0x0B, // DMR1 (D-Buffer TH-Interrupts on) - 0x0087, 1, 0xFF, // DMR2 - 0x0092, 1, 0x03, // EFCR (extended mode d-channel-fifo on) - 0x0090, 4, 0xFE, 0xFF, 0x02, 0x0F, // FRAR4, SRAR4, DMR3, DMR4 (address recognition ) - 0x0084, 2, 0x80, 0x00, // DRLR - 0x00C0, 1, 0x47, // PPCR1 - 0x00C8, 1, 0x01, // PPCR2 - - 0x0102, - 0x0107, - 0x01A1, 1, - 0x0121, 1, - 0x0189, 2, - - 0x0045, 4, 0x61, 0x72, 0x00, 0x00, // MCR1, MCR2, MCR3, MCR4 - 0x0063, 2, 0x08, 0x08, // GX - 0x0064, 2, 0x08, 0x08, // GR - 0x0065, 2, 0x99, 0x00, // GER - 0x0066, 2, 0x7C, 0x8B, // STG - 0x0067, 2, 0x00, 0x00, // FTGR1, FTGR2 - 0x0068, 2, 0x20, 0x20, // ATGR1, ATGR2 - 0x0069, 1, 0x4F, // MMR1 - 0x006A, 1, 0x00, // MMR2 - 0x006C, 1, 0x40, // MMR3 - 0x0021, 1, 0x02, // INIT - 0x00A3, 1, 0x40, // LMR1 - - 0xFFFF}; - -static struct dc_l1_ops amd7930_l1_ops = { - .open = setstack_Amd7930, - .bh_func = Amd7930_bh, - .dbusy_func = dbusy_timer_handler, -}; void __devinit Amd7930_init(struct IsdnCardState *cs) { - u16 *ptr; - u8 cmd, cnt; + WORD *ptr; + BYTE cmd, cnt; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "Amd7930: initamd called"); - dc_l1_init(cs, &amd7930_l1_ops); cs->dc.amd7930.tx_xmtlen = 0; cs->dc.amd7930.old_state = 0; cs->dc.amd7930.lmr1 = 0x40; cs->dc.amd7930.ph_command = Amd7930_ph_command; + cs->setstack_d = setstack_Amd7930; + cs->DC_Close = DC_Close_Amd7930; /* AMD Initialisation */ for (ptr = initAMD; *ptr != 0xFFFF; ) { @@ -805,11 +786,11 @@ } } -int -amd7930_setup(struct IsdnCardState *cs, struct dc_hw_ops *amd7930_ops, - void (*set_irq_mask)(struct IsdnCardState *, u8 val)) -{ - cs->dc_hw_ops = amd7930_ops; - cs->dc.amd7930.setIrqMask = set_irq_mask; - return 0; +void __devinit +setup_Amd7930(struct IsdnCardState *cs) +{ + INIT_WORK(&cs->tqueue, (void *)(void *) Amd7930_bh, cs); + cs->dbusytimer.function = (void *) dbusy_timer_handler; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); } diff -Nru a/drivers/isdn/hisax/amd7930_fn.h b/drivers/isdn/hisax/amd7930_fn.h --- a/drivers/isdn/hisax/amd7930_fn.h Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/amd7930_fn.h Thu Feb 19 23:44:28 2004 @@ -12,13 +12,26 @@ */ + + +#define BYTE unsigned char +#define WORD unsigned int +#define rByteAMD(cs, reg) cs->readisac(cs, reg) +#define wByteAMD(cs, reg, val) cs->writeisac(cs, reg, val) +#define rWordAMD(cs, reg) ReadWordAmd7930(cs, reg) +#define wWordAMD(cs, reg, val) WriteWordAmd7930(cs, reg, val) +#define HIBYTE(w) ((unsigned char)((w & 0xff00) / 256)) +#define LOBYTE(w) ((unsigned char)(w & 0x00ff)) + +#define AmdIrqOff(cs) cs->dc.amd7930.setIrqMask(cs, 0) +#define AmdIrqOn(cs) cs->dc.amd7930.setIrqMask(cs, 1) + #define AMD_CR 0x00 #define AMD_DR 0x01 #define DBUSY_TIMER_VALUE 80 -void Amd7930_interrupt(struct IsdnCardState *cs, unsigned char irflags); -void Amd7930_init(struct IsdnCardState *cs); -int amd7930_setup(struct IsdnCardState *cs, struct dc_hw_ops *amd7930_ops, - void (*set_irq_mask)(struct IsdnCardState *, u8 val)); +extern void Amd7930_interrupt(struct IsdnCardState *, unsigned char); +extern void Amd7930_init(struct IsdnCardState *); +extern void setup_Amd7930(struct IsdnCardState *); diff -Nru a/drivers/isdn/hisax/arcofi.c b/drivers/isdn/hisax/arcofi.c --- a/drivers/isdn/hisax/arcofi.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/arcofi.c Thu Feb 19 23:44:26 2004 @@ -1,4 +1,4 @@ -/* $Id: arcofi.c,v 1.12.6.2 2001/09/23 22:24:46 kai Exp $ +/* $Id: arcofi.c,v 1.14.2.3 2004/01/13 14:31:24 keil Exp $ * * Ansteuerung ARCOFI 2165 * @@ -17,19 +17,6 @@ #define ARCOFI_TIMER_VALUE 20 - -static inline u8 -isac_read(struct IsdnCardState *cs, u8 addr) -{ - return cs->dc_hw_ops->read_reg(cs, addr); -} - -static inline void -isac_write(struct IsdnCardState *cs, u8 addr, u8 val) -{ - cs->dc_hw_ops->write_reg(cs, addr, val); -} - static void add_arcofi_timer(struct IsdnCardState *cs) { if (test_and_set_bit(FLG_ARCOFI_TIMER, &cs->HW_Flags)) { @@ -42,7 +29,7 @@ static void send_arcofi(struct IsdnCardState *cs) { - u8 val; + u_char val; add_arcofi_timer(cs); cs->dc.isac.mon_txp = 0; @@ -56,11 +43,11 @@ } cs->dc.isac.mocr &= 0x0f; cs->dc.isac.mocr |= 0xa0; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); - val = isac_read(cs, ISAC_MOSR); - isac_write(cs, ISAC_MOX1, cs->dc.isac.mon_tx[cs->dc.isac.mon_txp++]); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); + val = cs->readisac(cs, ISAC_MOSR); + cs->writeisac(cs, ISAC_MOX1, cs->dc.isac.mon_tx[cs->dc.isac.mon_txp++]); cs->dc.isac.mocr |= 0x10; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); } int diff -Nru a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c --- a/drivers/isdn/hisax/asuscom.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/asuscom.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: asuscom.c,v 1.11.6.3 2001/09/23 22:24:46 kai Exp $ +/* $Id: asuscom.c,v 1.14.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for ASUSCOM NETWORK INC. ISDNLink cards * @@ -22,9 +22,8 @@ extern const char *CardType[]; -const char *Asuscom_revision = "$Revision: 1.11.6.3 $"; +const char *Asuscom_revision = "$Revision: 1.14.2.4 $"; -static spinlock_t asuscom_lock = SPIN_LOCK_UNLOCKED; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -43,237 +42,258 @@ /* CARD_ADR (Write) */ #define ASUS_RESET 0x80 /* Bit 7 Reset-Leitung */ -static inline u8 -readreg(struct IsdnCardState *cs, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&asuscom_lock, flags); - byteout(cs->hw.asus.adr, off); + byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&asuscom_lock, flags); - return ret; + return (ret); } static inline void -writereg(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&asuscom_lock, flags); - byteout(cs->hw.asus.adr, off); - byteout(adr, data); - spin_unlock_irqrestore(&asuscom_lock, flags); + byteout(ale, off); + insb(adr, data, size); } + static inline void -readfifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { - byteout(cs->hw.asus.adr, off); - insb(adr, data, size); + byteout(ale, off); + byteout(adr, data); } - static inline void -writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - byteout(cs->hw.asus.adr, off); + byteout(ale, off); outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.asus.isac, offset); + return (readreg(cs->hw.asus.adr, cs->hw.asus.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.asus.isac, offset, value); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs, cs->hw.asus.isac, 0, data, size); + readfifo(cs->hw.asus.adr, cs->hw.asus.isac, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.asus.isac, 0, data, size); + writefifo(cs->hw.asus.adr, cs->hw.asus.isac, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0)); + return (readreg(cs->hw.asus.adr, cs->hw.asus.isac, offset|0x80)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0), value); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, offset|0x80, value); } static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs, cs->hw.asus.hscx, hscx ? 0x40 : 0, data, size); + readfifo(cs->hw.asus.adr, cs->hw.asus.isac, 0x80, data, size); } static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.asus.hscx, hscx ? 0x40 : 0, data, size); + writefifo(cs->hw.asus.adr, cs->hw.asus.isac, 0x80, data, size); } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static inline u8 -ipac_read(struct IsdnCardState *cs, u8 off) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - u8 ret; - unsigned long flags; - - spin_lock_irqsave(&asuscom_lock, flags); - byteout(cs->hw.asus.adr, off); - ret = bytein(cs->hw.asus.isac); - spin_unlock_irqrestore(&asuscom_lock, flags); - return ret; + return (readreg(cs->hw.asus.adr, + cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0))); } -static inline void -ipac_write(struct IsdnCardState *cs, u8 off, u8 data) -{ - unsigned long flags; - - spin_lock_irqsave(&asuscom_lock, flags); - byteout(cs->hw.asus.adr, off); - byteout(cs->hw.asus.isac, data); - spin_unlock_irqrestore(&asuscom_lock, flags); -} - -static inline void -ipac_readfifo(struct IsdnCardState *cs, u8 off, u8 * data, int size) +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - byteout(cs->hw.asus.adr, off); - insb(cs->hw.asus.isac, data, size); + writereg(cs->hw.asus.adr, + cs->hw.asus.hscx, offset + (hscx ? 0x40 : 0), value); } +/* + * fast interrupt HSCX stuff goes here + */ -static inline void -ipac_writefifo(struct IsdnCardState *cs, u8 off, u8 * data, int size) -{ - byteout(cs->hw.asus.adr, off); - outsb(cs->hw.asus.isac, data, size); +#define READHSCX(cs, nr, reg) readreg(cs->hw.asus.adr, \ + cs->hw.asus.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.asus.adr, \ + cs->hw.asus.hscx, reg + (nr ? 0x40 : 0), data) + +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.asus.adr, \ + cs->hw.asus.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.asus.adr, \ + cs->hw.asus.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +asuscom_interrupt(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + val = readreg(cs->hw.asus.adr, cs->hw.asus.hscx, HSCX_ISTA + 0x40); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.asus.adr, cs->hw.asus.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + val = readreg(cs->hw.asus.adr, cs->hw.asus.hscx, HSCX_ISTA + 0x40); + if (val) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.asus.adr, cs->hw.asus.isac, ISAC_ISTA); + if (val) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + writereg(cs->hw.asus.adr, cs->hw.asus.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.asus.adr, cs->hw.asus.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, ISAC_MASK, 0x0); + writereg(cs->hw.asus.adr, cs->hw.asus.hscx, HSCX_MASK, 0x0); + writereg(cs->hw.asus.adr, cs->hw.asus.hscx, HSCX_MASK + 0x40, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +static irqreturn_t +asuscom_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char ista, val, icnt = 5; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + ista = readreg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_ISTA); +Start_IPAC: + if (cs->debug & L1_DEB_IPAC) + debugl1(cs, "IPAC ISTA %02X", ista); + if (ista & 0x0f) { + val = readreg(cs->hw.asus.adr, cs->hw.asus.hscx, HSCX_ISTA + 0x40); + if (ista & 0x01) + val |= 0x01; + if (ista & 0x04) + val |= 0x02; + if (ista & 0x08) + val |= 0x04; + if (val) + hscx_int_main(cs, val); + } + if (ista & 0x20) { + val = 0xfe & readreg(cs->hw.asus.adr, cs->hw.asus.isac, ISAC_ISTA | 0x80); + if (val) { + isac_interrupt(cs, val); + } + } + if (ista & 0x10) { + val = 0x01; + isac_interrupt(cs, val); + } + ista = readreg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_ISTA); + if ((ista & 0x3f) && icnt) { + icnt--; + goto Start_IPAC; + } + if (!icnt) + printk(KERN_WARNING "ASUS IRQ LOOP\n"); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_MASK, 0xFF); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_MASK, 0xC0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } -/* This will generate ipac_dc_ops and ipac_bc_ops using the functions - * above */ +void +release_io_asuscom(struct IsdnCardState *cs) +{ + int bytecnt = 8; -BUILD_IPAC_OPS(ipac); + if (cs->hw.asus.cfg_reg) + release_region(cs->hw.asus.cfg_reg, bytecnt); +} -static int -asuscom_reset(struct IsdnCardState *cs) +static void +reset_asuscom(struct IsdnCardState *cs) { - byteout(cs->hw.asus.adr, ASUS_RESET); /* Reset On */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - byteout(cs->hw.asus.adr, 0); /* Reset Off */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - return 0; + if (cs->subtyp == ASUS_IPAC) + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_POTA2, 0x20); + else + byteout(cs->hw.asus.adr, ASUS_RESET); /* Reset On */ + mdelay(10); + if (cs->subtyp == ASUS_IPAC) + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_POTA2, 0x0); + else + byteout(cs->hw.asus.adr, 0); /* Reset Off */ + mdelay(10); + if (cs->subtyp == ASUS_IPAC) { + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_CONF, 0x0); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_ACFG, 0xff); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_AOE, 0x0); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_MASK, 0xc0); + writereg(cs->hw.asus.adr, cs->hw.asus.isac, IPAC_PCFG, 0x12); + } } static int -asuscom_ipac_reset(struct IsdnCardState *cs) +Asus_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - writereg(cs, cs->hw.asus.isac, IPAC_POTA2, 0x20); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writereg(cs, cs->hw.asus.isac, IPAC_POTA2, 0x0); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writereg(cs, cs->hw.asus.isac, IPAC_CONF, 0x0); - writereg(cs, cs->hw.asus.isac, IPAC_ACFG, 0xff); - writereg(cs, cs->hw.asus.isac, IPAC_AOE, 0x0); - writereg(cs, cs->hw.asus.isac, IPAC_MASK, 0xc0); - writereg(cs, cs->hw.asus.isac, IPAC_PCFG, 0x12); - return 0; -} - -static struct card_ops asuscom_ops = { - .init = inithscxisac, - .reset = asuscom_reset, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; - -static struct card_ops asuscom_ipac_ops = { - .init = ipac_init, - .reset = asuscom_ipac_reset, - .release = hisax_release_resources, - .irq_func = ipac_irq, -}; + u_long flags; -static int __init -asuscom_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - int rc; - u8 val; - - printk(KERN_INFO "ISDNLink: defined at %#lx IRQ %lu\n", - card->para[1], card->para[0]); - - cs->hw.asus.cfg_reg = card->para[1]; - cs->irq = card->para[0]; - - rc = -EBUSY; - if (!request_io(&cs->rs, cs->hw.asus.cfg_reg, 8, "asuscom isdn")) - goto err; - - rc = -ENODEV; - cs->hw.asus.adr = cs->hw.asus.cfg_reg + ASUS_IPAC_ALE; - val = readreg(cs, cs->hw.asus.cfg_reg + ASUS_IPAC_DATA, IPAC_ID); - if ((val == 1) || (val == 2)) { - cs->subtyp = ASUS_IPAC; - cs->card_ops = &asuscom_ipac_ops; - cs->hw.asus.isac = cs->hw.asus.cfg_reg + ASUS_IPAC_DATA; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - goto err; - } else { - cs->subtyp = ASUS_ISACHSCX; - cs->card_ops = &asuscom_ops; - cs->hw.asus.adr = cs->hw.asus.cfg_reg + ASUS_ADR; - cs->hw.asus.isac = cs->hw.asus.cfg_reg + ASUS_ISAC; - cs->hw.asus.hscx = cs->hw.asus.cfg_reg + ASUS_HSCX; - cs->hw.asus.u7 = cs->hw.asus.cfg_reg + ASUS_CTRL_U7; - cs->hw.asus.pots = cs->hw.asus.cfg_reg + ASUS_CTRL_POTS; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_asuscom(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_asuscom(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + cs->debug |= L1_DEB_IPAC; + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); } - printk(KERN_INFO "ISDNLink: resetting card\n"); - cs->card_ops->reset(cs); - return 0; - - err: - hisax_release_resources(cs); - return rc; + return(0); } #ifdef __ISAPNP__ @@ -293,66 +313,115 @@ { 0, } }; -static struct isapnp_device_id *adev = &asus_ids[0]; +static struct isapnp_device_id *ipid __initdata = &asus_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif int __init setup_asuscom(struct IsdnCard *card) { + int bytecnt; + struct IsdnCardState *cs = card->cs; + u_char val; char tmp[64]; strcpy(tmp, Asuscom_revision); printk(KERN_INFO "HiSax: Asuscom ISDNLink driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_ASUSCOM) + return (0); #ifdef __ISAPNP__ if (!card->para[1] && isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; - while(adev->card_vendor) { - if ((pb = pnp_find_card(adev->card_vendor, - adev->card_device, - pnp_c))) { - pnp_c = pb; - pd = NULL; - if ((pd = pnp_find_dev(pnp_c, - adev->vendor, - adev->function, - pd))) { printk(KERN_INFO "HiSax: %s detected\n", - (char *)adev->driver_data); - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "AsusPnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "AsusPnP: activate failed\n"); - pnp_device_detach(pd); - return 0; + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_irq_valid(pd, 0) || !pnp_port_valid(pd, 0)) { + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + if (!card->para[0] || !card->para[1]) { printk(KERN_ERR "AsusPnP:some resources are missing %ld/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0)); - pnp_device_detach(pd); + card->para[0], card->para[1]); + pnp_disable_dev(pnp_d); return(0); } - card->para[1] = pnp_port_start(pd, 0); - card->para[0] = pnp_irq(pd, 0); break; } else { printk(KERN_ERR "AsusPnP: PnP error card found, no device\n"); } } - adev++; - pnp_c=NULL; + ipid++; + pnp_c = NULL; } - if (!adev->card_vendor) { + if (!ipid->card_vendor) { printk(KERN_INFO "AsusPnP: no ISAPnP card found\n"); return(0); } } #endif - if (asuscom_probe(card->cs, card) < 0) - return 0; - return 1; + bytecnt = 8; + cs->hw.asus.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + if (!request_region(cs->hw.asus.cfg_reg, bytecnt, "asuscom isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.asus.cfg_reg, + cs->hw.asus.cfg_reg + bytecnt); + return (0); + } + printk(KERN_INFO "ISDNLink: defined at 0x%x IRQ %d\n", + cs->hw.asus.cfg_reg, cs->irq); + setup_isac(cs); + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &Asus_card_msg; + val = readreg(cs->hw.asus.cfg_reg + ASUS_IPAC_ALE, + cs->hw.asus.cfg_reg + ASUS_IPAC_DATA, IPAC_ID); + if ((val == 1) || (val == 2)) { + cs->subtyp = ASUS_IPAC; + cs->hw.asus.adr = cs->hw.asus.cfg_reg + ASUS_IPAC_ALE; + cs->hw.asus.isac = cs->hw.asus.cfg_reg + ASUS_IPAC_DATA; + cs->hw.asus.hscx = cs->hw.asus.cfg_reg + ASUS_IPAC_DATA; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + cs->readisac = &ReadISAC_IPAC; + cs->writeisac = &WriteISAC_IPAC; + cs->readisacfifo = &ReadISACfifo_IPAC; + cs->writeisacfifo = &WriteISACfifo_IPAC; + cs->irq_func = &asuscom_interrupt_ipac; + printk(KERN_INFO "Asus: IPAC version %x\n", val); + } else { + cs->subtyp = ASUS_ISACHSCX; + cs->hw.asus.adr = cs->hw.asus.cfg_reg + ASUS_ADR; + cs->hw.asus.isac = cs->hw.asus.cfg_reg + ASUS_ISAC; + cs->hw.asus.hscx = cs->hw.asus.cfg_reg + ASUS_HSCX; + cs->hw.asus.u7 = cs->hw.asus.cfg_reg + ASUS_CTRL_U7; + cs->hw.asus.pots = cs->hw.asus.cfg_reg + ASUS_CTRL_POTS; + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->irq_func = &asuscom_interrupt; + ISACVersion(cs, "ISDNLink:"); + if (HscxVersion(cs, "ISDNLink:")) { + printk(KERN_WARNING + "ISDNLink: wrong HSCX versions check IO address\n"); + release_io_asuscom(cs); + return (0); + } + } + return (1); } diff -Nru a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c --- a/drivers/isdn/hisax/avm_a1.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/avm_a1.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: avm_a1.c,v 2.13.6.2 2001/09/23 22:24:46 kai Exp $ +/* $Id: avm_a1.c,v 2.15.2.4 2004/01/13 21:46:03 keil Exp $ * * low level stuff for AVM A1 (Fritz) isdn cards * @@ -17,7 +17,7 @@ #include "isdnl1.h" extern const char *CardType[]; -static const char *avm_revision = "$Revision: 2.13.6.2 $"; +static const char *avm_revision = "$Revision: 2.15.2.4 $"; #define AVM_A1_STAT_ISAC 0x01 #define AVM_A1_STAT_HSCX 0x02 @@ -26,172 +26,237 @@ #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -static inline u8 -readreg(unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int adr, u_char off) { return (bytein(adr + off)); } static inline void -writereg(unsigned int adr, u8 off, u8 data) +writereg(unsigned int adr, u_char off, u_char data) { byteout(adr + off, data); } static inline void -read_fifo(unsigned int adr, u8 * data, int size) +read_fifo(unsigned int adr, u_char * data, int size) { insb(adr, data, size); } static void -write_fifo(unsigned int adr, u8 * data, int size) +write_fifo(unsigned int adr, u_char * data, int size) { outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs->hw.avm.isac, offset); + return (readreg(cs->hw.avm.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { writereg(cs->hw.avm.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { read_fifo(cs->hw.avm.isacfifo, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { write_fifo(cs->hw.avm.isacfifo, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { return (readreg(cs->hw.avm.hscx[hscx], offset)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { writereg(cs->hw.avm.hscx[hscx], offset, value); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - read_fifo(cs->hw.avm.hscxfifo[hscx], data, size); -} +/* + * fast interrupt HSCX stuff goes here + */ -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - write_fifo(cs->hw.avm.hscxfifo[hscx], data, size); -} +#define READHSCX(cs, nr, reg) readreg(cs->hw.avm.hscx[nr], reg) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.avm.hscx[nr], reg, data) +#define READHSCXFIFO(cs, nr, ptr, cnt) read_fifo(cs->hw.avm.hscxfifo[nr], ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) write_fifo(cs->hw.avm.hscxfifo[nr], ptr, cnt) -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; +#include "hscx_irq.c" static irqreturn_t avm_a1_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val, sval; - int handled = 0; + u_char val, sval; + u_long flags; - spin_lock(&cs->lock); + spin_lock_irqsave(&cs->lock, flags); while (((sval = bytein(cs->hw.avm.cfg_reg)) & 0xf) != 0x7) { - handled = 1; if (!(sval & AVM_A1_STAT_TIMER)) { byteout(cs->hw.avm.cfg_reg, 0x1E); sval = bytein(cs->hw.avm.cfg_reg); } else if (cs->debug & L1_DEB_INTSTAT) debugl1(cs, "avm IntStatus %x", sval); if (!(sval & AVM_A1_STAT_HSCX)) { - val = hscx_read(cs, 1, HSCX_ISTA); + val = readreg(cs->hw.avm.hscx[1], HSCX_ISTA); if (val) hscx_int_main(cs, val); } if (!(sval & AVM_A1_STAT_ISAC)) { - val = isac_read(cs, ISAC_ISTA); + val = readreg(cs->hw.avm.isac, ISAC_ISTA); if (val) isac_interrupt(cs, val); } } - hscx_write(cs, 0, HSCX_MASK, 0xFF); - hscx_write(cs, 1, HSCX_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0x0); - hscx_write(cs, 0, HSCX_MASK, 0x0); - hscx_write(cs, 1, HSCX_MASK, 0x0); - spin_unlock(&cs->lock); - return IRQ_RETVAL(handled); + writereg(cs->hw.avm.hscx[0], HSCX_MASK, 0xFF); + writereg(cs->hw.avm.hscx[1], HSCX_MASK, 0xFF); + writereg(cs->hw.avm.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.avm.isac, ISAC_MASK, 0x0); + writereg(cs->hw.avm.hscx[0], HSCX_MASK, 0x0); + writereg(cs->hw.avm.hscx[1], HSCX_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +inline static void +release_ioregs(struct IsdnCardState *cs, int mask) +{ + release_region(cs->hw.avm.cfg_reg, 8); + if (mask & 1) + release_region(cs->hw.avm.isac + 32, 32); + if (mask & 2) + release_region(cs->hw.avm.isacfifo, 1); + if (mask & 4) + release_region(cs->hw.avm.hscx[0] + 32, 32); + if (mask & 8) + release_region(cs->hw.avm.hscxfifo[0], 1); + if (mask & 0x10) + release_region(cs->hw.avm.hscx[1] + 32, 32); + if (mask & 0x20) + release_region(cs->hw.avm.hscxfifo[1], 1); +} + +static int +AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) +{ + u_long flags; + + switch (mt) { + case CARD_RESET: + return(0); + case CARD_RELEASE: + release_ioregs(cs, 0x3f); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscxisac(cs, 1); + byteout(cs->hw.avm.cfg_reg, 0x16); + byteout(cs->hw.avm.cfg_reg, 0x1E); + inithscxisac(cs, 2); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } -static void -avm_a1_init(struct IsdnCardState *cs) +int __init +setup_avm_a1(struct IsdnCard *card) { - byteout(cs->hw.avm.cfg_reg, 0x16); - byteout(cs->hw.avm.cfg_reg, 0x1E); - inithscxisac(cs); -} - -static struct card_ops avm_a1_ops = { - .init = avm_a1_init, - .release = hisax_release_resources, - .irq_func = avm_a1_interrupt, -}; - -static int __init -avm_a1_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - int rc; - u8 val; - - printk(KERN_INFO "AVM A1: defined at %#lx IRQ %lu\n", - card->para[1], card->para[0]); - - rc = -EBUSY; - cs->hw.avm.cfg_reg = request_io(&cs->rs, card->para[1] + 0x1800, 8, "avm cfg"); - if (!cs->hw.avm.cfg_reg) goto err; - cs->hw.avm.isac = request_io(&cs->rs, card->para[1] + 0x1400, 32, "HiSax isac"); - if (!cs->hw.avm.isac) goto err; - cs->hw.avm.isacfifo = request_io(&cs->rs, card->para[1] + 0x1000, 1, "HiSax isac fifo"); - if (!cs->hw.avm.isacfifo) goto err; - cs->hw.avm.hscx[0] = request_io(&cs->rs, card->para[1] + 0x400, 32, "HiSax hscx A"); - if (!cs->hw.avm.hscx[0]) goto err; - cs->hw.avm.hscxfifo[0] = request_io(&cs->rs, card->para[1], 1, "HiSax hscx A fifo"); - if (!cs->hw.avm.hscxfifo[0]) goto err; - cs->hw.avm.hscx[1] = request_io(&cs->rs, card->para[1] + 0xc00, 32, "HiSax hscx B"); - if (!cs->hw.avm.hscx[1]) goto err; - cs->hw.avm.hscxfifo[1] = request_io(&cs->rs, card->para[1] + 0x800, 1, "HiSax hscx B fifo"); - if (!cs->hw.avm.hscxfifo[1]) goto err; - cs->hw.avm.isac -= 0x20; - cs->hw.avm.hscx[0] -= 0x20; - cs->hw.avm.hscx[1] -= 0x20; - cs->irq = card->para[0]; + u_char val; + struct IsdnCardState *cs = card->cs; + char tmp[64]; + + strcpy(tmp, avm_revision); + printk(KERN_INFO "HiSax: AVM driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_A1) + return (0); + cs->hw.avm.cfg_reg = card->para[1] + 0x1800; + cs->hw.avm.isac = card->para[1] + 0x1400 - 0x20; + cs->hw.avm.hscx[0] = card->para[1] + 0x400 - 0x20; + cs->hw.avm.hscx[1] = card->para[1] + 0xc00 - 0x20; + cs->hw.avm.isacfifo = card->para[1] + 0x1000; + cs->hw.avm.hscxfifo[0] = card->para[1]; + cs->hw.avm.hscxfifo[1] = card->para[1] + 0x800; + cs->irq = card->para[0]; + if (!request_region(cs->hw.avm.cfg_reg, 8, "avm cfg")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.avm.cfg_reg, + cs->hw.avm.cfg_reg + 8); + return (0); + } + if (!request_region(cs->hw.avm.isac + 32, 32, "HiSax isac")) { + printk(KERN_WARNING + "HiSax: %s isac ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.avm.isac + 32, + cs->hw.avm.isac + 64); + release_ioregs(cs, 0); + return (0); + } + if (!request_region(cs->hw.avm.isacfifo, 1, "HiSax isac fifo")) { + printk(KERN_WARNING + "HiSax: %s isac fifo port %x already in use\n", + CardType[cs->typ], + cs->hw.avm.isacfifo); + release_ioregs(cs, 1); + return (0); + } + if (!request_region(cs->hw.avm.hscx[0] + 32, 32, "HiSax hscx A")) { + printk(KERN_WARNING + "HiSax: %s hscx A ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.avm.hscx[0] + 32, + cs->hw.avm.hscx[0] + 64); + release_ioregs(cs, 3); + return (0); + } + if (!request_region(cs->hw.avm.hscxfifo[0], 1, "HiSax hscx A fifo")) { + printk(KERN_WARNING + "HiSax: %s hscx A fifo port %x already in use\n", + CardType[cs->typ], + cs->hw.avm.hscxfifo[0]); + release_ioregs(cs, 7); + return (0); + } + if (!request_region(cs->hw.avm.hscx[1] + 32, 32, "HiSax hscx B")) { + printk(KERN_WARNING + "HiSax: %s hscx B ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.avm.hscx[1] + 32, + cs->hw.avm.hscx[1] + 64); + release_ioregs(cs, 0xf); + return (0); + } + if (!request_region(cs->hw.avm.hscxfifo[1], 1, "HiSax hscx B fifo")) { + printk(KERN_WARNING + "HiSax: %s hscx B fifo port %x already in use\n", + CardType[cs->typ], + cs->hw.avm.hscxfifo[1]); + release_ioregs(cs, 0x1f); + return (0); + } byteout(cs->hw.avm.cfg_reg, 0x0); HZDELAY(HZ / 5 + 1); byteout(cs->hw.avm.cfg_reg, 0x1); @@ -219,24 +284,34 @@ printk(KERN_INFO "AVM A1: Byte at %x is %x\n", cs->hw.avm.cfg_reg, val); - cs->card_ops = &avm_a1_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return rc; -} - -int __init -setup_avm_a1(struct IsdnCard *card) -{ - char tmp[64]; - - strcpy(tmp, avm_revision); - printk(KERN_INFO "HiSax: AVM driver Rev. %s\n", HiSax_getrev(tmp)); - - if (avm_a1_probe(card->cs, card) < 0) - return 0; - return 1; + printk(KERN_INFO + "HiSax: %s config irq:%d cfg:0x%X\n", + CardType[cs->typ], cs->irq, + cs->hw.avm.cfg_reg); + printk(KERN_INFO + "HiSax: isac:0x%X/0x%X\n", + cs->hw.avm.isac + 32, cs->hw.avm.isacfifo); + printk(KERN_INFO + "HiSax: hscx A:0x%X/0x%X hscx B:0x%X/0x%X\n", + cs->hw.avm.hscx[0] + 32, cs->hw.avm.hscxfifo[0], + cs->hw.avm.hscx[1] + 32, cs->hw.avm.hscxfifo[1]); + + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + setup_isac(cs); + cs->cardmsg = &AVM_card_msg; + cs->irq_func = &avm_a1_interrupt; + ISACVersion(cs, "AVM A1:"); + if (HscxVersion(cs, "AVM A1:")) { + printk(KERN_WARNING + "AVM A1: wrong HSCX versions check IO address\n"); + release_ioregs(cs, 0x3f); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/avm_a1p.c b/drivers/isdn/hisax/avm_a1p.c --- a/drivers/isdn/hisax/avm_a1p.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/avm_a1p.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: avm_a1p.c,v 2.7.6.2 2001/09/23 22:24:46 kai Exp $ +/* $Id: avm_a1p.c,v 2.9.2.5 2004/01/24 20:47:19 keil Exp $ * * low level stuff for the following AVM cards: * A1 PCMCIA @@ -56,176 +56,182 @@ #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -static const char *avm_revision = "$Revision: 2.7.6.2 $"; -static spinlock_t avm_a1p_lock = SPIN_LOCK_UNLOCKED; +static const char *avm_revision = "$Revision: 2.9.2.5 $"; -static inline u8 -readreg(struct IsdnCardState *cs, int offset, u8 adr) +static inline u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - unsigned long flags; - u8 ret; + u_char ret; - spin_lock_irqsave(&avm_a1p_lock, flags); - byteout(cs->hw.avm.cfg_reg + ADDRREG_OFFSET, offset + adr - 0x20); - ret = bytein(cs->hw.avm.cfg_reg + DATAREG_OFFSET); - spin_unlock_irqrestore(&avm_a1p_lock, flags); + offset -= 0x20; + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET,ISAC_REG_OFFSET+offset); + ret = bytein(cs->hw.avm.cfg_reg+DATAREG_OFFSET); return ret; } static inline void -writereg(struct IsdnCardState *cs, int offset, u8 adr, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - unsigned long flags; - - spin_lock_irqsave(&avm_a1p_lock, flags); - byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET, offset + adr - 0x20); + offset -= 0x20; + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET,ISAC_REG_OFFSET+offset); byteout(cs->hw.avm.cfg_reg+DATAREG_OFFSET, value); - spin_unlock_irqrestore(&avm_a1p_lock, flags); } static inline void -readfifo(struct IsdnCardState *cs, int offset, u8 *data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - byteout(cs->hw.avm.cfg_reg + ADDRREG_OFFSET, offset); - insb(cs->hw.avm.cfg_reg + DATAREG_OFFSET, data, size); + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET,ISAC_FIFO_OFFSET); + insb(cs->hw.avm.cfg_reg+DATAREG_OFFSET, data, size); } static inline void -writefifo(struct IsdnCardState *cs, int offset, u8 *data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET, offset); + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET,ISAC_FIFO_OFFSET); outsb(cs->hw.avm.cfg_reg+DATAREG_OFFSET, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 adr) -{ - return readreg(cs, ISAC_REG_OFFSET, adr); -} - -static void -isac_write(struct IsdnCardState *cs, u8 adr, u8 value) +static inline u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - writereg(cs, ISAC_REG_OFFSET, adr, value); -} + u_char ret; -static void -isac_read_fifo(struct IsdnCardState *cs, u8 *data, int size) -{ - readfifo(cs, ISAC_FIFO_OFFSET, data, size); + offset -= 0x20; + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET, + HSCX_REG_OFFSET+hscx*HSCX_CH_DIFF+offset); + ret = bytein(cs->hw.avm.cfg_reg+DATAREG_OFFSET); + return ret; } -static void -isac_write_fifo(struct IsdnCardState *cs, u8 *data, int size) +static inline void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writefifo(cs, ISAC_FIFO_OFFSET, data, size); + offset -= 0x20; + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET, + HSCX_REG_OFFSET+hscx*HSCX_CH_DIFF+offset); + byteout(cs->hw.avm.cfg_reg+DATAREG_OFFSET, value); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 adr) +static inline void +ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) { - return readreg(cs, HSCX_REG_OFFSET + hscx*HSCX_CH_DIFF, adr); + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET, + HSCX_FIFO_OFFSET+hscx*HSCX_CH_DIFF); + insb(cs->hw.avm.cfg_reg+DATAREG_OFFSET, data, size); } -static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 adr, u8 value) +static inline void +WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) { - writereg(cs, HSCX_REG_OFFSET + hscx*HSCX_CH_DIFF, adr, value); + byteout(cs->hw.avm.cfg_reg+ADDRREG_OFFSET, + HSCX_FIFO_OFFSET+hscx*HSCX_CH_DIFF); + outsb(cs->hw.avm.cfg_reg+DATAREG_OFFSET, data, size); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - return readfifo(cs, HSCX_FIFO_OFFSET + hscx*HSCX_CH_DIFF, data, size); -} +/* + * fast interrupt HSCX stuff goes here + */ -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - writefifo(cs, HSCX_FIFO_OFFSET + hscx*HSCX_CH_DIFF, data, size); -} +#define READHSCX(cs, nr, reg) ReadHSCX(cs, nr, reg) +#define WRITEHSCX(cs, nr, reg, data) WriteHSCX(cs, nr, reg, data) +#define READHSCXFIFO(cs, nr, ptr, cnt) ReadHSCXfifo(cs, nr, ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) WriteHSCXfifo(cs, nr, ptr, cnt) -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; +#include "hscx_irq.c" static irqreturn_t avm_a1p_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val, sval; + u_char val, sval; + u_long flags; - spin_lock(&cs->lock); + spin_lock_irqsave(&cs->lock, flags); while ((sval = (~bytein(cs->hw.avm.cfg_reg+ASL0_OFFSET) & ASL0_R_IRQPENDING))) { if (cs->debug & L1_DEB_INTSTAT) debugl1(cs, "avm IntStatus %x", sval); if (sval & ASL0_R_HSCX) { - val = hscx_read(cs, 1, HSCX_ISTA); + val = ReadHSCX(cs, 1, HSCX_ISTA); if (val) hscx_int_main(cs, val); } if (sval & ASL0_R_ISAC) { - val = isac_read(cs, ISAC_ISTA); + val = ReadISAC(cs, ISAC_ISTA); if (val) isac_interrupt(cs, val); } } - hscx_write(cs, 0, HSCX_MASK, 0xFF); - hscx_write(cs, 1, HSCX_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0x0); - hscx_write(cs, 0, HSCX_MASK, 0x0); - hscx_write(cs, 1, HSCX_MASK, 0x0); - spin_unlock(&cs->lock); + WriteHSCX(cs, 0, HSCX_MASK, 0xff); + WriteHSCX(cs, 1, HSCX_MASK, 0xff); + WriteISAC(cs, ISAC_MASK, 0xff); + WriteISAC(cs, ISAC_MASK, 0x00); + WriteHSCX(cs, 0, HSCX_MASK, 0x00); + WriteHSCX(cs, 1, HSCX_MASK, 0x00); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static void -avm_a1p_init(struct IsdnCardState *cs) -{ - byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET, - ASL0_W_TDISABLE|ASL0_W_TRESET|ASL0_W_IRQENABLE); - inithscxisac(cs); -} - static int -avm_a1p_reset(struct IsdnCardState *cs) +AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,0x00); - HZDELAY(HZ / 5 + 1); - byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,ASL0_W_RESET); - HZDELAY(HZ / 5 + 1); - byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,0x00); + u_long flags; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,0x00); + HZDELAY(HZ / 5 + 1); + byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,ASL0_W_RESET); + HZDELAY(HZ / 5 + 1); + byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,0x00); + spin_unlock_irqrestore(&cs->lock, flags); + return 0; + + case CARD_RELEASE: + /* free_irq is done in HiSax_closecard(). */ + /* free_irq(cs->irq, cs); */ + return 0; + + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,ASL0_W_TDISABLE|ASL0_W_TRESET|ASL0_W_IRQENABLE); + clear_pending_isac_ints(cs); + clear_pending_hscx_ints(cs); + inithscxisac(cs, 1); + inithscxisac(cs, 2); + spin_unlock_irqrestore(&cs->lock, flags); + return 0; + + case CARD_TEST: + /* we really don't need it for the PCMCIA Version */ + return 0; + + default: + /* all card drivers ignore others, so we do the same */ + return 0; + } return 0; } -static struct card_ops avm_a1p_ops = { - .init = avm_a1p_init, - .reset = avm_a1p_reset, - .irq_func = avm_a1p_interrupt, -}; - -static int __init -avm_a1p_probe(struct IsdnCardState *cs, struct IsdnCard *card) +int +setup_avm_a1_pcmcia(struct IsdnCard *card) { - u8 model, vers; + u_char model, vers; + struct IsdnCardState *cs = card->cs; + char tmp[64]; + + + strcpy(tmp, avm_revision); + printk(KERN_INFO "HiSax: AVM A1 PCMCIA driver Rev. %s\n", + HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_A1_PCMCIA) + return (0); - cs->irq = card->para[0]; cs->hw.avm.cfg_reg = card->para[1]; + cs->irq = card->para[0]; - outb(cs->hw.avm.cfg_reg+ASL1_OFFSET, ASL1_W_ENABLE_S0); + outb(cs->hw.avm.cfg_reg+ASL1_OFFSET, ASL1_W_ENABLE_S0); byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,0x00); HZDELAY(HZ / 5 + 1); byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,ASL0_W_RESET); @@ -238,26 +244,25 @@ vers = bytein(cs->hw.avm.cfg_reg+VERREG_OFFSET); printk(KERN_INFO "AVM A1 PCMCIA: io 0x%x irq %d model %d version %d\n", - cs->hw.avm.cfg_reg, cs->irq, model, vers); - - cs->card_ops = &avm_a1p_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -int __devinit -setup_avm_a1_pcmcia(struct IsdnCard *card) -{ - char tmp[64]; + cs->hw.avm.cfg_reg, cs->irq, model, vers); - strcpy(tmp, avm_revision); - printk(KERN_INFO "HiSax: AVM A1 PCMCIA driver Rev. %s\n", - HiSax_getrev(tmp)); - if (avm_a1p_probe(card->cs, card)) - return 0; - return 1; + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &AVM_card_msg; + cs->irq_flags = SA_SHIRQ; + cs->irq_func = &avm_a1p_interrupt; + + ISACVersion(cs, "AVM A1 PCMCIA:"); + if (HscxVersion(cs, "AVM A1 PCMCIA:")) { + printk(KERN_WARNING + "AVM A1 PCMCIA: wrong HSCX versions check IO address\n"); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c --- a/drivers/isdn/hisax/avm_pci.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/avm_pci.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: avm_pci.c,v 1.22.6.6 2001/09/23 22:24:46 kai Exp $ +/* $Id: avm_pci.c,v 1.29.2.4 2004/02/11 13:21:32 keil Exp $ * * low level stuff for AVM Fritz!PCI and ISA PnP isdn cards * @@ -22,8 +22,7 @@ #include extern const char *CardType[]; -static const char *avm_pci_rev = "$Revision: 1.22.6.6 $"; -static spinlock_t avm_pci_lock = SPIN_LOCK_UNLOCKED; +static const char *avm_pci_rev = "$Revision: 1.29.2.4 $"; #define AVM_FRITZ_PCI 1 #define AVM_FRITZ_PNP 2 @@ -76,137 +75,91 @@ /* Interface functions */ -static u8 -ReadISAC(struct IsdnCardState *cs, u8 offset) +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - u8 idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW; - u8 val; - unsigned long flags; + register u_char idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW; + register u_char val; - spin_lock_irqsave(&avm_pci_lock, flags); outb(idx, cs->hw.avm.cfg_reg + 4); val = inb(cs->hw.avm.isac + (offset & 0xf)); - spin_unlock_irqrestore(&avm_pci_lock, flags); return (val); } static void -WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - u8 idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW; - unsigned long flags; + register u_char idx = (offset > 0x2f) ? AVM_ISAC_REG_HIGH : AVM_ISAC_REG_LOW; - spin_lock_irqsave(&avm_pci_lock, flags); outb(idx, cs->hw.avm.cfg_reg + 4); outb(value, cs->hw.avm.isac + (offset & 0xf)); - spin_unlock_irqrestore(&avm_pci_lock, flags); } static void -ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { outb(AVM_ISAC_FIFO, cs->hw.avm.cfg_reg + 4); insb(cs->hw.avm.isac, data, size); } static void -WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { outb(AVM_ISAC_FIFO, cs->hw.avm.cfg_reg + 4); outsb(cs->hw.avm.isac, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = ReadISAC, - .write_reg = WriteISAC, - .read_fifo = ReadISACfifo, - .write_fifo = WriteISACfifo, -}; - static inline u_int -ReadHDLCPCI(struct IsdnCardState *cs, int chan, u8 offset) +ReadHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset) { - u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; - u_int val; - unsigned long flags; + register u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; + register u_int val; - spin_lock_irqsave(&avm_pci_lock, flags); outl(idx, cs->hw.avm.cfg_reg + 4); val = inl(cs->hw.avm.isac + offset); - spin_unlock_irqrestore(&avm_pci_lock, flags); return (val); } static inline void -WriteHDLCPCI(struct IsdnCardState *cs, int chan, u8 offset, u_int value) +WriteHDLCPCI(struct IsdnCardState *cs, int chan, u_char offset, u_int value) { - u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; - unsigned long flags; + register u_int idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; - spin_lock_irqsave(&avm_pci_lock, flags); outl(idx, cs->hw.avm.cfg_reg + 4); outl(value, cs->hw.avm.isac + offset); - spin_unlock_irqrestore(&avm_pci_lock, flags); } -static inline u8 -ReadHDLCPnP(struct IsdnCardState *cs, int chan, u8 offset) +static inline u_char +ReadHDLCPnP(struct IsdnCardState *cs, int chan, u_char offset) { - u8 idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; - u8 val; - unsigned long flags; + register u_char idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; + register u_char val; - spin_lock_irqsave(&avm_pci_lock, flags); outb(idx, cs->hw.avm.cfg_reg + 4); val = inb(cs->hw.avm.isac + offset); - spin_unlock_irqrestore(&avm_pci_lock, flags); return (val); } static inline void -WriteHDLCPnP(struct IsdnCardState *cs, int chan, u8 offset, u8 value) +WriteHDLCPnP(struct IsdnCardState *cs, int chan, u_char offset, u_char value) { - u8 idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; - unsigned long flags; + register u_char idx = chan ? AVM_HDLC_2 : AVM_HDLC_1; - spin_lock_irqsave(&avm_pci_lock, flags); outb(idx, cs->hw.avm.cfg_reg + 4); outb(value, cs->hw.avm.isac + offset); - spin_unlock_irqrestore(&avm_pci_lock, flags); } -static void -hdlc_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int len) +static u_char +ReadHDLC_s(struct IsdnCardState *cs, int chan, u_char offset) { - u8 idx = hscx ? AVM_HDLC_2 : AVM_HDLC_1; - int i; - - if (cs->subtyp == AVM_FRITZ_PCI) { - u32 *ptr = (u32 *) data; - - outl(idx, cs->hw.avm.cfg_reg + 4); - for (i = 0; i < len; i += 4) { -#ifdef __powerpc__ -#ifdef CONFIG_APUS - *ptr++ = in_le32((u32 *)(cs->hw.avm.isac +_IO_BASE)); -#else - *ptr++ = in_be32((u32 *)(cs->hw.avm.isac +_IO_BASE)); -#endif /* CONFIG_APUS */ -#else - *ptr++ = inl(cs->hw.avm.isac); -#endif /* __powerpc__ */ - } - } else { - outb(idx, cs->hw.avm.cfg_reg + 4); - for (i = 0; i < len; i++) { - *data++ = inb(cs->hw.avm.isac); - } - } + return(0xff & ReadHDLCPCI(cs, chan, offset)); } -static struct bc_hw_ops hdlc_hw_ops = { - .read_fifo = hdlc_read_fifo, -}; +static void +WriteHDLC_s(struct IsdnCardState *cs, int chan, u_char offset, u_char value) +{ + WriteHDLCPCI(cs, chan, offset, value); +} static inline struct BCState *Sel_BCS(struct IsdnCardState *cs, int channel) @@ -273,7 +226,7 @@ bcs->hw.hdlc.ctrl.sr.cmd = HDLC_CMD_XRS; write_ctrl(bcs, 1); bcs->hw.hdlc.ctrl.sr.cmd = 0; - sched_b_event(bcs, B_XMTBUFREADY); + schedule_event(bcs, B_XMTBUFREADY); break; case (L1_MODE_HDLC): bcs->mode = mode; @@ -284,7 +237,7 @@ bcs->hw.hdlc.ctrl.sr.cmd = HDLC_CMD_XRS; write_ctrl(bcs, 1); bcs->hw.hdlc.ctrl.sr.cmd = 0; - sched_b_event(bcs, B_XMTBUFREADY); + schedule_event(bcs, B_XMTBUFREADY); break; } } @@ -292,31 +245,89 @@ static inline void hdlc_empty_fifo(struct BCState *bcs, int count) { - recv_empty_fifo_b(bcs, count); + register u_int *ptr; + u_char *p; + u_char idx = bcs->channel ? AVM_HDLC_2 : AVM_HDLC_1; + int cnt=0; + struct IsdnCardState *cs = bcs->cs; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hdlc_empty_fifo %d", count); + if (bcs->hw.hdlc.rcvidx + count > HSCX_BUFMAX) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "hdlc_empty_fifo: incoming packet too large"); + return; + } + p = bcs->hw.hdlc.rcvbuf + bcs->hw.hdlc.rcvidx; + ptr = (u_int *)p; + bcs->hw.hdlc.rcvidx += count; + if (cs->subtyp == AVM_FRITZ_PCI) { + outl(idx, cs->hw.avm.cfg_reg + 4); + while (cnt < count) { +#ifdef __powerpc__ +#ifdef CONFIG_APUS + *ptr++ = in_le32((unsigned *)(cs->hw.avm.isac +_IO_BASE)); +#else + *ptr++ = in_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE)); +#endif /* CONFIG_APUS */ +#else + *ptr++ = inl(cs->hw.avm.isac); +#endif /* __powerpc__ */ + cnt += 4; + } + } else { + outb(idx, cs->hw.avm.cfg_reg + 4); + while (cnt < count) { + *p++ = inb(cs->hw.avm.isac); + cnt++; + } + } + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + if (cs->subtyp == AVM_FRITZ_PNP) + p = (u_char *) ptr; + t += sprintf(t, "hdlc_empty_fifo %c cnt %d", + bcs->channel ? 'B' : 'A', count); + QuickHex(t, p, count); + debugl1(cs, bcs->blog); + } } -static void +static inline void hdlc_fill_fifo(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; - int count, more, cnt =0; + int count, cnt =0; int fifo_size = 32; - unsigned char *p; - unsigned int *ptr; + u_char *p; + u_int *ptr; - p = xmit_fill_fifo_b(bcs, fifo_size, &count, &more); - if (!p) + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hdlc_fill_fifo"); + if (!bcs->tx_skb) + return; + if (bcs->tx_skb->len <= 0) return; - if (more) - bcs->hw.hdlc.ctrl.sr.cmd &= ~HDLC_CMD_XME; - else - bcs->hw.hdlc.ctrl.sr.cmd |= HDLC_CMD_XME; - + bcs->hw.hdlc.ctrl.sr.cmd &= ~HDLC_CMD_XME; + if (bcs->tx_skb->len > fifo_size) { + count = fifo_size; + } else { + count = bcs->tx_skb->len; + if (bcs->mode != L1_MODE_TRANS) + bcs->hw.hdlc.ctrl.sr.cmd |= HDLC_CMD_XME; + } + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hdlc_fill_fifo %d/%ld", count, bcs->tx_skb->len); + p = bcs->tx_skb->data; + ptr = (u_int *)p; + skb_pull(bcs->tx_skb, count); + bcs->tx_cnt -= count; + bcs->hw.hdlc.count += count; bcs->hw.hdlc.ctrl.sr.xml = ((count == fifo_size) ? 0 : count); write_ctrl(bcs, 3); /* sets the correct index too */ if (cs->subtyp == AVM_FRITZ_PCI) { - ptr = (unsigned int *) p; while (cntdebug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; -static void -reset_xmit(struct BCState *bcs) -{ - bcs->hw.hdlc.ctrl.sr.xml = 0; - bcs->hw.hdlc.ctrl.sr.cmd |= HDLC_CMD_XRS; - write_ctrl(bcs, 1); - bcs->hw.hdlc.ctrl.sr.cmd &= ~HDLC_CMD_XRS; - write_ctrl(bcs, 1); - hdlc_fill_fifo(bcs); + if (cs->subtyp == AVM_FRITZ_PNP) + p = (u_char *) ptr; + t += sprintf(t, "hdlc_fill_fifo %c cnt %d", + bcs->channel ? 'B' : 'A', count); + QuickHex(t, p, count); + debugl1(cs, bcs->blog); + } } static inline void -HDLC_irq(struct BCState *bcs, u_int stat) -{ +HDLC_irq(struct BCState *bcs, u_int stat) { int len; + struct sk_buff *skb; if (bcs->cs->debug & L1_DEB_HSCX) debugl1(bcs->cs, "ch%d stat %#x", bcs->channel, stat); - if (stat & HDLC_INT_RPR) { if (stat & HDLC_STAT_RDO) { if (bcs->cs->debug & L1_DEB_HSCX) @@ -367,7 +376,7 @@ write_ctrl(bcs, 1); bcs->hw.hdlc.ctrl.sr.cmd &= ~HDLC_CMD_RRS; write_ctrl(bcs, 1); - bcs->rcvidx = 0; + bcs->hw.hdlc.rcvidx = 0; } else { if (!(len = (stat & HDLC_STAT_RML_MASK)>>8)) len = 32; @@ -375,21 +384,70 @@ if ((stat & HDLC_STAT_RME) || (bcs->mode == L1_MODE_TRANS)) { if (((stat & HDLC_STAT_CRCVFRRAB)==HDLC_STAT_CRCVFR) || (bcs->mode == L1_MODE_TRANS)) { - recv_rme_b(bcs); + if (!(skb = dev_alloc_skb(bcs->hw.hdlc.rcvidx))) + printk(KERN_WARNING "HDLC: receive out of memory\n"); + else { + memcpy(skb_put(skb, bcs->hw.hdlc.rcvidx), + bcs->hw.hdlc.rcvbuf, bcs->hw.hdlc.rcvidx); + skb_queue_tail(&bcs->rqueue, skb); + } + bcs->hw.hdlc.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); } else { if (bcs->cs->debug & L1_DEB_HSCX) debugl1(bcs->cs, "invalid frame"); else debugl1(bcs->cs, "ch%d invalid frame %#x", bcs->channel, stat); - bcs->rcvidx = 0; + bcs->hw.hdlc.rcvidx = 0; } } } } if (stat & HDLC_INT_XDU) { - xmit_xdu_b(bcs, reset_xmit); + /* Here we lost an TX interrupt, so + * restart transmitting the whole frame. + */ + if (bcs->tx_skb) { + skb_push(bcs->tx_skb, bcs->hw.hdlc.count); + bcs->tx_cnt += bcs->hw.hdlc.count; + bcs->hw.hdlc.count = 0; + if (bcs->cs->debug & L1_DEB_WARN) + debugl1(bcs->cs, "ch%d XDU", bcs->channel); + } else if (bcs->cs->debug & L1_DEB_WARN) + debugl1(bcs->cs, "ch%d XDU without skb", bcs->channel); + bcs->hw.hdlc.ctrl.sr.xml = 0; + bcs->hw.hdlc.ctrl.sr.cmd |= HDLC_CMD_XRS; + write_ctrl(bcs, 1); + bcs->hw.hdlc.ctrl.sr.cmd &= ~HDLC_CMD_XRS; + write_ctrl(bcs, 1); + hdlc_fill_fifo(bcs); } else if (stat & HDLC_INT_XPR) { - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (bcs->tx_skb->len) { + hdlc_fill_fifo(bcs); + return; + } else { + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.hdlc.count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_irq(bcs->tx_skb); + bcs->hw.hdlc.count = 0; + bcs->tx_skb = NULL; + } + } + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + bcs->hw.hdlc.count = 0; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + hdlc_fill_fifo(bcs); + } else { + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + schedule_event(bcs, B_XMTBUFREADY); + } } } @@ -399,7 +457,6 @@ u_int stat; struct BCState *bcs; - spin_lock(&cs->lock); if (cs->subtyp == AVM_FRITZ_PCI) { stat = ReadHDLCPCI(cs, 0, HDLC_STATUS); } else { @@ -428,37 +485,64 @@ } else HDLC_irq(bcs, stat); } - spin_unlock(&cs->lock); } void hdlc_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->hw.hdlc.count = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "hdlc_l2l1: this shouldn't happen\n"); + } else { + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->hw.hdlc.count = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - modehdlc(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + modehdlc(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - modehdlc(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + modehdlc(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -467,38 +551,69 @@ close_hdlcstate(struct BCState *bcs) { modehdlc(bcs, 0, 0); - bc_close(bcs); + if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { + if (bcs->hw.hdlc.rcvbuf) { + kfree(bcs->hw.hdlc.rcvbuf); + bcs->hw.hdlc.rcvbuf = NULL; + } + if (bcs->blog) { + kfree(bcs->blog); + bcs->blog = NULL; + } + skb_queue_purge(&bcs->rqueue); + skb_queue_purge(&bcs->squeue); + if (bcs->tx_skb) { + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + } + } } int open_hdlcstate(struct IsdnCardState *cs, struct BCState *bcs) { - return bc_open(bcs); + if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { + if (!(bcs->hw.hdlc.rcvbuf = kmalloc(HSCX_BUFMAX, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for hdlc.rcvbuf\n"); + return (1); + } + if (!(bcs->blog = kmalloc(MAX_BLOG_SPACE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for bcs->blog\n"); + test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); + kfree(bcs->hw.hdlc.rcvbuf); + bcs->hw.hdlc.rcvbuf = NULL; + return (2); + } + skb_queue_head_init(&bcs->rqueue); + skb_queue_head_init(&bcs->squeue); + } + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->event = 0; + bcs->hw.hdlc.rcvidx = 0; + bcs->tx_cnt = 0; + return (0); } int setstack_hdlc(struct PStack *st, struct BCState *bcs) { bcs->channel = st->l1.bc; - bcs->unit = bcs->channel; if (open_hdlcstate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = hdlc_l2l1; + st->l2.l2l1 = hdlc_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); return (0); } -static struct bc_l1_ops hdlc_l1_ops = { - .fill_fifo = hdlc_fill_fifo, - .open = setstack_hdlc, - .close = close_hdlcstate, -}; - -static void __init -inithdlc(struct IsdnCardState *cs) +void __init +clear_pending_hdlc_ints(struct IsdnCardState *cs) { u_int val; @@ -525,7 +640,15 @@ val = ReadHDLCPnP(cs, 1, HDLC_STATUS + 3); debugl1(cs, "HDLC 2 VIN %x", val); } +} +void __init +inithdlc(struct IsdnCardState *cs) +{ + cs->bcs[0].BC_SetStack = setstack_hdlc; + cs->bcs[1].BC_SetStack = setstack_hdlc; + cs->bcs[0].BC_Close = close_hdlcstate; + cs->bcs[1].BC_Close = close_hdlcstate; modehdlc(cs->bcs, -1, 0); modehdlc(cs->bcs + 1, -1, 1); } @@ -534,13 +657,17 @@ avm_pcipnp_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val; - u8 sval; + u_long flags; + u_char val; + u_char sval; + spin_lock_irqsave(&cs->lock, flags); sval = inb(cs->hw.avm.cfg_reg + 2); - if ((sval & AVM_STATUS0_IRQ_MASK) == AVM_STATUS0_IRQ_MASK) + if ((sval & AVM_STATUS0_IRQ_MASK) == AVM_STATUS0_IRQ_MASK) { /* possible a shared IRQ reqest */ + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_NONE; + } if (!(sval & AVM_STATUS0_IRQ_ISAC)) { val = ReadISAC(cs, ISAC_ISTA); isac_interrupt(cs, val); @@ -550,192 +677,187 @@ } WriteISAC(cs, ISAC_MASK, 0xFF); WriteISAC(cs, ISAC_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static int -avm_pcipnp_reset(struct IsdnCardState *cs) +static void +reset_avmpcipnp(struct IsdnCardState *cs) { printk(KERN_INFO "AVM PCI/PnP: reset\n"); outb(AVM_STATUS0_RESET | AVM_STATUS0_DIS_TIMER, cs->hw.avm.cfg_reg + 2); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ + mdelay(10); outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER | AVM_STATUS0_ENA_IRQ, cs->hw.avm.cfg_reg + 2); outb(AVM_STATUS1_ENA_IOM | cs->irq, cs->hw.avm.cfg_reg + 3); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ + mdelay(10); printk(KERN_INFO "AVM PCI/PnP: S1 %x\n", inb(cs->hw.avm.cfg_reg + 3)); - return 0; -} - -static void -avm_pcipnp_init(struct IsdnCardState *cs) -{ - initisac(cs); - inithdlc(cs); - outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER, - cs->hw.avm.cfg_reg + 2); - outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER | - AVM_STATUS0_ENA_IRQ, cs->hw.avm.cfg_reg + 2); -} - -static void -avm_pcipnp_release(struct IsdnCardState *cs) -{ - outb(0, cs->hw.avm.cfg_reg + 2); - hisax_release_resources(cs); } -static struct card_ops avm_pci_ops = { - .init = avm_pcipnp_init, - .reset = avm_pcipnp_reset, - .release = avm_pcipnp_release, - .irq_func = avm_pcipnp_interrupt, -}; - -static int __init -avm_pcipnp_hw_init(struct IsdnCardState *cs) -{ - cs->bc_hw_ops = &hdlc_hw_ops; - cs->bc_l1_ops = &hdlc_l1_ops; - cs->card_ops = &avm_pci_ops; - avm_pcipnp_reset(cs); - return isac_setup(cs, &isac_ops); -} - -static int __init -avm_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - int rc; - u32 val; - - printk(KERN_INFO "AVM PCI: defined at %#lx IRQ %u\n", - pci_resource_start(pdev, 1), pdev->irq); - - rc = -EBUSY; - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = AVM_FRITZ_PCI; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.avm.cfg_reg = pci_resource_start(pdev, 1); - cs->hw.avm.isac = cs->hw.avm.cfg_reg + 0x10; - if (!request_io(&cs->rs, cs->hw.avm.cfg_reg, 32, "avm PCI")) - goto err; - - val = inl(cs->hw.avm.cfg_reg); - printk(KERN_INFO "AVM PCI: stat %#x\n", val); - printk(KERN_INFO "AVM PCI: Class %X Rev %d\n", - val & 0xff, (val>>8) & 0xff); - - if (avm_pcipnp_hw_init(cs)) - goto err; - - return 0; - err: - hisax_release_resources(cs); - return rc; -} - -static int __init -avm_pnp_probe(struct IsdnCardState *cs, struct IsdnCard *card) +static int +AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - int rc; - u8 val, ver; + u_long flags; - printk(KERN_INFO "AVM PnP: defined at %#lx IRQ %lu\n", - card->para[1], card->para[0]); - - cs->subtyp = AVM_FRITZ_PNP; - cs->irq = card->para[0]; - cs->hw.avm.cfg_reg = card->para[1]; - cs->hw.avm.isac = cs->hw.avm.cfg_reg + 0x10; - - rc = -EBUSY; - if (!request_io(&cs->rs, cs->hw.avm.cfg_reg, 32, "avm PnP")) - goto err; - - val = inb(cs->hw.avm.cfg_reg); - ver = inb(cs->hw.avm.cfg_reg + 1); - printk(KERN_INFO "AVM PnP: Class %X Rev %d\n", val, ver); - - if (avm_pcipnp_hw_init(cs)) - goto err; - - return 0; - err: - hisax_release_resources(cs); - return rc; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_avmpcipnp(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + outb(0, cs->hw.avm.cfg_reg + 2); + release_region(cs->hw.avm.cfg_reg, 32); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + reset_avmpcipnp(cs); + clear_pending_isac_ints(cs); + initisac(cs); + inithdlc(cs); + outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER, + cs->hw.avm.cfg_reg + 2); + WriteISAC(cs, ISAC_MASK, 0); + outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER | + AVM_STATUS0_ENA_IRQ, cs->hw.avm.cfg_reg + 2); + /* RESET Receiver and Transmitter */ + WriteISAC(cs, ISAC_CMDR, 0x41); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } static struct pci_dev *dev_avm __initdata = NULL; #ifdef __ISAPNP__ -static struct pnp_card *card_avm __initdata = NULL; -static struct pnp_dev *pnp_avm __initdata = NULL; +static struct pnp_card *pnp_avm_c __initdata = NULL; #endif int __init setup_avm_pcipnp(struct IsdnCard *card) { + u_int val, ver; + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, avm_pci_rev); printk(KERN_INFO "HiSax: AVM PCI driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_FRITZPCI) + return (0); if (card->para[1]) { /* old manual method */ - if (avm_pnp_probe(card->cs, card)) - return 0; - return 1; + cs->hw.avm.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + cs->subtyp = AVM_FRITZ_PNP; } else { #ifdef __ISAPNP__ if (isapnp_present()) { - struct pnp_card *ba; - if ((ba = pnp_find_card( + struct pnp_dev *pnp_avm_d = NULL; + if ((pnp_avm_c = pnp_find_card( ISAPNP_VENDOR('A', 'V', 'M'), - ISAPNP_FUNCTION(0x0900), card_avm))) { - card_avm = ba; - pnp_avm = NULL; - if ((pnp_avm = pnp_find_dev(card_avm, + ISAPNP_FUNCTION(0x0900), pnp_avm_c))) { + if ((pnp_avm_d = pnp_find_dev(pnp_avm_c, ISAPNP_VENDOR('A', 'V', 'M'), - ISAPNP_FUNCTION(0x0900), pnp_avm))) { - if (pnp_device_attach(pnp_avm) < 0) { - printk(KERN_ERR "FritzPnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pnp_avm) < 0) { - printk(KERN_ERR "FritzPnP: activate failed\n"); - pnp_device_detach(pnp_avm); - return 0; + ISAPNP_FUNCTION(0x0900), pnp_avm_d))) { + int err; + + pnp_disable_dev(pnp_avm_d); + err = pnp_activate_dev(pnp_avm_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_irq_valid(pnp_avm, 0)) { + cs->hw.avm.cfg_reg = + pnp_port_start(pnp_avm_d, 0); + cs->irq = pnp_irq(pnp_avm_d, 0); + if (!cs->irq) { printk(KERN_ERR "FritzPnP:No IRQ\n"); - pnp_device_detach(pnp_avm); return(0); } - if (!pnp_port_valid(pnp_avm, 0)) { + if (!cs->hw.avm.cfg_reg) { printk(KERN_ERR "FritzPnP:No IO address\n"); - pnp_device_detach(pnp_avm); return(0); } - card->para[1] = pnp_port_start(pnp_avm, 0); - card->para[0] = pnp_irq(pnp_avm, 0); - if (avm_pnp_probe(card->cs, card)) - return 0; - return 1; + cs->subtyp = AVM_FRITZ_PNP; + goto ready; } } + } else { + printk(KERN_INFO "FritzPnP: no ISA PnP present\n"); } #endif -#ifdef CONFIG_PCI +#if CONFIG_PCI if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, dev_avm))) { - if (avm_pci_probe(card->cs, dev_avm)) - return 0; - return 1; + cs->irq = dev_avm->irq; + if (!cs->irq) { + printk(KERN_ERR "FritzPCI: No IRQ for PCI card found\n"); + return(0); + } + if (pci_enable_device(dev_avm)) + return(0); + cs->hw.avm.cfg_reg = pci_resource_start(dev_avm, 1); + if (!cs->hw.avm.cfg_reg) { + printk(KERN_ERR "FritzPCI: No IO-Adr for PCI card found\n"); + return(0); + } + cs->subtyp = AVM_FRITZ_PCI; + } else { + printk(KERN_WARNING "FritzPCI: No PCI card found\n"); + return(0); } + cs->irq_flags |= SA_SHIRQ; +#else + printk(KERN_WARNING "FritzPCI: NO_PCI_BIOS\n"); + return (0); #endif /* CONFIG_PCI */ } - printk(KERN_WARNING "FritzPCI: No card found\n"); - return 0; +ready: + cs->hw.avm.isac = cs->hw.avm.cfg_reg + 0x10; + if (!request_region(cs->hw.avm.cfg_reg, 32, + (cs->subtyp == AVM_FRITZ_PCI) ? "avm PCI" : "avm PnP")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.avm.cfg_reg, + cs->hw.avm.cfg_reg + 31); + return (0); + } + switch (cs->subtyp) { + case AVM_FRITZ_PCI: + val = inl(cs->hw.avm.cfg_reg); + printk(KERN_INFO "AVM PCI: stat %#x\n", val); + printk(KERN_INFO "AVM PCI: Class %X Rev %d\n", + val & 0xff, (val>>8) & 0xff); + cs->BC_Read_Reg = &ReadHDLC_s; + cs->BC_Write_Reg = &WriteHDLC_s; + break; + case AVM_FRITZ_PNP: + val = inb(cs->hw.avm.cfg_reg); + ver = inb(cs->hw.avm.cfg_reg + 1); + printk(KERN_INFO "AVM PnP: Class %X Rev %d\n", val, ver); + cs->BC_Read_Reg = &ReadHDLCPnP; + cs->BC_Write_Reg = &WriteHDLCPnP; + break; + default: + printk(KERN_WARNING "AVM unknown subtype %d\n", cs->subtyp); + return(0); + } + printk(KERN_INFO "HiSax: %s config irq:%d base:0x%X\n", + (cs->subtyp == AVM_FRITZ_PCI) ? "AVM Fritz!PCI" : "AVM Fritz!PnP", + cs->irq, cs->hw.avm.cfg_reg); + + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Send_Data = &hdlc_fill_fifo; + cs->cardmsg = &AVM_card_msg; + cs->irq_func = &avm_pcipnp_interrupt; + cs->writeisac(cs, ISAC_MASK, 0xFF); + ISACVersion(cs, (cs->subtyp == AVM_FRITZ_PCI) ? "AVM PCI:" : "AVM PnP:"); + return (1); } diff -Nru a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c --- a/drivers/isdn/hisax/avma1_cs.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/avma1_cs.c Thu Feb 19 23:44:26 2004 @@ -26,15 +26,12 @@ #include #include #include +#include "hisax_cfg.h" MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for AVM A1/Fritz!PCMCIA cards"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); -int avm_a1_init_pcmcia(void *pcm_iob, int pcm_irq, int *busy_flag, int prot); -void HiSax_closecard(int cardnr); - - /* All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If you do not define PCMCIA_DEBUG at all, all the debug code will be @@ -156,6 +153,15 @@ return NULL; memset(link, 0, sizeof(struct dev_link_t)); + /* Allocate space for private device-specific data */ + local = kmalloc(sizeof(local_info_t), GFP_KERNEL); + if (!local) { + kfree(link); + return NULL; + } + memset(local, 0, sizeof(local_info_t)); + link->priv = local; + /* The io structure describes IO port mapping */ link->io.NumPorts1 = 16; link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; @@ -183,15 +189,6 @@ link->conf.ConfigIndex = 1; link->conf.Present = PRESENT_OPTION; - /* Allocate space for private device-specific data */ - local = kmalloc(sizeof(local_info_t), GFP_KERNEL); - if (!local) { - kfree(link); - return NULL; - } - memset(local, 0, sizeof(local_info_t)); - link->priv = local; - /* Register with Card Services */ link->next = dev_list; dev_list = link; @@ -252,7 +249,7 @@ /* Break the link with Card Services */ if (link->handle) - pcmcia_deregister_client(link->handle); + pcmcia_deregister_client(link->handle); /* Unlink device structure, free pieces */ *linkp = link->next; @@ -303,8 +300,9 @@ cistpl_cftable_entry_t *cf = &parse.cftable_entry; local_info_t *dev; int i; - u8 buf[64]; + u_char buf[64]; char devname[128]; + IsdnCard_t icard; int busy = 0; handle = link->handle; @@ -365,9 +363,9 @@ link->io.BasePort1 = cf->io.win[0].base; link->io.NumPorts1 = cf->io.win[0].len; link->io.NumPorts2 = 0; - printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n", + printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n", link->io.BasePort1, - link->io.BasePort1+link->io.NumPorts1 - 1); + link->io.BasePort1+link->io.NumPorts1 - 1); i = pcmcia_request_io(link->handle, &link->io); if (i == CS_SUCCESS) goto found_port; } @@ -391,8 +389,8 @@ } /* - * configure the PCMCIA socket - */ + * configure the PCMCIA socket + */ i = pcmcia_request_configuration(link->handle, &link->conf); if (i != CS_SUCCESS) { cs_error(link->handle, RequestConfiguration, i); @@ -421,15 +419,17 @@ printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n", link->io.BasePort1, link->irq.AssignedIRQ); - if (avm_a1_init_pcmcia((void *)(int)link->io.BasePort1, - link->irq.AssignedIRQ, - &busy, isdnprot) != 0) { - printk(KERN_ERR "avma1_cs: failed to initialize AVM A1 PCMCIA %d at i/o %#x\n", i, link->io.BasePort1); - return; + icard.para[0] = link->irq.AssignedIRQ; + icard.para[1] = link->io.BasePort1; + icard.protocol = isdnprot; + icard.typ = ISDN_CTYPE_A1_PCMCIA; + + i = hisax_init_pcmcia(link, &busy, &icard); + if (i < 0) { + printk(KERN_ERR "avma1_cs: failed to initialize AVM A1 PCMCIA %d at i/o %#x\n", i, link->io.BasePort1); + avma1cs_release(link); + return; } - - i = 0; /* no returncode for cardnr :-( */ - dev->node.minor = i; } /* avma1cs_config */ @@ -486,29 +486,28 @@ DEBUG(1, "avma1cs_event(0x%06x)\n", event); switch (event) { - case CS_EVENT_CARD_REMOVAL: - link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) + case CS_EVENT_CARD_REMOVAL: + if (link->state & DEV_CONFIG) avma1cs_release(link); - break; - case CS_EVENT_CARD_INSERTION: - link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; - avma1cs_config(link); - break; - case CS_EVENT_PM_SUSPEND: - link->state |= DEV_SUSPEND; - /* Fall through... */ - case CS_EVENT_RESET_PHYSICAL: - if (link->state & DEV_CONFIG) - pcmcia_release_configuration(link->handle); - break; - case CS_EVENT_PM_RESUME: - link->state &= ~DEV_SUSPEND; - /* Fall through... */ - case CS_EVENT_CARD_RESET: - if (link->state & DEV_CONFIG) - pcmcia_request_configuration(link->handle, &link->conf); - break; + break; + case CS_EVENT_CARD_INSERTION: + link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; + avma1cs_config(link); + break; + case CS_EVENT_PM_SUSPEND: + link->state |= DEV_SUSPEND; + /* Fall through... */ + case CS_EVENT_RESET_PHYSICAL: + if (link->state & DEV_CONFIG) + pcmcia_release_configuration(link->handle); + break; + case CS_EVENT_PM_RESUME: + link->state &= ~DEV_SUSPEND; + /* Fall through... */ + case CS_EVENT_CARD_RESET: + if (link->state & DEV_CONFIG) + pcmcia_request_configuration(link->handle, &link->conf); + break; } return 0; } /* avma1cs_event */ @@ -521,10 +520,12 @@ .attach = avma1cs_attach, .detach = avma1cs_detach, }; + +/*====================================================================*/ static int __init init_avma1_cs(void) { - return pcmcia_register_driver(&avma1cs_driver); + return(pcmcia_register_driver(&avma1cs_driver)); } static void __exit exit_avma1_cs(void) diff -Nru a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c --- a/drivers/isdn/hisax/bkm_a4t.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/bkm_a4t.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: bkm_a4t.c,v 1.13.6.6 2001/09/23 22:24:46 kai Exp $ +/* $Id: bkm_a4t.c,v 1.22.2.4 2004/01/14 16:04:48 keil Exp $ * * low level stuff for T-Berkom A4T * @@ -10,6 +10,7 @@ * */ + #include #include #include "hisax.h" @@ -21,51 +22,47 @@ #include "bkm_ax.h" extern const char *CardType[]; -// FIXME needs per card lock -static spinlock_t bkm_a4t_lock = SPIN_LOCK_UNLOCKED; -const char *bkm_a4t_revision = "$Revision: 1.13.6.6 $"; +const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $"; + -static inline u8 -readreg(unsigned int ale, unsigned long adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned long adr, u_char off) { - u_int ret; - unsigned long flags; + register u_int ret; unsigned int *po = (unsigned int *) adr; /* Postoffice */ - spin_lock_irqsave(&bkm_a4t_lock, flags); + *po = (GCS_2 | PO_WRITE | off); __WAITI20__(po); *po = (ale | PO_READ); __WAITI20__(po); ret = *po; - spin_unlock_irqrestore(&bkm_a4t_lock, flags); return ((unsigned char) ret); } + static inline void -writereg(unsigned int ale, unsigned long adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int size) +{ + int i; + for (i = 0; i < size; i++) + *data++ = readreg(ale, adr, off); +} + + +static inline void +writereg(unsigned int ale, unsigned long adr, u_char off, u_char data) { - unsigned long flags; unsigned int *po = (unsigned int *) adr; /* Postoffice */ - spin_lock_irqsave(&bkm_a4t_lock, flags); *po = (GCS_2 | PO_WRITE | off); __WAITI20__(po); *po = (ale | PO_WRITE | data); __WAITI20__(po); - spin_unlock_irqrestore(&bkm_a4t_lock, flags); } -static inline void -readfifo(unsigned int ale, unsigned long adr, u8 off, u8 * data, int size) -{ - int i; - - for (i = 0; i < size; i++) - *data++ = readreg(ale, adr, off); -} static inline void -writefifo(unsigned int ale, unsigned long adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int size) { int i; @@ -73,84 +70,74 @@ writereg(ale, adr, off, *data++); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) + +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { return (readreg(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { writereg(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { readfifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { writefifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -jade_read(struct IsdnCardState *cs, int jade, u8 offset) +static u_char +ReadJADE(struct IsdnCardState *cs, int jade, u_char offset) { - return readreg(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, offset + (jade == -1 ? 0 : (jade ? 0xC0 : 0x80))); + return (readreg(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, offset + (jade == -1 ? 0 : (jade ? 0xC0 : 0x80)))); } static void -jade_write(struct IsdnCardState *cs, int jade, u8 offset, u8 value) +WriteJADE(struct IsdnCardState *cs, int jade, u_char offset, u_char value) { writereg(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, offset + (jade == -1 ? 0 : (jade ? 0xC0 : 0x80)), value); } -static void -jade_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - readfifo(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, - (hscx == -1 ? 0 : (hscx ? 0xc0 : 0x80)), data, size); -} +/* + * fast interrupt JADE stuff goes here + */ -static void -jade_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - writefifo(cs->hw.ax.jade_ale, cs->hw.ax.jade_adr, - (hscx == -1 ? 0 : (hscx ? 0xc0 : 0x80)), data, size); -} +#define READJADE(cs, nr, reg) readreg(cs->hw.ax.jade_ale,\ + cs->hw.ax.jade_adr, reg + (nr == -1 ? 0 : (nr ? 0xC0 : 0x80))) +#define WRITEJADE(cs, nr, reg, data) writereg(cs->hw.ax.jade_ale,\ + cs->hw.ax.jade_adr, reg + (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), data) + +#define READJADEFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ax.jade_ale,\ + cs->hw.ax.jade_adr, (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), ptr, cnt) +#define WRITEJADEFIFO(cs, nr, ptr, cnt) writefifo( cs->hw.ax.jade_ale,\ + cs->hw.ax.jade_adr, (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), ptr, cnt) -static struct bc_hw_ops jade_ops = { - .read_reg = jade_read, - .write_reg = jade_write, - .read_fifo = jade_read_fifo, - .write_fifo = jade_write_fifo, -}; +#include "jade_irq.c" static irqreturn_t bkm_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val = 0; + u_char val = 0; + u_long flags; I20_REGISTER_FILE *pI20_Regs; - int handled = 0; - spin_lock(&cs->lock); + spin_lock_irqsave(&cs->lock, flags); pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); /* ISDN interrupt pending? */ if (pI20_Regs->i20IntStatus & intISDN) { - handled = 1; /* Reset the ISDN interrupt */ pI20_Regs->i20IntStatus = intISDN; /* Disable ISDN interrupt */ @@ -172,129 +159,101 @@ } /* Reenable ISDN interrupt */ pI20_Regs->i20IntCtrl |= intISDN; + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; + } else { + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; } - spin_unlock(&cs->lock); - return IRQ_RETVAL(handled); } -static void -enable_bkm_int(struct IsdnCardState *cs, unsigned bEnable) +void +release_io_bkm(struct IsdnCardState *cs) { - I20_REGISTER_FILE *pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); - if (bEnable) - pI20_Regs->i20IntCtrl |= (intISDN | intPCI); - else - /* CAUTION: This disables the video capture driver too */ - pI20_Regs->i20IntCtrl &= ~(intISDN | intPCI); + if (cs->hw.ax.base) { + iounmap((void *) cs->hw.ax.base); + cs->hw.ax.base = 0; + } } static void -reset_bkm(struct IsdnCardState *cs) +enable_bkm_int(struct IsdnCardState *cs, unsigned bEnable) { - I20_REGISTER_FILE *pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); - /* Issue the I20 soft reset */ - pI20_Regs->i20SysControl = 0xFF; /* all in */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10 * HZ) / 1000); - /* Remove the soft reset */ - pI20_Regs->i20SysControl = sysRESET | 0xFF; - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10 * HZ) / 1000); - /* Set our configuration */ - pI20_Regs->i20SysControl = sysRESET | sysCFG; - /* Issue ISDN reset */ - pI20_Regs->i20GuestControl = guestWAIT_CFG | - g_A4T_JADE_RES | - g_A4T_ISAR_RES | - g_A4T_ISAC_RES | - g_A4T_JADE_BOOTR | - g_A4T_ISAR_BOOTR; - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10 * HZ) / 1000); - - /* Remove RESET state from ISDN */ - pI20_Regs->i20GuestControl &= ~(g_A4T_ISAC_RES | - g_A4T_JADE_RES | - g_A4T_ISAR_RES); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10 * HZ) / 1000); + if (cs->typ == ISDN_CTYPE_BKM_A4T) { + I20_REGISTER_FILE *pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); + if (bEnable) + pI20_Regs->i20IntCtrl |= (intISDN | intPCI); + else + /* CAUTION: This disables the video capture driver too */ + pI20_Regs->i20IntCtrl &= ~(intISDN | intPCI); + } } static void -bkm_a4t_init(struct IsdnCardState *cs) +reset_bkm(struct IsdnCardState *cs) { - initisac(cs); - initjade(cs); - /* Enable ints */ - enable_bkm_int(cs, 1); + if (cs->typ == ISDN_CTYPE_BKM_A4T) { + I20_REGISTER_FILE *pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); + /* Issue the I20 soft reset */ + pI20_Regs->i20SysControl = 0xFF; /* all in */ + mdelay(10); + /* Remove the soft reset */ + pI20_Regs->i20SysControl = sysRESET | 0xFF; + mdelay(10); + /* Set our configuration */ + pI20_Regs->i20SysControl = sysRESET | sysCFG; + /* Issue ISDN reset */ + pI20_Regs->i20GuestControl = guestWAIT_CFG | + g_A4T_JADE_RES | + g_A4T_ISAR_RES | + g_A4T_ISAC_RES | + g_A4T_JADE_BOOTR | + g_A4T_ISAR_BOOTR; + mdelay(10); + + /* Remove RESET state from ISDN */ + pI20_Regs->i20GuestControl &= ~(g_A4T_ISAC_RES | + g_A4T_JADE_RES | + g_A4T_ISAR_RES); + mdelay(10); + } } static int -bkm_a4t_reset(struct IsdnCardState *cs) +BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - /* Disable ints */ - enable_bkm_int(cs, 0); - reset_bkm(cs); - return 0; -} - -static void -bkm_a4t_release(struct IsdnCardState *cs) -{ - reset_bkm(cs); - hisax_release_resources(cs); -} - -static struct card_ops bkm_a4t_ops = { - .init = bkm_a4t_init, - .reset = bkm_a4t_reset, - .release = bkm_a4t_release, - .irq_func = bkm_interrupt, -}; + u_long flags; -static int __init -bkm_a4t_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - I20_REGISTER_FILE *pI20_Regs; - int rc; - - printk(KERN_INFO "BKM A4T: defined at %#lx IRQ %u\n", - pci_resource_start(pdev, 0), pdev->irq); - - rc = -EBUSY; - if (pci_enable_device(pdev)) - goto err; - - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.avm.cfg_reg = pci_resource_start(pdev, 1); - - cs->hw.ax.base = (unsigned long)request_mmio(&cs->rs, pci_resource_start(pdev, 0), 4096, "Telekom A4T"); - if (!cs->hw.ax.base) - goto err; - - /* Check suspicious address */ - // FIXME needs to use read[bl] - pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); - if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) { - printk(KERN_WARNING "HiSax: address %lx suspicious\n", - cs->hw.ax.base); - goto err; + switch (mt) { + case CARD_RESET: + /* Disable ints */ + spin_lock_irqsave(&cs->lock, flags); + enable_bkm_int(cs, 0); + reset_bkm(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_RELEASE: + /* Sanity */ + spin_lock_irqsave(&cs->lock, flags); + enable_bkm_int(cs, 0); + reset_bkm(cs); + spin_unlock_irqrestore(&cs->lock, flags); + release_io_bkm(cs); + return (0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + clear_pending_isac_ints(cs); + clear_pending_jade_ints(cs); + initisac(cs); + initjade(cs); + /* Enable ints */ + enable_bkm_int(cs, 1); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_TEST: + return (0); } - cs->hw.ax.isac_adr = cs->hw.ax.base + PO_OFFSET; - cs->hw.ax.jade_adr = cs->hw.ax.base + PO_OFFSET; - cs->hw.ax.isac_ale = GCS_1; - cs->hw.ax.jade_ale = GCS_3; - - reset_bkm(cs); - cs->card_ops = &bkm_a4t_ops; - isac_setup(cs, &isac_ops); - jade_setup(cs, &jade_ops); - return 0; - - err: - hisax_release_resources(cs); - return rc; + return (0); } static struct pci_dev *dev_a4t __initdata = NULL; @@ -302,10 +261,21 @@ int __init setup_bkm_a4t(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; + u_int pci_memaddr = 0, found = 0; + I20_REGISTER_FILE *pI20_Regs; +#if CONFIG_PCI +#endif strcpy(tmp, bkm_a4t_revision); printk(KERN_INFO "HiSax: T-Berkom driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ == ISDN_CTYPE_BKM_A4T) { + cs->subtyp = BKM_A4T; + } else + return (0); + +#if CONFIG_PCI while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { u16 sub_sys; @@ -313,13 +283,62 @@ sub_vendor = dev_a4t->subsystem_vendor; sub_sys = dev_a4t->subsystem_device; - if (sub_sys == PCI_DEVICE_ID_BERKOM_A4T && - sub_vendor == PCI_VENDOR_ID_BERKOM) { - if (bkm_a4t_probe(card->cs, dev_a4t)) - return 0; - return 1; + if ((sub_sys == PCI_DEVICE_ID_BERKOM_A4T) && (sub_vendor == PCI_VENDOR_ID_BERKOM)) { + if (pci_enable_device(dev_a4t)) + return(0); + found = 1; + pci_memaddr = pci_resource_start(dev_a4t, 0); + cs->irq = dev_a4t->irq; + break; } } - printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]); - return 0; + if (!found) { + printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]); + return (0); + } + if (!cs->irq) { /* IRQ range check ?? */ + printk(KERN_WARNING "HiSax: %s: No IRQ\n", CardType[card->typ]); + return (0); + } + if (!pci_memaddr) { + printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]); + return (0); + } + cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096); + /* Check suspecious address */ + pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); + if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) { + printk(KERN_WARNING "HiSax: %s address %lx-%lx suspecious\n", + CardType[card->typ], cs->hw.ax.base, cs->hw.ax.base + 4096); + iounmap((void *) cs->hw.ax.base); + cs->hw.ax.base = 0; + return (0); + } + cs->hw.ax.isac_adr = cs->hw.ax.base + PO_OFFSET; + cs->hw.ax.jade_adr = cs->hw.ax.base + PO_OFFSET; + cs->hw.ax.isac_ale = GCS_1; + cs->hw.ax.jade_ale = GCS_3; +#else + printk(KERN_WARNING "HiSax: %s: NO_PCI_BIOS\n", CardType[card->typ]); + printk(KERN_WARNING "HiSax: %s: unable to configure\n", CardType[card->typ]); + return (0); +#endif /* CONFIG_PCI */ + printk(KERN_INFO "HiSax: %s: Card configured at 0x%lX IRQ %d\n", + CardType[card->typ], cs->hw.ax.base, cs->irq); + + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadJADE; + cs->BC_Write_Reg = &WriteJADE; + cs->BC_Send_Data = &jade_fill_fifo; + cs->cardmsg = &BKM_card_msg; + cs->irq_func = &bkm_interrupt; + cs->irq_flags |= SA_SHIRQ; + ISACVersion(cs, "Telekom A4T:"); + /* Jade version */ + JadeVersion(cs, "Telekom A4T:"); + return (1); } diff -Nru a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c --- a/drivers/isdn/hisax/bkm_a8.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/bkm_a8.c Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: bkm_a8.c,v 1.14.6.7 2001/09/23 22:24:46 kai Exp $ +/* $Id: bkm_a8.c,v 1.22.2.4 2004/01/15 14:02:34 keil Exp $ * * low level stuff for Scitel Quadro (4*S0, passive) * @@ -10,6 +10,7 @@ * */ + #include #include #include "hisax.h" @@ -20,11 +21,13 @@ #include #include "bkm_ax.h" +#if CONFIG_PCI + #define ATTEMPT_PCI_REMAPPING /* Required for PLX rev 1 */ extern const char *CardType[]; -static spinlock_t bkm_a8_lock = SPIN_LOCK_UNLOCKED; -const char sct_quadro_revision[] = "$Revision: 1.14.6.7 $"; + +const char sct_quadro_revision[] = "$Revision: 1.22.2.4 $"; static const char *sct_quadro_subtypes[] = { @@ -39,70 +42,174 @@ #define wordout(addr,val) outw(val,addr) #define wordin(addr) inw(addr) -static inline u8 -ipac_read(struct IsdnCardState *cs, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; - - spin_lock_irqsave(&bkm_a8_lock, flags); - wordout(cs->hw.ax.base, off); - ret = wordin(cs->hw.ax.data_adr) & 0xFF; - spin_unlock_irqrestore(&bkm_a8_lock, flags); - return ret; + register u_char ret; + wordout(ale, off); + ret = wordin(adr) & 0xFF; + return (ret); } static inline void -ipac_write(struct IsdnCardState *cs, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; + int i; + wordout(ale, off); + for (i = 0; i < size; i++) + data[i] = wordin(adr) & 0xFF; +} - spin_lock_irqsave(&bkm_a8_lock, flags); - wordout(cs->hw.ax.base, off); - wordout(cs->hw.ax.data_adr, data); - spin_unlock_irqrestore(&bkm_a8_lock, flags); + +static inline void +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) +{ + wordout(ale, off); + wordout(adr, data); } static inline void -ipac_readfifo(struct IsdnCardState *cs, u8 off, u8 *data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { int i; - - wordout(cs->hw.ax.base, off); + wordout(ale, off); for (i = 0; i < size; i++) - data[i] = wordin(cs->hw.ax.data_adr) & 0xFF; + wordout(adr, data[i]); } -static inline void -ipac_writefifo(struct IsdnCardState *cs, u8 off, u8 *data, int size) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - int i; + return (readreg(cs->hw.ax.base, cs->hw.ax.data_adr, offset | 0x80)); +} - wordout(cs->hw.ax.base, off); - for (i = 0; i < size; i++) - wordout(cs->hw.ax.data_adr, data[i]); +static void +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) +{ + writereg(cs->hw.ax.base, cs->hw.ax.data_adr, offset | 0x80, value); +} + +static void +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) +{ + readfifo(cs->hw.ax.base, cs->hw.ax.data_adr, 0x80, data, size); +} + +static void +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) +{ + writefifo(cs->hw.ax.base, cs->hw.ax.data_adr, 0x80, data, size); } -/* This will generate ipac_dc_ops and ipac_bc_ops using the functions - * above */ -BUILD_IPAC_OPS(ipac); - +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) +{ + return (readreg(cs->hw.ax.base, cs->hw.ax.data_adr, offset + (hscx ? 0x40 : 0))); +} + +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) +{ + writereg(cs->hw.ax.base, cs->hw.ax.data_adr, offset + (hscx ? 0x40 : 0), value); +} + /* Set the specific ipac to active */ static void set_ipac_active(struct IsdnCardState *cs, u_int active) { /* set irq mask */ - ipac_write(cs, IPAC_MASK, active ? 0xc0 : 0xff); + writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK, + active ? 0xc0 : 0xff); +} + +/* + * fast interrupt HSCX stuff goes here + */ + +#define READHSCX(cs, nr, reg) readreg(cs->hw.ax.base, \ + cs->hw.ax.data_adr, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.ax.base, \ + cs->hw.ax.data_adr, reg + (nr ? 0x40 : 0), data) +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ax.base, \ + cs->hw.ax.data_adr, (nr ? 0x40 : 0), ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.ax.base, \ + cs->hw.ax.data_adr, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +bkm_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char ista, val, icnt = 5; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + ista = readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ISTA); + if (!(ista & 0x3f)) { /* not this IPAC */ + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; + } + Start_IPAC: + if (cs->debug & L1_DEB_IPAC) + debugl1(cs, "IPAC ISTA %02X", ista); + if (ista & 0x0f) { + val = readreg(cs->hw.ax.base, cs->hw.ax.data_adr, HSCX_ISTA + 0x40); + if (ista & 0x01) + val |= 0x01; + if (ista & 0x04) + val |= 0x02; + if (ista & 0x08) + val |= 0x04; + if (val) { + hscx_int_main(cs, val); + } + } + if (ista & 0x20) { + val = 0xfe & readreg(cs->hw.ax.base, cs->hw.ax.data_adr, ISAC_ISTA | 0x80); + if (val) { + isac_interrupt(cs, val); + } + } + if (ista & 0x10) { + val = 0x01; + isac_interrupt(cs, val); + } + ista = readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ISTA); + if ((ista & 0x3f) && icnt) { + icnt--; + goto Start_IPAC; + } + if (!icnt) + printk(KERN_WARNING "HiSax: %s (%s) IRQ LOOP\n", + CardType[cs->typ], + sct_quadro_subtypes[cs->subtyp]); + writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK, 0xFF); + writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK, 0xC0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +void +release_io_sct_quadro(struct IsdnCardState *cs) +{ + release_region(cs->hw.ax.base & 0xffffffc0, 128); + if (cs->subtyp == SCT_1) + release_region(cs->hw.ax.plx_adr, 64); } static void enable_bkm_int(struct IsdnCardState *cs, unsigned bEnable) { - if (bEnable) - wordout(cs->hw.ax.plx_adr + 0x4C, (wordin(cs->hw.ax.plx_adr + 0x4C) | 0x41)); - else - wordout(cs->hw.ax.plx_adr + 0x4C, (wordin(cs->hw.ax.plx_adr + 0x4C) & ~0x41)); + if (cs->typ == ISDN_CTYPE_SCT_QUADRO) { + if (bEnable) + wordout(cs->hw.ax.plx_adr + 0x4C, (wordin(cs->hw.ax.plx_adr + 0x4C) | 0x41)); + else + wordout(cs->hw.ax.plx_adr + 0x4C, (wordin(cs->hw.ax.plx_adr + 0x4C) & ~0x41)); + } } static void @@ -110,66 +217,88 @@ { if (cs->subtyp == SCT_1) { wordout(cs->hw.ax.plx_adr + 0x50, (wordin(cs->hw.ax.plx_adr + 0x50) & ~4)); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10 * HZ) / 1000); + mdelay(10); /* Remove the soft reset */ wordout(cs->hw.ax.plx_adr + 0x50, (wordin(cs->hw.ax.plx_adr + 0x50) | 4)); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10 * HZ) / 1000); + mdelay(10); } } -static void -bkm_a8_init(struct IsdnCardState *cs) -{ - cs->debug |= L1_DEB_IPAC; - set_ipac_active(cs, 1); - ipac_init(cs); - /* Enable ints */ - enable_bkm_int(cs, 1); -} - static int -bkm_a8_reset(struct IsdnCardState *cs) +BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - /* Disable ints */ - set_ipac_active(cs, 0); - enable_bkm_int(cs, 0); - reset_bkm(cs); - return 0; + u_long flags; + + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + /* Disable ints */ + set_ipac_active(cs, 0); + enable_bkm_int(cs, 0); + reset_bkm(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_RELEASE: + /* Sanity */ + spin_lock_irqsave(&cs->lock, flags); + set_ipac_active(cs, 0); + enable_bkm_int(cs, 0); + spin_unlock_irqrestore(&cs->lock, flags); + release_io_sct_quadro(cs); + return (0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + cs->debug |= L1_DEB_IPAC; + set_ipac_active(cs, 1); + inithscxisac(cs, 3); + /* Enable ints */ + enable_bkm_int(cs, 1); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_TEST: + return (0); + } + return (0); } -static void -bkm_a8_release(struct IsdnCardState *cs) +int __init +sct_alloc_io(u_int adr, u_int len) { - set_ipac_active(cs, 0); - enable_bkm_int(cs, 0); - hisax_release_resources(cs); + if (!request_region(adr, len, "scitel")) { + printk(KERN_WARNING + "HiSax: Scitel port %#x-%#x already in use\n", + adr, adr + len); + return (1); + } + return(0); } -static struct card_ops bkm_a8_ops = { - .init = bkm_a8_init, - .reset = bkm_a8_reset, - .release = bkm_a8_release, - .irq_func = ipac_irq, -}; - static struct pci_dev *dev_a8 __initdata = NULL; static u16 sub_vendor_id __initdata = 0; static u16 sub_sys_id __initdata = 0; -static u8 pci_irq __initdata = 0; +static u_char pci_bus __initdata = 0; +static u_char pci_device_fn __initdata = 0; +static u_char pci_irq __initdata = 0; + +#endif /* CONFIG_PCI */ int __init setup_sct_quadro(struct IsdnCard *card) { +#if CONFIG_PCI struct IsdnCardState *cs = card->cs; char tmp[64]; - u8 pci_rev_id; + u_char pci_rev_id; u_int found = 0; u_int pci_ioaddr1, pci_ioaddr2, pci_ioaddr3, pci_ioaddr4, pci_ioaddr5; strcpy(tmp, sct_quadro_revision); printk(KERN_INFO "HiSax: T-Berkom driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ == ISDN_CTYPE_SCT_QUADRO) { + cs->subtyp = SCT_1; /* Preset */ + } else + return (0); + /* Identify subtype by para[0] */ if (card->para[0] >= SCT_1 && card->para[0] <= SCT_4) cs->subtyp = card->para[0]; @@ -193,6 +322,8 @@ return(0); pci_ioaddr1 = pci_resource_start(dev_a8, 1); pci_irq = dev_a8->irq; + pci_bus = dev_a8->bus->number; + pci_device_fn = dev_a8->devfn; found = 1; break; } @@ -253,31 +384,40 @@ cs->hw.ax.plx_adr = pci_ioaddr1; /* Enter all ipac_base addresses */ switch(cs->subtyp) { - case 1: - cs->hw.ax.base = pci_ioaddr5 + 0x00; - if (!request_io(&cs->rs, pci_ioaddr1, 128, "scitel")) - goto err; - if (!request_io(&cs->rs, pci_ioaddr5, 64, "scitel")) - goto err; - break; - case 2: - cs->hw.ax.base = pci_ioaddr4 + 0x08; - if (!request_io(&cs->rs, pci_ioaddr4, 64, "scitel")) - goto err; - break; - case 3: - cs->hw.ax.base = pci_ioaddr3 + 0x10; - if (!request_io(&cs->rs, pci_ioaddr3, 64, "scitel")) - goto err; - break; - case 4: - cs->hw.ax.base = pci_ioaddr2 + 0x20; - if (!request_io(&cs->rs, pci_ioaddr2, 64, "scitel")) - goto err; - break; + case 1: + cs->hw.ax.base = pci_ioaddr5 + 0x00; + if (sct_alloc_io(pci_ioaddr1, 128)) + return(0); + if (sct_alloc_io(pci_ioaddr5, 64)) + return(0); + /* disable all IPAC */ + writereg(pci_ioaddr5, pci_ioaddr5 + 4, + IPAC_MASK, 0xFF); + writereg(pci_ioaddr4 + 0x08, pci_ioaddr4 + 0x0c, + IPAC_MASK, 0xFF); + writereg(pci_ioaddr3 + 0x10, pci_ioaddr3 + 0x14, + IPAC_MASK, 0xFF); + writereg(pci_ioaddr2 + 0x20, pci_ioaddr2 + 0x24, + IPAC_MASK, 0xFF); + break; + case 2: + cs->hw.ax.base = pci_ioaddr4 + 0x08; + if (sct_alloc_io(pci_ioaddr4, 64)) + return(0); + break; + case 3: + cs->hw.ax.base = pci_ioaddr3 + 0x10; + if (sct_alloc_io(pci_ioaddr3, 64)) + return(0); + break; + case 4: + cs->hw.ax.base = pci_ioaddr2 + 0x20; + if (sct_alloc_io(pci_ioaddr2, 64)) + return(0); + break; } + /* For isac and hscx data path */ cs->hw.ax.data_adr = cs->hw.ax.base + 4; - ipac_write(cs, IPAC_MASK, 0xFF); printk(KERN_INFO "HiSax: %s (%s) configured at 0x%.4lX, 0x%.4lX, 0x%.4lX and IRQ %d\n", CardType[card->typ], @@ -287,12 +427,25 @@ cs->hw.ax.data_adr, cs->irq); - cs->card_ops = &bkm_a8_ops; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - goto err; - - return 1; - err: - hisax_release_resources(cs); - return 0; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &BKM_card_msg; + cs->irq_func = &bkm_interrupt_ipac; + + printk(KERN_INFO "HiSax: %s (%s): IPAC Version %d\n", + CardType[card->typ], + sct_quadro_subtypes[cs->subtyp], + readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ID)); + return (1); +#else + printk(KERN_ERR "HiSax: bkm_a8 only supported on PCI Systems\n"); +#endif /* CONFIG_PCI */ } diff -Nru a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c --- a/drivers/isdn/hisax/callc.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/callc.c Thu Feb 19 23:44:25 2004 @@ -1,4 +1,4 @@ -/* $Id: callc.c,v 2.51.6.6 2001/09/23 22:24:46 kai Exp $ +/* $Id: callc.c,v 2.59.2.4 2004/02/11 13:21:32 keil Exp $ * * Author Karsten Keil * Copyright by Karsten Keil @@ -21,8 +21,7 @@ #include "hisax.h" #include - -const char *lli_revision = "$Revision: 2.51.6.6 $"; +const char *lli_revision = "$Revision: 2.59.2.4 $"; extern struct IsdnCard cards[]; extern int nrcards; @@ -32,7 +31,6 @@ static struct Fsm callcfsm; static int chancount; -static spinlock_t callc_lock = SPIN_LOCK_UNLOCKED; /* experimental REJECT after ALERTING for CALLBACK to beat the 4s delay */ #define ALERT_REJECT 0 @@ -205,49 +203,13 @@ } static inline void -mdl_info_setup(struct Channel *chanp) -{ - if (chanp->chan) - chanp->cs->status |= 0x0200; - else - chanp->cs->status |= 0x0100; - - if (chanp->cs->card_ops->led_handler) - chanp->cs->card_ops->led_handler(chanp->cs); -} - -static inline void -mdl_info_connect(struct Channel *chanp) -{ - if (chanp->chan) - chanp->cs->status |= 0x2000; - else - chanp->cs->status |= 0x1000; - - if (chanp->cs->card_ops->led_handler) - chanp->cs->card_ops->led_handler(chanp->cs); -} - -static inline void -mdl_info_release(struct Channel *chanp) -{ - if (chanp->chan) - chanp->cs->status &= ~0x2200; - else - chanp->cs->status &= ~0x1100; - - if (chanp->cs->card_ops->led_handler) - chanp->cs->card_ops->led_handler(chanp->cs); -} - -static void lli_close(struct FsmInst *fi) { struct Channel *chanp = fi->userdata; FsmChangeState(fi, ST_NULL); chanp->Flags = 0; - mdl_info_release(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_REL, (void *) (long)chanp->chan); } static void @@ -259,8 +221,7 @@ if (!chanp->leased) return; - - mdl_info_setup(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_SETUP, (void *) (long)chanp->chan); FsmChangeState(fi, ST_IN_WAIT_LL); if (chanp->debug & 1) link_debug(chanp, 0, "STAT_ICALL_LEASED"); @@ -277,11 +238,12 @@ if (chanp->debug & 1) link_debug(chanp, 1, "statcallb ret=%d", ret); if (!ret) { - mdl_info_release(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_REL, (void *) (long)chanp->chan); FsmChangeState(fi, ST_NULL); } } + /* * Dial out */ @@ -295,7 +257,7 @@ link_debug(chanp, 0, "STAT_DCONN"); HL_LL(chanp, ISDN_STAT_DCONN); init_b_st(chanp, 0); - L4L3(chanp->b_st, DL_ESTABLISH | REQUEST, NULL); + chanp->b_st->lli.l4l3(chanp->b_st, DL_ESTABLISH | REQUEST, NULL); } static void @@ -307,12 +269,12 @@ FsmDelTimer(&chanp->dial_timer, 73); chanp->l2_active_protocol = chanp->l2_protocol; chanp->incoming = 0; - mdl_info_setup(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_SETUP, (void *) (long)chanp->chan); if (chanp->leased) { lli_init_bchan_out(fi, event, arg); } else { FsmChangeState(fi, ST_OUT_DIAL); - L4L3(chanp->d_st, CC_SETUP | REQUEST, chanp); + chanp->d_st->lli.l4l3(chanp->d_st, CC_SETUP | REQUEST, chanp); } } @@ -325,12 +287,12 @@ FsmDelTimer(&chanp->dial_timer, 73); chanp->l2_active_protocol = chanp->l2_protocol; chanp->incoming = 0; - mdl_info_setup(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_SETUP, (void *) (long)chanp->chan); if (chanp->leased) { lli_init_bchan_out(fi, event, arg); } else { FsmChangeState(fi, ST_OUT_DIAL); - L4L3(chanp->d_st, CC_RESUME | REQUEST, chanp); + chanp->d_st->lli.l4l3(chanp->d_st, CC_RESUME | REQUEST, chanp); } } @@ -353,7 +315,7 @@ ic.command = ISDN_STAT_BCONN; ic.arg = chanp->chan; chanp->cs->iif.statcallb(&ic); - mdl_info_connect(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_CONN, (void *) (long)chanp->chan); } @@ -370,7 +332,7 @@ isdn_ctrl ic; int ret; - mdl_info_setup(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_SETUP, (void *) (long)chanp->chan); /* * Report incoming calls only once to linklevel, use CallFlags * which is set to 3 with each broadcast message in isdnl1.c @@ -397,34 +359,34 @@ case 1: /* OK, someone likes this call */ FsmDelTimer(&chanp->drel_timer, 61); FsmChangeState(fi, ST_IN_ALERT_SENT); - L4L3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); break; case 5: /* direct redirect */ case 4: /* Proceeding desired */ FsmDelTimer(&chanp->drel_timer, 61); FsmChangeState(fi, ST_IN_PROCEED_SEND); - L4L3(chanp->d_st, CC_PROCEED_SEND | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_PROCEED_SEND | REQUEST, chanp->proc); if (ret == 5) { memcpy(&chanp->setup, &ic.parm.setup, sizeof(setup_parm)); - L4L3(chanp->d_st, CC_REDIR | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_REDIR | REQUEST, chanp->proc); } break; case 2: /* Rejecting Call */ break; case 3: /* incomplete number */ FsmDelTimer(&chanp->drel_timer, 61); - L4L3(chanp->d_st, CC_MORE_INFO | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_MORE_INFO | REQUEST, chanp->proc); break; case 0: /* OK, nobody likes this call */ default: /* statcallb problems */ - L4L3(chanp->d_st, CC_IGNORE | REQUEST, chanp->proc); - mdl_info_release(chanp); + chanp->d_st->lli.l4l3(chanp->d_st, CC_IGNORE | REQUEST, chanp->proc); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_REL, (void *) (long)chanp->chan); FsmChangeState(fi, ST_NULL); break; } } else { - L4L3(chanp->d_st, CC_IGNORE | REQUEST, chanp->proc); - mdl_info_release(chanp); + chanp->d_st->lli.l4l3(chanp->d_st, CC_IGNORE | REQUEST, chanp->proc); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_REL, (void *) (long)chanp->chan); } } @@ -434,7 +396,7 @@ struct Channel *chanp = fi->userdata; FsmChangeState(fi, ST_IN_WAIT_CONN_ACK); - L4L3(chanp->d_st, CC_SETUP | RESPONSE, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_SETUP | RESPONSE, chanp->proc); } static void @@ -443,7 +405,7 @@ struct Channel *chanp = fi->userdata; FsmChangeState(fi, ST_IN_ALERT_SENT); - L4L3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); } static void @@ -451,7 +413,7 @@ { struct Channel *chanp = fi->userdata; - L4L3(chanp->d_st, CC_REDIR | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_REDIR | REQUEST, chanp->proc); } static void @@ -466,7 +428,7 @@ chanp->l2_active_protocol = chanp->l2_protocol; chanp->incoming = !0; init_b_st(chanp, !0); - L4L3(chanp->b_st, DL_ESTABLISH | REQUEST, NULL); + chanp->b_st->lli.l4l3(chanp->b_st, DL_ESTABLISH | REQUEST, NULL); } static void @@ -479,9 +441,9 @@ } else { FsmChangeState(fi, ST_IN_WAIT_CONN_ACK); #ifdef WANT_ALERT - L4L3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); #endif - L4L3(chanp->d_st, CC_SETUP | RESPONSE, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_SETUP | RESPONSE, chanp->proc); } } @@ -492,7 +454,7 @@ { struct Channel *chanp = fi->userdata; - L4L3(chanp->d_st, CC_SUSPEND | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_SUSPEND | REQUEST, chanp->proc); } /* Call clearing */ @@ -524,7 +486,8 @@ FsmChangeState(fi, ST_WAIT_DRELEASE); if (chanp->proc) chanp->proc->para.cause = 0x10; /* Normal Call Clearing */ - L4L3(chanp->d_st, CC_DISCONNECT | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_DISCONNECT | REQUEST, + chanp->proc); } } @@ -539,7 +502,8 @@ FsmChangeState(fi, ST_WAIT_DRELEASE); if (chanp->proc) chanp->proc->para.cause = 0x15; /* Call Rejected */ - L4L3(chanp->d_st, CC_DISCONNECT | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_DISCONNECT | REQUEST, + chanp->proc); } } @@ -571,12 +535,12 @@ #ifndef ALERT_REJECT if (chanp->proc) chanp->proc->para.cause = 0x15; /* Call Rejected */ - L4L3(chanp->d_st, CC_REJECT | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_REJECT | REQUEST, chanp->proc); lli_dhup_close(fi, event, arg); #else FsmRestartTimer(&chanp->drel_timer, 40, EV_HANGUP, NULL, 63); FsmChangeState(fi, ST_IN_ALERT_SENT); - L4L3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_ALERTING | REQUEST, chanp->proc); #endif } @@ -587,7 +551,7 @@ chanp->data_open = 0; FsmChangeState(fi, ST_WAIT_BRELEASE); - L4L3(chanp->b_st, DL_RELEASE | REQUEST, NULL); + chanp->b_st->lli.l4l3(chanp->b_st, DL_RELEASE | REQUEST, NULL); } static void @@ -642,7 +606,7 @@ chanp->data_open = 0; FsmChangeState(fi, ST_WAIT_BREL_DISC); - L4L3(chanp->b_st, DL_RELEASE | REQUEST, NULL); + chanp->b_st->lli.l4l3(chanp->b_st, DL_RELEASE | REQUEST, NULL); } @@ -672,7 +636,7 @@ struct Channel *chanp = fi->userdata; chanp->data_open = 0; - L4L3(chanp->b_st, DL_RELEASE | REQUEST, NULL); + chanp->b_st->lli.l4l3(chanp->b_st, DL_RELEASE | REQUEST, NULL); lli_bhup_dhup(fi, event, arg); } @@ -685,7 +649,8 @@ lli_leased_hup(fi, chanp); } else { FsmChangeState(fi, ST_WAIT_D_REL_CNF); - L4L3(chanp->d_st, CC_RELEASE | REQUEST, chanp->proc); + chanp->d_st->lli.l4l3(chanp->d_st, CC_RELEASE | REQUEST, + chanp->proc); } } @@ -767,7 +732,7 @@ chanp->cs->iif.statcallb(&ic); HL_LL(chanp, ISDN_STAT_DHUP); chanp->Flags = 0; - mdl_info_release(chanp); + chanp->cs->cardmsg(chanp->cs, MDL_INFO_REL, (void *) (long)chanp->chan); } static void @@ -796,7 +761,7 @@ struct Channel *chanp = fi->userdata; chanp->data_open = 0; - L4L3(chanp->b_st, DL_RELEASE | REQUEST, NULL); + chanp->b_st->lli.l4l3(chanp->b_st, DL_RELEASE | REQUEST, NULL); lli_bhup_fail(fi, event, arg); } @@ -890,11 +855,10 @@ static void release_b_st(struct Channel *chanp) { - struct IsdnCardState *cs = chanp->cs; struct PStack *st = chanp->b_st; if(test_and_clear_bit(FLG_START_B, &chanp->Flags)) { - cs->bc_l1_ops->close(chanp->bcs); + chanp->bcs->BC_Close(chanp->bcs); switch (chanp->l2_active_protocol) { case (ISDN_PROTO_L2_X75I): releasestack_isdnl2(st); @@ -954,7 +918,7 @@ ic.driver = cs->myid; ic.command = ISDN_STAT_REDIR; ic.arg = chan; - (ulong)(ic.parm.num[0]) = result; + ic.parm.num[0] = result; cs->iif.statcallb(&ic); } /* stat_redir_result */ @@ -971,7 +935,7 @@ if (pr == (CC_SETUP | INDICATION)) { if (!(chanp = selectfreechannel(pc->st, pc->para.bchannel))) { pc->para.cause = 0x11; /* User busy */ - L4L3(pc->st, CC_REJECT | REQUEST, pc); + pc->st->lli.l4l3(pc->st, CC_REJECT | REQUEST, pc); } else { chanp->proc = pc; pc->chan = chanp; @@ -1054,16 +1018,16 @@ if (!*stp) return -ENOMEM; (*stp)->next = NULL; + (*stp)->l1.l1l2 = dummy_pstack; (*stp)->l1.l1hw = dummy_pstack; (*stp)->l1.l1tei = dummy_pstack; - (*stp)->l1.l2l1 = dummy_pstack; - (*stp)->l2.l1l2 = dummy_pstack; (*stp)->l2.l2tei = dummy_pstack; - (*stp)->l2.l3l2 = dummy_pstack; - (*stp)->l3.l2l3 = dummy_pstack; + (*stp)->l2.l2l1 = dummy_pstack; + (*stp)->l2.l2l3 = dummy_pstack; + (*stp)->l3.l3l2 = dummy_pstack; (*stp)->l3.l3ml3 = dummy_pstack; - (*stp)->l3.l4l3 = dummy_pstack; - (*stp)->lli.l3l4 = dummy_pstack; + (*stp)->l3.l3l4 = dummy_pstack; + (*stp)->lli.l4l3 = dummy_pstack; (*stp)->ma.layer = dummy_pstack; return 0; } @@ -1101,7 +1065,7 @@ setstack_isdnl2(st, tmp); setstack_l3dc(st, chanp); st->lli.userdata = chanp; - st->lli.l3l4 = dchan_l3l4; + st->l3.l3l4 = dchan_l3l4; return 0; } @@ -1175,7 +1139,8 @@ printk(KERN_INFO "HiSax: MAX_WAITING_CALLS added\n"); if (test_bit(FLG_PTP, &csta->channel->d_st->l2.flag)) { printk(KERN_INFO "LAYER2 WATCHING ESTABLISH\n"); - L4L3(csta->channel->d_st, DL_ESTABLISH | REQUEST, NULL); + csta->channel->d_st->lli.l4l3(csta->channel->d_st, + DL_ESTABLISH | REQUEST, NULL); } return (0); } @@ -1209,7 +1174,7 @@ kfree(csta->channel[i].b_st); csta->channel[i].b_st = NULL; } else - printk(KERN_WARNING "CallcFreeChan b_st ch%d already freed\n", i); + printk(KERN_WARNING "CallcFreeChan b_st ch%d allready freed\n", i); if (i || test_bit(FLG_TWO_DCHAN, &csta->HW_Flags)) { release_d_st(csta->channel + i); } else @@ -1218,30 +1183,13 @@ } static void -ll_writewakeup(struct Channel *chanp, struct sk_buff *skb) -{ - isdn_ctrl ic; - - if (skb->pkt_type != PACKET_NOACK) { - if (chanp->debug & 0x800) - link_debug(chanp, 0, "llwakeup: %d", skb->truesize); - ic.driver = chanp->cs->myid; - ic.command = ISDN_STAT_BSENT; - ic.arg = chanp->chan; - ic.parm.length = skb->truesize; - chanp->cs->iif.statcallb(&ic); - } - dev_kfree_skb(skb); -} - -static void lldata_handler(struct PStack *st, int pr, void *arg) { struct Channel *chanp = (struct Channel *) st->lli.userdata; struct sk_buff *skb = arg; switch (pr) { - case (DL_DATA | INDICATION): + case (DL_DATA | INDICATION): if (chanp->data_open) { if (chanp->debug & 0x800) link_debug(chanp, 0, "lldata: %d", skb->len); @@ -1251,9 +1199,6 @@ dev_kfree_skb(skb); } break; - case (DL_DATA | CONFIRM): - ll_writewakeup(chanp, skb); - break; case (DL_ESTABLISH | INDICATION): case (DL_ESTABLISH | CONFIRM): FsmEvent(&chanp->fi, EV_BC_EST, NULL); @@ -1286,9 +1231,6 @@ dev_kfree_skb(skb); } break; - case (PH_DATA | CONFIRM): - ll_writewakeup(chanp, skb); - break; case (PH_ACTIVATE | INDICATION): case (PH_ACTIVATE | CONFIRM): FsmEvent(&chanp->fi, EV_BC_EST, NULL); @@ -1304,6 +1246,21 @@ } } +void +lli_writewakeup(struct PStack *st, int len) +{ + struct Channel *chanp = st->lli.userdata; + isdn_ctrl ic; + + if (chanp->debug & 0x800) + link_debug(chanp, 0, "llwakeup: %d", len); + ic.driver = chanp->cs->myid; + ic.command = ISDN_STAT_BSENT; + ic.arg = chanp->chan; + ic.parm.length = len; + chanp->cs->iif.statcallb(&ic); +} + static int init_b_st(struct Channel *chanp, int incoming) { @@ -1335,7 +1292,7 @@ break; } chanp->bcs->conmsg = NULL; - if (cs->bc_l1_ops->open(st, chanp->bcs)) + if (chanp->bcs->BC_SetStack(st, chanp->bcs)) return (-1); st->l2.flag = 0; test_and_set_bit(FLG_LAPB, &st->l2.flag); @@ -1352,8 +1309,10 @@ sprintf(tmp, "Ch%d X.75", chanp->chan); setstack_isdnl2(st, tmp); setstack_l3bc(st, chanp); - st->l3.l2l3 = lldata_handler; + st->l2.l2l3 = lldata_handler; st->lli.userdata = chanp; + test_and_clear_bit(FLG_LLI_L1WAKEUP, &st->lli.flag); + test_and_set_bit(FLG_LLI_L2WAKEUP, &st->lli.flag); st->l2.l2m.debug = chanp->debug & 16; st->l2.debug = chanp->debug & 64; break; @@ -1362,8 +1321,10 @@ case (ISDN_PROTO_L2_TRANS): case (ISDN_PROTO_L2_MODEM): case (ISDN_PROTO_L2_FAX): - st->l2.l1l2 = lltrans_handler; + st->l1.l1l2 = lltrans_handler; st->lli.userdata = chanp; + test_and_set_bit(FLG_LLI_L1WAKEUP, &st->lli.flag); + test_and_clear_bit(FLG_LLI_L2WAKEUP, &st->lli.flag); setstack_transl2(st); setstack_l3bc(st, chanp); break; @@ -1384,7 +1345,7 @@ dev_kfree_skb(skb); break; case (DL_ESTABLISH | REQUEST): - L2L1(st, PH_ACTIVATE | REQUEST, NULL); + st->l2.l2l1(st, PH_ACTIVATE | REQUEST, NULL); break; case (DL_RELEASE | REQUEST): break; @@ -1462,7 +1423,7 @@ { char *t = tmpbuf; - t += QuickHex(t, (u8 *)cm, (cm->Length>50)? 50: cm->Length); + t += QuickHex(t, (u_char *)cm, (cm->Length>50)? 50: cm->Length); t--; *t= 0; HiSax_putstatus(chanp->cs, "Ch", "%d CAPIMSG %s", chanp->chan, tmpbuf); @@ -1478,11 +1439,11 @@ return; switch(cm->para[3]) { case 4: /* Suspend */ - strlcpy(chanp->setup.phone, &cm->para[5], cm->para[5] +1); + strncpy(chanp->setup.phone, &cm->para[5], cm->para[5] +1); FsmEvent(&chanp->fi, EV_SUSPEND, cm); break; case 5: /* Resume */ - strlcpy(chanp->setup.phone, &cm->para[5], cm->para[5] +1); + strncpy(chanp->setup.phone, &cm->para[5], cm->para[5] +1); if (chanp->fi.state == ST_NULL) { FsmEvent(&chanp->fi, EV_RESUME, cm); } else { @@ -1495,8 +1456,12 @@ void lli_got_manufacturer(struct Channel *chanp, struct IsdnCardState *cs, capi_msg *cm) { - if (cs->card_ops->aux_ind) - cs->card_ops->aux_ind(cs, cm->para); + if ((cs->typ == ISDN_CTYPE_ELSA) || (cs->typ == ISDN_CTYPE_ELSA_PNP) || + (cs->typ == ISDN_CTYPE_ELSA_PCI)) { + if (cs->hw.elsa.MFlag) { + cs->cardmsg(cs, CARD_AUX_IND, cm->para); + } + } } @@ -1654,15 +1619,16 @@ HiSax_putstatus(csta, "Card", "%d channel %d set leased mode\n", csta->cardnr + 1, num + 1); - chanp->d_st->l2.l1l2 = leased_l1l2; - chanp->d_st->l3.l4l3 = leased_l4l3; - L4L3(chanp->d_st, DL_ESTABLISH | REQUEST, NULL); + chanp->d_st->l1.l1l2 = leased_l1l2; + chanp->d_st->lli.l4l3 = leased_l4l3; + chanp->d_st->lli.l4l3(chanp->d_st, + DL_ESTABLISH | REQUEST, NULL); } break; case (6): /* set B-channel test loop */ num = *(unsigned int *) ic->parm.num; if (csta->stlist) - csta->stlist->l1.l2l1(csta->stlist, + csta->stlist->l2.l2l1(csta->stlist, PH_TESTLOOP | REQUEST, (void *) (long)num); break; case (7): /* set card in PTP mode */ @@ -1676,7 +1642,8 @@ HiSax_putstatus(csta, "set card ", "in PTP mode"); printk(KERN_DEBUG "HiSax: set card in PTP mode\n"); printk(KERN_INFO "LAYER2 WATCHING ESTABLISH\n"); - L4L3(csta->channel[0].d_st, DL_ESTABLISH | REQUEST, NULL); + csta->channel[0].d_st->lli.l4l3(csta->channel[0].d_st, + DL_ESTABLISH | REQUEST, NULL); } else { test_and_clear_bit(FLG_PTP, &csta->channel[0].d_st->l2.flag); test_and_clear_bit(FLG_FIXED_TEI, &csta->channel[0].d_st->l2.flag); @@ -1700,7 +1667,8 @@ printk(KERN_DEBUG "HiSax: set card in FIXED TEI (%d) mode\n", num); } - L4L3(chanp->d_st, DL_ESTABLISH | REQUEST, NULL); + chanp->d_st->lli.l4l3(chanp->d_st, + DL_ESTABLISH | REQUEST, NULL); break; case (11): num = csta->debug & DEB_DLOG_HEX; @@ -1758,8 +1726,8 @@ /* protocol specific io commands */ case (ISDN_CMD_PROT_IO): for (st = csta->stlist; st; st = st->next) - if ((u_int)st->protocol == (ic->arg & 0xFF)) - return(st->l3.l4l3_proto(st, ic)); + if (st->protocol == (ic->arg & 0xFF)) + return(st->lli.l4l3_proto(st, ic)); return(-EINVAL); break; default: @@ -1777,7 +1745,6 @@ struct Channel *chanp; struct PStack *st; int len = skb->len; - unsigned long flags; struct sk_buff *nskb; if (!csta) { @@ -1807,22 +1774,20 @@ return 0; } else if (chanp->debug & 0x800) link_debug(chanp, 1, "writebuf %d/%d/%d", len, chanp->bcs->tx_cnt,MAX_DATA_MEM); - spin_lock_irqsave(&callc_lock, flags); nskb = skb_clone(skb, GFP_ATOMIC); if (nskb) { nskb->truesize = nskb->len; if (!ack) nskb->pkt_type = PACKET_NOACK; if (chanp->l2_active_protocol == ISDN_PROTO_L2_X75I) - L3L2(st, DL_DATA | REQUEST, nskb); + st->l3.l3l2(st, DL_DATA | REQUEST, nskb); else { chanp->bcs->tx_cnt += len; - st->l1.l2l1(st, PH_DATA | REQUEST, nskb); + st->l2.l2l1(st, PH_DATA | REQUEST, nskb); } dev_kfree_skb(skb); } else len = 0; - spin_unlock_irqrestore(&callc_lock, flags); } return (len); } diff -Nru a/drivers/isdn/hisax/cert.c b/drivers/isdn/hisax/cert.c --- a/drivers/isdn/hisax/cert.c Thu Feb 19 23:44:27 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,50 +0,0 @@ -/* $Id: cert.c,v 2.3.6.3 2001/09/23 22:24:47 kai Exp $ - * - * Author Karsten Keil - * Copyright by Karsten Keil - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - * - * For changes and modifications please read - * ../../../Documentation/isdn/HiSax.cert - * - */ - -#include - -int -certification_check(int output) { - -#ifdef CERTIFICATION -#if CERTIFICATION == 0 - if (output) { - printk(KERN_INFO "HiSax: Approval certification valid\n"); - printk(KERN_INFO "HiSax: Approved with ELSA Microlink PCI cards\n"); - printk(KERN_INFO "HiSax: Approved with Eicon Technology Diva 2.01 PCI cards\n"); - printk(KERN_INFO "HiSax: Approved with Sedlbauer Speedfax + cards\n"); - printk(KERN_INFO "HiSax: Approved with HFC-S PCI A based cards\n"); - } - return(0); -#endif -#if CERTIFICATION == 1 - if (output) { - printk(KERN_INFO "HiSax: Approval certification failed because of\n"); - printk(KERN_INFO "HiSax: unauthorized source code changes\n"); - } - return(1); -#endif -#if CERTIFICATION == 127 - if (output) { - printk(KERN_INFO "HiSax: Approval certification not possible\n"); - printk(KERN_INFO "HiSax: because \"md5sum\" is not available\n"); - } - return(2); -#endif -#else - if (output) { - printk(KERN_INFO "HiSax: Certification not verified\n"); - } - return(3); -#endif -} diff -Nru a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c --- a/drivers/isdn/hisax/config.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/config.c Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: config.c,v 1.1.4.2.2.1 2001/12/09 20:18:40 kai Exp $ +/* $Id: config.c,v 2.84.2.5 2004/02/11 13:21:33 keil Exp $ * * Author Karsten Keil * Copyright by Karsten Keil @@ -24,7 +24,6 @@ #include #include #include -#include "isdnl1.h" #define HISAX_STATUS_BUFSIZE 4096 #define INCLUDE_INLINE_FUNCS @@ -99,14 +98,9 @@ "Hotplug", "Formula-n enter:now PCI a/b", }; -void HiSax_closecard(int cardnr); -static spinlock_t hisax_config_lock = SPIN_LOCK_UNLOCKED; - #ifdef CONFIG_HISAX_ELSA #define DEFAULT_CARD ISDN_CTYPE_ELSA #define DEFAULT_CFG {0,0,0,0} -int elsa_init_pcmcia(void *, int, int *, int); -EXPORT_SYMBOL(elsa_init_pcmcia); #endif #ifdef CONFIG_HISAX_AVM_A1 @@ -121,8 +115,6 @@ #undef DEFAULT_CFG #define DEFAULT_CARD ISDN_CTYPE_A1_PCMCIA #define DEFAULT_CFG {11,0x170,0,0} -int avm_a1_init_pcmcia(void *, int, int *, int); -EXPORT_SYMBOL(avm_a1_init_pcmcia); #endif #ifdef CONFIG_HISAX_FRITZPCI @@ -193,8 +185,6 @@ #undef DEFAULT_CFG #define DEFAULT_CARD ISDN_CTYPE_SEDLBAUER #define DEFAULT_CFG {11,0x270,0,0} -int sedl_init_pcmcia(void *, int, int *, int); -EXPORT_SYMBOL(sedl_init_pcmcia); #endif #ifdef CONFIG_HISAX_SPORTSTER @@ -237,8 +227,6 @@ #undef DEFAULT_CFG #define DEFAULT_CARD ISDN_CTYPE_HFC_SX #define DEFAULT_CFG {5,0x2E0,0,0} -int hfc_init_pcmcia(void *, int, int *, int); -EXPORT_SYMBOL(hfc_init_pcmcia); #endif @@ -330,10 +318,6 @@ #define DEFAULT_CFG {0,0,0,0} #endif -int hisax_init_pcmcia(void *, int *, struct IsdnCard *); -EXPORT_SYMBOL(hisax_init_pcmcia); -EXPORT_SYMBOL(HiSax_closecard); - #define FIRST_CARD { \ DEFAULT_CARD, \ DEFAULT_PROTO, \ @@ -346,14 +330,14 @@ }; #define HISAX_IDSIZE (HISAX_MAX_CARDS*8) -static char HiSaxID[HISAX_IDSIZE] __devinitdata = { 0, }; +static char HiSaxID[HISAX_IDSIZE] = { 0, }; -char *HiSax_id __devinitdata = HiSaxID; +char *HiSax_id = HiSaxID; #ifdef MODULE /* Variables for insmod */ -static int type[HISAX_MAX_CARDS] __devinitdata = { 0, }; -static int protocol[HISAX_MAX_CARDS] __devinitdata = { 0, }; -static int io[HISAX_MAX_CARDS] __devinitdata = { 0, }; +static int type[HISAX_MAX_CARDS] = { 0, }; +static int protocol[HISAX_MAX_CARDS] = { 0, }; +static int io[HISAX_MAX_CARDS] = { 0, }; #undef IO0_IO1 #ifdef CONFIG_HISAX_16_3 #define IO0_IO1 @@ -368,7 +352,7 @@ #endif static int irq[HISAX_MAX_CARDS] __devinitdata = { 0, }; static int mem[HISAX_MAX_CARDS] __devinitdata = { 0, }; -static char *id __devinitdata = HiSaxID; +static char *id = HiSaxID; #define PARM_PARA "1-" __MODULE_STRING(HISAX_MAX_CARDS) "i" @@ -430,7 +414,6 @@ strcpy(tmp, lli_revision); printk(KERN_INFO "HiSax: LinkLayer Revision %s\n", HiSax_getrev(tmp)); - certification_check(1); } #ifndef MODULE @@ -490,36 +473,125 @@ __setup("hisax=", HiSax_setup); #endif /* MODULES */ +#if CARD_TELES0 extern int setup_teles0(struct IsdnCard *card); +#endif + +#if CARD_TELES3 extern int setup_teles3(struct IsdnCard *card); +#endif + +#if CARD_S0BOX extern int setup_s0box(struct IsdnCard *card); +#endif + +#if CARD_TELESPCI extern int setup_telespci(struct IsdnCard *card); +#endif + +#if CARD_AVM_A1 extern int setup_avm_a1(struct IsdnCard *card); +#endif + +#if CARD_AVM_A1_PCMCIA extern int setup_avm_a1_pcmcia(struct IsdnCard *card); +#endif + +#if CARD_FRITZPCI extern int setup_avm_pcipnp(struct IsdnCard *card); +#endif + +#if CARD_ELSA extern int setup_elsa(struct IsdnCard *card); +#endif + +#if CARD_IX1MICROR2 extern int setup_ix1micro(struct IsdnCard *card); +#endif + +#if CARD_DIEHLDIVA extern int setup_diva(struct IsdnCard *card); +#endif + +#if CARD_ASUSCOM extern int setup_asuscom(struct IsdnCard *card); +#endif + +#if CARD_TELEINT extern int setup_TeleInt(struct IsdnCard *card); +#endif + +#if CARD_SEDLBAUER extern int setup_sedlbauer(struct IsdnCard *card); +#endif + +#if CARD_SPORTSTER extern int setup_sportster(struct IsdnCard *card); +#endif + +#if CARD_MIC extern int setup_mic(struct IsdnCard *card); +#endif + +#if CARD_NETJET_S extern int setup_netjet_s(struct IsdnCard *card); +#endif + +#if CARD_HFCS extern int setup_hfcs(struct IsdnCard *card); +#endif + +#if CARD_HFC_PCI extern int setup_hfcpci(struct IsdnCard *card); +#endif + +#if CARD_HFC_SX extern int setup_hfcsx(struct IsdnCard *card); +#endif + +#if CARD_AMD7930 extern int setup_amd7930(struct IsdnCard *card); +#endif + +#if CARD_NICCY extern int setup_niccy(struct IsdnCard *card); +#endif + +#if CARD_ISURF extern int setup_isurf(struct IsdnCard *card); +#endif + +#if CARD_HSTSAPHIR extern int setup_saphir(struct IsdnCard *card); +#endif + +#if CARD_TESTEMU extern int setup_testemu(struct IsdnCard *card); +#endif + +#if CARD_BKM_A4T extern int setup_bkm_a4t(struct IsdnCard *card); +#endif + +#if CARD_SCT_QUADRO extern int setup_sct_quadro(struct IsdnCard *card); +#endif + +#if CARD_GAZEL extern int setup_gazel(struct IsdnCard *card); +#endif + +#if CARD_W6692 extern int setup_w6692(struct IsdnCard *card); +#endif + +#if CARD_NETJET_U extern int setup_netjet_u(struct IsdnCard *card); +#endif + +#if CARD_FN_ENTERNOW_PCI extern int setup_enternow_pci(struct IsdnCard *card); +#endif /* * Find card with given driverId @@ -546,10 +618,10 @@ return NULL; } -int HiSax_readstatus(u8 * buf, int len, int user, int id, int channel) +int HiSax_readstatus(u_char * buf, int len, int user, int id, int channel) { int count, cnt; - u8 *p = buf; + u_char *p = buf; struct IsdnCardState *cs = hisax_findcard(id); if (cs) { @@ -561,10 +633,9 @@ count = cs->status_end - cs->status_read + 1; if (count >= len) count = len; - if (user) { - if (copy_to_user(p, cs->status_read, count)) - return -EFAULT; - } else + if (user) + copy_to_user(p, cs->status_read, count); + else memcpy(p, cs->status_read, count); cs->status_read += count; if (cs->status_read > cs->status_end) @@ -576,10 +647,9 @@ cnt = HISAX_STATUS_BUFSIZE; else cnt = count; - if (user) { - if (copy_to_user(p, cs->status_read, cnt)) - return -EFAULT; - } else + if (user) + copy_to_user(p, cs->status_read, cnt); + else memcpy(p, cs->status_read, cnt); p += cnt; cs->status_read += cnt % HISAX_STATUS_BUFSIZE; @@ -614,20 +684,24 @@ return 8; } -static char tmpbuf[HISAX_STATUS_BUFSIZE]; +static u_char tmpbuf[HISAX_STATUS_BUFSIZE]; -void VHiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, +void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args) { /* if head == NULL the fmt contains the full info */ - unsigned long flags; - int count, i; - char *p; - isdn_ctrl ic; - int len; + u_long flags; + int count, i; + u_char *p; + isdn_ctrl ic; + int len; - spin_lock_irqsave(&hisax_config_lock, flags); + if (!cs) { + printk(KERN_WARNING "HiSax: No CardStatus for message"); + return; + } + spin_lock_irqsave(&cs->statlock, flags); p = tmpbuf; if (head) { p += jiftime(p, jiffies); @@ -638,19 +712,13 @@ len = p - tmpbuf; p = tmpbuf; } else { - p = (char *) fmt; + p = fmt; len = strlen(fmt); } - if (!cs) { - printk(KERN_WARNING "HiSax: No CardStatus for message %s", - p); - spin_unlock_irqrestore(&hisax_config_lock, flags); - return; - } if (len > HISAX_STATUS_BUFSIZE) { + spin_unlock_irqrestore(&cs->statlock, flags); printk(KERN_WARNING "HiSax: status overflow %d/%d\n", len, HISAX_STATUS_BUFSIZE); - spin_unlock_irqrestore(&hisax_config_lock, flags); return; } count = len; @@ -679,7 +747,7 @@ count++; } #endif - spin_unlock_irqrestore(&hisax_config_lock, flags); + spin_unlock_irqrestore(&cs->statlock, flags); if (count) { ic.command = ISDN_STAT_STAVAIL; ic.driver = cs->myid; @@ -725,15 +793,22 @@ ic.command = ISDN_STAT_UNLOAD; ic.driver = cs->myid; cs->iif.statcallb(&ic); + if (cs->status_buf) + kfree(cs->status_buf); + cs->status_read = NULL; + cs->status_write = NULL; + cs->status_end = NULL; + kfree(cs->dlog); + cs->dlog = NULL; } static void closecard(int cardnr) { struct IsdnCardState *csta = cards[cardnr].cs; - if (csta->bc_l1_ops->close) { - csta->bc_l1_ops->close(csta->bcs + 1); - csta->bc_l1_ops->close(csta->bcs); + if (csta->bcs->BC_Close != NULL) { + csta->bcs->BC_Close(csta->bcs + 1); + csta->bcs->BC_Close(csta->bcs); } skb_queue_purge(&csta->rq); @@ -746,32 +821,34 @@ dev_kfree_skb(csta->tx_skb); csta->tx_skb = NULL; } - if (csta->dc_l1_ops->close) - csta->dc_l1_ops->close(csta); - - if (csta->card_ops->release) - csta->card_ops->release(csta); + if (csta->DC_Close != NULL) { + csta->DC_Close(csta); + } + if (csta->cardmsg) + csta->cardmsg(csta, CARD_RELEASE, NULL); if (csta->dbusytimer.function != NULL) // FIXME? del_timer(&csta->dbusytimer); ll_unload(csta); } -static int __devinit init_card(struct IsdnCardState *cs) +static int init_card(struct IsdnCardState *cs) { - int irq_cnt, cnt = 3; - - cs->card_ops->init(cs); + int irq_cnt, cnt = 3, ret; + if (!cs->irq) { + ret = cs->cardmsg(cs, CARD_INIT, NULL); + return(ret); + } irq_cnt = kstat_irqs(cs->irq); printk(KERN_INFO "%s: IRQ %d count %d\n", CardType[cs->typ], cs->irq, irq_cnt); - if (request_irq(cs->irq, cs->card_ops->irq_func, cs->irq_flags, "HiSax", cs)) { + if (request_irq(cs->irq, cs->irq_func, cs->irq_flags, "HiSax", cs)) { printk(KERN_WARNING "HiSax: couldn't get interrupt %d\n", cs->irq); return 1; } while (cnt) { - cs->card_ops->init(cs); + cs->cardmsg(cs, CARD_INIT, NULL); set_current_state(TASK_UNINTERRUPTIBLE); /* Timeout 10ms */ schedule_timeout((10 * HZ) / 1000); @@ -785,86 +862,74 @@ free_irq(cs->irq, cs); return 2; } else { - if (cs->card_ops->reset) - cs->card_ops->reset(cs); + cs->cardmsg(cs, CARD_RESET, NULL); cnt--; } } else { - if (cs->card_ops->test) - cs->card_ops->test(cs); + cs->cardmsg(cs, CARD_TEST, NULL); return 0; } } return 3; } -static struct IsdnCardState * -alloc_IsdnCardState(void) +static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner) { + int ret = 0; + struct IsdnCard *card = cards + cardnr; struct IsdnCardState *cs; - cs = kmalloc(sizeof(*cs), GFP_ATOMIC); // FIXME - if (!cs) - goto err; - - memset(cs, 0, sizeof(*cs)); - - cs->dlog = kmalloc(MAX_DLOG_SPACE, GFP_ATOMIC); - if (!cs->dlog) - goto err_cs; - - cs->status_buf = kmalloc(HISAX_STATUS_BUFSIZE, GFP_ATOMIC); - if (!cs->status_buf) - goto err_dlog; - - cs->rcvbuf = kmalloc(MAX_DFRAME_LEN_L1, GFP_ATOMIC); - if (!cs->rcvbuf) - goto err_status_buf; - + cs = kmalloc(sizeof(struct IsdnCardState), GFP_ATOMIC); + if (!cs) { + printk(KERN_WARNING + "HiSax: No memory for IsdnCardState(card %d)\n", + cardnr + 1); + goto out; + } + memset(cs, 0, sizeof(struct IsdnCardState)); + card->cs = cs; + spin_lock_init(&cs->statlock); + spin_lock_init(&cs->lock); cs->chanlimit = 2; /* maximum B-channel number */ + cs->logecho = 0; /* No echo logging */ + cs->cardnr = cardnr; cs->debug = L1_DEB_WARN; + cs->HW_Flags = 0; + cs->busy_flag = busy_flag; cs->irq_flags = I4L_IRQ_FLAG; +#if TEI_PER_CARD + if (card->protocol == ISDN_PTYPE_NI1) + test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); +#else + test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); +#endif + cs->protocol = card->protocol; + + if (card->typ <= 0 || card->typ > ISDN_CTYPE_COUNT) { + printk(KERN_WARNING + "HiSax: Card Type %d out of range\n", card->typ); + goto outf_cs; + } + if (!(cs->dlog = kmalloc(MAX_DLOG_SPACE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for dlog(card %d)\n", cardnr + 1); + goto outf_cs; + } + if (!(cs->status_buf = kmalloc(HISAX_STATUS_BUFSIZE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for status_buf(card %d)\n", + cardnr + 1); + goto outf_dlog; + } cs->stlist = NULL; cs->status_read = cs->status_buf; cs->status_write = cs->status_buf; cs->status_end = cs->status_buf + HISAX_STATUS_BUFSIZE - 1; - cs->rcvidx = 0; - cs->tx_skb = NULL; - cs->tx_cnt = 0; - cs->event = 0; - - skb_queue_head_init(&cs->rq); - skb_queue_head_init(&cs->sq); - - spin_lock_init(&cs->lock); - resources_init(&cs->rs); - return cs; - - err_status_buf: - kfree(cs->status_buf); - err_dlog: - kfree(cs->dlog); - err_cs: - kfree(cs); - err: - return NULL; -} - -static void -free_IsdnCardState(struct IsdnCardState *cs) -{ - kfree(cs->rcvbuf); - kfree(cs->status_buf); - kfree(cs->dlog); - kfree(cs); -} - -static void -do_register_isdn(struct IsdnCardState *cs) -{ - if (!cs->iif.owner) - cs->iif.owner = THIS_MODULE; - + cs->typ = card->typ; +#ifdef MODULE + cs->iif.owner = lockowner; +#endif + strcpy(cs->iif.id, id); cs->iif.channels = 2; cs->iif.maxbufsize = MAX_DATA_SIZE; cs->iif.hl_hdrlen = MAX_HEADER_LEN; @@ -892,72 +957,20 @@ register_isdn(&cs->iif); cs->myid = cs->iif.channels; printk(KERN_INFO - "HiSax: Card %d Protocol %s Id=%s (%d)\n", cs->cardnr + 1, - (cs->protocol == ISDN_PTYPE_1TR6) ? "1TR6" : - (cs->protocol == ISDN_PTYPE_EURO) ? "EDSS1" : - (cs->protocol == ISDN_PTYPE_LEASED) ? "LEASED" : - (cs->protocol == ISDN_PTYPE_NI1) ? "NI1" : + "HiSax: Card %d Protocol %s Id=%s (%d)\n", cardnr + 1, + (card->protocol == ISDN_PTYPE_1TR6) ? "1TR6" : + (card->protocol == ISDN_PTYPE_EURO) ? "EDSS1" : + (card->protocol == ISDN_PTYPE_LEASED) ? "LEASED" : + (card->protocol == ISDN_PTYPE_NI1) ? "NI1" : "NONE", cs->iif.id, cs->myid); -} - -static int -do_init(struct IsdnCardState *cs) -{ - int ret; - - init_tei(cs, cs->protocol); - ret = CallcNewChan(cs); - if (ret) - return -EIO; - - /* ISAR needs firmware download first */ - if (!test_bit(HW_ISAR, &cs->HW_Flags)) - ll_run(cs, 0); - - return 0; -} - - -static int __devinit checkcard(int cardnr, char *id, int *busy_flag) -{ - int ret = 0; - struct IsdnCard *card = cards + cardnr; - struct IsdnCardState *cs; - - cs = alloc_IsdnCardState(); - if (!cs) { - printk(KERN_WARNING - "HiSax: No memory for IsdnCardState(card %d)\n", - cardnr + 1); - goto out; - } - card->cs = cs; -#if TEI_PER_CARD - if (card->protocol == ISDN_PTYPE_NI1) - test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); -#else - test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); -#endif - cs->cardnr = cardnr; - cs->protocol = card->protocol; - cs->typ = card->typ; - cs->busy_flag = busy_flag; - - if (card->typ <= 0 || card->typ > ISDN_CTYPE_COUNT) { - printk(KERN_WARNING - "HiSax: Card Type %d out of range\n", card->typ); - goto outf_cs; - } - strcpy(cs->iif.id, id); - do_register_isdn(cs); switch (card->typ) { -#ifdef CONFIG_HISAX_16_0 +#if CARD_TELES0 case ISDN_CTYPE_16_0: case ISDN_CTYPE_8_0: ret = setup_teles0(card); break; #endif -#ifdef CONFIG_HISAX_16_3 +#if CARD_TELES3 case ISDN_CTYPE_16_3: case ISDN_CTYPE_PNP: case ISDN_CTYPE_TELESPCMCIA: @@ -965,32 +978,32 @@ ret = setup_teles3(card); break; #endif -#ifdef CONFIG_HISAX_S0BOX +#if CARD_S0BOX case ISDN_CTYPE_S0BOX: ret = setup_s0box(card); break; #endif -#ifdef CONFIG_HISAX_TELESPCI +#if CARD_TELESPCI case ISDN_CTYPE_TELESPCI: ret = setup_telespci(card); break; #endif -#ifdef CONFIG_HISAX_AVM_A1 +#if CARD_AVM_A1 case ISDN_CTYPE_A1: ret = setup_avm_a1(card); break; #endif -#ifdef CONFIG_HISAX_AVM_A1_PCMCIA +#if CARD_AVM_A1_PCMCIA case ISDN_CTYPE_A1_PCMCIA: ret = setup_avm_a1_pcmcia(card); break; #endif -#ifdef CONFIG_HISAX_FRITZPCI +#if CARD_FRITZPCI case ISDN_CTYPE_FRITZPCI: ret = setup_avm_pcipnp(card); break; #endif -#ifdef CONFIG_HISAX_ELSA +#if CARD_ELSA case ISDN_CTYPE_ELSA: case ISDN_CTYPE_ELSA_PNP: case ISDN_CTYPE_ELSA_PCMCIA: @@ -998,115 +1011,115 @@ ret = setup_elsa(card); break; #endif -#ifdef CONFIG_HISAX_IX1MICROR2 +#if CARD_IX1MICROR2 case ISDN_CTYPE_IX1MICROR2: ret = setup_ix1micro(card); break; #endif -#ifdef CONFIG_HISAX_DIEHLDIVA +#if CARD_DIEHLDIVA case ISDN_CTYPE_DIEHLDIVA: ret = setup_diva(card); break; #endif -#ifdef CONFIG_HISAX_ASUSCOM +#if CARD_ASUSCOM case ISDN_CTYPE_ASUSCOM: ret = setup_asuscom(card); break; #endif -#ifdef CONFIG_HISAX_TELEINT +#if CARD_TELEINT case ISDN_CTYPE_TELEINT: ret = setup_TeleInt(card); break; #endif -#ifdef CONFIG_HISAX_SEDLBAUER +#if CARD_SEDLBAUER case ISDN_CTYPE_SEDLBAUER: case ISDN_CTYPE_SEDLBAUER_PCMCIA: case ISDN_CTYPE_SEDLBAUER_FAX: ret = setup_sedlbauer(card); break; #endif -#ifdef CONFIG_HISAX_SPORTSTER +#if CARD_SPORTSTER case ISDN_CTYPE_SPORTSTER: ret = setup_sportster(card); break; #endif -#ifdef CONFIG_HISAX_MIC +#if CARD_MIC case ISDN_CTYPE_MIC: ret = setup_mic(card); break; #endif -#ifdef CONFIG_HISAX_NETJET +#if CARD_NETJET_S case ISDN_CTYPE_NETJET_S: ret = setup_netjet_s(card); break; #endif -#ifdef CONFIG_HISAX_HFCS +#if CARD_HFCS case ISDN_CTYPE_TELES3C: case ISDN_CTYPE_ACERP10: ret = setup_hfcs(card); break; #endif -#ifdef CONFIG_HISAX_HFC_PCI +#if CARD_HFC_PCI case ISDN_CTYPE_HFC_PCI: ret = setup_hfcpci(card); break; #endif -#ifdef CONFIG_HISAX_HFC_SX +#if CARD_HFC_SX case ISDN_CTYPE_HFC_SX: ret = setup_hfcsx(card); break; #endif -#ifdef CONFIG_HISAX_NICCY +#if CARD_NICCY case ISDN_CTYPE_NICCY: ret = setup_niccy(card); break; #endif -#ifdef CONFIG_HISAX_AMD7930 +#if CARD_AMD7930 case ISDN_CTYPE_AMD7930: ret = setup_amd7930(card); break; #endif -#ifdef CONFIG_HISAX_ISURF +#if CARD_ISURF case ISDN_CTYPE_ISURF: ret = setup_isurf(card); break; #endif -#ifdef CONFIG_HISAX_HSTSAPHIR +#if CARD_HSTSAPHIR case ISDN_CTYPE_HSTSAPHIR: ret = setup_saphir(card); break; #endif -#ifdef CONFIG_HISAX_TESTEMU +#if CARD_TESTEMU case ISDN_CTYPE_TESTEMU: ret = setup_testemu(card); break; #endif -#ifdef CONFIG_HISAX_BKM_A4T +#if CARD_BKM_A4T case ISDN_CTYPE_BKM_A4T: ret = setup_bkm_a4t(card); break; #endif -#ifdef CONFIG_HISAX_SCT_QUADRO +#if CARD_SCT_QUADRO case ISDN_CTYPE_SCT_QUADRO: ret = setup_sct_quadro(card); break; #endif -#ifdef CONFIG_HISAX_GAZEL +#if CARD_GAZEL case ISDN_CTYPE_GAZEL: ret = setup_gazel(card); break; #endif -#ifdef CONFIG_HISAX_W6692 +#if CARD_W6692 case ISDN_CTYPE_W6692: ret = setup_w6692(card); break; #endif -#ifdef CONFIG_HISAX_NETJET_U +#if CARD_NETJET_U case ISDN_CTYPE_NETJET_U: ret = setup_netjet_u(card); break; #endif -#ifdef CONFIG_HISAX_ENTERNOW_PCI +#if CARD_FN_ENTERNOW_PCI case ISDN_CTYPE_ENTERNOW: ret = setup_enternow_pci(card); break; @@ -1125,40 +1138,62 @@ ll_unload(cs); goto outf_cs; } + if (!(cs->rcvbuf = kmalloc(MAX_DFRAME_LEN_L1, GFP_ATOMIC))) { + printk(KERN_WARNING "HiSax: No memory for isac rcvbuf\n"); + ll_unload(cs); + goto outf_cs; + } + cs->rcvidx = 0; + cs->tx_skb = NULL; + cs->tx_cnt = 0; + cs->event = 0; + cs->tqueue.data = cs; + + skb_queue_head_init(&cs->rq); + skb_queue_head_init(&cs->sq); + init_bcstate(cs, 0); init_bcstate(cs, 1); /* init_card only handles interrupts which are not */ /* used here for the loadable driver */ switch (card->typ) { - case ISDN_CTYPE_DYNAMIC: - ret = 0; - break; - default: - ret = init_card(cs); - break; + case ISDN_CTYPE_DYNAMIC: + ret = 0; + break; + default: + ret = init_card(cs); + break; } if (ret) { closecard(cardnr); ret = 0; goto outf_cs; } - if (do_init(cs)) { + init_tei(cs, cs->protocol); + ret = CallcNewChan(cs); + if (ret) { closecard(cardnr); ret = 0; goto outf_cs; } + /* ISAR needs firmware download first */ + if (!test_bit(HW_ISAR, &cs->HW_Flags)) + ll_run(cs, 0); + ret = 1; goto out; + outf_dlog: + kfree(cs->dlog); outf_cs: - free_IsdnCardState(cs); + kfree(cs); card->cs = NULL; out: return ret; } -void __devinit HiSax_shiftcards(int idx) +void HiSax_shiftcards(int idx) { int i; @@ -1166,7 +1201,7 @@ memcpy(&cards[i], &cards[i + 1], sizeof(cards[i])); } -int __devinit HiSax_inithardware(int *busy_flag) +int HiSax_inithardware(int *busy_flag) { int foundcards = 0; int i = 0; @@ -1196,13 +1231,16 @@ else sprintf(ids, "%s%d", id, i); } - if (checkcard(i, ids, busy_flag)) { + if (checkcard(i, ids, busy_flag, THIS_MODULE)) { foundcards++; i++; } else { - printk(KERN_WARNING - "HiSax: Card type %d not installed !\n", - cards[i].typ); + /* make sure we don't oops the module */ + if (cards[i].typ > 0 && cards[i].typ <= ISDN_CTYPE_COUNT) { + printk(KERN_WARNING + "HiSax: Card %s not installed !\n", + CardType[cards[i].typ]); + } HiSax_shiftcards(i); nrcards--; } @@ -1214,7 +1252,7 @@ { int i, last = nrcards - 1; - if (cardnr > last) + if (cardnr > last || cardnr < 0) return; if (cards[cardnr].cs) { ll_stop(cards[cardnr].cs); @@ -1492,182 +1530,9 @@ printk(KERN_INFO "HiSax module removed\n"); } -#ifdef CONFIG_HISAX_ELSA -int elsa_init_pcmcia(void *pcm_iob, int pcm_irq, int *busy_flag, int prot) -{ -#ifdef MODULE - int i; - - nrcards = 0; - /* Initialize all structs, even though we only accept - two pcmcia cards - */ - for (i = 0; i < HISAX_MAX_CARDS; i++) { - cards[i].para[0] = irq[i]; - cards[i].para[1] = io[i]; - cards[i].typ = type[i]; - if (protocol[i]) { - cards[i].protocol = protocol[i]; - } else { - cards[i].protocol = DEFAULT_PROTO; - } - } - cards[0].para[0] = pcm_irq; - cards[0].para[1] = (int) pcm_iob; - cards[0].protocol = prot; - cards[0].typ = ISDN_CTYPE_ELSA_PCMCIA; - - if (!HiSax_id) - HiSax_id = HiSaxID; - if (!HiSaxID[0]) - strcpy(HiSaxID, "HiSax"); - for (i = 0; i < HISAX_MAX_CARDS; i++) - if (cards[i].typ > 0) - nrcards++; - printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", - nrcards, (nrcards > 1) ? "s" : ""); - - if (!HiSax_inithardware(busy_flag)) - return -ENODEV; - printk(KERN_NOTICE "HiSax: module installed\n"); -#endif - return 0; -} -#endif - -#ifdef CONFIG_HISAX_HFC_SX -int hfc_init_pcmcia(void *pcm_iob, int pcm_irq, int *busy_flag, int prot) -{ -#ifdef MODULE - int i; - - nrcards = 0; - /* Initialize all structs, even though we only accept - two pcmcia cards - */ - for (i = 0; i < HISAX_MAX_CARDS; i++) { - cards[i].para[0] = irq[i]; - cards[i].para[1] = io[i]; - cards[i].typ = type[i]; - if (protocol[i]) { - cards[i].protocol = protocol[i]; - } else { - cards[i].protocol = DEFAULT_PROTO; - } - } - cards[0].para[0] = pcm_irq; - cards[0].para[1] = (int) pcm_iob; - cards[0].protocol = prot; - cards[0].typ = ISDN_CTYPE_HFC_SP_PCMCIA; - - if (!HiSax_id) - HiSax_id = HiSaxID; - if (!HiSaxID[0]) - strcpy(HiSaxID, "HiSax"); - for (i = 0; i < HISAX_MAX_CARDS; i++) - if (cards[i].typ > 0) - nrcards++; - printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", - nrcards, (nrcards > 1) ? "s" : ""); - - if (!HiSax_inithardware(busy_flag)) - return -ENODEV; - printk(KERN_NOTICE "HiSax: module installed\n"); -#endif - return 0; -} -#endif - -#ifdef CONFIG_HISAX_SEDLBAUER -int sedl_init_pcmcia(void *pcm_iob, int pcm_irq, int *busy_flag, int prot) +int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card) { -#ifdef MODULE - int i; - - nrcards = 0; - /* Initialize all structs, even though we only accept - two pcmcia cards - */ - for (i = 0; i < HISAX_MAX_CARDS; i++) { - cards[i].para[0] = irq[i]; - cards[i].para[1] = io[i]; - cards[i].typ = type[i]; - if (protocol[i]) { - cards[i].protocol = protocol[i]; - } else { - cards[i].protocol = DEFAULT_PROTO; - } - } - cards[0].para[0] = pcm_irq; - cards[0].para[1] = (int) pcm_iob; - cards[0].protocol = prot; - cards[0].typ = ISDN_CTYPE_SEDLBAUER_PCMCIA; - - if (!HiSax_id) - HiSax_id = HiSaxID; - if (!HiSaxID[0]) - strcpy(HiSaxID, "HiSax"); - for (i = 0; i < HISAX_MAX_CARDS; i++) - if (cards[i].typ > 0) - nrcards++; - printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", - nrcards, (nrcards > 1) ? "s" : ""); - - if (!HiSax_inithardware(busy_flag)) - return -ENODEV; - printk(KERN_NOTICE "HiSax: module installed\n"); -#endif - return 0; -} -#endif - -#ifdef CONFIG_HISAX_AVM_A1_PCMCIA -int avm_a1_init_pcmcia(void *pcm_iob, int pcm_irq, int *busy_flag, int prot) -{ -#ifdef MODULE - int i; - - nrcards = 0; - /* Initialize all structs, even though we only accept - two pcmcia cards - */ - for (i = 0; i < HISAX_MAX_CARDS; i++) { - cards[i].para[0] = irq[i]; - cards[i].para[1] = io[i]; - cards[i].typ = type[i]; - if (protocol[i]) { - cards[i].protocol = protocol[i]; - } else { - cards[i].protocol = DEFAULT_PROTO; - } - } - cards[0].para[0] = pcm_irq; - cards[0].para[1] = (int) pcm_iob; - cards[0].protocol = prot; - cards[0].typ = ISDN_CTYPE_A1_PCMCIA; - - if (!HiSax_id) - HiSax_id = HiSaxID; - if (!HiSaxID[0]) - strcpy(HiSaxID, "HiSax"); - for (i = 0; i < HISAX_MAX_CARDS; i++) - if (cards[i].typ > 0) - nrcards++; - printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", - nrcards, (nrcards > 1) ? "s" : ""); - - if (!HiSax_inithardware(busy_flag)) - return -ENODEV; - printk(KERN_NOTICE "HiSax: module installed\n"); -#endif - return 0; -} -#endif - -int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag, - struct IsdnCard *card) -{ - u8 ids[16]; + u_char ids[16]; int ret = -1; cards[nrcards] = *card; @@ -1675,14 +1540,18 @@ sprintf(ids, "HiSax%d", nrcards); else sprintf(ids, "HiSax"); - if (!checkcard(nrcards, ids, busy_flag)) { - return -1; - } + if (!checkcard(nrcards, ids, busy_flag, THIS_MODULE)) + goto error; + ret = nrcards; nrcards++; +error: return ret; } +EXPORT_SYMBOL(hisax_init_pcmcia); +EXPORT_SYMBOL(HiSax_closecard); + #include "hisax_if.h" EXPORT_SYMBOL(hisax_register); @@ -1692,68 +1561,47 @@ static void hisax_b_l1l2(struct hisax_if *ifc, int pr, void *arg); static void hisax_d_l2l1(struct PStack *st, int pr, void *arg); static void hisax_b_l2l1(struct PStack *st, int pr, void *arg); +static int hisax_cardmsg(struct IsdnCardState *cs, int mt, void *arg); static int hisax_bc_setstack(struct PStack *st, struct BCState *bcs); static void hisax_bc_close(struct BCState *bcs); -static void hisax_bh(void *data); +static void hisax_bh(struct IsdnCardState *cs); static void EChannel_proc_rcv(struct hisax_d_if *d_if); -static int -hisax_l1_open(struct PStack *st, struct IsdnCardState *cs) -{ - st->l1.l2l1 = hisax_d_l2l1; - return 0; -} - -static struct dc_l1_ops hisax_l1_ops = { - .open = hisax_l1_open, - .bh_func = hisax_bh, -}; - -static struct bc_l1_ops hisax_bc_l1_ops = { - .open = hisax_bc_setstack, - .close = hisax_bc_close, -}; - int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[], char *name, int protocol) { - int i; + int i, retval; + char id[20]; struct IsdnCardState *cs; - + for (i = 0; i < HISAX_MAX_CARDS; i++) { if (!cards[i].typ) break; } - + if (i >= HISAX_MAX_CARDS) return -EBUSY; - - nrcards++; - - cs = alloc_IsdnCardState(); - if (!cs) - return -ENOMEM; - -#if TEI_PER_CARD - if (protocol == ISDN_PTYPE_NI1) - test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); -#else - test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); -#endif - cs->cardnr = i; - cs->protocol = protocol; - cs->typ = ISDN_CTYPE_DYNAMIC; - - sprintf(cs->iif.id, "%s%d", name, i); - do_register_isdn(cs); + cards[i].typ = ISDN_CTYPE_DYNAMIC; + cards[i].protocol = protocol; + sprintf(id, "%s%d", name, i); + nrcards++; + retval = checkcard(i, id, 0, hisax_d_if->owner); + if (retval == 0) { // yuck + cards[i].typ = 0; + nrcards--; + return retval; + } + cs = cards[i].cs; hisax_d_if->cs = cs; cs->hw.hisax_d_if = hisax_d_if; - cs->iif.owner = hisax_d_if->owner; - dc_l1_init(cs, &hisax_l1_ops); - cs->bc_l1_ops = &hisax_bc_l1_ops; - + cs->cardmsg = hisax_cardmsg; + INIT_WORK(&cs->tqueue, (void *)(void *)hisax_bh, cs); + cs->channel[0].d_st->l2.l2l1 = hisax_d_l2l1; for (i = 0; i < 2; i++) { + cs->bcs[i].BC_SetStack = hisax_bc_setstack; + cs->bcs[i].BC_Close = hisax_bc_close; + b_if[i]->ifc.l1l2 = hisax_b_l1l2; hisax_d_if->b_if[i] = b_if[i]; @@ -1762,8 +1610,6 @@ skb_queue_head_init(&hisax_d_if->erq); clear_bit(0, &hisax_d_if->ph_state); - do_init(cs); - return 0; } @@ -1776,9 +1622,14 @@ #include "isdnl1.h" -static void hisax_bh(void *data) +static void hisax_sched_event(struct IsdnCardState *cs, int event) +{ + test_and_set_bit(event, &cs->event); + schedule_work(&cs->tqueue); +} + +static void hisax_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; struct PStack *st; int pr; @@ -1792,11 +1643,17 @@ else pr = PH_DEACTIVATE | INDICATION; for (st = cs->stlist; st; st = st->next) - L1L2(st, pr, NULL); + st->l1.l1l2(st, pr, NULL); } } +static void hisax_b_sched_event(struct BCState *bcs, int event) +{ + test_and_set_bit(event, &bcs->event); + schedule_work(&bcs->tqueue); +} + static inline void D_L2L1(struct hisax_d_if *d_if, int pr, void *arg) { struct hisax_if *ifc = (struct hisax_if *) d_if; @@ -1819,15 +1676,15 @@ switch (pr) { case PH_ACTIVATE | INDICATION: set_bit(0, &d_if->ph_state); - sched_d_event(cs, D_L1STATECHANGE); + hisax_sched_event(cs, D_L1STATECHANGE); break; case PH_DEACTIVATE | INDICATION: clear_bit(0, &d_if->ph_state); - sched_d_event(cs, D_L1STATECHANGE); + hisax_sched_event(cs, D_L1STATECHANGE); break; case PH_DATA | INDICATION: skb_queue_tail(&cs->rq, arg); - sched_d_event(cs, D_RCVBUFREADY); + hisax_sched_event(cs, D_RCVBUFREADY); break; case PH_DATA | CONFIRM: skb = skb_dequeue(&cs->sq); @@ -1838,14 +1695,14 @@ clear_bit(FLG_L1_DBUSY, &cs->HW_Flags); for (st = cs->stlist; st; st = st->next) { if (test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags)) { - L1L2(st, PH_PULL | CONFIRM, NULL); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); break; } } break; case PH_DATA_E | INDICATION: skb_queue_tail(&d_if->erq, arg); - sched_d_event(cs, E_RCVBUFREADY); + hisax_sched_event(cs, E_RCVBUFREADY); break; default: printk("pr %#x\n", pr); @@ -1863,22 +1720,27 @@ // FIXME use isdnl1? switch (pr) { case PH_ACTIVATE | INDICATION: - L1L2(st, pr, NULL); + st->l1.l1l2(st, pr, NULL); break; case PH_DEACTIVATE | INDICATION: - L1L2(st, pr, NULL); + st->l1.l1l2(st, pr, NULL); clear_bit(BC_FLG_BUSY, &bcs->Flag); skb_queue_purge(&bcs->squeue); bcs->hw.b_if = NULL; break; case PH_DATA | INDICATION: skb_queue_tail(&bcs->rqueue, arg); - sched_b_event(bcs, B_RCVBUFREADY); + hisax_b_sched_event(bcs, B_RCVBUFREADY); break; case PH_DATA | CONFIRM: - skb = arg; - bcs->tx_cnt -= skb->truesize; - xmit_complete_b(bcs); + bcs->tx_cnt -= (int) arg; + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += (int) arg; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } skb = skb_dequeue(&bcs->squeue); if (skb) { B_L2L1(b_if, PH_DATA | REQUEST, skb); @@ -1886,7 +1748,7 @@ } clear_bit(BC_FLG_BUSY, &bcs->Flag); if (test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags)) { - L1L2(st, PH_PULL | CONFIRM, NULL); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); } break; default: @@ -1917,7 +1779,7 @@ break; case PH_PULL | REQUEST: if (!test_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - L1L2(st, PH_PULL | CONFIRM, NULL); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); else set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; @@ -1927,6 +1789,11 @@ } } +static int hisax_cardmsg(struct IsdnCardState *cs, int mt, void *arg) +{ + return 0; +} + static void hisax_b_l2l1(struct PStack *st, int pr, void *arg) { struct BCState *bcs = st->l1.bcs; @@ -1947,7 +1814,7 @@ break; case PH_PULL | REQUEST: if (!test_bit(BC_FLG_BUSY, &bcs->Flag)) - L1L2(st, PH_PULL | CONFIRM, NULL); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); else set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; @@ -1971,7 +1838,7 @@ hisax_d_if->b_if[st->l1.bc]->bcs = bcs; st->l1.bcs = bcs; - st->l1.l2l1 = hisax_b_l2l1; + st->l2.l2l1 = hisax_b_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -1991,7 +1858,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if) { struct IsdnCardState *cs = d_if->cs; - u8 *ptr; + u_char *ptr; struct sk_buff *skb; while ((skb = skb_dequeue(&d_if->erq)) != NULL) { @@ -2017,103 +1884,9 @@ } } -void -resources_init(struct resources *rs) -{ - INIT_LIST_HEAD(&rs->res_head); -} - -void -resources_release(struct resources *rs) -{ - struct res *r; - - list_for_each_entry(r, &rs->res_head, node) { - if (r->flags & IORESOURCE_IO) { - release_region(r->start, r->end - r->start + 1); - } - if (r->flags & IORESOURCE_MEM) { - iounmap(r->r_u.ioremap_addr); - release_mem_region(r->start, r->end - r->start + 1); - } - } -} - -unsigned long -request_io(struct resources *rs, unsigned long start, int len, - const char *name) -{ - struct res *r; - - r = kmalloc(sizeof(*r), GFP_KERNEL); - if (!r) { - printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__); - goto err; - } - if (!request_region(start, len, name)) { - printk(KERN_WARNING "%s: IO %#lx-%#lx already in use\n", - __FUNCTION__, start, start + len - 1); - goto err_free; - } - r->flags = IORESOURCE_IO; - r->start = start; - r->end = start + len - 1; - r->name = name; - list_add_tail(&r->node, &rs->res_head); - - return r->start; - - err_free: - kfree(r); - err: - return 0; -} - -void * -request_mmio(struct resources *rs, unsigned long start, int len, - const char *name) -{ - struct res *r; - - r = kmalloc(sizeof(*r), GFP_KERNEL); - if (!r) { - printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__); - goto err; - } - if (!request_mem_region(start, len, name)) { - printk(KERN_WARNING "%s: MMIO %#lx-%#lx already in use\n", - __FUNCTION__, start, start + len - 1); - goto err_free; - } - r->flags = IORESOURCE_MEM; - r->start = start; - r->end = start + len - 1; - r->name = name; - r->r_u.ioremap_addr = ioremap(start, len); - if (!r->r_u.ioremap_addr) - goto err_release; - - list_add_tail(&r->node, &rs->res_head); - - return r->r_u.ioremap_addr; - - err_release: - release_mem_region(r->start, r->end - r->start + 1); - err_free: - kfree(r); - err: - return 0; -} - -void -hisax_release_resources(struct IsdnCardState *cs) -{ - resources_release(&cs->rs); -} - #include -static struct pci_device_id hisax_pci_tbl[] = { +static struct pci_device_id hisax_pci_tbl[] __initdata = { #ifdef CONFIG_HISAX_FRITZPCI {PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID}, #endif @@ -2121,7 +1894,9 @@ {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, PCI_ANY_ID, PCI_ANY_ID}, {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, PCI_ANY_ID, PCI_ANY_ID}, {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, PCI_ANY_ID, PCI_ANY_ID}, +//######################################################################################### {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202, PCI_ANY_ID, PCI_ANY_ID}, +//######################################################################################### #endif #ifdef CONFIG_HISAX_ELSA {PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, PCI_ANY_ID, PCI_ANY_ID}, diff -Nru a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c --- a/drivers/isdn/hisax/diva.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/diva.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: diva.c,v 1.25.6.5 2001/09/23 22:24:47 kai Exp $ +/* $Id: diva.c,v 1.33.2.6 2004/02/11 13:21:33 keil Exp $ * * low level stuff for Eicon.Diehl Diva Family ISDN cards * @@ -28,8 +28,7 @@ extern const char *CardType[]; -const char *Diva_revision = "$Revision: 1.25.6.5 $"; -static spinlock_t diva_lock = SPIN_LOCK_UNLOCKED; +const char *Diva_revision = "$Revision: 1.33.2.6 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -82,376 +81,715 @@ #endif #define PITA_INT0_STATUS 0x02 -static inline u8 -readreg(unsigned int ale, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&diva_lock, flags); byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&diva_lock, flags); - return ret; + return (ret); } static inline void -writereg(unsigned int ale, unsigned int adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&diva_lock, flags); byteout(ale, off); - byteout(adr, data); - spin_unlock_irqrestore(&diva_lock, flags); + insb(adr, data, size); } + static inline void -readfifo(unsigned int ale, unsigned int adr, u8 off, u8 * data, int size) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { byteout(ale, off); - insb(adr, data, size); + byteout(adr, data); } static inline void -writefifo(unsigned int ale, unsigned int adr, u8 off, u8 *data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size) { byteout(ale, off); outsb(adr, data, size); } -static inline u8 -memreadreg(unsigned long adr, u8 off) +static inline u_char +memreadreg(unsigned long adr, u_char off) { - return readb(((unsigned int *)adr) + off); + return(*((unsigned char *) + (((unsigned int *)adr) + off))); } static inline void -memwritereg(unsigned long adr, u8 off, u8 data) +memwritereg(unsigned long adr, u_char off, u_char data) { - writeb(data, ((unsigned int *)adr) + off); + register u_char *p; + + p = (unsigned char *)(((unsigned int *)adr) + off); + *p = data; } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset); + return(readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 *data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char *data, int size) { readfifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 *data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size) { writefifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, - offset + (hscx ? 0x40 : 0)); + return (readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset+0x80)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, - offset + (hscx ? 0x40 : 0), value); + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset|0x80, value); } static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, hscx ? 0x40 : 0, data, size); + readfifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0x80, data, size); } static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, hscx ? 0x40 : 0, data, size); + writefifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, 0x80, data, size); } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static inline u8 -ipac_read(struct IsdnCardState *cs, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset); + return(readreg(cs->hw.diva.hscx_adr, + cs->hw.diva.hscx, offset + (hscx ? 0x40 : 0))); } -static inline void -ipac_write(struct IsdnCardState *cs, u8 offset, u8 value) +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset, value); + writereg(cs->hw.diva.hscx_adr, + cs->hw.diva.hscx, offset + (hscx ? 0x40 : 0), value); } -static inline void -ipac_readfifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) +static u_char +MemReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) { - readfifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset, data, size); + return (memreadreg(cs->hw.diva.cfg_reg, offset+0x80)); } -static inline void -ipac_writefifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) +static void +MemWriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writefifo(cs->hw.diva.isac_adr, cs->hw.diva.isac, offset, data, size); + memwritereg(cs->hw.diva.cfg_reg, offset|0x80, value); } -/* This will generate ipac_dc_ops and ipac_bc_ops using the functions - * above */ - -BUILD_IPAC_OPS(ipac); - -static inline u8 -mem_ipac_read(struct IsdnCardState *cs, u8 offset) +static void +MemReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - return memreadreg(cs->hw.diva.cfg_reg, offset); + while(size--) + *data++ = memreadreg(cs->hw.diva.cfg_reg, 0x80); } -static inline void -mem_ipac_write(struct IsdnCardState *cs, u8 offset, u8 value) +static void +MemWriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - memwritereg(cs->hw.diva.cfg_reg, offset, value); + while(size--) + memwritereg(cs->hw.diva.cfg_reg, 0x80, *data++); } -static inline void -mem_ipac_readfifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) +static u_char +MemReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - while(size--) - *data++ = memreadreg(cs->hw.diva.cfg_reg, offset); + return(memreadreg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0))); } -static inline void -mem_ipac_writefifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) +static void +MemWriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - while(size--) - memwritereg(cs->hw.diva.cfg_reg, offset, *data++); + memwritereg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0), value); } -/* This will generate mem_ipac_dc_ops and mem_ipac_bc_ops using the functions - * above */ - -BUILD_IPAC_OPS(mem_ipac); - /* IO-Functions for IPACX type cards */ -static u8 -ipacx_dc_read(struct IsdnCardState *cs, u8 offset) +static u_char +MemReadISAC_IPACX(struct IsdnCardState *cs, u_char offset) { - return memreadreg(cs->hw.diva.cfg_reg, offset); + return (memreadreg(cs->hw.diva.cfg_reg, offset)); } static void -ipacx_dc_write(struct IsdnCardState *cs, u8 offset, u8 value) +MemWriteISAC_IPACX(struct IsdnCardState *cs, u_char offset, u_char value) { memwritereg(cs->hw.diva.cfg_reg, offset, value); } static void -ipacx_dc_read_fifo(struct IsdnCardState *cs, u8 *data, int size) +MemReadISACfifo_IPACX(struct IsdnCardState *cs, u_char * data, int size) { while(size--) *data++ = memreadreg(cs->hw.diva.cfg_reg, 0); } static void -ipacx_dc_write_fifo(struct IsdnCardState *cs, u8 *data, int size) +MemWriteISACfifo_IPACX(struct IsdnCardState *cs, u_char * data, int size) { while(size--) memwritereg(cs->hw.diva.cfg_reg, 0, *data++); } -static struct dc_hw_ops ipacx_dc_ops = { - .read_reg = ipacx_dc_read, - .write_reg = ipacx_dc_write, - .read_fifo = ipacx_dc_read_fifo, - .write_fifo = ipacx_dc_write_fifo, -}; - -static u8 -ipacx_bc_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +MemReadHSCX_IPACX(struct IsdnCardState *cs, int hscx, u_char offset) { - return memreadreg(cs->hw.diva.cfg_reg, offset + - (hscx ? IPACX_OFF_B2 : IPACX_OFF_B1)); + return(memreadreg(cs->hw.diva.cfg_reg, offset + + (hscx ? IPACX_OFF_B2 : IPACX_OFF_B1))); } static void -ipacx_bc_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +MemWriteHSCX_IPACX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { memwritereg(cs->hw.diva.cfg_reg, offset + (hscx ? IPACX_OFF_B2 : IPACX_OFF_B1), value); } -static void -ipacx_bc_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int len) -{ - int i; +/* + * fast interrupt HSCX stuff goes here + */ - for (i = 0; i < len ; i++) - *data++ = ipacx_bc_read(cs, hscx, IPACX_RFIFOB); -} +#define READHSCX(cs, nr, reg) readreg(cs->hw.diva.hscx_adr, \ + cs->hw.diva.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.diva.hscx_adr, \ + cs->hw.diva.hscx, reg + (nr ? 0x40 : 0), data) -static struct bc_hw_ops ipacx_bc_ops = { - .read_reg = ipacx_bc_read, - .write_reg = ipacx_bc_write, - .read_fifo = ipacx_bc_read_fifo, -}; +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.diva.hscx_adr, \ + cs->hw.diva.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.diva.hscx_adr, \ + cs->hw.diva.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" static irqreturn_t diva_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 sval; + u_char val, sval; + u_long flags; int cnt=5; + spin_lock_irqsave(&cs->lock, flags); while (((sval = bytein(cs->hw.diva.ctrl)) & DIVA_IRQ_REQ) && cnt) { - hscxisac_irq(intno, dev_id, regs); + val = readreg(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, HSCX_ISTA + 0x40); + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, ISAC_ISTA); + if (val) + isac_interrupt(cs, val); + cnt--; } if (!cnt) printk(KERN_WARNING "Diva: IRQ LOOP\n"); + writereg(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, ISAC_MASK, 0x0); + writereg(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, HSCX_MASK, 0x0); + writereg(cs->hw.diva.hscx_adr, cs->hw.diva.hscx, HSCX_MASK + 0x40, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } static irqreturn_t -diva_ipac_pci_irq(int intno, void *dev_id, struct pt_regs *regs) +diva_irq_ipac_isa(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val; + u_char ista,val; + u_long flags; + int icnt=5; + + spin_lock_irqsave(&cs->lock, flags); + ista = readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_ISTA); +Start_IPACISA: + if (cs->debug & L1_DEB_IPAC) + debugl1(cs, "IPAC ISTA %02X", ista); + if (ista & 0x0f) { + val = readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, HSCX_ISTA + 0x40); + if (ista & 0x01) + val |= 0x01; + if (ista & 0x04) + val |= 0x02; + if (ista & 0x08) + val |= 0x04; + if (val) + hscx_int_main(cs, val); + } + if (ista & 0x20) { + val = 0xfe & readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, ISAC_ISTA + 0x80); + if (val) { + isac_interrupt(cs, val); + } + } + if (ista & 0x10) { + val = 0x01; + isac_interrupt(cs, val); + } + ista = readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_ISTA); + if ((ista & 0x3f) && icnt) { + icnt--; + goto Start_IPACISA; + } + if (!icnt) + printk(KERN_WARNING "DIVA IPAC IRQ LOOP\n"); + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_MASK, 0xFF); + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_MASK, 0xC0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} - val = readb(cs->hw.diva.pci_cfg); - if (!(val & PITA_INT0_STATUS)) - return IRQ_NONE; /* other shared IRQ */ - writeb(PITA_INT0_STATUS, cs->hw.diva.pci_cfg); /* Reset pending INT0 */ +static inline void +MemwaitforCEC(struct IsdnCardState *cs, int hscx) +{ + int to = 50; - return ipac_irq(intno, dev_id, regs); + while ((MemReadHSCX(cs, hscx, HSCX_STAR) & 0x04) && to) { + udelay(1); + to--; + } + if (!to) + printk(KERN_WARNING "HiSax: waitforCEC timeout\n"); } -static irqreturn_t -diva_ipacx_pci_irq(int intno, void *dev_id, struct pt_regs *regs) + +static inline void +MemwaitforXFW(struct IsdnCardState *cs, int hscx) { - struct IsdnCardState *cs = dev_id; - u8 val; + int to = 50; - val = readb(cs->hw.diva.pci_cfg); - if (!(val &PITA_INT0_STATUS)) - return IRQ_NONE; // other shared IRQ - interrupt_ipacx(cs); // handler for chip - writeb(PITA_INT0_STATUS, cs->hw.diva.pci_cfg); // Reset PLX interrupt - return IRQ_HANDLED; + while ((!(MemReadHSCX(cs, hscx, HSCX_STAR) & 0x44) == 0x40) && to) { + udelay(1); + to--; + } + if (!to) + printk(KERN_WARNING "HiSax: waitforXFW timeout\n"); } -static void -diva_release(struct IsdnCardState *cs) +static inline void +MemWriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data) { - del_timer_sync(&cs->hw.diva.tl); - if (cs->hw.diva.cfg_reg) - byteout(cs->hw.diva.ctrl, 0); /* LED off, Reset */ + MemwaitforCEC(cs, hscx); + MemWriteHSCX(cs, hscx, HSCX_CMDR, data); +} - hisax_release_resources(cs); +static void +Memhscx_empty_fifo(struct BCState *bcs, int count) +{ + u_char *ptr; + struct IsdnCardState *cs = bcs->cs; + int cnt; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hscx_empty_fifo"); + + if (bcs->hw.hscx.rcvidx + count > HSCX_BUFMAX) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "hscx_empty_fifo: incoming packet too large"); + MemWriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x80); + bcs->hw.hscx.rcvidx = 0; + return; + } + ptr = bcs->hw.hscx.rcvbuf + bcs->hw.hscx.rcvidx; + cnt = count; + while (cnt--) + *ptr++ = memreadreg(cs->hw.diva.cfg_reg, bcs->hw.hscx.hscx ? 0x40 : 0); + MemWriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x80); + ptr = bcs->hw.hscx.rcvbuf + bcs->hw.hscx.rcvidx; + bcs->hw.hscx.rcvidx += count; + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "hscx_empty_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } static void -diva_ipac_pci_release(struct IsdnCardState *cs) +Memhscx_fill_fifo(struct BCState *bcs) { - writel(0, cs->hw.diva.pci_cfg); /* disable INT0/1 */ - writel(2, cs->hw.diva.pci_cfg); /* reset pending INT0 */ - hisax_release_resources(cs); + struct IsdnCardState *cs = bcs->cs; + int more, count, cnt; + int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; + u_char *ptr,*p; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hscx_fill_fifo"); + + if (!bcs->tx_skb) + return; + if (bcs->tx_skb->len <= 0) + return; + + more = (bcs->mode == L1_MODE_TRANS) ? 1 : 0; + if (bcs->tx_skb->len > fifo_size) { + more = !0; + count = fifo_size; + } else + count = bcs->tx_skb->len; + cnt = count; + MemwaitforXFW(cs, bcs->hw.hscx.hscx); + p = ptr = bcs->tx_skb->data; + skb_pull(bcs->tx_skb, count); + bcs->tx_cnt -= count; + bcs->hw.hscx.count += count; + while(cnt--) + memwritereg(cs->hw.diva.cfg_reg, bcs->hw.hscx.hscx ? 0x40 : 0, + *p++); + MemWriteHSCXCMDR(cs, bcs->hw.hscx.hscx, more ? 0x8 : 0xa); + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "hscx_fill_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } -static int -diva_ipac_isa_reset(struct IsdnCardState *cs) +static inline void +Memhscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx) { - writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_POTA2, 0x20); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_POTA2, 0x00); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_MASK, 0xc0); - return 0; + u_char r; + struct BCState *bcs = cs->bcs + hscx; + struct sk_buff *skb; + int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; + int count; + + if (!test_bit(BC_FLG_INIT, &bcs->Flag)) + return; + + if (val & 0x80) { /* RME */ + r = MemReadHSCX(cs, hscx, HSCX_RSTA); + if ((r & 0xf0) != 0xa0) { + if (!(r & 0x80)) + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "HSCX invalid frame"); + if ((r & 0x40) && bcs->mode) + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "HSCX RDO mode=%d", + bcs->mode); + if (!(r & 0x20)) + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "HSCX CRC error"); + MemWriteHSCXCMDR(cs, hscx, 0x80); + } else { + count = MemReadHSCX(cs, hscx, HSCX_RBCL) & ( + test_bit(HW_IPAC, &cs->HW_Flags)? 0x3f: 0x1f); + if (count == 0) + count = fifo_size; + Memhscx_empty_fifo(bcs, count); + if ((count = bcs->hw.hscx.rcvidx - 1) > 0) { + if (cs->debug & L1_DEB_HSCX_FIFO) + debugl1(cs, "HX Frame %d", count); + if (!(skb = dev_alloc_skb(count))) + printk(KERN_WARNING "HSCX: receive out of memory\n"); + else { + memcpy(skb_put(skb, count), bcs->hw.hscx.rcvbuf, count); + skb_queue_tail(&bcs->rqueue, skb); + } + } + } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); + } + if (val & 0x40) { /* RPF */ + Memhscx_empty_fifo(bcs, fifo_size); + if (bcs->mode == L1_MODE_TRANS) { + /* receive audio data */ + if (!(skb = dev_alloc_skb(fifo_size))) + printk(KERN_WARNING "HiSax: receive out of memory\n"); + else { + memcpy(skb_put(skb, fifo_size), bcs->hw.hscx.rcvbuf, fifo_size); + skb_queue_tail(&bcs->rqueue, skb); + } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); + } + } + if (val & 0x10) { /* XPR */ + if (bcs->tx_skb) { + if (bcs->tx_skb->len) { + Memhscx_fill_fifo(bcs); + return; + } else { + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.hscx.count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_irq(bcs->tx_skb); + bcs->hw.hscx.count = 0; + bcs->tx_skb = NULL; + } + } + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + bcs->hw.hscx.count = 0; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + Memhscx_fill_fifo(bcs); + } else { + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + schedule_event(bcs, B_XMTBUFREADY); + } + } } -static int -diva_ipac_pci_reset(struct IsdnCardState *cs) +static inline void +Memhscx_int_main(struct IsdnCardState *cs, u_char val) +{ + + u_char exval; + struct BCState *bcs; + + if (val & 0x01) { // EXB + bcs = cs->bcs + 1; + exval = MemReadHSCX(cs, 1, HSCX_EXIR); + if (exval & 0x40) { + if (bcs->mode == 1) + Memhscx_fill_fifo(bcs); + else { + /* Here we lost an TX interrupt, so + * restart transmitting the whole frame. + */ + if (bcs->tx_skb) { + skb_push(bcs->tx_skb, bcs->hw.hscx.count); + bcs->tx_cnt += bcs->hw.hscx.count; + bcs->hw.hscx.count = 0; + } + MemWriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x01); + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "HSCX B EXIR %x Lost TX", exval); + } + } else if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX B EXIR %x", exval); + } + if (val & 0xf8) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX B interrupt %x", val); + Memhscx_interrupt(cs, val, 1); + } + if (val & 0x02) { // EXA + bcs = cs->bcs; + exval = MemReadHSCX(cs, 0, HSCX_EXIR); + if (exval & 0x40) { + if (bcs->mode == L1_MODE_TRANS) + Memhscx_fill_fifo(bcs); + else { + /* Here we lost an TX interrupt, so + * restart transmitting the whole frame. + */ + if (bcs->tx_skb) { + skb_push(bcs->tx_skb, bcs->hw.hscx.count); + bcs->tx_cnt += bcs->hw.hscx.count; + bcs->hw.hscx.count = 0; + } + MemWriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x01); + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "HSCX A EXIR %x Lost TX", exval); + } + } else if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX A EXIR %x", exval); + } + if (val & 0x04) { // ICA + exval = MemReadHSCX(cs, 0, HSCX_ISTA); + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX A interrupt %x", exval); + Memhscx_interrupt(cs, exval, 0); + } +} + +static irqreturn_t +diva_irq_ipac_pci(int intno, void *dev_id, struct pt_regs *regs) { - unsigned long misc_reg = cs->hw.diva.pci_cfg + PITA_MISC_REG; + struct IsdnCardState *cs = dev_id; + u_char ista,val; + int icnt=5; + u_char *cfg; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + cfg = (u_char *) cs->hw.diva.pci_cfg; + val = *cfg; + if (!(val & PITA_INT0_STATUS)) { + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; /* other shared IRQ */ + } + *cfg = PITA_INT0_STATUS; /* Reset pending INT0 */ + ista = memreadreg(cs->hw.diva.cfg_reg, IPAC_ISTA); +Start_IPACPCI: + if (cs->debug & L1_DEB_IPAC) + debugl1(cs, "IPAC ISTA %02X", ista); + if (ista & 0x0f) { + val = memreadreg(cs->hw.diva.cfg_reg, HSCX_ISTA + 0x40); + if (ista & 0x01) + val |= 0x01; + if (ista & 0x04) + val |= 0x02; + if (ista & 0x08) + val |= 0x04; + if (val) + Memhscx_int_main(cs, val); + } + if (ista & 0x20) { + val = 0xfe & memreadreg(cs->hw.diva.cfg_reg, ISAC_ISTA + 0x80); + if (val) { + isac_interrupt(cs, val); + } + } + if (ista & 0x10) { + val = 0x01; + isac_interrupt(cs, val); + } + ista = memreadreg(cs->hw.diva.cfg_reg, IPAC_ISTA); + if ((ista & 0x3f) && icnt) { + icnt--; + goto Start_IPACPCI; + } + if (!icnt) + printk(KERN_WARNING "DIVA IPAC PCI IRQ LOOP\n"); + memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xFF); + memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xC0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} - writel(PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE, misc_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writel(PITA_PARA_MPX_MODE, misc_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xc0); - return 0; +static irqreturn_t +diva_irq_ipacx_pci(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char val; + u_char *cfg; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + cfg = (u_char *) cs->hw.diva.pci_cfg; + val = *cfg; + if (!(val &PITA_INT0_STATUS)) { + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; // other shared IRQ + } + interrupt_ipacx(cs); // handler for chip + *cfg = PITA_INT0_STATUS; // Reset PLX interrupt + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } -static int -diva_ipacx_pci_reset(struct IsdnCardState *cs) +void +release_io_diva(struct IsdnCardState *cs) { - unsigned long misc_reg = cs->hw.diva.pci_cfg + PITA_MISC_REG; + int bytecnt; - writel(PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE, misc_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writel(PITA_PARA_MPX_MODE | PITA_SER_SOFTRESET, misc_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - ipacx_dc_write(cs, IPACX_MASK, 0xff); // Interrupts off - return 0; + if ((cs->subtyp == DIVA_IPAC_PCI) || + (cs->subtyp == DIVA_IPACX_PCI) ) { + u_int *cfg = (unsigned int *)cs->hw.diva.pci_cfg; + + *cfg = 0; /* disable INT0/1 */ + *cfg = 2; /* reset pending INT0 */ + iounmap((void *)cs->hw.diva.cfg_reg); + iounmap((void *)cs->hw.diva.pci_cfg); + return; + } else if (cs->subtyp != DIVA_IPAC_ISA) { + del_timer(&cs->hw.diva.tl); + if (cs->hw.diva.cfg_reg) + byteout(cs->hw.diva.ctrl, 0); /* LED off, Reset */ + } + if ((cs->subtyp == DIVA_ISA) || (cs->subtyp == DIVA_IPAC_ISA)) + bytecnt = 8; + else + bytecnt = 32; + if (cs->hw.diva.cfg_reg) { + release_region(cs->hw.diva.cfg_reg, bytecnt); + } } -static int -diva_reset(struct IsdnCardState *cs) +static void +reset_diva(struct IsdnCardState *cs) { - /* DIVA 2.0 */ - cs->hw.diva.ctrl_reg = 0; /* Reset On */ - byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - cs->hw.diva.ctrl_reg |= DIVA_RESET; /* Reset Off */ - byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - if (cs->subtyp == DIVA_ISA) { - cs->hw.diva.ctrl_reg |= DIVA_ISA_LED_A; - } else { - /* Workaround PCI9060 */ - byteout(cs->hw.diva.pci_cfg + 0x69, 9); - cs->hw.diva.ctrl_reg |= DIVA_PCI_LED_A; + if (cs->subtyp == DIVA_IPAC_ISA) { + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_POTA2, 0x20); + mdelay(10); + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_POTA2, 0x00); + mdelay(10); + writereg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_MASK, 0xc0); + } else if (cs->subtyp == DIVA_IPAC_PCI) { + unsigned int *ireg = (unsigned int *)(cs->hw.diva.pci_cfg + + PITA_MISC_REG); + *ireg = PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE; + mdelay(10); + *ireg = PITA_PARA_MPX_MODE; + mdelay(10); + memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xc0); + } else if (cs->subtyp == DIVA_IPACX_PCI) { + unsigned int *ireg = (unsigned int *)(cs->hw.diva.pci_cfg + + PITA_MISC_REG); + *ireg = PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE; + mdelay(10); + *ireg = PITA_PARA_MPX_MODE | PITA_SER_SOFTRESET; + mdelay(10); + MemWriteISAC_IPACX(cs, IPACX_MASK, 0xff); // Interrupts off + } else { /* DIVA 2.0 */ + cs->hw.diva.ctrl_reg = 0; /* Reset On */ + byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); + mdelay(10); + cs->hw.diva.ctrl_reg |= DIVA_RESET; /* Reset Off */ + byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); + mdelay(10); + if (cs->subtyp == DIVA_ISA) + cs->hw.diva.ctrl_reg |= DIVA_ISA_LED_A; + else { + /* Workaround PCI9060 */ + byteout(cs->hw.diva.pci_cfg + 0x69, 9); + cs->hw.diva.ctrl_reg |= DIVA_PCI_LED_A; + } + byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); } - byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); - return 0; } +#define DIVA_ASSIGN 1 + static void diva_led_handler(struct IsdnCardState *cs) { int blink = 0; - if (cs->status & 0x0001) + if ((cs->subtyp == DIVA_IPAC_ISA) || + (cs->subtyp == DIVA_IPAC_PCI) || + (cs->subtyp == DIVA_IPACX_PCI) ) + return; + del_timer(&cs->hw.diva.tl); + if (cs->hw.diva.status & DIVA_ASSIGN) cs->hw.diva.ctrl_reg |= (DIVA_ISA == cs->subtyp) ? DIVA_ISA_LED_A : DIVA_PCI_LED_A; else { @@ -459,10 +797,10 @@ DIVA_ISA_LED_A : DIVA_PCI_LED_A; blink = 250; } - if (cs->status & 0xf000) + if (cs->hw.diva.status & 0xf000) cs->hw.diva.ctrl_reg |= (DIVA_ISA == cs->subtyp) ? DIVA_ISA_LED_B : DIVA_PCI_LED_B; - else if (cs->status & 0x0f00) { + else if (cs->hw.diva.status & 0x0f00) { cs->hw.diva.ctrl_reg ^= (DIVA_ISA == cs->subtyp) ? DIVA_ISA_LED_B : DIVA_PCI_LED_B; blink = 500; @@ -471,212 +809,90 @@ DIVA_ISA_LED_B : DIVA_PCI_LED_B); byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); - if (blink) - mod_timer(&cs->hw.diva.tl, jiffies + (blink * HZ) / 1000); -} - -static void -diva_ipacx_pci_init(struct IsdnCardState *cs) -{ - writel(PITA_INT0_ENABLE, cs->hw.diva.pci_cfg); - init_ipacx(cs, 3); // init chip and enable interrupts -} - -static void -diva_ipac_pci_init(struct IsdnCardState *cs) -{ - writel(PITA_INT0_ENABLE, cs->hw.diva.pci_cfg); - ipac_init(cs); -} - -static struct card_ops diva_ops = { - .init = inithscxisac, - .reset = diva_reset, - .release = diva_release, - .led_handler = diva_led_handler, - .irq_func = diva_interrupt, -}; - -static struct card_ops diva_ipac_isa_ops = { - .init = ipac_init, - .reset = diva_ipac_isa_reset, - .release = hisax_release_resources, - .irq_func = ipac_irq, -}; - -static struct card_ops diva_ipac_pci_ops = { - .init = diva_ipac_pci_init, - .reset = diva_ipac_pci_reset, - .release = diva_ipac_pci_release, - .irq_func = diva_ipac_pci_irq, -}; - -static struct card_ops diva_ipacx_pci_ops = { - .init = diva_ipacx_pci_init, - .reset = diva_ipacx_pci_reset, - .release = diva_ipac_pci_release, - .irq_func = diva_ipacx_pci_irq, -}; - -static int __init -diva_ipac_probe(struct IsdnCardState *cs) -{ - u8 val; - - // request_io - val = readreg(cs->hw.diva.cfg_reg + DIVA_IPAC_ADR, - cs->hw.diva.cfg_reg + DIVA_IPAC_DATA, IPAC_ID); - printk(KERN_INFO "Diva: IPAC version %x\n", val); - return (val == 1 || val == 2); -} - -static int __init -diva_ipac_isa_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->subtyp = DIVA_IPAC_ISA; - cs->irq = card->para[0]; - cs->hw.diva.cfg_reg = card->para[1]; - cs->hw.diva.isac = card->para[1] + DIVA_IPAC_DATA; - cs->hw.diva.isac_adr = card->para[1] + DIVA_IPAC_ADR; - printk(KERN_INFO "Diva: %s card configured at %#lx IRQ %d\n", - "IPAC ISA", cs->hw.diva.cfg_reg, cs->irq); - if (!request_io(&cs->rs, cs->hw.diva.cfg_reg, 8, "diva isdn")) - goto err; - diva_ipac_isa_reset(cs); - cs->card_ops = &diva_ipac_isa_ops; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -diva_isac_isa_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->subtyp = DIVA_ISA; - cs->irq = card->para[0]; - cs->hw.diva.cfg_reg = card->para[1]; - cs->hw.diva.ctrl = card->para[1] + DIVA_ISA_CTRL; - cs->hw.diva.isac = card->para[1] + DIVA_ISA_ISAC_DATA; - cs->hw.diva.hscx = card->para[1] + DIVA_HSCX_DATA; - cs->hw.diva.isac_adr = card->para[1] + DIVA_ISA_ISAC_ADR; - cs->hw.diva.hscx_adr = card->para[1] + DIVA_HSCX_ADR; - printk(KERN_INFO "Diva: %s card configured at %#lx IRQ %d\n", - "ISA", cs->hw.diva.cfg_reg, cs->irq); - if (!request_io(&cs->rs, cs->hw.diva.cfg_reg, 8, "diva isdn")) - goto err; - diva_reset(cs); - init_timer(&cs->hw.diva.tl); - cs->hw.diva.tl.function = (void *) diva_led_handler; - cs->hw.diva.tl.data = (long) cs; - cs->card_ops = &diva_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -diva_isa_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - int is_ipac; - cs->hw.diva.cfg_reg = card->para[1]; - if (!request_io(&cs->rs, cs->hw.diva.cfg_reg, 8, "diva isdn")) - return -EBUSY; - - is_ipac = diva_ipac_probe(cs); - hisax_release_resources(cs); - - if (is_ipac) - return diva_ipac_isa_probe(cs, card); - else - return diva_isac_isa_probe(cs, card); + if (blink) { + init_timer(&cs->hw.diva.tl); + cs->hw.diva.tl.expires = jiffies + ((blink * HZ) / 1000); + add_timer(&cs->hw.diva.tl); + } } -static int __init -diva_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) +static int +Diva_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - if (pci_enable_device(pdev)) - goto err; + u_int *ireg; + u_long flags; - cs->subtyp = DIVA_PCI; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.diva.cfg_reg = pci_resource_start(pdev, 2); - cs->hw.diva.ctrl = cs->hw.diva.cfg_reg + DIVA_PCI_CTRL; - cs->hw.diva.isac = cs->hw.diva.cfg_reg + DIVA_PCI_ISAC_DATA; - cs->hw.diva.hscx = cs->hw.diva.cfg_reg + DIVA_HSCX_DATA; - cs->hw.diva.isac_adr = cs->hw.diva.cfg_reg + DIVA_PCI_ISAC_ADR; - cs->hw.diva.hscx_adr = cs->hw.diva.cfg_reg + DIVA_HSCX_ADR; - printk(KERN_INFO "Diva: %s card configured at %#lx IRQ %d\n", - "PCI", cs->hw.diva.cfg_reg, cs->irq); - printk(KERN_INFO "Diva: %s space at %#lx\n", - "PCI", cs->hw.diva.pci_cfg); - if (!request_io(&cs->rs, cs->hw.diva.cfg_reg, 32, "diva isdn")) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -diva_ipac_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = DIVA_IPAC_PCI; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.diva.pci_cfg = (unsigned long)request_mmio( - &cs->rs, pci_resource_start(pdev, 0), 4096, "diva"); - cs->hw.diva.cfg_reg = (unsigned long)request_mmio( - &cs->rs, pci_resource_start(pdev, 1), 4096, "diva"); - printk(KERN_INFO "Diva: %s card configured at %#lx IRQ %d\n", - "IPAC PCI", cs->hw.diva.cfg_reg, cs->irq); - printk(KERN_INFO "Diva: %s space at %#lx\n", - "IPAC PCI", cs->hw.diva.pci_cfg); - diva_ipac_pci_reset(cs); - cs->card_ops = &diva_ipac_pci_ops; - if (ipac_setup(cs, &mem_ipac_dc_ops, &mem_ipac_bc_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -diva_ipacx_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = DIVA_IPACX_PCI; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - printk(KERN_INFO "Diva: %s card configured at %#lx IRQ %d\n", - "IPACX PCI", cs->hw.diva.cfg_reg, cs->irq); - printk(KERN_INFO "Diva: %s space at %#lx\n", - "IPACX PCI", cs->hw.diva.pci_cfg); - diva_ipacx_pci_reset(cs); - cs->card_ops = &diva_ipacx_pci_ops; - if (ipacx_setup(cs, &ipacx_dc_ops, &ipacx_bc_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_diva(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_diva(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + reset_diva(cs); + if (cs->subtyp == DIVA_IPACX_PCI) { + ireg = (unsigned int *)cs->hw.diva.pci_cfg; + *ireg = PITA_INT0_ENABLE; + init_ipacx(cs, 3); // init chip and enable interrupts + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + } + if (cs->subtyp == DIVA_IPAC_PCI) { + ireg = (unsigned int *)cs->hw.diva.pci_cfg; + *ireg = PITA_INT0_ENABLE; + } + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + case (MDL_REMOVE | REQUEST): + cs->hw.diva.status = 0; + break; + case (MDL_ASSIGN | REQUEST): + cs->hw.diva.status |= DIVA_ASSIGN; + break; + case MDL_INFO_SETUP: + if ((long)arg) + cs->hw.diva.status |= 0x0200; + else + cs->hw.diva.status |= 0x0100; + break; + case MDL_INFO_CONN: + if ((long)arg) + cs->hw.diva.status |= 0x2000; + else + cs->hw.diva.status |= 0x1000; + break; + case MDL_INFO_REL: + if ((long)arg) { + cs->hw.diva.status &= ~0x2000; + cs->hw.diva.status &= ~0x0200; + } else { + cs->hw.diva.status &= ~0x1000; + cs->hw.diva.status &= ~0x0100; + } + break; + } + if ((cs->subtyp != DIVA_IPAC_ISA) && + (cs->subtyp != DIVA_IPAC_PCI) && + (cs->subtyp != DIVA_IPACX_PCI)) { + spin_lock_irqsave(&cs->lock, flags); + diva_led_handler(cs); + spin_unlock_irqrestore(&cs->lock, flags); + } + return(0); } static struct pci_dev *dev_diva __initdata = NULL; static struct pci_dev *dev_diva_u __initdata = NULL; static struct pci_dev *dev_diva201 __initdata = NULL; +static struct pci_dev *dev_diva202 __initdata = NULL; + #ifdef __ISAPNP__ static struct isapnp_device_id diva_ids[] __initdata = { { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), @@ -700,99 +916,268 @@ { 0, } }; -static struct isapnp_device_id *pdev = &diva_ids[0]; +static struct isapnp_device_id *ipid __initdata = &diva_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif + int __init setup_diva(struct IsdnCard *card) { + int bytecnt = 8; + u_char val; + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, Diva_revision); printk(KERN_INFO "HiSax: Eicon.Diehl Diva driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_DIEHLDIVA) + return(0); + cs->hw.diva.status = 0; if (card->para[1]) { - if (diva_isa_probe(card->cs, card) < 0) - return 0; - return 1; - - } + cs->hw.diva.ctrl_reg = 0; + cs->hw.diva.cfg_reg = card->para[1]; + val = readreg(cs->hw.diva.cfg_reg + DIVA_IPAC_ADR, + cs->hw.diva.cfg_reg + DIVA_IPAC_DATA, IPAC_ID); + printk(KERN_INFO "Diva: IPAC version %x\n", val); + if ((val == 1) || (val==2)) { + cs->subtyp = DIVA_IPAC_ISA; + cs->hw.diva.ctrl = 0; + cs->hw.diva.isac = card->para[1] + DIVA_IPAC_DATA; + cs->hw.diva.hscx = card->para[1] + DIVA_IPAC_DATA; + cs->hw.diva.isac_adr = card->para[1] + DIVA_IPAC_ADR; + cs->hw.diva.hscx_adr = card->para[1] + DIVA_IPAC_ADR; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + } else { + cs->subtyp = DIVA_ISA; + cs->hw.diva.ctrl = card->para[1] + DIVA_ISA_CTRL; + cs->hw.diva.isac = card->para[1] + DIVA_ISA_ISAC_DATA; + cs->hw.diva.hscx = card->para[1] + DIVA_HSCX_DATA; + cs->hw.diva.isac_adr = card->para[1] + DIVA_ISA_ISAC_ADR; + cs->hw.diva.hscx_adr = card->para[1] + DIVA_HSCX_ADR; + } + cs->irq = card->para[0]; + } else { #ifdef __ISAPNP__ - if (isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; - - while(pdev->card_vendor) { - if ((pb = pnp_find_card(pdev->card_vendor, - pdev->card_device, pnp_c))) { - pnp_c = pb; - pd = NULL; - if ((pd = pnp_find_dev(pnp_c, - pdev->vendor, - pdev->function, - pd))) { - printk(KERN_INFO "HiSax: %s detected\n", - (char *)pdev->driver_data); - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "Diva PnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "Diva PnP: activate failed\n"); - pnp_device_detach(pd); - return 0; - } - if (!pnp_irq_valid(pd, 0) || !pnp_port_valid(pd, 0)) { - printk(KERN_ERR "Diva PnP:some resources are missing %ld/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0)); - pnp_device_detach(pd); - return(0); - } - card->para[1] = pnp_port_start(pd, 0); - card->para[0] = pnp_irq(pd, 0); - if (pdev->function == ISAPNP_FUNCTION(0xA1)) { - if (diva_ipac_isa_probe(card->cs, card)) - return 0; - return 1; + if (isapnp_present()) { + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; + + printk(KERN_INFO "HiSax: %s detected\n", + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); + } + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + if (!card->para[0] || !card->para[1]) { + printk(KERN_ERR "Diva PnP:some resources are missing %ld/%lx\n", + card->para[0], card->para[1]); + pnp_disable_dev(pnp_d); + return(0); + } + cs->hw.diva.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + if (ipid->function == ISAPNP_FUNCTION(0xA1)) { + cs->subtyp = DIVA_IPAC_ISA; + cs->hw.diva.ctrl = 0; + cs->hw.diva.isac = + card->para[1] + DIVA_IPAC_DATA; + cs->hw.diva.hscx = + card->para[1] + DIVA_IPAC_DATA; + cs->hw.diva.isac_adr = + card->para[1] + DIVA_IPAC_ADR; + cs->hw.diva.hscx_adr = + card->para[1] + DIVA_IPAC_ADR; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + } else { + cs->subtyp = DIVA_ISA; + cs->hw.diva.ctrl = + card->para[1] + DIVA_ISA_CTRL; + cs->hw.diva.isac = + card->para[1] + DIVA_ISA_ISAC_DATA; + cs->hw.diva.hscx = + card->para[1] + DIVA_HSCX_DATA; + cs->hw.diva.isac_adr = + card->para[1] + DIVA_ISA_ISAC_ADR; + cs->hw.diva.hscx_adr = + card->para[1] + DIVA_HSCX_ADR; + } + goto ready; } else { - if (diva_isac_isa_probe(card->cs, card)) - return 0; - return 1; + printk(KERN_ERR "Diva PnP: PnP error card found, no device\n"); + return(0); } - } else { - printk(KERN_ERR "Diva PnP: PnP error card found, no device\n"); - return(0); } - pdev++; + ipid++; pnp_c=NULL; } - if (!pdev->card_vendor) { + if (!ipid->card_vendor) { printk(KERN_INFO "Diva PnP: no ISAPnP card found\n"); } } - } #endif -#ifdef CONFIG_PCI - if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, - PCI_DEVICE_ID_EICON_DIVA20, - dev_diva))) { - if (diva_pci_probe(card->cs, dev_diva)) - return 0; - return 1; - } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, - PCI_DEVICE_ID_EICON_DIVA20_U, - dev_diva_u))) { - if (diva_pci_probe(card->cs, dev_diva_u)) - return 0; - return 1; - } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, - PCI_DEVICE_ID_EICON_DIVA201, - dev_diva201))) { - if (diva_ipac_pci_probe(card->cs, dev_diva201)) - return 0; - return 1; - } - printk(KERN_WARNING "Diva: No PCI card found\n"); +#if CONFIG_PCI + cs->subtyp = 0; + if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, + PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) { + if (pci_enable_device(dev_diva)) + return(0); + cs->subtyp = DIVA_PCI; + cs->irq = dev_diva->irq; + cs->hw.diva.cfg_reg = pci_resource_start(dev_diva, 2); + } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, + PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) { + if (pci_enable_device(dev_diva_u)) + return(0); + cs->subtyp = DIVA_PCI; + cs->irq = dev_diva_u->irq; + cs->hw.diva.cfg_reg = pci_resource_start(dev_diva_u, 2); + } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, + PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { + if (pci_enable_device(dev_diva201)) + return(0); + cs->subtyp = DIVA_IPAC_PCI; + cs->irq = dev_diva201->irq; + cs->hw.diva.pci_cfg = + (ulong) ioremap(pci_resource_start(dev_diva201, 0), 4096); + cs->hw.diva.cfg_reg = + (ulong) ioremap(pci_resource_start(dev_diva201, 1), 4096); + } else if ((dev_diva202 = pci_find_device(PCI_VENDOR_ID_EICON, + PCI_DEVICE_ID_EICON_DIVA202, dev_diva202))) { + if (pci_enable_device(dev_diva202)) + return(0); + cs->subtyp = DIVA_IPACX_PCI; + cs->irq = dev_diva202->irq; + cs->hw.diva.pci_cfg = + (ulong) ioremap(pci_resource_start(dev_diva202, 0), 4096); + cs->hw.diva.cfg_reg = + (ulong) ioremap(pci_resource_start(dev_diva202, 1), 4096); + } else { + printk(KERN_WARNING "Diva: No PCI card found\n"); + return(0); + } + + if (!cs->irq) { + printk(KERN_WARNING "Diva: No IRQ for PCI card found\n"); + return(0); + } + + if (!cs->hw.diva.cfg_reg) { + printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n"); + return(0); + } + cs->irq_flags |= SA_SHIRQ; +#else + printk(KERN_WARNING "Diva: cfgreg 0 and NO_PCI_BIOS\n"); + printk(KERN_WARNING "Diva: unable to config DIVA PCI\n"); + return (0); #endif /* CONFIG_PCI */ - return 0; + if ((cs->subtyp == DIVA_IPAC_PCI) || + (cs->subtyp == DIVA_IPACX_PCI) ) { + cs->hw.diva.ctrl = 0; + cs->hw.diva.isac = 0; + cs->hw.diva.hscx = 0; + cs->hw.diva.isac_adr = 0; + cs->hw.diva.hscx_adr = 0; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + bytecnt = 0; + } else { + cs->hw.diva.ctrl = cs->hw.diva.cfg_reg + DIVA_PCI_CTRL; + cs->hw.diva.isac = cs->hw.diva.cfg_reg + DIVA_PCI_ISAC_DATA; + cs->hw.diva.hscx = cs->hw.diva.cfg_reg + DIVA_HSCX_DATA; + cs->hw.diva.isac_adr = cs->hw.diva.cfg_reg + DIVA_PCI_ISAC_ADR; + cs->hw.diva.hscx_adr = cs->hw.diva.cfg_reg + DIVA_HSCX_ADR; + bytecnt = 32; + } + } +ready: + printk(KERN_INFO + "Diva: %s card configured at %#lx IRQ %d\n", + (cs->subtyp == DIVA_PCI) ? "PCI" : + (cs->subtyp == DIVA_ISA) ? "ISA" : + (cs->subtyp == DIVA_IPAC_ISA) ? "IPAC ISA" : + (cs->subtyp == DIVA_IPAC_PCI) ? "IPAC PCI" : "IPACX PCI", + cs->hw.diva.cfg_reg, cs->irq); + if ((cs->subtyp == DIVA_IPAC_PCI) || + (cs->subtyp == DIVA_IPACX_PCI) || + (cs->subtyp == DIVA_PCI) ) + printk(KERN_INFO "Diva: %s space at %#lx\n", + (cs->subtyp == DIVA_PCI) ? "PCI" : + (cs->subtyp == DIVA_IPAC_PCI) ? "IPAC PCI" : "IPACX PCI", + cs->hw.diva.pci_cfg); + if ((cs->subtyp != DIVA_IPAC_PCI) && + (cs->subtyp != DIVA_IPACX_PCI) ) { + if (!request_region(cs->hw.diva.cfg_reg, bytecnt, "diva isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %lx-%lx already in use\n", + CardType[card->typ], + cs->hw.diva.cfg_reg, + cs->hw.diva.cfg_reg + bytecnt); + return (0); + } + } + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &Diva_card_msg; + setup_isac(cs); + if (cs->subtyp == DIVA_IPAC_ISA) { + cs->readisac = &ReadISAC_IPAC; + cs->writeisac = &WriteISAC_IPAC; + cs->readisacfifo = &ReadISACfifo_IPAC; + cs->writeisacfifo = &WriteISACfifo_IPAC; + cs->irq_func = &diva_irq_ipac_isa; + val = readreg(cs->hw.diva.isac_adr, cs->hw.diva.isac, IPAC_ID); + printk(KERN_INFO "Diva: IPAC version %x\n", val); + } else if (cs->subtyp == DIVA_IPAC_PCI) { + cs->readisac = &MemReadISAC_IPAC; + cs->writeisac = &MemWriteISAC_IPAC; + cs->readisacfifo = &MemReadISACfifo_IPAC; + cs->writeisacfifo = &MemWriteISACfifo_IPAC; + cs->BC_Read_Reg = &MemReadHSCX; + cs->BC_Write_Reg = &MemWriteHSCX; + cs->BC_Send_Data = &Memhscx_fill_fifo; + cs->irq_func = &diva_irq_ipac_pci; + val = memreadreg(cs->hw.diva.cfg_reg, IPAC_ID); + printk(KERN_INFO "Diva: IPAC version %x\n", val); + } else if (cs->subtyp == DIVA_IPACX_PCI) { + cs->readisac = &MemReadISAC_IPACX; + cs->writeisac = &MemWriteISAC_IPACX; + cs->readisacfifo = &MemReadISACfifo_IPACX; + cs->writeisacfifo = &MemWriteISACfifo_IPACX; + cs->BC_Read_Reg = &MemReadHSCX_IPACX; + cs->BC_Write_Reg = &MemWriteHSCX_IPACX; + cs->BC_Send_Data = 0; // function located in ipacx module + cs->irq_func = &diva_irq_ipacx_pci; + printk(KERN_INFO "Diva: IPACX Design Id: %x\n", + MemReadISAC_IPACX(cs, IPACX_ID) &0x3F); + } else { /* DIVA 2.0 */ + cs->hw.diva.tl.function = (void *) diva_led_handler; + cs->hw.diva.tl.data = (long) cs; + init_timer(&cs->hw.diva.tl); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->irq_func = &diva_interrupt; + ISACVersion(cs, "Diva:"); + if (HscxVersion(cs, "Diva:")) { + printk(KERN_WARNING + "Diva: wrong HSCX versions check IO address\n"); + release_io_diva(cs); + return (0); + } + } + return (1); } diff -Nru a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c --- a/drivers/isdn/hisax/elsa.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/elsa.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: elsa.c,v 2.26.6.6 2001/09/23 22:24:47 kai Exp $ +/* $Id: elsa.c,v 2.32.2.4 2004/01/24 20:47:21 keil Exp $ * * low level stuff for Elsa isdn cards * @@ -32,9 +32,8 @@ #include extern const char *CardType[]; -static spinlock_t elsa_lock = SPIN_LOCK_UNLOCKED; -const char *Elsa_revision = "$Revision: 2.26.6.6 $"; +const char *Elsa_revision = "$Revision: 2.32.2.4 $"; const char *Elsa_Types[] = {"None", "PC", "PCC-8", "PCC-16", "PCF", "PCF-Pro", "PCMCIA", "QS 1000", "QS 3000", "Microlink PCI", "QS 3000 PCI", @@ -106,6 +105,7 @@ /* Status Flags */ #define ELSA_TIMER_AKTIV 1 #define ELSA_BAD_PWR 2 +#define ELSA_ASSIGN 4 #define RS_ISR_PASS_LIMIT 256 #define _INLINE_ inline @@ -141,163 +141,123 @@ #include "elsa_ser.c" #endif /* ARCOFI_USE */ -static inline u8 -readreg(struct IsdnCardState *cs, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&elsa_lock, flags); - byteout(cs->hw.elsa.ale, off); + byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&elsa_lock, flags); - return ret; + return (ret); } static inline void -writereg(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&elsa_lock, flags); - byteout(cs->hw.elsa.ale, off); - byteout(adr, data); - spin_unlock_irqrestore(&elsa_lock, flags); + byteout(ale, off); + insb(adr, data, size); } + static inline void -readfifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { - byteout(cs->hw.elsa.ale, off); - insb(adr, data, size); + byteout(ale, off); + byteout(adr, data); } static inline void -writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - byteout(cs->hw.elsa.ale, off); + byteout(ale, off); outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.elsa.isac, offset); + return (readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.elsa.isac, offset, value); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 *data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs, cs->hw.elsa.isac, 0, data, size); + readfifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 *data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.elsa.isac, 0, data, size); + writefifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0)); + return (readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset+0x80)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0), value); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, offset|0x80, value); } static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.elsa.hscx, hscx ? 0x40 : 0, data, size); + readfifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0x80, data, size); } static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - writefifo(cs, cs->hw.elsa.hscx, hscx ? 0x40 : 0, data, size); -} - -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static inline u8 -ipac_read(struct IsdnCardState *cs, u8 offset) -{ - return readreg(cs, cs->hw.elsa.isac, offset); -} - -static inline void -ipac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - writereg(cs, cs->hw.elsa.isac, offset, value); + writefifo(cs->hw.elsa.ale, cs->hw.elsa.isac, 0x80, data, size); } -static inline void -ipac_readfifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - readfifo(cs, cs->hw.elsa.isac, offset, data, size); + return (readreg(cs->hw.elsa.ale, + cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0))); } -static inline void -ipac_writefifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writefifo(cs, cs->hw.elsa.isac, offset, data, size); + writereg(cs->hw.elsa.ale, + cs->hw.elsa.hscx, offset + (hscx ? 0x40 : 0), value); } -/* This will generate ipac_dc_ops and ipac_bc_ops using the functions - * above */ - -BUILD_IPAC_OPS(ipac); - -static inline u8 -readitac(struct IsdnCardState *cs, u8 off) +static inline u_char +readitac(struct IsdnCardState *cs, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&elsa_lock, flags); byteout(cs->hw.elsa.ale, off); ret = bytein(cs->hw.elsa.itac); - spin_unlock_irqrestore(&elsa_lock, flags); - return ret; + return (ret); } static inline void -writeitac(struct IsdnCardState *cs, u8 off, u8 data) +writeitac(struct IsdnCardState *cs, u_char off, u_char data) { - unsigned long flags; - - spin_lock_irqsave(&elsa_lock, flags); byteout(cs->hw.elsa.ale, off); byteout(cs->hw.elsa.itac, data); - spin_unlock_irqrestore(&elsa_lock, flags); } static inline int TimerRun(struct IsdnCardState *cs) { - register u8 v; + register u_char v; v = bytein(cs->hw.elsa.cfg); if ((cs->subtyp == ELSA_QS1000) || (cs->subtyp == ELSA_QS3000)) @@ -306,12 +266,30 @@ return (v & ELSA_TIMER_RUN_PCC8); return (v & ELSA_TIMER_RUN); } +/* + * fast interrupt HSCX stuff goes here + */ + +#define READHSCX(cs, nr, reg) readreg(cs->hw.elsa.ale, \ + cs->hw.elsa.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.elsa.ale, \ + cs->hw.elsa.hscx, reg + (nr ? 0x40 : 0), data) + +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.elsa.ale, \ + cs->hw.elsa.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.elsa.ale, \ + cs->hw.elsa.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" static irqreturn_t elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val; + u_long flags; + u_char val; + int icnt=5; if ((cs->typ == ISDN_CTYPE_ELSA_PCMCIA) && (*cs->busy_flag == 1)) { /* The card tends to generate interrupts while being removed @@ -319,19 +297,45 @@ printk(KERN_WARNING "Elsa: card not available!\n"); return IRQ_NONE; } + spin_lock_irqsave(&cs->lock, flags); #if ARCOFI_USE if (cs->hw.elsa.MFlag) { val = serial_inp(cs, UART_IIR); if (!(val & UART_IIR_NO_INT)) { debugl1(cs,"IIR %02x", val); - spin_lock(&cs->lock); rs_interrupt_elsa(intno, cs); - spin_unlock(&cs->lock); } } #endif - hscxisac_irq(intno, dev_id, regs); - + val = readreg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_ISTA + 0x40); + Start_HSCX: + if (val) { + hscx_int_main(cs, val); + } + val = readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_ISTA); + Start_ISAC: + if (val) { + isac_interrupt(cs, val); + } + val = readreg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_ISTA + 0x40); + if (val && icnt) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + icnt--; + goto Start_HSCX; + } + val = readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_ISTA); + if (val && icnt) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + icnt--; + goto Start_ISAC; + } + if (!icnt) + printk(KERN_WARNING"ELSA IRQ LOOP\n"); + writereg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_MASK, 0xFF); if (cs->hw.elsa.status & ELSA_TIMER_AKTIV) { if (!TimerRun(cs)) { /* Timer Restart */ @@ -351,6 +355,10 @@ #endif if (cs->hw.elsa.trig) byteout(cs->hw.elsa.trig, 0x00); + writereg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_MASK, 0x0); + writereg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_MASK + 0x40, 0x0); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } @@ -358,35 +366,70 @@ elsa_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val; + u_long flags; + u_char ista,val; + int icnt=5; - if (!cs) { - printk(KERN_WARNING "Elsa: Spurious interrupt!\n"); - return IRQ_NONE; - } + spin_lock_irqsave(&cs->lock, flags); if (cs->subtyp == ELSA_QS1000PCI || cs->subtyp == ELSA_QS3000PCI) { val = bytein(cs->hw.elsa.cfg + 0x4c); /* PCI IRQ */ - if (!test_bit(FLG_BUGGY_PLX9050, &cs->HW_Flags) && - !(val & ELSA_PCI_IRQ_MASK)) + if (!(val & ELSA_PCI_IRQ_MASK)) { + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_NONE; + } } #if ARCOFI_USE if (cs->hw.elsa.MFlag) { val = serial_inp(cs, UART_IIR); if (!(val & UART_IIR_NO_INT)) { debugl1(cs,"IIR %02x", val); - spin_lock(&cs->lock); rs_interrupt_elsa(intno, cs); - spin_unlock(&cs->lock); } } #endif - return ipac_irq(intno, dev_id, regs); + ista = readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ISTA); +Start_IPAC: + if (cs->debug & L1_DEB_IPAC) + debugl1(cs, "IPAC ISTA %02X", ista); + if (ista & 0x0f) { + val = readreg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_ISTA + 0x40); + if (ista & 0x01) + val |= 0x01; + if (ista & 0x04) + val |= 0x02; + if (ista & 0x08) + val |= 0x04; + if (val) + hscx_int_main(cs, val); + } + if (ista & 0x20) { + val = 0xfe & readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_ISTA + 0x80); + if (val) { + isac_interrupt(cs, val); + } + } + if (ista & 0x10) { + val = 0x01; + isac_interrupt(cs, val); + } + ista = readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ISTA); + if ((ista & 0x3f) && icnt) { + icnt--; + goto Start_IPAC; + } + if (!icnt) + printk(KERN_WARNING "ELSA IRQ LOOP\n"); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_MASK, 0xFF); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_MASK, 0xC0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } -static void -elsa_release(struct IsdnCardState *cs) +void +release_io_elsa(struct IsdnCardState *cs) { + int bytecnt = 8; + del_timer(&cs->hw.elsa.tl); #if ARCOFI_USE clear_arcofi(cs); @@ -395,28 +438,33 @@ byteout(cs->hw.elsa.ctrl, 0); /* LEDs Out */ if (cs->subtyp == ELSA_QS1000PCI) { byteout(cs->hw.elsa.cfg + 0x4c, 0x01); /* disable IRQ */ - writereg(cs, cs->hw.elsa.isac, IPAC_ATX, 0xff); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff); + bytecnt = 2; + release_region(cs->hw.elsa.cfg, 0x80); } if (cs->subtyp == ELSA_QS3000PCI) { byteout(cs->hw.elsa.cfg + 0x4c, 0x03); /* disable ELSA PCI IRQ */ - writereg(cs, cs->hw.elsa.isac, IPAC_ATX, 0xff); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff); + release_region(cs->hw.elsa.cfg, 0x80); } if (cs->subtyp == ELSA_PCMCIA_IPAC) { - writereg(cs, cs->hw.elsa.isac, IPAC_ATX, 0xff); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff); } -#if ARCOFI_USE if ((cs->subtyp == ELSA_PCFPRO) || (cs->subtyp == ELSA_QS3000) || (cs->subtyp == ELSA_PCF) || (cs->subtyp == ELSA_QS3000PCI)) { + bytecnt = 16; +#if ARCOFI_USE release_modem(cs); - } #endif - hisax_release_resources(cs); + } + if (cs->hw.elsa.base) + release_region(cs->hw.elsa.base, bytecnt); } -static int -elsa_reset(struct IsdnCardState *cs) +static void +reset_elsa(struct IsdnCardState *cs) { if (cs->hw.elsa.timer) { /* Wait 1 Timer */ @@ -437,28 +485,25 @@ byteout(cs->hw.elsa.trig, 0xff); } if ((cs->subtyp == ELSA_QS1000PCI) || (cs->subtyp == ELSA_QS3000PCI) || (cs->subtyp == ELSA_PCMCIA_IPAC)) { - writereg(cs, cs->hw.elsa.isac, IPAC_POTA2, 0x20); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - writereg(cs, cs->hw.elsa.isac, IPAC_POTA2, 0x00); - set_current_state(TASK_UNINTERRUPTIBLE); - writereg(cs, cs->hw.elsa.isac, IPAC_MASK, 0xc0); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_POTA2, 0x20); + mdelay(10); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_POTA2, 0x00); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_MASK, 0xc0); + mdelay(10); if (cs->subtyp != ELSA_PCMCIA_IPAC) { - writereg(cs, cs->hw.elsa.isac, IPAC_ACFG, 0x0); - writereg(cs, cs->hw.elsa.isac, IPAC_AOE, 0x3c); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ACFG, 0x0); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_AOE, 0x3c); } else { - writereg(cs, cs->hw.elsa.isac, IPAC_PCFG, 0x10); - writereg(cs, cs->hw.elsa.isac, IPAC_ACFG, 0x4); - writereg(cs, cs->hw.elsa.isac, IPAC_AOE, 0xf8); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_PCFG, 0x10); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ACFG, 0x4); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_AOE, 0xf8); } - writereg(cs, cs->hw.elsa.isac, IPAC_ATX, 0xff); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, 0xff); if (cs->subtyp == ELSA_QS1000PCI) byteout(cs->hw.elsa.cfg + 0x4c, 0x41); /* enable ELSA PCI IRQ */ else if (cs->subtyp == ELSA_QS3000PCI) byteout(cs->hw.elsa.cfg + 0x4c, 0x43); /* enable ELSA PCI IRQ */ } - return 0; } #if ARCOFI_USE @@ -476,7 +521,7 @@ int arcofi_present = 0; char tmp[40]; char *t; - u8 *p; + u_char *p; if (!cs->dc.isac.mon_tx) if (!(cs->dc.isac.mon_tx=kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) { @@ -525,14 +570,28 @@ "Elsa: %s detected modem at 0x%lx\n", Elsa_Types[cs->subtyp], cs->hw.elsa.base+8); - request_io(&cs->rs, cs->hw.elsa.base+8, 8, "elsa isdn modem"); + release_region(cs->hw.elsa.base, 8); + if (!request_region(cs->hw.elsa.base, 16, "elsa isdn modem")) { + printk(KERN_WARNING + "HiSax: %s config port %lx-%lx already in use\n", + Elsa_Types[cs->subtyp], + cs->hw.elsa.base + 8, + cs->hw.elsa.base + 16); + } } else if (cs->subtyp==ELSA_PCC16) { cs->subtyp = ELSA_PCF; printk(KERN_INFO "Elsa: %s detected modem at 0x%lx\n", Elsa_Types[cs->subtyp], cs->hw.elsa.base+8); - request_io(&cs->rs, cs->hw.elsa.base+8, 8, "elsa isdn modem"); + release_region(cs->hw.elsa.base, 8); + if (!request_region(cs->hw.elsa.base, 16, "elsa isdn modem")) { + printk(KERN_WARNING + "HiSax: %s config port %lx-%lx already in use\n", + Elsa_Types[cs->subtyp], + cs->hw.elsa.base + 8, + cs->hw.elsa.base + 16); + } } else printk(KERN_INFO "Elsa: %s detected modem at 0x%lx\n", @@ -553,15 +612,8 @@ if (cs->subtyp == ELSA_PCMCIA || cs->subtyp == ELSA_PCMCIA_IPAC) return; - - if (cs->typ == ISDN_CTYPE_ELSA) { - int pwr = bytein(cs->hw.elsa.ale); - if (pwr & 0x08) - cs->hw.elsa.status |= ELSA_BAD_PWR; - else - cs->hw.elsa.status &= ~ELSA_BAD_PWR; - } - if (cs->status & 0x0001) + del_timer(&cs->hw.elsa.tl); + if (cs->hw.elsa.status & ELSA_ASSIGN) cs->hw.elsa.ctrl_reg |= ELSA_STAT_LED; else if (cs->hw.elsa.status & ELSA_BAD_PWR) cs->hw.elsa.ctrl_reg &= ~ELSA_STAT_LED; @@ -569,9 +621,9 @@ cs->hw.elsa.ctrl_reg ^= ELSA_STAT_LED; blink = 250; } - if (cs->status & 0xf000) + if (cs->hw.elsa.status & 0xf000) cs->hw.elsa.ctrl_reg |= ELSA_LINE_LED; - else if (cs->status & 0x0f00) { + else if (cs->hw.elsa.status & 0x0f00) { cs->hw.elsa.ctrl_reg ^= ELSA_LINE_LED; blink = 500; } else @@ -579,159 +631,148 @@ if ((cs->subtyp == ELSA_QS1000PCI) || (cs->subtyp == ELSA_QS3000PCI)) { - u8 led = 0xff; + u_char led = 0xff; if (cs->hw.elsa.ctrl_reg & ELSA_LINE_LED) led ^= ELSA_IPAC_LINE_LED; if (cs->hw.elsa.ctrl_reg & ELSA_STAT_LED) led ^= ELSA_IPAC_STAT_LED; - writereg(cs, cs->hw.elsa.isac, IPAC_ATX, led); + writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ATX, led); } else byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg); - - if (blink) - mod_timer(&cs->hw.elsa.tl, jiffies + (blink * HZ) / 1000); -} - -#if ARCOFI_USE -static void -elsa_aux_ind(struct IsdnCardState *cs, void *arg) -{ - if (cs->hw.elsa.MFlag) { - int len; - u8 *msg; - - if (!arg) - return; - msg = arg; - len = *msg; - msg++; - modem_write_cmd(cs, msg, len); - } -} -#else -#define elsa_aux_ind NULL -#endif - -static void -elsa_init(struct IsdnCardState *cs) -{ - if (cs->subtyp == ELSA_QS1000 || cs->subtyp == ELSA_QS3000) - byteout(cs->hw.elsa.timer, 0); - - if (cs->hw.elsa.trig) - byteout(cs->hw.elsa.trig, 0xff); - - inithscxisac(cs); + if (blink) { + init_timer(&cs->hw.elsa.tl); + cs->hw.elsa.tl.expires = jiffies + ((blink * HZ) / 1000); + add_timer(&cs->hw.elsa.tl); + } } -static void -elsa_ipac_init(struct IsdnCardState *cs) +static int +Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - if (cs->hw.elsa.trig) - byteout(cs->hw.elsa.trig, 0xff); - - ipac_init(cs); -} + int ret = 0; + u_long flags; -static void -elsa_test(struct IsdnCardState *cs) -{ - if ((cs->subtyp == ELSA_PCMCIA) || - (cs->subtyp == ELSA_PCMCIA_IPAC) || - (cs->subtyp == ELSA_QS1000PCI)) { - return; - } - if (cs->subtyp != ELSA_QS3000PCI) { - cs->hw.elsa.counter = 0; - cs->hw.elsa.ctrl_reg |= ELSA_ENA_TIMER_INT; - cs->hw.elsa.status |= ELSA_TIMER_AKTIV; - byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg); - byteout(cs->hw.elsa.timer, 0); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((110*HZ)/1000); - cs->hw.elsa.ctrl_reg &= ~ELSA_ENA_TIMER_INT; - byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg); - cs->hw.elsa.status &= ~ELSA_TIMER_AKTIV; - printk(KERN_INFO "Elsa: %d timer tics in 110 msek\n", - cs->hw.elsa.counter); - if ((cs->hw.elsa.counter > 10) && - (cs->hw.elsa.counter < 16)) { - printk(KERN_INFO "Elsa: timer and irq OK\n"); - } else { - printk(KERN_WARNING - "Elsa: timer tic problem (%d/12) maybe an IRQ(%d) conflict\n", - cs->hw.elsa.counter, cs->irq); - } - } + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_elsa(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_elsa(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + cs->debug |= L1_DEB_IPAC; + reset_elsa(cs); + inithscxisac(cs, 1); + if ((cs->subtyp == ELSA_QS1000) || + (cs->subtyp == ELSA_QS3000)) + { + byteout(cs->hw.elsa.timer, 0); + } + if (cs->hw.elsa.trig) + byteout(cs->hw.elsa.trig, 0xff); + inithscxisac(cs, 2); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + if ((cs->subtyp == ELSA_PCMCIA) || + (cs->subtyp == ELSA_PCMCIA_IPAC) || + (cs->subtyp == ELSA_QS1000PCI)) { + return(0); + } else if (cs->subtyp == ELSA_QS3000PCI) { + ret = 0; + } else { + spin_lock_irqsave(&cs->lock, flags); + cs->hw.elsa.counter = 0; + cs->hw.elsa.ctrl_reg |= ELSA_ENA_TIMER_INT; + cs->hw.elsa.status |= ELSA_TIMER_AKTIV; + byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg); + byteout(cs->hw.elsa.timer, 0); + spin_unlock_irqrestore(&cs->lock, flags); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout((110*HZ)/1000); + spin_lock_irqsave(&cs->lock, flags); + cs->hw.elsa.ctrl_reg &= ~ELSA_ENA_TIMER_INT; + byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg); + cs->hw.elsa.status &= ~ELSA_TIMER_AKTIV; + spin_unlock_irqrestore(&cs->lock, flags); + printk(KERN_INFO "Elsa: %d timer tics in 110 msek\n", + cs->hw.elsa.counter); + if ((cs->hw.elsa.counter > 10) && + (cs->hw.elsa.counter < 16)) { + printk(KERN_INFO "Elsa: timer and irq OK\n"); + ret = 0; + } else { + printk(KERN_WARNING + "Elsa: timer tic problem (%d/12) maybe an IRQ(%d) conflict\n", + cs->hw.elsa.counter, cs->irq); + ret = 1; + } + } #if ARCOFI_USE - if (check_arcofi(cs)) { - init_modem(cs); - } + if (check_arcofi(cs)) { + init_modem(cs); + } #endif - elsa_led_handler(cs); -} - -static struct card_ops elsa_ops = { - .init = elsa_init, - .test = elsa_test, - .reset = elsa_reset, - .release = elsa_release, - .aux_ind = elsa_aux_ind, - .led_handler = elsa_led_handler, - .irq_func = elsa_interrupt, -}; - -static struct card_ops elsa_ipac_ops = { - .init = elsa_ipac_init, - .test = elsa_test, - .reset = elsa_reset, - .release = elsa_release, - .aux_ind = elsa_aux_ind, - .led_handler = elsa_led_handler, - .irq_func = elsa_interrupt_ipac, -}; - -static void __init -elsa_arcofi_init(struct IsdnCardState *cs) -{ + elsa_led_handler(cs); + return(ret); + case (MDL_REMOVE | REQUEST): + cs->hw.elsa.status &= 0; + break; + case (MDL_ASSIGN | REQUEST): + cs->hw.elsa.status |= ELSA_ASSIGN; + break; + case MDL_INFO_SETUP: + if ((long) arg) + cs->hw.elsa.status |= 0x0200; + else + cs->hw.elsa.status |= 0x0100; + break; + case MDL_INFO_CONN: + if ((long) arg) + cs->hw.elsa.status |= 0x2000; + else + cs->hw.elsa.status |= 0x1000; + break; + case MDL_INFO_REL: + if ((long) arg) { + cs->hw.elsa.status &= ~0x2000; + cs->hw.elsa.status &= ~0x0200; + } else { + cs->hw.elsa.status &= ~0x1000; + cs->hw.elsa.status &= ~0x0100; + } + break; #if ARCOFI_USE - init_arcofi(cs); + case CARD_AUX_IND: + if (cs->hw.elsa.MFlag) { + int len; + u_char *msg; + + if (!arg) + return(0); + msg = arg; + len = *msg; + msg++; + modem_write_cmd(cs, msg, len); + } + break; #endif -} - -static void __init -elsa_timer_init(struct IsdnCardState *cs) -{ - cs->hw.elsa.tl.function = (void *) elsa_led_handler; - cs->hw.elsa.tl.data = (long) cs; - init_timer(&cs->hw.elsa.tl); -} - -static int __init -elsa_timer_test(struct IsdnCardState *cs) -{ - /* test timer */ - byteout(cs->hw.elsa.trig, 0xff); - byteout(cs->hw.elsa.timer, 0); - if (!TimerRun(cs)) { - byteout(cs->hw.elsa.timer, 0); /* second attempt */ - if (!TimerRun(cs)) { - printk(KERN_WARNING "Elsa: timer does not start\n"); - goto err; - } } - HZDELAY(10 * HZ / 1000); /* wait >=10 ms */ - if (TimerRun(cs)) { - printk(KERN_WARNING "Elsa: timer does not run\n"); - goto err; - } - printk(KERN_INFO "Elsa: timer OK; resetting card\n"); - return 0; - err: - return -EBUSY; + if (cs->typ == ISDN_CTYPE_ELSA) { + int pwr = bytein(cs->hw.elsa.ale); + if (pwr & 0x08) + cs->hw.elsa.status |= ELSA_BAD_PWR; + else + cs->hw.elsa.status &= ~ELSA_BAD_PWR; + } + elsa_led_handler(cs); + return(ret); } -static unsigned char __init +static unsigned char probe_elsa_adr(unsigned int adr, int typ) { int i, in1, in2, p16_1 = 0, p16_2 = 0, p8_1 = 0, p8_2 = 0, pc_1 = 0, @@ -740,13 +781,18 @@ /* In case of the elsa pcmcia card, this region is in use, reserved for us by the card manager. So we do not check it here, it would fail. */ - if (typ != ISDN_CTYPE_ELSA_PCMCIA && !request_region(adr, 8, "elsa")) { - printk(KERN_WARNING "Elsa: probing port 0x%x: in use\n", adr); - return 0; + if (typ != ISDN_CTYPE_ELSA_PCMCIA) { + if (request_region(adr, 8, "elsa card")) { + release_region(adr, 8); + } else { + printk(KERN_WARNING + "Elsa: Probing Port 0x%x: already in use\n", adr); + return (0); + } } for (i = 0; i < 16; i++) { - in1 = inb(adr + ELSA_CONFIG); /* 'toggels' at */ - in2 = inb(adr + ELSA_CONFIG); /* each access */ + in1 = inb(adr + ELSA_CONFIG); /* 'toggelt' bei */ + in2 = inb(adr + ELSA_CONFIG); /* jedem Zugriff */ p16_1 += 0x04 & in1; p16_2 += 0x04 & in2; p8_1 += 0x02 & in1; @@ -756,7 +802,6 @@ pfp_1 += 0x40 & in1; pfp_2 += 0x40 & in2; } - release_region(adr, 8); printk(KERN_INFO "Elsa: Probing IO 0x%x", adr); if (65 == ++p16_1 * ++p16_2) { printk(" PCC-16/PCF found\n"); @@ -776,227 +821,18 @@ } } -static int __init -elsa_probe(struct IsdnCardState *cs, struct IsdnCard *card) +static unsigned int +probe_elsa(struct IsdnCardState *cs) { - u8 val; - int i, bytecnt = 8; - unsigned int CARD_portlist[] = {0x160, 0x170, 0x260, 0x360, 0}; - - cs->hw.elsa.base = card->para[0]; - printk(KERN_INFO "Elsa: Microlink IO probing\n"); - if (cs->hw.elsa.base) { - cs->subtyp = probe_elsa_adr(cs->hw.elsa.base, cs->typ); - if (!cs->subtyp) { - printk(KERN_WARNING "Elsa: no Microlink at %#lx\n", - cs->hw.elsa.base); - goto err; - } - } else { - for (i = 0; CARD_portlist[i]; i++) { - cs->subtyp = probe_elsa_adr(CARD_portlist[i], cs->typ); - if (cs->subtyp) - cs->hw.elsa.base = CARD_portlist[i]; - break; - } - } - if (!cs->hw.elsa.base) - goto err; - - cs->hw.elsa.cfg = cs->hw.elsa.base + ELSA_CONFIG; - cs->hw.elsa.ctrl = cs->hw.elsa.base + ELSA_CONTROL; - cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE; - cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC; - cs->hw.elsa.itac = cs->hw.elsa.base + ELSA_ITAC; - cs->hw.elsa.hscx = cs->hw.elsa.base + ELSA_HSCX; - cs->hw.elsa.trig = cs->hw.elsa.base + ELSA_TRIG_IRQ; - cs->hw.elsa.timer = cs->hw.elsa.base + ELSA_START_TIMER; - val = bytein(cs->hw.elsa.cfg); - if (cs->subtyp == ELSA_PC) { - const u8 CARD_IrqTab[8] = {7, 3, 5, 9, 0, 0, 0, 0}; - cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PC) >> 2]; - } else if (cs->subtyp == ELSA_PCC8) { - const u8 CARD_IrqTab[8] = {7, 3, 5, 9, 0, 0, 0, 0}; - cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PCC8) >> 4]; - } else { - const u8 CARD_IrqTab[8] = {15, 10, 15, 3, 11, 5, 11, 9}; - cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX) >> 3]; - } - val = bytein(cs->hw.elsa.ale) & ELSA_HW_RELEASE; - if (val < 3) - val |= 8; - val += 'A' - 3; - if (val == 'B' || val == 'C') - val ^= 1; - if ((cs->subtyp == ELSA_PCFPRO) && (val = 'G')) - val = 'C'; - printk(KERN_INFO "Elsa: %s found at %#lx Rev.:%c IRQ %d\n", - Elsa_Types[cs->subtyp], cs->hw.elsa.base, val, cs->irq); - val = bytein(cs->hw.elsa.ale) & ELSA_S0_POWER_BAD; - if (val) { - printk(KERN_WARNING "Elsa: Microlink S0 bus power bad\n"); - cs->hw.elsa.status |= ELSA_BAD_PWR; - } - switch (cs->subtyp) { - case ELSA_PCFPRO: bytecnt = 16; break; - } - if (!request_io(&cs->rs, cs->hw.elsa.base, bytecnt, "elsa isdn")) - goto err; - elsa_arcofi_init(cs); - elsa_timer_init(cs); - if (elsa_timer_test(cs)) - goto err; - elsa_reset(cs); - cs->card_ops = &elsa_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - if (cs->subtyp == ELSA_PC) { - val = readitac(cs, ITAC_SYS); - printk(KERN_INFO "Elsa: ITAC version %s\n", ITACVer[val & 7]); - writeitac(cs, ITAC_ISEN, 0); - writeitac(cs, ITAC_RFIE, 0); - writeitac(cs, ITAC_XFIE, 0); - writeitac(cs, ITAC_SCIE, 0); - writeitac(cs, ITAC_STIE, 0); - } - return 0; - err: - elsa_release(cs); - return -EBUSY; -} - -static int __init -elsa_qs_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - int bytecnt = 8; + int i; + unsigned int CARD_portlist[] = + {0x160, 0x170, 0x260, 0x360, 0}; - cs->irq = card->para[0]; - cs->hw.elsa.base = card->para[1]; - cs->hw.elsa.cfg = cs->hw.elsa.base + ELSA_CONFIG; - cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE; - cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC; - cs->hw.elsa.hscx = cs->hw.elsa.base + ELSA_HSCX; - cs->hw.elsa.trig = cs->hw.elsa.base + ELSA_TRIG_IRQ; - cs->hw.elsa.timer = cs->hw.elsa.base + ELSA_START_TIMER; - cs->hw.elsa.ctrl = cs->hw.elsa.base + ELSA_CONTROL; - printk(KERN_INFO "Elsa: %s defined at %#lx IRQ %d\n", - Elsa_Types[cs->subtyp], cs->hw.elsa.base, cs->irq); - switch (cs->subtyp) { - case ELSA_QS3000: bytecnt = 16; break; - } - if (!request_io(&cs->rs, cs->hw.elsa.base, bytecnt, "elsa isdn")) - goto err; - elsa_arcofi_init(cs); - elsa_timer_init(cs); - if (elsa_timer_test(cs)) - goto err; - elsa_reset(cs); - cs->card_ops = &elsa_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - elsa_release(cs); - return -EBUSY; -} - -static int __init -elsa_qs1000_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->subtyp = ELSA_QS1000; - return elsa_qs_probe(cs, card); -} - -static int __init -elsa_qs3000_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->subtyp = ELSA_QS3000; - return elsa_qs_probe(cs, card); -} - -static int __init -elsa_pcmcia_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - u8 val; - - cs->irq = card->para[0]; - cs->hw.elsa.base = card->para[1]; - cs->hw.elsa.ale = cs->hw.elsa.base + 0; - val = readreg(cs, cs->hw.elsa.base + 2, IPAC_ID); - if ((val == 1) || (val == 2)) { /* IPAC version 1.1/1.2 */ - cs->subtyp = ELSA_PCMCIA_IPAC; - cs->hw.elsa.isac = cs->hw.elsa.base + 2; - } else { - cs->subtyp = ELSA_PCMCIA; - cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE_PCM; - cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC_PCM; - cs->hw.elsa.hscx = cs->hw.elsa.base + ELSA_HSCX; - } - cs->hw.elsa.timer = 0; - cs->hw.elsa.trig = 0; - cs->hw.elsa.ctrl = 0; - printk(KERN_INFO "Elsa: %s defined at %#lx IRQ %d\n", - Elsa_Types[cs->subtyp], cs->hw.elsa.base, cs->irq); - elsa_arcofi_init(cs); - elsa_reset(cs); - if (cs->subtyp == ELSA_PCMCIA_IPAC) { - cs->card_ops = &elsa_ipac_ops; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - goto err; - } else { - cs->card_ops = &elsa_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - } - return 0; - err: - elsa_release(cs); - return -EBUSY; -} - -static int __init -elsa_qs_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev, - int subtyp) -{ - int bytecnt = 2; - u8 pci_rev; - - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = subtyp; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.elsa.cfg = pci_resource_start(pdev, 1); - cs->hw.elsa.base = pci_resource_start(pdev, 3); - pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev); - if (cs->hw.elsa.cfg & 0x80 && pci_rev == 1) { - printk(KERN_INFO "Elsa: PLX9050 rev1 workaround activated\n"); - __set_bit(FLG_BUGGY_PLX9050, &cs->HW_Flags); - } - cs->hw.elsa.ale = cs->hw.elsa.base; - cs->hw.elsa.isac = cs->hw.elsa.base +1; - cs->hw.elsa.hscx = cs->hw.elsa.base +1; - printk(KERN_INFO "Elsa: %s defined at %#lx/%#x IRQ %d\n", - Elsa_Types[cs->subtyp], cs->hw.elsa.base, cs->hw.elsa.cfg, - cs->irq); - switch (cs->subtyp) { - case ELSA_QS3000PCI: bytecnt = 16; break; + for (i = 0; CARD_portlist[i]; i++) { + if ((cs->subtyp = probe_elsa_adr(CARD_portlist[i], cs->typ))) + break; } - if (!request_io(&cs->rs, cs->hw.elsa.base, bytecnt, "elsa isdn")) - goto err; - if (!request_io(&cs->rs, cs->hw.elsa.cfg, 0x80, "elsa isdn pci")) - goto err; - elsa_arcofi_init(cs); - elsa_timer_init(cs); - elsa_reset(cs); - cs->card_ops = &elsa_ipac_ops; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - goto err; - return 0; - err: - elsa_release(cs); - return -EBUSY; + return (CARD_portlist[i]); } static struct pci_dev *dev_qs1000 __devinitdata = NULL; @@ -1013,109 +849,343 @@ { 0, } }; -static struct isapnp_device_id *pdev = &elsa_ids[0]; +static struct isapnp_device_id *ipid __initdata = &elsa_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif int __devinit setup_elsa(struct IsdnCard *card) { + int bytecnt; + u_char val; + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, Elsa_revision); printk(KERN_INFO "HiSax: Elsa driver Rev. %s\n", HiSax_getrev(tmp)); - - if (card->typ == ISDN_CTYPE_ELSA) { - if (elsa_probe(card->cs, card)) - return 0; - return 1; - } else if (card->typ == ISDN_CTYPE_ELSA_PNP) { + cs->hw.elsa.ctrl_reg = 0; + cs->hw.elsa.status = 0; + cs->hw.elsa.MFlag = 0; + cs->subtyp = 0; + if (cs->typ == ISDN_CTYPE_ELSA) { + cs->hw.elsa.base = card->para[0]; + printk(KERN_INFO "Elsa: Microlink IO probing\n"); + if (cs->hw.elsa.base) { + if (!(cs->subtyp = probe_elsa_adr(cs->hw.elsa.base, + cs->typ))) { + printk(KERN_WARNING + "Elsa: no Elsa Microlink at %#lx\n", + cs->hw.elsa.base); + return (0); + } + } else + cs->hw.elsa.base = probe_elsa(cs); + if (cs->hw.elsa.base) { + cs->hw.elsa.cfg = cs->hw.elsa.base + ELSA_CONFIG; + cs->hw.elsa.ctrl = cs->hw.elsa.base + ELSA_CONTROL; + cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE; + cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC; + cs->hw.elsa.itac = cs->hw.elsa.base + ELSA_ITAC; + cs->hw.elsa.hscx = cs->hw.elsa.base + ELSA_HSCX; + cs->hw.elsa.trig = cs->hw.elsa.base + ELSA_TRIG_IRQ; + cs->hw.elsa.timer = cs->hw.elsa.base + ELSA_START_TIMER; + val = bytein(cs->hw.elsa.cfg); + if (cs->subtyp == ELSA_PC) { + const u_char CARD_IrqTab[8] = + {7, 3, 5, 9, 0, 0, 0, 0}; + cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PC) >> 2]; + } else if (cs->subtyp == ELSA_PCC8) { + const u_char CARD_IrqTab[8] = + {7, 3, 5, 9, 0, 0, 0, 0}; + cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX_PCC8) >> 4]; + } else { + const u_char CARD_IrqTab[8] = + {15, 10, 15, 3, 11, 5, 11, 9}; + cs->irq = CARD_IrqTab[(val & ELSA_IRQ_IDX) >> 3]; + } + val = bytein(cs->hw.elsa.ale) & ELSA_HW_RELEASE; + if (val < 3) + val |= 8; + val += 'A' - 3; + if (val == 'B' || val == 'C') + val ^= 1; + if ((cs->subtyp == ELSA_PCFPRO) && (val = 'G')) + val = 'C'; + printk(KERN_INFO + "Elsa: %s found at %#lx Rev.:%c IRQ %d\n", + Elsa_Types[cs->subtyp], + cs->hw.elsa.base, + val, cs->irq); + val = bytein(cs->hw.elsa.ale) & ELSA_S0_POWER_BAD; + if (val) { + printk(KERN_WARNING + "Elsa: Microlink S0 bus power bad\n"); + cs->hw.elsa.status |= ELSA_BAD_PWR; + } + } else { + printk(KERN_WARNING + "No Elsa Microlink found\n"); + return (0); + } + } else if (cs->typ == ISDN_CTYPE_ELSA_PNP) { #ifdef __ISAPNP__ if (!card->para[1] && isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; - - while(pdev->card_vendor) { - if ((pb = pnp_find_card(pdev->card_vendor, - pdev->card_device, - pnp_c))) { - pnp_c = pb; - pd = NULL; - if ((pd = pnp_find_dev(pnp_c, - pdev->vendor, - pdev->function, - pd))) { + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; + printk(KERN_INFO "HiSax: %s detected\n", - (char *)pdev->driver_data); - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "Elsa PnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - pnp_device_detach(pd); - printk(KERN_ERR "Elsa PnP: activate failed\n"); - return 0; + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_port_valid(pd, 0) || - !pnp_irq_valid(pd, 0)) { + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + + if (!card->para[0] || !card->para[1]) { printk(KERN_ERR "Elsa PnP:some resources are missing %ld/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0)); - pnp_device_detach(pd); + card->para[0], card->para[1]); + pnp_disable_dev(pnp_d); return(0); } - card->para[1] = pnp_port_start(pd, 0); - card->para[0] = pnp_irq(pd, 0); - if (pdev->function == ISAPNP_FUNCTION(0x133)) { - if (elsa_qs1000_probe(card->cs, card)) - return 0; - return 1; - } else { - if (elsa_qs3000_probe(card->cs, card)) - return 0; - return 1; - } + if (ipid->function == ISAPNP_FUNCTION(0x133)) + cs->subtyp = ELSA_QS1000; + else + cs->subtyp = ELSA_QS3000; break; } else { printk(KERN_ERR "Elsa PnP: PnP error card found, no device\n"); return(0); } } - pdev++; + ipid++; pnp_c=NULL; } - if (!pdev->card_vendor) { + if (!ipid->card_vendor) { printk(KERN_INFO "Elsa PnP: no ISAPnP card found\n"); return(0); } } #endif - if (elsa_qs1000_probe(card->cs, card)) - return 0; - return 1; - - } else if (card->typ == ISDN_CTYPE_ELSA_PCMCIA) { - if (elsa_pcmcia_probe(card->cs, card)) - return 0; - return 1; - } else if (card->typ == ISDN_CTYPE_ELSA_PCI) { -#ifdef CONFIG_PCI + if (card->para[1] && card->para[0]) { + cs->hw.elsa.base = card->para[1]; + cs->irq = card->para[0]; + if (!cs->subtyp) + cs->subtyp = ELSA_QS1000; + } else { + printk(KERN_ERR "Elsa PnP: no parameter\n"); + } + cs->hw.elsa.cfg = cs->hw.elsa.base + ELSA_CONFIG; + cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE; + cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC; + cs->hw.elsa.hscx = cs->hw.elsa.base + ELSA_HSCX; + cs->hw.elsa.trig = cs->hw.elsa.base + ELSA_TRIG_IRQ; + cs->hw.elsa.timer = cs->hw.elsa.base + ELSA_START_TIMER; + cs->hw.elsa.ctrl = cs->hw.elsa.base + ELSA_CONTROL; + printk(KERN_INFO + "Elsa: %s defined at %#lx IRQ %d\n", + Elsa_Types[cs->subtyp], + cs->hw.elsa.base, + cs->irq); + } else if (cs->typ == ISDN_CTYPE_ELSA_PCMCIA) { + cs->hw.elsa.base = card->para[1]; + cs->irq = card->para[0]; + val = readreg(cs->hw.elsa.base + 0, cs->hw.elsa.base + 2, IPAC_ID); + if ((val == 1) || (val == 2)) { /* IPAC version 1.1/1.2 */ + cs->subtyp = ELSA_PCMCIA_IPAC; + cs->hw.elsa.ale = cs->hw.elsa.base + 0; + cs->hw.elsa.isac = cs->hw.elsa.base + 2; + cs->hw.elsa.hscx = cs->hw.elsa.base + 2; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + } else { + cs->subtyp = ELSA_PCMCIA; + cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE_PCM; + cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC_PCM; + cs->hw.elsa.hscx = cs->hw.elsa.base + ELSA_HSCX; + } + cs->hw.elsa.timer = 0; + cs->hw.elsa.trig = 0; + cs->hw.elsa.ctrl = 0; + cs->irq_flags |= SA_SHIRQ; + printk(KERN_INFO + "Elsa: %s defined at %#lx IRQ %d\n", + Elsa_Types[cs->subtyp], + cs->hw.elsa.base, + cs->irq); + } else if (cs->typ == ISDN_CTYPE_ELSA_PCI) { +#if CONFIG_PCI + cs->subtyp = 0; if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) { - if (elsa_qs_pci_probe(card->cs, dev_qs1000, - ELSA_QS1000PCI)) - return 0; - return 1; + if (pci_enable_device(dev_qs1000)) + return(0); + cs->subtyp = ELSA_QS1000PCI; + cs->irq = dev_qs1000->irq; + cs->hw.elsa.cfg = pci_resource_start(dev_qs1000, 1); + cs->hw.elsa.base = pci_resource_start(dev_qs1000, 3); } else if ((dev_qs3000 = pci_find_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) { - if (elsa_qs_pci_probe(card->cs, dev_qs3000, - ELSA_QS3000PCI)) - return 0; - return 1; + if (pci_enable_device(dev_qs3000)) + return(0); + cs->subtyp = ELSA_QS3000PCI; + cs->irq = dev_qs3000->irq; + cs->hw.elsa.cfg = pci_resource_start(dev_qs3000, 1); + cs->hw.elsa.base = pci_resource_start(dev_qs3000, 3); } else { printk(KERN_WARNING "Elsa: No PCI card found\n"); - return 0; + return(0); + } + if (!cs->irq) { + printk(KERN_WARNING "Elsa: No IRQ for PCI card found\n"); + return(0); + } + + if (!(cs->hw.elsa.base && cs->hw.elsa.cfg)) { + printk(KERN_WARNING "Elsa: No IO-Adr for PCI card found\n"); + return(0); + } + if ((cs->hw.elsa.cfg & 0xff) || (cs->hw.elsa.base & 0xf)) { + printk(KERN_WARNING "Elsa: You may have a wrong PCI bios\n"); + printk(KERN_WARNING "Elsa: If your system hangs now, read\n"); + printk(KERN_WARNING "Elsa: Documentation/isdn/README.HiSax\n"); } + cs->hw.elsa.ale = cs->hw.elsa.base; + cs->hw.elsa.isac = cs->hw.elsa.base +1; + cs->hw.elsa.hscx = cs->hw.elsa.base +1; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + cs->hw.elsa.timer = 0; + cs->hw.elsa.trig = 0; + cs->irq_flags |= SA_SHIRQ; + printk(KERN_INFO + "Elsa: %s defined at %#lx/0x%x IRQ %d\n", + Elsa_Types[cs->subtyp], + cs->hw.elsa.base, + cs->hw.elsa.cfg, + cs->irq); +#else + printk(KERN_WARNING "Elsa: Elsa PCI and NO_PCI_BIOS\n"); + printk(KERN_WARNING "Elsa: unable to config Elsa PCI\n"); + return (0); #endif /* CONFIG_PCI */ + } else + return (0); + + switch (cs->subtyp) { + case ELSA_PC: + case ELSA_PCC8: + case ELSA_PCC16: + case ELSA_QS1000: + case ELSA_PCMCIA: + case ELSA_PCMCIA_IPAC: + bytecnt = 8; + break; + case ELSA_PCFPRO: + case ELSA_PCF: + case ELSA_QS3000: + case ELSA_QS3000PCI: + bytecnt = 16; + break; + case ELSA_QS1000PCI: + bytecnt = 2; + break; + default: + printk(KERN_WARNING + "Unknown ELSA subtype %d\n", cs->subtyp); + return (0); + } + /* In case of the elsa pcmcia card, this region is in use, + reserved for us by the card manager. So we do not check it + here, it would fail. */ + if (cs->typ != ISDN_CTYPE_ELSA_PCMCIA && !request_region(cs->hw.elsa.base, bytecnt, "elsa isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %#lx-%#lx already in use\n", + CardType[card->typ], + cs->hw.elsa.base, + cs->hw.elsa.base + bytecnt); + return (0); + } + if ((cs->subtyp == ELSA_QS1000PCI) || (cs->subtyp == ELSA_QS3000PCI)) { + if (!request_region(cs->hw.elsa.cfg, 0x80, "elsa isdn pci")) { + printk(KERN_WARNING + "HiSax: %s pci port %x-%x already in use\n", + CardType[card->typ], + cs->hw.elsa.cfg, + cs->hw.elsa.cfg + 0x80); + release_region(cs->hw.elsa.base, bytecnt); + return (0); + } + } +#if ARCOFI_USE + init_arcofi(cs); +#endif + setup_isac(cs); + cs->hw.elsa.tl.function = (void *) elsa_led_handler; + cs->hw.elsa.tl.data = (long) cs; + init_timer(&cs->hw.elsa.tl); + /* Teste Timer */ + if (cs->hw.elsa.timer) { + byteout(cs->hw.elsa.trig, 0xff); + byteout(cs->hw.elsa.timer, 0); + if (!TimerRun(cs)) { + byteout(cs->hw.elsa.timer, 0); /* 2. Versuch */ + if (!TimerRun(cs)) { + printk(KERN_WARNING + "Elsa: timer do not start\n"); + release_io_elsa(cs); + return (0); + } + } + HZDELAY((HZ/100) + 1); /* wait >=10 ms */ + if (TimerRun(cs)) { + printk(KERN_WARNING "Elsa: timer do not run down\n"); + release_io_elsa(cs); + return (0); + } + printk(KERN_INFO "Elsa: timer OK; resetting card\n"); + } + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &Elsa_card_msg; + if ((cs->subtyp == ELSA_QS1000PCI) || (cs->subtyp == ELSA_QS3000PCI) || (cs->subtyp == ELSA_PCMCIA_IPAC)) { + cs->readisac = &ReadISAC_IPAC; + cs->writeisac = &WriteISAC_IPAC; + cs->readisacfifo = &ReadISACfifo_IPAC; + cs->writeisacfifo = &WriteISACfifo_IPAC; + cs->irq_func = &elsa_interrupt_ipac; + val = readreg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_ID); + printk(KERN_INFO "Elsa: IPAC version %x\n", val); + } else { + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->irq_func = &elsa_interrupt; + ISACVersion(cs, "Elsa:"); + if (HscxVersion(cs, "Elsa:")) { + printk(KERN_WARNING + "Elsa: wrong HSCX versions check IO address\n"); + release_io_elsa(cs); + return (0); + } + } + if (cs->subtyp == ELSA_PC) { + val = readitac(cs, ITAC_SYS); + printk(KERN_INFO "Elsa: ITAC version %s\n", ITACVer[val & 7]); + writeitac(cs, ITAC_ISEN, 0); + writeitac(cs, ITAC_RFIE, 0); + writeitac(cs, ITAC_XFIE, 0); + writeitac(cs, ITAC_SCIE, 0); + writeitac(cs, ITAC_STIE, 0); } - return 0; + return (1); } diff -Nru a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c --- a/drivers/isdn/hisax/elsa_cs.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/elsa_cs.c Thu Feb 19 23:44:25 2004 @@ -53,6 +53,7 @@ #include #include #include +#include "hisax_cfg.h" MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for Elsa PCM cards"); MODULE_AUTHOR("Klaus Lichtenwalder"); @@ -71,7 +72,7 @@ MODULE_PARM(pc_debug, "i"); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); static char *version = -"elsa_cs.c $Revision: 1.1.2.2 $ $Date: 2001/09/23 22:24:47 $ (K.Lichtenwalder)"; +"elsa_cs.c $Revision: 1.2.2.4 $ $Date: 2004/01/25 15:07:06 $ (K.Lichtenwalder)"; #else #define DEBUG(n, args...) #endif @@ -93,8 +94,6 @@ static int protocol = 2; /* EURO-ISDN Default */ MODULE_PARM(protocol, "i"); -extern int elsa_init_pcmcia(int, int, int*, int); - /*====================================================================*/ /* @@ -168,6 +167,7 @@ dev_link_t link; dev_node_t node; int busy; + int cardnr; } local_info_t; /*====================================================================== @@ -188,7 +188,6 @@ dev_link_t *link; local_info_t *local; int ret, i; - void elsa_interrupt(int, void *, struct pt_regs *); DEBUG(0, "elsa_cs_attach()\n"); @@ -196,6 +195,7 @@ local = kmalloc(sizeof(local_info_t), GFP_KERNEL); if (!local) return NULL; memset(local, 0, sizeof(local_info_t)); + local->cardnr = -1; link = &local->link; link->priv = local; /* Interrupt setup */ @@ -337,6 +337,7 @@ int i, j, last_fn; u_short buf[128]; cistpl_cftable_entry_t *cf = &parse.cftable_entry; + IsdnCard_t icard; DEBUG(0, "elsa_config(0x%p)\n", link); handle = link->handle; @@ -430,9 +431,19 @@ link->state &= ~DEV_CONFIG_PENDING; - elsa_init_pcmcia(link->io.BasePort1, link->irq.AssignedIRQ, - &(((local_info_t*)link->priv)->busy), - protocol); + icard.para[0] = link->irq.AssignedIRQ; + icard.para[1] = link->io.BasePort1; + icard.protocol = protocol; + icard.typ = ISDN_CTYPE_ELSA_PCMCIA; + + i = hisax_init_pcmcia(link, &(((local_info_t*)link->priv)->busy), &icard); + if (i < 0) { + printk(KERN_ERR "elsa_cs: failed to initialize Elsa PCMCIA %d at i/o %#x\n", + i, link->io.BasePort1); + elsa_cs_release(link); + } else + ((local_info_t*)link->priv)->cardnr = i; + return; cs_failed: cs_error(link->handle, last_fn, i); @@ -449,9 +460,16 @@ static void elsa_cs_release(dev_link_t *link) { + local_info_t *local = link->priv; DEBUG(0, "elsa_cs_release(0x%p)\n", link); + if (local) { + if (local->cardnr >= 0) { + /* no unregister function with hisax */ + HiSax_closecard(local->cardnr); + } + } /* Unlink the device chain */ link->dev = NULL; diff -Nru a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c --- a/drivers/isdn/hisax/elsa_ser.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/elsa_ser.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: elsa_ser.c,v 2.10.6.4 2001/09/23 22:24:47 kai Exp $ +/* $Id: elsa_ser.c,v 2.14.2.3 2004/02/11 13:21:33 keil Exp $ * * stuff for the serial modem on ELSA cards * @@ -26,11 +26,10 @@ //#define SERIAL_DEBUG_REG 1 #ifdef SERIAL_DEBUG_REG -static u8 deb[32]; +static u_char deb[32]; const char *ModemIn[] = {"RBR","IER","IIR","LCR","MCR","LSR","MSR","SCR"}; const char *ModemOut[] = {"THR","IER","FCR","LCR","MCR","LSR","MSR","SCR"}; #endif -static spinlock_t elsa_ser_lock = SPIN_LOCK_UNLOCKED; static char *MInit_1 = "AT&F&C1E0&D2\r\0"; static char *MInit_2 = "ATL2M1S64=13\r\0"; @@ -111,7 +110,6 @@ int quot = 0, baud_base; unsigned cval, fcr = 0; int bits; - unsigned long flags; /* byte size and parity */ @@ -135,23 +133,17 @@ serial_outp(cs, UART_IER, cs->hw.elsa.IER); debugl1(cs,"modem quot=0x%x", quot); - spin_lock_irqsave(&elsa_ser_lock, flags); serial_outp(cs, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */ serial_outp(cs, UART_DLL, quot & 0xff); /* LS of divisor */ serial_outp(cs, UART_DLM, quot >> 8); /* MS of divisor */ serial_outp(cs, UART_LCR, cval); /* reset DLAB */ serial_inp(cs, UART_RX); - spin_unlock_irqrestore(&elsa_ser_lock, flags); } static int mstartup(struct IsdnCardState *cs) { - unsigned long flags; int retval=0; - - spin_lock_irqsave(&elsa_ser_lock, flags); - /* * Clear the FIFO buffers and disable them * (they will be reenabled in change_speed()) @@ -207,7 +199,6 @@ change_speed(cs, BASE_BAUD); cs->hw.elsa.MFlag = 1; errout: - spin_unlock_irqrestore(&elsa_ser_lock, flags); return retval; } @@ -217,15 +208,11 @@ */ static void mshutdown(struct IsdnCardState *cs) { - unsigned long flags; - #ifdef SERIAL_DEBUG_OPEN printk(KERN_DEBUG"Shutting down serial ...."); #endif - spin_lock_irqsave(&elsa_ser_lock, flags); /* Disable interrupts */ - /* * clear delta_msr_wait queue to avoid mem leaks: we may free the irq * here so the queue might never be waken up @@ -245,7 +232,6 @@ serial_outp(cs, UART_FCR, (UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT)); serial_inp(cs, UART_RX); /* read data port to reset things */ - spin_unlock_irqrestore(&elsa_ser_lock, flags); #ifdef SERIAL_DEBUG_OPEN printk(" done\n"); #endif @@ -255,14 +241,12 @@ write_modem(struct BCState *bcs) { int ret=0; struct IsdnCardState *cs = bcs->cs; - u_int count, len, fp; - unsigned long flags; + int count, len, fp; if (!bcs->tx_skb) return 0; if (bcs->tx_skb->len <= 0) return 0; - spin_lock_irqsave(&elsa_ser_lock, flags); len = bcs->tx_skb->len; if (len > MAX_MODEM_BUF - cs->hw.elsa.transcnt) len = MAX_MODEM_BUF - cs->hw.elsa.transcnt; @@ -288,14 +272,37 @@ cs->hw.elsa.IER |= UART_IER_THRI; serial_outp(cs, UART_IER, cs->hw.elsa.IER); } - spin_unlock_irqrestore(&elsa_ser_lock, flags); return(ret); } -static void -modem_fill(struct BCState *bcs) -{ - xmit_xpr_b(bcs); +inline void +modem_fill(struct BCState *bcs) { + + if (bcs->tx_skb) { + if (bcs->tx_skb->len) { + write_modem(bcs); + return; + } else { + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.hscx.count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; + } + } + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + bcs->hw.hscx.count = 0; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + write_modem(bcs); + } else { + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + schedule_event(bcs, B_XMTBUFREADY); + } } static inline void receive_chars(struct IsdnCardState *cs, @@ -329,7 +336,7 @@ cs->hw.elsa.rcvcnt); skb_queue_tail(& cs->hw.elsa.bcs->rqueue, skb); } - sched_b_event(cs->hw.elsa.bcs, B_RCVBUFREADY); + schedule_event(cs->hw.elsa.bcs, B_RCVBUFREADY); } else { char tmp[128]; char *t = tmp; @@ -375,6 +382,7 @@ } } + static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs) { int status, iir, msr; @@ -419,10 +427,10 @@ { modehscx(bcs, 0, bcs->channel); if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { - if (bcs->rcvbuf) { + if (bcs->hw.hscx.rcvbuf) { if (bcs->mode != L1_MODE_MODEM) - kfree(bcs->rcvbuf); - bcs->rcvbuf = NULL; + kfree(bcs->hw.hscx.rcvbuf); + bcs->hw.hscx.rcvbuf = NULL; } skb_queue_purge(&bcs->rqueue); skb_queue_purge(&bcs->squeue); @@ -435,16 +443,13 @@ } void -modem_write_cmd(struct IsdnCardState *cs, u8 *buf, u_int len) { - u_int count, fp; - u8 *msg = buf; - unsigned long flags; +modem_write_cmd(struct IsdnCardState *cs, u_char *buf, int len) { + int count, fp; + u_char *msg = buf; if (!len) return; - spin_lock_irqsave(&elsa_ser_lock, flags); if (len > (MAX_MODEM_BUF - cs->hw.elsa.transcnt)) { - spin_unlock_irqrestore(&elsa_ser_lock, flags); return; } fp = cs->hw.elsa.transcnt + cs->hw.elsa.transp; @@ -465,16 +470,13 @@ cs->hw.elsa.IER |= UART_IER_THRI; serial_outp(cs, UART_IER, cs->hw.elsa.IER); } - spin_unlock_irqrestore(&elsa_ser_lock, flags); } void modem_set_init(struct IsdnCardState *cs) { - unsigned long flags; int timeout; #define RCV_DELAY 20000 - spin_lock_irqsave(&elsa_ser_lock, flags); modem_write_cmd(cs, MInit_1, strlen(MInit_1)); timeout = 1000; while(timeout-- && cs->hw.elsa.transcnt) @@ -517,16 +519,13 @@ udelay(1000); debugl1(cs, "msi tout=%d", timeout); udelay(RCV_DELAY); - spin_unlock_irqrestore(&elsa_ser_lock, flags); } void modem_set_dial(struct IsdnCardState *cs, int outgoing) { - unsigned long flags; int timeout; #define RCV_DELAY 20000 - spin_lock_irqsave(&elsa_ser_lock, flags); modem_write_cmd(cs, MInit_speed28800, strlen(MInit_speed28800)); timeout = 1000; while(timeout-- && cs->hw.elsa.transcnt) @@ -542,40 +541,39 @@ udelay(1000); debugl1(cs, "msi tout=%d", timeout); udelay(RCV_DELAY); - spin_unlock_irqrestore(&elsa_ser_lock, flags); } void modem_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; - unsigned long flags; + u_long flags; if (pr == (PH_DATA | REQUEST)) { - spin_lock_irqsave(&elsa_ser_lock, flags); - if (st->l1.bcs->tx_skb) { - skb_queue_tail(&st->l1.bcs->squeue, skb); - spin_unlock_irqrestore(&elsa_ser_lock, flags); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); } else { - st->l1.bcs->tx_skb = skb; - test_and_set_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - st->l1.bcs->count = 0; - spin_unlock_irqrestore(&elsa_ser_lock, flags); - write_modem(st->l1.bcs); + bcs->tx_skb = skb; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->hw.hscx.count = 0; + write_modem(bcs); } + spin_unlock_irqrestore(&bcs->cs->lock, flags); } else if (pr == (PH_ACTIVATE | REQUEST)) { - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - L1L2(st, PH_ACTIVATE | CONFIRM, NULL); - set_arcofi(st->l1.bcs->cs, st->l1.bc); - mstartup(st->l1.bcs->cs); - modem_set_dial(st->l1.bcs->cs, test_bit(FLG_ORIG, &st->l2.flag)); - st->l1.bcs->cs->hw.elsa.MFlag=2; + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + st->l1.l1l2(st, PH_ACTIVATE | CONFIRM, NULL); + set_arcofi(bcs->cs, st->l1.bc); + mstartup(bcs->cs); + modem_set_dial(bcs->cs, test_bit(FLG_ORIG, &st->l2.flag)); + bcs->cs->hw.elsa.MFlag=2; } else if (pr == (PH_DEACTIVATE | REQUEST)) { - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - st->l1.bcs->cs->dc.isac.arcofi_bc = st->l1.bc; - arcofi_fsm(st->l1.bcs->cs, ARCOFI_START, &ARCOFI_XOP_0); - interruptible_sleep_on(&st->l1.bcs->cs->dc.isac.arcofi_wait); - st->l1.bcs->cs->hw.elsa.MFlag=1; + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + bcs->cs->dc.isac.arcofi_bc = st->l1.bc; + arcofi_fsm(bcs->cs, ARCOFI_START, &ARCOFI_XOP_0); + interruptible_sleep_on(&bcs->cs->dc.isac.arcofi_wait); + bcs->cs->hw.elsa.MFlag=1; } else { printk(KERN_WARNING"ElsaSer: unknown pr %x\n", pr); } @@ -591,24 +589,22 @@ case L1_MODE_TRANS: if (open_hscxstate(st->l1.hardware, bcs)) return (-1); - st->l1.l2l1 = hscx_l2l1; - // bcs->cs->BC_Send_Data = hscx_fill_fifo; FIXME + st->l2.l2l1 = hscx_l2l1; break; case L1_MODE_MODEM: bcs->mode = L1_MODE_MODEM; if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { - bcs->rcvbuf = bcs->cs->hw.elsa.rcvbuf; + bcs->hw.hscx.rcvbuf = bcs->cs->hw.elsa.rcvbuf; skb_queue_head_init(&bcs->rqueue); skb_queue_head_init(&bcs->squeue); } bcs->tx_skb = NULL; test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); bcs->event = 0; - bcs->rcvidx = 0; + bcs->hw.hscx.rcvidx = 0; bcs->tx_cnt = 0; bcs->cs->hw.elsa.bcs = bcs; - st->l1.l2l1 = modem_l2l1; -// bcs->cs->bc_l1_ops = &modem_l1_ops; + st->l2.l2l1 = modem_l2l1; break; } st->l1.bcs = bcs; @@ -618,17 +614,13 @@ return (0); } -static struct bc_l1_ops modem_l1_ops = { - .fill_fifo = modem_fill, - .open = setstack_elsa, - .close = close_elsastate, -}; - void -init_modem(struct IsdnCardState *cs) -{ - cs->bc_l1_ops = &modem_l1_ops; +init_modem(struct IsdnCardState *cs) { + cs->bcs[0].BC_SetStack = setstack_elsa; + cs->bcs[1].BC_SetStack = setstack_elsa; + cs->bcs[0].BC_Close = close_elsastate; + cs->bcs[1].BC_Close = close_elsastate; if (!(cs->hw.elsa.rcvbuf = kmalloc(MAX_MODEM_BUF, GFP_ATOMIC))) { printk(KERN_WARNING diff -Nru a/drivers/isdn/hisax/enternow.h b/drivers/isdn/hisax/enternow.h --- a/drivers/isdn/hisax/enternow.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/enternow.h Thu Feb 19 23:44:23 2004 @@ -40,3 +40,12 @@ * den TigerJet i/o-Raum gemappt * -> 0x01 des AMD bei hw.njet.base + 0C4 */ #define TJ_AMD_PORT 0xC0 + + + +/* ***************************************************************************************** * + * *************************************** Prototypen ************************************** * + * ***************************************************************************************** */ + +BYTE ReadByteAmd7930(struct IsdnCardState *cs, BYTE offset); +void WriteByteAmd7930(struct IsdnCardState *cs, BYTE offset, BYTE value); diff -Nru a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c --- a/drivers/isdn/hisax/enternow_pci.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/enternow_pci.c Thu Feb 19 23:44:27 2004 @@ -74,13 +74,14 @@ -const char *enternow_pci_rev = "$Revision: 1.1.2.1 $"; +const char *enternow_pci_rev = "$Revision: 1.1.4.5 $"; + /* *************************** I/O-Interface functions ************************************* */ /* cs->readisac, macro rByteAMD */ -static BYTE +BYTE ReadByteAmd7930(struct IsdnCardState *cs, BYTE offset) { /* direktes Register */ @@ -95,7 +96,7 @@ } /* cs->writeisac, macro wByteAMD */ -static void +void WriteByteAmd7930(struct IsdnCardState *cs, BYTE offset, BYTE value) { /* direktes Register */ @@ -110,14 +111,8 @@ } -static struct dc_hw_ops amd7930_ops = { - .read_reg = ReadByteAmd7930, - .write_reg = WriteByteAmd7930, -}; - -static void -enpci_setIrqMask(struct IsdnCardState *cs, BYTE val) -{ +void +enpci_setIrqMask(struct IsdnCardState *cs, BYTE val) { if (!val) OutByte(cs->hw.njet.base+NETJET_IRQMASK1, 0x00); else @@ -125,6 +120,17 @@ } +static BYTE dummyrr(struct IsdnCardState *cs, int chan, BYTE off) +{ + return(5); +} + +static void dummywr(struct IsdnCardState *cs, int chan, BYTE off, BYTE value) +{ + +} + + /* ******************************************************************************** */ @@ -137,15 +143,12 @@ /* Reset on, (also for AMD) */ cs->hw.njet.ctrl_reg = 0x07; OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - /* 80 ms delay */ - schedule_timeout((80*HZ)/1000); + mdelay(20); /* Reset off */ - cs->hw.njet.ctrl_reg = 0x70; + cs->hw.njet.ctrl_reg = 0x30; OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - /* 80ms delay */ - schedule_timeout((80*HZ)/1000); + /* 20ms delay */ + mdelay(20); cs->hw.njet.auxd = 0; // LED-status cs->hw.njet.dmactrl = 0; OutByte(cs->hw.njet.base + NETJET_AUXCTRL, ~TJ_AMD_IRQ); @@ -153,96 +156,124 @@ OutByte(cs->hw.njet.auxa, cs->hw.njet.auxd); // LED off } -static void -enpci_bc_activate(struct IsdnCardState *cs, int chan) -{ - if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "enter:now PCI: assign phys. BC %d in AMD LMR1", chan); - - cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 | (chan + 1)), "MDL_BC_ASSIGN"); - /* at least one b-channel in use, LED 2 on */ - cs->hw.njet.auxd |= TJ_AMD_IRQ << 2; - OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd); -} -static void -enpci_bc_deactivate(struct IsdnCardState *cs, int chan) +static int +enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "enter:now PCI: release phys. BC %d in Amd LMR1", chan); - - cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 & ~(chan + 1)), "MDL_BC_RELEASE"); - /* no b-channel active -> LED2 off */ - if (!(cs->dc.amd7930.lmr1 & 3)) { - cs->hw.njet.auxd &= ~(TJ_AMD_IRQ << 2); - OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd); - } -} + u_long flags; + BYTE *chan; -static void -enpci_led_handler(struct IsdnCardState *cs) -{ - if (cs->status & 0x0001) { - /* TEI assigned, LED1 on */ - cs->hw.njet.auxd = TJ_AMD_IRQ << 1; - OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd); - } else { - /* TEI removed, LEDs off */ - cs->hw.njet.auxd = 0; - OutByte(cs->hw.njet.base + NETJET_AUXDATA, 0x00); - } -} + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "enter:now PCI: card_msg: 0x%04X", mt); -static void -enpci_init(struct IsdnCardState *cs) -{ - inittiger(cs); - Amd7930_init(cs); -} + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_enpci(cs); + Amd7930_init(cs); + spin_unlock_irqrestore(&cs->lock, flags); + break; + case CARD_RELEASE: + release_io_netjet(cs); + break; + case CARD_INIT: + reset_enpci(cs); + inittiger(cs); + /* irq must be on here */ + Amd7930_init(cs); + break; + case CARD_TEST: + break; + case MDL_ASSIGN: + /* TEI assigned, LED1 on */ + cs->hw.njet.auxd = TJ_AMD_IRQ << 1; + OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd); + break; + case MDL_REMOVE: + /* TEI removed, LEDs off */ + cs->hw.njet.auxd = 0; + OutByte(cs->hw.njet.base + NETJET_AUXDATA, 0x00); + break; + case MDL_BC_ASSIGN: + /* activate B-channel */ + chan = (BYTE *)arg; + + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "enter:now PCI: assign phys. BC %d in AMD LMR1", *chan); + + cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 | (*chan + 1)), "MDL_BC_ASSIGN"); + /* at least one b-channel in use, LED 2 on */ + cs->hw.njet.auxd |= TJ_AMD_IRQ << 2; + OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd); + break; + case MDL_BC_RELEASE: + /* deactivate B-channel */ + chan = (BYTE *)arg; + + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "enter:now PCI: release phys. BC %d in Amd LMR1", *chan); + + cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 & ~(*chan + 1)), "MDL_BC_RELEASE"); + /* no b-channel active -> LED2 off */ + if (!(cs->dc.amd7930.lmr1 & 3)) { + cs->hw.njet.auxd &= ~(TJ_AMD_IRQ << 2); + OutByte(cs->hw.njet.base + NETJET_AUXDATA, cs->hw.njet.auxd); + } + break; + default: + break; -static int -enpci_reset(struct IsdnCardState *cs) -{ - reset_enpci(cs); - Amd7930_init(cs); - return 0; + } + return(0); } static irqreturn_t enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - BYTE sval, ir; - - spin_lock(&cs->lock); + BYTE s0val, s1val, ir; + u_long flags; - sval = InByte(cs->hw.njet.base + NETJET_IRQSTAT1); + spin_lock_irqsave(&cs->lock, flags); + s1val = InByte(cs->hw.njet.base + NETJET_IRQSTAT1); /* AMD threw an interrupt */ - if (!(sval & TJ_AMD_IRQ)) { + if (!(s1val & TJ_AMD_IRQ)) { /* read and clear interrupt-register */ ir = ReadByteAmd7930(cs, 0x00); Amd7930_interrupt(cs, ir); - } + s1val = 1; + } else + s1val = 0; + s0val = InByte(cs->hw.njet.base + NETJET_IRQSTAT0); + if ((s0val | s1val)==0) { // shared IRQ + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; + } + if (s0val) + OutByte(cs->hw.njet.base + NETJET_IRQSTAT0, s0val); /* DMA-Interrupt: B-channel-stuff */ /* set bits in sval to indicate which page is free */ - - /* set bits in sval to indicate which page is free */ if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) < inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ)) /* the 2nd write page is free */ - sval = 0x08; + s0val = 0x08; else /* the 1st write page is free */ - sval = 0x04; + s0val = 0x04; if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) < inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ)) /* the 2nd read page is free */ - sval = sval | 0x02; + s0val = s0val | 0x02; else /* the 1st read page is free */ - sval = sval | 0x01; - if (sval != cs->hw.njet.last_is0) { /* we have a DMA interrupt */ - cs->hw.njet.irqstat0 = sval; + s0val = s0val | 0x01; + if (s0val != cs->hw.njet.last_is0) /* we have a DMA interrupt */ + { + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; + } + cs->hw.njet.irqstat0 = s0val; if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) != (cs->hw.njet.last_is0 & NETJET_IRQM0_READ)) /* we have a read dma int */ @@ -251,71 +282,12 @@ (cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE)) /* we have a write dma int */ write_tiger(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); } - spin_unlock(&cs->lock); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static struct card_ops enpci_ops = { - .init = enpci_init, - .reset = enpci_reset, - .release = netjet_release, - .led_handler = enpci_led_handler, - .irq_func = enpci_interrupt, -}; - -static int __init -enpci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - if (pci_enable_device(pdev)) - goto err; - - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.njet.base = pci_resource_start(pdev, 0); - if (!request_io(&cs->rs, cs->hw.njet.base, 0x100, "Fn_ISDN")) - goto err; - - cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; - cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD - - /* Reset an */ - cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff - OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - - set_current_state(TASK_UNINTERRUPTIBLE); - /* 50 ms Pause */ - schedule_timeout((50*HZ)/1000); - - cs->hw.njet.ctrl_reg = 0x30; /* Reset Off and status read clear */ - OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - - cs->hw.njet.auxd = 0x00; // war 0xc0 - cs->hw.njet.dmactrl = 0; - - OutByte(cs->hw.njet.base + NETJET_AUXCTRL, ~TJ_AMD_IRQ); - OutByte(cs->hw.njet.base + NETJET_IRQMASK1, TJ_AMD_IRQ); - OutByte(cs->hw.njet.auxa, cs->hw.njet.auxd); - - printk(KERN_INFO - "enter:now PCI: PCI card configured at 0x%lx IRQ %d\n", - cs->hw.njet.base, cs->irq); - reset_enpci(cs); - cs->hw.njet.last_is0 = 0; - cs->hw.njet.bc_activate = enpci_bc_activate; - cs->hw.njet.bc_deactivate = enpci_bc_deactivate; - amd7930_setup(cs, &amd7930_ops, &enpci_setIrqMask); - - cs->card_ops = &enpci_ops; - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} static struct pci_dev *dev_netjet __initdata = NULL; @@ -323,30 +295,105 @@ int __init setup_enternow_pci(struct IsdnCard *card) { + int bytecnt; + struct IsdnCardState *cs = card->cs; char tmp[64]; +#if CONFIG_PCI #ifdef __BIG_ENDIAN #error "not running on big endian machines now" #endif strcpy(tmp, enternow_pci_rev); printk(KERN_INFO "HiSax: Formula-n Europe AG enter:now ISDN PCI driver Rev. %s\n", HiSax_getrev(tmp)); - - dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet); - if (dev_netjet) { - if (dev_netjet->subsystem_vendor != 0x55 || - dev_netjet->subsystem_device != 0x02) { - printk(KERN_WARNING "enter:now: You tried to load " - "this driver with an incompatible " - "TigerJet-card\n"); - printk(KERN_WARNING "Use type=20 for Traverse " - "NetJet PCI Card.\n"); - return 0; + if (cs->typ != ISDN_CTYPE_ENTERNOW) + return(0); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + + for ( ;; ) + { + if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { + if (pci_enable_device(dev_netjet)) + return(0); + cs->irq = dev_netjet->irq; + if (!cs->irq) { + printk(KERN_WARNING "enter:now PCI: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.njet.base = pci_resource_start(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "enter:now PCI: No IO-Adr for PCI card found\n"); + return(0); + } + /* checks Sub-Vendor ID because system crashes with Traverse-Card */ + if ((dev_netjet->subsystem_vendor != 0x55) || + (dev_netjet->subsystem_device != 0x02)) { + printk(KERN_WARNING "enter:now: You tried to load this driver with an incompatible TigerJet-card\n"); + printk(KERN_WARNING "Use type=20 for Traverse NetJet PCI Card.\n"); + return(0); + } + } else { + printk(KERN_WARNING "enter:now PCI: No PCI card found\n"); + return(0); } - if (enpci_probe(card->cs, dev_netjet)) - return 1; - return 0; + + cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; + cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD + + /* Reset an */ + cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff + OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + /* 20 ms Pause */ + mdelay(20); + + cs->hw.njet.ctrl_reg = 0x30; /* Reset Off and status read clear */ + OutByte(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); + + cs->hw.njet.auxd = 0x00; // war 0xc0 + cs->hw.njet.dmactrl = 0; + + OutByte(cs->hw.njet.base + NETJET_AUXCTRL, ~TJ_AMD_IRQ); + OutByte(cs->hw.njet.base + NETJET_IRQMASK1, TJ_AMD_IRQ); + OutByte(cs->hw.njet.auxa, cs->hw.njet.auxd); + + break; + } +#else + + printk(KERN_WARNING "enter:now PCI: NO_PCI_BIOS\n"); + printk(KERN_WARNING "enter:now PCI: unable to config Formula-n enter:now ISDN PCI ab\n"); + return (0); + +#endif /* CONFIG_PCI */ + + bytecnt = 256; + + printk(KERN_INFO + "enter:now PCI: PCI card configured at 0x%lx IRQ %d\n", + cs->hw.njet.base, cs->irq); + if (!request_region(cs->hw.njet.base, bytecnt, "Fn_ISDN")) { + printk(KERN_WARNING + "HiSax: %s config port %lx-%lx already in use\n", + CardType[card->typ], + cs->hw.njet.base, + cs->hw.njet.base + bytecnt); + return (0); } - printk(KERN_WARNING "enter:now PCI: No PCI card found\n"); - return 0; + setup_Amd7930(cs); + cs->hw.njet.last_is0 = 0; + /* macro rByteAMD */ + cs->readisac = &ReadByteAmd7930; + /* macro wByteAMD */ + cs->writeisac = &WriteByteAmd7930; + cs->dc.amd7930.setIrqMask = &enpci_setIrqMask; + + cs->BC_Read_Reg = &dummyrr; + cs->BC_Write_Reg = &dummywr; + cs->BC_Send_Data = &netjet_fill_dma; + cs->cardmsg = &enpci_card_msg; + cs->irq_func = &enpci_interrupt; + cs->irq_flags |= SA_SHIRQ; + + return (1); } diff -Nru a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c --- a/drivers/isdn/hisax/gazel.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/gazel.c Thu Feb 19 23:44:25 2004 @@ -1,4 +1,4 @@ -/* $Id: gazel.c,v 2.11.6.7 2001/09/23 22:24:47 kai Exp $ +/* $Id: gazel.c,v 2.19.2.4 2004/01/14 16:04:48 keil Exp $ * * low level stuff for Gazel isdn cards * @@ -21,8 +21,7 @@ #include extern const char *CardType[]; -const char *gazel_revision = "$Revision: 2.11.6.7 $"; -static spinlock_t gazel_lock = SPIN_LOCK_UNLOCKED; +const char *gazel_revision = "$Revision: 2.19.2.4 $"; #define R647 1 #define R685 2 @@ -44,492 +43,642 @@ #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -static inline u8 +static inline u_char readreg(unsigned int adr, u_short off) { return bytein(adr + off); } static inline void -writereg(unsigned int adr, u_short off, u8 data) +writereg(unsigned int adr, u_short off, u_char data) { byteout(adr + off, data); } static inline void -read_fifo(unsigned int adr, u8 * data, int size) +read_fifo(unsigned int adr, u_char * data, int size) { insb(adr, data, size); } static void -write_fifo(unsigned int adr, u8 * data, int size) +write_fifo(unsigned int adr, u_char * data, int size) { outsb(adr, data, size); } -static u8 -r685_isac_read(struct IsdnCardState *cs, u8 off) +static inline u_char +readreg_ipac(unsigned int adr, u_short off) { - return readreg(cs->hw.gazel.isac, off); -} + register u_char ret; -static u8 -r647_isac_read(struct IsdnCardState *cs, u8 off) -{ - return readreg(cs->hw.gazel.isac, (off << 8 & 0xf000) | (off & 0xf)); + byteout(adr, off); + ret = bytein(adr + 4); + return ret; } -static void -r685_isac_write(struct IsdnCardState *cs, u8 off, u8 value) +static inline void +writereg_ipac(unsigned int adr, u_short off, u_char data) { - writereg(cs->hw.gazel.isac, off, value); + byteout(adr, off); + byteout(adr + 4, data); } -static void -r647_isac_write(struct IsdnCardState *cs, u8 off, u8 value) -{ - writereg(cs->hw.gazel.isac, (off << 8 & 0xf000) | (off & 0xf), value); -} -static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +static inline void +read_fifo_ipac(unsigned int adr, u_short off, u_char * data, int size) { - read_fifo(cs->hw.gazel.isacfifo, data, size); + byteout(adr, off); + insb(adr + 4, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +write_fifo_ipac(unsigned int adr, u_short off, u_char * data, int size) { - write_fifo(cs->hw.gazel.isacfifo, data, size); + byteout(adr, off); + outsb(adr + 4, data, size); } -static struct dc_hw_ops r685_isac_ops = { - .read_reg = r685_isac_read, - .write_reg = r685_isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; +/* Interface functions */ -static struct dc_hw_ops r647_isac_ops = { - .read_reg = r647_isac_read, - .write_reg = r647_isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -r685_hscx_read(struct IsdnCardState *cs, int hscx, u8 off) +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs->hw.gazel.hscx[hscx], off); + u_short off2 = offset; + + switch (cs->subtyp) { + case R647: + off2 = ((off2 << 8 & 0xf000) | (off2 & 0xf)); + case R685: + return (readreg(cs->hw.gazel.isac, off2)); + case R753: + case R742: + return (readreg_ipac(cs->hw.gazel.ipac, 0x80 + off2)); + } + return 0; } -static u8 -r647_hscx_read(struct IsdnCardState *cs, int hscx, u8 off) +static void +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - return readreg(cs->hw.gazel.hscx[hscx], - (off << 8 & 0xf000) | (off & 0xf)); + u_short off2 = offset; + + switch (cs->subtyp) { + case R647: + off2 = ((off2 << 8 & 0xf000) | (off2 & 0xf)); + case R685: + writereg(cs->hw.gazel.isac, off2, value); + break; + case R753: + case R742: + writereg_ipac(cs->hw.gazel.ipac, 0x80 + off2, value); + break; + } } static void -r685_hscx_write(struct IsdnCardState *cs, int hscx, u8 off, u8 value) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writereg(cs->hw.gazel.hscx[hscx], off, value); + switch (cs->subtyp) { + case R647: + case R685: + read_fifo(cs->hw.gazel.isacfifo, data, size); + break; + case R753: + case R742: + read_fifo_ipac(cs->hw.gazel.ipac, 0x80, data, size); + break; + } } static void -r647_hscx_write(struct IsdnCardState *cs, int hscx, u8 off, u8 value) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writereg(cs->hw.gazel.hscx[hscx], - (off << 8 & 0xf000) | (off & 0xf), value); + switch (cs->subtyp) { + case R647: + case R685: + write_fifo(cs->hw.gazel.isacfifo, data, size); + break; + case R753: + case R742: + write_fifo_ipac(cs->hw.gazel.ipac, 0x80, data, size); + break; + } } static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 * data, int size) +ReadHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) { - read_fifo(cs->hw.gazel.hscxfifo[hscx], data, size); + switch (cs->subtyp) { + case R647: + case R685: + read_fifo(cs->hw.gazel.hscxfifo[hscx], data, size); + break; + case R753: + case R742: + read_fifo_ipac(cs->hw.gazel.ipac, hscx * 0x40, data, size); + break; + } } static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 * data, int size) +WriteHSCXfifo(struct IsdnCardState *cs, int hscx, u_char * data, int size) { - write_fifo(cs->hw.gazel.hscxfifo[hscx], data, size); + switch (cs->subtyp) { + case R647: + case R685: + write_fifo(cs->hw.gazel.hscxfifo[hscx], data, size); + break; + case R753: + case R742: + write_fifo_ipac(cs->hw.gazel.ipac, hscx * 0x40, data, size); + break; + } } -static struct bc_hw_ops r685_hscx_ops = { - .read_reg = r685_hscx_read, - .write_reg = r685_hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static struct bc_hw_ops r647_hscx_ops = { - .read_reg = r647_hscx_read, - .write_reg = r647_hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static inline u8 -ipac_read(struct IsdnCardState *cs, u_short off) -{ - register u8 ret; - unsigned long flags; - - spin_lock_irqsave(&gazel_lock, flags); - byteout(cs->hw.gazel.ipac, off); - ret = bytein(cs->hw.gazel.ipac + 4); - spin_unlock_irqrestore(&gazel_lock, flags); - return ret; +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) +{ + u_short off2 = offset; + + switch (cs->subtyp) { + case R647: + off2 = ((off2 << 8 & 0xf000) | (off2 & 0xf)); + case R685: + return (readreg(cs->hw.gazel.hscx[hscx], off2)); + case R753: + case R742: + return (readreg_ipac(cs->hw.gazel.ipac, hscx * 0x40 + off2)); + } + return 0; } -static inline void -ipac_write(struct IsdnCardState *cs, u_short off, u8 data) +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - unsigned long flags; + u_short off2 = offset; - spin_lock_irqsave(&gazel_lock, flags); - byteout(cs->hw.gazel.ipac, off); - byteout(cs->hw.gazel.ipac + 4, data); - spin_unlock_irqrestore(&gazel_lock, flags); + switch (cs->subtyp) { + case R647: + off2 = ((off2 << 8 & 0xf000) | (off2 & 0xf)); + case R685: + writereg(cs->hw.gazel.hscx[hscx], off2, value); + break; + case R753: + case R742: + writereg_ipac(cs->hw.gazel.ipac, hscx * 0x40 + off2, value); + break; + } } +/* + * fast interrupt HSCX stuff goes here + */ -static inline void -ipac_readfifo(struct IsdnCardState *cs, u8 off, u8 * data, int size) -{ - byteout(cs->hw.gazel.ipac, off); - insb(cs->hw.gazel.ipac + 4, data, size); +#define READHSCX(cs, nr, reg) ReadHSCX(cs, nr, reg) +#define WRITEHSCX(cs, nr, reg, data) WriteHSCX(cs, nr, reg, data) +#define READHSCXFIFO(cs, nr, ptr, cnt) ReadHSCXfifo(cs, nr, ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) WriteHSCXfifo(cs, nr, ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs) +{ +#define MAXCOUNT 5 + struct IsdnCardState *cs = dev_id; + u_char valisac, valhscx; + int count = 0; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + do { + valhscx = ReadHSCX(cs, 1, HSCX_ISTA); + if (valhscx) + hscx_int_main(cs, valhscx); + valisac = ReadISAC(cs, ISAC_ISTA); + if (valisac) + isac_interrupt(cs, valisac); + count++; + } while ((valhscx || valisac) && (count < MAXCOUNT)); + + WriteHSCX(cs, 0, HSCX_MASK, 0xFF); + WriteHSCX(cs, 1, HSCX_MASK, 0xFF); + WriteISAC(cs, ISAC_MASK, 0xFF); + WriteISAC(cs, ISAC_MASK, 0x0); + WriteHSCX(cs, 0, HSCX_MASK, 0x0); + WriteHSCX(cs, 1, HSCX_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } -static inline void -ipac_writefifo(struct IsdnCardState *cs, u8 off, u8 * data, int size) -{ - byteout(cs->hw.gazel.ipac, off); - outsb(cs->hw.gazel.ipac + 4, data, size); -} -/* This will generate ipac_dc_ops and ipac_bc_ops using the functions - * above */ +static irqreturn_t +gazel_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char ista, val; + int count = 0; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + ista = ReadISAC(cs, IPAC_ISTA - 0x80); + do { + if (ista & 0x0f) { + val = ReadHSCX(cs, 1, HSCX_ISTA); + if (ista & 0x01) + val |= 0x01; + if (ista & 0x04) + val |= 0x02; + if (ista & 0x08) + val |= 0x04; + if (val) { + hscx_int_main(cs, val); + } + } + if (ista & 0x20) { + val = 0xfe & ReadISAC(cs, ISAC_ISTA); + if (val) { + isac_interrupt(cs, val); + } + } + if (ista & 0x10) { + val = 0x01; + isac_interrupt(cs, val); + } + ista = ReadISAC(cs, IPAC_ISTA - 0x80); + count++; + } + while ((ista & 0x3f) && (count < MAXCOUNT)); -BUILD_IPAC_OPS(ipac); + WriteISAC(cs, IPAC_MASK - 0x80, 0xFF); + WriteISAC(cs, IPAC_MASK - 0x80, 0xC0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} +void +release_io_gazel(struct IsdnCardState *cs) +{ + unsigned int i; + + switch (cs->subtyp) { + case R647: + for (i = 0x0000; i < 0xC000; i += 0x1000) + release_region(i + cs->hw.gazel.hscx[0], 16); + release_region(0xC000 + cs->hw.gazel.hscx[0], 1); + break; -static int -r647_reset(struct IsdnCardState *cs) -{ - writereg(cs->hw.gazel.cfg_reg, 0, 0); - HZDELAY(10); - writereg(cs->hw.gazel.cfg_reg, 0, 1); - HZDELAY(2); - return 0; + case R685: + release_region(cs->hw.gazel.hscx[0], 0x100); + release_region(cs->hw.gazel.cfg_reg, 0x80); + break; + + case R753: + release_region(cs->hw.gazel.ipac, 0x8); + release_region(cs->hw.gazel.cfg_reg, 0x80); + break; + + case R742: + release_region(cs->hw.gazel.ipac, 8); + break; + } } static int -r685_reset(struct IsdnCardState *cs) +reset_gazel(struct IsdnCardState *cs) { unsigned long plxcntrl, addr = cs->hw.gazel.cfg_reg; - plxcntrl = inl(addr + PLX_CNTRL); - plxcntrl |= (RESET_9050 + RESET_GAZEL); - outl(plxcntrl, addr + PLX_CNTRL); - plxcntrl &= ~(RESET_9050 + RESET_GAZEL); - HZDELAY(4); - outl(plxcntrl, addr + PLX_CNTRL); - HZDELAY(10); - outb(INT_ISAC_EN + INT_HSCX_EN + INT_PCI_EN, addr + PLX_INCSR); - return 0; + switch (cs->subtyp) { + case R647: + writereg(addr, 0, 0); + HZDELAY(10); + writereg(addr, 0, 1); + HZDELAY(2); + break; + case R685: + plxcntrl = inl(addr + PLX_CNTRL); + plxcntrl |= (RESET_9050 + RESET_GAZEL); + outl(plxcntrl, addr + PLX_CNTRL); + plxcntrl &= ~(RESET_9050 + RESET_GAZEL); + HZDELAY(4); + outl(plxcntrl, addr + PLX_CNTRL); + HZDELAY(10); + outb(INT_ISAC_EN + INT_HSCX_EN + INT_PCI_EN, addr + PLX_INCSR); + break; + case R753: + plxcntrl = inl(addr + PLX_CNTRL); + plxcntrl |= (RESET_9050 + RESET_GAZEL); + outl(plxcntrl, addr + PLX_CNTRL); + plxcntrl &= ~(RESET_9050 + RESET_GAZEL); + WriteISAC(cs, IPAC_POTA2 - 0x80, 0x20); + HZDELAY(4); + outl(plxcntrl, addr + PLX_CNTRL); + HZDELAY(10); + WriteISAC(cs, IPAC_POTA2 - 0x80, 0x00); + WriteISAC(cs, IPAC_ACFG - 0x80, 0xff); + WriteISAC(cs, IPAC_AOE - 0x80, 0x0); + WriteISAC(cs, IPAC_MASK - 0x80, 0xff); + WriteISAC(cs, IPAC_CONF - 0x80, 0x1); + outb(INT_IPAC_EN + INT_PCI_EN, addr + PLX_INCSR); + WriteISAC(cs, IPAC_MASK - 0x80, 0xc0); + break; + case R742: + WriteISAC(cs, IPAC_POTA2 - 0x80, 0x20); + HZDELAY(4); + WriteISAC(cs, IPAC_POTA2 - 0x80, 0x00); + WriteISAC(cs, IPAC_ACFG - 0x80, 0xff); + WriteISAC(cs, IPAC_AOE - 0x80, 0x0); + WriteISAC(cs, IPAC_MASK - 0x80, 0xff); + WriteISAC(cs, IPAC_CONF - 0x80, 0x1); + WriteISAC(cs, IPAC_MASK - 0x80, 0xc0); + break; + } + return (0); } static int -r753_reset(struct IsdnCardState *cs) +Gazel_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - unsigned long plxcntrl, addr = cs->hw.gazel.cfg_reg; + u_long flags; - if (test_bit(FLG_BUGGY_PLX9050, &cs->HW_Flags)) - /* we can't read, assume the default */ - plxcntrl = 0x18784db6; - else - plxcntrl = inl(addr + PLX_CNTRL); - plxcntrl |= (RESET_9050 + RESET_GAZEL); - outl(plxcntrl, addr + PLX_CNTRL); - ipac_write(cs, IPAC_POTA2, 0x20); - HZDELAY(4); - plxcntrl &= ~(RESET_9050 + RESET_GAZEL); - outl(plxcntrl, addr + PLX_CNTRL); - HZDELAY(10); - ipac_write(cs, IPAC_POTA2, 0x00); - ipac_write(cs, IPAC_ACFG, 0xff); - ipac_write(cs, IPAC_AOE, 0x0); - ipac_write(cs, IPAC_MASK, 0xff); - ipac_write(cs, IPAC_CONF, 0x1); - outb(INT_IPAC_EN + INT_PCI_EN, addr + PLX_INCSR); - ipac_write(cs, IPAC_MASK, 0xc0); - return 0; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_gazel(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_RELEASE: + release_io_gazel(cs); + return (0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscxisac(cs, 1); + if ((cs->subtyp==R647)||(cs->subtyp==R685)) { + int i; + for (i=0;i<(2+MAX_WAITING_CALLS);i++) { + cs->bcs[i].hw.hscx.tsaxr0 = 0x1f; + cs->bcs[i].hw.hscx.tsaxr1 = 0x23; + } + } + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_TEST: + return (0); + } + return (0); } static int -r742_reset(struct IsdnCardState *cs) +reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs) { - ipac_write(cs, IPAC_POTA2, 0x20); - HZDELAY(4); - ipac_write(cs, IPAC_POTA2, 0x00); - ipac_write(cs, IPAC_ACFG, 0xff); - ipac_write(cs, IPAC_AOE, 0x0); - ipac_write(cs, IPAC_MASK, 0xff); - ipac_write(cs, IPAC_CONF, 0x1); - ipac_write(cs, IPAC_MASK, 0xc0); - return 0; -} + unsigned int i, j, base = 0, adr = 0, len = 0; -static void -gazel_init(struct IsdnCardState *cs) -{ - int i; + switch (cs->subtyp) { + case R647: + base = cs->hw.gazel.hscx[0]; + if (!request_region(adr = (0xC000 + base), len = 1, "gazel")) + goto error; + for (i = 0x0000; i < 0xC000; i += 0x1000) { + if (!request_region(adr = (i + base), len = 16, "gazel")) + goto error; + } + if (i != 0xC000) { + for (j = 0; j < i; j+= 0x1000) + release_region(j + base, 16); + release_region(0xC000 + base, 1); + goto error; + } + break; + + case R685: + if (!request_region(adr = cs->hw.gazel.hscx[0], len = 0x100, "gazel")) + goto error; + if (!request_region(adr = cs->hw.gazel.cfg_reg, len = 0x80, "gazel")) { + release_region(cs->hw.gazel.hscx[0],0x100); + goto error; + } + break; - for (i = 0; i < 2; i++) { - cs->bcs[i].hw.hscx.tsaxr0 = 0x1f; - cs->bcs[i].hw.hscx.tsaxr1 = 0x23; - } - inithscxisac(cs); -} - -static struct card_ops r647_ops = { - .init = gazel_init, - .reset = r647_reset, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; - -static struct card_ops r685_ops = { - .init = gazel_init, - .reset = r685_reset, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; - -static struct card_ops r742_ops = { - .init = ipac_init, - .reset = r742_reset, - .release = hisax_release_resources, - .irq_func = ipac_irq, -}; - -static struct card_ops r753_ops = { - .init = ipac_init, - .reset = r753_reset, - .release = hisax_release_resources, - .irq_func = ipac_irq, -}; + case R753: + if (!request_region(adr = cs->hw.gazel.ipac, len = 0x8, "gazel")) + goto error; + if (!request_region(adr = cs->hw.gazel.cfg_reg, len = 0x80, "gazel")) { + release_region(cs->hw.gazel.ipac, 8); + goto error; + } + break; + + case R742: + if (!request_region(adr = cs->hw.gazel.ipac, len = 0x8, "gazel")) + goto error; + break; + } + + return 0; + + error: + printk(KERN_WARNING "Gazel: %s io ports 0x%x-0x%x already in use\n", + CardType[cs->typ], adr, adr + len); + return 1; +} static int __init -gazel647_probe(struct IsdnCardState *cs, struct IsdnCard *card) +setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) { - int i, base; + printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n"); + // we got an irq parameter, assume it is an ISA card + // R742 decodes address even in not started... + // R647 returns FF if not present or not started + // eventually needs improvment + if (readreg_ipac(card->para[1], IPAC_ID) == 1) + cs->subtyp = R742; + else + cs->subtyp = R647; - cs->subtyp = R647; - cs->irq = card->para[0]; + setup_isac(cs); cs->hw.gazel.cfg_reg = card->para[1] + 0xC000; - - printk(KERN_INFO "Gazel: Card ISA R647/R648 found\n"); - cs->dc.isac.adf2 = 0x87; - printk(KERN_INFO "Gazel: config irq:%d isac:0x%X cfg:0x%X\n", - cs->irq, cs->hw.gazel.isac, cs->hw.gazel.cfg_reg); - printk(KERN_INFO - "Gazel: hscx A:0x%X hscx B:0x%X\n", - cs->hw.gazel.hscx[0], cs->hw.gazel.hscx[1]); - + cs->hw.gazel.ipac = card->para[1]; cs->hw.gazel.isac = card->para[1] + 0x8000; cs->hw.gazel.hscx[0] = card->para[1]; cs->hw.gazel.hscx[1] = card->para[1] + 0x4000; + cs->irq = card->para[0]; cs->hw.gazel.isacfifo = cs->hw.gazel.isac; cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0]; cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1]; - base = cs->hw.gazel.hscx[0]; - for (i = 0; i < 0xc000; i += 0x1000) { - if (!request_io(&cs->rs, base + i, 16, "gazel")) - goto err; - } - if (!request_io(&cs->rs, 0xc000 + base, 1, "gazel")) - goto err; - - cs->card_ops = &r647_ops; - if (hscxisac_setup(cs, &r647_isac_ops, &r647_hscx_ops)) - goto err; - - cs->card_ops->reset(cs); - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -gazel742_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->subtyp = R742; - cs->irq = card->para[0]; - cs->hw.gazel.cfg_reg = card->para[1] + 0xC000; + switch (cs->subtyp) { + case R647: + printk(KERN_INFO "Gazel: Card ISA R647/R648 found\n"); + cs->dc.isac.adf2 = 0x87; + printk(KERN_INFO + "Gazel: config irq:%d isac:0x%X cfg:0x%X\n", + cs->irq, cs->hw.gazel.isac, cs->hw.gazel.cfg_reg); + printk(KERN_INFO + "Gazel: hscx A:0x%X hscx B:0x%X\n", + cs->hw.gazel.hscx[0], cs->hw.gazel.hscx[1]); - printk(KERN_INFO "Gazel: Card ISA R742 found\n"); - printk(KERN_INFO "Gazel: config irq:%d ipac:0x%X\n", - cs->irq, cs->hw.gazel.ipac); - - if (!request_io(&cs->rs, cs->hw.gazel.ipac, 0x8, "gazel")) - goto err; - - cs->card_ops = &r742_ops; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - goto err; + break; + case R742: + printk(KERN_INFO "Gazel: Card ISA R742 found\n"); + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + printk(KERN_INFO + "Gazel: config irq:%d ipac:0x%X\n", + cs->irq, cs->hw.gazel.ipac); + break; + } - cs->card_ops->reset(cs); - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + return (0); } +static struct pci_dev *dev_tel __initdata = NULL; + static int __init -gazel685_probe(struct IsdnCardState *cs, struct pci_dev *pdev) +setup_gazelpci(struct IsdnCardState *cs) { - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = R685; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.gazel.cfg_reg = pci_resource_start(pdev, 1); - cs->hw.gazel.isac = pci_resource_start(pdev, 2) + 0x80; - cs->hw.gazel.hscx[0] = pci_resource_start(pdev, 2); - cs->hw.gazel.hscx[1] = pci_resource_start(pdev, 2) + 0x40; - cs->hw.gazel.isacfifo = cs->hw.gazel.isac; + u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0; + u_char pci_irq = 0, found; + u_int nbseek, seekcard; + + printk(KERN_WARNING "Gazel: PCI card automatic recognition\n"); + + found = 0; + seekcard = PCI_DEVICE_ID_PLX_R685; + for (nbseek = 0; nbseek < 3; nbseek++) { + if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, seekcard, dev_tel))) { + if (pci_enable_device(dev_tel)) + return 1; + pci_irq = dev_tel->irq; + pci_ioaddr0 = pci_resource_start(dev_tel, 1); + pci_ioaddr1 = pci_resource_start(dev_tel, 2); + found = 1; + } + if (found) + break; + else { + switch (seekcard) { + case PCI_DEVICE_ID_PLX_R685: + seekcard = PCI_DEVICE_ID_PLX_R753; + break; + case PCI_DEVICE_ID_PLX_R753: + seekcard = PCI_DEVICE_ID_PLX_DJINN_ITOO; + break; + } + } + } + if (!found) { + printk(KERN_WARNING "Gazel: No PCI card found\n"); + return (1); + } + if (!pci_irq) { + printk(KERN_WARNING "Gazel: No IRQ for PCI card found\n"); + return 1; + } + cs->hw.gazel.pciaddr[0] = pci_ioaddr0; + cs->hw.gazel.pciaddr[1] = pci_ioaddr1; + setup_isac(cs); + pci_ioaddr1 &= 0xfffe; + cs->hw.gazel.cfg_reg = pci_ioaddr0 & 0xfffe; + cs->hw.gazel.ipac = pci_ioaddr1; + cs->hw.gazel.isac = pci_ioaddr1 + 0x80; + cs->hw.gazel.hscx[0] = pci_ioaddr1; + cs->hw.gazel.hscx[1] = pci_ioaddr1 + 0x40; + cs->hw.gazel.isacfifo = cs->hw.gazel.isac; cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0]; cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1]; - cs->dc.isac.adf2 = 0x87; - - if (!request_io(&cs->rs, cs->hw.gazel.hscx[0], 0x100, "gazel")) - goto err; - if (!request_io(&cs->rs, cs->hw.gazel.cfg_reg, 0x80, "gazel")) - goto err; - - printk(KERN_INFO "Gazel: Card PCI R685 found\n"); - printk(KERN_INFO "Gazel: config irq:%d isac:0x%X cfg:0x%X\n", - cs->irq, cs->hw.gazel.isac, cs->hw.gazel.cfg_reg); - printk(KERN_INFO "Gazel: hscx A:0x%X hscx B:0x%X\n", - cs->hw.gazel.hscx[0], cs->hw.gazel.hscx[1]); - - cs->card_ops = &r685_ops; - if (hscxisac_setup(cs, &r685_isac_ops, &r685_hscx_ops)) - goto err; + cs->irq = pci_irq; + cs->irq_flags |= SA_SHIRQ; - cs->card_ops->reset(cs); - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -gazel753_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - u8 pci_rev; - - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = R753; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.gazel.cfg_reg = pci_resource_start(pdev, 1); - cs->hw.gazel.ipac = pci_resource_start(pdev, 2); - - if (!request_io(&cs->rs, cs->hw.gazel.ipac, 0x8, "gazel")) - goto err; - if (!request_io(&cs->rs, cs->hw.gazel.cfg_reg, 0x80, "gazel")) - goto err; - - printk(KERN_INFO "Gazel: Card PCI R753 found\n"); - printk(KERN_INFO "Gazel: config irq:%d ipac:0x%X cfg:0x%X\n", - cs->irq, cs->hw.gazel.ipac, cs->hw.gazel.cfg_reg); - /* - * Erratum for PLX9050, revision 1: - * If bit 7 of BAR 0/1 is set, local config registers - * can not be read (write is okay) - */ - if (cs->hw.gazel.cfg_reg & 0x80) { - pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev); - if (pci_rev == 1) { - printk(KERN_INFO "Gazel: PLX9050 rev1 workaround " - "activated\n"); - __set_bit(FLG_BUGGY_PLX9050, &cs->HW_Flags); - } + switch (seekcard) { + case PCI_DEVICE_ID_PLX_R685: + printk(KERN_INFO "Gazel: Card PCI R685 found\n"); + cs->subtyp = R685; + cs->dc.isac.adf2 = 0x87; + printk(KERN_INFO + "Gazel: config irq:%d isac:0x%X cfg:0x%X\n", + cs->irq, cs->hw.gazel.isac, cs->hw.gazel.cfg_reg); + printk(KERN_INFO + "Gazel: hscx A:0x%X hscx B:0x%X\n", + cs->hw.gazel.hscx[0], cs->hw.gazel.hscx[1]); + break; + case PCI_DEVICE_ID_PLX_R753: + case PCI_DEVICE_ID_PLX_DJINN_ITOO: + printk(KERN_INFO "Gazel: Card PCI R753 found\n"); + cs->subtyp = R753; + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + printk(KERN_INFO + "Gazel: config irq:%d ipac:0x%X cfg:0x%X\n", + cs->irq, cs->hw.gazel.ipac, cs->hw.gazel.cfg_reg); + break; } - cs->card_ops = &r753_ops; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - goto err; - cs->card_ops->reset(cs); - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + return (0); } -static struct pci_dev *dev_tel __initdata = NULL; -static u16 __initdata dev_id = PCI_DEVICE_ID_PLX_R685; - int __init setup_gazel(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; + u_char val; strcpy(tmp, gazel_revision); printk(KERN_INFO "Gazel: Driver Revision %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_GAZEL) + return (0); + if (card->para[0]) { - printk(KERN_INFO "Gazel: ISA card automatic recognition\n"); - // we got an irq parameter, assume it is an ISA card - // R742 decodes address even in not started... - // R647 returns FF if not present or not started - // eventually needs improvment - card->cs->hw.gazel.ipac = card->para[1]; - if (ipac_read(card->cs, IPAC_ID) == 1) { - if (gazel742_probe(card->cs, card)) - return 0; - } else { - if (gazel647_probe(card->cs, card)) - return 0; - } - return 1; + if (setup_gazelisa(card, cs)) + return (0); + } else { + +#if CONFIG_PCI + if (setup_gazelpci(cs)) + return (0); +#else + printk(KERN_WARNING "Gazel: Card PCI requested and NO_PCI_BIOS, unable to config\n"); + return (0); +#endif /* CONFIG_PCI */ } - for (;;) { - dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, dev_id, dev_tel); - if (dev_tel) { - switch (dev_id) { - case PCI_DEVICE_ID_PLX_R685: - if (gazel685_probe(card->cs, dev_tel)) - return 0; - return 1; - case PCI_DEVICE_ID_PLX_R753: - case PCI_DEVICE_ID_PLX_DJINN_ITOO: - if (gazel753_probe(card->cs, dev_tel)) - return 0; - return 1; + if (reserve_regions(card, cs)) { + return (0); + } + if (reset_gazel(cs)) { + printk(KERN_WARNING "Gazel: wrong IRQ\n"); + release_io_gazel(cs); + return (0); + } + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &Gazel_card_msg; + + switch (cs->subtyp) { + case R647: + case R685: + cs->irq_func = &gazel_interrupt; + ISACVersion(cs, "Gazel:"); + if (HscxVersion(cs, "Gazel:")) { + printk(KERN_WARNING + "Gazel: wrong HSCX versions check IO address\n"); + release_io_gazel(cs); + return (0); } - } - switch (dev_id) { - case PCI_DEVICE_ID_PLX_R685: - dev_id = PCI_DEVICE_ID_PLX_R753; - case PCI_DEVICE_ID_PLX_R753: - dev_id = PCI_DEVICE_ID_PLX_DJINN_ITOO; - default: break; - } + case R742: + case R753: + cs->irq_func = &gazel_interrupt_ipac; + val = ReadISAC(cs, IPAC_ID - 0x80); + printk(KERN_INFO "Gazel: IPAC version %x\n", val); + break; } - printk(KERN_WARNING "Gazel: No PCI card found\n"); - return 0; -} - + return (1); +} diff -Nru a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c --- a/drivers/isdn/hisax/hfc_2bds0.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/hisax/hfc_2bds0.c Thu Feb 19 23:44:22 2004 @@ -1,4 +1,4 @@ -/* $Id: hfc_2bds0.c,v 1.15.6.3 2001/09/23 22:24:47 kai Exp $ +/* $Id: hfc_2bds0.c,v 1.18.2.6 2004/02/11 13:21:33 keil Exp $ * * specific routines for CCD's HFC 2BDS0 * @@ -23,10 +23,16 @@ #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -static inline u8 -ReadReg(struct IsdnCardState *cs, int data, u8 reg) +static void +dummyf(struct IsdnCardState *cs, u_char * data, int size) +{ + printk(KERN_WARNING "HiSax: hfcd dummy fifo called\n"); +} + +static inline u_char +ReadReg(struct IsdnCardState *cs, int data, u_char reg) { - register u8 ret; + register u_char ret; if (data) { if (cs->hw.hfcD.cip != reg) { @@ -44,7 +50,7 @@ } static inline void -WriteReg(struct IsdnCardState *cs, int data, u8 reg, u8 value) +WriteReg(struct IsdnCardState *cs, int data, u_char reg, u_char value) { if (cs->hw.hfcD.cip != reg) { cs->hw.hfcD.cip = reg; @@ -58,31 +64,20 @@ #endif } -static struct bc_hw_ops hfcs_bc_ops = { - .read_reg = ReadReg, - .write_reg = WriteReg, -}; - /* Interface functions */ -static inline u8 -hfcs_read_reg(struct IsdnCardState *cs, u8 offset) +static u_char +readreghfcd(struct IsdnCardState *cs, u_char offset) { - return ReadReg(cs, HFCD_DATA, offset); + return(ReadReg(cs, HFCD_DATA, offset)); } -static inline void -hfcs_write_reg(struct IsdnCardState *cs, u8 offset, u8 value) +static void +writereghfcd(struct IsdnCardState *cs, u_char offset, u_char value) { WriteReg(cs, HFCD_DATA, offset, value); } -void -set_cs_func(struct IsdnCardState *cs) -{ - cs->bc_hw_ops = &hfcs_bc_ops; -} - static inline int WaitForBusy(struct IsdnCardState *cs) { @@ -112,13 +107,12 @@ } static int -SelFiFo(struct IsdnCardState *cs, u8 FiFo) +SelFiFo(struct IsdnCardState *cs, u_char FiFo) { - u8 cip; + u_char cip; if (cs->hw.hfcD.fifo == FiFo) return(1); - switch(FiFo) { case 0: cip = HFCB_FIFO | HFCB_Z1 | HFCB_SEND | HFCB_B1; break; @@ -138,10 +132,11 @@ } cs->hw.hfcD.fifo = FiFo; WaitNoBusy(cs); - WriteReg(cs, HFCD_DATA, cip, 0); + cs->BC_Write_Reg(cs, HFCD_DATA, cip, 0); WaitForBusy(cs); return(2); } + static int GetFreeFifoBytes_B(struct BCState *bcs) { @@ -171,7 +166,7 @@ } static int -ReadZReg(struct IsdnCardState *cs, u8 reg) +ReadZReg(struct IsdnCardState *cs, u_char reg) { int val; @@ -185,12 +180,12 @@ static struct sk_buff *hfc_empty_fifo(struct BCState *bcs, int count) { - u8 *ptr; + u_char *ptr; struct sk_buff *skb; struct IsdnCardState *cs = bcs->cs; int idx; int chksum; - u8 stat, cip; + u_char stat, cip; if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) debugl1(cs, "hfc_empty_fifo"); @@ -264,10 +259,9 @@ hfc_fill_fifo(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; - u_int idx; - int fcnt; - u_int count; - u8 cip; + int idx, fcnt; + int count; + u_char cip; if (!bcs->tx_skb) return; @@ -320,7 +314,16 @@ printk(KERN_WARNING "HFC S FIFO channel %d BUSY Error\n", bcs->channel); } else { bcs->tx_cnt -= bcs->tx_skb->len; - xmit_complete_b(bcs); + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->tx_skb->len; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; } WaitForBusy(cs); WaitNoBusy(cs); @@ -330,17 +333,33 @@ return; } +static void +hfc_send_data(struct BCState *bcs) +{ + struct IsdnCardState *cs = bcs->cs; + + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs,"send_data %d blocked", bcs->channel); +} + void main_rec_2bds0(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; int z1, z2, rcnt; - u8 f1, f2, cip; + u_char f1, f2, cip; int receive, count = 5; struct sk_buff *skb; Begin: count--; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs,"rec_data %d blocked", bcs->channel); + return; + } SelFiFo(cs, HFCB_REC | HFCB_CHANNEL(bcs->channel)); cip = HFCB_FIFO | HFCB_F1 | HFCB_REC | HFCB_CHANNEL(bcs->channel); WaitNoBusy(cs); @@ -363,7 +382,7 @@ bcs->channel, z1, z2, rcnt); if ((skb = hfc_empty_fifo(bcs, rcnt))) { skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); } rcnt = f1 -f2; if (rcnt<0) @@ -374,6 +393,7 @@ receive = 0; } else receive = 0; + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); if (count && receive) goto Begin; return; @@ -430,31 +450,57 @@ static void hfc_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; +// test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "hfc_l2l1: this shouldn't happen\n"); + } else { +// test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - mode_2bs0(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + mode_2bs0(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - mode_2bs0(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + mode_2bs0(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -495,7 +541,7 @@ if (open_hfcstate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = hfc_l2l1; + st->l2.l2l1 = hfc_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -503,11 +549,8 @@ } static void -hfcd_bh(void *data) +hfcd_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; -/* struct PStack *stptr; -*/ if (!cs) return; if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { @@ -543,18 +586,22 @@ struct sk_buff *skb; int idx; int rcnt, z1, z2; - u8 stat, cip, f1, f2; + u_char stat, cip, f1, f2; int chksum; int count=5; - u8 *ptr; + u_char *ptr; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs, "rec_dmsg blocked"); + return(1); + } SelFiFo(cs, 4 | HFCD_REC); cip = HFCD_FIFO | HFCD_F1 | HFCD_REC; WaitNoBusy(cs); - f1 = hfcs_read_reg(cs, cip) & 0xf; + f1 = cs->readisac(cs, cip) & 0xf; cip = HFCD_FIFO | HFCD_F2 | HFCD_REC; WaitNoBusy(cs); - f2 = hfcs_read_reg(cs, cip) & 0xf; + f2 = cs->readisac(cs, cip) & 0xf; while ((f1 != f2) && count--) { z1 = ReadZReg(cs, HFCD_FIFO | HFCD_Z1 | HFCD_REC); z2 = ReadZReg(cs, HFCD_FIFO | HFCD_Z2 | HFCD_REC); @@ -617,7 +664,7 @@ #endif } else { skb_queue_tail(&cs->rq, skb); - sched_d_event(cs, D_RCVBUFREADY); + schedule_event(cs, D_RCVBUFREADY); } } } else @@ -629,17 +676,18 @@ WaitForBusy(cs); cip = HFCD_FIFO | HFCD_F2 | HFCD_REC; WaitNoBusy(cs); - f2 = hfcs_read_reg(cs, cip) & 0xf; + f2 = cs->readisac(cs, cip) & 0xf; } + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); return(1); } static void hfc_fill_dfifo(struct IsdnCardState *cs) { - int fcnt; - u_int idx, count; - u8 cip; + int idx, fcnt; + int count; + u_char cip; if (!cs->tx_skb) return; @@ -711,26 +759,31 @@ } void -hfc2bds0_interrupt(struct IsdnCardState *cs, u8 val) +hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val) { - u8 exval; + u_char exval; struct BCState *bcs; int count=15; if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "HFCD irq %x", val); - + debugl1(cs, "HFCD irq %x %s", val, + test_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags) ? + "locked" : "unlocked"); val &= cs->hw.hfcD.int_m1; if (val & 0x40) { /* TE state machine irq */ - exval = hfcs_read_reg(cs, HFCD_STATES) & 0xf; + exval = cs->readisac(cs, HFCD_STATES) & 0xf; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ph_state chg %d->%d", cs->dc.hfcd.ph_state, exval); cs->dc.hfcd.ph_state = exval; - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); val &= ~0x40; } while (val) { + if (test_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + cs->hw.hfcD.int_s1 |= val; + return; + } if (cs->hw.hfcD.int_s1 & 0x18) { exval = val; val = cs->hw.hfcD.int_s1; @@ -755,7 +808,23 @@ if (cs->debug) debugl1(cs, "hfcd spurious 0x01 IRQ"); } else { - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs,"fill_data %d blocked", bcs->channel); + } else { + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs,"fill_data %d blocked", bcs->channel); + } else { + schedule_event(bcs, B_XMTBUFREADY); + } + } } } if (val & 0x02) { @@ -763,15 +832,60 @@ if (cs->debug) debugl1(cs, "hfcd spurious 0x02 IRQ"); } else { - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs,"fill_data %d blocked", bcs->channel); + } else { + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs,"fill_data %d blocked", bcs->channel); + } else { + schedule_event(bcs, B_XMTBUFREADY); + } + } } } if (val & 0x20) { /* receive dframe */ receive_dmsg(cs); } if (val & 0x04) { /* dframe transmitted */ - xmit_xpr_d(cs); + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { + if (cs->tx_skb->len) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else { + debugl1(cs, "hfc_fill_dfifo irq blocked"); + } + goto afterXPR; + } else { + dev_kfree_skb_irq(cs->tx_skb); + cs->tx_cnt = 0; + cs->tx_skb = NULL; + } + } + if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_cnt = 0; + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else { + debugl1(cs, "hfc_fill_dfifo irq blocked"); + } + } else + schedule_event(cs, D_XMTBUFREADY); } + afterXPR: if (cs->hw.hfcD.int_s1 && count--) { val = cs->hw.hfcD.int_s1; cs->hw.hfcD.int_s1 = 0; @@ -787,36 +901,101 @@ { struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_d(cs, skb); + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + skb_queue_tail(&cs->sq, skb); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA Queued", 0); +#endif + } else { + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA", 0); +#endif + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "hfc_fill_dfifo blocked"); + + } + spin_unlock_irqrestore(&cs->lock, flags); break; - case (PH_PULL |INDICATION): - xmit_pull_ind_d(cs, skb); + case (PH_PULL | INDICATION): + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); + skb_queue_tail(&cs->sq, skb); + spin_unlock_irqrestore(&cs->lock, flags); + break; + } + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); +#endif + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfc_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "hfc_fill_dfifo blocked"); + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_d(st); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + debugl1(cs, "-> PH_REQUEST_PULL"); +#endif + if (!cs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (HW_RESET | REQUEST): - hfcs_write_reg(cs, HFCD_STATES, HFCD_LOAD_STATE | 3); /* HFC ST 3 */ + spin_lock_irqsave(&cs->lock, flags); + cs->writeisac(cs, HFCD_STATES, HFCD_LOAD_STATE | 3); /* HFC ST 3 */ udelay(6); - hfcs_write_reg(cs, HFCD_STATES, 3); /* HFC ST 2 */ + cs->writeisac(cs, HFCD_STATES, 3); /* HFC ST 2 */ cs->hw.hfcD.mst_m |= HFCD_MASTER; - hfcs_write_reg(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); - hfcs_write_reg(cs, HFCD_STATES, HFCD_ACTIVATE | HFCD_DO_ACTION); + cs->writeisac(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); + cs->writeisac(cs, HFCD_STATES, HFCD_ACTIVATE | HFCD_DO_ACTION); + spin_unlock_irqrestore(&cs->lock, flags); l1_msg(cs, HW_POWERUP | CONFIRM, NULL); break; case (HW_ENABLE | REQUEST): - hfcs_write_reg(cs, HFCD_STATES, HFCD_ACTIVATE | HFCD_DO_ACTION); + spin_lock_irqsave(&cs->lock, flags); + cs->writeisac(cs, HFCD_STATES, HFCD_ACTIVATE | HFCD_DO_ACTION); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_DEACTIVATE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); cs->hw.hfcD.mst_m &= ~HFCD_MASTER; - hfcs_write_reg(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); + cs->writeisac(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_INFO3 | REQUEST): + spin_lock_irqsave(&cs->lock, flags); cs->hw.hfcD.mst_m |= HFCD_MASTER; - hfcs_write_reg(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); + cs->writeisac(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); break; default: if (cs->debug & L1_DEB_WARN) @@ -825,11 +1004,10 @@ } } -static int +void setstack_hfcd(struct PStack *st, struct IsdnCardState *cs) { st->l1.l1hw = HFCD_l1hw; - return 0; } static void @@ -852,30 +1030,21 @@ return(send); } -static struct bc_l1_ops hfcd_bc_l1_ops = { - .fill_fifo = hfc_fill_fifo, - .open = setstack_2b, - .close = close_2bs0, -}; - -static struct dc_l1_ops hfcd_dc_l1_ops = { - .fill_fifo = hfc_fill_dfifo, - .open = setstack_hfcd, - .bh_func = hfcd_bh, - .dbusy_func = hfc_dbusy_timer, -}; - void __init init2bds0(struct IsdnCardState *cs) { - dc_l1_init(cs, &hfcd_dc_l1_ops); - cs->bc_l1_ops = &hfcd_bc_l1_ops; + cs->setstack_d = setstack_hfcd; if (!cs->hw.hfcD.send) cs->hw.hfcD.send = init_send_hfcd(16); if (!cs->bcs[0].hw.hfc.send) cs->bcs[0].hw.hfc.send = init_send_hfcd(32); if (!cs->bcs[1].hw.hfc.send) cs->bcs[1].hw.hfc.send = init_send_hfcd(32); + cs->BC_Send_Data = &hfc_send_data; + cs->bcs[0].BC_SetStack = setstack_2b; + cs->bcs[1].BC_SetStack = setstack_2b; + cs->bcs[0].BC_Close = close_2bs0; + cs->bcs[1].BC_Close = close_2bs0; mode_2bs0(cs->bcs, 0, 0); mode_2bs0(cs->bcs + 1, 0, 1); } @@ -895,4 +1064,19 @@ kfree(cs->hw.hfcD.send); cs->hw.hfcD.send = NULL; } +} + +void +set_cs_func(struct IsdnCardState *cs) +{ + cs->readisac = &readreghfcd; + cs->writeisac = &writereghfcd; + cs->readisacfifo = &dummyf; + cs->writeisacfifo = &dummyf; + cs->BC_Read_Reg = &ReadReg; + cs->BC_Write_Reg = &WriteReg; + cs->dbusytimer.function = (void *) hfc_dbusy_timer; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); + INIT_WORK(&cs->tqueue, (void *)(void *) hfcd_bh, cs); } diff -Nru a/drivers/isdn/hisax/hfc_2bds0.h b/drivers/isdn/hisax/hfc_2bds0.h --- a/drivers/isdn/hisax/hfc_2bds0.h Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/hfc_2bds0.h Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: hfc_2bds0.h,v 1.4.6.2 2001/09/23 22:24:47 kai Exp $ +/* $Id: hfc_2bds0.h,v 1.6.2.2 2004/01/12 22:52:26 keil Exp $ * * specific defines for CCD's HFC 2BDS0 * @@ -124,5 +124,5 @@ extern void main_irq_2bds0(struct BCState *bcs); extern void init2bds0(struct IsdnCardState *cs); extern void release2bds0(struct IsdnCardState *cs); -extern void hfc2bds0_interrupt(struct IsdnCardState *cs, u8 val); +extern void hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val); extern void set_cs_func(struct IsdnCardState *cs); diff -Nru a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c --- a/drivers/isdn/hisax/hfc_2bs0.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/hfc_2bs0.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: hfc_2bs0.c,v 1.17.6.3 2001/09/23 22:24:47 kai Exp $ +/* $Id: hfc_2bs0.c,v 1.20.2.6 2004/02/11 13:21:33 keil Exp $ * * specific routines for CCD's HFC 2BS0 * @@ -17,26 +17,14 @@ #include "isdnl1.h" #include -static inline u8 -hfc_read_reg(struct IsdnCardState *cs, int data, u8 reg) -{ - return cs->bc_hw_ops->read_reg(cs, data, reg); -} - -static inline void -hfc_write_reg(struct IsdnCardState *cs, int data, u8 reg, u8 val) -{ - cs->bc_hw_ops->write_reg(cs, data, reg, val); -} - static inline int WaitForBusy(struct IsdnCardState *cs) { int to = 130; - u8 val; + u_char val; - while (!(hfc_read_reg(cs, HFC_STATUS, 0) & HFC_BUSY) && to) { - val = hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2 | + while (!(cs->BC_Read_Reg(cs, HFC_STATUS, 0) & HFC_BUSY) && to) { + val = cs->BC_Read_Reg(cs, HFC_DATA, HFC_CIP | HFC_F2 | (cs->hw.hfc.cip & 3)); udelay(1); to--; @@ -53,7 +41,7 @@ { int to = 125; - while ((hfc_read_reg(cs, HFC_STATUS, 0) & HFC_BUSY) && to) { + while ((cs->BC_Read_Reg(cs, HFC_STATUS, 0) & HFC_BUSY) && to) { udelay(1); to--; } @@ -79,14 +67,14 @@ } int -ReadZReg(struct BCState *bcs, u8 reg) +ReadZReg(struct BCState *bcs, u_char reg) { int val; WaitNoBusy(bcs->cs); - val = 256 * hfc_read_reg(bcs->cs, HFC_DATA, reg | HFC_CIP | HFC_Z_HIGH); + val = 256 * bcs->cs->BC_Read_Reg(bcs->cs, HFC_DATA, reg | HFC_CIP | HFC_Z_HIGH); WaitNoBusy(bcs->cs); - val += hfc_read_reg(bcs->cs, HFC_DATA, reg | HFC_CIP | HFC_Z_LOW); + val += bcs->cs->BC_Read_Reg(bcs->cs, HFC_DATA, reg | HFC_CIP | HFC_Z_LOW); return (val); } @@ -96,21 +84,20 @@ struct IsdnCardState *cs = bcs->cs; int idx, cnt; int rcnt, z1, z2; - u8 cip, f1, f2; + u_char cip, f1, f2; if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) debugl1(cs, "hfc_clear_fifo"); - cip = HFC_CIP | HFC_F1 | HFC_REC | HFC_CHANNEL(bcs->channel); if ((cip & 0xc3) != (cs->hw.hfc.cip & 0xc3)) { - hfc_write_reg(cs, HFC_STATUS, cip, cip); + cs->BC_Write_Reg(cs, HFC_STATUS, cip, cip); WaitForBusy(cs); } WaitNoBusy(cs); - f1 = hfc_read_reg(cs, HFC_DATA, cip); + f1 = cs->BC_Read_Reg(cs, HFC_DATA, cip); cip = HFC_CIP | HFC_F2 | HFC_REC | HFC_CHANNEL(bcs->channel); WaitNoBusy(cs); - f2 = hfc_read_reg(cs, HFC_DATA, cip); + f2 = cs->BC_Read_Reg(cs, HFC_DATA, cip); z1 = ReadZReg(bcs, HFC_Z1 | HFC_REC | HFC_CHANNEL(bcs->channel)); z2 = ReadZReg(bcs, HFC_Z2 | HFC_REC | HFC_CHANNEL(bcs->channel)); cnt = 32; @@ -129,21 +116,21 @@ cip = HFC_CIP | HFC_FIFO_OUT | HFC_REC | HFC_CHANNEL(bcs->channel); idx = 0; while ((idx < rcnt) && WaitNoBusy(cs)) { - hfc_read_reg(cs, HFC_DATA_NODEB, cip); + cs->BC_Read_Reg(cs, HFC_DATA_NODEB, cip); idx++; } if (f1 != f2) { WaitNoBusy(cs); - hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | + cs->BC_Read_Reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | HFC_CHANNEL(bcs->channel)); WaitForBusy(cs); } cip = HFC_CIP | HFC_F1 | HFC_REC | HFC_CHANNEL(bcs->channel); WaitNoBusy(cs); - f1 = hfc_read_reg(cs, HFC_DATA, cip); + f1 = cs->BC_Read_Reg(cs, HFC_DATA, cip); cip = HFC_CIP | HFC_F2 | HFC_REC | HFC_CHANNEL(bcs->channel); WaitNoBusy(cs); - f2 = hfc_read_reg(cs, HFC_DATA, cip); + f2 = cs->BC_Read_Reg(cs, HFC_DATA, cip); z1 = ReadZReg(bcs, HFC_Z1 | HFC_REC | HFC_CHANNEL(bcs->channel)); z2 = ReadZReg(bcs, HFC_Z2 | HFC_REC | HFC_CHANNEL(bcs->channel)); } @@ -155,12 +142,12 @@ * hfc_empty_fifo(struct BCState *bcs, int count) { - u8 *ptr; + u_char *ptr; struct sk_buff *skb; struct IsdnCardState *cs = bcs->cs; int idx; int chksum; - u8 stat, cip; + u_char stat, cip; if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) debugl1(cs, "hfc_empty_fifo"); @@ -170,9 +157,9 @@ debugl1(cs, "hfc_empty_fifo: incoming packet too large"); cip = HFC_CIP | HFC_FIFO_OUT | HFC_REC | HFC_CHANNEL(bcs->channel); while ((idx++ < count) && WaitNoBusy(cs)) - hfc_read_reg(cs, HFC_DATA_NODEB, cip); + cs->BC_Read_Reg(cs, HFC_DATA_NODEB, cip); WaitNoBusy(cs); - stat = hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | + stat = cs->BC_Read_Reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | HFC_CHANNEL(bcs->channel)); WaitForBusy(cs); return (NULL); @@ -182,9 +169,9 @@ debugl1(cs, "hfc_empty_fifo: incoming packet too small"); cip = HFC_CIP | HFC_FIFO_OUT | HFC_REC | HFC_CHANNEL(bcs->channel); while ((idx++ < count) && WaitNoBusy(cs)) - hfc_read_reg(cs, HFC_DATA_NODEB, cip); + cs->BC_Read_Reg(cs, HFC_DATA_NODEB, cip); WaitNoBusy(cs); - stat = hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | + stat = cs->BC_Read_Reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | HFC_CHANNEL(bcs->channel)); WaitForBusy(cs); #ifdef ERROR_STATISTIC @@ -203,7 +190,7 @@ idx = 0; cip = HFC_CIP | HFC_FIFO_OUT | HFC_REC | HFC_CHANNEL(bcs->channel); while ((idx < count) && WaitNoBusy(cs)) { - *ptr++ = hfc_read_reg(cs, HFC_DATA_NODEB, cip); + *ptr++ = cs->BC_Read_Reg(cs, HFC_DATA_NODEB, cip); idx++; } if (idx != count) { @@ -212,7 +199,7 @@ dev_kfree_skb_any(skb); if (bcs->mode != L1_MODE_TRANS) { WaitNoBusy(cs); - stat = hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | + stat = cs->BC_Read_Reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | HFC_CHANNEL(bcs->channel)); WaitForBusy(cs); } @@ -220,11 +207,11 @@ } if (bcs->mode != L1_MODE_TRANS) { WaitNoBusy(cs); - chksum = (hfc_read_reg(cs, HFC_DATA, cip) << 8); + chksum = (cs->BC_Read_Reg(cs, HFC_DATA, cip) << 8); WaitNoBusy(cs); - chksum += hfc_read_reg(cs, HFC_DATA, cip); + chksum += cs->BC_Read_Reg(cs, HFC_DATA, cip); WaitNoBusy(cs); - stat = hfc_read_reg(cs, HFC_DATA, cip); + stat = cs->BC_Read_Reg(cs, HFC_DATA, cip); if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfc_empty_fifo %d chksum %x stat %x", bcs->channel, chksum, stat); @@ -237,7 +224,7 @@ #endif } WaitNoBusy(cs); - stat = hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | + stat = cs->BC_Read_Reg(cs, HFC_DATA, HFC_CIP | HFC_F2_INC | HFC_REC | HFC_CHANNEL(bcs->channel)); WaitForBusy(cs); } @@ -249,10 +236,10 @@ hfc_fill_fifo(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; - int fcnt; - u_int idx, count; + int idx, fcnt; + int count; int z1, z2; - u8 cip; + u_char cip; if (!bcs->tx_skb) return; @@ -261,15 +248,15 @@ cip = HFC_CIP | HFC_F1 | HFC_SEND | HFC_CHANNEL(bcs->channel); if ((cip & 0xc3) != (cs->hw.hfc.cip & 0xc3)) { - hfc_write_reg(cs, HFC_STATUS, cip, cip); + cs->BC_Write_Reg(cs, HFC_STATUS, cip, cip); WaitForBusy(cs); } WaitNoBusy(cs); if (bcs->mode != L1_MODE_TRANS) { - bcs->hw.hfc.f1 = hfc_read_reg(cs, HFC_DATA, cip); + bcs->hw.hfc.f1 = cs->BC_Read_Reg(cs, HFC_DATA, cip); cip = HFC_CIP | HFC_F2 | HFC_SEND | HFC_CHANNEL(bcs->channel); WaitNoBusy(cs); - bcs->hw.hfc.f2 = hfc_read_reg(cs, HFC_DATA, cip); + bcs->hw.hfc.f2 = cs->BC_Read_Reg(cs, HFC_DATA, cip); bcs->hw.hfc.send[bcs->hw.hfc.f1] = ReadZReg(bcs, HFC_Z1 | HFC_SEND | HFC_CHANNEL(bcs->channel)); if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfc_fill_fifo %d f1(%d) f2(%d) z1(%x)", @@ -305,7 +292,7 @@ cip = HFC_CIP | HFC_FIFO_IN | HFC_SEND | HFC_CHANNEL(bcs->channel); idx = 0; while ((idx < bcs->tx_skb->len) && WaitNoBusy(cs)) - hfc_write_reg(cs, HFC_DATA_NODEB, cip, bcs->tx_skb->data[idx++]); + cs->BC_Write_Reg(cs, HFC_DATA_NODEB, cip, bcs->tx_skb->data[idx++]); if (idx != bcs->tx_skb->len) { debugl1(cs, "FIFO Send BUSY error"); printk(KERN_WARNING "HFC S FIFO channel %d BUSY Error\n", bcs->channel); @@ -314,12 +301,20 @@ bcs->tx_cnt -= count; if (PACKET_NOACK == bcs->tx_skb->pkt_type) count = -1; - - xmit_complete_b(bcs); + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; if (bcs->mode != L1_MODE_TRANS) { WaitForBusy(cs); WaitNoBusy(cs); - hfc_read_reg(cs, HFC_DATA, HFC_CIP | HFC_F1_INC | HFC_SEND | HFC_CHANNEL(bcs->channel)); + cs->BC_Read_Reg(cs, HFC_DATA, HFC_CIP | HFC_F1_INC | HFC_SEND | HFC_CHANNEL(bcs->channel)); + } + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (count >= 0)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); } test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); } @@ -331,7 +326,7 @@ { struct IsdnCardState *cs = bcs->cs; int z1, z2, rcnt; - u8 f1, f2, cip; + u_char f1, f2, cip; int receive, transmit, count = 5; struct sk_buff *skb; @@ -339,16 +334,16 @@ count--; cip = HFC_CIP | HFC_F1 | HFC_REC | HFC_CHANNEL(bcs->channel); if ((cip & 0xc3) != (cs->hw.hfc.cip & 0xc3)) { - hfc_write_reg(cs, HFC_STATUS, cip, cip); + cs->BC_Write_Reg(cs, HFC_STATUS, cip, cip); WaitForBusy(cs); } WaitNoBusy(cs); receive = 0; if (bcs->mode == L1_MODE_HDLC) { - f1 = hfc_read_reg(cs, HFC_DATA, cip); + f1 = cs->BC_Read_Reg(cs, HFC_DATA, cip); cip = HFC_CIP | HFC_F2 | HFC_REC | HFC_CHANNEL(bcs->channel); WaitNoBusy(cs); - f2 = hfc_read_reg(cs, HFC_DATA, cip); + f2 = cs->BC_Read_Reg(cs, HFC_DATA, cip); if (f1 != f2) { if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfc rec %d f1(%d) f2(%d)", @@ -368,14 +363,14 @@ if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfc rec %d z1(%x) z2(%x) cnt(%d)", bcs->channel, z1, z2, rcnt); + /* sti(); */ if ((skb = hfc_empty_fifo(bcs, rcnt))) { skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); } } receive = 1; } - udelay(1); if (bcs->tx_skb) { transmit = 1; test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); @@ -391,7 +386,7 @@ transmit = 0; } else { transmit = 0; - sched_b_event(bcs, B_XMTBUFREADY); + schedule_event(bcs, B_XMTBUFREADY); } } if ((receive || transmit) && count) @@ -423,7 +418,7 @@ break; case (L1_MODE_TRANS): cs->hw.hfc.ctmt &= ~(1 << bc); /* set HDLC mode */ - hfc_write_reg(cs, HFC_STATUS, cs->hw.hfc.ctmt, cs->hw.hfc.ctmt); + cs->BC_Write_Reg(cs, HFC_STATUS, cs->hw.hfc.ctmt, cs->hw.hfc.ctmt); hfc_clear_fifo(bcs); /* complete fifo clear */ if (bc) { cs->hw.hfc.ctmt |= 1; @@ -447,8 +442,8 @@ } break; } - hfc_write_reg(cs, HFC_STATUS, cs->hw.hfc.ctmt, cs->hw.hfc.ctmt); - cs->dc_hw_ops->write_reg(cs, ISAC_SPCR, cs->hw.hfc.isac_spcr); + cs->BC_Write_Reg(cs, HFC_STATUS, cs->hw.hfc.ctmt, cs->hw.hfc.ctmt); + cs->writeisac(cs, ISAC_SPCR, cs->hw.hfc.isac_spcr); if (mode == L1_MODE_HDLC) hfc_clear_fifo(bcs); } @@ -456,31 +451,57 @@ static void hfc_l2l1(struct PStack *st, int pr, void *arg) { - struct sk_buff *skb = arg; + struct BCState *bcs = st->l1.bcs; + struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "hfc_l2l1: this shouldn't happen\n"); + } else { + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - mode_hfc(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + mode_hfc(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - mode_hfc(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + mode_hfc(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -523,7 +544,7 @@ if (open_hfcstate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = hfc_l2l1; + st->l2.l2l1 = hfc_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -544,18 +565,16 @@ bcs->hw.hfc.send[i] = 0x1fff; } -static struct bc_l1_ops hfc_l1_ops = { - .fill_fifo = hfc_fill_fifo, - .open = setstack_hfc, - .close = close_hfcstate, -}; - void __init inithfc(struct IsdnCardState *cs) { init_send(&cs->bcs[0]); init_send(&cs->bcs[1]); - cs->bc_l1_ops = &hfc_l1_ops; + cs->BC_Send_Data = &hfc_fill_fifo; + cs->bcs[0].BC_SetStack = setstack_hfc; + cs->bcs[1].BC_SetStack = setstack_hfc; + cs->bcs[0].BC_Close = close_hfcstate; + cs->bcs[1].BC_Close = close_hfcstate; mode_hfc(cs->bcs, 0, 0); mode_hfc(cs->bcs + 1, 0, 0); } @@ -571,11 +590,4 @@ kfree(cs->bcs[1].hw.hfc.send); cs->bcs[1].hw.hfc.send = NULL; } -} - -int -hfc_setup(struct IsdnCardState *cs, struct bc_hw_ops *hfc_ops) -{ - cs->bc_hw_ops = hfc_ops; - return 0; } diff -Nru a/drivers/isdn/hisax/hfc_2bs0.h b/drivers/isdn/hisax/hfc_2bs0.h --- a/drivers/isdn/hisax/hfc_2bs0.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/hfc_2bs0.h Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: hfc_2bs0.h,v 1.3.6.2 2001/09/23 22:24:47 kai Exp $ +/* $Id: hfc_2bs0.h,v 1.5.2.2 2004/01/12 22:52:26 keil Exp $ * * specific defines for CCD's HFC 2BS0 * @@ -58,4 +58,3 @@ extern void main_irq_hfc(struct BCState *bcs); extern void inithfc(struct IsdnCardState *cs); extern void releasehfc(struct IsdnCardState *cs); -extern int hfc_setup(struct IsdnCardState *cs, struct bc_hw_ops *hfc_ops); diff -Nru a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c --- a/drivers/isdn/hisax/hfc_pci.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/hfc_pci.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: hfc_pci.c,v 1.34.6.8 2001/09/23 22:24:47 kai Exp $ +/* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $ * * low level driver for CCD´s hfc-pci based cards * @@ -25,7 +25,7 @@ extern const char *CardType[]; -static const char *hfcpci_revision = "$Revision: 1.34.6.8 $"; +static const char *hfcpci_revision = "$Revision: 1.48.2.4 $"; /* table entry in the PCI devices list */ typedef struct { @@ -65,45 +65,47 @@ }; +#if CONFIG_PCI + /******************************************/ /* free hardware resources used by driver */ /******************************************/ -static void -hfcpci_release(struct IsdnCardState *cs) +void +release_io_hfcpci(struct IsdnCardState *cs) { printk(KERN_INFO "HiSax: release hfcpci at %p\n", cs->hw.hfcpci.pci_io); - cs->hw.hfcpci.int_m2 = 0; /* interrupt output off ! */ + cs->hw.hfcpci.int_m2 = 0; /* interrupt output off ! */ Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); - Write_hfc(cs, HFCPCI_CIRM, HFCPCI_RESET); /* Reset On */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30 * HZ) / 1000); /* Timeout 30ms */ - Write_hfc(cs, HFCPCI_CIRM, 0); /* Reset Off */ - pci_disable_device(cs->hw.hfcpci.pdev); + Write_hfc(cs, HFCPCI_CIRM, HFCPCI_RESET); /* Reset On */ + mdelay(10); + Write_hfc(cs, HFCPCI_CIRM, 0); /* Reset Off */ + mdelay(10); + Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); + pci_write_config_word(cs->hw.hfcpci.dev, PCI_COMMAND, 0); /* disable memory mapped ports + busmaster */ del_timer(&cs->hw.hfcpci.timer); - pci_free_consistent(cs->hw.hfcpci.pdev, 32768, cs->hw.hfcpci.fifos, cs->hw.hfcpci.fifos_dma); - hisax_release_resources(cs); + kfree(cs->hw.hfcpci.share_start); + cs->hw.hfcpci.share_start = NULL; + iounmap((void *)cs->hw.hfcpci.pci_io); } /********************************************************************************/ /* function called to reset the HFC PCI chip. A complete software reset of chip */ /* and fifos is done. */ /********************************************************************************/ -static int -hfcpci_reset(struct IsdnCardState *cs) +static void +reset_hfcpci(struct IsdnCardState *cs) { - pci_disable_device(cs->hw.hfcpci.pdev); + pci_write_config_word(cs->hw.hfcpci.dev, PCI_COMMAND, PCI_ENA_MEMIO); /* enable memory mapped ports, disable busmaster */ cs->hw.hfcpci.int_m2 = 0; /* interrupt output off ! */ Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); printk(KERN_INFO "HFC_PCI: resetting card\n"); - pci_set_master(cs->hw.hfcpci.pdev); + pci_write_config_word(cs->hw.hfcpci.dev, PCI_COMMAND, PCI_ENA_MEMIO + PCI_ENA_MASTER); /* enable memory ports + busmaster */ Write_hfc(cs, HFCPCI_CIRM, HFCPCI_RESET); /* Reset On */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30 * HZ) / 1000); /* Timeout 30ms */ + mdelay(10); Write_hfc(cs, HFCPCI_CIRM, 0); /* Reset Off */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((20 * HZ) / 1000); /* Timeout 20ms */ + mdelay(10); if (Read_hfc(cs, HFCPCI_STATUS) & 2) printk(KERN_WARNING "HFC-PCI init bit busy\n"); @@ -156,9 +158,7 @@ /* Finally enable IRQ output */ cs->hw.hfcpci.int_m2 = HFCPCI_IRQ_ENABLE; Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); - if (Read_hfc(cs, HFCPCI_INT_S2)); - - return 0; + if (Read_hfc(cs, HFCPCI_INT_S1)); } /***************************************************/ @@ -174,6 +174,27 @@ */ } + +/*********************************/ +/* schedule a new D-channel task */ +/*********************************/ +static void +sched_event_D_pci(struct IsdnCardState *cs, int event) +{ + test_and_set_bit(event, &cs->event); + schedule_work(&cs->tqueue); +} + +/*********************************/ +/* schedule a new b_channel task */ +/*********************************/ +static void +hfcpci_sched_event(struct BCState *bcs, int event) +{ + test_and_set_bit(event, &bcs->event); + schedule_work(&bcs->tqueue); +} + /************************************************/ /* select a b-channel entry matching and active */ /************************************************/ @@ -193,7 +214,7 @@ /* clear the desired B-channel rx fifo */ /***************************************/ static void hfcpci_clear_fifo_rx(struct IsdnCardState *cs, int fifo) -{ u8 fifo_state; +{ u_char fifo_state; bzfifo_type *bzr; if (fifo) { @@ -207,7 +228,7 @@ cs->hw.hfcpci.fifo_en ^= fifo_state; Write_hfc(cs, HFCPCI_FIFO_EN, cs->hw.hfcpci.fifo_en); cs->hw.hfcpci.last_bfifo_cnt[fifo] = 0; - bzr->za[MAX_B_FRAMES].z1 = cpu_to_le16(B_FIFO_SIZE + B_SUB_VAL - 1); + bzr->za[MAX_B_FRAMES].z1 = B_FIFO_SIZE + B_SUB_VAL - 1; bzr->za[MAX_B_FRAMES].z2 = bzr->za[MAX_B_FRAMES].z1; bzr->f1 = MAX_B_FRAMES; bzr->f2 = bzr->f1; /* init F pointers to remain constant */ @@ -220,7 +241,7 @@ /* clear the desired B-channel tx fifo */ /***************************************/ static void hfcpci_clear_fifo_tx(struct IsdnCardState *cs, int fifo) -{ u8 fifo_state; +{ u_char fifo_state; bzfifo_type *bzt; if (fifo) { @@ -233,7 +254,7 @@ if (fifo_state) cs->hw.hfcpci.fifo_en ^= fifo_state; Write_hfc(cs, HFCPCI_FIFO_EN, cs->hw.hfcpci.fifo_en); - bzt->za[MAX_B_FRAMES].z1 = cpu_to_le16(B_FIFO_SIZE + B_SUB_VAL - 1); + bzt->za[MAX_B_FRAMES].z1 = B_FIFO_SIZE + B_SUB_VAL - 1; bzt->za[MAX_B_FRAMES].z2 = bzt->za[MAX_B_FRAMES].z1; bzt->f1 = MAX_B_FRAMES; bzt->f2 = bzt->f1; /* init F pointers to remain constant */ @@ -247,9 +268,9 @@ /*********************************************/ static struct sk_buff * -hfcpci_empty_fifo(struct BCState *bcs, bzfifo_type * bz, u8 * bdata, int count) +hfcpci_empty_fifo(struct BCState *bcs, bzfifo_type * bz, u_char * bdata, int count) { - u8 *ptr, *ptr1, new_f2; + u_char *ptr, *ptr1, new_f2; struct sk_buff *skb; struct IsdnCardState *cs = bcs->cs; int total, maxlen, new_z2; @@ -258,18 +279,18 @@ if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) debugl1(cs, "hfcpci_empty_fifo"); zp = &bz->za[bz->f2]; /* point to Z-Regs */ - new_z2 = le16_to_cpu(zp->z2) + count; /* new position in fifo */ + new_z2 = zp->z2 + count; /* new position in fifo */ if (new_z2 >= (B_FIFO_SIZE + B_SUB_VAL)) new_z2 -= B_FIFO_SIZE; /* buffer wrap */ new_f2 = (bz->f2 + 1) & MAX_B_FRAMES; if ((count > HSCX_BUFMAX + 3) || (count < 4) || - (*(bdata + (le16_to_cpu(zp->z1) - B_SUB_VAL)))) { + (*(bdata + (zp->z1 - B_SUB_VAL)))) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "hfcpci_empty_fifo: incoming packet invalid length %d or crc", count); #ifdef ERROR_STATISTIC bcs->err_inv++; #endif - bz->za[new_f2].z2 = cpu_to_le16(new_z2); + bz->za[new_f2].z2 = new_z2; bz->f2 = new_f2; /* next buffer */ skb = NULL; } else if (!(skb = dev_alloc_skb(count - 3))) @@ -279,12 +300,12 @@ count -= 3; ptr = skb_put(skb, count); - if (le16_to_cpu(zp->z2) + count <= B_FIFO_SIZE + B_SUB_VAL) + if (zp->z2 + count <= B_FIFO_SIZE + B_SUB_VAL) maxlen = count; /* complete transfer */ else - maxlen = B_FIFO_SIZE + B_SUB_VAL - le16_to_cpu(zp->z2); /* maximum */ + maxlen = B_FIFO_SIZE + B_SUB_VAL - zp->z2; /* maximum */ - ptr1 = bdata + (le16_to_cpu(zp->z2) - B_SUB_VAL); /* start of data */ + ptr1 = bdata + (zp->z2 - B_SUB_VAL); /* start of data */ memcpy(ptr, ptr1, maxlen); /* copy data */ count -= maxlen; @@ -293,7 +314,7 @@ ptr1 = bdata; /* start of buffer */ memcpy(ptr, ptr1, count); /* rest */ } - bz->za[new_f2].z2 = cpu_to_le16(new_z2); + bz->za[new_f2].z2 = new_z2; bz->f2 = new_f2; /* next buffer */ } @@ -311,41 +332,45 @@ int maxlen; int rcnt, total; int count = 5; - u8 *ptr, *ptr1; + u_char *ptr, *ptr1; dfifo_type *df; z_type *zp; df = &((fifo_area *) (cs->hw.hfcpci.fifos))->d_chan.d_rx; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs, "rec_dmsg blocked"); + return (1); + } while (((df->f1 & D_FREG_MASK) != (df->f2 & D_FREG_MASK)) && count--) { zp = &df->za[df->f2 & D_FREG_MASK]; - rcnt = le16_to_cpu(zp->z1) - le16_to_cpu(zp->z2); + rcnt = zp->z1 - zp->z2; if (rcnt < 0) rcnt += D_FIFO_SIZE; rcnt++; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "hfcpci recd f1(%d) f2(%d) z1(%x) z2(%x) cnt(%d)", - df->f1, df->f2, le16_to_cpu(zp->z1), le16_to_cpu(zp->z2), rcnt); + df->f1, df->f2, zp->z1, zp->z2, rcnt); if ((rcnt > MAX_DFRAME_LEN + 3) || (rcnt < 4) || - (df->data[le16_to_cpu(zp->z1)])) { + (df->data[zp->z1])) { if (cs->debug & L1_DEB_WARN) - debugl1(cs, "empty_fifo hfcpci paket inv. len %d or crc %d", rcnt, df->data[le16_to_cpu(zp->z1)]); + debugl1(cs, "empty_fifo hfcpci paket inv. len %d or crc %d", rcnt, df->data[zp->z1]); #ifdef ERROR_STATISTIC cs->err_rx++; #endif df->f2 = ((df->f2 + 1) & MAX_D_FRAMES) | (MAX_D_FRAMES + 1); /* next buffer */ - df->za[df->f2 & D_FREG_MASK].z2 = cpu_to_le16((le16_to_cpu(zp->z2) + rcnt) & (D_FIFO_SIZE - 1)); + df->za[df->f2 & D_FREG_MASK].z2 = (zp->z2 + rcnt) & (D_FIFO_SIZE - 1); } else if ((skb = dev_alloc_skb(rcnt - 3))) { total = rcnt; rcnt -= 3; ptr = skb_put(skb, rcnt); - if ((le16_to_cpu(zp->z2) + rcnt) <= D_FIFO_SIZE) + if (zp->z2 + rcnt <= D_FIFO_SIZE) maxlen = rcnt; /* complete transfer */ else - maxlen = D_FIFO_SIZE - le16_to_cpu(zp->z2); /* maximum */ + maxlen = D_FIFO_SIZE - zp->z2; /* maximum */ - ptr1 = df->data + le16_to_cpu(zp->z2); /* start of data */ + ptr1 = df->data + zp->z2; /* start of data */ memcpy(ptr, ptr1, maxlen); /* copy data */ rcnt -= maxlen; @@ -355,13 +380,14 @@ memcpy(ptr, ptr1, rcnt); /* rest */ } df->f2 = ((df->f2 + 1) & MAX_D_FRAMES) | (MAX_D_FRAMES + 1); /* next buffer */ - df->za[df->f2 & D_FREG_MASK].z2 = cpu_to_le16((le16_to_cpu(zp->z2) + total) & (D_FIFO_SIZE - 1)); + df->za[df->f2 & D_FREG_MASK].z2 = (zp->z2 + total) & (D_FIFO_SIZE - 1); skb_queue_tail(&cs->rq, skb); - sched_d_event(cs, D_RCVBUFREADY); + sched_event_D_pci(cs, D_RCVBUFREADY); } else printk(KERN_WARNING "HFC-PCI: D receive out of memory\n"); } + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); return (1); } @@ -369,17 +395,17 @@ /* check for transparent receive data and read max one threshold size if avail */ /*******************************************************************************/ int -hfcpci_empty_fifo_trans(struct BCState *bcs, bzfifo_type * bz, u8 * bdata) +hfcpci_empty_fifo_trans(struct BCState *bcs, bzfifo_type * bz, u_char * bdata) { unsigned short *z1r, *z2r; int new_z2, fcnt, maxlen; struct sk_buff *skb; - u8 *ptr, *ptr1; + u_char *ptr, *ptr1; z1r = &bz->za[MAX_B_FRAMES].z1; /* pointer to z reg */ z2r = z1r + 1; - if (!(fcnt = le16_to_cpu(*z1r) - le16_to_cpu(*z2r))) + if (!(fcnt = *z1r - *z2r)) return (0); /* no data avail */ if (fcnt <= 0) @@ -387,7 +413,7 @@ if (fcnt > HFCPCI_BTRANS_THRESHOLD) fcnt = HFCPCI_BTRANS_THRESHOLD; /* limit size */ - new_z2 = le16_to_cpu(*z2r) + fcnt; /* new position in fifo */ + new_z2 = *z2r + fcnt; /* new position in fifo */ if (new_z2 >= (B_FIFO_SIZE + B_SUB_VAL)) new_z2 -= B_FIFO_SIZE; /* buffer wrap */ @@ -395,12 +421,12 @@ printk(KERN_WARNING "HFCPCI: receive out of memory\n"); else { ptr = skb_put(skb, fcnt); - if (le16_to_cpu(*z2r) + fcnt <= B_FIFO_SIZE + B_SUB_VAL) + if (*z2r + fcnt <= B_FIFO_SIZE + B_SUB_VAL) maxlen = fcnt; /* complete transfer */ else - maxlen = B_FIFO_SIZE + B_SUB_VAL - le16_to_cpu(*z2r); /* maximum */ + maxlen = B_FIFO_SIZE + B_SUB_VAL - *z2r; /* maximum */ - ptr1 = bdata + (le16_to_cpu(*z2r) - B_SUB_VAL); /* start of data */ + ptr1 = bdata + (*z2r - B_SUB_VAL); /* start of data */ memcpy(ptr, ptr1, maxlen); /* copy data */ fcnt -= maxlen; @@ -410,10 +436,10 @@ memcpy(ptr, ptr1, fcnt); /* rest */ } skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + hfcpci_sched_event(bcs, B_RCVBUFREADY); } - *z2r = cpu_to_le16(new_z2); /* new position */ + *z2r = new_z2; /* new position */ return (1); } /* hfcpci_empty_fifo_trans */ @@ -428,9 +454,10 @@ int receive, count = 5; struct sk_buff *skb; bzfifo_type *bz; - u8 *bdata; + u_char *bdata; z_type *zp; + if ((bcs->channel) && (!cs->hw.hfcpci.bswapped)) { bz = &((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxbz_b2; bdata = ((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxdat_b2; @@ -442,22 +469,26 @@ } Begin: count--; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs, "rec_data %d blocked", bcs->channel); + return; + } if (bz->f1 != bz->f2) { if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfcpci rec %d f1(%d) f2(%d)", bcs->channel, bz->f1, bz->f2); zp = &bz->za[bz->f2]; - rcnt = le16_to_cpu(zp->z1) - le16_to_cpu(zp->z2); + rcnt = zp->z1 - zp->z2; if (rcnt < 0) rcnt += B_FIFO_SIZE; rcnt++; if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfcpci rec %d z1(%x) z2(%x) cnt(%d)", - bcs->channel, le16_to_cpu(zp->z1), le16_to_cpu(zp->z2), rcnt); + bcs->channel, zp->z1, zp->z2, rcnt); if ((skb = hfcpci_empty_fifo(bcs, bz, bdata, rcnt))) { skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + hfcpci_sched_event(bcs, B_RCVBUFREADY); } rcnt = bz->f1 - bz->f2; if (rcnt < 0) @@ -475,7 +506,7 @@ receive = hfcpci_empty_fifo_trans(bcs, bz, bdata); else receive = 0; - + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); if (count && receive) goto Begin; return; @@ -487,10 +518,10 @@ static void hfcpci_fill_dfifo(struct IsdnCardState *cs) { - int fcnt, new_z1, maxlen; - u_int count; + int fcnt; + int count, new_z1, maxlen; dfifo_type *df; - u8 *src, *dst, new_f1; + u_char *src, *dst, new_f1; if (!cs->tx_skb) return; @@ -502,7 +533,7 @@ if (cs->debug & L1_DEB_ISAC) debugl1(cs, "hfcpci_fill_Dfifo f1(%d) f2(%d) z1(f1)(%x)", df->f1, df->f2, - le16_to_cpu(df->za[df->f1 & D_FREG_MASK].z1)); + df->za[df->f1 & D_FREG_MASK].z1); fcnt = df->f1 - df->f2; /* frame count actually buffered */ if (fcnt < 0) fcnt += (MAX_D_FRAMES + 1); /* if wrap around */ @@ -515,7 +546,7 @@ return; } /* now determine free bytes in FIFO buffer */ - count = le16_to_cpu(df->za[df->f1 & D_FREG_MASK].z2) - le16_to_cpu(df->za[df->f1 & D_FREG_MASK].z1); + count = df->za[df->f2 & D_FREG_MASK].z2 - df->za[df->f1 & D_FREG_MASK].z1 - 1; if (count <= 0) count += D_FIFO_SIZE; /* count now contains available bytes */ @@ -528,12 +559,12 @@ return; } count = cs->tx_skb->len; /* get frame len */ - new_z1 = (le16_to_cpu(df->za[df->f1 & D_FREG_MASK].z1) + count) & (D_FIFO_SIZE - 1); + new_z1 = (df->za[df->f1 & D_FREG_MASK].z1 + count) & (D_FIFO_SIZE - 1); new_f1 = ((df->f1 + 1) & D_FREG_MASK) | (D_FREG_MASK + 1); src = cs->tx_skb->data; /* source pointer */ - dst = df->data + le16_to_cpu(df->za[df->f1 & D_FREG_MASK].z1); - maxlen = D_FIFO_SIZE - le16_to_cpu(df->za[df->f1 & D_FREG_MASK].z1); /* end fifo */ - if (maxlen > (int)count) + dst = df->data + df->za[df->f1 & D_FREG_MASK].z1; + maxlen = D_FIFO_SIZE - df->za[df->f1 & D_FREG_MASK].z1; /* end fifo */ + if (maxlen > count) maxlen = count; /* limit size */ memcpy(dst, src, maxlen); /* first copy */ @@ -543,8 +574,8 @@ src += maxlen; /* new position */ memcpy(dst, src, count); } - df->za[new_f1 & D_FREG_MASK].z1 = cpu_to_le16(new_z1); /* for next buffer */ - df->za[df->f1 & D_FREG_MASK].z1 = cpu_to_le16(new_z1); /* new pos actual buffer */ + df->za[new_f1 & D_FREG_MASK].z1 = new_z1; /* for next buffer */ + df->za[df->f1 & D_FREG_MASK].z1 = new_z1; /* new pos actual buffer */ df->f1 = new_f1; /* next frame */ dev_kfree_skb_any(cs->tx_skb); @@ -559,11 +590,11 @@ hfcpci_fill_fifo(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; - int maxlen, fcnt, new_z1; - u_int count; + int maxlen, fcnt; + int count, new_z1; bzfifo_type *bz; - u8 *bdata; - u8 new_f1, *src, *dst; + u_char *bdata; + u_char new_f1, *src, *dst; unsigned short *z1t, *z2t; if (!bcs->tx_skb) @@ -584,24 +615,24 @@ z2t = z1t + 1; if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfcpci_fill_fifo_trans %d z1(%x) z2(%x)", - bcs->channel, le16_to_cpu(*z1t), le16_to_cpu(*z2t)); - fcnt = le16_to_cpu(*z2t) - le16_to_cpu(*z1t); + bcs->channel, *z1t, *z2t); + fcnt = *z2t - *z1t; if (fcnt <= 0) fcnt += B_FIFO_SIZE; /* fcnt contains available bytes in fifo */ fcnt = B_FIFO_SIZE - fcnt; /* remaining bytes to send */ while ((fcnt < 2 * HFCPCI_BTRANS_THRESHOLD) && (bcs->tx_skb)) { - if ((int)bcs->tx_skb->len < (B_FIFO_SIZE - fcnt)) { + if (bcs->tx_skb->len < B_FIFO_SIZE - fcnt) { /* data is suitable for fifo */ count = bcs->tx_skb->len; - new_z1 = le16_to_cpu(*z1t) + count; /* new buffer Position */ + new_z1 = *z1t + count; /* new buffer Position */ if (new_z1 >= (B_FIFO_SIZE + B_SUB_VAL)) new_z1 -= B_FIFO_SIZE; /* buffer wrap */ src = bcs->tx_skb->data; /* source pointer */ - dst = bdata + (le16_to_cpu(*z1t) - B_SUB_VAL); - maxlen = (B_FIFO_SIZE + B_SUB_VAL) - le16_to_cpu(*z1t); /* end of fifo */ - if (maxlen > (int)count) + dst = bdata + (*z1t - B_SUB_VAL); + maxlen = (B_FIFO_SIZE + B_SUB_VAL) - *z1t; /* end of fifo */ + if (maxlen > count) maxlen = count; /* limit size */ memcpy(dst, src, maxlen); /* first copy */ @@ -613,11 +644,20 @@ } bcs->tx_cnt -= bcs->tx_skb->len; fcnt += bcs->tx_skb->len; - *z1t = cpu_to_le16(new_z1); /* now send data */ + *z1t = new_z1; /* now send data */ } else if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfcpci_fill_fifo_trans %d frame length %d discarded", bcs->channel, bcs->tx_skb->len); + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->tx_skb->len; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_any(bcs->tx_skb); bcs->tx_skb = skb_dequeue(&bcs->squeue); /* fetch next data */ } @@ -627,7 +667,7 @@ if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hfcpci_fill_fifo_hdlc %d f1(%d) f2(%d) z1(f1)(%x)", bcs->channel, bz->f1, bz->f2, - le16_to_cpu(bz->za[bz->f1].z1)); + bz->za[bz->f1].z1); fcnt = bz->f1 - bz->f2; /* frame count actually buffered */ if (fcnt < 0) @@ -638,7 +678,7 @@ return; } /* now determine free bytes in FIFO buffer */ - count = le16_to_cpu(bz->za[bz->f1].z2) - le16_to_cpu(bz->za[bz->f1].z1); + count = bz->za[bz->f2].z2 - bz->za[bz->f1].z1 - 1; if (count <= 0) count += B_FIFO_SIZE; /* count now contains available bytes */ @@ -653,15 +693,15 @@ return; } count = bcs->tx_skb->len; /* get frame len */ - new_z1 = le16_to_cpu(bz->za[bz->f1].z1) + count; /* new buffer Position */ + new_z1 = bz->za[bz->f1].z1 + count; /* new buffer Position */ if (new_z1 >= (B_FIFO_SIZE + B_SUB_VAL)) new_z1 -= B_FIFO_SIZE; /* buffer wrap */ new_f1 = ((bz->f1 + 1) & MAX_B_FRAMES); src = bcs->tx_skb->data; /* source pointer */ - dst = bdata + (le16_to_cpu(bz->za[bz->f1].z1) - B_SUB_VAL); - maxlen = (B_FIFO_SIZE + B_SUB_VAL) - le16_to_cpu(bz->za[bz->f1].z1); /* end fifo */ - if (maxlen > (int)count) + dst = bdata + (bz->za[bz->f1].z1 - B_SUB_VAL); + maxlen = (B_FIFO_SIZE + B_SUB_VAL) - bz->za[bz->f1].z1; /* end fifo */ + if (maxlen > count) maxlen = count; /* limit size */ memcpy(dst, src, maxlen); /* first copy */ @@ -672,11 +712,20 @@ memcpy(dst, src, count); } bcs->tx_cnt -= bcs->tx_skb->len; - xmit_complete_b(bcs); + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->tx_skb->len; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } - bz->za[new_f1].z1 = cpu_to_le16(new_z1); /* for next buffer */ + bz->za[new_f1].z1 = new_z1; /* for next buffer */ bz->f1 = new_f1; /* next frame */ + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); return; } @@ -696,7 +745,7 @@ st->l1.l1hw(st, pr, arg); break; case (PH_ACTIVATE | REQUEST): - L1L2(st, PH_ACTIVATE | CONFIRM, NULL); + st->l1.l1l2(st, PH_ACTIVATE | CONFIRM, NULL); break; case (PH_TESTLOOP | REQUEST): if (1 & (long) arg) @@ -722,10 +771,12 @@ static int hfcpci_auxcmd(struct IsdnCardState *cs, isdn_ctrl * ic) { - int i = *(unsigned int *) ic->parm.num; + u_long flags; + int i = *(unsigned int *) ic->parm.num; if ((ic->arg == 98) && (!(cs->hw.hfcpci.int_m1 & (HFCPCI_INTS_B2TRANS + HFCPCI_INTS_B2REC + HFCPCI_INTS_B1TRANS + HFCPCI_INTS_B1REC)))) { + spin_lock_irqsave(&cs->lock, flags); Write_hfc(cs, HFCPCI_CLKDEL, CLKDEL_NT); /* ST-Bit delay for NT-Mode */ Write_hfc(cs, HFCPCI_STATES, HFCPCI_LOAD_STATE | 0); /* HFC ST G0 */ udelay(10); @@ -738,7 +789,8 @@ cs->dc.hfcpci.ph_state = 1; cs->hw.hfcpci.nt_mode = 1; cs->hw.hfcpci.nt_timer = 0; - cs->stlist->l1.l2l1 = dch_nt_l2l1; + cs->stlist->l2.l2l1 = dch_nt_l2l1; + spin_unlock_irqrestore(&cs->lock, flags); debugl1(cs, "NT mode activated"); return (0); } @@ -746,6 +798,7 @@ (cs->hw.hfcpci.nt_mode) || (ic->arg != 12)) return (-EINVAL); + spin_lock_irqsave(&cs->lock, flags); if (i) { cs->logecho = 1; cs->hw.hfcpci.trm |= 0x20; /* enable echo chan */ @@ -768,6 +821,7 @@ Write_hfc(cs, HFCPCI_TRM, cs->hw.hfcpci.trm); Write_hfc(cs, HFCPCI_FIFO_EN, cs->hw.hfcpci.fifo_en); Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); + spin_unlock_irqrestore(&cs->lock, flags); return (0); } /* hfcpci_auxcmd */ @@ -780,50 +834,54 @@ int rcnt; int receive, count = 5; bzfifo_type *bz; - u8 *bdata; + u_char *bdata; z_type *zp; - u8 *ptr, *ptr1, new_f2; + u_char *ptr, *ptr1, new_f2; int total, maxlen, new_z2; - u8 e_buffer[256]; + u_char e_buffer[256]; bz = &((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxbz_b2; bdata = ((fifo_area *) (cs->hw.hfcpci.fifos))->b_chans.rxdat_b2; Begin: count--; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs, "echo_rec_data blocked"); + return; + } if (bz->f1 != bz->f2) { if (cs->debug & L1_DEB_ISAC) debugl1(cs, "hfcpci e_rec f1(%d) f2(%d)", bz->f1, bz->f2); zp = &bz->za[bz->f2]; - rcnt = le16_to_cpu(zp->z1) - le16_to_cpu(zp->z2); + rcnt = zp->z1 - zp->z2; if (rcnt < 0) rcnt += B_FIFO_SIZE; rcnt++; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "hfcpci e_rec z1(%x) z2(%x) cnt(%d)", - le16_to_cpu(zp->z1), le16_to_cpu(zp->z2), rcnt); - new_z2 = le16_to_cpu(zp->z2) + rcnt; /* new position in fifo */ + zp->z1, zp->z2, rcnt); + new_z2 = zp->z2 + rcnt; /* new position in fifo */ if (new_z2 >= (B_FIFO_SIZE + B_SUB_VAL)) new_z2 -= B_FIFO_SIZE; /* buffer wrap */ new_f2 = (bz->f2 + 1) & MAX_B_FRAMES; if ((rcnt > 256 + 3) || (count < 4) || - (*(bdata + (le16_to_cpu(zp->z1) - B_SUB_VAL)))) { + (*(bdata + (zp->z1 - B_SUB_VAL)))) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "hfcpci_empty_echan: incoming packet invalid length %d or crc", rcnt); - bz->za[new_f2].z2 = cpu_to_le16(new_z2); + bz->za[new_f2].z2 = new_z2; bz->f2 = new_f2; /* next buffer */ } else { total = rcnt; rcnt -= 3; ptr = e_buffer; - if (le16_to_cpu(zp->z2) <= (B_FIFO_SIZE + B_SUB_VAL)) + if (zp->z2 <= B_FIFO_SIZE + B_SUB_VAL) maxlen = rcnt; /* complete transfer */ else - maxlen = B_FIFO_SIZE + B_SUB_VAL - le16_to_cpu(zp->z2); /* maximum */ + maxlen = B_FIFO_SIZE + B_SUB_VAL - zp->z2; /* maximum */ - ptr1 = bdata + (le16_to_cpu(zp->z2) - B_SUB_VAL); /* start of data */ + ptr1 = bdata + (zp->z2 - B_SUB_VAL); /* start of data */ memcpy(ptr, ptr1, maxlen); /* copy data */ rcnt -= maxlen; @@ -832,7 +890,7 @@ ptr1 = bdata; /* start of buffer */ memcpy(ptr, ptr1, rcnt); /* rest */ } - bz->za[new_f2].z2 = cpu_to_le16(new_z2); + bz->za[new_f2].z2 = new_z2; bz->f2 = new_f2; /* next buffer */ if (cs->debug & DEB_DLOG_HEX) { ptr = cs->dlog; @@ -861,6 +919,7 @@ receive = 0; } else receive = 0; + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); if (count && receive) goto Begin; return; @@ -872,28 +931,30 @@ static irqreturn_t hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs) { + u_long flags; struct IsdnCardState *cs = dev_id; - u8 exval; + u_char exval; struct BCState *bcs; int count = 15; - u8 val, stat; + u_char val, stat; - if (!cs) { - printk(KERN_WARNING "HFC-PCI: Spurious interrupt!\n"); - return IRQ_NONE; + if (!(cs->hw.hfcpci.int_m2 & 0x08)) { + debugl1(cs, "HFC-PCI: int_m2 %x not initialised", cs->hw.hfcpci.int_m2); + return IRQ_NONE; /* not initialised */ } - if (!(cs->hw.hfcpci.int_m2 & 0x08)) - return IRQ_NONE; /* not initialised */ - + spin_lock_irqsave(&cs->lock, flags); if (HFCPCI_ANYINT & (stat = Read_hfc(cs, HFCPCI_STATUS))) { val = Read_hfc(cs, HFCPCI_INT_S1); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "HFC-PCI: stat(%02x) s1(%02x)", stat, val); - } else + } else { + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_NONE; - + } if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "HFC-PCI irq %x", val); + debugl1(cs, "HFC-PCI irq %x %s", val, + test_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags) ? + "locked" : "unlocked"); val &= cs->hw.hfcpci.int_m1; if (val & 0x40) { /* state machine irq */ exval = Read_hfc(cs, HFCPCI_STATES) & 0xf; @@ -901,18 +962,23 @@ debugl1(cs, "ph_state chg %d->%d", cs->dc.hfcpci.ph_state, exval); cs->dc.hfcpci.ph_state = exval; - sched_d_event(cs, D_L1STATECHANGE); + sched_event_D_pci(cs, D_L1STATECHANGE); val &= ~0x40; } if (val & 0x80) { /* timer irq */ if (cs->hw.hfcpci.nt_mode) { if ((--cs->hw.hfcpci.nt_timer) < 0) - sched_d_event(cs, D_L1STATECHANGE); + sched_event_D_pci(cs, D_L1STATECHANGE); } val &= ~0x80; Write_hfc(cs, HFCPCI_CTMT, cs->hw.hfcpci.ctmt | HFCPCI_CLTIMER); } while (val) { + if (test_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + cs->hw.hfcpci.int_s1 |= val; + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; + } if (cs->hw.hfcpci.int_s1 & 0x18) { exval = val; val = cs->hw.hfcpci.int_s1; @@ -939,7 +1005,23 @@ if (cs->debug) debugl1(cs, "hfcpci spurious 0x01 IRQ"); } else { - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + hfcpci_sched_event(bcs, B_XMTBUFREADY); + } + } } } if (val & 0x02) { @@ -947,15 +1029,60 @@ if (cs->debug) debugl1(cs, "hfcpci spurious 0x02 IRQ"); } else { - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + hfcpci_sched_event(bcs, B_XMTBUFREADY); + } + } } } if (val & 0x20) { /* receive dframe */ receive_dmsg(cs); } if (val & 0x04) { /* dframe transmitted */ - xmit_xpr_d(cs); + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + sched_event_D_pci(cs, D_CLEARBUSY); + if (cs->tx_skb) { + if (cs->tx_skb->len) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else { + debugl1(cs, "hfcpci_fill_dfifo irq blocked"); + } + goto afterXPR; + } else { + dev_kfree_skb_irq(cs->tx_skb); + cs->tx_cnt = 0; + cs->tx_skb = NULL; + } + } + if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_cnt = 0; + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else { + debugl1(cs, "hfcpci_fill_dfifo irq blocked"); + } + } else + sched_event_D_pci(cs, D_XMTBUFREADY); } + afterXPR: if (cs->hw.hfcpci.int_s1 && count--) { val = cs->hw.hfcpci.int_s1; cs->hw.hfcpci.int_s1 = 0; @@ -964,6 +1091,7 @@ } else val = 0; } + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } @@ -981,40 +1109,106 @@ static void HFCPCI_l1hw(struct PStack *st, int pr, void *arg) { + u_long flags; struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_d(cs, skb); + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + skb_queue_tail(&cs->sq, skb); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA Queued", 0); +#endif + } else { + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA", 0); +#endif + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "hfcpci_fill_dfifo blocked"); + + } + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_d(cs, skb); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); + skb_queue_tail(&cs->sq, skb); + spin_unlock_irqrestore(&cs->lock, flags); + break; + } + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); +#endif + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "hfcpci_fill_dfifo blocked"); + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_d(st); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + debugl1(cs, "-> PH_REQUEST_PULL"); +#endif + if (!cs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (HW_RESET | REQUEST): + spin_lock_irqsave(&cs->lock, flags); Write_hfc(cs, HFCPCI_STATES, HFCPCI_LOAD_STATE | 3); /* HFC ST 3 */ udelay(6); Write_hfc(cs, HFCPCI_STATES, 3); /* HFC ST 2 */ cs->hw.hfcpci.mst_m |= HFCPCI_MASTER; Write_hfc(cs, HFCPCI_MST_MODE, cs->hw.hfcpci.mst_m); Write_hfc(cs, HFCPCI_STATES, HFCPCI_ACTIVATE | HFCPCI_DO_ACTION); + spin_unlock_irqrestore(&cs->lock, flags); l1_msg(cs, HW_POWERUP | CONFIRM, NULL); break; case (HW_ENABLE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); Write_hfc(cs, HFCPCI_STATES, HFCPCI_DO_ACTION); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_DEACTIVATE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); cs->hw.hfcpci.mst_m &= ~HFCPCI_MASTER; Write_hfc(cs, HFCPCI_MST_MODE, cs->hw.hfcpci.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_INFO3 | REQUEST): + spin_lock_irqsave(&cs->lock, flags); cs->hw.hfcpci.mst_m |= HFCPCI_MASTER; Write_hfc(cs, HFCPCI_MST_MODE, cs->hw.hfcpci.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_TESTLOOP | REQUEST): + spin_lock_irqsave(&cs->lock, flags); switch ((int) arg) { case (1): Write_hfc(cs, HFCPCI_B1_SSL, 0x80); /* tx slot */ @@ -1031,12 +1225,14 @@ break; default: + spin_unlock_irqrestore(&cs->lock, flags); if (cs->debug & L1_DEB_WARN) debugl1(cs, "hfcpci_l1hw loop invalid %4x", (int) arg); return; } cs->hw.hfcpci.trm |= 0x80; /* enable IOM-loop */ Write_hfc(cs, HFCPCI_TRM, cs->hw.hfcpci.trm); + spin_unlock_irqrestore(&cs->lock, flags); break; default: if (cs->debug & L1_DEB_WARN) @@ -1048,11 +1244,25 @@ /***********************************************/ /* called during init setting l1 stack pointer */ /***********************************************/ -static int +void setstack_hfcpci(struct PStack *st, struct IsdnCardState *cs) { st->l1.l1hw = HFCPCI_l1hw; - return 0; +} + +/**************************************/ +/* send B-channel data if not blocked */ +/**************************************/ +static void +hfcpci_send_data(struct BCState *bcs) +{ + struct IsdnCardState *cs = bcs->cs; + + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcpci_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "send_data %d blocked", bcs->channel); } /***************************************************************/ @@ -1182,31 +1392,58 @@ static void hfcpci_l2l1(struct PStack *st, int pr, void *arg) { - struct sk_buff *skb = arg; + struct BCState *bcs = st->l1.bcs; + u_long flags; + struct sk_buff *skb = arg; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; +// test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + spin_unlock_irqrestore(&bcs->cs->lock, flags); + printk(KERN_WARNING "hfc_l2l1: this shouldn't happen\n"); + break; + } +// test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->cs->BC_Send_Data(bcs); + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - mode_hfcpci(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + mode_hfcpci(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - mode_hfcpci(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + mode_hfcpci(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -1256,7 +1493,7 @@ if (open_hfcpcistate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = hfcpci_l2l1; + st->l2.l2l1 = hfcpci_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -1267,11 +1504,11 @@ /* handle L1 state changes */ /***************************/ static void -hfcpci_bh(void *data) +hfcpci_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; -/* struct PStack *stptr; - */ + u_long flags; +// struct PStack *stptr; + if (!cs) return; if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { @@ -1295,6 +1532,7 @@ default: break; } else { + spin_lock_irqsave(&cs->lock, flags); switch (cs->dc.hfcpci.ph_state) { case (2): if (cs->hw.hfcpci.nt_timer < 0) { @@ -1303,7 +1541,6 @@ Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); /* Clear already pending ints */ if (Read_hfc(cs, HFCPCI_INT_S1)); - Write_hfc(cs, HFCPCI_STATES, 4 | HFCPCI_LOAD_STATE); udelay(10); Write_hfc(cs, HFCPCI_STATES, 4); @@ -1329,6 +1566,7 @@ default: break; } + spin_unlock_irqrestore(&cs->lock, flags); } } if (test_and_clear_bit(D_RCVBUFREADY, &cs->event)) @@ -1337,18 +1575,6 @@ DChannel_proc_xmt(cs); } -static struct bc_l1_ops hfcpci_bc_l1_ops = { - .fill_fifo = hfcpci_fill_fifo, - .open = setstack_2b, - .close = close_hfcpci, -}; - -static struct dc_l1_ops hfcpci_dc_l1_ops = { - .fill_fifo = hfcpci_fill_dfifo, - .open = setstack_hfcpci, - .bh_func = hfcpci_bh, - .dbusy_func = hfcpci_dbusy_timer, -}; /********************************/ /* called for card init message */ @@ -1356,116 +1582,167 @@ void __init inithfcpci(struct IsdnCardState *cs) { - dc_l1_init(cs, &hfcpci_dc_l1_ops); - cs->bc_l1_ops = &hfcpci_bc_l1_ops; + cs->bcs[0].BC_SetStack = setstack_2b; + cs->bcs[1].BC_SetStack = setstack_2b; + cs->bcs[0].BC_Close = close_hfcpci; + cs->bcs[1].BC_Close = close_hfcpci; + cs->dbusytimer.function = (void *) hfcpci_dbusy_timer; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); mode_hfcpci(cs->bcs, 0, 0); mode_hfcpci(cs->bcs + 1, 0, 1); } -static void -hfcpci_init(struct IsdnCardState *cs) -{ - inithfcpci(cs); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((80 * HZ) / 1000); /* Timeout 80ms */ - /* now switch timer interrupt off */ - cs->hw.hfcpci.int_m1 &= ~HFCPCI_INTS_TIMER; - Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); - /* reinit mode reg */ - Write_hfc(cs, HFCPCI_MST_MODE, cs->hw.hfcpci.mst_m); -} -static struct card_ops hfcpci_ops = { - .init = hfcpci_init, - .reset = hfcpci_reset, - .release = hfcpci_release, - .irq_func = hfcpci_interrupt, -}; - -static int __init -niccy_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev, int i) +/*******************************************/ +/* handle card messages from control layer */ +/*******************************************/ +static int +hfcpci_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - int rc; - - rc = -EBUSY; - if (pci_enable_device(pdev)) - goto err; - - pci_set_master(pdev); - - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.hfcpci.pdev = pdev; - - cs->hw.hfcpci.pci_io = request_mmio(&cs->rs, - pci_resource_start(pdev, 1), 128, - "hfc_pci"); - if (!cs->hw.hfcpci.pci_io) - goto err; - - /* Allocate memory for FIFOS */ - rc = -ENOMEM; - cs->hw.hfcpci.fifos = pci_alloc_consistent(pdev, 32768, - &cs->hw.hfcpci.fifos_dma); - if (!cs->hw.hfcpci.fifos) - goto err; - - pci_write_config_dword(cs->hw.hfcpci.pdev, 0x80, - (u_int)cs->hw.hfcpci.fifos_dma); - printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s name: %s\n", - id_list[i].vendor_name, id_list[i].card_name); - printk(KERN_INFO "HFC-PCI: defined at mem %#x fifo %#x(%#x) IRQ %d\n", - (u_int) cs->hw.hfcpci.pci_io, (u_int) cs->hw.hfcpci.fifos, - (u_int) cs->hw.hfcpci.fifos_dma, cs->irq); - printk("ChipID: %x\n", Read_hfc(cs, HFCPCI_CHIP_ID)); - cs->hw.hfcpci.int_m2 = 0; /* disable alle interrupts */ - cs->hw.hfcpci.int_m1 = 0; - Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); - Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); - /* At this point the needed PCI config is done */ - /* fifos are still not enabled */ + u_long flags; - init_timer(&cs->hw.hfcpci.timer); - cs->hw.hfcpci.timer.function = (void *) hfcpci_Timer; - cs->hw.hfcpci.timer.data = (long) cs; - - hfcpci_reset(cs); - cs->auxcmd = &hfcpci_auxcmd; - cs->card_ops = &hfcpci_ops; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "HFCPCI: card_msg %x", mt); + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_hfcpci(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_RELEASE: + release_io_hfcpci(cs); + return (0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithfcpci(cs); + reset_hfcpci(cs); + spin_unlock_irqrestore(&cs->lock, flags); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout((80 * HZ) / 1000); /* Timeout 80ms */ + /* now switch timer interrupt off */ + spin_lock_irqsave(&cs->lock, flags); + cs->hw.hfcpci.int_m1 &= ~HFCPCI_INTS_TIMER; + Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); + /* reinit mode reg */ + Write_hfc(cs, HFCPCI_MST_MODE, cs->hw.hfcpci.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_TEST: + return (0); + } + return (0); } + /* this variable is used as card index when more than one cards are present */ static struct pci_dev *dev_hfcpci __initdata = NULL; +#endif /* CONFIG_PCI */ + int __init setup_hfcpci(struct IsdnCard *card) { + u_long flags; struct IsdnCardState *cs = card->cs; char tmp[64]; int i; struct pci_dev *tmp_hfcpci = NULL; +#ifdef __BIG_ENDIAN +#error "not running on big endian machines now" +#endif strcpy(tmp, hfcpci_revision); printk(KERN_INFO "HiSax: HFC-PCI driver Rev. %s\n", HiSax_getrev(tmp)); +#if CONFIG_PCI cs->hw.hfcpci.int_s1 = 0; cs->dc.hfcpci.ph_state = 0; cs->hw.hfcpci.fifo = 255; + if (cs->typ == ISDN_CTYPE_HFC_PCI) { + i = 0; + while (id_list[i].vendor_id) { + tmp_hfcpci = pci_find_device(id_list[i].vendor_id, + id_list[i].device_id, + dev_hfcpci); + i++; + if (tmp_hfcpci) { + if (pci_enable_device(tmp_hfcpci)) + continue; + pci_set_master(tmp_hfcpci); + if ((card->para[0]) && (card->para[0] != (tmp_hfcpci->resource[ 0].start & PCI_BASE_ADDRESS_IO_MASK))) + continue; + else + break; + } + } - for (i = 0; id_list[i].vendor_id; i++) { - tmp_hfcpci = pci_find_device(id_list[i].vendor_id, - id_list[i].device_id, - dev_hfcpci); - if (!tmp_hfcpci) - continue; - - if (niccy_pci_probe(card->cs, tmp_hfcpci, i) < 0) + if (tmp_hfcpci) { + i--; + dev_hfcpci = tmp_hfcpci; /* old device */ + cs->hw.hfcpci.dev = dev_hfcpci; + cs->irq = dev_hfcpci->irq; + if (!cs->irq) { + printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); + return (0); + } + cs->hw.hfcpci.pci_io = (char *) dev_hfcpci->resource[ 1].start; + printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name); + } else { + printk(KERN_WARNING "HFC-PCI: No PCI card found\n"); + return (0); + } + if (!cs->hw.hfcpci.pci_io) { + printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); + return (0); + } + /* Allocate memory for FIFOS */ + /* Because the HFC-PCI needs a 32K physical alignment, we */ + /* need to allocate the double mem and align the address */ + if (!(cs->hw.hfcpci.share_start = kmalloc(65536, GFP_KERNEL))) { + printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n"); return 0; - return 1; - } - return 0; + } + cs->hw.hfcpci.fifos = (void *) + (((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000; + pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos)); + cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256); + printk(KERN_INFO + "HFC-PCI: defined at mem %#x fifo %#x(%#x) IRQ %d HZ %d\n", + (u_int) cs->hw.hfcpci.pci_io, + (u_int) cs->hw.hfcpci.fifos, + (u_int) virt_to_bus(cs->hw.hfcpci.fifos), + cs->irq, HZ); + spin_lock_irqsave(&cs->lock, flags); + pci_write_config_word(cs->hw.hfcpci.dev, PCI_COMMAND, PCI_ENA_MEMIO); /* enable memory mapped ports, disable busmaster */ + cs->hw.hfcpci.int_m2 = 0; /* disable alle interrupts */ + cs->hw.hfcpci.int_m1 = 0; + Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); + Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); + /* At this point the needed PCI config is done */ + /* fifos are still not enabled */ + INIT_WORK(&cs->tqueue, (void *)(void *) hfcpci_bh, cs); + cs->setstack_d = setstack_hfcpci; + cs->BC_Send_Data = &hfcpci_send_data; + cs->readisac = NULL; + cs->writeisac = NULL; + cs->readisacfifo = NULL; + cs->writeisacfifo = NULL; + cs->BC_Read_Reg = NULL; + cs->BC_Write_Reg = NULL; + cs->irq_func = &hfcpci_interrupt; + cs->irq_flags |= SA_SHIRQ; + cs->hw.hfcpci.timer.function = (void *) hfcpci_Timer; + cs->hw.hfcpci.timer.data = (long) cs; + init_timer(&cs->hw.hfcpci.timer); + cs->cardmsg = &hfcpci_card_msg; + cs->auxcmd = &hfcpci_auxcmd; + spin_unlock_irqrestore(&cs->lock, flags); + return (1); + } else + return (0); /* no valid card type */ +#else + printk(KERN_WARNING "HFC-PCI: NO_PCI_BIOS\n"); + return (0); +#endif /* CONFIG_PCI */ } diff -Nru a/drivers/isdn/hisax/hfc_pci.h b/drivers/isdn/hisax/hfc_pci.h --- a/drivers/isdn/hisax/hfc_pci.h Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/hfc_pci.h Thu Feb 19 23:44:25 2004 @@ -1,4 +1,4 @@ -/* $Id: hfc_pci.h,v 1.8.6.2 2001/09/23 22:24:48 kai Exp $ +/* $Id: hfc_pci.h,v 1.10.2.2 2004/01/12 22:52:26 keil Exp $ * * specific defines for CCD's HFC 2BDS0 PCI chips * @@ -185,53 +185,51 @@ typedef struct { unsigned short z1; /* Z1 pointer 16 Bit */ unsigned short z2; /* Z2 pointer 16 Bit */ - } __attribute__((packed)) z_type; + } z_type; typedef struct { - u8 data[D_FIFO_SIZE]; /* FIFO data space */ - u8 fill1[0x20A0-D_FIFO_SIZE]; /* reserved, do not use */ - u8 f1,f2; /* f pointers */ - u8 fill2[0x20C0-0x20A2]; /* reserved, do not use */ + u_char data[D_FIFO_SIZE]; /* FIFO data space */ + u_char fill1[0x20A0-D_FIFO_SIZE]; /* reserved, do not use */ + u_char f1,f2; /* f pointers */ + u_char fill2[0x20C0-0x20A2]; /* reserved, do not use */ z_type za[MAX_D_FRAMES+1]; /* mask index with D_FREG_MASK for access */ - u8 fill3[0x4000-0x2100]; /* align 16K */ - } __attribute__((packed)) dfifo_type; + u_char fill3[0x4000-0x2100]; /* align 16K */ + } dfifo_type; typedef struct { z_type za[MAX_B_FRAMES+1]; /* only range 0x0..0x1F allowed */ - u8 f1,f2; /* f pointers */ - u8 fill[0x2100-0x2082]; /* alignment */ - } __attribute__((packed)) bzfifo_type; + u_char f1,f2; /* f pointers */ + u_char fill[0x2100-0x2082]; /* alignment */ + } bzfifo_type; typedef union { struct { dfifo_type d_tx; /* D-send channel */ dfifo_type d_rx; /* D-receive channel */ - } __attribute__((packed)) d_chan; + } d_chan; struct { - u8 fill1[0x200]; - u8 txdat_b1[B_FIFO_SIZE]; + u_char fill1[0x200]; + u_char txdat_b1[B_FIFO_SIZE]; bzfifo_type txbz_b1; bzfifo_type txbz_b2; - u8 txdat_b2[B_FIFO_SIZE]; + u_char txdat_b2[B_FIFO_SIZE]; - u8 fill2[D_FIFO_SIZE]; + u_char fill2[D_FIFO_SIZE]; - u8 rxdat_b1[B_FIFO_SIZE]; + u_char rxdat_b1[B_FIFO_SIZE]; bzfifo_type rxbz_b1; bzfifo_type rxbz_b2; - u8 rxdat_b2[B_FIFO_SIZE]; - } __attribute__((packed)) b_chans; - u8 fill[32768]; - } __attribute__((packed)) fifo_area; + u_char rxdat_b2[B_FIFO_SIZE]; + } b_chans; + u_char fill[32768]; + } fifo_area; -//#define Write_hfc(a,b,c) (*(((u8 *)a->hw.hfcpci.pci_io)+b) = c) -//#define Read_hfc(a,b) (*(((u8 *)a->hw.hfcpci.pci_io)+b)) -#define Write_hfc(a,b,c) writeb(c, ((u8 *)a->hw.hfcpci.pci_io)+b) -#define Read_hfc(a,b) readb(((u8 *)a->hw.hfcpci.pci_io)+b) +#define Write_hfc(a,b,c) (*(((u_char *)a->hw.hfcpci.pci_io)+b) = c) +#define Read_hfc(a,b) (*(((u_char *)a->hw.hfcpci.pci_io)+b)) extern void main_irq_hcpci(struct BCState *bcs); extern void inithfcpci(struct IsdnCardState *cs); diff -Nru a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c --- a/drivers/isdn/hisax/hfc_sx.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/hfc_sx.c Thu Feb 19 23:44:23 2004 @@ -1,6 +1,6 @@ -/* $Id: hfc_sx.c,v 1.9.6.3 2001/09/23 22:24:48 kai Exp $ +/* $Id: hfc_sx.c,v 1.12.2.5 2004/02/11 13:21:33 keil Exp $ * - * level driver for CCD´s hfc-s+/sp based cards + * level driver for Cologne Chip Designs hfc-s+/sp based cards * * Author Werner Cornelius * based on existing driver for CCD HFC PCI cards @@ -20,7 +20,7 @@ extern const char *CardType[]; -static const char *hfcsx_revision = "$Revision: 1.9.6.3 $"; +static const char *hfcsx_revision = "$Revision: 1.12.2.5 $"; /***************************************/ /* IRQ-table for CCDs demo board */ @@ -43,11 +43,11 @@ #undef CCD_DEMO_BOARD #ifdef CCD_DEMO_BOARD -static u8 ccd_sp_irqtab[16] = { +static u_char ccd_sp_irqtab[16] = { 0,0,0,0,0,2,1,0,0,0,3,4,5,0,0,6 }; #else /* Teles 16.3c */ -static u8 ccd_sp_irqtab[16] = { +static u_char ccd_sp_irqtab[16] = { 0,0,0,7,0,1,0,0,0,2,3,4,5,0,0,6 }; #endif @@ -60,17 +60,16 @@ /* In/Out access to registers */ /******************************/ static inline void -Write_hfc(struct IsdnCardState *cs, u8 regnum, u8 val) +Write_hfc(struct IsdnCardState *cs, u_char regnum, u_char val) { - byteout(cs->hw.hfcsx.base+1, regnum); byteout(cs->hw.hfcsx.base, val); } -static inline u8 -Read_hfc(struct IsdnCardState *cs, u8 regnum) +static inline u_char +Read_hfc(struct IsdnCardState *cs, u_char regnum) { - u8 ret; + u_char ret; byteout(cs->hw.hfcsx.base+1, regnum); ret = bytein(cs->hw.hfcsx.base); @@ -82,7 +81,7 @@ /* select a fifo and remember which one for reuse */ /**************************************************/ static void -fifo_select(struct IsdnCardState *cs, u8 fifo) +fifo_select(struct IsdnCardState *cs, u_char fifo) { if (fifo == cs->hw.hfcsx.last_fifo) return; /* still valid */ @@ -97,10 +96,10 @@ /******************************************/ /* reset the specified fifo to defaults. */ -/* If it's a send fifo init needed markers */ +/* If its a send fifo init needed markers */ /******************************************/ static void -reset_fifo(struct IsdnCardState *cs, u8 fifo) +reset_fifo(struct IsdnCardState *cs, u_char fifo) { fifo_select(cs, fifo); /* first select the fifo */ byteout(cs->hw.hfcsx.base+1, HFCSX_CIRM); @@ -116,10 +115,11 @@ /* the skb is not released in any way. */ /*************************************************************/ static int -write_fifo(struct IsdnCardState *cs, struct sk_buff *skb, u8 fifo, int trans_max) -{ unsigned short *msp; +write_fifo(struct IsdnCardState *cs, struct sk_buff *skb, u_char fifo, int trans_max) +{ + unsigned short *msp; int fifo_size, count, z1, z2; - u8 f_msk, f1, f2, *src; + u_char f_msk, f1, f2, *src; if (skb->len <= 0) return(0); if (fifo & 1) return(0); /* no write fifo */ @@ -145,9 +145,9 @@ count = z2 - z1; if (count <= 0) count += fifo_size; /* free bytes */ - if (count < (int)(skb->len+1)) return(0); /* no room */ + if (count < skb->len+1) return(0); /* no room */ count = fifo_size - count; /* bytes still not send */ - if (count > 2 * trans_max) return(0); /* delay too long */ + if (count > 2 * trans_max) return(0); /* delay to long */ count = skb->len; src = skb->data; while (count--) @@ -182,7 +182,7 @@ if (cs->debug & L1_DEB_ISAC_FIFO) debugl1(cs, "hfcsx_write_fifo %d count(%ld/%d)", fifo, skb->len, count); - if (count < (int)skb->len) { + if (count < skb->len) { if (cs->debug & L1_DEB_ISAC_FIFO) debugl1(cs, "hfcsx_write_fifo %d no fifo mem", fifo); return(0); @@ -205,9 +205,9 @@ /* the skb is not released in any way. */ /***************************************************************/ static struct sk_buff * -read_fifo(struct IsdnCardState *cs, u8 fifo, int trans_max) +read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max) { int fifo_size, count, z1, z2; - u8 f_msk, f1, f2, *dst; + u_char f_msk, f1, f2, *dst; struct sk_buff *skb; if (!(fifo & 1)) return(NULL); /* no read fifo */ @@ -308,8 +308,8 @@ /******************************************/ /* free hardware resources used by driver */ /******************************************/ -static void -hfcsx_release(struct IsdnCardState *cs) +void +release_io_hfcsx(struct IsdnCardState *cs) { cs->hw.hfcsx.int_m2 = 0; /* interrupt output off ! */ Write_hfc(cs, HFCSX_INT_M2, cs->hw.hfcsx.int_m2); @@ -318,7 +318,7 @@ schedule_timeout((30 * HZ) / 1000); /* Timeout 30ms */ Write_hfc(cs, HFCSX_CIRM, 0); /* Reset Off */ del_timer(&cs->hw.hfcsx.timer); - hisax_release_resources(cs); + release_region(cs->hw.hfcsx.base, 2); /* release IO-Block */ kfree(cs->hw.hfcsx.extra); cs->hw.hfcsx.extra = NULL; } @@ -347,8 +347,8 @@ /* function called to reset the HFC SX chip. A complete software reset of chip */ /* and fifos is done. */ /********************************************************************************/ -static int -hfcsx_reset(struct IsdnCardState *cs) +static void +reset_hfcsx(struct IsdnCardState *cs) { cs->hw.hfcsx.int_m2 = 0; /* interrupt output off ! */ Write_hfc(cs, HFCSX_INT_M2, cs->hw.hfcsx.int_m2); @@ -356,11 +356,9 @@ printk(KERN_INFO "HFC_SX: resetting card\n"); while (1) { Write_hfc(cs, HFCSX_CIRM, HFCSX_RESET | cs->hw.hfcsx.cirm ); /* Reset */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30 * HZ) / 1000); /* Timeout 30ms */ + mdelay(30); Write_hfc(cs, HFCSX_CIRM, cs->hw.hfcsx.cirm); /* Reset Off */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((20 * HZ) / 1000); /* Timeout 20ms */ + mdelay(20); if (Read_hfc(cs, HFCSX_STATUS) & 2) printk(KERN_WARNING "HFC-SX init bit busy\n"); cs->hw.hfcsx.last_fifo = 0xff; /* invalidate */ @@ -415,7 +413,6 @@ cs->hw.hfcsx.int_m2 = HFCSX_IRQ_ENABLE; Write_hfc(cs, HFCSX_INT_M2, cs->hw.hfcsx.int_m2); if (Read_hfc(cs, HFCSX_INT_S2)); - return 0; } /***************************************************/ @@ -431,7 +428,6 @@ */ } - /************************************************/ /* select a b-channel entry matching and active */ /************************************************/ @@ -450,20 +446,27 @@ /*******************************/ /* D-channel receive procedure */ /*******************************/ -static int +static +int receive_dmsg(struct IsdnCardState *cs) { struct sk_buff *skb; int count = 5; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs, "rec_dmsg blocked"); + return (1); + } + do { skb = read_fifo(cs, HFCSX_SEL_D_RX, 0); if (skb) { skb_queue_tail(&cs->rq, skb); - sched_d_event(cs, D_RCVBUFREADY); + schedule_event(cs, D_RCVBUFREADY); } } while (--count && skb); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); return (1); } @@ -479,6 +482,10 @@ Begin: count--; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs, "rec_data %d blocked", bcs->channel); + return; + } skb = read_fifo(cs, ((bcs->channel) && (!cs->hw.hfcsx.bswapped)) ? HFCSX_SEL_B2_RX : HFCSX_SEL_B1_RX, (bcs->mode == L1_MODE_TRANS) ? @@ -486,9 +493,10 @@ if (skb) { skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); } + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); if (count && skb) goto Begin; return; @@ -509,6 +517,7 @@ dev_kfree_skb_any(cs->tx_skb); cs->tx_skb = NULL; } + return; } /**************************/ @@ -530,9 +539,18 @@ (bcs->mode == L1_MODE_TRANS) ? HFCSX_BTRANS_THRESHOLD : 0)) { - bcs->tx_cnt -= bcs->tx_skb->len; - xmit_complete_b(bcs); - test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_cnt -= bcs->tx_skb->len; + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->tx_skb->len; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); } } @@ -551,7 +569,7 @@ st->l1.l1hw(st, pr, arg); break; case (PH_ACTIVATE | REQUEST): - L1L2(st, PH_ACTIVATE | CONFIRM, NULL); + st->l1.l1l2(st, PH_ACTIVATE | CONFIRM, NULL); break; case (PH_TESTLOOP | REQUEST): if (1 & (long) arg) @@ -577,10 +595,12 @@ static int hfcsx_auxcmd(struct IsdnCardState *cs, isdn_ctrl * ic) { + unsigned long flags; int i = *(unsigned int *) ic->parm.num; if ((ic->arg == 98) && (!(cs->hw.hfcsx.int_m1 & (HFCSX_INTS_B2TRANS + HFCSX_INTS_B2REC + HFCSX_INTS_B1TRANS + HFCSX_INTS_B1REC)))) { + spin_lock_irqsave(&cs->lock, flags); Write_hfc(cs, HFCSX_STATES, HFCSX_LOAD_STATE | 0); /* HFC ST G0 */ udelay(10); cs->hw.hfcsx.sctrl |= SCTRL_MODE_NT; @@ -592,7 +612,8 @@ cs->dc.hfcsx.ph_state = 1; cs->hw.hfcsx.nt_mode = 1; cs->hw.hfcsx.nt_timer = 0; - cs->stlist->l1.l2l1 = dch_nt_l2l1; + spin_unlock_irqrestore(&cs->lock, flags); + cs->stlist->l2.l2l1 = dch_nt_l2l1; debugl1(cs, "NT mode activated"); return (0); } @@ -614,12 +635,14 @@ cs->hw.hfcsx.sctrl &= ~SCTRL_B2_ENA; cs->hw.hfcsx.conn |= 0x10; /* B2-IOM -> B2-ST */ cs->hw.hfcsx.ctmt &= ~2; + spin_lock_irqsave(&cs->lock, flags); Write_hfc(cs, HFCSX_CTMT, cs->hw.hfcsx.ctmt); Write_hfc(cs, HFCSX_SCTRL_R, cs->hw.hfcsx.sctrl_r); Write_hfc(cs, HFCSX_SCTRL, cs->hw.hfcsx.sctrl); Write_hfc(cs, HFCSX_CONNECT, cs->hw.hfcsx.conn); Write_hfc(cs, HFCSX_TRM, cs->hw.hfcsx.trm); Write_hfc(cs, HFCSX_INT_M1, cs->hw.hfcsx.int_m1); + spin_unlock_irqrestore(&cs->lock, flags); return (0); } /* hfcsx_auxcmd */ @@ -630,9 +653,13 @@ receive_emsg(struct IsdnCardState *cs) { int count = 5; - u8 *ptr; + u_char *ptr; struct sk_buff *skb; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + debugl1(cs, "echo_rec_data blocked"); + return; + } do { skb = read_fifo(cs, HFCSX_SEL_B2_RX, 0); if (skb) { @@ -655,6 +682,9 @@ dev_kfree_skb_any(skb); } } while (--count && skb); + + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + return; } /* receive_emsg */ @@ -665,27 +695,28 @@ hfcsx_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 exval; + u_char exval; struct BCState *bcs; int count = 15; - u8 val, stat; + u_long flags; + u_char val, stat; - if (!cs) { - printk(KERN_WARNING "HFC-SX: Spurious interrupt!\n"); - return IRQ_NONE; - } if (!(cs->hw.hfcsx.int_m2 & 0x08)) return IRQ_NONE; /* not initialised */ + spin_lock_irqsave(&cs->lock, flags); if (HFCSX_ANYINT & (stat = Read_hfc(cs, HFCSX_STATUS))) { val = Read_hfc(cs, HFCSX_INT_S1); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "HFC-SX: stat(%02x) s1(%02x)", stat, val); - } else + } else { + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_NONE; - + } if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "HFC-SX irq %x", val); + debugl1(cs, "HFC-SX irq %x %s", val, + test_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags) ? + "locked" : "unlocked"); val &= cs->hw.hfcsx.int_m1; if (val & 0x40) { /* state machine irq */ exval = Read_hfc(cs, HFCSX_STATES) & 0xf; @@ -693,18 +724,23 @@ debugl1(cs, "ph_state chg %d->%d", cs->dc.hfcsx.ph_state, exval); cs->dc.hfcsx.ph_state = exval; - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); val &= ~0x40; } if (val & 0x80) { /* timer irq */ if (cs->hw.hfcsx.nt_mode) { if ((--cs->hw.hfcsx.nt_timer) < 0) - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); } val &= ~0x80; Write_hfc(cs, HFCSX_CTMT, cs->hw.hfcsx.ctmt | HFCSX_CLTIMER); } while (val) { + if (test_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + cs->hw.hfcsx.int_s1 |= val; + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; + } if (cs->hw.hfcsx.int_s1 & 0x18) { exval = val; val = cs->hw.hfcsx.int_s1; @@ -731,7 +767,23 @@ if (cs->debug) debugl1(cs, "hfcsx spurious 0x01 IRQ"); } else { - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + schedule_event(bcs, B_XMTBUFREADY); + } + } } } if (val & 0x02) { @@ -739,15 +791,60 @@ if (cs->debug) debugl1(cs, "hfcsx spurious 0x02 IRQ"); } else { - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "fill_data %d blocked", bcs->channel); + } else { + schedule_event(bcs, B_XMTBUFREADY); + } + } } } if (val & 0x20) { /* receive dframe */ receive_dmsg(cs); } if (val & 0x04) { /* dframe transmitted */ - xmit_xpr_d(cs); + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { + if (cs->tx_skb->len) { + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else { + debugl1(cs, "hfcsx_fill_dfifo irq blocked"); + } + goto afterXPR; + } else { + dev_kfree_skb_irq(cs->tx_skb); + cs->tx_cnt = 0; + cs->tx_skb = NULL; + } + } + if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_cnt = 0; + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else { + debugl1(cs, "hfcsx_fill_dfifo irq blocked"); + } + } else + schedule_event(cs, D_XMTBUFREADY); } + afterXPR: if (cs->hw.hfcsx.int_s1 && count--) { val = cs->hw.hfcsx.int_s1; cs->hw.hfcsx.int_s1 = 0; @@ -756,6 +853,7 @@ } else val = 0; } + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } @@ -775,38 +873,104 @@ { struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_d(cs, skb); + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + skb_queue_tail(&cs->sq, skb); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA Queued", 0); +#endif + } else { + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA", 0); +#endif + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "hfcsx_fill_dfifo blocked"); + + } + spin_unlock_irqrestore(&cs->lock, flags); break; - case (PH_PULL |INDICATION): - xmit_pull_ind_d(cs, skb); + case (PH_PULL | INDICATION): + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); + skb_queue_tail(&cs->sq, skb); + spin_unlock_irqrestore(&cs->lock, flags); + break; + } + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); +#endif + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_dfifo(cs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "hfcsx_fill_dfifo blocked"); + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_d(st); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + debugl1(cs, "-> PH_REQUEST_PULL"); +#endif + if (!cs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (HW_RESET | REQUEST): + spin_lock_irqsave(&cs->lock, flags); Write_hfc(cs, HFCSX_STATES, HFCSX_LOAD_STATE | 3); /* HFC ST 3 */ udelay(6); Write_hfc(cs, HFCSX_STATES, 3); /* HFC ST 2 */ cs->hw.hfcsx.mst_m |= HFCSX_MASTER; Write_hfc(cs, HFCSX_MST_MODE, cs->hw.hfcsx.mst_m); Write_hfc(cs, HFCSX_STATES, HFCSX_ACTIVATE | HFCSX_DO_ACTION); + spin_unlock_irqrestore(&cs->lock, flags); l1_msg(cs, HW_POWERUP | CONFIRM, NULL); break; case (HW_ENABLE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); Write_hfc(cs, HFCSX_STATES, HFCSX_ACTIVATE | HFCSX_DO_ACTION); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_DEACTIVATE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); cs->hw.hfcsx.mst_m &= ~HFCSX_MASTER; Write_hfc(cs, HFCSX_MST_MODE, cs->hw.hfcsx.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_INFO3 | REQUEST): + spin_lock_irqsave(&cs->lock, flags); cs->hw.hfcsx.mst_m |= HFCSX_MASTER; Write_hfc(cs, HFCSX_MST_MODE, cs->hw.hfcsx.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_TESTLOOP | REQUEST): + spin_lock_irqsave(&cs->lock, flags); switch ((int) arg) { case (1): Write_hfc(cs, HFCSX_B1_SSL, 0x80); /* tx slot */ @@ -814,21 +978,21 @@ cs->hw.hfcsx.conn = (cs->hw.hfcsx.conn & ~7) | 1; Write_hfc(cs, HFCSX_CONNECT, cs->hw.hfcsx.conn); break; - case (2): Write_hfc(cs, HFCSX_B2_SSL, 0x81); /* tx slot */ Write_hfc(cs, HFCSX_B2_RSL, 0x81); /* rx slot */ cs->hw.hfcsx.conn = (cs->hw.hfcsx.conn & ~0x38) | 0x08; Write_hfc(cs, HFCSX_CONNECT, cs->hw.hfcsx.conn); break; - default: + spin_unlock_irqrestore(&cs->lock, flags); if (cs->debug & L1_DEB_WARN) debugl1(cs, "hfcsx_l1hw loop invalid %4x", (int) arg); return; } cs->hw.hfcsx.trm |= 0x80; /* enable IOM-loop */ Write_hfc(cs, HFCSX_TRM, cs->hw.hfcsx.trm); + spin_unlock_irqrestore(&cs->lock, flags); break; default: if (cs->debug & L1_DEB_WARN) @@ -840,11 +1004,25 @@ /***********************************************/ /* called during init setting l1 stack pointer */ /***********************************************/ -static int +void setstack_hfcsx(struct PStack *st, struct IsdnCardState *cs) { st->l1.l1hw = HFCSX_l1hw; - return 0; +} + +/**************************************/ +/* send B-channel data if not blocked */ +/**************************************/ +static void +hfcsx_send_data(struct BCState *bcs) +{ + struct IsdnCardState *cs = bcs->cs; + + if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + hfcsx_fill_fifo(bcs); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + } else + debugl1(cs, "send_data %d blocked", bcs->channel); } /***************************************************************/ @@ -963,31 +1141,57 @@ static void hfcsx_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; +// test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "hfc_l2l1: this shouldn't happen\n"); + } else { +// test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - mode_hfcsx(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + mode_hfcsx(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - mode_hfcsx(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + mode_hfcsx(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -1037,7 +1241,7 @@ if (open_hfcsxstate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = hfcsx_l2l1; + st->l2.l2l1 = hfcsx_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -1048,10 +1252,12 @@ /* handle L1 state changes */ /***************************/ static void -hfcsx_bh(void *data) +hfcsx_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; + u_long flags; + if (!cs) + return; if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { if (!cs->hw.hfcsx.nt_mode) switch (cs->dc.hfcsx.ph_state) { @@ -1075,6 +1281,7 @@ } else { switch (cs->dc.hfcsx.ph_state) { case (2): + spin_lock_irqsave(&cs->lock, flags); if (cs->hw.hfcsx.nt_timer < 0) { cs->hw.hfcsx.nt_timer = 0; cs->hw.hfcsx.int_m1 &= ~HFCSX_INTS_TIMER; @@ -1096,13 +1303,16 @@ cs->hw.hfcsx.nt_timer = NT_T1_COUNT; Write_hfc(cs, HFCSX_STATES, 2 | HFCSX_NT_G2_G3); /* allow G2 -> G3 transition */ } + spin_unlock_irqrestore(&cs->lock, flags); break; case (1): case (3): case (4): + spin_lock_irqsave(&cs->lock, flags); cs->hw.hfcsx.nt_timer = 0; cs->hw.hfcsx.int_m1 &= ~HFCSX_INTS_TIMER; Write_hfc(cs, HFCSX_INT_M1, cs->hw.hfcsx.int_m1); + spin_unlock_irqrestore(&cs->lock, flags); break; default: break; @@ -1115,18 +1325,6 @@ DChannel_proc_xmt(cs); } -static struct bc_l1_ops hfcsx_bc_l1_ops = { - .fill_fifo = hfcsx_fill_fifo, - .open = setstack_2b, - .close = close_hfcsx, -}; - -static struct dc_l1_ops hfcsx_dc_l1_ops = { - .fill_fifo = hfcsx_fill_dfifo, - .open = setstack_hfcsx, - .bh_func = hfcsx_bh, - .dbusy_func = hfcsx_dbusy_timer, -}; /********************************/ /* called for card init message */ @@ -1134,98 +1332,55 @@ void __devinit inithfcsx(struct IsdnCardState *cs) { - dc_l1_init(cs, &hfcsx_dc_l1_ops); - cs->bc_l1_ops = &hfcsx_bc_l1_ops; + cs->setstack_d = setstack_hfcsx; + cs->BC_Send_Data = &hfcsx_send_data; + cs->bcs[0].BC_SetStack = setstack_2b; + cs->bcs[1].BC_SetStack = setstack_2b; + cs->bcs[0].BC_Close = close_hfcsx; + cs->bcs[1].BC_Close = close_hfcsx; mode_hfcsx(cs->bcs, 0, 0); mode_hfcsx(cs->bcs + 1, 0, 1); } -static void -hfcsx_init(struct IsdnCardState *cs) -{ - inithfcsx(cs); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((80 * HZ) / 1000); /* Timeout 80ms */ - /* now switch timer interrupt off */ - cs->hw.hfcsx.int_m1 &= ~HFCSX_INTS_TIMER; - Write_hfc(cs, HFCSX_INT_M1, cs->hw.hfcsx.int_m1); - /* reinit mode reg */ - Write_hfc(cs, HFCSX_MST_MODE, cs->hw.hfcsx.mst_m); -} -static struct card_ops hfcsx_ops = { - .init = hfcsx_init, - .reset = hfcsx_reset, - .release = hfcsx_release, - .irq_func = hfcsx_interrupt, -}; -static int __init -hfcsx_probe(struct IsdnCardState *cs, struct IsdnCard *card) +/*******************************************/ +/* handle card messages from control layer */ +/*******************************************/ +static int +hfcsx_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - int rc; - char c; + u_long flags; - cs->irq = card->para[0]; - cs->hw.hfcsx.base = card->para[1] & 0xfffe; - - cs->hw.hfcsx.fifo = 255; - cs->hw.hfcsx.int_s1 = 0; - cs->dc.hfcsx.ph_state = 0; - - rc = -EBUSY; - if (!request_io(&cs->rs, cs->hw.hfcsx.base, 2, "HFCSX isdn")) - goto err; - - rc = -ENODEV; - byteout(cs->hw.hfcsx.base, cs->hw.hfcsx.base & 0xFF); - byteout(cs->hw.hfcsx.base + 1, ((cs->hw.hfcsx.base >> 8) & 3) | 0x54); - udelay(10); - cs->hw.hfcsx.chip = Read_hfc(cs,HFCSX_CHIP_ID); - switch (cs->hw.hfcsx.chip >> 4) { - case 1: - c ='+'; - break; - case 9: - c ='P'; - break; - default: - printk(KERN_WARNING "HFC-SX: invalid chip id 0x%x\n", - cs->hw.hfcsx.chip >> 4); - goto err; - } - if (!ccd_sp_irqtab[cs->irq & 0xF]) { - printk(KERN_WARNING "HFC_SX: invalid irq %d specified\n", - cs->irq & 0xF); - goto err; - } - rc = -ENOMEM; - cs->hw.hfcsx.extra = kmalloc(sizeof(struct hfcsx_extra), GFP_ATOMIC); - if (!cs->hw.hfcsx.extra) { - printk(KERN_WARNING "HFC-SX: unable to allocate memory\n"); - goto err; + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "HFCSX: card_msg %x", mt); + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_hfcsx(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_RELEASE: + release_io_hfcsx(cs); + return (0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithfcsx(cs); + spin_unlock_irqrestore(&cs->lock, flags); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout((80 * HZ) / 1000); /* Timeout 80ms */ + /* now switch timer interrupt off */ + spin_lock_irqsave(&cs->lock, flags); + cs->hw.hfcsx.int_m1 &= ~HFCSX_INTS_TIMER; + Write_hfc(cs, HFCSX_INT_M1, cs->hw.hfcsx.int_m1); + /* reinit mode reg */ + Write_hfc(cs, HFCSX_MST_MODE, cs->hw.hfcsx.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); + return (0); + case CARD_TEST: + return (0); } - printk(KERN_INFO "HFC-S%c chip detected at base 0x%x IRQ %d\n", - c, (u_int) cs->hw.hfcsx.base, cs->irq); - - cs->hw.hfcsx.int_m2 = 0; /* disable alle interrupts */ - cs->hw.hfcsx.int_m1 = 0; - Write_hfc(cs, HFCSX_INT_M1, cs->hw.hfcsx.int_m1); - Write_hfc(cs, HFCSX_INT_M2, cs->hw.hfcsx.int_m2); - - init_timer(&cs->hw.hfcsx.timer); - cs->hw.hfcsx.timer.function = (void *) hfcsx_Timer; - cs->hw.hfcsx.timer.data = (long) cs; - cs->hw.hfcsx.b_fifo_size = 0; /* fifo size still unknown */ - cs->hw.hfcsx.cirm = ccd_sp_irqtab[cs->irq & 0xF]; /* RAM not eval. */ - - hfcsx_reset(cs); - cs->auxcmd = &hfcsx_auxcmd; - cs->card_ops = &hfcsx_ops; - return 0; - err: - hisax_release_resources(cs); - return rc; + return (0); } #ifdef __ISAPNP__ @@ -1236,66 +1391,133 @@ { 0, } }; -static struct isapnp_device_id *hdev = &hfc_ids[0]; +static struct isapnp_device_id *ipid __initdata = &hfc_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif int __devinit setup_hfcsx(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, hfcsx_revision); printk(KERN_INFO "HiSax: HFC-SX driver Rev. %s\n", HiSax_getrev(tmp)); #ifdef __ISAPNP__ if (!card->para[1] && isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; - while(hdev->card_vendor) { - if ((pb = pnp_find_card(hdev->card_vendor, - hdev->card_device, - pnp_c))) { - pnp_c = pb; - pd = NULL; - if ((pd = pnp_find_dev(pnp_c, - hdev->vendor, - hdev->function, - pd))) { printk(KERN_INFO "HiSax: %s detected\n", - (char *)hdev->driver_data); - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "HFC PnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "HFC PnP: activate failed\n"); - pnp_device_detach(pd); - return 0; + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_irq_valid(pd, 0) || !pnp_port_valid(pd, 0)) { + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + if (!card->para[0] || !card->para[1]) { printk(KERN_ERR "HFC PnP:some resources are missing %ld/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0)); - pnp_device_detach(pd); + card->para[0], card->para[1]); + pnp_disable_dev(pnp_d); return(0); } - card->para[1] = pnp_port_start(pd, 0); - card->para[0] = pnp_irq(pd, 0); break; } else { printk(KERN_ERR "HFC PnP: PnP error card found, no device\n"); } } - hdev++; - pnp_c=NULL; + ipid++; + pnp_c = NULL; } - if (!hdev->card_vendor) { + if (!ipid->card_vendor) { printk(KERN_INFO "HFC PnP: no ISAPnP card found\n"); return(0); } } #endif - if (hfcsx_probe(card->cs, card) < 0) - return 0; - return 1; + cs->hw.hfcsx.base = card->para[1] & 0xfffe; + cs->irq = card->para[0]; + cs->hw.hfcsx.int_s1 = 0; + cs->dc.hfcsx.ph_state = 0; + cs->hw.hfcsx.fifo = 255; + if ((cs->typ == ISDN_CTYPE_HFC_SX) || + (cs->typ == ISDN_CTYPE_HFC_SP_PCMCIA)) { + if ((!cs->hw.hfcsx.base) || !request_region(cs->hw.hfcsx.base, 2, "HFCSX isdn")) { + printk(KERN_WARNING + "HiSax: HFC-SX io-base %#lx already in use\n", + cs->hw.hfcsx.base); + return(0); + } + byteout(cs->hw.hfcsx.base, cs->hw.hfcsx.base & 0xFF); + byteout(cs->hw.hfcsx.base + 1, + ((cs->hw.hfcsx.base >> 8) & 3) | 0x54); + udelay(10); + cs->hw.hfcsx.chip = Read_hfc(cs,HFCSX_CHIP_ID); + switch (cs->hw.hfcsx.chip >> 4) { + case 1: + tmp[0] ='+'; + break; + case 9: + tmp[0] ='P'; + break; + default: + printk(KERN_WARNING + "HFC-SX: invalid chip id 0x%x\n", + cs->hw.hfcsx.chip >> 4); + release_region(cs->hw.hfcsx.base, 2); + return(0); + } + if (!ccd_sp_irqtab[cs->irq & 0xF]) { + printk(KERN_WARNING + "HFC_SX: invalid irq %d specified\n",cs->irq & 0xF); + release_region(cs->hw.hfcsx.base, 2); + return(0); + } + if (!(cs->hw.hfcsx.extra = (void *) + kmalloc(sizeof(struct hfcsx_extra), GFP_ATOMIC))) { + release_region(cs->hw.hfcsx.base, 2); + printk(KERN_WARNING "HFC-SX: unable to allocate memory\n"); + return(0); + } + printk(KERN_INFO "HFC-S%c chip detected at base 0x%x IRQ %d HZ %d\n", + tmp[0], (u_int) cs->hw.hfcsx.base, cs->irq, HZ); + cs->hw.hfcsx.int_m2 = 0; /* disable alle interrupts */ + cs->hw.hfcsx.int_m1 = 0; + Write_hfc(cs, HFCSX_INT_M1, cs->hw.hfcsx.int_m1); + Write_hfc(cs, HFCSX_INT_M2, cs->hw.hfcsx.int_m2); + } else + return (0); /* no valid card type */ + + cs->dbusytimer.function = (void *) hfcsx_dbusy_timer; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); + INIT_WORK(&cs->tqueue, (void *)(void *) hfcsx_bh, cs); + cs->readisac = NULL; + cs->writeisac = NULL; + cs->readisacfifo = NULL; + cs->writeisacfifo = NULL; + cs->BC_Read_Reg = NULL; + cs->BC_Write_Reg = NULL; + cs->irq_func = &hfcsx_interrupt; + + cs->hw.hfcsx.timer.function = (void *) hfcsx_Timer; + cs->hw.hfcsx.timer.data = (long) cs; + cs->hw.hfcsx.b_fifo_size = 0; /* fifo size still unknown */ + cs->hw.hfcsx.cirm = ccd_sp_irqtab[cs->irq & 0xF]; /* RAM not evaluated */ + init_timer(&cs->hw.hfcsx.timer); + + reset_hfcsx(cs); + cs->cardmsg = &hfcsx_card_msg; + cs->auxcmd = &hfcsx_auxcmd; + return (1); } diff -Nru a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/isdn/hisax/hfc_usb.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,1667 @@ +/* + * hfc_usb.c + * + * modular HiSax ISDN driver for Colognechip HFC-USB chip + * + * Authors : Peter Sprenger (sprenger@moving-byters.de) + * Martin Bachem (info@colognechip.com) + * based on the first hfc_usb driver of Werner Cornelius (werner@isdn-development.de) + * + * 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. + * +*/ + + +#include +#include +#include +#include +#include +#include "hisax.h" +#include +#include +#include +#include +#include +#include +#include "hisax_if.h" + +static const char *hfcusb_revision = "4.0"; + +/* + to enable much mire debug messages in this driver, define + VERBOSE_USB_DEBUG and VERBOSE_ISDN_DEBUG + below +*/ + +#define VERBOSE_USB_DEBUG +#define VERBOSE_ISDN_DEBUG + +#define INCLUDE_INLINE_FUNCS + +#define TRUE 1 +#define FALSE 0 + + +/***********/ +/* defines */ +/***********/ +#define HFC_CTRL_TIMEOUT 20 //(HZ * USB_CTRL_GET_TIMEOUT) +/* 5ms timeout writing/reading regs */ +#define HFC_TIMER_T3 8000 /* timeout for l1 activation timer */ +#define HFC_TIMER_T4 500 /* time for state change interval */ + +#define HFCUSB_L1_STATECHANGE 0 /* L1 state changed */ +#define HFCUSB_L1_DRX 1 /* D-frame received */ +#define HFCUSB_L1_ERX 2 /* E-frame received */ +#define HFCUSB_L1_DTX 4 /* D-frames completed */ + +#define MAX_BCH_SIZE 2048 /* allowed B-channel packet size */ + +#define HFCUSB_RX_THRESHOLD 64 /* threshold for fifo report bit rx */ +#define HFCUSB_TX_THRESHOLD 64 /* threshold for fifo report bit tx */ + +#define HFCUSB_CHIP_ID 0x16 /* Chip ID register index */ +#define HFCUSB_CIRM 0x00 /* cirm register index */ +#define HFCUSB_USB_SIZE 0x07 /* int length register */ +#define HFCUSB_USB_SIZE_I 0x06 /* iso length register */ +#define HFCUSB_F_CROSS 0x0b /* bit order register */ +#define HFCUSB_CLKDEL 0x37 /* bit delay register */ +#define HFCUSB_CON_HDLC 0xfa /* channel connect register */ +#define HFCUSB_HDLC_PAR 0xfb +#define HFCUSB_SCTRL 0x31 /* S-bus control register (tx) */ +#define HFCUSB_SCTRL_E 0x32 /* same for E and special funcs */ +#define HFCUSB_SCTRL_R 0x33 /* S-bus control register (rx) */ +#define HFCUSB_F_THRES 0x0c /* threshold register */ +#define HFCUSB_FIFO 0x0f /* fifo select register */ +#define HFCUSB_F_USAGE 0x1a /* fifo usage register */ +#define HFCUSB_MST_MODE0 0x14 +#define HFCUSB_MST_MODE1 0x15 +#define HFCUSB_P_DATA 0x1f +#define HFCUSB_INC_RES_F 0x0e +#define HFCUSB_STATES 0x30 + +#define HFCUSB_CHIPID 0x40 /* ID value of HFC-USB */ + +/******************/ +/* fifo registers */ +/******************/ +#define HFCUSB_NUM_FIFOS 8 /* maximum number of fifos */ +#define HFCUSB_B1_TX 0 /* index for B1 transmit bulk/int */ +#define HFCUSB_B1_RX 1 /* index for B1 receive bulk/int */ +#define HFCUSB_B2_TX 2 +#define HFCUSB_B2_RX 3 +#define HFCUSB_D_TX 4 +#define HFCUSB_D_RX 5 +#define HFCUSB_PCM_TX 6 +#define HFCUSB_PCM_RX 7 + +/* +* used to switch snd_transfer_mode for different TA modes e.g. the Billion USB TA just +* supports ISO out, while the Cologne Chip EVAL TA just supports BULK out +*/ +#define USB_INT 0 +#define USB_BULK 1 +#define USB_ISOC 2 + +#define ISOC_PACKETS_D 8 +#define ISOC_PACKETS_B 8 +#define ISO_BUFFER_SIZE 128 + +// ISO send definitions +#define SINK_MAX 68 +#define SINK_MIN 48 +#define SINK_DMIN 12 +#define SINK_DMAX 18 +#define BITLINE_INF (-64*8) + + + + +/**********/ +/* macros */ +/**********/ +#define write_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),0,0,HFC_CTRL_TIMEOUT) +#define read_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT) + +/*************************************************/ +/* entry and size of output/input control buffer */ +/*************************************************/ +#define HFC_CTRL_BUFSIZE 32 +typedef struct +{ + __u8 hfc_reg; /* register number */ + __u8 reg_val; /* value to be written (or read) */ + int action; /* data for action handler */ + +} ctrl_buft; + +typedef struct +{ + int vendor; // vendor id + int prod_id; // product id + char *vend_name; // vendor string + __u8 led_scheme; // led display scheme + __u8 led_invert; // invert led aux port settings + __u8 led_bits[8]; // array of 8 possible LED bitmask settings + +} vendor_data; + +/***************************************************************/ +/* structure defining input+output fifos (interrupt/bulk mode) */ +/***************************************************************/ + +struct usb_fifo; /* forward definition */ +typedef struct iso_urb_struct +{ + struct urb *purb; + __u8 buffer[ISO_BUFFER_SIZE]; /* buffer incoming/outgoing data */ + struct usb_fifo *owner_fifo; // pointer to owner fifo +} iso_urb_struct; + + +struct hfcusb_data; /* forward definition */ +typedef struct usb_fifo +{ + int fifonum; /* fifo index attached to this structure */ + int active; /* fifo is currently active */ + struct hfcusb_data *hfc; /* pointer to main structure */ + int pipe; /* address of endpoint */ + __u8 usb_packet_maxlen; /* maximum length for usb transfer */ + unsigned int max_size; /* maximum size of receive/send packet */ + __u8 intervall; /* interrupt interval */ + struct sk_buff *skbuff; /* actual used buffer */ + struct urb *urb; /* transfer structure for usb routines */ + __u8 buffer[128]; /* buffer incoming/outgoing data */ + int bit_line; /* how much bits are in the fifo? */ + + volatile __u8 usb_transfer_mode;/* switched between ISO and INT */ + iso_urb_struct iso[2]; /* need two urbs to have one always for pending */ + struct hisax_if *hif; /* hisax interface */ + int delete_flg; /* only delete skbuff once */ + int last_urblen; /* remember length of last packet */ + +} usb_fifo; + + +/*********************************************/ +/* structure holding all data for one device */ +/*********************************************/ +typedef struct hfcusb_data +{ + // HiSax Interface for loadable Layer1 drivers + struct hisax_d_if d_if; /* see hisax_if.h */ + struct hisax_b_if b_if[2]; /* see hisax_if.h */ + int protocol; + + struct usb_device *dev; /* our device */ + int if_used; /* used interface number */ + int alt_used; /* used alternate config */ + int ctrl_paksize; /* control pipe packet size */ + int ctrl_in_pipe, ctrl_out_pipe; /* handles for control pipe */ + int cfg_used; /* configuration index used */ + int vend_idx; // vendor found + + int b_mode[2]; // B-channel mode + + int l1_activated; // layer 1 activated + + int packet_size,iso_packet_size; + + /* control pipe background handling */ + ctrl_buft ctrl_buff[HFC_CTRL_BUFSIZE]; /* buffer holding queued data */ + volatile int ctrl_in_idx, ctrl_out_idx, + ctrl_cnt; /* input/output pointer + count */ + struct urb *ctrl_urb; /* transfer structure for control channel */ + + struct usb_ctrlrequest ctrl_write; /* buffer for control write request */ + struct usb_ctrlrequest ctrl_read; /* same for read request */ + + __u8 led_state,led_new_data,led_b_active; + + volatile __u8 threshold_mask; /* threshold actually reported */ + volatile __u8 bch_enables; /* or mask for sctrl_r and sctrl register values */ + + usb_fifo fifos[HFCUSB_NUM_FIFOS]; /* structure holding all fifo data */ + + volatile __u8 l1_state; /* actual l1 state */ + struct timer_list t3_timer; /* timer 3 for activation/deactivation */ + struct timer_list t4_timer; /* timer 4 for activation/deactivation */ + struct timer_list led_timer; /* timer flashing leds */ + +} hfcusb_data; + + +static void collect_rx_frame(usb_fifo *fifo,__u8 *data,int len,int finish); + + + +/******************************************************/ +/* start next background transfer for control channel */ +/******************************************************/ +static void ctrl_start_transfer(hfcusb_data * hfc) +{ + int err; + if(hfc->ctrl_cnt) + { + hfc->ctrl_urb->pipe = hfc->ctrl_out_pipe; + hfc->ctrl_urb->setup_packet = (u_char *) & hfc->ctrl_write; + hfc->ctrl_urb->transfer_buffer = NULL; + hfc->ctrl_urb->transfer_buffer_length = 0; + hfc->ctrl_write.wIndex = hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg; + hfc->ctrl_write.wValue = hfc->ctrl_buff[hfc->ctrl_out_idx].reg_val; + err = usb_submit_urb(hfc->ctrl_urb, GFP_KERNEL); /* start transfer */ + printk(KERN_DEBUG "ctrl_start_transfer: submit %d\n", err); + } +} /* ctrl_start_transfer */ + +/************************************/ +/* queue a control transfer request */ +/* return 0 on success. */ +/************************************/ +static int queue_control_request(hfcusb_data * hfc, __u8 reg, __u8 val,int action) +{ + ctrl_buft *buf; + +#ifdef VERBOSE_USB_DEBUG + printk ("HFC_USB: queue_control_request reg: %x, val: %x\n", reg, val); +#endif + + if(hfc->ctrl_cnt >= HFC_CTRL_BUFSIZE) return(1); /* no space left */ + buf = &hfc->ctrl_buff[hfc->ctrl_in_idx]; /* pointer to new index */ + buf->hfc_reg = reg; + buf->reg_val = val; + buf->action=action; + if (++hfc->ctrl_in_idx >= HFC_CTRL_BUFSIZE) + hfc->ctrl_in_idx = 0; /* pointer wrap */ + if (++hfc->ctrl_cnt == 1) + ctrl_start_transfer(hfc); + return(0); +} /* queue_control_request */ + + +static int control_action_handler(hfcusb_data *hfc,int reg,int val,int action) +{ + if(!action) return(1); // no action defined + + return(0); +} + + +/***************************************************************/ +/* control completion routine handling background control cmds */ +/***************************************************************/ +static void ctrl_complete(struct urb *urb, struct pt_regs *regs) +{ + hfcusb_data *hfc = (hfcusb_data *) urb->context; + ctrl_buft *buf; + + printk(KERN_DEBUG "ctrl_complete cnt %d\n", hfc->ctrl_cnt); + urb->dev = hfc->dev; + if(hfc->ctrl_cnt) + { + buf=&hfc->ctrl_buff[hfc->ctrl_out_idx]; + control_action_handler(hfc,buf->hfc_reg,buf->reg_val,buf->action); + + hfc->ctrl_cnt--; /* decrement actual count */ + if(++hfc->ctrl_out_idx >= HFC_CTRL_BUFSIZE) hfc->ctrl_out_idx = 0; /* pointer wrap */ + + ctrl_start_transfer(hfc); /* start next transfer */ + } +} /* ctrl_complete */ + + + +#define LED_OFF 0 // no LED support +#define LED_SCHEME1 1 // LED standard scheme +#define LED_SCHEME2 2 // not used yet... + +#define LED_POWER_ON 1 +#define LED_POWER_OFF 2 +#define LED_S0_ON 3 +#define LED_S0_OFF 4 +#define LED_B1_ON 5 +#define LED_B1_OFF 6 +#define LED_B1_DATA 7 +#define LED_B2_ON 8 +#define LED_B2_OFF 9 +#define LED_B2_DATA 10 + +#define LED_NORMAL 0 // LEDs are normal +#define LED_INVERTED 1 // LEDs are inverted + +// time for LED flashing +#define LED_TIME 250 + +vendor_data vdata[]= +{ + {0x959, 0x2bd0, "ISDN USB TA (Cologne Chip HFC-S USB based)", LED_OFF,LED_NORMAL,{4,0,2,1}}, /* CologneChip Eval TA */ + {0x7b0, 0x0007, "Billion tiny USB ISDN TA 128", LED_SCHEME1, LED_INVERTED, {8,0x40,0x20,0x10}}, /* Billion TA */ + {0x742, 0x2008, "Stollmann USB TA", LED_SCHEME1, LED_NORMAL, {4,0,2,1}}, /* Stollmann TA */ + {0x8e3, 0x0301, "Olitec USB RNIS", LED_SCHEME1, LED_NORMAL, {2,0,1,4}}, /* Olitec TA */ + {0x675, 0x1688, "DrayTec USB ISDN TA", LED_SCHEME1, LED_NORMAL, {4,0,2,1}}, /* Draytec TA */ + {0x7fa, 0x0846, "Bewan Modem RNIS USB", LED_SCHEME1, LED_INVERTED, {8,0x40,0x20,0x10}}, /* Bewan TA */ + {0,0,0} // EOL element +}; + +/***************************************************/ +/* write led data to auxport & invert if necessary */ +/***************************************************/ +static void write_led(hfcusb_data * hfc,__u8 led_state) +{ + if(led_state!=hfc->led_state) + { + hfc->led_state=led_state; + queue_control_request(hfc, HFCUSB_P_DATA,(vdata[hfc->vend_idx].led_invert) ? ~led_state : led_state,1); + } +} + +/******************************************/ +/* invert B-channel LEDs if data is sent */ +/******************************************/ +static void led_timer(hfcusb_data * hfc) +{ + static int cnt=0; + __u8 led_state=hfc->led_state; + + if(cnt) + { + if(hfc->led_b_active&1) led_state|=vdata[hfc->vend_idx].led_bits[2]; + if(hfc->led_b_active&2) led_state|=vdata[hfc->vend_idx].led_bits[3]; + } + else + { + if(!(hfc->led_b_active&1) || hfc->led_new_data&1) led_state&=~vdata[hfc->vend_idx].led_bits[2]; + if(!(hfc->led_b_active&2) || hfc->led_new_data&2) led_state&=~vdata[hfc->vend_idx].led_bits[3]; + } + + write_led(hfc,led_state); + hfc->led_new_data=0; + + cnt=!cnt; + // restart 4 hz timer + hfc->led_timer.expires = jiffies + (LED_TIME * HZ) / 1000; + if(!timer_pending(&hfc->led_timer)) add_timer(&hfc->led_timer); +} + +/**************************/ +/* handle LED requests */ +/**************************/ +static void handle_led(hfcusb_data * hfc,int event) +{ + __u8 led_state=hfc->led_state; + + // if no scheme -> no LED action + if(vdata[hfc->vend_idx].led_scheme==LED_OFF) return; + + switch(event) + { + case LED_POWER_ON: + led_state|=vdata[hfc->vend_idx].led_bits[0]; + break; + case LED_POWER_OFF: // no Power off handling + break; + case LED_S0_ON: + led_state|=vdata[hfc->vend_idx].led_bits[1]; + break; + case LED_S0_OFF: + led_state&=~vdata[hfc->vend_idx].led_bits[1]; + break; + case LED_B1_ON: + hfc->led_b_active|=1; + break; + case LED_B1_OFF: + hfc->led_b_active&=~1; + break; + case LED_B1_DATA: + hfc->led_new_data|=1; + break; + case LED_B2_ON: + hfc->led_b_active|=2; + break; + case LED_B2_OFF: + hfc->led_b_active&=~2; + break; + case LED_B2_DATA: + hfc->led_new_data|=2; + break; + } + + write_led(hfc,led_state); +} + +/********************************/ +/* called when timer t3 expires */ +/********************************/ +static void l1_timer_expire_t3(hfcusb_data * hfc) +{ + //printk (KERN_INFO "HFC-USB: l1_timer_expire_t3\n"); + + hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_DEACTIVATE | INDICATION,NULL); +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "PH_DEACTIVATE | INDICATION sent\n"); +#endif + hfc->l1_activated=FALSE; + handle_led(hfc,LED_S0_OFF); +} + +/********************************/ +/* called when timer t4 expires */ +/********************************/ +static void l1_timer_expire_t4(hfcusb_data * hfc) +{ + //printk (KERN_INFO "HFC-USB: l1_timer_expire_t4\n"); + + hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_DEACTIVATE | INDICATION,NULL); +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "PH_DEACTIVATE | INDICATION sent\n"); +#endif + hfc->l1_activated=FALSE; + handle_led(hfc,LED_S0_OFF); +} + +/*****************************/ +/* handle S0 state changes */ +/*****************************/ +static void state_handler(hfcusb_data * hfc,__u8 state) +{ + __u8 old_state; + + old_state=hfc->l1_state; + + // range check + if(state==old_state || state<1 || state>8) return; + +#ifdef VERBOSE_ISDN_DEBUG + printk(KERN_INFO "HFC-USB: new S0 state:%d old_state:%d\n",state,old_state); +#endif + + if(state<4 || state==7 || state==8) + { + if(timer_pending(&hfc->t3_timer)) del_timer(&hfc->t3_timer); + //printk(KERN_INFO "HFC-USB: T3 deactivated\n"); + } + + if(state>=7) + { + if(timer_pending(&hfc->t4_timer)) del_timer(&hfc->t4_timer); + //printk(KERN_INFO "HFC-USB: T4 deactivated\n"); + } + + if(state==7 && !hfc->l1_activated) + { + hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_ACTIVATE | INDICATION,NULL); + //printk(KERN_INFO "HFC-USB: PH_ACTIVATE | INDICATION sent\n"); + hfc->l1_activated=TRUE; + handle_led(hfc,LED_S0_ON); + } + else + if(state<=3 /* && activated*/) + { + if(old_state==7 || old_state==8) + { + //printk(KERN_INFO "HFC-USB: T4 activated\n"); + hfc->t4_timer.expires = jiffies + (HFC_TIMER_T4 * HZ) / 1000; + if(!timer_pending(&hfc->t4_timer)) add_timer(&hfc->t4_timer); + } + else + { + hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_DEACTIVATE | INDICATION,NULL); + //printk(KERN_INFO "HFC-USB: PH_DEACTIVATE | INDICATION sent\n"); + hfc->l1_activated=FALSE; + handle_led(hfc,LED_S0_OFF); + } + } + + hfc->l1_state=state; +} + + +/* prepare iso urb */ +static void fill_isoc_urb(struct urb *urb, struct usb_device *dev, unsigned int pipe, void *buf, + int num_packets, int packet_size, int interval, usb_complete_t complete, void *context) +{ + int k; + + spin_lock_init(&urb->lock); // do we really need spin_lock_init ? + urb->dev = dev; + urb->pipe = pipe; + urb->complete = complete; + urb->number_of_packets = num_packets; + urb->transfer_buffer_length = packet_size * num_packets; + urb->context = context; + urb->transfer_buffer = buf; + urb->transfer_flags = 0; + urb->transfer_flags = URB_ISO_ASAP; + urb->actual_length = 0; + urb->interval = interval; + for (k = 0; k < num_packets; k++) { + urb->iso_frame_desc[k].offset = packet_size * k; + urb->iso_frame_desc[k].length = packet_size; + urb->iso_frame_desc[k].actual_length = 0; + } +} + +/* allocs urbs and start isoc transfer with two pending urbs to avoid gaps in the transfer chain */ +static int start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,usb_complete_t complete,int packet_size) +{ + int i, k, errcode; + +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: starting ISO-chain for Fifo %i\n", fifo->fifonum); +#endif + + + // allocate Memory for Iso out Urbs + for (i = 0; i < 2; i++) { + if (!(fifo->iso[i].purb)) { + fifo->iso[i].purb = usb_alloc_urb(num_packets_per_urb, GFP_KERNEL); + fifo->iso[i].owner_fifo = (struct usb_fifo *) fifo; + + // Init the first iso + if (ISO_BUFFER_SIZE >= (fifo->usb_packet_maxlen * num_packets_per_urb)) + { + + fill_isoc_urb(fifo->iso[i].purb, fifo->hfc->dev, fifo->pipe, fifo->iso[i].buffer, + num_packets_per_urb, fifo->usb_packet_maxlen, fifo->intervall, + complete, &fifo->iso[i]); + + memset(fifo->iso[i].buffer, 0, sizeof(fifo->iso[i].buffer)); + + // defining packet delimeters in fifo->buffer + for(k = 0; k < num_packets_per_urb; k++) + { + fifo->iso[i].purb->iso_frame_desc[k].offset = k*packet_size; + fifo->iso[i].purb->iso_frame_desc[k].length = packet_size; + } + } + } + + fifo->bit_line = BITLINE_INF; + + errcode = usb_submit_urb(fifo->iso[i].purb, GFP_KERNEL); + fifo->active = (errcode >= 0) ? 1 : 0; + if(errcode < 0) + { + printk(KERN_INFO "HFC-USB: error submitting ISO URB: %i.%i \n", errcode, i); + }; + + } + + // errcode = (usb_submit_urb(fifo->iso[0].purb, GFP_KERNEL)); + return(fifo->active); +} + +/* stops running iso chain and frees their pending urbs */ +static void stop_isoc_chain(usb_fifo * fifo) +{ + int i; + + for(i = 0; i < 2; i++) + { + if(fifo->iso[i].purb) + { +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: Stopping iso chain for fifo %i.%i\n", fifo->fifonum, i); +#endif + usb_unlink_urb(fifo->iso[i].purb); + usb_free_urb(fifo->iso[i].purb); + fifo->iso[i].purb = NULL; + } + } + if (fifo->urb) { + usb_unlink_urb(fifo->urb); + usb_free_urb(fifo->urb); + fifo->urb = NULL; + } + fifo->active = 0; +} + +// defines how much ISO packets are handled in one URB +static int iso_packets[8]={ISOC_PACKETS_B,ISOC_PACKETS_B,ISOC_PACKETS_B,ISOC_PACKETS_B, + ISOC_PACKETS_D,ISOC_PACKETS_D,ISOC_PACKETS_D,ISOC_PACKETS_D}; + +/*****************************************************/ +/* transmit completion routine for all ISO tx fifos */ +/*****************************************************/ +static void tx_iso_complete(struct urb *urb, struct pt_regs *regs) +{ + iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context; + usb_fifo *fifo = context_iso_urb->owner_fifo; + hfcusb_data *hfc = fifo->hfc; + int k, tx_offset, num_isoc_packets, sink, len, current_len,errcode,frame_complete,transp_mode,fifon; + __u8 threshbit; + __u8 threshtable[8] = { 1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; + + fifon=fifo->fifonum; + tx_offset=0; + // very weird error code when using ohci drivers, for now : ignore this error ... (MB) + if(urb->status == -EOVERFLOW) + { + urb->status = 0; +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: ignoring USB DATAOVERRUN for fifo %i \n",fifon); +#endif + } + + if(fifo->active && !urb->status) + { + transp_mode=0; + if(fifon<4 && hfc->b_mode[fifon/2]==L1_MODE_TRANS) transp_mode=TRUE; + + threshbit = threshtable[fifon] & hfc->threshold_mask; // is threshold set for our channel? + num_isoc_packets=iso_packets[fifon]; + + if(fifon >= HFCUSB_D_TX) + { + sink = (threshbit) ? SINK_DMIN : SINK_DMAX; // how much bit go to the sink for D-channel? + } + else + { + sink = (threshbit) ? SINK_MIN : SINK_MAX; // how much bit go to the sink for B-channel? + } + + // prepare ISO Urb + fill_isoc_urb(urb, fifo->hfc->dev, fifo->pipe,context_iso_urb->buffer, num_isoc_packets, + fifo->usb_packet_maxlen, fifo->intervall, tx_iso_complete, urb->context); + memset(context_iso_urb->buffer, 0, sizeof(context_iso_urb->buffer)); + + frame_complete=FALSE; + + // Generate Iso Packets + for(k = 0; k < num_isoc_packets; ++k) + { + if(fifo->skbuff) + { + len = fifo->skbuff->len; // remaining length + + fifo->bit_line -= sink; // we lower data margin every msec + current_len = (0 - fifo->bit_line) / 8; + if(current_len > 14) current_len = 14; // maximum 15 byte for every ISO packet makes our life easier + current_len = (len <= current_len) ? len : current_len; + fifo->bit_line += current_len * 8; // how much bit do we put on the line? + + context_iso_urb->buffer[tx_offset] = 0; + if(current_len == len) + { + if(!transp_mode) + { + context_iso_urb->buffer[tx_offset] = 1; // here frame completion + fifo->bit_line += 32; // add 2 byte flags and 16bit CRC at end of ISDN frame + } + frame_complete = TRUE; + } + + // copy bytes from buffer into ISO_URB + memcpy(context_iso_urb->buffer+tx_offset+1,fifo->skbuff->data,current_len); + skb_pull(fifo->skbuff,current_len); + + // define packet delimeters within the URB buffer + urb->iso_frame_desc[k].offset = tx_offset; + urb->iso_frame_desc[k].length = current_len + 1; + + tx_offset += (current_len + 1); + // printk(KERN_INFO "HFC-USB: fifonum:%d,%d bytes to send, %d bytes ISO packet,bitline:%d,sink:%d,threshbit:%d,threshmask:%x\n",fifon,len,current_len,fifo->bit_line,sink,threshbit,hfc->threshold_mask); + if(!transp_mode) + { + if(fifon==HFCUSB_B1_TX) handle_led(hfc,LED_B1_DATA); + if(fifon==HFCUSB_B2_TX) handle_led(hfc,LED_B2_DATA); + } + } + else + { + // we have no more data - generate 1 byte ISO packets + urb->iso_frame_desc[k].offset = tx_offset++; + + urb->iso_frame_desc[k].length = 1; + fifo->bit_line -= sink; // we lower data margin every msec + + if(fifo->bit_line < BITLINE_INF) + { + fifo->bit_line = BITLINE_INF; + //printk (KERN_INFO "HFC-USB: BITLINE_INF underrun\n"); + } + } + + if(frame_complete) + { + // delete the buffer only once, here or in hfc_usb_l2l1() in a PH_DATA|REQUEST + fifo->delete_flg=TRUE; + + fifo->hif->l1l2(fifo->hif,PH_DATA|CONFIRM,(void*)fifo->skbuff->truesize); + + if(fifo->skbuff && fifo->delete_flg) + { + dev_kfree_skb_any(fifo->skbuff); + //printk(KERN_INFO "HFC-USB: skbuff=NULL on fifo:%d\n",fifo->fifonum); + fifo->skbuff = NULL; + fifo->delete_flg=FALSE; + } + + frame_complete=FALSE; + } + } + + errcode = usb_submit_urb(urb, GFP_KERNEL); + if(errcode < 0) + { + printk(KERN_INFO "HFC-USB: error submitting ISO URB: %i \n", errcode); + } + } + else + { + if(urb->status) + { + printk(KERN_INFO "HFC-USB: tx_iso_complete : urb->status %i, fifonum %i\n", urb->status,fifon); + } + } + +} /* tx_iso_complete */ + +/*****************************************************/ +/* receive completion routine for all ISO tx fifos */ +/*****************************************************/ +static void rx_iso_complete(struct urb *urb, struct pt_regs *regs) +{ + iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context; + usb_fifo *fifo = context_iso_urb->owner_fifo; + hfcusb_data *hfc = fifo->hfc; + int k, len, errcode, offset, num_isoc_packets,fifon; + __u8 *buf; + + fifon=fifo->fifonum; + // very weird error code when using ohci drivers, for now : ignore this error ... (MB) + if(urb->status == -EOVERFLOW) + { + urb->status = 0; +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: ignoring USB DATAOVERRUN for fifo %i \n",fifon); +#endif + } + + if(fifo->active && !urb->status) + { + num_isoc_packets=iso_packets[fifon]; + + // Generate D-Channel Iso Packets + for(k = 0; k < num_isoc_packets; ++k) + { + len=urb->iso_frame_desc[k].actual_length; + offset=urb->iso_frame_desc[k].offset; + buf=context_iso_urb->buffer+offset; + + if(fifo->last_urblen!=fifo->usb_packet_maxlen) + { + // the threshold mask is in the 2nd status byte + hfc->threshold_mask=buf[1]; + // the S0 state is in the upper half of the 1st status byte + state_handler(hfc,buf[0] >> 4); + // if we have more than the 2 status bytes -> collect data + if(len>2) collect_rx_frame(fifo,buf+2,len-2,buf[0]&1); + } + else collect_rx_frame(fifo,buf,len,0); + + fifo->last_urblen=len; + + } + + // prepare ISO Urb + fill_isoc_urb(urb, fifo->hfc->dev, fifo->pipe,context_iso_urb->buffer, num_isoc_packets, + fifo->usb_packet_maxlen, fifo->intervall, rx_iso_complete, urb->context); + + errcode = usb_submit_urb(urb, GFP_KERNEL); + if(errcode < 0) + { + printk(KERN_INFO "HFC-USB: error submitting ISO URB: %i \n", errcode); + } + } + else + { + if(urb->status) + { + printk(KERN_INFO "HFC-USB: rx_iso_complete : urb->status %i, fifonum %i\n", urb->status,fifon); + } + } +} /* rx_iso_complete */ + + +/*****************************************************/ +/* collect data from interrupt or isochron in */ +/*****************************************************/ +static void collect_rx_frame(usb_fifo *fifo,__u8 *data,int len,int finish) +{ + hfcusb_data *hfc = fifo->hfc; + int transp_mode,fifon; + + fifon=fifo->fifonum; + transp_mode=0; + if(fifon<4 && hfc->b_mode[fifon/2]==L1_MODE_TRANS) transp_mode=TRUE; + + //printk(KERN_INFO "HFC-USB: got %d bytes finish:%d max_size:%d fifo:%d\n",len,finish,fifo->max_size,fifon); + if(!fifo->skbuff) + { + // allocate sk buffer + fifo->skbuff=dev_alloc_skb(fifo->max_size + 3); + if(!fifo->skbuff) + { + printk(KERN_INFO "HFC-USB: cannot allocate buffer (dev_alloc_skb) fifo:%d\n",fifon); + return; + } + + } + + if(len && fifo->skbuff->len+lenmax_size) + { + memcpy(skb_put(fifo->skbuff,len),data,len); + } + else printk(KERN_INFO "HCF-USB: got frame exceeded fifo->max_size:%d\n",fifo->max_size); + + // give transparent data up, when 128 byte are available + if(transp_mode && fifo->skbuff->len>=128) + { + fifo->hif->l1l2(fifo->hif,PH_DATA | INDICATION,fifo->skbuff); + fifo->skbuff = NULL; // buffer was freed from upper layer + return; + } + + // we have a complete hdlc packet + if(finish) + { + if(!fifo->skbuff->data[fifo->skbuff->len-1]) + { + skb_trim(fifo->skbuff,fifo->skbuff->len-3); // remove CRC & status + + //printk(KERN_INFO "HFC-USB: got frame %d bytes on fifo:%d\n",fifo->skbuff->len,fifon); + + if(fifon==HFCUSB_PCM_RX) fifo->hif->l1l2(fifo->hif,PH_DATA_E | INDICATION,fifo->skbuff); + else fifo->hif->l1l2(fifo->hif,PH_DATA | INDICATION,fifo->skbuff); + + fifo->skbuff = NULL; // buffer was freed from upper layer + } + else + { + printk(KERN_INFO "HFC-USB: got frame %d bytes but CRC ERROR!!!\n",fifo->skbuff->len); + + skb_trim(fifo->skbuff,0); // clear whole buffer + } + } + + // LED flashing only in HDLC mode + if(!transp_mode) + { + if(fifon==HFCUSB_B1_RX) handle_led(hfc,LED_B1_DATA); + if(fifon==HFCUSB_B2_RX) handle_led(hfc,LED_B2_DATA); + } +} + +/***********************************************/ +/* receive completion routine for all rx fifos */ +/***********************************************/ +static void rx_complete(struct urb *urb, struct pt_regs *regs) +{ + int len; + __u8 *buf; + usb_fifo *fifo = (usb_fifo *) urb->context; /* pointer to our fifo */ + hfcusb_data *hfc = fifo->hfc; + + urb->dev = hfc->dev; /* security init */ + + if((!fifo->active) || (urb->status)) { +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: RX-Fifo %i is going down (%i)\n", fifo->fifonum, urb->status); +#endif + fifo->urb->interval = 0; /* cancel automatic rescheduling */ + if(fifo->skbuff) { + dev_kfree_skb_any(fifo->skbuff); + fifo->skbuff = NULL; + } + return; + } + + len=urb->actual_length; + buf=fifo->buffer; + + if(fifo->last_urblen!=fifo->usb_packet_maxlen) { + // the threshold mask is in the 2nd status byte + hfc->threshold_mask=buf[1]; + // the S0 state is in the upper half of the 1st status byte + state_handler(hfc,buf[0] >> 4); + // if we have more than the 2 status bytes -> collect data + if(len>2) collect_rx_frame(fifo,buf+2,urb->actual_length-2,buf[0]&1); + } else + collect_rx_frame(fifo,buf,urb->actual_length,0); + + fifo->last_urblen=urb->actual_length; + + +} /* rx_complete */ + + + +/***************************************************/ +/* start the interrupt transfer for the given fifo */ +/***************************************************/ +static void start_int_fifo(usb_fifo * fifo) +{ + int errcode; + +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: starting intr IN fifo:%d\n", fifo->fifonum); +#endif + if (!fifo->urb) { + fifo->urb = usb_alloc_urb(0, GFP_KERNEL); + if (!fifo->urb) + return; + } + usb_fill_int_urb(fifo->urb, fifo->hfc->dev, fifo->pipe, fifo->buffer, + fifo->usb_packet_maxlen, rx_complete, fifo, fifo->intervall); + fifo->active = 1; /* must be marked active */ + errcode = usb_submit_urb(fifo->urb, GFP_KERNEL); + + if(errcode) + { + printk(KERN_INFO "HFC-USB: submit URB error(start_int_info): status:%i\n", errcode); + fifo->active = 0; + fifo->skbuff = NULL; + } +} /* start_int_fifo */ + +/*****************************/ +/* set the B-channel mode */ +/*****************************/ +static void set_hfcmode(hfcusb_data *hfc,int channel,int mode) +{ + __u8 val,idx_table[2]={0,2}; + +#ifdef VERBOSE_ISDN_DEBUG + printk (KERN_INFO "HFC-USB: setting channel %d to mode %d\n",channel,mode); +#endif + + hfc->b_mode[channel]=mode; + + // setup CON_HDLC + val=0; + if(mode!=L1_MODE_NULL) val=8; // enable fifo? + if(mode==L1_MODE_TRANS) val|=2; // set transparent bit + + queue_control_request(hfc,HFCUSB_FIFO,idx_table[channel],1); // set FIFO to transmit register + queue_control_request(hfc,HFCUSB_CON_HDLC,val,1); + queue_control_request(hfc,HFCUSB_INC_RES_F,2,1); // reset fifo + + queue_control_request(hfc,HFCUSB_FIFO,idx_table[channel]+1,1); // set FIFO to receive register + queue_control_request(hfc,HFCUSB_CON_HDLC,val,1); + queue_control_request(hfc,HFCUSB_INC_RES_F,2,1); // reset fifo + + val=0x40; + if(hfc->b_mode[0]) val|=1; + if(hfc->b_mode[1]) val|=2; + queue_control_request(hfc,HFCUSB_SCTRL,val,1); + + val=0; + if(hfc->b_mode[0]) val|=1; + if(hfc->b_mode[1]) val|=2; + queue_control_request(hfc,HFCUSB_SCTRL_R,val,1); + + if(mode==L1_MODE_NULL) + { + if(channel) handle_led(hfc,LED_B2_OFF); + else handle_led(hfc,LED_B1_OFF); + } + else + { + if(channel) handle_led(hfc,LED_B2_ON); + else handle_led(hfc,LED_B1_ON); + } +} + +/* + -------------------------------------------------------------------------------------- + from here : hisax_if callback routines : + - void hfc_usb_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg) { + + l1 to l2 routines : + - static void hfc_usb_l1l2(hfcusb_data * hfc) + +*/ + +void hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg) +{ + usb_fifo *fifo = my_hisax_if->priv; + hfcusb_data *hfc = fifo->hfc; + + switch (pr) { + case PH_ACTIVATE | REQUEST: + if(fifo->fifonum==HFCUSB_D_TX) + { +#ifdef VERBOSE_ISDN_DEBUG + printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_ACTIVATE | REQUEST\n"); +#endif + queue_control_request(hfc, HFCUSB_STATES,0x60,1); /* make activation */ + hfc->t3_timer.expires = jiffies + (HFC_TIMER_T3 * HZ) / 1000; + if(!timer_pending(&hfc->t3_timer)) add_timer(&hfc->t3_timer); + } + else + { +#ifdef VERBOSE_ISDN_DEBUG + printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_ACTIVATE | REQUEST\n"); +#endif + set_hfcmode(hfc,(fifo->fifonum==HFCUSB_B1_TX) ? 0 : 1 ,(int)arg); + fifo->hif->l1l2(fifo->hif,PH_ACTIVATE | INDICATION, NULL); + } + break; + case PH_DEACTIVATE | REQUEST: + if(fifo->fifonum==HFCUSB_D_TX) + { +#ifdef VERBOSE_ISDN_DEBUG + printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_DEACTIVATE | REQUEST\n"); +#endif + printk (KERN_INFO "HFC-USB: ISDN TE device should not deativate...\n"); + } + else + { +#ifdef VERBOSE_ISDN_DEBUG + printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_DEACTIVATE | REQUEST\n"); +#endif + set_hfcmode(hfc,(fifo->fifonum==HFCUSB_B1_TX) ? 0 : 1 ,(int)L1_MODE_NULL); + fifo->hif->l1l2(fifo->hif,PH_DEACTIVATE | INDICATION, NULL); + } + break; + case PH_DATA | REQUEST: + if(fifo->skbuff && fifo->delete_flg) + { + dev_kfree_skb_any(fifo->skbuff); + //printk(KERN_INFO "skbuff=NULL on fifo:%d\n",fifo->fifonum); + fifo->skbuff = NULL; + fifo->delete_flg=FALSE; + } + + fifo->skbuff=arg; // we have a new buffer + + //if(fifo->fifonum==HFCUSB_D_TX) printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_DATA | REQUEST\n"); + //else printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_DATA | REQUEST\n"); + break; + default: + printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x\n", pr); + break; + } +} + +// valid configurations +#define CNF_4INT3ISO 1 // 4 INT IN, 3 ISO OUT +#define CNF_3INT3ISO 2 // 3 INT IN, 3 ISO OUT +#define CNF_4ISO3ISO 3 // 4 ISO IN, 3 ISO OUT +#define CNF_3ISO3ISO 4 // 3 ISO IN, 3 ISO OUT + + +/* + -------------------------------------------------------------------------------------- + From here on USB initialization and deactivation related routines are implemented : + + - hfc_usb_init : + is the main Entry Point for the USB Subsystem when the device get plugged + in. This function calls usb_register with usb_driver as parameter. + Here, further entry points for probing (hfc_usb_probe) and disconnecting + the device (hfc_usb_disconnect) are published, as the id_table + + - hfc_usb_probe + this function is called by the usb subsystem, and steps through the alternate + settings of the currently plugged in device to detect all Endpoints needed to + run an ISDN TA. + Needed EndPoints are + 3 (+1) IntIn EndPoints (D-in, E-in, B1-in, B2-in, (E-in)) or + 3 (+1) Isochron In Endpoints (D-out, B1-out, B2-out) and 3 IsoOut Endpoints + The currently used transfer mode of on the Out-Endpoints will be stored in + hfc->usb_transfer_mode and is either USB_INT or USB_ISO + When a valid alternate setting could be found, the usb_init (see blow) + function is called + + - usb_init + Here, the HFC_USB Chip itself gets initialized and the USB framework to send/receive + Data to/from the several EndPoints are initialized: + The E- and D-Channel Int-In chain gets started + The IsoChain for the Iso-Out traffic get started + + - hfc_usb_disconnect + this function is called by the usb subsystem and has to free all resources + and stop all usb traffic to allow a proper hotplugging disconnect. + +*/ + +/***************************************************************************/ +/* usb_init is called once when a new matching device is detected to setup */ +/* main parameters. It registers the driver at the main hisax module. */ +/* on success 0 is returned. */ +/***************************************************************************/ +static int usb_init(hfcusb_data * hfc) +{ + usb_fifo *fifo; + int i, err; + u_char b; + struct hisax_b_if *p_b_if[2]; + + /* check the chip id */ + printk(KERN_INFO "HFCUSB_CHIP_ID begin\n"); + if (read_usb(hfc, HFCUSB_CHIP_ID, &b) != 1) { + printk(KERN_INFO "HFC-USB: cannot read chip id\n"); + return(1); + } + printk(KERN_INFO "HFCUSB_CHIP_ID %x\n", b); + if (b != HFCUSB_CHIPID) { + printk(KERN_INFO "HFC-USB: Invalid chip id 0x%02x\n", b); + return(1); + } + + /* first set the needed config, interface and alternate */ + printk(KERN_INFO "usb_init 1\n"); +// usb_set_configuration(hfc->dev, 1); + printk(KERN_INFO "usb_init 2\n"); + err = usb_set_interface(hfc->dev, hfc->if_used, hfc->alt_used); + printk(KERN_INFO "usb_init usb_set_interface return %d\n", err); + /* now we initialize the chip */ + write_usb(hfc, HFCUSB_CIRM, 8); // do reset + write_usb(hfc, HFCUSB_CIRM, 0x10); // aux = output, reset off + + // set USB_SIZE to match the the wMaxPacketSize for INT or BULK transfers + write_usb(hfc, HFCUSB_USB_SIZE,(hfc->packet_size/8) | ((hfc->packet_size/8) << 4)); + + // set USB_SIZE_I to match the the wMaxPacketSize for ISO transfers + write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size); + + /* enable PCM/GCI master mode */ + write_usb(hfc, HFCUSB_MST_MODE1, 0); /* set default values */ + write_usb(hfc, HFCUSB_MST_MODE0, 1); /* enable master mode */ + + /* init the fifos */ + write_usb(hfc, HFCUSB_F_THRES, (HFCUSB_TX_THRESHOLD/8) |((HFCUSB_RX_THRESHOLD/8) << 4)); + + fifo = hfc->fifos; + for(i = 0; i < HFCUSB_NUM_FIFOS; i++) + { + write_usb(hfc, HFCUSB_FIFO, i); /* select the desired fifo */ + fifo[i].skbuff = NULL; /* init buffer pointer */ + fifo[i].max_size = (i <= HFCUSB_B2_RX) ? MAX_BCH_SIZE : MAX_DFRAME_LEN; + fifo[i].last_urblen=0; + write_usb(hfc, HFCUSB_HDLC_PAR, ((i <= HFCUSB_B2_RX) ? 0 : 2)); // set 2 bit for D- & E-channel + write_usb(hfc, HFCUSB_CON_HDLC, ((i==HFCUSB_D_TX) ? 0x09 : 0x08)); // rx hdlc, enable IFF for D-channel + write_usb(hfc, HFCUSB_INC_RES_F, 2); /* reset the fifo */ + } + + write_usb(hfc, HFCUSB_CLKDEL, 0x0f); /* clock delay value */ + write_usb(hfc, HFCUSB_STATES, 3 | 0x10); /* set deactivated mode */ + write_usb(hfc, HFCUSB_STATES, 3); /* enable state machine */ + + write_usb(hfc, HFCUSB_SCTRL_R, 0); /* disable both B receivers */ + write_usb(hfc, HFCUSB_SCTRL, 0x40); /* disable B transmitters + capacitive mode */ + + // set both B-channel to not connected + hfc->b_mode[0]=L1_MODE_NULL; + hfc->b_mode[1]=L1_MODE_NULL; + + hfc->l1_activated=FALSE; + hfc->led_state=0; + hfc->led_new_data=0; + + /* init the t3 timer */ + init_timer(&hfc->t3_timer); + hfc->t3_timer.data = (long) hfc; + hfc->t3_timer.function = (void *) l1_timer_expire_t3; + /* init the t4 timer */ + init_timer(&hfc->t4_timer); + hfc->t4_timer.data = (long) hfc; + hfc->t4_timer.function = (void *) l1_timer_expire_t4; + /* init the led timer */ + init_timer(&hfc->led_timer); + hfc->led_timer.data = (long) hfc; + hfc->led_timer.function = (void *) led_timer; + // trigger 4 hz led timer + hfc->led_timer.expires = jiffies + (LED_TIME * HZ) / 1000; + if(!timer_pending(&hfc->led_timer)) add_timer(&hfc->led_timer); + + // init the background machinery for control requests + hfc->ctrl_read.bRequestType = 0xc0; + hfc->ctrl_read.bRequest = 1; + hfc->ctrl_read.wLength = 1; + hfc->ctrl_write.bRequestType = 0x40; + hfc->ctrl_write.bRequest = 0; + hfc->ctrl_write.wLength = 0; + usb_fill_control_urb(hfc->ctrl_urb, hfc->dev, hfc->ctrl_out_pipe,(u_char *) & hfc->ctrl_write, NULL, 0, ctrl_complete, hfc); + + /* Init All Fifos */ + for(i = 0; i < HFCUSB_NUM_FIFOS; i++) + { + hfc->fifos[i].iso[0].purb = NULL; + hfc->fifos[i].iso[1].purb = NULL; + hfc->fifos[i].active = 0; + } + + // register like Germaschewski : + hfc->d_if.owner = THIS_MODULE; + hfc->d_if.ifc.priv = &hfc->fifos[HFCUSB_D_TX]; + hfc->d_if.ifc.l2l1 = hfc_usb_l2l1; + + for (i=0; i<2; i++) + { + hfc->b_if[i].ifc.priv = &hfc->fifos[HFCUSB_B1_TX+i*2]; + hfc->b_if[i].ifc.l2l1 = hfc_usb_l2l1; + p_b_if[i] = &hfc->b_if[i]; + } + + hfc->protocol = 2; /* default EURO ISDN, should be a module_param */ + hisax_register(&hfc->d_if, p_b_if, "hfc_usb", hfc->protocol); + + for (i=0; i<4; i++) + hfc->fifos[i].hif=&p_b_if[i/2]->ifc; + for (i=4; i<8; i++) + hfc->fifos[i].hif=&hfc->d_if.ifc; + + // 3 (+1) INT IN + 3 ISO OUT + if(hfc->cfg_used == CNF_3INT3ISO || hfc->cfg_used == CNF_4INT3ISO) + { + start_int_fifo(hfc->fifos + HFCUSB_D_RX); // Int IN D-fifo + if(hfc->fifos[HFCUSB_PCM_RX].pipe) start_int_fifo(hfc->fifos + HFCUSB_PCM_RX); // E-fifo + start_int_fifo(hfc->fifos + HFCUSB_B1_RX); // Int IN B1-fifo + start_int_fifo(hfc->fifos + HFCUSB_B2_RX); // Int IN B2-fifo + } + + // 3 (+1) ISO IN + 3 ISO OUT + if(hfc->cfg_used==CNF_3ISO3ISO || hfc->cfg_used==CNF_4ISO3ISO) + { + start_isoc_chain(hfc->fifos + HFCUSB_D_RX, ISOC_PACKETS_D, rx_iso_complete,16); + if(hfc->fifos[HFCUSB_PCM_RX].pipe) start_isoc_chain(hfc->fifos + HFCUSB_PCM_RX, ISOC_PACKETS_D, rx_iso_complete,16); + start_isoc_chain(hfc->fifos + HFCUSB_B1_RX, ISOC_PACKETS_B, rx_iso_complete,16); + start_isoc_chain(hfc->fifos + HFCUSB_B2_RX, ISOC_PACKETS_B, rx_iso_complete,16); + } + + start_isoc_chain(hfc->fifos + HFCUSB_D_TX, ISOC_PACKETS_D, tx_iso_complete,1); + start_isoc_chain(hfc->fifos + HFCUSB_B1_TX, ISOC_PACKETS_B, tx_iso_complete,1); + start_isoc_chain(hfc->fifos + HFCUSB_B2_TX, ISOC_PACKETS_B, tx_iso_complete,1); + + handle_led(hfc,LED_POWER_ON); + + return(0); +} /* usb_init */ + + +/****************************************/ +/* data defining the devices to be used */ +/****************************************/ +// static __devinitdata const struct usb_device_id hfc_usb_idtab[3] = { +static struct usb_device_id hfc_usb_idtab[] = { + {USB_DEVICE(0x7b0, 0x0007)}, /* Billion USB TA 2 */ + {USB_DEVICE(0x742, 0x2008)}, /* Stollmann USB TA */ + {USB_DEVICE(0x959, 0x2bd0)}, /* Colognechip USB eval TA */ + {USB_DEVICE(0x8e3, 0x0301)}, /* OliTec ISDN USB */ + {USB_DEVICE(0x675, 0x1688)}, /* DrayTec ISDN USB */ + {USB_DEVICE(0x7fa, 0x0846)}, /* Bewan ISDN USB TA */ + {} /* end with an all-zeroes entry */ +}; + +MODULE_AUTHOR("Peter Sprenger (sprenger@moving-byters.de)/Martin Bachem (info@colognechip.com)"); +MODULE_DESCRIPTION("HFC I4L USB driver"); +MODULE_DEVICE_TABLE(usb, hfc_usb_idtab); +MODULE_LICENSE("GPL"); + +#define EP_NUL 1 // Endpoint at this position not allowed +#define EP_NOP 2 // all type of endpoints allowed at this position +#define EP_ISO 3 // Isochron endpoint mandatory at this position +#define EP_BLK 4 // Bulk endpoint mandatory at this position +#define EP_INT 5 // Interrupt endpoint mandatory at this position + +// this array represents all endpoints possible in the HCF-USB +// the last 2 entries are the configuration number and the minimum interval for Interrupt endpoints +int validconf[][18]= +{ + // INT in, ISO out config + {EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NOP,EP_INT,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_NUL,EP_NUL,CNF_4INT3ISO,2}, + {EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NUL,EP_NUL,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_NUL,EP_NUL,CNF_3INT3ISO,2}, + // ISO in, ISO out config + {EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_NOP,EP_ISO,CNF_4ISO3ISO,2}, + {EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_NUL,EP_NUL,CNF_3ISO3ISO,2}, + {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} // EOL element +}; + +// string description of chosen config +char *conf_str[]= +{ + "4 Interrupt IN + 3 Isochron OUT", + "3 Interrupt IN + 3 Isochron OUT", + "4 Isochron IN + 3 Isochron OUT", + "3 Isochron IN + 3 Isochron OUT" +}; + + +/*************************************************/ +/* function called to probe a new plugged device */ +/*************************************************/ +static int __devinit hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) +{ + struct usb_device *dev= interface_to_usbdev(intf); + hfcusb_data *context; + struct usb_host_interface *iface = intf->altsetting + intf->act_altsetting; + struct usb_host_endpoint *ep; + int i, 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); +// usb_show_device_descriptor(&dev->descriptor); +// usb_show_interface_descriptor(&iface->desc); + vend_idx=0xffff; + for(i=0;vdata[i].vendor;i++) + { + if(dev->descriptor.idVendor==vdata[i].vendor && dev->descriptor.idProduct==vdata[i].prod_id) vend_idx=i; + } + + +#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); +#endif + + if (vend_idx != 0xffff) { +#ifdef VERBOSE_USB_DEBUG + 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; + 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; + cfg_used=0; + +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: test alt_setting %d\n", probe_alt_setting); +#endif + // check for config EOL element + while (validconf[cfg_used][0]) { + cfg_found=TRUE; + vcf=validconf[cfg_used]; + ep = iface->endpoint; /* first endpoint descriptor */ + +#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); +#endif + // copy table + memcpy(cmptbl,vcf,16*sizeof(int)); + + // check for all endpoints in this alternate setting + for (i=0; i < iface->desc.bNumEndpoints; i++) { + ep_addr = ep->desc.bEndpointAddress; + idx = ((ep_addr & 0x7f)-1)*2; /* get endpoint base */ + if (ep_addr & 0x80) + idx++; + attr = ep->desc.bmAttributes; + + if (cmptbl[idx] == EP_NUL) { + printk(KERN_INFO "HFC-USB: cfg_found=FALSE in idx:%d attr:%d cmptbl[%d]:%d\n", + idx, attr, idx, cmptbl[idx]); + cfg_found = FALSE; + } + + if (attr == USB_ENDPOINT_XFER_INT && cmptbl[idx] == EP_INT) + cmptbl[idx] = EP_NUL; + if (attr == USB_ENDPOINT_XFER_BULK && cmptbl[idx] == EP_BLK) + cmptbl[idx] = EP_NUL; + if (attr == USB_ENDPOINT_XFER_ISOC && cmptbl[idx] == EP_ISO) + cmptbl[idx] = EP_NUL; + + // check if all INT endpoints match minimum interval + if (attr == USB_ENDPOINT_XFER_INT && ep->desc.bInterval < vcf[17]) { +#ifdef VERBOSE_USB_DEBUG + if (cfg_found) + printk(KERN_INFO "HFC-USB: Interrupt Endpoint interval < %d found - skipping config\n", + vcf[17]); +#endif + cfg_found = FALSE; + } + + ep++; + } + + for (i = 0; i < 16; i++) { + // printk(KERN_INFO "HFC-USB: cmptbl[%d]:%d\n", i, cmptbl[i]); + + // all entries must be EP_NOP or EP_NUL for a valid config + if (cmptbl[i] != EP_NOP && cmptbl[i] != EP_NUL) + cfg_found = FALSE; + } + + // we check for smallest match, to provide configuration priority + // configurations with smaller index have higher priority + if (cfg_found) { + if (cfg_used < small_match) { + small_match = cfg_used; + alt_used = probe_alt_setting; + } +#ifdef VERBOSE_USB_DEBUG + printk(KERN_INFO "HFC-USB: small_match=%x %x\n", small_match, alt_used); +#endif + } + + cfg_used++; + } + + probe_alt_setting++; + } /* (probe_alt_setting < 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; + + if (!(context = kmalloc(sizeof(hfcusb_data), GFP_KERNEL))) + return(-ENOMEM); /* got no mem */ + memset(context, 0, sizeof(hfcusb_data)); /* clear the structure */ + + ep = iface->endpoint; /* first endpoint descriptor */ + vcf = validconf[small_match]; + + for (i = 0; i < iface->desc.bNumEndpoints; i++) { + ep_addr = ep->desc.bEndpointAddress; + idx = ((ep_addr & 0x7f)-1)*2; /* get endpoint base */ + if (ep_addr & 0x80) + idx++; + cidx = idx & 7; + attr = ep->desc.bmAttributes; + + // only initialize used endpoints + if (vcf[idx] != EP_NOP && vcf[idx] != EP_NUL) { + switch (attr) { + case USB_ENDPOINT_XFER_INT: + context->fifos[cidx].pipe = usb_rcvintpipe(dev, ep->desc.bEndpointAddress); + context->fifos[cidx].usb_transfer_mode = USB_INT; + packet_size = ep->desc.wMaxPacketSize; // remember max packet size +#ifdef VERBOSE_USB_DEBUG + printk (KERN_INFO "HFC-USB: Interrupt-In Endpoint found %d ms(idx:%d cidx:%d)!\n", + ep->desc.bInterval, idx, cidx); +#endif + break; + case USB_ENDPOINT_XFER_BULK: + if (ep_addr & 0x80) + context->fifos[cidx].pipe = usb_rcvbulkpipe(dev, ep->desc.bEndpointAddress); + else + context->fifos[cidx].pipe = usb_sndbulkpipe(dev, ep->desc.bEndpointAddress); + context->fifos[cidx].usb_transfer_mode = USB_BULK; + packet_size = ep->desc.wMaxPacketSize; // remember max packet size +#ifdef VERBOSE_USB_DEBUG + printk (KERN_INFO "HFC-USB: Bulk Endpoint found (idx:%d cidx:%d)!\n", + idx, cidx); +#endif + break; + case USB_ENDPOINT_XFER_ISOC: + if (ep_addr & 0x80) + context->fifos[cidx].pipe = usb_rcvisocpipe(dev, ep->desc.bEndpointAddress); + else + context->fifos[cidx].pipe = usb_sndisocpipe(dev, ep->desc.bEndpointAddress); + context->fifos[cidx].usb_transfer_mode = USB_ISOC; + iso_packet_size = ep->desc.wMaxPacketSize; // remember max packet size +#ifdef VERBOSE_USB_DEBUG + printk (KERN_INFO "HFC-USB: ISO Endpoint found (idx:%d cidx:%d)!\n", + idx, cidx); +#endif + break; + default: + context->fifos[cidx].pipe = 0; /* reset data */ + } /* switch attribute */ + + if (context->fifos[cidx].pipe) { + context->fifos[cidx].fifonum = cidx; + context->fifos[cidx].hfc = context; + context->fifos[cidx].usb_packet_maxlen = ep->desc.wMaxPacketSize; + context->fifos[cidx].intervall = ep->desc.bInterval; + context->fifos[cidx].skbuff = NULL; +#ifdef VERBOSE_USB_DEBUG + printk (KERN_INFO "HFC-USB: fifo%d pktlen %d interval %d\n", + context->fifos[cidx].fifonum, + context->fifos[cidx].usb_packet_maxlen, + context->fifos[cidx].intervall); +#endif + } + } + + ep++; + } + + // 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->ctrl_paksize = dev->descriptor.bMaxPacketSize0; /* control size */ + context->cfg_used=vcf[16]; // store used config + context->vend_idx=vend_idx; // store found vendor + context->packet_size=packet_size; + context->iso_packet_size=iso_packet_size; + + /* create the control pipes needed for register access */ + context->ctrl_in_pipe = usb_rcvctrlpipe(context->dev, 0); + context->ctrl_out_pipe = usb_sndctrlpipe(context->dev, 0); + context->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL); + + printk(KERN_INFO "HFC-USB: detected \"%s\" configuration: %s (if=%d alt=%d)\n", + vdata[vend_idx].vend_name, conf_str[small_match], context->if_used, context->alt_used); + + /* init the chip and register the driver */ + if (usb_init(context)) + { + if (context->ctrl_urb) { + usb_unlink_urb(context->ctrl_urb); + usb_free_urb(context->ctrl_urb); + context->ctrl_urb = NULL; + } + kfree(context); + return(-EIO); + } + usb_set_intfdata(intf, context); + return(0); + } + } + return(-EIO); +} + +/****************************************************/ +/* function called when an active device is removed */ +/****************************************************/ +static void hfc_usb_disconnect(struct usb_interface *intf) +{ + hfcusb_data *context = usb_get_intfdata(intf); + int i; + + printk(KERN_INFO "HFC-USB: device disconnect\n"); + + usb_set_intfdata(intf, NULL); + if (!context) + return; + if (timer_pending(&context->t3_timer)) + del_timer(&context->t3_timer); + if (timer_pending(&context->t4_timer)) + del_timer(&context->t4_timer); + if (timer_pending(&context->led_timer)) + del_timer(&context->led_timer); + + hisax_unregister(&context->d_if); + + /* tell all fifos to terminate */ + for(i = 0; i < HFCUSB_NUM_FIFOS; i++) { + if(context->fifos[i].usb_transfer_mode == USB_ISOC) { + if(context->fifos[i].active > 0) { + stop_isoc_chain(&context->fifos[i]); +#ifdef VERBOSE_USB_DEBUG + printk (KERN_INFO "HFC-USB: hfc_usb_disconnect: stopping ISOC chain Fifo no %i\n", i); +#endif + } + } else { + if(context->fifos[i].active > 0) { + context->fifos[i].active = 0; +#ifdef VERBOSE_USB_DEBUG + printk (KERN_INFO "HFC-USB: hfc_usb_disconnect: unlinking URB for Fifo no %i\n", i); +#endif + } + if (context->fifos[i].urb) { + usb_unlink_urb(context->fifos[i].urb); + usb_free_urb(context->fifos[i].urb); + context->fifos[i].urb = NULL; + } + } + context->fifos[i].active = 0; + } + if (context->ctrl_urb) { + usb_unlink_urb(context->ctrl_urb); + usb_free_urb(context->ctrl_urb); + context->ctrl_urb = NULL; + } + kfree(context); /* free our structure again */ +} /* hfc_usb_disconnect */ + + +/************************************/ +/* our driver information structure */ +/************************************/ +static struct usb_driver hfc_drv = { + .owner = THIS_MODULE, + .name = "hfc_usb", + .id_table = hfc_usb_idtab, + .probe = hfc_usb_probe, + .disconnect = hfc_usb_disconnect, +}; + +static void __exit hfc_usb_exit(void) +{ +#ifdef VERBOSE_USB_DEBUG + printk ("HFC-USB: calling \"hfc_usb_exit\" ...\n"); +#endif + usb_deregister(&hfc_drv); /* release our driver */ + printk(KERN_INFO "HFC-USB module removed\n"); +} + +static int __init hfc_usb_init(void) +{ + printk ("HFC-USB: driver module revision %s loaded\n", hfcusb_revision); + + if(usb_register(&hfc_drv)) + { + printk(KERN_INFO "HFC-USB: Unable to register HFC-USB module at usb stack\n"); + return(-1); /* unable to register */ + } + return(0); +} + +module_init(hfc_usb_init); +module_exit(hfc_usb_exit); diff -Nru a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c --- a/drivers/isdn/hisax/hfcscard.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/hfcscard.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: hfcscard.c,v 1.8.6.2 2001/09/23 22:24:48 kai Exp $ +/* $Id: hfcscard.c,v 1.10.2.4 2004/01/14 16:04:48 keil Exp $ * * low level stuff for hfcs based cards (Teles3c, ACER P10) * @@ -18,33 +18,19 @@ extern const char *CardType[]; -static const char *hfcs_revision = "$Revision: 1.8.6.2 $"; - -static inline u8 -hfcs_read_reg(struct IsdnCardState *cs, int data, u8 reg) -{ - return cs->bc_hw_ops->read_reg(cs, data, reg); -} - -static inline void -hfcs_write_reg(struct IsdnCardState *cs, int data, u8 reg, u8 val) -{ - cs->bc_hw_ops->write_reg(cs, data, reg, val); -} +static const char *hfcs_revision = "$Revision: 1.10.2.4 $"; static irqreturn_t hfcs_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val, stat; + u_char val, stat; + u_long flags; - if (!cs) { - printk(KERN_WARNING "HFCS: Spurious interrupt!\n"); - return IRQ_NONE; - } + spin_lock_irqsave(&cs->lock, flags); if ((HFCD_ANYINT | HFCD_BUSY_NBUSY) & - (stat = hfcs_read_reg(cs, HFCD_DATA, HFCD_STAT))) { - val = hfcs_read_reg(cs, HFCD_DATA, HFCD_INT_S1); + (stat = cs->BC_Read_Reg(cs, HFCD_DATA, HFCD_STAT))) { + val = cs->BC_Read_Reg(cs, HFCD_DATA, HFCD_INT_S1); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "HFCS: stat(%02x) s1(%02x)", stat, val); hfc2bds0_interrupt(cs, val); @@ -52,6 +38,7 @@ if (cs->debug & L1_DEB_ISAC) debugl1(cs, "HFCS: irq_no_irq stat(%02x)", stat); } + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } @@ -65,117 +52,91 @@ */ } -static void -hfcs_release(struct IsdnCardState *cs) +void +release_io_hfcs(struct IsdnCardState *cs) { release2bds0(cs); del_timer(&cs->hw.hfcD.timer); - hisax_release_resources(cs); + if (cs->hw.hfcD.addr) + release_region(cs->hw.hfcD.addr, 2); } -static int -hfcs_reset(struct IsdnCardState *cs) +static void +reset_hfcs(struct IsdnCardState *cs) { printk(KERN_INFO "HFCS: resetting card\n"); cs->hw.hfcD.cirm = HFCD_RESET; if (cs->typ == ISDN_CTYPE_TELES3C) cs->hw.hfcD.cirm |= HFCD_MEM8K; - hfcs_write_reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); /* Reset On */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30*HZ)/1000); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); /* Reset On */ + mdelay(10); cs->hw.hfcD.cirm = 0; if (cs->typ == ISDN_CTYPE_TELES3C) cs->hw.hfcD.cirm |= HFCD_MEM8K; - hfcs_write_reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); /* Reset Off */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); /* Reset Off */ + mdelay(10); if (cs->typ == ISDN_CTYPE_TELES3C) cs->hw.hfcD.cirm |= HFCD_INTB; else if (cs->typ == ISDN_CTYPE_ACERP10) cs->hw.hfcD.cirm |= HFCD_INTA; - hfcs_write_reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); - hfcs_write_reg(cs, HFCD_DATA, HFCD_CLKDEL, 0x0e); - hfcs_write_reg(cs, HFCD_DATA, HFCD_TEST, HFCD_AUTO_AWAKE); /* S/T Auto awake */ + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CLKDEL, 0x0e); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_TEST, HFCD_AUTO_AWAKE); /* S/T Auto awake */ cs->hw.hfcD.ctmt = HFCD_TIM25 | HFCD_AUTO_TIMER; - hfcs_write_reg(cs, HFCD_DATA, HFCD_CTMT, cs->hw.hfcD.ctmt); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CTMT, cs->hw.hfcD.ctmt); cs->hw.hfcD.int_m2 = HFCD_IRQ_ENABLE; cs->hw.hfcD.int_m1 = HFCD_INTS_B1TRANS | HFCD_INTS_B2TRANS | HFCD_INTS_DTRANS | HFCD_INTS_B1REC | HFCD_INTS_B2REC | HFCD_INTS_DREC | HFCD_INTS_L1STATE; - hfcs_write_reg(cs, HFCD_DATA, HFCD_INT_M1, cs->hw.hfcD.int_m1); - hfcs_write_reg(cs, HFCD_DATA, HFCD_INT_M2, cs->hw.hfcD.int_m2); - hfcs_write_reg(cs, HFCD_DATA, HFCD_STATES, HFCD_LOAD_STATE | 2); /* HFC ST 2 */ + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_INT_M1, cs->hw.hfcD.int_m1); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_INT_M2, cs->hw.hfcD.int_m2); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_STATES, HFCD_LOAD_STATE | 2); /* HFC ST 2 */ udelay(10); - hfcs_write_reg(cs, HFCD_DATA, HFCD_STATES, 2); /* HFC ST 2 */ + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_STATES, 2); /* HFC ST 2 */ cs->hw.hfcD.mst_m = HFCD_MASTER; - hfcs_write_reg(cs, HFCD_DATA, HFCD_MST_MODE, cs->hw.hfcD.mst_m); /* HFC Master */ + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_MST_MODE, cs->hw.hfcD.mst_m); /* HFC Master */ cs->hw.hfcD.sctrl = 0; - hfcs_write_reg(cs, HFCD_DATA, HFCD_SCTRL, cs->hw.hfcD.sctrl); - return 0; + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_SCTRL, cs->hw.hfcD.sctrl); } -static void -hfcs_init(struct IsdnCardState *cs) -{ - cs->hw.hfcD.timer.expires = jiffies + 75; - add_timer(&cs->hw.hfcD.timer); - init2bds0(cs); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((80*HZ)/1000); - cs->hw.hfcD.ctmt |= HFCD_TIM800; - hfcs_write_reg(cs, HFCD_DATA, HFCD_CTMT, cs->hw.hfcD.ctmt); - hfcs_write_reg(cs, HFCD_DATA, HFCD_MST_MODE, cs->hw.hfcD.mst_m); -} - -static struct card_ops hfcs_ops = { - .init = hfcs_init, - .reset = hfcs_reset, - .release = hfcs_release, - .irq_func = hfcs_interrupt, -}; - -static int __init -hfcs_probe(struct IsdnCardState *cs, struct IsdnCard *card) +static int +hfcs_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - cs->irq = card->para[0]; - cs->hw.hfcD.addr = card->para[1]; + u_long flags; + int delay; - if (!request_io(&cs->rs, cs->hw.hfcD.addr, 2, "HFCS isdn")) - goto err; - - printk(KERN_INFO "HFCS: defined at 0x%x IRQ %d\n", - cs->hw.hfcD.addr, cs->irq); - - cs->hw.hfcD.cip = 0; - cs->hw.hfcD.int_s1 = 0; - cs->hw.hfcD.send = NULL; - cs->bcs[0].hw.hfc.send = NULL; - cs->bcs[1].hw.hfc.send = NULL; - cs->hw.hfcD.dfifosize = 512; - cs->dc.hfcd.ph_state = 0; - cs->hw.hfcD.fifo = 255; - - if (cs->typ == ISDN_CTYPE_TELES3C) { - cs->hw.hfcD.bfifosize = 1024 + 512; - /* Teles 16.3c IO ADR is 0x200 | YY0U (YY Bit 15/14 address) */ - outb(0x00, cs->hw.hfcD.addr); - outb(0x56, cs->hw.hfcD.addr | 1); - } else if (cs->typ == ISDN_CTYPE_ACERP10) { - cs->hw.hfcD.bfifosize = 7*1024 + 512; - /* Acer P10 IO ADR is 0x300 */ - outb(0x00, cs->hw.hfcD.addr); - outb(0x57, cs->hw.hfcD.addr | 1); + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "HFCS: card_msg %x", mt); + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_hfcs(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_hfcs(cs); + return(0); + case CARD_INIT: + delay = (75*HZ)/100 +1; + cs->hw.hfcD.timer.expires = jiffies + delay; + add_timer(&cs->hw.hfcD.timer); + spin_lock_irqsave(&cs->lock, flags); + reset_hfcs(cs); + init2bds0(cs); + spin_unlock_irqrestore(&cs->lock, flags); + delay = (80*HZ)/1000 +1; + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout((80*HZ)/1000); + spin_lock_irqsave(&cs->lock, flags); + cs->hw.hfcD.ctmt |= HFCD_TIM800; + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CTMT, cs->hw.hfcD.ctmt); + cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_MST_MODE, cs->hw.hfcD.mst_m); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); } - set_cs_func(cs); - init_timer(&cs->hw.hfcD.timer); - cs->hw.hfcD.timer.function = (void *) hfcs_Timer; - cs->hw.hfcD.timer.data = (long) cs; - hfcs_reset(cs); - cs->card_ops = &hfcs_ops; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + return(0); } #ifdef __ISAPNP__ @@ -204,13 +165,14 @@ { 0, } }; -static struct isapnp_device_id *hdev = &hfc_ids[0]; +static struct isapnp_device_id *ipid __initdata = &hfc_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif int __init setup_hfcs(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, hfcs_revision); @@ -218,54 +180,88 @@ #ifdef __ISAPNP__ if (!card->para[1] && isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; - while(hdev->card_vendor) { - if ((pb = pnp_find_card(hdev->card_vendor, - hdev->card_device, - pnp_c))) { - pnp_c = pb; - pd = NULL; - if ((pd = pnp_find_dev(pnp_c, - hdev->vendor, - hdev->function, - pd))) { printk(KERN_INFO "HiSax: %s detected\n", - (char *)hdev->driver_data); - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "HFC PnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "HFC PnP: activate failed\n"); - pnp_device_detach(pd); - return 0; + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_irq_valid(pd, 0) || !pnp_port_valid(pd, 0)) { + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + if (!card->para[0] || !card->para[1]) { printk(KERN_ERR "HFC PnP:some resources are missing %ld/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0)); - pnp_device_detach(pd); + card->para[0], card->para[1]); + pnp_disable_dev(pnp_d); return(0); } - card->para[1] = pnp_port_start(pd, 0); - card->para[0] = pnp_irq(pd, 0); break; } else { printk(KERN_ERR "HFC PnP: PnP error card found, no device\n"); } } - hdev++; - pnp_c=NULL; + ipid++; + pnp_c = NULL; } - if (!hdev->card_vendor) { + if (!ipid->card_vendor) { printk(KERN_INFO "HFC PnP: no ISAPnP card found\n"); return(0); } } #endif - if (hfcs_probe(card->cs, card) < 0) - return 0; - return 1; - + cs->hw.hfcD.addr = card->para[1] & 0xfffe; + cs->irq = card->para[0]; + cs->hw.hfcD.cip = 0; + cs->hw.hfcD.int_s1 = 0; + cs->hw.hfcD.send = NULL; + cs->bcs[0].hw.hfc.send = NULL; + cs->bcs[1].hw.hfc.send = NULL; + cs->hw.hfcD.dfifosize = 512; + cs->dc.hfcd.ph_state = 0; + cs->hw.hfcD.fifo = 255; + if (cs->typ == ISDN_CTYPE_TELES3C) { + cs->hw.hfcD.bfifosize = 1024 + 512; + } else if (cs->typ == ISDN_CTYPE_ACERP10) { + cs->hw.hfcD.bfifosize = 7*1024 + 512; + } else + return (0); + if (!request_region(cs->hw.hfcD.addr, 2, "HFCS isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.hfcD.addr, + cs->hw.hfcD.addr + 2); + return (0); + } + printk(KERN_INFO + "HFCS: defined at 0x%x IRQ %d HZ %d\n", + cs->hw.hfcD.addr, + cs->irq, HZ); + if (cs->typ == ISDN_CTYPE_TELES3C) { + /* Teles 16.3c IO ADR is 0x200 | YY0U (YY Bit 15/14 address) */ + outb(0x00, cs->hw.hfcD.addr); + outb(0x56, cs->hw.hfcD.addr | 1); + } else if (cs->typ == ISDN_CTYPE_ACERP10) { + /* Acer P10 IO ADR is 0x300 */ + outb(0x00, cs->hw.hfcD.addr); + outb(0x57, cs->hw.hfcD.addr | 1); + } + set_cs_func(cs); + cs->hw.hfcD.timer.function = (void *) hfcs_Timer; + cs->hw.hfcD.timer.data = (long) cs; + init_timer(&cs->hw.hfcD.timer); + cs->cardmsg = &hfcs_card_msg; + cs->irq_func = &hfcs_interrupt; + return (1); } diff -Nru a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h --- a/drivers/isdn/hisax/hisax.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/hisax.h Thu Feb 19 23:44:26 2004 @@ -1,4 +1,4 @@ -/* $Id: hisax.h,v 1.1.4.1.2.1 2001/12/09 20:18:40 kai Exp $ +/* $Id: hisax.h,v 2.64.2.4 2004/02/11 13:21:33 keil Exp $ * * Basic declarations, defines and prototypes * @@ -6,14 +6,11 @@ * of the GNU General Public License, incorporated herein by reference. * */ - -#ifndef __HISAX_H__ -#define __HISAX_H__ - #include #include #include #include +#include #include #include #include @@ -28,7 +25,6 @@ #include #include #include -#include #define ERROR_STATISTIC @@ -51,6 +47,11 @@ #define HW_INFO4_P10 0x0048 #define HW_RSYNC 0x0060 #define HW_TESTLOOP 0x0070 +#define CARD_RESET 0x00F0 +#define CARD_INIT 0x00F2 +#define CARD_RELEASE 0x00F3 +#define CARD_TEST 0x00F4 +#define CARD_AUX_IND 0x00F5 #define PH_ACTIVATE 0x0100 #define PH_DEACTIVATE 0x0110 @@ -68,9 +69,14 @@ #define DL_FLUSH 0x0224 #define DL_UNIT_DATA 0x0230 +#define MDL_BC_RELEASE 0x0278 // Formula-n enter:now +#define MDL_BC_ASSIGN 0x027C // Formula-n enter:now #define MDL_ASSIGN 0x0280 #define MDL_REMOVE 0x0284 #define MDL_ERROR 0x0288 +#define MDL_INFO_SETUP 0x02E0 +#define MDL_INFO_CONN 0x02E4 +#define MDL_INFO_REL 0x02E8 #define CC_SETUP 0x0300 #define CC_RESUME 0x0304 @@ -145,35 +151,6 @@ /* #define I4L_IRQ_FLAG SA_INTERRUPT */ #define I4L_IRQ_FLAG 0 -struct res { - struct list_head node; - const char *name; - unsigned long start, end; - unsigned long flags; - union { - void *ioremap_addr; - } r_u; -}; - -struct resources { - struct list_head res_head; -}; - -void -resources_init(struct resources *rs); - -void -resources_release(struct resources *rs); - -unsigned long -request_io(struct resources *rs, unsigned long start, int len, - const char *name); - -void * -request_mmio(struct resources *rs, unsigned long start, int len, - const char *name); - - /* * Statemachine */ @@ -230,9 +207,9 @@ long Flags; struct FsmInst l1m; struct FsmTimer timer; + void (*l1l2) (struct PStack *, int, void *); void (*l1hw) (struct PStack *, int, void *); void (*l1tei) (struct PStack *, int, void *); - void (*l2l1) (struct PStack *, int, void *); int mode, bc; int delay; }; @@ -265,17 +242,18 @@ struct Layer2 { int tei; int sap; - u_int maxlen; - unsigned long flag; - unsigned int vs, va, vr; + int maxlen; + u_long flag; + spinlock_t lock; + u_int vs, va, vr; int rc; unsigned int window; unsigned int sow; struct sk_buff *windowar[MAX_WINDOW]; struct sk_buff_head i_queue; struct sk_buff_head ui_queue; - void (*l3l2) (struct PStack *, int, void *); - void (*l1l2) (struct PStack *, int, void *); + void (*l2l1) (struct PStack *, int, void *); + void (*l2l3) (struct PStack *, int, void *); void (*l2tei) (struct PStack *, int, void *); struct FsmInst l2m; struct FsmTimer t200, t203; @@ -285,10 +263,9 @@ }; struct Layer3 { - void (*l4l3) (struct PStack *, int, void *); - int (*l4l3_proto) (struct PStack *, isdn_ctrl *); + void (*l3l4) (struct PStack *, int, void *); void (*l3ml3) (struct PStack *, int, void *); - void (*l2l3) (struct PStack *, int, void *); + void (*l3l2) (struct PStack *, int, void *); struct FsmInst l3m; struct FsmTimer l3m_timer; struct sk_buff_head squeue; @@ -300,10 +277,14 @@ }; struct LLInterface { - void (*l3l4) (struct PStack *, int, void *); + void (*l4l3) (struct PStack *, int, void *); + int (*l4l3_proto) (struct PStack *, isdn_ctrl *); void *userdata; + u_long flag; }; +#define FLG_LLI_L1WAKEUP 1 +#define FLG_LLI_L2WAKEUP 2 struct Management { int ri; @@ -316,14 +297,14 @@ #define NO_CAUSE 254 struct Param { - u8 cause; - u8 loc; - u8 diag[6]; + u_char cause; + u_char loc; + u_char diag[6]; int bchannel; int chargeinfo; int spv; /* SPV Flag */ setup_parm setup; /* from isdnif.h numbers and Serviceindicator */ - u8 moderate; /* transfer mode and rate (bearer octet 4) */ + u_char moderate; /* transfer mode and rate (bearer octet 4) */ }; @@ -338,7 +319,7 @@ /* protocol specific data fields */ union - { u8 uuuu; /* only as dummy */ + { u_char uuuu; /* only as dummy */ #ifdef CONFIG_HISAX_EURO dss1_stk_priv dss1; /* private dss1 data */ #endif /* CONFIG_HISAX_EURO */ @@ -362,7 +343,7 @@ /* protocol specific data fields */ union - { u8 uuuu; /* only when euro not defined, avoiding empty union */ + { u_char uuuu; /* only when euro not defined, avoiding empty union */ #ifdef CONFIG_HISAX_EURO dss1_proc_priv dss1; /* private dss1 data */ #endif /* CONFIG_HISAX_EURO */ @@ -373,50 +354,58 @@ }; struct hscx_hw { - u8 tsaxr0; - u8 tsaxr1; + int hscx; + int rcvidx; + int count; /* Current skb sent count */ + u_char *rcvbuf; /* B-Channel receive Buffer */ + u_char tsaxr0; + u_char tsaxr1; }; struct w6692B_hw { int bchan; + int rcvidx; + int count; /* Current skb sent count */ + u_char *rcvbuf; /* B-Channel receive Buffer */ }; struct isar_reg { unsigned long Flags; - volatile u8 bstat; - volatile u8 iis; - volatile u8 cmsb; - volatile u8 clsb; - volatile u8 par[8]; + volatile u_char bstat; + volatile u_char iis; + volatile u_char cmsb; + volatile u_char clsb; + volatile u_char par[8]; }; struct isar_hw { int dpath; int rcvidx; + int txcnt; int mml; - u8 state; - u8 cmd; - u8 mod; - u8 newcmd; - u8 newmod; + u_char state; + u_char cmd; + u_char mod; + u_char newcmd; + u_char newmod; char try_mod; struct timer_list ftimer; - u8 *rcvbuf; /* B-Channel receive Buffer */ - u8 conmsg[16]; + u_char *rcvbuf; /* B-Channel receive Buffer */ + u_char conmsg[16]; struct isar_reg *reg; }; struct hdlc_stat_reg { #ifdef __BIG_ENDIAN - u8 fill __attribute__((packed)); - u8 mode __attribute__((packed)); - u8 xml __attribute__((packed)); - u8 cmd __attribute__((packed)); -#else - u8 cmd __attribute__((packed)); - u8 xml __attribute__((packed)); - u8 mode __attribute__((packed)); - u8 fill __attribute__((packed)); + u_char fill __attribute__((packed)); + u_char mode __attribute__((packed)); + u_char xml __attribute__((packed)); + u_char cmd __attribute__((packed)); +#else + u_char cmd __attribute__((packed)); + u_char xml __attribute__((packed)); + u_char mode __attribute__((packed)); + u_char fill __attribute__((packed)); #endif }; @@ -426,6 +415,9 @@ struct hdlc_stat_reg sr; } ctrl; u_int stat; + int rcvidx; + int count; /* Current skb sent count */ + u_char *rcvbuf; /* B-Channel receive Buffer */ }; struct hfcB_hw { @@ -436,36 +428,35 @@ struct tiger_hw { u_int *send; - dma_addr_t send_dma; + u_int *s_irq; u_int *s_end; u_int *sendp; u_int *rec; - dma_addr_t rec_dma; int free; - u8 *rcvbuf; - u8 *sendbuf; - u8 *sp; + u_char *rcvbuf; + u_char *sendbuf; + u_char *sp; int sendcnt; u_int s_tot; u_int r_bitcnt; u_int r_tot; u_int r_err; u_int r_fcs; - u8 r_state; - u8 r_one; - u8 r_val; - u8 s_state; + u_char r_state; + u_char r_one; + u_char r_val; + u_char s_state; }; struct amd7930_hw { - u8 *tx_buff; - u8 *rv_buff; + u_char *tx_buff; + u_char *rv_buff; int rv_buff_in; int rv_buff_out; struct sk_buff *rv_skb; struct hdlc_state *hdlc_state; - struct work_struct rcv_work; - struct work_struct xmt_work; + struct work_struct tq_rcv; + struct work_struct tq_xmt; }; #define BC_FLG_INIT 1 @@ -483,6 +474,8 @@ #define BC_FLG_FTI_RUN 13 #define BC_FLG_LL_OK 14 #define BC_FLG_LL_CONN 15 +#define BC_FLG_FTI_FTS 16 +#define BC_FLG_FRH_WAIT 17 #define L1_MODE_NULL 0 #define L1_MODE_TRANS 1 @@ -496,29 +489,28 @@ struct BCState { int channel; int mode; - long Flag; + u_long Flag; struct IsdnCardState *cs; - int unit; /* first or second unit (e.g. HSCX) */ - int rcvidx; - u8 *rcvbuf; /* B-Channel receive Buffer */ - int tx_cnt; /* B-Channel transmit counter */ - struct sk_buff *tx_skb; /* B-Channel transmit Buffer */ - struct sk_buff_head rqueue; /* B-Channel receive queue */ - struct sk_buff_head squeue; /* B-Channel send queue */ - struct sk_buff_head cmpl_queue; /* B-Channel send complete queue */ + int tx_cnt; /* B-Channel transmit counter */ + struct sk_buff *tx_skb; /* B-Channel transmit Buffer */ + struct sk_buff_head rqueue; /* B-Channel receive Queue */ + struct sk_buff_head squeue; /* B-Channel send Queue */ + int ackcnt; + spinlock_t aclock; struct PStack *st; - u8 *blog; - u8 *conmsg; + u_char *blog; + u_char *conmsg; struct timer_list transbusy; - struct work_struct work; - unsigned long event; + struct work_struct tqueue; + u_long event; + int (*BC_SetStack) (struct PStack *, struct BCState *); + void (*BC_Close) (struct BCState *); #ifdef ERROR_STATISTIC int err_crc; int err_tx; int err_rdo; int err_inv; #endif - int count; union { struct hscx_hw hscx; struct hdlc_hw hdlc; @@ -545,12 +537,12 @@ int data_open; struct l3_process *proc; setup_parm setup; /* from isdnif.h numbers and Serviceindicator */ - long Flags; /* for remembering action done in l4 */ - /* long req'd for set_bit --RR */ + u_long Flags; /* for remembering action done in l4 */ int leased; }; struct elsa_hw { + struct pci_dev *dev; unsigned long base; unsigned int cfg; unsigned int ctrl; @@ -565,17 +557,17 @@ struct timer_list tl; unsigned int MFlag; struct BCState *bcs; - u8 *transbuf; - u8 *rcvbuf; + u_char *transbuf; + u_char *rcvbuf; unsigned int transp; unsigned int rcvp; unsigned int transcnt; unsigned int rcvcnt; - u8 IER; - u8 FCR; - u8 LCR; - u8 MCR; - u8 ctrl_reg; + u_char IER; + u_char FCR; + u_char LCR; + u_char MCR; + u_char ctrl_reg; }; struct teles3_hw { @@ -588,8 +580,8 @@ struct teles0_hw { unsigned int cfg_reg; + unsigned long membase; unsigned long phymem; - void *membase; }; struct avm_hw { @@ -599,6 +591,7 @@ unsigned int isacfifo; unsigned int hscxfifo[2]; unsigned int counter; + struct pci_dev *dev; }; struct ix1_hw { @@ -617,8 +610,10 @@ unsigned int isac; unsigned long hscx_adr; unsigned int hscx; + unsigned int status; struct timer_list tl; - u8 ctrl_reg; + u_char ctrl_reg; + struct pci_dev *dev; }; struct asus_hw { @@ -637,9 +632,9 @@ unsigned char cirm; unsigned char ctmt; unsigned char cip; - u8 isac_spcr; + u_char isac_spcr; struct timer_list timer; -}; +}; struct sedl_hw { unsigned int cfg_reg; @@ -651,6 +646,7 @@ struct isar_reg isar; unsigned int chip; unsigned int bus; + struct pci_dev *dev; }; struct spt_hw { @@ -677,9 +673,7 @@ unsigned char irqmask0; unsigned char irqstat0; unsigned char last_is0; - struct pci_dev *pdev; - void (*bc_activate)(struct IsdnCardState *cs, int bc); - void (*bc_deactivate)(struct IsdnCardState *cs, int bc); + struct pci_dev *dev; }; struct hfcPCI_hw { @@ -700,10 +694,10 @@ unsigned char bswapped; unsigned char nt_mode; int nt_timer; + struct pci_dev *dev; unsigned char *pci_io; /* start of PCI IO memory */ + void *share_start; /* shared memory for Fifos start */ void *fifos; /* FIFO memory */ - dma_addr_t fifos_dma; - struct pci_dev* pdev; int last_bfifo_cnt[2]; /* marker saving last b-fifo frame count */ struct timer_list timer; }; @@ -756,12 +750,14 @@ struct isurf_hw { unsigned int reset; - void *isac; - void *isar; + unsigned long phymem; + unsigned long isac; + unsigned long isar; struct isar_reg isar_r; }; struct saphir_hw { + struct pci_dev *dev; unsigned int cfg_reg; unsigned int ale; unsigned int isac; @@ -770,6 +766,7 @@ }; struct bkm_hw { + struct pci_dev *dev; unsigned long base; /* A4T stuff */ unsigned long isac_adr; @@ -782,7 +779,9 @@ }; struct gazel_hw { + struct pci_dev *dev; unsigned int cfg_reg; + unsigned int pciaddr[2]; signed int ipac; signed int isac; signed int hscx[2]; @@ -793,6 +792,7 @@ }; struct w6692_hw { + struct pci_dev *dev; unsigned int iobase; struct timer_list timer; }; @@ -812,25 +812,25 @@ struct arcofi_msg { struct arcofi_msg *next; - u8 receive; - u8 len; - u8 msg[10]; + u_char receive; + u_char len; + u_char msg[10]; }; struct isac_chip { int ph_state; - u8 *mon_tx; - u8 *mon_rx; + u_char *mon_tx; + u_char *mon_rx; int mon_txp; int mon_txc; int mon_rxp; struct arcofi_msg *arcofi_list; struct timer_list arcofitimer; wait_queue_head_t arcofi_wait; - u8 arcofi_bc; - u8 arcofi_state; - u8 mocr; - u8 adf2; + u_char arcofi_bc; + u_char arcofi_state; + u_char mocr; + u_char adf2; }; struct hfcd_chip { @@ -850,80 +850,30 @@ }; struct amd7930_chip { - u8 lmr1; - u8 ph_state; - u8 old_state; - u8 flg_t3; + u_char lmr1; + u_char ph_state; + u_char old_state; + u_char flg_t3; unsigned int tx_xmtlen; struct timer_list timer3; - void (*ph_command) (struct IsdnCardState *, u8, char *); - void (*setIrqMask) (struct IsdnCardState *, u8); + void (*ph_command) (struct IsdnCardState *, u_char, char *); + void (*setIrqMask) (struct IsdnCardState *, u_char); }; struct icc_chip { int ph_state; - u8 *mon_tx; - u8 *mon_rx; + u_char *mon_tx; + u_char *mon_rx; int mon_txp; int mon_txc; int mon_rxp; struct arcofi_msg *arcofi_list; struct timer_list arcofitimer; wait_queue_head_t arcofi_wait; - u8 arcofi_bc; - u8 arcofi_state; - u8 mocr; - u8 adf2; -}; - -struct IsdnCardState; - -/* Methods provided by driver for a specific card */ - -struct card_ops { - void (*init) (struct IsdnCardState *); - void (*test) (struct IsdnCardState *); - int (*reset) (struct IsdnCardState *); - void (*release) (struct IsdnCardState *); - void (*aux_ind) (struct IsdnCardState *, void *); - void (*led_handler)(struct IsdnCardState *); - irqreturn_t (*irq_func) (int, void *, struct pt_regs *); -}; - -/* Card specific drivers provide methods to access the - * chips to the chip drivers */ - -struct bc_hw_ops { - u8 (*read_reg) (struct IsdnCardState *, int, u8); - void (*write_reg) (struct IsdnCardState *, int, u8, u8); - void (*read_fifo) (struct IsdnCardState *, int, u8 *, int); - void (*write_fifo) (struct IsdnCardState *, int, u8 *, int); -}; - -struct dc_hw_ops { - u8 (*read_reg) (struct IsdnCardState *, u8); - void (*write_reg) (struct IsdnCardState *, u8, u8); - void (*read_fifo) (struct IsdnCardState *, u8 *, int); - void (*write_fifo) (struct IsdnCardState *, u8 *, int); -}; - -/* Methods provided to shared B-channel FIFO handling */ - -struct bc_l1_ops { - void (*fill_fifo) (struct BCState *); - int (*open) (struct PStack *, struct BCState *); - void (*close) (struct BCState *); -}; - -/* Methods provided to shared D-channel FIFO handling */ - -struct dc_l1_ops { - void (*fill_fifo) (struct IsdnCardState *); - int (*open) (struct PStack *, struct IsdnCardState *); - void (*close) (struct IsdnCardState *); - - void (*bh_func) (void *); - void (*dbusy_func) (struct IsdnCardState *); + u_char arcofi_bc; + u_char arcofi_state; + u_char mocr; + u_char adf2; }; #define HW_IOM1 0 @@ -933,25 +883,22 @@ #define FLG_TWO_DCHAN 4 #define FLG_L1_DBUSY 5 #define FLG_DBUSY_TIMER 6 +#define FLG_LOCK_ATOMIC 7 #define FLG_ARCOFI_TIMER 8 #define FLG_ARCOFI_ERROR 9 #define FLG_HW_L1_UINT 10 -#define FLG_BUGGY_PLX9050 11 struct IsdnCardState { - unsigned char typ; - unsigned char subtyp; - spinlock_t lock; - struct card_ops *card_ops; - int protocol; - struct resources rs; - unsigned int irq; - unsigned long irq_flags; - int status; - long HW_Flags; - int *busy_flag; - int chanlimit; /* limited number of B-chans to use */ - int logecho; /* log echo if supported by card */ + spinlock_t lock; + u_char typ; + u_char subtyp; + int protocol; + u_int irq; + u_long irq_flags; + u_long HW_Flags; + int *busy_flag; + int chanlimit; /* limited number of B-chans to use */ + int logecho; /* log echo if supported by card */ union { struct elsa_hw elsa; struct teles0_hw teles0; @@ -979,25 +926,32 @@ struct w6692_hw w6692; struct hisax_d_if *hisax_d_if; } hw; - int myid; - isdn_if iif; - u8 *status_buf; - u8 *status_read; - u8 *status_write; - u8 *status_end; - struct dc_hw_ops *dc_hw_ops; - struct bc_hw_ops *bc_hw_ops; - struct dc_l1_ops *dc_l1_ops; - struct bc_l1_ops *bc_l1_ops; - int (*cardmsg) (struct IsdnCardState *, int, void *); - int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *); - struct Channel channel[2+MAX_WAITING_CALLS]; - struct BCState bcs[2+MAX_WAITING_CALLS]; - struct PStack *stlist; + int myid; + isdn_if iif; + spinlock_t statlock; + u_char *status_buf; + u_char *status_read; + u_char *status_write; + u_char *status_end; + u_char (*readisac) (struct IsdnCardState *, u_char); + void (*writeisac) (struct IsdnCardState *, u_char, u_char); + void (*readisacfifo) (struct IsdnCardState *, u_char *, int); + void (*writeisacfifo) (struct IsdnCardState *, u_char *, int); + u_char (*BC_Read_Reg) (struct IsdnCardState *, int, u_char); + void (*BC_Write_Reg) (struct IsdnCardState *, int, u_char, u_char); + void (*BC_Send_Data) (struct BCState *); + int (*cardmsg) (struct IsdnCardState *, int, void *); + void (*setstack_d) (struct PStack *, struct IsdnCardState *); + void (*DC_Close) (struct IsdnCardState *); + int (*irq_func) (int, void *, struct pt_regs *); + int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *); + struct Channel channel[2+MAX_WAITING_CALLS]; + struct BCState bcs[2+MAX_WAITING_CALLS]; + struct PStack *stlist; struct sk_buff_head rq, sq; /* D-channel queues */ - int cardnr; - char *dlog; - int debug; + int cardnr; + char *dlog; + int debug; union { struct isac_chip isac; struct hfcd_chip hfcd; @@ -1007,83 +961,287 @@ struct amd7930_chip amd7930; struct icc_chip icc; } dc; - u8 *rcvbuf; - int rcvidx; - struct sk_buff *tx_skb; - int tx_cnt; - long event; - struct work_struct work; + u_char *rcvbuf; + int rcvidx; + struct sk_buff *tx_skb; + int tx_cnt; + u_long event; + struct work_struct tqueue; struct timer_list dbusytimer; #ifdef ERROR_STATISTIC - int err_crc; - int err_tx; - int err_rx; + int err_crc; + int err_tx; + int err_rx; #endif }; -void -hisax_release_resources(struct IsdnCardState *cs); + +#define schedule_event(s, ev) do {test_and_set_bit(ev, &s->event);schedule_work(&s->tqueue); } while(0) #define MON0_RX 1 #define MON1_RX 2 #define MON0_TX 4 #define MON1_TX 8 -#define ISDN_CTYPE_16_0 1 -#define ISDN_CTYPE_8_0 2 -#define ISDN_CTYPE_16_3 3 -#define ISDN_CTYPE_PNP 4 -#define ISDN_CTYPE_A1 5 -#define ISDN_CTYPE_ELSA 6 -#define ISDN_CTYPE_ELSA_PNP 7 -#define ISDN_CTYPE_TELESPCMCIA 8 -#define ISDN_CTYPE_IX1MICROR2 9 -#define ISDN_CTYPE_ELSA_PCMCIA 10 -#define ISDN_CTYPE_DIEHLDIVA 11 -#define ISDN_CTYPE_ASUSCOM 12 -#define ISDN_CTYPE_TELEINT 13 -#define ISDN_CTYPE_TELES3C 14 -#define ISDN_CTYPE_SEDLBAUER 15 -#define ISDN_CTYPE_SPORTSTER 16 -#define ISDN_CTYPE_MIC 17 -#define ISDN_CTYPE_ELSA_PCI 18 -#define ISDN_CTYPE_COMPAQ_ISA 19 -#define ISDN_CTYPE_NETJET_S 20 -#define ISDN_CTYPE_TELESPCI 21 -#define ISDN_CTYPE_SEDLBAUER_PCMCIA 22 -#define ISDN_CTYPE_AMD7930 23 -#define ISDN_CTYPE_NICCY 24 -#define ISDN_CTYPE_S0BOX 25 -#define ISDN_CTYPE_A1_PCMCIA 26 -#define ISDN_CTYPE_FRITZPCI 27 -#define ISDN_CTYPE_SEDLBAUER_FAX 28 -#define ISDN_CTYPE_ISURF 29 -#define ISDN_CTYPE_ACERP10 30 -#define ISDN_CTYPE_HSTSAPHIR 31 -#define ISDN_CTYPE_BKM_A4T 32 -#define ISDN_CTYPE_SCT_QUADRO 33 -#define ISDN_CTYPE_GAZEL 34 -#define ISDN_CTYPE_HFC_PCI 35 -#define ISDN_CTYPE_W6692 36 -#define ISDN_CTYPE_HFC_SX 37 -#define ISDN_CTYPE_NETJET_U 38 -#define ISDN_CTYPE_HFC_SP_PCMCIA 39 -#define ISDN_CTYPE_DYNAMIC 40 -#define ISDN_CTYPE_ENTERNOW 41 -#define ISDN_CTYPE_COUNT 41 +#ifdef ISDN_CHIP_ISAC +#undef ISDN_CHIP_ISAC +#endif + +#ifdef CONFIG_HISAX_16_0 +#define CARD_TELES0 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_TELES0 0 +#endif + +#ifdef CONFIG_HISAX_16_3 +#define CARD_TELES3 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_TELES3 0 +#endif + +#ifdef CONFIG_HISAX_TELESPCI +#define CARD_TELESPCI 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_TELESPCI 0 +#endif + +#ifdef CONFIG_HISAX_AVM_A1 +#define CARD_AVM_A1 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_AVM_A1 0 +#endif + +#ifdef CONFIG_HISAX_AVM_A1_PCMCIA +#define CARD_AVM_A1_PCMCIA 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_AVM_A1_PCMCIA 0 +#endif + +#ifdef CONFIG_HISAX_FRITZPCI +#define CARD_FRITZPCI 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_FRITZPCI 0 +#endif + +#ifdef CONFIG_HISAX_ELSA +#define CARD_ELSA 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_ELSA 0 +#endif + +#ifdef CONFIG_HISAX_IX1MICROR2 +#define CARD_IX1MICROR2 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_IX1MICROR2 0 +#endif + +#ifdef CONFIG_HISAX_DIEHLDIVA +#define CARD_DIEHLDIVA 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_DIEHLDIVA 0 +#endif + +#ifdef CONFIG_HISAX_ASUSCOM +#define CARD_ASUSCOM 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_ASUSCOM 0 +#endif + +#ifdef CONFIG_HISAX_TELEINT +#define CARD_TELEINT 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_TELEINT 0 +#endif + +#ifdef CONFIG_HISAX_SEDLBAUER +#define CARD_SEDLBAUER 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_SEDLBAUER 0 +#endif + +#ifdef CONFIG_HISAX_SPORTSTER +#define CARD_SPORTSTER 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_SPORTSTER 0 +#endif + +#ifdef CONFIG_HISAX_MIC +#define CARD_MIC 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_MIC 0 +#endif + +#ifdef CONFIG_HISAX_NETJET +#define CARD_NETJET_S 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_NETJET_S 0 +#endif + +#ifdef CONFIG_HISAX_HFCS +#define CARD_HFCS 1 +#else +#define CARD_HFCS 0 +#endif + +#ifdef CONFIG_HISAX_HFC_PCI +#define CARD_HFC_PCI 1 +#else +#define CARD_HFC_PCI 0 +#endif + +#ifdef CONFIG_HISAX_HFC_SX +#define CARD_HFC_SX 1 +#else +#define CARD_HFC_SX 0 +#endif + +#ifdef CONFIG_HISAX_AMD7930 +#define CARD_AMD7930 1 +#else +#define CARD_AMD7930 0 +#endif + +#ifdef CONFIG_HISAX_NICCY +#define CARD_NICCY 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_NICCY 0 +#endif + +#ifdef CONFIG_HISAX_ISURF +#define CARD_ISURF 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_ISURF 0 +#endif + +#ifdef CONFIG_HISAX_S0BOX +#define CARD_S0BOX 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_S0BOX 0 +#endif + +#ifdef CONFIG_HISAX_HSTSAPHIR +#define CARD_HSTSAPHIR 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_HSTSAPHIR 0 +#endif #ifdef CONFIG_HISAX_TESTEMU +#define CARD_TESTEMU 1 #define ISDN_CTYPE_TESTEMU 99 #undef ISDN_CTYPE_COUNT #define ISDN_CTYPE_COUNT ISDN_CTYPE_TESTEMU +#else +#define CARD_TESTEMU 0 +#endif + +#ifdef CONFIG_HISAX_BKM_A4T +#define CARD_BKM_A4T 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_BKM_A4T 0 +#endif + +#ifdef CONFIG_HISAX_SCT_QUADRO +#define CARD_SCT_QUADRO 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_SCT_QUADRO 0 +#endif + +#ifdef CONFIG_HISAX_GAZEL +#define CARD_GAZEL 1 +#ifndef ISDN_CHIP_ISAC +#define ISDN_CHIP_ISAC 1 +#endif +#else +#define CARD_GAZEL 0 +#endif + +#ifdef CONFIG_HISAX_W6692 +#define CARD_W6692 1 +#ifndef ISDN_CHIP_W6692 +#define ISDN_CHIP_W6692 1 +#endif +#else +#define CARD_W6692 0 #endif #ifdef CONFIG_HISAX_NETJET_U +#define CARD_NETJET_U 1 +#ifndef ISDN_CHIP_ICC +#define ISDN_CHIP_ICC 1 +#endif #ifndef HISAX_UINTERFACE #define HISAX_UINTERFACE 1 #endif #else +#define CARD_NETJET_U 0 +#endif + +#ifdef CONFIG_HISAX_ENTERNOW_PCI +#define CARD_FN_ENTERNOW_PCI 1 #endif #define TEI_PER_CARD 1 @@ -1108,12 +1266,7 @@ extern void Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf, int dir); #endif -struct IsdnCard { - int typ; - int protocol; /* EDSS1, 1TR6 or NI1 */ - unsigned long para[4]; - struct IsdnCardState *cs; -}; +#include "hisax_cfg.h" void init_bcstate(struct IsdnCardState *cs, int bc); @@ -1131,13 +1284,14 @@ void releasestack_isdnl2(struct PStack *st); void setstack_transl2(struct PStack *st); void releasestack_transl2(struct PStack *st); +void lli_writewakeup(struct PStack *st, int len); void setstack_l3dc(struct PStack *st, struct Channel *chanp); void setstack_l3bc(struct PStack *st, struct Channel *chanp); void releasestack_isdnl3(struct PStack *st); -u8 *findie(u8 * p, int size, u8 ie, int wanted_set); -int getcallref(u8 * p); +u_char *findie(u_char * p, int size, u_char ie, int wanted_set); +int getcallref(u_char * p); int newcallref(void); int FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount); @@ -1155,12 +1309,15 @@ int HiSax_command(isdn_ctrl * ic); int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb); void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...); -void VHiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, va_list args); +void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args); void HiSax_reportcard(int cardnr, int sel); -int QuickHex(char *txt, u8 * p, int cnt); -void LogFrame(struct IsdnCardState *cs, u8 * p, int size); +int QuickHex(char *txt, u_char * p, int cnt); +void LogFrame(struct IsdnCardState *cs, u_char * p, int size); void dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir); -void iecpy(u8 * dest, u8 * iestart, int ieoffset); +void iecpy(u_char * dest, u_char * iestart, int ieoffset); +#ifdef ISDN_CHIP_ISAC +void setstack_isac(struct PStack *st, struct IsdnCardState *cs); +#endif /* ISDN_CHIP_ISAC */ #endif /* __KERNEL__ */ #define HZDELAY(jiffs) {int tout = jiffs; while (tout--) udelay(1000000/HZ);} @@ -1182,43 +1339,3 @@ char *HiSax_getrev(const char *revision); int TeiNew(void); void TeiFree(void); -int certification_check(int output); - -static inline void -L2L1(struct PStack *st, int pr, void *arg) -{ - st->l1.l2l1(st, pr, arg); -} - -static inline void -L1L2(struct PStack *st, int pr, void *arg) -{ - st->l2.l1l2(st, pr, arg); -} - -static inline void -L3L2(struct PStack *st, int pr, void *arg) -{ - st->l2.l3l2(st, pr, arg); -} - -static inline void -L2L3(struct PStack *st, int pr, void *arg) -{ - st->l3.l2l3(st, pr, arg); -} - -static inline void -L3L4(struct PStack *st, int pr, void *arg) -{ - st->lli.l3l4(st, pr, arg); -} - -static inline void -L4L3(struct PStack *st, int pr, void *arg) -{ - st->l3.l4l3(st, pr, arg); -} - - -#endif diff -Nru a/drivers/isdn/hisax/hisax_cfg.h b/drivers/isdn/hisax/hisax_cfg.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/isdn/hisax/hisax_cfg.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,64 @@ +/* $Id: hisax_cfg.h,v 1.1.2.1 2004/01/24 20:47:23 keil Exp $ + * define of the basic HiSax configuration structures + * and pcmcia interface + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * + */ + +#define ISDN_CTYPE_16_0 1 +#define ISDN_CTYPE_8_0 2 +#define ISDN_CTYPE_16_3 3 +#define ISDN_CTYPE_PNP 4 +#define ISDN_CTYPE_A1 5 +#define ISDN_CTYPE_ELSA 6 +#define ISDN_CTYPE_ELSA_PNP 7 +#define ISDN_CTYPE_TELESPCMCIA 8 +#define ISDN_CTYPE_IX1MICROR2 9 +#define ISDN_CTYPE_ELSA_PCMCIA 10 +#define ISDN_CTYPE_DIEHLDIVA 11 +#define ISDN_CTYPE_ASUSCOM 12 +#define ISDN_CTYPE_TELEINT 13 +#define ISDN_CTYPE_TELES3C 14 +#define ISDN_CTYPE_SEDLBAUER 15 +#define ISDN_CTYPE_SPORTSTER 16 +#define ISDN_CTYPE_MIC 17 +#define ISDN_CTYPE_ELSA_PCI 18 +#define ISDN_CTYPE_COMPAQ_ISA 19 +#define ISDN_CTYPE_NETJET_S 20 +#define ISDN_CTYPE_TELESPCI 21 +#define ISDN_CTYPE_SEDLBAUER_PCMCIA 22 +#define ISDN_CTYPE_AMD7930 23 +#define ISDN_CTYPE_NICCY 24 +#define ISDN_CTYPE_S0BOX 25 +#define ISDN_CTYPE_A1_PCMCIA 26 +#define ISDN_CTYPE_FRITZPCI 27 +#define ISDN_CTYPE_SEDLBAUER_FAX 28 +#define ISDN_CTYPE_ISURF 29 +#define ISDN_CTYPE_ACERP10 30 +#define ISDN_CTYPE_HSTSAPHIR 31 +#define ISDN_CTYPE_BKM_A4T 32 +#define ISDN_CTYPE_SCT_QUADRO 33 +#define ISDN_CTYPE_GAZEL 34 +#define ISDN_CTYPE_HFC_PCI 35 +#define ISDN_CTYPE_W6692 36 +#define ISDN_CTYPE_HFC_SX 37 +#define ISDN_CTYPE_NETJET_U 38 +#define ISDN_CTYPE_HFC_SP_PCMCIA 39 +#define ISDN_CTYPE_DYNAMIC 40 +#define ISDN_CTYPE_ENTERNOW 41 +#define ISDN_CTYPE_COUNT 41 + +typedef struct IsdnCardState IsdnCardState_t; +typedef struct IsdnCard IsdnCard_t; + +struct IsdnCard { + int typ; + int protocol; /* EDSS1, 1TR6 or NI1 */ + unsigned long para[4]; + IsdnCardState_t *cs; +}; + +extern void HiSax_closecard(int); +extern int hisax_init_pcmcia(void *, int *, IsdnCard_t *); diff -Nru a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h --- a/drivers/isdn/hisax/hisax_debug.h Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/hisax_debug.h Thu Feb 19 23:44:24 2004 @@ -39,7 +39,7 @@ static void __attribute__((unused)) -dump_packet(const char *name,const u8 *data,int pkt_len) +dump_packet(const char *name,const u_char *data,int pkt_len) { #define DUMP_HDR_SIZE 20 #define DUMP_TLR_SIZE 8 diff -Nru a/drivers/isdn/hisax/hisax_fcclassic.c b/drivers/isdn/hisax/hisax_fcclassic.c --- a/drivers/isdn/hisax/hisax_fcclassic.c Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,385 +0,0 @@ -/* - * Driver for AVM Fritz!classic (ISA) ISDN card - * - * Author Kai Germaschewski - * Copyright 2001 by Kai Germaschewski - * 2001 by Karsten Keil - * - * based upon Karsten Keil's original avm_a1.c driver - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - * - */ - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "hisax_fcclassic.h" - -// debugging cruft -#define __debug_variable debug -#include "hisax_debug.h" - -#ifdef CONFIG_HISAX_DEBUG -static int debug = 0; -MODULE_PARM(debug, "i"); -#endif - -MODULE_AUTHOR("Kai Germaschewski /Karsten Keil "); -MODULE_DESCRIPTION("AVM Fritz!Card classic ISDN driver"); - -static int protocol = 2; /* EURO-ISDN Default */ -MODULE_PARM(protocol, "i"); - -// ---------------------------------------------------------------------- - -#define AVM_A1_STAT_ISAC 0x01 -#define AVM_A1_STAT_HSCX 0x02 -#define AVM_A1_STAT_TIMER 0x04 - -// ---------------------------------------------------------------------- - -static unsigned char -fcclassic_read_isac(struct isac *isac, unsigned char offset) -{ - struct fritz_adapter *adapter = isac->priv; - unsigned char val; - - val = inb(adapter->isac_base + offset); - DBG(0x1000, " port %#x, value %#x", - offset, val); - return val; -} - -static void -fcclassic_write_isac(struct isac *isac, unsigned char offset, - unsigned char value) -{ - struct fritz_adapter *adapter = isac->priv; - - DBG(0x1000, " port %#x, value %#x", - offset, value); - outb(value, adapter->isac_base + offset); -} - -static void -fcclassic_read_isac_fifo(struct isac *isac, unsigned char * data, int size) -{ - struct fritz_adapter *adapter = isac->priv; - - insb(adapter->isac_fifo, data, size); -} - -static void -fcclassic_write_isac_fifo(struct isac *isac, unsigned char * data, int size) -{ - struct fritz_adapter *adapter = isac->priv; - - outsb(adapter->isac_fifo, data, size); -} - -static u8 -fcclassic_read_hscx(struct hscx *hscx, u8 offset) -{ - struct fritz_adapter *adapter = hscx->priv; - - return inb(adapter->hscx_base[hscx->channel] + offset); -} - -static void -fcclassic_write_hscx(struct hscx *hscx, u8 offset, u8 value) -{ - struct fritz_adapter *adapter = hscx->priv; - - outb(value, adapter->hscx_base[hscx->channel] + offset); -} - -static void -fcclassic_read_hscx_fifo(struct hscx *hscx, unsigned char * data, int size) -{ - struct fritz_adapter *adapter = hscx->priv; - - insb(adapter->hscx_fifo[hscx->channel], data, size); -} - -static void -fcclassic_write_hscx_fifo(struct hscx *hscx, unsigned char * data, int size) -{ - struct fritz_adapter *adapter = hscx->priv; - - outsb(adapter->hscx_fifo[hscx->channel], data, size); -} - -// ---------------------------------------------------------------------- - -static irqreturn_t -fcclassic_irq(int intno, void *dev, struct pt_regs *regs) -{ - struct fritz_adapter *adapter = dev; - unsigned char sval; - - DBG(2, ""); - while ((sval = inb(adapter->cfg_reg) & 0xf) != 0x7) { - DBG(2, "sval %#x", sval); - if (!(sval & AVM_A1_STAT_TIMER)) { - outb(0x1e, adapter->cfg_reg); - } - if (!(sval & AVM_A1_STAT_HSCX)) { - hscx_irq(adapter->hscx); - } - if (!(sval & AVM_A1_STAT_ISAC)) { - isac_irq(&adapter->isac); - } - } - return IRQ_HANDLED; -} - -// ---------------------------------------------------------------------- - -static int __init -fcclassic_setup(struct fritz_adapter *adapter) -{ - u32 val = 0; - int i; - int retval; - - DBG(1,""); - - isac_init(&adapter->isac); // FIXME is this okay now - - adapter->cfg_reg = adapter->io + 0x1800; - adapter->isac_base = adapter->io + 0x1400 - 0x20; - adapter->isac_fifo = adapter->io + 0x1000; - adapter->hscx_base[0] = adapter->io + 0x0400 - 0x20; - adapter->hscx_fifo[0] = adapter->io; - adapter->hscx_base[1] = adapter->io + 0x0c00 - 0x20; - adapter->hscx_fifo[1] = adapter->io + 0x0800; - - retval = -EBUSY; - if (!request_region(adapter->cfg_reg , 8, - "fcclassic cfg")) - goto err; - if (!request_region(adapter->isac_base + 0x20 , 32, - "fcclassic isac")) - goto err_cfg_reg; - if (!request_region(adapter->isac_fifo , 1, - "fcclassic isac fifo")) - goto err_isac_base; - if (!request_region(adapter->hscx_base[0] + 0x20, 32, - "fcclassic hscx")) - goto err_isac_fifo; - if (!request_region(adapter->hscx_fifo[0] , 1, - "fcclassic hscx fifo")) - goto err_hscx_base_0; - if (!request_region(adapter->hscx_base[1] + 0x20, 32, - "fcclassic hscx")) - goto err_hscx_fifo_0; - if (!request_region(adapter->hscx_fifo[1] , 1, - "fcclassic hscx fifo")) - goto err_hscx_base_1; - retval = request_irq(adapter->irq, fcclassic_irq, 0, - "fcclassic", adapter); - if (retval) - goto err_hscx_fifo_1; - - // Reset - outb(0x00, adapter->cfg_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(200 * HZ / 1000); // 200 msec - outb(0x01, adapter->cfg_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(200 * HZ / 1000); // 200 msec - outb(0x00, adapter->cfg_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(200 * HZ / 1000); // 200 msec - - val = adapter->irq; - if (val == 9) - val = 2; - outb(val, adapter->cfg_reg + 1); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(200 * HZ / 1000); // 200 msec - outb(0x00, adapter->cfg_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(200 * HZ / 1000); // 200 msec - - val = inb(adapter->cfg_reg); - printk(KERN_INFO "AVM A1: Byte at %x is %x\n", - adapter->cfg_reg, val); - val = inb(adapter->cfg_reg + 3); - printk(KERN_INFO "AVM A1: Byte at %x is %x\n", - adapter->cfg_reg + 3, val); - val = inb(adapter->cfg_reg + 2); - printk(KERN_INFO "AVM A1: Byte at %x is %x\n", - adapter->cfg_reg + 2, val); - val = inb(adapter->cfg_reg); - printk(KERN_INFO "AVM A1: Byte at %x is %x\n", - adapter->cfg_reg, val); - - outb(0x16, adapter->cfg_reg); - outb(0x1e, adapter->cfg_reg); - - adapter->isac.priv = adapter; - adapter->isac.read_isac = &fcclassic_read_isac; - adapter->isac.write_isac = &fcclassic_write_isac; - adapter->isac.read_isac_fifo = &fcclassic_read_isac_fifo; - adapter->isac.write_isac_fifo = &fcclassic_write_isac_fifo; - hisax_isac_setup(&adapter->isac); - for (i = 0; i < 2; i++) { - hscx_init(&adapter->hscx[i]); - adapter->hscx[i].priv = adapter; - adapter->hscx[i].read_hscx = &fcclassic_read_hscx; - adapter->hscx[i].write_hscx = &fcclassic_write_hscx; - adapter->hscx[i].read_hscx_fifo = &fcclassic_read_hscx_fifo; - adapter->hscx[i].write_hscx_fifo = &fcclassic_write_hscx_fifo; - hscx_setup(&adapter->hscx[i]); - } - - return 0; - - err_hscx_fifo_1: - release_region(adapter->hscx_fifo[1] , 1); - err_hscx_base_1: - release_region(adapter->hscx_base[1] + 0x20, 32); - err_hscx_fifo_0: - release_region(adapter->hscx_fifo[0] , 1); - err_hscx_base_0: - release_region(adapter->hscx_base[0] + 0x20, 32); - err_isac_fifo: - release_region(adapter->isac_fifo , 1); - err_isac_base: - release_region(adapter->isac_base + 0x20, 32); - err_cfg_reg: - release_region(adapter->cfg_reg , 8); - err: - return retval; -} - -static void __exit fcclassic_release(struct fritz_adapter *adapter) -{ - DBG(1,""); - -// outb(0, adapter->io + AVM_STATUS0); - free_irq(adapter->irq, adapter); - release_region(adapter->hscx_fifo[1] , 1); - release_region(adapter->hscx_base[1] + 0x20, 32); - release_region(adapter->hscx_fifo[0] , 1); - release_region(adapter->hscx_base[0] + 0x20, 32); - release_region(adapter->isac_fifo , 1); - release_region(adapter->isac_base + 0x20, 32); - release_region(adapter->cfg_reg , 8); -} - -// ---------------------------------------------------------------------- - -static struct fritz_adapter * __init -new_adapter(struct pci_dev *pdev) -{ - struct fritz_adapter *adapter; - struct hisax_b_if *b_if[2]; - int i; - - adapter = kmalloc(sizeof(struct fritz_adapter), GFP_KERNEL); - if (!adapter) - return NULL; - - memset(adapter, 0, sizeof(struct fritz_adapter)); - - adapter->isac.hisax_d_if.owner = THIS_MODULE; - adapter->isac.hisax_d_if.ifc.priv = &adapter->isac; - adapter->isac.hisax_d_if.ifc.l2l1 = isac_d_l2l1; - - for (i = 0; i < 2; i++) { - // adapter->hscx[i].adapter = adapter; - adapter->hscx[i].channel = i; - adapter->hscx[i].b_if.ifc.priv = &adapter->hscx[i]; - adapter->hscx[i].b_if.ifc.l2l1 = hscx_b_l2l1; - } - pci_set_drvdata(pdev, adapter); - - for (i = 0; i < 2; i++) - b_if[i] = &adapter->hscx[i].b_if; - - hisax_register(&adapter->isac.hisax_d_if, b_if, "fcclassic", protocol); - - return adapter; -} - -static void -delete_adapter(struct fritz_adapter *adapter) -{ - hisax_unregister(&adapter->isac.hisax_d_if); - kfree(adapter); -} - -static int __init -fcclassic_probe(struct pci_dev *pdev, const struct isapnp_device_id *ent) -{ - struct fritz_adapter *adapter; - int retval; - - retval = -ENOMEM; - adapter = new_adapter(pdev); - if (!adapter) - goto err; - - adapter->io = pdev->resource[0].start; - adapter->irq = pdev->irq_resource[0].start; - - printk(KERN_INFO "hisax_fcclassic: found Fritz!Card classic at IO %#x irq %d\n", - adapter->io, adapter->irq); - - retval = fcclassic_setup(adapter); - if (retval) - goto err_free; - - return 0; - - err_free: - delete_adapter(adapter); - err: - return retval; -} - -static int __exit -fcclassic_remove(struct pci_dev *pdev) -{ - struct fritz_adapter *adapter = pci_get_drvdata(pdev); - - fcclassic_release(adapter); - delete_adapter(adapter); - - return 0; -} - -static struct pci_dev isa_dev[4]; - -static int __init -hisax_fcclassic_init(void) -{ - printk(KERN_INFO "hisax_fcclassic: Fritz!Card classic ISDN driver v0.0.1\n"); - - isa_dev[0].resource[0].start = 0x300; - isa_dev[0].irq_resource[0].start = 7; - - fcclassic_probe(isa_dev, NULL); - - return 0; -} - -static void __exit -hisax_fcclassic_exit(void) -{ - fcclassic_remove(isa_dev); -} - -module_init(hisax_fcclassic_init); -module_exit(hisax_fcclassic_exit); diff -Nru a/drivers/isdn/hisax/hisax_fcclassic.h b/drivers/isdn/hisax/hisax_fcclassic.h --- a/drivers/isdn/hisax/hisax_fcclassic.h Thu Feb 19 23:44:26 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,18 +0,0 @@ -#include "hisax_if.h" -#include "hisax_isac.h" -#include "hisax_hscx.h" - -#include - -struct fritz_adapter { - unsigned int io; - unsigned int irq; - unsigned int cfg_reg; - unsigned int isac_base; - unsigned int isac_fifo; - unsigned int hscx_base[2]; - unsigned int hscx_fifo[2]; - struct isac isac; - - struct hscx hscx[2]; -}; diff -Nru a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c --- a/drivers/isdn/hisax/hisax_fcpcipnp.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c Thu Feb 19 23:44:27 2004 @@ -27,22 +27,26 @@ #include #include #include -#include +#include #include #include #include #include +#include + +#include + #include "hisax_fcpcipnp.h" // debugging cruft #define __debug_variable debug #include "hisax_debug.h" -// #define CONFIG_PNP_CARD 1 - #ifdef CONFIG_HISAX_DEBUG static int debug = 0; +/* static int hdlcfifosize = 32; */ MODULE_PARM(debug, "i"); +/* MODULE_PARM(hdlcfifosize, "i"); */ #endif MODULE_AUTHOR("Kai Germaschewski /Karsten Keil "); @@ -65,6 +69,17 @@ MODULE_DEVICE_TABLE(pci, fcpci_ids); +#ifdef __ISAPNP__ +static struct pnp_device_id fcpnp_ids[] __devinitdata = { + { + .id = "AVM0900", + .driver_data = (unsigned long) "Fritz!Card PnP", + }, +}; + +MODULE_DEVICE_TABLE(isapnp, fcpnp_ids); +#endif + static int protocol = 2; /* EURO-ISDN Default */ MODULE_PARM(protocol, "i"); MODULE_LICENSE("GPL"); @@ -115,12 +130,12 @@ #define HDLC_STAT_RDO 0x10 #define HDLC_STAT_CRCVFRRAB 0x0E #define HDLC_STAT_CRCVFR 0x06 -#define HDLC_STAT_RML_MASK 0x3f00 +#define HDLC_STAT_RML_MASK 0xff00 #define HDLC_CMD_XRS 0x80 #define HDLC_CMD_XME 0x01 #define HDLC_CMD_RRS 0x20 -#define HDLC_CMD_XML_MASK 0x3f00 +#define HDLC_CMD_XML_MASK 0xff00 #define AVM_HDLC_FIFO_1 0x10 #define AVM_HDLC_FIFO_2 0x18 @@ -367,8 +382,7 @@ { struct fritz_adapter *adapter = bcs->adapter; struct sk_buff *skb = bcs->tx_skb; - u_int count; - u_int fifo_size = 32; + int count; unsigned long flags; unsigned char *p; @@ -378,8 +392,8 @@ BUG(); bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME; - if (bcs->tx_skb->len > fifo_size) { - count = fifo_size; + if (bcs->tx_skb->len > bcs->fifo_size) { + count = bcs->fifo_size; } else { count = bcs->tx_skb->len; if (bcs->mode != L1_MODE_TRANS) @@ -389,7 +403,7 @@ p = bcs->tx_skb->data; skb_pull(bcs->tx_skb, count); bcs->tx_cnt += count; - bcs->ctrl.sr.xml = ((count == fifo_size) ? 0 : count); + bcs->ctrl.sr.xml = ((count == bcs->fifo_size) ? 0 : count); switch (adapter->type) { case AVM_FRITZ_PCI: @@ -470,7 +484,7 @@ len = (stat & HDLC_STAT_RML_MASK) >> 8; if (len == 0) - len = 32; + len = bcs->fifo_size; hdlc_empty_fifo(bcs, len); @@ -498,6 +512,7 @@ static inline void hdlc_xdu_irq(struct fritz_bcs *bcs) { struct fritz_adapter *adapter = bcs->adapter; + /* Here we lost an TX interrupt, so * restart transmitting the whole frame. @@ -506,14 +521,17 @@ bcs->ctrl.sr.cmd |= HDLC_CMD_XRS; adapter->write_ctrl(bcs, 1); bcs->ctrl.sr.cmd &= ~HDLC_CMD_XRS; - adapter->write_ctrl(bcs, 1); if (!bcs->tx_skb) { DBG(0x10, "XDU without skb"); + adapter->write_ctrl(bcs, 1); return; } - skb_push(bcs->tx_skb, bcs->tx_cnt); - bcs->tx_cnt = 0; + /* only hdlc restarts the frame, transparent mode must continue */ + if (bcs->mode == L1_MODE_HDLC) { + skb_push(bcs->tx_skb, bcs->tx_cnt); + bcs->tx_cnt = 0; + } } static inline void hdlc_xpr_irq(struct fritz_bcs *bcs) @@ -530,7 +548,8 @@ } bcs->tx_cnt = 0; bcs->tx_skb = NULL; - B_L1L2(bcs, PH_DATA | CONFIRM, skb); + B_L1L2(bcs, PH_DATA | CONFIRM, (void *) skb->truesize); + dev_kfree_skb_irq(skb); } static void hdlc_irq_one(struct fritz_bcs *bcs, u32 stat) @@ -543,6 +562,8 @@ if (stat & HDLC_INT_XDU) { DBG(0x10, "XDU"); hdlc_xdu_irq(bcs); + hdlc_xpr_irq(bcs); + return; } if (stat & HDLC_INT_XPR) { DBG(0x10, "XPR"); @@ -573,6 +594,7 @@ if (bcs->mode == mode) return; + bcs->fifo_size = 32; bcs->ctrl.ctrl = 0; bcs->ctrl.sr.cmd = HDLC_CMD_XRS | HDLC_CMD_RRS; switch (mode) { @@ -585,10 +607,11 @@ bcs->rcvidx = 0; bcs->tx_cnt = 0; bcs->tx_skb = NULL; - if (mode == L1_MODE_TRANS) + if (mode == L1_MODE_TRANS) { bcs->ctrl.sr.mode = HDLC_MODE_TRANS; - else + } else { bcs->ctrl.sr.mode = HDLC_MODE_ITF_FLG; + } adapter->write_ctrl(bcs, 5); bcs->ctrl.sr.cmd = HDLC_CMD_XRS; adapter->write_ctrl(bcs, 1); @@ -631,7 +654,8 @@ // ---------------------------------------------------------------------- -static irqreturn_t fcpci2_irq(int intno, void *dev, struct pt_regs *regs) +static irqreturn_t +fcpci2_irq(int intno, void *dev, struct pt_regs *regs) { struct fritz_adapter *adapter = dev; unsigned char val; @@ -643,13 +667,15 @@ DBG(2, "STATUS0 %#x", val); if (val & AVM_STATUS0_IRQ_ISAC) isacsx_irq(&adapter->isac); - if (val & AVM_STATUS0_IRQ_HDLC) hdlc_irq(adapter); + if (val & AVM_STATUS0_IRQ_ISAC) + isacsx_irq(&adapter->isac); return IRQ_HANDLED; } -static irqreturn_t fcpci_irq(int intno, void *dev, struct pt_regs *regs) +static irqreturn_t +fcpci_irq(int intno, void *dev, struct pt_regs *regs) { struct fritz_adapter *adapter = dev; unsigned char sval; @@ -683,8 +709,7 @@ outb(AVM_STATUS1_ENA_IOM | adapter->irq, adapter->io + AVM_STATUS1); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(50*HZ / 1000); /* Timeout 50ms */ + mdelay(10); } // ---------------------------------------------------------------------- @@ -767,14 +792,11 @@ // Reset outb(0, adapter->io + AVM_STATUS0); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(50 * HZ / 1000); // 50 msec + mdelay(10); outb(AVM_STATUS0_RESET, adapter->io + AVM_STATUS0); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(50 * HZ / 1000); // 50 msec + mdelay(10); outb(0, adapter->io + AVM_STATUS0); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(10 * HZ / 1000); // 10 msec + mdelay(10); switch (adapter->type) { case AVM_FRITZ_PCIV2: @@ -784,7 +806,7 @@ case AVM_FRITZ_PCI: case AVM_FRITZ_PNP: fcpci_init(adapter); - hisax_isac_setup(&adapter->isac); + isac_setup(&adapter->isac); break; } val = adapter->read_hdlc_status(adapter, 0); @@ -817,7 +839,7 @@ // ---------------------------------------------------------------------- static struct fritz_adapter * __devinit -new_adapter(struct pci_dev *pdev) +new_adapter(void) { struct fritz_adapter *adapter; struct hisax_b_if *b_if[2]; @@ -840,8 +862,6 @@ adapter->bcs[i].b_if.ifc.l2l1 = fritz_b_l2l1; } - pci_set_drvdata(pdev, adapter); - for (i = 0; i < 2; i++) b_if[i] = &adapter->bcs[i].b_if; @@ -863,10 +883,12 @@ int retval; retval = -ENOMEM; - adapter = new_adapter(pdev); + adapter = new_adapter(); if (!adapter) goto err; + pci_set_drvdata(pdev, adapter); + if (pdev->device == PCI_DEVICE_ID_AVM_A1_V2) adapter->type = AVM_FRITZ_PCIV2; else @@ -880,7 +902,7 @@ adapter->irq = pdev->irq; printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at %s\n", - (char *) ent->driver_data, pci_name(pdev)); + (char *) ent->driver_data, pdev->slot_name); retval = fcpcipnp_setup(adapter); if (retval) @@ -894,91 +916,87 @@ return retval; } -static void __devexit fcpci_remove(struct pci_dev *pdev) -{ - struct fritz_adapter *adapter = pci_get_drvdata(pdev); - - fcpcipnp_release(adapter); - pci_disable_device(pdev); - delete_adapter(adapter); -} - -static struct pci_driver fcpci_driver = { - .name = "fcpci", - .probe = fcpci_probe, - .remove = __devexit_p(fcpci_remove), - .id_table = fcpci_ids, -}; - -#ifdef CONFIG_PNP_CARD - -static int __devinit fcpnp_probe(struct pnp_card *card, - const struct pnp_card_device_id *card_id) +#ifdef __ISAPNP__ +static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) { struct fritz_adapter *adapter; - struct pnp_dev *pnp_dev; int retval; - retval = -ENODEV; - pnp_dev = pnp_request_card_device(card, card_id->devs[0].id, NULL); - if (!pnp_dev) - goto err; - - if (!pnp_port_valid(pnp_dev, 0) || !pnp_irq_valid(pnp_dev, 0)) - goto err; + if (!pdev) + return(-ENODEV); retval = -ENOMEM; - adapter = new_adapter((struct pci_dev *)pnp_dev); // FIXME + adapter = new_adapter(); if (!adapter) goto err; - + + pnp_set_drvdata(pdev, adapter); + adapter->type = AVM_FRITZ_PNP; - adapter->io = pnp_port_start(pnp_dev, 0); - adapter->irq = pnp_irq(pnp_dev, 0); - + + pnp_disable_dev(pdev); + retval = pnp_activate_dev(pdev); + if (retval < 0) { + printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __FUNCTION__, + (char *)dev_id->driver_data, retval); + goto err_free; + } + adapter->io = pnp_port_start(pdev, 0); + adapter->irq = pnp_irq(pdev, 0); + printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at IO %#x irq %d\n", - (char *) card_id->driver_data, adapter->io, adapter->irq); - + (char *) dev_id->driver_data, adapter->io, adapter->irq); + retval = fcpcipnp_setup(adapter); if (retval) - goto err_delete; - + goto err_free; + return 0; - err_delete: + err_free: delete_adapter(adapter); err: return retval; } -static void __devexit fcpnp_remove(struct pnp_card *pcard) +static void __devexit fcpnp_remove(struct pnp_dev *pdev) { - struct fritz_adapter *adapter = pnpc_get_drvdata(pcard); + struct fritz_adapter *adapter = pnp_get_drvdata(pdev); - fcpcipnp_release(adapter); - delete_adapter(adapter); + if (adapter) { + fcpcipnp_release(adapter); + delete_adapter(adapter); + } + pnp_disable_dev(pdev); } -static struct pnp_card_device_id fcpnp_ids[] __devinitdata = { - { .id = "AVM0900", - .driver_data = (unsigned long) "Fritz!Card PnP", - .devs = { { "AVM0900" } }, - }, - {} +static struct pnp_driver fcpnp_driver = { + name: "fcpnp", + probe: fcpnp_probe, + remove: __devexit_p(fcpnp_remove), + id_table: fcpnp_ids, }; +#endif -static struct pnpc_driver fcpnp_driver = { - .name = "fcpnp", - .probe = fcpnp_probe, - .remove = __devexit_p(fcpnp_remove), - .id_table = fcpnp_ids, -}; +static void __devexit fcpci_remove(struct pci_dev *pdev) +{ + struct fritz_adapter *adapter = pci_get_drvdata(pdev); -#endif + fcpcipnp_release(adapter); + pci_disable_device(pdev); + delete_adapter(adapter); +} + +static struct pci_driver fcpci_driver = { + name: "fcpci", + probe: fcpci_probe, + remove: __devexit_p(fcpci_remove), + id_table: fcpci_ids, +}; static int __init hisax_fcpcipnp_init(void) { - int retval = 0, pci_nr_found; + int retval, pci_nr_found; printk(KERN_INFO "hisax_fcpcipnp: Fritz!Card PCI/PCIv2/PnP ISDN driver v0.0.1\n"); @@ -986,25 +1004,26 @@ if (retval < 0) goto out; pci_nr_found = retval; + retval = 0; -#ifdef CONFIG_PNP_CARD - retval = pnpc_register_driver(&fcpnp_driver); -#endif +#ifdef __ISAPNP__ + retval = pnp_register_driver(&fcpnp_driver); if (retval < 0) goto out_unregister_pci; +#endif #if !defined(CONFIG_HOTPLUG) || defined(MODULE) if (pci_nr_found + retval == 0) { retval = -ENODEV; - goto out_unregister_pnp; + goto out_unregister_isapnp; } #endif return 0; #if !defined(CONFIG_HOTPLUG) || defined(MODULE) - out_unregister_pnp: -#ifdef CONFIG_PNP_CARD - pnpc_unregister_driver(&fcpnp_driver); + out_unregister_isapnp: +#ifdef __ISAPNP__ + pnp_unregister_driver(&fcpnp_driver); #endif #endif out_unregister_pci: @@ -1015,8 +1034,8 @@ static void __exit hisax_fcpcipnp_exit(void) { -#ifdef CONFIG_PNP_CARD - pnpc_unregister_driver(&fcpnp_driver); +#ifdef __ISAPNP__ + pnp_unregister_driver(&fcpnp_driver); #endif pci_unregister_driver(&fcpci_driver); } diff -Nru a/drivers/isdn/hisax/hisax_fcpcipnp.h b/drivers/isdn/hisax/hisax_fcpcipnp.h --- a/drivers/isdn/hisax/hisax_fcpcipnp.h Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/hisax_fcpcipnp.h Thu Feb 19 23:44:28 2004 @@ -12,15 +12,15 @@ struct hdlc_stat_reg { #ifdef __BIG_ENDIAN - u8 fill __attribute__((packed)); - u8 mode __attribute__((packed)); - u8 xml __attribute__((packed)); - u8 cmd __attribute__((packed)); + u_char fill __attribute__((packed)); + u_char mode __attribute__((packed)); + u_char xml __attribute__((packed)); + u_char cmd __attribute__((packed)); #else - u8 cmd __attribute__((packed)); - u8 xml __attribute__((packed)); - u8 mode __attribute__((packed)); - u8 fill __attribute__((packed)); + u_char cmd __attribute__((packed)); + u_char xml __attribute__((packed)); + u_char mode __attribute__((packed)); + u_char fill __attribute__((packed)); #endif }; @@ -36,8 +36,9 @@ } ctrl; u_int stat; int rcvidx; - u8 rcvbuf[HSCX_BUFMAX]; /* B-Channel receive Buffer */ - + int fifo_size; + u_char rcvbuf[HSCX_BUFMAX]; /* B-Channel receive Buffer */ + int tx_cnt; /* B-Channel transmit counter */ struct sk_buff *tx_skb; /* B-Channel transmit Buffer */ }; diff -Nru a/drivers/isdn/hisax/hisax_hfcpci.c b/drivers/isdn/hisax/hisax_hfcpci.c --- a/drivers/isdn/hisax/hisax_hfcpci.c Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,1645 +0,0 @@ -/* - * Driver for HFC PCI based cards - * - * Author Kai Germaschewski - * Copyright 2002 by Kai Germaschewski - * 2000 by Karsten Keil - * 2000 by Werner Cornelius - * - * based upon Werner Cornelius's original hfc_pci.c driver - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - * - */ - -// XXX timer3 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "hisax_hfcpci.h" - -// debugging cruft -#define __debug_variable debug -#include "hisax_debug.h" - -#ifdef CONFIG_HISAX_DEBUG -static int debug = 0; -MODULE_PARM(debug, "i"); -#endif - -MODULE_AUTHOR("Kai Germaschewski /Werner Cornelius "); -MODULE_DESCRIPTION("HFC PCI ISDN driver"); - -#define ID(ven, dev, name) \ - { .vendor = PCI_VENDOR_ID_##ven, \ - .device = PCI_DEVICE_ID_##dev, \ - .subvendor = PCI_ANY_ID, \ - .subdevice = PCI_ANY_ID, \ - .class = 0, \ - .class_mask = 0, \ - .driver_data = (unsigned long) name } - -static struct pci_device_id hfcpci_ids[] = { - ID(CCD, CCD_2BD0, "CCD/Billion/Asuscom 2BD0"), - ID(CCD, CCD_B000, "Billion B000"), - ID(CCD, CCD_B006, "Billion B006"), - ID(CCD, CCD_B007, "Billion B007"), - ID(CCD, CCD_B008, "Billion B008"), - ID(CCD, CCD_B009, "Billion B009"), - ID(CCD, CCD_B00A, "Billion B00A"), - ID(CCD, CCD_B00B, "Billion B00B"), - ID(CCD, CCD_B00C, "Billion B00C"), - ID(CCD, CCD_B100, "Seyeon"), - ID(ABOCOM, ABOCOM_2BD1, "Abocom/Magitek"), - ID(ASUSTEK, ASUSTEK_0675, "Asuscom/Askey"), - ID(BERKOM, BERKOM_T_CONCEPT, "German Telekom T-Concept"), - ID(BERKOM, BERKOM_A1T, "German Telekom A1T"), - ID(ANIGMA, ANIGMA_MC145575, "Motorola MC145575"), - ID(ZOLTRIX, ZOLTRIX_2BD0, "Zoltrix 2BD0"), - ID(DIGI, DIGI_DF_M_IOM2_E, "Digi DataFire Micro V IOM2 (Europe)"), - ID(DIGI, DIGI_DF_M_E, "Digi DataFire Micro V (Europe)"), - ID(DIGI, DIGI_DF_M_IOM2_A, "Digi DataFire Micro V IOM2 (America)"), - ID(DIGI, DIGI_DF_M_A, "Digi DataFire Micro V (America)"), - { } -}; -MODULE_DEVICE_TABLE(pci, hfcpci_ids); - -#undef ID - -static int protocol = 2; /* EURO-ISDN Default */ -MODULE_PARM(protocol, "i"); - -// ---------------------------------------------------------------------- -// - -#define DBG_WARN 0x0001 -#define DBG_INFO 0x0002 -#define DBG_IRQ 0x0010 -#define DBG_L1M 0x0020 -#define DBG_PR 0x0040 -#define DBG_D_XMIT 0x0100 -#define DBG_D_RECV 0x0200 -#define DBG_B_XMIT 0x1000 -#define DBG_B_RECV 0x2000 - -/* memory window base address offset (in config space) */ - -#define HFCPCI_MWBA 0x80 - -/* GCI/IOM bus monitor registers */ - -#define HCFPCI_C_I 0x08 -#define HFCPCI_TRxR 0x0C -#define HFCPCI_MON1_D 0x28 -#define HFCPCI_MON2_D 0x2C - - -/* GCI/IOM bus timeslot registers */ - -#define HFCPCI_B1_SSL 0x80 -#define HFCPCI_B2_SSL 0x84 -#define HFCPCI_AUX1_SSL 0x88 -#define HFCPCI_AUX2_SSL 0x8C -#define HFCPCI_B1_RSL 0x90 -#define HFCPCI_B2_RSL 0x94 -#define HFCPCI_AUX1_RSL 0x98 -#define HFCPCI_AUX2_RSL 0x9C - -/* GCI/IOM bus data registers */ - -#define HFCPCI_B1_D 0xA0 -#define HFCPCI_B2_D 0xA4 -#define HFCPCI_AUX1_D 0xA8 -#define HFCPCI_AUX2_D 0xAC - -/* GCI/IOM bus configuration registers */ - -#define HFCPCI_MST_EMOD 0xB4 -#define HFCPCI_MST_MODE 0xB8 -#define HFCPCI_CONNECT 0xBC - - -/* Interrupt and status registers */ - -#define HFCPCI_FIFO_EN 0x44 -#define HFCPCI_TRM 0x48 -#define HFCPCI_B_MODE 0x4C -#define HFCPCI_CHIP_ID 0x58 -#define HFCPCI_CIRM 0x60 -#define HFCPCI_CTMT 0x64 -#define HFCPCI_INT_M1 0x68 -#define HFCPCI_INT_M2 0x6C -#define HFCPCI_INT_S1 0x78 -#define HFCPCI_INT_S2 0x7C -#define HFCPCI_STATUS 0x70 - -/* S/T section registers */ - -#define HFCPCI_STATES 0xC0 -#define HFCPCI_SCTRL 0xC4 -#define HFCPCI_SCTRL_E 0xC8 -#define HFCPCI_SCTRL_R 0xCC -#define HFCPCI_SQ 0xD0 -#define HFCPCI_CLKDEL 0xDC -#define HFCPCI_B1_REC 0xF0 -#define HFCPCI_B1_SEND 0xF0 -#define HFCPCI_B2_REC 0xF4 -#define HFCPCI_B2_SEND 0xF4 -#define HFCPCI_D_REC 0xF8 -#define HFCPCI_D_SEND 0xF8 -#define HFCPCI_E_REC 0xFC - - -/* bits in status register (READ) */ -#define HFCPCI_PCI_PROC 0x02 -#define HFCPCI_NBUSY 0x04 -#define HFCPCI_TIMER_ELAP 0x10 -#define HFCPCI_STATINT 0x20 -#define HFCPCI_FRAMEINT 0x40 -#define HFCPCI_ANYINT 0x80 - -/* bits in CTMT (Write) */ -#define HFCPCI_CLTIMER 0x80 -#define HFCPCI_TIM3_125 0x04 -#define HFCPCI_TIM25 0x10 -#define HFCPCI_TIM50 0x14 -#define HFCPCI_TIM400 0x18 -#define HFCPCI_TIM800 0x1C -#define HFCPCI_AUTO_TIMER 0x20 -#define HFCPCI_TRANSB2 0x02 -#define HFCPCI_TRANSB1 0x01 - -/* bits in CIRM (Write) */ -#define HFCPCI_AUX_MSK 0x07 -#define HFCPCI_RESET 0x08 -#define HFCPCI_B1_REV 0x40 -#define HFCPCI_B2_REV 0x80 - -/* bits in INT_M1 and INT_S1 */ -#define HFCPCI_INTS_B1TRANS 0x01 -#define HFCPCI_INTS_B2TRANS 0x02 -#define HFCPCI_INTS_DTRANS 0x04 -#define HFCPCI_INTS_B1REC 0x08 -#define HFCPCI_INTS_B2REC 0x10 -#define HFCPCI_INTS_DREC 0x20 -#define HFCPCI_INTS_L1STATE 0x40 -#define HFCPCI_INTS_TIMER 0x80 - -/* bits in INT_M2 */ -#define HFCPCI_PROC_TRANS 0x01 -#define HFCPCI_GCI_I_CHG 0x02 -#define HFCPCI_GCI_MON_REC 0x04 -#define HFCPCI_IRQ_ENABLE 0x08 -#define HFCPCI_PMESEL 0x80 - -/* bits in STATES */ -#define HFCPCI_STATE_MSK 0x0F -#define HFCPCI_LOAD_STATE 0x10 -#define HFCPCI_ACTIVATE 0x20 -#define HFCPCI_DO_ACTION 0x40 -#define HFCPCI_NT_G2_G3 0x80 - -/* bits in HFCD_MST_MODE */ -#define HFCPCI_MASTER 0x01 -#define HFCPCI_SLAVE 0x00 -/* remaining bits are for codecs control */ - -/* bits in HFCD_SCTRL */ -#define SCTRL_B1_ENA 0x01 -#define SCTRL_B2_ENA 0x02 -#define SCTRL_MODE_TE 0x00 -#define SCTRL_MODE_NT 0x04 -#define SCTRL_LOW_PRIO 0x08 -#define SCTRL_SQ_ENA 0x10 -#define SCTRL_TEST 0x20 -#define SCTRL_NONE_CAP 0x40 -#define SCTRL_PWR_DOWN 0x80 - -/* bits in SCTRL_E */ -#define HFCPCI_AUTO_AWAKE 0x01 -#define HFCPCI_DBIT_1 0x04 -#define HFCPCI_IGNORE_COL 0x08 -#define HFCPCI_CHG_B1_B2 0x80 - -/* bits in FIFO_EN register */ -#define HFCPCI_FIFOEN_B1 0x03 -#define HFCPCI_FIFOEN_B2 0x0C -#define HFCPCI_FIFOEN_DTX 0x10 -#define HFCPCI_FIFOEN_DRX 0x20 -#define HFCPCI_FIFOEN_B1TX 0x01 -#define HFCPCI_FIFOEN_B1RX 0x02 -#define HFCPCI_FIFOEN_B2TX 0x04 -#define HFCPCI_FIFOEN_B2RX 0x08 - -/* - * thresholds for transparent B-channel mode - * change mask and threshold simultaneously - */ -#define HFCPCI_BTRANS_THRESHOLD 128 -#define HFCPCI_BTRANS_THRESMASK 0x00 - -#define CLKDEL_TE 0x0e /* CLKDEL in TE mode */ -#define CLKDEL_NT 0x6c /* CLKDEL in NT mode */ - -#define MAX_D_FRAMES 0x10 -#define MAX_B_FRAMES 0x20 -#define B_FIFO_START 0x0200 -#define B_FIFO_END 0x2000 -#define B_FIFO_SIZE (B_FIFO_END - B_FIFO_START) -#define D_FIFO_START 0x0000 -#define D_FIFO_END 0x0200 -#define D_FIFO_SIZE (D_FIFO_END - D_FIFO_START) - -// ---------------------------------------------------------------------- -// push messages to the upper layers - -static inline void D_L1L2(struct hfcpci_adapter *adapter, int pr, void *arg) -{ - struct hisax_if *ifc = (struct hisax_if *) &adapter->d_if; - - DBG(DBG_PR, "pr %#x", pr); - ifc->l1l2(ifc, pr, arg); -} - -static inline void B_L1L2(struct hfcpci_bcs *bcs, int pr, void *arg) -{ - struct hisax_if *ifc = (struct hisax_if *) &bcs->b_if; - - DBG(DBG_PR, "pr %#x", pr); - ifc->l1l2(ifc, pr, arg); -} - -// ---------------------------------------------------------------------- -// MMIO - -static inline void -hfcpci_writeb(struct hfcpci_adapter *adapter, u8 b, unsigned char offset) -{ - writeb(b, adapter->mmio + offset); -} - -static inline u8 -hfcpci_readb(struct hfcpci_adapter *adapter, unsigned char offset) -{ - return readb(adapter->mmio + offset); -} - -// ---------------------------------------------------------------------- -// magic to define the various F/Z counter accesses - -#define DECL_B_F(r, f) \ -static inline u8 \ -get_b_##r##_##f (struct hfcpci_bcs *bcs) \ -{ \ - u16 off = bcs->channel ? OFF_B2_##r##_##f : OFF_B1_##r##_##f; \ - \ - return *(bcs->adapter->fifo + off); \ -} \ - \ -static inline void \ -set_b_##r##_##f (struct hfcpci_bcs *bcs, u8 f) \ -{ \ - u16 off = bcs->channel ? OFF_B2_##r##_##f : OFF_B1_##r##_##f; \ - \ - *(bcs->adapter->fifo + off) = f; \ -} - -#define OFF_B1_rx_f1 0x6080 -#define OFF_B2_rx_f1 0x6180 -#define OFF_B1_rx_f2 0x6081 -#define OFF_B2_rx_f2 0x6181 - -#define OFF_B1_tx_f1 0x2080 -#define OFF_B2_tx_f1 0x2180 -#define OFF_B1_tx_f2 0x2081 -#define OFF_B2_tx_f2 0x2181 - -DECL_B_F(rx, f1) -DECL_B_F(rx, f2) -DECL_B_F(tx, f1) -DECL_B_F(tx, f2) - -#undef DECL_B_F - -#define DECL_B_Z(r, z) \ -static inline u16 \ -get_b_##r##_##z (struct hfcpci_bcs *bcs, u8 f) \ -{ \ - u16 off = bcs->channel ? OFF_B2_##r##_##z : OFF_B1_##r##_##z; \ - \ - return le16_to_cpu(*((u16 *) (bcs->adapter->fifo + off + f * 4))); \ -} \ - \ -static inline void \ -set_b_##r##_##z(struct hfcpci_bcs *bcs, u8 f, u16 z) \ -{ \ - u16 off = bcs->channel ? OFF_B2_##r##_##z : OFF_B1_##r##_##z; \ - \ - *((u16 *) (bcs->adapter->fifo + off + f * 4)) = cpu_to_le16(z); \ -} - -#define OFF_B1_rx_z1 0x6000 -#define OFF_B2_rx_z1 0x6100 -#define OFF_B1_rx_z2 0x6002 -#define OFF_B2_rx_z2 0x6102 - -#define OFF_B1_tx_z1 0x2000 -#define OFF_B2_tx_z1 0x2100 -#define OFF_B1_tx_z2 0x2002 -#define OFF_B2_tx_z2 0x2102 - -DECL_B_Z(rx, z1) -DECL_B_Z(rx, z2) -DECL_B_Z(tx, z1) -DECL_B_Z(tx, z2) - -#undef DECL_B_Z - -#define DECL_D_F(r, f) \ -static inline u8 \ -get_d_##r##_##f (struct hfcpci_adapter *adapter) \ -{ \ - u16 off = OFF_D_##r##_##f; \ - \ - return *(adapter->fifo + off) & 0xf; \ -} \ - \ -static inline void \ -set_d_##r##_##f (struct hfcpci_adapter *adapter, u8 f) \ -{ \ - u16 off = OFF_D_##r##_##f; \ - \ - *(adapter->fifo + off) = f | 0x10; \ -} - -#define OFF_D_rx_f1 0x60a0 -#define OFF_D_rx_f2 0x60a1 - -#define OFF_D_tx_f1 0x20a0 -#define OFF_D_tx_f2 0x20a1 - -DECL_D_F(rx, f1) -DECL_D_F(rx, f2) -DECL_D_F(tx, f1) -DECL_D_F(tx, f2) - -#undef DECL_D_F - -#define DECL_D_Z(r, z) \ -static inline u16 \ -get_d_##r##_##z (struct hfcpci_adapter *adapter, u8 f) \ -{ \ - u16 off = OFF_D_##r##_##z; \ - \ - return le16_to_cpu(*((u16 *) (adapter->fifo + off + (f | 0x10) * 4)));\ -} \ - \ -static inline void \ -set_d_##r##_##z(struct hfcpci_adapter *adapter, u8 f, u16 z) \ -{ \ - u16 off = OFF_D_##r##_##z; \ - \ - *((u16 *) (adapter->fifo + off + (f | 0x10) * 4)) = cpu_to_le16(z); \ -} - -#define OFF_D_rx_z1 0x6080 -#define OFF_D_rx_z2 0x6082 - -#define OFF_D_tx_z1 0x2080 -#define OFF_D_tx_z2 0x2082 - -DECL_D_Z(rx, z1) -DECL_D_Z(rx, z2) -DECL_D_Z(tx, z1) -DECL_D_Z(tx, z2) - -#undef DECL_B_Z - -// ---------------------------------------------------------------------- -// fill b / d fifos - -static inline void -hfcpci_fill_d_fifo(struct hfcpci_adapter *adapter) -{ - u8 f1, f2; - u16 z1, z2; - int cnt, fcnt; - char *fifo_adr = adapter->fifo; - struct sk_buff *tx_skb = adapter->tx_skb; - - f1 = get_d_tx_f1(adapter); - f2 = get_d_tx_f2(adapter); - DBG(DBG_D_XMIT, "f1 %#x f2 %#x", f1, f2); - - fcnt = f1 - f2; - if (fcnt < 0) - fcnt += MAX_D_FRAMES; - - if (fcnt) { - printk("BUG\n"); - return; - } - - z1 = get_d_tx_z1(adapter, f1); - z2 = get_d_tx_z2(adapter, f1); //XXX - DBG(DBG_D_XMIT, "z1 %#x z2 %#x", z1, z2); - - cnt = z2 - z1; - if (cnt <= 0) - cnt += D_FIFO_SIZE; - - if (tx_skb->len > cnt) { - printk("BUG\n"); - return; - } - - cnt = tx_skb->len; - if (z1 + cnt <= D_FIFO_END) { - memcpy(fifo_adr + z1, tx_skb->data, cnt); - } else { - memcpy(fifo_adr + z1, tx_skb->data, D_FIFO_END - z1); - memcpy(fifo_adr + D_FIFO_START, - tx_skb->data + (D_FIFO_END - z1), - cnt - (D_FIFO_END - z1)); - } - z1 += cnt; - if (z1 >= D_FIFO_END) - z1 -= D_FIFO_SIZE; - - f1 = (f1 + 1) & (MAX_D_FRAMES - 1); - mb(); - set_d_tx_z1(adapter, f1, z1); - mb(); - set_d_tx_f1(adapter, f1); -} - -static inline void -hfcpci_fill_b_fifo_hdlc(struct hfcpci_bcs *bcs) -{ - u8 f1, f2; - u16 z1, z2; - int cnt, fcnt; - char *fifo_adr = bcs->adapter->fifo + (bcs->channel ? 0x2000 : 0x0000); - struct sk_buff *tx_skb = bcs->tx_skb; - - f1 = get_b_tx_f1(bcs); - f2 = get_b_tx_f2(bcs); - DBG(DBG_B_XMIT, "f1 %#x f2 %#x", f1, f2); - - fcnt = f1 - f2; - if (fcnt < 0) - fcnt += MAX_B_FRAMES; - - if (fcnt) { - printk("BUG\n"); - return; - } - - z1 = get_b_tx_z1(bcs, f1); - z2 = get_b_tx_z2(bcs, f1); //XXX - DBG(DBG_B_XMIT, "z1 %#x z2 %#x", z1, z2); - - cnt = z2 - z1; - if (cnt <= 0) - cnt += B_FIFO_SIZE; - - if (tx_skb->len > cnt) { - printk("BUG\n"); - return; - } - - cnt = tx_skb->len; - if (z1 + cnt <= B_FIFO_END) { - memcpy(fifo_adr + z1, tx_skb->data, cnt); - } else { - memcpy(fifo_adr + z1, tx_skb->data, B_FIFO_END - z1); - memcpy(fifo_adr + B_FIFO_START, - tx_skb->data + (B_FIFO_END - z1), - cnt - (B_FIFO_END - z1)); - } - z1 += cnt; - if (z1 >= B_FIFO_END) - z1 -= B_FIFO_SIZE; - - f1 = (f1 + 1) & (MAX_B_FRAMES - 1); - mb(); - set_b_tx_z1(bcs, f1, z1); - mb(); - set_b_tx_f1(bcs, f1); -} - -static inline void -hfcpci_fill_b_fifo_trans(struct hfcpci_bcs *bcs) -{ - int cnt; - char *fifo_adr = bcs->adapter->fifo + (bcs->channel ? 0x2000 : 0x0000); - struct sk_buff *tx_skb = bcs->tx_skb; - u8 f1, f2; - u16 z1, z2; - - f1 = get_b_tx_f1(bcs); - f2 = get_b_tx_f2(bcs); - - if (f1 != f2) - BUG(); - - z1 = get_b_tx_z1(bcs, f1); - z2 = get_b_tx_z2(bcs, f1); - - cnt = z2 - z1; - if (cnt <= 0) - cnt += B_FIFO_SIZE; - - if (tx_skb->len > cnt) - BUG(); - - if (z1 + cnt <= B_FIFO_END) { - memcpy(fifo_adr + z1, tx_skb->data, cnt); - } else { - memcpy(fifo_adr + z1, tx_skb->data, B_FIFO_END - z1); - memcpy(fifo_adr + B_FIFO_START, - tx_skb->data + (B_FIFO_END - z1), - cnt - (B_FIFO_END - z1)); - } - z1 += cnt; - if (z1 >= B_FIFO_END) - z1 -= B_FIFO_SIZE; - - mb(); - set_b_tx_z1(bcs, f1, z1); -} - -static inline void -hfcpci_fill_b_fifo(struct hfcpci_bcs *bcs) -{ - if (!bcs->tx_skb) { - DBG(DBG_WARN, "?"); - return; - } - - switch (bcs->mode) { - case L1_MODE_TRANS: - hfcpci_fill_b_fifo_trans(bcs); - break; - case L1_MODE_HDLC: - hfcpci_fill_b_fifo_hdlc(bcs); - break; - default: - DBG(DBG_WARN, "?"); - } -} - -static void hfcpci_clear_b_rx_fifo(struct hfcpci_bcs *bcs); -static void hfcpci_clear_b_tx_fifo(struct hfcpci_bcs *bcs); - -static void -hfcpci_b_mode(struct hfcpci_bcs *bcs, int mode) -{ - struct hfcpci_adapter *adapter = bcs->adapter; - - DBG(DBG_B_XMIT, "B%d mode %d --> %d", - bcs->channel + 1, bcs->mode, mode); - - if (bcs->mode == mode) - return; - - switch (mode) { - case L1_MODE_NULL: - if (bcs->channel == 0) { - adapter->sctrl &= ~SCTRL_B1_ENA; - adapter->sctrl_r &= ~SCTRL_B1_ENA; - adapter->fifo_en &= ~HFCPCI_FIFOEN_B1; - adapter->int_m1 &= ~(HFCPCI_INTS_B1TRANS + HFCPCI_INTS_B1REC); - } else { - adapter->sctrl &= ~SCTRL_B2_ENA; - adapter->sctrl_r &= ~SCTRL_B2_ENA; - adapter->fifo_en &= ~HFCPCI_FIFOEN_B2; - adapter->int_m1 &= ~(HFCPCI_INTS_B2TRANS + HFCPCI_INTS_B2REC); - } - break; - case L1_MODE_TRANS: - case L1_MODE_HDLC: - hfcpci_clear_b_rx_fifo(bcs); - hfcpci_clear_b_tx_fifo(bcs); - if (bcs->channel == 0) { - adapter->sctrl |= SCTRL_B1_ENA; - adapter->sctrl_r |= SCTRL_B1_ENA; - adapter->fifo_en |= HFCPCI_FIFOEN_B1; - adapter->int_m1 |= (HFCPCI_INTS_B1TRANS + HFCPCI_INTS_B1REC); - - if (mode == L1_MODE_TRANS) - adapter->ctmt |= 1; - else - adapter->ctmt &= ~1; - - } else { - adapter->sctrl |= SCTRL_B2_ENA; - adapter->sctrl_r |= SCTRL_B2_ENA; - adapter->fifo_en |= HFCPCI_FIFOEN_B2; - adapter->int_m1 |= (HFCPCI_INTS_B2TRANS + HFCPCI_INTS_B2REC); - - if (mode == L1_MODE_TRANS) - adapter->ctmt |= 2; - else - adapter->ctmt &= ~2; - - } - break; - } - hfcpci_writeb(adapter, adapter->int_m1, HFCPCI_INT_M1); - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - hfcpci_writeb(adapter, adapter->sctrl, HFCPCI_SCTRL); - hfcpci_writeb(adapter, adapter->sctrl_r, HFCPCI_SCTRL_R); - hfcpci_writeb(adapter, adapter->ctmt, HFCPCI_CTMT); - hfcpci_writeb(adapter, adapter->conn, HFCPCI_CONNECT); - - bcs->mode = mode; -} - -// ---------------------------------------------------------------------- -// Layer 1 state machine - -static struct Fsm l1fsm; - -enum { - ST_L1_F0, - ST_L1_F2, - ST_L1_F3, - ST_L1_F4, - ST_L1_F5, - ST_L1_F6, - ST_L1_F7, - ST_L1_F8, -}; - -#define L1_STATE_COUNT (ST_L1_F8+1) - -static char *strL1State[] = -{ - "ST_L1_F0", - "ST_L1_F2", - "ST_L1_F3", - "ST_L1_F4", - "ST_L1_F5", - "ST_L1_F6", - "ST_L1_F7", - "ST_L1_F8", -}; - -enum { - EV_PH_F0, - EV_PH_1, - EV_PH_F2, - EV_PH_F3, - EV_PH_F4, - EV_PH_F5, - EV_PH_F6, - EV_PH_F7, - EV_PH_F8, - EV_PH_ACTIVATE_REQ, - EV_PH_DEACTIVATE_REQ, - EV_TIMER3, -}; - -#define L1_EVENT_COUNT (EV_TIMER3 + 1) - -static char *strL1Event[] = -{ - "EV_PH_F0", - "EV_PH_1", - "EV_PH_F2", - "EV_PH_F3", - "EV_PH_F4", - "EV_PH_F5", - "EV_PH_F6", - "EV_PH_F7", - "EV_PH_F8", - "EV_PH_ACTIVATE_REQ", - "EV_PH_DEACTIVATE_REQ", - "EV_TIMER3", -}; - -static void l1_ignore(struct FsmInst *fi, int event, void *arg) -{ -} - -static void l1_go_f3(struct FsmInst *fi, int event, void *arg) -{ - FsmChangeState(fi, ST_L1_F3); -} - -static void l1_go_f3_deact_ind(struct FsmInst *fi, int event, void *arg) -{ - struct hfcpci_adapter *adapter = fi->userdata; - - FsmChangeState(fi, ST_L1_F3); - D_L1L2(adapter, PH_DEACTIVATE | INDICATION, NULL); -} - -static void l1_go_f4(struct FsmInst *fi, int event, void *arg) -{ - FsmChangeState(fi, ST_L1_F3); -} - -static void l1_go_f5(struct FsmInst *fi, int event, void *arg) -{ - FsmChangeState(fi, ST_L1_F3); -} - -static void l1_go_f6(struct FsmInst *fi, int event, void *arg) -{ - FsmChangeState(fi, ST_L1_F6); -} - -static void l1_go_f6_deact_ind(struct FsmInst *fi, int event, void *arg) -{ - struct hfcpci_adapter *adapter = fi->userdata; - - FsmChangeState(fi, ST_L1_F6); - D_L1L2(adapter, PH_DEACTIVATE | INDICATION, NULL); -} - -static void l1_go_f7(struct FsmInst *fi, int event, void *arg) -{ - FsmChangeState(fi, ST_L1_F7); -} - -static void l1_go_f7_act_ind(struct FsmInst *fi, int event, void *arg) -{ - struct hfcpci_adapter *adapter = fi->userdata; - - FsmChangeState(fi, ST_L1_F7); - D_L1L2(adapter, PH_ACTIVATE | INDICATION, NULL); -} - -static void l1_go_f8(struct FsmInst *fi, int event, void *arg) -{ - FsmChangeState(fi, ST_L1_F8); -} - -static void l1_go_f8_deact_ind(struct FsmInst *fi, int event, void *arg) -{ - struct hfcpci_adapter *adapter = fi->userdata; - - FsmChangeState(fi, ST_L1_F8); - D_L1L2(adapter, PH_DEACTIVATE | INDICATION, NULL); -} - -static void l1_act_req(struct FsmInst *fi, int event, void *arg) -{ - struct hfcpci_adapter *adapter = fi->userdata; - - hfcpci_writeb(adapter, HFCPCI_ACTIVATE | HFCPCI_DO_ACTION, HFCPCI_STATES); -} - -static struct FsmNode L1FnList[] __initdata = -{ - {ST_L1_F2, EV_PH_F3, l1_go_f3}, - {ST_L1_F2, EV_PH_F6, l1_go_f6}, - {ST_L1_F2, EV_PH_F7, l1_go_f7_act_ind}, - - {ST_L1_F3, EV_PH_F3, l1_ignore}, - {ST_L1_F3, EV_PH_F4, l1_go_f4}, - {ST_L1_F3, EV_PH_F5, l1_go_f5}, - {ST_L1_F3, EV_PH_F6, l1_go_f6}, - {ST_L1_F3, EV_PH_F7, l1_go_f7_act_ind}, - {ST_L1_F3, EV_PH_ACTIVATE_REQ, l1_act_req}, - - {ST_L1_F4, EV_PH_F7, l1_ignore}, - {ST_L1_F4, EV_PH_F3, l1_go_f3}, - {ST_L1_F4, EV_PH_F5, l1_go_f5}, - {ST_L1_F4, EV_PH_F6, l1_go_f6}, - {ST_L1_F4, EV_PH_F7, l1_go_f7}, - - {ST_L1_F5, EV_PH_F7, l1_ignore}, - {ST_L1_F5, EV_PH_F3, l1_go_f3}, - {ST_L1_F5, EV_PH_F6, l1_go_f6}, - {ST_L1_F5, EV_PH_F7, l1_go_f7}, - - {ST_L1_F6, EV_PH_F7, l1_ignore}, - {ST_L1_F6, EV_PH_F3, l1_go_f3}, - {ST_L1_F6, EV_PH_F7, l1_go_f7_act_ind}, - {ST_L1_F6, EV_PH_F8, l1_go_f8}, - - {ST_L1_F7, EV_PH_F7, l1_ignore}, - {ST_L1_F7, EV_PH_F3, l1_go_f3_deact_ind}, - {ST_L1_F7, EV_PH_F6, l1_go_f6_deact_ind}, - {ST_L1_F7, EV_PH_F8, l1_go_f8_deact_ind}, - - {ST_L1_F8, EV_PH_F7, l1_ignore}, - {ST_L1_F8, EV_PH_F3, l1_go_f3}, - {ST_L1_F8, EV_PH_F6, l1_go_f6}, - {ST_L1_F8, EV_PH_F7, l1_go_f7_act_ind}, - -}; - -static void l1m_debug(struct FsmInst *fi, char *fmt, ...) -{ - va_list args; - char buf[256]; - - va_start(args, fmt); - vsprintf(buf, fmt, args); - DBG(DBG_L1M, "%s", buf); - va_end(args); -} - -// ---------------------------------------------------------------------- -// clear FIFOs - -static void -hfcpci_clear_d_rx_fifo(struct hfcpci_adapter *adapter) -{ - u8 fifo_state; - - DBG(DBG_D_RECV, ""); - - fifo_state = adapter->fifo_en & HFCPCI_FIFOEN_DRX; - - if (fifo_state) { // enabled - // XXX locking - adapter->fifo_en &= ~fifo_state; - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - } - - adapter->last_fcnt = 0; - - set_d_rx_z1(adapter, MAX_D_FRAMES - 1, D_FIFO_END - 1); - set_d_rx_z2(adapter, MAX_D_FRAMES - 1, D_FIFO_END - 1); - mb(); - set_d_rx_f1(adapter, MAX_D_FRAMES - 1); - set_d_rx_f2(adapter, MAX_D_FRAMES - 1); - mb(); - - if (fifo_state) { - adapter->fifo_en |= fifo_state; - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - } -} - -static void -hfcpci_clear_b_rx_fifo(struct hfcpci_bcs *bcs) -{ - struct hfcpci_adapter *adapter = bcs->adapter; - int nr = bcs->channel; - u8 fifo_state; - - DBG(DBG_B_RECV, ""); - - fifo_state = adapter->fifo_en & - (nr ? HFCPCI_FIFOEN_B2RX : HFCPCI_FIFOEN_B1RX); - - if (fifo_state) { // enabled - adapter->fifo_en &= ~fifo_state; - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - } - - bcs->last_fcnt = 0; - - set_b_rx_z1(bcs, MAX_B_FRAMES - 1, B_FIFO_END - 1); - set_b_rx_z2(bcs, MAX_B_FRAMES - 1, B_FIFO_END - 1); - mb(); - set_b_rx_f1(bcs, MAX_B_FRAMES - 1); - set_b_rx_f2(bcs, MAX_B_FRAMES - 1); - mb(); - - if (fifo_state) { - adapter->fifo_en |= fifo_state; - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - } -} - -// XXX clear d_tx_fifo? - -static void -hfcpci_clear_b_tx_fifo(struct hfcpci_bcs *bcs) -{ - struct hfcpci_adapter *adapter = bcs->adapter; - int nr = bcs->channel; - u8 fifo_state; - - fifo_state = adapter->fifo_en & - (nr ? HFCPCI_FIFOEN_B2TX : HFCPCI_FIFOEN_B1TX); - - if (fifo_state) { // enabled - adapter->fifo_en &= ~fifo_state; - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - } - - bcs->last_fcnt = 0; - - set_b_rx_z1(bcs, MAX_B_FRAMES - 1, B_FIFO_END - 1); - set_b_rx_z2(bcs, MAX_B_FRAMES - 1, B_FIFO_END - 1); - mb(); - set_b_rx_f1(bcs, MAX_B_FRAMES - 1); - set_b_rx_f2(bcs, MAX_B_FRAMES - 1); - mb(); - - if (fifo_state) { - adapter->fifo_en |= fifo_state; - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - } -} - -// ---------------------------------------------------------------------- -// receive messages from upper layers - -static void -hfcpci_d_l2l1(struct hisax_if *ifc, int pr, void *arg) -{ - struct hfcpci_adapter *adapter = ifc->priv; - struct sk_buff *skb = arg; - - DBG(DBG_PR, "pr %#x", pr); - - switch (pr) { - case PH_ACTIVATE | REQUEST: - FsmEvent(&adapter->l1m, EV_PH_ACTIVATE_REQ, NULL); - break; - case PH_DEACTIVATE | REQUEST: - FsmEvent(&adapter->l1m, EV_PH_DEACTIVATE_REQ, NULL); - break; - case PH_DATA | REQUEST: - DBG(DBG_PR, "PH_DATA REQUEST len %d", skb->len); - DBG_SKB(DBG_D_XMIT, skb); - if (adapter->l1m.state != ST_L1_F7) { - DBG(DBG_WARN, "L1 wrong state %d", adapter->l1m.state); - break; - } - if (adapter->tx_skb) - BUG(); - - adapter->tx_skb = skb; - hfcpci_fill_d_fifo(adapter); - break; - } -} - -static void -hfcpci_b_l2l1(struct hisax_if *ifc, int pr, void *arg) -{ - struct hfcpci_bcs *bcs = ifc->priv; - struct sk_buff *skb = arg; - int mode; - - DBG(DBG_PR, "pr %#x", pr); - - switch (pr) { - case PH_DATA | REQUEST: - if (bcs->tx_skb) - BUG(); - - bcs->tx_skb = skb; - DBG_SKB(DBG_B_XMIT, skb); - hfcpci_fill_b_fifo(bcs); - break; - case PH_ACTIVATE | REQUEST: - mode = (int) arg; - DBG(DBG_PR,"B%d,PH_ACTIVATE_REQUEST %d", bcs->channel + 1, mode); - hfcpci_b_mode(bcs, mode); - B_L1L2(bcs, PH_ACTIVATE | INDICATION, NULL); - break; - case PH_DEACTIVATE | REQUEST: - DBG(DBG_PR,"B%d,PH_DEACTIVATE_REQUEST", bcs->channel + 1); - hfcpci_b_mode(bcs, L1_MODE_NULL); - B_L1L2(bcs, PH_DEACTIVATE | INDICATION, NULL); - break; - } -} - -// ---------------------------------------------------------------------- -// receive IRQ - -static inline void -hfcpci_d_recv_irq(struct hfcpci_adapter *adapter) -{ - struct sk_buff *skb; - char *fifo_adr = adapter->fifo + 0x4000; - char *p; - int cnt, fcnt; - int loop = 5; - u8 f1, f2; - u16 z1, z2; - - while (loop-- > 0) { - f1 = get_d_rx_f1(adapter); - f2 = get_d_rx_f2(adapter); - DBG(DBG_D_RECV, "f1 %#x f2 %#x", f1, f2); - - fcnt = f1 - f2; - if (fcnt < 0) - fcnt += 16; - - if (!fcnt) - return; - - if (fcnt < adapter->last_fcnt) - /* overrun */ - hfcpci_clear_d_rx_fifo(adapter); - // XXX init last_fcnt - - z1 = get_d_rx_z1(adapter, f2); - z2 = get_d_rx_z2(adapter, f2); - DBG(DBG_D_RECV, "z1 %#x z2 %#x", z1, z2); - - cnt = z1 - z2; - if (cnt < 0) - cnt += D_FIFO_SIZE; - cnt++; - - if (cnt < 4) { - DBG(DBG_WARN, "frame too short"); - goto next; - } - if (fifo_adr[z1] != 0) { - DBG(DBG_WARN, "CRC error"); - goto next; - } - cnt -= 3; - skb = dev_alloc_skb(cnt); - if (!skb) { - DBG(DBG_WARN, "no mem"); - goto next; - } - p = skb_put(skb, cnt); - if (z2 + cnt <= D_FIFO_END) { - memcpy(p, fifo_adr + z2, cnt); - } else { - memcpy(p, fifo_adr + z2, D_FIFO_END - z2); - memcpy(p + (D_FIFO_END - z2), fifo_adr + D_FIFO_START, - cnt - (D_FIFO_END - z2)); - } - - DBG_SKB(DBG_D_RECV, skb); - D_L1L2(adapter, PH_DATA | INDICATION, skb); - - next: - if (++z1 >= D_FIFO_END) - z1 -= D_FIFO_START; - - f2 = (f2 + 1) & (MAX_D_FRAMES - 1); - mb(); - set_d_rx_z2(adapter, f2, z1); - mb(); - set_d_rx_f2(adapter, f2); - - adapter->last_fcnt = fcnt - 1; - } -} - -static inline void -hfcpci_b_recv_hdlc_irq(struct hfcpci_adapter *adapter, int nr) -{ - struct hfcpci_bcs *bcs = &adapter->bcs[nr]; - struct sk_buff *skb; - char *fifo_adr = adapter->fifo + (nr ? 0x6000 : 0x4000); - char *p; - int cnt, fcnt; - int loop = 5; - u8 f1, f2; - u16 z1, z2; - - while (loop-- > 0) { - f1 = get_b_rx_f1(bcs); - f2 = get_b_rx_f2(bcs); - DBG(DBG_B_RECV, "f1 %d f2 %d", f1, f2); - - fcnt = f1 - f2; - if (fcnt < 0) - fcnt += 32; - - if (!fcnt) - return; - - if (fcnt < bcs->last_fcnt) - /* overrun */ - hfcpci_clear_b_rx_fifo(bcs); - // XXX init last_fcnt - - z1 = get_b_rx_z1(bcs, f2); - z2 = get_b_rx_z2(bcs, f2); - DBG(DBG_B_RECV, "z1 %d z2 %d", z1, z2); - - cnt = z1 - z2; - if (cnt < 0) - cnt += B_FIFO_SIZE; - cnt++; - - if (cnt < 4) { - DBG(DBG_WARN, "frame too short"); - goto next; - } - if (fifo_adr[z1] != 0) { - DBG(DBG_WARN, "CRC error"); - goto next; - } - cnt -= 3; - skb = dev_alloc_skb(cnt); - if (!skb) { - DBG(DBG_WARN, "no mem"); - goto next; - } - p = skb_put(skb, cnt); - if (z2 + cnt <= B_FIFO_END) { - memcpy(p, fifo_adr + z2, cnt); - } else { - memcpy(p, fifo_adr + z2, B_FIFO_END - z2); - memcpy(p + (B_FIFO_END - z2), fifo_adr + B_FIFO_START, - cnt - (B_FIFO_END - z2)); - } - - DBG_SKB(DBG_B_RECV, skb); - B_L1L2(bcs, PH_DATA | INDICATION, skb); - - next: - if (++z1 >= B_FIFO_END) - z1 -= B_FIFO_SIZE; - - f2 = (f2 + 1) & (MAX_B_FRAMES - 1); - mb(); - set_b_rx_z2(bcs, f2, z1); - mb(); - set_b_rx_f2(bcs, f2); - - bcs->last_fcnt = fcnt - 1; - } -} - -static inline void -hfcpci_b_recv_trans_irq(struct hfcpci_adapter *adapter, int nr) -{ - struct hfcpci_bcs *bcs = &adapter->bcs[nr]; - struct sk_buff *skb; - char *fifo_adr = adapter->fifo + (nr ? 0x6000 : 0x4000); - char *p; - int cnt; - int loop = 5; - u8 f1, f2; - u16 z1, z2; - - f1 = get_b_rx_f1(bcs); - f2 = get_b_rx_f2(bcs); - - if (f1 != f2) - BUG(); - - while (loop-- > 0) { - z1 = get_b_rx_z1(bcs, f2); - z2 = get_b_rx_z2(bcs, f2); - - cnt = z1 - z2; - if (!cnt) - /* no data available */ - return; - - if (cnt < 0) - cnt += B_FIFO_SIZE; - - if (cnt > HFCPCI_BTRANS_THRESHOLD) - cnt = HFCPCI_BTRANS_THRESHOLD; - - skb = dev_alloc_skb(cnt); - if (!skb) { - DBG(DBG_WARN, "no mem"); - goto next; - } - - p = skb_put(skb, cnt); - if (z2 + cnt <= 0x2000) { - memcpy(p, fifo_adr + z2, cnt); - } else { - memcpy(p, fifo_adr + z2, 0x2000 - z2); - p += 0x2000 - z2; - memcpy(p, fifo_adr + 0x200, cnt - (0x2000 - z2)); - } - - DBG_SKB(DBG_B_RECV, skb); - B_L1L2(bcs, PH_DATA | INDICATION, skb); - - next: - z2 += cnt; - if (z2 >= 0x2000) - z2 -= B_FIFO_SIZE; - - mb(); - set_b_rx_z2(bcs, f2, z2); - // XXX always receive buffers of a given size - } -} - -static inline void -hfcpci_b_recv_irq(struct hfcpci_adapter *adapter, int nr) -{ - DBG(DBG_B_RECV, ""); - - switch (adapter->bcs[nr].mode) { - case L1_MODE_NULL: - DBG(DBG_WARN, "?"); - break; - - case L1_MODE_HDLC: - hfcpci_b_recv_hdlc_irq(adapter, nr); - break; - - case L1_MODE_TRANS: - hfcpci_b_recv_trans_irq(adapter, nr); - break; - } -} - -// ---------------------------------------------------------------------- -// transmit IRQ - -// XXX make xmit FIFO deeper than 1 - -static inline void -hfcpci_d_xmit_irq(struct hfcpci_adapter *adapter) -{ - struct sk_buff *skb; - - DBG(DBG_D_XMIT, ""); - - skb = adapter->tx_skb; - if (!skb) { - DBG(DBG_WARN, "?"); - return; - } - - adapter->tx_skb = NULL; - D_L1L2(adapter, PH_DATA | CONFIRM, (void *) skb->truesize); - dev_kfree_skb_irq(skb); -} - -static inline void -hfcpci_b_xmit_irq(struct hfcpci_adapter *adapter, int nr) -{ - struct hfcpci_bcs *bcs = &adapter->bcs[nr]; - struct sk_buff *skb; - - DBG(DBG_B_XMIT, ""); - - skb = bcs->tx_skb; - if (!skb) { - DBG(DBG_WARN, "?"); - return; - } - - bcs->tx_skb = NULL; - B_L1L2(bcs, PH_DATA | CONFIRM, skb); -} - -// ---------------------------------------------------------------------- -// Layer 1 state change IRQ - -static inline void -hfcpci_state_irq(struct hfcpci_adapter *adapter) -{ - u8 val; - - val = hfcpci_readb(adapter, HFCPCI_STATES); - DBG(DBG_L1M, "STATES %#x", val); - FsmEvent(&adapter->l1m, val & 0xf, NULL); -} - -// ---------------------------------------------------------------------- -// Timer IRQ - -static inline void -hfcpci_timer_irq(struct hfcpci_adapter *adapter) -{ - hfcpci_writeb(adapter, adapter->ctmt | HFCPCI_CLTIMER, HFCPCI_CTMT); -} - -// ---------------------------------------------------------------------- -// IRQ handler - -static irqreturn_t -hfcpci_irq(int intno, void *dev, struct pt_regs *regs) -{ - struct hfcpci_adapter *adapter = dev; - int loop = 15; - u8 val, stat; - - if (!(adapter->int_m2 & 0x08)) - return IRQ_NONE; /* not initialised */ // XX - - stat = hfcpci_readb(adapter, HFCPCI_STATUS); - if (!(stat & HFCPCI_ANYINT)) - return IRQ_NONE; - - spin_lock(&adapter->hw_lock); - while (loop-- > 0) { - val = hfcpci_readb(adapter, HFCPCI_INT_S1); - DBG(DBG_IRQ, "stat %02x s1 %02x", stat, val); - val &= adapter->int_m1; - - if (!val) - break; - - if (val & 0x08) - hfcpci_b_recv_irq(adapter, 0); - - if (val & 0x10) - hfcpci_b_recv_irq(adapter, 1); - - if (val & 0x01) - hfcpci_b_xmit_irq(adapter, 0); - - if (val & 0x02) - hfcpci_b_xmit_irq(adapter, 1); - - if (val & 0x20) - hfcpci_d_recv_irq(adapter); - - if (val & 0x04) - hfcpci_d_xmit_irq(adapter); - - if (val & 0x40) - hfcpci_state_irq(adapter); - - if (val & 0x80) - hfcpci_timer_irq(adapter); - } - spin_unlock(&adapter->hw_lock); - return IRQ_HANDLED; -} - -// ---------------------------------------------------------------------- -// reset hardware - -static void -hfcpci_reset(struct hfcpci_adapter *adapter) -{ - /* disable all interrupts */ - adapter->int_m1 = 0; - adapter->int_m2 = 0; - hfcpci_writeb(adapter, adapter->int_m1, HFCPCI_INT_M1); - hfcpci_writeb(adapter, adapter->int_m2, HFCPCI_INT_M2); - - /* reset */ - hfcpci_writeb(adapter, HFCPCI_RESET, HFCPCI_CIRM); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30 * HZ) / 1000); - hfcpci_writeb(adapter, 0, HFCPCI_CIRM); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((20 * HZ) / 1000); - if (hfcpci_readb(adapter, HFCPCI_STATUS) & 2) // XX - printk(KERN_WARNING "HFC-PCI init bit busy\n"); -} - -// ---------------------------------------------------------------------- -// init hardware - -static void -hfcpci_hw_init(struct hfcpci_adapter *adapter) -{ - adapter->fifo_en = 0x30; /* only D fifos enabled */ // XX - hfcpci_writeb(adapter, adapter->fifo_en, HFCPCI_FIFO_EN); - - /* no echo connect , threshold */ - adapter->trm = HFCPCI_BTRANS_THRESMASK; - hfcpci_writeb(adapter, adapter->trm, HFCPCI_TRM); - - /* ST-Bit delay for TE-Mode */ - hfcpci_writeb(adapter, CLKDEL_TE, HFCPCI_CLKDEL); - - /* S/T Auto awake */ - adapter->sctrl_e = HFCPCI_AUTO_AWAKE; - hfcpci_writeb(adapter, adapter->sctrl_e, HFCPCI_SCTRL_E); - - /* no exchange */ - adapter->bswapped = 0; - /* we are in TE mode */ - adapter->nt_mode = 0; - - adapter->ctmt = HFCPCI_TIM3_125 | HFCPCI_AUTO_TIMER; - hfcpci_writeb(adapter, adapter->ctmt, HFCPCI_CTMT); - - adapter->int_m1 = HFCPCI_INTS_DTRANS | HFCPCI_INTS_DREC | - HFCPCI_INTS_L1STATE; - hfcpci_writeb(adapter, adapter->int_m1, HFCPCI_INT_M1); - - /* clear already pending ints */ - hfcpci_readb(adapter, HFCPCI_INT_S1); - - adapter->l1m.state = 2; - hfcpci_writeb(adapter, HFCPCI_LOAD_STATE | 2, HFCPCI_STATES); // XX /* HFC ST 2 */ - udelay(10); - hfcpci_writeb(adapter, 2, HFCPCI_STATES); /* HFC ST 2 */ - - /* HFC Master Mode */ - adapter->mst_m = HFCPCI_MASTER; - hfcpci_writeb(adapter, adapter->mst_m, HFCPCI_MST_MODE); - - /* set tx_lo mode, error in datasheet ! */ - adapter->sctrl = 0x40; - hfcpci_writeb(adapter, adapter->sctrl, HFCPCI_SCTRL); - - adapter->sctrl_r = 0; - hfcpci_writeb(adapter, adapter->sctrl_r, HFCPCI_SCTRL_R); - - // XXX - /* Init GCI/IOM2 in master mode */ - /* Slots 0 and 1 are set for B-chan 1 and 2 */ - /* D- and monitor/CI channel are not enabled */ - /* STIO1 is used as output for data, B1+B2 from ST->IOM+HFC */ - /* STIO2 is used as data input, B1+B2 from IOM->ST */ - /* ST B-channel send disabled -> continous 1s */ - /* The IOM slots are always enabled */ - adapter->conn = 0; /* set data flow directions */ - hfcpci_writeb(adapter, adapter->conn, HFCPCI_CONNECT); - hfcpci_writeb(adapter, 0x80, HFCPCI_B1_SSL); /* B1-Slot 0 STIO1 out enabled */ - hfcpci_writeb(adapter, 0x81, HFCPCI_B2_SSL); /* B2-Slot 1 STIO1 out enabled */ - hfcpci_writeb(adapter, 0x80, HFCPCI_B1_RSL); /* B1-Slot 0 STIO2 in enabled */ - hfcpci_writeb(adapter, 0x81, HFCPCI_B2_RSL); /* B2-Slot 1 STIO2 in enabled */ - - /* Finally enable IRQ output */ - adapter->int_m2 = HFCPCI_IRQ_ENABLE; - hfcpci_writeb(adapter, adapter->int_m2, HFCPCI_INT_M2); - - hfcpci_readb(adapter, HFCPCI_INT_S2); -} - -// ---------------------------------------------------------------------- -// probe / remove - -static struct hfcpci_adapter * __devinit -new_adapter(struct pci_dev *pdev) -{ - struct hfcpci_adapter *adapter; - struct hisax_b_if *b_if[2]; - int i; - - adapter = kmalloc(sizeof(struct hfcpci_adapter), GFP_KERNEL); - if (!adapter) - return NULL; - - memset(adapter, 0, sizeof(struct hfcpci_adapter)); - - adapter->d_if.owner = THIS_MODULE; - adapter->d_if.ifc.priv = adapter; - adapter->d_if.ifc.l2l1 = hfcpci_d_l2l1; - - for (i = 0; i < 2; i++) { - adapter->bcs[i].adapter = adapter; - adapter->bcs[i].channel = i; - adapter->bcs[i].b_if.ifc.priv = &adapter->bcs[i]; - adapter->bcs[i].b_if.ifc.l2l1 = hfcpci_b_l2l1; - } - - pci_set_drvdata(pdev, adapter); - - for (i = 0; i < 2; i++) - b_if[i] = &adapter->bcs[i].b_if; - - hisax_register(&adapter->d_if, b_if, "hfcpci", protocol); - - return adapter; -} - -static void delete_adapter(struct hfcpci_adapter *adapter) -{ - hisax_unregister(&adapter->d_if); - kfree(adapter); -} - -static int __devinit hfcpci_probe(struct pci_dev *pdev, - const struct pci_device_id *ent) -{ - struct hfcpci_adapter *adapter; - int retval; - - DBG(DBG_INFO, ""); - retval = -ENOMEM; - adapter = new_adapter(pdev); - if (!adapter) - goto err; - - retval = pci_enable_device(pdev); - if (retval) - goto err_free; - - adapter->irq = pdev->irq; - retval = request_irq(adapter->irq, hfcpci_irq, SA_SHIRQ, - "hfcpci", adapter); - if (retval) - goto err_free; - - retval = -EBUSY; - if (!request_mem_region(pci_resource_start(pdev, 1), 256, "hfcpci")) - goto err_free_irq; - - adapter->mmio = ioremap(pci_resource_start(pdev, 1), 256); // XX pci_io - if (!adapter->mmio) - goto err_release_region; - - /* Allocate 32K for FIFOs */ - if (pci_set_dma_mask(pdev, 0xffffffff)) - goto err_unmap; - - adapter->fifo = pci_alloc_consistent(pdev, 32768, &adapter->fifo_dma); - if (!adapter->fifo) - goto err_unmap; - - pci_write_config_dword(pdev, HFCPCI_MWBA, (u32) adapter->fifo_dma); - pci_set_master(pdev); - - adapter->l1m.fsm = &l1fsm; - adapter->l1m.state = ST_L1_F0; -#ifdef CONFIG_HISAX_DEBUG - adapter->l1m.debug = 1; -#else - adapter->l1m.debug = 0; -#endif - adapter->l1m.userdata = adapter; - adapter->l1m.printdebug = l1m_debug; - FsmInitTimer(&adapter->l1m, &adapter->timer); - - hfcpci_reset(adapter); - hfcpci_hw_init(adapter); - - printk(KERN_INFO "hisax_hfcpci: found adapter %s at %s\n", - (char *) ent->driver_data, pci_name(pdev)); - - return 0; - - err_unmap: - iounmap(adapter->mmio); - err_release_region: - release_mem_region(pci_resource_start(pdev, 1), 256); - err_free_irq: - free_irq(adapter->irq, adapter); - err_free: - delete_adapter(adapter); - err: - return retval; -} - -static void __devexit hfcpci_remove(struct pci_dev *pdev) -{ - struct hfcpci_adapter *adapter = pci_get_drvdata(pdev); - - hfcpci_reset(adapter); - -// del_timer(&cs->hw.hfcpci.timer); XX - - /* disable DMA */ - pci_disable_device(pdev); - pci_write_config_dword(pdev, HFCPCI_MWBA, 0); - pci_free_consistent(pdev, 32768, adapter->fifo, adapter->fifo_dma); - - iounmap(adapter->mmio); - release_mem_region(pci_resource_start(pdev, 1), 256); - free_irq(adapter->irq, adapter); - delete_adapter(adapter); -} - -static struct pci_driver hfcpci_driver = { - .name = "hfcpci", - .probe = hfcpci_probe, - .remove = __devexit_p(hfcpci_remove), - .id_table = hfcpci_ids, -}; - -static int __init hisax_hfcpci_init(void) -{ - int retval; - - printk(KERN_INFO "hisax_hfcpcipnp: HFC PCI ISDN driver v0.0.1\n"); - - l1fsm.state_count = L1_STATE_COUNT; - l1fsm.event_count = L1_EVENT_COUNT; - l1fsm.strState = strL1State; - l1fsm.strEvent = strL1Event; - retval = FsmNew(&l1fsm, L1FnList, ARRAY_SIZE(L1FnList)); - if (retval) - goto err; - - retval = pci_module_init(&hfcpci_driver); - if (retval) - goto err_fsm; - - return 0; - - err_fsm: - FsmFree(&l1fsm); - err: - return retval; -} - -static void __exit hisax_hfcpci_exit(void) -{ - FsmFree(&l1fsm); - pci_unregister_driver(&hfcpci_driver); -} - -module_init(hisax_hfcpci_init); -module_exit(hisax_hfcpci_exit); diff -Nru a/drivers/isdn/hisax/hisax_hfcpci.h b/drivers/isdn/hisax/hisax_hfcpci.h --- a/drivers/isdn/hisax/hisax_hfcpci.h Thu Feb 19 23:44:28 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,40 +0,0 @@ -#include "hisax_if.h" -#include "hisax_isac.h" -#include - -struct hfcpci_bcs { - struct hisax_b_if b_if; - struct hfcpci_adapter *adapter; - int mode; - int channel; - int last_fcnt; - - struct sk_buff *tx_skb; -}; - -struct hfcpci_adapter { - struct hisax_d_if d_if; - spinlock_t hw_lock; - unsigned int irq; - void *mmio; - u8 *fifo; - dma_addr_t fifo_dma; - - struct FsmInst l1m; - struct FsmTimer timer; - struct sk_buff *tx_skb; - int last_fcnt; - - u8 int_m1, int_m2; - u8 fifo_en; - u8 trm; - u8 sctrl, sctrl_r, sctrl_e; - u8 nt_mode; - u8 ctmt; - u8 mst_m; - u8 conn; - u8 bswapped; - - struct hfcpci_bcs bcs[2]; -}; - diff -Nru a/drivers/isdn/hisax/hisax_hscx.c b/drivers/isdn/hisax/hisax_hscx.c --- a/drivers/isdn/hisax/hisax_hscx.c Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,420 +0,0 @@ -/* - * Driver for HSCX - * High-Level Serial Communcation Controller Extended - * - * Author Kai Germaschewski - * Copyright 2001 by Kai Germaschewski - * 2001 by Karsten Keil - * - * based upon Karsten Keil's original isac.c driver - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - */ - -/* TODO: - * comments in .h - */ - -#include -#include -#include -#include "hisax_hscx.h" - -// debugging cruft - -#define __debug_variable debug -#include "hisax_debug.h" - -#ifdef CONFIG_HISAX_DEBUG -static int debug = 1; -MODULE_PARM(debug, "i"); - -static char *HSCXVer[] = -{"A1", "?1", "A2", "?3", "A3", "V2.1", "?6", "?7", - "?8", "?9", "?10", "?11", "?12", "?13", "?14", "???"}; -#endif - -MODULE_AUTHOR("Kai Germaschewski /Karsten Keil "); -MODULE_DESCRIPTION("HSCX driver"); - -#define DBG_WARN 0x0001 -#define DBG_IRQ 0x0002 -#define DBG_L1M 0x0004 -#define DBG_PR 0x0008 -#define DBG_RFIFO 0x0100 -#define DBG_RPACKET 0x0200 -#define DBG_XFIFO 0x1000 -#define DBG_XPACKET 0x2000 - -#define HSCX_ISTA 0x20 -#define HSCX_ISTA_EXB 0x01 -#define HSCX_ISTA_EXA 0x02 -#define HSCX_ISTA_ICA 0x04 -#define HSCX_ISTA_TIN 0x08 -#define HSCX_ISTA_XPR 0x10 -#define HSCX_ISTA_RSC 0x20 -#define HSCX_ISTA_RPF 0x40 -#define HSCX_ISTA_RME 0x80 - -#define HSCX_CMDR 0x21 -#define HSCX_CMDR_RMC 0x80 -#define HSCX_CMDR_RHR 0x40 -#define HSCX_CMDR_RNR 0x20 -#define HSCX_CMDR_STI 0x10 -#define HSCX_CMDR_XTF 0x08 -#define HSCX_CMDR_XIF 0x04 -#define HSCX_CMDR_XME 0x02 -#define HSCX_CMDR_XRES 0x01 - -#define HSCX_EXIR 0x24 -#define HSCX_EXIR_XDU 0x40 - -#define HSCX_RSTA 0x27 -#define HSCX_RSTA_VFR 0x80 -#define HSCX_RSTA_RDO 0x40 -#define HSCX_RSTA_CRC 0x20 -#define HSCX_RSTA_RAB 0x10 - -#define HSCX_CCR1 0x2f -#define HSCX_CCR2 0x2c -#define HSCX_TSAR 0x31 -#define HSCX_TSAX 0x30 -#define HSCX_XCCR 0x32 -#define HSCX_RCCR 0x33 -#define HSCX_MODE 0x22 - -#define HSCX_XAD1 0x24 -#define HSCX_XAD2 0x25 -#define HSCX_RAH2 0x27 -#define HSCX_TIMR 0x23 -#define HSCX_STAR 0x21 -#define HSCX_RBCL 0x25 -#define HSCX_XBCH 0x2d -#define HSCX_VSTR 0x2e -#define HSCX_RLCR 0x2e -#define HSCX_MASK 0x20 - -static inline void B_L1L2(struct hscx *hscx, int pr, void *arg) -{ - struct hisax_if *ifc = (struct hisax_if *) &hscx->b_if; - - DBG(0x10, "pr %#x", pr); - ifc->l1l2(ifc, pr, arg); -} - -static void hscx_version(struct hscx *hscx) -{ - int val; - - val = hscx->read_hscx(hscx, HSCX_VSTR) & 0xf; - DBG(1, "HSCX version (%x): %s", val, HSCXVer[val]); -} - -static void hscx_empty_fifo(struct hscx *hscx, int count) -{ - u8 *ptr; - - DBG(DBG_IRQ, "count %d", count); - - if ((hscx->rcvidx + count) >= HSCX_BUFMAX) { - DBG(DBG_WARN, "overrun %d", hscx->rcvidx + count); - hscx->write_hscx(hscx, HSCX_CMDR, HSCX_CMDR_RMC); - hscx->rcvidx = 0; - return; - } - ptr = hscx->rcvbuf + hscx->rcvidx; - hscx->rcvidx += count; - hscx->read_hscx_fifo(hscx, ptr, count); - hscx->write_hscx(hscx, HSCX_CMDR, HSCX_CMDR_RMC); - DBG_PACKET(DBG_RFIFO, ptr, count); -} - -static void hscx_fill_fifo(struct hscx *hscx) -{ - int count; - unsigned char cmd; - int fifo_size = test_bit(HSCX_IPAC, &hscx->flags)? 64: 32; - unsigned char *ptr; - - if (!hscx->tx_skb) - BUG(); - - count = hscx->tx_skb->len; - if (count <= 0) - BUG(); - - DBG(DBG_IRQ, "count %d", count); - - if (count > fifo_size || hscx->mode == L1_MODE_TRANS) { - count = fifo_size; - cmd = 0x8; - } else { - cmd = 0xa; - } - - ptr = hscx->tx_skb->data; - skb_pull(hscx->tx_skb, count); - hscx->tx_cnt += count; - DBG_PACKET(DBG_XFIFO, ptr, count); - hscx->write_hscx_fifo(hscx, ptr, count); - hscx->write_hscx(hscx, HSCX_CMDR, cmd); -} - -static void hscx_retransmit(struct hscx *hscx) -{ - if (!hscx->tx_skb) { - DBG(DBG_WARN, "no skb"); - return; - } - skb_push(hscx->tx_skb, hscx->tx_cnt); - hscx->tx_cnt = 0; - hscx->write_hscx(hscx, HSCX_CMDR, 0x01); -} - -static inline void hscx_rme_interrupt(struct hscx *hscx) -{ - unsigned char val; - int count; - struct sk_buff *skb; - int fifo_size = test_bit(HSCX_IPAC, &hscx->flags)? 64: 32; - - val = hscx->read_hscx(hscx, HSCX_RSTA); - if ((val & (HSCX_RSTA_VFR | HSCX_RSTA_RDO | HSCX_RSTA_CRC | HSCX_RSTA_RAB) ) - != (HSCX_RSTA_VFR | HSCX_RSTA_CRC)) { - DBG(DBG_WARN, "RSTA %#x, dropped", val); - hscx->write_hscx(hscx, HSCX_CMDR, HSCX_CMDR_RMC); - goto out; - } - - count = hscx->read_hscx(hscx, HSCX_RBCL) & (fifo_size-1); - DBG(DBG_IRQ, "RBCL %#x", count); - if (count == 0) - count = fifo_size; - - hscx_empty_fifo(hscx, count); - - count = hscx->rcvidx; - if (count < 1) { - DBG(DBG_WARN, "count %d < 1", count); - goto out; - } - - skb = alloc_skb(count, GFP_ATOMIC); - if (!skb) { - DBG(DBG_WARN, "no memory, dropping\n"); - goto out; - } - memcpy(skb_put(skb, count), hscx->rcvbuf, count); - DBG_SKB(DBG_RPACKET, skb); - B_L1L2(hscx, PH_DATA | INDICATION, skb); - out: - hscx->rcvidx = 0; -} - -static inline void hscx_xpr_interrupt(struct hscx *hscx) -{ - struct sk_buff *skb; - - skb = hscx->tx_skb; - if (!skb) - return; - - if (skb->len > 0) { - hscx_fill_fifo(hscx); - return; - } - hscx->tx_cnt = 0; - hscx->tx_skb = NULL; - B_L1L2(hscx, PH_DATA | CONFIRM, skb); -} - -static inline void hscx_exi_interrupt(struct hscx *hscx) -{ - unsigned char val; - - val = hscx->read_hscx(hscx, HSCX_EXIR); - DBG(2, "EXIR %#x", val); - - if (val & HSCX_EXIR_XDU) { - DBG(DBG_WARN, "HSCX XDU"); - if (hscx->mode == L1_MODE_TRANS) { - hscx_fill_fifo(hscx); - } else { - hscx_retransmit(hscx); - } - } -} - -static void hscx_reg_interrupt(struct hscx *hscx, unsigned char val) -{ - struct sk_buff *skb; - - if (val & HSCX_ISTA_XPR) { - DBG(DBG_IRQ, "XPR"); - hscx_xpr_interrupt(hscx); - } - if (val & HSCX_ISTA_RME) { - DBG(DBG_IRQ, "RME"); - hscx_rme_interrupt(hscx); - } - if (val & HSCX_ISTA_RPF) { - int fifo_size = test_bit(HSCX_IPAC, &hscx->flags)? 64: 32; - - DBG(DBG_IRQ, "RPF"); - hscx_empty_fifo(hscx, fifo_size); - if (hscx->mode == L1_MODE_TRANS) { - skb = dev_alloc_skb(fifo_size); - if (!skb) { - DBG(DBG_WARN, "no memory, dropping\n"); - goto out; - } - memcpy(skb_put(skb, fifo_size), hscx->rcvbuf, fifo_size); - DBG_SKB(DBG_RPACKET, skb); - B_L1L2(hscx, PH_DATA | INDICATION, skb); - out: - hscx->rcvidx = 0; - } - } -} - -void hscx_irq(struct hscx *hscx_a) -{ - struct hscx *hscx_b = hscx_a + 1; - unsigned char val; - - val = hscx_b->read_hscx(hscx_b, HSCX_ISTA); - DBG(DBG_IRQ, "ISTA B %#x", val); - - if (val & HSCX_ISTA_EXB) { - DBG(DBG_IRQ, "EXI B"); - hscx_exi_interrupt(hscx_b); - } - if (val & HSCX_ISTA_EXA) { - DBG(DBG_IRQ, "EXI A"); - hscx_exi_interrupt(hscx_a); - } - if (val & 0xf8) { - hscx_reg_interrupt(hscx_b, val); - } - if (val & HSCX_ISTA_ICA) { - val = hscx_a->read_hscx(hscx_a, HSCX_ISTA); - DBG(DBG_IRQ, "ISTA A %#x", val); - hscx_reg_interrupt(hscx_a, val); - hscx_a->write_hscx(hscx_a, HSCX_MASK, 0xff); - hscx_a->write_hscx(hscx_a, HSCX_MASK, 0x00); - } - hscx_b->write_hscx(hscx_b, HSCX_MASK, 0xff); - hscx_b->write_hscx(hscx_b, HSCX_MASK, 0x00); -} - -static void modehscx(struct hscx *hscx, int mode) -{ - int bc = hscx->channel; - - DBG(0x40, "hscx %c mode %d --> %d", - 'A' + hscx->channel, hscx->mode, mode); - - hscx->mode = mode; - hscx->write_hscx(hscx, HSCX_XAD1, 0xFF); - hscx->write_hscx(hscx, HSCX_XAD2, 0xFF); - hscx->write_hscx(hscx, HSCX_RAH2, 0xFF); - hscx->write_hscx(hscx, HSCX_XBCH, 0x0); - hscx->write_hscx(hscx, HSCX_RLCR, 0x0); - hscx->write_hscx(hscx, HSCX_CCR1, - test_bit(HSCX_IPAC, &hscx->flags) ? 0x82 : 0x85); - hscx->write_hscx(hscx, HSCX_CCR2, 0x30); - hscx->write_hscx(hscx, HSCX_XCCR, 7); - hscx->write_hscx(hscx, HSCX_RCCR, 7); - - /* Switch IOM 1 SSI */ - if (test_bit(HSCX_IOM1, &hscx->flags)) - bc = 1; - - hscx->write_hscx(hscx, HSCX_TSAX, hscx->tsaxr); - hscx->write_hscx(hscx, HSCX_TSAR, hscx->tsaxr); - - switch (mode) { - case (L1_MODE_NULL): - hscx->write_hscx(hscx, HSCX_TSAX, 0x1f); - hscx->write_hscx(hscx, HSCX_TSAR, 0x1f); - hscx->write_hscx(hscx, HSCX_MODE, 0x84); - break; - case (L1_MODE_TRANS): - hscx->write_hscx(hscx, HSCX_MODE, 0xe4); - break; - case (L1_MODE_HDLC): - hscx->write_hscx(hscx, HSCX_CCR1, test_bit(HSCX_IPAC, &hscx->flags) ? 0x8a : 0x8d); - hscx->write_hscx(hscx, HSCX_MODE, 0x8c); - break; - } - if (mode) - hscx->write_hscx(hscx, HSCX_CMDR, 0x41); - - hscx->write_hscx(hscx, HSCX_ISTA, 0x00); -} - -void hscx_init(struct hscx *hscx) -{ - if (hscx->channel) - hscx->tsaxr = 0x03; - else - hscx->tsaxr = 0x2f; -} - -void hscx_setup(struct hscx *hscx) -{ - hscx_version(hscx); - hscx->mode = -1; - modehscx(hscx, L1_MODE_NULL); -} - -void hscx_b_l2l1(struct hisax_if *ifc, int pr, void *arg) -{ - struct hscx *hscx = ifc->priv; - struct sk_buff *skb = arg; - int mode; - - DBG(0x10, "pr %#x", pr); - - switch (pr) { - case PH_DATA | REQUEST: - if (hscx->tx_skb) - BUG(); - - hscx->tx_skb = skb; - DBG_SKB(1, skb); - hscx_fill_fifo(hscx); - break; - case PH_ACTIVATE | REQUEST: - mode = (int) arg; - DBG(4,"B%d,PH_ACTIVATE_REQUEST %d", hscx->channel + 1, mode); - modehscx(hscx, mode); - B_L1L2(hscx, PH_ACTIVATE | INDICATION, NULL); - break; - case PH_DEACTIVATE | REQUEST: - DBG(4,"B%d,PH_DEACTIVATE_REQUEST", hscx->channel + 1); - modehscx(hscx, L1_MODE_NULL); - B_L1L2(hscx, PH_DEACTIVATE | INDICATION, NULL); - break; - } -} - -static int __init hisax_hscx_init(void) -{ - printk(KERN_INFO "hisax_hscx: HSCX ISDN driver v0.1.0\n"); - return 0; -} - -static void __exit hisax_hscx_exit(void) -{ -} - -EXPORT_SYMBOL(hscx_init); -EXPORT_SYMBOL(hscx_b_l2l1); - -EXPORT_SYMBOL(hscx_setup); -EXPORT_SYMBOL(hscx_irq); - -module_init(hisax_hscx_init); -module_exit(hisax_hscx_exit); diff -Nru a/drivers/isdn/hisax/hisax_hscx.h b/drivers/isdn/hisax/hisax_hscx.h --- a/drivers/isdn/hisax/hisax_hscx.h Thu Feb 19 23:44:26 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,37 +0,0 @@ -#ifndef __HISAX_HSCX_H__ -#define __HISAX_HSCX_H__ - -#include -#include "fsm.h" -#include "hisax_if.h" - -#define HSCX_BUFMAX 4096 - -#define HSCX_IOM1 0 -#define HSCX_IPAC 1 - -struct hscx { - void *priv; - u_long flags; - struct hisax_b_if b_if; - int mode; - int channel; - u8 tsaxr; - struct sk_buff *tx_skb; - int tx_cnt; - u8 rcvbuf[HSCX_BUFMAX]; - int rcvidx; - - u8 (*read_hscx) (struct hscx *, u8); - void (*write_hscx) (struct hscx *, u8, u8); - void (*read_hscx_fifo) (struct hscx *, u8 *, int); - void (*write_hscx_fifo)(struct hscx *, u8 *, int); -}; - -void hscx_init(struct hscx *hscx); -void hscx_b_l2l1(struct hisax_if *hisax_b_if, int pr, void *arg); - -void hscx_setup(struct hscx *hscx); -void hscx_irq(struct hscx *hscx); - -#endif diff -Nru a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c --- a/drivers/isdn/hisax/hisax_isac.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/hisax_isac.c Thu Feb 19 23:44:23 2004 @@ -450,7 +450,7 @@ { // this also works for isacsx, since // CMDR(D) register works the same - u8 *ptr; + u_char *ptr; DBG(DBG_IRQ, "count %d", count); @@ -474,7 +474,7 @@ int count; unsigned char cmd; - u8 *ptr; + u_char *ptr; if (!isac->tx_skb) BUG(); @@ -770,7 +770,7 @@ FsmInitTimer(&isac->l1m, &isac->timer); } -void hisax_isac_setup(struct isac *isac) +void isac_setup(struct isac *isac) { int val, eval; @@ -890,7 +890,7 @@ EXPORT_SYMBOL(isacsx_setup); EXPORT_SYMBOL(isacsx_irq); -EXPORT_SYMBOL(hisax_isac_setup); +EXPORT_SYMBOL(isac_setup); EXPORT_SYMBOL(isac_irq); module_init(hisax_isac_init); diff -Nru a/drivers/isdn/hisax/hisax_isac.h b/drivers/isdn/hisax/hisax_isac.h --- a/drivers/isdn/hisax/hisax_isac.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/hisax_isac.h Thu Feb 19 23:44:26 2004 @@ -17,26 +17,26 @@ struct hisax_d_if hisax_d_if; struct FsmInst l1m; struct FsmTimer timer; - u8 mocr; - u8 adf2; + u_char mocr; + u_char adf2; int type; - u8 rcvbuf[MAX_DFRAME_LEN_L1]; + u_char rcvbuf[MAX_DFRAME_LEN_L1]; int rcvidx; struct sk_buff *tx_skb; int tx_cnt; - u8 (*read_isac) (struct isac *, u8); - void (*write_isac) (struct isac *, u8, u8); - void (*read_isac_fifo) (struct isac *, u8 *, int); - void (*write_isac_fifo)(struct isac *, u8 *, int); + u_char (*read_isac) (struct isac *, u_char); + void (*write_isac) (struct isac *, u_char, u_char); + void (*read_isac_fifo) (struct isac *, u_char *, int); + void (*write_isac_fifo)(struct isac *, u_char *, int); }; void isac_init(struct isac *isac); void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg); -void hisax_isac_setup(struct isac *isac); +void isac_setup(struct isac *isac); void isac_irq(struct isac *isac); void isacsx_setup(struct isac *isac); diff -Nru a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c --- a/drivers/isdn/hisax/hscx.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/hisax/hscx.c Thu Feb 19 23:44:22 2004 @@ -1,4 +1,4 @@ -/* $Id: hscx.c,v 1.21.6.3 2001/09/23 22:24:48 kai Exp $ +/* $Id: hscx.c,v 1.24.2.4 2004/01/24 20:47:23 keil Exp $ * * HSCX specific routines * @@ -17,133 +17,136 @@ #include "isdnl1.h" #include -static char *HSCXVer[] __initdata = +static char *HSCXVer[] = {"A1", "?1", "A2", "?3", "A3", "V2.1", "?6", "?7", "?8", "?9", "?10", "?11", "?12", "?13", "?14", "???"}; -static inline u8 -hscx_read(struct BCState *bcs, u8 addr) -{ - struct IsdnCardState *cs = bcs->cs; - - return cs->bc_hw_ops->read_reg(cs, bcs->unit, addr); -} - -static inline void -hscx_write(struct BCState *bcs, u8 addr, u8 val) -{ - struct IsdnCardState *cs = bcs->cs; - - cs->bc_hw_ops->write_reg(cs, bcs->unit, addr, val); -} - -static inline void -hscx_write_fifo(struct BCState *bcs, u8 *p, int len) -{ - struct IsdnCardState *cs = bcs->cs; - - cs->bc_hw_ops->write_fifo(cs, bcs->unit, p, len); -} - -static int +int HscxVersion(struct IsdnCardState *cs, char *s) { int verA, verB; - verA = cs->bc_hw_ops->read_reg(cs, 0, HSCX_VSTR) & 0xf; - verB = cs->bc_hw_ops->read_reg(cs, 1, HSCX_VSTR) & 0xf; + verA = cs->BC_Read_Reg(cs, 0, HSCX_VSTR) & 0xf; + verB = cs->BC_Read_Reg(cs, 1, HSCX_VSTR) & 0xf; printk(KERN_INFO "%s HSCX version A: %s B: %s\n", s, HSCXVer[verA], HSCXVer[verB]); if ((verA == 0) | (verA == 0xf) | (verB == 0) | (verB == 0xf)) - return 1; + return (1); else - return 0; + return (0); } void modehscx(struct BCState *bcs, int mode, int bc) { struct IsdnCardState *cs = bcs->cs; - int hscx = bcs->unit; + int hscx = bcs->hw.hscx.hscx; if (cs->debug & L1_DEB_HSCX) debugl1(cs, "hscx %c mode %d ichan %d", 'A' + hscx, mode, bc); bcs->mode = mode; bcs->channel = bc; - hscx_write(bcs, HSCX_XAD1, 0xFF); - hscx_write(bcs, HSCX_XAD2, 0xFF); - hscx_write(bcs, HSCX_RAH2, 0xFF); - hscx_write(bcs, HSCX_XBCH, 0x0); - hscx_write(bcs, HSCX_RLCR, 0x0); - hscx_write(bcs, HSCX_CCR1, + cs->BC_Write_Reg(cs, hscx, HSCX_XAD1, 0xFF); + cs->BC_Write_Reg(cs, hscx, HSCX_XAD2, 0xFF); + cs->BC_Write_Reg(cs, hscx, HSCX_RAH2, 0xFF); + cs->BC_Write_Reg(cs, hscx, HSCX_XBCH, 0x0); + cs->BC_Write_Reg(cs, hscx, HSCX_RLCR, 0x0); + cs->BC_Write_Reg(cs, hscx, HSCX_CCR1, test_bit(HW_IPAC, &cs->HW_Flags) ? 0x82 : 0x85); - hscx_write(bcs, HSCX_CCR2, 0x30); - hscx_write(bcs, HSCX_XCCR, 7); - hscx_write(bcs, HSCX_RCCR, 7); + cs->BC_Write_Reg(cs, hscx, HSCX_CCR2, 0x30); + cs->BC_Write_Reg(cs, hscx, HSCX_XCCR, 7); + cs->BC_Write_Reg(cs, hscx, HSCX_RCCR, 7); /* Switch IOM 1 SSI */ if (test_bit(HW_IOM1, &cs->HW_Flags) && (hscx == 0)) bc = 1 - bc; if (bc == 0) { - hscx_write(bcs, HSCX_TSAX, + cs->BC_Write_Reg(cs, hscx, HSCX_TSAX, test_bit(HW_IOM1, &cs->HW_Flags) ? 0x7 : bcs->hw.hscx.tsaxr0); - hscx_write(bcs, HSCX_TSAR, + cs->BC_Write_Reg(cs, hscx, HSCX_TSAR, test_bit(HW_IOM1, &cs->HW_Flags) ? 0x7 : bcs->hw.hscx.tsaxr0); } else { - hscx_write(bcs, HSCX_TSAX, bcs->hw.hscx.tsaxr1); - hscx_write(bcs, HSCX_TSAR, bcs->hw.hscx.tsaxr1); + cs->BC_Write_Reg(cs, hscx, HSCX_TSAX, bcs->hw.hscx.tsaxr1); + cs->BC_Write_Reg(cs, hscx, HSCX_TSAR, bcs->hw.hscx.tsaxr1); } switch (mode) { - case L1_MODE_NULL: - hscx_write(bcs, HSCX_TSAX, 0x1f); - hscx_write(bcs, HSCX_TSAR, 0x1f); - hscx_write(bcs, HSCX_MODE, 0x84); - break; - case L1_MODE_TRANS: - hscx_write(bcs, HSCX_MODE, 0xe4); - break; - case L1_MODE_HDLC: - hscx_write(bcs, HSCX_CCR1, - test_bit(HW_IPAC, &cs->HW_Flags) ? 0x8a : 0x8d); - hscx_write(bcs, HSCX_MODE, 0x8c); - break; + case (L1_MODE_NULL): + cs->BC_Write_Reg(cs, hscx, HSCX_TSAX, 0x1f); + cs->BC_Write_Reg(cs, hscx, HSCX_TSAR, 0x1f); + cs->BC_Write_Reg(cs, hscx, HSCX_MODE, 0x84); + break; + case (L1_MODE_TRANS): + cs->BC_Write_Reg(cs, hscx, HSCX_MODE, 0xe4); + break; + case (L1_MODE_HDLC): + cs->BC_Write_Reg(cs, hscx, HSCX_CCR1, + test_bit(HW_IPAC, &cs->HW_Flags) ? 0x8a : 0x8d); + cs->BC_Write_Reg(cs, hscx, HSCX_MODE, 0x8c); + break; } if (mode) - hscx_write(bcs, HSCX_CMDR, 0x41); - - hscx_write(bcs, HSCX_ISTA, 0x00); + cs->BC_Write_Reg(cs, hscx, HSCX_CMDR, 0x41); + cs->BC_Write_Reg(cs, hscx, HSCX_ISTA, 0x00); } void hscx_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; + u_long flags; struct sk_buff *skb = arg; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->hw.hscx.count = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "hscx_l2l1: this shouldn't happen\n"); + } else { + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->hw.hscx.count = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - modehscx(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + modehscx(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - modehscx(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + modehscx(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -152,17 +155,50 @@ close_hscxstate(struct BCState *bcs) { modehscx(bcs, 0, bcs->channel); - bc_close(bcs); + if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { + if (bcs->hw.hscx.rcvbuf) { + kfree(bcs->hw.hscx.rcvbuf); + bcs->hw.hscx.rcvbuf = NULL; + } + if (bcs->blog) { + kfree(bcs->blog); + bcs->blog = NULL; + } + skb_queue_purge(&bcs->rqueue); + skb_queue_purge(&bcs->squeue); + if (bcs->tx_skb) { + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + } + } } int open_hscxstate(struct IsdnCardState *cs, struct BCState *bcs) { - bc_open(bcs); + if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { + if (!(bcs->hw.hscx.rcvbuf = kmalloc(HSCX_BUFMAX, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for hscx.rcvbuf\n"); + test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); + return (1); + } + if (!(bcs->blog = kmalloc(MAX_BLOG_SPACE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for bcs->blog\n"); + test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); + kfree(bcs->hw.hscx.rcvbuf); + bcs->hw.hscx.rcvbuf = NULL; + return (2); + } + skb_queue_head_init(&bcs->rqueue); + skb_queue_head_init(&bcs->squeue); + } bcs->tx_skb = NULL; test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); bcs->event = 0; - bcs->rcvidx = 0; + bcs->hw.hscx.rcvidx = 0; bcs->tx_cnt = 0; return (0); } @@ -174,80 +210,71 @@ if (open_hscxstate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = hscx_l2l1; + st->l2.l2l1 = hscx_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); return (0); } -static void hscx_fill_fifo(struct BCState *bcs); - -static struct bc_l1_ops hscx_l1_ops = { - .fill_fifo = hscx_fill_fifo, - .open = setstack_hscx, - .close = close_hscxstate, -}; - -void __init -inithscx(struct IsdnCardState *cs) +void +clear_pending_hscx_ints(struct IsdnCardState *cs) { int val, eval; - - cs->bc_l1_ops = &hscx_l1_ops; - cs->bcs[0].unit = 0; - cs->bcs[1].unit = 1; - cs->bcs[0].hw.hscx.tsaxr0 = 0x2f; - cs->bcs[0].hw.hscx.tsaxr1 = 3; - cs->bcs[1].hw.hscx.tsaxr0 = 0x2f; - cs->bcs[1].hw.hscx.tsaxr1 = 3; - val = hscx_read(&cs->bcs[1], HSCX_ISTA); + val = cs->BC_Read_Reg(cs, 1, HSCX_ISTA); debugl1(cs, "HSCX B ISTA %x", val); if (val & 0x01) { - eval = hscx_read(&cs->bcs[1], HSCX_EXIR); + eval = cs->BC_Read_Reg(cs, 1, HSCX_EXIR); debugl1(cs, "HSCX B EXIR %x", eval); } if (val & 0x02) { - eval = hscx_read(&cs->bcs[0], HSCX_EXIR); + eval = cs->BC_Read_Reg(cs, 0, HSCX_EXIR); debugl1(cs, "HSCX A EXIR %x", eval); } - val = hscx_read(&cs->bcs[0], HSCX_ISTA); + val = cs->BC_Read_Reg(cs, 0, HSCX_ISTA); debugl1(cs, "HSCX A ISTA %x", val); - val = hscx_read(&cs->bcs[1], HSCX_STAR); + val = cs->BC_Read_Reg(cs, 1, HSCX_STAR); debugl1(cs, "HSCX B STAR %x", val); - val = hscx_read(&cs->bcs[0], HSCX_STAR); + val = cs->BC_Read_Reg(cs, 0, HSCX_STAR); debugl1(cs, "HSCX A STAR %x", val); /* disable all IRQ */ - hscx_write(&cs->bcs[0], HSCX_MASK, 0xFF); - hscx_write(&cs->bcs[1], HSCX_MASK, 0xFF); - - modehscx(&cs->bcs[0], 0, 0); - modehscx(&cs->bcs[1], 0, 0); - - /* Reenable all IRQ */ - hscx_write(&cs->bcs[0], HSCX_MASK, 0x0); - hscx_write(&cs->bcs[1], HSCX_MASK, 0x0); + cs->BC_Write_Reg(cs, 0, HSCX_MASK, 0xFF); + cs->BC_Write_Reg(cs, 1, HSCX_MASK, 0xFF); } void -inithscxisac(struct IsdnCardState *cs) +inithscx(struct IsdnCardState *cs) { - initisac(cs); - inithscx(cs); + cs->bcs[0].BC_SetStack = setstack_hscx; + cs->bcs[1].BC_SetStack = setstack_hscx; + cs->bcs[0].BC_Close = close_hscxstate; + cs->bcs[1].BC_Close = close_hscxstate; + cs->bcs[0].hw.hscx.hscx = 0; + cs->bcs[1].hw.hscx.hscx = 1; + cs->bcs[0].hw.hscx.tsaxr0 = 0x2f; + cs->bcs[0].hw.hscx.tsaxr1 = 3; + cs->bcs[1].hw.hscx.tsaxr0 = 0x2f; + cs->bcs[1].hw.hscx.tsaxr1 = 3; + modehscx(cs->bcs, 0, 0); + modehscx(cs->bcs + 1, 0, 0); } -int -hscxisac_setup(struct IsdnCardState *cs, struct dc_hw_ops *isac_ops, - struct bc_hw_ops *hscx_ops) +void +inithscxisac(struct IsdnCardState *cs, int part) { - isac_setup(cs, isac_ops); - cs->bc_hw_ops = hscx_ops; - if (HscxVersion(cs, "HiSax:")) { - printk(KERN_WARNING "HiSax: invalid HSCX version\n"); - return -ENODEV; + if (part & 1) { + clear_pending_isac_ints(cs); + clear_pending_hscx_ints(cs); + initisac(cs); + inithscx(cs); + } + if (part & 2) { + /* Reenable all IRQ */ + cs->writeisac(cs, ISAC_MASK, 0); + cs->BC_Write_Reg(cs, 0, HSCX_MASK, 0); + cs->BC_Write_Reg(cs, 1, HSCX_MASK, 0); + /* RESET Receiver and Transmitter */ + cs->writeisac(cs, ISAC_CMDR, 0x41); } - return 0; } - -#include "hscx_irq.c" diff -Nru a/drivers/isdn/hisax/hscx.h b/drivers/isdn/hisax/hscx.h --- a/drivers/isdn/hisax/hscx.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/hscx.h Thu Feb 19 23:44:26 2004 @@ -1,4 +1,4 @@ -/* $Id: hscx.h,v 1.6.6.2 2001/09/23 22:24:48 kai Exp $ +/* $Id: hscx.h,v 1.8.2.2 2004/01/12 22:52:26 keil Exp $ * * HSCX specific defines * @@ -10,8 +10,6 @@ * */ -#include - /* All Registers original Siemens Spec */ #define HSCX_ISTA 0x20 @@ -36,10 +34,8 @@ #define HSCX_RLCR 0x2e #define HSCX_MASK 0x20 +extern int HscxVersion(struct IsdnCardState *cs, char *s); extern void modehscx(struct BCState *bcs, int mode, int bc); -extern void inithscxisac(struct IsdnCardState *cs); -extern void hscx_int_main(struct IsdnCardState *cs, u8 val); -extern irqreturn_t hscxisac_irq(int intno, void *dev_id, struct pt_regs *regs); -extern int hscxisac_setup(struct IsdnCardState *cs, - struct dc_hw_ops *isac_ops, - struct bc_hw_ops *hscx_ops); +extern void clear_pending_hscx_ints(struct IsdnCardState *cs); +extern void inithscx(struct IsdnCardState *cs); +extern void inithscxisac(struct IsdnCardState *cs, int part); diff -Nru a/drivers/isdn/hisax/hscx_irq.c b/drivers/isdn/hisax/hscx_irq.c --- a/drivers/isdn/hisax/hscx_irq.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/hscx_irq.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: hscx_irq.c,v 1.16.6.2 2001/09/23 22:24:48 kai Exp $ +/* $Id: hscx_irq.c,v 1.18.2.3 2004/02/11 13:21:34 keil Exp $ * * low level b-channel stuff for Siemens HSCX * @@ -12,12 +12,13 @@ * */ -static void -waitforCEC(struct BCState *bcs) + +static inline void +waitforCEC(struct IsdnCardState *cs, int hscx) { int to = 50; - while ((hscx_read(bcs, HSCX_STAR) & 0x04) && to) { + while ((READHSCX(cs, hscx, HSCX_STAR) & 0x04) && to) { udelay(1); to--; } @@ -26,12 +27,12 @@ } -static void -waitforXFW(struct BCState *bcs) +static inline void +waitforXFW(struct IsdnCardState *cs, int hscx) { int to = 50; - while ((!(hscx_read(bcs, HSCX_STAR) & 0x44) == 0x40) && to) { + while ((!(READHSCX(cs, hscx, HSCX_STAR) & 0x44) == 0x40) && to) { udelay(1); to--; } @@ -40,18 +41,42 @@ } static inline void -WriteHSCXCMDR(struct BCState *bcs, u8 data) +WriteHSCXCMDR(struct IsdnCardState *cs, int hscx, u_char data) { - waitforCEC(bcs); - hscx_write(bcs, HSCX_CMDR, data); + waitforCEC(cs, hscx); + WRITEHSCX(cs, hscx, HSCX_CMDR, data); } + static void hscx_empty_fifo(struct BCState *bcs, int count) { - recv_empty_fifo_b(bcs, count); - WriteHSCXCMDR(bcs, 0x80); + u_char *ptr; + struct IsdnCardState *cs = bcs->cs; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hscx_empty_fifo"); + + if (bcs->hw.hscx.rcvidx + count > HSCX_BUFMAX) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "hscx_empty_fifo: incoming packet too large"); + WriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x80); + bcs->hw.hscx.rcvidx = 0; + return; + } + ptr = bcs->hw.hscx.rcvbuf + bcs->hw.hscx.rcvidx; + bcs->hw.hscx.rcvidx += count; + READHSCXFIFO(cs, bcs->hw.hscx.hscx, ptr, count); + WriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x80); + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "hscx_empty_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } static void @@ -60,22 +85,46 @@ struct IsdnCardState *cs = bcs->cs; int more, count; int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; - u8 *p; + u_char *ptr; - p = xmit_fill_fifo_b(bcs, fifo_size, &count, &more); - if (!p) + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hscx_fill_fifo"); + + if (!bcs->tx_skb) + return; + if (bcs->tx_skb->len <= 0) return; - waitforXFW(bcs); - hscx_write_fifo(bcs, p, count); - WriteHSCXCMDR(bcs, more ? 0x8 : 0xa); + more = (bcs->mode == L1_MODE_TRANS) ? 1 : 0; + if (bcs->tx_skb->len > fifo_size) { + more = !0; + count = fifo_size; + } else + count = bcs->tx_skb->len; + + waitforXFW(cs, bcs->hw.hscx.hscx); + ptr = bcs->tx_skb->data; + skb_pull(bcs->tx_skb, count); + bcs->tx_cnt -= count; + bcs->hw.hscx.count += count; + WRITEHSCXFIFO(cs, bcs->hw.hscx.hscx, ptr, count); + WriteHSCXCMDR(cs, bcs->hw.hscx.hscx, more ? 0x8 : 0xa); + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "hscx_fill_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } static inline void -hscx_interrupt(struct IsdnCardState *cs, u8 val, u8 hscx) +hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx) { - u8 r; + u_char r; struct BCState *bcs = cs->bcs + hscx; + struct sk_buff *skb; int fifo_size = test_bit(HW_IPAC, &cs->HW_Flags)? 64: 32; int count; @@ -83,7 +132,7 @@ return; if (val & 0x80) { /* RME */ - r = hscx_read(bcs, HSCX_RSTA); + r = READHSCX(cs, hscx, HSCX_RSTA); if ((r & 0xf0) != 0xa0) { if (!(r & 0x80)) { if (cs->debug & L1_DEB_WARN) @@ -107,46 +156,102 @@ bcs->err_crc++; #endif } - WriteHSCXCMDR(bcs, 0x80); - bcs->rcvidx = 0; + WriteHSCXCMDR(cs, hscx, 0x80); } else { - count = hscx_read(bcs, HSCX_RBCL) & (fifo_size-1); + count = READHSCX(cs, hscx, HSCX_RBCL) & ( + test_bit(HW_IPAC, &cs->HW_Flags)? 0x3f: 0x1f); if (count == 0) count = fifo_size; - hscx_empty_fifo(bcs, count); - recv_rme_b(bcs); + if ((count = bcs->hw.hscx.rcvidx - 1) > 0) { + if (cs->debug & L1_DEB_HSCX_FIFO) + debugl1(cs, "HX Frame %d", count); + if (!(skb = dev_alloc_skb(count))) + printk(KERN_WARNING "HSCX: receive out of memory\n"); + else { + memcpy(skb_put(skb, count), bcs->hw.hscx.rcvbuf, count); + skb_queue_tail(&bcs->rqueue, skb); + } + } } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); } if (val & 0x40) { /* RPF */ hscx_empty_fifo(bcs, fifo_size); - recv_rpf_b(bcs); + if (bcs->mode == L1_MODE_TRANS) { + /* receive audio data */ + if (!(skb = dev_alloc_skb(fifo_size))) + printk(KERN_WARNING "HiSax: receive out of memory\n"); + else { + memcpy(skb_put(skb, fifo_size), bcs->hw.hscx.rcvbuf, fifo_size); + skb_queue_tail(&bcs->rqueue, skb); + } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); + } } - if (val & 0x10) { - xmit_xpr_b(bcs); + if (val & 0x10) { /* XPR */ + if (bcs->tx_skb) { + if (bcs->tx_skb->len) { + hscx_fill_fifo(bcs); + return; + } else { + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.hscx.count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_irq(bcs->tx_skb); + bcs->hw.hscx.count = 0; + bcs->tx_skb = NULL; + } + } + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + bcs->hw.hscx.count = 0; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + hscx_fill_fifo(bcs); + } else { + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + schedule_event(bcs, B_XMTBUFREADY); + } } } -static void -reset_xmit(struct BCState *bcs) +static inline void +hscx_int_main(struct IsdnCardState *cs, u_char val) { - WriteHSCXCMDR(bcs, 0x01); -} -void -hscx_int_main(struct IsdnCardState *cs, u8 val) -{ - u8 exval; + u_char exval; struct BCState *bcs; if (val & 0x01) { bcs = cs->bcs + 1; - exval = hscx_read(bcs, HSCX_EXIR); - if (cs->debug & L1_DEB_HSCX) - debugl1(cs, "HSCX B EXIR %x", exval); + exval = READHSCX(cs, 1, HSCX_EXIR); if (exval & 0x40) { - xmit_xdu_b(bcs, reset_xmit); - } + if (bcs->mode == 1) + hscx_fill_fifo(bcs); + else { +#ifdef ERROR_STATISTIC + bcs->err_tx++; +#endif + /* Here we lost an TX interrupt, so + * restart transmitting the whole frame. + */ + if (bcs->tx_skb) { + skb_push(bcs->tx_skb, bcs->hw.hscx.count); + bcs->tx_cnt += bcs->hw.hscx.count; + bcs->hw.hscx.count = 0; + } + WriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x01); + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "HSCX B EXIR %x Lost TX", exval); + } + } else if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX B EXIR %x", exval); } if (val & 0xf8) { if (cs->debug & L1_DEB_HSCX) @@ -155,72 +260,33 @@ } if (val & 0x02) { bcs = cs->bcs; - exval = hscx_read(bcs, HSCX_EXIR); - if (cs->debug & L1_DEB_HSCX) - debugl1(cs, "HSCX A EXIR %x", exval); + exval = READHSCX(cs, 0, HSCX_EXIR); if (exval & 0x40) { - xmit_xdu_b(bcs, reset_xmit); - } + if (bcs->mode == L1_MODE_TRANS) + hscx_fill_fifo(bcs); + else { + /* Here we lost an TX interrupt, so + * restart transmitting the whole frame. + */ +#ifdef ERROR_STATISTIC + bcs->err_tx++; +#endif + if (bcs->tx_skb) { + skb_push(bcs->tx_skb, bcs->hw.hscx.count); + bcs->tx_cnt += bcs->hw.hscx.count; + bcs->hw.hscx.count = 0; + } + WriteHSCXCMDR(cs, bcs->hw.hscx.hscx, 0x01); + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "HSCX A EXIR %x Lost TX", exval); + } + } else if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX A EXIR %x", exval); } if (val & 0x04) { - bcs = cs->bcs; - exval = hscx_read(bcs, HSCX_ISTA); + exval = READHSCX(cs, 0, HSCX_ISTA); if (cs->debug & L1_DEB_HSCX) debugl1(cs, "HSCX A interrupt %x", exval); hscx_interrupt(cs, exval, 0); } } - -/* ====================================================================== */ - -static inline u8 -isac_read(struct IsdnCardState *cs, u8 addr) -{ - return cs->dc_hw_ops->read_reg(cs, addr); -} - -static inline void -isac_write(struct IsdnCardState *cs, u8 addr, u8 val) -{ - cs->dc_hw_ops->write_reg(cs, addr, val); -} - -irqreturn_t -hscxisac_irq(int intno, void *dev_id, struct pt_regs *regs) -{ - struct IsdnCardState *cs = dev_id; - u8 val; - int count = 0; - - spin_lock(&cs->lock); - val = hscx_read(&cs->bcs[1], HSCX_ISTA); - Start_HSCX: - if (val) - hscx_int_main(cs, val); - val = isac_read(cs, ISAC_ISTA); - Start_ISAC: - if (val) - isac_interrupt(cs, val); - count++; - val = hscx_read(&cs->bcs[1], HSCX_ISTA); - if (val && count < 5) { - if (cs->debug & L1_DEB_HSCX) - debugl1(cs, "HSCX IntStat after IntRoutine"); - goto Start_HSCX; - } - val = isac_read(cs, ISAC_ISTA); - if (val && count < 5) { - if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "ISAC IntStat after IntRoutine"); - goto Start_ISAC; - } - hscx_write(&cs->bcs[0], HSCX_MASK, 0xFF); - hscx_write(&cs->bcs[1], HSCX_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0x0); - hscx_write(&cs->bcs[0], HSCX_MASK, 0x0); - hscx_write(&cs->bcs[1], HSCX_MASK, 0x0); - spin_unlock(&cs->lock); - return IRQ_HANDLED; -} - diff -Nru a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c --- a/drivers/isdn/hisax/icc.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/hisax/icc.c Thu Feb 19 23:44:22 2004 @@ -1,4 +1,4 @@ -/* $Id: icc.c,v 1.5.6.4 2001/09/23 22:24:48 kai Exp $ +/* $Id: icc.c,v 1.8.2.3 2004/01/13 14:31:25 keil Exp $ * * ICC specific routines * @@ -24,39 +24,15 @@ #define DBUSY_TIMER_VALUE 80 #define ARCOFI_USE 0 -static inline u8 -icc_read_reg(struct IsdnCardState *cs, u8 addr) -{ - return cs->dc_hw_ops->read_reg(cs, addr); -} - -static inline void -icc_write_reg(struct IsdnCardState *cs, u8 addr, u8 val) -{ - cs->dc_hw_ops->write_reg(cs, addr, val); -} - -static inline void -icc_read_fifo(struct IsdnCardState *cs, u8 *p, int len) -{ - return cs->dc_hw_ops->read_fifo(cs, p, len); -} - -static inline void -icc_write_fifo(struct IsdnCardState *cs, u8 *p, int len) -{ - return cs->dc_hw_ops->write_fifo(cs, p, len); -} - static char *ICCVer[] __initdata = {"2070 A1/A3", "2070 B1", "2070 B2/B3", "2070 V2.4"}; -static void +void ICCVersion(struct IsdnCardState *cs, char *s) { int val; - val = icc_read_reg(cs, ICC_RBCH); + val = cs->readisac(cs, ICC_RBCH); printk(KERN_INFO "%s ICC version (%x): %s\n", s, val, ICCVer[(val >> 5) & 3]); } @@ -65,7 +41,7 @@ { if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ph_command %x", command); - icc_write_reg(cs, ICC_CIX0, (command << 2) | 3); + cs->writeisac(cs, ICC_CIX0, (command << 2) | 3); } @@ -101,9 +77,8 @@ } static void -icc_bh(void *data) +icc_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; struct PStack *stptr; if (!cs) @@ -113,7 +88,7 @@ debugl1(cs, "D-Channel Busy cleared"); stptr = cs->stlist; while (stptr != NULL) { - L1L2(stptr, PH_PAUSE | CONFIRM, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); stptr = stptr->next; } } @@ -136,22 +111,58 @@ void icc_empty_fifo(struct IsdnCardState *cs, int count) { - recv_empty_fifo_d(cs, count); - icc_write_reg(cs, ICC_CMDR, 0x80); + u_char *ptr; + + if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) + debugl1(cs, "icc_empty_fifo"); + + if ((cs->rcvidx + count) >= MAX_DFRAME_LEN_L1) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "icc_empty_fifo overrun %d", + cs->rcvidx + count); + cs->writeisac(cs, ICC_CMDR, 0x80); + cs->rcvidx = 0; + return; + } + ptr = cs->rcvbuf + cs->rcvidx; + cs->rcvidx += count; + cs->readisacfifo(cs, ptr, count); + cs->writeisac(cs, ICC_CMDR, 0x80); + if (cs->debug & L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "icc_empty_fifo cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } static void icc_fill_fifo(struct IsdnCardState *cs) { int count, more; - unsigned char *p; + u_char *ptr; + + if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) + debugl1(cs, "icc_fill_fifo"); - p = xmit_fill_fifo_d(cs, 32, &count, &more); - if (!p) + if (!cs->tx_skb) return; - icc_write_fifo(cs, p, count); - icc_write_reg(cs, ICC_CMDR, more ? 0x8 : 0xa); + count = cs->tx_skb->len; + if (count <= 0) + return; + + more = 0; + if (count > 32) { + more = !0; + count = 32; + } + ptr = cs->tx_skb->data; + skb_pull(cs->tx_skb, count); + cs->tx_cnt += count; + cs->writeisacfifo(cs, ptr, count); + cs->writeisac(cs, ICC_CMDR, more ? 0x8 : 0xa); if (test_and_set_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { debugl1(cs, "icc_fill_fifo dbusytimer running"); del_timer(&cs->dbusytimer); @@ -159,18 +170,26 @@ init_timer(&cs->dbusytimer); cs->dbusytimer.expires = jiffies + ((DBUSY_TIMER_VALUE * HZ)/1000); add_timer(&cs->dbusytimer); + if (cs->debug & L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "icc_fill_fifo cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } void -icc_interrupt(struct IsdnCardState *cs, u8 val) +icc_interrupt(struct IsdnCardState *cs, u_char val) { - u8 exval, v1; + u_char exval, v1; + struct sk_buff *skb; unsigned int count; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ICC interrupt %x", val); if (val & 0x80) { /* RME */ - exval = icc_read_reg(cs, ICC_RSTA); + exval = cs->readisac(cs, ICC_RSTA); if ((exval & 0x70) != 0x20) { if (exval & 0x40) { if (cs->debug & L1_DEB_WARN) @@ -186,15 +205,24 @@ cs->err_crc++; #endif } - icc_write_reg(cs, ICC_CMDR, 0x80); - cs->rcvidx = 0; + cs->writeisac(cs, ICC_CMDR, 0x80); } else { - count = icc_read_reg(cs, ICC_RBCL) & 0x1f; + count = cs->readisac(cs, ICC_RBCL) & 0x1f; if (count == 0) count = 32; icc_empty_fifo(cs, count); - recv_rme_d(cs); + if ((count = cs->rcvidx) > 0) { + cs->rcvidx = 0; + if (!(skb = alloc_skb(count, GFP_ATOMIC))) + printk(KERN_WARNING "HiSax: D receive out of memory\n"); + else { + memcpy(skb_put(skb, count), cs->rcvbuf, count); + skb_queue_tail(&cs->rq, skb); + } + } } + cs->rcvidx = 0; + schedule_event(cs, D_RCVBUFREADY); } if (val & 0x40) { /* RPF */ icc_empty_fifo(cs, 32); @@ -205,20 +233,39 @@ debugl1(cs, "ICC RSC interrupt"); } if (val & 0x10) { /* XPR */ - xmit_xpr_d(cs); + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { + if (cs->tx_skb->len) { + icc_fill_fifo(cs); + goto afterXPR; + } else { + dev_kfree_skb_irq(cs->tx_skb); + cs->tx_cnt = 0; + cs->tx_skb = NULL; + } + } + if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_cnt = 0; + icc_fill_fifo(cs); + } else + schedule_event(cs, D_XMTBUFREADY); } + afterXPR: if (val & 0x04) { /* CISQ */ - exval = icc_read_reg(cs, ICC_CIR0); + exval = cs->readisac(cs, ICC_CIR0); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ICC CIR0 %02X", exval ); if (exval & 2) { cs->dc.icc.ph_state = (exval >> 2) & 0xf; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ph_state change %x", cs->dc.icc.ph_state); - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); } if (exval & 1) { - exval = icc_read_reg(cs, ICC_CIR1); + exval = cs->readisac(cs, ICC_CIR1); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ICC CIR1 %02X", exval ); } @@ -229,7 +276,7 @@ debugl1(cs, "ICC SIN interrupt"); } if (val & 0x01) { /* EXI */ - exval = icc_read_reg(cs, ICC_EXIR); + exval = cs->readisac(cs, ICC_EXIR); if (cs->debug & L1_DEB_WARN) debugl1(cs, "ICC EXIR %02x", exval); if (exval & 0x80) { /* XMR */ @@ -237,10 +284,26 @@ printk(KERN_WARNING "HiSax: ICC XMR\n"); } if (exval & 0x40) { /* XDU */ - xmit_xdu_d(cs, NULL); + debugl1(cs, "ICC XDU"); + printk(KERN_WARNING "HiSax: ICC XDU\n"); +#ifdef ERROR_STATISTIC + cs->err_tx++; +#endif + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { /* Restart frame */ + skb_push(cs->tx_skb, cs->tx_cnt); + cs->tx_cnt = 0; + icc_fill_fifo(cs); + } else { + printk(KERN_WARNING "HiSax: ICC XDU no skb\n"); + debugl1(cs, "ICC XDU no skb"); + } } if (exval & 0x04) { /* MOS */ - v1 = icc_read_reg(cs, ICC_MOSR); + v1 = cs->readisac(cs, ICC_MOSR); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ICC MOSR %02x", v1); #if ARCOFI_USE @@ -251,7 +314,7 @@ debugl1(cs, "ICC MON RX out of memory!"); cs->dc.icc.mocr &= 0xf0; cs->dc.icc.mocr |= 0x0a; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); goto afterMONR0; } else cs->dc.icc.mon_rxp = 0; @@ -259,18 +322,18 @@ if (cs->dc.icc.mon_rxp >= MAX_MON_FRAME) { cs->dc.icc.mocr &= 0xf0; cs->dc.icc.mocr |= 0x0a; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); cs->dc.icc.mon_rxp = 0; if (cs->debug & L1_DEB_WARN) debugl1(cs, "ICC MON RX overflow!"); goto afterMONR0; } - cs->dc.icc.mon_rx[cs->dc.icc.mon_rxp++] = icc_read_reg(cs, ICC_MOR0); + cs->dc.icc.mon_rx[cs->dc.icc.mon_rxp++] = cs->readisac(cs, ICC_MOR0); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ICC MOR0 %02x", cs->dc.icc.mon_rx[cs->dc.icc.mon_rxp -1]); if (cs->dc.icc.mon_rxp == 1) { cs->dc.icc.mocr |= 0x04; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); } } afterMONR0: @@ -281,7 +344,7 @@ debugl1(cs, "ICC MON RX out of memory!"); cs->dc.icc.mocr &= 0x0f; cs->dc.icc.mocr |= 0xa0; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); goto afterMONR1; } else cs->dc.icc.mon_rxp = 0; @@ -289,51 +352,51 @@ if (cs->dc.icc.mon_rxp >= MAX_MON_FRAME) { cs->dc.icc.mocr &= 0x0f; cs->dc.icc.mocr |= 0xa0; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); cs->dc.icc.mon_rxp = 0; if (cs->debug & L1_DEB_WARN) debugl1(cs, "ICC MON RX overflow!"); goto afterMONR1; } - cs->dc.icc.mon_rx[cs->dc.icc.mon_rxp++] = icc_read_reg(cs, ICC_MOR1); + cs->dc.icc.mon_rx[cs->dc.icc.mon_rxp++] = cs->readisac(cs, ICC_MOR1); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ICC MOR1 %02x", cs->dc.icc.mon_rx[cs->dc.icc.mon_rxp -1]); cs->dc.icc.mocr |= 0x40; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); } afterMONR1: if (v1 & 0x04) { cs->dc.icc.mocr &= 0xf0; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); cs->dc.icc.mocr |= 0x0a; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); - sched_d_event(cs, D_RX_MON0); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); + schedule_event(cs, D_RX_MON0); } if (v1 & 0x40) { cs->dc.icc.mocr &= 0x0f; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); cs->dc.icc.mocr |= 0xa0; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); - sched_d_event(cs, D_RX_MON1); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); + schedule_event(cs, D_RX_MON1); } if (v1 & 0x02) { if ((!cs->dc.icc.mon_tx) || (cs->dc.icc.mon_txc && (cs->dc.icc.mon_txp >= cs->dc.icc.mon_txc) && !(v1 & 0x08))) { cs->dc.icc.mocr &= 0xf0; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); cs->dc.icc.mocr |= 0x0a; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); if (cs->dc.icc.mon_txc && (cs->dc.icc.mon_txp >= cs->dc.icc.mon_txc)) - sched_d_event(cs, D_TX_MON0); + schedule_event(cs, D_TX_MON0); goto AfterMOX0; } if (cs->dc.icc.mon_txc && (cs->dc.icc.mon_txp >= cs->dc.icc.mon_txc)) { - sched_d_event(cs, D_TX_MON0); + schedule_event(cs, D_TX_MON0); goto AfterMOX0; } - icc_write_reg(cs, ICC_MOX0, + cs->writeisac(cs, ICC_MOX0, cs->dc.icc.mon_tx[cs->dc.icc.mon_txp++]); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ICC %02x -> MOX0", cs->dc.icc.mon_tx[cs->dc.icc.mon_txp -1]); @@ -344,19 +407,19 @@ (cs->dc.icc.mon_txp >= cs->dc.icc.mon_txc) && !(v1 & 0x80))) { cs->dc.icc.mocr &= 0x0f; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); cs->dc.icc.mocr |= 0xa0; - icc_write_reg(cs, ICC_MOCR, cs->dc.icc.mocr); + cs->writeisac(cs, ICC_MOCR, cs->dc.icc.mocr); if (cs->dc.icc.mon_txc && (cs->dc.icc.mon_txp >= cs->dc.icc.mon_txc)) - sched_d_event(cs, D_TX_MON1); + schedule_event(cs, D_TX_MON1); goto AfterMOX1; } if (cs->dc.icc.mon_txc && (cs->dc.icc.mon_txp >= cs->dc.icc.mon_txc)) { - sched_d_event(cs, D_TX_MON1); + schedule_event(cs, D_TX_MON1); goto AfterMOX1; } - icc_write_reg(cs, ICC_MOX1, + cs->writeisac(cs, ICC_MOX1, cs->dc.icc.mon_tx[cs->dc.icc.mon_txp++]); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ICC %02x -> MOX1", cs->dc.icc.mon_tx[cs->dc.icc.mon_txp -1]); @@ -372,35 +435,91 @@ { struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; + u_long flags; int val; switch (pr) { case (PH_DATA |REQUEST): - xmit_data_req_d(cs, skb); + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + skb_queue_tail(&cs->sq, skb); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA Queued", 0); +#endif + } else { + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA", 0); +#endif + icc_fill_fifo(cs); + } + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL |INDICATION): - xmit_pull_ind_d(cs, skb); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); + skb_queue_tail(&cs->sq, skb); + break; + } + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); +#endif + icc_fill_fifo(cs); + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_d(st); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + debugl1(cs, "-> PH_REQUEST_PULL"); +#endif + if (!cs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (HW_RESET | REQUEST): + spin_lock_irqsave(&cs->lock, flags); if ((cs->dc.icc.ph_state == ICC_IND_EI1) || (cs->dc.icc.ph_state == ICC_IND_DR)) ph_command(cs, ICC_CMD_DI); else ph_command(cs, ICC_CMD_RES); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_ENABLE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); ph_command(cs, ICC_CMD_DI); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_INFO1 | REQUEST): + spin_lock_irqsave(&cs->lock, flags); ph_command(cs, ICC_CMD_AR); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_INFO3 | REQUEST): + spin_lock_irqsave(&cs->lock, flags); ph_command(cs, ICC_CMD_AI); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_TESTLOOP | REQUEST): + spin_lock_irqsave(&cs->lock, flags); val = 0; if (1 & (long) arg) val |= 0x0c; @@ -409,20 +528,21 @@ if (test_bit(HW_IOM1, &cs->HW_Flags)) { /* IOM 1 Mode */ if (!val) { - icc_write_reg(cs, ICC_SPCR, 0xa); - icc_write_reg(cs, ICC_ADF1, 0x2); + cs->writeisac(cs, ICC_SPCR, 0xa); + cs->writeisac(cs, ICC_ADF1, 0x2); } else { - icc_write_reg(cs, ICC_SPCR, val); - icc_write_reg(cs, ICC_ADF1, 0xa); + cs->writeisac(cs, ICC_SPCR, val); + cs->writeisac(cs, ICC_ADF1, 0xa); } } else { /* IOM 2 Mode */ - icc_write_reg(cs, ICC_SPCR, val); + cs->writeisac(cs, ICC_SPCR, val); if (val) - icc_write_reg(cs, ICC_ADF1, 0x8); + cs->writeisac(cs, ICC_ADF1, 0x8); else - icc_write_reg(cs, ICC_ADF1, 0x0); + cs->writeisac(cs, ICC_ADF1, 0x0); } + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_DEACTIVATE | RESPONSE): skb_queue_purge(&cs->rq); @@ -434,7 +554,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); break; default: if (cs->debug & L1_DEB_WARN) @@ -443,11 +563,10 @@ } } -static int +void setstack_icc(struct PStack *st, struct IsdnCardState *cs) { st->l1.l1hw = ICC_l1hw; - return 0; } void @@ -469,8 +588,8 @@ int rbch, star; if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { - rbch = icc_read_reg(cs, ICC_RBCH); - star = icc_read_reg(cs, ICC_STAR); + rbch = cs->readisac(cs, ICC_RBCH); + star = cs->readisac(cs, ICC_STAR); if (cs->debug) debugl1(cs, "D-Channel Busy RBCH %02x STAR %02x", rbch, star); @@ -478,7 +597,7 @@ test_and_set_bit(FLG_L1_DBUSY, &cs->HW_Flags); stptr = cs->stlist; while (stptr != NULL) { - L1L2(stptr, PH_PAUSE | INDICATION, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | INDICATION, NULL); stptr = stptr->next; } } else { @@ -492,77 +611,75 @@ printk(KERN_WARNING "HiSax: ICC D-Channel Busy no skb\n"); debugl1(cs, "D-Channel Busy no skb"); } - icc_write_reg(cs, ICC_CMDR, 0x01); /* Transmitter reset */ - cs->card_ops->irq_func(cs->irq, cs, NULL); /* FIXME? */ + cs->writeisac(cs, ICC_CMDR, 0x01); /* Transmitter reset */ + cs->irq_func(cs->irq, cs, NULL); } } } -static struct dc_l1_ops icc_l1_ops = { - .fill_fifo = icc_fill_fifo, - .open = setstack_icc, - .close = DC_Close_icc, - .bh_func = icc_bh, - .dbusy_func = dbusy_timer_handler, -}; - void __init initicc(struct IsdnCardState *cs) { - int val, eval; - - dc_l1_init(cs, &icc_l1_ops); + cs->setstack_d = setstack_icc; + cs->DC_Close = DC_Close_icc; cs->dc.icc.mon_tx = NULL; cs->dc.icc.mon_rx = NULL; + cs->writeisac(cs, ICC_MASK, 0xff); + cs->dc.icc.mocr = 0xaa; + if (test_bit(HW_IOM1, &cs->HW_Flags)) { + /* IOM 1 Mode */ + cs->writeisac(cs, ICC_ADF2, 0x0); + cs->writeisac(cs, ICC_SPCR, 0xa); + cs->writeisac(cs, ICC_ADF1, 0x2); + cs->writeisac(cs, ICC_STCR, 0x70); + cs->writeisac(cs, ICC_MODE, 0xc9); + } else { + /* IOM 2 Mode */ + if (!cs->dc.icc.adf2) + cs->dc.icc.adf2 = 0x80; + cs->writeisac(cs, ICC_ADF2, cs->dc.icc.adf2); + cs->writeisac(cs, ICC_SQXR, 0xa0); + cs->writeisac(cs, ICC_SPCR, 0x20); + cs->writeisac(cs, ICC_STCR, 0x70); + cs->writeisac(cs, ICC_MODE, 0xca); + cs->writeisac(cs, ICC_TIMR, 0x00); + cs->writeisac(cs, ICC_ADF1, 0x20); + } + ph_command(cs, ICC_CMD_RES); + cs->writeisac(cs, ICC_MASK, 0x0); + ph_command(cs, ICC_CMD_DI); +} + +void __init +clear_pending_icc_ints(struct IsdnCardState *cs) +{ + int val, eval; - val = icc_read_reg(cs, ICC_STAR); + val = cs->readisac(cs, ICC_STAR); debugl1(cs, "ICC STAR %x", val); - val = icc_read_reg(cs, ICC_MODE); + val = cs->readisac(cs, ICC_MODE); debugl1(cs, "ICC MODE %x", val); - val = icc_read_reg(cs, ICC_ADF2); + val = cs->readisac(cs, ICC_ADF2); debugl1(cs, "ICC ADF2 %x", val); - val = icc_read_reg(cs, ICC_ISTA); + val = cs->readisac(cs, ICC_ISTA); debugl1(cs, "ICC ISTA %x", val); if (val & 0x01) { - eval = icc_read_reg(cs, ICC_EXIR); + eval = cs->readisac(cs, ICC_EXIR); debugl1(cs, "ICC EXIR %x", eval); } - val = icc_read_reg(cs, ICC_CIR0); + val = cs->readisac(cs, ICC_CIR0); debugl1(cs, "ICC CIR0 %x", val); cs->dc.icc.ph_state = (val >> 2) & 0xf; - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); /* Disable all IRQ */ - icc_write_reg(cs, ICC_MASK, 0xFF); - - cs->dc.icc.mocr = 0xaa; - if (test_bit(HW_IOM1, &cs->HW_Flags)) { - /* IOM 1 Mode */ - icc_write_reg(cs, ICC_ADF2, 0x0); - icc_write_reg(cs, ICC_SPCR, 0xa); - icc_write_reg(cs, ICC_ADF1, 0x2); - icc_write_reg(cs, ICC_STCR, 0x70); - icc_write_reg(cs, ICC_MODE, 0xc9); - } else { - /* IOM 2 Mode */ - if (!cs->dc.icc.adf2) - cs->dc.icc.adf2 = 0x80; - icc_write_reg(cs, ICC_ADF2, cs->dc.icc.adf2); - icc_write_reg(cs, ICC_SQXR, 0xa0); - icc_write_reg(cs, ICC_SPCR, 0x20); - icc_write_reg(cs, ICC_STCR, 0x70); - icc_write_reg(cs, ICC_MODE, 0xca); - icc_write_reg(cs, ICC_TIMR, 0x00); - icc_write_reg(cs, ICC_ADF1, 0x20); - } - ph_command(cs, ICC_CMD_RES); - icc_write_reg(cs, ICC_MASK, 0x0); - ph_command(cs, ICC_CMD_DI); + cs->writeisac(cs, ICC_MASK, 0xFF); } -int -icc_setup(struct IsdnCardState *cs, struct dc_hw_ops *icc_ops) +void __devinit +setup_icc(struct IsdnCardState *cs) { - cs->dc_hw_ops = icc_ops; - ICCVersion(cs, "HiSax:"); - return 0; + INIT_WORK(&cs->tqueue, (void *)(void *) icc_bh, cs); + cs->dbusytimer.function = (void *) dbusy_timer_handler; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); } diff -Nru a/drivers/isdn/hisax/icc.h b/drivers/isdn/hisax/icc.h --- a/drivers/isdn/hisax/icc.h Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/icc.h Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: icc.h,v 1.2.6.3 2001/09/23 22:24:48 kai Exp $ +/* $Id: icc.h,v 1.4.2.2 2004/01/12 22:52:26 keil Exp $ * * ICC specific routines * @@ -65,6 +65,8 @@ #define ICC_IND_AIL 0xE #define ICC_IND_DC 0xF -extern int icc_setup(struct IsdnCardState *cs, struct dc_hw_ops *icc_ops); +extern void ICCVersion(struct IsdnCardState *cs, char *s); extern void initicc(struct IsdnCardState *cs); -extern void icc_interrupt(struct IsdnCardState *cs, u8 val); +extern void icc_interrupt(struct IsdnCardState *cs, u_char val); +extern void clear_pending_icc_ints(struct IsdnCardState *cs); +extern void setup_icc(struct IsdnCardState *); diff -Nru a/drivers/isdn/hisax/ipac.c b/drivers/isdn/hisax/ipac.c --- a/drivers/isdn/hisax/ipac.c Thu Feb 19 23:44:22 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,107 +0,0 @@ -#include "hisax.h" -#include "isdnl1.h" -#include "ipac.h" -#include "hscx.h" -#include "isac.h" - -static inline u8 -ipac_dc_read(struct IsdnCardState *cs, u8 addr) -{ - return cs->dc_hw_ops->read_reg(cs, addr); -} - -static inline void -ipac_dc_write(struct IsdnCardState *cs, u8 addr, u8 val) -{ - cs->dc_hw_ops->write_reg(cs, addr, val); -} - -static inline u8 -ipac_bc_read(struct IsdnCardState *cs, int hscx, u8 addr) -{ - return cs->bc_hw_ops->read_reg(cs, hscx, addr); -} - -static inline void -ipac_bc_write(struct IsdnCardState *cs, int hscx, u8 addr, u8 val) -{ - cs->bc_hw_ops->write_reg(cs, hscx, addr, val); -} - -static inline u8 -ipac_read(struct IsdnCardState *cs, u8 offset) -{ - return ipac_dc_read(cs, offset - 0x80); -} - -static inline void -ipac_write(struct IsdnCardState *cs, u8 offset, u8 value) -{ - ipac_dc_write(cs, offset - 0x80, value); -} - -void -ipac_init(struct IsdnCardState *cs) -{ - set_bit(HW_IPAC, &cs->HW_Flags); - inithscxisac(cs); -} - -irqreturn_t -ipac_irq(int intno, void *dev_id, struct pt_regs *regs) -{ - struct IsdnCardState *cs = dev_id; - u8 ista, val, icnt = 5; - - spin_lock(&cs->lock); - ista = ipac_read(cs, IPAC_ISTA); -Start_IPAC: - if (cs->debug & L1_DEB_IPAC) - debugl1(cs, "IPAC ISTA %02X", ista); - if (ista & 0x0f) { - val = ipac_bc_read(cs, 1, HSCX_ISTA); - if (ista & 0x01) - val |= 0x01; - if (ista & 0x04) - val |= 0x02; - if (ista & 0x08) - val |= 0x04; - if (val) - hscx_int_main(cs, val); - } - if (ista & 0x20) { - val = ipac_dc_read(cs, ISAC_ISTA) & 0xfe; - if (val) { - isac_interrupt(cs, val); - } - } - if (ista & 0x10) { - val = 0x01; - isac_interrupt(cs, val); - } - ista = ipac_read(cs, IPAC_ISTA); - if ((ista & 0x3f) && icnt) { - icnt--; - goto Start_IPAC; - } - if (!icnt) - printk(KERN_WARNING "IRQ LOOP\n"); - - ipac_write(cs, IPAC_MASK, 0xFF); - ipac_write(cs, IPAC_MASK, 0xC0); - spin_unlock(&cs->lock); - return IRQ_HANDLED; -} - -int -ipac_setup(struct IsdnCardState *cs, struct dc_hw_ops *ipac_dc_ops, - struct bc_hw_ops *ipac_bc_ops) -{ - u8 val; - - cs->dc_hw_ops = ipac_dc_ops; - cs->bc_hw_ops = ipac_bc_ops; - val = ipac_read(cs, IPAC_ID); - printk(KERN_INFO "HiSax: IPAC version %#x\n", val); - return 0; -} diff -Nru a/drivers/isdn/hisax/ipac.h b/drivers/isdn/hisax/ipac.h --- a/drivers/isdn/hisax/ipac.h Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/ipac.h Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: ipac.h,v 1.5.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: ipac.h,v 1.7.2.2 2004/01/12 22:52:26 keil Exp $ * * IPAC specific defines * @@ -10,8 +10,6 @@ * */ -#include - /* All Registers original Siemens Spec */ #define IPAC_CONF 0xC0 @@ -29,76 +27,3 @@ #define IPAC_PCFG 0xCA #define IPAC_SCFG 0xCB #define IPAC_TIMR2 0xCC - -void ipac_init(struct IsdnCardState *cs); -irqreturn_t ipac_irq(int intno, void *dev_id, struct pt_regs *regs); -int ipac_setup(struct IsdnCardState *cs, struct dc_hw_ops *ipac_dc_ops, - struct bc_hw_ops *ipac_bc_ops); - -/* Macro to build the needed D- and B-Channel access routines given - * access functions for the IPAC */ - -#define BUILD_IPAC_OPS(ipac) \ - \ -static u8 \ -ipac ## _dc_read(struct IsdnCardState *cs, u8 offset) \ -{ \ - return ipac ## _read(cs, offset+0x80); \ -} \ - \ -static void \ -ipac ## _dc_write(struct IsdnCardState *cs, u8 offset, u8 value) \ -{ \ - ipac ## _write(cs, offset+0x80, value); \ -} \ - \ -static void \ -ipac ## _dc_read_fifo(struct IsdnCardState *cs, u8 * data, int size) \ -{ \ - ipac ## _readfifo(cs, 0x80, data, size); \ -} \ - \ -static void \ -ipac ## _dc_write_fifo(struct IsdnCardState *cs, u8 * data, int size) \ -{ \ - ipac ## _writefifo(cs, 0x80, data, size); \ -} \ - \ -static struct dc_hw_ops ipac ## _dc_ops = { \ - .read_reg = ipac ## _dc_read, \ - .write_reg = ipac ## _dc_write, \ - .read_fifo = ipac ## _dc_read_fifo, \ - .write_fifo = ipac ## _dc_write_fifo, \ -}; \ - \ -static u8 \ -ipac ## _bc_read(struct IsdnCardState *cs, int hscx, u8 offset) \ -{ \ - return ipac ## _read(cs, offset + (hscx ? 0x40 : 0)); \ -} \ - \ -static void \ -ipac ## _bc_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) \ -{ \ - ipac ## _write(cs, offset + (hscx ? 0x40 : 0), value); \ -} \ - \ -static void \ -ipac ## _bc_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) \ -{ \ - ipac ## _readfifo(cs, hscx ? 0x40 : 0, data, size); \ -} \ - \ -static void \ -ipac ## _bc_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size)\ -{ \ - ipac ## _writefifo(cs, hscx ? 0x40 : 0, data, size); \ -} \ - \ -static struct bc_hw_ops ipac ## _bc_ops = { \ - .read_reg = ipac ## _bc_read, \ - .write_reg = ipac ## _bc_write, \ - .read_fifo = ipac ## _bc_read_fifo, \ - .write_fifo = ipac ## _bc_write_fifo, \ -} - diff -Nru a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c --- a/drivers/isdn/hisax/ipacx.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/ipacx.c Thu Feb 19 23:44:25 2004 @@ -12,7 +12,6 @@ #include #include #include -#include #include "hisax_if.h" #include "hisax.h" #include "isdnl1.h" @@ -24,6 +23,7 @@ #define B_FIFO_SIZE 64 #define D_FIFO_SIZE 32 + // ipacx interrupt mask values #define _MASK_IMASK 0x2E // global mask #define _MASKB_IMASK 0x0B @@ -37,13 +37,16 @@ static void dch_l2l1(struct PStack *st, int pr, void *arg); static void dbusy_timer_handler(struct IsdnCardState *cs); static void ipacx_new_ph(struct IsdnCardState *cs); -static void dch_bh(void *data); +static void dch_bh(struct IsdnCardState *cs); static void dch_empty_fifo(struct IsdnCardState *cs, int count); static void dch_fill_fifo(struct IsdnCardState *cs); static inline void dch_int(struct IsdnCardState *cs); +static void __devinit dch_setstack(struct PStack *st, struct IsdnCardState *cs); +static void __devinit dch_init(struct IsdnCardState *cs); static void bch_l2l1(struct PStack *st, int pr, void *arg); -static void ipacx_bc_empty_fifo(struct BCState *bcs, int count); -static void bch_int(struct IsdnCardState *cs, u8 hscx); +static void bch_empty_fifo(struct BCState *bcs, int count); +static void bch_fill_fifo(struct BCState *bcs); +static void bch_int(struct IsdnCardState *cs, u_char hscx); static void bch_mode(struct BCState *bcs, int mode, int bc); static void bch_close_state(struct BCState *bcs); static int bch_open_state(struct IsdnCardState *cs, struct BCState *bcs); @@ -51,45 +54,6 @@ static void __devinit bch_init(struct IsdnCardState *cs, int hscx); static void __init clear_pending_ints(struct IsdnCardState *cs); -static inline u8 -ipacx_bc_read_reg(struct BCState *bcs, u8 addr) -{ - struct IsdnCardState *cs = bcs->cs; - - return cs->bc_hw_ops->read_reg(cs, bcs->unit, addr); -} - -static inline void -ipacx_bc_write_reg(struct BCState *bcs, u8 addr, u8 val) -{ - struct IsdnCardState *cs = bcs->cs; - - cs->bc_hw_ops->write_reg(cs, bcs->unit, addr, val); -} - -static inline u8 -ipacx_read_reg(struct IsdnCardState *cs, u8 addr) -{ - return cs->dc_hw_ops->read_reg(cs, addr); -} - -static inline void -ipacx_write_reg(struct IsdnCardState *cs, u8 addr, u8 val) -{ - cs->dc_hw_ops->write_reg(cs, addr, val); -} - -static inline void -ipacx_read_fifo(struct IsdnCardState *cs, u8 *p, int len) -{ - return cs->dc_hw_ops->read_fifo(cs, p, len); -} - -static inline void -ipacx_write_fifo(struct IsdnCardState *cs, u8 *p, int len) -{ - return cs->dc_hw_ops->write_fifo(cs, p, len); -} //---------------------------------------------------------- // Issue Layer 1 command to chip //---------------------------------------------------------- @@ -99,7 +63,10 @@ if (cs->debug &L1_DEB_ISAC) debugl1(cs, "ph_command (%#x) in (%#x)", command, cs->dc.isac.ph_state); - ipacx_write_reg(cs, IPACX_CIX0, (command << 4) | 0x0E); +//################################### +// printk(KERN_INFO "ph_command (%#x)\n", command); +//################################### + cs->writeisac(cs, IPACX_CIX0, (command << 4) | 0x0E); } //---------------------------------------------------------- @@ -108,12 +75,15 @@ static inline void cic_int(struct IsdnCardState *cs) { - u8 event; + u_char event; - event = ipacx_read_reg(cs, IPACX_CIR0) >> 4; + event = cs->readisac(cs, IPACX_CIR0) >> 4; if (cs->debug &L1_DEB_ISAC) debugl1(cs, "cic_int(event=%#x)", event); - cs->dc.isac.ph_state = event; - sched_d_event(cs, D_L1STATECHANGE); +//######################################### +// printk(KERN_INFO "cic_int(%x)\n", event); +//######################################### + cs->dc.isac.ph_state = event; + schedule_event(cs, D_L1STATECHANGE); } //========================================================== @@ -128,21 +98,63 @@ { struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; - u8 cda1_cr, cda2_cr; + u_char cda1_cr, cda2_cr; switch (pr) { case (PH_DATA |REQUEST): - xmit_data_req_d(cs, skb); + if (cs->debug &DEB_DLOG_HEX) LogFrame(cs, skb->data, skb->len); + if (cs->debug &DEB_DLOG_VERBOSE) dlogframe(cs, skb, 0); + if (cs->tx_skb) { + skb_queue_tail(&cs->sq, skb); +#ifdef L2FRAME_DEBUG + if (cs->debug &L1_DEB_LAPD) Logl2Frame(cs, skb, "PH_DATA Queued", 0); +#endif + } else { + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG + if (cs->debug &L1_DEB_LAPD) Logl2Frame(cs, skb, "PH_DATA", 0); +#endif + dch_fill_fifo(cs); + } break; + case (PH_PULL |INDICATION): - xmit_pull_ind_d(cs, skb); + if (cs->tx_skb) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); + skb_queue_tail(&cs->sq, skb); + break; + } + if (cs->debug & DEB_DLOG_HEX) LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) dlogframe(cs, skb, 0); + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG + if (cs->debug & L1_DEB_LAPD) Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); +#endif + dch_fill_fifo(cs); break; + case (PH_PULL | REQUEST): - xmit_pull_req_d(st); +#ifdef L2FRAME_DEBUG + if (cs->debug & L1_DEB_LAPD) debugl1(cs, "-> PH_REQUEST_PULL"); +#endif + if (!cs->tx_skb) { + clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; + case (HW_RESET | REQUEST): case (HW_ENABLE | REQUEST): - ph_command(cs, IPACX_CMD_TIM); + if ((cs->dc.isac.ph_state == IPACX_IND_RES) || + (cs->dc.isac.ph_state == IPACX_IND_DR) || + (cs->dc.isac.ph_state == IPACX_IND_DC)) + ph_command(cs, IPACX_CMD_TIM); + else + ph_command(cs, IPACX_CMD_RES); break; case (HW_INFO3 | REQUEST): @@ -150,21 +162,21 @@ break; case (HW_TESTLOOP | REQUEST): - ipacx_write_reg(cs, IPACX_CDA_TSDP10, 0x80); // Timeslot 0 is B1 - ipacx_write_reg(cs, IPACX_CDA_TSDP11, 0x81); // Timeslot 0 is B1 - cda1_cr = ipacx_read_reg(cs, IPACX_CDA1_CR); - cda2_cr = ipacx_read_reg(cs, IPACX_CDA2_CR); + cs->writeisac(cs, IPACX_CDA_TSDP10, 0x80); // Timeslot 0 is B1 + cs->writeisac(cs, IPACX_CDA_TSDP11, 0x81); // Timeslot 0 is B1 + cda1_cr = cs->readisac(cs, IPACX_CDA1_CR); + cda2_cr = cs->readisac(cs, IPACX_CDA2_CR); if ((long)arg &1) { // loop B1 - ipacx_write_reg(cs, IPACX_CDA1_CR, cda1_cr |0x0a); + cs->writeisac(cs, IPACX_CDA1_CR, cda1_cr |0x0a); } else { // B1 off - ipacx_write_reg(cs, IPACX_CDA1_CR, cda1_cr &~0x0a); + cs->writeisac(cs, IPACX_CDA1_CR, cda1_cr &~0x0a); } if ((long)arg &2) { // loop B2 - ipacx_write_reg(cs, IPACX_CDA1_CR, cda1_cr |0x14); + cs->writeisac(cs, IPACX_CDA1_CR, cda1_cr |0x14); } else { // B2 off - ipacx_write_reg(cs, IPACX_CDA1_CR, cda1_cr &~0x14); + cs->writeisac(cs, IPACX_CDA1_CR, cda1_cr &~0x14); } break; @@ -194,14 +206,14 @@ int rbchd, stard; if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { - rbchd = ipacx_read_reg(cs, IPACX_RBCHD); - stard = ipacx_read_reg(cs, IPACX_STARD); + rbchd = cs->readisac(cs, IPACX_RBCHD); + stard = cs->readisac(cs, IPACX_STARD); if (cs->debug) debugl1(cs, "D-Channel Busy RBCHD %02x STARD %02x", rbchd, stard); if (!(stard &0x40)) { // D-Channel Busy set_bit(FLG_L1_DBUSY, &cs->HW_Flags); for (st = cs->stlist; st; st = st->next) { - st->l2.l1l2(st, PH_PAUSE | INDICATION, NULL); // flow control on + st->l1.l1l2(st, PH_PAUSE | INDICATION, NULL); // flow control on } } else { // seems we lost an interrupt; reset transceiver */ @@ -214,7 +226,7 @@ printk(KERN_WARNING "HiSax: ISAC D-Channel Busy no skb\n"); debugl1(cs, "D-Channel Busy no skb"); } - ipacx_write_reg(cs, IPACX_CMDRD, 0x01); // Tx reset, generates XPR + cs->writeisac(cs, IPACX_CMDRD, 0x01); // Tx reset, generates XPR } } } @@ -268,9 +280,8 @@ // bottom half handler for D channel //---------------------------------------------------------- static void -dch_bh(void *data) +dch_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; struct PStack *st; if (!cs) return; @@ -278,7 +289,7 @@ if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) { if (cs->debug) debugl1(cs, "D-Channel Busy cleared"); for (st = cs->stlist; st; st = st->next) { - st->l2.l1l2(st, PH_PAUSE | CONFIRM, NULL); + st->l1.l1l2(st, PH_PAUSE | CONFIRM, NULL); } } @@ -301,8 +312,33 @@ static void dch_empty_fifo(struct IsdnCardState *cs, int count) { - recv_empty_fifo_d(cs, count); - ipacx_write_reg(cs, IPACX_CMDRD, 0x80); // RMC + u_char *ptr; + + if ((cs->debug &L1_DEB_ISAC) && !(cs->debug &L1_DEB_ISAC_FIFO)) + debugl1(cs, "dch_empty_fifo()"); + + // message too large, remove + if ((cs->rcvidx + count) >= MAX_DFRAME_LEN_L1) { + if (cs->debug &L1_DEB_WARN) + debugl1(cs, "dch_empty_fifo() incoming message too large"); + cs->writeisac(cs, IPACX_CMDRD, 0x80); // RMC + cs->rcvidx = 0; + return; + } + + ptr = cs->rcvbuf + cs->rcvidx; + cs->rcvidx += count; + + cs->readisacfifo(cs, ptr, count); + cs->writeisac(cs, IPACX_CMDRD, 0x80); // RMC + + if (cs->debug &L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "dch_empty_fifo() cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } //---------------------------------------------------------- @@ -311,21 +347,28 @@ static void dch_fill_fifo(struct IsdnCardState *cs) { - int count, more; - unsigned char cmd, *p; + int count; + u_char cmd, *ptr; - p = xmit_fill_fifo_d(cs, 32, &count, &more); - if (!p) - return; + if ((cs->debug &L1_DEB_ISAC) && !(cs->debug &L1_DEB_ISAC_FIFO)) + debugl1(cs, "dch_fill_fifo()"); + + if (!cs->tx_skb) return; + count = cs->tx_skb->len; + if (count <= 0) return; - if (more) { + if (count > D_FIFO_SIZE) { + count = D_FIFO_SIZE; cmd = 0x08; // XTF } else { cmd = 0x0A; // XTF | XME } - ipacx_write_fifo(cs, p, count); - ipacx_write_reg(cs, IPACX_CMDRD, cmd); + ptr = cs->tx_skb->data; + skb_pull(cs->tx_skb, count); + cs->tx_cnt += count; + cs->writeisacfifo(cs, ptr, count); + cs->writeisac(cs, IPACX_CMDRD, cmd); // set timeout for transmission contol if (test_and_set_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { @@ -335,6 +378,14 @@ init_timer(&cs->dbusytimer); cs->dbusytimer.expires = jiffies + ((DBUSY_TIMER_VALUE * HZ)/1000); add_timer(&cs->dbusytimer); + + if (cs->debug &L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "dch_fill_fifo() cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } //---------------------------------------------------------- @@ -343,35 +394,46 @@ static inline void dch_int(struct IsdnCardState *cs) { - u8 istad, rstad; + struct sk_buff *skb; + u_char istad, rstad; int count; - istad = ipacx_read_reg(cs, IPACX_ISTAD); + istad = cs->readisac(cs, IPACX_ISTAD); +//############################################## +// printk(KERN_WARNING "dch_int(istad=%02x)\n", istad); +//############################################## if (istad &0x80) { // RME - rstad = ipacx_read_reg(cs, IPACX_RSTAD); + rstad = cs->readisac(cs, IPACX_RSTAD); if ((rstad &0xf0) != 0xa0) { // !(VFR && !RDO && CRC && !RAB) if (!(rstad &0x80)) if (cs->debug &L1_DEB_WARN) - debugl1(cs, "dch_int(): invalid frame"); + debugl1(cs, "dch_int(): invalid frame"); if ((rstad &0x40)) if (cs->debug &L1_DEB_WARN) - debugl1(cs, "dch_int(): RDO"); + debugl1(cs, "dch_int(): RDO"); if (!(rstad &0x20)) if (cs->debug &L1_DEB_WARN) - debugl1(cs, "dch_int(): CRC error"); - ipacx_write_reg(cs, IPACX_CMDRD, 0x80); // RMC - cs->rcvidx = 0; + debugl1(cs, "dch_int(): CRC error"); + cs->writeisac(cs, IPACX_CMDRD, 0x80); // RMC } else { // received frame ok - count = ipacx_read_reg(cs, IPACX_RBCLD); - // FIXME this looks flaky - if (count) count--; // RSTAB is last byte + count = cs->readisac(cs, IPACX_RBCLD); + if (count) count--; // RSTAB is last byte count &= D_FIFO_SIZE-1; - if (count == 0) - count = D_FIFO_SIZE; + if (count == 0) count = D_FIFO_SIZE; dch_empty_fifo(cs, count); - recv_rme_d(cs); - } + if ((count = cs->rcvidx) > 0) { + cs->rcvidx = 0; + if (!(skb = dev_alloc_skb(count))) + printk(KERN_WARNING "HiSax dch_int(): receive out of memory\n"); + else { + memcpy(skb_put(skb, count), cs->rcvbuf, count); + skb_queue_tail(&cs->rq, skb); + } + } + } + cs->rcvidx = 0; + schedule_event(cs, D_RCVBUFREADY); } if (istad &0x40) { // RPF @@ -380,34 +442,56 @@ if (istad &0x20) { // RFO if (cs->debug &L1_DEB_WARN) debugl1(cs, "dch_int(): RFO"); - ipacx_write_reg(cs, IPACX_CMDRD, 0x40); //RRES + cs->writeisac(cs, IPACX_CMDRD, 0x40); //RRES } - if (istad &0x10) { // XPR - xmit_xpr_d(cs); - } + if (istad &0x10) { // XPR + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { + if (cs->tx_skb->len) { + dch_fill_fifo(cs); + goto afterXPR; + } + else { + dev_kfree_skb_irq(cs->tx_skb); + cs->tx_skb = NULL; + cs->tx_cnt = 0; + } + } + if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_cnt = 0; + dch_fill_fifo(cs); + } + else { + schedule_event(cs, D_XMTBUFREADY); + } + } + afterXPR: if (istad &0x0C) { // XDU or XMR - xmit_xdu_d(cs, NULL); - } + if (cs->debug &L1_DEB_WARN) debugl1(cs, "dch_int(): XDU"); + if (cs->tx_skb) { + skb_push(cs->tx_skb, cs->tx_cnt); // retransmit + cs->tx_cnt = 0; + dch_fill_fifo(cs); + } else { + printk(KERN_WARNING "HiSax: ISAC XDU no skb\n"); + debugl1(cs, "ISAC XDU no skb"); + } + } } //---------------------------------------------------------- //---------------------------------------------------------- -static int +static void __devinit dch_setstack(struct PStack *st, struct IsdnCardState *cs) { st->l1.l1hw = dch_l2l1; - return 0; } -static struct dc_l1_ops ipacx_dc_l1_ops = { - .fill_fifo = dch_fill_fifo, - .open = dch_setstack, - .bh_func = dch_bh, - .dbusy_func = dbusy_timer_handler, -}; - //---------------------------------------------------------- //---------------------------------------------------------- static void __devinit @@ -415,12 +499,16 @@ { printk(KERN_INFO "HiSax: IPACX ISDN driver v0.1.0\n"); - dc_l1_init(cs, &ipacx_dc_l1_ops); + cs->setstack_d = dch_setstack; + + cs->dbusytimer.function = (void *) dbusy_timer_handler; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); - ipacx_write_reg(cs, IPACX_TR_CONF0, 0x00); // clear LDD - ipacx_write_reg(cs, IPACX_TR_CONF2, 0x00); // enable transmitter - ipacx_write_reg(cs, IPACX_MODED, 0xC9); // transparent mode 0, RAC, stop/go - ipacx_write_reg(cs, IPACX_MON_CR, 0x00); // disable monitor channel + cs->writeisac(cs, IPACX_TR_CONF0, 0x00); // clear LDD + cs->writeisac(cs, IPACX_TR_CONF2, 0x00); // enable transmitter + cs->writeisac(cs, IPACX_MODED, 0xC9); // transparent mode 0, RAC, stop/go + cs->writeisac(cs, IPACX_MON_CR, 0x00); // disable monitor channel } @@ -434,31 +522,59 @@ static void bch_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->hw.hscx.count = 0; + bch_fill_fifo(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "HiSax bch_l2l1(): this shouldn't happen\n"); + } else { + set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->hw.hscx.count = 0; + bch_fill_fifo(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - bch_mode(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + set_bit(BC_FLG_ACTIV, &bcs->Flag); + bch_mode(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - bch_mode(st->l1.bcs, 0, st->l1.bc); - st->l2.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + clear_bit(BC_FLG_ACTIV, &bcs->Flag); + clear_bit(BC_FLG_BUSY, &bcs->Flag); + bch_mode(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -467,94 +583,204 @@ // Read B channel fifo to receive buffer //---------------------------------------------------------- static void -ipacx_bc_empty_fifo(struct BCState *bcs, int count) +bch_empty_fifo(struct BCState *bcs, int count) { - recv_empty_fifo_b(bcs, count); - ipacx_bc_write_reg(bcs, IPACX_CMDRB, 0x80); // RMC + u_char *ptr, hscx; + struct IsdnCardState *cs; + int cnt; + + cs = bcs->cs; + hscx = bcs->hw.hscx.hscx; + if ((cs->debug &L1_DEB_HSCX) && !(cs->debug &L1_DEB_HSCX_FIFO)) + debugl1(cs, "bch_empty_fifo()"); + + // message too large, remove + if (bcs->hw.hscx.rcvidx + count > HSCX_BUFMAX) { + if (cs->debug &L1_DEB_WARN) + debugl1(cs, "bch_empty_fifo() incoming packet too large"); + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x80); // RMC + bcs->hw.hscx.rcvidx = 0; + return; + } + + ptr = bcs->hw.hscx.rcvbuf + bcs->hw.hscx.rcvidx; + cnt = count; + while (cnt--) *ptr++ = cs->BC_Read_Reg(cs, hscx, IPACX_RFIFOB); + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x80); // RMC + + ptr = bcs->hw.hscx.rcvbuf + bcs->hw.hscx.rcvidx; + bcs->hw.hscx.rcvidx += count; + + if (cs->debug &L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "bch_empty_fifo() B-%d cnt %d", hscx, count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } //---------------------------------------------------------- // Fill buffer to transmit FIFO //---------------------------------------------------------- static void -ipacx_bc_fill_fifo(struct BCState *bcs) +bch_fill_fifo(struct BCState *bcs) { - int more, count; - unsigned char *p; - - p = xmit_fill_fifo_b(bcs, B_FIFO_SIZE, &count, &more); - if (!p) - return; - - while (count--) - ipacx_bc_write_reg(bcs, IPACX_XFIFOB, *p++); - - ipacx_bc_write_reg(bcs, IPACX_CMDRB, (more ? 0x08 : 0x0a)); + struct IsdnCardState *cs; + int more, count, cnt; + u_char *ptr, *p, hscx; + + cs = bcs->cs; + if ((cs->debug &L1_DEB_HSCX) && !(cs->debug &L1_DEB_HSCX_FIFO)) + debugl1(cs, "bch_fill_fifo()"); + + if (!bcs->tx_skb) return; + if (bcs->tx_skb->len <= 0) return; + + hscx = bcs->hw.hscx.hscx; + more = (bcs->mode == L1_MODE_TRANS) ? 1 : 0; + if (bcs->tx_skb->len > B_FIFO_SIZE) { + more = 1; + count = B_FIFO_SIZE; + } else { + count = bcs->tx_skb->len; + } + cnt = count; + + p = ptr = bcs->tx_skb->data; + skb_pull(bcs->tx_skb, count); + bcs->tx_cnt -= count; + bcs->hw.hscx.count += count; + while (cnt--) cs->BC_Write_Reg(cs, hscx, IPACX_XFIFOB, *p++); + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, (more ? 0x08 : 0x0a)); + + if (cs->debug &L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "chb_fill_fifo() B-%d cnt %d", hscx, count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } //---------------------------------------------------------- // B channel interrupt handler //---------------------------------------------------------- - -static void -reset_xmit(struct BCState *bcs) -{ - ipacx_bc_write_reg(bcs, IPACX_CMDRB, 0x01); // XRES -} - static void -bch_int(struct IsdnCardState *cs, u8 hscx) +bch_int(struct IsdnCardState *cs, u_char hscx) { - u8 istab; + u_char istab; struct BCState *bcs; + struct sk_buff *skb; int count; - u8 rstab; + u_char rstab; bcs = cs->bcs + hscx; - istab = ipacx_bc_read_reg(bcs, IPACX_ISTAB); + istab = cs->BC_Read_Reg(cs, hscx, IPACX_ISTAB); +//############################################## +// printk(KERN_WARNING "bch_int(istab=%02x)\n", istab); +//############################################## if (!test_bit(BC_FLG_INIT, &bcs->Flag)) return; if (istab &0x80) { // RME - rstab = ipacx_bc_read_reg(bcs, IPACX_RSTAB); + rstab = cs->BC_Read_Reg(cs, hscx, IPACX_RSTAB); if ((rstab &0xf0) != 0xa0) { // !(VFR && !RDO && CRC && !RAB) if (!(rstab &0x80)) if (cs->debug &L1_DEB_WARN) - debugl1(cs, "bch_int() B-%d: invalid frame", hscx); + debugl1(cs, "bch_int() B-%d: invalid frame", hscx); if ((rstab &0x40) && (bcs->mode != L1_MODE_NULL)) if (cs->debug &L1_DEB_WARN) - debugl1(cs, "bch_int() B-%d: RDO mode=%d", hscx, bcs->mode); + debugl1(cs, "bch_int() B-%d: RDO mode=%d", hscx, bcs->mode); if (!(rstab &0x20)) if (cs->debug &L1_DEB_WARN) - debugl1(cs, "bch_int() B-%d: CRC error", hscx); - ipacx_bc_write_reg(bcs, IPACX_CMDRB, 0x80); // RMC - bcs->rcvidx = 0; - } else { // received frame ok - count = ipacx_bc_read_reg(bcs, IPACX_RBCLB) &(B_FIFO_SIZE-1); - if (count == 0) - count = B_FIFO_SIZE; - - ipacx_bc_empty_fifo(bcs, count); - recv_rme_b(bcs); + debugl1(cs, "bch_int() B-%d: CRC error", hscx); + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x80); // RMC + } + else { // received frame ok + count = cs->BC_Read_Reg(cs, hscx, IPACX_RBCLB) &(B_FIFO_SIZE-1); + if (count == 0) count = B_FIFO_SIZE; + bch_empty_fifo(bcs, count); + if ((count = bcs->hw.hscx.rcvidx - 1) > 0) { + if (cs->debug &L1_DEB_HSCX_FIFO) + debugl1(cs, "bch_int Frame %d", count); + if (!(skb = dev_alloc_skb(count))) + printk(KERN_WARNING "HiSax bch_int(): receive frame out of memory\n"); + else { + memcpy(skb_put(skb, count), bcs->hw.hscx.rcvbuf, count); + skb_queue_tail(&bcs->rqueue, skb); + } + } } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); } if (istab &0x40) { // RPF - ipacx_bc_empty_fifo(bcs, B_FIFO_SIZE); - recv_rpf_b(bcs); + bch_empty_fifo(bcs, B_FIFO_SIZE); + + if (bcs->mode == L1_MODE_TRANS) { // queue every chunk + // receive transparent audio data + if (!(skb = dev_alloc_skb(B_FIFO_SIZE))) + printk(KERN_WARNING "HiSax bch_int(): receive transparent out of memory\n"); + else { + memcpy(skb_put(skb, B_FIFO_SIZE), bcs->hw.hscx.rcvbuf, B_FIFO_SIZE); + skb_queue_tail(&bcs->rqueue, skb); + } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); + } } if (istab &0x20) { // RFO if (cs->debug &L1_DEB_WARN) debugl1(cs, "bch_int() B-%d: RFO error", hscx); - ipacx_bc_write_reg(bcs, IPACX_CMDRB, 0x40); // RRES + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x40); // RRES } if (istab &0x10) { // XPR - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (bcs->tx_skb->len) { + bch_fill_fifo(bcs); + goto afterXPR; + } else { + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.hscx.count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + } + dev_kfree_skb_irq(bcs->tx_skb); + bcs->hw.hscx.count = 0; + bcs->tx_skb = NULL; + } + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + bcs->hw.hscx.count = 0; + set_bit(BC_FLG_BUSY, &bcs->Flag); + bch_fill_fifo(bcs); + } else { + clear_bit(BC_FLG_BUSY, &bcs->Flag); + schedule_event(bcs, B_XMTBUFREADY); + } } + afterXPR: if (istab &0x04) { // XDU - xmit_xdu_b(bcs, reset_xmit); + if (bcs->mode == L1_MODE_TRANS) { + bch_fill_fifo(bcs); + } + else { + if (bcs->tx_skb) { // restart transmitting the whole frame + skb_push(bcs->tx_skb, bcs->hw.hscx.count); + bcs->tx_cnt += bcs->hw.hscx.count; + bcs->hw.hscx.count = 0; + } + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x01); // XRES + if (cs->debug &L1_DEB_WARN) + debugl1(cs, "bch_int() B-%d XDU error", hscx); + } } } @@ -564,7 +790,7 @@ bch_mode(struct BCState *bcs, int mode, int bc) { struct IsdnCardState *cs = bcs->cs; - int hscx = bcs->unit; + int hscx = bcs->hw.hscx.hscx; bc = bc ? 1 : 0; // in case bc is greater than 1 if (cs->debug & L1_DEB_HSCX) @@ -575,33 +801,33 @@ // map controller to according timeslot if (!hscx) { - ipacx_write_reg(cs, IPACX_BCHA_TSDP_BC1, 0x80 | bc); - ipacx_write_reg(cs, IPACX_BCHA_CR, 0x88); + cs->writeisac(cs, IPACX_BCHA_TSDP_BC1, 0x80 | bc); + cs->writeisac(cs, IPACX_BCHA_CR, 0x88); } else { - ipacx_write_reg(cs, IPACX_BCHB_TSDP_BC1, 0x80 | bc); - ipacx_write_reg(cs, IPACX_BCHB_CR, 0x88); + cs->writeisac(cs, IPACX_BCHB_TSDP_BC1, 0x80 | bc); + cs->writeisac(cs, IPACX_BCHB_CR, 0x88); } switch (mode) { case (L1_MODE_NULL): - ipacx_bc_write_reg(bcs, IPACX_MODEB, 0xC0); // rec off - ipacx_bc_write_reg(bcs, IPACX_EXMB, 0x30); // std adj. - ipacx_bc_write_reg(bcs, IPACX_MASKB, 0xFF); // ints off - ipacx_bc_write_reg(bcs, IPACX_CMDRB, 0x41); // validate adjustments + cs->BC_Write_Reg(cs, hscx, IPACX_MODEB, 0xC0); // rec off + cs->BC_Write_Reg(cs, hscx, IPACX_EXMB, 0x30); // std adj. + cs->BC_Write_Reg(cs, hscx, IPACX_MASKB, 0xFF); // ints off + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x41); // validate adjustments break; case (L1_MODE_TRANS): - ipacx_bc_write_reg(bcs, IPACX_MODEB, 0x88); // ext transp mode - ipacx_bc_write_reg(bcs, IPACX_EXMB, 0x00); // xxx00000 - ipacx_bc_write_reg(bcs, IPACX_CMDRB, 0x41); // validate adjustments - ipacx_bc_write_reg(bcs, IPACX_MASKB, _MASKB_IMASK); + cs->BC_Write_Reg(cs, hscx, IPACX_MODEB, 0x88); // ext transp mode + cs->BC_Write_Reg(cs, hscx, IPACX_EXMB, 0x00); // xxx00000 + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x41); // validate adjustments + cs->BC_Write_Reg(cs, hscx, IPACX_MASKB, _MASKB_IMASK); break; case (L1_MODE_HDLC): - ipacx_bc_write_reg(bcs, IPACX_MODEB, 0xC8); // transp mode 0 - ipacx_bc_write_reg(bcs, IPACX_EXMB, 0x01); // idle=hdlc flags crc enabled - ipacx_bc_write_reg(bcs, IPACX_CMDRB, 0x41); // validate adjustments - ipacx_bc_write_reg(bcs, IPACX_MASKB, _MASKB_IMASK); + cs->BC_Write_Reg(cs, hscx, IPACX_MODEB, 0xC8); // transp mode 0 + cs->BC_Write_Reg(cs, hscx, IPACX_EXMB, 0x01); // idle=hdlc flags crc enabled + cs->BC_Write_Reg(cs, hscx, IPACX_CMDRB, 0x41); // validate adjustments + cs->BC_Write_Reg(cs, hscx, IPACX_MASKB, _MASKB_IMASK); break; } } @@ -612,7 +838,23 @@ bch_close_state(struct BCState *bcs) { bch_mode(bcs, 0, bcs->channel); - bc_close(bcs); + if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { + if (bcs->hw.hscx.rcvbuf) { + kfree(bcs->hw.hscx.rcvbuf); + bcs->hw.hscx.rcvbuf = NULL; + } + if (bcs->blog) { + kfree(bcs->blog); + bcs->blog = NULL; + } + skb_queue_purge(&bcs->rqueue); + skb_queue_purge(&bcs->squeue); + if (bcs->tx_skb) { + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; + clear_bit(BC_FLG_BUSY, &bcs->Flag); + } + } } //---------------------------------------------------------- @@ -620,7 +862,30 @@ static int bch_open_state(struct IsdnCardState *cs, struct BCState *bcs) { - return bc_open(bcs); + if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { + if (!(bcs->hw.hscx.rcvbuf = kmalloc(HSCX_BUFMAX, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax open_bchstate(): No memory for hscx.rcvbuf\n"); + clear_bit(BC_FLG_INIT, &bcs->Flag); + return (1); + } + if (!(bcs->blog = kmalloc(MAX_BLOG_SPACE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax open_bchstate: No memory for bcs->blog\n"); + clear_bit(BC_FLG_INIT, &bcs->Flag); + kfree(bcs->hw.hscx.rcvbuf); + bcs->hw.hscx.rcvbuf = NULL; + return (2); + } + skb_queue_head_init(&bcs->rqueue); + skb_queue_head_init(&bcs->squeue); + } + bcs->tx_skb = NULL; + clear_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->event = 0; + bcs->hw.hscx.rcvidx = 0; + bcs->tx_cnt = 0; + return (0); } //---------------------------------------------------------- @@ -631,7 +896,7 @@ bcs->channel = st->l1.bc; if (bch_open_state(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = bch_l2l1; + st->l2.l2l1 = bch_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -643,7 +908,9 @@ static void __devinit bch_init(struct IsdnCardState *cs, int hscx) { - cs->bcs[hscx].unit = hscx; + cs->bcs[hscx].BC_SetStack = bch_setstack; + cs->bcs[hscx].BC_Close = bch_close_state; + cs->bcs[hscx].hw.hscx.hscx = hscx; cs->bcs[hscx].cs = cs; bch_mode(cs->bcs + hscx, 0, hscx); } @@ -659,16 +926,18 @@ void interrupt_ipacx(struct IsdnCardState *cs) { - u8 ista; - - spin_lock(&cs->lock); - while ((ista = ipacx_read_reg(cs, IPACX_ISTA))) { - if (ista &0x80) bch_int(cs, 0); // B channel interrupts - if (ista &0x40) bch_int(cs, 1); - if (ista &0x01) dch_int(cs); // D channel - if (ista &0x10) cic_int(cs); // Layer 1 state - } - spin_unlock(&cs->lock); + u_char ista; + + while ((ista = cs->readisac(cs, IPACX_ISTA))) { +//################################################# +// printk(KERN_WARNING "interrupt_ipacx(ista=%02x)\n", ista); +//################################################# + if (ista &0x80) bch_int(cs, 0); // B channel interrupts + if (ista &0x40) bch_int(cs, 1); + + if (ista &0x01) dch_int(cs); // D channel + if (ista &0x10) cic_int(cs); // Layer 1 state + } } //---------------------------------------------------------- @@ -680,23 +949,17 @@ int ista; // all interrupts off - ipacx_write_reg(cs, IPACX_MASK, 0xff); - ipacx_write_reg(cs, IPACX_MASKD, 0xff); - cs->bc_hw_ops->write_reg(cs, 0, IPACX_MASKB, 0xff); - cs->bc_hw_ops->write_reg(cs, 1, IPACX_MASKB, 0xff); - - ista = ipacx_read_reg(cs, IPACX_ISTA); - if (ista &0x80) cs->bc_hw_ops->read_reg(cs, 0, IPACX_ISTAB); - if (ista &0x40) cs->bc_hw_ops->read_reg(cs, 1, IPACX_ISTAB); - if (ista &0x10) ipacx_read_reg(cs, IPACX_CIR0); - if (ista &0x01) ipacx_read_reg(cs, IPACX_ISTAD); -} - -static struct bc_l1_ops ipacx_bc_l1_ops = { - .fill_fifo = ipacx_bc_fill_fifo, - .open = bch_setstack, - .close = bch_close_state, -}; + cs->writeisac(cs, IPACX_MASK, 0xff); + cs->writeisac(cs, IPACX_MASKD, 0xff); + cs->BC_Write_Reg(cs, 0, IPACX_MASKB, 0xff); + cs->BC_Write_Reg(cs, 1, IPACX_MASKB, 0xff); + + ista = cs->readisac(cs, IPACX_ISTA); + if (ista &0x80) cs->BC_Read_Reg(cs, 0, IPACX_ISTAB); + if (ista &0x40) cs->BC_Read_Reg(cs, 1, IPACX_ISTAB); + if (ista &0x10) cs->readisac(cs, IPACX_CIR0); + if (ista &0x01) cs->readisac(cs, IPACX_ISTAD); +} //---------------------------------------------------------- // Does chip configuration work @@ -706,36 +969,36 @@ init_ipacx(struct IsdnCardState *cs, int part) { if (part &1) { // initialise chip - cs->bc_l1_ops = &ipacx_bc_l1_ops; +//################################################## +// printk(KERN_INFO "init_ipacx(%x)\n", part); +//################################################## clear_pending_ints(cs); bch_init(cs, 0); bch_init(cs, 1); dch_init(cs); } if (part &2) { // reenable all interrupts and start chip - cs->bc_hw_ops->write_reg(cs, 0, IPACX_MASKB, _MASKB_IMASK); - cs->bc_hw_ops->write_reg(cs, 1, IPACX_MASKB, _MASKB_IMASK); - ipacx_write_reg(cs, IPACX_MASKD, _MASKD_IMASK); - ipacx_write_reg(cs, IPACX_MASK, _MASK_IMASK); // global mask register - - // reset HDLC Transmitters/receivers - ipacx_write_reg(cs, IPACX_CMDRD, 0x41); - cs->bc_hw_ops->write_reg(cs, 0, IPACX_CMDRB, 0x41); - cs->bc_hw_ops->write_reg(cs, 1, IPACX_CMDRB, 0x41); + cs->BC_Write_Reg(cs, 0, IPACX_MASKB, _MASKB_IMASK); + cs->BC_Write_Reg(cs, 1, IPACX_MASKB, _MASKB_IMASK); + cs->writeisac(cs, IPACX_MASKD, _MASKD_IMASK); + cs->writeisac(cs, IPACX_MASK, _MASK_IMASK); // global mask register + + // reset HDLC Transmitters/receivers + cs->writeisac(cs, IPACX_CMDRD, 0x41); + cs->BC_Write_Reg(cs, 0, IPACX_CMDRB, 0x41); + cs->BC_Write_Reg(cs, 1, IPACX_CMDRB, 0x41); ph_command(cs, IPACX_CMD_RES); } } -int -ipacx_setup(struct IsdnCardState *cs, struct dc_hw_ops *ipacx_dc_ops, - struct bc_hw_ops *ipacx_bc_ops) -{ - u8 val; - - cs->dc_hw_ops = ipacx_dc_ops; - cs->bc_hw_ops = ipacx_bc_ops; - val = ipacx_read_reg(cs, IPACX_ID) & 0x3f; - printk(KERN_INFO "HiSax: IPACX Design Id: %#x\n", val); - return 0; + +void __devinit +setup_ipacx(struct IsdnCardState *cs) +{ + INIT_WORK(&cs->tqueue, (void *)(void *) dch_bh, cs); + cs->dbusytimer.function = (void *) dbusy_timer_handler; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); } +//----------------- end of file ----------------------- diff -Nru a/drivers/isdn/hisax/ipacx.h b/drivers/isdn/hisax/ipacx.h --- a/drivers/isdn/hisax/ipacx.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/ipacx.h Thu Feb 19 23:44:23 2004 @@ -155,10 +155,8 @@ #define IPACX_IND_AIL 0xe #define IPACX_IND_DC 0xf -extern void init_ipacx(struct IsdnCardState *cs, int part); -extern void interrupt_ipacx(struct IsdnCardState *cs); -extern int ipacx_setup(struct IsdnCardState *cs, - struct dc_hw_ops *ipacx_dc_ops, - struct bc_hw_ops *ipacx_bc_ops); +extern void init_ipacx(struct IsdnCardState *, int); +extern void interrupt_ipacx(struct IsdnCardState *); +extern void setup_isac(struct IsdnCardState *); #endif diff -Nru a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c --- a/drivers/isdn/hisax/isac.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/isac.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: isac.c,v 1.28.6.3 2001/09/23 22:24:49 kai Exp $ +/* $Id: isac.c,v 1.31.2.3 2004/01/13 14:31:25 keil Exp $ * * ISAC specific routines * @@ -27,30 +27,12 @@ {"2086/2186 V1.1", "2085 B1", "2085 B2", "2085 V2.3"}; -static inline u8 -isac_read(struct IsdnCardState *cs, u8 addr) -{ - return cs->dc_hw_ops->read_reg(cs, addr); -} - -static inline void -isac_write(struct IsdnCardState *cs, u8 addr, u8 val) -{ - cs->dc_hw_ops->write_reg(cs, addr, val); -} - -static inline void -isac_write_fifo(struct IsdnCardState *cs, u8 *p, int len) -{ - return cs->dc_hw_ops->write_fifo(cs, p, len); -} - -static void +void ISACVersion(struct IsdnCardState *cs, char *s) { int val; - val = isac_read(cs, ISAC_RBCH); + val = cs->readisac(cs, ISAC_RBCH); printk(KERN_INFO "%s ISAC version (%x): %s\n", s, val, ISACVer[(val >> 5) & 3]); } @@ -59,7 +41,7 @@ { if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ph_command %x", command); - isac_write(cs, ISAC_CIX0, (command << 2) | 3); + cs->writeisac(cs, ISAC_CIX0, (command << 2) | 3); } @@ -99,9 +81,8 @@ } static void -isac_bh(void *data) +isac_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; struct PStack *stptr; if (!cs) @@ -111,7 +92,7 @@ debugl1(cs, "D-Channel Busy cleared"); stptr = cs->stlist; while (stptr != NULL) { - L1L2(stptr, PH_PAUSE | CONFIRM, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); stptr = stptr->next; } } @@ -134,22 +115,58 @@ void isac_empty_fifo(struct IsdnCardState *cs, int count) { - recv_empty_fifo_d(cs, count); - isac_write(cs, ISAC_CMDR, 0x80); + u_char *ptr; + + if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) + debugl1(cs, "isac_empty_fifo"); + + if ((cs->rcvidx + count) >= MAX_DFRAME_LEN_L1) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "isac_empty_fifo overrun %d", + cs->rcvidx + count); + cs->writeisac(cs, ISAC_CMDR, 0x80); + cs->rcvidx = 0; + return; + } + ptr = cs->rcvbuf + cs->rcvidx; + cs->rcvidx += count; + cs->readisacfifo(cs, ptr, count); + cs->writeisac(cs, ISAC_CMDR, 0x80); + if (cs->debug & L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "isac_empty_fifo cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } static void isac_fill_fifo(struct IsdnCardState *cs) { int count, more; - unsigned char *p; + u_char *ptr; + + if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) + debugl1(cs, "isac_fill_fifo"); + + if (!cs->tx_skb) + return; - p = xmit_fill_fifo_d(cs, 32, &count, &more); - if (!p) + count = cs->tx_skb->len; + if (count <= 0) return; - isac_write_fifo(cs, p, count); - isac_write(cs, ISAC_CMDR, more ? 0x8 : 0xa); + more = 0; + if (count > 32) { + more = !0; + count = 32; + } + ptr = cs->tx_skb->data; + skb_pull(cs->tx_skb, count); + cs->tx_cnt += count; + cs->writeisacfifo(cs, ptr, count); + cs->writeisac(cs, ISAC_CMDR, more ? 0x8 : 0xa); if (test_and_set_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { debugl1(cs, "isac_fill_fifo dbusytimer running"); del_timer(&cs->dbusytimer); @@ -157,18 +174,26 @@ init_timer(&cs->dbusytimer); cs->dbusytimer.expires = jiffies + ((DBUSY_TIMER_VALUE * HZ)/1000); add_timer(&cs->dbusytimer); + if (cs->debug & L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "isac_fill_fifo cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } void -isac_interrupt(struct IsdnCardState *cs, u8 val) +isac_interrupt(struct IsdnCardState *cs, u_char val) { - u8 exval, v1; + u_char exval, v1; + struct sk_buff *skb; unsigned int count; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ISAC interrupt %x", val); if (val & 0x80) { /* RME */ - exval = isac_read(cs, ISAC_RSTA); + exval = cs->readisac(cs, ISAC_RSTA); if ((exval & 0x70) != 0x20) { if (exval & 0x40) { if (cs->debug & L1_DEB_WARN) @@ -184,17 +209,24 @@ cs->err_crc++; #endif } - isac_write(cs, ISAC_CMDR, 0x80); - cs->rcvidx = 0; + cs->writeisac(cs, ISAC_CMDR, 0x80); } else { - count = isac_read(cs, ISAC_RBCL) & 0x1f; + count = cs->readisac(cs, ISAC_RBCL) & 0x1f; if (count == 0) count = 32; isac_empty_fifo(cs, count); - recv_rme_d(cs); + if ((count = cs->rcvidx) > 0) { + cs->rcvidx = 0; + if (!(skb = alloc_skb(count, GFP_ATOMIC))) + printk(KERN_WARNING "HiSax: D receive out of memory\n"); + else { + memcpy(skb_put(skb, count), cs->rcvbuf, count); + skb_queue_tail(&cs->rq, skb); + } + } } cs->rcvidx = 0; - sched_d_event(cs, D_RCVBUFREADY); + schedule_event(cs, D_RCVBUFREADY); } if (val & 0x40) { /* RPF */ isac_empty_fifo(cs, 32); @@ -205,20 +237,39 @@ debugl1(cs, "ISAC RSC interrupt"); } if (val & 0x10) { /* XPR */ - xmit_xpr_d(cs); + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { + if (cs->tx_skb->len) { + isac_fill_fifo(cs); + goto afterXPR; + } else { + dev_kfree_skb_irq(cs->tx_skb); + cs->tx_cnt = 0; + cs->tx_skb = NULL; + } + } + if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_cnt = 0; + isac_fill_fifo(cs); + } else + schedule_event(cs, D_XMTBUFREADY); } + afterXPR: if (val & 0x04) { /* CISQ */ - exval = isac_read(cs, ISAC_CIR0); + exval = cs->readisac(cs, ISAC_CIR0); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ISAC CIR0 %02X", exval ); if (exval & 2) { cs->dc.isac.ph_state = (exval >> 2) & 0xf; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ph_state change %x", cs->dc.isac.ph_state); - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); } if (exval & 1) { - exval = isac_read(cs, ISAC_CIR1); + exval = cs->readisac(cs, ISAC_CIR1); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ISAC CIR1 %02X", exval ); } @@ -229,7 +280,7 @@ debugl1(cs, "ISAC SIN interrupt"); } if (val & 0x01) { /* EXI */ - exval = isac_read(cs, ISAC_EXIR); + exval = cs->readisac(cs, ISAC_EXIR); if (cs->debug & L1_DEB_WARN) debugl1(cs, "ISAC EXIR %02x", exval); if (exval & 0x80) { /* XMR */ @@ -237,10 +288,26 @@ printk(KERN_WARNING "HiSax: ISAC XMR\n"); } if (exval & 0x40) { /* XDU */ - xmit_xdu_d(cs, NULL); + debugl1(cs, "ISAC XDU"); + printk(KERN_WARNING "HiSax: ISAC XDU\n"); +#ifdef ERROR_STATISTIC + cs->err_tx++; +#endif + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { /* Restart frame */ + skb_push(cs->tx_skb, cs->tx_cnt); + cs->tx_cnt = 0; + isac_fill_fifo(cs); + } else { + printk(KERN_WARNING "HiSax: ISAC XDU no skb\n"); + debugl1(cs, "ISAC XDU no skb"); + } } if (exval & 0x04) { /* MOS */ - v1 = isac_read(cs, ISAC_MOSR); + v1 = cs->readisac(cs, ISAC_MOSR); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ISAC MOSR %02x", v1); #if ARCOFI_USE @@ -251,7 +318,7 @@ debugl1(cs, "ISAC MON RX out of memory!"); cs->dc.isac.mocr &= 0xf0; cs->dc.isac.mocr |= 0x0a; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); goto afterMONR0; } else cs->dc.isac.mon_rxp = 0; @@ -259,18 +326,18 @@ if (cs->dc.isac.mon_rxp >= MAX_MON_FRAME) { cs->dc.isac.mocr &= 0xf0; cs->dc.isac.mocr |= 0x0a; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); cs->dc.isac.mon_rxp = 0; if (cs->debug & L1_DEB_WARN) debugl1(cs, "ISAC MON RX overflow!"); goto afterMONR0; } - cs->dc.isac.mon_rx[cs->dc.isac.mon_rxp++] = isac_read(cs, ISAC_MOR0); + cs->dc.isac.mon_rx[cs->dc.isac.mon_rxp++] = cs->readisac(cs, ISAC_MOR0); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ISAC MOR0 %02x", cs->dc.isac.mon_rx[cs->dc.isac.mon_rxp -1]); if (cs->dc.isac.mon_rxp == 1) { cs->dc.isac.mocr |= 0x04; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); } } afterMONR0: @@ -281,7 +348,7 @@ debugl1(cs, "ISAC MON RX out of memory!"); cs->dc.isac.mocr &= 0x0f; cs->dc.isac.mocr |= 0xa0; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); goto afterMONR1; } else cs->dc.isac.mon_rxp = 0; @@ -289,51 +356,51 @@ if (cs->dc.isac.mon_rxp >= MAX_MON_FRAME) { cs->dc.isac.mocr &= 0x0f; cs->dc.isac.mocr |= 0xa0; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); cs->dc.isac.mon_rxp = 0; if (cs->debug & L1_DEB_WARN) debugl1(cs, "ISAC MON RX overflow!"); goto afterMONR1; } - cs->dc.isac.mon_rx[cs->dc.isac.mon_rxp++] = isac_read(cs, ISAC_MOR1); + cs->dc.isac.mon_rx[cs->dc.isac.mon_rxp++] = cs->readisac(cs, ISAC_MOR1); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ISAC MOR1 %02x", cs->dc.isac.mon_rx[cs->dc.isac.mon_rxp -1]); cs->dc.isac.mocr |= 0x40; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); } afterMONR1: if (v1 & 0x04) { cs->dc.isac.mocr &= 0xf0; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); cs->dc.isac.mocr |= 0x0a; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); - sched_d_event(cs, D_RX_MON0); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); + schedule_event(cs, D_RX_MON0); } if (v1 & 0x40) { cs->dc.isac.mocr &= 0x0f; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); cs->dc.isac.mocr |= 0xa0; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); - sched_d_event(cs, D_RX_MON1); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); + schedule_event(cs, D_RX_MON1); } if (v1 & 0x02) { if ((!cs->dc.isac.mon_tx) || (cs->dc.isac.mon_txc && (cs->dc.isac.mon_txp >= cs->dc.isac.mon_txc) && !(v1 & 0x08))) { cs->dc.isac.mocr &= 0xf0; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); cs->dc.isac.mocr |= 0x0a; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); if (cs->dc.isac.mon_txc && (cs->dc.isac.mon_txp >= cs->dc.isac.mon_txc)) - sched_d_event(cs, D_TX_MON0); + schedule_event(cs, D_TX_MON0); goto AfterMOX0; } if (cs->dc.isac.mon_txc && (cs->dc.isac.mon_txp >= cs->dc.isac.mon_txc)) { - sched_d_event(cs, D_TX_MON0); + schedule_event(cs, D_TX_MON0); goto AfterMOX0; } - isac_write(cs, ISAC_MOX0, + cs->writeisac(cs, ISAC_MOX0, cs->dc.isac.mon_tx[cs->dc.isac.mon_txp++]); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ISAC %02x -> MOX0", cs->dc.isac.mon_tx[cs->dc.isac.mon_txp -1]); @@ -344,19 +411,19 @@ (cs->dc.isac.mon_txp >= cs->dc.isac.mon_txc) && !(v1 & 0x80))) { cs->dc.isac.mocr &= 0x0f; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); cs->dc.isac.mocr |= 0xa0; - isac_write(cs, ISAC_MOCR, cs->dc.isac.mocr); + cs->writeisac(cs, ISAC_MOCR, cs->dc.isac.mocr); if (cs->dc.isac.mon_txc && (cs->dc.isac.mon_txp >= cs->dc.isac.mon_txc)) - sched_d_event(cs, D_TX_MON1); + schedule_event(cs, D_TX_MON1); goto AfterMOX1; } if (cs->dc.isac.mon_txc && (cs->dc.isac.mon_txp >= cs->dc.isac.mon_txc)) { - sched_d_event(cs, D_TX_MON1); + schedule_event(cs, D_TX_MON1); goto AfterMOX1; } - isac_write(cs, ISAC_MOX1, + cs->writeisac(cs, ISAC_MOX1, cs->dc.isac.mon_tx[cs->dc.isac.mon_txp++]); if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ISAC %02x -> MOX1", cs->dc.isac.mon_tx[cs->dc.isac.mon_txp -1]); @@ -372,33 +439,87 @@ { struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; + u_long flags; int val; switch (pr) { case (PH_DATA |REQUEST): - xmit_data_req_d(cs, skb); + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + skb_queue_tail(&cs->sq, skb); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA Queued", 0); +#endif + } else { + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA", 0); +#endif + isac_fill_fifo(cs); + } + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL |INDICATION): - xmit_pull_ind_d(cs, skb); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); + skb_queue_tail(&cs->sq, skb); + } else { + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); +#endif + isac_fill_fifo(cs); + } + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_d(st); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + debugl1(cs, "-> PH_REQUEST_PULL"); +#endif + if (!cs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (HW_RESET | REQUEST): + spin_lock_irqsave(&cs->lock, flags); if ((cs->dc.isac.ph_state == ISAC_IND_EI) || (cs->dc.isac.ph_state == ISAC_IND_DR) || (cs->dc.isac.ph_state == ISAC_IND_RS)) ph_command(cs, ISAC_CMD_TIM); else ph_command(cs, ISAC_CMD_RS); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_ENABLE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); ph_command(cs, ISAC_CMD_TIM); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_INFO3 | REQUEST): + spin_lock_irqsave(&cs->lock, flags); ph_command(cs, ISAC_CMD_AR8); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_TESTLOOP | REQUEST): + spin_lock_irqsave(&cs->lock, flags); val = 0; if (1 & (long) arg) val |= 0x0c; @@ -407,20 +528,21 @@ if (test_bit(HW_IOM1, &cs->HW_Flags)) { /* IOM 1 Mode */ if (!val) { - isac_write(cs, ISAC_SPCR, 0xa); - isac_write(cs, ISAC_ADF1, 0x2); + cs->writeisac(cs, ISAC_SPCR, 0xa); + cs->writeisac(cs, ISAC_ADF1, 0x2); } else { - isac_write(cs, ISAC_SPCR, val); - isac_write(cs, ISAC_ADF1, 0xa); + cs->writeisac(cs, ISAC_SPCR, val); + cs->writeisac(cs, ISAC_ADF1, 0xa); } } else { /* IOM 2 Mode */ - isac_write(cs, ISAC_SPCR, val); + cs->writeisac(cs, ISAC_SPCR, val); if (val) - isac_write(cs, ISAC_ADF1, 0x8); + cs->writeisac(cs, ISAC_ADF1, 0x8); else - isac_write(cs, ISAC_ADF1, 0x0); + cs->writeisac(cs, ISAC_ADF1, 0x0); } + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_DEACTIVATE | RESPONSE): skb_queue_purge(&cs->rq); @@ -432,7 +554,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); break; default: if (cs->debug & L1_DEB_WARN) @@ -441,14 +563,13 @@ } } -static int +void setstack_isac(struct PStack *st, struct IsdnCardState *cs) { st->l1.l1hw = ISAC_l1hw; - return 0; } -static void +void DC_Close_isac(struct IsdnCardState *cs) { if (cs->dc.isac.mon_rx) { kfree(cs->dc.isac.mon_rx); @@ -467,8 +588,8 @@ int rbch, star; if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { - rbch = isac_read(cs, ISAC_RBCH); - star = isac_read(cs, ISAC_STAR); + rbch = cs->readisac(cs, ISAC_RBCH); + star = cs->readisac(cs, ISAC_STAR); if (cs->debug) debugl1(cs, "D-Channel Busy RBCH %02x STAR %02x", rbch, star); @@ -476,7 +597,7 @@ test_and_set_bit(FLG_L1_DBUSY, &cs->HW_Flags); stptr = cs->stlist; while (stptr != NULL) { - L1L2(stptr, PH_PAUSE | INDICATION, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | INDICATION, NULL); stptr = stptr->next; } } else { @@ -490,80 +611,74 @@ printk(KERN_WARNING "HiSax: ISAC D-Channel Busy no skb\n"); debugl1(cs, "D-Channel Busy no skb"); } - isac_write(cs, ISAC_CMDR, 0x01); /* Transmitter reset */ - cs->card_ops->irq_func(cs->irq, cs, NULL); + cs->writeisac(cs, ISAC_CMDR, 0x01); /* Transmitter reset */ + cs->irq_func(cs->irq, cs, NULL); } } } -static struct dc_l1_ops isac_l1_ops = { - .fill_fifo = isac_fill_fifo, - .open = setstack_isac, - .close = DC_Close_isac, - .bh_func = isac_bh, - .dbusy_func = dbusy_timer_handler, -}; - void __devinit initisac(struct IsdnCardState *cs) { - int val, eval; - - dc_l1_init(cs, &isac_l1_ops); - - val = isac_read(cs, ISAC_STAR); - debugl1(cs, "ISAC STAR %x", val); - val = isac_read(cs, ISAC_MODE); - debugl1(cs, "ISAC MODE %x", val); - val = isac_read(cs, ISAC_ADF2); - debugl1(cs, "ISAC ADF2 %x", val); - val = isac_read(cs, ISAC_ISTA); - debugl1(cs, "ISAC ISTA %x", val); - if (val & 0x01) { - eval = isac_read(cs, ISAC_EXIR); - debugl1(cs, "ISAC EXIR %x", eval); - } - /* Disable all IRQ */ - isac_write(cs, ISAC_MASK, 0xFF); - + cs->setstack_d = setstack_isac; + cs->DC_Close = DC_Close_isac; cs->dc.isac.mon_tx = NULL; cs->dc.isac.mon_rx = NULL; + cs->writeisac(cs, ISAC_MASK, 0xff); cs->dc.isac.mocr = 0xaa; if (test_bit(HW_IOM1, &cs->HW_Flags)) { /* IOM 1 Mode */ - isac_write(cs, ISAC_ADF2, 0x0); - isac_write(cs, ISAC_SPCR, 0xa); - isac_write(cs, ISAC_ADF1, 0x2); - isac_write(cs, ISAC_STCR, 0x70); - isac_write(cs, ISAC_MODE, 0xc9); + cs->writeisac(cs, ISAC_ADF2, 0x0); + cs->writeisac(cs, ISAC_SPCR, 0xa); + cs->writeisac(cs, ISAC_ADF1, 0x2); + cs->writeisac(cs, ISAC_STCR, 0x70); + cs->writeisac(cs, ISAC_MODE, 0xc9); } else { /* IOM 2 Mode */ if (!cs->dc.isac.adf2) cs->dc.isac.adf2 = 0x80; - isac_write(cs, ISAC_ADF2, cs->dc.isac.adf2); - isac_write(cs, ISAC_SQXR, 0x2f); - isac_write(cs, ISAC_SPCR, 0x00); - isac_write(cs, ISAC_STCR, 0x70); - isac_write(cs, ISAC_MODE, 0xc9); - isac_write(cs, ISAC_TIMR, 0x00); - isac_write(cs, ISAC_ADF1, 0x00); + cs->writeisac(cs, ISAC_ADF2, cs->dc.isac.adf2); + cs->writeisac(cs, ISAC_SQXR, 0x2f); + cs->writeisac(cs, ISAC_SPCR, 0x00); + cs->writeisac(cs, ISAC_STCR, 0x70); + cs->writeisac(cs, ISAC_MODE, 0xc9); + cs->writeisac(cs, ISAC_TIMR, 0x00); + cs->writeisac(cs, ISAC_ADF1, 0x00); } ph_command(cs, ISAC_CMD_RS); - isac_write(cs, ISAC_MASK, 0x0); + cs->writeisac(cs, ISAC_MASK, 0x0); +} - val = isac_read(cs, ISAC_CIR0); +void __devinit +clear_pending_isac_ints(struct IsdnCardState *cs) +{ + int val, eval; + + val = cs->readisac(cs, ISAC_STAR); + debugl1(cs, "ISAC STAR %x", val); + val = cs->readisac(cs, ISAC_MODE); + debugl1(cs, "ISAC MODE %x", val); + val = cs->readisac(cs, ISAC_ADF2); + debugl1(cs, "ISAC ADF2 %x", val); + val = cs->readisac(cs, ISAC_ISTA); + debugl1(cs, "ISAC ISTA %x", val); + if (val & 0x01) { + eval = cs->readisac(cs, ISAC_EXIR); + debugl1(cs, "ISAC EXIR %x", eval); + } + val = cs->readisac(cs, ISAC_CIR0); debugl1(cs, "ISAC CIR0 %x", val); cs->dc.isac.ph_state = (val >> 2) & 0xf; - sched_d_event(cs, D_L1STATECHANGE); - - /* RESET Receiver and Transmitter */ - isac_write(cs, ISAC_CMDR, 0x41); + schedule_event(cs, D_L1STATECHANGE); + /* Disable all IRQ */ + cs->writeisac(cs, ISAC_MASK, 0xFF); } -int -isac_setup(struct IsdnCardState *cs, struct dc_hw_ops *isac_ops) +void __devinit +setup_isac(struct IsdnCardState *cs) { - cs->dc_hw_ops = isac_ops; - ISACVersion(cs, "HiSax:"); - return 0; + INIT_WORK(&cs->tqueue, (void *)(void *) isac_bh, cs); + cs->dbusytimer.function = (void *) dbusy_timer_handler; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); } diff -Nru a/drivers/isdn/hisax/isac.h b/drivers/isdn/hisax/isac.h --- a/drivers/isdn/hisax/isac.h Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/isac.h Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: isac.h,v 1.7.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: isac.h,v 1.9.2.2 2004/01/12 22:52:27 keil Exp $ * * ISAC specific defines * @@ -63,6 +63,8 @@ #define ISAC_IND_AI10 0xD #define ISAC_IND_DID 0xF -extern void initisac(struct IsdnCardState *cs); -extern void isac_interrupt(struct IsdnCardState *cs, u8 val); -extern int isac_setup(struct IsdnCardState *cs, struct dc_hw_ops *isac_ops); +extern void ISACVersion(struct IsdnCardState *, char *); +extern void setup_isac(struct IsdnCardState *); +extern void initisac(struct IsdnCardState *); +extern void isac_interrupt(struct IsdnCardState *, u_char); +extern void clear_pending_isac_ints(struct IsdnCardState *); diff -Nru a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c --- a/drivers/isdn/hisax/isar.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/isar.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: isar.c,v 1.17.6.5 2001/09/23 11:51:33 keil Exp $ +/* $Id: isar.c,v 1.22.2.6 2004/02/11 13:21:34 keil Exp $ * * isar.c ISAR (Siemens PSB 7110) specific routines * @@ -20,33 +20,22 @@ #define DLE 0x10 #define ETX 0x03 - -const u8 faxmodulation_s[] = "3,24,48,72,73,74,96,97,98,121,122,145,146"; -const u8 faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146}; -#define FAXMODCNT 13 - -static void __isar_setup(struct IsdnCardState *cs); -static void isar_pump_cmd(struct BCState *bcs, u8 cmd, u8 para); -static inline void ll_deliver_faxstat(struct BCState *bcs, u8 status); -static spinlock_t isar_lock = SPIN_LOCK_UNLOCKED; - -static inline u8 -isar_read_reg(struct IsdnCardState *cs, int mode, u8 addr) -{ - return cs->bc_hw_ops->read_reg(cs, mode, addr); -} - -static inline void -isar_write_reg(struct IsdnCardState *cs, int mode, u8 addr, u8 val) -{ - cs->bc_hw_ops->write_reg(cs, mode, addr, val); -} +#define FAXMODCNT 13 +const u_char faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146}; +static u_int modmask = 0x1fff; +static int frm_extra_delay = 2; +static int para_TOA = 6; +const u_char *FC1_CMD[] = {"FAE", "FTS", "FRS", "FTM", "FRM", "FTH", "FRH", "CTRL" }; + +void isar_setup(struct IsdnCardState *cs); +static void isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para); +static void ll_deliver_faxstat(struct BCState *bcs, u_char status); static inline int waitforHIA(struct IsdnCardState *cs, int timeout) { - while ((isar_read_reg(cs, 0, ISAR_HIA) & 1) && timeout) { + while ((cs->BC_Read_Reg(cs, 0, ISAR_HIA) & 1) && timeout) { udelay(1); timeout--; } @@ -57,10 +46,9 @@ int -sendmsg(struct IsdnCardState *cs, u8 his, u8 creg, u8 len, - u8 *msg) +sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len, + u_char *msg) { - unsigned long flags; int i; if (!waitforHIA(cs, 4000)) @@ -69,14 +57,13 @@ if (cs->debug & L1_DEB_HSCX) debugl1(cs, "sendmsg(%02x,%02x,%d)", his, creg, len); #endif - spin_lock_irqsave(&isar_lock, flags); - isar_write_reg(cs, 0, ISAR_CTRL_H, creg); - isar_write_reg(cs, 0, ISAR_CTRL_L, len); - isar_write_reg(cs, 0, ISAR_WADR, 0); + cs->BC_Write_Reg(cs, 0, ISAR_CTRL_H, creg); + cs->BC_Write_Reg(cs, 0, ISAR_CTRL_L, len); + cs->BC_Write_Reg(cs, 0, ISAR_WADR, 0); if (msg && len) { - isar_write_reg(cs, 1, ISAR_MBOX, msg[0]); + cs->BC_Write_Reg(cs, 1, ISAR_MBOX, msg[0]); for (i=1; iBC_Write_Reg(cs, 2, ISAR_MBOX, msg[i]); #if DUMP_MBOXFRAME>1 if (cs->debug & L1_DEB_HSCX_FIFO) { char tmp[256], *t; @@ -92,23 +79,22 @@ } #endif } - isar_write_reg(cs, 1, ISAR_HIS, his); - spin_unlock_irqrestore(&isar_lock, flags); + cs->BC_Write_Reg(cs, 1, ISAR_HIS, his); waitforHIA(cs, 10000); return(1); } /* Call only with IRQ disabled !!! */ inline void -rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u8 *msg) +rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u_char *msg) { int i; - isar_write_reg(cs, 1, ISAR_RADR, 0); + cs->BC_Write_Reg(cs, 1, ISAR_RADR, 0); if (msg && ireg->clsb) { - msg[0] = isar_read_reg(cs, 1, ISAR_MBOX); + msg[0] = cs->BC_Read_Reg(cs, 1, ISAR_MBOX); for (i=1; i < ireg->clsb; i++) - msg[i] = isar_read_reg(cs, 2, ISAR_MBOX); + msg[i] = cs->BC_Read_Reg(cs, 2, ISAR_MBOX); #if DUMP_MBOXFRAME>1 if (cs->debug & L1_DEB_HSCX_FIFO) { char tmp[256], *t; @@ -124,85 +110,90 @@ } #endif } - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } /* Call only with IRQ disabled !!! */ inline void get_irq_infos(struct IsdnCardState *cs, struct isar_reg *ireg) { - ireg->iis = isar_read_reg(cs, 1, ISAR_IIS); - ireg->cmsb = isar_read_reg(cs, 1, ISAR_CTRL_H); - ireg->clsb = isar_read_reg(cs, 1, ISAR_CTRL_L); + ireg->iis = cs->BC_Read_Reg(cs, 1, ISAR_IIS); + ireg->cmsb = cs->BC_Read_Reg(cs, 1, ISAR_CTRL_H); + ireg->clsb = cs->BC_Read_Reg(cs, 1, ISAR_CTRL_L); #if DUMP_MBOXFRAME if (cs->debug & L1_DEB_HSCX) - debugl1(cs, "rcv_mbox(%02x,%02x,%d)", ireg->iis, ireg->cmsb, + debugl1(cs, "irq_stat(%02x,%02x,%d)", ireg->iis, ireg->cmsb, ireg->clsb); #endif } int -waitrecmsg(struct IsdnCardState *cs, u8 *len, - u8 *msg, int maxdelay) +waitrecmsg(struct IsdnCardState *cs, u_char *len, + u_char *msg, int maxdelay) { int timeout = 0; - unsigned long flags; struct isar_reg *ir = cs->bcs[0].hw.isar.reg; - while((!(isar_read_reg(cs, 0, ISAR_IRQBIT) & ISAR_IRQSTA)) && + while((!(cs->BC_Read_Reg(cs, 0, ISAR_IRQBIT) & ISAR_IRQSTA)) && (timeout++ < maxdelay)) udelay(1); if (timeout >= maxdelay) { printk(KERN_WARNING"isar recmsg IRQSTA timeout\n"); return(0); } - spin_lock_irqsave(&isar_lock, flags); get_irq_infos(cs, ir); rcv_mbox(cs, ir, msg); *len = ir->clsb; - spin_unlock_irqrestore(&isar_lock, flags); return(1); } -static int +int ISARVersion(struct IsdnCardState *cs, char *s) { int ver; - u8 msg[] = ISAR_MSG_HWVER; - u8 tmp[64]; - u8 len; + u_char msg[] = ISAR_MSG_HWVER; + u_char tmp[64]; + u_char len; + u_long flags; int debug; - cs->card_ops->reset(cs); + cs->cardmsg(cs, CARD_RESET, NULL); + spin_lock_irqsave(&cs->lock, flags); /* disable ISAR IRQ */ - isar_write_reg(cs, 0, ISAR_IRQBIT, 0); + cs->BC_Write_Reg(cs, 0, ISAR_IRQBIT, 0); debug = cs->debug; cs->debug &= ~(L1_DEB_HSCX | L1_DEB_HSCX_FIFO); - if (!sendmsg(cs, ISAR_HIS_VNR, 0, 3, msg)) + if (!sendmsg(cs, ISAR_HIS_VNR, 0, 3, msg)) { + spin_unlock_irqrestore(&cs->lock, flags); return(-1); - if (!waitrecmsg(cs, &len, tmp, 100000)) - return(-2); + } + if (!waitrecmsg(cs, &len, tmp, 100000)) { + spin_unlock_irqrestore(&cs->lock, flags); + return(-2); + } cs->debug = debug; if (cs->bcs[0].hw.isar.reg->iis == ISAR_IIS_VNR) { if (len == 1) { ver = tmp[0] & 0xf; printk(KERN_INFO "%s ISAR version %d\n", s, ver); - return(ver); - } - return(-3); - } - return(-4); + } else + ver = -3; + } else + ver = -4; + spin_unlock_irqrestore(&cs->lock, flags); + return(ver); } int -isar_load_firmware(struct IsdnCardState *cs, u8 *buf) +isar_load_firmware(struct IsdnCardState *cs, u_char *buf) { int ret, size, cnt, debug; - u8 len, nom, noc; + u_char len, nom, noc; u_short sadr, left, *sp; - u8 *p = buf; - u8 *msg, *tmpmsg, *mp, tmp[64]; + u_char *p = buf; + u_char *msg, *tmpmsg, *mp, tmp[64]; + u_long flags; struct isar_reg *ireg = cs->bcs[0].hw.isar.reg; struct {u_short sadr; @@ -219,16 +210,16 @@ #if DBG_LOADFIRM<2 cs->debug &= ~(L1_DEB_HSCX | L1_DEB_HSCX_FIFO); #endif - printk(KERN_DEBUG"isar_load_firmware buf %#lx\n", (u_long)buf); + if ((ret = copy_from_user(&size, p, sizeof(int)))) { printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret); - return -EFAULT; + return ret; } p += sizeof(int); printk(KERN_DEBUG"isar_load_firmware size: %d\n", size); cnt = 0; /* disable ISAR IRQ */ - isar_write_reg(cs, 0, ISAR_IRQBIT, 0); + cs->BC_Write_Reg(cs, 0, ISAR_IRQBIT, 0); if (!(msg = kmalloc(256, GFP_KERNEL))) { printk(KERN_ERR"isar_load_firmware no buffer\n"); return (1); @@ -238,10 +229,13 @@ kfree(msg); return (1); } + spin_lock_irqsave(&cs->lock, flags); + /* disable ISAR IRQ */ + cs->BC_Write_Reg(cs, 0, ISAR_IRQBIT, 0); + spin_unlock_irqrestore(&cs->lock, flags); while (cnt < size) { if ((ret = copy_from_user(&blk_head, p, BLK_HEAD_SIZE))) { printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret); - ret = -EFAULT; goto reterror; } #ifdef __BIG_ENDIAN @@ -258,19 +252,21 @@ blk_head.sadr, blk_head.len, blk_head.d_key & 0xff); sadr = blk_head.sadr; left = blk_head.len; + spin_lock_irqsave(&cs->lock, flags); if (!sendmsg(cs, ISAR_HIS_DKEY, blk_head.d_key & 0xff, 0, NULL)) { printk(KERN_ERR"isar sendmsg dkey failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } if (!waitrecmsg(cs, &len, tmp, 100000)) { printk(KERN_ERR"isar waitrecmsg dkey failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } if ((ireg->iis != ISAR_IIS_DKEY) || ireg->cmsb || len) { printk(KERN_ERR"isar wrong dkey response (%x,%x,%x)\n", ireg->iis, ireg->cmsb, len); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } + spin_unlock_irqrestore(&cs->lock, flags); while (left>0) { if (left > 126) noc = 126; @@ -284,7 +280,6 @@ *mp++ = noc; if ((ret = copy_from_user(tmpmsg, p, nom))) { printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret); - ret = -EFAULT; goto reterror; } p += nom; @@ -307,19 +302,21 @@ sp++; noc--; } + spin_lock_irqsave(&cs->lock, flags); if (!sendmsg(cs, ISAR_HIS_FIRM, 0, nom, msg)) { printk(KERN_ERR"isar sendmsg prog failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } if (!waitrecmsg(cs, &len, tmp, 100000)) { printk(KERN_ERR"isar waitrecmsg prog failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } if ((ireg->iis != ISAR_IIS_FIRM) || ireg->cmsb || len) { printk(KERN_ERR"isar wrong prog response (%x,%x,%x)\n", ireg->iis, ireg->cmsb, len); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } + spin_unlock_irqrestore(&cs->lock, flags); } printk(KERN_DEBUG"isar firmware block %5d words loaded\n", blk_head.len); @@ -331,23 +328,25 @@ msg[0] = 0xff; msg[1] = 0xfe; ireg->bstat = 0; + spin_lock_irqsave(&cs->lock, flags); if (!sendmsg(cs, ISAR_HIS_STDSP, 0, 2, msg)) { printk(KERN_ERR"isar sendmsg start dsp failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } if (!waitrecmsg(cs, &len, tmp, 100000)) { printk(KERN_ERR"isar waitrecmsg start dsp failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } if ((ireg->iis != ISAR_IIS_STDSP) || ireg->cmsb || len) { printk(KERN_ERR"isar wrong start dsp response (%x,%x,%x)\n", ireg->iis, ireg->cmsb, len); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } else printk(KERN_DEBUG"isar start dsp success\n"); /* NORMAL mode entered */ /* Enable IRQs of ISAR */ - isar_write_reg(cs, 0, ISAR_IRQBIT, ISAR_IRQSTA); + cs->BC_Write_Reg(cs, 0, ISAR_IRQBIT, ISAR_IRQSTA); + spin_unlock_irqrestore(&cs->lock, flags); cnt = 1000; /* max 1s */ while ((!ireg->bstat) && cnt) { udelay(1000); @@ -364,12 +363,14 @@ cnt = 10; while (cnt--) udelay(1000); + spin_lock_irqsave(&cs->lock, flags); ireg->iis = 0; if (!sendmsg(cs, ISAR_HIS_DIAG, ISAR_CTRL_STST, 0, NULL)) { printk(KERN_ERR"isar sendmsg self tst failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } cnt = 10000; /* max 100 ms */ + spin_unlock_irqrestore(&cs->lock, flags); while ((ireg->iis != ISAR_IIS_DIAG) && cnt) { udelay(10); cnt--; @@ -387,11 +388,13 @@ ireg->cmsb, ireg->clsb, ireg->par[0]); ret = 1;goto reterror; } + spin_lock_irqsave(&cs->lock, flags); ireg->iis = 0; if (!sendmsg(cs, ISAR_HIS_DIAG, ISAR_CTRL_SWVER, 0, NULL)) { printk(KERN_ERR"isar RQST SVN failed\n"); - ret = 1;goto reterror; + ret = 1;goto reterr_unlock; } + spin_unlock_irqrestore(&cs->lock, flags); cnt = 30000; /* max 300 ms */ while ((ireg->iis != ISAR_IIS_DIAG) && cnt) { udelay(10); @@ -411,26 +414,31 @@ ret = 1;goto reterror; } } + spin_lock_irqsave(&cs->lock, flags); cs->debug = debug; - __isar_setup(cs); + isar_setup(cs); + ret = 0; +reterr_unlock: + spin_unlock_irqrestore(&cs->lock, flags); reterror: cs->debug = debug; if (ret) /* disable ISAR IRQ */ - isar_write_reg(cs, 0, ISAR_IRQBIT, 0); + cs->BC_Write_Reg(cs, 0, ISAR_IRQBIT, 0); kfree(msg); kfree(tmpmsg); return(ret); } extern void BChannel_bh(struct BCState *); +#define B_LL_NOCARRIER 8 +#define B_LL_CONNECT 9 +#define B_LL_OK 10 static void -isar_bh(void *data) +isar_bh(struct BCState *bcs) { - struct BCState *bcs = data; - BChannel_bh(bcs); if (test_and_clear_bit(B_LL_NOCARRIER, &bcs->event)) ll_deliver_faxstat(bcs, ISDN_FAX_CLASS1_NOCARR); @@ -440,16 +448,16 @@ ll_deliver_faxstat(bcs, ISDN_FAX_CLASS1_OK); } -static inline void +static void send_DLE_ETX(struct BCState *bcs) { - u8 dleetx[2] = {DLE,ETX}; + u_char dleetx[2] = {DLE,ETX}; struct sk_buff *skb; if ((skb = dev_alloc_skb(2))) { memcpy(skb_put(skb, 2), dleetx, 2); skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); } else { printk(KERN_WARNING "HiSax: skb out of memory\n"); } @@ -476,16 +484,16 @@ } } -static inline void +static void isar_rcv_frame(struct IsdnCardState *cs, struct BCState *bcs) { - u8 *ptr; + u_char *ptr; struct sk_buff *skb; struct isar_reg *ireg = bcs->hw.isar.reg; if (!ireg->clsb) { debugl1(cs, "isar zero len frame"); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); return; } switch (bcs->mode) { @@ -494,24 +502,24 @@ ireg->iis, ireg->cmsb, ireg->clsb); printk(KERN_WARNING"isar mode 0 spurious IIS_RDATA %x/%x/%x\n", ireg->iis, ireg->cmsb, ireg->clsb); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); break; case L1_MODE_TRANS: case L1_MODE_V32: if ((skb = dev_alloc_skb(ireg->clsb))) { - rcv_mbox(cs, ireg, (u8 *)skb_put(skb, ireg->clsb)); + rcv_mbox(cs, ireg, (u_char *)skb_put(skb, ireg->clsb)); skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); } else { printk(KERN_WARNING "HiSax: skb out of memory\n"); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } break; case L1_MODE_HDLC: if ((bcs->hw.isar.rcvidx + ireg->clsb) > HSCX_BUFMAX) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: incoming packet too large"); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); bcs->hw.isar.rcvidx = 0; } else if (ireg->cmsb & HDLC_ERROR) { if (cs->debug & L1_DEB_WARN) @@ -524,7 +532,7 @@ bcs->err_crc++; #endif bcs->hw.isar.rcvidx = 0; - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } else { if (ireg->cmsb & HDLC_FSD) bcs->hw.isar.rcvidx = 0; @@ -542,7 +550,7 @@ memcpy(skb_put(skb, bcs->hw.isar.rcvidx-2), bcs->hw.isar.rcvbuf, bcs->hw.isar.rcvidx-2); skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); } bcs->hw.isar.rcvidx = 0; } @@ -552,7 +560,7 @@ if (bcs->hw.isar.state != STFAX_ACTIV) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: not ACTIV"); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); bcs->hw.isar.rcvidx = 0; break; } @@ -564,25 +572,23 @@ debugl1(cs, "isar_rcv_frame: raw(%d) dle(%d)", ireg->clsb, bcs->hw.isar.rcvidx); if ((skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) { - insert_dle((u8 *)skb_put(skb, bcs->hw.isar.rcvidx), + insert_dle((u_char *)skb_put(skb, bcs->hw.isar.rcvidx), bcs->hw.isar.rcvbuf, ireg->clsb); skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); if (ireg->cmsb & SART_NMD) { /* ABORT */ if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: no more data"); - isar_write_reg(cs, 1, ISAR_IIA, 0); bcs->hw.isar.rcvidx = 0; send_DLE_ETX(bcs); sendmsg(cs, SET_DPS(bcs->hw.isar.dpath) | ISAR_HIS_PUMPCTRL, PCTRL_CMD_ESC, 0, NULL); bcs->hw.isar.state = STFAX_ESCAPE; - sched_b_event(bcs, B_LL_NOCARRIER); + schedule_event(bcs, B_LL_NOCARRIER); } } else { printk(KERN_WARNING "HiSax: skb out of memory\n"); - isar_write_reg(cs, 1, ISAR_IIA, 0); } break; } @@ -590,7 +596,7 @@ if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: unknown fax mode %x", bcs->hw.isar.cmd); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); bcs->hw.isar.rcvidx = 0; break; } @@ -598,17 +604,18 @@ if ((bcs->hw.isar.rcvidx + ireg->clsb) > HSCX_BUFMAX) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: incoming packet too large"); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); bcs->hw.isar.rcvidx = 0; } else if (ireg->cmsb & HDLC_ERROR) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar frame error %x len %d", ireg->cmsb, ireg->clsb); bcs->hw.isar.rcvidx = 0; - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } else { - if (ireg->cmsb & HDLC_FSD) + if (ireg->cmsb & HDLC_FSD) { bcs->hw.isar.rcvidx = 0; + } ptr = bcs->hw.isar.rcvbuf + bcs->hw.isar.rcvidx; bcs->hw.isar.rcvidx += ireg->clsb; rcv_mbox(cs, ireg, ptr); @@ -619,16 +626,19 @@ if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar frame to short %d", bcs->hw.isar.rcvidx); - } else if (!(skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) { + printk(KERN_WARNING "ISAR: frame to short %d\n", + bcs->hw.isar.rcvidx); + } else if (!(skb = dev_alloc_skb(len))) { printk(KERN_WARNING "ISAR: receive out of memory\n"); } else { - insert_dle((u8 *)skb_put(skb, len), + insert_dle((u_char *)skb_put(skb, len), bcs->hw.isar.rcvbuf, bcs->hw.isar.rcvidx); skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); + schedule_event(bcs, B_RCVBUFREADY); send_DLE_ETX(bcs); - sched_b_event(bcs, B_LL_OK); + schedule_event(bcs, B_LL_OK); + test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); } bcs->hw.isar.rcvidx = 0; } @@ -636,18 +646,19 @@ if (ireg->cmsb & SART_NMD) { /* ABORT */ if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: no more data"); - isar_write_reg(cs, 1, ISAR_IIA, 0); bcs->hw.isar.rcvidx = 0; - send_DLE_ETX(bcs); sendmsg(cs, SET_DPS(bcs->hw.isar.dpath) | ISAR_HIS_PUMPCTRL, PCTRL_CMD_ESC, 0, NULL); bcs->hw.isar.state = STFAX_ESCAPE; - sched_b_event(bcs, B_LL_NOCARRIER); + if (test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag)) { + send_DLE_ETX(bcs); + schedule_event(bcs, B_LL_NOCARRIER); + } } break; default: printk(KERN_ERR"isar_rcv_frame mode (%x)error\n", bcs->mode); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); break; } } @@ -657,8 +668,8 @@ { struct IsdnCardState *cs = bcs->cs; int count; - u8 msb; - u8 *ptr; + u_char msb; + u_char *ptr; if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) debugl1(cs, "isar_fill_fifo"); @@ -669,7 +680,7 @@ if (!(bcs->hw.isar.reg->bstat & (bcs->hw.isar.dpath == 1 ? BSTAT_RDM1 : BSTAT_RDM2))) return; - if (bcs->tx_skb->len > (u_int)bcs->hw.isar.mml) { + if (bcs->tx_skb->len > bcs->hw.isar.mml) { msb = 0; count = bcs->hw.isar.mml; } else { @@ -677,7 +688,7 @@ msb = HDLC_FED; } ptr = bcs->tx_skb->data; - if (!bcs->count) { + if (!bcs->hw.isar.txcnt) { msb |= HDLC_FST; if ((bcs->mode == L1_MODE_FAX) && (bcs->hw.isar.cmd == PCTRL_CMD_FTH)) { @@ -691,7 +702,7 @@ } skb_pull(bcs->tx_skb, count); bcs->tx_cnt -= count; - bcs->count += count; + bcs->hw.isar.txcnt += count; switch (bcs->mode) { case L1_MODE_NULL: printk(KERN_ERR"isar_fill_fifo wrong mode 0\n"); @@ -729,7 +740,7 @@ } inline -struct BCState *sel_bcs_isar(struct IsdnCardState *cs, u8 dpath) +struct BCState *sel_bcs_isar(struct IsdnCardState *cs, u_char dpath) { if ((!dpath) || (dpath == 3)) return(NULL); @@ -740,7 +751,7 @@ return(NULL); } -inline void +void send_frames(struct BCState *bcs) { if (bcs->tx_skb) { @@ -748,7 +759,14 @@ isar_fill_fifo(bcs); return; } else { - xmit_complete_b(bcs); + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.isar.txcnt; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } if (bcs->mode == L1_MODE_FAX) { if (bcs->hw.isar.cmd == PCTRL_CMD_FTH) { if (test_bit(BC_FLG_LASTDATA, &bcs->Flag)) { @@ -761,33 +779,35 @@ } } } - bcs->count = 0; + dev_kfree_skb_any(bcs->tx_skb); + bcs->hw.isar.txcnt = 0; + bcs->tx_skb = NULL; } } if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { - bcs->count = 0; + bcs->hw.isar.txcnt = 0; test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); isar_fill_fifo(bcs); } else { if (test_and_clear_bit(BC_FLG_DLEETX, &bcs->Flag)) { if (test_and_clear_bit(BC_FLG_LASTDATA, &bcs->Flag)) { if (test_and_clear_bit(BC_FLG_NMD_DATA, &bcs->Flag)) { - u8 dummy = 0; + u_char dummy = 0; sendmsg(bcs->cs, SET_DPS(bcs->hw.isar.dpath) | ISAR_HIS_SDATA, 0x01, 1, &dummy); } test_and_set_bit(BC_FLG_LL_OK, &bcs->Flag); } else { - sched_b_event(bcs, B_LL_CONNECT); + schedule_event(bcs, B_LL_CONNECT); } } test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); - sched_b_event(bcs, B_XMTBUFREADY); + schedule_event(bcs, B_XMTBUFREADY); } } inline void -check_send(struct IsdnCardState *cs, u8 rdm) +check_send(struct IsdnCardState *cs, u_char rdm) { struct BCState *bcs; @@ -817,8 +837,8 @@ static void isar_pump_status_rsp(struct BCState *bcs, struct isar_reg *ireg) { struct IsdnCardState *cs = bcs->cs; - u8 ril = ireg->par[0]; - u8 rim; + u_char ril = ireg->par[0]; + u_char rim; if (!test_and_clear_bit(ISAR_RATE_REQ, &bcs->hw.isar.reg->Flags)) return; @@ -869,9 +889,9 @@ } static void -isar_pump_statev_modem(struct BCState *bcs, u8 devt) { +isar_pump_statev_modem(struct BCState *bcs, u_char devt) { struct IsdnCardState *cs = bcs->cs; - u8 dps = SET_DPS(bcs->hw.isar.dpath); + u_char dps = SET_DPS(bcs->hw.isar.dpath); switch(devt) { case PSEV_10MS_TIMER: @@ -938,8 +958,8 @@ } } -static inline void -ll_deliver_faxstat(struct BCState *bcs, u8 status) +static void +ll_deliver_faxstat(struct BCState *bcs, u_char status) { isdn_ctrl ic; struct Channel *chanp = (struct Channel *) bcs->st->lli.userdata; @@ -954,10 +974,10 @@ } static void -isar_pump_statev_fax(struct BCState *bcs, u8 devt) { +isar_pump_statev_fax(struct BCState *bcs, u_char devt) { struct IsdnCardState *cs = bcs->cs; - u8 dps = SET_DPS(bcs->hw.isar.dpath); - u8 p1; + u_char dps = SET_DPS(bcs->hw.isar.dpath); + u_char p1; switch(devt) { case PSEV_10MS_TIMER: @@ -1041,7 +1061,7 @@ &bcs->Flag); add_timer(&bcs->hw.isar.ftimer); } else { - sched_b_event(bcs, B_LL_CONNECT); + schedule_event(bcs, B_LL_CONNECT); } } else { if (cs->debug & L1_DEB_WARN) @@ -1057,19 +1077,22 @@ if (cs->debug & L1_DEB_HSCX) debugl1(cs, "pump stev RSP_DISC"); if (bcs->hw.isar.state == STFAX_ESCAPE) { + p1 = 5; switch(bcs->hw.isar.newcmd) { case 0: bcs->hw.isar.state = STFAX_READY; break; - case PCTRL_CMD_FTH: case PCTRL_CMD_FTM: - p1 = 10; + p1 = 2; + case PCTRL_CMD_FTH: sendmsg(cs, dps | ISAR_HIS_PUMPCTRL, PCTRL_CMD_SILON, 1, &p1); bcs->hw.isar.state = STFAX_SILDET; break; - case PCTRL_CMD_FRH: case PCTRL_CMD_FRM: + if (frm_extra_delay) + mdelay(frm_extra_delay); + case PCTRL_CMD_FRH: p1 = bcs->hw.isar.mod = bcs->hw.isar.newmod; bcs->hw.isar.newmod = 0; bcs->hw.isar.cmd = bcs->hw.isar.newcmd; @@ -1086,10 +1109,10 @@ } } else if (bcs->hw.isar.state == STFAX_ACTIV) { if (test_and_clear_bit(BC_FLG_LL_OK, &bcs->Flag)) { - sched_b_event(bcs, B_LL_OK); + schedule_event(bcs, B_LL_OK); } else if (bcs->hw.isar.cmd == PCTRL_CMD_FRM) { send_DLE_ETX(bcs); - sched_b_event(bcs, B_LL_NOCARRIER); + schedule_event(bcs, B_LL_NOCARRIER); } else { ll_deliver_faxstat(bcs, ISDN_FAX_CLASS1_FCERROR); } @@ -1156,11 +1179,11 @@ } else { debugl1(cs, "isar spurious IIS_RDATA %x/%x/%x", ireg->iis, ireg->cmsb, ireg->clsb); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } break; case ISAR_IIS_GSTEV: - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); ireg->bstat |= ireg->cmsb; check_send(cs, ireg->cmsb); break; @@ -1176,15 +1199,18 @@ if (cs->debug & L1_DEB_WARN) debugl1(cs, "Buffer STEV dpath%d msb(%x)", ireg->iis>>6, ireg->cmsb); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); break; case ISAR_IIS_PSTEV: if ((bcs = sel_bcs_isar(cs, ireg->iis >> 6))) { - rcv_mbox(cs, ireg, (u8 *)ireg->par); + rcv_mbox(cs, ireg, (u_char *)ireg->par); if (bcs->mode == L1_MODE_V32) { isar_pump_statev_modem(bcs, ireg->cmsb); } else if (bcs->mode == L1_MODE_FAX) { isar_pump_statev_fax(bcs, ireg->cmsb); + } else if (ireg->cmsb == PSEV_10MS_TIMER) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "pump stev TIMER"); } else { if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar IIS_PSTEV pmode %d stat %x", @@ -1193,30 +1219,30 @@ } else { debugl1(cs, "isar spurious IIS_PSTEV %x/%x/%x", ireg->iis, ireg->cmsb, ireg->clsb); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } break; case ISAR_IIS_PSTRSP: if ((bcs = sel_bcs_isar(cs, ireg->iis >> 6))) { - rcv_mbox(cs, ireg, (u8 *)ireg->par); + rcv_mbox(cs, ireg, (u_char *)ireg->par); isar_pump_status_rsp(bcs, ireg); } else { debugl1(cs, "isar spurious IIS_PSTRSP %x/%x/%x", ireg->iis, ireg->cmsb, ireg->clsb); - isar_write_reg(cs, 1, ISAR_IIA, 0); + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } break; case ISAR_IIS_DIAG: case ISAR_IIS_BSTRSP: case ISAR_IIS_IOM2RSP: - rcv_mbox(cs, ireg, (u8 *)ireg->par); + rcv_mbox(cs, ireg, (u_char *)ireg->par); if ((cs->debug & (L1_DEB_HSCX | L1_DEB_HSCX_FIFO)) == L1_DEB_HSCX) { - u8 *tp=debbuf; + u_char *tp=debbuf; tp += sprintf(debbuf, "msg iis(%x) msb(%x)", ireg->iis, ireg->cmsb); - QuickHex(tp, (u8 *)ireg->par, ireg->clsb); + QuickHex(tp, (u_char *)ireg->par, ireg->clsb); debugl1(cs, debbuf); } break; @@ -1242,15 +1268,18 @@ bcs->Flag); test_and_clear_bit(BC_FLG_FTI_RUN, &bcs->Flag); if (test_and_clear_bit(BC_FLG_LL_CONN, &bcs->Flag)) { - sched_b_event(bcs, B_LL_CONNECT); + schedule_event(bcs, B_LL_CONNECT); + } + if (test_and_clear_bit(BC_FLG_FTI_FTS, &bcs->Flag)) { + schedule_event(bcs, B_LL_OK); } } static void setup_pump(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; - u8 dps = SET_DPS(bcs->hw.isar.dpath); - u8 ctrl, param[6]; + u_char dps = SET_DPS(bcs->hw.isar.dpath); + u_char ctrl, param[6]; switch (bcs->mode) { case L1_MODE_NULL: @@ -1266,7 +1295,7 @@ } else { param[5] = PV32P6_ATN; } - param[0] = 6; /* 6 db */ + param[0] = para_TOA; /* 6 db */ param[1] = PV32P2_V23R | PV32P2_V22A | PV32P2_V22B | PV32P2_V22C | PV32P2_V21 | PV32P2_BEL; param[2] = PV32P3_AMOD | PV32P3_V32B | PV32P3_V23B; @@ -1282,7 +1311,7 @@ } else { param[1] = PFAXP2_ATN; } - param[0] = 6; /* 6 db */ + param[0] = para_TOA; /* 6 db */ sendmsg(cs, dps | ISAR_HIS_PUMPCFG, ctrl, 2, param); bcs->hw.isar.state = STFAX_NULL; bcs->hw.isar.newcmd = 0; @@ -1298,8 +1327,8 @@ static void setup_sart(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; - u8 dps = SET_DPS(bcs->hw.isar.dpath); - u8 ctrl, param[2]; + u_char dps = SET_DPS(bcs->hw.isar.dpath); + u_char ctrl, param[2]; switch (bcs->mode) { case L1_MODE_NULL: @@ -1311,7 +1340,6 @@ "\0\0"); break; case L1_MODE_HDLC: - case L1_MODE_FAX: param[0] = 0; sendmsg(cs, dps | ISAR_HIS_SARTCFG, SMODE_HDLC, 1, param); @@ -1323,6 +1351,9 @@ sendmsg(cs, dps | ISAR_HIS_SARTCFG, ctrl, 2, param); break; + case L1_MODE_FAX: + /* SART must not configured with FAX */ + break; } udelay(1000); sendmsg(cs, dps | ISAR_HIS_BSTREQ, 0, 0, NULL); @@ -1332,8 +1363,8 @@ static void setup_iom2(struct BCState *bcs) { struct IsdnCardState *cs = bcs->cs; - u8 dps = SET_DPS(bcs->hw.isar.dpath); - u8 cmsb = IOM_CTRL_ENA, msg[5] = {IOM_P1_TXD,0,0,0,0}; + u_char dps = SET_DPS(bcs->hw.isar.dpath); + u_char cmsb = IOM_CTRL_ENA, msg[5] = {IOM_P1_TXD,0,0,0,0}; if (bcs->channel) msg[1] = msg[3] = 1; @@ -1418,14 +1449,15 @@ } static void -isar_pump_cmd(struct BCState *bcs, u8 cmd, u8 para) +isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para) { struct IsdnCardState *cs = bcs->cs; - u8 dps = SET_DPS(bcs->hw.isar.dpath); - u8 ctrl = 0, nom = 0, p1 = 0; + u_char dps = SET_DPS(bcs->hw.isar.dpath); + u_char ctrl = 0, nom = 0, p1 = 0; switch(cmd) { case ISDN_FAX_CLASS1_FTM: + test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FTM; @@ -1449,6 +1481,7 @@ } break; case ISDN_FAX_CLASS1_FTH: + test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FTH; @@ -1472,6 +1505,7 @@ } break; case ISDN_FAX_CLASS1_FRM: + test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FRM; @@ -1495,6 +1529,7 @@ } break; case ISDN_FAX_CLASS1_FRH: + test_and_set_bit(BC_FLG_FRH_WAIT, &bcs->Flag); if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FRH; @@ -1517,15 +1552,20 @@ bcs->hw.isar.state = STFAX_ESCAPE; } break; + case ISDN_FAXPUMP_HALT: + bcs->hw.isar.state = STFAX_NULL; + nom = 0; + ctrl = PCTRL_CMD_HALT; + break; } if (ctrl) sendmsg(cs, dps | ISAR_HIS_PUMPCTRL, ctrl, nom, &p1); } void -__isar_setup(struct IsdnCardState *cs) +isar_setup(struct IsdnCardState *cs) { - u8 msg; + u_char msg; int i; /* Dpath 1, 2 */ @@ -1538,57 +1578,105 @@ cs->bcs[i].mode = 0; cs->bcs[i].hw.isar.dpath = i + 1; modeisar(&cs->bcs[i], 0, 0); - INIT_WORK(&cs->bcs[i].work, isar_bh, &cs->bcs[i]); + INIT_WORK(&cs->bcs[i].tqueue, (void *)(void *) isar_bh, &cs->bcs[i]); } } void isar_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; + int ret; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + if (bcs->cs->debug & L1_DEB_HSCX) + debugl1(bcs->cs, "DRQ set BC_FLG_BUSY"); + bcs->hw.isar.txcnt = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "isar_l2l1: this shouldn't happen\n"); + } else { + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + if (bcs->cs->debug & L1_DEB_HSCX) + debugl1(bcs->cs, "PUI set BC_FLG_BUSY"); + bcs->tx_skb = skb; + bcs->hw.isar.txcnt = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - st->l1.bcs->hw.isar.conmsg[0] = 0; + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + bcs->hw.isar.conmsg[0] = 0; if (test_bit(FLG_ORIG, &st->l2.flag)) - test_and_set_bit(BC_FLG_ORIG, &st->l1.bcs->Flag); + test_and_set_bit(BC_FLG_ORIG, &bcs->Flag); else - test_and_clear_bit(BC_FLG_ORIG, &st->l1.bcs->Flag); + test_and_clear_bit(BC_FLG_ORIG, &bcs->Flag); switch(st->l1.mode) { case L1_MODE_TRANS: case L1_MODE_HDLC: - if (modeisar(st->l1.bcs, st->l1.mode, st->l1.bc)) + ret = modeisar(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + if (ret) l1_msg_b(st, PH_DEACTIVATE | REQUEST, arg); else l1_msg_b(st, PH_ACTIVATE | REQUEST, arg); break; case L1_MODE_V32: case L1_MODE_FAX: - if (modeisar(st->l1.bcs, st->l1.mode, st->l1.bc)) + ret = modeisar(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + if (ret) l1_msg_b(st, PH_DEACTIVATE | REQUEST, arg); break; + default: + spin_unlock_irqrestore(&bcs->cs->lock, flags); + break; } break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - if (st->l1.bcs->cs->debug & L1_DEB_HSCX) - debugl1(st->l1.bcs->cs, "PDAC clear BC_FLG_BUSY"); - modeisar(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + switch(st->l1.mode) { + case L1_MODE_TRANS: + case L1_MODE_HDLC: + case L1_MODE_V32: + break; + case L1_MODE_FAX: + isar_pump_cmd(bcs, ISDN_FAXPUMP_HALT, 0); + break; + } + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + if (bcs->cs->debug & L1_DEB_HSCX) + debugl1(bcs->cs, "PDAC clear BC_FLG_BUSY"); + modeisar(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -1634,9 +1722,6 @@ bcs->event = 0; bcs->hw.isar.rcvidx = 0; bcs->tx_cnt = 0; - bcs->hw.isar.ftimer.function = (void *) ftimer_handler; - bcs->hw.isar.ftimer.data = (long) bcs; - init_timer(&bcs->hw.isar.ftimer); return (0); } @@ -1647,7 +1732,7 @@ if (open_isarstate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = isar_l2l1; + st->l2.l2l1 = isar_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -1674,6 +1759,51 @@ test_and_set_bit(BC_FLG_DLEETX, &bcs->Flag); break; + case ISDN_FAX_CLASS1_FTS: + if (ic->parm.aux.subcmd == AT_QUERY) { + ic->command = ISDN_STAT_FAXIND; + ic->parm.aux.cmd = ISDN_FAX_CLASS1_OK; + cs->iif.statcallb(ic); + return(0); + } else if (ic->parm.aux.subcmd == AT_EQ_QUERY) { + strcpy(ic->parm.aux.para, "0-255"); + ic->command = ISDN_STAT_FAXIND; + ic->parm.aux.cmd = ISDN_FAX_CLASS1_QUERY; + cs->iif.statcallb(ic); + return(0); + } else if (ic->parm.aux.subcmd == AT_EQ_VALUE) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "isar_auxcmd %s=%d", + FC1_CMD[ic->parm.aux.cmd], ic->parm.aux.para[0]); + if (bcs->hw.isar.state == STFAX_READY) { + if (! ic->parm.aux.para[0]) { + ic->command = ISDN_STAT_FAXIND; + ic->parm.aux.cmd = ISDN_FAX_CLASS1_OK; + cs->iif.statcallb(ic); + return(0); + } + if (! test_and_set_bit(BC_FLG_FTI_RUN, &bcs->Flag)) { + /* n*10 ms */ + bcs->hw.isar.ftimer.expires = + jiffies + ((ic->parm.aux.para[0] * 10 * HZ)/1000); + test_and_set_bit(BC_FLG_FTI_FTS, &bcs->Flag); + add_timer(&bcs->hw.isar.ftimer); + return(0); + } else { + if (cs->debug) + debugl1(cs, "isar FTS=%d and FTI busy", + ic->parm.aux.para[0]); + } + } else { + if (cs->debug) + debugl1(cs, "isar FTS=%d and isar.state not ready(%x)", + ic->parm.aux.para[0],bcs->hw.isar.state); + } + ic->command = ISDN_STAT_FAXIND; + ic->parm.aux.cmd = ISDN_FAX_CLASS1_ERROR; + cs->iif.statcallb(ic); + } + break; case ISDN_FAX_CLASS1_FRM: case ISDN_FAX_CLASS1_FRH: case ISDN_FAX_CLASS1_FTM: @@ -1686,16 +1816,24 @@ cs->iif.statcallb(ic); return(0); } else if (ic->parm.aux.subcmd == AT_EQ_QUERY) { - strcpy(ic->parm.aux.para, faxmodulation_s); + char *p = ic->parm.aux.para; + for(i=0;icommand = ISDN_STAT_FAXIND; ic->parm.aux.cmd = ISDN_FAX_CLASS1_QUERY; cs->iif.statcallb(ic); return(0); } else if (ic->parm.aux.subcmd == AT_EQ_VALUE) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "isar_auxcmd %s=%d", + FC1_CMD[ic->parm.aux.cmd], ic->parm.aux.para[0]); for(i=0;iparm.aux.para[0]) break; - if ((FAXMODCNT > i) && + if ((i < FAXMODCNT) && ((1<Flag)) { isar_pump_cmd(bcs, ic->parm.aux.cmd, @@ -1713,16 +1851,36 @@ break; case (ISDN_CMD_IOCTL): switch (ic->arg) { - case (9): /* load firmware */ + case 9: /* load firmware */ features = ISDN_FEATURE_L2_MODEM | ISDN_FEATURE_L2_FAX | ISDN_FEATURE_L3_FCLASS1; memcpy(&adr, ic->parm.num, sizeof(ulong)); - if (isar_load_firmware(cs, (u8 *)adr)) + if (isar_load_firmware(cs, (u_char *)adr)) return(1); else ll_run(cs, features); break; + case 20: + features = *(unsigned int *) ic->parm.num; + printk(KERN_DEBUG "HiSax: max modulation old(%04x) new(%04x)\n", + modmask, features); + modmask = features; + break; + case 21: + features = *(unsigned int *) ic->parm.num; + printk(KERN_DEBUG "HiSax: FRM extra delay old(%d) new(%d) ms\n", + frm_extra_delay, features); + if (features >= 0) + frm_extra_delay = features; + break; + case 22: + features = *(unsigned int *) ic->parm.num; + printk(KERN_DEBUG "HiSax: TOA old(%d) new(%d) db\n", + para_TOA, features); + if (features >= 0 && features < 32) + para_TOA = features; + break; default: printk(KERN_DEBUG "HiSax: invalid ioctl %d\n", (int) ic->arg); @@ -1735,21 +1893,17 @@ return(0); } -static struct bc_l1_ops isar_l1_ops = { - .fill_fifo = isar_fill_fifo, - .open = setstack_isar, - .close = close_isarstate, -}; - void __devinit initisar(struct IsdnCardState *cs) { - cs->bc_l1_ops = &isar_l1_ops; -} - -int -isar_setup(struct IsdnCardState *cs, struct bc_hw_ops *isar_ops) -{ - cs->bc_hw_ops = isar_ops; - return ISARVersion(cs, "HiSax:"); + cs->bcs[0].BC_SetStack = setstack_isar; + cs->bcs[1].BC_SetStack = setstack_isar; + cs->bcs[0].BC_Close = close_isarstate; + cs->bcs[1].BC_Close = close_isarstate; + cs->bcs[0].hw.isar.ftimer.function = (void *) ftimer_handler; + cs->bcs[0].hw.isar.ftimer.data = (long) &cs->bcs[0]; + init_timer(&cs->bcs[0].hw.isar.ftimer); + cs->bcs[1].hw.isar.ftimer.function = (void *) ftimer_handler; + cs->bcs[1].hw.isar.ftimer.data = (long) &cs->bcs[1]; + init_timer(&cs->bcs[1].hw.isar.ftimer); } diff -Nru a/drivers/isdn/hisax/isar.h b/drivers/isdn/hisax/isar.h --- a/drivers/isdn/hisax/isar.h Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/isar.h Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: isar.h,v 1.9.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: isar.h,v 1.11.2.2 2004/01/12 22:52:27 keil Exp $ * * ISAR (Siemens PSB 7110) specific defines * @@ -28,6 +28,8 @@ #define ISAR_HIS_FIRM 0x1e #define ISAR_HIS_STDSP 0x08 #define ISAR_HIS_DIAG 0x05 +#define ISAR_HIS_WAITSTATE 0x27 +#define ISAR_HIS_TIMERIRQ 0x25 #define ISAR_HIS_P0CFG 0x3c #define ISAR_HIS_P12CFG 0x24 #define ISAR_HIS_SARTCFG 0x25 @@ -43,6 +45,10 @@ #define ISAR_HIS_DPS2 0x80 #define SET_DPS(x) ((x<<6) & 0xc0) +#define ISAR_CMD_TIMERIRQ_OFF 0x20 +#define ISAR_CMD_TIMERIRQ_ON 0x21 + + #define ISAR_IIS_MSCMSD 0x3f #define ISAR_IIS_VNR 0x15 #define ISAR_IIS_DKEY 0x03 @@ -207,8 +213,10 @@ #define STFAX_ESCAPE 5 #define STFAX_SILDET 6 +#define ISDN_FAXPUMP_HALT 100 + +extern int ISARVersion(struct IsdnCardState *cs, char *s); extern void isar_int_main(struct IsdnCardState *cs); extern void initisar(struct IsdnCardState *cs); extern void isar_fill_fifo(struct BCState *bcs); extern int isar_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic); -extern int isar_setup(struct IsdnCardState *cs, struct bc_hw_ops *isar_ops); diff -Nru a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/isdn/hisax/isdnhdlc.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,669 @@ +/* + * isdnhdlc.c -- General purpose ISDN HDLC decoder. + * + *Copyright (C) 2002 Wolfgang Mües + * 2001 Frode Isaksen + * 2001 Kai Germaschewski + * + * 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. + */ + +#include +#include +#include "isdnhdlc.h" + +/*-------------------------------------------------------------------*/ + +MODULE_AUTHOR("Wolfgang Mües , " + "Frode Isaksen , " + "Kai Germaschewski "); +MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); +MODULE_LICENSE("GPL"); + +/*-------------------------------------------------------------------*/ + +/* bit swap table. + * Very handy for devices with different bit order, + * and neccessary for each transparent B-channel access for all + * devices which works with this HDLC decoder without bit reversal. + */ +const unsigned char isdnhdlc_bit_rev_tab[256] = { + 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, + 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, + 0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, + 0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, + 0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, + 0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, + 0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, + 0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, + 0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, + 0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, + 0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, + 0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, + 0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, + 0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, + 0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, + 0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF +}; + +/* Table for CRC16. Internal used only. */ +static const unsigned short int crc16_tab[] = { + 0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf, + 0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7, + 0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e, + 0x9cc9,0x8d40,0xbfdb,0xae52,0xdaed,0xcb64,0xf9ff,0xe876, + 0x2102,0x308b,0x0210,0x1399,0x6726,0x76af,0x4434,0x55bd, + 0xad4a,0xbcc3,0x8e58,0x9fd1,0xeb6e,0xfae7,0xc87c,0xd9f5, + 0x3183,0x200a,0x1291,0x0318,0x77a7,0x662e,0x54b5,0x453c, + 0xbdcb,0xac42,0x9ed9,0x8f50,0xfbef,0xea66,0xd8fd,0xc974, + 0x4204,0x538d,0x6116,0x709f,0x0420,0x15a9,0x2732,0x36bb, + 0xce4c,0xdfc5,0xed5e,0xfcd7,0x8868,0x99e1,0xab7a,0xbaf3, + 0x5285,0x430c,0x7197,0x601e,0x14a1,0x0528,0x37b3,0x263a, + 0xdecd,0xcf44,0xfddf,0xec56,0x98e9,0x8960,0xbbfb,0xaa72, + 0x6306,0x728f,0x4014,0x519d,0x2522,0x34ab,0x0630,0x17b9, + 0xef4e,0xfec7,0xcc5c,0xddd5,0xa96a,0xb8e3,0x8a78,0x9bf1, + 0x7387,0x620e,0x5095,0x411c,0x35a3,0x242a,0x16b1,0x0738, + 0xffcf,0xee46,0xdcdd,0xcd54,0xb9eb,0xa862,0x9af9,0x8b70, + 0x8408,0x9581,0xa71a,0xb693,0xc22c,0xd3a5,0xe13e,0xf0b7, + 0x0840,0x19c9,0x2b52,0x3adb,0x4e64,0x5fed,0x6d76,0x7cff, + 0x9489,0x8500,0xb79b,0xa612,0xd2ad,0xc324,0xf1bf,0xe036, + 0x18c1,0x0948,0x3bd3,0x2a5a,0x5ee5,0x4f6c,0x7df7,0x6c7e, + 0xa50a,0xb483,0x8618,0x9791,0xe32e,0xf2a7,0xc03c,0xd1b5, + 0x2942,0x38cb,0x0a50,0x1bd9,0x6f66,0x7eef,0x4c74,0x5dfd, + 0xb58b,0xa402,0x9699,0x8710,0xf3af,0xe226,0xd0bd,0xc134, + 0x39c3,0x284a,0x1ad1,0x0b58,0x7fe7,0x6e6e,0x5cf5,0x4d7c, + 0xc60c,0xd785,0xe51e,0xf497,0x8028,0x91a1,0xa33a,0xb2b3, + 0x4a44,0x5bcd,0x6956,0x78df,0x0c60,0x1de9,0x2f72,0x3efb, + 0xd68d,0xc704,0xf59f,0xe416,0x90a9,0x8120,0xb3bb,0xa232, + 0x5ac5,0x4b4c,0x79d7,0x685e,0x1ce1,0x0d68,0x3ff3,0x2e7a, + 0xe70e,0xf687,0xc41c,0xd595,0xa12a,0xb0a3,0x8238,0x93b1, + 0x6b46,0x7acf,0x4854,0x59dd,0x2d62,0x3ceb,0x0e70,0x1ff9, + 0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330, + 0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78 +}; + + +enum { + HDLC_FAST_IDLE,HDLC_GET_FLAG_B0,HDLC_GETFLAG_B1A6,HDLC_GETFLAG_B7, + HDLC_GET_DATA,HDLC_FAST_FLAG +}; + +enum { + HDLC_SEND_DATA,HDLC_SEND_CRC1,HDLC_SEND_FAST_FLAG, + HDLC_SEND_FIRST_FLAG,HDLC_SEND_CRC2,HDLC_SEND_CLOSING_FLAG, + HDLC_SEND_IDLE1,HDLC_SEND_FAST_IDLE,HDLC_SENDFLAG_B0, + HDLC_SENDFLAG_B1A6,HDLC_SENDFLAG_B7,STOPPED +}; + +void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc, int do_adapt56) +{ + hdlc->bit_shift = 0; + hdlc->hdlc_bits1 = 0; + hdlc->data_bits = 0; + hdlc->ffbit_shift = 0; + hdlc->data_received = 0; + hdlc->state = HDLC_GET_DATA; + hdlc->do_adapt56 = do_adapt56; + hdlc->dchannel = 0; + hdlc->crc = 0; + hdlc->cbin = 0; + hdlc->shift_reg = 0; + hdlc->ffvalue = 0; + hdlc->dstpos = 0; +} + +void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc, int is_d_channel, int do_adapt56) +{ + hdlc->bit_shift = 0; + hdlc->hdlc_bits1 = 0; + hdlc->data_bits = 0; + hdlc->ffbit_shift = 0; + hdlc->data_received = 0; + hdlc->do_closing = 0; + hdlc->ffvalue = 0; + if (is_d_channel) { + hdlc->dchannel = 1; + hdlc->state = HDLC_SEND_FIRST_FLAG; + } else { + hdlc->dchannel = 0; + hdlc->state = HDLC_SEND_FAST_FLAG; + hdlc->ffvalue = 0x7e; + } + hdlc->cbin = 0x7e; + hdlc->bit_shift = 0; + if(do_adapt56){ + hdlc->do_adapt56 = 1; + hdlc->data_bits = 0; + hdlc->state = HDLC_SENDFLAG_B0; + } else { + hdlc->do_adapt56 = 0; + hdlc->data_bits = 8; + } + hdlc->shift_reg = 0; +} + +/* + isdnhdlc_decode - decodes HDLC frames from a transparent bit stream. + + The source buffer is scanned for valid HDLC frames looking for + flags (01111110) to indicate the start of a frame. If the start of + the frame is found, the bit stuffing is removed (0 after 5 1's). + When a new flag is found, the complete frame has been received + and the CRC is checked. + If a valid frame is found, the function returns the frame length + excluding the CRC with the bit HDLC_END_OF_FRAME set. + If the beginning of a valid frame is found, the function returns + the length. + If a framing error is found (too many 1s and not a flag) the function + returns the length with the bit HDLC_FRAMING_ERROR set. + If a CRC error is found the function returns the length with the + bit HDLC_CRC_ERROR set. + If the frame length exceeds the destination buffer size, the function + returns the length with the bit HDLC_LENGTH_ERROR set. + + src - source buffer + slen - source buffer length + count - number of bytes removed (decoded) from the source buffer + dst _ destination buffer + dsize - destination buffer size + returns - number of decoded bytes in the destination buffer and status + flag. + */ +int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, + int slen, int *count, unsigned char *dst, int dsize) +{ + int status=0; + + static const unsigned char fast_flag[]={ + 0x00,0x00,0x00,0x20,0x30,0x38,0x3c,0x3e,0x3f + }; + + static const unsigned char fast_flag_value[]={ + 0x00,0x7e,0xfc,0xf9,0xf3,0xe7,0xcf,0x9f,0x3f + }; + + static const unsigned char fast_abort[]={ + 0x00,0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff + }; + + *count = slen; + + while(slen > 0){ + if(hdlc->bit_shift==0){ + hdlc->cbin = *src++; + slen--; + hdlc->bit_shift = 8; + if(hdlc->do_adapt56){ + hdlc->bit_shift --; + } + } + + switch(hdlc->state){ + case STOPPED: + return 0; + case HDLC_FAST_IDLE: + if(hdlc->cbin == 0xff){ + hdlc->bit_shift = 0; + break; + } + hdlc->state = HDLC_GET_FLAG_B0; + hdlc->hdlc_bits1 = 0; + hdlc->bit_shift = 8; + break; + case HDLC_GET_FLAG_B0: + if(!(hdlc->cbin & 0x80)) { + hdlc->state = HDLC_GETFLAG_B1A6; + hdlc->hdlc_bits1 = 0; + } else { + if(!hdlc->do_adapt56){ + if(++hdlc->hdlc_bits1 >=8 ) if(hdlc->bit_shift==1) + hdlc->state = HDLC_FAST_IDLE; + } + } + hdlc->cbin<<=1; + hdlc->bit_shift --; + break; + case HDLC_GETFLAG_B1A6: + if(hdlc->cbin & 0x80){ + hdlc->hdlc_bits1++; + if(hdlc->hdlc_bits1==6){ + hdlc->state = HDLC_GETFLAG_B7; + } + } else { + hdlc->hdlc_bits1 = 0; + } + hdlc->cbin<<=1; + hdlc->bit_shift --; + break; + case HDLC_GETFLAG_B7: + if(hdlc->cbin & 0x80) { + hdlc->state = HDLC_GET_FLAG_B0; + } else { + hdlc->state = HDLC_GET_DATA; + hdlc->crc = 0xffff; + hdlc->shift_reg = 0; + hdlc->hdlc_bits1 = 0; + hdlc->data_bits = 0; + hdlc->data_received = 0; + } + hdlc->cbin<<=1; + hdlc->bit_shift --; + break; + case HDLC_GET_DATA: + if(hdlc->cbin & 0x80){ + hdlc->hdlc_bits1++; + switch(hdlc->hdlc_bits1){ + case 6: + break; + case 7: + if(hdlc->data_received) { + // bad frame + status = -HDLC_FRAMING_ERROR; + } + if(!hdlc->do_adapt56){ + if(hdlc->cbin==fast_abort[hdlc->bit_shift+1]){ + hdlc->state = HDLC_FAST_IDLE; + hdlc->bit_shift=1; + break; + } + } else { + hdlc->state = HDLC_GET_FLAG_B0; + } + break; + default: + hdlc->shift_reg>>=1; + hdlc->shift_reg |= 0x80; + hdlc->data_bits++; + break; + } + } else { + switch(hdlc->hdlc_bits1){ + case 5: + break; + case 6: + if(hdlc->data_received){ + if (hdlc->dstpos < 2) { + status = -HDLC_FRAMING_ERROR; + } else if (hdlc->crc != 0xf0b8){ + // crc error + status = -HDLC_CRC_ERROR; + } else { + // remove CRC + hdlc->dstpos -= 2; + // good frame + status = hdlc->dstpos; + } + } + hdlc->crc = 0xffff; + hdlc->shift_reg = 0; + hdlc->data_bits = 0; + if(!hdlc->do_adapt56){ + if(hdlc->cbin==fast_flag[hdlc->bit_shift]){ + hdlc->ffvalue = fast_flag_value[hdlc->bit_shift]; + hdlc->state = HDLC_FAST_FLAG; + hdlc->ffbit_shift = hdlc->bit_shift; + hdlc->bit_shift = 1; + } else { + hdlc->state = HDLC_GET_DATA; + hdlc->data_received = 0; + } + } else { + hdlc->state = HDLC_GET_DATA; + hdlc->data_received = 0; + } + break; + default: + hdlc->shift_reg>>=1; + hdlc->data_bits++; + break; + } + hdlc->hdlc_bits1 = 0; + } + if (status) { + hdlc->dstpos = 0; + *count -= slen; + hdlc->cbin <<= 1; + hdlc->bit_shift--; + return status; + } + if(hdlc->data_bits==8){ + unsigned cval; + + hdlc->data_bits = 0; + hdlc->data_received = 1; + cval = (hdlc->crc^hdlc->shift_reg) & 0xff; + hdlc->crc = (hdlc->crc>>8)^crc16_tab[cval]; + // good byte received + if (dsize--) { + dst[hdlc->dstpos++] = hdlc->shift_reg; + } else { + // frame too long + status = -HDLC_LENGTH_ERROR; + hdlc->dstpos = 0; + } + } + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_FAST_FLAG: + if(hdlc->cbin==hdlc->ffvalue){ + hdlc->bit_shift = 0; + break; + } else { + if(hdlc->cbin == 0xff){ + hdlc->state = HDLC_FAST_IDLE; + hdlc->bit_shift=0; + } else if(hdlc->ffbit_shift==8){ + hdlc->state = HDLC_GETFLAG_B7; + break; + } else { + hdlc->shift_reg = fast_abort[hdlc->ffbit_shift-1]; + hdlc->hdlc_bits1 = hdlc->ffbit_shift-2; + if(hdlc->hdlc_bits1<0)hdlc->hdlc_bits1 = 0; + hdlc->data_bits = hdlc->ffbit_shift-1; + hdlc->state = HDLC_GET_DATA; + hdlc->data_received = 0; + } + } + break; + default: + break; + } + } + *count -= slen; + return 0; +} + +/* + isdnhdlc_encode - encodes HDLC frames to a transparent bit stream. + + The bit stream starts with a beginning flag (01111110). After + that each byte is added to the bit stream with bit stuffing added + (0 after 5 1's). + When the last byte has been removed from the source buffer, the + CRC (2 bytes is added) and the frame terminates with the ending flag. + For the dchannel, the idle character (all 1's) is also added at the end. + If this function is called with empty source buffer (slen=0), flags or + idle character will be generated. + + src - source buffer + slen - source buffer length + count - number of bytes removed (encoded) from source buffer + dst _ destination buffer + dsize - destination buffer size + returns - number of encoded bytes in the destination buffer +*/ +int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src, + unsigned short slen, int *count, + unsigned char *dst, int dsize) +{ + static const unsigned char xfast_flag_value[] = { + 0x7e,0x3f,0x9f,0xcf,0xe7,0xf3,0xf9,0xfc,0x7e + }; + + int len = 0; + + *count = slen; + + while (dsize > 0) { + if(hdlc->bit_shift==0){ + if(slen && !hdlc->do_closing){ + hdlc->shift_reg = *src++; + slen--; + if (slen == 0) + hdlc->do_closing = 1; /* closing sequence, CRC + flag(s) */ + hdlc->bit_shift = 8; + } else { + if(hdlc->state == HDLC_SEND_DATA){ + if(hdlc->data_received){ + hdlc->state = HDLC_SEND_CRC1; + hdlc->crc ^= 0xffff; + hdlc->bit_shift = 8; + hdlc->shift_reg = hdlc->crc & 0xff; + } else if(!hdlc->do_adapt56){ + hdlc->state = HDLC_SEND_FAST_FLAG; + } else { + hdlc->state = HDLC_SENDFLAG_B0; + } + } + + } + } + + switch(hdlc->state){ + case STOPPED: + while (dsize--) + *dst++ = 0xff; + + return dsize; + case HDLC_SEND_FAST_FLAG: + hdlc->do_closing = 0; + if(slen == 0){ + *dst++ = hdlc->ffvalue; + len++; + dsize--; + break; + } + if(hdlc->bit_shift==8){ + hdlc->cbin = hdlc->ffvalue>>(8-hdlc->data_bits); + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + hdlc->data_received = 1; + } + break; + case HDLC_SENDFLAG_B0: + hdlc->do_closing = 0; + hdlc->cbin <<= 1; + hdlc->data_bits++; + hdlc->hdlc_bits1 = 0; + hdlc->state = HDLC_SENDFLAG_B1A6; + break; + case HDLC_SENDFLAG_B1A6: + hdlc->cbin <<= 1; + hdlc->data_bits++; + hdlc->cbin++; + if(++hdlc->hdlc_bits1 == 6) + hdlc->state = HDLC_SENDFLAG_B7; + break; + case HDLC_SENDFLAG_B7: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if(slen == 0){ + hdlc->state = HDLC_SENDFLAG_B0; + break; + } + if(hdlc->bit_shift==8){ + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + hdlc->data_received = 1; + } + break; + case HDLC_SEND_FIRST_FLAG: + hdlc->data_received = 1; + if(hdlc->data_bits==8){ + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + break; + } + hdlc->cbin <<= 1; + hdlc->data_bits++; + if(hdlc->shift_reg & 0x01) + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + if(hdlc->bit_shift==0){ + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + } + break; + case HDLC_SEND_DATA: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if(hdlc->hdlc_bits1 == 5){ + hdlc->hdlc_bits1 = 0; + break; + } + if(hdlc->bit_shift==8){ + unsigned cval; + + cval = (hdlc->crc^hdlc->shift_reg) & 0xff; + hdlc->crc = (hdlc->crc>>8)^crc16_tab[cval]; + } + if(hdlc->shift_reg & 0x01){ + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + break; + case HDLC_SEND_CRC1: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if(hdlc->hdlc_bits1 == 5){ + hdlc->hdlc_bits1 = 0; + break; + } + if(hdlc->shift_reg & 0x01){ + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + if(hdlc->bit_shift==0){ + hdlc->shift_reg = (hdlc->crc >> 8); + hdlc->state = HDLC_SEND_CRC2; + hdlc->bit_shift = 8; + } + break; + case HDLC_SEND_CRC2: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if(hdlc->hdlc_bits1 == 5){ + hdlc->hdlc_bits1 = 0; + break; + } + if(hdlc->shift_reg & 0x01){ + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + if(hdlc->bit_shift==0){ + hdlc->shift_reg = 0x7e; + hdlc->state = HDLC_SEND_CLOSING_FLAG; + hdlc->bit_shift = 8; + } + break; + case HDLC_SEND_CLOSING_FLAG: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if(hdlc->hdlc_bits1 == 5){ + hdlc->hdlc_bits1 = 0; + break; + } + if(hdlc->shift_reg & 0x01){ + hdlc->cbin++; + } + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + if(hdlc->bit_shift==0){ + hdlc->ffvalue = xfast_flag_value[hdlc->data_bits]; + if(hdlc->dchannel){ + hdlc->ffvalue = 0x7e; + hdlc->state = HDLC_SEND_IDLE1; + hdlc->bit_shift = 8-hdlc->data_bits; + if(hdlc->bit_shift==0) + hdlc->state = HDLC_SEND_FAST_IDLE; + } else { + if(!hdlc->do_adapt56){ + hdlc->state = HDLC_SEND_FAST_FLAG; + hdlc->data_received = 0; + } else { + hdlc->state = HDLC_SENDFLAG_B0; + hdlc->data_received = 0; + } + // Finished with this frame, send flags + if (dsize > 1) dsize = 1; + } + } + break; + case HDLC_SEND_IDLE1: + hdlc->do_closing = 0; + hdlc->cbin <<= 1; + hdlc->cbin++; + hdlc->data_bits++; + hdlc->bit_shift--; + if(hdlc->bit_shift==0){ + hdlc->state = HDLC_SEND_FAST_IDLE; + hdlc->bit_shift = 0; + } + break; + case HDLC_SEND_FAST_IDLE: + hdlc->do_closing = 0; + hdlc->cbin = 0xff; + hdlc->data_bits = 8; + if(hdlc->bit_shift == 8){ + hdlc->cbin = 0x7e; + hdlc->state = HDLC_SEND_FIRST_FLAG; + } else { + *dst++ = hdlc->cbin; + hdlc->bit_shift = hdlc->data_bits = 0; + len++; + dsize = 0; + } + break; + default: + break; + } + if(hdlc->do_adapt56){ + if(hdlc->data_bits==7){ + hdlc->cbin <<= 1; + hdlc->cbin++; + hdlc->data_bits++; + } + } + if(hdlc->data_bits==8){ + *dst++ = hdlc->cbin; + hdlc->data_bits = 0; + len++; + dsize--; + } + } + *count -= slen; + + return len; +} + +EXPORT_SYMBOL(isdnhdlc_bit_rev_tab); +EXPORT_SYMBOL(isdnhdlc_rcv_init); +EXPORT_SYMBOL(isdnhdlc_decode); +EXPORT_SYMBOL(isdnhdlc_out_init); +EXPORT_SYMBOL(isdnhdlc_encode); diff -Nru a/drivers/isdn/hisax/isdnhdlc.h b/drivers/isdn/hisax/isdnhdlc.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/isdn/hisax/isdnhdlc.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,72 @@ +/* + * isdnhdlc.h -- General purpose ISDN HDLC decoder. + * + * Implementation of a HDLC decoder/encoder in software. + * Neccessary because some ISDN devices don't have HDLC + * controllers. Also included: a bit reversal table. + * + *Copyright (C) 2002 Wolfgang Mües + * 2001 Frode Isaksen + * 2001 Kai Germaschewski + * + * 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. + */ + +#ifndef __ISDNHDLC_H__ +#define __ISDNHDLC_H__ + +struct isdnhdlc_vars { + int bit_shift; + int hdlc_bits1; + int data_bits; + int ffbit_shift; // encoding only + int state; + int dstpos; + + unsigned short crc; + + unsigned char cbin; + unsigned char shift_reg; + unsigned char ffvalue; + + int data_received:1; // set if transferring data + int dchannel:1; // set if D channel (send idle instead of flags) + int do_adapt56:1; // set if 56K adaptation + int do_closing:1; // set if in closing phase (need to send CRC + flag +}; + + +/* + The return value from isdnhdlc_decode is + the frame length, 0 if no complete frame was decoded, + or a negative error number +*/ +#define HDLC_FRAMING_ERROR 1 +#define HDLC_CRC_ERROR 2 +#define HDLC_LENGTH_ERROR 3 + +extern const unsigned char isdnhdlc_bit_rev_tab[256]; + +extern void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc, int do_adapt56); + +extern int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, int slen,int *count, + unsigned char *dst, int dsize); + +extern void isdnhdlc_out_init (struct isdnhdlc_vars *hdlc,int is_d_channel,int do_adapt56); + +extern int isdnhdlc_encode (struct isdnhdlc_vars *hdlc,const unsigned char *src,unsigned short slen,int *count, + unsigned char *dst,int dsize); + +#endif /* __ISDNHDLC_H__ */ diff -Nru a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c --- a/drivers/isdn/hisax/isdnl1.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/isdnl1.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: isdnl1.c,v 2.41.6.5 2001/09/23 22:24:49 kai Exp $ +/* $Id: isdnl1.c,v 2.46.2.5 2004/02/11 13:21:34 keil Exp $ * * common low level stuff for Siemens Chipsetbased isdn cards * @@ -18,7 +18,7 @@ * */ -const char *l1_revision = "$Revision: 2.41.6.5 $"; +const char *l1_revision = "$Revision: 2.46.2.5 $"; #include #include "hisax.h" @@ -126,7 +126,7 @@ }; void -debugl1(struct IsdnCardState *cs, const char *fmt, ...) +debugl1(struct IsdnCardState *cs, char *fmt, ...) { va_list args; char tmp[8]; @@ -159,9 +159,9 @@ st = cs->stlist; while (st) { if (test_and_clear_bit(FLG_L1_ACTIVATING, &st->l1.Flags)) - L1L2(st, PH_ACTIVATE | CONFIRM, NULL); + st->l1.l1l2(st, PH_ACTIVATE | CONFIRM, NULL); else - L1L2(st, PH_ACTIVATE | INDICATION, NULL); + st->l1.l1l2(st, PH_ACTIVATE | INDICATION, NULL); st = st->next; } } @@ -174,8 +174,8 @@ st = cs->stlist; while (st) { if (test_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - L1L2(st, PH_PAUSE | CONFIRM, NULL); - L1L2(st, PH_DEACTIVATE | INDICATION, NULL); + st->l1.l1l2(st, PH_PAUSE | CONFIRM, NULL); + st->l1.l1l2(st, PH_DEACTIVATE | INDICATION, NULL); st = st->next; } test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags); @@ -190,12 +190,13 @@ return; stptr = cs->stlist; - while (stptr != NULL) + while (stptr != NULL) { if (test_and_clear_bit(FLG_L1_PULL_REQ, &stptr->l1.Flags)) { - L1L2(stptr, PH_PULL | CONFIRM, NULL); + stptr->l1.l1l2(stptr, PH_PULL | CONFIRM, NULL); break; } else stptr = stptr->next; + } } void @@ -234,7 +235,7 @@ if (sapi == CTRL_SAPI) { /* sapi 0 */ while (stptr != NULL) { if ((nskb = skb_clone(skb, GFP_ATOMIC))) - L1L2(stptr, PH_DATA | INDICATION, nskb); + stptr->l1.l1l2(stptr, PH_DATA | INDICATION, nskb); else printk(KERN_WARNING "HiSax: isdn broadcast buffer shortage\n"); stptr = stptr->next; @@ -253,7 +254,7 @@ found = 0; while (stptr != NULL) if (tei == stptr->l2.tei) { - L1L2(stptr, PH_DATA | INDICATION, skb); + stptr->l1.l1l2(stptr, PH_DATA | INDICATION, skb); found = !0; break; } else @@ -276,10 +277,10 @@ } if (test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags)) - L1L2(st, PH_PULL | CONFIRM, NULL); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); if (!test_bit(BC_FLG_ACTIV, &bcs->Flag)) { if (!test_bit(BC_FLG_BUSY, &bcs->Flag) && (!skb_queue_len(&bcs->squeue))) { - L2L1(st, PH_DEACTIVATE | CONFIRM, NULL); + st->l2.l2l1(st, PH_DEACTIVATE | CONFIRM, NULL); } } } @@ -294,31 +295,35 @@ FsmEvent(&bcs->st->l1.l1m, EV_TIMER_ACT, NULL); } while ((skb = skb_dequeue(&bcs->rqueue))) { - L1L2(bcs->st, PH_DATA | INDICATION, skb); + bcs->st->l1.l1l2(bcs->st, PH_DATA | INDICATION, skb); } } static void -BChannel_proc_cmpl(struct BCState *bcs) +BChannel_proc_ack(struct BCState *bcs) { - struct sk_buff *skb; + u_long flags; + int ack; - while ((skb = skb_dequeue(&bcs->cmpl_queue))) { - L1L2(bcs->st, PH_DATA | CONFIRM, skb); - } + spin_lock_irqsave(&bcs->aclock, flags); + ack = bcs->ackcnt; + bcs->ackcnt = 0; + spin_unlock_irqrestore(&bcs->aclock, flags); + if (ack) + lli_writewakeup(bcs->st, ack); } void -BChannel_bh(void *data) +BChannel_bh(struct BCState *bcs) { - struct BCState *bcs = data; - + if (!bcs) + return; if (test_and_clear_bit(B_RCVBUFREADY, &bcs->event)) BChannel_proc_rcv(bcs); if (test_and_clear_bit(B_XMTBUFREADY, &bcs->event)) BChannel_proc_xmt(bcs); - if (test_and_clear_bit(B_CMPLREADY, &bcs->event)) - BChannel_proc_cmpl(bcs); + if (test_and_clear_bit(B_ACKPENDING, &bcs->event)) + BChannel_proc_ack(bcs); } void @@ -350,21 +355,23 @@ } void -init_bcstate(struct IsdnCardState *cs, - int bc) +init_bcstate(struct IsdnCardState *cs, int bc) { struct BCState *bcs = cs->bcs + bc; bcs->cs = cs; bcs->channel = bc; - INIT_WORK(&bcs->work, BChannel_bh, bcs); + INIT_WORK(&bcs->tqueue, (void *)(void *) BChannel_bh, bcs); + spin_lock_init(&bcs->aclock); + bcs->BC_SetStack = NULL; + bcs->BC_Close = NULL; bcs->Flag = 0; } #ifdef L2FRAME_DEBUG /* psa */ char * -l2cmd(u8 cmd) +l2cmd(u_char cmd) { switch (cmd & ~0x10) { case 1: @@ -398,7 +405,7 @@ static char tmpdeb[32]; char * -l2frames(u8 * ptr) +l2frames(u_char * ptr) { switch (ptr[2] & ~0x10) { case 1: @@ -430,7 +437,7 @@ void Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf, int dir) { - u8 *ptr; + u_char *ptr; ptr = skb->data; @@ -724,7 +731,7 @@ struct PStack *st = fi->userdata; FsmChangeState(fi, ST_L1_ACTIV); - L1L2(st, PH_ACTIVATE | CONFIRM, NULL); + st->l1.l1l2(st, PH_ACTIVATE | CONFIRM, NULL); } static void @@ -733,7 +740,7 @@ struct PStack *st = fi->userdata; FsmChangeState(fi, ST_L1_NULL); - L2L1(st, PH_DEACTIVATE | CONFIRM, NULL); + st->l2.l2l1(st, PH_DEACTIVATE | CONFIRM, NULL); } static struct FsmNode L1BFnList[] __initdata = @@ -808,7 +815,7 @@ debugl1(cs, "PH_ACTIVATE_REQ %s", st->l1.l1m.fsm->strState[st->l1.l1m.state]); if (test_bit(FLG_L1_ACTIVATED, &st->l1.Flags)) - L1L2(st, PH_ACTIVATE | CONFIRM, NULL); + st->l1.l1l2(st, PH_ACTIVATE | CONFIRM, NULL); else { test_and_set_bit(FLG_L1_ACTIVATING, &st->l1.Flags); FsmEvent(&st->l1.l1m, EV_PH_ACTIVATE, arg); @@ -904,19 +911,9 @@ setstack_tei(st); setstack_manager(st); st->l1.stlistp = &(cs->stlist); - st->l1.l2l1 = dch_l2l1; - if (cs->dc_l1_ops->open) - cs->dc_l1_ops->open(st, cs); -} - -void -dc_l1_init(struct IsdnCardState *cs, struct dc_l1_ops *ops) -{ - cs->dc_l1_ops = ops; - INIT_WORK(&cs->work, ops->bh_func, cs); - init_timer(&cs->dbusytimer); - cs->dbusytimer.function = (void *)(unsigned long) ops->dbusy_func; - cs->dbusytimer.data = (unsigned long) cs; + st->l2.l2l1 = dch_l2l1; + if (cs->setstack_d) + cs->setstack_d(st, cs); } void diff -Nru a/drivers/isdn/hisax/isdnl1.h b/drivers/isdn/hisax/isdnl1.h --- a/drivers/isdn/hisax/isdnl1.h Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/isdnl1.h Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: isdnl1.h,v 2.9.6.3 2001/09/23 22:24:49 kai Exp $ +/* $Id: isdnl1.h,v 2.12.2.3 2004/02/11 13:21:34 keil Exp $ * * Layer 1 defines * @@ -7,9 +7,6 @@ * */ -#ifndef __ISDNL1_H__ -#define __ISDNL1_H__ - #define D_RCVBUFREADY 0 #define D_XMTBUFREADY 1 #define D_L1STATECHANGE 2 @@ -20,578 +17,16 @@ #define D_TX_MON1 7 #define E_RCVBUFREADY 8 -#define B_RCVBUFREADY 0 -#define B_XMTBUFREADY 1 -#define B_CMPLREADY 2 - -#define B_LL_NOCARRIER 8 -#define B_LL_CONNECT 9 -#define B_LL_OK 10 +#define B_RCVBUFREADY 0 +#define B_XMTBUFREADY 1 +#define B_ACKPENDING 2 -extern void debugl1(struct IsdnCardState *cs, const char *fmt, ...); +extern void debugl1(struct IsdnCardState *cs, char *fmt, ...); extern void DChannel_proc_xmt(struct IsdnCardState *cs); extern void DChannel_proc_rcv(struct IsdnCardState *cs); extern void l1_msg(struct IsdnCardState *cs, int pr, void *arg); extern void l1_msg_b(struct PStack *st, int pr, void *arg); -void dc_l1_init(struct IsdnCardState *cs, struct dc_l1_ops *ops); - -static inline void -fill_fifo_b(struct BCState *bcs) -{ - bcs->cs->bc_l1_ops->fill_fifo(bcs); -} - -static inline void -fill_fifo_d(struct IsdnCardState *cs) -{ - cs->dc_l1_ops->fill_fifo(cs); -} - #ifdef L2FRAME_DEBUG extern void Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf, int dir); -#endif - -static inline void -sched_b_event(struct BCState *bcs, int event) -{ - set_bit(event, &bcs->event); - schedule_work(&bcs->work); -} - -static inline void -sched_d_event(struct IsdnCardState *cs, int event) -{ - set_bit(event, &cs->event); - schedule_work(&cs->work); -} - -/* called with the card lock held */ -static inline void -xmit_complete_b(struct BCState *bcs) -{ - skb_queue_tail(&bcs->cmpl_queue, bcs->tx_skb); - sched_b_event(bcs, B_CMPLREADY); - bcs->tx_skb = NULL; -} - -/* called with the card lock held */ -static inline void -xmit_complete_d(struct IsdnCardState *cs) -{ - dev_kfree_skb_irq(cs->tx_skb); - cs->tx_skb = NULL; -} - -/* called with the card lock held */ -static inline void -xmit_ready_b(struct BCState *bcs) -{ - bcs->tx_skb = skb_dequeue(&bcs->squeue); - if (bcs->tx_skb) { - bcs->count = 0; - set_bit(BC_FLG_BUSY, &bcs->Flag); - fill_fifo_b(bcs); - } else { - clear_bit(BC_FLG_BUSY, &bcs->Flag); - sched_b_event(bcs, B_XMTBUFREADY); - } -} - -/* called with the card lock held */ -static inline void -xmit_ready_d(struct IsdnCardState *cs) -{ - cs->tx_skb = skb_dequeue(&cs->sq); - if (cs->tx_skb) { - cs->tx_cnt = 0; - fill_fifo_d(cs); - } else { - sched_d_event(cs, D_XMTBUFREADY); - } -} - -static inline void -xmit_data_req_b(struct BCState *bcs, struct sk_buff *skb) -{ - struct IsdnCardState *cs = bcs->cs; - unsigned long flags; - - spin_lock_irqsave(&cs->lock, flags); - if (bcs->tx_skb) { - skb_queue_tail(&bcs->squeue, skb); - } else { - set_bit(BC_FLG_BUSY, &bcs->Flag); - bcs->tx_skb = skb; - bcs->count = 0; - fill_fifo_b(bcs); - } - spin_unlock_irqrestore(&cs->lock, flags); -} - -static inline void -xmit_data_req_d(struct IsdnCardState *cs, struct sk_buff *skb) -{ - unsigned long flags; - - spin_lock_irqsave(&cs->lock, flags); - if (cs->debug & DEB_DLOG_HEX) - LogFrame(cs, skb->data, skb->len); - if (cs->debug & DEB_DLOG_VERBOSE) - dlogframe(cs, skb, 0); - if (cs->tx_skb) { - skb_queue_tail(&cs->sq, skb); -#ifdef L2FRAME_DEBUG - if (cs->debug & L1_DEB_LAPD) - Logl2Frame(cs, skb, "PH_DATA Queued", 0); -#endif - } else { - cs->tx_skb = skb; - cs->tx_cnt = 0; -#ifdef L2FRAME_DEBUG - if (cs->debug & L1_DEB_LAPD) - Logl2Frame(cs, skb, "PH_DATA", 0); -#endif - fill_fifo_d(cs); - } - spin_unlock_irqrestore(&cs->lock, flags); -} - -static inline void -xmit_pull_ind_b(struct BCState *bcs, struct sk_buff *skb) -{ - struct IsdnCardState *cs = bcs->cs; - unsigned long flags; - - spin_lock_irqsave(&cs->lock, flags); - if (bcs->tx_skb) { - WARN_ON(1); - } else { - set_bit(BC_FLG_BUSY, &bcs->Flag); - bcs->tx_skb = skb; - bcs->count = 0; - fill_fifo_b(bcs); - } - spin_unlock_irqrestore(&cs->lock, flags); -} - -static inline void -xmit_pull_ind_d(struct IsdnCardState *cs, struct sk_buff *skb) -{ - unsigned long flags; - - spin_lock_irqsave(&cs->lock, flags); - if (cs->tx_skb) { - WARN_ON(1); - } else { - if (cs->debug & DEB_DLOG_HEX) - LogFrame(cs, skb->data, skb->len); - if (cs->debug & DEB_DLOG_VERBOSE) - dlogframe(cs, skb, 0); -#ifdef L2FRAME_DEBUG - if (cs->debug & L1_DEB_LAPD) - Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); -#endif - cs->tx_skb = skb; - cs->tx_cnt = 0; - fill_fifo_d(cs); - } - spin_unlock_irqrestore(&cs->lock, flags); -} - -/* If busy, the PH_PULL | CONFIRM scheduling is handled under - * the card lock by xmit_ready_b() above, so no race */ -static inline void -xmit_pull_req_b(struct PStack *st) -{ - struct BCState *bcs = st->l1.bcs; - struct IsdnCardState *cs = bcs->cs; - unsigned long flags; - int busy = 0; - - spin_lock_irqsave(&cs->lock, flags); - if (bcs->tx_skb) { - set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); - busy = 1; - } - spin_unlock_irqrestore(&cs->lock, flags); - if (!busy) - L1L2(st, PH_PULL | CONFIRM, NULL); -} - -/* If busy, the PH_PULL | CONFIRM scheduling is handled under - * the card lock by xmit_ready_d() above, so no race */ -static inline void -xmit_pull_req_d(struct PStack *st) -{ - struct IsdnCardState *cs = st->l1.hardware; - unsigned long flags; - int busy = 0; - -#ifdef L2FRAME_DEBUG - if (cs->debug & L1_DEB_LAPD) - debugl1(cs, "-> PH_REQUEST_PULL"); -#endif - spin_lock_irqsave(&cs->lock, flags); - if (cs->tx_skb) { - set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); - busy = 1; - } - spin_unlock_irqrestore(&cs->lock, flags); - if (!busy) - L1L2(st, PH_PULL | CONFIRM, NULL); -} - -/* called with the card lock held */ -static inline void -xmit_restart_b(struct BCState *bcs) -{ -#ifdef ERROR_STATISTIC - bcs->err_tx++; -#endif - if (!bcs->tx_skb) { - WARN_ON(1); - return; - } - skb_push(bcs->tx_skb, bcs->count); - bcs->tx_cnt += bcs->count; - bcs->count = 0; -} - -/* called with the card lock held */ -static inline void -xmit_restart_d(struct IsdnCardState *cs) -{ -#ifdef ERROR_STATISTIC - cs->err_tx++; -#endif - if (!cs->tx_skb) { - WARN_ON(1); - return; - } - skb_push(cs->tx_skb, cs->tx_cnt); - cs->tx_cnt = 0; -} - -/* Useful for HSCX/ISAC work-alike's */ -/* ---------------------------------------------------------------------- */ - -/* XPR - transmit pool ready */ -/* called with the card lock held */ -static inline void -xmit_xpr_b(struct BCState *bcs) -{ - /* current frame? */ - if (bcs->tx_skb) { - /* last frame not done yet? */ - if (bcs->tx_skb->len) { - fill_fifo_b(bcs); - return; - } - xmit_complete_b(bcs); - bcs->count = 0; - } - xmit_ready_b(bcs); -} - -/* XPR - transmit pool ready */ -/* called with the card lock held */ -static inline void -xmit_xpr_d(struct IsdnCardState *cs) -{ - if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) - del_timer(&cs->dbusytimer); - if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); - /* current frame? */ - if (cs->tx_skb) { - /* last frame not done yet? */ - if (cs->tx_skb->len) { - fill_fifo_d(cs); - return; - } - xmit_complete_d(cs); - cs->tx_cnt = 0; - } - xmit_ready_d(cs); -} - -/* XDU - transmit data underrun */ -/* called with the card lock held */ -static inline void -xmit_xdu_b(struct BCState *bcs, void (*reset_xmit)(struct BCState *bcs)) -{ - struct IsdnCardState *cs = bcs->cs; - - if (cs->debug & L1_DEB_WARN) - debugl1(cs, "HSCX %c EXIR XDU", 'A' + bcs->channel); - - if (bcs->mode == L1_MODE_TRANS) { - fill_fifo_b(bcs); - } else { - xmit_restart_b(bcs); - reset_xmit(bcs); - } -} - -/* XDU - transmit data underrun */ -/* called with the card lock held */ -static inline void -xmit_xdu_d(struct IsdnCardState *cs, void (*reset_xmit)(struct IsdnCardState *cs)) -{ - printk(KERN_WARNING "HiSax: D XDU\n"); - if (cs->debug & L1_DEB_WARN) - debugl1(cs, "D XDU"); - - if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) - del_timer(&cs->dbusytimer); - if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); - - xmit_restart_d(cs); - if (reset_xmit) - reset_xmit(cs); -} - -static inline unsigned char * -xmit_fill_fifo_b(struct BCState *bcs, u_int fifo_size, int *count, int *more) -{ - struct IsdnCardState *cs = bcs->cs; - unsigned char *p; - - if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) - debugl1(cs, __FUNCTION__); - - if (!bcs->tx_skb || bcs->tx_skb->len <= 0) { - WARN_ON(1); - return NULL; - } - - *more = (bcs->mode == L1_MODE_TRANS); - if (bcs->tx_skb->len > fifo_size) { - *more = 1; - *count = fifo_size; - } else { - *count = bcs->tx_skb->len; - } - p = bcs->tx_skb->data; - skb_pull(bcs->tx_skb, *count); - bcs->tx_cnt -= *count; - bcs->count += *count; - - if (cs->debug & L1_DEB_HSCX_FIFO) { - char *t = bcs->blog; - - t += sprintf(t, "%s %c cnt %d", __FUNCTION__, - bcs->unit ? 'B' : 'A', *count); - QuickHex(t, p, *count); - debugl1(cs, bcs->blog); - } - return p; -} - -static inline unsigned char * -xmit_fill_fifo_d(struct IsdnCardState *cs, u_int fifo_size, int *count, int *more) -{ - unsigned char *p; - - if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) - debugl1(cs, __FUNCTION__); - - if (!cs->tx_skb || cs->tx_skb->len <= 0) { - WARN_ON(1); - return NULL; - } - - *more = 0; - if (cs->tx_skb->len > fifo_size) { - *more = 1; - *count = fifo_size; - } else { - *count = cs->tx_skb->len; - } - - p = cs->tx_skb->data; - skb_pull(cs->tx_skb, *count); - cs->tx_cnt += *count; - - if (cs->debug & L1_DEB_ISAC_FIFO) { - char *t = cs->dlog; - - t += sprintf(t, "%s cnt %d", __FUNCTION__, *count); - QuickHex(t, p, *count); - debugl1(cs, cs->dlog); - } - return p; -} - -static inline void -recv_empty_fifo_d(struct IsdnCardState *cs, int count) -{ - u8 *p; - - if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) - debugl1(cs, __FUNCTION__); - - if (cs->rcvidx + count > MAX_DFRAME_LEN_L1) { - if (cs->debug & L1_DEB_WARN) - debugl1(cs, "%s: incoming packet too large", __FUNCTION__); - cs->rcvidx = 0; - return; - } - p = cs->rcvbuf + cs->rcvidx; - cs->rcvidx += count; - cs->dc_hw_ops->read_fifo(cs, p, count); - - if (cs->debug & L1_DEB_ISAC_FIFO) { - char *t = cs->dlog; - - t += sprintf(t, "%s cnt %d", __FUNCTION__, count); - QuickHex(t, p, count); - debugl1(cs, cs->dlog); - } -} - -static inline void -recv_empty_fifo_b(struct BCState *bcs, int count) -{ - u8 *p; - struct IsdnCardState *cs = bcs->cs; - - if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) - debugl1(cs, __FUNCTION__); - - if (bcs->rcvidx + count > HSCX_BUFMAX) { - if (cs->debug & L1_DEB_WARN) - debugl1(cs, "%s: incoming packet too large", __FUNCTION__); - bcs->rcvidx = 0; - return; - } - p = bcs->rcvbuf + bcs->rcvidx; - bcs->rcvidx += count; - cs->bc_hw_ops->read_fifo(cs, bcs->unit, p, count); - - if (cs->debug & L1_DEB_HSCX_FIFO) { - char *t = bcs->blog; - - t += sprintf(t, "%s %c cnt %d", __FUNCTION__, - bcs->unit ? 'B' : 'A', count); - QuickHex(t, p, count); - debugl1(cs, bcs->blog); - } -} - -/* RME - receive message end */ -static inline void -recv_rme_d(struct IsdnCardState *cs) -{ - struct sk_buff *skb; - int count; - - count = cs->rcvidx - 1; - cs->rcvidx = 0; - if (count == 0) - return; - - skb = dev_alloc_skb(count); - if (!skb) { - printk(KERN_WARNING "HiSax: %s: out of memory\n", __FUNCTION__); - return; - } - memcpy(skb_put(skb, count), cs->rcvbuf, count); - skb_queue_tail(&cs->rq, skb); - sched_d_event(cs, D_RCVBUFREADY); -} - -static inline void -recv_rme_b(struct BCState *bcs) -{ - struct IsdnCardState *cs = bcs->cs; - struct sk_buff *skb; - int count; - - count = bcs->rcvidx - 1; - bcs->rcvidx = 0; - if (count == 0) - return; - - if (cs->debug & L1_DEB_HSCX_FIFO) - debugl1(cs, "HX Frame %d", count); - - skb = dev_alloc_skb(count); - if (!skb) { - printk(KERN_WARNING "HiSax: %s: out of memory\n", __FUNCTION__); - return; - } - memcpy(skb_put(skb, count), bcs->rcvbuf, count); - skb_queue_tail(&bcs->rqueue, skb); - sched_b_event(bcs, B_RCVBUFREADY); -} - -/* RPF - receive pull full */ -static inline void -recv_rpf_b(struct BCState *bcs) -{ - if (bcs->mode != L1_MODE_TRANS) - return; - - recv_rme_b(bcs); -} - -static inline int -bc_open(struct BCState *bcs) -{ - if (test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) - return 0; - - bcs->rcvbuf = kmalloc(HSCX_BUFMAX, GFP_ATOMIC); - if (!bcs->rcvbuf) - goto err; - - bcs->blog = kmalloc(MAX_BLOG_SPACE, GFP_ATOMIC); - if (!bcs->blog) - goto err_rcvbuf; - - skb_queue_head_init(&bcs->rqueue); - skb_queue_head_init(&bcs->squeue); - skb_queue_head_init(&bcs->cmpl_queue); - - clear_bit(BC_FLG_BUSY, &bcs->Flag); - bcs->tx_skb = NULL; - bcs->rcvidx = 0; - bcs->tx_cnt = 0; - bcs->event = 0; - - return 0; - - err_rcvbuf: - kfree(bcs->rcvbuf); - err: - clear_bit(BC_FLG_INIT, &bcs->Flag); - printk(KERN_WARNING "HiSax: %s: out of memory\n", __FUNCTION__); - return -ENOMEM;; -} - -static inline void -bc_close(struct BCState *bcs) -{ - if (!test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) - return; - - kfree(bcs->rcvbuf); - bcs->rcvbuf = NULL; - - kfree(bcs->blog); - bcs->blog = NULL; - - skb_queue_purge(&bcs->rqueue); - skb_queue_purge(&bcs->squeue); - skb_queue_purge(&bcs->cmpl_queue); - if (bcs->tx_skb) { - dev_kfree_skb_any(bcs->tx_skb); - bcs->tx_skb = NULL; - clear_bit(BC_FLG_BUSY, &bcs->Flag); - } -} - #endif diff -Nru a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c --- a/drivers/isdn/hisax/isdnl2.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/isdnl2.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: isdnl2.c,v 2.25.6.4 2001/09/23 22:24:49 kai Exp $ +/* $Id: isdnl2.c,v 2.30.2.4 2004/02/11 13:21:34 keil Exp $ * * Author Karsten Keil * based on the teles driver from Jan den Ouden @@ -19,21 +19,21 @@ #include "hisax.h" #include "isdnl2.h" -const char *l2_revision = "$Revision: 2.25.6.4 $"; -static spinlock_t isdnl2_lock = SPIN_LOCK_UNLOCKED; +const char *l2_revision = "$Revision: 2.30.2.4 $"; + static void l2m_debug(struct FsmInst *fi, char *fmt, ...); static struct Fsm l2fsm; enum { - ST_L2_1, /* TEI unassigned */ - ST_L2_2, /* Assign awaiting TEI */ - ST_L2_3, /* Establish awaiting TEI */ - ST_L2_4, /* TEI assigned */ - ST_L2_5, /* Awaiting establishment */ - ST_L2_6, /* Awaiting release */ - ST_L2_7, /* Multiple frame established */ - ST_L2_8, /* Timer recovery */ + ST_L2_1, + ST_L2_2, + ST_L2_3, + ST_L2_4, + ST_L2_5, + ST_L2_6, + ST_L2_7, + ST_L2_8, }; #define L2_STATE_COUNT (ST_L2_8+1) @@ -103,7 +103,7 @@ "EV_L2_FRAME_ERROR", }; -static u_int l2addrsize(struct Layer2 *l2); +static int l2addrsize(struct Layer2 *l2); static void set_peer_busy(struct Layer2 *l2) { @@ -178,23 +178,23 @@ clear_peer_busy(l2); } -inline u_int +inline int l2headersize(struct Layer2 *l2, int ui) { return (((test_bit(FLG_MOD128, &l2->flag) && (!ui)) ? 2 : 1) + (test_bit(FLG_LAPD, &l2->flag) ? 2 : 1)); } -inline u_int +inline int l2addrsize(struct Layer2 *l2) { return (test_bit(FLG_LAPD, &l2->flag) ? 2 : 1); } static int -sethdraddr(struct Layer2 *l2, u8 * header, int rsp) +sethdraddr(struct Layer2 *l2, u_char * header, int rsp) { - u8 *ptr = header; + u_char *ptr = header; int crbit = rsp; if (test_bit(FLG_LAPD, &l2->flag)) { @@ -218,37 +218,37 @@ { if (test_bit(FLG_LAPB, &st->l2.flag)) st->l1.bcs->tx_cnt += skb->len; - L2L1(st, PH_DATA | REQUEST, skb); + st->l2.l2l1(st, PH_DATA | REQUEST, skb); } #define enqueue_ui(a, b) enqueue_super(a, b) inline int -IsUI(u8 * data) +IsUI(u_char * data) { return ((data[0] & 0xef) == UI); } inline int -IsUA(u8 * data) +IsUA(u_char * data) { return ((data[0] & 0xef) == UA); } inline int -IsDM(u8 * data) +IsDM(u_char * data) { return ((data[0] & 0xef) == DM); } inline int -IsDISC(u8 * data) +IsDISC(u_char * data) { return ((data[0] & 0xef) == DISC); } inline int -IsRR(u8 * data, struct PStack *st) +IsRR(u_char * data, struct PStack *st) { if (test_bit(FLG_MOD128, &st->l2.flag)) return (data[0] == RR); @@ -257,9 +257,9 @@ } inline int -IsSFrame(u8 * data, struct PStack *st) +IsSFrame(u_char * data, struct PStack *st) { - register u8 d = *data; + register u_char d = *data; if (!test_bit(FLG_MOD128, &st->l2.flag)) d &= 0xf; @@ -267,27 +267,27 @@ } inline int -IsSABME(u8 * data, struct PStack *st) +IsSABME(u_char * data, struct PStack *st) { - u8 d = data[0] & ~0x10; + u_char d = data[0] & ~0x10; return (test_bit(FLG_MOD128, &st->l2.flag) ? d == SABME : d == SABM); } inline int -IsREJ(u8 * data, struct PStack *st) +IsREJ(u_char * data, struct PStack *st) { return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == REJ : (data[0] & 0xf) == REJ); } inline int -IsFRMR(u8 * data) +IsFRMR(u_char * data) { return ((data[0] & 0xef) == FRMR); } inline int -IsRNR(u8 * data, struct PStack *st) +IsRNR(u_char * data, struct PStack *st) { return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == RNR : (data[0] & 0xf) == RNR); } @@ -295,7 +295,7 @@ int iframe_error(struct PStack *st, struct sk_buff *skb) { - u_int i = l2addrsize(&st->l2) + (test_bit(FLG_MOD128, &st->l2.flag) ? 2 : 1); + int i = l2addrsize(&st->l2) + (test_bit(FLG_MOD128, &st->l2.flag) ? 2 : 1); int rsp = *skb->data & 0x2; if (test_bit(FLG_ORIG, &st->l2.flag)) @@ -360,8 +360,8 @@ int FRMR_error(struct PStack *st, struct sk_buff *skb) { - u_int headers = l2addrsize(&st->l2) + 1; - u8 *datap = skb->data + headers; + int headers = l2addrsize(&st->l2) + 1; + u_char *datap = skb->data + headers; int rsp = *skb->data & 0x2; if (test_bit(FLG_ORIG, &st->l2.flag)) @@ -403,27 +403,35 @@ setva(struct PStack *st, unsigned int nr) { struct Layer2 *l2 = &st->l2; - struct sk_buff *skb; + int len; + u_long flags; + spin_lock_irqsave(&l2->lock, flags); while (l2->va != nr) { (l2->va)++; if(test_bit(FLG_MOD128, &l2->flag)) l2->va %= 128; else l2->va %= 8; - skb = l2->windowar[l2->sow]; + len = l2->windowar[l2->sow]->len; + if (PACKET_NOACK == l2->windowar[l2->sow]->pkt_type) + len = -1; + dev_kfree_skb(l2->windowar[l2->sow]); l2->windowar[l2->sow] = NULL; l2->sow = (l2->sow + 1) % l2->window; - - L2L3(st, DL_DATA | CONFIRM, skb); + spin_unlock_irqrestore(&l2->lock, flags); + if (test_bit(FLG_LLI_L2WAKEUP, &st->lli.flag) && (len >=0)) + lli_writewakeup(st, len); + spin_lock_irqsave(&l2->lock, flags); } + spin_unlock_irqrestore(&l2->lock, flags); } static void -send_uframe(struct PStack *st, u8 cmd, u8 cr) +send_uframe(struct PStack *st, u_char cmd, u_char cr) { struct sk_buff *skb; - u8 tmp[MAX_HEADER_LEN]; + u_char tmp[MAX_HEADER_LEN]; int i; i = sethdraddr(&st->l2, tmp, cr); @@ -436,7 +444,7 @@ enqueue_super(st, skb); } -inline u8 +inline u_char get_PollFlag(struct PStack * st, struct sk_buff * skb) { return (skb->data[l2addrsize(&(st->l2))] & 0x10); @@ -449,10 +457,10 @@ } -inline u8 +inline u_char get_PollFlagFree(struct PStack *st, struct sk_buff *skb) { - u8 PF; + u_char PF; PF = get_PollFlag(st, skb); FreeSkb(skb); @@ -490,22 +498,22 @@ else pr = DL_RELEASE | INDICATION; - L2L3(st, pr, NULL); + st->l2.l2l3(st, pr, NULL); } inline void lapb_dl_release_l2l3(struct PStack *st, int f) { if (test_bit(FLG_LAPB, &st->l2.flag)) - L2L1(st, PH_DEACTIVATE | REQUEST, NULL); - L2L3(st, DL_RELEASE | f, NULL); + st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL); + st->l2.l2l3(st, DL_RELEASE | f, NULL); } static void establishlink(struct FsmInst *fi) { struct PStack *st = fi->userdata; - u8 cmd; + u_char cmd; clear_exception(&st->l2); st->l2.rc = 0; @@ -599,7 +607,7 @@ tx_ui(struct PStack *st) { struct sk_buff *skb; - u8 header[MAX_HEADER_LEN]; + u_char header[MAX_HEADER_LEN]; int i; i = sethdraddr(&(st->l2), header, CMD); @@ -627,7 +635,7 @@ struct sk_buff *skb = arg; skb_pull(skb, l2headersize(&st->l2, 1)); - L2L3(st, DL_UNIT_DATA | INDICATION, skb); + st->l2.l2l3(st, DL_UNIT_DATA | INDICATION, skb); /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ * in states 1-3 for broadcast */ @@ -669,7 +677,7 @@ { struct PStack *st = fi->userdata; - L2L3(st, DL_RELEASE | CONFIRM, NULL); + st->l2.l2l3(st, DL_RELEASE | CONFIRM, NULL); } static void @@ -710,7 +718,7 @@ FsmChangeState(fi, ST_L2_7); FsmAddTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 3); - L2L3(st, DL_ESTABLISH | INDICATION, NULL); + st->l2.l2l3(st, DL_ESTABLISH | INDICATION, NULL); } static void @@ -759,11 +767,11 @@ FsmRestartTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 3); if (est) - L2L3(st, DL_ESTABLISH | INDICATION, NULL); + st->l2.l2l3(st, DL_ESTABLISH | INDICATION, NULL); if ((ST_L2_7==state) || (ST_L2_8 == state)) if (skb_queue_len(&st->l2.i_queue) && cansend(st)) - L2L1(st, PH_PULL | REQUEST, NULL); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); } static void @@ -816,10 +824,10 @@ FsmAddTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 4); if (pr != -1) - L2L3(st, pr, NULL); + st->l2.l2l3(st, pr, NULL); if (skb_queue_len(&st->l2.i_queue) && cansend(st)) - L2L1(st, PH_PULL | REQUEST, NULL); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); } static void @@ -862,7 +870,7 @@ if (!test_bit(FLG_L3_INIT, &st->l2.flag)) skb_queue_purge(&st->l2.i_queue); if (test_bit(FLG_LAPB, &st->l2.flag)) - L2L1(st, PH_DEACTIVATE | REQUEST, NULL); + st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL); st5_dl_release_l2l3(st); FsmChangeState(fi, ST_L2_4); } @@ -882,11 +890,11 @@ } inline void -enquiry_cr(struct PStack *st, u8 typ, u8 cr, u8 pf) +enquiry_cr(struct PStack *st, u_char typ, u_char cr, u_char pf) { struct sk_buff *skb; struct Layer2 *l2; - u8 tmp[MAX_HEADER_LEN]; + u_char tmp[MAX_HEADER_LEN]; int i; l2 = &st->l2; @@ -940,8 +948,10 @@ invoke_retransmission(struct PStack *st, unsigned int nr) { struct Layer2 *l2 = &st->l2; - unsigned int p1; + u_int p1; + u_long flags; + spin_lock_irqsave(&l2->lock, flags); if (l2->vs != nr) { while (l2->vs != nr) { (l2->vs)--; @@ -958,8 +968,11 @@ skb_queue_head(&l2->i_queue, l2->windowar[p1]); l2->windowar[p1] = NULL; } - L2L1(st, PH_PULL | REQUEST, NULL); + spin_unlock_irqrestore(&l2->lock, flags); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); + return; } + spin_unlock_irqrestore(&l2->lock, flags); } static void @@ -1018,7 +1031,7 @@ restart_t200(st, 12); } if (skb_queue_len(&st->l2.i_queue) && (typ == RR)) - L2L1(st, PH_PULL | REQUEST, NULL); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); } else nrerrorrecovery(fi); } @@ -1046,7 +1059,7 @@ if (test_bit(FLG_LAPB, &st->l2.flag)) st->l1.bcs->tx_cnt += skb->len + l2headersize(&st->l2, 0); skb_queue_tail(&st->l2.i_queue, skb); - L2L1(st, PH_PULL | REQUEST, NULL); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); } static void @@ -1066,8 +1079,8 @@ struct PStack *st = fi->userdata; struct sk_buff *skb = arg; struct Layer2 *l2 = &(st->l2); - int PollFlag, i; - unsigned int nr, ns; + int PollFlag, ns, i; + unsigned int nr; i = l2addrsize(l2); if (test_bit(FLG_MOD128, &l2->flag)) { @@ -1095,7 +1108,7 @@ else test_and_set_bit(FLG_ACK_PEND, &l2->flag); skb_pull(skb, l2headersize(l2, 0)); - L2L3(st, DL_DATA | INDICATION, skb); + st->l2.l2l3(st, DL_DATA | INDICATION, skb); } else { /* n(s)!=v(r) */ FreeSkb(skb); @@ -1124,7 +1137,7 @@ } if (skb_queue_len(&st->l2.i_queue) && (fi->state == ST_L2_7)) - L2L1(st, PH_PULL | REQUEST, NULL); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); if (test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag)) enquiry_cr(st, RR, RSP, 0); } @@ -1159,7 +1172,7 @@ skb_queue_purge(&st->l2.i_queue); st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'G'); if (test_bit(FLG_LAPB, &st->l2.flag)) - L2L1(st, PH_DEACTIVATE | REQUEST, NULL); + st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL); st5_dl_release_l2l3(st); } else { st->l2.rc++; @@ -1250,9 +1263,10 @@ struct PStack *st = fi->userdata; struct sk_buff *skb, *oskb; struct Layer2 *l2 = &st->l2; - u8 header[MAX_HEADER_LEN]; - int unsigned p1, i; - unsigned long flags; + u_char header[MAX_HEADER_LEN]; + int i; + int unsigned p1; + u_long flags; if (!cansend(st)) return; @@ -1261,7 +1275,7 @@ if (!skb) return; - spin_lock_irqsave(&isdnl2_lock, flags); + spin_lock_irqsave(&l2->lock, flags); if(test_bit(FLG_MOD128, &l2->flag)) p1 = (l2->vs - l2->va) % 128; else @@ -1284,8 +1298,7 @@ header[i++] = (l2->vr << 5) | (l2->vs << 1); l2->vs = (l2->vs + 1) % 8; } - spin_unlock_irqrestore(&isdnl2_lock, flags); - + spin_unlock_irqrestore(&l2->lock, flags); p1 = skb->data - skb->head; if (p1 >= i) memcpy(skb_push(skb, i), header, i); @@ -1298,14 +1311,14 @@ memcpy(skb_put(skb, oskb->len), oskb->data, oskb->len); FreeSkb(oskb); } - L2L1(st, PH_PULL | INDICATION, skb); + st->l2.l2l1(st, PH_PULL | INDICATION, skb); test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag); if (!test_and_set_bit(FLG_T200_RUN, &st->l2.flag)) { FsmDelTimer(&st->l2.t203, 13); FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 11); } if (skb_queue_len(&l2->i_queue) && cansend(st)) - L2L1(st, PH_PULL | REQUEST, NULL); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); } static void @@ -1351,7 +1364,7 @@ invoke_retransmission(st, nr); FsmChangeState(fi, ST_L2_7); if (skb_queue_len(&l2->i_queue) && cansend(st)) - L2L1(st, PH_PULL | REQUEST, NULL); + st->l2.l2l1(st, PH_PULL | REQUEST, NULL); } else nrerrorrecovery(fi); } else { @@ -1398,7 +1411,7 @@ skb_queue_purge(&st->l2.ui_queue); st->l2.tei = -1; - L2L3(st, DL_RELEASE | INDICATION, NULL); + st->l2.l2l3(st, DL_RELEASE | INDICATION, NULL); FsmChangeState(fi, ST_L2_1); } @@ -1424,7 +1437,7 @@ skb_queue_purge(&st->l2.ui_queue); st->l2.tei = -1; stop_t200(st, 18); - L2L3(st, DL_RELEASE | CONFIRM, NULL); + st->l2.l2l3(st, DL_RELEASE | CONFIRM, NULL); FsmChangeState(fi, ST_L2_1); } @@ -1439,23 +1452,23 @@ st->l2.tei = -1; stop_t200(st, 17); FsmDelTimer(&st->l2.t203, 19); - L2L3(st, DL_RELEASE | INDICATION, NULL); + st->l2.l2l3(st, DL_RELEASE | INDICATION, NULL); FsmChangeState(fi, ST_L2_1); } static void -l2_st14_persistent_da(struct FsmInst *fi, int event, void *arg) +l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; skb_queue_purge(&st->l2.i_queue); skb_queue_purge(&st->l2.ui_queue); if (test_and_clear_bit(FLG_ESTAB_PEND, &st->l2.flag)) - L2L3(st, DL_RELEASE | INDICATION, NULL); + st->l2.l2l3(st, DL_RELEASE | INDICATION, NULL); } static void -l2_st5_persistent_da(struct FsmInst *fi, int event, void *arg) +l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; @@ -1468,18 +1481,18 @@ } static void -l2_st6_persistent_da(struct FsmInst *fi, int event, void *arg) +l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; skb_queue_purge(&st->l2.ui_queue); stop_t200(st, 20); - L2L3(st, DL_RELEASE | CONFIRM, NULL); + st->l2.l2l3(st, DL_RELEASE | CONFIRM, NULL); FsmChangeState(fi, ST_L2_4); } static void -l2_persistent_da(struct FsmInst *fi, int event, void *arg) +l2_persistant_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; @@ -1488,7 +1501,7 @@ freewin(st); stop_t200(st, 19); FsmDelTimer(&st->l2.t203, 19); - L2L3(st, DL_RELEASE | INDICATION, NULL); + st->l2.l2l3(st, DL_RELEASE | INDICATION, NULL); FsmChangeState(fi, ST_L2_4); } @@ -1614,14 +1627,14 @@ {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error}, {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest}, {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest}, - {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistent_da}, + {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistant_da}, {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove}, {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove}, - {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistent_da}, - {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistent_da}, - {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistent_da}, - {ST_L2_7, EV_L1_DEACTIVATE, l2_persistent_da}, - {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da}, + {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistant_da}, + {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistant_da}, + {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da}, + {ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da}, + {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da}, }; #define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode)) @@ -1630,8 +1643,8 @@ isdnl2_l1l2(struct PStack *st, int pr, void *arg) { struct sk_buff *skb = arg; - u8 *datap; - u_int ret = 1, len; + u_char *datap; + int ret = 1, len; int c = 0; switch (pr) { @@ -1682,9 +1695,6 @@ if (ret) FreeSkb(skb); break; - case (PH_DATA | CONFIRM): - dev_kfree_skb(skb); - break; case (PH_PULL | CONFIRM): FsmEvent(&st->l2.l2m, EV_L2_ACK_PULL, arg); break; @@ -1736,12 +1746,12 @@ test_bit(FLG_ORIG, &st->l2.flag)) { test_and_set_bit(FLG_ESTAB_PEND, &st->l2.flag); } - L2L1(st, PH_ACTIVATE, NULL); + st->l2.l2l1(st, PH_ACTIVATE, NULL); } break; case (DL_RELEASE | REQUEST): if (test_bit(FLG_LAPB, &st->l2.flag)) { - L2L1(st, PH_DEACTIVATE, NULL); + st->l2.l2l1(st, PH_DEACTIVATE, NULL); } FsmEvent(&st->l2.l2m, EV_L2_DL_RELEASE_REQ, arg); break; @@ -1781,8 +1791,9 @@ void setstack_isdnl2(struct PStack *st, char *debug_id) { - st->l2.l1l2 = isdnl2_l1l2; - st->l2.l3l2 = isdnl2_l3l2; + spin_lock_init(&st->l2.lock); + st->l1.l1l2 = isdnl2_l1l2; + st->l3.l3l2 = isdnl2_l3l2; skb_queue_head_init(&st->l2.i_queue); skb_queue_head_init(&st->l2.ui_queue); @@ -1810,13 +1821,13 @@ switch (pr) { case (DL_DATA | REQUEST): case (DL_UNIT_DATA | REQUEST): - L2L1(st, PH_DATA | REQUEST, arg); + st->l2.l2l1(st, PH_DATA | REQUEST, arg); break; case (DL_ESTABLISH | REQUEST): - L2L1(st, PH_ACTIVATE | REQUEST, NULL); + st->l2.l2l1(st, PH_ACTIVATE | REQUEST, NULL); break; case (DL_RELEASE | REQUEST): - L2L1(st, PH_DEACTIVATE | REQUEST, NULL); + st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL); break; } } @@ -1824,7 +1835,7 @@ void setstack_transl2(struct PStack *st) { - st->l2.l3l2 = transl2_l3l2; + st->l3.l3l2 = transl2_l3l2; } void diff -Nru a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c --- a/drivers/isdn/hisax/isdnl3.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/isdnl3.c Thu Feb 19 23:44:25 2004 @@ -1,4 +1,4 @@ -/* $Id: isdnl3.c,v 2.17.6.5 2001/09/23 22:24:49 kai Exp $ +/* $Id: isdnl3.c,v 2.22.2.3 2004/01/13 14:31:25 keil Exp $ * * Author Karsten Keil * based on the teles driver from Jan den Ouden @@ -20,7 +20,7 @@ #include "isdnl3.h" #include -const char *l3_revision = "$Revision: 2.17.6.5 $"; +const char *l3_revision = "$Revision: 2.22.2.3 $"; static struct Fsm l3fsm; @@ -77,11 +77,11 @@ va_end(args); } -u8 * -findie(u8 * p, int size, u8 ie, int wanted_set) +u_char * +findie(u_char * p, int size, u_char ie, int wanted_set) { int l, codeset, maincodeset; - u8 *pend = p + size; + u_char *pend = p + size; /* skip protocol discriminator, callref and message type */ p++; @@ -123,7 +123,7 @@ } int -getcallref(u8 * p) +getcallref(u_char * p) { int l, cr = 0; @@ -162,7 +162,7 @@ static void L3ExpireTimer(struct L3Timer *t) { - t->pc->st->l3.l4l3(t->pc->st, t->event, t->pc); + t->pc->st->lli.l4l3(t->pc->st, t->event, t->pc); } void @@ -354,7 +354,7 @@ st->l3.l3m.printdebug = l3m_debug; FsmInitTimer(&st->l3.l3m, &st->l3.l3m_timer); strcpy(st->l3.debug_id, "L3DC "); - st->l3.l4l3_proto = no_l3_proto_spec; + st->lli.l4l3_proto = no_l3_proto_spec; #ifdef CONFIG_HISAX_EURO if (st->protocol == ISDN_PTYPE_EURO) { @@ -372,13 +372,13 @@ } else #endif if (st->protocol == ISDN_PTYPE_LEASED) { - st->l3.l4l3 = no_l3_proto; - st->l3.l2l3 = no_l3_proto; + st->lli.l4l3 = no_l3_proto; + st->l2.l2l3 = no_l3_proto; st->l3.l3ml3 = no_l3_proto; printk(KERN_INFO "HiSax: Leased line mode\n"); } else { - st->l3.l4l3 = no_l3_proto; - st->l3.l2l3 = no_l3_proto; + st->lli.l4l3 = no_l3_proto; + st->l2.l2l3 = no_l3_proto; st->l3.l3ml3 = no_l3_proto; sprintf(tmp, "protocol %s not supported", (st->protocol == ISDN_PTYPE_1TR6) ? "1tr6" : @@ -392,7 +392,7 @@ void isdnl3_trans(struct PStack *st, int pr, void *arg) { - L3L2(st, pr, arg); + st->l3.l3l2(st, pr, arg); } void @@ -423,7 +423,7 @@ st->l3.l3m.userint = 0; st->l3.l3m.printdebug = l3m_debug; strcpy(st->l3.debug_id, "L3BC "); - st->l3.l4l3 = isdnl3_trans; + st->lli.l4l3 = isdnl3_trans; } #define DREL_TIMER_VALUE 40000 @@ -434,7 +434,7 @@ struct PStack *st = fi->userdata; FsmChangeState(fi, ST_L3_LC_ESTAB_WAIT); - L3L2(st, DL_ESTABLISH | REQUEST, NULL); + st->l3.l3l2(st, DL_ESTABLISH | REQUEST, NULL); } static void @@ -446,7 +446,7 @@ FsmChangeState(fi, ST_L3_LC_ESTAB); while ((skb = skb_dequeue(&st->l3.squeue))) { - L3L2(st, DL_DATA | REQUEST, skb); + st->l3.l3l2(st, DL_DATA | REQUEST, skb); dequeued++; } if ((!st->l3.proc) && dequeued) { @@ -467,7 +467,7 @@ FsmDelTimer(&st->l3.l3m_timer, 51); FsmChangeState(fi, ST_L3_LC_ESTAB); while ((skb = skb_dequeue(&st->l3.squeue))) { - L3L2(st, DL_DATA | REQUEST, skb); + st->l3.l3l2(st, DL_DATA | REQUEST, skb); dequeued++; } if ((!st->l3.proc) && dequeued) { @@ -511,7 +511,7 @@ FsmAddTimer(&st->l3.l3m_timer, DREL_TIMER_VALUE, EV_TIMEOUT, NULL, 51); } else { FsmChangeState(fi, ST_L3_LC_REL_WAIT); - L3L2(st, DL_RELEASE | REQUEST, NULL); + st->l3.l3l2(st, DL_RELEASE | REQUEST, NULL); } } @@ -564,7 +564,7 @@ switch (pr) { case (DL_DATA | REQUEST): if (st->l3.l3m.state == ST_L3_LC_ESTAB) { - L3L2(st, pr, arg); + st->l3.l3l2(st, pr, arg); } else { struct sk_buff *skb = arg; diff -Nru a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c --- a/drivers/isdn/hisax/isurf.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/isurf.c Thu Feb 19 23:44:25 2004 @@ -1,4 +1,4 @@ -/* $Id: isurf.c,v 1.10.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: isurf.c,v 1.12.2.4 2004/01/13 21:46:03 keil Exp $ * * low level stuff for Siemens I-Surf/I-Talk cards * @@ -19,7 +19,7 @@ extern const char *CardType[]; -static const char *ISurf_revision = "$Revision: 1.10.6.2 $"; +static const char *ISurf_revision = "$Revision: 1.12.2.4 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -35,20 +35,20 @@ #define ISURF_IOMEM_SIZE 0x400 /* Interface functions */ -static u8 -ReadISAC(struct IsdnCardState *cs, u8 offset) +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { return (readb(cs->hw.isurf.isac + offset)); } static void -WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { writeb(value, cs->hw.isurf.isac + offset); mb(); } static void -ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { register int i; for (i = 0; i < size; i++) @@ -56,7 +56,7 @@ } static void -WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { register int i; for (i = 0; i < size; i++){ @@ -64,44 +64,33 @@ } } -static struct dc_hw_ops isac_ops = { - .read_reg = ReadISAC, - .write_reg = WriteISAC, - .read_fifo = ReadISACfifo, - .write_fifo = WriteISACfifo, -}; - /* ISAR access routines * mode = 0 access with IRQ on * mode = 1 access with IRQ off * mode = 2 access with IRQ off and using last offset */ -static u8 -ReadISAR(struct IsdnCardState *cs, int mode, u8 offset) +static u_char +ReadISAR(struct IsdnCardState *cs, int mode, u_char offset) { return(readb(cs->hw.isurf.isar + offset)); } static void -WriteISAR(struct IsdnCardState *cs, int mode, u8 offset, u8 value) +WriteISAR(struct IsdnCardState *cs, int mode, u_char offset, u_char value) { writeb(value, cs->hw.isurf.isar + offset);mb(); } -static struct bc_hw_ops isar_ops = { - .read_reg = ReadISAR, - .write_reg = WriteISAR, -}; - static irqreturn_t isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val; + u_char val; int cnt = 5; + u_long flags; - spin_lock(&cs->lock); + spin_lock_irqsave(&cs->lock, flags); val = readb(cs->hw.isurf.isar + ISAR_IRQBIT); Start_ISAR: if (val & ISAR_IRQSTA) @@ -129,151 +118,190 @@ writeb(0xFF, cs->hw.isurf.isac + ISAC_MASK);mb(); writeb(0, cs->hw.isurf.isac + ISAC_MASK);mb(); writeb(ISAR_IRQMSK, cs->hw.isurf.isar + ISAR_IRQBIT); mb(); - spin_unlock(&cs->lock); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } +void +release_io_isurf(struct IsdnCardState *cs) +{ + release_region(cs->hw.isurf.reset, 1); + iounmap((unsigned char *)cs->hw.isurf.isar); + release_mem_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE); +} + static void -reset_isurf(struct IsdnCardState *cs, u8 chips) +reset_isurf(struct IsdnCardState *cs, u_char chips) { printk(KERN_INFO "ISurf: resetting card\n"); byteout(cs->hw.isurf.reset, chips); /* Reset On */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); + mdelay(10); byteout(cs->hw.isurf.reset, ISURF_ISAR_EA); /* Reset Off */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); + mdelay(10); +} + +static int +ISurf_card_msg(struct IsdnCardState *cs, int mt, void *arg) +{ + u_long flags; + + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_isurf(cs, ISURF_RESET); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_isurf(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + reset_isurf(cs, ISURF_RESET); + clear_pending_isac_ints(cs); + writeb(0, cs->hw.isurf.isar+ISAR_IRQBIT);mb(); + initisac(cs); + initisar(cs); + /* Reenable ISAC IRQ */ + cs->writeisac(cs, ISAC_MASK, 0); + /* RESET Receiver and Transmitter */ + cs->writeisac(cs, ISAC_CMDR, 0x41); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } static int isurf_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) { int ret; + u_long flags; if ((ic->command == ISDN_CMD_IOCTL) && (ic->arg == 9)) { ret = isar_auxcmd(cs, ic); + spin_lock_irqsave(&cs->lock, flags); if (!ret) { reset_isurf(cs, ISURF_ISAR_EA | ISURF_ISAC_RESET | ISURF_ARCOFI_RESET); initisac(cs); + cs->writeisac(cs, ISAC_MASK, 0); + cs->writeisac(cs, ISAC_CMDR, 0x41); } + spin_unlock_irqrestore(&cs->lock, flags); return(ret); } return(isar_auxcmd(cs, ic)); } -static void -isurf_init(struct IsdnCardState *cs) -{ - writeb(0, cs->hw.isurf.isar + ISAR_IRQBIT); - initisac(cs); - initisar(cs); -} - -static int -isurf_reset(struct IsdnCardState *cs) -{ - reset_isurf(cs, ISURF_RESET); - return 0; -} - -static struct card_ops isurf_ops = { - .init = isurf_init, - .reset = isurf_reset, - .release = hisax_release_resources, - .irq_func = isurf_interrupt, -}; - #ifdef __ISAPNP__ -static struct pnp_card *pnp_surf __devinitdata = NULL; +static struct pnp_card *pnp_c __initdata = NULL; #endif -static int __init -isurf_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - unsigned long phymem; - - phymem = card->para[2]; - cs->hw.isurf.reset = card->para[1]; - cs->irq = card->para[0]; - - if (!request_io(&cs->rs, cs->hw.isurf.reset, 1, "isurf isdn")) - goto err; - - cs->hw.isurf.isar = request_mmio(&cs->rs, phymem, ISURF_IOMEM_SIZE, - "isurf iomem"); - if (!cs->hw.isurf.isar) - goto err; - - cs->hw.isurf.isac = cs->hw.isurf.isar + ISURF_ISAC_OFFSET; - printk(KERN_INFO "ISurf: defined at 0x%x 0x%lx IRQ %d\n", - cs->hw.isurf.reset, phymem, cs->irq); - - cs->auxcmd = &isurf_auxcmd; - cs->card_ops = &isurf_ops; - cs->bcs[0].hw.isar.reg = &cs->hw.isurf.isar_r; - cs->bcs[1].hw.isar.reg = &cs->hw.isurf.isar_r; - reset_isurf(cs, ISURF_RESET); - __set_bit(HW_ISAR, &cs->HW_Flags); - isac_setup(cs, &isac_ops); - if (isar_setup(cs, &isar_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - int __init setup_isurf(struct IsdnCard *card) { + int ver; + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, ISurf_revision); printk(KERN_INFO "HiSax: ISurf driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_ISURF) + return(0); + if (card->para[1] && card->para[2]) { + cs->hw.isurf.reset = card->para[1]; + cs->hw.isurf.phymem = card->para[2]; + cs->irq = card->para[0]; + } else { #ifdef __ISAPNP__ - if (!card->para[1] || !card->para[2]) { - struct pnp_card *pb; - struct pnp_dev *pd; - - card->cs->subtyp = 0; - if ((pb = pnp_find_card( - ISAPNP_VENDOR('S', 'I', 'E'), - ISAPNP_FUNCTION(0x0010), pnp_surf))) { - pnp_surf = pb; - pd = NULL; - if (!(pd = pnp_find_dev(pnp_surf, - ISAPNP_VENDOR('S', 'I', 'E'), - ISAPNP_FUNCTION(0x0010), pd))) { - printk(KERN_ERR "ISurfPnP: PnP error card found, no device\n"); - return (0); - } - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "ISurfPnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "ISurfPnP: activate failed\n"); - pnp_device_detach(pd); - return 0; - } - if (!pnp_irq_valid(pd, 0) || !pnp_port_valid(pd, 0) || !pnp_port_valid(pd, 1)) { - printk(KERN_ERR "ISurfPnP:some resources are missing %ld/%lx/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0), pnp_port_start(pd, 1)); - pnp_device_detach(pd); + if (isapnp_present()) { + struct pnp_dev *pnp_d = NULL; + int err; + + cs->subtyp = 0; + if ((pnp_c = pnp_find_card( + ISAPNP_VENDOR('S', 'I', 'E'), + ISAPNP_FUNCTION(0x0010), pnp_c))) { + if (!(pnp_d = pnp_find_dev(pnp_c, + ISAPNP_VENDOR('S', 'I', 'E'), + ISAPNP_FUNCTION(0x0010), pnp_d))) { + printk(KERN_ERR "ISurfPnP: PnP error card found, no device\n"); + return (0); + } + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + cs->hw.isurf.reset = pnp_port_start(pnp_d, 0); + cs->hw.isurf.phymem = pnp_mem_start(pnp_d, 1); + cs->irq = pnp_irq(pnp_d, 0); + if (!cs->irq || !cs->hw.isurf.reset || !cs->hw.isurf.phymem) { + printk(KERN_ERR "ISurfPnP:some resources are missing %d/%x/%lx\n", + cs->irq, cs->hw.isurf.reset, cs->hw.isurf.phymem); + pnp_disable_dev(pnp_d); + return(0); + } + } else { + printk(KERN_INFO "ISurfPnP: no ISAPnP card found\n"); return(0); } - card->para[1] = pnp_port_start(pd, 0); - card->para[2] = pnp_port_start(pd, 1); - card->para[0] = pnp_irq(pd, 0); } else { - printk(KERN_INFO "ISurfPnP: no ISAPnP card found\n"); - return 0; + printk(KERN_INFO "ISurfPnP: no ISAPnP bus found\n"); + return(0); } - } +#else + printk(KERN_WARNING "HiSax: %s port/mem not set\n", + CardType[card->typ]); + return (0); #endif - if (isurf_probe(card->cs, card) < 0) - return 0; - return 1; + } + if (!request_region(cs->hw.isurf.reset, 1, "isurf isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %x already in use\n", + CardType[card->typ], + cs->hw.isurf.reset); + return (0); + } + if (!request_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE, "isurf iomem")) { + printk(KERN_WARNING + "HiSax: %s memory region %lx-%lx already in use\n", + CardType[card->typ], + cs->hw.isurf.phymem, + cs->hw.isurf.phymem + ISURF_IOMEM_SIZE); + release_region(cs->hw.isurf.reset, 1); + return (0); + } + cs->hw.isurf.isar = + (unsigned long) ioremap(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE); + cs->hw.isurf.isac = cs->hw.isurf.isar + ISURF_ISAC_OFFSET; + printk(KERN_INFO + "ISurf: defined at 0x%x 0x%lx IRQ %d\n", + cs->hw.isurf.reset, + cs->hw.isurf.phymem, + cs->irq); + + setup_isac(cs); + cs->cardmsg = &ISurf_card_msg; + cs->irq_func = &isurf_interrupt; + cs->auxcmd = &isurf_auxcmd; + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->bcs[0].hw.isar.reg = &cs->hw.isurf.isar_r; + cs->bcs[1].hw.isar.reg = &cs->hw.isurf.isar_r; + test_and_set_bit(HW_ISAR, &cs->HW_Flags); + ISACVersion(cs, "ISurf:"); + cs->BC_Read_Reg = &ReadISAR; + cs->BC_Write_Reg = &WriteISAR; + cs->BC_Send_Data = &isar_fill_fifo; + ver = ISARVersion(cs, "ISurf:"); + if (ver < 0) { + printk(KERN_WARNING + "ISurf: wrong ISAR version (ret = %d)\n", ver); + release_io_isurf(cs); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c --- a/drivers/isdn/hisax/ix1_micro.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/ix1_micro.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: ix1_micro.c,v 2.10.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: ix1_micro.c,v 2.12.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for ITK ix1-micro Rev.2 isdn cards * derived from the original file teles3.c from Karsten Keil @@ -25,8 +25,7 @@ #include "isdnl1.h" extern const char *CardType[]; -const char *ix1_revision = "$Revision: 2.10.6.2 $"; -static spinlock_t ix1_micro_lock = SPIN_LOCK_UNLOCKED; +const char *ix1_revision = "$Revision: 2.12.2.4 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -40,107 +39,137 @@ #define TIMEOUT 50 -static inline u8 -readreg(struct IsdnCardState *cs, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&ix1_micro_lock, flags); - byteout(cs->hw.ix1.isac_ale, off); + byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&ix1_micro_lock, flags); return (ret); } static inline void -writereg(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&ix1_micro_lock, flags); - byteout(cs->hw.ix1.isac_ale, off); - byteout(adr, data); - spin_unlock_irqrestore(&ix1_micro_lock, flags); + byteout(ale, off); + insb(adr, data, size); } + static inline void -readfifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { - byteout(cs->hw.ix1.isac_ale, off); - insb(adr, data, size); + byteout(ale, off); + byteout(adr, data); } static inline void -writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - byteout(cs->hw.ix1.isac_ale, off); + byteout(ale, off); outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.ix1.isac, offset); + return (readreg(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.ix1.isac, offset, value); + writereg(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs, cs->hw.ix1.isac, 0, data, size); + readfifo(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.ix1.isac, 0, data, size); + writefifo(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return readreg(cs, cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0)); + return (readreg(cs->hw.ix1.hscx_ale, + cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0))); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writereg(cs, cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0), value); + writereg(cs->hw.ix1.hscx_ale, + cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0), value); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - readfifo(cs, cs->hw.ix1.hscx, hscx ? 0x40 : 0, data, size); +#define READHSCX(cs, nr, reg) readreg(cs->hw.ix1.hscx_ale, \ + cs->hw.ix1.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.ix1.hscx_ale, \ + cs->hw.ix1.hscx, reg + (nr ? 0x40 : 0), data) + +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ix1.hscx_ale, \ + cs->hw.ix1.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.ix1.hscx_ale, \ + cs->hw.ix1.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +ix1micro_interrupt(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + val = readreg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_ISTA + 0x40); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + val = readreg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_ISTA + 0x40); + if (val) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, ISAC_ISTA); + if (val) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + writereg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, ISAC_MASK, 0); + writereg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_MASK, 0); + writereg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_MASK + 0x40, 0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +void +release_io_ix1micro(struct IsdnCardState *cs) { - writefifo(cs, cs->hw.ix1.hscx, hscx ? 0x40 : 0, data, size); + if (cs->hw.ix1.cfg_reg) + release_region(cs->hw.ix1.cfg_reg, 4); } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static int +static void ix1_reset(struct IsdnCardState *cs) { int cnt; @@ -152,37 +181,32 @@ HZDELAY(1); /* wait >=10 ms */ } byteout(cs->hw.ix1.cfg_reg + SPECIAL_PORT_OFFSET, 0); - return 0; } -static struct card_ops ix1_ops = { - .init = inithscxisac, - .reset = ix1_reset, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; - -static int __init -ix1_probe(struct IsdnCardState *cs, struct IsdnCard *card) +static int +ix1_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - cs->irq = card->para[0]; - cs->hw.ix1.isac_ale = card->para[1] + ISAC_COMMAND_OFFSET; - cs->hw.ix1.isac = card->para[1] + ISAC_DATA_OFFSET; - cs->hw.ix1.hscx = card->para[1] + HSCX_DATA_OFFSET; - cs->hw.ix1.cfg_reg = card->para[1]; - if (!request_io(&cs->rs, cs->hw.ix1.cfg_reg, 4, "ix1micro cfg")) - goto err; - - printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n", - CardType[cs->typ], cs->irq, cs->hw.ix1.cfg_reg); - ix1_reset(cs); - cs->card_ops = &ix1_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + u_long flags; + + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + ix1_reset(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_ix1micro(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + ix1_reset(cs); + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } #ifdef __ISAPNP__ @@ -196,7 +220,7 @@ { 0, } }; -static struct isapnp_device_id *idev = &itk_ids[0]; +static struct isapnp_device_id *ipid __initdata = &itk_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif @@ -204,64 +228,91 @@ int __init setup_ix1micro(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, ix1_revision); printk(KERN_INFO "HiSax: ITK IX1 driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_IX1MICROR2) + return (0); - if (card->para[1]) { - if (ix1_probe(card->cs, card)) - return 0; - return 1; - } #ifdef __ISAPNP__ - if (isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; - - while(idev->card_vendor) { - if ((pb = pnp_find_card(idev->card_vendor, - idev->card_device, - pnp_c))) { - pnp_c = pb; - pd = NULL; - if ((pd = pnp_find_dev(pnp_c, - idev->vendor, - idev->function, - pd))) { + if (!card->para[1] && isapnp_present()) { + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; + printk(KERN_INFO "HiSax: %s detected\n", - (char *)idev->driver_data); - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "ITK PnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "ITK PnP: activate failed\n"); - pnp_device_detach(pd); - return 0; + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_port_valid(pd, 0) || !pnp_irq_valid(pd, 0)) { + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + if (!card->para[0] || !card->para[1]) { printk(KERN_ERR "ITK PnP:some resources are missing %ld/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0)); - pnp_device_detach(pd); + card->para[0], card->para[1]); + pnp_disable_dev(pnp_d); return(0); } - card->para[1] = pnp_port_start(pd, 0); - card->para[0] = pnp_irq(pd, 0); - if (ix1_probe(card->cs, card)) - return 0; - return 1; + break; } else { printk(KERN_ERR "ITK PnP: PnP error card found, no device\n"); } } - idev++; - pnp_c=NULL; + ipid++; + pnp_c = NULL; } - if (!idev->card_vendor) { + if (!ipid->card_vendor) { printk(KERN_INFO "ITK PnP: no ISAPnP card found\n"); + return(0); } } #endif - return 0; + /* IO-Ports */ + cs->hw.ix1.isac_ale = card->para[1] + ISAC_COMMAND_OFFSET; + cs->hw.ix1.hscx_ale = card->para[1] + HSCX_COMMAND_OFFSET; + cs->hw.ix1.isac = card->para[1] + ISAC_DATA_OFFSET; + cs->hw.ix1.hscx = card->para[1] + HSCX_DATA_OFFSET; + cs->hw.ix1.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + if (cs->hw.ix1.cfg_reg) { + if (!request_region(cs->hw.ix1.cfg_reg, 4, "ix1micro cfg")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.ix1.cfg_reg, + cs->hw.ix1.cfg_reg + 4); + return (0); + } + } + printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n", + CardType[cs->typ], cs->irq, cs->hw.ix1.cfg_reg); + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &ix1_card_msg; + cs->irq_func = &ix1micro_interrupt; + ISACVersion(cs, "ix1-Micro:"); + if (HscxVersion(cs, "ix1-Micro:")) { + printk(KERN_WARNING + "ix1-Micro: wrong HSCX versions check IO address\n"); + release_io_ix1micro(cs); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c --- a/drivers/isdn/hisax/jade.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/jade.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: jade.c,v 1.6.6.3 2001/09/23 22:24:49 kai Exp $ +/* $Id: jade.c,v 1.9.2.4 2004/01/14 16:04:48 keil Exp $ * * JADE stuff (derived from original hscx.c) * @@ -18,38 +18,17 @@ #include "isdnl1.h" #include -static spinlock_t jade_lock = SPIN_LOCK_UNLOCKED; -static inline u8 -jade_read_reg(struct IsdnCardState *cs, int jade, u8 addr) -{ - return cs->bc_hw_ops->read_reg(cs, jade, addr); -} - -static inline void -jade_write_reg(struct IsdnCardState *cs, int jade, u8 addr, u8 val) -{ - cs->bc_hw_ops->write_reg(cs, jade, addr, val); -} - -static inline void -jade_write_fifo(struct BCState *bcs, u8 *p, int len) -{ - struct IsdnCardState *cs = bcs->cs; - - cs->bc_hw_ops->write_fifo(cs, bcs->unit, p, len); -} - -static int +int __init JadeVersion(struct IsdnCardState *cs, char *s) { int ver,i; int to = 50; - jade_write_reg(cs, -1, 0x50, 0x19); + cs->BC_Write_Reg(cs, -1, 0x50, 0x19); i=0; while (to) { udelay(1); - ver = jade_read_reg(cs, -1, 0x60); + ver = cs->BC_Read_Reg(cs, -1, 0x60); to--; if (ver) break; @@ -61,39 +40,36 @@ /* Wait for the JADE */ udelay(10); /* Read version */ - ver = jade_read_reg(cs, -1, 0x60); + ver = cs->BC_Read_Reg(cs, -1, 0x60); printk(KERN_INFO "%s JADE version: %d\n", s, ver); return (1); } /* Write to indirect accessible jade register set */ static void -jade_write_indirect(struct IsdnCardState *cs, u8 reg, u8 value) +jade_write_indirect(struct IsdnCardState *cs, u_char reg, u_char value) { int to = 50; - unsigned long flags; - u8 ret; - spin_lock_irqsave(&jade_lock, flags); + u_char ret; + /* Write the data */ - jade_write_reg(cs, -1, COMM_JADE+1, value); + cs->BC_Write_Reg(cs, -1, COMM_JADE+1, value); /* Say JADE we wanna write indirect reg 'reg' */ - jade_write_reg(cs, -1, COMM_JADE, reg); + cs->BC_Write_Reg(cs, -1, COMM_JADE, reg); to = 50; /* Wait for RDY goes high */ while (to) { udelay(1); - ret = jade_read_reg(cs, -1, COMM_JADE); + ret = cs->BC_Read_Reg(cs, -1, COMM_JADE); to--; if (ret & 1) /* Got acknowledge */ break; if (!to) { - spin_unlock_irqrestore(&jade_lock, flags); printk(KERN_INFO "Can not see ready bit from JADE DSP (reg=0x%X, value=0x%X)\n", reg, value); return; } } - spin_unlock_irqrestore(&jade_lock, flags); } @@ -102,7 +78,7 @@ modejade(struct BCState *bcs, int mode, int bc) { struct IsdnCardState *cs = bcs->cs; - int jade = bcs->unit; + int jade = bcs->hw.hscx.hscx; if (cs->debug & L1_DEB_HSCX) { char tmp[40]; @@ -113,75 +89,103 @@ bcs->mode = mode; bcs->channel = bc; - jade_write_reg(cs, jade, jade_HDLC_MODE, (mode == L1_MODE_TRANS ? jadeMODE_TMO:0x00)); - jade_write_reg(cs, jade, jade_HDLC_CCR0, (jadeCCR0_PU|jadeCCR0_ITF)); - jade_write_reg(cs, jade, jade_HDLC_CCR1, 0x00); + cs->BC_Write_Reg(cs, jade, jade_HDLC_MODE, (mode == L1_MODE_TRANS ? jadeMODE_TMO:0x00)); + cs->BC_Write_Reg(cs, jade, jade_HDLC_CCR0, (jadeCCR0_PU|jadeCCR0_ITF)); + cs->BC_Write_Reg(cs, jade, jade_HDLC_CCR1, 0x00); jade_write_indirect(cs, jade_HDLC1SERRXPATH, 0x08); jade_write_indirect(cs, jade_HDLC2SERRXPATH, 0x08); jade_write_indirect(cs, jade_HDLC1SERTXPATH, 0x00); jade_write_indirect(cs, jade_HDLC2SERTXPATH, 0x00); - jade_write_reg(cs, jade, jade_HDLC_XCCR, 0x07); - jade_write_reg(cs, jade, jade_HDLC_RCCR, 0x07); + cs->BC_Write_Reg(cs, jade, jade_HDLC_XCCR, 0x07); + cs->BC_Write_Reg(cs, jade, jade_HDLC_RCCR, 0x07); if (bc == 0) { - jade_write_reg(cs, jade, jade_HDLC_TSAX, 0x00); - jade_write_reg(cs, jade, jade_HDLC_TSAR, 0x00); + cs->BC_Write_Reg(cs, jade, jade_HDLC_TSAX, 0x00); + cs->BC_Write_Reg(cs, jade, jade_HDLC_TSAR, 0x00); } else { - jade_write_reg(cs, jade, jade_HDLC_TSAX, 0x04); - jade_write_reg(cs, jade, jade_HDLC_TSAR, 0x04); + cs->BC_Write_Reg(cs, jade, jade_HDLC_TSAX, 0x04); + cs->BC_Write_Reg(cs, jade, jade_HDLC_TSAR, 0x04); } switch (mode) { case (L1_MODE_NULL): - jade_write_reg(cs, jade, jade_HDLC_MODE, jadeMODE_TMO); + cs->BC_Write_Reg(cs, jade, jade_HDLC_MODE, jadeMODE_TMO); break; case (L1_MODE_TRANS): - jade_write_reg(cs, jade, jade_HDLC_MODE, (jadeMODE_TMO|jadeMODE_RAC|jadeMODE_XAC)); + cs->BC_Write_Reg(cs, jade, jade_HDLC_MODE, (jadeMODE_TMO|jadeMODE_RAC|jadeMODE_XAC)); break; case (L1_MODE_HDLC): - jade_write_reg(cs, jade, jade_HDLC_MODE, (jadeMODE_RAC|jadeMODE_XAC)); + cs->BC_Write_Reg(cs, jade, jade_HDLC_MODE, (jadeMODE_RAC|jadeMODE_XAC)); break; } if (mode) { - jade_write_reg(cs, jade, jade_HDLC_RCMD, (jadeRCMD_RRES|jadeRCMD_RMC)); - jade_write_reg(cs, jade, jade_HDLC_XCMD, jadeXCMD_XRES); + cs->BC_Write_Reg(cs, jade, jade_HDLC_RCMD, (jadeRCMD_RRES|jadeRCMD_RMC)); + cs->BC_Write_Reg(cs, jade, jade_HDLC_XCMD, jadeXCMD_XRES); /* Unmask ints */ - jade_write_reg(cs, jade, jade_HDLC_IMR, 0xF8); + cs->BC_Write_Reg(cs, jade, jade_HDLC_IMR, 0xF8); } else /* Mask ints */ - jade_write_reg(cs, jade, jade_HDLC_IMR, 0x00); + cs->BC_Write_Reg(cs, jade, jade_HDLC_IMR, 0x00); } static void jade_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->hw.hscx.count = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "jade_l2l1: this shouldn't happen\n"); + } else { + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->hw.hscx.count = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - modejade(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + modejade(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - modejade(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + modejade(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -189,14 +193,53 @@ void close_jadestate(struct BCState *bcs) { - modejade(bcs, 0, bcs->channel); - bc_close(bcs); + modejade(bcs, 0, bcs->channel); + if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { + if (bcs->hw.hscx.rcvbuf) { + kfree(bcs->hw.hscx.rcvbuf); + bcs->hw.hscx.rcvbuf = NULL; + } + if (bcs->blog) { + kfree(bcs->blog); + bcs->blog = NULL; + } + skb_queue_purge(&bcs->rqueue); + skb_queue_purge(&bcs->squeue); + if (bcs->tx_skb) { + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + } + } } static int open_jadestate(struct IsdnCardState *cs, struct BCState *bcs) { - return bc_open(bcs);; + if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { + if (!(bcs->hw.hscx.rcvbuf = kmalloc(HSCX_BUFMAX, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for hscx.rcvbuf\n"); + test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); + return (1); + } + if (!(bcs->blog = kmalloc(MAX_BLOG_SPACE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for bcs->blog\n"); + test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); + kfree(bcs->hw.hscx.rcvbuf); + bcs->hw.hscx.rcvbuf = NULL; + return (2); + } + skb_queue_head_init(&bcs->rqueue); + skb_queue_head_init(&bcs->squeue); + } + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->event = 0; + bcs->hw.hscx.rcvidx = 0; + bcs->tx_cnt = 0; + return (0); } @@ -207,74 +250,69 @@ if (open_jadestate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = jade_l2l1; + st->l2.l2l1 = jade_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); return (0); } -static void jade_fill_fifo(struct BCState *bcs); - -static struct bc_l1_ops jade_l1_ops = { - .fill_fifo = jade_fill_fifo, - .open = setstack_jade, - .close = close_jadestate, -}; - void __init -initjade(struct IsdnCardState *cs) +clear_pending_jade_ints(struct IsdnCardState *cs) { int val; + char tmp[64]; - cs->bc_l1_ops = &jade_l1_ops; - cs->bcs[0].unit = 0; - cs->bcs[1].unit = 1; - - jade_write_reg(cs, 0, jade_HDLC_IMR, 0x00); - jade_write_reg(cs, 1, jade_HDLC_IMR, 0x00); - - val = jade_read_reg(cs, 1, jade_HDLC_ISR); - debugl1(cs, "jade B ISTA %x", val); - val = jade_read_reg(cs, 0, jade_HDLC_ISR); - debugl1(cs, "jade A ISTA %x", val); - val = jade_read_reg(cs, 1, jade_HDLC_STAR); - debugl1(cs, "jade B STAR %x", val); - val = jade_read_reg(cs, 0, jade_HDLC_STAR); - debugl1(cs, "jade A STAR %x", val); + cs->BC_Write_Reg(cs, 0, jade_HDLC_IMR, 0x00); + cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); + val = cs->BC_Read_Reg(cs, 1, jade_HDLC_ISR); + sprintf(tmp, "jade B ISTA %x", val); + debugl1(cs, tmp); + val = cs->BC_Read_Reg(cs, 0, jade_HDLC_ISR); + sprintf(tmp, "jade A ISTA %x", val); + debugl1(cs, tmp); + val = cs->BC_Read_Reg(cs, 1, jade_HDLC_STAR); + sprintf(tmp, "jade B STAR %x", val); + debugl1(cs, tmp); + val = cs->BC_Read_Reg(cs, 0, jade_HDLC_STAR); + sprintf(tmp, "jade A STAR %x", val); + debugl1(cs, tmp); /* Unmask ints */ - jade_write_reg(cs, 0, jade_HDLC_IMR, 0xF8); - jade_write_reg(cs, 1, jade_HDLC_IMR, 0xF8); + cs->BC_Write_Reg(cs, 0, jade_HDLC_IMR, 0xF8); + cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0xF8); +} + +void __init +initjade(struct IsdnCardState *cs) +{ + cs->bcs[0].BC_SetStack = setstack_jade; + cs->bcs[1].BC_SetStack = setstack_jade; + cs->bcs[0].BC_Close = close_jadestate; + cs->bcs[1].BC_Close = close_jadestate; + cs->bcs[0].hw.hscx.hscx = 0; + cs->bcs[1].hw.hscx.hscx = 1; /* Stop DSP audio tx/rx */ jade_write_indirect(cs, 0x11, 0x0f); jade_write_indirect(cs, 0x17, 0x2f); /* Transparent Mode, RxTx inactive, No Test, No RFS/TFS */ - jade_write_reg(cs, 0, jade_HDLC_MODE, jadeMODE_TMO); - jade_write_reg(cs, 1, jade_HDLC_MODE, jadeMODE_TMO); + cs->BC_Write_Reg(cs, 0, jade_HDLC_MODE, jadeMODE_TMO); + cs->BC_Write_Reg(cs, 1, jade_HDLC_MODE, jadeMODE_TMO); /* Power down, 1-Idle, RxTx least significant bit first */ - jade_write_reg(cs, 0, jade_HDLC_CCR0, 0x00); - jade_write_reg(cs, 1, jade_HDLC_CCR0, 0x00); + cs->BC_Write_Reg(cs, 0, jade_HDLC_CCR0, 0x00); + cs->BC_Write_Reg(cs, 1, jade_HDLC_CCR0, 0x00); /* Mask all interrupts */ - jade_write_reg(cs, 0, jade_HDLC_IMR, 0x00); - jade_write_reg(cs, 1, jade_HDLC_IMR, 0x00); + cs->BC_Write_Reg(cs, 0, jade_HDLC_IMR, 0x00); + cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); /* Setup host access to hdlc controller */ jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2)); /* Unmask HDLC int (don´t forget DSP int later on)*/ - jade_write_reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2)); + cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2)); /* once again TRANSPARENT */ modejade(cs->bcs, 0, 0); modejade(cs->bcs + 1, 0, 0); } -int -jade_setup(struct IsdnCardState *cs, struct bc_hw_ops *jade_ops) -{ - cs->bc_hw_ops = jade_ops; - return JadeVersion(cs, "HiSax:"); -} - -#include "jade_irq.c" diff -Nru a/drivers/isdn/hisax/jade.h b/drivers/isdn/hisax/jade.h --- a/drivers/isdn/hisax/jade.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/jade.h Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: jade.h,v 1.3.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: jade.h,v 1.5.2.3 2004/01/14 16:04:48 keil Exp $ * * JADE specific defines * @@ -127,10 +127,9 @@ #define jade_TXAUDIOCH1CFG 0x17 #define jade_TXAUDIOCH2CFG 0x1A -extern void jade_sched_event(struct BCState *bcs, int event); +extern int JadeVersion(struct IsdnCardState *cs, char *s); extern void modejade(struct BCState *bcs, int mode, int bc); +extern void clear_pending_jade_ints(struct IsdnCardState *cs); extern void initjade(struct IsdnCardState *cs); -extern void jade_int_main(struct IsdnCardState *cs, u8 val, int jade); -extern int jade_setup(struct IsdnCardState *cs, struct bc_hw_ops *jade_ops); #endif /* __JADE_H__ */ diff -Nru a/drivers/isdn/hisax/jade_irq.c b/drivers/isdn/hisax/jade_irq.c --- a/drivers/isdn/hisax/jade_irq.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/jade_irq.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: jade_irq.c,v 1.5.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: jade_irq.c,v 1.7.2.4 2004/02/11 13:21:34 keil Exp $ * * Low level JADE IRQ stuff (derived from original hscx_irq.c) * @@ -15,7 +15,7 @@ { int to = 50; int mask = (reg == jade_HDLC_XCMD ? jadeSTAR_XCEC : jadeSTAR_RCEC); - while ((jade_read_reg(cs, jade, jade_HDLC_STAR) & mask) && to) { + while ((READJADE(cs, jade, jade_HDLC_STAR) & mask) && to) { udelay(1); to--; } @@ -25,17 +25,16 @@ static inline void -waitforXFW(struct BCState *bcs) +waitforXFW(struct IsdnCardState *cs, int jade) { + /* Does not work on older jade versions, don't care */ } static inline void -WriteJADECMDR(struct BCState *bcs, int reg, u8 data) +WriteJADECMDR(struct IsdnCardState *cs, int jade, int reg, u_char data) { - int jade = bcs->unit; - - waitforCEC(bcs->cs, jade, reg); - jade_write_reg(bcs->cs, jade, reg, data); + waitforCEC(cs, jade, reg); + WRITEJADE(cs, jade, reg, data); } @@ -43,33 +42,80 @@ static void jade_empty_fifo(struct BCState *bcs, int count) { - recv_empty_fifo_b(bcs, count); - WriteJADECMDR(bcs, jade_HDLC_RCMD, jadeRCMD_RMC); + u_char *ptr; + struct IsdnCardState *cs = bcs->cs; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "jade_empty_fifo"); + + if (bcs->hw.hscx.rcvidx + count > HSCX_BUFMAX) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "jade_empty_fifo: incoming packet too large"); + WriteJADECMDR(cs, bcs->hw.hscx.hscx, jade_HDLC_RCMD, jadeRCMD_RMC); + bcs->hw.hscx.rcvidx = 0; + return; + } + ptr = bcs->hw.hscx.rcvbuf + bcs->hw.hscx.rcvidx; + bcs->hw.hscx.rcvidx += count; + READJADEFIFO(cs, bcs->hw.hscx.hscx, ptr, count); + WriteJADECMDR(cs, bcs->hw.hscx.hscx, jade_HDLC_RCMD, jadeRCMD_RMC); + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "jade_empty_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } static void jade_fill_fifo(struct BCState *bcs) { + struct IsdnCardState *cs = bcs->cs; int more, count; int fifo_size = 32; - unsigned char *p; + u_char *ptr; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "jade_fill_fifo"); - p = xmit_fill_fifo_b(bcs, fifo_size, &count, &more); - if (!p) + if (!bcs->tx_skb) + return; + if (bcs->tx_skb->len <= 0) return; - waitforXFW(bcs); - jade_write_fifo(bcs, p, count); - WriteJADECMDR(bcs, jade_HDLC_XCMD, - more ? jadeXCMD_XF : (jadeXCMD_XF|jadeXCMD_XME)); + more = (bcs->mode == L1_MODE_TRANS) ? 1 : 0; + if (bcs->tx_skb->len > fifo_size) { + more = !0; + count = fifo_size; + } else + count = bcs->tx_skb->len; + + waitforXFW(cs, bcs->hw.hscx.hscx); + ptr = bcs->tx_skb->data; + skb_pull(bcs->tx_skb, count); + bcs->tx_cnt -= count; + bcs->hw.hscx.count += count; + WRITEJADEFIFO(cs, bcs->hw.hscx.hscx, ptr, count); + WriteJADECMDR(cs, bcs->hw.hscx.hscx, jade_HDLC_XCMD, more ? jadeXCMD_XF : (jadeXCMD_XF|jadeXCMD_XME)); + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "jade_fill_fifo %c cnt %d", + bcs->hw.hscx.hscx ? 'B' : 'A', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } static inline void -jade_interrupt(struct IsdnCardState *cs, u8 val, u8 jade) +jade_interrupt(struct IsdnCardState *cs, u_char val, u_char jade) { - u8 r; + u_char r; struct BCState *bcs = cs->bcs + jade; + struct sk_buff *skb; int fifo_size = 32; int count; int i_jade = (int) jade; /* To satisfy the compiler */ @@ -78,7 +124,7 @@ return; if (val & 0x80) { /* RME */ - r = jade_read_reg(cs, i_jade, jade_HDLC_RSTA); + r = READJADE(cs, i_jade, jade_HDLC_RSTA); if ((r & 0xf0) != 0xa0) { if (!(r & 0x80)) if (cs->debug & L1_DEB_WARN) @@ -89,34 +135,72 @@ if (!(r & 0x20)) if (cs->debug & L1_DEB_WARN) debugl1(cs, "JADE %c CRC error", 'A'+jade); - WriteJADECMDR(bcs, jade_HDLC_RCMD, jadeRCMD_RMC); - bcs->rcvidx = 0; + WriteJADECMDR(cs, jade, jade_HDLC_RCMD, jadeRCMD_RMC); } else { - count = jade_read_reg(cs, i_jade, jade_HDLC_RBCL) & 0x1F; + count = READJADE(cs, i_jade, jade_HDLC_RBCL) & 0x1F; if (count == 0) count = fifo_size; - jade_empty_fifo(bcs, count); - recv_rme_b(bcs); + if ((count = bcs->hw.hscx.rcvidx - 1) > 0) { + if (cs->debug & L1_DEB_HSCX_FIFO) + debugl1(cs, "HX Frame %d", count); + if (!(skb = dev_alloc_skb(count))) + printk(KERN_WARNING "JADE %s receive out of memory\n", (jade ? "B":"A")); + else { + memcpy(skb_put(skb, count), bcs->hw.hscx.rcvbuf, count); + skb_queue_tail(&bcs->rqueue, skb); + } + } } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); } if (val & 0x40) { /* RPF */ jade_empty_fifo(bcs, fifo_size); - recv_rpf_b(bcs); + if (bcs->mode == L1_MODE_TRANS) { + /* receive audio data */ + if (!(skb = dev_alloc_skb(fifo_size))) + printk(KERN_WARNING "HiSax: receive out of memory\n"); + else { + memcpy(skb_put(skb, fifo_size), bcs->hw.hscx.rcvbuf, fifo_size); + skb_queue_tail(&bcs->rqueue, skb); + } + bcs->hw.hscx.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); + } } if (val & 0x10) { /* XPR */ - xmit_xpr_b(bcs); + if (bcs->tx_skb) { + if (bcs->tx_skb->len) { + jade_fill_fifo(bcs); + return; + } else { + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.hscx.count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_irq(bcs->tx_skb); + bcs->hw.hscx.count = 0; + bcs->tx_skb = NULL; + } + } + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + bcs->hw.hscx.count = 0; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + jade_fill_fifo(bcs); + } else { + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + schedule_event(bcs, B_XMTBUFREADY); + } } } -static void -reset_xmit(struct BCState *bcs) -{ - WriteJADECMDR(bcs, jade_HDLC_XCMD, jadeXCMD_XRES); -} - -void -jade_int_main(struct IsdnCardState *cs, u8 val, int jade) +static inline void +jade_int_main(struct IsdnCardState *cs, u_char val, int jade) { struct BCState *bcs; bcs = cs->bcs + jade; @@ -126,7 +210,23 @@ val &= ~jadeISR_RFO; } if (val & jadeISR_XDU) { - xmit_xdu_b(bcs, reset_xmit); + /* relevant in HDLC mode only */ + /* don't reset XPR here */ + if (bcs->mode == 1) + jade_fill_fifo(bcs); + else { + /* Here we lost an TX interrupt, so + * restart transmitting the whole frame. + */ + if (bcs->tx_skb) { + skb_push(bcs->tx_skb, bcs->hw.hscx.count); + bcs->tx_cnt += bcs->hw.hscx.count; + bcs->hw.hscx.count = 0; + } + WriteJADECMDR(cs, bcs->hw.hscx.hscx, jade_HDLC_XCMD, jadeXCMD_XRES); + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "JADE %c EXIR %x Lost TX", 'A'+jade, val); + } } if (val & (jadeISR_RME|jadeISR_RPF|jadeISR_XPR)) { if (cs->debug & L1_DEB_HSCX) diff -Nru a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c --- a/drivers/isdn/hisax/l3_1tr6.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/l3_1tr6.c Thu Feb 19 23:44:26 2004 @@ -1,4 +1,4 @@ -/* $Id: l3_1tr6.c,v 2.13.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: l3_1tr6.c,v 2.15.2.3 2004/01/13 14:31:25 keil Exp $ * * German 1TR6 D-channel protocol * @@ -19,7 +19,7 @@ #include extern char *HiSax_getrev(const char *revision); -const char *l3_1tr6_revision = "$Revision: 2.13.6.2 $"; +const char *l3_1tr6_revision = "$Revision: 2.15.2.3 $"; #define MsgHead(ptr, cref, mty, dis) \ *ptr++ = dis; \ @@ -28,10 +28,10 @@ *ptr++ = mty static void -l3_1TR6_message(struct l3_process *pc, u8 mt, u8 pd) +l3_1TR6_message(struct l3_process *pc, u_char mt, u_char pd) { struct sk_buff *skb; - u8 *p; + u_char *p; if (!(skb = l3_alloc_skb(4))) return; @@ -41,7 +41,7 @@ } static void -l3_1tr6_release_req(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_release_req(struct l3_process *pc, u_char pr, void *arg) { StopAllL3Timer(pc); newl3state(pc, 19); @@ -50,7 +50,7 @@ } static void -l3_1tr6_invalid(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_invalid(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; @@ -59,7 +59,7 @@ } static void -l3_1tr6_error(struct l3_process *pc, u8 *msg, struct sk_buff *skb) +l3_1tr6_error(struct l3_process *pc, u_char *msg, struct sk_buff *skb) { dev_kfree_skb(skb); if (pc->st->l3.debug & L3_DEB_WARN) @@ -68,14 +68,14 @@ } static void -l3_1tr6_setup_req(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_setup_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[128]; - u8 *p = tmp; - u8 *teln; - u8 *eaz; - u8 channel = 0; + u_char tmp[128]; + u_char *p = tmp; + u_char *teln; + u_char *eaz; + u_char channel = 0; int l; MsgHead(p, pc->callref, MT_N1_SETUP, PROTO_DIS_N1); @@ -157,9 +157,9 @@ } static void -l3_1tr6_setup(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; int bcfound = 0; char tmp[80]; struct sk_buff *skb = arg; @@ -222,15 +222,15 @@ l3_debug(pc->st, tmp); } newl3state(pc, 6); - L3L4(pc->st, CC_SETUP | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP | INDICATION, pc); } else release_l3_process(pc); } static void -l3_1tr6_setup_ack(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_setup_ack(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; struct sk_buff *skb = arg; L3DelTimer(&pc->timer); @@ -252,13 +252,13 @@ } dev_kfree_skb(skb); L3AddTimer(&pc->timer, T304, CC_T304); - L3L4(pc->st, CC_MORE_INFO | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_MORE_INFO | INDICATION, pc); } static void -l3_1tr6_call_sent(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_call_sent(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; struct sk_buff *skb = arg; L3DelTimer(&pc->timer); @@ -284,26 +284,25 @@ dev_kfree_skb(skb); L3AddTimer(&pc->timer, T310, CC_T310); newl3state(pc, 3); - L3L4(pc->st, CC_PROCEEDING | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_PROCEEDING | INDICATION, pc); } static void -l3_1tr6_alert(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_alert(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; dev_kfree_skb(skb); L3DelTimer(&pc->timer); /* T304 */ newl3state(pc, 4); - L3L4(pc->st, CC_ALERTING | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_ALERTING | INDICATION, pc); } static void -l3_1tr6_info(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; - u_int i; - int tmpcharge = 0; + u_char *p; + int i, tmpcharge = 0; char a_charge[8], tmp[32]; struct sk_buff *skb = arg; @@ -316,7 +315,7 @@ } if (tmpcharge > pc->para.chargeinfo) { pc->para.chargeinfo = tmpcharge; - L3L4(pc->st, CC_CHARGE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_CHARGE | INDICATION, pc); } if (pc->st->l3.debug & L3_DEB_CHARGE) { sprintf(tmp, "charging info %d", pc->para.chargeinfo); @@ -329,7 +328,7 @@ } static void -l3_1tr6_info_s2(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_info_s2(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; @@ -337,7 +336,7 @@ } static void -l3_1tr6_connect(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_connect(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; @@ -349,14 +348,14 @@ newl3state(pc, 10); dev_kfree_skb(skb); pc->para.chargeinfo = 0; - L3L4(pc->st, CC_SETUP | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP | CONFIRM, pc); } static void -l3_1tr6_rel(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_rel(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; - u8 *p; + u_char *p; p = skb->data; if ((p = findie(p, skb->len, WE0_cause, 0))) { @@ -379,12 +378,12 @@ StopAllL3Timer(pc); newl3state(pc, 0); l3_1TR6_message(pc, MT_N1_REL_ACK, PROTO_DIS_N1); - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); release_l3_process(pc); } static void -l3_1tr6_rel_ack(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_rel_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; @@ -392,17 +391,16 @@ StopAllL3Timer(pc); newl3state(pc, 0); pc->para.cause = NO_CAUSE; - L3L4(pc->st, CC_RELEASE | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | CONFIRM, pc); release_l3_process(pc); } static void -l3_1tr6_disc(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; - u8 *p; - u_int i; - int tmpcharge = 0; + u_char *p; + int i, tmpcharge = 0; char a_charge[8], tmp[32]; StopAllL3Timer(pc); @@ -415,7 +413,7 @@ } if (tmpcharge > pc->para.chargeinfo) { pc->para.chargeinfo = tmpcharge; - L3L4(pc->st, CC_CHARGE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_CHARGE | INDICATION, pc); } if (pc->st->l3.debug & L3_DEB_CHARGE) { sprintf(tmp, "charging info %d", pc->para.chargeinfo); @@ -448,12 +446,12 @@ } dev_kfree_skb(skb); newl3state(pc, 12); - L3L4(pc->st, CC_DISCONNECT | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_DISCONNECT | INDICATION, pc); } static void -l3_1tr6_connect_ack(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_connect_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; @@ -465,22 +463,22 @@ newl3state(pc, 10); pc->para.chargeinfo = 0; L3DelTimer(&pc->timer); - L3L4(pc->st, CC_SETUP_COMPL | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_COMPL | INDICATION, pc); } static void -l3_1tr6_alert_req(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_alert_req(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 7); l3_1TR6_message(pc, MT_N1_ALERT, PROTO_DIS_N1); } static void -l3_1tr6_setup_rsp(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_setup_rsp(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[24]; - u8 *p = tmp; + u_char tmp[24]; + u_char *p = tmp; int l; MsgHead(p, pc->callref, MT_N1_CONN, PROTO_DIS_N1); @@ -510,20 +508,20 @@ } static void -l3_1tr6_reset(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_reset(struct l3_process *pc, u_char pr, void *arg) { release_l3_process(pc); } static void -l3_1tr6_disconnect_req(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_disconnect_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; - u8 cause = 0x10; - u8 clen = 1; + u_char cause = 0x10; + u_char clen = 1; if (pc->para.cause > 0) cause = pc->para.cause; @@ -555,7 +553,7 @@ } static void -l3_1tr6_t303(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_t303(struct l3_process *pc, u_char pr, void *arg) { if (pc->N303 > 0) { pc->N303--; @@ -569,23 +567,23 @@ } static void -l3_1tr6_t304(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_t304(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.cause = 0xE6; l3_1tr6_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3_1tr6_t305(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_t305(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; - u8 cause = 0x90; - u8 clen = 1; + u_char cause = 0x90; + u_char clen = 1; L3DelTimer(&pc->timer); if (pc->para.cause != NO_CAUSE) @@ -614,25 +612,25 @@ } static void -l3_1tr6_t310(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_t310(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.cause = 0xE6; l3_1tr6_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3_1tr6_t313(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_t313(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.cause = 0xE6; l3_1tr6_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_CONNECT_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_CONNECT_ERR, pc); } static void -l3_1tr6_t308_1(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_t308_1(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); l3_1TR6_message(pc, MT_N1_REL, PROTO_DIS_N1); @@ -641,28 +639,28 @@ } static void -l3_1tr6_t308_2(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_t308_2(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RELEASE_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE_ERR, pc); release_l3_process(pc); } static void -l3_1tr6_dl_reset(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_dl_reset(struct l3_process *pc, u_char pr, void *arg) { pc->para.cause = CAUSE_LocalProcErr; l3_1tr6_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3_1tr6_dl_release(struct l3_process *pc, u8 pr, void *arg) +l3_1tr6_dl_release(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 0); pc->para.cause = 0x1b; /* Destination out of order */ pc->para.loc = 0; - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); release_l3_process(pc); } @@ -755,8 +753,7 @@ static void up1tr6(struct PStack *st, int pr, void *arg) { - u_int i; - int mt, cr; + int i, mt, cr; struct l3_process *proc; struct sk_buff *skb = arg; char tmp[80]; @@ -871,8 +868,7 @@ static void down1tr6(struct PStack *st, int pr, void *arg) { - u_int i; - int cr; + int i, cr; struct l3_process *proc; struct Channel *chan; char tmp[80]; @@ -919,7 +915,7 @@ static void man1tr6(struct PStack *st, int pr, void *arg) { - u_int i; + int i; struct l3_process *proc = arg; if (!proc) { @@ -949,8 +945,8 @@ { char tmp[64]; - st->l3.l4l3 = down1tr6; - st->l3.l2l3 = up1tr6; + st->lli.l4l3 = down1tr6; + st->l2.l2l3 = up1tr6; st->l3.l3ml3 = man1tr6; st->l3.N303 = 0; diff -Nru a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c --- a/drivers/isdn/hisax/l3dss1.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/l3dss1.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: l3dss1.c,v 2.30.6.2 2001/09/23 22:24:49 kai Exp $ +/* $Id: l3dss1.c,v 2.32.2.3 2004/01/13 14:31:25 keil Exp $ * * EURO/DSS1 D-channel protocol * @@ -26,8 +26,7 @@ #include extern char *HiSax_getrev(const char *revision); -const char *dss1_revision = "$Revision: 2.30.6.2 $"; -static spinlock_t l3dss1_lock = SPIN_LOCK_UNLOCKED; +const char *dss1_revision = "$Revision: 2.32.2.3 $"; #define EXT_BEARER_CAPS 1 @@ -49,13 +48,10 @@ static unsigned char new_invoke_id(struct PStack *p) { unsigned char retval; - unsigned long flags; int i; i = 32; /* maximum search depth */ - spin_lock_irqsave(&l3dss1_lock, flags); - retval = p->prot.dss1.last_invoke_id + 1; /* try new id */ while ((i) && (p->prot.dss1.invoke_used[retval >> 3] == 0xFF)) { p->prot.dss1.last_invoke_id = (retval & 0xF8) + 8; @@ -68,8 +64,6 @@ retval = 0; p->prot.dss1.last_invoke_id = retval; p->prot.dss1.invoke_used[retval >> 3] |= (1 << (retval & 7)); - spin_unlock_irqrestore(&l3dss1_lock, flags); - return(retval); } /* new_invoke_id */ @@ -77,13 +71,11 @@ /* free a used invoke id */ /*************************/ static void free_invoke_id(struct PStack *p, unsigned char id) -{ unsigned long flags; +{ if (!id) return; /* 0 = invalid value */ - spin_lock_irqsave(&l3dss1_lock, flags); p->prot.dss1.invoke_used[id >> 3] &= ~(1 << (id & 7)); - spin_unlock_irqrestore(&l3dss1_lock, flags); } /* free_invoke_id */ @@ -136,7 +128,7 @@ /* and a return result is delivered. id specifies the invoke id. */ /*******************************************************************/ static void -l3dss1_dummy_return_result(struct PStack *st, int id, u8 *p, u8 nlen) +l3dss1_dummy_return_result(struct PStack *st, int id, u_char *p, u_char nlen) { isdn_ctrl ic; struct IsdnCardState *cs; struct l3_process *pc = NULL; @@ -203,7 +195,7 @@ /*******************************************************************/ static void l3dss1_dummy_invoke(struct PStack *st, int cr, int id, - int ident, u8 *p, u8 nlen) + int ident, u_char *p, u_char nlen) { isdn_ctrl ic; struct IsdnCardState *cs; @@ -227,7 +219,7 @@ static void l3dss1_parse_facility(struct PStack *st, struct l3_process *pc, - int cr, u8 * p) + int cr, u_char * p) { int qd_len = 0; unsigned char nlen = 0, ilen, cp_tag; @@ -447,7 +439,7 @@ pc->prot.dss1.remote_result = 0; /* success */ pc->prot.dss1.invoke_id = 0; pc->redir_result = pc->prot.dss1.remote_result; - L3L4(st, CC_REDIR | INDICATION, pc); } /* Diversion successful */ + st->l3.l3l4(st, CC_REDIR | INDICATION, pc); } /* Diversion successful */ else l3_debug(st,"return error unknown identifier"); break; @@ -492,7 +484,7 @@ pc->prot.dss1.remote_result = err_ret; /* result */ pc->prot.dss1.invoke_id = 0; pc->redir_result = pc->prot.dss1.remote_result; - L3L4(st, CC_REDIR | INDICATION, pc); + st->l3.l3l4(st, CC_REDIR | INDICATION, pc); } /* Deflection error */ else l3_debug(st,"return result unknown identifier"); @@ -504,10 +496,10 @@ } static void -l3dss1_message(struct l3_process *pc, u8 mt) +l3dss1_message(struct l3_process *pc, u_char mt) { struct sk_buff *skb; - u8 *p; + u_char *p; if (!(skb = l3_alloc_skb(4))) return; @@ -517,11 +509,11 @@ } static void -l3dss1_message_cause(struct l3_process *pc, u8 mt, u8 cause) +l3dss1_message_cause(struct l3_process *pc, u_char mt, u_char cause) { struct sk_buff *skb; - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; MsgHead(p, pc->callref, mt); @@ -538,10 +530,10 @@ } static void -l3dss1_status_send(struct l3_process *pc, u8 pr, void *arg) +l3dss1_status_send(struct l3_process *pc, u_char pr, void *arg) { - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; struct sk_buff *skb; @@ -564,14 +556,14 @@ } static void -l3dss1_msg_without_setup(struct l3_process *pc, u8 pr, void *arg) +l3dss1_msg_without_setup(struct l3_process *pc, u_char pr, void *arg) { /* This routine is called if here was no SETUP made (checks in dss1up and in * l3dss1_setup) and a RELEASE_COMPLETE have to be sent with an error code * MT_STATUS_ENQUIRE in the NULL state is handled too */ - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; struct sk_buff *skb; @@ -690,7 +682,7 @@ }; static int -getmax_ie_len(u8 ie) { +getmax_ie_len(u_char ie) { int i = 0; while (max_ie_len[i].ie != -1) { if (max_ie_len[i].ie == ie) @@ -701,7 +693,7 @@ } static int -ie_in_set(struct l3_process *pc, u8 ie, int *checklist) { +ie_in_set(struct l3_process *pc, u_char ie, int *checklist) { int ret = 1; while (*checklist != -1) { @@ -721,13 +713,13 @@ check_infoelements(struct l3_process *pc, struct sk_buff *skb, int *checklist) { int *cl = checklist; - u8 mt; - u8 *p, ie; + u_char mt; + u_char *p, ie; int l, newpos, oldpos; int err_seq = 0, err_len = 0, err_compr = 0, err_ureg = 0; - u8 codeset = 0; - u8 old_codeset = 0; - u8 codelock = 1; + u_char codeset = 0; + u_char old_codeset = 0; + u_char codelock = 1; p = skb->data; /* skip cr */ @@ -736,7 +728,7 @@ p += l; mt = *p++; oldpos = 0; - while ((p - skb->data) < (int)skb->len) { + while ((p - skb->data) < skb->len) { if ((*p & 0xf0) == 0x90) { /* shift codeset */ old_codeset = codeset; codeset = *p & 7; @@ -870,7 +862,7 @@ static int l3dss1_get_channel_id(struct l3_process *pc, struct sk_buff *skb) { - u8 *p; + u_char *p; p = skb->data; if ((p = findie(p, skb->len, IE_CHANNEL_ID, 0))) { @@ -893,8 +885,8 @@ static int l3dss1_get_cause(struct l3_process *pc, struct sk_buff *skb) { - u8 l, i=0; - u8 *p; + u_char l, i=0; + u_char *p; p = skb->data; pc->para.cause = 31; @@ -931,11 +923,11 @@ } static void -l3dss1_msg_with_uus(struct l3_process *pc, u8 cmd) +l3dss1_msg_with_uus(struct l3_process *pc, u_char cmd) { struct sk_buff *skb; - u8 tmp[16+40]; - u8 *p = tmp; + u_char tmp[16+40]; + u_char *p = tmp; int l; MsgHead(p, pc->callref, cmd); @@ -957,7 +949,7 @@ } /* l3dss1_msg_with_uus */ static void -l3dss1_release_req(struct l3_process *pc, u8 pr, void *arg) +l3dss1_release_req(struct l3_process *pc, u_char pr, void *arg) { StopAllL3Timer(pc); newl3state(pc, 19); @@ -969,7 +961,7 @@ } static void -l3dss1_release_cmpl(struct l3_process *pc, u8 pr, void *arg) +l3dss1_release_cmpl(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -981,14 +973,14 @@ pc->para.cause = NO_CAUSE; StopAllL3Timer(pc); newl3state(pc, 0); - L3L4(pc->st, CC_RELEASE | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | CONFIRM, pc); dss1_release_l3_process(pc); } #if EXT_BEARER_CAPS -static u8 * -EncodeASyncParams(u8 * p, u8 si2) +static u_char * +EncodeASyncParams(u_char * p, u_char si2) { // 7c 06 88 90 21 42 00 bb p[0] = 0; @@ -1052,8 +1044,8 @@ return p + 3; } -static u8 -EncodeSyncParams(u8 si2, u8 ai) +static u_char +EncodeSyncParams(u_char si2, u_char ai) { switch (si2) { @@ -1097,10 +1089,10 @@ } -static u8 -DecodeASyncParams(u8 si2, u8 * p) +static u_char +DecodeASyncParams(u_char si2, u_char * p) { - u8 info; + u_char info; switch (p[5]) { case 66: // 1200 bit/s @@ -1154,8 +1146,8 @@ } -static u8 -DecodeSyncParams(u8 si2, u8 info) +static u_char +DecodeSyncParams(u_char si2, u_char info) { info &= 0x7f; switch (info) { @@ -1195,10 +1187,10 @@ } } -static u8 +static u_char DecodeSI2(struct sk_buff *skb) { - u8 *p; //, *pend=skb->data + skb->len; + u_char *p; //, *pend=skb->data + skb->len; if ((p = findie(skb->data, skb->len, 0x7c, 0))) { switch (p[4] & 0x0f) { @@ -1225,20 +1217,20 @@ static void -l3dss1_setup_req(struct l3_process *pc, u8 pr, +l3dss1_setup_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[128]; - u8 *p = tmp; - u8 channel = 0; - - u8 send_keypad; - u8 screen = 0x80; - u8 *teln; - u8 *msn; - u8 *sub; - u8 *sp; + u_char tmp[128]; + u_char *p = tmp; + u_char channel = 0; + + u_char send_keypad; + u_char screen = 0x80; + u_char *teln; + u_char *msn; + u_char *sub; + u_char *sp; int l; MsgHead(p, pc->callref, MT_SETUP); @@ -1436,7 +1428,7 @@ } static void -l3dss1_call_proc(struct l3_process *pc, u8 pr, void *arg) +l3dss1_call_proc(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int id, ret; @@ -1471,11 +1463,11 @@ L3AddTimer(&pc->timer, T310, CC_T310); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3dss1_std_ie_err(pc, ret); - L3L4(pc->st, CC_PROCEEDING | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_PROCEEDING | INDICATION, pc); } static void -l3dss1_setup_ack(struct l3_process *pc, u8 pr, void *arg) +l3dss1_setup_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int id, ret; @@ -1510,16 +1502,16 @@ L3AddTimer(&pc->timer, T304, CC_T304); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3dss1_std_ie_err(pc, ret); - L3L4(pc->st, CC_MORE_INFO | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_MORE_INFO | INDICATION, pc); } static void -l3dss1_disconnect(struct l3_process *pc, u8 pr, void *arg) +l3dss1_disconnect(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; - u8 *p; + u_char *p; int ret; - u8 cause = 0; + u_char cause = 0; StopAllL3Timer(pc); if ((ret = l3dss1_get_cause(pc, skb))) { @@ -1542,7 +1534,7 @@ if (cause) newl3state(pc, 19); if (11 != ret) - L3L4(pc->st, CC_DISCONNECT | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_DISCONNECT | INDICATION, pc); else if (!cause) l3dss1_release_req(pc, pr, NULL); if (cause) { @@ -1552,7 +1544,7 @@ } static void -l3dss1_connect(struct l3_process *pc, u8 pr, void *arg) +l3dss1_connect(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -1568,11 +1560,11 @@ /* here should inserted COLP handling KKe */ if (ret) l3dss1_std_ie_err(pc, ret); - L3L4(pc->st, CC_SETUP | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP | CONFIRM, pc); } static void -l3dss1_alerting(struct l3_process *pc, u8 pr, void *arg) +l3dss1_alerting(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -1586,13 +1578,13 @@ newl3state(pc, 4); if (ret) l3dss1_std_ie_err(pc, ret); - L3L4(pc->st, CC_ALERTING | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_ALERTING | INDICATION, pc); } static void -l3dss1_setup(struct l3_process *pc, u8 pr, void *arg) +l3dss1_setup(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; int bcfound = 0; char tmp[80]; struct sk_buff *skb = arg; @@ -1603,7 +1595,7 @@ * Bearer Capabilities */ p = skb->data; - /* only the first occurrence 'll be detected ! */ + /* only the first occurence 'll be detected ! */ if ((p = findie(p, skb->len, 0x04, 0))) { if ((p[1] < 2) || (p[1] > 11)) err = 1; @@ -1752,23 +1744,23 @@ newl3state(pc, 6); if (err) /* STATUS for none mandatory IE errors after actions are taken */ l3dss1_std_ie_err(pc, err); - L3L4(pc->st, CC_SETUP | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP | INDICATION, pc); } static void -l3dss1_reset(struct l3_process *pc, u8 pr, void *arg) +l3dss1_reset(struct l3_process *pc, u_char pr, void *arg) { dss1_release_l3_process(pc); } static void -l3dss1_disconnect_req(struct l3_process *pc, u8 pr, void *arg) +l3dss1_disconnect_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[16+40]; - u8 *p = tmp; + u_char tmp[16+40]; + u_char *p = tmp; int l; - u8 cause = 16; + u_char cause = 16; if (pc->para.cause != NO_CAUSE) cause = pc->para.cause; @@ -1801,7 +1793,7 @@ } static void -l3dss1_setup_rsp(struct l3_process *pc, u8 pr, +l3dss1_setup_rsp(struct l3_process *pc, u_char pr, void *arg) { if (!pc->para.bchannel) @@ -1817,7 +1809,7 @@ } static void -l3dss1_connect_ack(struct l3_process *pc, u8 pr, void *arg) +l3dss1_connect_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -1831,17 +1823,17 @@ L3DelTimer(&pc->timer); if (ret) l3dss1_std_ie_err(pc, ret); - L3L4(pc->st, CC_SETUP_COMPL | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_COMPL | INDICATION, pc); } static void -l3dss1_reject_req(struct l3_process *pc, u8 pr, void *arg) +l3dss1_reject_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; - u8 cause = 21; + u_char cause = 21; if (pc->para.cause != NO_CAUSE) cause = pc->para.cause; @@ -1858,16 +1850,16 @@ return; memcpy(skb_put(skb, l), tmp, l); l3_msg(pc->st, DL_DATA | REQUEST, skb); - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); dss1_release_l3_process(pc); } static void -l3dss1_release(struct l3_process *pc, u8 pr, void *arg) +l3dss1_release(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; - u8 *p; + u_char *p; int ret, cause=0; StopAllL3Timer(pc); @@ -1892,13 +1884,13 @@ l3dss1_message_cause(pc, MT_RELEASE_COMPLETE, cause); else l3dss1_message(pc, MT_RELEASE_COMPLETE); - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); dss1_release_l3_process(pc); } static void -l3dss1_alert_req(struct l3_process *pc, u8 pr, +l3dss1_alert_req(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 7); @@ -1909,16 +1901,16 @@ } static void -l3dss1_proceed_req(struct l3_process *pc, u8 pr, +l3dss1_proceed_req(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 9); l3dss1_message(pc, MT_CALL_PROCEEDING); - L3L4(pc->st, CC_PROCEED_SEND | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_PROCEED_SEND | INDICATION, pc); } static void -l3dss1_setup_ack_req(struct l3_process *pc, u8 pr, +l3dss1_setup_ack_req(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 25); @@ -1931,8 +1923,8 @@ /* deliver a incoming display message to HL */ /********************************************/ static void -l3dss1_deliver_display(struct l3_process *pc, int pr, u8 *infp) -{ u8 len; +l3dss1_deliver_display(struct l3_process *pc, int pr, u_char *infp) +{ u_char len; isdn_ctrl ic; struct IsdnCardState *cs; char *p; @@ -1954,11 +1946,11 @@ static void -l3dss1_progress(struct l3_process *pc, u8 pr, void *arg) +l3dss1_progress(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int err = 0; - u8 *p; + u_char *p; if ((p = findie(skb->data, skb->len, IE_PROGRESS, 0))) { if (p[1] != 2) { @@ -2007,15 +1999,15 @@ if (err) l3dss1_std_ie_err(pc, err); if (ERR_IE_COMPREHENSION != err) - L3L4(pc->st, CC_PROGRESS | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_PROGRESS | INDICATION, pc); } static void -l3dss1_notify(struct l3_process *pc, u8 pr, void *arg) +l3dss1_notify(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int err = 0; - u8 *p; + u_char *p; if ((p = findie(skb->data, skb->len, IE_NOTIFY, 0))) { if (p[1] != 1) { @@ -2048,11 +2040,11 @@ if (err) l3dss1_std_ie_err(pc, err); if (ERR_IE_COMPREHENSION != err) - L3L4(pc->st, CC_NOTIFY | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_NOTIFY | INDICATION, pc); } static void -l3dss1_status_enq(struct l3_process *pc, u8 pr, void *arg) +l3dss1_status_enq(struct l3_process *pc, u_char pr, void *arg) { int ret; struct sk_buff *skb = arg; @@ -2064,11 +2056,11 @@ } static void -l3dss1_information(struct l3_process *pc, u8 pr, void *arg) +l3dss1_information(struct l3_process *pc, u_char pr, void *arg) { int ret; struct sk_buff *skb = arg; - u8 *p; + u_char *p; char tmp[32]; ret = check_infoelements(pc, skb, ie_INFORMATION); @@ -2080,7 +2072,7 @@ if ((p = findie(p, skb->len, 0x70, 0))) { iecpy(tmp, p, 1); strcat(pc->para.setup.eazmsn, tmp); - L3L4(pc->st, CC_MORE_INFO | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_MORE_INFO | INDICATION, pc); } L3AddTimer(&pc->timer, T302, CC_T302); } @@ -2089,14 +2081,14 @@ /******************************/ /* handle deflection requests */ /******************************/ -static void l3dss1_redir_req(struct l3_process *pc, u8 pr, void *arg) +static void l3dss1_redir_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[128]; - u8 *p = tmp; - u8 *subp; - u8 len_phone = 0; - u8 len_sub = 0; + u_char tmp[128]; + u_char *p = tmp; + u_char *subp; + u_char len_phone = 0; + u_char len_sub = 0; int l; @@ -2161,7 +2153,7 @@ /********************************************/ /* handle deflection request in early state */ /********************************************/ -static void l3dss1_redir_req_early(struct l3_process *pc, u8 pr, void *arg) +static void l3dss1_redir_req_early(struct l3_process *pc, u_char pr, void *arg) { l3dss1_proceed_req(pc,pr,arg); l3dss1_redir_req(pc,pr,arg); @@ -2169,13 +2161,13 @@ /***********************************************/ /* handle special commands for this protocol. */ -/* Examples are call independent services like */ +/* Examples are call independant services like */ /* remote operations with dummy callref. */ /***********************************************/ static int l3dss1_cmd_global(struct PStack *st, isdn_ctrl *ic) -{ u8 id; - u8 temp[265]; - u8 *p = temp; +{ u_char id; + u_char temp[265]; + u_char *p = temp; int i, l, proc_len; struct sk_buff *skb; struct l3_process *pc = NULL; @@ -2279,9 +2271,9 @@ } /* l3dss1_io_timer */ static void -l3dss1_release_ind(struct l3_process *pc, u8 pr, void *arg) +l3dss1_release_ind(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; struct sk_buff *skb = arg; int callState = 0; p = skb->data; @@ -2295,31 +2287,31 @@ /* ETS 300-104 7.6.1, 8.6.1, 10.6.1... and 16.1 * set down layer 3 without sending any message */ - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); dss1_release_l3_process(pc); } else { - L3L4(pc->st, CC_IGNORE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_IGNORE | INDICATION, pc); } } static void -l3dss1_dummy(struct l3_process *pc, u8 pr, void *arg) +l3dss1_dummy(struct l3_process *pc, u_char pr, void *arg) { } static void -l3dss1_t302(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t302(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 28; /* invalid number */ l3dss1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3dss1_t303(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t303(struct l3_process *pc, u_char pr, void *arg) { if (pc->N303 > 0) { pc->N303--; @@ -2328,30 +2320,30 @@ } else { L3DelTimer(&pc->timer); l3dss1_message_cause(pc, MT_RELEASE_COMPLETE, 102); - L3L4(pc->st, CC_NOSETUP_RSP, pc); + pc->st->l3.l3l4(pc->st, CC_NOSETUP_RSP, pc); dss1_release_l3_process(pc); } } static void -l3dss1_t304(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t304(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 102; l3dss1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3dss1_t305(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t305(struct l3_process *pc, u_char pr, void *arg) { - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; struct sk_buff *skb; - u8 cause = 16; + u_char cause = 16; L3DelTimer(&pc->timer); if (pc->para.cause != NO_CAUSE) @@ -2374,27 +2366,27 @@ } static void -l3dss1_t310(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t310(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 102; l3dss1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3dss1_t313(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t313(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 102; l3dss1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_CONNECT_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_CONNECT_ERR, pc); } static void -l3dss1_t308_1(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t308_1(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 19); L3DelTimer(&pc->timer); @@ -2403,50 +2395,50 @@ } static void -l3dss1_t308_2(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t308_2(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RELEASE_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE_ERR, pc); dss1_release_l3_process(pc); } static void -l3dss1_t318(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t318(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.cause = 102; /* Timer expiry */ pc->para.loc = 0; /* local */ - L3L4(pc->st, CC_RESUME_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_RESUME_ERR, pc); newl3state(pc, 19); l3dss1_message(pc, MT_RELEASE); L3AddTimer(&pc->timer, T308, CC_T308_1); } static void -l3dss1_t319(struct l3_process *pc, u8 pr, void *arg) +l3dss1_t319(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.cause = 102; /* Timer expiry */ pc->para.loc = 0; /* local */ - L3L4(pc->st, CC_SUSPEND_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SUSPEND_ERR, pc); newl3state(pc, 10); } static void -l3dss1_restart(struct l3_process *pc, u8 pr, void *arg) +l3dss1_restart(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); dss1_release_l3_process(pc); } static void -l3dss1_status(struct l3_process *pc, u8 pr, void *arg) +l3dss1_status(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; struct sk_buff *skb = arg; int ret; - u8 cause = 0, callState = 0; + u_char cause = 0, callState = 0; if ((ret = l3dss1_get_cause(pc, skb))) { if (pc->debug & L3_DEB_WARN) @@ -2474,7 +2466,7 @@ cause = 99; } if (cause) { - u8 tmp; + u_char tmp; if (pc->debug & L3_DEB_WARN) l3_debug(pc->st, "STATUS error(%d/%d)",ret,cause); @@ -2492,14 +2484,14 @@ * if received MT_STATUS with cause == 111 and call * state == 0, then we must set down layer 3 */ - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); dss1_release_l3_process(pc); } } static void -l3dss1_facility(struct l3_process *pc, u8 pr, void *arg) +l3dss1_facility(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2507,20 +2499,20 @@ ret = check_infoelements(pc, skb, ie_FACILITY); l3dss1_std_ie_err(pc, ret); { - u8 *p; + u_char *p; if ((p = findie(skb->data, skb->len, IE_FACILITY, 0))) l3dss1_parse_facility(pc->st, pc, pc->callref, p); } } static void -l3dss1_suspend_req(struct l3_process *pc, u8 pr, void *arg) +l3dss1_suspend_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[32]; - u8 *p = tmp; - u8 i, l; - u8 *msg = pc->chan->setup.phone; + u_char tmp[32]; + u_char *p = tmp; + u_char i, l; + u_char *msg = pc->chan->setup.phone; MsgHead(p, pc->callref, MT_SUSPEND); l = *msg++; @@ -2543,7 +2535,7 @@ } static void -l3dss1_suspend_ack(struct l3_process *pc, u8 pr, void *arg) +l3dss1_suspend_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2551,7 +2543,7 @@ L3DelTimer(&pc->timer); newl3state(pc, 0); pc->para.cause = NO_CAUSE; - L3L4(pc->st, CC_SUSPEND | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_SUSPEND | CONFIRM, pc); /* We don't handle suspend_ack for IE errors now */ if ((ret = check_infoelements(pc, skb, ie_SUSPEND_ACKNOWLEDGE))) if (pc->debug & L3_DEB_WARN) @@ -2560,7 +2552,7 @@ } static void -l3dss1_suspend_rej(struct l3_process *pc, u8 pr, void *arg) +l3dss1_suspend_rej(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2581,20 +2573,20 @@ return; } L3DelTimer(&pc->timer); - L3L4(pc->st, CC_SUSPEND_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SUSPEND_ERR, pc); newl3state(pc, 10); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3dss1_std_ie_err(pc, ret); } static void -l3dss1_resume_req(struct l3_process *pc, u8 pr, void *arg) +l3dss1_resume_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[32]; - u8 *p = tmp; - u8 i, l; - u8 *msg = pc->para.setup.phone; + u_char tmp[32]; + u_char *p = tmp; + u_char i, l; + u_char *msg = pc->para.setup.phone; MsgHead(p, pc->callref, MT_RESUME); @@ -2618,7 +2610,7 @@ } static void -l3dss1_resume_ack(struct l3_process *pc, u8 pr, void *arg) +l3dss1_resume_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int id, ret; @@ -2645,14 +2637,14 @@ return; } L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RESUME | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_RESUME | CONFIRM, pc); newl3state(pc, 10); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3dss1_std_ie_err(pc, ret); } static void -l3dss1_resume_rej(struct l3_process *pc, u8 pr, void *arg) +l3dss1_resume_rej(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2673,7 +2665,7 @@ return; } L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RESUME_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_RESUME_ERR, pc); newl3state(pc, 0); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3dss1_std_ie_err(pc, ret); @@ -2681,11 +2673,11 @@ } static void -l3dss1_global_restart(struct l3_process *pc, u8 pr, void *arg) +l3dss1_global_restart(struct l3_process *pc, u_char pr, void *arg) { - u8 tmp[32]; - u8 *p; - u8 ri, ch = 0, chan = 0; + u_char tmp[32]; + u_char *p; + u_char ri, ch = 0, chan = 0; int l; struct sk_buff *skb = arg; struct l3_process *up; @@ -2711,9 +2703,9 @@ up = pc->st->l3.proc; while (up) { if ((ri & 7) == 7) - L4L3(up->st, CC_RESTART | REQUEST, up); + up->st->lli.l4l3(up->st, CC_RESTART | REQUEST, up); else if (up->para.bchannel == chan) - L4L3(up->st, CC_RESTART | REQUEST, up); + up->st->lli.l4l3(up->st, CC_RESTART | REQUEST, up); up = up->next; } p = tmp; @@ -2735,26 +2727,26 @@ } static void -l3dss1_dl_reset(struct l3_process *pc, u8 pr, void *arg) +l3dss1_dl_reset(struct l3_process *pc, u_char pr, void *arg) { pc->para.cause = 0x29; /* Temporary failure */ pc->para.loc = 0; l3dss1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3dss1_dl_release(struct l3_process *pc, u8 pr, void *arg) +l3dss1_dl_release(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 0); pc->para.cause = 0x1b; /* Destination out of order */ pc->para.loc = 0; - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); release_l3_process(pc); } static void -l3dss1_dl_reestablish(struct l3_process *pc, u8 pr, void *arg) +l3dss1_dl_reestablish(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); L3AddTimer(&pc->timer, T309, CC_T309); @@ -2762,7 +2754,7 @@ } static void -l3dss1_dl_reest_status(struct l3_process *pc, u8 pr, void *arg) +l3dss1_dl_reest_status(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); @@ -2920,10 +2912,10 @@ static void global_handler(struct PStack *st, int mt, struct sk_buff *skb) { - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; - u_int i; + int i; struct l3_process *proc = st->l3.global; proc->callref = skb->data[2]; /* cr flag */ @@ -2961,10 +2953,9 @@ static void dss1up(struct PStack *st, int pr, void *arg) { - u_int i; - int mt, cr, cause, callState; + int i, mt, cr, cause, callState; char *ptr; - u8 *p; + u_char *p; struct sk_buff *skb = arg; struct l3_process *proc; @@ -2999,7 +2990,7 @@ return; } cr = getcallref(skb->data); - if (skb->len < (u_int)((skb->data[1] & 0x0f) + 3)) { + if (skb->len < ((skb->data[1] & 0x0f) + 3)) { l3_debug(st, "dss1up frame too short(%d)", skb->len); dev_kfree_skb(skb); return; @@ -3136,8 +3127,7 @@ static void dss1down(struct PStack *st, int pr, void *arg) { - u_int i; - int cr; + int i, cr; struct l3_process *proc; struct Channel *chan; @@ -3188,29 +3178,29 @@ static void dss1man(struct PStack *st, int pr, void *arg) { - u_int i; - struct l3_process *proc = arg; - - if (!proc) { - printk(KERN_ERR "HiSax dss1man without proc pr=%04x\n", pr); - return; - } - for (i = 0; i < MANSLLEN; i++) + int i; + struct l3_process *proc = arg; + + if (!proc) { + printk(KERN_ERR "HiSax dss1man without proc pr=%04x\n", pr); + return; + } + for (i = 0; i < MANSLLEN; i++) if ((pr == manstatelist[i].primitive) && - ((1 << proc->state) & manstatelist[i].state)) - break; - if (i == MANSLLEN) { - if (st->l3.debug & L3_DEB_STATE) { - l3_debug(st, "cr %d dss1man state %d prim %#x unhandled", - proc->callref & 0x7f, proc->state, pr); - } - } else { - if (st->l3.debug & L3_DEB_STATE) { - l3_debug(st, "cr %d dss1man state %d prim %#x", - proc->callref & 0x7f, proc->state, pr); - } - manstatelist[i].rout(proc, pr, arg); - } + ((1 << proc->state) & manstatelist[i].state)) + break; + if (i == MANSLLEN) { + if (st->l3.debug & L3_DEB_STATE) { + l3_debug(st, "cr %d dss1man state %d prim %#x unhandled", + proc->callref & 0x7f, proc->state, pr); + } + } else { + if (st->l3.debug & L3_DEB_STATE) { + l3_debug(st, "cr %d dss1man state %d prim %#x", + proc->callref & 0x7f, proc->state, pr); + } + manstatelist[i].rout(proc, pr, arg); + } } void @@ -3219,9 +3209,9 @@ char tmp[64]; int i; - st->l3.l4l3 = dss1down; - st->l3.l4l3_proto = l3dss1_cmd_global; - st->l3.l2l3 = dss1up; + st->lli.l4l3 = dss1down; + st->lli.l4l3_proto = l3dss1_cmd_global; + st->l2.l2l3 = dss1up; st->l3.l3ml3 = dss1man; st->l3.N303 = 1; st->prot.dss1.last_invoke_id = 0; diff -Nru a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c --- a/drivers/isdn/hisax/l3ni1.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/l3ni1.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: l3ni1.c,v 2.5.6.3 2001/09/23 22:24:50 kai Exp $ +/* $Id: l3ni1.c,v 2.8.2.3 2004/01/13 14:31:25 keil Exp $ * * NI1 D-channel protocol * @@ -24,8 +24,7 @@ #include extern char *HiSax_getrev(const char *revision); -const char *ni1_revision = "$Revision: 2.5.6.3 $"; -static spinlock_t l3ni1_lock = SPIN_LOCK_UNLOCKED; +const char *ni1_revision = "$Revision: 2.8.2.3 $"; #define EXT_BEARER_CAPS 1 @@ -47,13 +46,10 @@ static unsigned char new_invoke_id(struct PStack *p) { unsigned char retval; - unsigned long flags; int i; i = 32; /* maximum search depth */ - spin_lock_irqsave(&l3ni1_lock, flags); - retval = p->prot.ni1.last_invoke_id + 1; /* try new id */ while ((i) && (p->prot.ni1.invoke_used[retval >> 3] == 0xFF)) { p->prot.ni1.last_invoke_id = (retval & 0xF8) + 8; @@ -66,8 +62,6 @@ retval = 0; p->prot.ni1.last_invoke_id = retval; p->prot.ni1.invoke_used[retval >> 3] |= (1 << (retval & 7)); - spin_unlock_irqrestore(&l3ni1_lock, flags); - return(retval); } /* new_invoke_id */ @@ -75,13 +69,11 @@ /* free a used invoke id */ /*************************/ static void free_invoke_id(struct PStack *p, unsigned char id) -{ unsigned long flags; +{ if (!id) return; /* 0 = invalid value */ - spin_lock_irqsave(&l3ni1_lock, flags); p->prot.ni1.invoke_used[id >> 3] &= ~(1 << (id & 7)); - spin_unlock_irqrestore(&l3ni1_lock, flags); } /* free_invoke_id */ @@ -134,7 +126,7 @@ /* and a return result is delivered. id specifies the invoke id. */ /*******************************************************************/ static void -l3ni1_dummy_return_result(struct PStack *st, int id, u8 *p, u8 nlen) +l3ni1_dummy_return_result(struct PStack *st, int id, u_char *p, u_char nlen) { isdn_ctrl ic; struct IsdnCardState *cs; struct l3_process *pc = NULL; @@ -201,7 +193,7 @@ /*******************************************************************/ static void l3ni1_dummy_invoke(struct PStack *st, int cr, int id, - int ident, u8 *p, u8 nlen) + int ident, u_char *p, u_char nlen) { isdn_ctrl ic; struct IsdnCardState *cs; @@ -225,7 +217,7 @@ static void l3ni1_parse_facility(struct PStack *st, struct l3_process *pc, - int cr, u8 * p) + int cr, u_char * p) { int qd_len = 0; unsigned char nlen = 0, ilen, cp_tag; @@ -375,7 +367,7 @@ pc->prot.ni1.remote_result = 0; /* success */ pc->prot.ni1.invoke_id = 0; pc->redir_result = pc->prot.ni1.remote_result; - L3L4(st, CC_REDIR | INDICATION, pc); } /* Diversion successful */ + st->l3.l3l4(st, CC_REDIR | INDICATION, pc); } /* Diversion successful */ else l3_debug(st,"return error unknown identifier"); break; @@ -420,7 +412,7 @@ pc->prot.ni1.remote_result = err_ret; /* result */ pc->prot.ni1.invoke_id = 0; pc->redir_result = pc->prot.ni1.remote_result; - L3L4(st, CC_REDIR | INDICATION, pc); + st->l3.l3l4(st, CC_REDIR | INDICATION, pc); } /* Deflection error */ else l3_debug(st,"return result unknown identifier"); @@ -432,10 +424,10 @@ } static void -l3ni1_message(struct l3_process *pc, u8 mt) +l3ni1_message(struct l3_process *pc, u_char mt) { struct sk_buff *skb; - u8 *p; + u_char *p; if (!(skb = l3_alloc_skb(4))) return; @@ -445,15 +437,15 @@ } static void -l3ni1_message_plus_chid(struct l3_process *pc, u8 mt) +l3ni1_message_plus_chid(struct l3_process *pc, u_char mt) /* sends an l3 messages plus channel id - added GE 05/09/00 */ { struct sk_buff *skb; - u8 tmp[16]; - u8 *p = tmp; - u8 chid; + u_char tmp[16]; + u_char *p = tmp; + u_char chid; - chid = (u8)(pc->para.bchannel & 0x03) | 0x88; + chid = (u_char)(pc->para.bchannel & 0x03) | 0x88; MsgHead(p, pc->callref, mt); *p++ = IE_CHANNEL_ID; *p++ = 0x01; @@ -466,11 +458,11 @@ } static void -l3ni1_message_cause(struct l3_process *pc, u8 mt, u8 cause) +l3ni1_message_cause(struct l3_process *pc, u_char mt, u_char cause) { struct sk_buff *skb; - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; MsgHead(p, pc->callref, mt); @@ -487,10 +479,10 @@ } static void -l3ni1_status_send(struct l3_process *pc, u8 pr, void *arg) +l3ni1_status_send(struct l3_process *pc, u_char pr, void *arg) { - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; struct sk_buff *skb; @@ -513,14 +505,14 @@ } static void -l3ni1_msg_without_setup(struct l3_process *pc, u8 pr, void *arg) +l3ni1_msg_without_setup(struct l3_process *pc, u_char pr, void *arg) { /* This routine is called if here was no SETUP made (checks in ni1up and in * l3ni1_setup) and a RELEASE_COMPLETE have to be sent with an error code * MT_STATUS_ENQUIRE in the NULL state is handled too */ - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; struct sk_buff *skb; @@ -639,7 +631,7 @@ }; static int -getmax_ie_len(u8 ie) { +getmax_ie_len(u_char ie) { int i = 0; while (max_ie_len[i].ie != -1) { if (max_ie_len[i].ie == ie) @@ -650,7 +642,7 @@ } static int -ie_in_set(struct l3_process *pc, u8 ie, int *checklist) { +ie_in_set(struct l3_process *pc, u_char ie, int *checklist) { int ret = 1; while (*checklist != -1) { @@ -670,13 +662,13 @@ check_infoelements(struct l3_process *pc, struct sk_buff *skb, int *checklist) { int *cl = checklist; - u8 mt; - u8 *p, ie; + u_char mt; + u_char *p, ie; int l, newpos, oldpos; int err_seq = 0, err_len = 0, err_compr = 0, err_ureg = 0; - u8 codeset = 0; - u8 old_codeset = 0; - u8 codelock = 1; + u_char codeset = 0; + u_char old_codeset = 0; + u_char codelock = 1; p = skb->data; /* skip cr */ @@ -685,7 +677,7 @@ p += l; mt = *p++; oldpos = 0; - while ((u_int)(p - skb->data) < skb->len) { + while ((p - skb->data) < skb->len) { if ((*p & 0xf0) == 0x90) { /* shift codeset */ old_codeset = codeset; codeset = *p & 7; @@ -819,7 +811,7 @@ static int l3ni1_get_channel_id(struct l3_process *pc, struct sk_buff *skb) { - u8 *p; + u_char *p; p = skb->data; if ((p = findie(p, skb->len, IE_CHANNEL_ID, 0))) { @@ -842,8 +834,8 @@ static int l3ni1_get_cause(struct l3_process *pc, struct sk_buff *skb) { - u8 l, i=0; - u8 *p; + u_char l, i=0; + u_char *p; p = skb->data; pc->para.cause = 31; @@ -880,11 +872,11 @@ } static void -l3ni1_msg_with_uus(struct l3_process *pc, u8 cmd) +l3ni1_msg_with_uus(struct l3_process *pc, u_char cmd) { struct sk_buff *skb; - u8 tmp[16+40]; - u8 *p = tmp; + u_char tmp[16+40]; + u_char *p = tmp; int l; MsgHead(p, pc->callref, cmd); @@ -906,7 +898,7 @@ } /* l3ni1_msg_with_uus */ static void -l3ni1_release_req(struct l3_process *pc, u8 pr, void *arg) +l3ni1_release_req(struct l3_process *pc, u_char pr, void *arg) { StopAllL3Timer(pc); newl3state(pc, 19); @@ -918,7 +910,7 @@ } static void -l3ni1_release_cmpl(struct l3_process *pc, u8 pr, void *arg) +l3ni1_release_cmpl(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -930,14 +922,14 @@ pc->para.cause = NO_CAUSE; StopAllL3Timer(pc); newl3state(pc, 0); - L3L4(pc->st, CC_RELEASE | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | CONFIRM, pc); ni1_release_l3_process(pc); } #if EXT_BEARER_CAPS -static u8 * -EncodeASyncParams(u8 * p, u8 si2) +static u_char * +EncodeASyncParams(u_char * p, u_char si2) { // 7c 06 88 90 21 42 00 bb p[0] = 0; @@ -1001,8 +993,8 @@ return p + 3; } -static u8 -EncodeSyncParams(u8 si2, u8 ai) +static u_char +EncodeSyncParams(u_char si2, u_char ai) { switch (si2) { @@ -1046,10 +1038,10 @@ } -static u8 -DecodeASyncParams(u8 si2, u8 * p) +static u_char +DecodeASyncParams(u_char si2, u_char * p) { - u8 info; + u_char info; switch (p[5]) { case 66: // 1200 bit/s @@ -1103,8 +1095,8 @@ } -static u8 -DecodeSyncParams(u8 si2, u8 info) +static u_char +DecodeSyncParams(u_char si2, u_char info) { info &= 0x7f; switch (info) { @@ -1144,10 +1136,10 @@ } } -static u8 +static u_char DecodeSI2(struct sk_buff *skb) { - u8 *p; //, *pend=skb->data + skb->len; + u_char *p; //, *pend=skb->data + skb->len; if ((p = findie(skb->data, skb->len, 0x7c, 0))) { switch (p[4] & 0x0f) { @@ -1174,16 +1166,16 @@ static void -l3ni1_setup_req(struct l3_process *pc, u8 pr, +l3ni1_setup_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[128]; - u8 *p = tmp; + u_char tmp[128]; + u_char *p = tmp; - u8 *teln; - u8 *sub; - u8 *sp; + u_char *teln; + u_char *sub; + u_char *sp; int l; MsgHead(p, pc->callref, MT_SETUP); @@ -1289,7 +1281,7 @@ } static void -l3ni1_call_proc(struct l3_process *pc, u8 pr, void *arg) +l3ni1_call_proc(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int id, ret; @@ -1324,11 +1316,11 @@ L3AddTimer(&pc->timer, T310, CC_T310); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3ni1_std_ie_err(pc, ret); - L3L4(pc->st, CC_PROCEEDING | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_PROCEEDING | INDICATION, pc); } static void -l3ni1_setup_ack(struct l3_process *pc, u8 pr, void *arg) +l3ni1_setup_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int id, ret; @@ -1363,16 +1355,16 @@ L3AddTimer(&pc->timer, T304, CC_T304); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3ni1_std_ie_err(pc, ret); - L3L4(pc->st, CC_MORE_INFO | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_MORE_INFO | INDICATION, pc); } static void -l3ni1_disconnect(struct l3_process *pc, u8 pr, void *arg) +l3ni1_disconnect(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; - u8 *p; + u_char *p; int ret; - u8 cause = 0; + u_char cause = 0; StopAllL3Timer(pc); if ((ret = l3ni1_get_cause(pc, skb))) { @@ -1395,7 +1387,7 @@ if (cause) newl3state(pc, 19); if (11 != ret) - L3L4(pc->st, CC_DISCONNECT | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_DISCONNECT | INDICATION, pc); else if (!cause) l3ni1_release_req(pc, pr, NULL); if (cause) { @@ -1405,7 +1397,7 @@ } static void -l3ni1_connect(struct l3_process *pc, u8 pr, void *arg) +l3ni1_connect(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -1421,11 +1413,11 @@ /* here should inserted COLP handling KKe */ if (ret) l3ni1_std_ie_err(pc, ret); - L3L4(pc->st, CC_SETUP | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP | CONFIRM, pc); } static void -l3ni1_alerting(struct l3_process *pc, u8 pr, void *arg) +l3ni1_alerting(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -1439,13 +1431,13 @@ newl3state(pc, 4); if (ret) l3ni1_std_ie_err(pc, ret); - L3L4(pc->st, CC_ALERTING | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_ALERTING | INDICATION, pc); } static void -l3ni1_setup(struct l3_process *pc, u8 pr, void *arg) +l3ni1_setup(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; int bcfound = 0; char tmp[80]; struct sk_buff *skb = arg; @@ -1456,7 +1448,7 @@ * Bearer Capabilities */ p = skb->data; - /* only the first occurrence 'll be detected ! */ + /* only the first occurence 'll be detected ! */ if ((p = findie(p, skb->len, 0x04, 0))) { if ((p[1] < 2) || (p[1] > 11)) err = 1; @@ -1605,23 +1597,23 @@ newl3state(pc, 6); if (err) /* STATUS for none mandatory IE errors after actions are taken */ l3ni1_std_ie_err(pc, err); - L3L4(pc->st, CC_SETUP | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP | INDICATION, pc); } static void -l3ni1_reset(struct l3_process *pc, u8 pr, void *arg) +l3ni1_reset(struct l3_process *pc, u_char pr, void *arg) { ni1_release_l3_process(pc); } static void -l3ni1_disconnect_req(struct l3_process *pc, u8 pr, void *arg) +l3ni1_disconnect_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[16+40]; - u8 *p = tmp; + u_char tmp[16+40]; + u_char *p = tmp; int l; - u8 cause = 16; + u_char cause = 16; if (pc->para.cause != NO_CAUSE) cause = pc->para.cause; @@ -1654,7 +1646,7 @@ } static void -l3ni1_setup_rsp(struct l3_process *pc, u8 pr, +l3ni1_setup_rsp(struct l3_process *pc, u_char pr, void *arg) { if (!pc->para.bchannel) @@ -1672,7 +1664,7 @@ } static void -l3ni1_connect_ack(struct l3_process *pc, u8 pr, void *arg) +l3ni1_connect_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -1686,17 +1678,17 @@ L3DelTimer(&pc->timer); if (ret) l3ni1_std_ie_err(pc, ret); - L3L4(pc->st, CC_SETUP_COMPL | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_COMPL | INDICATION, pc); } static void -l3ni1_reject_req(struct l3_process *pc, u8 pr, void *arg) +l3ni1_reject_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; - u8 cause = 21; + u_char cause = 21; if (pc->para.cause != NO_CAUSE) cause = pc->para.cause; @@ -1713,16 +1705,16 @@ return; memcpy(skb_put(skb, l), tmp, l); l3_msg(pc->st, DL_DATA | REQUEST, skb); - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); ni1_release_l3_process(pc); } static void -l3ni1_release(struct l3_process *pc, u8 pr, void *arg) +l3ni1_release(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; - u8 *p; + u_char *p; int ret, cause=0; StopAllL3Timer(pc); @@ -1747,13 +1739,13 @@ l3ni1_message_cause(pc, MT_RELEASE_COMPLETE, cause); else l3ni1_message(pc, MT_RELEASE_COMPLETE); - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); ni1_release_l3_process(pc); } static void -l3ni1_alert_req(struct l3_process *pc, u8 pr, +l3ni1_alert_req(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 7); @@ -1764,16 +1756,16 @@ } static void -l3ni1_proceed_req(struct l3_process *pc, u8 pr, +l3ni1_proceed_req(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 9); l3ni1_message(pc, MT_CALL_PROCEEDING); - L3L4(pc->st, CC_PROCEED_SEND | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_PROCEED_SEND | INDICATION, pc); } static void -l3ni1_setup_ack_req(struct l3_process *pc, u8 pr, +l3ni1_setup_ack_req(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 25); @@ -1786,8 +1778,8 @@ /* deliver a incoming display message to HL */ /********************************************/ static void -l3ni1_deliver_display(struct l3_process *pc, int pr, u8 *infp) -{ u8 len; +l3ni1_deliver_display(struct l3_process *pc, int pr, u_char *infp) +{ u_char len; isdn_ctrl ic; struct IsdnCardState *cs; char *p; @@ -1809,11 +1801,11 @@ static void -l3ni1_progress(struct l3_process *pc, u8 pr, void *arg) +l3ni1_progress(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int err = 0; - u8 *p; + u_char *p; if ((p = findie(skb->data, skb->len, IE_PROGRESS, 0))) { if (p[1] != 2) { @@ -1862,15 +1854,15 @@ if (err) l3ni1_std_ie_err(pc, err); if (ERR_IE_COMPREHENSION != err) - L3L4(pc->st, CC_PROGRESS | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_PROGRESS | INDICATION, pc); } static void -l3ni1_notify(struct l3_process *pc, u8 pr, void *arg) +l3ni1_notify(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int err = 0; - u8 *p; + u_char *p; if ((p = findie(skb->data, skb->len, IE_NOTIFY, 0))) { if (p[1] != 1) { @@ -1903,11 +1895,11 @@ if (err) l3ni1_std_ie_err(pc, err); if (ERR_IE_COMPREHENSION != err) - L3L4(pc->st, CC_NOTIFY | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_NOTIFY | INDICATION, pc); } static void -l3ni1_status_enq(struct l3_process *pc, u8 pr, void *arg) +l3ni1_status_enq(struct l3_process *pc, u_char pr, void *arg) { int ret; struct sk_buff *skb = arg; @@ -1919,11 +1911,11 @@ } static void -l3ni1_information(struct l3_process *pc, u8 pr, void *arg) +l3ni1_information(struct l3_process *pc, u_char pr, void *arg) { int ret; struct sk_buff *skb = arg; - u8 *p; + u_char *p; char tmp[32]; ret = check_infoelements(pc, skb, ie_INFORMATION); @@ -1935,7 +1927,7 @@ if ((p = findie(p, skb->len, 0x70, 0))) { iecpy(tmp, p, 1); strcat(pc->para.setup.eazmsn, tmp); - L3L4(pc->st, CC_MORE_INFO | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_MORE_INFO | INDICATION, pc); } L3AddTimer(&pc->timer, T302, CC_T302); } @@ -1944,14 +1936,14 @@ /******************************/ /* handle deflection requests */ /******************************/ -static void l3ni1_redir_req(struct l3_process *pc, u8 pr, void *arg) +static void l3ni1_redir_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[128]; - u8 *p = tmp; - u8 *subp; - u8 len_phone = 0; - u8 len_sub = 0; + u_char tmp[128]; + u_char *p = tmp; + u_char *subp; + u_char len_phone = 0; + u_char len_sub = 0; int l; @@ -2016,7 +2008,7 @@ /********************************************/ /* handle deflection request in early state */ /********************************************/ -static void l3ni1_redir_req_early(struct l3_process *pc, u8 pr, void *arg) +static void l3ni1_redir_req_early(struct l3_process *pc, u_char pr, void *arg) { l3ni1_proceed_req(pc,pr,arg); l3ni1_redir_req(pc,pr,arg); @@ -2024,13 +2016,13 @@ /***********************************************/ /* handle special commands for this protocol. */ -/* Examples are call independent services like */ +/* Examples are call independant services like */ /* remote operations with dummy callref. */ /***********************************************/ static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic) -{ u8 id; - u8 temp[265]; - u8 *p = temp; +{ u_char id; + u_char temp[265]; + u_char *p = temp; int i, l, proc_len; struct sk_buff *skb; struct l3_process *pc = NULL; @@ -2134,9 +2126,9 @@ } /* l3ni1_io_timer */ static void -l3ni1_release_ind(struct l3_process *pc, u8 pr, void *arg) +l3ni1_release_ind(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; struct sk_buff *skb = arg; int callState = 0; p = skb->data; @@ -2150,31 +2142,31 @@ /* ETS 300-104 7.6.1, 8.6.1, 10.6.1... and 16.1 * set down layer 3 without sending any message */ - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); ni1_release_l3_process(pc); } else { - L3L4(pc->st, CC_IGNORE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_IGNORE | INDICATION, pc); } } static void -l3ni1_dummy(struct l3_process *pc, u8 pr, void *arg) +l3ni1_dummy(struct l3_process *pc, u_char pr, void *arg) { } static void -l3ni1_t302(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t302(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 28; /* invalid number */ l3ni1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3ni1_t303(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t303(struct l3_process *pc, u_char pr, void *arg) { if (pc->N303 > 0) { pc->N303--; @@ -2183,30 +2175,30 @@ } else { L3DelTimer(&pc->timer); l3ni1_message_cause(pc, MT_RELEASE_COMPLETE, 102); - L3L4(pc->st, CC_NOSETUP_RSP, pc); + pc->st->l3.l3l4(pc->st, CC_NOSETUP_RSP, pc); ni1_release_l3_process(pc); } } static void -l3ni1_t304(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t304(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 102; l3ni1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3ni1_t305(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t305(struct l3_process *pc, u_char pr, void *arg) { - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; struct sk_buff *skb; - u8 cause = 16; + u_char cause = 16; L3DelTimer(&pc->timer); if (pc->para.cause != NO_CAUSE) @@ -2229,27 +2221,27 @@ } static void -l3ni1_t310(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t310(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 102; l3ni1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3ni1_t313(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t313(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.loc = 0; pc->para.cause = 102; l3ni1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_CONNECT_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_CONNECT_ERR, pc); } static void -l3ni1_t308_1(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t308_1(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 19); L3DelTimer(&pc->timer); @@ -2258,50 +2250,50 @@ } static void -l3ni1_t308_2(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t308_2(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RELEASE_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE_ERR, pc); ni1_release_l3_process(pc); } static void -l3ni1_t318(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t318(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.cause = 102; /* Timer expiry */ pc->para.loc = 0; /* local */ - L3L4(pc->st, CC_RESUME_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_RESUME_ERR, pc); newl3state(pc, 19); l3ni1_message(pc, MT_RELEASE); L3AddTimer(&pc->timer, T308, CC_T308_1); } static void -l3ni1_t319(struct l3_process *pc, u8 pr, void *arg) +l3ni1_t319(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); pc->para.cause = 102; /* Timer expiry */ pc->para.loc = 0; /* local */ - L3L4(pc->st, CC_SUSPEND_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SUSPEND_ERR, pc); newl3state(pc, 10); } static void -l3ni1_restart(struct l3_process *pc, u8 pr, void *arg) +l3ni1_restart(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); ni1_release_l3_process(pc); } static void -l3ni1_status(struct l3_process *pc, u8 pr, void *arg) +l3ni1_status(struct l3_process *pc, u_char pr, void *arg) { - u8 *p; + u_char *p; struct sk_buff *skb = arg; int ret; - u8 cause = 0, callState = 0; + u_char cause = 0, callState = 0; if ((ret = l3ni1_get_cause(pc, skb))) { if (pc->debug & L3_DEB_WARN) @@ -2329,7 +2321,7 @@ cause = 99; } if (cause) { - u8 tmp; + u_char tmp; if (pc->debug & L3_DEB_WARN) l3_debug(pc->st, "STATUS error(%d/%d)",ret,cause); @@ -2347,14 +2339,14 @@ * if received MT_STATUS with cause == 111 and call * state == 0, then we must set down layer 3 */ - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); newl3state(pc, 0); ni1_release_l3_process(pc); } } static void -l3ni1_facility(struct l3_process *pc, u8 pr, void *arg) +l3ni1_facility(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2362,20 +2354,20 @@ ret = check_infoelements(pc, skb, ie_FACILITY); l3ni1_std_ie_err(pc, ret); { - u8 *p; + u_char *p; if ((p = findie(skb->data, skb->len, IE_FACILITY, 0))) l3ni1_parse_facility(pc->st, pc, pc->callref, p); } } static void -l3ni1_suspend_req(struct l3_process *pc, u8 pr, void *arg) +l3ni1_suspend_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[32]; - u8 *p = tmp; - u8 i, l; - u8 *msg = pc->chan->setup.phone; + u_char tmp[32]; + u_char *p = tmp; + u_char i, l; + u_char *msg = pc->chan->setup.phone; MsgHead(p, pc->callref, MT_SUSPEND); l = *msg++; @@ -2398,7 +2390,7 @@ } static void -l3ni1_suspend_ack(struct l3_process *pc, u8 pr, void *arg) +l3ni1_suspend_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2406,7 +2398,7 @@ L3DelTimer(&pc->timer); newl3state(pc, 0); pc->para.cause = NO_CAUSE; - L3L4(pc->st, CC_SUSPEND | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_SUSPEND | CONFIRM, pc); /* We don't handle suspend_ack for IE errors now */ if ((ret = check_infoelements(pc, skb, ie_SUSPEND_ACKNOWLEDGE))) if (pc->debug & L3_DEB_WARN) @@ -2415,7 +2407,7 @@ } static void -l3ni1_suspend_rej(struct l3_process *pc, u8 pr, void *arg) +l3ni1_suspend_rej(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2436,20 +2428,20 @@ return; } L3DelTimer(&pc->timer); - L3L4(pc->st, CC_SUSPEND_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SUSPEND_ERR, pc); newl3state(pc, 10); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3ni1_std_ie_err(pc, ret); } static void -l3ni1_resume_req(struct l3_process *pc, u8 pr, void *arg) +l3ni1_resume_req(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb; - u8 tmp[32]; - u8 *p = tmp; - u8 i, l; - u8 *msg = pc->para.setup.phone; + u_char tmp[32]; + u_char *p = tmp; + u_char i, l; + u_char *msg = pc->para.setup.phone; MsgHead(p, pc->callref, MT_RESUME); @@ -2473,7 +2465,7 @@ } static void -l3ni1_resume_ack(struct l3_process *pc, u8 pr, void *arg) +l3ni1_resume_ack(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int id, ret; @@ -2500,14 +2492,14 @@ return; } L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RESUME | CONFIRM, pc); + pc->st->l3.l3l4(pc->st, CC_RESUME | CONFIRM, pc); newl3state(pc, 10); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3ni1_std_ie_err(pc, ret); } static void -l3ni1_resume_rej(struct l3_process *pc, u8 pr, void *arg) +l3ni1_resume_rej(struct l3_process *pc, u_char pr, void *arg) { struct sk_buff *skb = arg; int ret; @@ -2528,7 +2520,7 @@ return; } L3DelTimer(&pc->timer); - L3L4(pc->st, CC_RESUME_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_RESUME_ERR, pc); newl3state(pc, 0); if (ret) /* STATUS for none mandatory IE errors after actions are taken */ l3ni1_std_ie_err(pc, ret); @@ -2536,11 +2528,11 @@ } static void -l3ni1_global_restart(struct l3_process *pc, u8 pr, void *arg) +l3ni1_global_restart(struct l3_process *pc, u_char pr, void *arg) { - u8 tmp[32]; - u8 *p; - u8 ri, ch = 0, chan = 0; + u_char tmp[32]; + u_char *p; + u_char ri, ch = 0, chan = 0; int l; struct sk_buff *skb = arg; struct l3_process *up; @@ -2566,9 +2558,9 @@ up = pc->st->l3.proc; while (up) { if ((ri & 7) == 7) - L4L3(up->st, CC_RESTART | REQUEST, up); + up->st->lli.l4l3(up->st, CC_RESTART | REQUEST, up); else if (up->para.bchannel == chan) - L4L3(up->st, CC_RESTART | REQUEST, up); + up->st->lli.l4l3(up->st, CC_RESTART | REQUEST, up); up = up->next; } @@ -2591,26 +2583,26 @@ } static void -l3ni1_dl_reset(struct l3_process *pc, u8 pr, void *arg) +l3ni1_dl_reset(struct l3_process *pc, u_char pr, void *arg) { pc->para.cause = 0x29; /* Temporary failure */ pc->para.loc = 0; l3ni1_disconnect_req(pc, pr, NULL); - L3L4(pc->st, CC_SETUP_ERR, pc); + pc->st->l3.l3l4(pc->st, CC_SETUP_ERR, pc); } static void -l3ni1_dl_release(struct l3_process *pc, u8 pr, void *arg) +l3ni1_dl_release(struct l3_process *pc, u_char pr, void *arg) { newl3state(pc, 0); pc->para.cause = 0x1b; /* Destination out of order */ pc->para.loc = 0; - L3L4(pc->st, CC_RELEASE | INDICATION, pc); + pc->st->l3.l3l4(pc->st, CC_RELEASE | INDICATION, pc); release_l3_process(pc); } static void -l3ni1_dl_reestablish(struct l3_process *pc, u8 pr, void *arg) +l3ni1_dl_reestablish(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); L3AddTimer(&pc->timer, T309, CC_T309); @@ -2618,7 +2610,7 @@ } static void -l3ni1_dl_reest_status(struct l3_process *pc, u8 pr, void *arg) +l3ni1_dl_reest_status(struct l3_process *pc, u_char pr, void *arg) { L3DelTimer(&pc->timer); @@ -2626,9 +2618,9 @@ l3ni1_status_send(pc, 0, NULL); } -static void l3ni1_SendSpid( struct l3_process *pc, u8 pr, struct sk_buff *skb, int iNewState ) +static void l3ni1_SendSpid( struct l3_process *pc, u_char pr, struct sk_buff *skb, int iNewState ) { - u8 * p; + u_char * p; char * pSPID; struct Channel * pChan = pc->st->lli.userdata; int l; @@ -2640,7 +2632,7 @@ { printk( KERN_ERR "SPID not supplied in EAZMSN %s\n", pChan->setup.eazmsn ); newl3state( pc, 0 ); - L3L2( pc->st, DL_RELEASE | REQUEST, NULL ); + pc->st->l3.l3l2( pc->st, DL_RELEASE | REQUEST, NULL ); return; } @@ -2665,15 +2657,15 @@ L3DelTimer( &pc->timer ); L3AddTimer( &pc->timer, TSPID, CC_TSPID ); - L3L2( pc->st, DL_DATA | REQUEST, skb ); + pc->st->l3.l3l2( pc->st, DL_DATA | REQUEST, skb ); } -static void l3ni1_spid_send( struct l3_process *pc, u8 pr, void *arg ) +static void l3ni1_spid_send( struct l3_process *pc, u_char pr, void *arg ) { l3ni1_SendSpid( pc, pr, arg, 20 ); } -void l3ni1_spid_epid( struct l3_process *pc, u8 pr, void *arg ) +void l3ni1_spid_epid( struct l3_process *pc, u_char pr, void *arg ) { struct sk_buff *skb = arg; @@ -2687,7 +2679,7 @@ dev_kfree_skb( skb); } -static void l3ni1_spid_tout( struct l3_process *pc, u8 pr, void *arg ) +static void l3ni1_spid_tout( struct l3_process *pc, u_char pr, void *arg ) { if ( pc->state < 22 ) l3ni1_SendSpid( pc, pr, arg, pc->state+1 ); @@ -2698,7 +2690,7 @@ printk( KERN_ERR "SPID not accepted\n" ); newl3state( pc, 0 ); - L3L2( pc->st, DL_RELEASE | REQUEST, NULL ); + pc->st->l3.l3l2( pc->st, DL_RELEASE | REQUEST, NULL ); } } @@ -2856,10 +2848,10 @@ static void global_handler(struct PStack *st, int mt, struct sk_buff *skb) { - u8 tmp[16]; - u8 *p = tmp; + u_char tmp[16]; + u_char *p = tmp; int l; - u_int i; + int i; struct l3_process *proc = st->l3.global; if ( skb ) @@ -2900,10 +2892,9 @@ static void ni1up(struct PStack *st, int pr, void *arg) { - u_int i; - int mt, cr, cause, callState; + int i, mt, cr, cause, callState; char *ptr; - u8 *p; + u_char *p; struct sk_buff *skb = arg; struct l3_process *proc; @@ -2942,7 +2933,7 @@ return; } cr = getcallref(skb->data); - if (skb->len < (u_int)((skb->data[1] & 0x0f) + 3)) { + if (skb->len < ((skb->data[1] & 0x0f) + 3)) { l3_debug(st, "ni1up frame too short(%d)", skb->len); dev_kfree_skb(skb); return; @@ -3087,8 +3078,7 @@ static void ni1down(struct PStack *st, int pr, void *arg) { - u_int i; - int cr; + int i, cr; struct l3_process *proc; struct Channel *chan; @@ -3139,7 +3129,7 @@ static void ni1man(struct PStack *st, int pr, void *arg) { - u_int i; + int i; struct l3_process *proc = arg; if (!proc) { @@ -3170,9 +3160,9 @@ char tmp[64]; int i; - st->l3.l4l3 = ni1down; - st->l3.l4l3_proto = l3ni1_cmd_global; - st->l3.l2l3 = ni1up; + st->lli.l4l3 = ni1down; + st->lli.l4l3_proto = l3ni1_cmd_global; + st->l2.l2l3 = ni1up; st->l3.l3ml3 = ni1man; st->l3.N303 = 1; st->prot.ni1.last_invoke_id = 0; diff -Nru a/drivers/isdn/hisax/md5sums.asc b/drivers/isdn/hisax/md5sums.asc --- a/drivers/isdn/hisax/md5sums.asc Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,22 +0,0 @@ -# This are valid md5sums for certificated HiSax driver. -# The certification is valid only if the md5sums of all files match. -# The certification is valid only for ELSA Microlink PCI, -# Eicon Technology Diva 2.01 PCI, Sedlbauer SpeedFax+, -# HFC-S PCI A based cards and HFC-S USB based isdn tas -# in the moment. -# Read ../../../Documentation/isdn/HiSax.cert for more informations. -# -d08b59f56fb9ed1fbd17713342c75081 isac.c -e81e6e96f307e55f8b9777aca2b356d9 isdnl1.c -cfd2527d9fb01885484cba74bfc67121 isdnl2.c -8c6829f11459f9d044b5768803fb646d isdnl3.c -d40f88dff4191d2660240749cbdcb688 tei.c -3bd3bd05ee4cb25ffe046200b569a83a callc.c -d518f52402ebc3f1be84e09af375313c cert.c -c425de1f8be86e84006de63c9bb3cc5f l3dss1.c -4c411e29d4103ba60e9af4e3e1234a99 l3_1tr6.c -68c6cc2784f208e3247a5a555918d014 elsa.c -8d63a85d7222cf7b40e663e543191d8f diva.c -8c8cb4ce621fb84d8e337a696e75b0df sedlbauer.c -ebe5613d535748409407568435b2be97 hfc_pci.c -# end of md5sums diff -Nru a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c --- a/drivers/isdn/hisax/mic.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/mic.c Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: mic.c,v 1.10.6.2 2001/09/23 22:24:50 kai Exp $ +/* $Id: mic.c,v 1.12.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for mic cards * @@ -18,8 +18,7 @@ extern const char *CardType[]; -const char *mic_revision = "$Revision: 1.10.6.2 $"; -static spinlock_t mic_lock = SPIN_LOCK_UNLOCKED; +const char *mic_revision = "$Revision: 1.12.2.4 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -31,146 +30,210 @@ /* CARD_ADR (Write) */ #define MIC_RESET 0x3 /* same as DOS driver */ -static inline u8 -readreg(struct IsdnCardState *cs, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&mic_lock, flags); - byteout(cs->hw.mic.adr, off); + byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&mic_lock, flags); - return (ret); } static inline void -writereg(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&mic_lock, flags); - byteout(cs->hw.mic.adr, off); - byteout(adr, data); - spin_unlock_irqrestore(&mic_lock, flags); + byteout(ale, off); + insb(adr, data, size); } + static inline void -readfifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { - byteout(cs->hw.mic.adr, off); - insb(adr, data, size); + byteout(ale, off); + byteout(adr, data); } static inline void -writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - byteout(cs->hw.mic.adr, off); + byteout(ale, off); outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) -{ - return readreg(cs, cs->hw.mic.isac, offset); -} +/* Interface functions */ -static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - writereg(cs, cs->hw.mic.isac, offset, value); + return (readreg(cs->hw.mic.adr, cs->hw.mic.isac, offset)); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - readfifo(cs, cs->hw.mic.isac, 0, data, size); + writereg(cs->hw.mic.adr, cs->hw.mic.isac, offset, value); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) -{ - writefifo(cs, cs->hw.mic.isac, 0, data, size); -} - -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - return readreg(cs, cs->hw.mic.hscx, offset + (hscx ? 0x40 : 0)); + readfifo(cs->hw.mic.adr, cs->hw.mic.isac, 0, data, size); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writereg(cs, cs->hw.mic.hscx, offset + (hscx ? 0x40 : 0), value); + writefifo(cs->hw.mic.adr, cs->hw.mic.isac, 0, data, size); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - readfifo(cs, cs->hw.mic.hscx, hscx ? 0x40 : 0, data, size); + return (readreg(cs->hw.mic.adr, + cs->hw.mic.hscx, offset + (hscx ? 0x40 : 0))); } static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writefifo(cs, cs->hw.mic.hscx, hscx ? 0x40 : 0, data, size); + writereg(cs->hw.mic.adr, + cs->hw.mic.hscx, offset + (hscx ? 0x40 : 0), value); } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static struct card_ops mic_ops = { - .init = inithscxisac, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; - -static int __init -mic_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->irq = card->para[0]; - cs->hw.mic.cfg_reg = card->para[1]; - cs->hw.mic.adr = cs->hw.mic.cfg_reg + MIC_ADR; - cs->hw.mic.isac = cs->hw.mic.cfg_reg + MIC_ISAC; - cs->hw.mic.hscx = cs->hw.mic.cfg_reg + MIC_HSCX; - - if (!request_io(&cs->rs, cs->hw.mic.cfg_reg, 8, "mic isdn")) - goto err; - - printk(KERN_INFO "mic: defined at 0x%x IRQ %d\n", - cs->hw.mic.cfg_reg, cs->irq); +/* + * fast interrupt HSCX stuff goes here + */ - cs->card_ops = &mic_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; +#define READHSCX(cs, nr, reg) readreg(cs->hw.mic.adr, \ + cs->hw.mic.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.mic.adr, \ + cs->hw.mic.hscx, reg + (nr ? 0x40 : 0), data) + +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.mic.adr, \ + cs->hw.mic.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.mic.adr, \ + cs->hw.mic.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +mic_interrupt(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + val = readreg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_ISTA + 0x40); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.mic.adr, cs->hw.mic.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + val = readreg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_ISTA + 0x40); + if (val) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.mic.adr, cs->hw.mic.isac, ISAC_ISTA); + if (val) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + writereg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.mic.adr, cs->hw.mic.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.mic.adr, cs->hw.mic.isac, ISAC_MASK, 0x0); + writereg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_MASK, 0x0); + writereg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_MASK + 0x40, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +void +release_io_mic(struct IsdnCardState *cs) +{ + int bytecnt = 8; + + if (cs->hw.mic.cfg_reg) + release_region(cs->hw.mic.cfg_reg, bytecnt); +} + +static int +mic_card_msg(struct IsdnCardState *cs, int mt, void *arg) +{ + u_long flags; + + switch (mt) { + case CARD_RESET: + return(0); + case CARD_RELEASE: + release_io_mic(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscx(cs); /* /RTSA := ISAC RST */ + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } int __init setup_mic(struct IsdnCard *card) { + int bytecnt; + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, mic_revision); printk(KERN_INFO "HiSax: mic driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_MIC) + return (0); + + bytecnt = 8; + cs->hw.mic.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + cs->hw.mic.adr = cs->hw.mic.cfg_reg + MIC_ADR; + cs->hw.mic.isac = cs->hw.mic.cfg_reg + MIC_ISAC; + cs->hw.mic.hscx = cs->hw.mic.cfg_reg + MIC_HSCX; - if (mic_probe(card->cs, card) < 0) - return 0; - return 1; + if (!request_region(cs->hw.mic.cfg_reg, bytecnt, "mic isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.mic.cfg_reg, + cs->hw.mic.cfg_reg + bytecnt); + return (0); + } + printk(KERN_INFO "mic: defined at 0x%x IRQ %d\n", + cs->hw.mic.cfg_reg, cs->irq); + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &mic_card_msg; + cs->irq_func = &mic_interrupt; + ISACVersion(cs, "mic:"); + if (HscxVersion(cs, "mic:")) { + printk(KERN_WARNING + "mic: wrong HSCX versions check IO address\n"); + release_io_mic(cs); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c --- a/drivers/isdn/hisax/netjet.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/netjet.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: netjet.c,v 1.24.6.6 2001/09/23 22:24:50 kai Exp $ +/* $Id: netjet.c,v 1.29.2.4 2004/02/11 13:21:34 keil Exp $ * * low level stuff for Traverse Technologie NETJet ISDN cards * @@ -25,63 +25,40 @@ #include #include "netjet.h" -const char *NETjet_revision = "$Revision: 1.24.6.6 $"; -static spinlock_t netjet_lock = SPIN_LOCK_UNLOCKED; +const char *NETjet_revision = "$Revision: 1.29.2.4 $"; /* Interface functions */ -u8 -NETjet_ReadIC(struct IsdnCardState *cs, u8 offset) +u_char +NETjet_ReadIC(struct IsdnCardState *cs, u_char offset) { - unsigned long flags; - u8 ret; + u_char ret; - spin_lock_irqsave(&netjet_lock, flags); cs->hw.njet.auxd &= 0xfc; cs->hw.njet.auxd |= (offset>>4) & 3; byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); ret = bytein(cs->hw.njet.isac + ((offset & 0xf)<<2)); - spin_unlock_irqrestore(&netjet_lock, flags); return(ret); } void -NETjet_WriteIC(struct IsdnCardState *cs, u8 offset, u8 value) +NETjet_WriteIC(struct IsdnCardState *cs, u_char offset, u_char value) { - unsigned long flags; - - spin_lock_irqsave(&netjet_lock, flags); cs->hw.njet.auxd &= 0xfc; cs->hw.njet.auxd |= (offset>>4) & 3; byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); byteout(cs->hw.njet.isac + ((offset & 0xf)<<2), value); - spin_unlock_irqrestore(&netjet_lock, flags); } void -NETjet_ReadICfifo(struct IsdnCardState *cs, u8 *data, int size) +NETjet_ReadICfifo(struct IsdnCardState *cs, u_char *data, int size) { cs->hw.njet.auxd &= 0xfc; byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); insb(cs->hw.njet.isac, data, size); } -void -NETjet_WriteICfifo(struct IsdnCardState *cs, u8 *data, int size) -{ - cs->hw.njet.auxd &= 0xfc; - byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); - outsb(cs->hw.njet.isac, data, size); -} - -struct dc_hw_ops netjet_dc_ops = { - .read_reg = NETjet_ReadIC, - .write_reg = NETjet_WriteIC, - .read_fifo = NETjet_ReadICfifo, - .write_fifo = NETjet_WriteICfifo, -}; - -static u16 fcstab[256] = +__u16 fcstab[256] = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, @@ -117,7 +94,15 @@ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; -void fill_mem(struct BCState *bcs, u_int *pos, u_int cnt, int chan, u8 fill) +void +NETjet_WriteICfifo(struct IsdnCardState *cs, u_char *data, int size) +{ + cs->hw.njet.auxd &= 0xfc; + byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); + outsb(cs->hw.njet.isac, data, size); +} + +void fill_mem(struct BCState *bcs, u_int *pos, u_int cnt, int chan, u_char fill) { u_int mask=0x000000ff, val = 0, *p=pos; u_int i; @@ -140,7 +125,7 @@ mode_tiger(struct BCState *bcs, int mode, int bc) { struct IsdnCardState *cs = bcs->cs; - u8 led; + u_char led; if (cs->debug & L1_DEB_HSCX) debugl1(cs, "Tiger mode %d bchan %d/%d", @@ -216,11 +201,11 @@ bytein(cs->hw.njet.base + NETJET_PULSE_CNT)); } -static void printframe(struct IsdnCardState *cs, u8 *buf, int count, char *s) { +static void printframe(struct IsdnCardState *cs, u_char *buf, int count, char *s) { char tmp[128]; char *t = tmp; int i=count,j; - u8 *p = buf; + u_char *p = buf; t += sprintf(t, "tiger %s(%4d)", s, count); while (i>0) { @@ -269,11 +254,11 @@ static int make_raw_data(struct BCState *bcs) { // this make_raw is for 64k register u_int i,s_cnt=0; - register u8 j; - register u8 val; - register u8 s_one = 0; - register u8 s_val = 0; - register u8 bitcnt = 0; + register u_char j; + register u_char val; + register u_char s_one = 0; + register u_char s_val = 0; + register u_char bitcnt = 0; u_int fcs; if (!bcs->tx_skb) { @@ -359,11 +344,11 @@ static int make_raw_data_56k(struct BCState *bcs) { // this make_raw is for 56k register u_int i,s_cnt=0; - register u8 j; - register u8 val; - register u8 s_one = 0; - register u8 s_val = 0; - register u8 bitcnt = 0; + register u_char j; + register u_char val; + register u_char s_one = 0; + register u_char s_val = 0; + register u_char bitcnt = 0; u_int fcs; if (!bcs->tx_skb) { @@ -439,7 +424,8 @@ memcpy(skb_put(skb, count), bcs->hw.tiger.rcvbuf, count); skb_queue_tail(&bcs->rqueue, skb); } - sched_b_event(bcs, B_RCVBUFREADY); + test_and_set_bit(B_RCVBUFREADY, &bcs->event); + schedule_work(&bcs->tqueue); if (bcs->cs->debug & L1_DEB_RECEIVE_FRAME) printframe(bcs->cs, bcs->hw.tiger.rcvbuf, count, "rec"); @@ -449,16 +435,16 @@ static void read_raw(struct BCState *bcs, u_int *buf, int cnt){ int i; - register u8 j; - register u8 val; + register u_char j; + register u_char val; u_int *pend = bcs->hw.tiger.rec +NETJET_DMA_RXSIZE -1; - register u8 state = bcs->hw.tiger.r_state; - register u8 r_one = bcs->hw.tiger.r_one; - register u8 r_val = bcs->hw.tiger.r_val; + register u_char state = bcs->hw.tiger.r_state; + register u_char r_one = bcs->hw.tiger.r_one; + register u_char r_val = bcs->hw.tiger.r_val; register u_int bitcnt = bcs->hw.tiger.r_bitcnt; u_int *p = buf; int bits; - u8 mask; + u_char mask; if (bcs->mode == L1_MODE_HDLC) { // it's 64k mask = 0xff; @@ -682,9 +668,7 @@ if (test_and_clear_bit(BC_FLG_NOFRAME, &bcs->Flag)) { write_raw(bcs, bcs->hw.tiger.sendp, bcs->hw.tiger.free); } else if (test_and_clear_bit(BC_FLG_HALF, &bcs->Flag)) { - p = inl(bcs->cs->hw.njet.base + NETJET_DMA_READ_ADR) - - bcs->hw.tiger.send_dma - + bcs->hw.tiger.send; + p = bus_to_virt(inl(bcs->cs->hw.njet.base + NETJET_DMA_READ_ADR)); sp = bcs->hw.tiger.sendp; if (p == bcs->hw.tiger.s_end) p = bcs->hw.tiger.send -1; @@ -705,9 +689,7 @@ write_raw(bcs, p, bcs->hw.tiger.free - cnt); } } else if (test_and_clear_bit(BC_FLG_EMPTY, &bcs->Flag)) { - p = inl(bcs->cs->hw.njet.base + NETJET_DMA_READ_ADR) - - bcs->hw.tiger.send_dma - + bcs->hw.tiger.send; + p = bus_to_virt(inl(bcs->cs->hw.njet.base + NETJET_DMA_READ_ADR)); cnt = bcs->hw.tiger.s_end - p; if (cnt < 2) { p = bcs->hw.tiger.send + 1; @@ -729,7 +711,7 @@ static void write_raw(struct BCState *bcs, u_int *buf, int cnt) { u_int mask, val, *p=buf; - int i, s_cnt; + u_int i, s_cnt; if (cnt <= 0) return; @@ -766,7 +748,16 @@ if (!bcs->tx_skb) { debugl1(bcs->cs,"tiger write_raw: NULL skb s_cnt %d", s_cnt); } else { - xmit_complete_b(bcs); + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->tx_skb->len; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; } test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); bcs->hw.tiger.free = cnt - s_cnt; @@ -790,7 +781,8 @@ debugl1(bcs->cs, "tiger write_raw: fill rest %d", cnt - s_cnt); } - sched_b_event(bcs, B_XMTBUFREADY); + test_and_set_bit(B_XMTBUFREADY, &bcs->event); + schedule_work(&bcs->tqueue); } } } else if (test_and_clear_bit(BC_FLG_NOFRAME, &bcs->Flag)) { @@ -838,36 +830,59 @@ static void tiger_l2l1(struct PStack *st, int pr, void *arg) { + struct BCState *bcs = st->l1.bcs; struct sk_buff *skb = arg; - struct IsdnCardState *cs = st->l1.bcs->cs; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + printk(KERN_WARNING "tiger_l2l1: this shouldn't happen\n"); + } else { + bcs->tx_skb = skb; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - mode_tiger(st->l1.bcs, st->l1.mode, st->l1.bc); - if (cs->hw.njet.bc_activate) - (cs->hw.njet.bc_activate)(cs, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + mode_tiger(bcs, st->l1.mode, st->l1.bc); + /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG */ + spin_unlock_irqrestore(&bcs->cs->lock, flags); + bcs->cs->cardmsg(bcs->cs, MDL_BC_ASSIGN, (void *)(&st->l1.bc)); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): - if (cs->hw.njet.bc_deactivate) - (cs->hw.njet.bc_deactivate)(cs, st->l1.bc); + /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG */ + bcs->cs->cardmsg(bcs->cs, MDL_BC_RELEASE, (void *)(&st->l1.bc)); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - mode_tiger(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + mode_tiger(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -928,7 +943,7 @@ if (open_tigerstate(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = tiger_l2l1; + st->l2.l2l1 = tiger_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); @@ -936,47 +951,32 @@ } -static struct bc_l1_ops netjet_l1_ops = { - .fill_fifo = netjet_fill_dma, - .open = setstack_tiger, - .close = close_tigerstate, -}; - void __init inittiger(struct IsdnCardState *cs) { - cs->bc_l1_ops = &netjet_l1_ops; - - cs->bcs[0].hw.tiger.send = - pci_alloc_consistent(cs->hw.njet.pdev, - NETJET_DMA_TXSIZE * sizeof(unsigned int), - &cs->bcs[0].hw.tiger.send_dma); - if (!cs->bcs[0].hw.tiger.send) { + if (!(cs->bcs[0].hw.tiger.send = kmalloc(NETJET_DMA_TXSIZE * sizeof(unsigned int), + GFP_KERNEL | GFP_DMA))) { printk(KERN_WARNING "HiSax: No memory for tiger.send\n"); return; } - cs->bcs[0].hw.tiger.s_end = cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1; - - cs->bcs[1].hw.tiger.send = cs->bcs[0].hw.tiger.send; - cs->bcs[1].hw.tiger.send_dma = cs->bcs[0].hw.tiger.send_dma; - cs->bcs[1].hw.tiger.s_end = cs->bcs[0].hw.tiger.s_end; + cs->bcs[0].hw.tiger.s_irq = cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE/2 - 1; + cs->bcs[0].hw.tiger.s_end = cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1; + cs->bcs[1].hw.tiger.send = cs->bcs[0].hw.tiger.send; + cs->bcs[1].hw.tiger.s_irq = cs->bcs[0].hw.tiger.s_irq; + cs->bcs[1].hw.tiger.s_end = cs->bcs[0].hw.tiger.s_end; memset(cs->bcs[0].hw.tiger.send, 0xff, NETJET_DMA_TXSIZE * sizeof(unsigned int)); debugl1(cs, "tiger: send buf %x - %x", (u_int)cs->bcs[0].hw.tiger.send, (u_int)(cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1)); - outl(cs->bcs[0].hw.tiger.send_dma, + outl(virt_to_bus(cs->bcs[0].hw.tiger.send), cs->hw.njet.base + NETJET_DMA_READ_START); - outl(cs->bcs[0].hw.tiger.send_dma + NETJET_DMA_TXSIZE/2 - 1, + outl(virt_to_bus(cs->bcs[0].hw.tiger.s_irq), cs->hw.njet.base + NETJET_DMA_READ_IRQ); - outl(cs->bcs[0].hw.tiger.send_dma + NETJET_DMA_TXSIZE - 1, + outl(virt_to_bus(cs->bcs[0].hw.tiger.s_end), cs->hw.njet.base + NETJET_DMA_READ_END); - - cs->bcs[0].hw.tiger.rec = - pci_alloc_consistent(cs->hw.njet.pdev, - NETJET_DMA_RXSIZE * sizeof(unsigned int), - &cs->bcs[0].hw.tiger.rec_dma); - if (!cs->bcs[0].hw.tiger.rec) { + if (!(cs->bcs[0].hw.tiger.rec = kmalloc(NETJET_DMA_RXSIZE * sizeof(unsigned int), + GFP_KERNEL | GFP_DMA))) { printk(KERN_WARNING "HiSax: No memory for tiger.rec\n"); return; @@ -984,39 +984,36 @@ debugl1(cs, "tiger: rec buf %x - %x", (u_int)cs->bcs[0].hw.tiger.rec, (u_int)(cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE - 1)); cs->bcs[1].hw.tiger.rec = cs->bcs[0].hw.tiger.rec; - cs->bcs[1].hw.tiger.rec_dma = cs->bcs[0].hw.tiger.rec_dma; memset(cs->bcs[0].hw.tiger.rec, 0xff, NETJET_DMA_RXSIZE * sizeof(unsigned int)); - outl(cs->bcs[0].hw.tiger.rec_dma, + outl(virt_to_bus(cs->bcs[0].hw.tiger.rec), cs->hw.njet.base + NETJET_DMA_WRITE_START); - outl(cs->bcs[0].hw.tiger.rec_dma + NETJET_DMA_RXSIZE/2 - 1, + outl(virt_to_bus(cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE/2 - 1), cs->hw.njet.base + NETJET_DMA_WRITE_IRQ); - outl(cs->bcs[0].hw.tiger.rec_dma + NETJET_DMA_RXSIZE - 1, + outl(virt_to_bus(cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE - 1), cs->hw.njet.base + NETJET_DMA_WRITE_END); debugl1(cs, "tiger: dmacfg %x/%x pulse=%d", inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR), inl(cs->hw.njet.base + NETJET_DMA_READ_ADR), bytein(cs->hw.njet.base + NETJET_PULSE_CNT)); cs->hw.njet.last_is0 = 0; + cs->bcs[0].BC_SetStack = setstack_tiger; + cs->bcs[1].BC_SetStack = setstack_tiger; + cs->bcs[0].BC_Close = close_tigerstate; + cs->bcs[1].BC_Close = close_tigerstate; } -static void +void releasetiger(struct IsdnCardState *cs) { if (cs->bcs[0].hw.tiger.send) { - pci_free_consistent(cs->hw.njet.pdev, - NETJET_DMA_TXSIZE * sizeof(unsigned int), - cs->bcs[0].hw.tiger.send, - cs->bcs[0].hw.tiger.send_dma); + kfree(cs->bcs[0].hw.tiger.send); cs->bcs[0].hw.tiger.send = NULL; } if (cs->bcs[1].hw.tiger.send) { cs->bcs[1].hw.tiger.send = NULL; } if (cs->bcs[0].hw.tiger.rec) { - pci_free_consistent(cs->hw.njet.pdev, - NETJET_DMA_RXSIZE * sizeof(unsigned int), - cs->bcs[0].hw.tiger.rec, - cs->bcs[0].hw.tiger.rec_dma); + kfree(cs->bcs[0].hw.tiger.rec); cs->bcs[0].hw.tiger.rec = NULL; } if (cs->bcs[1].hw.tiger.rec) { @@ -1025,11 +1022,11 @@ } void -netjet_release(struct IsdnCardState *cs) +release_io_netjet(struct IsdnCardState *cs) { byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0); byteout(cs->hw.njet.base + NETJET_IRQMASK1, 0); releasetiger(cs); - hisax_release_resources(cs); + release_region(cs->hw.njet.base, 256); } diff -Nru a/drivers/isdn/hisax/netjet.h b/drivers/isdn/hisax/netjet.h --- a/drivers/isdn/hisax/netjet.h Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/netjet.h Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: netjet.h,v 2.5.6.3 2001/09/23 22:24:50 kai Exp $ +/* $Id: netjet.h,v 2.8.2.2 2004/01/12 22:52:28 keil Exp $ * * NETjet common header file * @@ -57,12 +57,10 @@ #define HDLC_FLAG_VALUE 0x7e -extern struct dc_hw_ops netjet_dc_ops; - -u8 NETjet_ReadIC(struct IsdnCardState *cs, u8 offset); -void NETjet_WriteIC(struct IsdnCardState *cs, u8 offset, u8 value); -void NETjet_ReadICfifo(struct IsdnCardState *cs, u8 *data, int size); -void NETjet_WriteICfifo(struct IsdnCardState *cs, u8 *data, int size); +u_char NETjet_ReadIC(struct IsdnCardState *cs, u_char offset); +void NETjet_WriteIC(struct IsdnCardState *cs, u_char offset, u_char value); +void NETjet_ReadICfifo(struct IsdnCardState *cs, u_char *data, int size); +void NETjet_WriteICfifo(struct IsdnCardState *cs, u_char *data, int size); void read_tiger(struct IsdnCardState *cs); void write_tiger(struct IsdnCardState *cs); @@ -70,5 +68,5 @@ void netjet_fill_dma(struct BCState *bcs); void netjet_interrupt(int intno, void *dev_id, struct pt_regs *regs); void inittiger(struct IsdnCardState *cs); -void netjet_release(struct IsdnCardState *cs); +void release_io_netjet(struct IsdnCardState *cs); diff -Nru a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c --- a/drivers/isdn/hisax/niccy.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/niccy.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: niccy.c,v 1.15.6.6 2001/10/20 22:08:24 kai Exp $ +/* $Id: niccy.c,v 1.21.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for Dr. Neuhaus NICCY PnP and NICCY PCI and * compatible (SAGEM cybermodem) @@ -24,8 +24,7 @@ #include extern const char *CardType[]; -const char *niccy_revision = "$Revision: 1.15.6.6 $"; -static spinlock_t niccy_lock = SPIN_LOCK_UNLOCKED; +const char *niccy_revision = "$Revision: 1.21.2.4 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -47,127 +46,140 @@ #define PCI_IRQ_DISABLE 0xff0000 #define PCI_IRQ_ASSERT 0x800000 -static inline u8 -readreg(unsigned int ale, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&niccy_lock, flags); byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&niccy_lock, flags); - return ret; + return (ret); } static inline void -writereg(unsigned int ale, unsigned int adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&niccy_lock, flags); byteout(ale, off); - byteout(adr, data); - spin_unlock_irqrestore(&niccy_lock, flags); + insb(adr, data, size); } + static inline void -readfifo(unsigned int ale, unsigned int adr, u8 off, u8 * data, int size) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { byteout(ale, off); - insb(adr, data, size); + byteout(adr, data); } static inline void -writefifo(unsigned int ale, unsigned int adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { byteout(ale, off); outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, offset); + return (readreg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { writereg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 *data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { readfifo(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 *data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { writefifo(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return readreg(cs->hw.niccy.hscx_ale, - cs->hw.niccy.hscx, offset + (hscx ? 0x40 : 0)); + return (readreg(cs->hw.niccy.hscx_ale, + cs->hw.niccy.hscx, offset + (hscx ? 0x40 : 0))); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, offset + (hscx ? 0x40 : 0), value); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - readfifo(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, - hscx ? 0x40 : 0, data, size); -} +#define READHSCX(cs, nr, reg) readreg(cs->hw.niccy.hscx_ale, \ + cs->hw.niccy.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.niccy.hscx_ale, \ + cs->hw.niccy.hscx, reg + (nr ? 0x40 : 0), data) -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - writefifo(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, - hscx ? 0x40 : 0, data, size); -} +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.niccy.hscx_ale, \ + cs->hw.niccy.hscx, (nr ? 0x40 : 0), ptr, cnt) -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.niccy.hscx_ale, \ + cs->hw.niccy.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" static irqreturn_t niccy_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - + u_char val; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); if (cs->subtyp == NICCY_PCI) { int ival; ival = inl(cs->hw.niccy.cfg_reg + PCI_IRQ_CTRL_REG); - if (!(ival & PCI_IRQ_ASSERT)) /* IRQ not for us (shared) */ + if (!(ival & PCI_IRQ_ASSERT)) { /* IRQ not for us (shared) */ + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_NONE; + } outl(ival, cs->hw.niccy.cfg_reg + PCI_IRQ_CTRL_REG); } - return hscxisac_irq(intno, dev_id, regs); + val = readreg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_ISTA + 0x40); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + val = readreg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_ISTA + 0x40); + if (val) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, ISAC_ISTA); + if (val) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, ISAC_MASK, 0); + writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK, 0); + writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK + 0x40, 0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } void -niccy_release(struct IsdnCardState *cs) +release_io_niccy(struct IsdnCardState *cs) { if (cs->subtyp == NICCY_PCI) { int val; @@ -175,11 +187,15 @@ val = inl(cs->hw.niccy.cfg_reg + PCI_IRQ_CTRL_REG); val &= PCI_IRQ_DISABLE; outl(val, cs->hw.niccy.cfg_reg + PCI_IRQ_CTRL_REG); + release_region(cs->hw.niccy.cfg_reg, 0x40); + release_region(cs->hw.niccy.isac, 4); + } else { + release_region(cs->hw.niccy.isac, 2); + release_region(cs->hw.niccy.isac_ale, 2); } - hisax_release_resources(cs); } -static int +static void niccy_reset(struct IsdnCardState *cs) { if (cs->subtyp == NICCY_PCI) { @@ -189,78 +205,32 @@ val |= PCI_IRQ_ENABLE; outl(val, cs->hw.niccy.cfg_reg + PCI_IRQ_CTRL_REG); } - return 0; + inithscxisac(cs, 3); } -static struct card_ops niccy_ops = { - .init = inithscxisac, - .reset = niccy_reset, - .release = niccy_release, - .irq_func = niccy_interrupt, -}; - -static int __init -niccy_probe(struct IsdnCardState *cs) +static int +niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - printk(KERN_INFO "HiSax: %s %s config irq:%d data:0x%X ale:0x%X\n", - CardType[cs->typ], (cs->subtyp==1) ? "PnP":"PCI", - cs->irq, cs->hw.niccy.isac, cs->hw.niccy.isac_ale); - cs->card_ops = &niccy_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - return -EBUSY; - return 0; -} - -static int __init -niccy_pnp_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->subtyp = NICCY_PNP; - cs->irq = card->para[0]; - cs->hw.niccy.isac = card->para[1] + ISAC_PNP; - cs->hw.niccy.hscx = card->para[1] + HSCX_PNP; - cs->hw.niccy.isac_ale = card->para[2] + ISAC_PNP; - cs->hw.niccy.hscx_ale = card->para[2] + HSCX_PNP; - cs->hw.niccy.cfg_reg = 0; - - if (!request_io(&cs->rs, cs->hw.niccy.isac, 2, "niccy data")) - goto err; - if (!request_io(&cs->rs, cs->hw.niccy.isac_ale, 2, "niccy addr")) - goto err; - if (niccy_probe(cs) < 0) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -niccy_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - u32 pci_ioaddr; - - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = NICCY_PCI; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.niccy.cfg_reg = pci_resource_start(pdev, 0); - pci_ioaddr = pci_resource_start(pdev, 1); - cs->hw.niccy.isac = pci_ioaddr + ISAC_PCI_DATA; - cs->hw.niccy.isac_ale = pci_ioaddr + ISAC_PCI_ADDR; - cs->hw.niccy.hscx = pci_ioaddr + HSCX_PCI_DATA; - cs->hw.niccy.hscx_ale = pci_ioaddr + HSCX_PCI_ADDR; - if (!request_io(&cs->rs, cs->hw.niccy.isac, 4, "niccy")) - goto err; - if (!request_io(&cs->rs, cs->hw.niccy.cfg_reg, 0x40, "niccy pci")) - goto err; - if (niccy_probe(cs) < 0) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + u_long flags; + + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + niccy_reset(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_niccy(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + niccy_reset(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } static struct pci_dev *niccy_dev __initdata = NULL; @@ -271,62 +241,149 @@ int __init setup_niccy(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, niccy_revision); printk(KERN_INFO "HiSax: Niccy driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_NICCY) + return (0); #ifdef __ISAPNP__ if (!card->para[1] && isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; + struct pnp_dev *pnp_d = NULL; + int err; - if ((pb = pnp_find_card( + if ((pnp_c = pnp_find_card( ISAPNP_VENDOR('S', 'D', 'A'), ISAPNP_FUNCTION(0x0150), pnp_c))) { - pnp_c = pb; - pd = NULL; - if (!(pd = pnp_find_dev(pnp_c, + if (!(pnp_d = pnp_find_dev(pnp_c, ISAPNP_VENDOR('S', 'D', 'A'), - ISAPNP_FUNCTION(0x0150), pd))) { + ISAPNP_FUNCTION(0x0150), pnp_d))) { printk(KERN_ERR "NiccyPnP: PnP error card found, no device\n"); return (0); } - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "NiccyPnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "NiccyPnP: activate failed\n"); - pnp_device_detach(pd); - return 0; + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_irq_valid(pd, 0) || !pnp_port_valid(pd, 0) || !pnp_port_valid(pd, 1)) { + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[2] = pnp_port_start(pnp_d, 1); + card->para[0] = pnp_irq(pnp_d, 0);; + if (!card->para[0] || !card->para[1] || !card->para[2]) { printk(KERN_ERR "NiccyPnP:some resources are missing %ld/%lx/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0), pnp_port_start(pd, 1)); - pnp_device_detach(pd); + card->para[0], card->para[1], card->para[2]); + pnp_disable_dev(pnp_d); return(0); } - card->para[1] = pnp_port_start(pd, 0); - card->para[2] = pnp_port_start(pd, 1); - card->para[0] = pnp_irq(pd, 0); } else { printk(KERN_INFO "NiccyPnP: no ISAPnP card found\n"); } } #endif if (card->para[1]) { - if (niccy_pnp_probe(card->cs, card) < 0) - return 0; - return 1; + cs->hw.niccy.isac = card->para[1] + ISAC_PNP; + cs->hw.niccy.hscx = card->para[1] + HSCX_PNP; + cs->hw.niccy.isac_ale = card->para[2] + ISAC_PNP; + cs->hw.niccy.hscx_ale = card->para[2] + HSCX_PNP; + cs->hw.niccy.cfg_reg = 0; + cs->subtyp = NICCY_PNP; + cs->irq = card->para[0]; + if (!request_region(cs->hw.niccy.isac, 2, "niccy data")) { + printk(KERN_WARNING + "HiSax: %s data port %x-%x already in use\n", + CardType[card->typ], + cs->hw.niccy.isac, + cs->hw.niccy.isac + 1); + return (0); + } + if (!request_region(cs->hw.niccy.isac_ale, 2, "niccy addr")) { + printk(KERN_WARNING + "HiSax: %s address port %x-%x already in use\n", + CardType[card->typ], + cs->hw.niccy.isac_ale, + cs->hw.niccy.isac_ale + 1); + release_region(cs->hw.niccy.isac, 2); + return (0); + } } else { -#ifdef CONFIG_PCI +#if CONFIG_PCI + u_int pci_ioaddr; + cs->subtyp = 0; if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY, niccy_dev))) { - if (niccy_pci_probe(card->cs, niccy_dev) < 0) - return 0; - return 1; + if (pci_enable_device(niccy_dev)) + return(0); + /* get IRQ */ + if (!niccy_dev->irq) { + printk(KERN_WARNING "Niccy: No IRQ for PCI card found\n"); + return(0); + } + cs->irq = niccy_dev->irq; + cs->hw.niccy.cfg_reg = pci_resource_start(niccy_dev, 0); + if (!cs->hw.niccy.cfg_reg) { + printk(KERN_WARNING "Niccy: No IO-Adr for PCI cfg found\n"); + return(0); + } + pci_ioaddr = pci_resource_start(niccy_dev, 1); + if (!pci_ioaddr) { + printk(KERN_WARNING "Niccy: No IO-Adr for PCI card found\n"); + return(0); + } + cs->subtyp = NICCY_PCI; + } else { + printk(KERN_WARNING "Niccy: No PCI card found\n"); + return(0); + } + cs->irq_flags |= SA_SHIRQ; + cs->hw.niccy.isac = pci_ioaddr + ISAC_PCI_DATA; + cs->hw.niccy.isac_ale = pci_ioaddr + ISAC_PCI_ADDR; + cs->hw.niccy.hscx = pci_ioaddr + HSCX_PCI_DATA; + cs->hw.niccy.hscx_ale = pci_ioaddr + HSCX_PCI_ADDR; + if (!request_region(cs->hw.niccy.isac, 4, "niccy")) { + printk(KERN_WARNING + "HiSax: %s data port %x-%x already in use\n", + CardType[card->typ], + cs->hw.niccy.isac, + cs->hw.niccy.isac + 4); + return (0); + } + if (!request_region(cs->hw.niccy.cfg_reg, 0x40, "niccy pci")) { + printk(KERN_WARNING + "HiSax: %s pci port %x-%x already in use\n", + CardType[card->typ], + cs->hw.niccy.cfg_reg, + cs->hw.niccy.cfg_reg + 0x40); + release_region(cs->hw.niccy.isac, 4); + return (0); } +#else + printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n"); + printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n"); + return (0); #endif /* CONFIG_PCI */ } - return 0; + printk(KERN_INFO "HiSax: %s %s config irq:%d data:0x%X ale:0x%X\n", + CardType[cs->typ], (cs->subtyp==1) ? "PnP":"PCI", + cs->irq, cs->hw.niccy.isac, cs->hw.niccy.isac_ale); + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &niccy_card_msg; + cs->irq_func = &niccy_interrupt; + ISACVersion(cs, "Niccy:"); + if (HscxVersion(cs, "Niccy:")) { + printk(KERN_WARNING + "Niccy: wrong HSCX versions check IO address\n"); + release_io_niccy(cs); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c --- a/drivers/isdn/hisax/nj_s.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/nj_s.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: nj_s.c,v 2.7.6.6 2001/09/23 22:24:50 kai Exp $ +/* $Id: nj_s.c,v 2.13.2.4 2004/01/16 01:53:48 keil Exp $ * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. @@ -15,43 +15,74 @@ #include #include "netjet.h" -const char *NETjet_S_revision = "$Revision: 2.7.6.6 $"; +const char *NETjet_S_revision = "$Revision: 2.13.2.4 $"; + +static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) +{ + return(5); +} + +static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value) +{ +} static irqreturn_t -nj_s_interrupt(int intno, void *dev_id, struct pt_regs *regs) +netjet_s_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val, sval; + u_char val, s1val, s0val; + u_long flags; - spin_lock(&cs->lock); - if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) & - NETJET_ISACIRQ)) { + spin_lock_irqsave(&cs->lock, flags); + s1val = bytein(cs->hw.njet.base + NETJET_IRQSTAT1); + if (!(s1val & NETJET_ISACIRQ)) { val = NETjet_ReadIC(cs, ISAC_ISTA); if (cs->debug & L1_DEB_ISAC) - debugl1(cs, "tiger: i1 %x %x", sval, val); + debugl1(cs, "tiger: i1 %x %x", s1val, val); if (val) { isac_interrupt(cs, val); NETjet_WriteIC(cs, ISAC_MASK, 0xFF); NETjet_WriteIC(cs, ISAC_MASK, 0x0); } - } + s1val = 1; + } else + s1val = 0; + /* + * read/write stat0 is better, because lower IRQ rate + * Note the IRQ is on for 125 us if a condition match + * thats long on modern CPU and so the IRQ is reentered + * all the time. + */ + s0val = bytein(cs->hw.njet.base + NETJET_IRQSTAT0); + if ((s0val | s1val)==0) { // shared IRQ + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; + } + if (s0val) + byteout(cs->hw.njet.base + NETJET_IRQSTAT0, s0val); /* start new code 13/07/00 GE */ /* set bits in sval to indicate which page is free */ if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) < inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ)) /* the 2nd write page is free */ - sval = 0x08; + s0val = 0x08; else /* the 1st write page is free */ - sval = 0x04; + s0val = 0x04; if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) < inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ)) /* the 2nd read page is free */ - sval = sval | 0x02; + s0val |= 0x02; else /* the 1st read page is free */ - sval = sval | 0x01; - if (sval != cs->hw.njet.last_is0) /* we have a DMA interrupt */ + s0val |= 0x01; + if (s0val != cs->hw.njet.last_is0) /* we have a DMA interrupt */ { - cs->hw.njet.irqstat0 = sval; + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + printk(KERN_WARNING "nj LOCK_ATOMIC s0val %x->%x\n", + cs->hw.njet.last_is0, s0val); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED;; + } + cs->hw.njet.irqstat0 = s0val; if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) != (cs->hw.njet.last_is0 & NETJET_IRQM0_READ)) /* we have a read dma int */ @@ -61,112 +92,58 @@ /* we have a write dma int */ write_tiger(cs); /* end new code 13/07/00 GE */ + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); } -/* if (!testcnt--) { - cs->hw.njet.dmactrl = 0; - byteout(cs->hw.njet.base + NETJET_DMACTRL, - cs->hw.njet.dmactrl); - byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0); - } -*/ - spin_unlock(&cs->lock); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static int -nj_s_reset(struct IsdnCardState *cs) +static void +reset_netjet_s(struct IsdnCardState *cs) { cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - cs->hw.njet.ctrl_reg = 0x40; /* Reset Off and status read clear */ + mdelay(10); + cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ /* now edge triggered for TJ320 GE 13/07/00 */ + /* see comment in IRQ function */ byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ + mdelay(10); cs->hw.njet.auxd = 0; cs->hw.njet.dmactrl = 0; byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); - return 0; } -static void -nj_s_init(struct IsdnCardState *cs) -{ - inittiger(cs); - initisac(cs); -} - -static struct card_ops nj_s_ops = { - .init = nj_s_init, - .reset = nj_s_reset, - .release = netjet_release, - .irq_func = nj_s_interrupt, -}; - -static int __init -nj_s_probe(struct IsdnCardState *cs, struct pci_dev *pdev) +static int +NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - if (pci_enable_device(pdev)) - goto err; - - pci_set_master(pdev); + u_long flags; - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.njet.pdev = pdev; - cs->hw.njet.base = pci_resource_start(pdev, 0); - if (!request_io(&cs->rs, cs->hw.njet.base, 0x100, "netjet-s isdn")) - return 0; - - cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; - cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; - - cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - - cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - - cs->hw.njet.auxd = 0xC0; - cs->hw.njet.dmactrl = 0; - - byteout(cs->hw.njet.auxa, 0); - byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); - byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); - byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); - - switch ((NETjet_ReadIC(cs, ISAC_RBCH) >> 5) & 3) { - case 0 : - break; - case 3 : - printk(KERN_WARNING "NETjet-S: NETspider-U PCI card found\n" ); - goto err; - default : - printk(KERN_WARNING "NETjet-S: No PCI card found\n" ); - goto err; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_netjet_s(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_netjet(cs); + return(0); + case CARD_INIT: + reset_netjet_s(cs); + inittiger(cs); + spin_lock_irqsave(&cs->lock, flags); + clear_pending_isac_ints(cs); + initisac(cs); + /* Reenable all IRQ */ + cs->writeisac(cs, ISAC_MASK, 0); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); } - printk(KERN_INFO - "NETjet-S: PCI card configured at %#lx IRQ %d\n", - cs->hw.njet.base, cs->irq); - - nj_s_reset(cs); - cs->irq_flags |= SA_SHIRQ; - cs->card_ops = &nj_s_ops; - isac_setup(cs, &netjet_dc_ops); - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + return(0); } static struct pci_dev *dev_netjet __initdata = NULL; @@ -174,32 +151,116 @@ int __init setup_netjet_s(struct IsdnCard *card) { + int bytecnt; + struct IsdnCardState *cs = card->cs; char tmp[64]; #ifdef __BIG_ENDIAN #error "not running on big endian machines now" #endif strcpy(tmp, NETjet_S_revision); - printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", - HiSax_getrev(tmp)); + printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_NETJET_S) + return(0); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + +#if CONFIG_PCI - dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet); - if (dev_netjet) { - /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG www.formula-n.com */ - if (dev_netjet->subsystem_vendor == 0x55 && - dev_netjet->subsystem_device == 0x02) { - printk(KERN_WARNING "Netjet: You tried to load this " - "driver with an incompatible TigerJet-card\n"); - printk(KERN_WARNING "Use type=41 for Formula-n " - "enter:now ISDN PCI and compatible\n"); - return 0; + for ( ;; ) + { + if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { + if (pci_enable_device(dev_netjet)) + return(0); + pci_set_master(dev_netjet); + cs->irq = dev_netjet->irq; + if (!cs->irq) { + printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.njet.base = pci_resource_start(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "NETjet-S: No IO-Adr for PCI card found\n"); + return(0); + } + /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG www.formula-n.com */ + if ((dev_netjet->subsystem_vendor == 0x55) && + (dev_netjet->subsystem_device == 0x02)) { + printk(KERN_WARNING "Netjet: You tried to load this driver with an incompatible TigerJet-card\n"); + printk(KERN_WARNING "Use type=41 for Formula-n enter:now ISDN PCI and compatible\n"); + return(0); + } + /* end new code */ + } else { + printk(KERN_WARNING "NETjet-S: No PCI card found\n"); + return(0); } - if (nj_s_probe(card->cs, dev_netjet)) - return 1; - return 0; + + cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; + cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; + + cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); + + cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); + + cs->hw.njet.auxd = 0xC0; + cs->hw.njet.dmactrl = 0; + + byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); + byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); + byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); + + switch ( ( ( NETjet_ReadIC( cs, ISAC_RBCH ) >> 5 ) & 3 ) ) + { + case 0 : + break; + + case 3 : + printk( KERN_WARNING "NETjet-S: NETspider-U PCI card found\n" ); + continue; + + default : + printk( KERN_WARNING "NETjet-S: No PCI card found\n" ); + return 0; + } + break; } - printk(KERN_WARNING "NETjet-S: No PCI card found\n"); - return 0; -} +#else + + printk(KERN_WARNING "NETjet-S: NO_PCI_BIOS\n"); + printk(KERN_WARNING "NETjet-S: unable to config NETJET-S PCI\n"); + return (0); + +#endif /* CONFIG_PCI */ + + bytecnt = 256; + printk(KERN_INFO + "NETjet-S: PCI card configured at %#lx IRQ %d\n", + cs->hw.njet.base, cs->irq); + if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %#lx-%#lx already in use\n", + CardType[card->typ], + cs->hw.njet.base, + cs->hw.njet.base + bytecnt); + return (0); + } + cs->readisac = &NETjet_ReadIC; + cs->writeisac = &NETjet_WriteIC; + cs->readisacfifo = &NETjet_ReadICfifo; + cs->writeisacfifo = &NETjet_WriteICfifo; + cs->BC_Read_Reg = &dummyrr; + cs->BC_Write_Reg = &dummywr; + cs->BC_Send_Data = &netjet_fill_dma; + setup_isac(cs); + cs->cardmsg = &NETjet_S_card_msg; + cs->irq_func = &netjet_s_interrupt; + cs->irq_flags |= SA_SHIRQ; + ISACVersion(cs, "NETjet-S:"); + return (1); +} diff -Nru a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c --- a/drivers/isdn/hisax/nj_u.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/nj_u.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: nj_u.c,v 2.8.6.6 2001/09/23 22:24:50 kai Exp $ +/* $Id: nj_u.c,v 2.14.2.3 2004/01/13 14:31:26 keil Exp $ * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. @@ -15,15 +15,25 @@ #include #include "netjet.h" -const char *NETjet_U_revision = "$Revision: 2.8.6.6 $"; +const char *NETjet_U_revision = "$Revision: 2.14.2.3 $"; + +static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) +{ + return(5); +} + +static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value) +{ +} static irqreturn_t -nj_u_interrupt(int intno, void *dev_id, struct pt_regs *regs) +netjet_u_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val, sval; + u_char val, sval; + u_long flags; - spin_lock(&cs->lock); + spin_lock_irqsave(&cs->lock, flags); if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) & NETJET_ISACIRQ)) { val = NETjet_ReadIC(cs, ICC_ISTA); @@ -51,6 +61,10 @@ sval = sval | 0x01; if (sval != cs->hw.njet.last_is0) /* we have a DMA interrupt */ { + if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; + } cs->hw.njet.irqstat0 = sval; if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) != (cs->hw.njet.last_is0 & NETJET_IRQM0_READ)) @@ -61,113 +75,58 @@ /* we have a write dma int */ write_tiger(cs); /* end new code 13/07/00 GE */ + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); } -/* if (!testcnt--) { - cs->hw.njet.dmactrl = 0; - byteout(cs->hw.njet.base + NETJET_DMACTRL, - cs->hw.njet.dmactrl); - byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0); - } -*/ - spin_unlock(&cs->lock); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static int -nj_u_reset(struct IsdnCardState *cs) +static void +reset_netjet_u(struct IsdnCardState *cs) { cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ + mdelay(10); cs->hw.njet.ctrl_reg = 0x40; /* Reset Off and status read clear */ /* now edge triggered for TJ320 GE 13/07/00 */ byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - + mdelay(10); cs->hw.njet.auxd = 0xC0; cs->hw.njet.dmactrl = 0; byteout(cs->hw.njet.auxa, 0); byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); - return 0; } -static void -nj_u_init(struct IsdnCardState *cs) +static int +NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - inittiger(cs); - initicc(cs); - /* Reenable all IRQ */ - NETjet_WriteIC(cs, ICC_MASK, 0); -} - -static struct card_ops nj_u_ops = { - .init = nj_u_init, - .reset = nj_u_reset, - .release = netjet_release, - .irq_func = nj_u_interrupt, -}; - -static int __init -nj_u_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - if (pci_enable_device(pdev)) - goto err; - - pci_set_master(pdev); - - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.njet.pdev = pdev; - cs->hw.njet.base = pci_resource_start(pdev, 0); - if (!request_io(&cs->rs, cs->hw.njet.base, 0x100, "netspider-u isdn")) - goto err; - - cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; - cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; - - cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - - cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); /* Timeout 10ms */ - - cs->hw.njet.auxd = 0xC0; - cs->hw.njet.dmactrl = 0; - - byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); - byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); - byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); + u_long flags; - switch ((NETjet_ReadIC(cs, ICC_RBCH) >> 5) & 3) { - case 3: - break; - case 0: - printk(KERN_WARNING "NETspider-U: NETjet-S PCI card found\n" ); - goto err; - default: - printk(KERN_WARNING "NETspider-U: No PCI card found\n" ); - goto err; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_netjet_u(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_netjet(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inittiger(cs); + reset_netjet_u(cs); + clear_pending_icc_ints(cs); + initicc(cs); + /* Reenable all IRQ */ + cs->writeisac(cs, ICC_MASK, 0); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); } - printk(KERN_INFO "NETspider-U: PCI card configured at %#lx IRQ %d\n", - cs->hw.njet.base, cs->irq); - - nj_u_reset(cs); - cs->card_ops = &nj_u_ops; - icc_setup(cs, &netjet_dc_ops); - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + return(0); } static struct pci_dev *dev_netjet __initdata = NULL; @@ -175,21 +134,111 @@ int __init setup_netjet_u(struct IsdnCard *card) { + int bytecnt; + struct IsdnCardState *cs = card->cs; char tmp[64]; +#if CONFIG_PCI +#endif #ifdef __BIG_ENDIAN #error "not running on big endian machines now" #endif strcpy(tmp, NETjet_U_revision); - printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", - HiSax_getrev(tmp)); - - dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet); - if (dev_netjet) { - if (nj_u_probe(card->cs, dev_netjet)) - return 1; - return 0; + printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_NETJET_U) + return(0); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + +#if CONFIG_PCI + + for ( ;; ) + { + if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { + if (pci_enable_device(dev_netjet)) + return(0); + pci_set_master(dev_netjet); + cs->irq = dev_netjet->irq; + if (!cs->irq) { + printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.njet.base = pci_resource_start(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n"); + return(0); + } + } else { + printk(KERN_WARNING "NETspider-U: No PCI card found\n"); + return(0); + } + + cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; + cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; + mdelay(10); + + cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); + + cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); + + cs->hw.njet.auxd = 0xC0; + cs->hw.njet.dmactrl = 0; + + byteout(cs->hw.njet.auxa, 0); + byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); + byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); + byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); + + switch ( ( ( NETjet_ReadIC( cs, ICC_RBCH ) >> 5 ) & 3 ) ) + { + case 3 : + break; + + case 0 : + printk( KERN_WARNING "NETspider-U: NETjet-S PCI card found\n" ); + continue; + + default : + printk( KERN_WARNING "NETspider-U: No PCI card found\n" ); + return 0; + } + break; } - printk(KERN_WARNING "NETspider-U: No PCI card found\n"); - return 0; +#else + + printk(KERN_WARNING "NETspider-U: NO_PCI_BIOS\n"); + printk(KERN_WARNING "NETspider-U: unable to config NETspider-U PCI\n"); + return (0); + +#endif /* CONFIG_PCI */ + + bytecnt = 256; + + printk(KERN_INFO + "NETspider-U: PCI card configured at %#lx IRQ %d\n", + cs->hw.njet.base, cs->irq); + if (!request_region(cs->hw.njet.base, bytecnt, "netspider-u isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %#lx-%#lx already in use\n", + CardType[card->typ], + cs->hw.njet.base, + cs->hw.njet.base + bytecnt); + return (0); + } + setup_icc(cs); + cs->readisac = &NETjet_ReadIC; + cs->writeisac = &NETjet_WriteIC; + cs->readisacfifo = &NETjet_ReadICfifo; + cs->writeisacfifo = &NETjet_WriteICfifo; + cs->BC_Read_Reg = &dummyrr; + cs->BC_Write_Reg = &dummywr; + cs->BC_Send_Data = &netjet_fill_dma; + cs->cardmsg = &NETjet_U_card_msg; + cs->irq_func = &netjet_u_interrupt; + cs->irq_flags |= SA_SHIRQ; + ICCVersion(cs, "NETspider-U:"); + return (1); } diff -Nru a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c --- a/drivers/isdn/hisax/q931.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/q931.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: q931.c,v 1.10.6.3 2001/09/23 22:24:50 kai Exp $ +/* $Id: q931.c,v 1.12.2.3 2004/01/13 14:31:26 keil Exp $ * * code to decode ITU Q.931 call control messages * @@ -21,9 +21,9 @@ #include "l3_1tr6.h" void -iecpy(u8 * dest, u8 * iestart, int ieoffset) +iecpy(u_char * dest, u_char * iestart, int ieoffset) { - u8 *p; + u_char *p; int l; p = iestart + ieoffset + 2; @@ -38,7 +38,7 @@ */ static struct MessageType { - u8 nr; + u_char nr; char *descr; } mtlist[] = { @@ -198,7 +198,7 @@ static int -prbits(char *dest, u8 b, int start, int len) +prbits(char *dest, u_char b, int start, int len) { char *dp = dest; @@ -214,8 +214,8 @@ } static -u8 * -skipext(u8 * p) +u_char * +skipext(u_char * p) { while (!(*p++ & 0x80)); return (p); @@ -230,7 +230,7 @@ static struct CauseValue { - u8 nr; + u_char nr; char *edescr; char *ddescr; } cvlist[] = { @@ -442,11 +442,11 @@ static int -prcause(char *dest, u8 * p) +prcause(char *dest, u_char * p) { - u8 *end; + u_char *end; char *dp = dest; - u_int i, cause; + int i, cause; end = p + p[1] + 1; p += 2; @@ -519,7 +519,7 @@ int cause_1tr6_len = (sizeof(cause_1tr6) / sizeof(struct MessageType)); static int -prcause_1tr6(char *dest, u8 * p) +prcause_1tr6(char *dest, u_char * p) { char *dp = dest; int i, cause; @@ -554,7 +554,7 @@ } static int -prchident(char *dest, u8 * p) +prchident(char *dest, u_char * p) { char *dp = dest; @@ -566,7 +566,7 @@ } static int -prcalled(char *dest, u8 * p) +prcalled(char *dest, u_char * p) { int l; char *dp = dest; @@ -583,7 +583,7 @@ return (dp - dest); } static int -prcalling(char *dest, u8 * p) +prcalling(char *dest, u_char * p) { int l; char *dp = dest; @@ -610,7 +610,7 @@ static int -prbearer(char *dest, u8 * p) +prbearer(char *dest, u_char * p) { char *dp = dest, ch; @@ -658,10 +658,10 @@ static int -prbearer_ni1(char *dest, u8 * p) +prbearer_ni1(char *dest, u_char * p) { char *dp = dest; - u8 len; + u_char len; p++; len = *p++; @@ -715,7 +715,7 @@ } static int -general(char *dest, u8 * p) +general(char *dest, u_char * p) { char *dp = dest; char ch = ' '; @@ -742,7 +742,7 @@ } static int -general_ni1(char *dest, u8 * p) +general_ni1(char *dest, u_char * p) { char *dp = dest; char ch = ' '; @@ -769,7 +769,7 @@ } static int -prcharge(char *dest, u8 * p) +prcharge(char *dest, u_char * p) { char *dp = dest; int l; @@ -786,7 +786,7 @@ return (dp - dest); } static int -prtext(char *dest, u8 * p) +prtext(char *dest, u_char * p) { char *dp = dest; int l; @@ -802,7 +802,7 @@ } static int -prfeatureind(char *dest, u8 * p) +prfeatureind(char *dest, u_char * p) { char *dp = dest; @@ -839,7 +839,7 @@ static struct DTag { /* Display tags */ - u8 nr; + u_char nr; char *descr; } dtaglist[] = { { 0x82, "Continuation" }, @@ -868,11 +868,10 @@ #define DTAGSIZE sizeof(dtaglist)/sizeof(struct DTag) static int -disptext_ni1(char *dest, u8 * p) +disptext_ni1(char *dest, u_char * p) { char *dp = dest; - int l, tag, len; - u_int i; + int l, tag, len, i; p++; l = *p++ - 1; @@ -908,7 +907,7 @@ return (dp - dest); } static int -display(char *dest, u8 * p) +display(char *dest, u_char * p) { char *dp = dest; char ch = ' '; @@ -937,7 +936,7 @@ } int -prfacility(char *dest, u8 * p) +prfacility(char *dest, u_char * p) { char *dp = dest; int l, l2; @@ -968,9 +967,9 @@ static struct InformationElement { - u8 nr; + u_char nr; char *descr; - int (*f) (char *, u8 *); + int (*f) (char *, u_char *); } ielist[] = { { @@ -1149,11 +1148,11 @@ #define WE_6_LEN (sizeof(we_6) / sizeof(struct InformationElement)) int -QuickHex(char *txt, u8 * p, int cnt) +QuickHex(char *txt, u_char * p, int cnt) { register int i; register char *t = txt; - register u8 w; + register u_char w; for (i = 0; i < cnt; i++) { *t++ = ' '; @@ -1173,7 +1172,7 @@ } void -LogFrame(struct IsdnCardState *cs, u8 * buf, int size) +LogFrame(struct IsdnCardState *cs, u_char * buf, int size) { char *dp; @@ -1197,11 +1196,11 @@ void dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) { - u8 *bend, *buf; + u_char *bend, *buf; char *dp; unsigned char pd, cr_l, cr, mt; unsigned char sapi, tei, ftyp; - u_int i, cset = 0, cs_old = 0, cs_fest = 0; + int i, cset = 0, cs_old = 0, cs_fest = 0; int size, finish = 0; if (skb->len < 3) diff -Nru a/drivers/isdn/hisax/rawhdlc.c b/drivers/isdn/hisax/rawhdlc.c --- a/drivers/isdn/hisax/rawhdlc.c Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,543 +0,0 @@ -/* $Id: rawhdlc.c,v 1.5.6.2 2001/09/23 22:24:51 kai Exp $ - * - * support routines for cards that don't support HDLC - * - * Author Brent Baccala - * Copyright by Karsten Keil - * by Brent Baccala - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - * - * - * Some passive ISDN cards, such as the Traverse NETJet and the AMD 7930, - * don't perform HDLC encapsulation over the B channel. Drivers for - * such cards use support routines in this file to perform B channel HDLC. - * - * Bit-synchronous HDLC encapsulation is a means of encapsulating packets - * over a continuously transmitting serial communications link. - * It looks like this: - * - * 11111111101111110...........0111111011111111111 - * iiiiiiiiiffffffffdddddddddddffffffffiiiiiiiiiii - * - * i = idle f = flag d = data - * - * When idle, the channel sends a continuous string of ones (mark - * idle; illustrated), or a continuous string of flag characters (flag - * idle). The beginning of a data frame is marked by a flag character - * (01111110), then comes the actual data, followed by another flag - * character, after which another frame may be sent immediately (a - * single flag may serve as both the end of one frame and the start of - * the next), or the link may return to idle. Obviously, the flag - * character can not appear anywhere in the data (or a false - * end-of-frame would occur), so the transmitter performs - * "bit-stuffing" - inserting a zero bit after every five one bits, - * irregardless of the original bit after the five ones. Byte - * ordering is irrelevant at this point - the data is treated as a - * string of bits, not bytes. Since no more than 5 ones may now occur - * in a row, the flag sequence, with its 6 ones, is unique. - * - * Upon reception, a zero bit that occur after 5 one bits is simply - * discarded. A series of 6 one bits is end-of-frame, and a series of - * 7 one bits is an abort. Once bit-stuffing has been corrected for, - * an integer number of bytes should now be present. The last two - * of these bytes form the Frame Check Sequence, a CRC that is verified - * and then discarded. Note that bit-stuffing is performed on the FCS - * just as if it were regular data. - * - * - * - * int make_raw_hdlc_data(u8 *src, u_int slen, - * u8 *dst, u_int dsize) - * - * Used for transmission. Copies slen bytes from src to dst, performing - * HDLC encapsulation (flag bytes, bit-stuffing, CRC) in the process. - * dsize is size of destination buffer, and should be at least - * ((6*slen)/5)+5 bytes to ensure adequate space will be available. - * Function returns length (in bytes) of valid destination buffer, or - * 0 upon destination overflow. - * - * void init_hdlc_state(struct hdlc_state *stateptr, int mode) - * - * Initializes hdlc_state structure before first call to read_raw_hdlc_data - * - * mode = 0: Sane mode - * mode = 1/2: - * Insane mode; NETJet use a shared unsigned int memory block ( - * with busmaster DMA), the bit pattern of every word is - * <8 B1> <8 B2> <8 Mon> <2 D> <4 C/I> - * according to Siemens IOM-2 interface, so we have to handle - * the src buffer as unsigned int and have to shift/mask the - * B-channel bytes. - * mode 1 -> B1 mode 2 -> B2 data is used - * - * int read_raw_hdlc_data(struct hdlc_state *saved_state, - * u8 *src, u_int slen, - * u8 *dst, u_int dsize) - * - * Used for reception. Scans source buffer bit-by-bit looking for - * valid HDLC frames, which are copied to destination buffer. HDLC - * state information is stored in a structure, which allows this - * function to process frames spread across several blocks of raw - * HDLC data. Part of the state information is bit offsets into - * the source and destination buffers. - * - * A return value >0 indicates the length of a valid frame, now - * stored in the destination buffer. In this case, the source - * buffer might not be completely processed, so this function should - * be called again with the same source buffer, possibly with a - * different destination buffer. - * - * A return value of zero indicates that the source buffer was - * completely processed without finding a valid end-of-packet; - * however, we might be in the middle of packet reception, so - * the function should be called again with the next block of - * raw HDLC data and the same destination buffer. It is NOT - * permitted to change the destination buffer in this case, - * since data may already have begun to be stored there. - * - * A return value of -1 indicates some kind of error - destination - * buffer overflow, CRC check failed, frame not a multiple of 8 - * bits. Destination buffer probably contains invalid data, which - * should be discarded. Call function again with same source buffer - * and a new (or same) destination buffer. - * - * Suggested calling sequence: - * - * init_hdlc_state(...); - * for (EACH_RAW_DATA_BLOCK) { - * while (len = read_raw_hdlc_data(...)) { - * if (len == -1) DISCARD_FRAME; - * else PROCESS_FRAME; - * } - * } - * - * - * Test the code in this file as follows: - * gcc -DDEBUGME -o rawhdlctest rawhdlc.c - * ./rawhdlctest < rawdata - * - * The file "rawdata" can be easily generated from a HISAX B-channel - * hex dump (CF CF CF 02 ...) using the following perl script: - * - * while(<>) { - * @hexlist = split ' '; - * while ($hexstr = shift(@hexlist)) { - * printf "%c", hex($hexstr); - * } - * } - * - */ - -#ifdef DEBUGME -#include -#endif - -#include -#include -#include "rawhdlc.h" - -/* There's actually an identical copy of this table in the PPP code - * (ppp_crc16_table), but I don't want this code dependent on PPP - */ - -// static -__u16 fcstab[256] = -{ - 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, - 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, - 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, - 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, - 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, - 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, - 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, - 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, - 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, - 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, - 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, - 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, - 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, - 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, - 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, - 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, - 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, - 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, - 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, - 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, - 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, - 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, - 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, - 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, - 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, - 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, - 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, - 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, - 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, - 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, - 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, - 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 -}; - -#define HDLC_ZERO_SEARCH 0 -#define HDLC_FLAG_SEARCH 1 -#define HDLC_FLAG_FOUND 2 -#define HDLC_FRAME_FOUND 3 -#define HDLC_NULL 4 -#define HDLC_PART 5 -#define HDLC_FULL 6 - -#define HDLC_FLAG_VALUE 0x7e - - -#define MAKE_RAW_BYTE for (j=0; j<8; j++) { \ - bitcnt++;\ - out_val >>= 1;\ - if (val & 1) {\ - s_one++;\ - out_val |= 0x80;\ - } else {\ - s_one = 0;\ - out_val &= 0x7f;\ - }\ - if (bitcnt==8) {\ - if (d_cnt == dsize) return 0;\ - dst[d_cnt++] = out_val;\ - bitcnt = 0;\ - }\ - if (s_one == 5) {\ - out_val >>= 1;\ - out_val &= 0x7f;\ - bitcnt++;\ - s_one = 0;\ - }\ - if (bitcnt==8) {\ - if (d_cnt == dsize) return 0;\ - dst[d_cnt++] = out_val;\ - bitcnt = 0;\ - }\ - val >>= 1;\ - } - -/* Optimization suggestion: If needed, this function could be - * dramatically sped up using a state machine. Each state would - * correspond to having seen N one bits, and being offset M bits into - * the current output byte. N ranges from 0 to 4, M from 0 to 7, so - * we need 5*8 = 35 states. Each state would have a table with 256 - * entries, one for each input character. Each entry would contain - * three output characters, an output state, an a byte increment - * that's either 1 or 2. All this could fit in four bytes; so we need - * 4 bytes * 256 characters = 1 KB for each state (35 KB total). Zero - * the output buffer before you start. For each character in your - * input, you look it up in the current state's table and get three - * bytes to be or'ed into the output at the current byte offset, and - * an byte increment to move your pointer forward. A simple Perl - * script could generate the tables. Given HDLC semantics, probably - * would be better to set output to all 1s, then use ands instead of ors. - * A smaller state machine could operate on nibbles instead of bytes. - * A state machine for 32-bit architectures could use word offsets - * instead of byte offsets, requiring 5*32 = 160 states; probably - * best to work on nibbles in such a case. - */ - - -int make_raw_hdlc_data(u8 *src, u_int slen, u8 *dst, u_int dsize) -{ - register u_int i,d_cnt=0; - register u8 j; - register u8 val; - register u8 s_one = 0; - register u8 out_val = 0; - register u8 bitcnt = 0; - u_int fcs; - - - dst[d_cnt++] = HDLC_FLAG_VALUE; - fcs = PPP_INITFCS; - for (i=0; i>8) & 0xff; - MAKE_RAW_BYTE; - val = HDLC_FLAG_VALUE; - for (j=0; j<8; j++) { - bitcnt++; - out_val >>= 1; - if (val & 1) - out_val |= 0x80; - else - out_val &= 0x7f; - if (bitcnt==8) { - if (d_cnt == dsize) return 0; - dst[d_cnt++] = out_val; - bitcnt = 0; - } - val >>= 1; - } - if (bitcnt) { - while (8>bitcnt++) { - out_val >>= 1; - out_val |= 0x80; - } - if (d_cnt == dsize) return 0; - dst[d_cnt++] = out_val; - } - - return d_cnt; -} - -void init_hdlc_state(struct hdlc_state *stateptr, int mode) -{ - stateptr->state = HDLC_ZERO_SEARCH; - stateptr->r_one = 0; - stateptr->r_val = 0; - stateptr->o_bitcnt = 0; - stateptr->i_bitcnt = 0; - stateptr->insane_mode = mode; -} - -/* Optimization suggestion: A similar state machine could surely - * be developed for this function as well. - */ - -int read_raw_hdlc_data(struct hdlc_state *saved_state, - u8 *src, u_int slen, u8 *dst, u_int dsize) -{ - int retval=0; - register u8 val; - register u8 state = saved_state->state; - register u8 r_one = saved_state->r_one; - register u8 r_val = saved_state->r_val; - register u_int o_bitcnt = saved_state->o_bitcnt; - register u_int i_bitcnt = saved_state->i_bitcnt; - register u_int fcs = saved_state->fcs; - register u_int *isrc = (u_int *) src; - - /* Use i_bitcnt (bit offset into source buffer) to reload "val" - * in case we're starting up again partway through a source buffer - */ - - if ((i_bitcnt >> 3) < slen) { - if (saved_state->insane_mode==1) { - val = isrc[(i_bitcnt >> 3)] & 0xff; - } else if (saved_state->insane_mode==2) { - val = (isrc[i_bitcnt >> 3] >>8) & 0xff; - } else { - val = src[i_bitcnt >> 3]; - } - val >>= i_bitcnt & 7; - } - - /* One bit per loop. Keep going until we've got something to - * report (retval != 0), or we exhaust the source buffer - */ - - while ((retval == 0) && ((i_bitcnt >> 3) < slen)) { - if ((i_bitcnt & 7) == 0) { - if (saved_state->insane_mode==1) { - val = isrc[(i_bitcnt >> 3)] & 0xff; - } else if (saved_state->insane_mode==2) { - val = (isrc[i_bitcnt >> 3] >>8) & 0xff; - } else { - val = src[i_bitcnt >> 3]; - } -#ifdef DEBUGME - printf("Input byte %d: 0x%2x\n", i_bitcnt>>3, val); -#endif - if (val == 0xff) { - state = HDLC_ZERO_SEARCH; - o_bitcnt = 0; - r_one = 0; - i_bitcnt += 8; - continue; - } - } - -#ifdef DEBUGME - /* printf("Data bit=%d (%d/%d)\n", val&1, i_bitcnt>>3, i_bitcnt&7);*/ -#endif - - if (state == HDLC_ZERO_SEARCH) { - if (val & 1) { - r_one++; - } else { - r_one=0; - state= HDLC_FLAG_SEARCH; - } - } else if (state == HDLC_FLAG_SEARCH) { - if (val & 1) { - r_one++; - if (r_one>6) { - state=HDLC_ZERO_SEARCH; - } - } else { - if (r_one==6) { - o_bitcnt=0; - r_val=0; - state=HDLC_FLAG_FOUND; - } - r_one=0; - } - } else if (state == HDLC_FLAG_FOUND) { - if (val & 1) { - r_one++; - if (r_one>6) { - state=HDLC_ZERO_SEARCH; - } else { - r_val >>= 1; - r_val |= 0x80; - o_bitcnt++; - } - } else { - if (r_one==6) { - o_bitcnt=0; - r_val=0; - r_one=0; - i_bitcnt++; - val >>= 1; - continue; - } else if (r_one!=5) { - r_val >>= 1; - r_val &= 0x7f; - o_bitcnt++; - } - r_one=0; - } - if ((state != HDLC_ZERO_SEARCH) && - !(o_bitcnt & 7)) { -#ifdef DEBUGME - printf("HDLC_FRAME_FOUND at i_bitcnt:%d\n",i_bitcnt); -#endif - state=HDLC_FRAME_FOUND; - fcs = PPP_INITFCS; - dst[0] = r_val; - fcs = PPP_FCS (fcs, r_val); - } - } else if (state == HDLC_FRAME_FOUND) { - if (val & 1) { - r_one++; - if (r_one>6) { - state=HDLC_ZERO_SEARCH; - o_bitcnt=0; - } else { - r_val >>= 1; - r_val |= 0x80; - o_bitcnt++; - } - } else { - if (r_one==6) { - r_val=0; - r_one=0; - o_bitcnt++; - if (o_bitcnt & 7) { - /* Alignment error */ -#ifdef DEBUGME - printf("Alignment error\n"); -#endif - state=HDLC_FLAG_SEARCH; - retval = -1; - } else if (fcs==PPP_GOODFCS) { - /* Valid frame */ - state=HDLC_FLAG_FOUND; - retval = (o_bitcnt>>3)-3; - } else { - /* CRC error */ -#ifdef DEBUGME - printf("CRC error; fcs was 0x%x, should have been 0x%x\n", fcs, PPP_GOODFCS); -#endif - state=HDLC_FLAG_FOUND; - retval = -1; - } - } else if (r_one==5) { - r_one=0; - i_bitcnt++; - val >>= 1; - continue; - } else { - r_val >>= 1; - r_val &= 0x7f; - o_bitcnt++; - } - r_one=0; - } - if ((state == HDLC_FRAME_FOUND) && - !(o_bitcnt & 7)) { - if ((o_bitcnt>>3)>=dsize) { - /* Buffer overflow error */ -#ifdef DEBUGME - printf("Buffer overflow error\n"); -#endif - r_val=0; - state=HDLC_FLAG_SEARCH; - retval = -1; - } else { - dst[(o_bitcnt>>3)-1] = r_val; - fcs = PPP_FCS (fcs, r_val); -#ifdef DEBUGME - printf("Output byte %d: 0x%02x; FCS 0x%04x\n", (o_bitcnt>>3)-1, r_val, fcs); -#endif - } - } - } - i_bitcnt ++; - val >>= 1; - } - - /* We exhausted the source buffer before anything else happened - * (retval==0). Reset i_bitcnt in expectation of a new source - * buffer. Other, we either had an error or a valid frame, so - * reset o_bitcnt in expectation of a new destination buffer. - */ - - if (retval == 0) { - i_bitcnt = 0; - } else { - o_bitcnt = 0; - } - - saved_state->state = state; - saved_state->r_one = r_one; - saved_state->r_val = r_val; - saved_state->fcs = fcs; - saved_state->o_bitcnt = o_bitcnt; - saved_state->i_bitcnt = i_bitcnt; - - return (retval); -} - - - -#ifdef DEBUGME - -char buffer[1024]; -char obuffer[1024]; - -main() -{ - int buflen=0; - int len; - struct hdlc_state hdlc_state; - - while((buffer[buflen] = getc(stdin)) != EOF && buflen<1024) buflen++; - - printf("buflen = %d\n", buflen); - - init_hdlc_state(&hdlc_state, 0); - - while (len = read_raw_hdlc_data(&hdlc_state,buffer,buflen,obuffer,1024)) { - if (len == -1) printf("Error @ byte %d/bit %d\n", - hdlc_state.i_bitcnt>>3, hdlc_state.i_bitcnt & 7); - else { - printf("Frame received: len %d\n", len); - } - } - - printf("Done\n"); -} - -#endif diff -Nru a/drivers/isdn/hisax/rawhdlc.h b/drivers/isdn/hisax/rawhdlc.h --- a/drivers/isdn/hisax/rawhdlc.h Thu Feb 19 23:44:27 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,28 +0,0 @@ -/* $Id: rawhdlc.h,v 1.3.6.2 2001/09/23 22:24:51 kai Exp $ - * - * Author Brent Baccala - * Copyright by Brent Baccala - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - * - */ - -#ifndef RAWHDLC_H -struct hdlc_state { - char insane_mode; - u8 state; - u8 r_one; - u8 r_val; - u_int o_bitcnt; - u_int i_bitcnt; - u_int fcs; -}; - - -int make_raw_hdlc_data(u8 *src, u_int slen, u8 *dst, u_int dsize); -void init_hdlc_state(struct hdlc_state *stateptr, int mode); -int read_raw_hdlc_data(struct hdlc_state *saved_state, - u8 *src, u_int slen, u8 *dst, u_int dsize); -#define RAWHDLC_H -#endif diff -Nru a/drivers/isdn/hisax/s0box.c b/drivers/isdn/hisax/s0box.c --- a/drivers/isdn/hisax/s0box.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/s0box.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: s0box.c,v 2.4.6.2 2001/09/23 22:24:51 kai Exp $ +/* $Id: s0box.c,v 2.6.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for Creatix S0BOX * @@ -17,16 +17,10 @@ #include "isdnl1.h" extern const char *CardType[]; -const char *s0box_revision = "$Revision: 2.4.6.2 $"; -static spinlock_t s0box_lock = SPIN_LOCK_UNLOCKED; +const char *s0box_revision = "$Revision: 2.6.2.4 $"; static inline void -writereg(struct IsdnCardState *cs, int addr, u8 off, u8 val) -{ - unsigned long flags; - unsigned long padr = cs->hw.teles3.cfg_reg; - - spin_lock_irqsave(&s0box_lock, flags); +writereg(unsigned int padr, signed int addr, u_char off, u_char val) { outb_p(0x1c,padr+2); outb_p(0x14,padr+2); outb_p((addr+off)&0x7f,padr); @@ -35,21 +29,16 @@ outb_p(0x17,padr+2); outb_p(0x14,padr+2); outb_p(0x1c,padr+2); - spin_unlock_irqrestore(&s0box_lock, flags); } -static u8 nibtab[] = { 1, 9, 5, 0xd, 3, 0xb, 7, 0xf, +static u_char nibtab[] = { 1, 9, 5, 0xd, 3, 0xb, 7, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 0xc, 2, 0xa, 6, 0xe } ; -static inline u8 -readreg(struct IsdnCardState *cs, int addr, u8 off) -{ - u8 n1, n2; - unsigned long flags; - unsigned long padr = cs->hw.teles3.cfg_reg; +static inline u_char +readreg(unsigned int padr, signed int addr, u_char off) { + register u_char n1, n2; - spin_lock_irqsave(&s0box_lock, flags); outb_p(0x1c,padr+2); outb_p(0x14,padr+2); outb_p((addr+off)|0x80,padr); @@ -60,16 +49,14 @@ n2 = (inb_p(padr+1) >> 3) & 0x17; outb_p(0x14,padr+2); outb_p(0x1c,padr+2); - spin_unlock_irqrestore(&s0box_lock, flags); return nibtab[n1] | (nibtab[n2] << 4); } static inline void -read_fifo(struct IsdnCardState *cs, signed int adr, u8 * data, int size) +read_fifo(unsigned int padr, signed int adr, u_char * data, int size) { int i; - u8 n1, n2; - unsigned long padr = cs->hw.teles3.cfg_reg; + register u_char n1, n2; outb_p(0x1c, padr+2); outb_p(0x14, padr+2); @@ -84,14 +71,13 @@ } outb_p(0x14,padr+2); outb_p(0x1c,padr+2); + return; } static inline void -write_fifo(struct IsdnCardState *cs, signed int adr, u8 * data, int size) +write_fifo(unsigned int padr, signed int adr, u_char * data, int size) { int i; - unsigned long padr = cs->hw.teles3.cfg_reg; - outb_p(0x1c, padr+2); outb_p(0x14, padr+2); outb_p(adr&0x7f, padr); @@ -102,79 +88,140 @@ } outb_p(0x14,padr+2); outb_p(0x1c,padr+2); + return; } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.teles3.isac, offset); + return (readreg(cs->hw.teles3.cfg_reg, cs->hw.teles3.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.teles3.isac, offset, value); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - read_fifo(cs, cs->hw.teles3.isacfifo, data, size); + read_fifo(cs->hw.teles3.cfg_reg, cs->hw.teles3.isacfifo, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - write_fifo(cs, cs->hw.teles3.isacfifo, data, size); + write_fifo(cs->hw.teles3.cfg_reg, cs->hw.teles3.isacfifo, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return readreg(cs, cs->hw.teles3.hscx[hscx], offset); + return (readreg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[hscx], offset)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writereg(cs, cs->hw.teles3.hscx[hscx], offset, value); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[hscx], offset, value); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - read_fifo(cs, cs->hw.teles3.hscxfifo[hscx], data, size); +/* + * fast interrupt HSCX stuff goes here + */ + +#define READHSCX(cs, nr, reg) readreg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[nr], reg) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[nr], reg, data) +#define READHSCXFIFO(cs, nr, ptr, cnt) read_fifo(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscxfifo[nr], ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) write_fifo(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscxfifo[nr], ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +s0box_interrupt(int intno, void *dev_id, struct pt_regs *regs) +{ +#define MAXCOUNT 5 + struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; + int count = 0; + + spin_lock_irqsave(&cs->lock, flags); + val = readreg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[1], HSCX_ISTA); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.teles3.cfg_reg, cs->hw.teles3.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + count++; + val = readreg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[1], HSCX_ISTA); + if (val && count < MAXCOUNT) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.teles3.cfg_reg, cs->hw.teles3.isac, ISAC_ISTA); + if (val && count < MAXCOUNT) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + if (count >= MAXCOUNT) + printk(KERN_WARNING "S0Box: more than %d loops in s0box_interrupt\n", count); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[0], HSCX_MASK, 0xFF); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[1], HSCX_MASK, 0xFF); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.isac, ISAC_MASK, 0x0); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[0], HSCX_MASK, 0x0); + writereg(cs->hw.teles3.cfg_reg, cs->hw.teles3.hscx[1], HSCX_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +void +release_io_s0box(struct IsdnCardState *cs) +{ + release_region(cs->hw.teles3.cfg_reg, 8); +} + +static int +S0Box_card_msg(struct IsdnCardState *cs, int mt, void *arg) +{ + u_long flags; + + switch (mt) { + case CARD_RESET: + break; + case CARD_RELEASE: + release_io_s0box(cs); + break; + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + break; + case CARD_TEST: + break; + } + return(0); } -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +int __init +setup_s0box(struct IsdnCard *card) { - write_fifo(cs, cs->hw.teles3.hscxfifo[hscx], data, size); -} + struct IsdnCardState *cs = card->cs; + char tmp[64]; -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static struct card_ops s0box_ops = { - .init = inithscxisac, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; + strcpy(tmp, s0box_revision); + printk(KERN_INFO "HiSax: S0Box IO driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_S0BOX) + return (0); -static int __init -s0box_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ cs->hw.teles3.cfg_reg = card->para[1]; cs->hw.teles3.hscx[0] = -0x20; cs->hw.teles3.hscx[1] = 0x0; @@ -183,32 +230,37 @@ cs->hw.teles3.hscxfifo[0] = cs->hw.teles3.hscx[0] + 0x3e; cs->hw.teles3.hscxfifo[1] = cs->hw.teles3.hscx[1] + 0x3e; cs->irq = card->para[0]; - if (!request_io(&cs->rs, cs->hw.teles3.cfg_reg, 8, "S0Box parallel I/O")) - goto err; + if (!request_region(cs->hw.teles3.cfg_reg,8, "S0Box parallel I/O")) { + printk(KERN_WARNING + "HiSax: %s ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.teles3.cfg_reg, + cs->hw.teles3.cfg_reg + 7); + return 0; + } printk(KERN_INFO - "HiSax: %s config irq:%d isac:0x%x cfg:0x%x\n", - CardType[cs->typ], cs->irq, - cs->hw.teles3.isac, cs->hw.teles3.cfg_reg); + "HiSax: %s config irq:%d isac:0x%x cfg:0x%x\n", + CardType[cs->typ], cs->irq, + cs->hw.teles3.isac, cs->hw.teles3.cfg_reg); printk(KERN_INFO - "HiSax: hscx A:0x%x hscx B:0x%x\n", - cs->hw.teles3.hscx[0], cs->hw.teles3.hscx[1]); - cs->card_ops = &s0box_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -int __init -setup_s0box(struct IsdnCard *card) -{ - char tmp[64]; - - strcpy(tmp, s0box_revision); - printk(KERN_INFO "HiSax: S0Box IO driver Rev. %s\n", HiSax_getrev(tmp)); - if (s0box_probe(card->cs, card)) - return 0; - return 1; + "HiSax: hscx A:0x%x hscx B:0x%x\n", + cs->hw.teles3.hscx[0], cs->hw.teles3.hscx[1]); + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &S0Box_card_msg; + cs->irq_func = &s0box_interrupt; + ISACVersion(cs, "S0Box:"); + if (HscxVersion(cs, "S0Box:")) { + printk(KERN_WARNING + "S0Box: wrong HSCX versions check IO address\n"); + release_io_s0box(cs); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c --- a/drivers/isdn/hisax/saphir.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/hisax/saphir.c Thu Feb 19 23:44:22 2004 @@ -1,4 +1,4 @@ -/* $Id: saphir.c,v 1.8.6.2 2001/09/23 22:24:51 kai Exp $ +/* $Id: saphir.c,v 1.10.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for HST Saphir 1 * @@ -19,8 +19,7 @@ #include "isdnl1.h" extern const char *CardType[]; -static char *saphir_rev = "$Revision: 1.8.6.2 $"; -static spinlock_t saphir_lock = SPIN_LOCK_UNLOCKED; +static char *saphir_rev = "$Revision: 1.10.2.4 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -32,138 +31,160 @@ #define SPARE_REG 4 #define RESET_REG 5 -static inline u8 -readreg(struct IsdnCardState *cs, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&saphir_lock, flags); - byteout(cs->hw.saphir.ale, off); + byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&saphir_lock, flags); - return ret; + return (ret); } static inline void -writereg(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 data) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&saphir_lock, flags); - byteout(cs->hw.saphir.ale, off); - byteout(adr, data); - spin_unlock_irqrestore(&saphir_lock, flags); + byteout(ale, off); + insb(adr, data, size); } + static inline void -readfifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 *data, int size) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { - byteout(cs->hw.saphir.ale, off); - insb(adr, data, size); + byteout(ale, off); + byteout(adr, data); } static inline void -writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 *data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - byteout(cs->hw.saphir.ale, off); + byteout(ale, off); outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.saphir.isac, offset); + return (readreg(cs->hw.saphir.ale, cs->hw.saphir.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.saphir.isac, offset, value); + writereg(cs->hw.saphir.ale, cs->hw.saphir.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs, cs->hw.saphir.isac, 0, data, size); + readfifo(cs->hw.saphir.ale, cs->hw.saphir.isac, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.saphir.isac, 0, data, size); + writefifo(cs->hw.saphir.ale, cs->hw.saphir.isac, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return readreg(cs, cs->hw.saphir.hscx, offset + (hscx ? 0x40 : 0)); + return (readreg(cs->hw.saphir.ale, cs->hw.saphir.hscx, + offset + (hscx ? 0x40 : 0))); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writereg(cs, cs->hw.saphir.hscx, offset + (hscx ? 0x40 : 0), value); + writereg(cs->hw.saphir.ale, cs->hw.saphir.hscx, + offset + (hscx ? 0x40 : 0), value); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - readfifo(cs, cs->hw.saphir.hscx, hscx ? 0x40 : 0, data, size); -} +#define READHSCX(cs, nr, reg) readreg(cs->hw.saphir.ale, \ + cs->hw.saphir.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.saphir.ale, \ + cs->hw.saphir.hscx, reg + (nr ? 0x40 : 0), data) -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - writefifo(cs, cs->hw.saphir.hscx, hscx ? 0x40 : 0, data, size); -} +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.saphir.ale, \ + cs->hw.saphir.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.saphir.ale, \ + cs->hw.saphir.hscx, (nr ? 0x40 : 0), ptr, cnt) -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; +#include "hscx_irq.c" static irqreturn_t saphir_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - irqreturn_t ret; + u_char val; + u_long flags; - ret = hscxisac_irq(intno, dev_id, regs); - mod_timer(&cs->hw.saphir.timer, jiffies+1*HZ); - return ret; + spin_lock_irqsave(&cs->lock, flags); + val = readreg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_ISTA + 0x40); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.saphir.ale, cs->hw.saphir.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + val = readreg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_ISTA + 0x40); + if (val) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.saphir.ale, cs->hw.saphir.isac, ISAC_ISTA); + if (val) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + /* Watchdog */ + if (cs->hw.saphir.timer.function) + mod_timer(&cs->hw.saphir.timer, jiffies+1*HZ); + else + printk(KERN_WARNING "saphir: Spurious timer!\n"); + writereg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.saphir.ale, cs->hw.saphir.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.saphir.ale, cs->hw.saphir.isac, ISAC_MASK, 0); + writereg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_MASK, 0); + writereg(cs->hw.saphir.ale, cs->hw.saphir.hscx, HSCX_MASK + 0x40, 0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } static void SaphirWatchDog(struct IsdnCardState *cs) { + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); /* 5 sec WatchDog, so read at least every 4 sec */ - isac_read(cs, ISAC_RBCH); + cs->readisac(cs, ISAC_RBCH); + spin_unlock_irqrestore(&cs->lock, flags); mod_timer(&cs->hw.saphir.timer, jiffies+1*HZ); } -static void -saphir_release(struct IsdnCardState *cs) +void +release_io_saphir(struct IsdnCardState *cs) { byteout(cs->hw.saphir.cfg_reg + IRQ_REG, 0xff); - del_timer_sync(&cs->hw.saphir.timer); + del_timer(&cs->hw.saphir.timer); cs->hw.saphir.timer.function = NULL; - hisax_release_resources(cs); + if (cs->hw.saphir.cfg_reg) + release_region(cs->hw.saphir.cfg_reg, 6); } static int saphir_reset(struct IsdnCardState *cs) { - u8 irq_val; + u_char irq_val; switch(cs->irq) { case 5: irq_val = 0; @@ -186,66 +207,94 @@ } byteout(cs->hw.saphir.cfg_reg + IRQ_REG, irq_val); byteout(cs->hw.saphir.cfg_reg + RESET_REG, 1); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30*HZ)/1000); /* Timeout 30ms */ + mdelay(10); byteout(cs->hw.saphir.cfg_reg + RESET_REG, 0); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30*HZ)/1000); /* Timeout 30ms */ + mdelay(10); byteout(cs->hw.saphir.cfg_reg + IRQ_REG, irq_val); byteout(cs->hw.saphir.cfg_reg + SPARE_REG, 0x02); return (0); } -static struct card_ops saphir_ops = { - .init = inithscxisac, - .reset = saphir_reset, - .release = saphir_release, - .irq_func = saphir_interrupt, -}; +static int +saphir_card_msg(struct IsdnCardState *cs, int mt, void *arg) +{ + u_long flags; + + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + saphir_reset(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_saphir(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); +} -static int __init -saphir_probe(struct IsdnCardState *cs, struct IsdnCard *card) + +int __init +setup_saphir(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; + char tmp[64]; + + strcpy(tmp, saphir_rev); + printk(KERN_INFO "HiSax: HST Saphir driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_HSTSAPHIR) + return (0); + + /* IO-Ports */ cs->hw.saphir.cfg_reg = card->para[1]; cs->hw.saphir.isac = card->para[1] + ISAC_DATA; cs->hw.saphir.hscx = card->para[1] + HSCX_DATA; cs->hw.saphir.ale = card->para[1] + ADDRESS_REG; cs->irq = card->para[0]; - - if (!request_io(&cs->rs, cs->hw.saphir.cfg_reg, 6, "saphir")) - goto err; + if (!request_region(cs->hw.saphir.cfg_reg, 6, "saphir")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.saphir.cfg_reg, + cs->hw.saphir.cfg_reg + 5); + return (0); + } printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n", - CardType[cs->typ], cs->irq, cs->hw.saphir.cfg_reg); + CardType[cs->typ], cs->irq, cs->hw.saphir.cfg_reg); - if (saphir_reset(cs)) - goto err; - - cs->card_ops = &saphir_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - - init_timer(&cs->hw.saphir.timer); + setup_isac(cs); cs->hw.saphir.timer.function = (void *) SaphirWatchDog; cs->hw.saphir.timer.data = (long) cs; + init_timer(&cs->hw.saphir.timer); cs->hw.saphir.timer.expires = jiffies + 4*HZ; add_timer(&cs->hw.saphir.timer); - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -int __init -setup_saphir(struct IsdnCard *card) -{ - char tmp[64]; - - strcpy(tmp, saphir_rev); - printk(KERN_INFO "HiSax: HST Saphir driver Rev. %s\n", - HiSax_getrev(tmp)); - - if (saphir_probe(card->cs, card) < 0) - return 0; - return 1; + if (saphir_reset(cs)) { + release_io_saphir(cs); + return (0); + } + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &saphir_card_msg; + cs->irq_func = &saphir_interrupt; + ISACVersion(cs, "saphir:"); + if (HscxVersion(cs, "saphir:")) { + printk(KERN_WARNING + "saphir: wrong HSCX versions check IO address\n"); + release_io_saphir(cs); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c --- a/drivers/isdn/hisax/sedlbauer.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/sedlbauer.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: sedlbauer.c,v 1.25.6.6 2001/09/23 22:24:51 kai Exp $ +/* $Id: sedlbauer.c,v 1.34.2.6 2004/01/24 20:47:24 keil Exp $ * * low level stuff for Sedlbauer cards * includes support for the Sedlbauer speed star (speed star II), @@ -50,16 +50,16 @@ #include extern const char *CardType[]; -static spinlock_t sedlbauer_lock = SPIN_LOCK_UNLOCKED; -const char *Sedlbauer_revision = "$Revision: 1.25.6.6 $"; +const char *Sedlbauer_revision = "$Revision: 1.34.2.6 $"; const char *Sedlbauer_Types[] = {"None", "speed card/win", "speed star", "speed fax+", "speed win II / ISDN PC/104", "speed star II", "speed pci", - "speed fax+ pyramid", "speed fax+ pci"}; + "speed fax+ pyramid", "speed fax+ pci", "HST Saphir III"}; #define PCI_SUBVENDOR_SPEEDFAX_PYRAMID 0x51 +#define PCI_SUBVENDOR_HST_SAPHIR3 0x52 #define PCI_SUBVENDOR_SEDLBAUER_PCI 0x53 #define PCI_SUBVENDOR_SPEEDFAX_PCI 0x54 #define PCI_SUB_ID_SEDLBAUER 0x01 @@ -72,7 +72,9 @@ #define SEDL_SPEED_PCI 6 #define SEDL_SPEEDFAX_PYRAMID 7 #define SEDL_SPEEDFAX_PCI 8 +#define HST_SAPHIR3 9 +#define SEDL_CHIP_TEST 0 #define SEDL_CHIP_ISAC_HSCX 1 #define SEDL_CHIP_ISAC_ISAR 2 #define SEDL_CHIP_IPAC 3 @@ -117,209 +119,264 @@ #define SEDL_RESET 0x3 /* same as DOS driver */ -static inline u8 -readreg(struct IsdnCardState *cs, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - u8 ret; - unsigned long flags; + register u_char ret; - spin_lock_irqsave(&sedlbauer_lock, flags); - byteout(cs->hw.sedl.adr, off); + byteout(ale, off); ret = bytein(adr); - spin_unlock_irqrestore(&sedlbauer_lock, flags); - return ret; + return (ret); } static inline void -readfifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - unsigned long flags; - - spin_lock_irqsave(&sedlbauer_lock, flags); - byteout(cs->hw.sedl.adr, off); + byteout(ale, off); insb(adr, data, size); - spin_unlock_irqrestore(&sedlbauer_lock, flags); } static inline void -writereg(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 data) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { - byteout(cs->hw.sedl.adr, off); + byteout(ale, off); byteout(adr, data); } static inline void -writefifo(struct IsdnCardState *cs, unsigned int adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - byteout(cs->hw.sedl.adr, off); + byteout(ale, off); outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.sedl.isac, offset); + return (readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.sedl.isac, offset, value); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs, cs->hw.sedl.isac, 0, data, size); + readfifo(cs->hw.sedl.adr, cs->hw.sedl.isac, 0, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.sedl.isac, 0, data, size); + writefifo(cs->hw.sedl.adr, cs->hw.sedl.isac, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadISAC_IPAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs, cs->hw.sedl.hscx, offset + (hscx ? 0x40 : 0)); + return (readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, offset|0x80)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteISAC_IPAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writereg(cs, cs->hw.sedl.hscx, offset + (hscx ? 0x40 : 0), value); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, offset|0x80, value); } static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +ReadISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - readfifo(cs, cs->hw.sedl.hscx, hscx ? 0x40 : 0, data, size); + readfifo(cs->hw.sedl.adr, cs->hw.sedl.isac, 0x80, data, size); } static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +WriteISACfifo_IPAC(struct IsdnCardState *cs, u_char * data, int size) { - writefifo(cs, cs->hw.sedl.hscx, hscx ? 0x40 : 0, data, size); + writefifo(cs->hw.sedl.adr, cs->hw.sedl.isac, 0x80, data, size); } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - -static inline u8 -ipac_read(struct IsdnCardState *cs, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return readreg(cs, cs->hw.sedl.isac, offset); + return (readreg(cs->hw.sedl.adr, + cs->hw.sedl.hscx, offset + (hscx ? 0x40 : 0))); } -static inline void -ipac_write(struct IsdnCardState *cs, u8 offset, u8 value) -{ - writereg(cs, cs->hw.sedl.isac, offset, value); -} - -static inline void -ipac_readfifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) -{ - readfifo(cs, cs->hw.sedl.isac, offset, data, size); -} - -static inline void -ipac_writefifo(struct IsdnCardState *cs, u8 offset, u8 *data, int size) +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { - writefifo(cs, cs->hw.sedl.isac, offset, data, size); + writereg(cs->hw.sedl.adr, + cs->hw.sedl.hscx, offset + (hscx ? 0x40 : 0), value); } -/* This will generate ipac_dc_ops and ipac_bc_ops using the functions - * above */ - -BUILD_IPAC_OPS(ipac); - - /* ISAR access routines * mode = 0 access with IRQ on * mode = 1 access with IRQ off * mode = 2 access with IRQ off and using last offset */ -static u8 -isar_read(struct IsdnCardState *cs, int mode, u8 offset) +static u_char +ReadISAR(struct IsdnCardState *cs, int mode, u_char offset) { if (mode == 0) - return readreg(cs, cs->hw.sedl.hscx, offset); - - if (mode == 1) + return (readreg(cs->hw.sedl.adr, cs->hw.sedl.hscx, offset)); + else if (mode == 1) byteout(cs->hw.sedl.adr, offset); - - return bytein(cs->hw.sedl.hscx); + return(bytein(cs->hw.sedl.hscx)); } static void -isar_write(struct IsdnCardState *cs, int mode, u8 offset, u8 value) +WriteISAR(struct IsdnCardState *cs, int mode, u_char offset, u_char value) { if (mode == 0) - return writereg(cs, cs->hw.sedl.hscx, offset, value); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, offset, value); + else { + if (mode == 1) + byteout(cs->hw.sedl.adr, offset); + byteout(cs->hw.sedl.hscx, value); + } +} - if (mode == 1) - byteout(cs->hw.sedl.adr, offset); +/* + * fast interrupt HSCX stuff goes here + */ - byteout(cs->hw.sedl.hscx, value); -} +#define READHSCX(cs, nr, reg) readreg(cs->hw.sedl.adr, \ + cs->hw.sedl.hscx, reg + (nr ? 0x40 : 0)) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.sedl.adr, \ + cs->hw.sedl.hscx, reg + (nr ? 0x40 : 0), data) -static struct bc_hw_ops isar_ops = { - .read_reg = isar_read, - .write_reg = isar_write, -}; +#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.sedl.adr, \ + cs->hw.sedl.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.sedl.adr, \ + cs->hw.sedl.hscx, (nr ? 0x40 : 0), ptr, cnt) + +#include "hscx_irq.c" static irqreturn_t sedlbauer_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; + spin_lock_irqsave(&cs->lock, flags); if ((cs->hw.sedl.bus == SEDL_BUS_PCMCIA) && (*cs->busy_flag == 1)) { /* The card tends to generate interrupts while being removed causing us to just crash the kernel. bad. */ + spin_unlock_irqrestore(&cs->lock, flags); printk(KERN_WARNING "Sedlbauer: card not available!\n"); return IRQ_NONE; } - return hscxisac_irq(intno, dev_id, regs); + + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.hscx, HSCX_ISTA + 0x40); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.hscx, HSCX_ISTA + 0x40); + if (val) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_ISTA); + if (val) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, HSCX_MASK, 0xFF); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, HSCX_MASK + 0x40, 0xFF); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_MASK, 0x0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, HSCX_MASK, 0x0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, HSCX_MASK + 0x40, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +static irqreturn_t +sedlbauer_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char ista, val, icnt = 5; + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); + ista = readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_ISTA); +Start_IPAC: + if (cs->debug & L1_DEB_IPAC) + debugl1(cs, "IPAC ISTA %02X", ista); + if (ista & 0x0f) { + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.hscx, HSCX_ISTA + 0x40); + if (ista & 0x01) + val |= 0x01; + if (ista & 0x04) + val |= 0x02; + if (ista & 0x08) + val |= 0x04; + if (val) + hscx_int_main(cs, val); + } + if (ista & 0x20) { + val = 0xfe & readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_ISTA | 0x80); + if (val) { + isac_interrupt(cs, val); + } + } + if (ista & 0x10) { + val = 0x01; + isac_interrupt(cs, val); + } + ista = readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_ISTA); + if ((ista & 0x3f) && icnt) { + icnt--; + goto Start_IPAC; + } + if (!icnt) + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "Sedlbauer IRQ LOOP"); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_MASK, 0xFF); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_MASK, 0xC0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; } static irqreturn_t -sedlbauer_isar_interrupt(int intno, void *dev_id, struct pt_regs *regs) +sedlbauer_interrupt_isar(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val; + u_char val; int cnt = 5; + u_long flags; - spin_lock(&cs->lock); - val = isar_read(cs, 0, ISAR_IRQBIT); + spin_lock_irqsave(&cs->lock, flags); + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.hscx, ISAR_IRQBIT); Start_ISAR: if (val & ISAR_IRQSTA) isar_int_main(cs); - val = isac_read(cs, ISAC_ISTA); + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_ISTA); Start_ISAC: if (val) isac_interrupt(cs, val); - val = isar_read(cs, 0, ISAR_IRQBIT); + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.hscx, ISAR_IRQBIT); if ((val & ISAR_IRQSTA) && --cnt) { if (cs->debug & L1_DEB_HSCX) debugl1(cs, "ISAR IntStat after IntRoutine"); goto Start_ISAR; } - val = isac_read(cs, ISAC_ISTA); + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_ISTA); if (val && --cnt) { if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ISAC IntStat after IntRoutine"); @@ -329,362 +386,131 @@ if (cs->debug & L1_DEB_ISAC) debugl1(cs, "Sedlbauer IRQ LOOP"); - isar_write(cs, 0, ISAR_IRQBIT, 0); - isac_write(cs, ISAC_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0x0); - isar_write(cs, 0, ISAR_IRQBIT, ISAR_IRQMSK); - spin_unlock(&cs->lock); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, ISAR_IRQBIT, 0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, ISAC_MASK, 0x0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, ISAR_IRQBIT, ISAR_IRQMSK); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static int -sedlbauer_ipac_reset(struct IsdnCardState *cs) +void +release_io_sedlbauer(struct IsdnCardState *cs) { - writereg(cs, cs->hw.sedl.isac, IPAC_POTA2, 0x20); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writereg(cs, cs->hw.sedl.isac, IPAC_POTA2, 0x0); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - writereg(cs, cs->hw.sedl.isac, IPAC_CONF, 0x0); - writereg(cs, cs->hw.sedl.isac, IPAC_ACFG, 0xff); - writereg(cs, cs->hw.sedl.isac, IPAC_AOE, 0x0); - writereg(cs, cs->hw.sedl.isac, IPAC_MASK, 0xc0); - writereg(cs, cs->hw.sedl.isac, IPAC_PCFG, 0x12); - return 0; -} + int bytecnt = 8; -static int -sedlbauer_isar_pci_reset(struct IsdnCardState *cs) -{ - byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_on); - current->state = TASK_UNINTERRUPTIBLE; - schedule_timeout((20*HZ)/1000); - byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_off); - current->state = TASK_UNINTERRUPTIBLE; - schedule_timeout((20*HZ)/1000); - return 0; -} - -static int -sedlbauer_reset(struct IsdnCardState *cs) -{ - printk(KERN_INFO "Sedlbauer: resetting card\n"); - if (cs->hw.sedl.bus == SEDL_BUS_PCMCIA && - cs->hw.sedl.chip == SEDL_CHIP_ISAC_HSCX) - return 0; - - if (cs->hw.sedl.chip == SEDL_CHIP_IPAC) { - return sedlbauer_ipac_reset(cs); - } else if ((cs->hw.sedl.chip == SEDL_CHIP_ISAC_ISAR) && - (cs->hw.sedl.bus == SEDL_BUS_PCI)) { - return sedlbauer_isar_pci_reset(cs); - } else { - byteout(cs->hw.sedl.reset_on, SEDL_RESET); /* Reset On */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - byteout(cs->hw.sedl.reset_off, 0); /* Reset Off */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); + if (cs->subtyp == SEDL_SPEED_FAX) { + bytecnt = 16; + } else if (cs->hw.sedl.bus == SEDL_BUS_PCI) { + bytecnt = 256; } - return 0; + if (cs->hw.sedl.cfg_reg) + release_region(cs->hw.sedl.cfg_reg, bytecnt); } static void -sedlbauer_isar_release(struct IsdnCardState *cs) +reset_sedlbauer(struct IsdnCardState *cs) { - isar_write(cs, 0, ISAR_IRQBIT, 0); - isac_write(cs, ISAC_MASK, 0xFF); - sedlbauer_reset(cs); - isar_write(cs, 0, ISAR_IRQBIT, 0); - isac_write(cs, ISAC_MASK, 0xFF); - hisax_release_resources(cs); -} - -static void -sedlbauer_led_handler(struct IsdnCardState *cs) -{ - if (cs->subtyp != SEDL_SPEEDFAX_PYRAMID) - return; - - if (cs->status & 0x2000) - cs->hw.sedl.reset_off &= ~SEDL_ISAR_PCI_LED2; - else - cs->hw.sedl.reset_off |= SEDL_ISAR_PCI_LED2; - - if (cs->status & 0x1000) - cs->hw.sedl.reset_off &= ~SEDL_ISAR_PCI_LED1; - else - cs->hw.sedl.reset_off |= SEDL_ISAR_PCI_LED1; - - byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_off); -} - -static void -sedlbauer_isar_init(struct IsdnCardState *cs) -{ - isar_write(cs, 0, ISAR_IRQBIT, 0); - initisac(cs); - initisar(cs); -} - -static struct card_ops sedlbauer_ops = { - .init = inithscxisac, - .reset = sedlbauer_reset, - .release = hisax_release_resources, - .led_handler = sedlbauer_led_handler, - .irq_func = sedlbauer_interrupt, -}; - -static struct card_ops sedlbauer_ipac_ops = { - .init = ipac_init, - .reset = sedlbauer_reset, - .release = hisax_release_resources, - .led_handler = sedlbauer_led_handler, - .irq_func = ipac_irq, -}; - -static struct card_ops sedlbauer_isar_ops = { - .init = sedlbauer_isar_init, - .reset = sedlbauer_reset, - .release = sedlbauer_isar_release, - .led_handler = sedlbauer_led_handler, - .irq_func = sedlbauer_isar_interrupt, -}; - -static int __init -sedl_ipac_probe(struct IsdnCardState *cs) -{ - u8 val; - - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_ADR; - val = readreg(cs, cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_IPAC, IPAC_ID); - printk(KERN_DEBUG "Sedlbauer: testing IPAC version %x\n", val); - return (val == 1 || val == 2); -} - -static int __init -sedl_ipac_init(struct IsdnCardState *cs) -{ - cs->card_ops = &sedlbauer_ipac_ops; - if (ipac_setup(cs, &ipac_dc_ops, &ipac_bc_ops)) - return -ENODEV; - sedlbauer_reset(cs); - return 0; -} - -static int __init -sedl_isac_isar_init(struct IsdnCardState *cs) -{ - cs->bcs[0].hw.isar.reg = &cs->hw.sedl.isar; - cs->bcs[1].hw.isar.reg = &cs->hw.sedl.isar; - __set_bit(HW_ISAR, &cs->HW_Flags); - cs->card_ops = &sedlbauer_isar_ops; - cs->auxcmd = &isar_auxcmd; - isac_setup(cs, &isac_ops); - return isar_setup(cs, &isar_ops); -} + printk(KERN_INFO "Sedlbauer: resetting card\n"); -static int __init -sedl_isac_hscx_init(struct IsdnCardState *cs) -{ - cs->card_ops = &sedlbauer_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - return -ENODEV; - sedlbauer_reset(cs); - return 0; + if (!((cs->hw.sedl.bus == SEDL_BUS_PCMCIA) && + (cs->hw.sedl.chip == SEDL_CHIP_ISAC_HSCX))) { + if (cs->hw.sedl.chip == SEDL_CHIP_IPAC) { + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_POTA2, 0x20); + mdelay(2); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_POTA2, 0x0); + mdelay(10); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_CONF, 0x0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_ACFG, 0xff); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_AOE, 0x0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_MASK, 0xc0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_PCFG, 0x12); + } else if ((cs->hw.sedl.chip == SEDL_CHIP_ISAC_ISAR) && + (cs->hw.sedl.bus == SEDL_BUS_PCI)) { + byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_on); + mdelay(2); + byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_off); + mdelay(10); + } else { + byteout(cs->hw.sedl.reset_on, SEDL_RESET); /* Reset On */ + mdelay(2); + byteout(cs->hw.sedl.reset_off, 0); /* Reset Off */ + mdelay(10); + } + } } -static int __init -sedl_card_win_probe(struct IsdnCardState *cs, struct IsdnCard *card) +static int +Sedl_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - cs->irq = card->para[0]; - cs->hw.sedl.cfg_reg = card->para[1]; - cs->hw.sedl.bus = SEDL_BUS_ISA; - if (!request_io(&cs->rs, cs->hw.sedl.cfg_reg, 8, "sedlbauer isdn")) - goto err; + u_long flags; - if (sedl_ipac_probe(cs)) { - cs->subtyp = SEDL_SPEED_WIN2_PC104; - cs->hw.sedl.chip = SEDL_CHIP_IPAC; - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_IPAC; - if (sedl_ipac_init(cs)) - goto err; - } else { - cs->subtyp = SEDL_SPEED_CARD_WIN; - cs->hw.sedl.chip = SEDL_CHIP_ISAC_HSCX; - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_ISAC; - cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_HSCX; - cs->hw.sedl.reset_on = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_RESET_ON; - cs->hw.sedl.reset_off = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_RESET_OFF; - if (sedl_isac_hscx_init(cs)) - goto err; - } - printk(KERN_INFO "Sedlbauer %s: defined at 0x%x-0x%x IRQ %d\n", - Sedlbauer_Types[cs->subtyp], - cs->hw.sedl.cfg_reg, cs->hw.sedl.cfg_reg + 8, cs->irq); - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -sedl_star_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->hw.sedl.bus = SEDL_BUS_PCMCIA; - if (sedl_ipac_probe(cs)) { - cs->subtyp = SEDL_SPEED_STAR2; - cs->hw.sedl.chip = SEDL_CHIP_IPAC; - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_IPAC; - if (sedl_ipac_init(cs)) - goto err; - } else { - cs->subtyp = SEDL_SPEED_STAR; - cs->hw.sedl.chip = SEDL_CHIP_ISAC_HSCX; - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_ISAC; - cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_HSCX; - cs->hw.sedl.reset_on = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET; - cs->hw.sedl.reset_off = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET; - if (sedl_isac_hscx_init(cs)) - goto err; - } - printk(KERN_INFO "Sedlbauer %s: defined at 0x%x-0x%x IRQ %d\n", - Sedlbauer_Types[cs->subtyp], - cs->hw.sedl.cfg_reg, cs->hw.sedl.cfg_reg + 8, cs->irq); - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -sedl_fax_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->subtyp = SEDL_SPEED_FAX; - cs->hw.sedl.bus = SEDL_BUS_ISA; - cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; - if (!request_io(&cs->rs, cs->hw.sedl.cfg_reg, 16, "sedlbauer isdn")) - goto err; - - printk(KERN_INFO "Sedlbauer %s: defined at 0x%x-0x%x IRQ %d\n", - Sedlbauer_Types[cs->subtyp], - cs->hw.sedl.cfg_reg, cs->hw.sedl.cfg_reg + 16, cs->irq); - - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_ISAR_ISA_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_ISAR_ISA_ISAC; - cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_ISAR_ISA_ISAR; - cs->hw.sedl.reset_on = cs->hw.sedl.cfg_reg + SEDL_ISAR_ISA_ISAR_RESET_ON; - cs->hw.sedl.reset_off = cs->hw.sedl.cfg_reg + SEDL_ISAR_ISA_ISAR_RESET_OFF; - if (sedl_isac_isar_init(cs)) - goto err; - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -sedl_pci_init(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.sedl.cfg_reg = pci_resource_start(pdev, 0); - cs->hw.sedl.bus = SEDL_BUS_PCI; - - if (!request_io(&cs->rs, cs->hw.sedl.cfg_reg, 256, "sedlbauer isdn")) - return -EBUSY; - - printk(KERN_INFO "Sedlbauer %s: defined at 0x%x-0x%x IRQ %d\n", - Sedlbauer_Types[cs->subtyp], - cs->hw.sedl.cfg_reg, cs->hw.sedl.cfg_reg + 256, cs->irq); - - cs->hw.sedl.reset_on = SEDL_ISAR_PCI_ISAR_RESET_ON; - cs->hw.sedl.reset_off = SEDL_ISAR_PCI_ISAR_RESET_OFF; - byteout(cs->hw.sedl.cfg_reg, 0xff); - byteout(cs->hw.sedl.cfg_reg, 0x00); - byteout(cs->hw.sedl.cfg_reg+ 2, 0xdd); - byteout(cs->hw.sedl.cfg_reg+ 5, 0x02); - byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_on); - current->state = TASK_UNINTERRUPTIBLE; - schedule_timeout((10*HZ)/1000); - byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_off); - return 0; -} - -static int __init -sedl_fax_pyramid_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = SEDL_SPEEDFAX_PYRAMID; - cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; - if (sedl_pci_init(cs, pdev)) - goto err; - - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_ISAR_PCI_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_ISAR_PCI_ISAC; - cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_ISAR_PCI_ISAR; - if (sedl_isac_isar_init(cs)) - goto err; - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -sedl_fax_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = SEDL_SPEEDFAX_PCI; - cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; - - if (sedl_pci_init(cs, pdev)) - goto err; - - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_ISAR_PCI_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_ISAR_PCI_ISAC; - cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_ISAR_PCI_ISAR; - if (sedl_isac_isar_init(cs)) - goto err; - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -sedl_pci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) -{ - if (pci_enable_device(pdev)) - goto err; - - cs->subtyp = SEDL_SPEED_PCI; - cs->hw.sedl.chip = SEDL_CHIP_IPAC; - if (sedl_pci_init(cs, pdev)) - goto err; - - cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_IPAC_PCI_ADR; - cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_IPAC_PCI_IPAC; - if (sedl_ipac_init(cs)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_sedlbauer(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + if (cs->hw.sedl.chip == SEDL_CHIP_ISAC_ISAR) { + spin_lock_irqsave(&cs->lock, flags); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, + ISAR_IRQBIT, 0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, + ISAC_MASK, 0xFF); + reset_sedlbauer(cs); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, + ISAR_IRQBIT, 0); + writereg(cs->hw.sedl.adr, cs->hw.sedl.isac, + ISAC_MASK, 0xFF); + spin_unlock_irqrestore(&cs->lock, flags); + } + release_io_sedlbauer(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + reset_sedlbauer(cs); + if (cs->hw.sedl.chip == SEDL_CHIP_ISAC_ISAR) { + clear_pending_isac_ints(cs); + writereg(cs->hw.sedl.adr, cs->hw.sedl.hscx, + ISAR_IRQBIT, 0); + initisac(cs); + initisar(cs); + /* Reenable all IRQ */ + cs->writeisac(cs, ISAC_MASK, 0); + /* RESET Receiver and Transmitter */ + cs->writeisac(cs, ISAC_CMDR, 0x41); + } else { + inithscxisac(cs, 3); + } + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + case MDL_INFO_CONN: + if (cs->subtyp != SEDL_SPEEDFAX_PYRAMID) + return(0); + spin_lock_irqsave(&cs->lock, flags); + if ((long) arg) + cs->hw.sedl.reset_off &= ~SEDL_ISAR_PCI_LED2; + else + cs->hw.sedl.reset_off &= ~SEDL_ISAR_PCI_LED1; + byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_off); + spin_unlock_irqrestore(&cs->lock, flags); + break; + case MDL_INFO_REL: + if (cs->subtyp != SEDL_SPEEDFAX_PYRAMID) + return(0); + spin_lock_irqsave(&cs->lock, flags); + if ((long) arg) + cs->hw.sedl.reset_off |= SEDL_ISAR_PCI_LED2; + else + cs->hw.sedl.reset_off |= SEDL_ISAR_PCI_LED1; + byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_off); + spin_unlock_irqrestore(&cs->lock, flags); + break; + } + return(0); } static struct pci_dev *dev_sedl __devinitdata = NULL; @@ -700,124 +526,308 @@ { 0, } }; -static struct isapnp_device_id *pdev = &sedl_ids[0]; +static struct isapnp_device_id *ipid __initdata = &sedl_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif int __devinit setup_sedlbauer(struct IsdnCard *card) { + int bytecnt, ver, val; struct IsdnCardState *cs = card->cs; char tmp[64]; u16 sub_vendor_id, sub_id; strcpy(tmp, Sedlbauer_revision); - printk(KERN_INFO "HiSax: Sedlbauer driver Rev. %s\n", - HiSax_getrev(tmp)); + printk(KERN_INFO "HiSax: Sedlbauer driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ == ISDN_CTYPE_SEDLBAUER) { + cs->subtyp = SEDL_SPEED_CARD_WIN; + cs->hw.sedl.bus = SEDL_BUS_ISA; + cs->hw.sedl.chip = SEDL_CHIP_TEST; + } else if (cs->typ == ISDN_CTYPE_SEDLBAUER_PCMCIA) { + cs->subtyp = SEDL_SPEED_STAR; + cs->hw.sedl.bus = SEDL_BUS_PCMCIA; + cs->hw.sedl.chip = SEDL_CHIP_TEST; + } else if (cs->typ == ISDN_CTYPE_SEDLBAUER_FAX) { + cs->subtyp = SEDL_SPEED_FAX; + cs->hw.sedl.bus = SEDL_BUS_ISA; + cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; + } else + return (0); + + bytecnt = 8; if (card->para[1]) { - if (cs->typ == ISDN_CTYPE_SEDLBAUER) { - if (sedl_card_win_probe(card->cs, card) < 0) - return 0; - return 1; - } else if (cs->typ == ISDN_CTYPE_SEDLBAUER_PCMCIA) { - if (sedl_star_probe(card->cs, card) < 0) - return 0; - return 1; - } else if (cs->typ == ISDN_CTYPE_SEDLBAUER_FAX) { - if (sedl_fax_probe(card->cs, card) < 0) - return 0; - return 1; + cs->hw.sedl.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + if (cs->hw.sedl.chip == SEDL_CHIP_ISAC_ISAR) { + bytecnt = 16; } - } + } else { #ifdef __ISAPNP__ - if (isapnp_present()) { - struct pnp_card *pb; - struct pnp_dev *pd; - - while(pdev->card_vendor) { - if ((pb = pnp_find_card(pdev->card_vendor, - pdev->card_device, - pnp_c))) { - pnp_c = pb; - pd = NULL; - if ((pd = pnp_find_dev(pnp_c, - pdev->vendor, - pdev->function, - pd))) { - printk(KERN_INFO "HiSax: %s detected\n", - (char *)pdev->driver_data); - if (pnp_device_attach(pd) < 0) { - printk(KERN_ERR "Sedlbauer PnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pd) < 0) { - printk(KERN_ERR "Sedlbauer PnP: activate failed\n"); - pnp_device_detach(pd); - return 0; - } - if (!pnp_irq_valid(pd, 0) || !pnp_port_valid(pd, 0)) { - printk(KERN_ERR "Sedlbauer PnP:some resources are missing %ld/%lx\n", - pnp_irq(pd, 0), pnp_port_start(pd, 0)); - pnp_device_detach(pd); - return 0; - } - card->para[1] = pnp_port_start(pd, 0); - card->para[0] = pnp_irq(pd, 0); - cs->hw.sedl.cfg_reg = card->para[1]; - cs->irq = card->para[0]; - if (pdev->function == ISAPNP_FUNCTION(0x2)) { - if (sedl_fax_probe(card->cs, card)) - return 0; - return 1; + if (isapnp_present()) { + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; + + printk(KERN_INFO "HiSax: %s detected\n", + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); + } + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + + if (!card->para[0] || !card->para[1]) { + printk(KERN_ERR "Sedlbauer PnP:some resources are missing %ld/%lx\n", + card->para[0], card->para[1]); + pnp_disable_dev(pnp_d); + return(0); + } + cs->hw.sedl.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + if (ipid->function == ISAPNP_FUNCTION(0x2)) { + cs->subtyp = SEDL_SPEED_FAX; + cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; + bytecnt = 16; + } else { + cs->subtyp = SEDL_SPEED_CARD_WIN; + cs->hw.sedl.chip = SEDL_CHIP_TEST; + } + goto ready; } else { - if (sedl_card_win_probe(card->cs, card)) - return 0; - return 1; + printk(KERN_ERR "Sedlbauer PnP: PnP error card found, no device\n"); + return(0); } - } else { - printk(KERN_ERR "Sedlbauer PnP: PnP error card found, no device\n"); - return 0; } + ipid++; + pnp_c = NULL; + } + if (!ipid->card_vendor) { + printk(KERN_INFO "Sedlbauer PnP: no ISAPnP card found\n"); } - pdev++; - pnp_c=NULL; - } - if (!pdev->card_vendor) { - printk(KERN_INFO "Sedlbauer PnP: no ISAPnP card found\n"); } - } #endif /* Probe for Sedlbauer speed pci */ -#ifdef CONFIG_PCI - dev_sedl = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_100, dev_sedl); - if (dev_sedl) { +#if CONFIG_PCI + if ((dev_sedl = pci_find_device(PCI_VENDOR_ID_TIGERJET, + PCI_DEVICE_ID_TIGERJET_100, dev_sedl))) { + if (pci_enable_device(dev_sedl)) + return(0); + cs->irq = dev_sedl->irq; + if (!cs->irq) { + printk(KERN_WARNING "Sedlbauer: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.sedl.cfg_reg = pci_resource_start(dev_sedl, 0); + } else { + printk(KERN_WARNING "Sedlbauer: No PCI card found\n"); + return(0); + } + cs->irq_flags |= SA_SHIRQ; + cs->hw.sedl.bus = SEDL_BUS_PCI; sub_vendor_id = dev_sedl->subsystem_vendor; sub_id = dev_sedl->subsystem_device; printk(KERN_INFO "Sedlbauer: PCI subvendor:%x subid %x\n", - sub_vendor_id, sub_id); + sub_vendor_id, sub_id); + printk(KERN_INFO "Sedlbauer: PCI base adr %#x\n", + cs->hw.sedl.cfg_reg); if (sub_id != PCI_SUB_ID_SEDLBAUER) { printk(KERN_ERR "Sedlbauer: unknown sub id %#x\n", sub_id); - return 0; + return(0); } if (sub_vendor_id == PCI_SUBVENDOR_SPEEDFAX_PYRAMID) { - if (sedl_fax_pyramid_probe(cs, dev_sedl)) - return 0; - return 1; + cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; + cs->subtyp = SEDL_SPEEDFAX_PYRAMID; } else if (sub_vendor_id == PCI_SUBVENDOR_SPEEDFAX_PCI) { - if (sedl_fax_pci_probe(cs, dev_sedl)) - return 0; - return 1; + cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; + cs->subtyp = SEDL_SPEEDFAX_PCI; + } else if (sub_vendor_id == PCI_SUBVENDOR_HST_SAPHIR3) { + cs->hw.sedl.chip = SEDL_CHIP_IPAC; + cs->subtyp = HST_SAPHIR3; } else if (sub_vendor_id == PCI_SUBVENDOR_SEDLBAUER_PCI) { - if (sedl_pci_probe(cs, dev_sedl)) - return 0; - return 1; + cs->hw.sedl.chip = SEDL_CHIP_IPAC; + cs->subtyp = SEDL_SPEED_PCI; + } else { + printk(KERN_ERR "Sedlbauer: unknown sub vendor id %#x\n", + sub_vendor_id); + return(0); } - printk(KERN_ERR "Sedlbauer: unknown sub vendor id %#x\n", - sub_vendor_id); - return 0; - } + bytecnt = 256; + cs->hw.sedl.reset_on = SEDL_ISAR_PCI_ISAR_RESET_ON; + cs->hw.sedl.reset_off = SEDL_ISAR_PCI_ISAR_RESET_OFF; + byteout(cs->hw.sedl.cfg_reg, 0xff); + byteout(cs->hw.sedl.cfg_reg, 0x00); + byteout(cs->hw.sedl.cfg_reg+ 2, 0xdd); + byteout(cs->hw.sedl.cfg_reg+ 5, 0x02); + byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_on); + mdelay(2); + byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_off); + mdelay(10); +#else + printk(KERN_WARNING "Sedlbauer: NO_PCI_BIOS\n"); + return (0); #endif /* CONFIG_PCI */ - return 0; + } +ready: + /* In case of the sedlbauer pcmcia card, this region is in use, + * reserved for us by the card manager. So we do not check it + * here, it would fail. + */ + if (cs->hw.sedl.bus != SEDL_BUS_PCMCIA && + !request_region(cs->hw.sedl.cfg_reg, bytecnt, "sedlbauer isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.sedl.cfg_reg, + cs->hw.sedl.cfg_reg + bytecnt); + return (0); + } + + printk(KERN_INFO + "Sedlbauer: defined at 0x%x-0x%x IRQ %d\n", + cs->hw.sedl.cfg_reg, + cs->hw.sedl.cfg_reg + bytecnt, + cs->irq); + + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &Sedl_card_msg; + +/* + * testing ISA and PCMCIA Cards for IPAC, default is ISAC + * do not test for PCI card, because ports are different + * and PCI card uses only IPAC (for the moment) + */ + if (cs->hw.sedl.bus != SEDL_BUS_PCI) { + val = readreg(cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_ADR, + cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_IPAC, IPAC_ID); + printk(KERN_DEBUG "Sedlbauer: testing IPAC version %x\n", val); + if ((val == 1) || (val == 2)) { + /* IPAC */ + cs->subtyp = SEDL_SPEED_WIN2_PC104; + if (cs->hw.sedl.bus == SEDL_BUS_PCMCIA) { + cs->subtyp = SEDL_SPEED_STAR2; + } + cs->hw.sedl.chip = SEDL_CHIP_IPAC; + } else { + /* ISAC_HSCX oder ISAC_ISAR */ + if (cs->hw.sedl.chip == SEDL_CHIP_TEST) { + cs->hw.sedl.chip = SEDL_CHIP_ISAC_HSCX; + } + } + } + +/* + * hw.sedl.chip is now properly set + */ + printk(KERN_INFO "Sedlbauer: %s detected\n", + Sedlbauer_Types[cs->subtyp]); + + setup_isac(cs); + if (cs->hw.sedl.chip == SEDL_CHIP_IPAC) { + if (cs->hw.sedl.bus == SEDL_BUS_PCI) { + cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_IPAC_PCI_ADR; + cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_IPAC_PCI_IPAC; + cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_IPAC_PCI_IPAC; + } else { + cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_ADR; + cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_IPAC; + cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_IPAC_ANY_IPAC; + } + test_and_set_bit(HW_IPAC, &cs->HW_Flags); + cs->readisac = &ReadISAC_IPAC; + cs->writeisac = &WriteISAC_IPAC; + cs->readisacfifo = &ReadISACfifo_IPAC; + cs->writeisacfifo = &WriteISACfifo_IPAC; + cs->irq_func = &sedlbauer_interrupt_ipac; + val = readreg(cs->hw.sedl.adr, cs->hw.sedl.isac, IPAC_ID); + printk(KERN_INFO "Sedlbauer: IPAC version %x\n", val); + } else { + /* ISAC_HSCX oder ISAC_ISAR */ + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + if (cs->hw.sedl.chip == SEDL_CHIP_ISAC_ISAR) { + if (cs->hw.sedl.bus == SEDL_BUS_PCI) { + cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + + SEDL_ISAR_PCI_ADR; + cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + + SEDL_ISAR_PCI_ISAC; + cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + + SEDL_ISAR_PCI_ISAR; + } else { + cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + + SEDL_ISAR_ISA_ADR; + cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + + SEDL_ISAR_ISA_ISAC; + cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + + SEDL_ISAR_ISA_ISAR; + cs->hw.sedl.reset_on = cs->hw.sedl.cfg_reg + + SEDL_ISAR_ISA_ISAR_RESET_ON; + cs->hw.sedl.reset_off = cs->hw.sedl.cfg_reg + + SEDL_ISAR_ISA_ISAR_RESET_OFF; + } + cs->bcs[0].hw.isar.reg = &cs->hw.sedl.isar; + cs->bcs[1].hw.isar.reg = &cs->hw.sedl.isar; + test_and_set_bit(HW_ISAR, &cs->HW_Flags); + cs->irq_func = &sedlbauer_interrupt_isar; + cs->auxcmd = &isar_auxcmd; + ISACVersion(cs, "Sedlbauer:"); + cs->BC_Read_Reg = &ReadISAR; + cs->BC_Write_Reg = &WriteISAR; + cs->BC_Send_Data = &isar_fill_fifo; + bytecnt = 3; + while (bytecnt) { + ver = ISARVersion(cs, "Sedlbauer:"); + if (ver < 0) + printk(KERN_WARNING + "Sedlbauer: wrong ISAR version (ret = %d)\n", ver); + else + break; + reset_sedlbauer(cs); + bytecnt--; + } + if (!bytecnt) { + release_io_sedlbauer(cs); + return (0); + } + } else { + if (cs->hw.sedl.bus == SEDL_BUS_PCMCIA) { + cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_ADR; + cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_ISAC; + cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_HSCX; + cs->hw.sedl.reset_on = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET; + cs->hw.sedl.reset_off = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET; + cs->irq_flags |= SA_SHIRQ; + } else { + cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_ADR; + cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_ISAC; + cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_HSCX; + cs->hw.sedl.reset_on = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_RESET_ON; + cs->hw.sedl.reset_off = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_RESET_OFF; + } + cs->irq_func = &sedlbauer_interrupt; + ISACVersion(cs, "Sedlbauer:"); + + if (HscxVersion(cs, "Sedlbauer:")) { + printk(KERN_WARNING + "Sedlbauer: wrong HSCX versions check IO address\n"); + release_io_sedlbauer(cs); + return (0); + } + } + } + return (1); } diff -Nru a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c --- a/drivers/isdn/hisax/sedlbauer_cs.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/sedlbauer_cs.c Thu Feb 19 23:44:24 2004 @@ -53,6 +53,7 @@ #include #include #include +#include "hisax_cfg.h" MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for Sedlbauer cards"); MODULE_AUTHOR("Marcus Niemann"); @@ -93,8 +94,6 @@ static int protocol = 2; /* EURO-ISDN Default */ MODULE_PARM(protocol, "i"); -extern int sedl_init_pcmcia(int, int, int*, int); - /*====================================================================*/ /* @@ -176,6 +175,7 @@ dev_link_t link; dev_node_t node; int stop; + int cardnr; } local_info_t; /*====================================================================== @@ -203,6 +203,7 @@ local = kmalloc(sizeof(local_info_t), GFP_KERNEL); if (!local) return NULL; memset(local, 0, sizeof(local_info_t)); + local->cardnr = -1; link = &local->link; link->priv = local; /* Interrupt setup */ @@ -324,7 +325,7 @@ config_info_t conf; win_req_t req; memreq_t map; - + IsdnCard_t icard; DEBUG(0, "sedlbauer_config(0x%p)\n", link); @@ -509,10 +510,19 @@ printk("\n"); link->state &= ~DEV_CONFIG_PENDING; - - sedl_init_pcmcia(link->io.BasePort1, link->irq.AssignedIRQ, - &(((local_info_t*)link->priv)->stop), - protocol); + + icard.para[0] = link->irq.AssignedIRQ; + icard.para[1] = link->io.BasePort1; + icard.protocol = protocol; + icard.typ = ISDN_CTYPE_SEDLBAUER_PCMCIA; + + last_ret = hisax_init_pcmcia(link, &(((local_info_t*)link->priv)->stop), &icard); + if (last_ret < 0) { + printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n", + last_ret, link->io.BasePort1); + sedlbauer_release(link); + } else + ((local_info_t*)link->priv)->cardnr = last_ret; return; @@ -532,8 +542,15 @@ static void sedlbauer_release(dev_link_t *link) { + local_info_t *local = link->priv; DEBUG(0, "sedlbauer_release(0x%p)\n", link); + if (local) { + if (local->cardnr >= 0) { + /* no unregister function with hisax */ + HiSax_closecard(local->cardnr); + } + } /* Unlink the device chain */ link->dev = NULL; diff -Nru a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c --- a/drivers/isdn/hisax/sportster.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/sportster.c Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: sportster.c,v 1.14.6.2 2001/09/23 22:24:51 kai Exp $ +/* $Id: sportster.c,v 1.16.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for USR Sportster internal TA * @@ -19,7 +19,7 @@ #include "isdnl1.h" extern const char *CardType[]; -const char *sportster_revision = "$Revision: 1.14.6.2 $"; +const char *sportster_revision = "$Revision: 1.16.2.4 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) @@ -38,91 +38,102 @@ } static inline void -read_fifo(unsigned int adr, u8 * data, int size) +read_fifo(unsigned int adr, u_char * data, int size) { insb(adr, data, size); } static void -write_fifo(unsigned int adr, u8 * data, int size) +write_fifo(unsigned int adr, u_char * data, int size) { outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return bytein(calc_off(cs->hw.spt.isac, offset)); + return (bytein(calc_off(cs->hw.spt.isac, offset))); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { byteout(calc_off(cs->hw.spt.isac, offset), value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { read_fifo(cs->hw.spt.isac, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { write_fifo(cs->hw.spt.isac, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return bytein(calc_off(cs->hw.spt.hscx[hscx], offset)); + return (bytein(calc_off(cs->hw.spt.hscx[hscx], offset))); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { byteout(calc_off(cs->hw.spt.hscx[hscx], offset), value); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - read_fifo(cs->hw.spt.hscx[hscx], data, size); -} +/* + * fast interrupt HSCX stuff goes here + */ -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - write_fifo(cs->hw.spt.hscx[hscx], data, size); -} +#define READHSCX(cs, nr, reg) bytein(calc_off(cs->hw.spt.hscx[nr], reg)) +#define WRITEHSCX(cs, nr, reg, data) byteout(calc_off(cs->hw.spt.hscx[nr], reg), data) +#define READHSCXFIFO(cs, nr, ptr, cnt) read_fifo(cs->hw.spt.hscx[nr], ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) write_fifo(cs->hw.spt.hscx[nr], ptr, cnt) -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; +#include "hscx_irq.c" static irqreturn_t sportster_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; - hscxisac_irq(intno, dev_id, regs); + spin_lock_irqsave(&cs->lock, flags); + val = READHSCX(cs, 1, HSCX_ISTA); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = ReadISAC(cs, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + val = READHSCX(cs, 1, HSCX_ISTA); + if (val) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = ReadISAC(cs, ISAC_ISTA); + if (val) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + /* get a new irq impulse if there any pending */ bytein(cs->hw.spt.cfg_reg + SPORTSTER_RES_IRQ +1); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static void -sportster_release(struct IsdnCardState *cs) +void +release_io_sportster(struct IsdnCardState *cs) { int i, adr; @@ -133,45 +144,50 @@ } } -static int -sportster_reset(struct IsdnCardState *cs) +void +reset_sportster(struct IsdnCardState *cs) { cs->hw.spt.res_irq |= SPORTSTER_RESET; /* Reset On */ byteout(cs->hw.spt.cfg_reg + SPORTSTER_RES_IRQ, cs->hw.spt.res_irq); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); + mdelay(10); cs->hw.spt.res_irq &= ~SPORTSTER_RESET; /* Reset Off */ byteout(cs->hw.spt.cfg_reg + SPORTSTER_RES_IRQ, cs->hw.spt.res_irq); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - return 0; + mdelay(10); } static int Sportster_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - return(0); -} + u_long flags; -static void -sportster_init(struct IsdnCardState *cs) -{ - inithscxisac(cs); - cs->hw.spt.res_irq |= SPORTSTER_INTE; /* IRQ On */ - byteout(cs->hw.spt.cfg_reg + SPORTSTER_RES_IRQ, cs->hw.spt.res_irq); + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_sportster(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_sportster(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + reset_sportster(cs); + inithscxisac(cs, 1); + cs->hw.spt.res_irq |= SPORTSTER_INTE; /* IRQ On */ + byteout(cs->hw.spt.cfg_reg + SPORTSTER_RES_IRQ, cs->hw.spt.res_irq); + inithscxisac(cs, 2); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } -static struct card_ops sportster_ops = { - .init = sportster_init, - .reset = sportster_reset, - .release = sportster_release, - .irq_func = sportster_interrupt, -}; - static int __init get_io_range(struct IsdnCardState *cs) { - int i, adr; + int i, j, adr; for (i=0;i<64;i++) { adr = cs->hw.spt.cfg_reg + i *1024; @@ -179,65 +195,76 @@ printk(KERN_WARNING "HiSax: %s config port %x-%x already in use\n", CardType[cs->typ], adr, adr + 8); - goto err; - } + break; + } } - return 1; - err: - for (i=i-1; i >= 0; i--) { - adr = cs->hw.spt.cfg_reg + i *1024; - release_region(adr, 8); + if (i==64) + return(1); + else { + for (j=0; jhw.spt.cfg_reg + j *1024; + release_region(adr, 8); + } + return(0); } - return 0; } -static int __init -sportster_probe(struct IsdnCardState *cs, struct IsdnCard *card) +int __init +setup_sportster(struct IsdnCard *card) { - cs->irq = card->para[0]; + struct IsdnCardState *cs = card->cs; + char tmp[64]; + + strcpy(tmp, sportster_revision); + printk(KERN_INFO "HiSax: USR Sportster driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_SPORTSTER) + return (0); + cs->hw.spt.cfg_reg = card->para[1]; + cs->irq = card->para[0]; if (!get_io_range(cs)) - return -EBUSY; + return (0); cs->hw.spt.isac = cs->hw.spt.cfg_reg + SPORTSTER_ISAC; cs->hw.spt.hscx[0] = cs->hw.spt.cfg_reg + SPORTSTER_HSCXA; cs->hw.spt.hscx[1] = cs->hw.spt.cfg_reg + SPORTSTER_HSCXB; switch(cs->irq) { - case 5: cs->hw.spt.res_irq = 1; break; - case 7: cs->hw.spt.res_irq = 2; break; - case 10:cs->hw.spt.res_irq = 3; break; - case 11:cs->hw.spt.res_irq = 4; break; - case 12:cs->hw.spt.res_irq = 5; break; - case 14:cs->hw.spt.res_irq = 6; break; - case 15:cs->hw.spt.res_irq = 7; break; - default: - printk(KERN_WARNING "Sportster: wrong IRQ\n"); - goto err; + case 5: cs->hw.spt.res_irq = 1; + break; + case 7: cs->hw.spt.res_irq = 2; + break; + case 10:cs->hw.spt.res_irq = 3; + break; + case 11:cs->hw.spt.res_irq = 4; + break; + case 12:cs->hw.spt.res_irq = 5; + break; + case 14:cs->hw.spt.res_irq = 6; + break; + case 15:cs->hw.spt.res_irq = 7; + break; + default:release_io_sportster(cs); + printk(KERN_WARNING "Sportster: wrong IRQ\n"); + return(0); } - sportster_reset(cs); printk(KERN_INFO "HiSax: %s config irq:%d cfg:0x%X\n", - CardType[cs->typ], cs->irq, cs->hw.spt.cfg_reg); - + CardType[cs->typ], cs->irq, cs->hw.spt.cfg_reg); + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; cs->cardmsg = &Sportster_card_msg; - cs->card_ops = &sportster_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - sportster_release(cs); - return -EBUSY; -} - -int __init -setup_sportster(struct IsdnCard *card) -{ - char tmp[64]; - - strcpy(tmp, sportster_revision); - printk(KERN_INFO "HiSax: USR Sportster driver Rev. %s\n", - HiSax_getrev(tmp)); - - if (sportster_probe(card->cs, card) < 0) - return 0; - return 1; + cs->irq_func = &sportster_interrupt; + ISACVersion(cs, "Sportster:"); + if (HscxVersion(cs, "Sportster:")) { + printk(KERN_WARNING + "Sportster: wrong HSCX versions check IO address\n"); + release_io_sportster(cs); + return (0); + } + return (1); } diff -Nru a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h --- a/drivers/isdn/hisax/st5481.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/st5481.h Thu Feb 19 23:44:26 2004 @@ -219,15 +219,15 @@ #define L1_EVENT_COUNT (EV_TIMER3 + 1) #define ERR(format, arg...) \ -printk(KERN_ERR __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg) +printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) #define WARN(format, arg...) \ -printk(KERN_WARNING __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg) +printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) #define INFO(format, arg...) \ -printk(KERN_INFO __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg) +printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) -#include "st5481_hdlc.h" +#include "isdnhdlc.h" #include "fsm.h" #include "hisax_if.h" #include @@ -236,9 +236,9 @@ * FIFO handling */ -/* Generic FIFO structure */ +/* Generic FIFO structure */ struct fifo { - u8 r,w,count,size; + u_char r,w,count,size; spinlock_t lock; }; @@ -270,7 +270,7 @@ index = -1; } else { // Return index where to get the next data to add to the FIFO - index = fifo->w++ & (fifo->size-1); + index = fifo->w++ & (fifo->size-1); fifo->count++; } spin_unlock_irqrestore(&fifo->lock, flags); @@ -289,13 +289,13 @@ return -1; } - spin_lock_irqsave(&fifo->lock, flags); + spin_lock_irqsave(&fifo->lock, flags); if (!fifo->count) { // FIFO empty index = -1; } else { // Return index where to get the next data from the FIFO - index = fifo->r++ & (fifo->size-1); + index = fifo->r++ & (fifo->size-1); fifo->count--; } spin_unlock_irqrestore(&fifo->lock, flags); @@ -336,7 +336,7 @@ }; struct st5481_d_out { - struct hdlc_vars hdlc_state; + struct isdnhdlc_vars hdlc_state; struct urb *urb[2]; /* double buffering */ unsigned long busy; struct sk_buff *tx_skb; @@ -344,15 +344,15 @@ }; struct st5481_b_out { - struct hdlc_vars hdlc_state; + struct isdnhdlc_vars hdlc_state; struct urb *urb[2]; /* double buffering */ - u8 flow_event; + u_char flow_event; u_long busy; struct sk_buff *tx_skb; }; struct st5481_in { - struct hdlc_vars hdlc_state; + struct isdnhdlc_vars hdlc_state; struct urb *urb[2]; /* double buffering */ int mode; int bufsize; @@ -452,7 +452,7 @@ int st5481_isoc_flatten(struct urb *urb); void st5481_usb_pipe_reset(struct st5481_adapter *adapter, - u8 pipe, ctrl_complete_t complete, void *context); + u_char pipe, ctrl_complete_t complete, void *context); void st5481_usb_ctrl_msg(struct st5481_adapter *adapter, u8 request, u8 requesttype, u16 value, u16 index, ctrl_complete_t complete, void *context); @@ -482,7 +482,7 @@ { int i,j; int len,ofs; - u8 *data; + u_char *data; printk(KERN_DEBUG "%s: packets=%d,errors=%d\n", name,urb->number_of_packets,urb->error_count); diff -Nru a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c --- a/drivers/isdn/hisax/st5481_b.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/hisax/st5481_b.c Thu Feb 19 23:44:24 2004 @@ -31,9 +31,9 @@ struct st5481_b_out *b_out = &bcs->b_out; struct st5481_adapter *adapter = bcs->adapter; struct urb *urb; - u_int packet_size, bytes_sent; - int len, offset, buf_size; - u_int i; + unsigned int packet_size,offset; + int len,buf_size,bytes_sent; + int i; struct sk_buff *skb; if (test_and_set_bit(buf_nr, &b_out->busy)) { @@ -67,22 +67,31 @@ bytes_sent = buf_size - len; if (skb->len < bytes_sent) bytes_sent = skb->len; - - memcpy(urb->transfer_buffer+len, skb->data, bytes_sent); - + { /* swap tx bytes to get hearable audio data */ + register unsigned char *src = skb->data; + register unsigned char *dest = urb->transfer_buffer+len; + register unsigned int count; + for (count = 0; count < bytes_sent; count++) + *dest++ = isdnhdlc_bit_rev_tab[*src++]; + } len += bytes_sent; } else { - len += hdlc_encode(&b_out->hdlc_state, - skb->data, skb->len, &bytes_sent, - urb->transfer_buffer+len, buf_size-len); + len += isdnhdlc_encode(&b_out->hdlc_state, + skb->data, skb->len, &bytes_sent, + urb->transfer_buffer+len, buf_size-len); } skb_pull(skb, bytes_sent); - + if (!skb->len) { // Frame sent b_out->tx_skb = NULL; - B_L1L2(bcs, PH_DATA | CONFIRM, skb); + B_L1L2(bcs, PH_DATA | CONFIRM, (void *) skb->truesize); + dev_kfree_skb_any(skb); + +/* if (!(bcs->tx_skb = skb_dequeue(&bcs->sq))) { */ +/* st5481B_sched_event(bcs, B_XMTBUFREADY); */ +/* } */ } } else { if (bcs->mode == L1_MODE_TRANS) { @@ -90,9 +99,9 @@ len = buf_size; } else { // Send flags - len += hdlc_encode(&b_out->hdlc_state, - NULL, 0, &bytes_sent, - urb->transfer_buffer+len, buf_size-len); + len += isdnhdlc_encode(&b_out->hdlc_state, + NULL, 0, &bytes_sent, + urb->transfer_buffer+len, buf_size-len); } } } @@ -136,7 +145,7 @@ */ static void led_blink(struct st5481_adapter *adapter) { - u8 leds = adapter->leds; + u_char leds = adapter->leds; // 50 frames/sec for each channel if (++adapter->led_counter % 50) { @@ -204,7 +213,7 @@ if (bcs->mode != L1_MODE_NULL) { // Open the B channel if (bcs->mode != L1_MODE_TRANS) { - hdlc_out_init(&b_out->hdlc_state, 0, bcs->mode == L1_MODE_HDLC_56K); + isdnhdlc_out_init(&b_out->hdlc_state, 0, bcs->mode == L1_MODE_HDLC_56K); } st5481_usb_pipe_reset(adapter, (bcs->channel+1)*2, NULL, NULL); @@ -260,7 +269,7 @@ endpoint = &altsetting->endpoint[EP_B1_OUT - 1 + bcs->channel * 2]; DBG(4,"endpoint address=%02x,packet size=%d", - endpoint->desc.bEndpointAddress,endpoint->desc.wMaxPacketSize); + endpoint->desc.bEndpointAddress, endpoint->desc.wMaxPacketSize); // Allocate memory for 8000bytes/sec + extra bytes if underrun return st5481_setup_isocpipes(b_out->urb, dev, diff -Nru a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c --- a/drivers/isdn/hisax/st5481_d.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/st5481_d.c Thu Feb 19 23:44:25 2004 @@ -294,8 +294,8 @@ { struct st5481_d_out *d_out = &adapter->d_out; struct urb *urb; - unsigned int num_packets; - int len, buf_size, bytes_sent, packet_offset; + unsigned int num_packets, packet_offset; + int len, buf_size, bytes_sent; struct sk_buff *skb; struct usb_iso_packet_descriptor *desc; @@ -313,15 +313,15 @@ buf_size = NUM_ISO_PACKETS_D * SIZE_ISO_PACKETS_D_OUT; if (skb) { - len = hdlc_encode(&d_out->hdlc_state, - skb->data, skb->len, &bytes_sent, - urb->transfer_buffer, buf_size); + len = isdnhdlc_encode(&d_out->hdlc_state, + skb->data, skb->len, &bytes_sent, + urb->transfer_buffer, buf_size); skb_pull(skb,bytes_sent); } else { // Send flags or idle - len = hdlc_encode(&d_out->hdlc_state, - NULL, 0, &bytes_sent, - urb->transfer_buffer, buf_size); + len = isdnhdlc_encode(&d_out->hdlc_state, + NULL, 0, &bytes_sent, + urb->transfer_buffer, buf_size); } if (len < buf_size) { @@ -341,7 +341,7 @@ desc = &urb->iso_frame_desc[num_packets]; desc->offset = packet_offset; desc->length = SIZE_ISO_PACKETS_D_OUT; - if (len - packet_offset < (int)desc->length) + if (len - packet_offset < desc->length) desc->length = len - packet_offset; num_packets++; packet_offset += desc->length; @@ -413,7 +413,7 @@ DBG(2,"len=%d",skb->len); - hdlc_out_init(&d_out->hdlc_state, 1, 0); + isdnhdlc_out_init(&d_out->hdlc_state, 1, 0); if (test_and_set_bit(buf_nr, &d_out->busy)) { WARN("ep %d urb %d busy %#lx", EP_D_OUT, buf_nr, d_out->busy); @@ -422,9 +422,9 @@ urb = d_out->urb[buf_nr]; DBG_SKB(0x10, skb); - len = hdlc_encode(&d_out->hdlc_state, - skb->data, skb->len, &bytes_sent, - urb->transfer_buffer, 16); + len = isdnhdlc_encode(&d_out->hdlc_state, + skb->data, skb->len, &bytes_sent, + urb->transfer_buffer, 16); skb_pull(skb, bytes_sent); if(len < 16) @@ -664,7 +664,7 @@ endpoint = &altsetting->endpoint[EP_D_OUT-1]; DBG(2,"endpoint address=%02x,packet size=%d", - endpoint->desc.bEndpointAddress,endpoint->desc.wMaxPacketSize); + endpoint->desc.bEndpointAddress, endpoint->desc.wMaxPacketSize); return st5481_setup_isocpipes(d_out->urb, dev, usb_sndisocpipe(dev, endpoint->desc.bEndpointAddress), diff -Nru a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c --- a/drivers/isdn/hisax/st5481_init.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/st5481_init.c Thu Feb 19 23:44:28 2004 @@ -14,7 +14,6 @@ * TODO: * * b layer1 delay? - * hdlc as module * hotplug / unregister issues * mod_inc/dec_use_count * unify parts of d/b channel usb handling @@ -59,8 +58,8 @@ * This function will be called when the adapter is plugged * into the USB bus. */ -static int probe_st5481(struct usb_interface *intf, - const struct usb_device_id *id) +static int __devinit probe_st5481(struct usb_interface *intf, + const struct usb_device_id *id) { struct usb_device *dev = interface_to_usbdev(intf); struct st5481_adapter *adapter; @@ -140,7 +139,7 @@ usb_set_intfdata(intf, NULL); if (!adapter) return; - + list_del(&adapter->list); st5481_stop(adapter); @@ -196,7 +195,7 @@ st5481_debug = debug; #endif - printk(KERN_INFO "hisax_st5481: ST5481 USB ISDN driver v0.1.0\n"); + printk(KERN_INFO "hisax_st5481: ST5481 USB ISDN driver $Revision: 2.4.2.3 $\n"); retval = st5481_d_init(); if (retval < 0) diff -Nru a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c --- a/drivers/isdn/hisax/st5481_usb.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/st5481_usb.c Thu Feb 19 23:44:26 2004 @@ -96,7 +96,7 @@ * Asynchronous pipe reset (async version of usb_clear_halt). */ void st5481_usb_pipe_reset(struct st5481_adapter *adapter, - u8 pipe, + u_char pipe, ctrl_complete_t complete, void *context) { DBG(1,"pipe=%02x",pipe); @@ -500,8 +500,8 @@ status = len; len = 0; } else { - status = hdlc_decode(&in->hdlc_state, ptr, len, &count, - in->rcvbuf, in->bufsize); + status = isdnhdlc_decode(&in->hdlc_state, ptr, len, &count, + in->rcvbuf, in->bufsize); ptr += count; len -= count; } @@ -633,8 +633,8 @@ if (in->mode != L1_MODE_NULL) { if (in->mode != L1_MODE_TRANS) - hdlc_rcv_init(&in->hdlc_state, - in->mode == L1_MODE_HDLC_56K); + isdnhdlc_rcv_init(&in->hdlc_state, + in->mode == L1_MODE_HDLC_56K); st5481_usb_pipe_reset(in->adapter, in->ep, NULL, NULL); st5481_usb_device_ctrl_msg(in->adapter, in->counter, diff -Nru a/drivers/isdn/hisax/tei.c b/drivers/isdn/hisax/tei.c --- a/drivers/isdn/hisax/tei.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/tei.c Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: tei.c,v 2.17.6.3 2001/09/23 22:24:51 kai Exp $ +/* $Id: tei.c,v 2.20.2.3 2004/01/13 14:31:26 keil Exp $ * * Author Karsten Keil * based on the teles driver from Jan den Ouden @@ -20,7 +20,7 @@ #include #include -const char *tei_revision = "$Revision: 2.17.6.3 $"; +const char *tei_revision = "$Revision: 2.20.2.3 $"; #define ID_REQUEST 1 #define ID_ASSIGNED 2 @@ -34,7 +34,7 @@ static struct Fsm teifsm; -void tei_handler(struct PStack *st, u8 pr, struct sk_buff *skb); +void tei_handler(struct PStack *st, u_char pr, struct sk_buff *skb); enum { ST_TEI_NOP, @@ -74,22 +74,6 @@ "EV_T202", }; -static inline void -mdl_assign(struct IsdnCardState *cs) -{ - cs->status |= 0x0001; - if (cs->card_ops->led_handler) - cs->card_ops->led_handler(cs); -} - -static inline void -mdl_remove(struct IsdnCardState *cs) -{ - cs->status = 0; - if (cs->card_ops->led_handler) - cs->card_ops->led_handler(cs); -} - unsigned int random_ri(void) { @@ -116,10 +100,10 @@ } static void -put_tei_msg(struct PStack *st, u8 m_id, unsigned int ri, u8 tei) +put_tei_msg(struct PStack *st, u_char m_id, unsigned int ri, u_char tei) { struct sk_buff *skb; - u8 *bp; + u_char *bp; if (!(skb = alloc_skb(8, GFP_ATOMIC))) { printk(KERN_WARNING "HiSax: No skb for TEI manager\n"); @@ -135,7 +119,7 @@ bp[2] = ri & 0xff; bp[3] = m_id; bp[4] = (tei << 1) | 1; - L2L1(st, PH_DATA | REQUEST, skb); + st->l2.l2l1(st, PH_DATA | REQUEST, skb); } static void @@ -145,7 +129,7 @@ if (st->l2.tei != -1) { st->ma.tei_m.printdebug(&st->ma.tei_m, - "assign request for already assigned tei %d", + "assign request for allready asigned tei %d", st->l2.tei); return; } @@ -181,9 +165,9 @@ } else if (ri == st->ma.ri) { FsmDelTimer(&st->ma.t202, 1); FsmChangeState(&st->ma.tei_m, ST_TEI_NOP); - L3L2(st, MDL_ASSIGN | REQUEST, (void *) (long) tei); + st->l3.l3l2(st, MDL_ASSIGN | REQUEST, (void *) (long) tei); cs = (struct IsdnCardState *) st->l1.hardware; - mdl_assign(cs); + cs->cardmsg(cs, MDL_ASSIGN | REQUEST, NULL); } } @@ -255,9 +239,9 @@ if ((st->l2.tei != -1) && ((tei == GROUP_TEI) || (tei == st->l2.tei))) { FsmDelTimer(&st->ma.t202, 5); FsmChangeState(&st->ma.tei_m, ST_TEI_NOP); - L3L2(st, MDL_REMOVE | REQUEST, 0); + st->l3.l3l2(st, MDL_REMOVE | REQUEST, 0); cs = (struct IsdnCardState *) st->l1.hardware; - mdl_remove(cs); + cs->cardmsg(cs, MDL_REMOVE | REQUEST, NULL); } } @@ -291,9 +275,9 @@ FsmAddTimer(&st->ma.t202, st->ma.T202, EV_T202, NULL, 3); } else { st->ma.tei_m.printdebug(&st->ma.tei_m, "assign req failed"); - L3L2(st, MDL_ERROR | RESPONSE, 0); + st->l3.l3l2(st, MDL_ERROR | RESPONSE, 0); cs = (struct IsdnCardState *) st->l1.hardware; - mdl_remove(cs); + cs->cardmsg(cs, MDL_REMOVE | REQUEST, NULL); FsmChangeState(fi, ST_TEI_NOP); } } @@ -314,9 +298,9 @@ } else { st->ma.tei_m.printdebug(&st->ma.tei_m, "verify req for tei %d failed", st->l2.tei); - L3L2(st, MDL_REMOVE | REQUEST, 0); + st->l3.l3l2(st, MDL_REMOVE | REQUEST, 0); cs = (struct IsdnCardState *) st->l1.hardware; - mdl_remove(cs); + cs->cardmsg(cs, MDL_REMOVE | REQUEST, NULL); FsmChangeState(fi, ST_TEI_NOP); } } @@ -387,9 +371,9 @@ if (st->ma.debug) st->ma.tei_m.printdebug(&st->ma.tei_m, "fixed assign tei %d", st->l2.tei); - L3L2(st, MDL_ASSIGN | REQUEST, (void *) (long) st->l2.tei); + st->l3.l3l2(st, MDL_ASSIGN | REQUEST, (void *) (long) st->l2.tei); cs = (struct IsdnCardState *) st->l1.hardware; - mdl_assign(cs); + cs->cardmsg(cs, MDL_ASSIGN | REQUEST, NULL); } return; } diff -Nru a/drivers/isdn/hisax/teleint.c b/drivers/isdn/hisax/teleint.c --- a/drivers/isdn/hisax/teleint.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/teleint.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: teleint.c,v 1.14.6.2 2001/09/23 22:24:52 kai Exp $ +/* $Id: teleint.c,v 1.16.2.5 2004/01/19 15:31:50 keil Exp $ * * low level stuff for TeleInt isdn cards * @@ -18,38 +18,33 @@ extern const char *CardType[]; -const char *TeleInt_revision = "$Revision: 1.14.6.2 $"; -static spinlock_t teleint_lock = SPIN_LOCK_UNLOCKED; +const char *TeleInt_revision = "$Revision: 1.16.2.5 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -static inline u8 -readreg(unsigned int ale, unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int ale, unsigned int adr, u_char off) { - register u8 ret; + register u_char ret; int max_delay = 2000; - unsigned long flags; - spin_lock_irqsave(&teleint_lock, flags); byteout(ale, off); ret = HFC_BUSY & bytein(ale); while (ret && --max_delay) ret = HFC_BUSY & bytein(ale); if (!max_delay) { printk(KERN_WARNING "TeleInt Busy not inactive\n"); - spin_unlock_irqrestore(&teleint_lock, flags); return (0); } ret = bytein(adr); - spin_unlock_irqrestore(&teleint_lock, flags); return (ret); } static inline void -readfifo(unsigned int ale, unsigned int adr, u8 off, u8 * data, int size) +readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - register u8 ret; + register u_char ret; register int max_delay = 20000; register int i; @@ -68,34 +63,29 @@ static inline void -writereg(unsigned int ale, unsigned int adr, u8 off, u8 data) +writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) { - register u8 ret; + register u_char ret; int max_delay = 2000; - unsigned long flags; - spin_lock_irqsave(&teleint_lock, flags); byteout(ale, off); ret = HFC_BUSY & bytein(ale); while (ret && --max_delay) ret = HFC_BUSY & bytein(ale); if (!max_delay) { printk(KERN_WARNING "TeleInt Busy not inactive\n"); - spin_unlock_irqrestore(&teleint_lock, flags); return; } byteout(adr, data); - spin_unlock_irqrestore(&teleint_lock, flags); } static inline void -writefifo(unsigned int ale, unsigned int adr, u8 off, u8 * data, int size) +writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) { - register u8 ret; + register u_char ret; register int max_delay = 20000; register int i; - /* fifo write without cli because it's already done */ byteout(ale, off); for (i = 0; ihw.hfc.cip = offset; return (readreg(cs->hw.hfc.addr | 1, cs->hw.hfc.addr, offset)); } static void -WriteISAC(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { cs->hw.hfc.cip = offset; writereg(cs->hw.hfc.addr | 1, cs->hw.hfc.addr, offset, value); } static void -ReadISACfifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { cs->hw.hfc.cip = 0; readfifo(cs->hw.hfc.addr | 1, cs->hw.hfc.addr, 0, data, size); } static void -WriteISACfifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { cs->hw.hfc.cip = 0; writefifo(cs->hw.hfc.addr | 1, cs->hw.hfc.addr, 0, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = ReadISAC, - .write_reg = WriteISAC, - .read_fifo = ReadISACfifo, - .write_fifo = WriteISACfifo, -}; - -static u8 -ReadHFC(struct IsdnCardState *cs, int data, u8 reg) +static u_char +ReadHFC(struct IsdnCardState *cs, int data, u_char reg) { - register u8 ret; + register u_char ret; if (data) { cs->hw.hfc.cip = reg; @@ -163,7 +146,7 @@ } static void -WriteHFC(struct IsdnCardState *cs, int data, u8 reg, u8 value) +WriteHFC(struct IsdnCardState *cs, int data, u_char reg, u_char value) { byteout(cs->hw.hfc.addr | 1, reg); cs->hw.hfc.cip = reg; @@ -173,18 +156,14 @@ debugl1(cs, "hfc W%c %02x %02x", data ? 'D' : 'C', reg, value); } -static struct bc_hw_ops hfc_ops = { - .read_reg = ReadHFC, - .write_reg = WriteHFC, -}; - static irqreturn_t -teleint_interrupt(int intno, void *dev_id, struct pt_regs *regs) +TeleInt_interrupt(int intno, void *dev_id, struct pt_regs *regs) { struct IsdnCardState *cs = dev_id; - u8 val; + u_char val; + u_long flags; - spin_lock(&cs->lock); + spin_lock_irqsave(&cs->lock, flags); val = readreg(cs->hw.hfc.addr | 1, cs->hw.hfc.addr, ISAC_ISTA); Start_ISAC: if (val) @@ -197,7 +176,7 @@ } writereg(cs->hw.hfc.addr | 1, cs->hw.hfc.addr, ISAC_MASK, 0xFF); writereg(cs->hw.hfc.addr | 1, cs->hw.hfc.addr, ISAC_MASK, 0x0); - spin_unlock(&cs->lock); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } @@ -205,7 +184,9 @@ TeleInt_Timer(struct IsdnCardState *cs) { int stat = 0; - + u_long flags; + + spin_lock_irqsave(&cs->lock, flags); if (cs->bcs[0].mode) { stat |= 1; main_irq_hfc(&cs->bcs[0]); @@ -214,52 +195,83 @@ stat |= 2; main_irq_hfc(&cs->bcs[1]); } - cs->hw.hfc.timer.expires = jiffies + 1; + spin_unlock_irqrestore(&cs->lock, flags); + stat = HZ/100; + if (!stat) + stat = 1; + cs->hw.hfc.timer.expires = jiffies + stat; add_timer(&cs->hw.hfc.timer); } -static void -teleint_release(struct IsdnCardState *cs) +void +release_io_TeleInt(struct IsdnCardState *cs) { del_timer(&cs->hw.hfc.timer); releasehfc(cs); - hisax_release_resources(cs); + if (cs->hw.hfc.addr) + release_region(cs->hw.hfc.addr, 2); } -static int -teleint_reset(struct IsdnCardState *cs) +static void +reset_TeleInt(struct IsdnCardState *cs) { printk(KERN_INFO "TeleInt: resetting card\n"); cs->hw.hfc.cirm |= HFC_RESET; byteout(cs->hw.hfc.addr | 1, cs->hw.hfc.cirm); /* Reset On */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((30*HZ)/1000); + mdelay(10); cs->hw.hfc.cirm &= ~HFC_RESET; byteout(cs->hw.hfc.addr | 1, cs->hw.hfc.cirm); /* Reset Off */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((10*HZ)/1000); - return 0; + mdelay(10); } -static void -teleint_init(struct IsdnCardState *cs) +static int +TeleInt_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - inithfc(cs); - initisac(cs); - cs->hw.hfc.timer.expires = jiffies + 1; - add_timer(&cs->hw.hfc.timer); -} + u_long flags; + int delay; -static struct card_ops teleint_ops = { - .init = teleint_init, - .reset = teleint_reset, - .release = teleint_release, - .irq_func = teleint_interrupt, -}; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_TeleInt(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_TeleInt(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + reset_TeleInt(cs); + inithfc(cs); + clear_pending_isac_ints(cs); + initisac(cs); + /* Reenable all IRQ */ + cs->writeisac(cs, ISAC_MASK, 0); + cs->writeisac(cs, ISAC_CMDR, 0x41); + spin_unlock_irqrestore(&cs->lock, flags); + delay = HZ/100; + if (!delay) + delay = 1; + cs->hw.hfc.timer.expires = jiffies + delay; + add_timer(&cs->hw.hfc.timer); + return(0); + case CARD_TEST: + return(0); + } + return(0); +} -static int __init -teleint_probe(struct IsdnCardState *cs, struct IsdnCard *card) +int __init +setup_TeleInt(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; + char tmp[64]; + + strcpy(tmp, TeleInt_revision); + printk(KERN_INFO "HiSax: TeleInt driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_TELEINT) + return (0); + cs->hw.hfc.addr = card->para[1] & 0x3fe; cs->irq = card->para[0]; cs->hw.hfc.cirm = HFC_CIRM; @@ -272,61 +284,56 @@ cs->hw.hfc.timer.function = (void *) TeleInt_Timer; cs->hw.hfc.timer.data = (long) cs; init_timer(&cs->hw.hfc.timer); - if (!request_io(&cs->rs, cs->hw.hfc.addr, 2, "TeleInt isdn")) - goto err; - + if (!request_region(cs->hw.hfc.addr, 2, "TeleInt isdn")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.hfc.addr, + cs->hw.hfc.addr + 2); + return (0); + } /* HW IO = IO */ byteout(cs->hw.hfc.addr, cs->hw.hfc.addr & 0xff); byteout(cs->hw.hfc.addr | 1, ((cs->hw.hfc.addr & 0x300) >> 8) | 0x54); switch (cs->irq) { - case 3: - cs->hw.hfc.cirm |= HFC_INTA; - break; - case 4: - cs->hw.hfc.cirm |= HFC_INTB; - break; - case 5: - cs->hw.hfc.cirm |= HFC_INTC; - break; - case 7: - cs->hw.hfc.cirm |= HFC_INTD; - break; - case 10: - cs->hw.hfc.cirm |= HFC_INTE; - break; - case 11: - cs->hw.hfc.cirm |= HFC_INTF; - break; - default: - printk(KERN_WARNING "TeleInt: wrong IRQ\n"); - goto err; + case 3: + cs->hw.hfc.cirm |= HFC_INTA; + break; + case 4: + cs->hw.hfc.cirm |= HFC_INTB; + break; + case 5: + cs->hw.hfc.cirm |= HFC_INTC; + break; + case 7: + cs->hw.hfc.cirm |= HFC_INTD; + break; + case 10: + cs->hw.hfc.cirm |= HFC_INTE; + break; + case 11: + cs->hw.hfc.cirm |= HFC_INTF; + break; + default: + printk(KERN_WARNING "TeleInt: wrong IRQ\n"); + release_io_TeleInt(cs); + return (0); } byteout(cs->hw.hfc.addr | 1, cs->hw.hfc.cirm); byteout(cs->hw.hfc.addr | 1, cs->hw.hfc.ctmt); printk(KERN_INFO "TeleInt: defined at 0x%x IRQ %d\n", - cs->hw.hfc.addr, cs->irq); - - cs->card_ops = &teleint_ops; - teleint_reset(cs); - isac_setup(cs, &isac_ops); - hfc_setup(cs, &hfc_ops); - return 0; - - err: - hisax_release_resources(cs); - return -EBUSY; -} - -int __init -setup_TeleInt(struct IsdnCard *card) -{ - char tmp[64]; - - strcpy(tmp, TeleInt_revision); - printk(KERN_INFO "HiSax: TeleInt driver Rev. %s\n", HiSax_getrev(tmp)); + cs->hw.hfc.addr, cs->irq); - if (teleint_probe(card->cs, card) < 0) - return 0; - return 1; + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHFC; + cs->BC_Write_Reg = &WriteHFC; + cs->cardmsg = &TeleInt_card_msg; + cs->irq_func = &TeleInt_interrupt; + ISACVersion(cs, "TeleInt:"); + return (1); } diff -Nru a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c --- a/drivers/isdn/hisax/teles0.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/hisax/teles0.c Thu Feb 19 23:44:25 2004 @@ -1,4 +1,4 @@ -/* $Id: teles0.c,v 2.13.6.2 2001/09/23 22:24:52 kai Exp $ +/* $Id: teles0.c,v 2.15.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for Teles Memory IO isdn cards * @@ -23,97 +23,179 @@ extern const char *CardType[]; -const char *teles0_revision = "$Revision: 2.13.6.2 $"; +const char *teles0_revision = "$Revision: 2.15.2.4 $"; #define TELES_IOMEM_SIZE 0x400 #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -static u8 -isac_read(struct IsdnCardState *cs, u8 off) +static inline u_char +readisac(unsigned long adr, u_char off) { - return readb(cs->hw.teles0.membase + - ((off & 1) ? 0x2ff : 0x100) + off); + return readb(adr + ((off & 1) ? 0x2ff : 0x100) + off); } -static void -isac_write(struct IsdnCardState *cs, u8 off, u8 data) +static inline void +writeisac(unsigned long adr, u_char off, u_char data) { - writeb(data, cs->hw.teles0.membase + - ((off & 1) ? 0x2ff : 0x100) + off); mb(); + writeb(data, adr + ((off & 1) ? 0x2ff : 0x100) + off); mb(); } -static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +static inline u_char +readhscx(unsigned long adr, int hscx, u_char off) { - int i; - void *ad = cs->hw.teles0.membase + 0x100; + return readb(adr + (hscx ? 0x1c0 : 0x180) + + ((off & 1) ? 0x1ff : 0) + off); +} + +static inline void +writehscx(unsigned long adr, int hscx, u_char off, u_char data) +{ + writeb(data, adr + (hscx ? 0x1c0 : 0x180) + + ((off & 1) ? 0x1ff : 0) + off); mb(); +} + +static inline void +read_fifo_isac(unsigned long adr, u_char * data, int size) +{ + register int i; + register u_char *ad = (u_char *)adr + 0x100; for (i = 0; i < size; i++) data[i] = readb(ad); } -static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +static inline void +write_fifo_isac(unsigned long adr, u_char * data, int size) +{ + register int i; + register u_char *ad = (u_char *)adr + 0x100; + for (i = 0; i < size; i++) { + writeb(data[i], ad); mb(); + } +} + +static inline void +read_fifo_hscx(unsigned long adr, int hscx, u_char * data, int size) +{ + register int i; + register u_char *ad = (u_char *) (adr + (hscx ? 0x1c0 : 0x180)); + for (i = 0; i < size; i++) + data[i] = readb(ad); +} + +static inline void +write_fifo_hscx(unsigned long adr, int hscx, u_char * data, int size) { int i; - void *ad = cs->hw.teles0.membase + 0x100; + register u_char *ad = (u_char *) (adr + (hscx ? 0x1c0 : 0x180)); for (i = 0; i < size; i++) { writeb(data[i], ad); mb(); } } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; +/* Interface functions */ -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 off) +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readb(cs->hw.teles0.membase + (hscx ? 0x1c0 : 0x180) + - ((off & 1) ? 0x1ff : 0) + off); + return (readisac(cs->hw.teles0.membase, offset)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 off, u8 data) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { - writeb(data, cs->hw.teles0.membase + (hscx ? 0x1c0 : 0x180) + - ((off & 1) ? 0x1ff : 0) + off); mb(); + writeisac(cs->hw.teles0.membase, offset, value); } static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - int i; - void *ad = cs->hw.teles0.membase + (hscx ? 0x1c0 : 0x180); - for (i = 0; i < size; i++) - data[i] = readb(ad); + read_fifo_isac(cs->hw.teles0.membase, data, size); } static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { - int i; - void *ad = cs->hw.teles0.membase + (hscx ? 0x1c0 : 0x180); - for (i = 0; i < size; i++) { - writeb(data[i], ad); - } + write_fifo_isac(cs->hw.teles0.membase, data, size); } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) +{ + return (readhscx(cs->hw.teles0.membase, hscx, offset)); +} + +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) +{ + writehscx(cs->hw.teles0.membase, hscx, offset, value); +} + +/* + * fast interrupt HSCX stuff goes here + */ + +#define READHSCX(cs, nr, reg) readhscx(cs->hw.teles0.membase, nr, reg) +#define WRITEHSCX(cs, nr, reg, data) writehscx(cs->hw.teles0.membase, nr, reg, data) +#define READHSCXFIFO(cs, nr, ptr, cnt) read_fifo_hscx(cs->hw.teles0.membase, nr, ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) write_fifo_hscx(cs->hw.teles0.membase, nr, ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +teles0_interrupt(int intno, void *dev_id, struct pt_regs *regs) +{ + struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; + int count = 0; + + spin_lock_irqsave(&cs->lock, flags); + val = readhscx(cs->hw.teles0.membase, 1, HSCX_ISTA); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readisac(cs->hw.teles0.membase, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + count++; + val = readhscx(cs->hw.teles0.membase, 1, HSCX_ISTA); + if (val && count < 5) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readisac(cs->hw.teles0.membase, ISAC_ISTA); + if (val && count < 5) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + writehscx(cs->hw.teles0.membase, 0, HSCX_MASK, 0xFF); + writehscx(cs->hw.teles0.membase, 1, HSCX_MASK, 0xFF); + writeisac(cs->hw.teles0.membase, ISAC_MASK, 0xFF); + writeisac(cs->hw.teles0.membase, ISAC_MASK, 0x0); + writehscx(cs->hw.teles0.membase, 0, HSCX_MASK, 0x0); + writehscx(cs->hw.teles0.membase, 1, HSCX_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +void +release_io_teles0(struct IsdnCardState *cs) +{ + if (cs->hw.teles0.cfg_reg) + release_region(cs->hw.teles0.cfg_reg, 8); + iounmap((unsigned char *)cs->hw.teles0.membase); + release_mem_region(cs->hw.teles0.phymem, TELES_IOMEM_SIZE); +} static int -teles0_reset(struct IsdnCardState *cs) +reset_teles0(struct IsdnCardState *cs) { - u8 cfval; + u_char cfval; if (cs->hw.teles0.cfg_reg) { switch (cs->irq) { @@ -158,102 +240,129 @@ return(0); } -static struct card_ops teles0_ops = { - .init = inithscxisac, - .reset = teles0_reset, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; - -static int __init -teles0_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->irq = card->para[0]; - /* 16.0 and 8.0 designed for IOM1 */ - test_and_set_bit(HW_IOM1, &cs->HW_Flags); - cs->hw.teles0.phymem = card->para[1]; - cs->hw.teles0.membase = request_mmio(&cs->rs, cs->hw.teles0.phymem, - TELES_IOMEM_SIZE, "teles iomem"); - if (!cs->hw.teles0.membase) - return -EBUSY; - - if (teles0_reset(cs)) { - printk(KERN_WARNING "Teles0: wrong IRQ\n"); - return -EBUSY; - } - cs->card_ops = &teles0_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - return -EBUSY; - - return 0; -} - -static int __init -teles16_0_probe(struct IsdnCardState *cs, struct IsdnCard *card) +static int +Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - u8 val; + u_long flags; - cs->hw.teles0.cfg_reg = card->para[2]; - if (!request_io(&cs->rs, cs->hw.teles0.cfg_reg, 8, "teles cfg")) - goto err; - - if ((val = bytein(cs->hw.teles0.cfg_reg + 0)) != 0x51) { - printk(KERN_WARNING "Teles0: 16.0 Byte at %x is %x\n", - cs->hw.teles0.cfg_reg + 0, val); - goto err; - } - if ((val = bytein(cs->hw.teles0.cfg_reg + 1)) != 0x93) { - printk(KERN_WARNING "Teles0: 16.0 Byte at %x is %x\n", - cs->hw.teles0.cfg_reg + 1, val); - goto err; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_teles0(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_teles0(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); } - val = bytein(cs->hw.teles0.cfg_reg + 2);/* 0x1e=without AB - * 0x1f=with AB - * 0x1c 16.3 ??? - */ - if (val != 0x1e && val != 0x1f) { - printk(KERN_WARNING "Teles0: 16.0 Byte at %x is %x\n", - cs->hw.teles0.cfg_reg + 2, val); - goto err; - } - if (teles0_probe(cs, card) < 0) - goto err; - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -teles8_0_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->hw.teles0.cfg_reg = 0; - - if (teles0_probe(cs, card) < 0) - goto err; - - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + return(0); } int __init setup_teles0(struct IsdnCard *card) { + u_char val; + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, teles0_revision); - printk(KERN_INFO "HiSax: Teles 8.0/16.0 driver Rev. %s\n", - HiSax_getrev(tmp)); - - if (card->cs->typ == ISDN_CTYPE_16_0) { - if (teles16_0_probe(card->cs, card) < 0) - return 0; - } else { - if (teles8_0_probe(card->cs, card) < 0) - return 0; + printk(KERN_INFO "HiSax: Teles 8.0/16.0 driver Rev. %s\n", HiSax_getrev(tmp)); + if ((cs->typ != ISDN_CTYPE_16_0) && (cs->typ != ISDN_CTYPE_8_0)) + return (0); + + if (cs->typ == ISDN_CTYPE_16_0) + cs->hw.teles0.cfg_reg = card->para[2]; + else /* 8.0 */ + cs->hw.teles0.cfg_reg = 0; + + if (card->para[1] < 0x10000) { + card->para[1] <<= 4; + printk(KERN_INFO + "Teles0: membase configured DOSish, assuming 0x%lx\n", + (unsigned long) card->para[1]); + } + cs->irq = card->para[0]; + if (cs->hw.teles0.cfg_reg) { + if (!request_region(cs->hw.teles0.cfg_reg, 8, "teles cfg")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.teles0.cfg_reg, + cs->hw.teles0.cfg_reg + 8); + return (0); + } + } + if (cs->hw.teles0.cfg_reg) { + if ((val = bytein(cs->hw.teles0.cfg_reg + 0)) != 0x51) { + printk(KERN_WARNING "Teles0: 16.0 Byte at %x is %x\n", + cs->hw.teles0.cfg_reg + 0, val); + release_region(cs->hw.teles0.cfg_reg, 8); + return (0); + } + if ((val = bytein(cs->hw.teles0.cfg_reg + 1)) != 0x93) { + printk(KERN_WARNING "Teles0: 16.0 Byte at %x is %x\n", + cs->hw.teles0.cfg_reg + 1, val); + release_region(cs->hw.teles0.cfg_reg, 8); + return (0); + } + val = bytein(cs->hw.teles0.cfg_reg + 2); /* 0x1e=without AB + * 0x1f=with AB + * 0x1c 16.3 ??? + */ + if (val != 0x1e && val != 0x1f) { + printk(KERN_WARNING "Teles0: 16.0 Byte at %x is %x\n", + cs->hw.teles0.cfg_reg + 2, val); + release_region(cs->hw.teles0.cfg_reg, 8); + return (0); + } + } + /* 16.0 and 8.0 designed for IOM1 */ + test_and_set_bit(HW_IOM1, &cs->HW_Flags); + cs->hw.teles0.phymem = card->para[1]; + if (!request_mem_region(cs->hw.teles0.phymem, TELES_IOMEM_SIZE, "teles iomem")) { + printk(KERN_WARNING + "HiSax: %s memory region %lx-%lx already in use\n", + CardType[card->typ], + cs->hw.teles0.phymem, + cs->hw.teles0.phymem + TELES_IOMEM_SIZE); + if (cs->hw.teles0.cfg_reg) + release_region(cs->hw.teles0.cfg_reg, 8); + return (0); + } + cs->hw.teles0.membase = + (unsigned long) ioremap(cs->hw.teles0.phymem, TELES_IOMEM_SIZE); + printk(KERN_INFO + "HiSax: %s config irq:%d mem:0x%lX cfg:0x%X\n", + CardType[cs->typ], cs->irq, + cs->hw.teles0.membase, cs->hw.teles0.cfg_reg); + if (reset_teles0(cs)) { + printk(KERN_WARNING "Teles0: wrong IRQ\n"); + release_io_teles0(cs); + return (0); + } + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &Teles_card_msg; + cs->irq_func = &teles0_interrupt; + ISACVersion(cs, "Teles0:"); + if (HscxVersion(cs, "Teles0:")) { + printk(KERN_WARNING + "Teles0: wrong HSCX versions check IO/MEM addresses\n"); + release_io_teles0(cs); + return (0); } - return 1; + return (1); } diff -Nru a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c --- a/drivers/isdn/hisax/teles3.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/hisax/teles3.c Thu Feb 19 23:44:28 2004 @@ -1,4 +1,4 @@ -/* $Id: teles3.c,v 2.17.6.2 2001/09/23 22:24:52 kai Exp $ +/* $Id: teles3.c,v 2.19.2.4 2004/01/13 23:48:39 keil Exp $ * * low level stuff for Teles 16.3 & PNP isdn cards * @@ -21,102 +21,160 @@ #include "isdnl1.h" extern const char *CardType[]; -const char *teles3_revision = "$Revision: 2.17.6.2 $"; +const char *teles3_revision = "$Revision: 2.19.2.4 $"; #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -static inline u8 -readreg(unsigned int adr, u8 off) +static inline u_char +readreg(unsigned int adr, u_char off) { return (bytein(adr + off)); } static inline void -writereg(unsigned int adr, u8 off, u8 data) +writereg(unsigned int adr, u_char off, u_char data) { byteout(adr + off, data); } static inline void -read_fifo(unsigned int adr, u8 * data, int size) +read_fifo(unsigned int adr, u_char * data, int size) { insb(adr, data, size); } static void -write_fifo(unsigned int adr, u8 * data, int size) +write_fifo(unsigned int adr, u_char * data, int size) { outsb(adr, data, size); } -static u8 -isac_read(struct IsdnCardState *cs, u8 offset) +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) { - return readreg(cs->hw.teles3.isac, offset); + return (readreg(cs->hw.teles3.isac, offset)); } static void -isac_write(struct IsdnCardState *cs, u8 offset, u8 value) +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) { writereg(cs->hw.teles3.isac, offset, value); } static void -isac_read_fifo(struct IsdnCardState *cs, u8 * data, int size) +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) { read_fifo(cs->hw.teles3.isacfifo, data, size); } static void -isac_write_fifo(struct IsdnCardState *cs, u8 * data, int size) +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) { write_fifo(cs->hw.teles3.isacfifo, data, size); } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 offset) +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) { - return readreg(cs->hw.teles3.hscx[hscx], offset); + return (readreg(cs->hw.teles3.hscx[hscx], offset)); } static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 offset, u8 value) +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) { writereg(cs->hw.teles3.hscx[hscx], offset, value); } -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - read_fifo(cs->hw.teles3.hscxfifo[hscx], data, size); -} +/* + * fast interrupt HSCX stuff goes here + */ -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 *data, int size) -{ - write_fifo(cs->hw.teles3.hscxfifo[hscx], data, size); +#define READHSCX(cs, nr, reg) readreg(cs->hw.teles3.hscx[nr], reg) +#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.teles3.hscx[nr], reg, data) +#define READHSCXFIFO(cs, nr, ptr, cnt) read_fifo(cs->hw.teles3.hscxfifo[nr], ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) write_fifo(cs->hw.teles3.hscxfifo[nr], ptr, cnt) + +#include "hscx_irq.c" + +static irqreturn_t +teles3_interrupt(int intno, void *dev_id, struct pt_regs *regs) +{ +#define MAXCOUNT 5 + struct IsdnCardState *cs = dev_id; + u_char val; + u_long flags; + int count = 0; + + spin_lock_irqsave(&cs->lock, flags); + val = readreg(cs->hw.teles3.hscx[1], HSCX_ISTA); + Start_HSCX: + if (val) + hscx_int_main(cs, val); + val = readreg(cs->hw.teles3.isac, ISAC_ISTA); + Start_ISAC: + if (val) + isac_interrupt(cs, val); + count++; + val = readreg(cs->hw.teles3.hscx[1], HSCX_ISTA); + if (val && count < MAXCOUNT) { + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX IntStat after IntRoutine"); + goto Start_HSCX; + } + val = readreg(cs->hw.teles3.isac, ISAC_ISTA); + if (val && count < MAXCOUNT) { + if (cs->debug & L1_DEB_ISAC) + debugl1(cs, "ISAC IntStat after IntRoutine"); + goto Start_ISAC; + } + if (count >= MAXCOUNT) + printk(KERN_WARNING "Teles3: more than %d loops in teles3_interrupt\n", count); + writereg(cs->hw.teles3.hscx[0], HSCX_MASK, 0xFF); + writereg(cs->hw.teles3.hscx[1], HSCX_MASK, 0xFF); + writereg(cs->hw.teles3.isac, ISAC_MASK, 0xFF); + writereg(cs->hw.teles3.isac, ISAC_MASK, 0x0); + writereg(cs->hw.teles3.hscx[0], HSCX_MASK, 0x0); + writereg(cs->hw.teles3.hscx[1], HSCX_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_HANDLED; +} + +inline static void +release_ioregs(struct IsdnCardState *cs, int mask) +{ + if (mask & 1) + release_region(cs->hw.teles3.isac + 32, 32); + if (mask & 2) + release_region(cs->hw.teles3.hscx[0] + 32, 32); + if (mask & 4) + release_region(cs->hw.teles3.hscx[1] + 32, 32); +} + +void +release_io_teles3(struct IsdnCardState *cs) +{ + if (cs->typ == ISDN_CTYPE_TELESPCMCIA) { + release_region(cs->hw.teles3.hscx[1], 96); + } else { + if (cs->hw.teles3.cfg_reg) { + if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) { + release_region(cs->hw.teles3.cfg_reg, 1); + } else { + release_region(cs->hw.teles3.cfg_reg, 8); + } + } + release_ioregs(cs, 0x7); + } } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; - static int -teles3_reset(struct IsdnCardState *cs) +reset_teles3(struct IsdnCardState *cs) { - u8 irqcfg; + u_char irqcfg; if (cs->typ != ISDN_CTYPE_TELESPCMCIA) { if ((cs->hw.teles3.cfg_reg) && (cs->typ != ISDN_CTYPE_COMPAQ_ISA)) { @@ -169,160 +227,33 @@ return(0); } -static struct card_ops teles3_ops = { - .init = inithscxisac, - .reset = teles3_reset, - .release = hisax_release_resources, - .irq_func = hscxisac_irq, -}; - static int -teles_hw_init(struct IsdnCardState *cs) +Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg) { - - printk(KERN_INFO "HiSax: %s config irq:%d isac:0x%X cfg:0x%X\n", - CardType[cs->typ], cs->irq, - cs->hw.teles3.isac + 32, cs->hw.teles3.cfg_reg); - printk(KERN_INFO "HiSax: hscx A:0x%X hscx B:0x%X\n", - cs->hw.teles3.hscx[0] + 32, cs->hw.teles3.hscx[1] + 32); + u_long flags; - if (teles3_reset(cs)) { - printk(KERN_WARNING "Teles3: wrong IRQ\n"); - return -EBUSY; + switch (mt) { + case CARD_RESET: + spin_lock_irqsave(&cs->lock, flags); + reset_teles3(cs); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_RELEASE: + release_io_teles3(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); } - cs->card_ops = &teles3_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - return -EBUSY; - return 0; -} - -static void __init -teles_setup_io(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->irq = card->para[0]; - cs->hw.teles3.isacfifo = cs->hw.teles3.isac + 0x3e; - cs->hw.teles3.hscxfifo[0] = cs->hw.teles3.hscx[0] + 0x3e; - cs->hw.teles3.hscxfifo[1] = cs->hw.teles3.hscx[1] + 0x3e; -} - -static int __init -telespcmcia_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->hw.teles3.cfg_reg = 0; - cs->hw.teles3.hscx[0] = card->para[1] - 0x20; - cs->hw.teles3.hscx[1] = card->para[1]; - cs->hw.teles3.isac = card->para[1] + 0x20; - teles_setup_io(cs, card); - if (!request_io(&cs->rs, cs->hw.teles3.hscx[1], 96, - "HiSax Teles PCMCIA")) - goto err; - if (teles_hw_init(cs) < 0) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -teles_request_io(struct IsdnCardState *cs) -{ - if (!request_io(&cs->rs, cs->hw.teles3.isac + 32, 32, "HiSax isac")) - return -EBUSY; - if (!request_io(&cs->rs, cs->hw.teles3.hscx[0]+32, 32, "HiSax hscx A")) - return -EBUSY; - if (!request_io(&cs->rs, cs->hw.teles3.hscx[1]+32, 32, "HiSax hscx B")) - return -EBUSY; - return 0; -} - -static int __init -teles16_3_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - u8 val; - - cs->hw.teles3.cfg_reg = card->para[1]; - switch (cs->hw.teles3.cfg_reg) { - case 0x180: - case 0x280: - case 0x380: - cs->hw.teles3.cfg_reg |= 0xc00; - break; - } - cs->hw.teles3.isac = cs->hw.teles3.cfg_reg - 0x420; - cs->hw.teles3.hscx[0] = cs->hw.teles3.cfg_reg - 0xc20; - cs->hw.teles3.hscx[1] = cs->hw.teles3.cfg_reg - 0x820; - teles_setup_io(cs, card); - if (!request_io(&cs->rs, cs->hw.teles3.cfg_reg, 8, "teles3 cfg")) - goto err; - if (teles_request_io(cs) < 0) - goto err; - if ((val = bytein(cs->hw.teles3.cfg_reg + 0)) != 0x51) { - printk(KERN_WARNING "Teles: 16.3 Byte at %x is %x\n", - cs->hw.teles3.cfg_reg + 0, val); - goto err; - } - if ((val = bytein(cs->hw.teles3.cfg_reg + 1)) != 0x93) { - printk(KERN_WARNING "Teles: 16.3 Byte at %x is %x\n", - cs->hw.teles3.cfg_reg + 1, val); - goto err; - } - /* 0x1e without AB, 0x1f with AB, 0x1c 16.3 ???, - * 0x39 16.3 1.1, 0x38 16.3 1.3, 0x46 16.3 with AB + Video */ - val = bytein(cs->hw.teles3.cfg_reg + 2); - if (val != 0x46 && val != 0x39 && val != 0x38 && - val != 0x1c && val != 0x1e && val != 0x1f) { - printk(KERN_WARNING "Teles: 16.3 Byte at %x is %x\n", - cs->hw.teles3.cfg_reg + 2, val); - goto err; - } - if (teles_hw_init(cs) < 0) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -compaq_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->hw.teles3.cfg_reg = card->para[3]; - cs->hw.teles3.isac = card->para[2] - 32; - cs->hw.teles3.hscx[0] = card->para[1] - 32; - cs->hw.teles3.hscx[1] = card->para[1]; - teles_setup_io(cs, card); - if (!request_io(&cs->rs, cs->hw.teles3.cfg_reg, 1, "teles3 cfg")) - goto err; - if (teles_request_io(cs) < 0) - goto err; - if (teles_hw_init(cs) < 0) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; -} - -static int __init -telespnp_probe(struct IsdnCardState *cs, struct IsdnCard *card) -{ - cs->hw.teles3.cfg_reg = 0; - cs->hw.teles3.isac = card->para[1] - 32; - cs->hw.teles3.hscx[0] = card->para[2] - 32; - cs->hw.teles3.hscx[1] = card->para[2]; - teles_setup_io(cs, card); - if (teles_request_io(cs) < 0) - goto err; - if (teles_hw_init(cs) < 0) - goto err; - return 0; - err: - hisax_release_resources(cs); - return -EBUSY; + return(0); } #ifdef __ISAPNP__ + static struct isapnp_device_id teles_ids[] __initdata = { { ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110), ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110), @@ -336,80 +267,233 @@ { 0, } }; -static struct isapnp_device_id *tdev = &teles_ids[0]; +static struct isapnp_device_id *ipid __initdata = &teles_ids[0]; static struct pnp_card *pnp_c __devinitdata = NULL; #endif int __devinit setup_teles3(struct IsdnCard *card) { + u_char val; + struct IsdnCardState *cs = card->cs; char tmp[64]; strcpy(tmp, teles3_revision); printk(KERN_INFO "HiSax: Teles IO driver Rev. %s\n", HiSax_getrev(tmp)); + if ((cs->typ != ISDN_CTYPE_16_3) && (cs->typ != ISDN_CTYPE_PNP) + && (cs->typ != ISDN_CTYPE_TELESPCMCIA) && (cs->typ != ISDN_CTYPE_COMPAQ_ISA)) + return (0); + #ifdef __ISAPNP__ if (!card->para[1] && isapnp_present()) { - struct pnp_card *pnp_card; - struct pnp_dev *pnp_dev; + struct pnp_dev *pnp_d; + while(ipid->card_vendor) { + if ((pnp_c = pnp_find_card(ipid->card_vendor, + ipid->card_device, pnp_c))) { + pnp_d = NULL; + if ((pnp_d = pnp_find_dev(pnp_c, + ipid->vendor, ipid->function, pnp_d))) { + int err; - while(tdev->card_vendor) { - if ((pnp_card = pnp_find_card(tdev->card_vendor, - tdev->card_device, pnp_c))) { - pnp_c = pnp_card; - pnp_dev = NULL; - if ((pnp_dev = pnp_find_dev(pnp_card, - tdev->vendor, - tdev->function, - pnp_dev))) { printk(KERN_INFO "HiSax: %s detected\n", - (char *)tdev->driver_data); - if (pnp_device_attach(pnp_dev) < 0) { - printk(KERN_ERR "Teles PnP: attach failed\n"); - return 0; - } - if (pnp_activate_dev(pnp_dev) < 0) { - printk(KERN_ERR "Teles PnP: activate failed\n"); - pnp_device_detach(pnp_dev); - return 0; + (char *)ipid->driver_data); + pnp_disable_dev(pnp_d); + err = pnp_activate_dev(pnp_d); + if (err<0) { + printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n", + __FUNCTION__, err); + return(0); } - if (!pnp_irq_valid(pnp_dev, 0) || - !pnp_port_valid(pnp_dev, 0) || - !pnp_port_valid(pnp_dev, 1)) { - printk(KERN_ERR "Teles PnP: some resources are missing %ld/%lx/%lx\n", - pnp_irq(pnp_dev, 0), pnp_port_start(pnp_dev, 0), pnp_port_start(pnp_dev, 1)); - pnp_device_detach(pnp_dev); - return 0; + card->para[3] = pnp_port_start(pnp_d, 2); + card->para[2] = pnp_port_start(pnp_d, 1); + card->para[1] = pnp_port_start(pnp_d, 0); + card->para[0] = pnp_irq(pnp_d, 0); + if (!card->para[0] || !card->para[1] || !card->para[2]) { + printk(KERN_ERR "Teles PnP:some resources are missing %ld/%lx/%lx\n", + card->para[0], card->para[1], card->para[2]); + pnp_disable_dev(pnp_d); + return(0); } - card->para[3] = pnp_port_start(pnp_dev, 2); - card->para[2] = pnp_port_start(pnp_dev, 1); - card->para[1] = pnp_port_start(pnp_dev, 0); - card->para[0] = pnp_irq(pnp_dev, 0); break; } else { printk(KERN_ERR "Teles PnP: PnP error card found, no device\n"); } } - tdev++; - pnp_c=NULL; + ipid++; + pnp_c = NULL; } - if (!tdev->card_vendor) { + if (!ipid->card_vendor) { printk(KERN_INFO "Teles PnP: no ISAPnP card found\n"); return(0); } } #endif - if (card->cs->typ == ISDN_CTYPE_16_3) { - if (teles16_3_probe(card->cs, card) < 0) - return 0; - } else if (card->cs->typ == ISDN_CTYPE_TELESPCMCIA) { - if (telespcmcia_probe(card->cs, card) < 0) - return 0; - } else if (card->cs->typ == ISDN_CTYPE_COMPAQ_ISA) { - if (compaq_probe(card->cs, card) < 0) - return 0; + if (cs->typ == ISDN_CTYPE_16_3) { + cs->hw.teles3.cfg_reg = card->para[1]; + switch (cs->hw.teles3.cfg_reg) { + case 0x180: + case 0x280: + case 0x380: + cs->hw.teles3.cfg_reg |= 0xc00; + break; + } + cs->hw.teles3.isac = cs->hw.teles3.cfg_reg - 0x420; + cs->hw.teles3.hscx[0] = cs->hw.teles3.cfg_reg - 0xc20; + cs->hw.teles3.hscx[1] = cs->hw.teles3.cfg_reg - 0x820; + } else if (cs->typ == ISDN_CTYPE_TELESPCMCIA) { + cs->hw.teles3.cfg_reg = 0; + cs->hw.teles3.hscx[0] = card->para[1] - 0x20; + cs->hw.teles3.hscx[1] = card->para[1]; + cs->hw.teles3.isac = card->para[1] + 0x20; + } else if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) { + cs->hw.teles3.cfg_reg = card->para[3]; + cs->hw.teles3.isac = card->para[2] - 32; + cs->hw.teles3.hscx[0] = card->para[1] - 32; + cs->hw.teles3.hscx[1] = card->para[1]; } else { /* PNP */ - if (telespnp_probe(card->cs, card) < 0) - return 0; + cs->hw.teles3.cfg_reg = 0; + cs->hw.teles3.isac = card->para[1] - 32; + cs->hw.teles3.hscx[0] = card->para[2] - 32; + cs->hw.teles3.hscx[1] = card->para[2]; + } + cs->irq = card->para[0]; + cs->hw.teles3.isacfifo = cs->hw.teles3.isac + 0x3e; + cs->hw.teles3.hscxfifo[0] = cs->hw.teles3.hscx[0] + 0x3e; + cs->hw.teles3.hscxfifo[1] = cs->hw.teles3.hscx[1] + 0x3e; + if (cs->typ == ISDN_CTYPE_TELESPCMCIA) { + if (!request_region(cs->hw.teles3.hscx[1], 96, "HiSax Teles PCMCIA")) { + printk(KERN_WARNING + "HiSax: %s ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.teles3.hscx[1], + cs->hw.teles3.hscx[1] + 96); + return (0); + } + } else { + if (cs->hw.teles3.cfg_reg) { + if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) { + if (!request_region(cs->hw.teles3.cfg_reg, 1, "teles3 cfg")) { + printk(KERN_WARNING + "HiSax: %s config port %x already in use\n", + CardType[card->typ], + cs->hw.teles3.cfg_reg); + return (0); + } + } else { + if (!request_region(cs->hw.teles3.cfg_reg, 8, "teles3 cfg")) { + printk(KERN_WARNING + "HiSax: %s config port %x-%x already in use\n", + CardType[card->typ], + cs->hw.teles3.cfg_reg, + cs->hw.teles3.cfg_reg + 8); + return (0); + } + } + } + if (!request_region(cs->hw.teles3.isac + 32, 32, "HiSax isac")) { + printk(KERN_WARNING + "HiSax: %s isac ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.teles3.isac + 32, + cs->hw.teles3.isac + 64); + if (cs->hw.teles3.cfg_reg) { + if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) { + release_region(cs->hw.teles3.cfg_reg, 1); + } else { + release_region(cs->hw.teles3.cfg_reg, 8); + } + } + return (0); + } + if (!request_region(cs->hw.teles3.hscx[0] + 32, 32, "HiSax hscx A")) { + printk(KERN_WARNING + "HiSax: %s hscx A ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.teles3.hscx[0] + 32, + cs->hw.teles3.hscx[0] + 64); + if (cs->hw.teles3.cfg_reg) { + if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) { + release_region(cs->hw.teles3.cfg_reg, 1); + } else { + release_region(cs->hw.teles3.cfg_reg, 8); + } + } + release_ioregs(cs, 1); + return (0); + } + if (!request_region(cs->hw.teles3.hscx[1] + 32, 32, "HiSax hscx B")) { + printk(KERN_WARNING + "HiSax: %s hscx B ports %x-%x already in use\n", + CardType[cs->typ], + cs->hw.teles3.hscx[1] + 32, + cs->hw.teles3.hscx[1] + 64); + if (cs->hw.teles3.cfg_reg) { + if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) { + release_region(cs->hw.teles3.cfg_reg, 1); + } else { + release_region(cs->hw.teles3.cfg_reg, 8); + } + } + release_ioregs(cs, 3); + return (0); + } + } + if ((cs->hw.teles3.cfg_reg) && (cs->typ != ISDN_CTYPE_COMPAQ_ISA)) { + if ((val = bytein(cs->hw.teles3.cfg_reg + 0)) != 0x51) { + printk(KERN_WARNING "Teles: 16.3 Byte at %x is %x\n", + cs->hw.teles3.cfg_reg + 0, val); + release_io_teles3(cs); + return (0); + } + if ((val = bytein(cs->hw.teles3.cfg_reg + 1)) != 0x93) { + printk(KERN_WARNING "Teles: 16.3 Byte at %x is %x\n", + cs->hw.teles3.cfg_reg + 1, val); + release_io_teles3(cs); + return (0); + } + val = bytein(cs->hw.teles3.cfg_reg + 2);/* 0x1e=without AB + * 0x1f=with AB + * 0x1c 16.3 ??? + * 0x39 16.3 1.1 + * 0x38 16.3 1.3 + * 0x46 16.3 with AB + Video (Teles-Vision) + */ + if (val != 0x46 && val != 0x39 && val != 0x38 && val != 0x1c && val != 0x1e && val != 0x1f) { + printk(KERN_WARNING "Teles: 16.3 Byte at %x is %x\n", + cs->hw.teles3.cfg_reg + 2, val); + release_io_teles3(cs); + return (0); + } + } + printk(KERN_INFO + "HiSax: %s config irq:%d isac:0x%X cfg:0x%X\n", + CardType[cs->typ], cs->irq, + cs->hw.teles3.isac + 32, cs->hw.teles3.cfg_reg); + printk(KERN_INFO + "HiSax: hscx A:0x%X hscx B:0x%X\n", + cs->hw.teles3.hscx[0] + 32, cs->hw.teles3.hscx[1] + 32); + + setup_isac(cs); + if (reset_teles3(cs)) { + printk(KERN_WARNING "Teles3: wrong IRQ\n"); + release_io_teles3(cs); + return (0); + } + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &Teles_card_msg; + cs->irq_func = &teles3_interrupt; + ISACVersion(cs, "Teles3:"); + if (HscxVersion(cs, "Teles3:")) { + printk(KERN_WARNING + "Teles3: wrong HSCX versions check IO address\n"); + release_io_teles3(cs); + return (0); } - return 1; + return (1); } diff -Nru a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/isdn/hisax/teles_cs.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,549 @@ +/* $Id: teles_cs.c,v 1.1.2.2 2004/01/25 15:07:06 keil Exp $ */ +/*====================================================================== + + A teles S0 PCMCIA client driver + + Based on skeleton by David Hinds, dhinds@allegro.stanford.edu + Written by Christof Petig, christof.petig@wtal.de + + Also inspired by ELSA PCMCIA driver + by Klaus Lichtenwalder + + Extentions to new hisax_pcmcia by Karsten Keil + + minor changes to be compatible with kernel 2.4.x + by Jan.Schubert@GMX.li + +======================================================================*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include "hisax_cfg.h" + +MODULE_DESCRIPTION("ISDN4Linux: PCMCIA client driver for Teles PCMCIA cards"); +MODULE_AUTHOR("Christof Petig, christof.petig@wtal.de, Karsten Keil, kkeil@suse.de"); +MODULE_LICENSE("GPL"); + +/* + All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If + you do not define PCMCIA_DEBUG at all, all the debug code will be + left out. If you compile with PCMCIA_DEBUG=0, the debug code will + be present but disabled -- but it can then be enabled for specific + modules at load time with a 'pc_debug=#' option to insmod. +*/ + +#ifdef PCMCIA_DEBUG +static int pc_debug = PCMCIA_DEBUG; +MODULE_PARM(pc_debug, "i"); +#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); +static char *version = +"teles_cs.c 2.10 2002/07/30 22:23:34 kkeil"; +#else +#define DEBUG(n, args...) +#endif + +/*====================================================================*/ + +/* Parameters that can be set with 'insmod' */ + +/* Bit map of interrupts to choose from, the old way */ +/* This means pick from 15, 14, 12, 11, 10, 9, 7, 5, 4, 3 */ +static u_long irq_mask = 0xdeb8; + +/* Newer, simpler way of listing specific interrupts */ +static int irq_list[4] = { -1 }; + +MODULE_PARM(irq_mask, "i"); +MODULE_PARM(irq_list, "1-4i"); + +static int protocol = 2; /* EURO-ISDN Default */ +MODULE_PARM(protocol, "i"); + +/*====================================================================*/ + +/* + The event() function is this driver's Card Services event handler. + It will be called by Card Services when an appropriate card status + event is received. The config() and release() entry points are + used to configure or release a socket, in response to card insertion + and ejection events. They are invoked from the teles_cs event + handler. +*/ + +static void teles_cs_config(dev_link_t *link); +static void teles_cs_release(dev_link_t *link); +static int teles_cs_event(event_t event, int priority, + event_callback_args_t *args); + +/* + The attach() and detach() entry points are used to create and destroy + "instances" of the driver, where each instance represents everything + needed to manage one actual PCMCIA card. +*/ + +static dev_link_t *teles_attach(void); +static void teles_detach(dev_link_t *); + +/* + The dev_info variable is the "key" that is used to match up this + device driver with appropriate cards, through the card configuration + database. +*/ + +static dev_info_t dev_info = "teles_cs"; + +/* + A linked list of "instances" of the teles_cs device. Each actual + PCMCIA card corresponds to one device instance, and is described + by one dev_link_t structure (defined in ds.h). + + You may not want to use a linked list for this -- for example, the + memory card driver uses an array of dev_link_t pointers, where minor + device numbers are used to derive the corresponding array index. +*/ + +static dev_link_t *dev_list = NULL; + +/* + A dev_link_t structure has fields for most things that are needed + to keep track of a socket, but there will usually be some device + specific information that also needs to be kept track of. The + 'priv' pointer in a dev_link_t structure can be used to point to + a device-specific private data structure, like this. + + To simplify the data structure handling, we actually include the + dev_link_t structure in the device's private data structure. + + A driver needs to provide a dev_node_t structure for each device + on a card. In some cases, there is only one device per card (for + example, ethernet cards, modems). In other cases, there may be + many actual or logical devices (SCSI adapters, memory cards with + multiple partitions). The dev_node_t structures need to be kept + in a linked list starting at the 'dev' field of a dev_link_t + structure. We allocate them in the card's private data structure, + because they generally shouldn't be allocated dynamically. + In this case, we also provide a flag to indicate if a device is + "stopped" due to a power management event, or card ejection. The + device IO routines can use a flag like this to throttle IO to a + card that is not ready to accept it. +*/ + +typedef struct local_info_t { + dev_link_t link; + dev_node_t node; + int busy; + int cardnr; +} local_info_t; + +/*====================================================================== + + teles_attach() creates an "instance" of the driver, allocatingx + local data structures for one device. The device is registered + with Card Services. + + The dev_link structure is initialized, but we don't actually + configure the card at this point -- we wait until we receive a + card insertion event. + +======================================================================*/ + +static dev_link_t *teles_attach(void) +{ + client_reg_t client_reg; + dev_link_t *link; + local_info_t *local; + int ret, i; + + DEBUG(0, "teles_attach()\n"); + + /* Allocate space for private device-specific data */ + local = kmalloc(sizeof(local_info_t), GFP_KERNEL); + if (!local) return NULL; + memset(local, 0, sizeof(local_info_t)); + local->cardnr = -1; + link = &local->link; link->priv = local; + + /* Interrupt setup */ + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; + link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID|IRQ_SHARE_ID; + if (irq_list[0] == -1) + link->irq.IRQInfo2 = irq_mask; + else + for (i = 0; i < 4; i++) + link->irq.IRQInfo2 |= 1 << irq_list[i]; + link->irq.Handler = NULL; + + /* + General socket configuration defaults can go here. In this + client, we assume very little, and rely on the CIS for almost + everything. In most clients, many details (i.e., number, sizes, + and attributes of IO windows) are fixed by the nature of the + device, and can be hard-wired here. + */ + link->io.NumPorts1 = 96; + link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; + link->io.IOAddrLines = 5; + + link->conf.Attributes = CONF_ENABLE_IRQ; + link->conf.Vcc = 50; + link->conf.IntType = INT_MEMORY_AND_IO; + + /* Register with Card Services */ + link->next = dev_list; + dev_list = link; + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; + client_reg.EventMask = + CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &teles_cs_event; + client_reg.Version = 0x0210; + client_reg.event_callback_args.client_data = link; + ret = pcmcia_register_client(&link->handle, &client_reg); + if (ret != CS_SUCCESS) { + cs_error(link->handle, RegisterClient, ret); + teles_detach(link); + return NULL; + } + + return link; +} /* teles_attach */ + +/*====================================================================== + + This deletes a driver "instance". The device is de-registered + with Card Services. If it has been released, all local data + structures are freed. Otherwise, the structures will be freed + when the device is released. + +======================================================================*/ + +static void teles_detach(dev_link_t *link) +{ + dev_link_t **linkp; + local_info_t *info = link->priv; + int ret; + + DEBUG(0, "teles_detach(0x%p)\n", link); + + /* Locate device structure */ + for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) + if (*linkp == link) break; + if (*linkp == NULL) + return; + + if (link->state & DEV_CONFIG) + teles_cs_release(link); + + /* + If the device is currently configured and active, we won't + actually delete it yet. Instead, it is marked so that when + the release() function is called, that will trigger a proper + detach(). + */ + if (link->state & DEV_CONFIG) { + DEBUG(0, "teles_cs: detach postponed, '%s' " + "still locked\n", link->dev->dev_name); + link->state |= DEV_STALE_LINK; + return; + } + + /* Break the link with Card Services */ + if (link->handle) { + ret = pcmcia_deregister_client(link->handle); + if (ret != CS_SUCCESS) + cs_error(link->handle, DeregisterClient, ret); + } + + /* Unlink device structure and free it */ + *linkp = link->next; + kfree(info); + +} /* teles_detach */ + +/*====================================================================== + + teles_cs_config() is scheduled to run after a CARD_INSERTION event + is received, to configure the PCMCIA socket, and to make the + device available to the system. + +======================================================================*/ +static int get_tuple(client_handle_t handle, tuple_t *tuple, + cisparse_t *parse) +{ + int i = pcmcia_get_tuple_data(handle, tuple); + if (i != CS_SUCCESS) return i; + return pcmcia_parse_tuple(handle, tuple, parse); +} + +static int first_tuple(client_handle_t handle, tuple_t *tuple, + cisparse_t *parse) +{ + int i = pcmcia_get_first_tuple(handle, tuple); + if (i != CS_SUCCESS) return i; + return get_tuple(handle, tuple, parse); +} + +static int next_tuple(client_handle_t handle, tuple_t *tuple, + cisparse_t *parse) +{ + int i = pcmcia_get_next_tuple(handle, tuple); + if (i != CS_SUCCESS) return i; + return get_tuple(handle, tuple, parse); +} + +static void teles_cs_config(dev_link_t *link) +{ + client_handle_t handle; + tuple_t tuple; + cisparse_t parse; + local_info_t *dev; + int i, j, last_fn; + u_short buf[128]; + cistpl_cftable_entry_t *cf = &parse.cftable_entry; + IsdnCard_t icard; + + DEBUG(0, "teles_config(0x%p)\n", link); + handle = link->handle; + dev = link->priv; + + /* + This reads the card's CONFIG tuple to find its configuration + registers. + */ + tuple.DesiredTuple = CISTPL_CONFIG; + tuple.TupleData = (cisdata_t *)buf; + tuple.TupleDataMax = 255; + tuple.TupleOffset = 0; + tuple.Attributes = 0; + i = first_tuple(handle, &tuple, &parse); + if (i != CS_SUCCESS) { + last_fn = ParseTuple; + goto cs_failed; + } + link->conf.ConfigBase = parse.config.base; + link->conf.Present = parse.config.rmask[0]; + + /* Configure card */ + link->state |= DEV_CONFIG; + + tuple.TupleData = (cisdata_t *)buf; + tuple.TupleOffset = 0; tuple.TupleDataMax = 255; + tuple.Attributes = 0; + tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; + i = first_tuple(handle, &tuple, &parse); + while (i == CS_SUCCESS) { + if ( (cf->io.nwin > 0) && cf->io.win[0].base) { + printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); + link->conf.ConfigIndex = cf->index; + link->io.BasePort1 = cf->io.win[0].base; + i = pcmcia_request_io(link->handle, &link->io); + if (i == CS_SUCCESS) break; + } else { + printk(KERN_INFO "(teles_cs: looks like the 97 model)\n"); + link->conf.ConfigIndex = cf->index; + for (i = 0, j = 0x2f0; j > 0x100; j -= 0x10) { + link->io.BasePort1 = j; + i = pcmcia_request_io(link->handle, &link->io); + if (i == CS_SUCCESS) break; + } + break; + } + i = next_tuple(handle, &tuple, &parse); + } + + if (i != CS_SUCCESS) { + last_fn = RequestIO; + goto cs_failed; + } + + i = pcmcia_request_irq(link->handle, &link->irq); + if (i != CS_SUCCESS) { + link->irq.AssignedIRQ = 0; + last_fn = RequestIRQ; + goto cs_failed; + } + + i = pcmcia_request_configuration(link->handle, &link->conf); + if (i != CS_SUCCESS) { + last_fn = RequestConfiguration; + goto cs_failed; + } + + /* At this point, the dev_node_t structure(s) should be + initialized and arranged in a linked list at link->dev. *//* */ + sprintf(dev->node.dev_name, "teles"); + dev->node.major = dev->node.minor = 0x0; + + link->dev = &dev->node; + + /* Finally, report what we've done */ + printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d", + dev->node.dev_name, link->conf.ConfigIndex, + link->conf.Vcc/10, link->conf.Vcc%10); + if (link->conf.Vpp1) + printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10); + if (link->conf.Attributes & CONF_ENABLE_IRQ) + printk(", irq %d", link->irq.AssignedIRQ); + if (link->io.NumPorts1) + printk(", io 0x%04x-0x%04x", link->io.BasePort1, + link->io.BasePort1+link->io.NumPorts1-1); + if (link->io.NumPorts2) + printk(" & 0x%04x-0x%04x", link->io.BasePort2, + link->io.BasePort2+link->io.NumPorts2-1); + printk("\n"); + + link->state &= ~DEV_CONFIG_PENDING; + + icard.para[0] = link->irq.AssignedIRQ; + icard.para[1] = link->io.BasePort1; + icard.protocol = protocol; + icard.typ = ISDN_CTYPE_TELESPCMCIA; + + i = hisax_init_pcmcia(link, &(((local_info_t*)link->priv)->busy), &icard); + if (i < 0) { + printk(KERN_ERR "teles_cs: failed to initialize Teles PCMCIA %d at i/o %#x\n", + i, link->io.BasePort1); + teles_cs_release(link); + } else + ((local_info_t*)link->priv)->cardnr = i; + + return; +cs_failed: + cs_error(link->handle, last_fn, i); + teles_cs_release(link); +} /* teles_cs_config */ + +/*====================================================================== + + After a card is removed, teles_cs_release() will unregister the net + device, and release the PCMCIA configuration. If the device is + still open, this will be postponed until it is closed. + +======================================================================*/ + +static void teles_cs_release(dev_link_t *link) +{ + local_info_t *local = link->priv; + + DEBUG(0, "teles_cs_release(0x%p)\n", link); + + if (local) { + if (local->cardnr >= 0) { + /* no unregister function with hisax */ + HiSax_closecard(local->cardnr); + } + } + /* Unlink the device chain */ + link->dev = NULL; + + /* Don't bother checking to see if these succeed or not */ + if (link->win) + pcmcia_release_window(link->win); + pcmcia_release_configuration(link->handle); + pcmcia_release_io(link->handle, &link->io); + pcmcia_release_irq(link->handle, &link->irq); + link->state &= ~DEV_CONFIG; + + if (link->state & DEV_STALE_LINK) + teles_detach(link); + +} /* teles_cs_release */ + +/*====================================================================== + + The card status event handler. Mostly, this schedules other + stuff to run after an event is received. A CARD_REMOVAL event + also sets some flags to discourage the net drivers from trying + to talk to the card any more. + + When a CARD_REMOVAL event is received, we immediately set a flag + to block future accesses to this device. All the functions that + actually access the device should check this flag to make sure + the card is still present. + +======================================================================*/ + +static int teles_cs_event(event_t event, int priority, + event_callback_args_t *args) +{ + dev_link_t *link = args->client_data; + local_info_t *dev = link->priv; + + DEBUG(1, "teles_cs_event(%d)\n", event); + + switch (event) { + case CS_EVENT_CARD_REMOVAL: + link->state &= ~DEV_PRESENT; + if (link->state & DEV_CONFIG) { + ((local_info_t*)link->priv)->busy = 1; + teles_cs_release(link); + } + break; + case CS_EVENT_CARD_INSERTION: + link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; + teles_cs_config(link); + break; + case CS_EVENT_PM_SUSPEND: + link->state |= DEV_SUSPEND; + /* Fall through... */ + case CS_EVENT_RESET_PHYSICAL: + /* Mark the device as stopped, to block IO until later */ + dev->busy = 1; + if (link->state & DEV_CONFIG) + pcmcia_release_configuration(link->handle); + break; + case CS_EVENT_PM_RESUME: + link->state &= ~DEV_SUSPEND; + /* Fall through... */ + case CS_EVENT_CARD_RESET: + if (link->state & DEV_CONFIG) + pcmcia_request_configuration(link->handle, &link->conf); + dev->busy = 0; + break; + } + return 0; +} /* teles_cs_event */ + +static struct pcmcia_driver teles_cs_driver = { + .owner = THIS_MODULE, + .drv = { + .name = "teles_cs", + }, + .attach = teles_attach, + .detach = teles_detach, +}; + +static int __init init_teles_cs(void) +{ + return pcmcia_register_driver(&teles_cs_driver); +} + +static void __exit exit_teles_cs(void) +{ + pcmcia_unregister_driver(&teles_cs_driver); + + /* XXX: this really needs to move into generic code.. */ + while (dev_list != NULL) + teles_detach(dev_list); +} + +module_init(init_teles_cs); +module_exit(exit_teles_cs); diff -Nru a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c --- a/drivers/isdn/hisax/telespci.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/hisax/telespci.c Thu Feb 19 23:44:26 2004 @@ -1,4 +1,4 @@ -/* $Id: telespci.c,v 2.16.6.5 2001/09/23 22:24:52 kai Exp $ +/* $Id: telespci.c,v 2.23.2.3 2004/01/13 14:31:26 keil Exp $ * * low level stuff for Teles PCI isdn cards * @@ -21,7 +21,7 @@ #include extern const char *CardType[]; -const char *telespci_revision = "$Revision: 2.16.6.5 $"; +const char *telespci_revision = "$Revision: 2.23.2.3 $"; #define ZORAN_PO_RQ_PEN 0x02000000 #define ZORAN_PO_WR 0x00800000 @@ -39,233 +39,250 @@ #define WRITE_DATA_HSCX (ZORAN_PO_WR | ZORAN_PO_GID1 | ZORAN_PO_GREG1) #define ZORAN_WAIT_NOBUSY do { \ - portdata = readl(adr); \ + portdata = readl(adr + 0x200); \ } while (portdata & ZORAN_PO_RQ_PEN) -static u8 -isac_read(struct IsdnCardState *cs, u8 off) +static inline u_char +readisac(unsigned long adr, u_char off) { - void *adr = cs->hw.teles0.membase + 0x200; - unsigned int portdata; + register unsigned int portdata; ZORAN_WAIT_NOBUSY; /* set address for ISAC */ - writel(WRITE_ADDR_ISAC | off, adr); + writel(WRITE_ADDR_ISAC | off, adr + 0x200); ZORAN_WAIT_NOBUSY; /* read data from ISAC */ - writel(READ_DATA_ISAC, adr); + writel(READ_DATA_ISAC, adr + 0x200); ZORAN_WAIT_NOBUSY; - return((u8)(portdata & ZORAN_PO_DMASK)); + return((u_char)(portdata & ZORAN_PO_DMASK)); } -static void -isac_write(struct IsdnCardState *cs, u8 off, u8 data) +static inline void +writeisac(unsigned long adr, u_char off, u_char data) { - void *adr = cs->hw.teles0.membase + 0x200; - unsigned int portdata; + register unsigned int portdata; ZORAN_WAIT_NOBUSY; /* set address for ISAC */ - writel(WRITE_ADDR_ISAC | off, adr); + writel(WRITE_ADDR_ISAC | off, adr + 0x200); ZORAN_WAIT_NOBUSY; /* write data to ISAC */ - writel(WRITE_DATA_ISAC | data, adr); + writel(WRITE_DATA_ISAC | data, adr + 0x200); ZORAN_WAIT_NOBUSY; } -static void -isac_read_fifo(struct IsdnCardState *cs, u8 *data, int size) +static inline u_char +readhscx(unsigned long adr, int hscx, u_char off) { - void *adr = cs->hw.teles0.membase + 0x200; - unsigned int portdata; - int i; + register unsigned int portdata; + + ZORAN_WAIT_NOBUSY; + /* set address for HSCX */ + writel(WRITE_ADDR_HSCX | ((hscx ? 0x40:0) + off), adr + 0x200); + ZORAN_WAIT_NOBUSY; + + /* read data from HSCX */ + writel(READ_DATA_HSCX, adr + 0x200); + ZORAN_WAIT_NOBUSY; + return ((u_char)(portdata & ZORAN_PO_DMASK)); +} + +static inline void +writehscx(unsigned long adr, int hscx, u_char off, u_char data) +{ + register unsigned int portdata; + + ZORAN_WAIT_NOBUSY; + /* set address for HSCX */ + writel(WRITE_ADDR_HSCX | ((hscx ? 0x40:0) + off), adr + 0x200); + ZORAN_WAIT_NOBUSY; + + /* write data to HSCX */ + writel(WRITE_DATA_HSCX | data, adr + 0x200); + ZORAN_WAIT_NOBUSY; +} + +static inline void +read_fifo_isac(unsigned long adr, u_char * data, int size) +{ + register unsigned int portdata; + register int i; ZORAN_WAIT_NOBUSY; /* read data from ISAC */ for (i = 0; i < size; i++) { /* set address for ISAC fifo */ - writel(WRITE_ADDR_ISAC | 0x1E, adr); + writel(WRITE_ADDR_ISAC | 0x1E, adr + 0x200); ZORAN_WAIT_NOBUSY; - writel(READ_DATA_ISAC, adr); + writel(READ_DATA_ISAC, adr + 0x200); ZORAN_WAIT_NOBUSY; - data[i] = (u8)(portdata & ZORAN_PO_DMASK); + data[i] = (u_char)(portdata & ZORAN_PO_DMASK); } } static void -isac_write_fifo(struct IsdnCardState *cs, u8 *data, int size) +write_fifo_isac(unsigned long adr, u_char * data, int size) { - void *adr = cs->hw.teles0.membase + 0x200; - unsigned int portdata; - int i; + register unsigned int portdata; + register int i; ZORAN_WAIT_NOBUSY; /* write data to ISAC */ for (i = 0; i < size; i++) { /* set address for ISAC fifo */ - writel(WRITE_ADDR_ISAC | 0x1E, adr); + writel(WRITE_ADDR_ISAC | 0x1E, adr + 0x200); ZORAN_WAIT_NOBUSY; - writel(WRITE_DATA_ISAC | data[i], adr); + writel(WRITE_DATA_ISAC | data[i], adr + 0x200); ZORAN_WAIT_NOBUSY; } } -static struct dc_hw_ops isac_ops = { - .read_reg = isac_read, - .write_reg = isac_write, - .read_fifo = isac_read_fifo, - .write_fifo = isac_write_fifo, -}; - -static u8 -hscx_read(struct IsdnCardState *cs, int hscx, u8 off) -{ - void *adr = cs->hw.teles0.membase + 0x200; - unsigned int portdata; - - ZORAN_WAIT_NOBUSY; - /* set address for HSCX */ - writel(WRITE_ADDR_HSCX | ((hscx ? 0x40:0) + off), adr); - ZORAN_WAIT_NOBUSY; - - /* read data from HSCX */ - writel(READ_DATA_HSCX, adr); - ZORAN_WAIT_NOBUSY; - return ((u8)(portdata & ZORAN_PO_DMASK)); -} - -static void -hscx_write(struct IsdnCardState *cs, int hscx, u8 off, u8 data) +static inline void +read_fifo_hscx(unsigned long adr, int hscx, u_char * data, int size) { - void *adr = cs->hw.teles0.membase + 0x200; - unsigned int portdata; - - ZORAN_WAIT_NOBUSY; - /* set address for HSCX */ - writel(WRITE_ADDR_HSCX | ((hscx ? 0x40:0) + off), adr); - ZORAN_WAIT_NOBUSY; - - /* write data to HSCX */ - writel(WRITE_DATA_HSCX | data, adr); - ZORAN_WAIT_NOBUSY; -} - -static void -hscx_read_fifo(struct IsdnCardState *cs, int hscx, u8 * data, int size) -{ - void *adr = cs->hw.teles0.membase + 0x200; - unsigned int portdata; - int i; + register unsigned int portdata; + register int i; ZORAN_WAIT_NOBUSY; /* read data from HSCX */ for (i = 0; i < size; i++) { /* set address for HSCX fifo */ - writel(WRITE_ADDR_HSCX |(hscx ? 0x5F:0x1F), adr); + writel(WRITE_ADDR_HSCX |(hscx ? 0x5F:0x1F), adr + 0x200); ZORAN_WAIT_NOBUSY; - writel(READ_DATA_HSCX, adr); + writel(READ_DATA_HSCX, adr + 0x200); ZORAN_WAIT_NOBUSY; - data[i] = (u8) (portdata & ZORAN_PO_DMASK); + data[i] = (u_char) (portdata & ZORAN_PO_DMASK); } } -static void -hscx_write_fifo(struct IsdnCardState *cs, int hscx, u8 * data, int size) +static inline void +write_fifo_hscx(unsigned long adr, int hscx, u_char * data, int size) { - void *adr = cs->hw.teles0.membase + 0x200; unsigned int portdata; - int i; + register int i; ZORAN_WAIT_NOBUSY; /* write data to HSCX */ for (i = 0; i < size; i++) { /* set address for HSCX fifo */ - writel(WRITE_ADDR_HSCX |(hscx ? 0x5F:0x1F), adr); + writel(WRITE_ADDR_HSCX |(hscx ? 0x5F:0x1F), adr + 0x200); ZORAN_WAIT_NOBUSY; - writel(WRITE_DATA_HSCX | data[i], adr); + writel(WRITE_DATA_HSCX | data[i], adr + 0x200); ZORAN_WAIT_NOBUSY; udelay(10); } } -static struct bc_hw_ops hscx_ops = { - .read_reg = hscx_read, - .write_reg = hscx_write, - .read_fifo = hscx_read_fifo, - .write_fifo = hscx_write_fifo, -}; +/* Interface functions */ + +static u_char +ReadISAC(struct IsdnCardState *cs, u_char offset) +{ + return (readisac(cs->hw.teles0.membase, offset)); +} + +static void +WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) +{ + writeisac(cs->hw.teles0.membase, offset, value); +} + +static void +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) +{ + read_fifo_isac(cs->hw.teles0.membase, data, size); +} + +static void +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) +{ + write_fifo_isac(cs->hw.teles0.membase, data, size); +} + +static u_char +ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset) +{ + return (readhscx(cs->hw.teles0.membase, hscx, offset)); +} + +static void +WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) +{ + writehscx(cs->hw.teles0.membase, hscx, offset, value); +} + +/* + * fast interrupt HSCX stuff goes here + */ + +#define READHSCX(cs, nr, reg) readhscx(cs->hw.teles0.membase, nr, reg) +#define WRITEHSCX(cs, nr, reg, data) writehscx(cs->hw.teles0.membase, nr, reg, data) +#define READHSCXFIFO(cs, nr, ptr, cnt) read_fifo_hscx(cs->hw.teles0.membase, nr, ptr, cnt) +#define WRITEHSCXFIFO(cs, nr, ptr, cnt) write_fifo_hscx(cs->hw.teles0.membase, nr, ptr, cnt) + +#include "hscx_irq.c" static irqreturn_t telespci_interrupt(int intno, void *dev_id, struct pt_regs *regs) { -#define MAXCOUNT 20 struct IsdnCardState *cs = dev_id; - u8 val; + u_char hval, ival; + u_long flags; - spin_lock(&cs->lock); - val = hscx_read(cs, 1, HSCX_ISTA); - if (val) - hscx_int_main(cs, val); - val = isac_read(cs, ISAC_ISTA); - if (val) - isac_interrupt(cs, val); + spin_lock_irqsave(&cs->lock, flags); + hval = readhscx(cs->hw.teles0.membase, 1, HSCX_ISTA); + if (hval) + hscx_int_main(cs, hval); + ival = readisac(cs->hw.teles0.membase, ISAC_ISTA); + if ((hval | ival) == 0) { + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; + } + if (ival) + isac_interrupt(cs, ival); /* Clear interrupt register for Zoran PCI controller */ writel(0x70000000, cs->hw.teles0.membase + 0x3C); - hscx_write(cs, 0, HSCX_MASK, 0xFF); - hscx_write(cs, 1, HSCX_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0xFF); - isac_write(cs, ISAC_MASK, 0x0); - hscx_write(cs, 0, HSCX_MASK, 0x0); - hscx_write(cs, 1, HSCX_MASK, 0x0); - spin_unlock(&cs->lock); + writehscx(cs->hw.teles0.membase, 0, HSCX_MASK, 0xFF); + writehscx(cs->hw.teles0.membase, 1, HSCX_MASK, 0xFF); + writeisac(cs->hw.teles0.membase, ISAC_MASK, 0xFF); + writeisac(cs->hw.teles0.membase, ISAC_MASK, 0x0); + writehscx(cs->hw.teles0.membase, 0, HSCX_MASK, 0x0); + writehscx(cs->hw.teles0.membase, 1, HSCX_MASK, 0x0); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } -static struct card_ops telespci_ops = { - .init = inithscxisac, - .release = hisax_release_resources, - .irq_func = telespci_interrupt, -}; - -static int __init -telespci_probe(struct IsdnCardState *cs, struct pci_dev *pdev) +void +release_io_telespci(struct IsdnCardState *cs) { - int rc; - - printk(KERN_INFO "TelesPCI: defined at %#lx IRQ %d\n", - pci_resource_start(pdev, 0), pdev->irq); - - rc = -EBUSY; - if (pci_enable_device(pdev)) - goto err; - - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.teles0.membase = request_mmio(&cs->rs, pci_resource_start(pdev, 0), 4096, "telespci"); - if (!cs->hw.teles0.membase) - goto err; + iounmap((void *)cs->hw.teles0.membase); +} - /* Initialize Zoran PCI controller */ - writel(0x00000000, cs->hw.teles0.membase + 0x28); - writel(0x01000000, cs->hw.teles0.membase + 0x28); - writel(0x01000000, cs->hw.teles0.membase + 0x28); - writel(0x7BFFFFFF, cs->hw.teles0.membase + 0x2C); - writel(0x70000000, cs->hw.teles0.membase + 0x3C); - writel(0x61000000, cs->hw.teles0.membase + 0x40); - /* writel(0x00800000, cs->hw.teles0.membase + 0x200); */ +static int +TelesPCI_card_msg(struct IsdnCardState *cs, int mt, void *arg) +{ + u_long flags; - cs->card_ops = &telespci_ops; - if (hscxisac_setup(cs, &isac_ops, &hscx_ops)) - goto err; - return 0; - err: - hisax_release_resources(cs); - return rc; + switch (mt) { + case CARD_RESET: + return(0); + case CARD_RELEASE: + release_io_telespci(cs); + return(0); + case CARD_INIT: + spin_lock_irqsave(&cs->lock, flags); + inithscxisac(cs, 3); + spin_unlock_irqrestore(&cs->lock, flags); + return(0); + case CARD_TEST: + return(0); + } + return(0); } static struct pci_dev *dev_tel __initdata = NULL; @@ -273,21 +290,70 @@ int __init setup_telespci(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; #ifdef __BIG_ENDIAN #error "not running on big endian machines now" #endif strcpy(tmp, telespci_revision); - printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", - HiSax_getrev(tmp)); - dev_tel = pci_find_device(PCI_VENDOR_ID_ZORAN, - PCI_DEVICE_ID_ZORAN_36120, dev_tel); - if (dev_tel) { - if (telespci_probe(card->cs, dev_tel) < 0) - return 0; - return 1; + printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_TELESPCI) + return (0); +#if CONFIG_PCI + if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { + if (pci_enable_device(dev_tel)) + return(0); + cs->irq = dev_tel->irq; + if (!cs->irq) { + printk(KERN_WARNING "Teles: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.teles0.membase = (u_long) ioremap(pci_resource_start(dev_tel, 0), + PAGE_SIZE); + printk(KERN_INFO "Found: Zoran, base-address: 0x%lx, irq: 0x%x\n", + pci_resource_start(dev_tel, 0), dev_tel->irq); + } else { + printk(KERN_WARNING "TelesPCI: No PCI card found\n"); + return(0); + } +#else + printk(KERN_WARNING "HiSax: Teles/PCI and NO_PCI_BIOS\n"); + printk(KERN_WARNING "HiSax: Teles/PCI unable to config\n"); + return (0); +#endif /* CONFIG_PCI */ + + /* Initialize Zoran PCI controller */ + writel(0x00000000, cs->hw.teles0.membase + 0x28); + writel(0x01000000, cs->hw.teles0.membase + 0x28); + writel(0x01000000, cs->hw.teles0.membase + 0x28); + writel(0x7BFFFFFF, cs->hw.teles0.membase + 0x2C); + writel(0x70000000, cs->hw.teles0.membase + 0x3C); + writel(0x61000000, cs->hw.teles0.membase + 0x40); + /* writel(0x00800000, cs->hw.teles0.membase + 0x200); */ + + printk(KERN_INFO + "HiSax: %s config irq:%d mem:%lx\n", + CardType[cs->typ], cs->irq, + cs->hw.teles0.membase); + + setup_isac(cs); + cs->readisac = &ReadISAC; + cs->writeisac = &WriteISAC; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadHSCX; + cs->BC_Write_Reg = &WriteHSCX; + cs->BC_Send_Data = &hscx_fill_fifo; + cs->cardmsg = &TelesPCI_card_msg; + cs->irq_func = &telespci_interrupt; + cs->irq_flags |= SA_SHIRQ; + ISACVersion(cs, "TelesPCI:"); + if (HscxVersion(cs, "TelesPCI:")) { + printk(KERN_WARNING + "TelesPCI: wrong HSCX versions check IO/MEM addresses\n"); + release_io_telespci(cs); + return (0); } - printk(KERN_WARNING "TelesPCI: No PCI card found\n"); - return 0; + return (1); } diff -Nru a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c --- a/drivers/isdn/hisax/w6692.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hisax/w6692.c Thu Feb 19 23:44:27 2004 @@ -1,4 +1,4 @@ -/* $Id: w6692.c,v 1.12.6.6 2001/09/23 22:24:52 kai Exp $ +/* $Id: w6692.c,v 1.18.2.4 2004/02/11 13:21:34 keil Exp $ * * Winbond W6692 specific routines * @@ -41,60 +41,10 @@ extern const char *CardType[]; -const char *w6692_revision = "$Revision: 1.12.6.6 $"; +const char *w6692_revision = "$Revision: 1.18.2.4 $"; #define DBUSY_TIMER_VALUE 80 -static inline u8 -w6692_read_reg(struct IsdnCardState *cs, u8 offset) -{ - return (inb(cs->hw.w6692.iobase + offset)); -} - -static inline void -w6692_write_reg(struct IsdnCardState *cs, u8 offset, u8 value) -{ - outb(value, cs->hw.w6692.iobase + offset); -} - -static void -w6692_read_fifo(struct IsdnCardState *cs, u8 * data, int size) -{ - insb(cs->hw.w6692.iobase + W_D_RFIFO, data, size); -} - -static inline void -w6692_write_fifo(struct IsdnCardState *cs, u8 * data, int size) -{ - outsb(cs->hw.w6692.iobase + W_D_XFIFO, data, size); -} - -static struct dc_hw_ops w6692_dc_hw_ops = { - .read_fifo = w6692_read_fifo, -}; - -static inline u8 -w6692_bc_read_reg(struct IsdnCardState *cs, int bchan, u8 offset) -{ - return (inb(cs->hw.w6692.iobase + (bchan ? 0x40 : 0) + offset)); -} - -static inline void -w6692_bc_write_reg(struct IsdnCardState *cs, int bchan, u8 offset, u8 value) -{ - outb(value, cs->hw.w6692.iobase + (bchan ? 0x40 : 0) + offset); -} - -static void -w6692_bc_read_fifo(struct IsdnCardState *cs, int bchan, u8 *data, int len) -{ - insb(cs->hw.w6692.iobase + W_B_RFIFO + (bchan ? 0x40:0), data, len); -} - -static struct bc_hw_ops w6692_bc_hw_ops = { - .read_fifo = w6692_bc_read_fifo, -}; - static char *W6692Ver[] __initdata = {"W6692 V00", "W6692 V01", "W6692 V10", "W6692 V11"}; @@ -104,7 +54,7 @@ { int val; - val = w6692_read_reg(cs, W_D_RBCH); + val = cs->readW6692(cs, W_D_RBCH); printk(KERN_INFO "%s Winbond W6692 version (%x): %s\n", s, val, W6692Ver[(val >> 6) & 3]); } @@ -113,7 +63,7 @@ { if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ph_command %x", command); - w6692_write_reg(cs, W_CIX, command); + cs->writeisac(cs, W_CIX, command); } @@ -152,9 +102,8 @@ } static void -W6692_bh(void *data) +W6692_bh(struct IsdnCardState *cs) { - struct IsdnCardState *cs = data; struct PStack *stptr; if (!cs) @@ -164,7 +113,7 @@ debugl1(cs, "D-Channel Busy cleared"); stptr = cs->stlist; while (stptr != NULL) { - L1L2(stptr, PH_PAUSE | CONFIRM, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); stptr = stptr->next; } } @@ -185,22 +134,58 @@ static void W6692_empty_fifo(struct IsdnCardState *cs, int count) { - recv_empty_fifo_d(cs, count); - w6692_write_reg(cs, W_D_CMDR, W_D_CMDR_RACK); + u_char *ptr; + + if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) + debugl1(cs, "W6692_empty_fifo"); + + if ((cs->rcvidx + count) >= MAX_DFRAME_LEN_L1) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "W6692_empty_fifo overrun %d", + cs->rcvidx + count); + cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_RACK); + cs->rcvidx = 0; + return; + } + ptr = cs->rcvbuf + cs->rcvidx; + cs->rcvidx += count; + cs->readW6692fifo(cs, ptr, count); + cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_RACK); + if (cs->debug & L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "W6692_empty_fifo cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } static void W6692_fill_fifo(struct IsdnCardState *cs) { int count, more; - unsigned char *p; + u_char *ptr; + + if ((cs->debug & L1_DEB_ISAC) && !(cs->debug & L1_DEB_ISAC_FIFO)) + debugl1(cs, "W6692_fill_fifo"); - p = xmit_fill_fifo_d(cs, W_D_FIFO_THRESH, &count, &more); - if (!p) + if (!cs->tx_skb) return; - w6692_write_fifo(cs, p, count); - w6692_write_reg(cs, W_D_CMDR, more ? W_D_CMDR_XMS : (W_D_CMDR_XMS | W_D_CMDR_XME)); + count = cs->tx_skb->len; + if (count <= 0) + return; + + more = 0; + if (count > W_D_FIFO_THRESH) { + more = !0; + count = W_D_FIFO_THRESH; + } + ptr = cs->tx_skb->data; + skb_pull(cs->tx_skb, count); + cs->tx_cnt += count; + cs->writeW6692fifo(cs, ptr, count); + cs->writeW6692(cs, W_D_CMDR, more ? W_D_CMDR_XMS : (W_D_CMDR_XMS | W_D_CMDR_XME)); if (test_and_set_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { debugl1(cs, "W6692_fill_fifo dbusytimer running"); del_timer(&cs->dbusytimer); @@ -208,13 +193,43 @@ init_timer(&cs->dbusytimer); cs->dbusytimer.expires = jiffies + ((DBUSY_TIMER_VALUE * HZ) / 1000); add_timer(&cs->dbusytimer); + if (cs->debug & L1_DEB_ISAC_FIFO) { + char *t = cs->dlog; + + t += sprintf(t, "W6692_fill_fifo cnt %d", count); + QuickHex(t, ptr, count); + debugl1(cs, cs->dlog); + } } static void W6692B_empty_fifo(struct BCState *bcs, int count) { - recv_empty_fifo_b(bcs, count); - w6692_bc_write_reg(bcs->cs, bcs->channel, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RACT); + u_char *ptr; + struct IsdnCardState *cs = bcs->cs; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "W6692B_empty_fifo"); + + if (bcs->hw.w6692.rcvidx + count > HSCX_BUFMAX) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "W6692B_empty_fifo: incoming packet too large"); + cs->BC_Write_Reg(cs, bcs->channel, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RACT); + bcs->hw.w6692.rcvidx = 0; + return; + } + ptr = bcs->hw.w6692.rcvbuf + bcs->hw.w6692.rcvidx; + bcs->hw.w6692.rcvidx += count; + READW6692BFIFO(cs, bcs->channel, ptr, count); + cs->BC_Write_Reg(cs, bcs->channel, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RACT); + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "W6692B_empty_fifo %c cnt %d", + bcs->channel + '1', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } static void @@ -222,33 +237,50 @@ { struct IsdnCardState *cs = bcs->cs; int more, count; - unsigned char *p; + u_char *ptr; - p = xmit_fill_fifo_b(bcs, W_B_FIFO_THRESH, &count, &more); - if (!p) + if (!bcs->tx_skb) + return; + if (bcs->tx_skb->len <= 0) return; - WRITEW6692BFIFO(cs, bcs->channel, p, count); - w6692_bc_write_reg(cs, bcs->channel, W_B_CMDR, W_B_CMDR_RACT | W_B_CMDR_XMS | (more ? 0 : W_B_CMDR_XME)); -} - -static void -reset_xmit(struct BCState *bcs) -{ - w6692_bc_write_reg(bcs->cs, bcs->channel, W_B_CMDR, - W_B_CMDR_XRST | W_B_CMDR_RACT); + more = (bcs->mode == L1_MODE_TRANS) ? 1 : 0; + if (bcs->tx_skb->len > W_B_FIFO_THRESH) { + more = 1; + count = W_B_FIFO_THRESH; + } else + count = bcs->tx_skb->len; + + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "W6692B_fill_fifo%s%d", (more ? " ": " last "), count); + + ptr = bcs->tx_skb->data; + skb_pull(bcs->tx_skb, count); + bcs->tx_cnt -= count; + bcs->hw.w6692.count += count; + WRITEW6692BFIFO(cs, bcs->channel, ptr, count); + cs->BC_Write_Reg(cs, bcs->channel, W_B_CMDR, W_B_CMDR_RACT | W_B_CMDR_XMS | (more ? 0 : W_B_CMDR_XME)); + if (cs->debug & L1_DEB_HSCX_FIFO) { + char *t = bcs->blog; + + t += sprintf(t, "W6692B_fill_fifo %c cnt %d", + bcs->channel + '1', count); + QuickHex(t, ptr, count); + debugl1(cs, bcs->blog); + } } static void -W6692B_interrupt(struct IsdnCardState *cs, u8 bchan) +W6692B_interrupt(struct IsdnCardState *cs, u_char bchan) { - u8 val; - u8 r; + u_char val; + u_char r; struct BCState *bcs; + struct sk_buff *skb; int count; bcs = (cs->bcs->channel == bchan) ? cs->bcs : (cs->bcs+1); - val = w6692_bc_read_reg(cs, bchan, W_B_EXIR); + val = cs->BC_Read_Reg(cs, bchan, W_B_EXIR); debugl1(cs, "W6692B chan %d B_EXIR 0x%02X", bchan, val); if (!test_bit(BC_FLG_INIT, &bcs->Flag)) { @@ -256,8 +288,10 @@ return; } if (val & W_B_EXI_RME) { /* RME */ - r = w6692_bc_read_reg(cs, bchan, W_B_STAR); - if (r & (W_B_STAR_RDOV | W_B_STAR_CRCE | W_B_STAR_RMB | W_B_STAR_XDOW)) { + r = cs->BC_Read_Reg(cs, bchan, W_B_STAR); + if (r & (W_B_STAR_RDOV | W_B_STAR_CRCE | W_B_STAR_RMB)) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "W6692 B STAR %x", r); if ((r & W_B_STAR_RDOV) && bcs->mode) if (cs->debug & L1_DEB_WARN) debugl1(cs, "W6692 B RDOV mode=%d", @@ -265,46 +299,129 @@ if (r & W_B_STAR_CRCE) if (cs->debug & L1_DEB_WARN) debugl1(cs, "W6692 B CRC error"); - w6692_bc_write_reg(cs, bchan, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RRST | W_B_CMDR_RACT); - bcs->rcvidx = 0; + cs->BC_Write_Reg(cs, bchan, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RRST | W_B_CMDR_RACT); } else { - count = w6692_bc_read_reg(cs, bchan, W_B_RBCL) & (W_B_FIFO_THRESH - 1); + count = cs->BC_Read_Reg(cs, bchan, W_B_RBCL) & (W_B_FIFO_THRESH - 1); if (count == 0) count = W_B_FIFO_THRESH; W6692B_empty_fifo(bcs, count); - recv_rme_b(bcs); + if ((count = bcs->hw.w6692.rcvidx) > 0) { + if (cs->debug & L1_DEB_HSCX_FIFO) + debugl1(cs, "W6692 Bchan Frame %d", count); + if (!(skb = dev_alloc_skb(count))) + printk(KERN_WARNING "W6692: Bchan receive out of memory\n"); + else { + memcpy(skb_put(skb, count), bcs->hw.w6692.rcvbuf, count); + skb_queue_tail(&bcs->rqueue, skb); + } + } } + bcs->hw.w6692.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); } if (val & W_B_EXI_RMR) { /* RMR */ W6692B_empty_fifo(bcs, W_B_FIFO_THRESH); - recv_rpf_b(bcs); - } - if (val & W_B_EXI_XFR) { /* XFR */ - xmit_xpr_b(bcs); + r = cs->BC_Read_Reg(cs, bchan, W_B_STAR); + if (r & W_B_STAR_RDOV) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "W6692 B RDOV(RMR) mode=%d",bcs->mode); + cs->BC_Write_Reg(cs, bchan, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RRST | W_B_CMDR_RACT); + if (bcs->mode != L1_MODE_TRANS) + bcs->hw.w6692.rcvidx = 0; + } + if (bcs->mode == L1_MODE_TRANS) { + /* receive audio data */ + if (!(skb = dev_alloc_skb(W_B_FIFO_THRESH))) + printk(KERN_WARNING "HiSax: receive out of memory\n"); + else { + memcpy(skb_put(skb, W_B_FIFO_THRESH), bcs->hw.w6692.rcvbuf, W_B_FIFO_THRESH); + skb_queue_tail(&bcs->rqueue, skb); + } + bcs->hw.w6692.rcvidx = 0; + schedule_event(bcs, B_RCVBUFREADY); + } } if (val & W_B_EXI_XDUN) { /* XDUN */ - xmit_xdu_b(bcs, reset_xmit); + cs->BC_Write_Reg(cs, bchan, W_B_CMDR, W_B_CMDR_XRST | W_B_CMDR_RACT); + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "W6692 B EXIR %x Lost TX", val); + if (bcs->mode == 1) + W6692B_fill_fifo(bcs); + else { + /* Here we lost an TX interrupt, so + * restart transmitting the whole frame. + */ + if (bcs->tx_skb) { + skb_push(bcs->tx_skb, bcs->hw.w6692.count); + bcs->tx_cnt += bcs->hw.w6692.count; + bcs->hw.w6692.count = 0; + } + } + return; + } + if (val & W_B_EXI_XFR) { /* XFR */ + r = cs->BC_Read_Reg(cs, bchan, W_B_STAR); + if (r & W_B_STAR_XDOW) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "W6692 B STAR %x XDOW", r); + cs->BC_Write_Reg(cs, bchan, W_B_CMDR, W_B_CMDR_XRST | W_B_CMDR_RACT); + if (bcs->tx_skb && (bcs->mode != 1)) { + skb_push(bcs->tx_skb, bcs->hw.w6692.count); + bcs->tx_cnt += bcs->hw.w6692.count; + bcs->hw.w6692.count = 0; + } + } + if (bcs->tx_skb) { + if (bcs->tx_skb->len) { + W6692B_fill_fifo(bcs); + return; + } else { + if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag) && + (PACKET_NOACK != bcs->tx_skb->pkt_type)) { + u_long flags; + spin_lock_irqsave(&bcs->aclock, flags); + bcs->ackcnt += bcs->hw.w6692.count; + spin_unlock_irqrestore(&bcs->aclock, flags); + schedule_event(bcs, B_ACKPENDING); + } + dev_kfree_skb_irq(bcs->tx_skb); + bcs->hw.w6692.count = 0; + bcs->tx_skb = NULL; + } + } + if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) { + bcs->hw.w6692.count = 0; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + W6692B_fill_fifo(bcs); + } else { + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + schedule_event(bcs, B_XMTBUFREADY); + } } } static irqreturn_t -w6692_interrupt(int intno, void *dev_id, struct pt_regs *regs) +W6692_interrupt(int intno, void *dev_id, struct pt_regs *regs) { - struct IsdnCardState *cs = dev_id; - u8 val, exval, v1; - unsigned int count; - int icnt = 5; - - spin_lock(&cs->lock); - - val = w6692_read_reg(cs, W_ISTA); - + struct IsdnCardState *cs = dev_id; + u_char val, exval, v1; + struct sk_buff *skb; + u_int count; + u_long flags; + int icnt = 5; + + spin_lock_irqsave(&cs->lock, flags); + val = cs->readW6692(cs, W_ISTA); + if (!val) { + spin_unlock_irqrestore(&cs->lock, flags); + return IRQ_NONE; + } StartW6692: if (cs->debug & L1_DEB_ISAC) debugl1(cs, "W6692 ISTA %x", val); if (val & W_INT_D_RME) { /* RME */ - exval = w6692_read_reg(cs, W_D_RSTA); + exval = cs->readW6692(cs, W_D_RSTA); if (exval & (W_D_RSTA_RDOV | W_D_RSTA_CRCE | W_D_RSTA_RMB)) { if (exval & W_D_RSTA_RDOV) if (cs->debug & L1_DEB_WARN) @@ -315,58 +432,100 @@ if (exval & W_D_RSTA_RMB) if (cs->debug & L1_DEB_WARN) debugl1(cs, "W6692 D-channel ABORT"); - w6692_write_reg(cs, W_D_CMDR, W_D_CMDR_RACK | W_D_CMDR_RRST); - cs->rcvidx = 0; + cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_RACK | W_D_CMDR_RRST); } else { - count = w6692_read_reg(cs, W_D_RBCL) & (W_D_FIFO_THRESH - 1); + count = cs->readW6692(cs, W_D_RBCL) & (W_D_FIFO_THRESH - 1); if (count == 0) count = W_D_FIFO_THRESH; W6692_empty_fifo(cs, count); - recv_rme_d(cs); + if ((count = cs->rcvidx) > 0) { + cs->rcvidx = 0; + if (!(skb = alloc_skb(count, GFP_ATOMIC))) + printk(KERN_WARNING "HiSax: D receive out of memory\n"); + else { + memcpy(skb_put(skb, count), cs->rcvbuf, count); + skb_queue_tail(&cs->rq, skb); + } + } } + cs->rcvidx = 0; + schedule_event(cs, D_RCVBUFREADY); } if (val & W_INT_D_RMR) { /* RMR */ W6692_empty_fifo(cs, W_D_FIFO_THRESH); } if (val & W_INT_D_XFR) { /* XFR */ - xmit_xpr_d(cs); + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { + if (cs->tx_skb->len) { + W6692_fill_fifo(cs); + goto afterXFR; + } else { + dev_kfree_skb_irq(cs->tx_skb); + cs->tx_cnt = 0; + cs->tx_skb = NULL; + } + } + if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_cnt = 0; + W6692_fill_fifo(cs); + } else + schedule_event(cs, D_XMTBUFREADY); } + afterXFR: if (val & (W_INT_XINT0 | W_INT_XINT1)) { /* XINT0/1 - never */ if (cs->debug & L1_DEB_ISAC) debugl1(cs, "W6692 spurious XINT!"); } if (val & W_INT_D_EXI) { /* EXI */ - exval = w6692_read_reg(cs, W_D_EXIR); + exval = cs->readW6692(cs, W_D_EXIR); if (cs->debug & L1_DEB_WARN) debugl1(cs, "W6692 D_EXIR %02x", exval); if (exval & (W_D_EXI_XDUN | W_D_EXI_XCOL)) { /* Transmit underrun/collision */ - xmit_xdu_d(cs, NULL); + debugl1(cs, "W6692 D-chan underrun/collision"); + printk(KERN_WARNING "HiSax: W6692 XDUN/XCOL\n"); + if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) + del_timer(&cs->dbusytimer); + if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) + schedule_event(cs, D_CLEARBUSY); + if (cs->tx_skb) { /* Restart frame */ + skb_push(cs->tx_skb, cs->tx_cnt); + cs->tx_cnt = 0; + W6692_fill_fifo(cs); + } else { + printk(KERN_WARNING "HiSax: W6692 XDUN/XCOL no skb\n"); + debugl1(cs, "W6692 XDUN/XCOL no skb"); + cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_XRST); + } } if (exval & W_D_EXI_RDOV) { /* RDOV */ debugl1(cs, "W6692 D-channel RDOV"); printk(KERN_WARNING "HiSax: W6692 D-RDOV\n"); - w6692_write_reg(cs, W_D_CMDR, W_D_CMDR_RRST); + cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_RRST); } if (exval & W_D_EXI_TIN2) { /* TIN2 - never */ debugl1(cs, "W6692 spurious TIN2 interrupt"); } if (exval & W_D_EXI_MOC) { /* MOC - not supported */ debugl1(cs, "W6692 spurious MOC interrupt"); - v1 = w6692_read_reg(cs, W_MOSR); + v1 = cs->readW6692(cs, W_MOSR); debugl1(cs, "W6692 MOSR %02x", v1); } if (exval & W_D_EXI_ISC) { /* ISC - Level1 change */ - v1 = w6692_read_reg(cs, W_CIR); + v1 = cs->readW6692(cs, W_CIR); if (cs->debug & L1_DEB_ISAC) debugl1(cs, "W6692 ISC CIR=0x%02X", v1); if (v1 & W_CIR_ICC) { cs->dc.w6692.ph_state = v1 & W_CIR_COD_MASK; if (cs->debug & L1_DEB_ISAC) debugl1(cs, "ph_state_change %x", cs->dc.w6692.ph_state); - sched_d_event(cs, D_L1STATECHANGE); + schedule_event(cs, D_L1STATECHANGE); } if (v1 & W_CIR_SCC) { - v1 = w6692_read_reg(cs, W_SQR); + v1 = cs->readW6692(cs, W_SQR); debugl1(cs, "W6692 SCC SQR=0x%02X", v1); } } @@ -385,16 +544,16 @@ debugl1(cs, "W6692 B channel 2 interrupt"); W6692B_interrupt(cs, 1); } - val = w6692_read_reg(cs, W_ISTA); + val = cs->readW6692(cs, W_ISTA); if (val && icnt) { icnt--; goto StartW6692; } if (!icnt) { printk(KERN_WARNING "W6692 IRQ LOOP\n"); - w6692_write_reg(cs, W_IMASK, 0xff); + cs->writeW6692(cs, W_IMASK, 0xff); } - spin_unlock(&cs->lock); + spin_unlock_irqrestore(&cs->lock, flags); return IRQ_HANDLED; } @@ -403,32 +562,87 @@ { struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; struct sk_buff *skb = arg; + u_long flags; int val; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_d(cs, skb); + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + skb_queue_tail(&cs->sq, skb); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA Queued", 0); +#endif + } else { + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA", 0); +#endif + W6692_fill_fifo(cs); + } + spin_unlock_irqrestore(&cs->lock, flags); break; - case (PH_PULL |INDICATION): - xmit_pull_ind_d(cs, skb); + case (PH_PULL | INDICATION): + spin_lock_irqsave(&cs->lock, flags); + if (cs->tx_skb) { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); + skb_queue_tail(&cs->sq, skb); + spin_unlock_irqrestore(&cs->lock, flags); + break; + } + if (cs->debug & DEB_DLOG_HEX) + LogFrame(cs, skb->data, skb->len); + if (cs->debug & DEB_DLOG_VERBOSE) + dlogframe(cs, skb, 0); + cs->tx_skb = skb; + cs->tx_cnt = 0; +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); +#endif + W6692_fill_fifo(cs); + spin_unlock_irqrestore(&cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_d(st); +#ifdef L2FRAME_DEBUG /* psa */ + if (cs->debug & L1_DEB_LAPD) + debugl1(cs, "-> PH_REQUEST_PULL"); +#endif + if (!cs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (HW_RESET | REQUEST): - if ((cs->dc.w6692.ph_state == W_L1IND_DRD)) + spin_lock_irqsave(&cs->lock, flags); + if ((cs->dc.w6692.ph_state == W_L1IND_DRD)) { ph_command(cs, W_L1CMD_ECK); - else { + spin_unlock_irqrestore(&cs->lock, flags); + } else { ph_command(cs, W_L1CMD_RST); cs->dc.w6692.ph_state = W_L1CMD_RST; + spin_unlock_irqrestore(&cs->lock, flags); W6692_new_ph(cs); } break; case (HW_ENABLE | REQUEST): + spin_lock_irqsave(&cs->lock, flags); ph_command(cs, W_L1CMD_ECK); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_INFO3 | REQUEST): + spin_lock_irqsave(&cs->lock, flags); ph_command(cs, W_L1CMD_AR8); + spin_unlock_irqrestore(&cs->lock, flags); break; case (HW_TESTLOOP | REQUEST): val = 0; @@ -448,7 +662,7 @@ if (test_and_clear_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) del_timer(&cs->dbusytimer); if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags)) - sched_d_event(cs, D_CLEARBUSY); + schedule_event(cs, D_CLEARBUSY); break; default: if (cs->debug & L1_DEB_WARN) @@ -457,11 +671,15 @@ } } -static int +static void setstack_W6692(struct PStack *st, struct IsdnCardState *cs) { st->l1.l1hw = W6692_l1hw; - return 0; +} + +static void +DC_Close_W6692(struct IsdnCardState *cs) +{ } static void @@ -469,10 +687,12 @@ { struct PStack *stptr; int rbch, star; + u_long flags; + spin_lock_irqsave(&cs->lock, flags); if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { - rbch = w6692_read_reg(cs, W_D_RBCH); - star = w6692_read_reg(cs, W_D_STAR); + rbch = cs->readW6692(cs, W_D_RBCH); + star = cs->readW6692(cs, W_D_STAR); if (cs->debug) debugl1(cs, "D-Channel Busy D_RBCH %02x D_STAR %02x", rbch, star); @@ -480,7 +700,7 @@ test_and_set_bit(FLG_L1_DBUSY, &cs->HW_Flags); stptr = cs->stlist; while (stptr != NULL) { - L1L2(stptr, PH_PAUSE | INDICATION, NULL); + stptr->l1.l1l2(stptr, PH_PAUSE | INDICATION, NULL); stptr = stptr->next; } } else { @@ -494,10 +714,13 @@ printk(KERN_WARNING "HiSax: W6692 D-Channel Busy no skb\n"); debugl1(cs, "D-Channel Busy no skb"); } - w6692_write_reg(cs, W_D_CMDR, W_D_CMDR_XRST); /* Transmitter reset */ - cs->card_ops->irq_func(cs->irq, cs, NULL); /* FIXME? */ + cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_XRST); /* Transmitter reset */ + spin_unlock_irqrestore(&cs->lock, flags); + cs->irq_func(cs->irq, cs, NULL); + return; } } + spin_unlock_irqrestore(&cs->lock, flags); } static void @@ -514,51 +737,79 @@ switch (mode) { case (L1_MODE_NULL): - w6692_bc_write_reg(cs, bchan, W_B_MODE, 0); + cs->BC_Write_Reg(cs, bchan, W_B_MODE, 0); break; case (L1_MODE_TRANS): - w6692_bc_write_reg(cs, bchan, W_B_MODE, W_B_MODE_MMS); + cs->BC_Write_Reg(cs, bchan, W_B_MODE, W_B_MODE_MMS); break; case (L1_MODE_HDLC): - w6692_bc_write_reg(cs, bchan, W_B_MODE, W_B_MODE_ITF); - w6692_bc_write_reg(cs, bchan, W_B_ADM1, 0xff); - w6692_bc_write_reg(cs, bchan, W_B_ADM2, 0xff); + cs->BC_Write_Reg(cs, bchan, W_B_MODE, W_B_MODE_ITF); + cs->BC_Write_Reg(cs, bchan, W_B_ADM1, 0xff); + cs->BC_Write_Reg(cs, bchan, W_B_ADM2, 0xff); break; } if (mode) - w6692_bc_write_reg(cs, bchan, W_B_CMDR, W_B_CMDR_RRST | + cs->BC_Write_Reg(cs, bchan, W_B_CMDR, W_B_CMDR_RRST | W_B_CMDR_RACT | W_B_CMDR_XRST); - w6692_bc_write_reg(cs, bchan, W_B_EXIM, 0x00); + cs->BC_Write_Reg(cs, bchan, W_B_EXIM, 0x00); } static void W6692_l2l1(struct PStack *st, int pr, void *arg) { struct sk_buff *skb = arg; + struct BCState *bcs = st->l1.bcs; + u_long flags; switch (pr) { case (PH_DATA | REQUEST): - xmit_data_req_b(st->l1.bcs, skb); + spin_lock_irqsave(&bcs->cs->lock, flags); + if (bcs->tx_skb) { + skb_queue_tail(&bcs->squeue, skb); + } else { + bcs->tx_skb = skb; + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->hw.w6692.count = 0; + bcs->cs->BC_Send_Data(bcs); + } + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | INDICATION): - xmit_pull_ind_b(st->l1.bcs, skb); + if (bcs->tx_skb) { + printk(KERN_WARNING "W6692_l2l1: this shouldn't happen\n"); + break; + } + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->tx_skb = skb; + bcs->hw.w6692.count = 0; + bcs->cs->BC_Send_Data(bcs); + spin_unlock_irqrestore(&bcs->cs->lock, flags); break; case (PH_PULL | REQUEST): - xmit_pull_req_b(st); + if (!bcs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); break; case (PH_ACTIVATE | REQUEST): - test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - W6692Bmode(st->l1.bcs, st->l1.mode, st->l1.bc); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag); + W6692Bmode(bcs, st->l1.mode, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | REQUEST): l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): - test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); - test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); - W6692Bmode(st->l1.bcs, 0, st->l1.bc); - L1L2(st, PH_DEACTIVATE | CONFIRM, NULL); + spin_lock_irqsave(&bcs->cs->lock, flags); + test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + W6692Bmode(bcs, 0, st->l1.bc); + spin_unlock_irqrestore(&bcs->cs->lock, flags); + st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); break; } } @@ -567,13 +818,52 @@ close_w6692state(struct BCState *bcs) { W6692Bmode(bcs, 0, bcs->channel); - bc_close(bcs); + if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { + if (bcs->hw.w6692.rcvbuf) { + kfree(bcs->hw.w6692.rcvbuf); + bcs->hw.w6692.rcvbuf = NULL; + } + if (bcs->blog) { + kfree(bcs->blog); + bcs->blog = NULL; + } + skb_queue_purge(&bcs->rqueue); + skb_queue_purge(&bcs->squeue); + if (bcs->tx_skb) { + dev_kfree_skb_any(bcs->tx_skb); + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + } + } } static int open_w6692state(struct IsdnCardState *cs, struct BCState *bcs) { - return bc_open(bcs); + if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { + if (!(bcs->hw.w6692.rcvbuf = kmalloc(HSCX_BUFMAX, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for w6692.rcvbuf\n"); + test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); + return (1); + } + if (!(bcs->blog = kmalloc(MAX_BLOG_SPACE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for bcs->blog\n"); + test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); + kfree(bcs->hw.w6692.rcvbuf); + bcs->hw.w6692.rcvbuf = NULL; + return (2); + } + skb_queue_head_init(&bcs->rqueue); + skb_queue_head_init(&bcs->squeue); + } + bcs->tx_skb = NULL; + test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); + bcs->event = 0; + bcs->hw.w6692.rcvidx = 0; + bcs->tx_cnt = 0; + return (0); } static int @@ -583,166 +873,224 @@ if (open_w6692state(st->l1.hardware, bcs)) return (-1); st->l1.bcs = bcs; - st->l1.l2l1 = W6692_l2l1; + st->l2.l2l1 = W6692_l2l1; setstack_manager(st); bcs->st = st; setstack_l1_B(st); return (0); } -static int -w6692_reset(struct IsdnCardState *cs) +void resetW6692(struct IsdnCardState *cs) { - w6692_write_reg(cs, W_D_CTL, W_D_CTL_SRST); - schedule_timeout((10*HZ)/1000); - w6692_write_reg(cs, W_D_CTL, 0x00); - schedule_timeout((10*HZ)/1000); - w6692_write_reg(cs, W_IMASK, 0xff); - w6692_write_reg(cs, W_D_SAM, 0xff); - w6692_write_reg(cs, W_D_TAM, 0xff); - w6692_write_reg(cs, W_D_EXIM, 0x00); - w6692_write_reg(cs, W_D_MODE, W_D_MODE_RACT); - w6692_write_reg(cs, W_IMASK, 0x18); + cs->writeW6692(cs, W_D_CTL, W_D_CTL_SRST); + mdelay(10); + cs->writeW6692(cs, W_D_CTL, 0x00); + mdelay(10); + cs->writeW6692(cs, W_IMASK, 0xff); + cs->writeW6692(cs, W_D_SAM, 0xff); + cs->writeW6692(cs, W_D_TAM, 0xff); + cs->writeW6692(cs, W_D_EXIM, 0x00); + cs->writeW6692(cs, W_D_MODE, W_D_MODE_RACT); + cs->writeW6692(cs, W_IMASK, 0x18); if (cs->subtyp == W6692_USR) { /* seems that USR implemented some power control features * Pin 79 is connected to the oscilator circuit so we * have to handle it here */ - w6692_write_reg(cs, W_PCTL, 0x80); - w6692_write_reg(cs, W_XDATA, 0x00); + cs->writeW6692(cs, W_PCTL, 0x80); + cs->writeW6692(cs, W_XDATA, 0x00); } - return 0; } -static void -w6692_init(struct IsdnCardState *cs) +void __init initW6692(struct IsdnCardState *cs, int part) { - w6692_reset(cs); - ph_command(cs, W_L1CMD_RST); - cs->dc.w6692.ph_state = W_L1CMD_RST; - W6692_new_ph(cs); - ph_command(cs, W_L1CMD_ECK); - - W6692Bmode(cs->bcs, 0, 0); - W6692Bmode(cs->bcs + 1, 0, 0); + if (part & 1) { + cs->setstack_d = setstack_W6692; + cs->DC_Close = DC_Close_W6692; + cs->dbusytimer.function = (void *) dbusy_timer_handler; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); + resetW6692(cs); + ph_command(cs, W_L1CMD_RST); + cs->dc.w6692.ph_state = W_L1CMD_RST; + W6692_new_ph(cs); + ph_command(cs, W_L1CMD_ECK); - /* Reenable all IRQ */ - w6692_write_reg(cs, W_IMASK, 0x18); - w6692_write_reg(cs, W_D_EXIM, 0x00); - w6692_bc_write_reg(cs, 0, W_B_EXIM, 0x00); - w6692_bc_write_reg(cs, 1, W_B_EXIM, 0x00); - /* Reset D-chan receiver and transmitter */ - w6692_write_reg(cs, W_D_CMDR, W_D_CMDR_RRST | W_D_CMDR_XRST); + cs->bcs[0].BC_SetStack = setstack_w6692; + cs->bcs[1].BC_SetStack = setstack_w6692; + cs->bcs[0].BC_Close = close_w6692state; + cs->bcs[1].BC_Close = close_w6692state; + W6692Bmode(cs->bcs, 0, 0); + W6692Bmode(cs->bcs + 1, 0, 0); + } + if (part & 2) { + /* Reenable all IRQ */ + cs->writeW6692(cs, W_IMASK, 0x18); + cs->writeW6692(cs, W_D_EXIM, 0x00); + cs->BC_Write_Reg(cs, 0, W_B_EXIM, 0x00); + cs->BC_Write_Reg(cs, 1, W_B_EXIM, 0x00); + /* Reset D-chan receiver and transmitter */ + cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_RRST | W_D_CMDR_XRST); + } } +/* Interface functions */ -static void -w6692_release(struct IsdnCardState *cs) +static u_char +ReadW6692(struct IsdnCardState *cs, u_char offset) { - w6692_write_reg(cs, W_IMASK, 0xff); - if (cs->subtyp == W6692_USR) - w6692_write_reg(cs, W_XDATA, 0x04); - hisax_release_resources(cs); + return (inb(cs->hw.w6692.iobase + offset)); } -static struct card_ops w6692_ops = { - .init = w6692_init, - .reset = w6692_reset, - .release = w6692_release, - .irq_func = w6692_interrupt, -}; - -static struct dc_l1_ops w6692_dc_l1_ops = { - .fill_fifo = W6692_fill_fifo, - .open = setstack_W6692, - .bh_func = W6692_bh, - .dbusy_func = dbusy_timer_handler, -}; - -static struct bc_l1_ops w6692_bc_l1_ops = { - .fill_fifo = W6692B_fill_fifo, - .open = setstack_w6692, - .close = close_w6692state, -}; +static void +WriteW6692(struct IsdnCardState *cs, u_char offset, u_char value) +{ + outb(value, cs->hw.w6692.iobase + offset); +} -static int id_idx ; +static void +ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) +{ + insb(cs->hw.w6692.iobase + W_D_RFIFO, data, size); +} -static struct pci_dev *dev_w6692 __initdata = NULL; +static void +WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) +{ + outsb(cs->hw.w6692.iobase + W_D_XFIFO, data, size); +} -static int -w6692_hw_init(struct IsdnCardState *cs) +static u_char +ReadW6692B(struct IsdnCardState *cs, int bchan, u_char offset) { - cs->card_ops = &w6692_ops; - cs->dc_hw_ops = &w6692_dc_hw_ops, - cs->bc_hw_ops = &w6692_bc_hw_ops; - dc_l1_init(cs, &w6692_dc_l1_ops); - cs->bc_l1_ops = &w6692_bc_l1_ops; - W6692Version(cs, "W6692:"); - printk(KERN_INFO "W6692 ISTA=0x%X\n", w6692_read_reg(cs, W_ISTA)); - printk(KERN_INFO "W6692 IMASK=0x%X\n", w6692_read_reg(cs, W_IMASK)); - printk(KERN_INFO "W6692 D_EXIR=0x%X\n", w6692_read_reg(cs, W_D_EXIR)); - printk(KERN_INFO "W6692 D_EXIM=0x%X\n", w6692_read_reg(cs, W_D_EXIM)); - printk(KERN_INFO "W6692 D_RSTA=0x%X\n", w6692_read_reg(cs, W_D_RSTA)); - return 0; + return (inb(cs->hw.w6692.iobase + (bchan ? 0x40 : 0) + offset)); } -static int __init -w6692_probe(struct IsdnCardState *cs, struct pci_dev *pdev) +static void +WriteW6692B(struct IsdnCardState *cs, int bchan, u_char offset, u_char value) { - int rc; + outb(value, cs->hw.w6692.iobase + (bchan ? 0x40 : 0) + offset); +} - printk(KERN_INFO "W6692: %s %s at %#lx IRQ %d\n", - id_list[cs->subtyp].vendor_name, id_list[cs->subtyp].card_name, - pci_resource_start(pdev, 1), pdev->irq); - - rc = -EBUSY; - if (pci_enable_device(pdev)) - goto err; - - /* USR ISDN PCI card TA need some special handling */ - if (cs->subtyp == W6692_WINBOND) { - if (pdev->subsystem_vendor == W6692_SV_USR && - pdev->subsystem_device == W6692_SD_USR) { - cs->subtyp = W6692_USR; - } +static int +w6692_card_msg(struct IsdnCardState *cs, int mt, void *arg) +{ + switch (mt) { + case CARD_RESET: + resetW6692(cs); + return (0); + case CARD_RELEASE: + cs->writeW6692(cs, W_IMASK, 0xff); + release_region(cs->hw.w6692.iobase, 256); + if (cs->subtyp == W6692_USR) { + cs->writeW6692(cs, W_XDATA, 0x04); + } + return (0); + case CARD_INIT: + initW6692(cs, 3); + return (0); + case CARD_TEST: + return (0); } - cs->irq = pdev->irq; - cs->irq_flags |= SA_SHIRQ; - cs->hw.w6692.iobase = pci_resource_start(pdev, 1); - - if (!request_io(&cs->rs, cs->hw.w6692.iobase, 0x100, - id_list[cs->subtyp].card_name)) - goto err; - - w6692_hw_init(cs); - return 0; - err: - hisax_release_resources(cs); - return rc; + return (0); } +static int id_idx ; + +static struct pci_dev *dev_w6692 __initdata = NULL; + int __init setup_w6692(struct IsdnCard *card) { + struct IsdnCardState *cs = card->cs; char tmp[64]; + u_char found = 0; + u_char pci_irq = 0; + u_int pci_ioaddr = 0; -#ifdef __BIG_ENDIAN -#error "not running on big endian machines now" -#endif strcpy(tmp, w6692_revision); printk(KERN_INFO "HiSax: W6692 driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_W6692) + return (0); +#if CONFIG_PCI while (id_list[id_idx].vendor_id) { dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, id_list[id_idx].device_id, dev_w6692); if (dev_w6692) { - card->cs->subtyp = id_idx; - if (w6692_probe(card->cs, dev_w6692) < 0) - return 0; - return 1; + if (pci_enable_device(dev_w6692)) + continue; + cs->subtyp = id_idx; + break; } id_idx++; } - printk(KERN_WARNING "W6692: No PCI card found\n"); - return 0; + if (dev_w6692) { + found = 1; + pci_irq = dev_w6692->irq; + /* I think address 0 is allways the configuration area */ + /* and address 1 is the real IO space KKe 03.09.99 */ + pci_ioaddr = pci_resource_start(dev_w6692, 1); + /* USR ISDN PCI card TA need some special handling */ + if (cs->subtyp == W6692_WINBOND) { + if ((W6692_SV_USR == dev_w6692->subsystem_vendor) && + (W6692_SD_USR == dev_w6692->subsystem_device)) { + cs->subtyp = W6692_USR; + } + } + } + if (!found) { + printk(KERN_WARNING "W6692: No PCI card found\n"); + return (0); + } + cs->irq = pci_irq; + if (!cs->irq) { + printk(KERN_WARNING "W6692: No IRQ for PCI card found\n"); + return (0); + } + if (!pci_ioaddr) { + printk(KERN_WARNING "W6692: NO I/O Base Address found\n"); + return (0); + } + cs->hw.w6692.iobase = pci_ioaddr; + printk(KERN_INFO "Found: %s %s, I/O base: 0x%x, irq: %d\n", + id_list[cs->subtyp].vendor_name, id_list[cs->subtyp].card_name, + pci_ioaddr, pci_irq); + if (!request_region(cs->hw.w6692.iobase, 256, id_list[cs->subtyp].card_name)) { + printk(KERN_WARNING + "HiSax: %s I/O ports %x-%x already in use\n", + id_list[cs->subtyp].card_name, + cs->hw.w6692.iobase, + cs->hw.w6692.iobase + 255); + return (0); + } +#else + printk(KERN_WARNING "HiSax: W6692 and NO_PCI_BIOS\n"); + printk(KERN_WARNING "HiSax: W6692 unable to config\n"); + return (0); +#endif /* CONFIG_PCI */ + + printk(KERN_INFO + "HiSax: %s config irq:%d I/O:%x\n", + id_list[cs->subtyp].card_name, cs->irq, + cs->hw.w6692.iobase); + + INIT_WORK(&cs->tqueue, (void *)(void *) W6692_bh, cs); + cs->readW6692 = &ReadW6692; + cs->writeW6692 = &WriteW6692; + cs->readisacfifo = &ReadISACfifo; + cs->writeisacfifo = &WriteISACfifo; + cs->BC_Read_Reg = &ReadW6692B; + cs->BC_Write_Reg = &WriteW6692B; + cs->BC_Send_Data = &W6692B_fill_fifo; + cs->cardmsg = &w6692_card_msg; + cs->irq_func = &W6692_interrupt; + cs->irq_flags |= SA_SHIRQ; + W6692Version(cs, "W6692:"); + printk(KERN_INFO "W6692 ISTA=0x%X\n", ReadW6692(cs, W_ISTA)); + printk(KERN_INFO "W6692 IMASK=0x%X\n", ReadW6692(cs, W_IMASK)); + printk(KERN_INFO "W6692 D_EXIR=0x%X\n", ReadW6692(cs, W_D_EXIR)); + printk(KERN_INFO "W6692 D_EXIM=0x%X\n", ReadW6692(cs, W_D_EXIM)); + printk(KERN_INFO "W6692 D_RSTA=0x%X\n", ReadW6692(cs, W_D_RSTA)); + return (1); } diff -Nru a/drivers/isdn/hisax/w6692.h b/drivers/isdn/hisax/w6692.h --- a/drivers/isdn/hisax/w6692.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hisax/w6692.h Thu Feb 19 23:44:23 2004 @@ -1,4 +1,4 @@ -/* $Id: w6692.h,v 1.2.6.2 2001/09/23 22:24:52 kai Exp $ +/* $Id: w6692.h,v 1.4.2.2 2004/01/12 22:52:29 keil Exp $ * * Winbond W6692 specific defines * @@ -17,6 +17,9 @@ #define writeW6692fifo writeisacfifo /* B-channel FIFO read/write routines */ + +#define READW6692BFIFO(cs,bchan,ptr,count) \ + insb(cs->hw.w6692.iobase+W_B_RFIFO+(bchan?0x40:0),ptr,count) #define WRITEW6692BFIFO(cs,bchan,ptr,count) \ outsb(cs->hw.w6692.iobase+W_B_XFIFO+(bchan?0x40:0),ptr,count) diff -Nru a/drivers/isdn/hysdn/Kconfig b/drivers/isdn/hysdn/Kconfig --- a/drivers/isdn/hysdn/Kconfig Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/hysdn/Kconfig Thu Feb 19 23:44:27 2004 @@ -3,7 +3,7 @@ # config HYSDN tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" - depends on m && PROC_FS + depends on m && PROC_FS && BROKEN_ON_SMP help Say Y here if you have one of Hypercope's active PCI ISDN cards Champ, Ergo and Metro. You will then get a module called hysdn. diff -Nru a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c --- a/drivers/isdn/hysdn/hysdn_proclog.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/hysdn/hysdn_proclog.c Thu Feb 19 23:44:23 2004 @@ -233,7 +233,7 @@ return (0); inf->usage_cnt--; /* new usage count */ - (struct log_data **) file->private_data = &inf->next; /* next structure */ + file->private_data = &inf->next; /* next structure */ if ((len = strlen(inf->log_start)) <= count) { if (copy_to_user(buf, inf->log_start, len)) return -EFAULT; @@ -276,9 +276,9 @@ cli(); pd->if_used++; if (pd->log_head) - (struct log_data **) filep->private_data = &(pd->log_tail->next); + filep->private_data = &pd->log_tail->next; else - (struct log_data **) filep->private_data = &(pd->log_head); + filep->private_data = &pd->log_head; restore_flags(flags); } else { /* simultaneous read/write access forbidden ! */ unlock_kernel(); diff -Nru a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig --- a/drivers/isdn/i4l/Kconfig Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/i4l/Kconfig Thu Feb 19 23:44:24 2004 @@ -2,25 +2,6 @@ # Old ISDN4Linux config # -config ISDN_NET_SIMPLE - bool ' Support raw-IP and other simple protocols' - depends on INET - help - This options enables 'raw IP over ISDN', 'ethernet over ISDN', - 'raw IP with UI header' and 'IP + type field' encapsulations. - - If you never heard of any of those, you probably want to say N. - -config ISDN_NET_CISCO - bool ' Support CISCO router protocols' - depends on INET - help - This options enables 'CISCO HDLC' encapsulation with - optional support for CISCO keep-alive frames. - - Unless you want to connect to a Cisco Router in HDLC mode, - you probably want to say N. - config ISDN_PPP bool "Support synchronous PPP" depends on INET @@ -85,7 +66,7 @@ config ISDN_X25 bool "X.25 PLP on top of ISDN" - depends on X25 && BROKEN + depends on X25 help This feature provides the X.25 protocol over ISDN connections. See for more information @@ -97,6 +78,7 @@ config ISDN_DRV_LOOP tristate "isdnloop support" + depends on BROKEN_ON_SMP help This driver provides a virtual ISDN card. Its primary purpose is testing of linklevel features or configuration without getting @@ -106,7 +88,7 @@ config ISDN_DIVERSION tristate "Support isdn diversion services" - depends on BROKEN + depends on BROKEN && BROKEN_ON_SMP help This option allows you to use some supplementary diversion services in conjunction with the HiSax driver on an EURO/DSS1 @@ -124,3 +106,27 @@ Please read the file . endmenu + +comment "ISDN4Linux hardware drivers" + depends on NET && ISDN && ISDN_I4L + +source "drivers/isdn/hisax/Kconfig" + + +menu "Active cards" + depends on NET && ISDN && ISDN_I4L!=n + +source "drivers/isdn/icn/Kconfig" + +source "drivers/isdn/pcbit/Kconfig" + +source "drivers/isdn/sc/Kconfig" + +source "drivers/isdn/act2000/Kconfig" + +source "drivers/isdn/tpam/Kconfig" + +source "drivers/isdn/hysdn/Kconfig" + +endmenu + diff -Nru a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile --- a/drivers/isdn/i4l/Makefile Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/i4l/Makefile Thu Feb 19 23:44:24 2004 @@ -2,18 +2,17 @@ # Each configuration option enables a list of files. -obj-$(CONFIG_ISDN) += isdn.o +obj-$(CONFIG_ISDN_I4L) += isdn.o obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o # Multipart objects. -isdn-y := isdn_net_lib.o isdn_fsm.o isdn_tty.o \ - isdn_v110.o isdn_common.o -isdn-$(CONFIG_ISDN_NET_SIMPLE) += isdn_net.o -isdn-$(CONFIG_ISDN_NET_CISCO) += isdn_ciscohdlck.o -isdn-$(CONFIG_ISDN_PPP) += isdn_ppp.o isdn_ppp_ccp.o -isdn-$(CONFIG_ISDN_PPP_VJ) += isdn_ppp_vj.o -isdn-$(CONFIG_ISDN_MPP) += isdn_ppp_mp.o +isdn-y := isdn_net.o isdn_tty.o isdn_v110.o isdn_common.o + +# Optional parts of multipart objects. + +isdn-$(CONFIG_ISDN_PPP) += isdn_ppp.o isdn-$(CONFIG_ISDN_X25) += isdn_concap.o isdn_x25iface.o -isdn-$(CONFIG_ISDN_AUDIO) += isdn_audio.o +isdn-$(CONFIG_ISDN_AUDIO) += isdn_audio.o isdn-$(CONFIG_ISDN_TTY_FAX) += isdn_ttyfax.o + diff -Nru a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c --- a/drivers/isdn/i4l/isdn_audio.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/i4l/isdn_audio.c Thu Feb 19 23:44:22 2004 @@ -1,20 +1,21 @@ -/* Linux ISDN subsystem, audio conversion and compression +/* $Id: isdn_audio.c,v 1.1.2.2 2004/01/12 22:37:18 keil Exp $ + * + * Linux ISDN subsystem, audio conversion and compression (linklevel). * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) - * 1996 by Christian Mock (cm@tahina.priv.at) - * 1998 by Armin Schindler (mac@gismo.telekom.de) + * DTMF code (c) 1996 by Christian Mock (cm@kukuruz.ping.at) + * Silence detection (c) 1998 by Armin Schindler (mac@gismo.telekom.de) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. * - * DTMF code by Christian Mock - * Silence detection by Armin Schindler */ #include #include "isdn_audio.h" #include "isdn_common.h" -#include "isdn_tty.h" + +char *isdn_audio_revision = "$Revision: 1.1.2.2 $"; /* * Misc. lookup-tables. @@ -168,39 +169,19 @@ 0x8a, 0x8a, 0x6a, 0x6a, 0xea, 0xea, 0x2a, 0x2a }; -#define NCOEFF 16 /* number of frequencies to be analyzed */ -#define DTMF_TRESH 25000 /* above this is dtmf */ +#define NCOEFF 8 /* number of frequencies to be analyzed */ +#define DTMF_TRESH 4000 /* above this is dtmf */ #define SILENCE_TRESH 200 /* below this is silence */ -#define H2_TRESH 20000 /* 2nd harmonic */ #define AMP_BITS 9 /* bits per sample, reduced to avoid overflow */ #define LOGRP 0 #define HIGRP 1 -typedef struct { - int grp; /* low/high group */ - int k; /* k */ - int k2; /* k fuer 2. harmonic */ -} dtmf_t; - /* For DTMF recognition: * 2 * cos(2 * PI * k / N) precalculated for all k */ static int cos2pik[NCOEFF] = { - 55812, 29528, 53603, 24032, 51193, 14443, 48590, 6517, - 38113, -21204, 33057, -32186, 25889, -45081, 18332, -55279 -}; - -static dtmf_t dtmf_tones[8] = -{ - {LOGRP, 0, 1}, /* 697 Hz */ - {LOGRP, 2, 3}, /* 770 Hz */ - {LOGRP, 4, 5}, /* 852 Hz */ - {LOGRP, 6, 7}, /* 941 Hz */ - {HIGRP, 8, 9}, /* 1209 Hz */ - {HIGRP, 10, 11}, /* 1336 Hz */ - {HIGRP, 12, 13}, /* 1477 Hz */ - {HIGRP, 14, 15} /* 1633 Hz */ + 55813, 53604, 51193, 48591, 38114, 33057, 25889, 18332 }; static char dtmf_matrix[4][4] = @@ -226,10 +207,8 @@ : "0"((long) table), "1"(n), "2"((long) buff), "3"((long) buff) : "memory", "ax"); #else - while (n--) { - *buff = table[*buff]; - buff++; - } + while (n--) + *buff = table[*(unsigned char *)buff], buff++; #endif } @@ -500,13 +479,25 @@ sk2 = sk1; sk1 = sk; } + /* Avoid overflows */ + sk >>= 1; + sk2 >>= 1; + /* compute |X(k)|**2 */ + /* report overflows. This should not happen. */ + /* Comment this out if desired */ + if (sk < -32768 || sk > 32767) + printk(KERN_DEBUG + "isdn_audio: dtmf goertzel overflow, sk=%d\n", sk); + if (sk2 < -32768 || sk2 > 32767) + printk(KERN_DEBUG + "isdn_audio: dtmf goertzel overflow, sk2=%d\n", sk2); result[k] = ((sk * sk) >> AMP_BITS) - ((((cos2pik[k] * sk) >> 15) * sk2) >> AMP_BITS) + ((sk2 * sk2) >> AMP_BITS); } skb_queue_tail(&info->dtmf_queue, skb); - mod_timer(&info->read_timer, jiffies + 4); + isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1); } void @@ -517,31 +508,63 @@ dtmf_state *s; int silence; int i; + int di; + int ch; int grp[2]; char what; char *p; + int thresh; while ((skb = skb_dequeue(&info->dtmf_queue))) { result = (int *) skb->data; s = info->dtmf_state; - grp[LOGRP] = grp[HIGRP] = -2; + grp[LOGRP] = grp[HIGRP] = -1; silence = 0; - for (i = 0; i < 8; i++) { - if ((result[dtmf_tones[i].k] > DTMF_TRESH) && - (result[dtmf_tones[i].k2] < H2_TRESH)) - grp[dtmf_tones[i].grp] = (grp[dtmf_tones[i].grp] == -2) ? i : -1; - else if ((result[dtmf_tones[i].k] < SILENCE_TRESH) && - (result[dtmf_tones[i].k2] < SILENCE_TRESH)) + thresh = 0; + for (i = 0; i < NCOEFF; i++) { + if (result[i] > DTMF_TRESH) { + if (result[i] > thresh) + thresh = result[i]; + } + else if (result[i] < SILENCE_TRESH) silence++; } - if (silence == 8) + if (silence == NCOEFF) what = ' '; else { - if ((grp[LOGRP] >= 0) && (grp[HIGRP] >= 0)) { - what = dtmf_matrix[grp[LOGRP]][grp[HIGRP] - 4]; - if (s->last != ' ' && s->last != '.') - s->last = what; /* min. 1 non-DTMF between DTMF */ - } else + if (thresh > 0) { + thresh = thresh >> 4; /* touchtones must match within 12 dB */ + for (i = 0; i < NCOEFF; i++) { + if (result[i] < thresh) + continue; /* ignore */ + /* good level found. This is allowed only one time per group */ + if (i < NCOEFF / 2) { + /* lowgroup*/ + if (grp[LOGRP] >= 0) { + // Bad. Another tone found. */ + grp[LOGRP] = -1; + break; + } + else + grp[LOGRP] = i; + } + else { /* higroup */ + if (grp[HIGRP] >= 0) { // Bad. Another tone found. */ + grp[HIGRP] = -1; + break; + } + else + grp[HIGRP] = i - NCOEFF/2; + } + } + if ((grp[LOGRP] >= 0) && (grp[HIGRP] >= 0)) { + what = dtmf_matrix[grp[LOGRP]][grp[HIGRP]]; + if (s->last != ' ' && s->last != '.') + s->last = what; /* min. 1 non-DTMF between DTMF */ + } else + what = '.'; + } + else what = '.'; } if ((what != s->last) && (what != ' ') && (what != '.')) { @@ -550,17 +573,16 @@ *p++ = 0x10; *p = what; skb_trim(skb, 2); - if ((size_t)skb_headroom(skb) < sizeof(isdnaudio_header)) { - printk(KERN_WARNING - "isdn_audio: insufficient skb_headroom, dropping\n"); - kfree_skb(skb); - return; - } ISDN_AUDIO_SKB_DLECOUNT(skb) = 0; ISDN_AUDIO_SKB_LOCK(skb) = 0; - isdn_tty_queue_tail(info, skb, 2); - if (((get_isdn_dev())->modempoll) && (info->rcvsched)) - mod_timer(&info->read_timer, jiffies + 4); + di = info->isdn_driver; + ch = info->isdn_channel; + __skb_queue_tail(&dev->drv[di]->rpqueue[ch], skb); + dev->drv[di]->rcvcount[ch] += 2; + /* Schedule dequeuing */ + if ((dev->modempoll) && (info->rcvsched)) + isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1); + wake_up_interruptible(&dev->drv[di]->rcv_waitq[ch]); } else kfree_skb(skb); s->last = what; @@ -648,6 +670,8 @@ isdn_audio_put_dle_code(modem_info * info, u_char code) { struct sk_buff *skb; + int di; + int ch; char *p; skb = dev_alloc_skb(2); @@ -660,18 +684,16 @@ p = (char *) skb_put(skb, 2); p[0] = 0x10; p[1] = code; - if ((size_t)skb_headroom(skb) < sizeof(isdnaudio_header)) { - printk(KERN_WARNING - "isdn_audio: insufficient skb_headroom, dropping\n"); - kfree_skb(skb); - return; - } ISDN_AUDIO_SKB_DLECOUNT(skb) = 0; ISDN_AUDIO_SKB_LOCK(skb) = 0; - isdn_tty_queue_tail(info, skb, 2); + di = info->isdn_driver; + ch = info->isdn_channel; + __skb_queue_tail(&dev->drv[di]->rpqueue[ch], skb); + dev->drv[di]->rcvcount[ch] += 2; /* Schedule dequeuing */ - if (((get_isdn_dev())->modempoll) && (info->rcvsched)) - mod_timer(&info->read_timer, jiffies + 4); + if ((dev->modempoll) && (info->rcvsched)) + isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1); + wake_up_interruptible(&dev->drv[di]->rcv_waitq[ch]); } void @@ -682,7 +704,7 @@ what = ' '; - if (s->idx > (u_int)(info->emu.vpar[2] * 800)) { + if (s->idx > (info->emu.vpar[2] * 800)) { s->idx = 0; if (!s->state) { /* silence from beginning of rec */ what = 's'; @@ -690,9 +712,9 @@ what = 'q'; } } - if ((what == 's') || (what == 'q')) { - printk(KERN_DEBUG "ttyI%d: %s\n", info->line, - (what=='s') ? "silence":"quiet"); - isdn_audio_put_dle_code(info, what); - } + if ((what == 's') || (what == 'q')) { + printk(KERN_DEBUG "ttyI%d: %s\n", info->line, + (what=='s') ? "silence":"quiet"); + isdn_audio_put_dle_code(info, what); + } } diff -Nru a/drivers/isdn/i4l/isdn_audio.h b/drivers/isdn/i4l/isdn_audio.h --- a/drivers/isdn/i4l/isdn_audio.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/i4l/isdn_audio.h Thu Feb 19 23:44:23 2004 @@ -1,4 +1,6 @@ -/* Linux ISDN subsystem, audio conversion and compression +/* $Id: isdn_audio.h,v 1.1.2.2 2004/01/12 22:37:18 keil Exp $ + * + * Linux ISDN subsystem, audio conversion and compression (linklevel). * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) * @@ -18,6 +20,7 @@ typedef struct dtmf_state { char last; + char llast; int idx; int buf[DTMF_NPOINTS]; } dtmf_state; diff -Nru a/drivers/isdn/i4l/isdn_ciscohdlck.c b/drivers/isdn/i4l/isdn_ciscohdlck.c --- a/drivers/isdn/i4l/isdn_ciscohdlck.c Thu Feb 19 23:44:22 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,452 +0,0 @@ -/* Linux ISDN subsystem, CISCO HDLC network interfaces - * - * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-2002 by Kai Germaschewski - * 2001 by Bjoern A. Zeeb - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - * - * For info on the protocol, see http://i4l.zabbadoz.net/i4l/cisco-hdlc.txt - */ - -#include "isdn_common.h" -#include "isdn_net_lib.h" -#include "isdn_ciscohdlck.h" - -#include -#include - -/* - * Definitions for Cisco-HDLC header. - */ - -#define CISCO_ADDR_UNICAST 0x0f -#define CISCO_ADDR_BROADCAST 0x8f -#define CISCO_CTRL 0x00 -#define CISCO_TYPE_CDP 0x2000 -#define CISCO_TYPE_SLARP 0x8035 -#define CISCO_SLARP_REQUEST 0 -#define CISCO_SLARP_REPLY 1 -#define CISCO_SLARP_KEEPALIVE 2 - -/* - * CISCO HDLC keepalive specific stuff - */ -static struct sk_buff* -isdn_net_ciscohdlck_alloc_skb(isdn_net_dev *idev, int len) -{ - unsigned short hl = isdn_slot_hdrlen(idev->isdn_slot); - struct sk_buff *skb; - - skb = alloc_skb(hl + len, GFP_ATOMIC); - if (!skb) { - printk("isdn out of mem at %s:%d!\n", __FILE__, __LINE__); - return NULL; - } - skb_reserve(skb, hl); - return skb; -} - -/* cisco hdlck device private ioctls */ -static int -isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -{ - isdn_net_local *mlp = dev->priv; - struct inl_cisco *cisco = mlp->inl_priv; - unsigned long len = 0; - int period; - char debserint; - int rc = 0; - - if (mlp->p_encap != ISDN_NET_ENCAP_CISCOHDLCK) - return -EINVAL; - - switch (cmd) { - /* get/set keepalive period */ - case SIOCGKEEPPERIOD: - len = sizeof(cisco->keepalive_period); - if (copy_to_user((char *)ifr->ifr_ifru.ifru_data, - (char *)&cisco->keepalive_period, len)) - rc = -EFAULT; - break; - case SIOCSKEEPPERIOD: - len = sizeof(cisco->keepalive_period); - if (copy_from_user((char *)&period, - (char *)ifr->ifr_ifru.ifru_data, len)) { - rc = -EFAULT; - break; - } - if (period <= 0 || period > 32767) { - rc = -EINVAL; - break; - } - mod_timer(&cisco->timer, jiffies + period * HZ); - printk(KERN_INFO "%s: Keepalive period set " - "to %d seconds.\n", dev->name, period); - cisco->keepalive_period = period; - break; - - /* get/set debugging */ - case SIOCGDEBSERINT: - len = sizeof(cisco->debserint); - if (copy_to_user((char *)ifr->ifr_ifru.ifru_data, - (char *)&cisco->debserint, len)) - rc = -EFAULT; - break; - case SIOCSDEBSERINT: - len = sizeof(cisco->debserint); - if (copy_from_user((char *)&debserint, - (char *)ifr->ifr_ifru.ifru_data, len)) { - rc = -EFAULT; - break; - } - if (debserint < 0 || debserint > 64) { - rc = -EINVAL; - break; - } - cisco->debserint = debserint; - break; - - default: - rc = -EINVAL; - break; - } - return (rc); -} - -/* called via cisco_timer.function */ -static void -isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data) -{ - isdn_net_local *mlp = (isdn_net_local *) data; - isdn_net_dev *idev; - struct inl_cisco *cisco = mlp->inl_priv; - struct sk_buff *skb; - unsigned char *p; - unsigned long last_cisco_myseq = cisco->myseq; - int myseq_diff = 0; - - if (list_empty(&mlp->online)) { - isdn_BUG(); - return; - } - idev = list_entry(mlp->online.next, isdn_net_dev, online); - cisco->myseq++; - - myseq_diff = cisco->myseq - cisco->mineseen; - if (cisco->line_state && (myseq_diff >= 3 || myseq_diff <= -3)) { - /* line up -> down */ - cisco->line_state = 0; - printk (KERN_WARNING - "UPDOWN: Line protocol on Interface %s," - " changed state to down\n", idev->name); - /* should stop routing higher-level data accross */ - } else if (!cisco->line_state && - myseq_diff >= 0 && myseq_diff <= 2) { - /* line down -> up */ - cisco->line_state = 1; - printk (KERN_WARNING - "UPDOWN: Line protocol on Interface %s," - " changed state to up\n", idev->name); - /* restart routing higher-level data accross */ - } - - if (cisco->debserint) - printk (KERN_DEBUG "%s: HDLC " - "myseq %u, mineseen %u%c, yourseen %u, %s\n", - idev->name, cisco->myseq, cisco->mineseen, - (last_cisco_myseq == cisco->mineseen) ? '*' : 040, - cisco->yourseq, - (cisco->line_state) ? "line up" : "line down"); - - skb = isdn_net_ciscohdlck_alloc_skb(idev, 4 + 14); - if (!skb) - return; - - p = skb_put(skb, 4 + 14); - - /* cisco header */ - p += put_u8 (p, CISCO_ADDR_UNICAST); - p += put_u8 (p, CISCO_CTRL); - p += put_u16(p, CISCO_TYPE_SLARP); - - /* slarp keepalive */ - p += put_u32(p, CISCO_SLARP_KEEPALIVE); - p += put_u32(p, cisco->myseq); - p += put_u32(p, cisco->yourseq); - p += put_u16(p, 0xffff); // reliablity, always 0xffff - - isdn_net_write_super(idev, skb); - - mod_timer(&cisco->timer, jiffies + cisco->keepalive_period * HZ); -} - -static void -isdn_net_ciscohdlck_slarp_send_request(isdn_net_local *mlp) -{ - isdn_net_dev *idev; - struct sk_buff *skb; - unsigned char *p; - - if (list_empty(&mlp->online)) { - isdn_BUG(); - return; - } - idev = list_entry(mlp->online.next, isdn_net_dev, online); - - skb = isdn_net_ciscohdlck_alloc_skb(idev, 4 + 14); - if (!skb) - return; - - p = skb_put(skb, 4 + 14); - - /* cisco header */ - p += put_u8 (p, CISCO_ADDR_UNICAST); - p += put_u8 (p, CISCO_CTRL); - p += put_u16(p, CISCO_TYPE_SLARP); - - /* slarp request */ - p += put_u32(p, CISCO_SLARP_REQUEST); - p += put_u32(p, 0); // address - p += put_u32(p, 0); // netmask - p += put_u16(p, 0); // unused - - isdn_net_write_super(idev, skb); -} - -static void -isdn_ciscohdlck_connected(isdn_net_dev *idev) -{ - isdn_net_local *lp = idev->mlp; - struct inl_cisco *cisco = lp->inl_priv; - - cisco->myseq = 0; - cisco->mineseen = 0; - cisco->yourseq = 0; - cisco->keepalive_period = 10; - cisco->last_slarp_in = 0; - cisco->line_state = 0; - cisco->debserint = 0; - - if (lp->p_encap == ISDN_NET_ENCAP_CISCOHDLCK) { - /* send slarp request because interface/seq.no.s reset */ - isdn_net_ciscohdlck_slarp_send_request(lp); - - init_timer(&cisco->timer); - cisco->timer.data = (unsigned long) lp; - cisco->timer.function = isdn_net_ciscohdlck_slarp_send_keepalive; - cisco->timer.expires = jiffies + cisco->keepalive_period * HZ; - add_timer(&cisco->timer); - } - netif_wake_queue(&lp->dev); -} - -static void -isdn_ciscohdlck_disconnected(isdn_net_dev *idev) -{ - isdn_net_local *lp = idev->mlp; - struct inl_cisco *cisco = lp->inl_priv; - - if (lp->p_encap == ISDN_NET_ENCAP_CISCOHDLCK) { - del_timer(&cisco->timer); - } -} - -static void -isdn_net_ciscohdlck_slarp_send_reply(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - struct sk_buff *skb; - unsigned char *p; - struct in_device *in_dev = NULL; - u32 addr = 0; /* local ipv4 address */ - u32 mask = 0; /* local netmask */ - - if ((in_dev = mlp->dev.ip_ptr) != NULL) { - /* take primary(first) address of interface */ - struct in_ifaddr *ifa = in_dev->ifa_list; - if (ifa != NULL) { - addr = ifa->ifa_local; - mask = ifa->ifa_mask; - } - } - - skb = isdn_net_ciscohdlck_alloc_skb(idev, 4 + 14); - if (!skb) - return; - - p = skb_put(skb, 4 + 14); - - /* cisco header */ - p += put_u8 (p, CISCO_ADDR_UNICAST); - p += put_u8 (p, CISCO_CTRL); - p += put_u16(p, CISCO_TYPE_SLARP); - - /* slarp reply, send own ip/netmask; if values are nonsense remote - * should think we are unable to provide it with an address via SLARP */ - p += put_u32(p, CISCO_SLARP_REPLY); - p += put_u32(p, addr); // address - p += put_u32(p, mask); // netmask - p += put_u16(p, 0); // unused - - isdn_net_write_super(idev, skb); -} - -static void -isdn_net_ciscohdlck_slarp_in(isdn_net_dev *idev, struct sk_buff *skb) -{ - isdn_net_local *mlp = idev->mlp; - struct inl_cisco *cisco = mlp->inl_priv; - unsigned char *p; - int period; - u32 code; - u32 my_seq, addr; - u32 your_seq, mask; - u32 local; - u16 unused; - - if (skb->len < 14) - return; - - p = skb->data; - p += get_u32(p, &code); - - switch (code) { - case CISCO_SLARP_REQUEST: - cisco->yourseq = 0; - isdn_net_ciscohdlck_slarp_send_reply(idev); - break; - case CISCO_SLARP_REPLY: - addr = ntohl(*(u32 *)p); - mask = ntohl(*(u32 *)(p+4)); - if (mask != 0xfffffffc) - goto slarp_reply_out; - if ((addr & 3) == 0 || (addr & 3) == 3) - goto slarp_reply_out; - local = addr ^ 3; - printk(KERN_INFO "%s: got slarp reply: " - "remote ip: %d.%d.%d.%d, " - "local ip: %d.%d.%d.%d " - "mask: %d.%d.%d.%d\n", - idev->name, - HIPQUAD(addr), - HIPQUAD(local), - HIPQUAD(mask)); - break; - slarp_reply_out: - printk(KERN_INFO "%s: got invalid slarp " - "reply (%d.%d.%d.%d/%d.%d.%d.%d) " - "- ignored\n", idev->name, - HIPQUAD(addr), HIPQUAD(mask)); - break; - case CISCO_SLARP_KEEPALIVE: - period = (jiffies - cisco->last_slarp_in + HZ/2 - 1) / HZ; - if (cisco->debserint && - (period != cisco->keepalive_period) && - cisco->last_slarp_in) { - printk(KERN_DEBUG "%s: Keepalive period mismatch - " - "is %d but should be %d.\n", - idev->name, period, cisco->keepalive_period); - } - cisco->last_slarp_in = jiffies; - p += get_u32(p, &my_seq); - p += get_u32(p, &your_seq); - p += get_u16(p, &unused); - cisco->yourseq = my_seq; - cisco->mineseen = your_seq; - break; - } -} - -static void -isdn_ciscohdlck_receive(isdn_net_local *lp, isdn_net_dev *idev, - struct sk_buff *skb) -{ - struct inl_cisco *cisco = lp->inl_priv; - unsigned char *p; - u8 addr; - u8 ctrl; - u16 type; - - if (skb->len < 4) - goto out_free; - - p = skb->data; - p += get_u8 (p, &addr); - p += get_u8 (p, &ctrl); - p += get_u16(p, &type); - skb_pull(skb, 4); - - if ((addr != CISCO_ADDR_UNICAST && addr != CISCO_ADDR_BROADCAST) || - ctrl != CISCO_CTRL) { - printk(KERN_DEBUG "%s: Unknown Cisco header %#02x %#02x\n", - idev->name, addr, ctrl); - goto out_free; - } - - switch (type) { - case CISCO_TYPE_SLARP: - isdn_net_ciscohdlck_slarp_in(idev, skb); - goto out_free; - case CISCO_TYPE_CDP: - if (cisco->debserint) - printk(KERN_DEBUG "%s: Received CDP packet. use " - "\"no cdp enable\" on cisco.\n", idev->name); - goto out_free; - default: - /* no special cisco protocol */ - idev->huptimer = 0; - skb->protocol = htons(type); - netif_rx(skb); - return; - } - - out_free: - kfree_skb(skb); -} - -static int -isdn_ciscohdlck_header(struct sk_buff *skb, struct net_device *dev, - unsigned short type, - void *daddr, void *saddr, unsigned plen) -{ - unsigned char *p = skb_push(skb, 4); - - p += put_u8 (p, CISCO_ADDR_UNICAST); - p += put_u8 (p, CISCO_CTRL); - p += put_u16(p, type); - - return 4; -} - -static int -isdn_ciscohdlck_open(isdn_net_local *lp) -{ - lp->inl_priv = kmalloc(sizeof(struct inl_cisco), GFP_KERNEL); - if (!lp->inl_priv) - return -ENOMEM; - - return 0; -} - -static void -isdn_ciscohdlck_close(isdn_net_local *lp) -{ - kfree(lp->inl_priv); -} - -struct isdn_netif_ops isdn_ciscohdlck_ops = { - .hard_start_xmit = isdn_net_start_xmit, - .hard_header = isdn_ciscohdlck_header, - .do_ioctl = isdn_ciscohdlck_dev_ioctl, - .flags = IFF_NOARP | IFF_POINTOPOINT, - .type = ARPHRD_CISCO, - .receive = isdn_ciscohdlck_receive, - .connected = isdn_ciscohdlck_connected, - .disconnected = isdn_ciscohdlck_disconnected, - .open = isdn_ciscohdlck_open, - .close = isdn_ciscohdlck_close, -}; diff -Nru a/drivers/isdn/i4l/isdn_ciscohdlck.h b/drivers/isdn/i4l/isdn_ciscohdlck.h --- a/drivers/isdn/i4l/isdn_ciscohdlck.h Thu Feb 19 23:44:28 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,26 +0,0 @@ -/* Linux ISDN subsystem, CISCO HDLC network interfaces - * - * Copyright 1999-2002 by Kai Germaschewski - * 2001 by Bjoern A. Zeeb - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - */ - -#ifndef ISDN_CISCOHDLCK_H -#define ISDN_CISCOHDLCK_H - -extern struct isdn_netif_ops isdn_ciscohdlck_ops; - -struct inl_cisco { - u32 myseq; /* local keepalive seq. for Cisco */ - u32 mineseen; /* returned keepalive seq. from remote */ - u32 yourseq; /* remote keepalive seq. for Cisco */ - int keepalive_period; /* keepalive period */ - int last_slarp_in; /* jiffie of last recvd keepalive pkt */ - char line_state; /* state of line */ - char debserint; /* debugging flags */ - struct timer_list timer; -}; - -#endif diff -Nru a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c --- a/drivers/isdn/i4l/isdn_common.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/i4l/isdn_common.c Thu Feb 19 23:44:24 2004 @@ -1,4 +1,6 @@ -/* Linux ISDN subsystem, common used functions +/* $Id: isdn_common.c,v 1.1.2.3 2004/02/10 01:07:13 keil Exp $ + * + * Linux ISDN subsystem, common used functions (linklevel). * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) * Copyright 1995,96 Thinking Objects Software GmbH Wuerzburg @@ -6,6 +8,7 @@ * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ #include @@ -16,958 +19,94 @@ #include #include #include -#include #include "isdn_common.h" -#include "isdn_net_lib.h" -#include "isdn_net.h" #include "isdn_tty.h" +#include "isdn_net.h" #include "isdn_ppp.h" #ifdef CONFIG_ISDN_AUDIO #include "isdn_audio.h" #endif +#ifdef CONFIG_ISDN_DIVERSION_MODULE +#define CONFIG_ISDN_DIVERSION +#endif +#ifdef CONFIG_ISDN_DIVERSION #include -#include +#endif /* CONFIG_ISDN_DIVERSION */ +#include "isdn_v110.h" + +/* Debugflags */ +#undef ISDN_DEBUG_STATCALLB MODULE_DESCRIPTION("ISDN4Linux: link layer"); MODULE_AUTHOR("Fritz Elfert"); MODULE_LICENSE("GPL"); -static isdn_dev_t *isdndev; - -isdn_dev_t * -get_isdn_dev(void) { - return(isdndev); -} - -/* Description of hardware-level-driver */ -typedef struct isdn_driver { - int di; - char id[20]; - atomic_t refcnt; - unsigned long flags; /* Misc driver Flags */ - unsigned long features; - int channels; /* Number of channels */ - wait_queue_head_t st_waitq; /* Wait-Queue for status-reads */ - int maxbufsize; /* Maximum Buffersize supported*/ - int stavail; /* Chars avail on Status-device*/ - isdn_if *interface; /* Interface to driver */ - char msn2eaz[10][ISDN_MSNLEN]; /* MSN->EAZ */ - spinlock_t lock; - struct isdn_slot *slots; - struct fsm_inst fi; -} isdn_driver_t; - -static spinlock_t drivers_lock = SPIN_LOCK_UNLOCKED; -static isdn_driver_t *drivers[ISDN_MAX_DRIVERS]; - -static void isdn_lock_driver(struct isdn_driver *drv); -static void isdn_unlock_driver(struct isdn_driver *drv); - -/* ====================================================================== */ - -static void drv_destroy(struct isdn_driver *drv); - -static inline struct isdn_driver * -get_drv(struct isdn_driver *drv) -{ - printk("get_drv %d: %d -> %d\n", drv->di, atomic_read(&drv->refcnt), - atomic_read(&drv->refcnt) + 1); - atomic_inc(&drv->refcnt); - return drv; -} - -static inline void -put_drv(struct isdn_driver *drv) -{ - printk("put_drv %d: %d -> %d\n", drv->di, atomic_read(&drv->refcnt), - atomic_read(&drv->refcnt) - 1); - if (atomic_dec_and_test(&drv->refcnt)) { - drv_destroy(drv); - } -} - -/* ====================================================================== */ - -static struct fsm slot_fsm; -static void slot_debug(struct fsm_inst *fi, char *fmt, ...); - -static char *slot_st_str[] = { - "ST_SLOT_NULL", - "ST_SLOT_BOUND", - "ST_SLOT_IN", - "ST_SLOT_WAIT_DCONN", - "ST_SLOT_DCONN", - "ST_SLOT_WAIT_BCONN", - "ST_SLOT_ACTIVE", - "ST_SLOT_WAIT_BHUP", - "ST_SLOT_WAIT_DHUP", -}; - -static char *ev_str[] = { - "EV_DRV_REGISTER", - "EV_STAT_RUN", - "EV_STAT_STOP", - "EV_STAT_UNLOAD", - "EV_STAT_STAVAIL", - "EV_STAT_ADDCH", - "EV_STAT_ICALL", - "EV_STAT_DCONN", - "EV_STAT_BCONN", - "EV_STAT_BHUP", - "EV_STAT_DHUP", - "EV_STAT_BSENT", - "EV_STAT_CINF", - "EV_STAT_CAUSE", - "EV_STAT_DISPLAY", - "EV_STAT_FAXIND", - "EV_STAT_AUDIO", - "EV_CMD_CLREAZ", - "EV_CMD_SETEAZ", - "EV_CMD_SETL2", - "EV_CMD_SETL3", - "EV_CMD_DIAL", - "EV_CMD_ACCEPTD", - "EV_CMD_ACCEPTB", - "EV_CMD_HANGUP", - "EV_DATA_REQ", - "EV_DATA_IND", - "EV_SLOT_BIND", - "EV_SLOT_UNBIND", -}; - -static int __slot_command(struct isdn_slot *slot, isdn_ctrl *cmd); - -static void isdn_v110_setl2(struct isdn_slot *slot, isdn_ctrl *cmd); -static void __isdn_v110_open(struct isdn_slot *slot); -static void __isdn_v110_close(struct isdn_slot *slot); -static void __isdn_v110_bsent(struct isdn_slot *slot, int pr, isdn_ctrl *cmd); -static int isdn_v110_data_ind(struct isdn_slot *slot, struct sk_buff *skb); -static int isdn_v110_data_req(struct isdn_slot *slot, struct sk_buff *skb); - -static inline int -do_event_cb(struct isdn_slot *slot, int pr, void *arg) -{ - if (slot->event_cb) - return slot->event_cb(slot, pr, arg); - - return -ENXIO; -} - -static int -slot_bind(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - - isdn_lock_driver(slot->drv); - fsm_change_state(fi, ST_SLOT_BOUND); - - return 0; -} - -/* just pass through command */ -static int -slot_command(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *c = arg; - - return __slot_command(slot, c); -} - -/* just pass through status */ -static int -slot_stat(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - - do_event_cb(slot, pr, arg); - return 0; -} - -/* just pass through command */ -static int -slot_setl2(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *c = arg; - - isdn_v110_setl2(slot, c); - - return __slot_command(slot, c); -} - -static int -slot_dial(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *ctrl = arg; - int retval; - - retval = __slot_command(slot, ctrl); - if (retval >= 0) - fsm_change_state(fi, ST_SLOT_WAIT_DCONN); - - return retval; -} - -static int -slot_acceptd(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *ctrl = arg; - int retval; - - retval = __slot_command(slot, ctrl); - if (retval >= 0) - fsm_change_state(fi, ST_SLOT_WAIT_DCONN); - - return retval; -} - -static int -slot_acceptb(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *ctrl = arg; - int retval; - - retval = __slot_command(slot, ctrl); - if (retval >= 0) - fsm_change_state(fi, ST_SLOT_WAIT_BCONN); - - return retval; -} - -static int -slot_actv_hangup(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *ctrl = arg; - int retval; - - retval = __slot_command(slot, ctrl); - if (retval >= 0) { - fsm_change_state(fi, ST_SLOT_WAIT_BHUP); - } - return retval; -} - -static int -slot_dconn(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - - fsm_change_state(fi, ST_SLOT_DCONN); - do_event_cb(slot, pr, arg); - return 0; -} - -static int -slot_bconn(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - - fsm_change_state(fi, ST_SLOT_ACTIVE); - __isdn_v110_open(slot); - - isdn_info_update(); - - do_event_cb(slot, pr, arg); - return 0; -} - -static int -slot_bhup(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - - __isdn_v110_close(slot); - fsm_change_state(fi, ST_SLOT_WAIT_DHUP); - - do_event_cb(slot, pr, arg); - return 0; -} - -static int -slot_dhup(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; +isdn_dev *dev; - fsm_change_state(fi, ST_SLOT_BOUND); +static char *isdn_revision = "$Revision: 1.1.2.3 $"; - do_event_cb(slot, pr, arg); - return 0; -} - -static int -slot_data_req(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - struct sk_buff *skb = arg; - - return isdn_v110_data_req(slot, skb); -} - -static int -slot_data_ind(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - struct sk_buff *skb = arg; - - /* Update statistics */ - slot->ibytes += skb->len; - - return isdn_v110_data_ind(slot, skb); -} - -static int -slot_bsent(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *ctrl = arg; - - __isdn_v110_bsent(slot, pr, ctrl); - return 0; -} - -static int -slot_icall(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl *ctrl = arg; - int retval; - - isdn_lock_driver(slot->drv); - fsm_change_state(fi, ST_SLOT_IN); - slot_debug(fi, "ICALL: %s\n", ctrl->parm.num); - if (isdndev->global_flags & ISDN_GLOBAL_STOPPED) - return 0; - - strcpy(slot->num, ctrl->parm.setup.phone); - /* Try to find a network-interface which will accept incoming call */ - retval = isdn_net_find_icall(slot, &ctrl->parm.setup); - - /* already taken by net now? */ - if (fi->state != ST_SLOT_IN) - goto out; - - retval = isdn_tty_find_icall(slot, &ctrl->parm.setup); - out: - return 0; -} - -/* should become broadcast later */ -static int -slot_in_dhup(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - - isdn_unlock_driver(slot->drv); - fsm_change_state(fi, ST_SLOT_NULL); - do_event_cb(slot, pr, arg); - return 0; -} - -static int -slot_unbind(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_slot *slot = fi->userdata; - isdn_ctrl cmd; - - isdn_unlock_driver(slot->drv); - fsm_change_state(fi, ST_SLOT_NULL); - strcpy(slot->num, "???"); - cmd.parm.num[0] = '\0'; - isdn_slot_command(slot, ISDN_CMD_SETEAZ, &cmd); - slot->ibytes = 0; - slot->obytes = 0; - slot->usage = ISDN_USAGE_NONE; - put_drv(slot->drv); - isdn_info_update(); - return 0; -} - -static struct fsm_node slot_fn_tbl[] = { - { ST_SLOT_NULL, EV_SLOT_BIND, slot_bind }, - { ST_SLOT_NULL, EV_STAT_ICALL, slot_icall }, - - { ST_SLOT_BOUND, EV_CMD_CLREAZ, slot_command }, - { ST_SLOT_BOUND, EV_CMD_SETEAZ, slot_command }, - { ST_SLOT_BOUND, EV_CMD_SETL2, slot_setl2 }, - { ST_SLOT_BOUND, EV_CMD_SETL3, slot_command }, - { ST_SLOT_BOUND, EV_CMD_DIAL, slot_dial }, - { ST_SLOT_BOUND, EV_SLOT_UNBIND, slot_unbind }, - - { ST_SLOT_IN, EV_CMD_SETL2, slot_setl2 }, - { ST_SLOT_IN, EV_CMD_SETL3, slot_command }, - { ST_SLOT_IN, EV_CMD_ACCEPTD, slot_acceptd }, - { ST_SLOT_IN, EV_STAT_DHUP, slot_in_dhup }, - - { ST_SLOT_WAIT_DCONN, EV_STAT_DCONN, slot_dconn }, - { ST_SLOT_WAIT_DCONN, EV_STAT_DHUP, slot_dhup }, - - { ST_SLOT_DCONN, EV_CMD_ACCEPTB, slot_acceptb }, - { ST_SLOT_DCONN, EV_STAT_BCONN, slot_bconn }, - - { ST_SLOT_WAIT_BCONN, EV_STAT_BCONN, slot_bconn }, - - { ST_SLOT_ACTIVE, EV_DATA_REQ, slot_data_req }, - { ST_SLOT_ACTIVE, EV_DATA_IND, slot_data_ind }, - { ST_SLOT_ACTIVE, EV_CMD_HANGUP, slot_actv_hangup }, - { ST_SLOT_ACTIVE, EV_STAT_BSENT, slot_bsent }, - { ST_SLOT_ACTIVE, EV_STAT_BHUP, slot_bhup }, - { ST_SLOT_ACTIVE, EV_STAT_FAXIND, slot_stat }, - { ST_SLOT_ACTIVE, EV_STAT_AUDIO, slot_stat }, - - { ST_SLOT_WAIT_BHUP, EV_STAT_BHUP, slot_bhup }, - - { ST_SLOT_WAIT_DHUP, EV_STAT_DHUP, slot_dhup }, -}; - -static struct fsm slot_fsm = { - .st_cnt = ARRAY_SIZE(slot_st_str), - .st_str = slot_st_str, - .ev_cnt = ARRAY_SIZE(ev_str), - .ev_str = ev_str, - .fn_cnt = ARRAY_SIZE(slot_fn_tbl), - .fn_tbl = slot_fn_tbl, -}; - -static void slot_debug(struct fsm_inst *fi, char *fmt, ...) -{ - va_list args; - struct isdn_slot *slot = fi->userdata; - char buf[128]; - char *p = buf; - - va_start(args, fmt); - p += sprintf(p, "slot (%d:%d): ", slot->di, slot->ch); - p += vsprintf(p, fmt, args); - va_end(args); - printk(KERN_DEBUG "%s\n", buf); -} - -/* ====================================================================== */ - -static spinlock_t stat_lock = SPIN_LOCK_UNLOCKED; - -static struct fsm drv_fsm; +extern char *isdn_net_revision; +extern char *isdn_tty_revision; +#ifdef CONFIG_ISDN_PPP +extern char *isdn_ppp_revision; +#else +static char *isdn_ppp_revision = ": none $"; +#endif +#ifdef CONFIG_ISDN_AUDIO +extern char *isdn_audio_revision; +#else +static char *isdn_audio_revision = ": none $"; +#endif +extern char *isdn_v110_revision; -enum { - ST_DRV_NULL, - ST_DRV_LOADED, - ST_DRV_RUNNING, -}; +#ifdef CONFIG_ISDN_DIVERSION +static isdn_divert_if *divert_if; /* = NULL */ +#endif /* CONFIG_ISDN_DIVERSION */ -static char *drv_st_str[] = { - "ST_DRV_NULL", - "ST_DRV_LOADED", - "ST_DRV_RUNNING", -}; -#define DRV_FLAG_REJBUS 1 +static int isdn_writebuf_stub(int, int, const u_char *, int, int); +static void set_global_features(void); +static int isdn_wildmat(char *s, char *p); -static int __drv_command(struct isdn_driver *drv, isdn_ctrl *cmd); -static int -isdn_writebuf_skb(struct isdn_slot *slot, struct sk_buff *skb) +static inline void +isdn_lock_driver(isdn_driver_t *drv) { - struct sk_buff *skb2; - struct isdn_driver *drv = slot->drv; - int hl = drv->interface->hl_hdrlen; - int retval; - - if (skb_headroom(skb) >= hl) { - retval = drv->interface->writebuf_skb(slot->di, slot->ch, 1, skb); - goto out; - } - skb2 = skb_realloc_headroom(skb, hl); - if (!skb2) { - retval = -ENOMEM; - goto out; - } - retval = drv->interface->writebuf_skb(slot->di, slot->ch, 1, skb2); - if (retval < 0) - kfree_skb(skb2); - else - kfree_skb(skb); - - out: - if (retval > 0) - slot->obytes += retval; - - return retval; + try_module_get(drv->interface->owner); + drv->locks++; } -int -__isdn_drv_lookup(char *drvid) +void +isdn_lock_drivers(void) { - int drvidx; + int i; - for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) { - if (!drivers[drvidx]) + for (i = 0; i < ISDN_MAX_DRIVERS; i++) { + if (!dev->drv[i]) continue; - - if (strcmp(drivers[drvidx]->id, drvid) == 0) - return drvidx; + isdn_lock_driver(dev->drv[i]); } - return -1; } -int -isdn_drv_lookup(char *drvid) -{ - unsigned long flags; - int drvidx; - - spin_lock_irqsave(&drivers_lock, flags); - drvidx = __isdn_drv_lookup(drvid); - spin_unlock_irqrestore(&drivers_lock, flags); - return drvidx; -} - -static void -drv_destroy(struct isdn_driver *drv) -{ - kfree(drv->slots); - kfree(drv); -} - -static struct isdn_driver * -get_drv_by_nr(int di) -{ - unsigned long flags; - struct isdn_driver *drv; - - BUG_ON(di < 0 || di >= ISDN_MAX_DRIVERS); - - spin_lock_irqsave(&drivers_lock, flags); - drv = drivers[di]; - if (drv) - get_drv(drv); - spin_unlock_irqrestore(&drivers_lock, flags); - return drv; -} - -char * -isdn_drv_drvid(int di) +static inline void +isdn_unlock_driver(isdn_driver_t *drv) { - if (!drivers[di]) { - isdn_BUG(); - return ""; + if (drv->locks > 0) { + drv->locks--; + module_put(drv->interface->owner); } - return drivers[di]->id; } -/* - * Helper keeping track of the features the drivers support - */ -static void -set_global_features(void) +void +isdn_unlock_drivers(void) { - unsigned long flags; - int drvidx; + int i; - isdndev->global_features = 0; - spin_lock_irqsave(&drivers_lock, flags); - for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) { - if (!drivers[drvidx]) - continue; - if (drivers[drvidx]->fi.state != ST_DRV_RUNNING) + for (i = 0; i < ISDN_MAX_DRIVERS; i++) { + if (!dev->drv[i]) continue; - isdndev->global_features |= drivers[drvidx]->features; - } - spin_unlock_irqrestore(&drivers_lock, flags); -} - -/* - * driver state machine - */ -static int isdn_add_channels(struct isdn_driver *, int); -static void isdn_receive_skb_callback(int di, int ch, struct sk_buff *skb); -static int isdn_status_callback(isdn_ctrl * c); - -static void isdn_v110_add_features(struct isdn_driver *drv); - -static int -drv_register(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_driver *drv = fi->userdata; - isdn_if *iif = arg; - - fsm_change_state(fi, ST_DRV_LOADED); - drv->maxbufsize = iif->maxbufsize; - drv->interface = iif; - iif->channels = drv->di; - iif->rcvcallb_skb = isdn_receive_skb_callback; - iif->statcallb = isdn_status_callback; - - isdn_info_update(); - return(0); -} - -static int -drv_stat_run(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_driver *drv = fi->userdata; - fsm_change_state(fi, ST_DRV_RUNNING); - - drv->features = drv->interface->features; - isdn_v110_add_features(drv); - set_global_features(); - return(0); -} - -static int -drv_stat_stop(struct fsm_inst *fi, int pr, void *arg) -{ - fsm_change_state(fi, ST_DRV_LOADED); - set_global_features(); - return(0); -} - -static int -drv_stat_unload(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_driver *drv = fi->userdata; - unsigned long flags; - - spin_lock_irqsave(&drivers_lock, flags); - drivers[drv->di] = NULL; - spin_unlock_irqrestore(&drivers_lock, flags); - put_drv(drv); - - isdndev->channels -= drv->channels; - - isdn_info_update(); - return 0; -} - -static int -drv_stat_stavail(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_driver *drv = fi->userdata; - unsigned long flags; - isdn_ctrl *c = arg; - - spin_lock_irqsave(&stat_lock, flags); - drv->stavail += c->arg; - spin_unlock_irqrestore(&stat_lock, flags); - wake_up_interruptible(&drv->st_waitq); - return 0; -} - -static int -drv_to_slot(struct fsm_inst *fi, int pr, void *arg) -{ - struct isdn_driver *drv = fi->userdata; - isdn_ctrl *c = arg; - int ch = c->arg & 0xff; - - return fsm_event(&drv->slots[ch].fi, pr, arg); -} - -static struct fsm_node drv_fn_tbl[] = { - { ST_DRV_NULL, EV_DRV_REGISTER, drv_register }, - - { ST_DRV_LOADED, EV_STAT_RUN, drv_stat_run }, - { ST_DRV_LOADED, EV_STAT_STAVAIL, drv_stat_stavail }, - { ST_DRV_LOADED, EV_STAT_UNLOAD, drv_stat_unload }, - - { ST_DRV_RUNNING, EV_STAT_STOP, drv_stat_stop }, - { ST_DRV_RUNNING, EV_STAT_STAVAIL, drv_stat_stavail }, - { ST_DRV_RUNNING, EV_STAT_ICALL, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_DCONN, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_BCONN, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_BHUP, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_DHUP, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_BSENT, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_CINF, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_CAUSE, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_DISPLAY, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_FAXIND, drv_to_slot }, - { ST_DRV_RUNNING, EV_STAT_AUDIO, drv_to_slot }, -}; - -static struct fsm drv_fsm = { - .st_cnt = ARRAY_SIZE(drv_st_str), - .st_str = drv_st_str, - .ev_cnt = ARRAY_SIZE(ev_str), - .ev_str = ev_str, - .fn_cnt = ARRAY_SIZE(drv_fn_tbl), - .fn_tbl = drv_fn_tbl, -}; - -static void drv_debug(struct fsm_inst *fi, char *fmt, ...) -{ - va_list args; - struct isdn_driver *drv = fi->userdata; - char buf[128]; - char *p = buf; - - va_start(args, fmt); - p += sprintf(p, "%s: ", drv->id); - p += vsprintf(p, fmt, args); - va_end(args); - printk(KERN_DEBUG "%s\n", buf); -} - -/* ====================================================================== */ -/* callbacks from hardware driver */ -/* ====================================================================== */ - -/* Receive a packet from B-Channel. */ -static void -isdn_receive_skb_callback(int di, int ch, struct sk_buff *skb) -{ - struct isdn_driver *drv; - - drv = get_drv_by_nr(di); - if (!drv) { - /* hardware driver is buggy - driver isn't registered */ - isdn_BUG(); - goto out; - } - /* we short-cut here instead of going through the driver fsm */ - if (drv->fi.state != ST_DRV_RUNNING) { - /* hardware driver is buggy - driver isn't running */ - isdn_BUG(); - goto out; - } - if (fsm_event(&drv->slots[ch].fi, EV_DATA_IND, skb)) - dev_kfree_skb(skb); - out: - put_drv(drv); -} - -/* Receive status indications */ -static int -isdn_status_callback(isdn_ctrl *c) -{ - struct isdn_driver *drv; - int rc; - - drv = get_drv_by_nr(c->driver); - if (!drv) { - /* hardware driver is buggy - driver isn't registered */ - isdn_BUG(); - return 1; - } - - switch (c->command) { - case ISDN_STAT_STAVAIL: - rc = fsm_event(&drv->fi, EV_STAT_STAVAIL, c); - break; - case ISDN_STAT_RUN: - rc = fsm_event(&drv->fi, EV_STAT_RUN, c); - break; - case ISDN_STAT_STOP: - rc = fsm_event(&drv->fi, EV_STAT_STOP, c); - break; - case ISDN_STAT_UNLOAD: - rc = fsm_event(&drv->fi, EV_STAT_UNLOAD, c); - break; - case ISDN_STAT_ADDCH: - rc = fsm_event(&drv->fi, EV_STAT_ADDCH, c); - break; - case ISDN_STAT_ICALL: - rc = fsm_event(&drv->fi, EV_STAT_ICALL, c); - break; - case ISDN_STAT_DCONN: - rc = fsm_event(&drv->fi, EV_STAT_DCONN, c); - break; - case ISDN_STAT_BCONN: - rc = fsm_event(&drv->fi, EV_STAT_BCONN, c); - break; - case ISDN_STAT_BHUP: - rc = fsm_event(&drv->fi, EV_STAT_BHUP, c); - break; - case ISDN_STAT_DHUP: - rc = fsm_event(&drv->fi, EV_STAT_DHUP, c); - break; - case ISDN_STAT_BSENT: - rc = fsm_event(&drv->fi, EV_STAT_BSENT, c); - break; - case ISDN_STAT_CINF: - rc = fsm_event(&drv->fi, EV_STAT_CINF, c); - break; - case ISDN_STAT_CAUSE: - rc = fsm_event(&drv->fi, EV_STAT_CAUSE, c); - break; - case ISDN_STAT_DISPLAY: - rc = fsm_event(&drv->fi, EV_STAT_DISPLAY, c); - break; - case ISDN_STAT_FAXIND: - rc = fsm_event(&drv->fi, EV_STAT_FAXIND, c); - break; - case ISDN_STAT_AUDIO: - rc = fsm_event(&drv->fi, EV_STAT_AUDIO, c); - break; -#warning FIXME divert interface -#if 0 - case ISDN_STAT_ICALL: - /* Find any ttyI, waiting for D-channel setup */ - if (isdn_tty_stat_callback(i, c)) { - cmd.driver = di; - cmd.arg = c->arg; - cmd.command = ISDN_CMD_ACCEPTB; - isdn_command(&cmd); - break; - } - break; - switch (r) { - case 0: - if (divert_if) - if ((retval = divert_if->stat_callback(c))) - return(retval); /* processed */ - if ((!retval) && (drivers[di]->flags & DRV_FLAG_REJBUS)) { - /* No tty responding */ - cmd.driver = di; - cmd.arg = c->arg; - cmd.command = ISDN_CMD_HANGUP; - isdn_command(&cmd); - retval = 2; - } - break; - case 1: /* incoming call accepted by net interface */ - - case 2: /* For calling back, first reject incoming call ... */ - case 3: /* Interface found, but down, reject call actively */ - retval = 2; - printk(KERN_INFO "isdn: Rejecting Call\n"); - cmd.driver = di; - cmd.arg = c->arg; - cmd.command = ISDN_CMD_HANGUP; - isdn_command(&cmd); - if (r == 3) - break; - /* Fall through */ - case 4: - /* ... then start callback. */ - break; - case 5: - /* Number would eventually match, if longer */ - retval = 3; - break; - } - dbg_statcallb("ICALL: ret=%d\n", retval); - return retval; - break; - case ISDN_STAT_DHUP: - if (divert_if) - divert_if->stat_callback(c); - break; - case ISDN_STAT_DISCH: - save_flags(flags); - cli(); - for (i = 0; i < ISDN_MAX_CHANNELS; i++) - if ((slots[i].di == di) && - (slots[i].ch == c->arg)) { - if (c->parm.num[0]) - slots[i].usage &= ~ISDN_USAGE_DISABLED; - else if (USG_NONE(isdn_slot_usage(i))) - slots[i].usage |= ISDN_USAGE_DISABLED; - else - retval = -1; - break; - } - restore_flags(flags); - break; - case CAPI_PUT_MESSAGE: - return(isdn_capi_rec_hl_msg(&c->parm.cmsg)); - case ISDN_STAT_PROT: - case ISDN_STAT_REDIR: - if (divert_if) - return(divert_if->stat_callback(c)); -#endif - default: - rc = 1; + isdn_unlock_driver(dev->drv[i]); } - put_drv(drv); - return rc; -} - -/* ====================================================================== */ - -/* - * Register a new ISDN interface - */ -int -register_isdn(isdn_if *iif) -{ - struct isdn_driver *drv; - unsigned long flags; - int drvidx; - - drv = kmalloc(sizeof(*drv), GFP_ATOMIC); - if (!drv) { - printk(KERN_WARNING "register_isdn: out of mem\n"); - goto fail; - } - memset(drv, 0, sizeof(*drv)); - - atomic_set(&drv->refcnt, 0); - spin_lock_init(&drv->lock); - init_waitqueue_head(&drv->st_waitq); - drv->fi.fsm = &drv_fsm; - drv->fi.state = ST_DRV_NULL; - drv->fi.debug = 1; - drv->fi.userdata = drv; - drv->fi.printdebug = drv_debug; - - spin_lock_irqsave(&drivers_lock, flags); - for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) - if (!drivers[drvidx]) - break; - - if (drvidx == ISDN_MAX_DRIVERS) - goto fail_unlock; - - if (!strlen(iif->id)) - sprintf(iif->id, "line%d", drvidx); - - if (__isdn_drv_lookup(iif->id) >= 0) - goto fail_unlock; - - strcpy(drv->id, iif->id); - if (isdn_add_channels(drv, iif->channels)) - goto fail_unlock; - - drv->di = drvidx; - drivers[drvidx] = get_drv(drv); - spin_unlock_irqrestore(&drivers_lock, flags); - - fsm_event(&drv->fi, EV_DRV_REGISTER, iif); - return 1; - - fail_unlock: - spin_unlock_irqrestore(&drivers_lock, flags); - kfree(drv); - fail: - return 0; -} - -/* ====================================================================== */ - -#if defined(CONFIG_ISDN_DIVERSION) || defined(CONFIG_ISDN_DIVERSION_MODULE) -static isdn_divert_if *divert_if; /* = NULL */ -#else -#define divert_if ((isdn_divert_if *) NULL) -#endif - -static int isdn_wildmat(char *s, char *p); - -static void -isdn_lock_driver(struct isdn_driver *drv) -{ - // FIXME don't ignore return value - try_module_get(drv->interface->owner); -} - -static void -isdn_unlock_driver(struct isdn_driver *drv) -{ - module_put(drv->interface->owner); } #if defined(ISDN_DEBUG_NET_DUMP) || defined(ISDN_DEBUG_MODEM_DUMP) @@ -1078,58 +217,518 @@ return isdn_wildmat( TmpMsn1, TmpMsn2 ); } -static int -__drv_command(struct isdn_driver *drv, isdn_ctrl *c) +int +isdn_dc2minor(int di, int ch) { -#ifdef ISDN_DEBUG_COMMAND - switch (c->command) { - case ISDN_CMD_SETL2: - printk(KERN_DEBUG "ISDN_CMD_SETL2 %d/%ld\n", c->driver, c->arg & 0xff); break; - case ISDN_CMD_SETL3: - printk(KERN_DEBUG "ISDN_CMD_SETL3 %d/%ld\n", c->driver, c->arg & 0xff); break; - case ISDN_CMD_DIAL: - printk(KERN_DEBUG "ISDN_CMD_DIAL %d/%ld\n", c->driver, c->arg & 0xff); break; - case ISDN_CMD_ACCEPTD: - printk(KERN_DEBUG "ISDN_CMD_ACCEPTD %d/%ld\n", c->driver, c->arg & 0xff); break; - case ISDN_CMD_ACCEPTB: - printk(KERN_DEBUG "ISDN_CMD_ACCEPTB %d/%ld\n", c->driver, c->arg & 0xff); break; - case ISDN_CMD_HANGUP: - printk(KERN_DEBUG "ISDN_CMD_HANGUP %d/%ld\n", c->driver, c->arg & 0xff); break; - case ISDN_CMD_CLREAZ: - printk(KERN_DEBUG "ISDN_CMD_CLREAZ %d/%ld\n", c->driver, c->arg & 0xff); break; - case ISDN_CMD_SETEAZ: - printk(KERN_DEBUG "ISDN_CMD_SETEAZ %d/%ld\n", c->driver, c->arg & 0xff); break; - default: - printk(KERN_DEBUG "%s: cmd = %d\n", __FUNCTION__, c->command); + int i; + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if (dev->chanmap[i] == ch && dev->drvmap[i] == di) + return i; + return -1; +} + +static int isdn_timer_cnt1 = 0; +static int isdn_timer_cnt2 = 0; +static int isdn_timer_cnt3 = 0; + +static void +isdn_timer_funct(ulong dummy) +{ + int tf = dev->tflags; + if (tf & ISDN_TIMER_FAST) { + if (tf & ISDN_TIMER_MODEMREAD) + isdn_tty_readmodem(); + if (tf & ISDN_TIMER_MODEMPLUS) + isdn_tty_modem_escape(); + if (tf & ISDN_TIMER_MODEMXMIT) + isdn_tty_modem_xmit(); + } + if (tf & ISDN_TIMER_SLOW) { + if (++isdn_timer_cnt1 >= ISDN_TIMER_02SEC) { + isdn_timer_cnt1 = 0; + if (tf & ISDN_TIMER_NETDIAL) + isdn_net_dial(); + } + if (++isdn_timer_cnt2 >= ISDN_TIMER_1SEC) { + isdn_timer_cnt2 = 0; + if (tf & ISDN_TIMER_NETHANGUP) + isdn_net_autohup(); + if (++isdn_timer_cnt3 >= ISDN_TIMER_RINGING) { + isdn_timer_cnt3 = 0; + if (tf & ISDN_TIMER_MODEMRING) + isdn_tty_modem_ring(); + } + if (tf & ISDN_TIMER_CARRIER) + isdn_tty_carrier_timeout(); + } } -#endif - return drv->interface->command(c); + if (tf) + mod_timer(&dev->timer, jiffies+ISDN_TIMER_RES); } -static int -__slot_command(struct isdn_slot *slot, isdn_ctrl *cmd) +void +isdn_timer_ctrl(int tf, int onoff) { - struct isdn_driver *drv = slot->drv; + unsigned long flags; + int old_tflags; - return __drv_command(drv, cmd); + spin_lock_irqsave(&dev->timerlock, flags); + if ((tf & ISDN_TIMER_SLOW) && (!(dev->tflags & ISDN_TIMER_SLOW))) { + /* If the slow-timer wasn't activated until now */ + isdn_timer_cnt1 = 0; + isdn_timer_cnt2 = 0; + } + old_tflags = dev->tflags; + if (onoff) + dev->tflags |= tf; + else + dev->tflags &= ~tf; + if (dev->tflags && !old_tflags) + mod_timer(&dev->timer, jiffies+ISDN_TIMER_RES); + spin_unlock_irqrestore(&dev->timerlock, flags); +} + +/* + * Receive a packet from B-Channel. (Called from low-level-module) + */ +static void +isdn_receive_skb_callback(int di, int channel, struct sk_buff *skb) +{ + int i; + + if ((i = isdn_dc2minor(di, channel)) == -1) { + dev_kfree_skb(skb); + return; + } + /* Update statistics */ + dev->ibytes[i] += skb->len; + + /* First, try to deliver data to network-device */ + if (isdn_net_rcv_skb(i, skb)) + return; + + /* V.110 handling + * makes sense for async streams only, so it is + * called after possible net-device delivery. + */ + if (dev->v110[i]) { + atomic_inc(&dev->v110use[i]); + skb = isdn_v110_decode(dev->v110[i], skb); + atomic_dec(&dev->v110use[i]); + if (!skb) + return; + } + + /* No network-device found, deliver to tty or raw-channel */ + if (skb->len) { + if (isdn_tty_rcv_skb(i, di, channel, skb)) + return; + wake_up_interruptible(&dev->drv[di]->rcv_waitq[channel]); + } else + dev_kfree_skb(skb); +} + +/* + * Intercept command from Linklevel to Lowlevel. + * If layer 2 protocol is V.110 and this is not supported by current + * lowlevel-driver, use driver's transparent mode and handle V.110 in + * linklevel instead. + */ +int +isdn_command(isdn_ctrl *cmd) +{ + if (cmd->driver == -1) { + printk(KERN_WARNING "isdn_command command(%x) driver -1\n", cmd->command); + return(1); + } + if (cmd->command == ISDN_CMD_SETL2) { + int idx = isdn_dc2minor(cmd->driver, cmd->arg & 255); + unsigned long l2prot = (cmd->arg >> 8) & 255; + unsigned long features = (dev->drv[cmd->driver]->interface->features + >> ISDN_FEATURE_L2_SHIFT) & + ISDN_FEATURE_L2_MASK; + unsigned long l2_feature = (1 << l2prot); + + switch (l2prot) { + case ISDN_PROTO_L2_V11096: + case ISDN_PROTO_L2_V11019: + case ISDN_PROTO_L2_V11038: + /* If V.110 requested, but not supported by + * HL-driver, set emulator-flag and change + * Layer-2 to transparent + */ + if (!(features & l2_feature)) { + dev->v110emu[idx] = l2prot; + cmd->arg = (cmd->arg & 255) | + (ISDN_PROTO_L2_TRANS << 8); + } else + dev->v110emu[idx] = 0; + } + } + return dev->drv[cmd->driver]->interface->command(cmd); +} + +void +isdn_all_eaz(int di, int ch) +{ + isdn_ctrl cmd; + + if (di < 0) + return; + cmd.driver = di; + cmd.arg = ch; + cmd.command = ISDN_CMD_SETEAZ; + cmd.parm.num[0] = '\0'; + isdn_command(&cmd); } /* * Begin of a CAPI like LL<->HL interface, currently used only for * supplementary service (CAPI 2.0 part III) */ -#include +#include int -isdn_capi_rec_hl_msg(capi_msg *cm) -{ +isdn_capi_rec_hl_msg(capi_msg *cm) { + + int di; + int ch; + + di = (cm->adr.Controller & 0x7f) -1; + ch = isdn_dc2minor(di, (cm->adr.Controller>>8)& 0x7f); switch(cm->Command) { - case CAPI_FACILITY: - /* in the moment only handled in tty */ - return isdn_tty_capi_facility(cm); - default: - return -1; + case CAPI_FACILITY: + /* in the moment only handled in tty */ + return(isdn_tty_capi_facility(cm)); + default: + return(-1); + } +} + +static int +isdn_status_callback(isdn_ctrl * c) +{ + int di; + u_long flags; + int i; + int r; + int retval = 0; + isdn_ctrl cmd; + isdn_net_dev *p; + + di = c->driver; + i = isdn_dc2minor(di, c->arg); + switch (c->command) { + case ISDN_STAT_BSENT: + if (i < 0) + return -1; + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + return 0; + if (isdn_net_stat_callback(i, c)) + return 0; + if (isdn_v110_stat_callback(i, c)) + return 0; + if (isdn_tty_stat_callback(i, c)) + return 0; + wake_up_interruptible(&dev->drv[di]->snd_waitq[c->arg]); + break; + case ISDN_STAT_STAVAIL: + dev->drv[di]->stavail += c->arg; + wake_up_interruptible(&dev->drv[di]->st_waitq); + break; + case ISDN_STAT_RUN: + dev->drv[di]->flags |= DRV_FLAG_RUNNING; + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if (dev->drvmap[i] == di) + isdn_all_eaz(di, dev->chanmap[i]); + set_global_features(); + break; + case ISDN_STAT_STOP: + dev->drv[di]->flags &= ~DRV_FLAG_RUNNING; + break; + case ISDN_STAT_ICALL: + if (i < 0) + return -1; +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "ICALL (net): %d %ld %s\n", di, c->arg, c->parm.num); +#endif + if (dev->global_flags & ISDN_GLOBAL_STOPPED) { + cmd.driver = di; + cmd.arg = c->arg; + cmd.command = ISDN_CMD_HANGUP; + isdn_command(&cmd); + return 0; + } + /* Try to find a network-interface which will accept incoming call */ + r = ((c->command == ISDN_STAT_ICALLW) ? 0 : isdn_net_find_icall(di, c->arg, i, &c->parm.setup)); + switch (r) { + case 0: + /* No network-device replies. + * Try ttyI's. + * These return 0 on no match, 1 on match and + * 3 on eventually match, if CID is longer. + */ + if (c->command == ISDN_STAT_ICALL) + if ((retval = isdn_tty_find_icall(di, c->arg, &c->parm.setup))) return(retval); +#ifdef CONFIG_ISDN_DIVERSION + if (divert_if) + if ((retval = divert_if->stat_callback(c))) + return(retval); /* processed */ +#endif /* CONFIG_ISDN_DIVERSION */ + if ((!retval) && (dev->drv[di]->flags & DRV_FLAG_REJBUS)) { + /* No tty responding */ + cmd.driver = di; + cmd.arg = c->arg; + cmd.command = ISDN_CMD_HANGUP; + isdn_command(&cmd); + retval = 2; + } + break; + case 1: + /* Schedule connection-setup */ + isdn_net_dial(); + cmd.driver = di; + cmd.arg = c->arg; + cmd.command = ISDN_CMD_ACCEPTD; + for ( p = dev->netdev; p; p = p->next ) + if ( p->local->isdn_channel == cmd.arg ) + { + strcpy( cmd.parm.setup.eazmsn, p->local->msn ); + isdn_command(&cmd); + retval = 1; + break; + } + break; + + case 2: /* For calling back, first reject incoming call ... */ + case 3: /* Interface found, but down, reject call actively */ + retval = 2; + printk(KERN_INFO "isdn: Rejecting Call\n"); + cmd.driver = di; + cmd.arg = c->arg; + cmd.command = ISDN_CMD_HANGUP; + isdn_command(&cmd); + if (r == 3) + break; + /* Fall through */ + case 4: + /* ... then start callback. */ + isdn_net_dial(); + break; + case 5: + /* Number would eventually match, if longer */ + retval = 3; + break; + } +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "ICALL: ret=%d\n", retval); +#endif + return retval; + break; + case ISDN_STAT_CINF: + if (i < 0) + return -1; +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "CINF: %ld %s\n", c->arg, c->parm.num); +#endif + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + return 0; + if (strcmp(c->parm.num, "0")) + isdn_net_stat_callback(i, c); + isdn_tty_stat_callback(i, c); + break; + case ISDN_STAT_CAUSE: +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "CAUSE: %ld %s\n", c->arg, c->parm.num); +#endif + printk(KERN_INFO "isdn: %s,ch%ld cause: %s\n", + dev->drvid[di], c->arg, c->parm.num); + isdn_tty_stat_callback(i, c); +#ifdef CONFIG_ISDN_DIVERSION + if (divert_if) + divert_if->stat_callback(c); +#endif /* CONFIG_ISDN_DIVERSION */ + break; + case ISDN_STAT_DISPLAY: +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "DISPLAY: %ld %s\n", c->arg, c->parm.display); +#endif + isdn_tty_stat_callback(i, c); +#ifdef CONFIG_ISDN_DIVERSION + if (divert_if) + divert_if->stat_callback(c); +#endif /* CONFIG_ISDN_DIVERSION */ + break; + case ISDN_STAT_DCONN: + if (i < 0) + return -1; +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "DCONN: %ld\n", c->arg); +#endif + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + return 0; + /* Find any net-device, waiting for D-channel setup */ + if (isdn_net_stat_callback(i, c)) + break; + isdn_v110_stat_callback(i, c); + /* Find any ttyI, waiting for D-channel setup */ + if (isdn_tty_stat_callback(i, c)) { + cmd.driver = di; + cmd.arg = c->arg; + cmd.command = ISDN_CMD_ACCEPTB; + isdn_command(&cmd); + break; + } + break; + case ISDN_STAT_DHUP: + if (i < 0) + return -1; +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "DHUP: %ld\n", c->arg); +#endif + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + return 0; + dev->drv[di]->online &= ~(1 << (c->arg)); + isdn_info_update(); + /* Signal hangup to network-devices */ + if (isdn_net_stat_callback(i, c)) + break; + isdn_v110_stat_callback(i, c); + if (isdn_tty_stat_callback(i, c)) + break; +#ifdef CONFIG_ISDN_DIVERSION + if (divert_if) + divert_if->stat_callback(c); +#endif /* CONFIG_ISDN_DIVERSION */ + break; + break; + case ISDN_STAT_BCONN: + if (i < 0) + return -1; +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "BCONN: %ld\n", c->arg); +#endif + /* Signal B-channel-connect to network-devices */ + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + return 0; + dev->drv[di]->online |= (1 << (c->arg)); + isdn_info_update(); + if (isdn_net_stat_callback(i, c)) + break; + isdn_v110_stat_callback(i, c); + if (isdn_tty_stat_callback(i, c)) + break; + break; + case ISDN_STAT_BHUP: + if (i < 0) + return -1; +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "BHUP: %ld\n", c->arg); +#endif + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + return 0; + dev->drv[di]->online &= ~(1 << (c->arg)); + isdn_info_update(); +#ifdef CONFIG_ISDN_X25 + /* Signal hangup to network-devices */ + if (isdn_net_stat_callback(i, c)) + break; +#endif + isdn_v110_stat_callback(i, c); + if (isdn_tty_stat_callback(i, c)) + break; + break; + case ISDN_STAT_NODCH: + if (i < 0) + return -1; +#ifdef ISDN_DEBUG_STATCALLB + printk(KERN_DEBUG "NODCH: %ld\n", c->arg); +#endif + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + return 0; + if (isdn_net_stat_callback(i, c)) + break; + if (isdn_tty_stat_callback(i, c)) + break; + break; + case ISDN_STAT_ADDCH: + spin_lock_irqsave(&dev->lock, flags); + if (isdn_add_channels(dev->drv[di], di, c->arg, 1)) { + spin_unlock_irqrestore(&dev->lock, flags); + return -1; + } + spin_unlock_irqrestore(&dev->lock, flags); + isdn_info_update(); + break; + case ISDN_STAT_DISCH: + spin_lock_irqsave(&dev->lock, flags); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if ((dev->drvmap[i] == di) && + (dev->chanmap[i] == c->arg)) { + if (c->parm.num[0]) + dev->usage[i] &= ~ISDN_USAGE_DISABLED; + else + if (USG_NONE(dev->usage[i])) { + dev->usage[i] |= ISDN_USAGE_DISABLED; + } + else + retval = -1; + break; + } + spin_unlock_irqrestore(&dev->lock, flags); + isdn_info_update(); + break; + case ISDN_STAT_UNLOAD: + while (dev->drv[di]->locks > 0) { + isdn_unlock_driver(dev->drv[di]); + } + spin_lock_irqsave(&dev->lock, flags); + isdn_tty_stat_callback(i, c); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if (dev->drvmap[i] == di) { + dev->drvmap[i] = -1; + dev->chanmap[i] = -1; + dev->usage[i] &= ~ISDN_USAGE_DISABLED; + } + dev->drivers--; + dev->channels -= dev->drv[di]->channels; + kfree(dev->drv[di]->rcverr); + kfree(dev->drv[di]->rcvcount); + for (i = 0; i < dev->drv[di]->channels; i++) + skb_queue_purge(&dev->drv[di]->rpqueue[i]); + kfree(dev->drv[di]->rpqueue); + kfree(dev->drv[di]->rcv_waitq); + kfree(dev->drv[di]); + dev->drv[di] = NULL; + dev->drvid[di][0] = '\0'; + isdn_info_update(); + set_global_features(); + spin_unlock_irqrestore(&dev->lock, flags); + return 0; + case ISDN_STAT_L1ERR: + break; + case CAPI_PUT_MESSAGE: + return(isdn_capi_rec_hl_msg(&c->parm.cmsg)); +#ifdef CONFIG_ISDN_TTY_FAX + case ISDN_STAT_FAXIND: + isdn_tty_stat_callback(i, c); + break; +#endif +#ifdef CONFIG_ISDN_AUDIO + case ISDN_STAT_AUDIO: + isdn_tty_stat_callback(i, c); + break; +#endif +#ifdef CONFIG_ISDN_DIVERSION + case ISDN_STAT_PROT: + case ISDN_STAT_REDIR: + if (divert_if) + return(divert_if->stat_callback(c)); +#endif /* CONFIG_ISDN_DIVERSION */ + default: + return -1; } + return 0; } /* @@ -1145,429 +744,485 @@ return v; } -static struct isdn_slot * -get_slot_by_minor(int minor) -{ - int di, ch; - struct isdn_driver *drv; +#define DLE 0x10 - for (di = 0; di < ISDN_MAX_DRIVERS; di++) { - drv = get_drv_by_nr(di); - if (!drv) - continue; +/* + * isdn_readbchan() tries to get data from the read-queue. + * It MUST be called with interrupts off. + * + * Be aware that this is not an atomic operation when sleep != 0, even though + * interrupts are turned off! Well, like that we are currently only called + * on behalf of a read system call on raw device files (which are documented + * to be dangerous and for for debugging purpose only). The inode semaphore + * takes care that this is not called for the same minor device number while + * we are sleeping, but access is not serialized against simultaneous read() + * from the corresponding ttyI device. Can other ugly events, like changes + * of the mapping (di,ch)<->minor, happen during the sleep? --he + */ +int +isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_queue_head_t *sleep) +{ + int count; + int count_pull; + int count_put; + int dflag; + struct sk_buff *skb; + u_char *cp; - for (ch = 0; ch < drv->channels; ch++) { - if (minor-- == 0) - goto found; + if (!dev->drv[di]) + return 0; + if (skb_queue_empty(&dev->drv[di]->rpqueue[channel])) { + if (sleep) + interruptible_sleep_on(sleep); + else + return 0; + } + if (len > dev->drv[di]->rcvcount[channel]) + len = dev->drv[di]->rcvcount[channel]; + cp = buf; + count = 0; + while (len) { + if (!(skb = skb_peek(&dev->drv[di]->rpqueue[channel]))) + break; +#ifdef CONFIG_ISDN_AUDIO + if (ISDN_AUDIO_SKB_LOCK(skb)) + break; + ISDN_AUDIO_SKB_LOCK(skb) = 1; + if ((ISDN_AUDIO_SKB_DLECOUNT(skb)) || (dev->drv[di]->DLEflag & (1 << channel))) { + char *p = skb->data; + unsigned long DLEmask = (1 << channel); + + dflag = 0; + count_pull = count_put = 0; + while ((count_pull < skb->len) && (len > 0)) { + len--; + if (dev->drv[di]->DLEflag & DLEmask) { + *cp++ = DLE; + dev->drv[di]->DLEflag &= ~DLEmask; + } else { + *cp++ = *p; + if (*p == DLE) { + dev->drv[di]->DLEflag |= DLEmask; + (ISDN_AUDIO_SKB_DLECOUNT(skb))--; + } + p++; + count_pull++; + } + count_put++; + } + if (count_pull >= skb->len) + dflag = 1; + } else { +#endif + /* No DLE's in buff, so simply copy it */ + dflag = 1; + if ((count_pull = skb->len) > len) { + count_pull = len; + dflag = 0; + } + count_put = count_pull; + memcpy(cp, skb->data, count_put); + cp += count_put; + len -= count_put; +#ifdef CONFIG_ISDN_AUDIO } - put_drv(drv); +#endif + count += count_put; + if (fp) { + memset(fp, 0, count_put); + fp += count_put; + } + if (dflag) { + /* We got all the data in this buff. + * Now we can dequeue it. + */ + if (fp) + *(fp - 1) = 0xff; +#ifdef CONFIG_ISDN_AUDIO + ISDN_AUDIO_SKB_LOCK(skb) = 0; +#endif + skb = skb_dequeue(&dev->drv[di]->rpqueue[channel]); + dev_kfree_skb(skb); + } else { + /* Not yet emptied this buff, so it + * must stay in the queue, for further calls + * but we pull off the data we got until now. + */ + skb_pull(skb, count_pull); +#ifdef CONFIG_ISDN_AUDIO + ISDN_AUDIO_SKB_LOCK(skb) = 0; +#endif + } + dev->drv[di]->rcvcount[channel] -= count_put; } - return NULL; + return count; +} - found: - return drv->slots + ch; +static __inline int +isdn_minor2drv(int minor) +{ + return (dev->drvmap[minor]); } -static inline void -put_slot(struct isdn_slot *slot) +static __inline int +isdn_minor2chan(int minor) { - put_drv(slot->drv); + return (dev->chanmap[minor]); } static char * isdn_statstr(void) { static char istatbuf[2048]; - struct isdn_slot *slot; char *p; int i; sprintf(istatbuf, "idmap:\t"); p = istatbuf + strlen(istatbuf); for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - slot = get_slot_by_minor(i); - if (slot) { - sprintf(p, "%s ", slot->drv->id); - put_slot(slot); - } else { - sprintf(p, "- "); - } + sprintf(p, "%s ", (dev->drvmap[i] < 0) ? "-" : dev->drvid[dev->drvmap[i]]); p = istatbuf + strlen(istatbuf); } sprintf(p, "\nchmap:\t"); p = istatbuf + strlen(istatbuf); for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - slot = get_slot_by_minor(i); - if (slot) { - sprintf(p, "%d ", slot->ch); - put_slot(slot); - } else { - sprintf(p, "-1 "); - } + sprintf(p, "%d ", dev->chanmap[i]); p = istatbuf + strlen(istatbuf); } sprintf(p, "\ndrmap:\t"); p = istatbuf + strlen(istatbuf); for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - slot = get_slot_by_minor(i); - if (slot) { - sprintf(p, "%d ", slot->di); - put_slot(slot); - } else { - sprintf(p, "-1 "); - } + sprintf(p, "%d ", dev->drvmap[i]); + p = istatbuf + strlen(istatbuf); } sprintf(p, "\nusage:\t"); p = istatbuf + strlen(istatbuf); for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - slot = get_slot_by_minor(i); - if (slot) { - sprintf(p, "%d ", slot->usage); - put_slot(slot); - } else { - sprintf(p, "0 "); - } + sprintf(p, "%d ", dev->usage[i]); p = istatbuf + strlen(istatbuf); } sprintf(p, "\nflags:\t"); p = istatbuf + strlen(istatbuf); for (i = 0; i < ISDN_MAX_DRIVERS; i++) { - slot = get_slot_by_minor(i); - if (slot) { - sprintf(p, "0 "); - put_slot(slot); + if (dev->drv[i]) { + sprintf(p, "%ld ", dev->drv[i]->online); + p = istatbuf + strlen(istatbuf); } else { sprintf(p, "? "); + p = istatbuf + strlen(istatbuf); } - p = istatbuf + strlen(istatbuf); } sprintf(p, "\nphone:\t"); p = istatbuf + strlen(istatbuf); for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - slot = get_slot_by_minor(i); - if (slot) { - sprintf(p, "%s ", slot->num); - put_slot(slot); - } else { - sprintf(p, " "); - } + sprintf(p, "%s ", dev->num[i]); p = istatbuf + strlen(istatbuf); } sprintf(p, "\n"); return istatbuf; } -/* - * /dev/isdninfo - */ +/* Module interface-code */ void isdn_info_update(void) { - infostruct *p = isdndev->infochain; + infostruct *p = dev->infochain; while (p) { *(p->private) = 1; p = (infostruct *) p->next; } - wake_up_interruptible(&(isdndev->info_waitq)); -} - -static int -isdn_status_open(struct inode *ino, struct file *filep) -{ - infostruct *p; - - p = kmalloc(sizeof(infostruct), GFP_KERNEL); - if (!p) - return -ENOMEM; - - p->next = (char *) isdndev->infochain; - p->private = (char *) &(filep->private_data); - isdndev->infochain = p; - /* At opening we allow a single update */ - filep->private_data = (char *) 1; - - return 0; -} - -static int -isdn_status_release(struct inode *ino, struct file *filep) -{ - infostruct *p = isdndev->infochain; - infostruct *q = NULL; - - lock_kernel(); - - while (p) { - if (p->private == (char *) &(filep->private_data)) { - if (q) - q->next = p->next; - else - isdndev->infochain = (infostruct *) (p->next); - kfree(p); - goto out; - } - q = p; - p = (infostruct *) (p->next); - } - printk(KERN_WARNING "isdn: No private data while closing isdnctrl\n"); - - out: - unlock_kernel(); - return 0; + wake_up_interruptible(&(dev->info_waitq)); } static ssize_t -isdn_status_read(struct file *file, char *buf, size_t count, loff_t * off) +isdn_read(struct file *file, char *buf, size_t count, loff_t * off) { + uint minor = MINOR(file->f_dentry->d_inode->i_rdev); + int len = 0; + int drvidx; + int chidx; int retval; - size_t len = 0; char *p; if (off != &file->f_pos) return -ESPIPE; - if (!file->private_data) { - if (file->f_flags & O_NONBLOCK) - return -EAGAIN; - interruptible_sleep_on(&(isdndev->info_waitq)); - } lock_kernel(); - p = isdn_statstr(); - file->private_data = 0; - if ((len = strlen(p)) <= count) { - if (copy_to_user(buf, p, len)) { - retval = -EFAULT; + if (minor == ISDN_MINOR_STATUS) { + if (!file->private_data) { + if (file->f_flags & O_NONBLOCK) { + retval = -EAGAIN; + goto out; + } + interruptible_sleep_on(&(dev->info_waitq)); + } + p = isdn_statstr(); + file->private_data = 0; + if ((len = strlen(p)) <= count) { + if (copy_to_user(buf, p, len)) { + retval = -EFAULT; + goto out; + } + *off += len; + retval = len; + goto out; + } + retval = 0; + goto out; + } + if (!dev->drivers) { + retval = -ENODEV; + goto out; + } + if (minor <= ISDN_MINOR_BMAX) { + printk(KERN_WARNING "isdn_read minor %d obsolete!\n", minor); + drvidx = isdn_minor2drv(minor); + if (drvidx < 0) { + retval = -ENODEV; goto out; } + if (!(dev->drv[drvidx]->flags & DRV_FLAG_RUNNING)) { + retval = -ENODEV; + goto out; + } + chidx = isdn_minor2chan(minor); + if (!(p = kmalloc(count, GFP_KERNEL))) { + retval = -ENOMEM; + goto out; + } + len = isdn_readbchan(drvidx, chidx, p, 0, count, + &dev->drv[drvidx]->rcv_waitq[chidx]); *off += len; + if (copy_to_user(buf,p,len)) + len = -EFAULT; + kfree(p); retval = len; goto out; } - retval = 0; - goto out; - + if (minor <= ISDN_MINOR_CTRLMAX) { + drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); + if (drvidx < 0) { + retval = -ENODEV; + goto out; + } + if (!dev->drv[drvidx]->stavail) { + if (file->f_flags & O_NONBLOCK) { + retval = -EAGAIN; + goto out; + } + interruptible_sleep_on(&(dev->drv[drvidx]->st_waitq)); + } + if (dev->drv[drvidx]->interface->readstat) { + if (count > dev->drv[drvidx]->stavail) + count = dev->drv[drvidx]->stavail; + len = dev->drv[drvidx]->interface-> + readstat(buf, count, 1, drvidx, + isdn_minor2chan(minor)); + } else { + len = 0; + } + if (len) + dev->drv[drvidx]->stavail -= len; + else + dev->drv[drvidx]->stavail = 0; + *off += len; + retval = len; + goto out; + } +#ifdef CONFIG_ISDN_PPP + if (minor <= ISDN_MINOR_PPPMAX) { + retval = isdn_ppp_read(minor - ISDN_MINOR_PPP, file, buf, count); + goto out; + } +#endif + retval = -ENODEV; out: unlock_kernel(); return retval; } static ssize_t -isdn_status_write(struct file *file, const char *buf, size_t count, loff_t *off) -{ - return -EPERM; -} - -static unsigned int -isdn_status_poll(struct file *file, poll_table *wait) +isdn_write(struct file *file, const char *buf, size_t count, loff_t * off) { - unsigned int mask = 0; - - poll_wait(file, &(isdndev->info_waitq), wait); - lock_kernel(); - if (file->private_data) - mask |= POLLIN | POLLRDNORM; - unlock_kernel(); - return mask; -} - -static int -isdn_status_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) -{ - static unsigned long zero_ul = 0UL; - int ret; - struct isdn_slot *slot; - - switch (cmd) { - case IIOCGETDVR: - return (TTY_DV + - (NET_DV << 8) + - (INF_DV << 16)); - case IIOCGETCPS: - if (arg) { - ulong *p = (ulong *) arg; - int i; - if ((ret = verify_area(VERIFY_WRITE, (void *) arg, - sizeof(ulong) * ISDN_MAX_CHANNELS * 2))) - return ret; - for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - slot = get_slot_by_minor(i); - if (slot) { - put_user(slot->ibytes, p++); - put_user(slot->obytes, p++); - put_slot(slot); - } else { - put_user(zero_ul, p++); - put_user(zero_ul, p++); - } - } - return 0; - } else - return -EINVAL; - break; - case IIOCNETGPN: - return isdn_net_ioctl(inode, file, cmd, arg); - default: - return -EINVAL; - } -} - -static struct file_operations isdn_status_fops = -{ - .owner = THIS_MODULE, - .llseek = no_llseek, - .read = isdn_status_read, - .write = isdn_status_write, - .poll = isdn_status_poll, - .ioctl = isdn_status_ioctl, - .open = isdn_status_open, - .release = isdn_status_release, -}; - -/* - * /dev/isdnctrlX - */ - -static int -isdn_ctrl_open(struct inode *ino, struct file *file) -{ - unsigned int minor = iminor(ino); - struct isdn_slot *slot = get_slot_by_minor(minor - ISDN_MINOR_CTRL); - - if (!slot) - return -ENODEV; - - isdn_lock_driver(slot->drv); - file->private_data = slot; - - return 0; -} - -static int -isdn_ctrl_release(struct inode *ino, struct file *file) -{ - struct isdn_slot *slot = file->private_data; - - if (isdndev->profd == current) - isdndev->profd = NULL; - - isdn_unlock_driver(slot->drv); - put_slot(slot); - - return 0; -} - -static ssize_t -isdn_ctrl_read(struct file *file, char *buf, size_t count, loff_t * off) -{ - struct isdn_slot *slot = file->private_data; - DECLARE_WAITQUEUE(wait, current); - unsigned long flags; - size_t len = 0; + uint minor = MINOR(file->f_dentry->d_inode->i_rdev); + int drvidx; + int chidx; + int retval; if (off != &file->f_pos) return -ESPIPE; - if (!slot->drv->interface->readstat) { - isdn_BUG(); - return 0; - } - add_wait_queue(&slot->drv->st_waitq, &wait); - for (;;) { - spin_lock_irqsave(&stat_lock, flags); - len = slot->drv->stavail; - spin_unlock_irqrestore(&stat_lock, flags); - if (len > 0) - break; - if (signal_pending(current)) { - len = -ERESTARTSYS; - break; + if (minor == ISDN_MINOR_STATUS) + return -EPERM; + if (!dev->drivers) + return -ENODEV; + + lock_kernel(); + if (minor <= ISDN_MINOR_BMAX) { + printk(KERN_WARNING "isdn_write minor %d obsolete!\n", minor); + drvidx = isdn_minor2drv(minor); + if (drvidx < 0) { + retval = -ENODEV; + goto out; } - if (file->f_flags & O_NONBLOCK) { - len = -EAGAIN; - break; + if (!(dev->drv[drvidx]->flags & DRV_FLAG_RUNNING)) { + retval = -ENODEV; + goto out; } - schedule(); - } - __set_current_state(TASK_RUNNING); - remove_wait_queue(&slot->drv->st_waitq, &wait); - - if (len < 0) - return len; - - if (count > len) - count = len; - - len = slot->drv->interface->readstat(buf, count, 1, slot->di, - slot->ch); - - spin_lock_irqsave(&stat_lock, flags); - if (len) { - slot->drv->stavail -= len; - } else { - isdn_BUG(); - slot->drv->stavail = 0; + chidx = isdn_minor2chan(minor); + while (isdn_writebuf_stub(drvidx, chidx, buf, count, 1) != count) + interruptible_sleep_on(&dev->drv[drvidx]->snd_waitq[chidx]); + retval = count; + goto out; } - spin_unlock_irqrestore(&stat_lock, flags); - - *off += len; - return len; -} - -static ssize_t -isdn_ctrl_write(struct file *file, const char *buf, size_t count, loff_t *off) -{ - struct isdn_slot *slot = file->private_data; - int retval; - - if (off != &file->f_pos) { - retval = -ESPIPE; + if (minor <= ISDN_MINOR_CTRLMAX) { + drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); + if (drvidx < 0) { + retval = -ENODEV; + goto out; + } + /* + * We want to use the isdnctrl device to load the firmware + * + if (!(dev->drv[drvidx]->flags & DRV_FLAG_RUNNING)) + return -ENODEV; + */ + if (dev->drv[drvidx]->interface->writecmd) + retval = dev->drv[drvidx]->interface-> + writecmd(buf, count, 1, drvidx, isdn_minor2chan(minor)); + else + retval = count; goto out; } - if (!slot->drv->interface->writecmd) { - retval = -EINVAL; +#ifdef CONFIG_ISDN_PPP + if (minor <= ISDN_MINOR_PPPMAX) { + retval = isdn_ppp_write(minor - ISDN_MINOR_PPP, file, buf, count); goto out; } - retval = slot->drv->interface->writecmd(buf, count, 1, slot->di, - slot->ch); - +#endif + retval = -ENODEV; out: + unlock_kernel(); return retval; } static unsigned int -isdn_ctrl_poll(struct file *file, poll_table *wait) +isdn_poll(struct file *file, poll_table * wait) { - struct isdn_slot *slot = file->private_data; unsigned int mask = 0; + unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev); + int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); - poll_wait(file, &slot->drv->st_waitq, wait); - mask = POLLOUT | POLLWRNORM; - if (slot->drv->stavail) - mask |= POLLIN | POLLRDNORM; - + lock_kernel(); + if (minor == ISDN_MINOR_STATUS) { + poll_wait(file, &(dev->info_waitq), wait); + /* mask = POLLOUT | POLLWRNORM; */ + if (file->private_data) { + mask |= POLLIN | POLLRDNORM; + } + goto out; + } + if (minor >= ISDN_MINOR_CTRL && minor <= ISDN_MINOR_CTRLMAX) { + if (drvidx < 0) { + /* driver deregistered while file open */ + mask = POLLHUP; + goto out; + } + poll_wait(file, &(dev->drv[drvidx]->st_waitq), wait); + mask = POLLOUT | POLLWRNORM; + if (dev->drv[drvidx]->stavail) { + mask |= POLLIN | POLLRDNORM; + } + goto out; + } +#ifdef CONFIG_ISDN_PPP + if (minor <= ISDN_MINOR_PPPMAX) { + mask = isdn_ppp_poll(file, wait); + goto out; + } +#endif + mask = POLLERR; + out: + unlock_kernel(); return mask; } static int -isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) +isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) { + uint minor = MINOR(inode->i_rdev); isdn_ctrl c; int drvidx; + int chidx; int ret; int i; char *p; - /* save stack space */ - union { - char bname[20]; + char *s; + union iocpar { + char name[10]; + char bname[22]; isdn_ioctl_struct iocts; + isdn_net_ioctl_phone phone; + isdn_net_ioctl_cfg cfg; } iocpar; -#define iocts iocpar.iocts +#define name iocpar.name #define bname iocpar.bname +#define iocts iocpar.iocts +#define phone iocpar.phone +#define cfg iocpar.cfg + if (minor == ISDN_MINOR_STATUS) { + switch (cmd) { + case IIOCGETDVR: + return (TTY_DV + + (NET_DV << 8) + + (INF_DV << 16)); + case IIOCGETCPS: + if (arg) { + ulong *p = (ulong *) arg; + int i; + if ((ret = verify_area(VERIFY_WRITE, (void *) arg, + sizeof(ulong) * ISDN_MAX_CHANNELS * 2))) + return ret; + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + put_user(dev->ibytes[i], p++); + put_user(dev->obytes[i], p++); + } + return 0; + } else + return -EINVAL; + break; +#ifdef CONFIG_NETDEVICES + case IIOCNETGPN: + /* Get peer phone number of a connected + * isdn network interface */ + if (arg) { + if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) + return -EFAULT; + return isdn_net_getpeer(&phone, (isdn_net_ioctl_phone *) arg); + } else + return -EINVAL; +#endif + default: + return -EINVAL; + } + } + if (!dev->drivers) + return -ENODEV; + if (minor <= ISDN_MINOR_BMAX) { + drvidx = isdn_minor2drv(minor); + if (drvidx < 0) + return -ENODEV; + chidx = isdn_minor2chan(minor); + if (!(dev->drv[drvidx]->flags & DRV_FLAG_RUNNING)) + return -ENODEV; + return 0; + } + if (minor <= ISDN_MINOR_CTRLMAX) { /* * isdn net devices manage lots of configuration variables as linked lists. * Those lists must only be manipulated from user space. Some of the ioctl's @@ -1575,257 +1230,497 @@ * manipulating the lists and ioctl's sleeping while accessing the lists * are serialized by means of a semaphore. */ - switch (cmd) { - case IIOCNETAIF: - case IIOCNETASL: - case IIOCNETDIF: - case IIOCNETSCF: - case IIOCNETGCF: - case IIOCNETANM: - case IIOCNETGNM: - case IIOCNETDNM: - case IIOCNETDIL: - case IIOCNETALN: - case IIOCNETDLN: - case IIOCNETHUP: - return isdn_net_ioctl(inode, file, cmd, arg); - case IIOCSETVER: - isdndev->net_verbose = arg; - printk(KERN_INFO "isdn: Verbose-Level is %d\n", isdndev->net_verbose); - return 0; - case IIOCSETGST: - if (arg) { - isdndev->global_flags |= ISDN_GLOBAL_STOPPED; - isdn_net_hangup_all(); - } else { - isdndev->global_flags &= ~ISDN_GLOBAL_STOPPED; - } - return 0; - case IIOCSETBRJ: - drvidx = -1; - if (arg) { - char *p; - if (copy_from_user((char *) &iocts, (char *) arg, - sizeof(isdn_ioctl_struct))) - return -EFAULT; - if (strlen(iocts.drvid)) { - if ((p = strchr(iocts.drvid, ','))) - *p = 0; - drvidx = isdn_drv_lookup(iocts.drvid); - } - } - if (drvidx == -1) - return -ENODEV; - if (iocts.arg) - drivers[drvidx]->flags |= DRV_FLAG_REJBUS; - else - drivers[drvidx]->flags &= ~DRV_FLAG_REJBUS; - return 0; - case IIOCSIGPRF: - isdndev->profd = current; - return 0; - break; - case IIOCGETPRF: - /* Get all Modem-Profiles */ - if (arg) { - char *p = (char *) arg; - int i; - - for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - if (copy_to_user(p, isdn_mdm.info[i].emu.profile, - ISDN_MODEM_NUMREG)) - return -EFAULT; - p += ISDN_MODEM_NUMREG; - if (copy_to_user(p, isdn_mdm.info[i].emu.pmsn, ISDN_MSNLEN)) - return -EFAULT; - p += ISDN_MSNLEN; - if (copy_to_user(p, isdn_mdm.info[i].emu.plmsn, ISDN_LMSNLEN)) - return -EFAULT; - p += ISDN_LMSNLEN; - } - return (ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN) * ISDN_MAX_CHANNELS; - } else - return -EINVAL; - break; - case IIOCSETPRF: - /* Set all Modem-Profiles */ - if (arg) { - char *p = (char *) arg; - int i; - - for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - if (copy_from_user(isdn_mdm.info[i].emu.profile, p, - ISDN_MODEM_NUMREG)) + switch (cmd) { + case IIOCNETDWRSET: + printk(KERN_INFO "INFO: ISDN_DW_ABC_EXTENSION not enabled\n"); + return(-EINVAL); + case IIOCNETLCR: + printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n"); + return -ENODEV; +#ifdef CONFIG_NETDEVICES + case IIOCNETAIF: + /* Add a network-interface */ + if (arg) { + if (copy_from_user(name, (char *) arg, sizeof(name))) + return -EFAULT; + s = name; + } else { + s = NULL; + } + ret = down_interruptible(&dev->sem); + if( ret ) return ret; + if ((s = isdn_net_new(s, NULL))) { + if (copy_to_user((char *) arg, s, strlen(s) + 1)){ + ret = -EFAULT; + } else { + ret = 0; + } + } else + ret = -ENODEV; + up(&dev->sem); + return ret; + case IIOCNETASL: + /* Add a slave to a network-interface */ + if (arg) { + if (copy_from_user(bname, (char *) arg, sizeof(bname) - 1)) + return -EFAULT; + } else + return -EINVAL; + ret = down_interruptible(&dev->sem); + if( ret ) return ret; + if ((s = isdn_net_newslave(bname))) { + if (copy_to_user((char *) arg, s, strlen(s) + 1)){ + ret = -EFAULT; + } else { + ret = 0; + } + } else + ret = -ENODEV; + up(&dev->sem); + return ret; + case IIOCNETDIF: + /* Delete a network-interface */ + if (arg) { + if (copy_from_user(name, (char *) arg, sizeof(name))) + return -EFAULT; + ret = down_interruptible(&dev->sem); + if( ret ) return ret; + ret = isdn_net_rm(name); + up(&dev->sem); + return ret; + } else + return -EINVAL; + case IIOCNETSCF: + /* Set configurable parameters of a network-interface */ + if (arg) { + if (copy_from_user((char *) &cfg, (char *) arg, sizeof(cfg))) + return -EFAULT; + return isdn_net_setcfg(&cfg); + } else + return -EINVAL; + case IIOCNETGCF: + /* Get configurable parameters of a network-interface */ + if (arg) { + if (copy_from_user((char *) &cfg, (char *) arg, sizeof(cfg))) + return -EFAULT; + if (!(ret = isdn_net_getcfg(&cfg))) { + if (copy_to_user((char *) arg, (char *) &cfg, sizeof(cfg))) + return -EFAULT; + } + return ret; + } else + return -EINVAL; + case IIOCNETANM: + /* Add a phone-number to a network-interface */ + if (arg) { + if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) + return -EFAULT; + ret = down_interruptible(&dev->sem); + if( ret ) return ret; + ret = isdn_net_addphone(&phone); + up(&dev->sem); + return ret; + } else + return -EINVAL; + case IIOCNETGNM: + /* Get list of phone-numbers of a network-interface */ + if (arg) { + if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) + return -EFAULT; + ret = down_interruptible(&dev->sem); + if( ret ) return ret; + ret = isdn_net_getphones(&phone, (char *) arg); + up(&dev->sem); + return ret; + } else + return -EINVAL; + case IIOCNETDNM: + /* Delete a phone-number of a network-interface */ + if (arg) { + if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) + return -EFAULT; + ret = down_interruptible(&dev->sem); + if( ret ) return ret; + ret = isdn_net_delphone(&phone); + up(&dev->sem); + return ret; + } else + return -EINVAL; + case IIOCNETDIL: + /* Force dialing of a network-interface */ + if (arg) { + if (copy_from_user(name, (char *) arg, sizeof(name))) + return -EFAULT; + return isdn_net_force_dial(name); + } else + return -EINVAL; +#ifdef CONFIG_ISDN_PPP + case IIOCNETALN: + if (!arg) + return -EINVAL; + if (copy_from_user(name, (char *) arg, sizeof(name))) return -EFAULT; - p += ISDN_MODEM_NUMREG; - if (copy_from_user(isdn_mdm.info[i].emu.plmsn, p, ISDN_LMSNLEN)) + return isdn_ppp_dial_slave(name); + case IIOCNETDLN: + if (!arg) + return -EINVAL; + if (copy_from_user(name, (char *) arg, sizeof(name))) return -EFAULT; - p += ISDN_LMSNLEN; - if (copy_from_user(isdn_mdm.info[i].emu.pmsn, p, ISDN_MSNLEN)) + return isdn_ppp_hangup_slave(name); +#endif + case IIOCNETHUP: + /* Force hangup of a network-interface */ + if (!arg) + return -EINVAL; + if (copy_from_user(name, (char *) arg, sizeof(name))) return -EFAULT; - p += ISDN_MSNLEN; - } - return 0; - } else - return -EINVAL; - break; - case IIOCSETMAP: - case IIOCGETMAP: - /* Set/Get MSN->EAZ-Mapping for a driver */ - if (arg) { - - if (copy_from_user((char *) &iocts, - (char *) arg, - sizeof(isdn_ioctl_struct))) - return -EFAULT; - drvidx = isdn_drv_lookup(iocts.drvid); - if (drvidx == -1) - return -ENODEV; - if (cmd == IIOCSETMAP) { - int loop = 1; - - p = (char *) iocts.arg; - i = 0; - while (loop) { - int j = 0; - - while (1) { - if ((ret = get_user(bname[j], p++))) - return ret; - switch (bname[j]) { - case '\0': - loop = 0; - /* Fall through */ - case ',': - bname[j] = '\0'; - strcpy(drivers[drvidx]->msn2eaz[i], bname); - j = ISDN_MSNLEN; - break; - default: - j++; - } - if (j >= ISDN_MSNLEN) - break; + return isdn_net_force_hangup(name); + break; +#endif /* CONFIG_NETDEVICES */ + case IIOCSETVER: + dev->net_verbose = arg; + printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose); + return 0; + case IIOCSETGST: + if (arg) + dev->global_flags |= ISDN_GLOBAL_STOPPED; + else + dev->global_flags &= ~ISDN_GLOBAL_STOPPED; + printk(KERN_INFO "isdn: Global Mode %s\n", + (dev->global_flags & ISDN_GLOBAL_STOPPED) ? "stopped" : "running"); + return 0; + case IIOCSETBRJ: + drvidx = -1; + if (arg) { + int i; + char *p; + if (copy_from_user((char *) &iocts, (char *) arg, + sizeof(isdn_ioctl_struct))) + return -EFAULT; + if (strlen(iocts.drvid)) { + if ((p = strchr(iocts.drvid, ','))) + *p = 0; + drvidx = -1; + for (i = 0; i < ISDN_MAX_DRIVERS; i++) + if (!(strcmp(dev->drvid[i], iocts.drvid))) { + drvidx = i; + break; + } } - if (++i > 9) - break; } - } else { - p = (char *) iocts.arg; - for (i = 0; i < 10; i++) { - sprintf(bname, "%s%s", - strlen(drivers[drvidx]->msn2eaz[i]) ? - drivers[drvidx]->msn2eaz[i] : "_", - (i < 9) ? "," : "\0"); - if (copy_to_user(p, bname, strlen(bname) + 1)) + if (drvidx == -1) + return -ENODEV; + if (iocts.arg) + dev->drv[drvidx]->flags |= DRV_FLAG_REJBUS; + else + dev->drv[drvidx]->flags &= ~DRV_FLAG_REJBUS; + return 0; + case IIOCSIGPRF: + dev->profd = current; + return 0; + break; + case IIOCGETPRF: + /* Get all Modem-Profiles */ + if (arg) { + char *p = (char *) arg; + int i; + + if ((ret = verify_area(VERIFY_WRITE, (void *) arg, + (ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN) + * ISDN_MAX_CHANNELS))) + return ret; + + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + if (copy_to_user(p, dev->mdm.info[i].emu.profile, + ISDN_MODEM_NUMREG)) + return -EFAULT; + p += ISDN_MODEM_NUMREG; + if (copy_to_user(p, dev->mdm.info[i].emu.pmsn, ISDN_MSNLEN)) + return -EFAULT; + p += ISDN_MSNLEN; + if (copy_to_user(p, dev->mdm.info[i].emu.plmsn, ISDN_LMSNLEN)) + return -EFAULT; + p += ISDN_LMSNLEN; + } + return (ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN) * ISDN_MAX_CHANNELS; + } else + return -EINVAL; + break; + case IIOCSETPRF: + /* Set all Modem-Profiles */ + if (arg) { + char *p = (char *) arg; + int i; + + if ((ret = verify_area(VERIFY_READ, (void *) arg, + (ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN) + * ISDN_MAX_CHANNELS))) + return ret; + + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + if (copy_from_user(dev->mdm.info[i].emu.profile, p, + ISDN_MODEM_NUMREG)) + return -EFAULT; + p += ISDN_MODEM_NUMREG; + if (copy_from_user(dev->mdm.info[i].emu.plmsn, p, ISDN_LMSNLEN)) + return -EFAULT; + p += ISDN_LMSNLEN; + if (copy_from_user(dev->mdm.info[i].emu.pmsn, p, ISDN_MSNLEN)) + return -EFAULT; + p += ISDN_MSNLEN; + } + return 0; + } else + return -EINVAL; + break; + case IIOCSETMAP: + case IIOCGETMAP: + /* Set/Get MSN->EAZ-Mapping for a driver */ + if (arg) { + + if (copy_from_user((char *) &iocts, + (char *) arg, + sizeof(isdn_ioctl_struct))) return -EFAULT; - p += strlen(bname); - } - } - return 0; - } else - return -EINVAL; - case IIOCDBGVAR: - if (arg) { - if (copy_to_user((char *) arg, (char *) &isdndev, sizeof(ulong))) - return -EFAULT; - return 0; - } else - return -EINVAL; - break; - default: - if ((cmd & IIOCDRVCTL) == IIOCDRVCTL) - cmd = ((cmd >> _IOC_NRSHIFT) & _IOC_NRMASK) & ISDN_DRVIOCTL_MASK; - else - return -EINVAL; - if (arg) { - if (copy_from_user((char *) &iocts, (char *) arg, sizeof(isdn_ioctl_struct))) - return -EFAULT; - drvidx = isdn_drv_lookup(iocts.drvid); - if (drvidx == -1) - return -ENODEV; - if ((ret = verify_area(VERIFY_WRITE, (void *) arg, - sizeof(isdn_ioctl_struct)))) - return ret; - c.driver = drvidx; - c.command = ISDN_CMD_IOCTL; - c.arg = cmd; - memcpy(c.parm.num, (char *) &iocts.arg, sizeof(ulong)); - ret = __drv_command(drivers[drvidx], &c); - memcpy((char *) &iocts.arg, c.parm.num, sizeof(ulong)); - if (copy_to_user((char *) arg, &iocts, sizeof(isdn_ioctl_struct))) - return -EFAULT; - return ret; - } else - return -EINVAL; + if (strlen(iocts.drvid)) { + drvidx = -1; + for (i = 0; i < ISDN_MAX_DRIVERS; i++) + if (!(strcmp(dev->drvid[i], iocts.drvid))) { + drvidx = i; + break; + } + } else + drvidx = 0; + if (drvidx == -1) + return -ENODEV; + if (cmd == IIOCSETMAP) { + int loop = 1; + + p = (char *) iocts.arg; + i = 0; + while (loop) { + int j = 0; + + while (1) { + if ((ret = verify_area(VERIFY_READ, p, 1))) + return ret; + get_user(bname[j], p++); + switch (bname[j]) { + case '\0': + loop = 0; + /* Fall through */ + case ',': + bname[j] = '\0'; + strcpy(dev->drv[drvidx]->msn2eaz[i], bname); + j = ISDN_MSNLEN; + break; + default: + j++; + } + if (j >= ISDN_MSNLEN) + break; + } + if (++i > 9) + break; + } + } else { + p = (char *) iocts.arg; + for (i = 0; i < 10; i++) { + sprintf(bname, "%s%s", + strlen(dev->drv[drvidx]->msn2eaz[i]) ? + dev->drv[drvidx]->msn2eaz[i] : "_", + (i < 9) ? "," : "\0"); + if (copy_to_user(p, bname, strlen(bname) + 1)) + return -EFAULT; + p += strlen(bname); + } + } + return 0; + } else + return -EINVAL; + case IIOCDBGVAR: + if (arg) { + if (copy_to_user((char *) arg, (char *) &dev, sizeof(ulong))) + return -EFAULT; + return 0; + } else + return -EINVAL; + break; + default: + if ((cmd & IIOCDRVCTL) == IIOCDRVCTL) + cmd = ((cmd >> _IOC_NRSHIFT) & _IOC_NRMASK) & ISDN_DRVIOCTL_MASK; + else + return -EINVAL; + if (arg) { + int i; + char *p; + if (copy_from_user((char *) &iocts, (char *) arg, sizeof(isdn_ioctl_struct))) + return -EFAULT; + if (strlen(iocts.drvid)) { + if ((p = strchr(iocts.drvid, ','))) + *p = 0; + drvidx = -1; + for (i = 0; i < ISDN_MAX_DRIVERS; i++) + if (!(strcmp(dev->drvid[i], iocts.drvid))) { + drvidx = i; + break; + } + } else + drvidx = 0; + if (drvidx == -1) + return -ENODEV; + if ((ret = verify_area(VERIFY_WRITE, (void *) arg, + sizeof(isdn_ioctl_struct)))) + return ret; + c.driver = drvidx; + c.command = ISDN_CMD_IOCTL; + c.arg = cmd; + memcpy(c.parm.num, (char *) &iocts.arg, sizeof(ulong)); + ret = isdn_command(&c); + memcpy((char *) &iocts.arg, c.parm.num, sizeof(ulong)); + if (copy_to_user((char *) arg, &iocts, sizeof(isdn_ioctl_struct))) + return -EFAULT; + return ret; + } else + return -EINVAL; + } } -#undef iocts +#ifdef CONFIG_ISDN_PPP + if (minor <= ISDN_MINOR_PPPMAX) + return (isdn_ppp_ioctl(minor - ISDN_MINOR_PPP, file, cmd, arg)); +#endif + return -ENODEV; + +#undef name #undef bname +#undef iocts +#undef phone +#undef cfg } -static struct file_operations isdn_ctrl_fops = -{ - .owner = THIS_MODULE, - .llseek = no_llseek, - .read = isdn_ctrl_read, - .write = isdn_ctrl_write, - .poll = isdn_ctrl_poll, - .ioctl = isdn_ctrl_ioctl, - .open = isdn_ctrl_open, - .release = isdn_ctrl_release, -}; - - /* - * file_operations for major 45, /dev/isdn* - * stolen from drivers/char/misc.c + * Open the device code. */ - static int -isdn_open(struct inode * inode, struct file * file) +isdn_open(struct inode *ino, struct file *filep) { - int minor = iminor(inode); - int err = -ENODEV; - struct file_operations *old_fops, *new_fops = NULL; - - if (minor >= ISDN_MINOR_CTRL && minor <= ISDN_MINOR_CTRLMAX) - new_fops = fops_get(&isdn_ctrl_fops); + uint minor = MINOR(ino->i_rdev); + int drvidx; + int chidx; + int retval = -ENODEV; + + + if (minor == ISDN_MINOR_STATUS) { + infostruct *p; + + if ((p = kmalloc(sizeof(infostruct), GFP_KERNEL))) { + p->next = (char *) dev->infochain; + p->private = (char *) &(filep->private_data); + dev->infochain = p; + /* At opening we allow a single update */ + filep->private_data = (char *) 1; + retval = 0; + goto out; + } else { + retval = -ENOMEM; + goto out; + } + } + if (!dev->channels) + goto out; + if (minor <= ISDN_MINOR_BMAX) { + printk(KERN_WARNING "isdn_open minor %d obsolete!\n", minor); + drvidx = isdn_minor2drv(minor); + if (drvidx < 0) + goto out; + chidx = isdn_minor2chan(minor); + if (!(dev->drv[drvidx]->flags & DRV_FLAG_RUNNING)) + goto out; + if (!(dev->drv[drvidx]->online & (1 << chidx))) + goto out; + isdn_lock_drivers(); + retval = 0; + goto out; + } + if (minor <= ISDN_MINOR_CTRLMAX) { + drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); + if (drvidx < 0) + goto out; + isdn_lock_drivers(); + retval = 0; + goto out; + } #ifdef CONFIG_ISDN_PPP - else if (minor >= ISDN_MINOR_PPP && minor <= ISDN_MINOR_PPPMAX) - new_fops = fops_get(&isdn_ppp_fops); + if (minor <= ISDN_MINOR_PPPMAX) { + retval = isdn_ppp_open(minor - ISDN_MINOR_PPP, filep); + if (retval == 0) + isdn_lock_drivers(); + goto out; + } #endif - else if (minor == ISDN_MINOR_STATUS) - new_fops = fops_get(&isdn_status_fops); + out: + return retval; +} - if (!new_fops) - goto out; +static int +isdn_close(struct inode *ino, struct file *filep) +{ + uint minor = MINOR(ino->i_rdev); - err = 0; - old_fops = file->f_op; - file->f_op = new_fops; - if (file->f_op->open) { - err = file->f_op->open(inode,file); - if (err) { - fops_put(file->f_op); - file->f_op = fops_get(old_fops); + lock_kernel(); + if (minor == ISDN_MINOR_STATUS) { + infostruct *p = dev->infochain; + infostruct *q = NULL; + + while (p) { + if (p->private == (char *) &(filep->private_data)) { + if (q) + q->next = p->next; + else + dev->infochain = (infostruct *) (p->next); + kfree(p); + goto out; + } + q = p; + p = (infostruct *) (p->next); } + printk(KERN_WARNING "isdn: No private data while closing isdnctrl\n"); + goto out; } - fops_put(old_fops); - + isdn_unlock_drivers(); + if (minor <= ISDN_MINOR_BMAX) + goto out; + if (minor <= ISDN_MINOR_CTRLMAX) { + if (dev->profd == current) + dev->profd = NULL; + goto out; + } +#ifdef CONFIG_ISDN_PPP + if (minor <= ISDN_MINOR_PPPMAX) + isdn_ppp_release(minor - ISDN_MINOR_PPP, filep); +#endif + out: - return err; + unlock_kernel(); + return 0; } static struct file_operations isdn_fops = { - .owner = THIS_MODULE, - .open = isdn_open, + owner: THIS_MODULE, + llseek: no_llseek, + read: isdn_read, + write: isdn_write, + poll: isdn_poll, + ioctl: isdn_ioctl, + open: isdn_open, + release: isdn_close, }; char * isdn_map_eaz2msn(char *msn, int di) { - struct isdn_driver *this = drivers[di]; + isdn_driver_t *this = dev->drv[di]; int i; if (strlen(msn) == 1) { @@ -1841,118 +1736,281 @@ * Find an unused ISDN-channel, whose feature-flags match the * given L2- and L3-protocols. */ -struct isdn_slot * -isdn_get_free_slot(int usage, int l2_proto, int l3_proto, - int pre_dev, int pre_chan, char *msn) -{ - struct isdn_driver *drv; - struct isdn_slot *slot; - int di, ch; - unsigned long flags; - unsigned long features; - - features = ((1 << l2_proto) | (0x10000 << l3_proto)); - - for (di = 0; di < ISDN_MAX_DRIVERS; di++) { - if (pre_dev >= 0 && pre_dev != di) - continue; - - drv = get_drv_by_nr(di); - if (!drv) - continue; - - if (drv->fi.state != ST_DRV_RUNNING) - goto put; +#define L2V (~(ISDN_FEATURE_L2_V11096|ISDN_FEATURE_L2_V11019|ISDN_FEATURE_L2_V11038)) - if ((drv->features & features) != features) - goto put; - - spin_lock_irqsave(&drv->lock, flags); - for (ch = 0; ch < drv->channels; ch++) { - if (pre_chan >= 0 && pre_chan != ch) - continue; - - slot = &drv->slots[ch]; +/* + * This function must be called with holding the dev->lock. + */ +int +isdn_get_free_channel(int usage, int l2_proto, int l3_proto, int pre_dev + ,int pre_chan, char *msn) +{ + int i; + ulong features; + ulong vfeatures; - if (!USG_NONE(slot->usage)) + features = ((1 << l2_proto) | (0x10000 << l3_proto)); + vfeatures = (((1 << l2_proto) | (0x10000 << l3_proto)) & + ~(ISDN_FEATURE_L2_V11096|ISDN_FEATURE_L2_V11019|ISDN_FEATURE_L2_V11038)); + /* If Layer-2 protocol is V.110, accept drivers with + * transparent feature even if these don't support V.110 + * because we can emulate this in linklevel. + */ + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if (USG_NONE(dev->usage[i]) && + (dev->drvmap[i] != -1)) { + int d = dev->drvmap[i]; + if ((dev->usage[i] & ISDN_USAGE_EXCLUSIVE) && + ((pre_dev != d) || (pre_chan != dev->chanmap[i]))) continue; - - if (slot->usage & ISDN_USAGE_DISABLED) + if (!strcmp(isdn_map_eaz2msn(msn, d), "-")) continue; + if (dev->usage[i] & ISDN_USAGE_DISABLED) + continue; /* usage not allowed */ + if (dev->drv[d]->flags & DRV_FLAG_RUNNING) { + if (((dev->drv[d]->interface->features & features) == features) || + (((dev->drv[d]->interface->features & vfeatures) == vfeatures) && + (dev->drv[d]->interface->features & ISDN_FEATURE_L2_TRANS))) { + if ((pre_dev < 0) || (pre_chan < 0)) { + dev->usage[i] &= ISDN_USAGE_EXCLUSIVE; + dev->usage[i] |= usage; + isdn_info_update(); + return i; + } else { + if ((pre_dev == d) && (pre_chan == dev->chanmap[i])) { + dev->usage[i] &= ISDN_USAGE_EXCLUSIVE; + dev->usage[i] |= usage; + isdn_info_update(); + return i; + } + } + } + } + } + return -1; +} - if (strcmp(isdn_map_eaz2msn(msn, drv->di), "-") == 0) - continue; +/* + * Set state of ISDN-channel to 'unused' + */ +void +isdn_free_channel(int di, int ch, int usage) +{ + int i; - goto found; - + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if (((!usage) || ((dev->usage[i] & ISDN_USAGE_MASK) == usage)) && + (dev->drvmap[i] == di) && + (dev->chanmap[i] == ch)) { + dev->usage[i] &= (ISDN_USAGE_NONE | ISDN_USAGE_EXCLUSIVE); + strcpy(dev->num[i], "???"); + dev->ibytes[i] = 0; + dev->obytes[i] = 0; +// 20.10.99 JIM, try to reinitialize v110 ! + dev->v110emu[i] = 0; + atomic_set(&(dev->v110use[i]), 0); + isdn_v110_close(dev->v110[i]); + dev->v110[i] = NULL; +// 20.10.99 JIM, try to reinitialize v110 ! + isdn_info_update(); + skb_queue_purge(&dev->drv[di]->rpqueue[ch]); } - spin_unlock_irqrestore(&drv->lock, flags); - - put: - put_drv(drv); - } - return NULL; +} - found: - slot->usage = usage; - spin_unlock_irqrestore(&drv->lock, flags); +/* + * Cancel Exclusive-Flag for ISDN-channel + */ +void +isdn_unexclusive_channel(int di, int ch) +{ + int i; - isdn_info_update(); - fsm_event(&slot->fi, EV_SLOT_BIND, NULL); - return slot; + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if ((dev->drvmap[i] == di) && + (dev->chanmap[i] == ch)) { + dev->usage[i] &= ~ISDN_USAGE_EXCLUSIVE; + isdn_info_update(); + return; + } } /* - * Set state of ISDN-channel to 'unused' + * writebuf replacement for SKB_ABLE drivers */ -void -isdn_slot_free(struct isdn_slot *slot) +static int +isdn_writebuf_stub(int drvidx, int chan, const u_char * buf, int len, + int user) { - fsm_event(&slot->fi, EV_SLOT_UNBIND, NULL); + int ret; + int hl = dev->drv[drvidx]->interface->hl_hdrlen; + struct sk_buff *skb = alloc_skb(hl + len, GFP_ATOMIC); + + if (!skb) + return 0; + skb_reserve(skb, hl); + if (user) + copy_from_user(skb_put(skb, len), buf, len); + else + memcpy(skb_put(skb, len), buf, len); + ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, 1, skb); + if (ret <= 0) + dev_kfree_skb(skb); + if (ret > 0) + dev->obytes[isdn_dc2minor(drvidx, chan)] += ret; + return ret; } /* * Return: length of data on success, -ERRcode on failure. */ int -isdn_slot_write(struct isdn_slot *slot, struct sk_buff *skb) +isdn_writebuf_skb_stub(int drvidx, int chan, int ack, struct sk_buff *skb) { - return fsm_event(&slot->fi, EV_DATA_REQ, skb); + int ret; + struct sk_buff *nskb = NULL; + int v110_ret = skb->len; + int idx = isdn_dc2minor(drvidx, chan); + + if (dev->v110[idx]) { + atomic_inc(&dev->v110use[idx]); + nskb = isdn_v110_encode(dev->v110[idx], skb); + atomic_dec(&dev->v110use[idx]); + if (!nskb) + return 0; + v110_ret = *((int *)nskb->data); + skb_pull(nskb, sizeof(int)); + if (!nskb->len) { + dev_kfree_skb(nskb); + return v110_ret; + } + /* V.110 must always be acknowledged */ + ack = 1; + ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, ack, nskb); + } else { + int hl = dev->drv[drvidx]->interface->hl_hdrlen; + + if( skb_headroom(skb) < hl ){ + /* + * This should only occur when new HL driver with + * increased hl_hdrlen was loaded after netdevice + * was created and connected to the new driver. + * + * The V.110 branch (re-allocates on its own) does + * not need this + */ + struct sk_buff * skb_tmp; + + skb_tmp = skb_realloc_headroom(skb, hl); + printk(KERN_DEBUG "isdn_writebuf_skb_stub: reallocating headroom%s\n", skb_tmp ? "" : " failed"); + if (!skb_tmp) return -ENOMEM; /* 0 better? */ + ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, ack, skb_tmp); + if( ret > 0 ){ + dev_kfree_skb(skb); + } else { + dev_kfree_skb(skb_tmp); + } + } else { + ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, ack, skb); + } + } + if (ret > 0) { + dev->obytes[idx] += ret; + if (dev->v110[idx]) { + atomic_inc(&dev->v110use[idx]); + dev->v110[idx]->skbuser++; + atomic_dec(&dev->v110use[idx]); + /* For V.110 return unencoded data length */ + ret = v110_ret; + /* if the complete frame was send we free the skb; + if not upper function will requeue the skb */ + if (ret == skb->len) + dev_kfree_skb(skb); + } + } else + if (dev->v110[idx]) + dev_kfree_skb(nskb); + return ret; } -static int -isdn_add_channels(struct isdn_driver *drv, int n) +int +isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding) { - struct isdn_slot *slot; - int ch; + int j, k, m; - if (n < 1) - return 0; + init_waitqueue_head(&d->st_waitq); + if (d->flags & DRV_FLAG_RUNNING) + return -1; + if (n < 1) return 0; - if (isdndev->channels + n > ISDN_MAX_CHANNELS) { + m = (adding) ? d->channels + n : n; + + if (dev->channels + n > ISDN_MAX_CHANNELS) { printk(KERN_WARNING "register_isdn: Max. %d channels supported\n", ISDN_MAX_CHANNELS); - return -EBUSY; + return -1; + } + + if ((adding) && (d->rcverr)) + kfree(d->rcverr); + if (!(d->rcverr = kmalloc(sizeof(int) * m, GFP_ATOMIC))) { + printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n"); + return -1; + } + memset((char *) d->rcverr, 0, sizeof(int) * m); + + if ((adding) && (d->rcvcount)) + kfree(d->rcvcount); + if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_ATOMIC))) { + printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n"); + if (!adding) kfree(d->rcverr); + return -1; + } + memset((char *) d->rcvcount, 0, sizeof(int) * m); + + if ((adding) && (d->rpqueue)) { + for (j = 0; j < d->channels; j++) + skb_queue_purge(&d->rpqueue[j]); + kfree(d->rpqueue); + } + if (!(d->rpqueue = kmalloc(sizeof(struct sk_buff_head) * m, GFP_ATOMIC))) { + printk(KERN_WARNING "register_isdn: Could not alloc rpqueue\n"); + if (!adding) { + kfree(d->rcvcount); + kfree(d->rcverr); + } + return -1; } - isdndev->channels += n; - drv->slots = kmalloc(sizeof(struct isdn_slot) * n, GFP_ATOMIC); - if (!drv->slots) - return -ENOMEM; - memset(drv->slots, 0, sizeof(struct isdn_slot) * n); - for (ch = 0; ch < n; ch++) { - slot = drv->slots + ch; - - slot->ch = ch; - slot->di = drv->di; - slot->drv = drv; - strcpy(slot->num, "???"); - slot->fi.fsm = &slot_fsm; - slot->fi.state = ST_SLOT_NULL; - slot->fi.debug = 1; - slot->fi.userdata = slot; - slot->fi.printdebug = slot_debug; + for (j = 0; j < m; j++) { + skb_queue_head_init(&d->rpqueue[j]); } - drv->channels = n; + + if ((adding) && (d->rcv_waitq)) + kfree(d->rcv_waitq); + d->rcv_waitq = kmalloc(sizeof(wait_queue_head_t) * 2 * m, GFP_ATOMIC); + if (!d->rcv_waitq) { + printk(KERN_WARNING "register_isdn: Could not alloc rcv_waitq\n"); + if (!adding) { + kfree(d->rpqueue); + kfree(d->rcvcount); + kfree(d->rcverr); + } + return -1; + } + d->snd_waitq = d->rcv_waitq + m; + for (j = 0; j < m; j++) { + init_waitqueue_head(&d->rcv_waitq[j]); + init_waitqueue_head(&d->snd_waitq[j]); + } + + dev->channels += n; + for (j = d->channels; j < m; j++) + for (k = 0; k < ISDN_MAX_CHANNELS; k++) + if (dev->chanmap[k] < 0) { + dev->chanmap[k] = j; + dev->drvmap[k] = drvidx; + break; + } + d->channels = m; return 0; } @@ -1960,63 +2018,68 @@ * Low-level-driver registration */ -#if defined(CONFIG_ISDN_DIVERSION) || defined(CONFIG_ISDN_DIVERSION_MODULE) +static void +set_global_features(void) +{ + int drvidx; + + dev->global_features = 0; + for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) { + if (!dev->drv[drvidx]) + continue; + if (dev->drv[drvidx]->interface) + dev->global_features |= dev->drv[drvidx]->interface->features; + } +} + +#ifdef CONFIG_ISDN_DIVERSION -/* - * map_drvname - */ static char *map_drvname(int di) { - if ((di < 0) || (di >= ISDN_MAX_DRIVERS)) - return(NULL); - return(isdndev->drvid[di]); /* driver name */ -} + if ((di < 0) || (di >= ISDN_MAX_DRIVERS)) + return(NULL); + return(dev->drvid[di]); /* driver name */ +} /* map_drvname */ -/* - * map_namedrv - */ static int map_namedrv(char *id) -{ - int i; +{ int i; - for (i = 0; i < ISDN_MAX_DRIVERS; i++) { - if (!strcmp(dev->drvid[i],id)) - return(i); - } - return(-1); -} + for (i = 0; i < ISDN_MAX_DRIVERS; i++) + { if (!strcmp(dev->drvid[i],id)) + return(i); + } + return(-1); +} /* map_namedrv */ -/* - * DIVERT_REG_NAME - */ int DIVERT_REG_NAME(isdn_divert_if *i_div) { - if (i_div->if_magic != DIVERT_IF_MAGIC) - return(DIVERT_VER_ERR); - switch (i_div->cmd) { - case DIVERT_CMD_REL: - if (divert_if != i_div) - return(DIVERT_REL_ERR); - divert_if = NULL; /* free interface */ - MOD_DEC_USE_COUNT; - return(DIVERT_NO_ERR); - case DIVERT_CMD_REG: - if (divert_if) - return(DIVERT_REG_ERR); - i_div->ll_cmd = isdn_command; /* set command function */ - i_div->drv_to_name = map_drvname; - i_div->name_to_drv = map_namedrv; - MOD_INC_USE_COUNT; - divert_if = i_div; /* remember interface */ - return(DIVERT_NO_ERR); - default: - return(DIVERT_CMD_ERR); - } -} + if (i_div->if_magic != DIVERT_IF_MAGIC) + return(DIVERT_VER_ERR); + switch (i_div->cmd) + { + case DIVERT_CMD_REL: + if (divert_if != i_div) + return(DIVERT_REL_ERR); + divert_if = NULL; /* free interface */ + return(DIVERT_NO_ERR); + + case DIVERT_CMD_REG: + if (divert_if) + return(DIVERT_REG_ERR); + i_div->ll_cmd = isdn_command; /* set command function */ + i_div->drv_to_name = map_drvname; + i_div->name_to_drv = map_namedrv; + divert_if = i_div; /* remember interface */ + return(DIVERT_NO_ERR); + + default: + return(DIVERT_CMD_ERR); + } +} /* DIVERT_REG_NAME */ EXPORT_SYMBOL(DIVERT_REG_NAME); -#endif +#endif /* CONFIG_ISDN_DIVERSION */ EXPORT_SYMBOL(register_isdn); @@ -2026,159 +2089,80 @@ #endif int -isdn_slot_maxbufsize(struct isdn_slot *slot) -{ - return slot->drv->maxbufsize; -} - -int -isdn_slot_hdrlen(struct isdn_slot *slot) -{ - return slot->drv->interface->hl_hdrlen; -} - -char * -isdn_slot_map_eaz2msn(struct isdn_slot *slot, char *msn) -{ - return isdn_map_eaz2msn(msn, slot->di); -} - -int -isdn_slot_command(struct isdn_slot *slot, int cmd, isdn_ctrl *ctrl) +register_isdn(isdn_if * i) { - ctrl->command = cmd; - ctrl->driver = slot->di; + isdn_driver_t *d; + int j; + ulong flags; + int drvidx; - switch (cmd) { - case ISDN_CMD_SETL2: - case ISDN_CMD_SETL3: - case ISDN_CMD_PROT_IO: - ctrl->arg &= ~0xff; ctrl->arg |= slot->ch; - break; - case ISDN_CMD_DIAL: - if (isdndev->global_flags & ISDN_GLOBAL_STOPPED) - return -EBUSY; - - /* fall through */ - default: - ctrl->arg = slot->ch; - break; - } - switch (cmd) { - case ISDN_CMD_CLREAZ: - return fsm_event(&slot->fi, EV_CMD_CLREAZ, ctrl); - case ISDN_CMD_SETEAZ: - return fsm_event(&slot->fi, EV_CMD_SETEAZ, ctrl); - case ISDN_CMD_SETL2: - return fsm_event(&slot->fi, EV_CMD_SETL2, ctrl); - case ISDN_CMD_SETL3: - return fsm_event(&slot->fi, EV_CMD_SETL3, ctrl); - case ISDN_CMD_DIAL: - return fsm_event(&slot->fi, EV_CMD_DIAL, ctrl); - case ISDN_CMD_ACCEPTD: - return fsm_event(&slot->fi, EV_CMD_ACCEPTD, ctrl); - case ISDN_CMD_ACCEPTB: - return fsm_event(&slot->fi, EV_CMD_ACCEPTB, ctrl); - case ISDN_CMD_HANGUP: - return fsm_event(&slot->fi, EV_CMD_HANGUP, ctrl); + if (dev->drivers >= ISDN_MAX_DRIVERS) { + printk(KERN_WARNING "register_isdn: Max. %d drivers supported\n", + ISDN_MAX_DRIVERS); + return 0; } - HERE; - return -1; -} - -int -isdn_slot_dial(struct isdn_slot *slot, struct dial_info *dial) -{ - isdn_ctrl cmd; - int retval; - char *msn = isdn_slot_map_eaz2msn(slot, dial->msn); - - /* check for DOV */ - if (dial->si1 == 7 && tolower(dial->phone[0]) == 'v') { /* DOV call */ - dial->si1 = 1; - dial->phone++; /* skip v/V */ + if (!i->writebuf_skb) { + printk(KERN_WARNING "register_isdn: No write routine given.\n"); + return 0; } + if (!(d = kmalloc(sizeof(isdn_driver_t), GFP_KERNEL))) { + printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n"); + return 0; + } + memset((char *) d, 0, sizeof(isdn_driver_t)); - strcpy(slot->num, dial->phone); - slot->usage |= ISDN_USAGE_OUTGOING; - isdn_info_update(); - - retval = isdn_slot_command(slot, ISDN_CMD_CLREAZ, &cmd); - if (retval) - return retval; - - strcpy(cmd.parm.num, msn); - retval = isdn_slot_command(slot, ISDN_CMD_SETEAZ, &cmd); - - cmd.arg = dial->l2_proto << 8; - cmd.parm.fax = dial->fax; - retval = isdn_slot_command(slot, ISDN_CMD_SETL2, &cmd); - if (retval) - return retval; - - cmd.arg = dial->l3_proto << 8; - retval = isdn_slot_command(slot, ISDN_CMD_SETL3, &cmd); - if (retval) - return retval; - - cmd.parm.setup.si1 = dial->si1; - cmd.parm.setup.si2 = dial->si2; - strcpy(cmd.parm.setup.eazmsn, msn); - strcpy(cmd.parm.setup.phone, dial->phone); - - printk(KERN_INFO "ISDN: Dialing %s -> %s (SI %d/%d) (B %d/%d)\n", - cmd.parm.setup.eazmsn, cmd.parm.setup.phone, - cmd.parm.setup.si1, cmd.parm.setup.si2, - dial->l2_proto, dial->l3_proto); - - return isdn_slot_command(slot, ISDN_CMD_DIAL, &cmd); -} - -int -isdn_hard_header_len(void) -{ - int drvidx; - int max = 0; - - for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) { - if (drivers[drvidx] && - max < drivers[drvidx]->interface->hl_hdrlen) { - max = drivers[drvidx]->interface->hl_hdrlen; - } + d->maxbufsize = i->maxbufsize; + d->pktcount = 0; + d->stavail = 0; + d->flags = DRV_FLAG_LOADED; + d->online = 0; + d->interface = i; + d->channels = 0; + spin_lock_irqsave(&dev->lock, flags); + for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) + if (!dev->drv[drvidx]) + break; + if (isdn_add_channels(d, drvidx, i->channels, 0)) { + spin_unlock_irqrestore(&dev->lock, flags); + kfree(d); + return 0; } - return max; + i->channels = drvidx; + i->rcvcallb_skb = isdn_receive_skb_callback; + i->statcallb = isdn_status_callback; + if (!strlen(i->id)) + sprintf(i->id, "line%d", drvidx); + for (j = 0; j < drvidx; j++) + if (!strcmp(i->id, dev->drvid[j])) + sprintf(i->id, "line%d", drvidx); + dev->drv[drvidx] = d; + strcpy(dev->drvid[drvidx], i->id); + isdn_info_update(); + dev->drivers++; + set_global_features(); + spin_unlock_irqrestore(&dev->lock, flags); + return 1; } -static void isdn_init_devfs(void) -{ - devfs_mk_dir("isdn"); +/* + ***************************************************************************** + * And now the modules code. + ***************************************************************************** + */ -#ifdef CONFIG_ISDN_PPP +static char * +isdn_getrev(const char *revision) { - int i; - - for (i = 0; i < ISDN_MAX_CHANNELS; i++) - devfs_mk_cdev(MKDEV(ISDN_MAJOR, ISDN_MINOR_PPP + i), - 0600 | S_IFCHR, "isdn/ippp%d", i); -} -#endif - - devfs_mk_cdev(MKDEV(ISDN_MAJOR, ISDN_MINOR_STATUS), - 0600 | S_IFCHR, "isdn/isdninfo"); - devfs_mk_cdev(MKDEV(ISDN_MAJOR, ISDN_MINOR_CTRL), - 0600 | S_IFCHR, "isdn/isdnctrl"); -} + char *rev; + char *p; -static void isdn_cleanup_devfs(void) -{ -#ifdef CONFIG_ISDN_PPP - int i; - for (i = 0; i < ISDN_MAX_CHANNELS; i++) - devfs_remove("isdn/ippp%d", i); -#endif - devfs_remove("isdn/isdninfo"); - devfs_remove("isdn/isdnctrl"); - devfs_remove("isdn"); + if ((p = strchr(revision, ':'))) { + rev = p + 2; + p = strchr(rev, '$'); + *--p = 0; + } else + rev = "???"; + return rev; } /* @@ -2186,64 +2170,72 @@ */ static int __init isdn_init(void) { - int retval; - - retval = fsm_new(&slot_fsm); - if (retval) - goto err; - - retval = fsm_new(&drv_fsm); - if (retval) - goto err_slot_fsm; - - isdndev = vmalloc(sizeof(*isdndev)); - if (!isdndev) { - retval = -ENOMEM; - goto err_drv_fsm; - } - memset(isdndev, 0, sizeof(*isdndev)); - init_MUTEX(&isdndev->sem); - init_waitqueue_head(&isdndev->info_waitq); + int i; + char tmprev[50]; - retval = register_chrdev(ISDN_MAJOR, "isdn", &isdn_fops); - if (retval) { + if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) { + printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); + return -EIO; + } + memset((char *) dev, 0, sizeof(isdn_dev)); + init_timer(&dev->timer); + dev->timer.function = isdn_timer_funct; + spin_lock_init(&dev->lock); + spin_lock_init(&dev->timerlock); +#ifdef MODULE + dev->owner = THIS_MODULE; +#endif + init_MUTEX(&dev->sem); + init_waitqueue_head(&dev->info_waitq); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + dev->drvmap[i] = -1; + dev->chanmap[i] = -1; + dev->m_idx[i] = -1; + strcpy(dev->num[i], "???"); + init_waitqueue_head(&dev->mdm.info[i].open_wait); + init_waitqueue_head(&dev->mdm.info[i].close_wait); + } + if (register_chrdev(ISDN_MAJOR, "isdn", &isdn_fops)) { printk(KERN_WARNING "isdn: Could not register control devices\n"); - goto err_vfree; + vfree(dev); + return -EIO; } - isdn_init_devfs(); - retval = isdn_tty_init(); - if (retval < 0) { + if ((isdn_tty_modem_init()) < 0) { printk(KERN_WARNING "isdn: Could not register tty devices\n"); - goto err_cleanup_devfs; + vfree(dev); + unregister_chrdev(ISDN_MAJOR, "isdn"); + return -EIO; } #ifdef CONFIG_ISDN_PPP - retval = isdn_ppp_init(); - if (retval < 0) { + if (isdn_ppp_init() < 0) { printk(KERN_WARNING "isdn: Could not create PPP-device-structs\n"); - goto err_tty_modem; + isdn_tty_exit(); + unregister_chrdev(ISDN_MAJOR, "isdn"); + vfree(dev); + return -EIO; } #endif /* CONFIG_ISDN_PPP */ - isdn_net_lib_init(); - printk(KERN_NOTICE "ISDN subsystem initialized\n"); - isdn_info_update(); - return 0; + strcpy(tmprev, isdn_revision); + printk(KERN_NOTICE "ISDN subsystem Rev: %s/", isdn_getrev(tmprev)); + strcpy(tmprev, isdn_tty_revision); + printk("%s/", isdn_getrev(tmprev)); + strcpy(tmprev, isdn_net_revision); + printk("%s/", isdn_getrev(tmprev)); + strcpy(tmprev, isdn_ppp_revision); + printk("%s/", isdn_getrev(tmprev)); + strcpy(tmprev, isdn_audio_revision); + printk("%s/", isdn_getrev(tmprev)); + strcpy(tmprev, isdn_v110_revision); + printk("%s", isdn_getrev(tmprev)); -#ifdef CONFIG_ISDN_PPP - err_tty_modem: - isdn_tty_exit(); +#ifdef MODULE + printk(" loaded\n"); +#else + printk("\n"); #endif - err_cleanup_devfs: - isdn_cleanup_devfs(); - unregister_chrdev(ISDN_MAJOR, "isdn"); - err_vfree: - vfree(isdndev); - err_drv_fsm: - fsm_free(&drv_fsm); - err_slot_fsm: - fsm_free(&slot_fsm); - err: - return retval; + isdn_info_update(); + return 0; } /* @@ -2254,141 +2246,17 @@ #ifdef CONFIG_ISDN_PPP isdn_ppp_cleanup(); #endif - isdn_net_lib_exit(); - + if (isdn_net_rmall() < 0) { + printk(KERN_WARNING "isdn: net-device busy, remove cancelled\n"); + return; + } isdn_tty_exit(); unregister_chrdev(ISDN_MAJOR, "isdn"); - isdn_cleanup_devfs(); - vfree(isdndev); - fsm_free(&drv_fsm); - fsm_free(&slot_fsm); + del_timer(&dev->timer); + /* call vfree with interrupts enabled, else it will hang */ + vfree(dev); + printk(KERN_NOTICE "ISDN-subsystem unloaded\n"); } module_init(isdn_init); module_exit(isdn_exit); - -static void -isdn_v110_add_features(struct isdn_driver *drv) -{ - unsigned long features = drv->features >> ISDN_FEATURE_L2_SHIFT; - - if (features & ISDN_FEATURE_L2_TRANS) - drv->features |= (ISDN_FEATURE_L2_V11096| - ISDN_FEATURE_L2_V11019| - ISDN_FEATURE_L2_V11038) << - ISDN_FEATURE_L2_SHIFT; -} - -static void -__isdn_v110_open(struct isdn_slot *slot) -{ - if (!slot->iv110.v110emu) - return; - - isdn_v110_open(slot, &slot->iv110); -} - -static void -__isdn_v110_close(struct isdn_slot *slot) -{ - if (!slot->iv110.v110emu) - return; - - isdn_v110_close(slot, &slot->iv110); -} - -static void -__isdn_v110_bsent(struct isdn_slot *slot, int pr, isdn_ctrl *c) -{ - if (!slot->iv110.v110emu) { - do_event_cb(slot, pr, c); - return; - } - isdn_v110_bsent(slot, &slot->iv110); -} - -/* - * Intercept command from Linklevel to Lowlevel. - * If layer 2 protocol is V.110 and this is not supported by current - * lowlevel-driver, use driver's transparent mode and handle V.110 in - * linklevel instead. - */ -static void -isdn_v110_setl2(struct isdn_slot *slot, isdn_ctrl *cmd) -{ - struct isdn_driver *drv = slot->drv; - - unsigned long l2prot = (cmd->arg >> 8) & 255; - unsigned long l2_feature = 1 << l2prot; - unsigned long features = drv->interface->features >> - ISDN_FEATURE_L2_SHIFT; - - switch (l2prot) { - case ISDN_PROTO_L2_V11096: - case ISDN_PROTO_L2_V11019: - case ISDN_PROTO_L2_V11038: - /* If V.110 requested, but not supported by - * HL-driver, set emulator-flag and change - * Layer-2 to transparent - */ - if (!(features & l2_feature)) { - slot->iv110.v110emu = l2prot; - cmd->arg = (cmd->arg & 255) | - (ISDN_PROTO_L2_TRANS << 8); - } else - slot->iv110.v110emu = 0; - } -} - -static int -isdn_v110_data_ind(struct isdn_slot *slot, struct sk_buff *skb) -{ - if (!slot->iv110.v110emu) - goto recv; - - skb = isdn_v110_decode(slot->iv110.v110, skb); - if (!skb) - return 0; - -recv: - if (slot->event_cb) - slot->event_cb(slot, EV_DATA_IND, skb); - return 0; -} - -static int -isdn_v110_data_req(struct isdn_slot *slot, struct sk_buff *skb) -{ - int retval, v110_ret; - struct sk_buff *nskb = NULL; - - if (!slot->iv110.v110emu) - return isdn_writebuf_skb(slot, skb); - - atomic_inc(&slot->iv110.v110use); - nskb = isdn_v110_encode(slot->iv110.v110, skb); - atomic_dec(&slot->iv110.v110use); - if (!nskb) - return -ENOMEM; - - v110_ret = *(int *)nskb->data; - skb_pull(nskb, sizeof(int)); - if (!nskb->len) { - dev_kfree_skb(nskb); - return v110_ret; - } - - retval = isdn_writebuf_skb(slot, nskb); - if (retval <= 0) { - dev_kfree_skb(nskb); - return retval; - } - dev_kfree_skb(skb); - - atomic_inc(&slot->iv110.v110use); - slot->iv110.v110->skbuser++; - atomic_dec(&slot->iv110.v110use); - - /* For V.110 return unencoded data length */ - return v110_ret; -} diff -Nru a/drivers/isdn/i4l/isdn_common.h b/drivers/isdn/i4l/isdn_common.h --- a/drivers/isdn/i4l/isdn_common.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/i4l/isdn_common.h Thu Feb 19 23:44:26 2004 @@ -1,4 +1,7 @@ -/* Linux ISDN subsystem, common used functions and debugging-switches +/* $Id: isdn_common.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * header for Linux ISDN subsystem + * common used functions and debugging-switches (linklevel). * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) * Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg @@ -9,9 +12,6 @@ * */ -#include -#include "isdn_v110.h" - #undef ISDN_DEBUG_MODEM_OPEN #undef ISDN_DEBUG_MODEM_IOCTL #undef ISDN_DEBUG_MODEM_WAITSENT @@ -21,129 +21,27 @@ #undef ISDN_DEBUG_MODEM_VOICE #undef ISDN_DEBUG_AT #undef ISDN_DEBUG_NET_DUMP -#define ISDN_DEBUG_NET_DIAL -#define ISDN_DEBUG_NET_ICALL -#define ISDN_DEBUG_STATCALLB -#define ISDN_DEBUG_COMMAND - -#ifdef ISDN_DEBUG_NET_DIAL -#define dbg_net_dial(arg...) printk(KERN_DEBUG arg) -#else -#define dbg_net_dial(arg...) do {} while (0) -#endif - -#ifdef ISDN_DEBUG_NET_ICALL -#define dbg_net_icall(arg...) printk(KERN_DEBUG arg) -#else -#define dbg_net_icall(arg...) do {} while (0) -#endif - -#ifdef ISDN_DEBUG_STATCALLB -#define dbg_statcallb(arg...) printk(KERN_DEBUG arg) -#else -#define dbg_statcallb(arg...) do {} while (0) -#endif - -#define isdn_BUG() \ -do { printk(KERN_WARNING "ISDN BUG at %s:%d\n", __FILE__, __LINE__); \ -} while(0) - -#define HERE printk("%s:%d (%s)\n", __FILE__, __LINE__, __FUNCTION__) - -extern struct list_head isdn_net_devs; +#undef ISDN_DEBUG_NET_DIAL +#undef ISDN_DEBUG_NET_ICALL /* Prototypes */ -extern void isdn_MOD_INC_USE_COUNT(void); -extern void isdn_MOD_DEC_USE_COUNT(void); extern void isdn_lock_drivers(void); extern void isdn_unlock_drivers(void); +extern void isdn_free_channel(int di, int ch, int usage); +extern void isdn_all_eaz(int di, int ch); +extern int isdn_command(isdn_ctrl *); +extern int isdn_dc2minor(int di, int ch); extern void isdn_info_update(void); extern char *isdn_map_eaz2msn(char *msn, int di); -extern int isdn_getnum(char **); -extern int isdn_msncmp( const char *, const char *); +extern void isdn_timer_ctrl(int tf, int onoff); +extern void isdn_unexclusive_channel(int di, int ch); +extern int isdn_getnum(char **); +extern int isdn_readbchan(int, int, u_char *, u_char *, int, wait_queue_head_t *); +extern int isdn_get_free_channel(int, int, int, int, int, char *); +extern int isdn_writebuf_skb_stub(int, int, int, struct sk_buff *); +extern int register_isdn(isdn_if * i); +extern int isdn_msncmp( const char *, const char *); +extern int isdn_add_channels(isdn_driver_t *, int, int, int); #if defined(ISDN_DEBUG_NET_DUMP) || defined(ISDN_DEBUG_MODEM_DUMP) extern void isdn_dumppkt(char *, u_char *, int, int); -#else -static inline void isdn_dumppkt(char *s, u_char *d, int l, int m) { } #endif - -struct isdn_slot { - int di; /* driver index */ - struct isdn_driver *drv; /* driver */ - int ch; /* channel index (per driver) */ - int usage; /* how is it used */ - char num[ISDN_MSNLEN]; /* the current phone number */ - unsigned long ibytes; /* Statistics incoming bytes */ - unsigned long obytes; /* Statistics outgoing bytes */ - struct isdn_v110 iv110; /* For V.110 */ - void *priv; /* pointer to isdn_net_dev */ - int (*event_cb)(struct isdn_slot *, int pr, void *arg); - struct fsm_inst fi; -}; - -struct dial_info { - int l2_proto; - int l3_proto; - struct T30_s *fax; - unsigned char si1; - unsigned char si2; - unsigned char *msn; - unsigned char *phone; -}; - -struct isdn_slot *isdn_get_free_slot(int, int, int, int, int, char *); -void isdn_slot_free(struct isdn_slot *); -int isdn_slot_command(struct isdn_slot *, int cmd, isdn_ctrl *); -int isdn_slot_dial(struct isdn_slot *, struct dial_info *dial); -char *isdn_slot_map_eaz2msn(struct isdn_slot *, char *msn); -int isdn_slot_write(struct isdn_slot *, struct sk_buff *); -int isdn_slot_hdrlen(struct isdn_slot *); -int isdn_slot_maxbufsize(struct isdn_slot *); -int isdn_hard_header_len(void); - -int isdn_drv_lookup(char *drvid); -char *isdn_drv_drvid(int di); - -enum { - ST_SLOT_NULL, - ST_SLOT_BOUND, - ST_SLOT_IN, - ST_SLOT_WAIT_DCONN, - ST_SLOT_DCONN, - ST_SLOT_WAIT_BCONN, - ST_SLOT_ACTIVE, - ST_SLOT_WAIT_BHUP, - ST_SLOT_WAIT_DHUP, -}; - -enum { - EV_DRV_REGISTER, - EV_STAT_RUN, - EV_STAT_STOP, - EV_STAT_UNLOAD, - EV_STAT_STAVAIL, - EV_STAT_ADDCH, - EV_STAT_ICALL, - EV_STAT_DCONN, - EV_STAT_BCONN, - EV_STAT_BHUP, - EV_STAT_DHUP, - EV_STAT_BSENT, - EV_STAT_CINF, - EV_STAT_CAUSE, - EV_STAT_DISPLAY, - EV_STAT_FAXIND, - EV_STAT_AUDIO, - EV_CMD_CLREAZ, - EV_CMD_SETEAZ, - EV_CMD_SETL2, - EV_CMD_SETL3, - EV_CMD_DIAL, - EV_CMD_ACCEPTD, - EV_CMD_ACCEPTB, - EV_CMD_HANGUP, - EV_DATA_REQ, - EV_DATA_IND, - EV_SLOT_BIND, - EV_SLOT_UNBIND, -}; diff -Nru a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c --- a/drivers/isdn/i4l/isdn_concap.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/i4l/isdn_concap.c Thu Feb 19 23:44:27 2004 @@ -1,12 +1,16 @@ -/* Linux ISDN subsystem, protocol encapsulation +/* $Id: isdn_concap.c,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * Linux ISDN subsystem, protocol encapsulation * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ /* Stuff to support the concap_proto by isdn4linux. isdn4linux - specific * stuff goes here. Stuff that depends only on the concap protocol goes to * another -- protocol specific -- source file. + * */ @@ -15,7 +19,7 @@ #include "isdn_net.h" #include #include "isdn_concap.h" -#include + /* The following set of device service operations are for encapsulation protocols that require for reliable datalink semantics. That means: @@ -35,8 +39,7 @@ */ -static int -isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb) +int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb) { struct net_device *ndev = concap -> net_dev; isdn_net_dev *nd = ((isdn_net_local *) ndev->priv)->netdev; @@ -55,8 +58,7 @@ } -static int -isdn_concap_dl_connect_req(struct concap_proto *concap) +int isdn_concap_dl_connect_req(struct concap_proto *concap) { struct net_device *ndev = concap -> net_dev; isdn_net_local *lp = (isdn_net_local *) ndev->priv; @@ -69,8 +71,7 @@ return ret; } -static int -isdn_concap_dl_disconn_req(struct concap_proto *concap) +int isdn_concap_dl_disconn_req(struct concap_proto *concap) { IX25DEBUG( "isdn_concap_dl_disconn_req: %s \n", concap -> net_dev -> name); @@ -97,8 +98,7 @@ this sourcefile does not need to include any protocol specific header files. For now: */ -struct concap_proto * -isdn_concap_new( int encap ) +struct concap_proto * isdn_concap_new( int encap ) { switch ( encap ) { case ISDN_NET_ENCAP_X25IFACE: @@ -106,146 +106,3 @@ } return NULL; } - -static int -isdn_x25_open(isdn_net_local *lp) -{ - struct net_device * dev = & lp -> netdev -> dev; - struct concap_proto * cprot = lp -> netdev -> ind_priv; - struct concap_proto * dops = lp -> inl_priv; - unsigned long flags; - - save_flags(flags); - cli(); /* Avoid glitch on writes to CMD regs */ - if( cprot -> pops && dops ) - cprot -> pops -> restart ( cprot, dev, dops ); - restore_flags(flags); - return 0; -} - -static void -isdn_x25_close(isdn_net_local *lp) -{ - struct concap_proto * cprot = lp -> netdev -> ind_priv; - - if( cprot && cprot -> pops ) cprot -> pops -> close( cprot ); -} - -static void -isdn_x25_connected(isdn_net_local *lp) -{ - struct concap_proto *cprot = lp -> netdev -> ind_priv; - struct concap_proto_ops *pops = cprot ? cprot -> pops : 0; - - /* try if there are generic concap receiver routines */ - if( pops ) - if( pops->connect_ind) - pops->connect_ind(cprot); - - isdn_net_device_wake_queue(lp); -} - -static void -isdn_x25_disconnected(isdn_net_local *lp) -{ - struct concap_proto *cprot = lp -> netdev -> ind_priv; - struct concap_proto_ops *pops = cprot ? cprot -> pops : 0; - - /* try if there are generic encap protocol - receiver routines and signal the closure of - the link */ - if( pops && pops -> disconn_ind ) - pops -> disconn_ind(cprot); -} - -static int -isdn_x25_start_xmit(struct sk_buff *skb, struct net_device *dev) -{ -/* At this point hard_start_xmit() passes control to the encapsulation - protocol (if present). - For X.25 auto-dialing is completly bypassed because: - - It does not conform with the semantics of a reliable datalink - service as needed by X.25 PLP. - - I don't want that the interface starts dialing when the network layer - sends a message which requests to disconnect the lapb link (or if it - sends any other message not resulting in data transmission). - Instead, dialing will be initiated by the encapsulation protocol entity - when a dl_establish request is received from the upper layer. -*/ - isdn_net_local *lp = (isdn_net_local *) dev->priv; - struct concap_proto * cprot = lp -> netdev -> ind_priv; - int ret = cprot -> pops -> encap_and_xmit ( cprot , skb); - - if (ret) - netif_stop_queue(dev); - - return ret; -} - -static void -isdn_x25_receive(isdn_net_dev *p, isdn_net_local *olp, struct sk_buff *skb) -{ - isdn_net_local *lp = &p->local; - struct concap_proto *cprot = lp -> netdev -> ind_priv; - - /* try if there are generic sync_device receiver routines */ - if(cprot) - if(cprot -> pops) - if( cprot -> pops -> data_ind) { - cprot -> pops -> data_ind(cprot,skb); - return; - } -} - -static void -isdn_x25_init(struct net_device *dev) -{ - unsigned long flags; - - isdn_net_local *lp = dev->priv; - - /* ... , prepare for configuration of new one ... */ - switch ( lp->p_encap ){ - case ISDN_NET_ENCAP_X25IFACE: - lp -> inl_priv = &isdn_concap_reliable_dl_dops; - } - /* ... and allocate new one ... */ - p -> cprot = isdn_concap_new( cfg -> p_encap ); - /* p -> cprot == NULL now if p_encap is not supported - by means of the concap_proto mechanism */ - if (!p->cprot) - return -EINVAL; - - return 0; -} - -static void -isdn_x25_cleanup(isdn_net_dev *p) -{ - isdn_net_local *lp = &p->local; - struct concap_proto * cprot = p -> cprot; - unsigned long flags; - - /* delete old encapsulation protocol if present ... */ - save_flags(flags); - cli(); /* avoid races with incoming events trying to - call cprot->pops methods */ - if( cprot && cprot -> pops ) - cprot -> pops -> proto_del ( cprot ); - p -> cprot = NULL; - lp -> inl_priv = NULL; - restore_flags(flags); -} - -struct isdn_netif_ops isdn_x25_ops = { - .hard_start_xmit = isdn_x25_start_xmit, - .flags = IFF_NOARP | IFF_POINTOPOINT, - .type = ARPHRD_X25, - .receive = isdn_x25_receive, - .connected = isdn_x25_connected, - .disconnected = isdn_x25_disconnected, - .init = isdn_x25_init, - .cleanup = isdn_x25_cleanup, - .open = isdn_x25_open, - .close = isdn_x25_close, -}; diff -Nru a/drivers/isdn/i4l/isdn_concap.h b/drivers/isdn/i4l/isdn_concap.h --- a/drivers/isdn/i4l/isdn_concap.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/i4l/isdn_concap.h Thu Feb 19 23:44:26 2004 @@ -1,12 +1,14 @@ -/* Linux ISDN subsystem, protocol encapsulation +/* $Id: isdn_concap.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * Linux ISDN subsystem, protocol encapsulation * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ extern struct concap_device_ops isdn_concap_reliable_dl_dops; extern struct concap_device_ops isdn_concap_demand_dial_dops; +extern struct concap_proto * isdn_concap_new( int ); -struct concap_proto *isdn_concap_new(int); -extern struct isdn_netif_ops isdn_x25_ops; diff -Nru a/drivers/isdn/i4l/isdn_fsm.c b/drivers/isdn/i4l/isdn_fsm.c --- a/drivers/isdn/i4l/isdn_fsm.c Thu Feb 19 23:44:28 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,166 +0,0 @@ -/* Linux ISDN subsystem, finite state machine - * - * Author Karsten Keil - * Copyright by Karsten Keil - * 2001-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. - * - * Thanks to Jan den Ouden - * Fritz Elfert - */ - -#include -#include -#include -#include -#include -#include - -int -fsm_new(struct fsm *fsm) -{ - int i; - int size = sizeof(fsm_fn) * fsm->st_cnt * fsm->ev_cnt; - - fsm->jumpmatrix = kmalloc(size, GFP_KERNEL); - if (!fsm->jumpmatrix) - return -ENOMEM; - - memset(fsm->jumpmatrix, 0, size); - - for (i = 0; i < fsm->fn_cnt; i++) { - if (fsm->fn_tbl[i].st >= fsm->st_cnt || - fsm->fn_tbl[i].ev >= fsm->ev_cnt) { - printk(KERN_ERR "FsmNew Error line %d st(%d/%d) ev(%d/%d)\n", i, - fsm->fn_tbl[i].st, fsm->st_cnt, - fsm->fn_tbl[i].ev, fsm->ev_cnt); - continue; - } - fsm->jumpmatrix[fsm->st_cnt * fsm->fn_tbl[i].ev + fsm->fn_tbl[i].st] = fsm->fn_tbl[i].fn; - } - return 0; -} - -void -fsm_free(struct fsm *fsm) -{ - kfree(fsm->jumpmatrix); -} - -int -fsm_event(struct fsm_inst *fi, int event, void *arg) -{ - fsm_fn fn; - - if (fi->state >= fi->fsm->st_cnt || - event >= fi->fsm->ev_cnt) { - printk(KERN_ERR "FsmEvent Error st(%d/%d) ev(%d/%d)\n", - fi->state, fi->fsm->st_cnt,event, - fi->fsm->ev_cnt); - return -EINVAL; - } - fn = fi->fsm->jumpmatrix[fi->fsm->st_cnt * event + fi->state]; - if (!fn) { - if (fi->debug) - fi->printdebug(fi, "State %s Event %s no routine", - fi->fsm->st_str[fi->state], - fi->fsm->ev_str[event]); - return -ESRCH; - } - if (fi->debug) - fi->printdebug(fi, "State %s Event %s", - fi->fsm->st_str[fi->state], - fi->fsm->ev_str[event]); - - return fn(fi, event, arg); -} - -void -fsm_change_state(struct fsm_inst *fi, int newstate) -{ - fi->state = newstate; - if (fi->debug) - fi->printdebug(fi, "ChangeState %s", - fi->fsm->st_str[newstate]); -} - -#if 0 -static void -FsmExpireTimer(struct FsmTimer *ft) -{ -#if FSM_TIMER_DEBUG - if (ft->fi->debug) - ft->fi->printdebug(ft->fi, "FsmExpireTimer %lx", (long) ft); -#endif - FsmEvent(ft->fi, ft->event, ft->arg); -} - -void -FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft) -{ - ft->fi = fi; - ft->tl.function = (void *) FsmExpireTimer; - ft->tl.data = (long) ft; -#if FSM_TIMER_DEBUG - if (ft->fi->debug) - ft->fi->printdebug(ft->fi, "FsmInitTimer %lx", (long) ft); -#endif - init_timer(&ft->tl); -} - -void -FsmDelTimer(struct FsmTimer *ft, int where) -{ -#if FSM_TIMER_DEBUG - if (ft->fi->debug) - ft->fi->printdebug(ft->fi, "FsmDelTimer %lx %d", (long) ft, where); -#endif - del_timer(&ft->tl); -} - -int -FsmAddTimer(struct FsmTimer *ft, - int millisec, int event, void *arg, int where) -{ - -#if FSM_TIMER_DEBUG - if (ft->fi->debug) - ft->fi->printdebug(ft->fi, "FsmAddTimer %lx %d %d", - (long) ft, millisec, where); -#endif - - if (timer_pending(&ft->tl)) { - printk(KERN_WARNING "FsmAddTimer: timer already active!\n"); - ft->fi->printdebug(ft->fi, "FsmAddTimer already active!"); - return -1; - } - init_timer(&ft->tl); - ft->event = event; - ft->arg = arg; - ft->tl.expires = jiffies + (millisec * HZ) / 1000; - add_timer(&ft->tl); - return 0; -} - -void -FsmRestartTimer(struct FsmTimer *ft, - int millisec, int event, void *arg, int where) -{ - -#if FSM_TIMER_DEBUG - if (ft->fi->debug) - ft->fi->printdebug(ft->fi, "FsmRestartTimer %lx %d %d", - (long) ft, millisec, where); -#endif - - if (timer_pending(&ft->tl)) - del_timer(&ft->tl); - init_timer(&ft->tl); - ft->event = event; - ft->arg = arg; - ft->tl.expires = jiffies + (millisec * HZ) / 1000; - add_timer(&ft->tl); -} -#endif diff -Nru a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c --- a/drivers/isdn/i4l/isdn_net.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/i4l/isdn_net.c Thu Feb 19 23:44:28 2004 @@ -1,150 +1,3223 @@ -/* Linux ISDN subsystem, network interfaces and related functions (linklevel). +/* $Id: isdn_net.c,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * Linux ISDN subsystem, network interfaces and related functions (linklevel). * * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-2002 by Kai Germaschewski + * Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg + * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * + * Data Over Voice (DOV) support added - Guy Ellis 23-Mar-02 + * guy@traverse.com.au + * Outgoing calls - looks for a 'V' in first char of dialed number + * Incoming calls - checks first character of eaz as follows: + * Numeric - accept DATA only - original functionality + * 'V' - accept VOICE (DOV) only + * 'B' - accept BOTH DATA and DOV types + * + * Jan 2001: fix CISCO HDLC Bjoern A. Zeeb + * for info on the protocol, see + * http://i4l.zabbadoz.net/i4l/cisco-hdlc.txt */ +#include #include -#include #include +#include +#include +#include #include "isdn_common.h" -#include "isdn_net_lib.h" #include "isdn_net.h" +#ifdef CONFIG_ISDN_PPP +#include "isdn_ppp.h" +#endif +#ifdef CONFIG_ISDN_X25 +#include +#include "isdn_concap.h" +#endif + + +/* + * Outline of new tbusy handling: + * + * Old method, roughly spoken, consisted of setting tbusy when entering + * isdn_net_start_xmit() and at several other locations and clearing + * it from isdn_net_start_xmit() thread when sending was successful. + * + * With 2.3.x multithreaded network core, to prevent problems, tbusy should + * only be set by the isdn_net_start_xmit() thread and only when a tx-busy + * condition is detected. Other threads (in particular isdn_net_stat_callb()) + * are only allowed to clear tbusy. + * + * -HE + */ + +/* + * About SOFTNET: + * Most of the changes were pretty obvious and basically done by HE already. + * + * One problem of the isdn net device code is that is uses struct net_device + * for masters and slaves. However, only master interface are registered to + * the network layer, and therefore, it only makes sense to call netif_* + * functions on them. + * + * --KG + */ + +/* + * Find out if the netdevice has been ifup-ed yet. + * For slaves, look at the corresponding master. + */ +static __inline__ int isdn_net_device_started(isdn_net_dev *n) +{ + isdn_net_local *lp = n->local; + struct net_device *dev; + + if (lp->master) + dev = lp->master; + else + dev = &n->dev; + return netif_running(dev); +} + +/* + * wake up the network -> net_device queue. + * For slaves, wake the corresponding master interface. + */ +static __inline__ void isdn_net_device_wake_queue(isdn_net_local *lp) +{ + if (lp->master) + netif_wake_queue(lp->master); + else + netif_wake_queue(&lp->netdev->dev); +} + +/* + * stop the network -> net_device queue. + * For slaves, stop the corresponding master interface. + */ +static __inline__ void isdn_net_device_stop_queue(isdn_net_local *lp) +{ + if (lp->master) + netif_stop_queue(lp->master); + else + netif_stop_queue(&lp->netdev->dev); +} + +/* + * find out if the net_device which this lp belongs to (lp can be + * master or slave) is busy. It's busy iff all (master and slave) + * queues are busy + */ +static __inline__ int isdn_net_device_busy(isdn_net_local *lp) +{ + isdn_net_local *nlp; + isdn_net_dev *nd; + unsigned long flags; + + if (!isdn_net_lp_busy(lp)) + return 0; + + if (lp->master) + nd = ((isdn_net_local *) lp->master->priv)->netdev; + else + nd = lp->netdev; + + spin_lock_irqsave(&nd->queue_lock, flags); + nlp = lp->next; + while (nlp != lp) { + if (!isdn_net_lp_busy(nlp)) { + spin_unlock_irqrestore(&nd->queue_lock, flags); + return 0; + } + nlp = nlp->next; + } + spin_unlock_irqrestore(&nd->queue_lock, flags); + return 1; +} + +static __inline__ void isdn_net_inc_frame_cnt(isdn_net_local *lp) +{ + atomic_inc(&lp->frame_cnt); + if (isdn_net_device_busy(lp)) + isdn_net_device_stop_queue(lp); +} + +static __inline__ void isdn_net_dec_frame_cnt(isdn_net_local *lp) +{ + atomic_dec(&lp->frame_cnt); + + if (!(isdn_net_device_busy(lp))) { + if (!skb_queue_empty(&lp->super_tx_queue)) { + schedule_work(&lp->tqueue); + } else { + isdn_net_device_wake_queue(lp); + } + } +} + +static __inline__ void isdn_net_zero_frame_cnt(isdn_net_local *lp) +{ + atomic_set(&lp->frame_cnt, 0); +} + +/* For 2.2.x we leave the transmitter busy timeout at 2 secs, just + * to be safe. + * For 2.3.x we push it up to 20 secs, because call establishment + * (in particular callback) may take such a long time, and we + * don't want confusing messages in the log. However, there is a slight + * possibility that this large timeout will break other things like MPPP, + * which might rely on the tx timeout. If so, we'll find out this way... + */ + +#define ISDN_NET_TX_TIMEOUT (20*HZ) + +/* Prototypes */ + +int isdn_net_force_dial_lp(isdn_net_local *); +static int isdn_net_start_xmit(struct sk_buff *, struct net_device *); + +static void isdn_net_ciscohdlck_connected(isdn_net_local *lp); +static void isdn_net_ciscohdlck_disconnected(isdn_net_local *lp); + +char *isdn_net_revision = "$Revision: 1.1.2.2 $"; -// ISDN_NET_ENCAP_IPTYP -// ethernet type field -// ====================================================================== + /* + * Code for raw-networking over ISDN + */ +static void +isdn_net_unreachable(struct net_device *dev, struct sk_buff *skb, char *reason) +{ + if(skb) { + + u_short proto = ntohs(skb->protocol); + + printk(KERN_DEBUG "isdn_net: %s: %s, signalling dst_link_failure %s\n", + dev->name, + (reason != NULL) ? reason : "unknown", + (proto != ETH_P_IP) ? "Protocol != ETH_P_IP" : ""); + + dst_link_failure(skb); + } + else { /* dial not triggered by rawIP packet */ + printk(KERN_DEBUG "isdn_net: %s: %s\n", + dev->name, + (reason != NULL) ? reason : "reason unknown"); + } +} + +static void +isdn_net_reset(struct net_device *dev) +{ +#ifdef CONFIG_ISDN_X25 + struct concap_device_ops * dops = + ( (isdn_net_local *) dev->priv ) -> dops; + struct concap_proto * cprot = + ( (isdn_net_local *) dev->priv ) -> netdev -> cprot; +#endif +#ifdef CONFIG_ISDN_X25 + if( cprot && cprot -> pops && dops ) + cprot -> pops -> restart ( cprot, dev, dops ); +#endif +} + +/* Open/initialize the board. */ static int -isdn_iptyp_header(struct sk_buff *skb, struct net_device *dev, - unsigned short type, void *daddr, void *saddr, - unsigned plen) +isdn_net_open(struct net_device *dev) +{ + int i; + struct net_device *p; + struct in_device *in_dev; + + /* moved here from isdn_net_reset, because only the master has an + interface associated which is supposed to be started. BTW: + we need to call netif_start_queue, not netif_wake_queue here */ + netif_start_queue(dev); + + isdn_net_reset(dev); + /* Fill in the MAC-level header (not needed, but for compatibility... */ + for (i = 0; i < ETH_ALEN - sizeof(u32); i++) + dev->dev_addr[i] = 0xfc; + if ((in_dev = dev->ip_ptr) != NULL) { + /* + * Any address will do - we take the first + */ + struct in_ifaddr *ifa = in_dev->ifa_list; + if (ifa != NULL) + memcpy(dev->dev_addr+2, &ifa->ifa_local, 4); + } + + /* If this interface has slaves, start them also */ + + if ((p = (((isdn_net_local *) dev->priv)->slave))) { + while (p) { + isdn_net_reset(p); + p = (((isdn_net_local *) p->priv)->slave); + } + } + isdn_lock_drivers(); + return 0; +} + +/* + * Assign an ISDN-channel to a net-interface + */ +static void +isdn_net_bind_channel(isdn_net_local * lp, int idx) { - put_u16(skb_push(skb, 2), type); - return 2; + lp->flags |= ISDN_NET_CONNECTED; + lp->isdn_device = dev->drvmap[idx]; + lp->isdn_channel = dev->chanmap[idx]; + dev->rx_netdev[idx] = lp->netdev; + dev->st_netdev[idx] = lp->netdev; } +/* + * unbind a net-interface (resets interface after an error) + */ static void -isdn_iptyp_receive(isdn_net_local *lp, isdn_net_dev *idev, - struct sk_buff *skb) +isdn_net_unbind_channel(isdn_net_local * lp) +{ + skb_queue_purge(&lp->super_tx_queue); + + if (!lp->master) { /* reset only master device */ + /* Moral equivalent of dev_purge_queues(): + BEWARE! This chunk of code cannot be called from hardware + interrupt handler. I hope it is true. --ANK + */ + qdisc_reset(lp->netdev->dev.qdisc); + } + lp->dialstate = 0; + dev->rx_netdev[isdn_dc2minor(lp->isdn_device, lp->isdn_channel)] = NULL; + dev->st_netdev[isdn_dc2minor(lp->isdn_device, lp->isdn_channel)] = NULL; + isdn_free_channel(lp->isdn_device, lp->isdn_channel, ISDN_USAGE_NET); + lp->flags &= ~ISDN_NET_CONNECTED; + lp->isdn_device = -1; + lp->isdn_channel = -1; +} + +/* + * Perform auto-hangup and cps-calculation for net-interfaces. + * + * auto-hangup: + * Increment idle-counter (this counter is reset on any incoming or + * outgoing packet), if counter exceeds configured limit either do a + * hangup immediately or - if configured - wait until just before the next + * charge-info. + * + * cps-calculation (needed for dynamic channel-bundling): + * Since this function is called every second, simply reset the + * byte-counter of the interface after copying it to the cps-variable. + */ +unsigned long last_jiffies = -HZ; + +void +isdn_net_autohup() { - u16 protocol; + isdn_net_dev *p = dev->netdev; + int anymore; + + anymore = 0; + while (p) { + isdn_net_local *l = p->local; + if (jiffies == last_jiffies) + l->cps = l->transcount; + else + l->cps = (l->transcount * HZ) / (jiffies - last_jiffies); + l->transcount = 0; + if (dev->net_verbose > 3) + printk(KERN_DEBUG "%s: %d bogocps\n", l->name, l->cps); + if ((l->flags & ISDN_NET_CONNECTED) && (!l->dialstate)) { + anymore = 1; + l->huptimer++; + /* + * if there is some dialmode where timeout-hangup + * should _not_ be done, check for that here + */ + if ((l->onhtime) && + (l->huptimer > l->onhtime)) + { + if (l->hupflags & ISDN_MANCHARGE && + l->hupflags & ISDN_CHARGEHUP) { + while (time_after(jiffies, l->chargetime + l->chargeint)) + l->chargetime += l->chargeint; + if (time_after(jiffies, l->chargetime + l->chargeint - 2 * HZ)) + if (l->outgoing || l->hupflags & ISDN_INHUP) + isdn_net_hangup(&p->dev); + } else if (l->outgoing) { + if (l->hupflags & ISDN_CHARGEHUP) { + if (l->hupflags & ISDN_WAITCHARGE) { + printk(KERN_DEBUG "isdn_net: Hupflags of %s are %X\n", + l->name, l->hupflags); + isdn_net_hangup(&p->dev); + } else if (time_after(jiffies, l->chargetime + l->chargeint)) { + printk(KERN_DEBUG + "isdn_net: %s: chtime = %lu, chint = %d\n", + l->name, l->chargetime, l->chargeint); + isdn_net_hangup(&p->dev); + } + } else + isdn_net_hangup(&p->dev); + } else if (l->hupflags & ISDN_INHUP) + isdn_net_hangup(&p->dev); + } + + if(dev->global_flags & ISDN_GLOBAL_STOPPED || (ISDN_NET_DIALMODE(*l) == ISDN_NET_DM_OFF)) { + isdn_net_hangup(&p->dev); + break; + } + } + p = (isdn_net_dev *) p->next; + } + last_jiffies = jiffies; + isdn_timer_ctrl(ISDN_TIMER_NETHANGUP, anymore); +} - get_u16(skb->data, &protocol); - skb_pull(skb, 2); - isdn_netif_rx(idev, skb, protocol); +static void isdn_net_lp_disconnected(isdn_net_local *lp) +{ + isdn_net_rm_from_bundle(lp); } -struct isdn_netif_ops isdn_iptyp_ops = { - .hard_start_xmit = isdn_net_start_xmit, - .hard_header = isdn_iptyp_header, - .flags = IFF_NOARP | IFF_POINTOPOINT, - .type = ARPHRD_PPP, - .addr_len = 2, - .receive = isdn_iptyp_receive, -}; +/* + * Handle status-messages from ISDN-interfacecard. + * This function is called from within the main-status-dispatcher + * isdn_status_callback, which itself is called from the low-level driver. + * Return: 1 = Event handled, 0 = not for us or unknown Event. + */ +int +isdn_net_stat_callback(int idx, isdn_ctrl *c) +{ + isdn_net_dev *p = dev->st_netdev[idx]; + int cmd = c->command; -// ISDN_NET_ENCAP_UIHDLC -// HDLC with UI-Frames (for ispa with -h1 option) */ -// ====================================================================== + if (p) { + isdn_net_local *lp = p->local; +#ifdef CONFIG_ISDN_X25 + struct concap_proto *cprot = lp -> netdev -> cprot; + struct concap_proto_ops *pops = cprot ? cprot -> pops : 0; +#endif + switch (cmd) { + case ISDN_STAT_BSENT: + /* A packet has successfully been sent out */ + if ((lp->flags & ISDN_NET_CONNECTED) && + (!lp->dialstate)) { + isdn_net_dec_frame_cnt(lp); + lp->stats.tx_packets++; + lp->stats.tx_bytes += c->parm.length; + } + return 1; + case ISDN_STAT_DCONN: + /* D-Channel is up */ + switch (lp->dialstate) { + case 4: + case 7: + case 8: + lp->dialstate++; + return 1; + case 12: + lp->dialstate = 5; + return 1; + } + break; + case ISDN_STAT_DHUP: + /* Either D-Channel-hangup or error during dialout */ +#ifdef CONFIG_ISDN_X25 + /* If we are not connencted then dialing had + failed. If there are generic encap protocol + receiver routines signal the closure of + the link*/ + + if( !(lp->flags & ISDN_NET_CONNECTED) + && pops && pops -> disconn_ind ) + pops -> disconn_ind(cprot); +#endif /* CONFIG_ISDN_X25 */ + if ((!lp->dialstate) && (lp->flags & ISDN_NET_CONNECTED)) { + if (lp->p_encap == ISDN_NET_ENCAP_CISCOHDLCK) + isdn_net_ciscohdlck_disconnected(lp); +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) + isdn_ppp_free(lp); +#endif + isdn_net_lp_disconnected(lp); + isdn_all_eaz(lp->isdn_device, lp->isdn_channel); + printk(KERN_INFO "%s: remote hangup\n", lp->name); + printk(KERN_INFO "%s: Chargesum is %d\n", lp->name, + lp->charge); + isdn_net_unbind_channel(lp); + return 1; + } + break; +#ifdef CONFIG_ISDN_X25 + case ISDN_STAT_BHUP: + /* B-Channel-hangup */ + /* try if there are generic encap protocol + receiver routines and signal the closure of + the link */ + if( pops && pops -> disconn_ind ){ + pops -> disconn_ind(cprot); + return 1; + } + break; +#endif /* CONFIG_ISDN_X25 */ + case ISDN_STAT_BCONN: + /* B-Channel is up */ + isdn_net_zero_frame_cnt(lp); + switch (lp->dialstate) { + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 12: + if (lp->dialstate <= 6) { + dev->usage[idx] |= ISDN_USAGE_OUTGOING; + isdn_info_update(); + } else + dev->rx_netdev[idx] = p; + lp->dialstate = 0; + isdn_timer_ctrl(ISDN_TIMER_NETHANGUP, 1); + if (lp->p_encap == ISDN_NET_ENCAP_CISCOHDLCK) + isdn_net_ciscohdlck_connected(lp); + if (lp->p_encap != ISDN_NET_ENCAP_SYNCPPP) { + if (lp->master) { /* is lp a slave? */ + isdn_net_dev *nd = ((isdn_net_local *)lp->master->priv)->netdev; + isdn_net_add_to_bundle(nd, lp); + } + } + printk(KERN_INFO "isdn_net: %s connected\n", lp->name); + /* If first Chargeinfo comes before B-Channel connect, + * we correct the timestamp here. + */ + lp->chargetime = jiffies; + + /* reset dial-timeout */ + lp->dialstarted = 0; + lp->dialwait_timer = 0; + +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) + isdn_ppp_wakeup_daemon(lp); +#endif +#ifdef CONFIG_ISDN_X25 + /* try if there are generic concap receiver routines */ + if( pops ) + if( pops->connect_ind) + pops->connect_ind(cprot); +#endif /* CONFIG_ISDN_X25 */ + /* ppp needs to do negotiations first */ + if (lp->p_encap != ISDN_NET_ENCAP_SYNCPPP) + isdn_net_device_wake_queue(lp); + return 1; + } + break; + case ISDN_STAT_NODCH: + /* No D-Channel avail. */ + if (lp->dialstate == 4) { + lp->dialstate--; + return 1; + } + break; + case ISDN_STAT_CINF: + /* Charge-info from TelCo. Calculate interval between + * charge-infos and set timestamp for last info for + * usage by isdn_net_autohup() + */ + lp->charge++; + if (lp->hupflags & ISDN_HAVECHARGE) { + lp->hupflags &= ~ISDN_WAITCHARGE; + lp->chargeint = jiffies - lp->chargetime - (2 * HZ); + } + if (lp->hupflags & ISDN_WAITCHARGE) + lp->hupflags |= ISDN_HAVECHARGE; + lp->chargetime = jiffies; + printk(KERN_DEBUG "isdn_net: Got CINF chargetime of %s now %lu\n", + lp->name, lp->chargetime); + return 1; + } + } + return 0; +} +/* + * Perform dialout for net-interfaces and timeout-handling for + * D-Channel-up and B-Channel-up Messages. + * This function is initially called from within isdn_net_start_xmit() or + * or isdn_net_find_icall() after initializing the dialstate for an + * interface. If further calls are needed, the function schedules itself + * for a timer-callback via isdn_timer_function(). + * The dialstate is also affected by incoming status-messages from + * the ISDN-Channel which are handled in isdn_net_stat_callback() above. + */ +void +isdn_net_dial(void) +{ + isdn_net_dev *p = dev->netdev; + int anymore = 0; + int i; + isdn_ctrl cmd; + u_char *phone_number; + + while (p) { + isdn_net_local *lp = p->local; + +#ifdef ISDN_DEBUG_NET_DIAL + if (lp->dialstate) + printk(KERN_DEBUG "%s: dialstate=%d\n", lp->name, lp->dialstate); +#endif + switch (lp->dialstate) { + case 0: + /* Nothing to do for this interface */ + break; + case 1: + /* Initiate dialout. Set phone-number-pointer to first number + * of interface. + */ + lp->dial = lp->phone[1]; + if (!lp->dial) { + printk(KERN_WARNING "%s: phone number deleted?\n", + lp->name); + isdn_net_hangup(&p->dev); + break; + } + anymore = 1; + + if(lp->dialtimeout > 0) + if(lp->dialstarted == 0 || time_after(jiffies, lp->dialstarted + lp->dialtimeout + lp->dialwait)) { + lp->dialstarted = jiffies; + lp->dialwait_timer = 0; + } + + lp->dialstate++; + /* Fall through */ + case 2: + /* Prepare dialing. Clear EAZ, then set EAZ. */ + cmd.driver = lp->isdn_device; + cmd.arg = lp->isdn_channel; + cmd.command = ISDN_CMD_CLREAZ; + isdn_command(&cmd); + sprintf(cmd.parm.num, "%s", isdn_map_eaz2msn(lp->msn, cmd.driver)); + cmd.command = ISDN_CMD_SETEAZ; + isdn_command(&cmd); + lp->dialretry = 0; + anymore = 1; + lp->dialstate++; + /* Fall through */ + case 3: + /* Setup interface, dial current phone-number, switch to next number. + * If list of phone-numbers is exhausted, increment + * retry-counter. + */ + if(dev->global_flags & ISDN_GLOBAL_STOPPED || (ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_OFF)) { + char *s; + if (dev->global_flags & ISDN_GLOBAL_STOPPED) + s = "dial suppressed: isdn system stopped"; + else + s = "dial suppressed: dialmode `off'"; + isdn_net_unreachable(&p->dev, 0, s); + isdn_net_hangup(&p->dev); + break; + } + cmd.driver = lp->isdn_device; + cmd.command = ISDN_CMD_SETL2; + cmd.arg = lp->isdn_channel + (lp->l2_proto << 8); + isdn_command(&cmd); + cmd.driver = lp->isdn_device; + cmd.command = ISDN_CMD_SETL3; + cmd.arg = lp->isdn_channel + (lp->l3_proto << 8); + isdn_command(&cmd); + cmd.driver = lp->isdn_device; + cmd.arg = lp->isdn_channel; + if (!lp->dial) { + printk(KERN_WARNING "%s: phone number deleted?\n", + lp->name); + isdn_net_hangup(&p->dev); + break; + } + if (!strncmp(lp->dial->num, "LEASED", strlen("LEASED"))) { + lp->dialstate = 4; + printk(KERN_INFO "%s: Open leased line ...\n", lp->name); + } else { + if(lp->dialtimeout > 0) + if (time_after(jiffies, lp->dialstarted + lp->dialtimeout)) { + lp->dialwait_timer = jiffies + lp->dialwait; + lp->dialstarted = 0; + isdn_net_unreachable(&p->dev, 0, "dial: timed out"); + isdn_net_hangup(&p->dev); + break; + } + + cmd.driver = lp->isdn_device; + cmd.command = ISDN_CMD_DIAL; + cmd.parm.setup.si2 = 0; + + /* check for DOV */ + phone_number = lp->dial->num; + if ((*phone_number == 'v') || + (*phone_number == 'V')) { /* DOV call */ + cmd.parm.setup.si1 = 1; + } else { /* DATA call */ + cmd.parm.setup.si1 = 7; + } + + strcpy(cmd.parm.setup.phone, phone_number); + /* + * Switch to next number or back to start if at end of list. + */ + if (!(lp->dial = (isdn_net_phone *) lp->dial->next)) { + lp->dial = lp->phone[1]; + lp->dialretry++; + + if (lp->dialretry > lp->dialmax) { + if (lp->dialtimeout == 0) { + lp->dialwait_timer = jiffies + lp->dialwait; + lp->dialstarted = 0; + isdn_net_unreachable(&p->dev, 0, "dial: tried all numbers dialmax times"); + } + isdn_net_hangup(&p->dev); + break; + } + } + sprintf(cmd.parm.setup.eazmsn, "%s", + isdn_map_eaz2msn(lp->msn, cmd.driver)); + i = isdn_dc2minor(lp->isdn_device, lp->isdn_channel); + if (i >= 0) { + strcpy(dev->num[i], cmd.parm.setup.phone); + dev->usage[i] |= ISDN_USAGE_OUTGOING; + isdn_info_update(); + } + printk(KERN_INFO "%s: dialing %d %s... %s\n", lp->name, + lp->dialretry, cmd.parm.setup.phone, + (cmd.parm.setup.si1 == 1) ? "DOV" : ""); + lp->dtimer = 0; +#ifdef ISDN_DEBUG_NET_DIAL + printk(KERN_DEBUG "dial: d=%d c=%d\n", lp->isdn_device, + lp->isdn_channel); +#endif + isdn_command(&cmd); + } + lp->huptimer = 0; + lp->outgoing = 1; + if (lp->chargeint) { + lp->hupflags |= ISDN_HAVECHARGE; + lp->hupflags &= ~ISDN_WAITCHARGE; + } else { + lp->hupflags |= ISDN_WAITCHARGE; + lp->hupflags &= ~ISDN_HAVECHARGE; + } + anymore = 1; + lp->dialstate = + (lp->cbdelay && + (lp->flags & ISDN_NET_CBOUT)) ? 12 : 4; + break; + case 4: + /* Wait for D-Channel-connect. + * If timeout, switch back to state 3. + * Dialmax-handling moved to state 3. + */ + if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10) + lp->dialstate = 3; + anymore = 1; + break; + case 5: + /* Got D-Channel-Connect, send B-Channel-request */ + cmd.driver = lp->isdn_device; + cmd.arg = lp->isdn_channel; + cmd.command = ISDN_CMD_ACCEPTB; + anymore = 1; + lp->dtimer = 0; + lp->dialstate++; + isdn_command(&cmd); + break; + case 6: + /* Wait for B- or D-Channel-connect. If timeout, + * switch back to state 3. + */ +#ifdef ISDN_DEBUG_NET_DIAL + printk(KERN_DEBUG "dialtimer2: %d\n", lp->dtimer); +#endif + if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10) + lp->dialstate = 3; + anymore = 1; + break; + case 7: + /* Got incoming Call, setup L2 and L3 protocols, + * then wait for D-Channel-connect + */ +#ifdef ISDN_DEBUG_NET_DIAL + printk(KERN_DEBUG "dialtimer4: %d\n", lp->dtimer); +#endif + cmd.driver = lp->isdn_device; + cmd.command = ISDN_CMD_SETL2; + cmd.arg = lp->isdn_channel + (lp->l2_proto << 8); + isdn_command(&cmd); + cmd.driver = lp->isdn_device; + cmd.command = ISDN_CMD_SETL3; + cmd.arg = lp->isdn_channel + (lp->l3_proto << 8); + isdn_command(&cmd); + if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT15) + isdn_net_hangup(&p->dev); + else { + anymore = 1; + lp->dialstate++; + } + break; + case 9: + /* Got incoming D-Channel-Connect, send B-Channel-request */ + cmd.driver = lp->isdn_device; + cmd.arg = lp->isdn_channel; + cmd.command = ISDN_CMD_ACCEPTB; + isdn_command(&cmd); + anymore = 1; + lp->dtimer = 0; + lp->dialstate++; + break; + case 8: + case 10: + /* Wait for B- or D-channel-connect */ +#ifdef ISDN_DEBUG_NET_DIAL + printk(KERN_DEBUG "dialtimer4: %d\n", lp->dtimer); +#endif + if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10) + isdn_net_hangup(&p->dev); + else + anymore = 1; + break; + case 11: + /* Callback Delay */ + if (lp->dtimer++ > lp->cbdelay) + lp->dialstate = 1; + anymore = 1; + break; + case 12: + /* Remote does callback. Hangup after cbdelay, then wait for incoming + * call (in state 4). + */ + if (lp->dtimer++ > lp->cbdelay) + { + printk(KERN_INFO "%s: hangup waiting for callback ...\n", lp->name); + lp->dtimer = 0; + lp->dialstate = 4; + cmd.driver = lp->isdn_device; + cmd.command = ISDN_CMD_HANGUP; + cmd.arg = lp->isdn_channel; + isdn_command(&cmd); + isdn_all_eaz(lp->isdn_device, lp->isdn_channel); + } + anymore = 1; + break; + default: + printk(KERN_WARNING "isdn_net: Illegal dialstate %d for device %s\n", + lp->dialstate, lp->name); + } + p = (isdn_net_dev *) p->next; + } + isdn_timer_ctrl(ISDN_TIMER_NETDIAL, anymore); +} + +/* + * Perform hangup for a net-interface. + */ +void +isdn_net_hangup(struct net_device *d) +{ + isdn_net_local *lp = (isdn_net_local *) d->priv; + isdn_ctrl cmd; +#ifdef CONFIG_ISDN_X25 + struct concap_proto *cprot = lp -> netdev -> cprot; + struct concap_proto_ops *pops = cprot ? cprot -> pops : 0; +#endif + + if (lp->flags & ISDN_NET_CONNECTED) { + if (lp->slave != NULL) { + isdn_net_local *slp = (isdn_net_local *)lp->slave->priv; + if (slp->flags & ISDN_NET_CONNECTED) { + printk(KERN_INFO + "isdn_net: hang up slave %s before %s\n", + slp->name, lp->name); + isdn_net_hangup(lp->slave); + } + } + printk(KERN_INFO "isdn_net: local hangup %s\n", lp->name); +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) + isdn_ppp_free(lp); +#endif + isdn_net_lp_disconnected(lp); +#ifdef CONFIG_ISDN_X25 + /* try if there are generic encap protocol + receiver routines and signal the closure of + the link */ + if( pops && pops -> disconn_ind ) + pops -> disconn_ind(cprot); +#endif /* CONFIG_ISDN_X25 */ + + cmd.driver = lp->isdn_device; + cmd.command = ISDN_CMD_HANGUP; + cmd.arg = lp->isdn_channel; + isdn_command(&cmd); + printk(KERN_INFO "%s: Chargesum is %d\n", lp->name, lp->charge); + isdn_all_eaz(lp->isdn_device, lp->isdn_channel); + } + isdn_net_unbind_channel(lp); +} + +typedef struct { + unsigned short source; + unsigned short dest; +} ip_ports; + +static void +isdn_net_log_skb(struct sk_buff * skb, isdn_net_local * lp) +{ + u_char *p = skb->nh.raw; /* hopefully, this was set correctly */ + unsigned short proto = ntohs(skb->protocol); + int data_ofs; + ip_ports *ipp; + char addinfo[100]; + + addinfo[0] = '\0'; + /* This check stolen from 2.1.72 dev_queue_xmit_nit() */ + if (skb->nh.raw < skb->data || skb->nh.raw >= skb->tail) { + /* fall back to old isdn_net_log_packet method() */ + char * buf = skb->data; + + printk(KERN_DEBUG "isdn_net: protocol %04x is buggy, dev %s\n", skb->protocol, lp->name); + p = buf; + proto = ETH_P_IP; + switch (lp->p_encap) { + case ISDN_NET_ENCAP_IPTYP: + proto = ntohs(*(unsigned short *) &buf[0]); + p = &buf[2]; + break; + case ISDN_NET_ENCAP_ETHER: + proto = ntohs(*(unsigned short *) &buf[12]); + p = &buf[14]; + break; + case ISDN_NET_ENCAP_CISCOHDLC: + proto = ntohs(*(unsigned short *) &buf[2]); + p = &buf[4]; + break; +#ifdef CONFIG_ISDN_PPP + case ISDN_NET_ENCAP_SYNCPPP: + proto = ntohs(skb->protocol); + p = &buf[IPPP_MAX_HEADER]; + break; +#endif + } + } + data_ofs = ((p[0] & 15) * 4); + switch (proto) { + case ETH_P_IP: + switch (p[9]) { + case 1: + strcpy(addinfo, " ICMP"); + break; + case 2: + strcpy(addinfo, " IGMP"); + break; + case 4: + strcpy(addinfo, " IPIP"); + break; + case 6: + ipp = (ip_ports *) (&p[data_ofs]); + sprintf(addinfo, " TCP, port: %d -> %d", ntohs(ipp->source), + ntohs(ipp->dest)); + break; + case 8: + strcpy(addinfo, " EGP"); + break; + case 12: + strcpy(addinfo, " PUP"); + break; + case 17: + ipp = (ip_ports *) (&p[data_ofs]); + sprintf(addinfo, " UDP, port: %d -> %d", ntohs(ipp->source), + ntohs(ipp->dest)); + break; + case 22: + strcpy(addinfo, " IDP"); + break; + } + printk(KERN_INFO + "OPEN: %d.%d.%d.%d -> %d.%d.%d.%d%s\n", + + p[12], p[13], p[14], p[15], + p[16], p[17], p[18], p[19], + addinfo); + break; + case ETH_P_ARP: + printk(KERN_INFO + "OPEN: ARP %d.%d.%d.%d -> *.*.*.* ?%d.%d.%d.%d\n", + p[14], p[15], p[16], p[17], + p[24], p[25], p[26], p[27]); + break; + } +} + +/* + * this function is used to send supervisory data, i.e. data which was + * not received from the network layer, but e.g. frames from ipppd, CCP + * reset frames etc. + */ +void isdn_net_write_super(isdn_net_local *lp, struct sk_buff *skb) +{ + if (in_irq()) { + // we can't grab the lock from irq context, + // so we just queue the packet + skb_queue_tail(&lp->super_tx_queue, skb); + schedule_work(&lp->tqueue); + return; + } + + spin_lock_bh(&lp->xmit_lock); + if (!isdn_net_lp_busy(lp)) { + isdn_net_writebuf_skb(lp, skb); + } else { + skb_queue_tail(&lp->super_tx_queue, skb); + } + spin_unlock_bh(&lp->xmit_lock); +} + +/* + * called from tq_immediate + */ +static void isdn_net_softint(void *private) +{ + isdn_net_local *lp = private; + struct sk_buff *skb; + + spin_lock_bh(&lp->xmit_lock); + while (!isdn_net_lp_busy(lp)) { + skb = skb_dequeue(&lp->super_tx_queue); + if (!skb) + break; + isdn_net_writebuf_skb(lp, skb); + } + spin_unlock_bh(&lp->xmit_lock); +} + +/* + * all frames sent from the (net) LL to a HL driver should go via this function + * it's serialized by the caller holding the lp->xmit_lock spinlock + */ +void isdn_net_writebuf_skb(isdn_net_local *lp, struct sk_buff *skb) +{ + int ret; + int len = skb->len; /* save len */ + + /* before obtaining the lock the caller should have checked that + the lp isn't busy */ + if (isdn_net_lp_busy(lp)) { + printk("isdn BUG at %s:%d!\n", __FILE__, __LINE__); + goto error; + } + + if (!(lp->flags & ISDN_NET_CONNECTED)) { + printk("isdn BUG at %s:%d!\n", __FILE__, __LINE__); + goto error; + } + ret = isdn_writebuf_skb_stub(lp->isdn_device, lp->isdn_channel, 1, skb); + if (ret != len) { + /* we should never get here */ + printk(KERN_WARNING "%s: HL driver queue full\n", lp->name); + goto error; + } + + lp->transcount += len; + isdn_net_inc_frame_cnt(lp); + return; + + error: + dev_kfree_skb(skb); + lp->stats.tx_errors++; + +} + + +/* + * Helper function for isdn_net_start_xmit. + * When called, the connection is already established. + * Based on cps-calculation, check if device is overloaded. + * If so, and if a slave exists, trigger dialing for it. + * If any slave is online, deliver packets using a simple round robin + * scheme. + * + * Return: 0 on success, !0 on failure. + */ + +static int +isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb) +{ + isdn_net_dev *nd; + isdn_net_local *slp; + isdn_net_local *lp = (isdn_net_local *) ndev->priv; + int retv = 0; + + if (((isdn_net_local *) (ndev->priv))->master) { + printk("isdn BUG at %s:%d!\n", __FILE__, __LINE__); + dev_kfree_skb(skb); + return 0; + } + + /* For the other encaps the header has already been built */ +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) { + return isdn_ppp_xmit(skb, ndev); + } +#endif + nd = ((isdn_net_local *) ndev->priv)->netdev; + lp = isdn_net_get_locked_lp(nd); + if (!lp) { + printk(KERN_WARNING "%s: all channels busy - requeuing!\n", ndev->name); + return 1; + } + /* we have our lp locked from now on */ + + /* Reset hangup-timeout */ + lp->huptimer = 0; // FIXME? + isdn_net_writebuf_skb(lp, skb); + spin_unlock_bh(&lp->xmit_lock); + + /* the following stuff is here for backwards compatibility. + * in future, start-up and hangup of slaves (based on current load) + * should move to userspace and get based on an overall cps + * calculation + */ + if (lp->cps > lp->triggercps) { + if (lp->slave) { + if (!lp->sqfull) { + /* First time overload: set timestamp only */ + lp->sqfull = 1; + lp->sqfull_stamp = jiffies; + } else { + /* subsequent overload: if slavedelay exceeded, start dialing */ + if (time_after(jiffies, lp->sqfull_stamp + lp->slavedelay)) { + slp = lp->slave->priv; + if (!(slp->flags & ISDN_NET_CONNECTED)) { + isdn_net_force_dial_lp((isdn_net_local *) lp->slave->priv); + } + } + } + } + } else { + if (lp->sqfull && time_after(jiffies, lp->sqfull_stamp + lp->slavedelay + (10 * HZ))) { + lp->sqfull = 0; + } + /* this is a hack to allow auto-hangup for slaves on moderate loads */ + nd->queue = nd->local; + } + + return retv; + +} + +static void +isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev) +{ + isdn_net_local *lp = (isdn_net_local *) dev->priv; + if (!skb) + return; + if (lp->p_encap == ISDN_NET_ENCAP_ETHER) { + int pullsize = (ulong)skb->nh.raw - (ulong)skb->data - ETH_HLEN; + if (pullsize > 0) { + printk(KERN_DEBUG "isdn_net: Pull junk %d\n", pullsize); + skb_pull(skb, pullsize); + } + } +} + + +void isdn_net_tx_timeout(struct net_device * ndev) +{ + isdn_net_local *lp = (isdn_net_local *) ndev->priv; + + printk(KERN_WARNING "isdn_tx_timeout dev %s dialstate %d\n", ndev->name, lp->dialstate); + if (!lp->dialstate){ + lp->stats.tx_errors++; + /* + * There is a certain probability that this currently + * works at all because if we always wake up the interface, + * then upper layer will try to send the next packet + * immediately. And then, the old clean_up logic in the + * driver will hopefully continue to work as it used to do. + * + * This is rather primitive right know, we better should + * clean internal queues here, in particular for multilink and + * ppp, and reset HL driver's channel, too. --HE + * + * actually, this may not matter at all, because ISDN hardware + * should not see transmitter hangs at all IMO + * changed KERN_DEBUG to KERN_WARNING to find out if this is + * ever called --KG + */ + } + ndev->trans_start = jiffies; + netif_wake_queue(ndev); +} + +/* + * Try sending a packet. + * If this interface isn't connected to a ISDN-Channel, find a free channel, + * and start dialing. + */ +static int +isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) +{ + isdn_net_local *lp = (isdn_net_local *) ndev->priv; +#ifdef CONFIG_ISDN_X25 + struct concap_proto * cprot = lp -> netdev -> cprot; +/* At this point hard_start_xmit() passes control to the encapsulation + protocol (if present). + For X.25 auto-dialing is completly bypassed because: + - It does not conform with the semantics of a reliable datalink + service as needed by X.25 PLP. + - I don't want that the interface starts dialing when the network layer + sends a message which requests to disconnect the lapb link (or if it + sends any other message not resulting in data transmission). + Instead, dialing will be initiated by the encapsulation protocol entity + when a dl_establish request is received from the upper layer. +*/ + if (cprot && cprot -> pops) { + int ret = cprot -> pops -> encap_and_xmit ( cprot , skb); + + if (ret) + netif_stop_queue(ndev); + return ret; + } else +#endif + /* auto-dialing xmit function */ + { +#ifdef ISDN_DEBUG_NET_DUMP + u_char *buf; +#endif + isdn_net_adjust_hdr(skb, ndev); +#ifdef ISDN_DEBUG_NET_DUMP + buf = skb->data; + isdn_dumppkt("S:", buf, skb->len, 40); +#endif + + if (!(lp->flags & ISDN_NET_CONNECTED)) { + int chi; + /* only do autodial if allowed by config */ + if (!(ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_AUTO)) { + isdn_net_unreachable(ndev, skb, "dial rejected: interface not in dialmode `auto'"); + dev_kfree_skb(skb); + return 0; + } + if (lp->phone[1]) { + ulong flags; + + if(lp->dialwait_timer <= 0) + if(lp->dialstarted > 0 && lp->dialtimeout > 0 && time_before(jiffies, lp->dialstarted + lp->dialtimeout + lp->dialwait)) + lp->dialwait_timer = lp->dialstarted + lp->dialtimeout + lp->dialwait; + + if(lp->dialwait_timer > 0) { + if(time_before(jiffies, lp->dialwait_timer)) { + isdn_net_unreachable(ndev, skb, "dial rejected: retry-time not reached"); + dev_kfree_skb(skb); + return 0; + } else + lp->dialwait_timer = 0; + } + /* Grab a free ISDN-Channel */ + spin_lock_irqsave(&dev->lock, flags); + if (((chi = + isdn_get_free_channel( + ISDN_USAGE_NET, + lp->l2_proto, + lp->l3_proto, + lp->pre_device, + lp->pre_channel, + lp->msn) + ) < 0) && + ((chi = + isdn_get_free_channel( + ISDN_USAGE_NET, + lp->l2_proto, + lp->l3_proto, + lp->pre_device, + lp->pre_channel^1, + lp->msn) + ) < 0)) { + spin_unlock_irqrestore(&dev->lock, flags); + isdn_net_unreachable(ndev, skb, + "No channel"); + dev_kfree_skb(skb); + return 0; + } + /* Log packet, which triggered dialing */ + if (dev->net_verbose) + isdn_net_log_skb(skb, lp); + lp->dialstate = 1; + /* Connect interface with channel */ + isdn_net_bind_channel(lp, chi); +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) { + /* no 'first_skb' handling for syncPPP */ + if (isdn_ppp_bind(lp) < 0) { + dev_kfree_skb(skb); + isdn_net_unbind_channel(lp); + spin_unlock_irqrestore(&dev->lock, flags); + return 0; /* STN (skb to nirvana) ;) */ + } +#ifdef CONFIG_IPPP_FILTER + if (isdn_ppp_autodial_filter(skb, lp)) { + isdn_ppp_free(lp); + isdn_net_unbind_channel(lp); + spin_unlock_irqrestore(&dev->lock, flags); + isdn_net_unreachable(ndev, skb, "dial rejected: packet filtered"); + dev_kfree_skb(skb); + return 0; + } +#endif + spin_unlock_irqrestore(&dev->lock, flags); + isdn_net_dial(); /* Initiate dialing */ + netif_stop_queue(ndev); + return 1; /* let upper layer requeue skb packet */ + } +#endif + /* Initiate dialing */ + spin_unlock_irqrestore(&dev->lock, flags); + isdn_net_dial(); + isdn_net_device_stop_queue(lp); + return 1; + } else { + isdn_net_unreachable(ndev, skb, + "No phone number"); + dev_kfree_skb(skb); + return 0; + } + } else { + /* Device is connected to an ISDN channel */ + ndev->trans_start = jiffies; + if (!lp->dialstate) { + /* ISDN connection is established, try sending */ + int ret; + ret = (isdn_net_xmit(ndev, skb)); + if(ret) netif_stop_queue(ndev); + return ret; + } else + netif_stop_queue(ndev); + } + } + return 1; +} + +/* + * Shutdown a net-interface. + */ static int -isdn_uihdlc_header(struct sk_buff *skb, struct net_device *dev, - unsigned short type, void *daddr, void *saddr, - unsigned plen) +isdn_net_close(struct net_device *dev) +{ + struct net_device *p; +#ifdef CONFIG_ISDN_X25 + struct concap_proto * cprot = + ( (isdn_net_local *) dev->priv ) -> netdev -> cprot; + /* printk(KERN_DEBUG "isdn_net_close %s\n" , dev-> name ); */ +#endif + +#ifdef CONFIG_ISDN_X25 + if( cprot && cprot -> pops ) cprot -> pops -> close( cprot ); +#endif + netif_stop_queue(dev); + if ((p = (((isdn_net_local *) dev->priv)->slave))) { + /* If this interface has slaves, stop them also */ + while (p) { +#ifdef CONFIG_ISDN_X25 + cprot = ( (isdn_net_local *) p->priv ) + -> netdev -> cprot; + if( cprot && cprot -> pops ) + cprot -> pops -> close( cprot ); +#endif + isdn_net_hangup(p); + p = (((isdn_net_local *) p->priv)->slave); + } + } + isdn_net_hangup(dev); + isdn_unlock_drivers(); + return 0; +} + +/* + * Get statistics + */ +static struct net_device_stats * +isdn_net_get_stats(struct net_device *dev) +{ + isdn_net_local *lp = (isdn_net_local *) dev->priv; + return &lp->stats; +} + +/* This is simply a copy from std. eth.c EXCEPT we pull ETH_HLEN + * instead of dev->hard_header_len off. This is done because the + * lowlevel-driver has already pulled off its stuff when we get + * here and this routine only gets called with p_encap == ETHER. + * Determine the packet's protocol ID. The rule here is that we + * assume 802.3 if the type field is short enough to be a length. + * This is normal practice and works for any 'now in use' protocol. + */ + +static unsigned short +isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev) +{ + struct ethhdr *eth; + unsigned char *rawp; + + skb->mac.raw = skb->data; + skb_pull(skb, ETH_HLEN); + eth = skb->mac.ethernet; + + if (*eth->h_dest & 1) { + if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) + skb->pkt_type = PACKET_BROADCAST; + else + skb->pkt_type = PACKET_MULTICAST; + } + /* + * This ALLMULTI check should be redundant by 1.4 + * so don't forget to remove it. + */ + + else if (dev->flags & (IFF_PROMISC /*| IFF_ALLMULTI*/)) { + if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN)) + skb->pkt_type = PACKET_OTHERHOST; + } + if (ntohs(eth->h_proto) >= 1536) + return eth->h_proto; + + rawp = skb->data; + + /* + * This is a magic hack to spot IPX packets. Older Novell breaks + * the protocol design and runs IPX over 802.3 without an 802.2 LLC + * layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This + * won't work for fault tolerant netware but does for the rest. + */ + if (*(unsigned short *) rawp == 0xFFFF) + return htons(ETH_P_802_3); + /* + * Real 802.2 LLC + */ + return htons(ETH_P_802_2); +} + + +/* + * CISCO HDLC keepalive specific stuff + */ +static struct sk_buff* +isdn_net_ciscohdlck_alloc_skb(isdn_net_local *lp, int len) { - put_u16(skb_push(skb, 2), 0x0103); - return 2; + unsigned short hl = dev->drv[lp->isdn_device]->interface->hl_hdrlen; + struct sk_buff *skb; + + skb = alloc_skb(hl + len, GFP_ATOMIC); + if (!skb) { + printk("isdn out of mem at %s:%d!\n", __FILE__, __LINE__); + return 0; + } + skb_reserve(skb, hl); + return skb; +} + +/* cisco hdlck device private ioctls */ +int +isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +{ + isdn_net_local *lp = (isdn_net_local *) dev->priv; + unsigned long len = 0; + unsigned long expires = 0; + int tmp = 0; + int period = lp->cisco_keepalive_period; + char debserint = lp->cisco_debserint; + int rc = 0; + + if (lp->p_encap != ISDN_NET_ENCAP_CISCOHDLCK) + return -EINVAL; + + switch (cmd) { + /* get/set keepalive period */ + case SIOCGKEEPPERIOD: + len = (unsigned long)sizeof(lp->cisco_keepalive_period); + if (copy_to_user((char *)ifr->ifr_ifru.ifru_data, + (int *)&lp->cisco_keepalive_period, len)) + rc = -EFAULT; + break; + case SIOCSKEEPPERIOD: + tmp = lp->cisco_keepalive_period; + len = (unsigned long)sizeof(lp->cisco_keepalive_period); + if (copy_from_user((int *)&period, + (char *)ifr->ifr_ifru.ifru_data, len)) + rc = -EFAULT; + if ((period > 0) && (period <= 32767)) + lp->cisco_keepalive_period = period; + else + rc = -EINVAL; + if (!rc && (tmp != lp->cisco_keepalive_period)) { + expires = (unsigned long)(jiffies + + lp->cisco_keepalive_period * HZ); + mod_timer(&lp->cisco_timer, expires); + printk(KERN_INFO "%s: Keepalive period set " + "to %d seconds.\n", + lp->name, lp->cisco_keepalive_period); + } + break; + + /* get/set debugging */ + case SIOCGDEBSERINT: + len = (unsigned long)sizeof(lp->cisco_debserint); + if (copy_to_user((char *)ifr->ifr_ifru.ifru_data, + (char *)&lp->cisco_debserint, len)) + rc = -EFAULT; + break; + case SIOCSDEBSERINT: + len = (unsigned long)sizeof(lp->cisco_debserint); + if (copy_from_user((char *)&debserint, + (char *)ifr->ifr_ifru.ifru_data, len)) + rc = -EFAULT; + if ((debserint >= 0) && (debserint <= 64)) + lp->cisco_debserint = debserint; + else + rc = -EINVAL; + break; + + default: + rc = -EINVAL; + break; + } + return (rc); } +/* called via cisco_timer.function */ static void -isdn_uihdlc_receive(isdn_net_local *lp, isdn_net_dev *idev, - struct sk_buff *skb) +isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data) { - skb_pull(skb, 2); - isdn_netif_rx(idev, skb, htons(ETH_P_IP)); + isdn_net_local *lp = (isdn_net_local *) data; + struct sk_buff *skb; + unsigned char *p; + unsigned long last_cisco_myseq = lp->cisco_myseq; + int myseq_diff = 0; + + if (!(lp->flags & ISDN_NET_CONNECTED) || lp->dialstate) { + printk("isdn BUG at %s:%d!\n", __FILE__, __LINE__); + return; + } + lp->cisco_myseq++; + + myseq_diff = (lp->cisco_myseq - lp->cisco_mineseen); + if ((lp->cisco_line_state) && ((myseq_diff >= 3)||(myseq_diff <= -3))) { + /* line up -> down */ + lp->cisco_line_state = 0; + printk (KERN_WARNING + "UPDOWN: Line protocol on Interface %s," + " changed state to down\n", lp->name); + /* should stop routing higher-level data accross */ + } else if ((!lp->cisco_line_state) && + (myseq_diff >= 0) && (myseq_diff <= 2)) { + /* line down -> up */ + lp->cisco_line_state = 1; + printk (KERN_WARNING + "UPDOWN: Line protocol on Interface %s," + " changed state to up\n", lp->name); + /* restart routing higher-level data accross */ + } + + if (lp->cisco_debserint) + printk (KERN_DEBUG "%s: HDLC " + "myseq %lu, mineseen %lu%c, yourseen %lu, %s\n", + lp->name, last_cisco_myseq, lp->cisco_mineseen, + ((last_cisco_myseq == lp->cisco_mineseen) ? '*' : 040), + lp->cisco_yourseq, + ((lp->cisco_line_state) ? "line up" : "line down")); + + skb = isdn_net_ciscohdlck_alloc_skb(lp, 4 + 14); + if (!skb) + return; + + p = skb_put(skb, 4 + 14); + + /* cisco header */ + p += put_u8 (p, CISCO_ADDR_UNICAST); + p += put_u8 (p, CISCO_CTRL); + p += put_u16(p, CISCO_TYPE_SLARP); + + /* slarp keepalive */ + p += put_u32(p, CISCO_SLARP_KEEPALIVE); + p += put_u32(p, lp->cisco_myseq); + p += put_u32(p, lp->cisco_yourseq); + p += put_u16(p, 0xffff); // reliablity, always 0xffff + + isdn_net_write_super(lp, skb); + + lp->cisco_timer.expires = jiffies + lp->cisco_keepalive_period * HZ; + + add_timer(&lp->cisco_timer); } -struct isdn_netif_ops isdn_uihdlc_ops = { - .hard_start_xmit = isdn_net_start_xmit, - .hard_header = isdn_uihdlc_header, - .flags = IFF_NOARP | IFF_POINTOPOINT, - .type = ARPHRD_HDLC, - .addr_len = 2, - .receive = isdn_uihdlc_receive, -}; +static void +isdn_net_ciscohdlck_slarp_send_request(isdn_net_local *lp) +{ + struct sk_buff *skb; + unsigned char *p; -// ISDN_NET_ENCAP_RAWIP -// RAW-IP without MAC-Header -// ====================================================================== + skb = isdn_net_ciscohdlck_alloc_skb(lp, 4 + 14); + if (!skb) + return; + + p = skb_put(skb, 4 + 14); + + /* cisco header */ + p += put_u8 (p, CISCO_ADDR_UNICAST); + p += put_u8 (p, CISCO_CTRL); + p += put_u16(p, CISCO_TYPE_SLARP); + + /* slarp request */ + p += put_u32(p, CISCO_SLARP_REQUEST); + p += put_u32(p, 0); // address + p += put_u32(p, 0); // netmask + p += put_u16(p, 0); // unused + + isdn_net_write_super(lp, skb); +} + +static void +isdn_net_ciscohdlck_connected(isdn_net_local *lp) +{ + lp->cisco_myseq = 0; + lp->cisco_mineseen = 0; + lp->cisco_yourseq = 0; + lp->cisco_keepalive_period = ISDN_TIMER_KEEPINT; + lp->cisco_last_slarp_in = 0; + lp->cisco_line_state = 0; + lp->cisco_debserint = 0; + + /* send slarp request because interface/seq.no.s reset */ + isdn_net_ciscohdlck_slarp_send_request(lp); + + init_timer(&lp->cisco_timer); + lp->cisco_timer.data = (unsigned long) lp; + lp->cisco_timer.function = isdn_net_ciscohdlck_slarp_send_keepalive; + lp->cisco_timer.expires = jiffies + lp->cisco_keepalive_period * HZ; + add_timer(&lp->cisco_timer); +} + +static void +isdn_net_ciscohdlck_disconnected(isdn_net_local *lp) +{ + del_timer(&lp->cisco_timer); +} static void -isdn_rawip_receive(isdn_net_local *lp, isdn_net_dev *idev, - struct sk_buff *skb) +isdn_net_ciscohdlck_slarp_send_reply(isdn_net_local *lp) { - idev->huptimer = 0; - skb->protocol = htons(ETH_P_IP); + struct sk_buff *skb; + unsigned char *p; + struct in_device *in_dev = NULL; + u32 addr = 0; /* local ipv4 address */ + u32 mask = 0; /* local netmask */ + + if ((in_dev = lp->netdev->dev.ip_ptr) != NULL) { + /* take primary(first) address of interface */ + struct in_ifaddr *ifa = in_dev->ifa_list; + if (ifa != NULL) { + addr = ifa->ifa_local; + mask = ifa->ifa_mask; + } + } + + skb = isdn_net_ciscohdlck_alloc_skb(lp, 4 + 14); + if (!skb) + return; + + p = skb_put(skb, 4 + 14); + + /* cisco header */ + p += put_u8 (p, CISCO_ADDR_UNICAST); + p += put_u8 (p, CISCO_CTRL); + p += put_u16(p, CISCO_TYPE_SLARP); + + /* slarp reply, send own ip/netmask; if values are nonsense remote + * should think we are unable to provide it with an address via SLARP */ + p += put_u32(p, CISCO_SLARP_REPLY); + p += put_u32(p, addr); // address + p += put_u32(p, mask); // netmask + p += put_u16(p, 0); // unused + + isdn_net_write_super(lp, skb); +} + +static void +isdn_net_ciscohdlck_slarp_in(isdn_net_local *lp, struct sk_buff *skb) +{ + unsigned char *p; + int period; + u32 code; + u32 my_seq, addr; + u32 your_seq, mask; + u32 local; + u16 unused; + + if (skb->len < 14) + return; + + p = skb->data; + p += get_u32(p, &code); + + switch (code) { + case CISCO_SLARP_REQUEST: + lp->cisco_yourseq = 0; + isdn_net_ciscohdlck_slarp_send_reply(lp); + break; + case CISCO_SLARP_REPLY: + addr = ntohl(*(u32 *)p); + mask = ntohl(*(u32 *)(p+4)); + if (mask != 0xfffffffc) + goto slarp_reply_out; + if ((addr & 3) == 0 || (addr & 3) == 3) + goto slarp_reply_out; + local = addr ^ 3; + printk(KERN_INFO "%s: got slarp reply: " + "remote ip: %d.%d.%d.%d, " + "local ip: %d.%d.%d.%d " + "mask: %d.%d.%d.%d\n", + lp->name, + HIPQUAD(addr), + HIPQUAD(local), + HIPQUAD(mask)); + break; + slarp_reply_out: + printk(KERN_INFO "%s: got invalid slarp " + "reply (%d.%d.%d.%d/%d.%d.%d.%d) " + "- ignored\n", lp->name, + HIPQUAD(addr), HIPQUAD(mask)); + break; + case CISCO_SLARP_KEEPALIVE: + period = (int)((jiffies - lp->cisco_last_slarp_in + + HZ/2 - 1) / HZ); + if (lp->cisco_debserint && + (period != lp->cisco_keepalive_period) && + lp->cisco_last_slarp_in) { + printk(KERN_DEBUG "%s: Keepalive period mismatch - " + "is %d but should be %d.\n", + lp->name, period, lp->cisco_keepalive_period); + } + lp->cisco_last_slarp_in = jiffies; + p += get_u32(p, &my_seq); + p += get_u32(p, &your_seq); + p += get_u16(p, &unused); + lp->cisco_yourseq = my_seq; + lp->cisco_mineseen = your_seq; + break; + } +} + +static void +isdn_net_ciscohdlck_receive(isdn_net_local *lp, struct sk_buff *skb) +{ + unsigned char *p; + u8 addr; + u8 ctrl; + u16 type; + + if (skb->len < 4) + goto out_free; + + p = skb->data; + p += get_u8 (p, &addr); + p += get_u8 (p, &ctrl); + p += get_u16(p, &type); + skb_pull(skb, 4); + + if (addr != CISCO_ADDR_UNICAST && addr != CISCO_ADDR_BROADCAST) { + printk(KERN_WARNING "%s: Unknown Cisco addr 0x%02x\n", + lp->name, addr); + goto out_free; + } + if (ctrl != CISCO_CTRL) { + printk(KERN_WARNING "%s: Unknown Cisco ctrl 0x%02x\n", + lp->name, ctrl); + goto out_free; + } + + switch (type) { + case CISCO_TYPE_SLARP: + isdn_net_ciscohdlck_slarp_in(lp, skb); + goto out_free; + case CISCO_TYPE_CDP: + if (lp->cisco_debserint) + printk(KERN_DEBUG "%s: Received CDP packet. use " + "\"no cdp enable\" on cisco.\n", lp->name); + goto out_free; + default: + /* no special cisco protocol */ + skb->protocol = htons(type); + netif_rx(skb); + return; + } + + out_free: + kfree_skb(skb); +} + +/* + * Got a packet from ISDN-Channel. + */ +static void +isdn_net_receive(struct net_device *ndev, struct sk_buff *skb) +{ + isdn_net_local *lp = (isdn_net_local *) ndev->priv; + isdn_net_local *olp = lp; /* original 'lp' */ +#ifdef CONFIG_ISDN_X25 + struct concap_proto *cprot = lp -> netdev -> cprot; +#endif + lp->transcount += skb->len; + + lp->stats.rx_packets++; + lp->stats.rx_bytes += skb->len; + if (lp->master) { + /* Bundling: If device is a slave-device, deliver to master, also + * handle master's statistics and hangup-timeout + */ + ndev = lp->master; + lp = (isdn_net_local *) ndev->priv; + lp->stats.rx_packets++; + lp->stats.rx_bytes += skb->len; + } + skb->dev = ndev; + skb->pkt_type = PACKET_HOST; + skb->mac.raw = skb->data; +#ifdef ISDN_DEBUG_NET_DUMP + isdn_dumppkt("R:", skb->data, skb->len, 40); +#endif + switch (lp->p_encap) { + case ISDN_NET_ENCAP_ETHER: + /* Ethernet over ISDN */ + olp->huptimer = 0; + lp->huptimer = 0; + skb->protocol = isdn_net_type_trans(skb, ndev); + break; + case ISDN_NET_ENCAP_UIHDLC: + /* HDLC with UI-frame (for ispa with -h1 option) */ + olp->huptimer = 0; + lp->huptimer = 0; + skb_pull(skb, 2); + /* Fall through */ + case ISDN_NET_ENCAP_RAWIP: + /* RAW-IP without MAC-Header */ + olp->huptimer = 0; + lp->huptimer = 0; + skb->protocol = htons(ETH_P_IP); + break; + case ISDN_NET_ENCAP_CISCOHDLCK: + isdn_net_ciscohdlck_receive(lp, skb); + return; + case ISDN_NET_ENCAP_CISCOHDLC: + /* CISCO-HDLC IP with type field and fake I-frame-header */ + skb_pull(skb, 2); + /* Fall through */ + case ISDN_NET_ENCAP_IPTYP: + /* IP with type field */ + olp->huptimer = 0; + lp->huptimer = 0; + skb->protocol = *(unsigned short *) &(skb->data[0]); + skb_pull(skb, 2); + if (*(unsigned short *) skb->data == 0xFFFF) + skb->protocol = htons(ETH_P_802_3); + break; +#ifdef CONFIG_ISDN_PPP + case ISDN_NET_ENCAP_SYNCPPP: + /* huptimer is done in isdn_ppp_push_higher */ + isdn_ppp_receive(lp->netdev, olp, skb); + return; +#endif + + default: +#ifdef CONFIG_ISDN_X25 + /* try if there are generic sync_device receiver routines */ + if(cprot) if(cprot -> pops) + if( cprot -> pops -> data_ind){ + cprot -> pops -> data_ind(cprot,skb); + return; + }; +#endif /* CONFIG_ISDN_X25 */ + printk(KERN_WARNING "%s: unknown encapsulation, dropping\n", + lp->name); + kfree_skb(skb); + return; + } + netif_rx(skb); + return; } -struct isdn_netif_ops isdn_rawip_ops = { - .hard_start_xmit = isdn_net_start_xmit, - .flags = IFF_NOARP | IFF_POINTOPOINT, - .type = ARPHRD_PPP, - .receive = isdn_rawip_receive, -}; +/* + * A packet arrived via ISDN. Search interface-chain for a corresponding + * interface. If found, deliver packet to receiver-function and return 1, + * else return 0. + */ +int +isdn_net_rcv_skb(int idx, struct sk_buff *skb) +{ + isdn_net_dev *p = dev->rx_netdev[idx]; + + if (p) { + isdn_net_local *lp = p->local; + if ((lp->flags & ISDN_NET_CONNECTED) && + (!lp->dialstate)) { + isdn_net_receive(&p->dev, skb); + return 1; + } + } + return 0; +} + +static int +my_eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, + void *daddr, void *saddr, unsigned len) +{ + struct ethhdr *eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); + + /* + * Set the protocol type. For a packet of type ETH_P_802_3 we + * put the length here instead. It is up to the 802.2 layer to + * carry protocol information. + */ + + if (type != ETH_P_802_3) + eth->h_proto = htons(type); + else + eth->h_proto = htons(len); + + /* + * Set the source hardware address. + */ + if (saddr) + memcpy(eth->h_source, saddr, dev->addr_len); + else + memcpy(eth->h_source, dev->dev_addr, dev->addr_len); + + /* + * Anyway, the loopback-device should never use this function... + */ + + if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) { + memset(eth->h_dest, 0, dev->addr_len); + return ETH_HLEN /*(dev->hard_header_len)*/; + } + if (daddr) { + memcpy(eth->h_dest, daddr, dev->addr_len); + return ETH_HLEN /*dev->hard_header_len*/; + } + return -ETH_HLEN /*dev->hard_header_len*/; +} + +/* + * build an header + * depends on encaps that is being used. + */ + +static int +isdn_net_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, + void *daddr, void *saddr, unsigned plen) +{ + isdn_net_local *lp = dev->priv; + unsigned char *p; + ushort len = 0; + + switch (lp->p_encap) { + case ISDN_NET_ENCAP_ETHER: + len = my_eth_header(skb, dev, type, daddr, saddr, plen); + break; +#ifdef CONFIG_ISDN_PPP + case ISDN_NET_ENCAP_SYNCPPP: + /* stick on a fake header to keep fragmentation code happy. */ + len = IPPP_MAX_HEADER; + skb_push(skb,len); + break; +#endif + case ISDN_NET_ENCAP_RAWIP: + printk(KERN_WARNING "isdn_net_header called with RAW_IP!\n"); + len = 0; + break; + case ISDN_NET_ENCAP_IPTYP: + /* ethernet type field */ + *((ushort *) skb_push(skb, 2)) = htons(type); + len = 2; + break; + case ISDN_NET_ENCAP_UIHDLC: + /* HDLC with UI-Frames (for ispa with -h1 option) */ + *((ushort *) skb_push(skb, 2)) = htons(0x0103); + len = 2; + break; + case ISDN_NET_ENCAP_CISCOHDLC: + case ISDN_NET_ENCAP_CISCOHDLCK: + p = skb_push(skb, 4); + p += put_u8 (p, CISCO_ADDR_UNICAST); + p += put_u8 (p, CISCO_CTRL); + p += put_u16(p, type); + len = 4; + break; +#ifdef CONFIG_ISDN_X25 + default: + /* try if there are generic concap protocol routines */ + if( lp-> netdev -> cprot ){ + printk(KERN_WARNING "isdn_net_header called with concap_proto!\n"); + len = 0; + break; + } + break; +#endif /* CONFIG_ISDN_X25 */ + } + return len; +} + +/* We don't need to send arp, because we have point-to-point connections. */ +static int +isdn_net_rebuild_header(struct sk_buff *skb) +{ + struct net_device *dev = skb->dev; + isdn_net_local *lp = dev->priv; + int ret = 0; + + if (lp->p_encap == ISDN_NET_ENCAP_ETHER) { + struct ethhdr *eth = (struct ethhdr *) skb->data; + + /* + * Only ARP/IP is currently supported + */ + + if (eth->h_proto != htons(ETH_P_IP)) { + printk(KERN_WARNING + "isdn_net: %s don't know how to resolve type %d addresses?\n", + dev->name, (int) eth->h_proto); + memcpy(eth->h_source, dev->dev_addr, dev->addr_len); + return 0; + } + /* + * Try to get ARP to resolve the header. + */ +#ifdef CONFIG_INET + ret = arp_find(eth->h_dest, skb); +#endif + } + return ret; +} -// ISDN_NET_ENCAP_ETHER -// Ethernet over ISDN -// ====================================================================== +/* + * Interface-setup. (just after registering a new interface) + */ +static int +isdn_net_init(struct net_device *ndev) +{ + ushort max_hlhdr_len = 0; + isdn_net_local *lp = (isdn_net_local *) ndev->priv; + int drvidx, i; + + ether_setup(ndev); + lp->org_hhc = ndev->hard_header_cache; + lp->org_hcu = ndev->header_cache_update; + + /* Setup the generic properties */ + + ndev->hard_header = NULL; + ndev->hard_header_cache = NULL; + ndev->header_cache_update = NULL; + ndev->mtu = 1500; + ndev->flags = IFF_NOARP|IFF_POINTOPOINT; + ndev->type = ARPHRD_ETHER; + ndev->addr_len = ETH_ALEN; + + /* for clients with MPPP maybe higher values better */ + ndev->tx_queue_len = 30; + + for (i = 0; i < ETH_ALEN; i++) + ndev->broadcast[i] = 0xff; + + /* The ISDN-specific entries in the device structure. */ + ndev->open = &isdn_net_open; + ndev->hard_start_xmit = &isdn_net_start_xmit; + + /* + * up till binding we ask the protocol layer to reserve as much + * as we might need for HL layer + */ + + for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) + if (dev->drv[drvidx]) + if (max_hlhdr_len < dev->drv[drvidx]->interface->hl_hdrlen) + max_hlhdr_len = dev->drv[drvidx]->interface->hl_hdrlen; + + ndev->hard_header_len = ETH_HLEN + max_hlhdr_len; + ndev->stop = &isdn_net_close; + ndev->get_stats = &isdn_net_get_stats; + ndev->rebuild_header = &isdn_net_rebuild_header; + ndev->do_ioctl = NULL; + return 0; +} + +static void +isdn_net_swapbind(int drvidx) +{ + isdn_net_dev *p; + +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: swapping ch of %d\n", drvidx); +#endif + p = dev->netdev; + while (p) { + if (p->local->pre_device == drvidx) + switch (p->local->pre_channel) { + case 0: + p->local->pre_channel = 1; + break; + case 1: + p->local->pre_channel = 0; + break; + } + p = (isdn_net_dev *) p->next; + } +} static void -isdn_ether_receive(isdn_net_local *lp, isdn_net_dev *idev, - struct sk_buff *skb) +isdn_net_swap_usage(int i1, int i2) +{ + int u1 = dev->usage[i1] & ISDN_USAGE_EXCLUSIVE; + int u2 = dev->usage[i2] & ISDN_USAGE_EXCLUSIVE; + +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: usage of %d and %d\n", i1, i2); +#endif + dev->usage[i1] &= ~ISDN_USAGE_EXCLUSIVE; + dev->usage[i1] |= u2; + dev->usage[i2] &= ~ISDN_USAGE_EXCLUSIVE; + dev->usage[i2] |= u1; + isdn_info_update(); +} + +/* + * An incoming call-request has arrived. + * Search the interface-chain for an appropriate interface. + * If found, connect the interface to the ISDN-channel and initiate + * D- and B-Channel-setup. If secure-flag is set, accept only + * configured phone-numbers. If callback-flag is set, initiate + * callback-dialing. + * + * Return-Value: 0 = No appropriate interface for this call. + * 1 = Call accepted + * 2 = Reject call, wait cbdelay, then call back + * 3 = Reject call + * 4 = Wait cbdelay, then call back + * 5 = No appropriate interface for this call, + * would eventually match if CID was longer. + */ + +int +isdn_net_find_icall(int di, int ch, int idx, setup_parm *setup) { - isdn_netif_rx(idev, skb, eth_type_trans(skb, &lp->dev)); + char *eaz; + int si1; + int si2; + int ematch; + int wret; + int swapped; + int sidx = 0; + u_long flags; + isdn_net_dev *p; + isdn_net_phone *n; + char nr[32]; + char *my_eaz; + + /* Search name in netdev-chain */ + if (!setup->phone[0]) { + nr[0] = '0'; + nr[1] = '\0'; + printk(KERN_INFO "isdn_net: Incoming call without OAD, assuming '0'\n"); + } else + strcpy(nr, setup->phone); + si1 = (int) setup->si1; + si2 = (int) setup->si2; + if (!setup->eazmsn[0]) { + printk(KERN_WARNING "isdn_net: Incoming call without CPN, assuming '0'\n"); + eaz = "0"; + } else + eaz = setup->eazmsn; + if (dev->net_verbose > 1) + printk(KERN_INFO "isdn_net: call from %s,%d,%d -> %s\n", nr, si1, si2, eaz); + /* Accept DATA and VOICE calls at this stage + * local eaz is checked later for allowed call types + */ + if ((si1 != 7) && (si1 != 1)) { + if (dev->net_verbose > 1) + printk(KERN_INFO "isdn_net: Service-Indicator not 1 or 7, ignored\n"); + return 0; + } + n = (isdn_net_phone *) 0; + p = dev->netdev; + ematch = wret = swapped = 0; +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: di=%d ch=%d idx=%d usg=%d\n", di, ch, idx, + dev->usage[idx]); +#endif + while (p) { + int matchret; + isdn_net_local *lp = p->local; + + /* If last check has triggered as binding-swap, revert it */ + switch (swapped) { + case 2: + isdn_net_swap_usage(idx, sidx); + /* fall through */ + case 1: + isdn_net_swapbind(di); + break; + } + swapped = 0; + /* check acceptable call types for DOV */ + my_eaz = isdn_map_eaz2msn(lp->msn, di); + if (si1 == 1) { /* it's a DOV call, check if we allow it */ + if (*my_eaz == 'v' || *my_eaz == 'V' || + *my_eaz == 'b' || *my_eaz == 'B') + my_eaz++; /* skip to allow a match */ + else + my_eaz = 0; /* force non match */ + } else { /* it's a DATA call, check if we allow it */ + if (*my_eaz == 'b' || *my_eaz == 'B') + my_eaz++; /* skip to allow a match */ + } + if (my_eaz) + matchret = isdn_msncmp(eaz, my_eaz); + else + matchret = 1; + if (!matchret) + ematch = 1; + + /* Remember if more numbers eventually can match */ + if (matchret > wret) + wret = matchret; +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: if='%s', l.msn=%s, l.flags=%d, l.dstate=%d\n", + lp->name, lp->msn, lp->flags, lp->dialstate); +#endif + if ((!matchret) && /* EAZ is matching */ + (((!(lp->flags & ISDN_NET_CONNECTED)) && /* but not connected */ + (USG_NONE(dev->usage[idx]))) || /* and ch. unused or */ + ((((lp->dialstate == 4) || (lp->dialstate == 12)) && /* if dialing */ + (!(lp->flags & ISDN_NET_CALLBACK))) /* but no callback */ + ))) + { +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: match1, pdev=%d pch=%d\n", + lp->pre_device, lp->pre_channel); +#endif + if (dev->usage[idx] & ISDN_USAGE_EXCLUSIVE) { + if ((lp->pre_channel != ch) || + (lp->pre_device != di)) { + /* Here we got a problem: + * If using an ICN-Card, an incoming call is always signaled on + * on the first channel of the card, if both channels are + * down. However this channel may be bound exclusive. If the + * second channel is free, this call should be accepted. + * The solution is horribly but it runs, so what: + * We exchange the exclusive bindings of the two channels, the + * corresponding variables in the interface-structs. + */ + if (ch == 0) { + sidx = isdn_dc2minor(di, 1); +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: ch is 0\n"); +#endif + if (USG_NONE(dev->usage[sidx])) { + /* Second Channel is free, now see if it is bound + * exclusive too. */ + if (dev->usage[sidx] & ISDN_USAGE_EXCLUSIVE) { +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: 2nd channel is down and bound\n"); +#endif + /* Yes, swap bindings only, if the original + * binding is bound to channel 1 of this driver */ + if ((lp->pre_device == di) && + (lp->pre_channel == 1)) { + isdn_net_swapbind(di); + swapped = 1; + } else { + /* ... else iterate next device */ + p = (isdn_net_dev *) p->next; + continue; + } + } else { +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: 2nd channel is down and unbound\n"); +#endif + /* No, swap always and swap excl-usage also */ + isdn_net_swap_usage(idx, sidx); + isdn_net_swapbind(di); + swapped = 2; + } + /* Now check for exclusive binding again */ +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: final check\n"); +#endif + if ((dev->usage[idx] & ISDN_USAGE_EXCLUSIVE) && + ((lp->pre_channel != ch) || + (lp->pre_device != di))) { +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: final check failed\n"); +#endif + p = (isdn_net_dev *) p->next; + continue; + } + } + } else { + /* We are already on the second channel, so nothing to do */ +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: already on 2nd channel\n"); +#endif + } + } + } +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: match2\n"); +#endif + n = lp->phone[0]; + if (lp->flags & ISDN_NET_SECURE) { + while (n) { + if (!isdn_msncmp(nr, n->num)) + break; + n = (isdn_net_phone *) n->next; + } + } + if (n || (!(lp->flags & ISDN_NET_SECURE))) { +#ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: match3\n"); +#endif + /* matching interface found */ + + /* + * Is the state STOPPED? + * If so, no dialin is allowed, + * so reject actively. + * */ + if (ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_OFF) { + printk(KERN_INFO "incoming call, interface %s `stopped' -> rejected\n", + lp->name); + return 3; + } + /* + * Is the interface up? + * If not, reject the call actively. + */ + if (!isdn_net_device_started(p)) { + printk(KERN_INFO "%s: incoming call, interface down -> rejected\n", + lp->name); + return 3; + } + /* Interface is up, now see if it's a slave. If so, see if + * it's master and parent slave is online. If not, reject the call. + */ + if (lp->master) { + isdn_net_local *mlp = (isdn_net_local *) lp->master->priv; + printk(KERN_DEBUG "ICALLslv: %s\n", lp->name); + printk(KERN_DEBUG "master=%s\n", mlp->name); + if (mlp->flags & ISDN_NET_CONNECTED) { + printk(KERN_DEBUG "master online\n"); + /* Master is online, find parent-slave (master if first slave) */ + while (mlp->slave) { + if ((isdn_net_local *) mlp->slave->priv == lp) + break; + mlp = (isdn_net_local *) mlp->slave->priv; + } + } else + printk(KERN_DEBUG "master offline\n"); + /* Found parent, if it's offline iterate next device */ + printk(KERN_DEBUG "mlpf: %d\n", mlp->flags & ISDN_NET_CONNECTED); + if (!(mlp->flags & ISDN_NET_CONNECTED)) { + p = (isdn_net_dev *) p->next; + continue; + } + } + if (lp->flags & ISDN_NET_CALLBACK) { + int chi; + /* + * Is the state MANUAL? + * If so, no callback can be made, + * so reject actively. + * */ + if (ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_OFF) { + printk(KERN_INFO "incoming call for callback, interface %s `off' -> rejected\n", + lp->name); + return 3; + } + printk(KERN_DEBUG "%s: call from %s -> %s, start callback\n", + lp->name, nr, eaz); + if (lp->phone[1]) { + /* Grab a free ISDN-Channel */ + spin_lock_irqsave(&dev->lock, flags); + if ((chi = + isdn_get_free_channel( + ISDN_USAGE_NET, + lp->l2_proto, + lp->l3_proto, + lp->pre_device, + lp->pre_channel, + lp->msn) + ) < 0) { + + printk(KERN_WARNING "isdn_net_find_icall: No channel for %s\n", lp->name); + spin_unlock_irqrestore(&dev->lock, flags); + return 0; + } + /* Setup dialstate. */ + lp->dtimer = 0; + lp->dialstate = 11; + /* Connect interface with channel */ + isdn_net_bind_channel(lp, chi); +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) + if (isdn_ppp_bind(lp) < 0) { + spin_unlock_irqrestore(&dev->lock, flags); + isdn_net_unbind_channel(lp); + return 0; + } +#endif + spin_unlock_irqrestore(&dev->lock, flags); + /* Initiate dialing by returning 2 or 4 */ + return (lp->flags & ISDN_NET_CBHUP) ? 2 : 4; + } else + printk(KERN_WARNING "isdn_net: %s: No phone number\n", lp->name); + return 0; + } else { + printk(KERN_DEBUG "%s: call from %s -> %s accepted\n", lp->name, nr, + eaz); + /* if this interface is dialing, it does it probably on a different + device, so free this device */ + if ((lp->dialstate == 4) || (lp->dialstate == 12)) { +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) + isdn_ppp_free(lp); +#endif + isdn_net_lp_disconnected(lp); + isdn_free_channel(lp->isdn_device, lp->isdn_channel, + ISDN_USAGE_NET); + } + spin_lock_irqsave(&dev->lock, flags); + dev->usage[idx] &= ISDN_USAGE_EXCLUSIVE; + dev->usage[idx] |= ISDN_USAGE_NET; + strcpy(dev->num[idx], nr); + isdn_info_update(); + dev->st_netdev[idx] = lp->netdev; + lp->isdn_device = di; + lp->isdn_channel = ch; + lp->ppp_slot = -1; + lp->flags |= ISDN_NET_CONNECTED; + lp->dialstate = 7; + lp->dtimer = 0; + lp->outgoing = 0; + lp->huptimer = 0; + lp->hupflags |= ISDN_WAITCHARGE; + lp->hupflags &= ~ISDN_HAVECHARGE; +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) { + if (isdn_ppp_bind(lp) < 0) { + isdn_net_unbind_channel(lp); + spin_unlock_irqrestore(&dev->lock, flags); + return 0; + } + } +#endif + spin_unlock_irqrestore(&dev->lock, flags); + return 1; + } + } + } + p = (isdn_net_dev *) p->next; + } + /* If none of configured EAZ/MSN matched and not verbose, be silent */ + if (!ematch || dev->net_verbose) + printk(KERN_INFO "isdn_net: call from %s -> %d %s ignored\n", nr, di, eaz); + return (wret == 2)?5:0; } +/* + * Search list of net-interfaces for an interface with given name. + */ +isdn_net_dev * +isdn_net_findif(char *name) +{ + isdn_net_dev *p = dev->netdev; + + while (p) { + if (!strcmp(p->local->name, name)) + return p; + p = (isdn_net_dev *) p->next; + } + return (isdn_net_dev *) NULL; +} + +/* + * Force a net-interface to dial out. + * This is called from the userlevel-routine below or + * from isdn_net_start_xmit(). + */ +int +isdn_net_force_dial_lp(isdn_net_local * lp) +{ + if ((!(lp->flags & ISDN_NET_CONNECTED)) && !lp->dialstate) { + int chi; + if (lp->phone[1]) { + ulong flags; + + /* Grab a free ISDN-Channel */ + spin_lock_irqsave(&dev->lock, flags); + if ((chi = isdn_get_free_channel( + ISDN_USAGE_NET, + lp->l2_proto, + lp->l3_proto, + lp->pre_device, + lp->pre_channel, + lp->msn)) < 0) { + printk(KERN_WARNING "isdn_net_force_dial: No channel for %s\n", lp->name); + spin_unlock_irqrestore(&dev->lock, flags); + return -EAGAIN; + } + lp->dialstate = 1; + /* Connect interface with channel */ + isdn_net_bind_channel(lp, chi); +#ifdef CONFIG_ISDN_PPP + if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) + if (isdn_ppp_bind(lp) < 0) { + isdn_net_unbind_channel(lp); + spin_unlock_irqrestore(&dev->lock, flags); + return -EAGAIN; + } +#endif + /* Initiate dialing */ + spin_unlock_irqrestore(&dev->lock, flags); + isdn_net_dial(); + return 0; + } else + return -EINVAL; + } else + return -EBUSY; +} + +/* + * This is called from certain upper protocol layers (multilink ppp + * and x25iface encapsulation module) that want to initiate dialing + * themselves. + */ +int +isdn_net_dial_req(isdn_net_local * lp) +{ + /* is there a better error code? */ + if (!(ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_AUTO)) return -EBUSY; + + return isdn_net_force_dial_lp(lp); +} + +/* + * Force a net-interface to dial out. + * This is always called from within userspace (ISDN_IOCTL_NET_DIAL). + */ +int +isdn_net_force_dial(char *name) +{ + isdn_net_dev *p = isdn_net_findif(name); + + if (!p) + return -ENODEV; + return (isdn_net_force_dial_lp(p->local)); +} + +/* + * Allocate a new network-interface and initialize its data structures. + */ +char * +isdn_net_new(char *name, struct net_device *master) +{ + isdn_net_dev *netdev; + + /* Avoid creating an existing interface */ + if (isdn_net_findif(name)) { + printk(KERN_WARNING "isdn_net: interface %s already exists\n", name); + return NULL; + } + if (!(netdev = (isdn_net_dev *) kmalloc(sizeof(isdn_net_dev), GFP_KERNEL))) { + printk(KERN_WARNING "isdn_net: Could not allocate net-device\n"); + return NULL; + } + memset(netdev, 0, sizeof(isdn_net_dev)); + if (!(netdev->local = (isdn_net_local *) kmalloc(sizeof(isdn_net_local), GFP_KERNEL))) { + printk(KERN_WARNING "isdn_net: Could not allocate device locals\n"); + kfree(netdev); + return NULL; + } + memset(netdev->local, 0, sizeof(isdn_net_local)); + if (name == NULL) + strcpy(netdev->local->name, " "); + else + strcpy(netdev->local->name, name); + strcpy(netdev->dev.name, netdev->local->name); + netdev->dev.priv = netdev->local; + netdev->dev.init = isdn_net_init; + netdev->local->p_encap = ISDN_NET_ENCAP_RAWIP; + if (master) { + /* Device shall be a slave */ + struct net_device *p = (((isdn_net_local *) master->priv)->slave); + struct net_device *q = master; + + netdev->local->master = master; + /* Put device at end of slave-chain */ + while (p) { + q = p; + p = (((isdn_net_local *) p->priv)->slave); + } + ((isdn_net_local *) q->priv)->slave = &(netdev->dev); + } else { + /* Device shall be a master */ + /* + * Watchdog timer (currently) for master only. + */ + netdev->dev.tx_timeout = isdn_net_tx_timeout; + netdev->dev.watchdog_timeo = ISDN_NET_TX_TIMEOUT; + if (register_netdev(&netdev->dev) != 0) { + printk(KERN_WARNING "isdn_net: Could not register net-device\n"); + kfree(netdev->local); + kfree(netdev); + return NULL; + } + } + netdev->local->magic = ISDN_NET_MAGIC; + + netdev->queue = netdev->local; + spin_lock_init(&netdev->queue_lock); + + netdev->local->last = netdev->local; + netdev->local->netdev = netdev; + netdev->local->next = netdev->local; + + INIT_WORK(&netdev->local->tqueue, (void *)(void *) isdn_net_softint, netdev->local); + spin_lock_init(&netdev->local->xmit_lock); + + netdev->local->isdn_device = -1; + netdev->local->isdn_channel = -1; + netdev->local->pre_device = -1; + netdev->local->pre_channel = -1; + netdev->local->exclusive = -1; + netdev->local->ppp_slot = -1; + netdev->local->pppbind = -1; + skb_queue_head_init(&netdev->local->super_tx_queue); + netdev->local->l2_proto = ISDN_PROTO_L2_X75I; + netdev->local->l3_proto = ISDN_PROTO_L3_TRANS; + netdev->local->triggercps = 6000; + netdev->local->slavedelay = 10 * HZ; + netdev->local->hupflags = ISDN_INHUP; /* Do hangup even on incoming calls */ + netdev->local->onhtime = 10; /* Default hangup-time for saving costs + of those who forget configuring this */ + netdev->local->dialmax = 1; + netdev->local->flags = ISDN_NET_CBHUP | ISDN_NET_DM_MANUAL; /* Hangup before Callback, manual dial */ + netdev->local->cbdelay = 25; /* Wait 5 secs before Callback */ + netdev->local->dialtimeout = -1; /* Infinite Dial-Timeout */ + netdev->local->dialwait = 5 * HZ; /* Wait 5 sec. after failed dial */ + netdev->local->dialstarted = 0; /* Jiffies of last dial-start */ + netdev->local->dialwait_timer = 0; /* Jiffies of earliest next dial-start */ + + /* Put into to netdev-chain */ + netdev->next = (void *) dev->netdev; + dev->netdev = netdev; + return netdev->dev.name; +} + +char * +isdn_net_newslave(char *parm) +{ + char *p = strchr(parm, ','); + isdn_net_dev *n; + char newname[10]; + + if (p) { + /* Slave-Name MUST not be empty */ + if (!strlen(p + 1)) + return NULL; + strcpy(newname, p + 1); + *p = 0; + /* Master must already exist */ + if (!(n = isdn_net_findif(parm))) + return NULL; + /* Master must be a real interface, not a slave */ + if (n->local->master) + return NULL; + /* Master must not be started yet */ + if (isdn_net_device_started(n)) + return NULL; + return (isdn_net_new(newname, &(n->dev))); + } + return NULL; +} + +/* + * Set interface-parameters. + * Always set all parameters, so the user-level application is responsible + * for not overwriting existing setups. It has to get the current + * setup first, if only selected parameters are to be changed. + */ +int +isdn_net_setcfg(isdn_net_ioctl_cfg * cfg) +{ + isdn_net_dev *p = isdn_net_findif(cfg->name); + ulong features; + int i; + int drvidx; + int chidx; + char drvid[25]; + + if (p) { + isdn_net_local *lp = p->local; + + /* See if any registered driver supports the features we want */ + features = ((1 << cfg->l2_proto) << ISDN_FEATURE_L2_SHIFT) | + ((1 << cfg->l3_proto) << ISDN_FEATURE_L3_SHIFT); + for (i = 0; i < ISDN_MAX_DRIVERS; i++) + if (dev->drv[i]) + if ((dev->drv[i]->interface->features & features) == features) + break; + if (i == ISDN_MAX_DRIVERS) { + printk(KERN_WARNING "isdn_net: No driver with selected features\n"); + return -ENODEV; + } + if (lp->p_encap != cfg->p_encap){ +#ifdef CONFIG_ISDN_X25 + struct concap_proto * cprot = p -> cprot; +#endif + if (isdn_net_device_started(p)) { + printk(KERN_WARNING "%s: cannot change encap when if is up\n", + lp->name); + return -EBUSY; + } +#ifdef CONFIG_ISDN_X25 + if( cprot && cprot -> pops ) + cprot -> pops -> proto_del ( cprot ); + p -> cprot = NULL; + lp -> dops = NULL; + /* ... , prepare for configuration of new one ... */ + switch ( cfg -> p_encap ){ + case ISDN_NET_ENCAP_X25IFACE: + lp -> dops = &isdn_concap_reliable_dl_dops; + } + /* ... and allocate new one ... */ + p -> cprot = isdn_concap_new( cfg -> p_encap ); + /* p -> cprot == NULL now if p_encap is not supported + by means of the concap_proto mechanism */ + /* the protocol is not configured yet; this will + happen later when isdn_net_reset() is called */ +#endif + } + switch ( cfg->p_encap ) { + case ISDN_NET_ENCAP_SYNCPPP: +#ifndef CONFIG_ISDN_PPP + printk(KERN_WARNING "%s: SyncPPP support not configured\n", + lp->name); + return -EINVAL; +#else + p->dev.type = ARPHRD_PPP; /* change ARP type */ + p->dev.addr_len = 0; + p->dev.do_ioctl = isdn_ppp_dev_ioctl; +#endif + break; + case ISDN_NET_ENCAP_X25IFACE: +#ifndef CONFIG_ISDN_X25 + printk(KERN_WARNING "%s: isdn-x25 support not configured\n", + p->local->name); + return -EINVAL; +#else + p->dev.type = ARPHRD_X25; /* change ARP type */ + p->dev.addr_len = 0; +#endif + break; + case ISDN_NET_ENCAP_CISCOHDLCK: + p->dev.do_ioctl = isdn_ciscohdlck_dev_ioctl; + break; + default: + if( cfg->p_encap >= 0 && + cfg->p_encap <= ISDN_NET_ENCAP_MAX_ENCAP ) + break; + printk(KERN_WARNING + "%s: encapsulation protocol %d not supported\n", + p->local->name, cfg->p_encap); + return -EINVAL; + } + if (strlen(cfg->drvid)) { + /* A bind has been requested ... */ + char *c, + *e; + + drvidx = -1; + chidx = -1; + strcpy(drvid, cfg->drvid); + if ((c = strchr(drvid, ','))) { + /* The channel-number is appended to the driver-Id with a comma */ + chidx = (int) simple_strtoul(c + 1, &e, 10); + if (e == c) + chidx = -1; + *c = '\0'; + } + for (i = 0; i < ISDN_MAX_DRIVERS; i++) + /* Lookup driver-Id in array */ + if (!(strcmp(dev->drvid[i], drvid))) { + drvidx = i; + break; + } + if ((drvidx == -1) || (chidx == -1)) + /* Either driver-Id or channel-number invalid */ + return -ENODEV; + } else { + /* Parameters are valid, so get them */ + drvidx = lp->pre_device; + chidx = lp->pre_channel; + } + if (cfg->exclusive > 0) { + unsigned long flags; + + /* If binding is exclusive, try to grab the channel */ + spin_lock_irqsave(&dev->lock, flags); + if ((i = isdn_get_free_channel(ISDN_USAGE_NET, + lp->l2_proto, lp->l3_proto, drvidx, + chidx, lp->msn)) < 0) { + /* Grab failed, because desired channel is in use */ + lp->exclusive = -1; + spin_unlock_irqrestore(&dev->lock, flags); + return -EBUSY; + } + /* All went ok, so update isdninfo */ + dev->usage[i] = ISDN_USAGE_EXCLUSIVE; + isdn_info_update(); + spin_unlock_irqrestore(&dev->lock, flags); + lp->exclusive = i; + } else { + /* Non-exclusive binding or unbind. */ + lp->exclusive = -1; + if ((lp->pre_device != -1) && (cfg->exclusive == -1)) { + isdn_unexclusive_channel(lp->pre_device, lp->pre_channel); + isdn_free_channel(lp->pre_device, lp->pre_channel, ISDN_USAGE_NET); + drvidx = -1; + chidx = -1; + } + } + strcpy(lp->msn, cfg->eaz); + lp->pre_device = drvidx; + lp->pre_channel = chidx; + lp->onhtime = cfg->onhtime; + lp->charge = cfg->charge; + lp->l2_proto = cfg->l2_proto; + lp->l3_proto = cfg->l3_proto; + lp->cbdelay = cfg->cbdelay; + lp->dialmax = cfg->dialmax; + lp->triggercps = cfg->triggercps; + lp->slavedelay = cfg->slavedelay * HZ; + lp->pppbind = cfg->pppbind; + lp->dialtimeout = cfg->dialtimeout >= 0 ? cfg->dialtimeout * HZ : -1; + lp->dialwait = cfg->dialwait * HZ; + if (cfg->secure) + lp->flags |= ISDN_NET_SECURE; + else + lp->flags &= ~ISDN_NET_SECURE; + if (cfg->cbhup) + lp->flags |= ISDN_NET_CBHUP; + else + lp->flags &= ~ISDN_NET_CBHUP; + switch (cfg->callback) { + case 0: + lp->flags &= ~(ISDN_NET_CALLBACK | ISDN_NET_CBOUT); + break; + case 1: + lp->flags |= ISDN_NET_CALLBACK; + lp->flags &= ~ISDN_NET_CBOUT; + break; + case 2: + lp->flags |= ISDN_NET_CBOUT; + lp->flags &= ~ISDN_NET_CALLBACK; + break; + } + lp->flags &= ~ISDN_NET_DIALMODE_MASK; /* first all bits off */ + if (cfg->dialmode && !(cfg->dialmode & ISDN_NET_DIALMODE_MASK)) { + /* old isdnctrl version, where only 0 or 1 is given */ + printk(KERN_WARNING + "Old isdnctrl version detected! Please update.\n"); + lp->flags |= ISDN_NET_DM_OFF; /* turn on `off' bit */ + } + else { + lp->flags |= cfg->dialmode; /* turn on selected bits */ + } + if (cfg->chargehup) + lp->hupflags |= ISDN_CHARGEHUP; + else + lp->hupflags &= ~ISDN_CHARGEHUP; + if (cfg->ihup) + lp->hupflags |= ISDN_INHUP; + else + lp->hupflags &= ~ISDN_INHUP; + if (cfg->chargeint > 10) { + lp->hupflags |= ISDN_CHARGEHUP | ISDN_HAVECHARGE | ISDN_MANCHARGE; + lp->chargeint = cfg->chargeint * HZ; + } + if (cfg->p_encap != lp->p_encap) { + if (cfg->p_encap == ISDN_NET_ENCAP_RAWIP) { + p->dev.hard_header = NULL; + p->dev.hard_header_cache = NULL; + p->dev.header_cache_update = NULL; + p->dev.flags = IFF_NOARP|IFF_POINTOPOINT; + } else { + p->dev.hard_header = isdn_net_header; + if (cfg->p_encap == ISDN_NET_ENCAP_ETHER) { + p->dev.hard_header_cache = lp->org_hhc; + p->dev.header_cache_update = lp->org_hcu; + p->dev.flags = IFF_BROADCAST | IFF_MULTICAST; + } else { + p->dev.hard_header_cache = NULL; + p->dev.header_cache_update = NULL; + p->dev.flags = IFF_NOARP|IFF_POINTOPOINT; + } + } + } + lp->p_encap = cfg->p_encap; + return 0; + } + return -ENODEV; +} + +/* + * Perform get-interface-parameters.ioctl + */ +int +isdn_net_getcfg(isdn_net_ioctl_cfg * cfg) +{ + isdn_net_dev *p = isdn_net_findif(cfg->name); + + if (p) { + isdn_net_local *lp = p->local; + + strcpy(cfg->eaz, lp->msn); + cfg->exclusive = lp->exclusive; + if (lp->pre_device >= 0) { + sprintf(cfg->drvid, "%s,%d", dev->drvid[lp->pre_device], + lp->pre_channel); + } else + cfg->drvid[0] = '\0'; + cfg->onhtime = lp->onhtime; + cfg->charge = lp->charge; + cfg->l2_proto = lp->l2_proto; + cfg->l3_proto = lp->l3_proto; + cfg->p_encap = lp->p_encap; + cfg->secure = (lp->flags & ISDN_NET_SECURE) ? 1 : 0; + cfg->callback = 0; + if (lp->flags & ISDN_NET_CALLBACK) + cfg->callback = 1; + if (lp->flags & ISDN_NET_CBOUT) + cfg->callback = 2; + cfg->cbhup = (lp->flags & ISDN_NET_CBHUP) ? 1 : 0; + cfg->dialmode = lp->flags & ISDN_NET_DIALMODE_MASK; + cfg->chargehup = (lp->hupflags & 4) ? 1 : 0; + cfg->ihup = (lp->hupflags & 8) ? 1 : 0; + cfg->cbdelay = lp->cbdelay; + cfg->dialmax = lp->dialmax; + cfg->triggercps = lp->triggercps; + cfg->slavedelay = lp->slavedelay / HZ; + cfg->chargeint = (lp->hupflags & ISDN_CHARGEHUP) ? + (lp->chargeint / HZ) : 0; + cfg->pppbind = lp->pppbind; + cfg->dialtimeout = lp->dialtimeout >= 0 ? lp->dialtimeout / HZ : -1; + cfg->dialwait = lp->dialwait / HZ; + if (lp->slave) + strcpy(cfg->slave, ((isdn_net_local *) lp->slave->priv)->name); + else + cfg->slave[0] = '\0'; + if (lp->master) + strcpy(cfg->master, ((isdn_net_local *) lp->master->priv)->name); + else + cfg->master[0] = '\0'; + return 0; + } + return -ENODEV; +} + +/* + * Add a phone-number to an interface. + */ +int +isdn_net_addphone(isdn_net_ioctl_phone * phone) +{ + isdn_net_dev *p = isdn_net_findif(phone->name); + isdn_net_phone *n; + + if (p) { + if (!(n = (isdn_net_phone *) kmalloc(sizeof(isdn_net_phone), GFP_KERNEL))) + return -ENOMEM; + strcpy(n->num, phone->phone); + n->next = p->local->phone[phone->outgoing & 1]; + p->local->phone[phone->outgoing & 1] = n; + return 0; + } + return -ENODEV; +} + +/* + * Copy a string of all phone-numbers of an interface to user space. + * This might sleep and must be called with the isdn semaphore down. + */ +int +isdn_net_getphones(isdn_net_ioctl_phone * phone, char *phones) +{ + isdn_net_dev *p = isdn_net_findif(phone->name); + int inout = phone->outgoing & 1; + int more = 0; + int count = 0; + isdn_net_phone *n; + + if (!p) + return -ENODEV; + inout &= 1; + for (n = p->local->phone[inout]; n; n = n->next) { + if (more) { + put_user(' ', phones++); + count++; + } + if (copy_to_user(phones, n->num, strlen(n->num) + 1)) { + return -EFAULT; + } + phones += strlen(n->num); + count += strlen(n->num); + more = 1; + } + put_user(0, phones); + count++; + return count; +} + +/* + * Copy a string containing the peer's phone number of a connected interface + * to user space. + */ +int +isdn_net_getpeer(isdn_net_ioctl_phone *phone, isdn_net_ioctl_phone *peer) +{ + isdn_net_dev *p = isdn_net_findif(phone->name); + int ch, dv, idx; + + if (!p) return -ENODEV; + /* + * Theoretical race: while this executes, the remote number might + * become invalid (hang up) or change (new connection), resulting + * in (partially) wrong number copied to user. This race + * currently ignored. + */ + ch = p->local->isdn_channel; + dv = p->local->isdn_device; + if(ch<0 && dv<0) return -ENOTCONN; + idx = isdn_dc2minor(dv, ch); + if (idx<0) return -ENODEV; + /* for pre-bound channels, we need this extra check */ + if ( strncmp(dev->num[idx],"???",3) == 0 ) return -ENOTCONN; + strncpy(phone->phone,dev->num[idx],ISDN_MSNLEN); + phone->outgoing=USG_OUTGOING(dev->usage[idx]); + if ( copy_to_user(peer,phone,sizeof(*peer)) ) return -EFAULT; + return 0; +} +/* + * Delete a phone-number from an interface. + */ +int +isdn_net_delphone(isdn_net_ioctl_phone * phone) +{ + isdn_net_dev *p = isdn_net_findif(phone->name); + int inout = phone->outgoing & 1; + isdn_net_phone *n; + isdn_net_phone *m; + + if (p) { + n = p->local->phone[inout]; + m = NULL; + while (n) { + if (!strcmp(n->num, phone->phone)) { + if (p->local->dial == n) + p->local->dial = n->next; + if (m) + m->next = n->next; + else + p->local->phone[inout] = n->next; + kfree(n); + return 0; + } + m = n; + n = (isdn_net_phone *) n->next; + } + return -EINVAL; + } + return -ENODEV; +} + +/* + * Delete all phone-numbers of an interface. + */ static int -isdn_ether_open(isdn_net_local *lp) +isdn_net_rmallphone(isdn_net_dev * p) { - struct net_device *dev = &lp->dev; - struct in_device *in_dev; + isdn_net_phone *n; + isdn_net_phone *m; int i; - /* Fill in the MAC-level header ... */ - for (i = 0; i < ETH_ALEN; i++) - dev->dev_addr[i] = 0xfc; - in_dev = dev->ip_ptr; - if (in_dev) { - /* any address will do - we take the first */ - struct in_ifaddr *ifa = in_dev->ifa_list; - if (ifa) - memcpy(dev->dev_addr+2, &ifa->ifa_local, 4); + for (i = 0; i < 2; i++) { + n = p->local->phone[i]; + while (n) { + m = n->next; + kfree(n); + n = m; + } + p->local->phone[i] = NULL; } + p->local->dial = NULL; return 0; } +/* + * Force a hangup of a network-interface. + */ +int +isdn_net_force_hangup(char *name) +{ + isdn_net_dev *p = isdn_net_findif(name); + struct net_device *q; + + if (p) { + if (p->local->isdn_device < 0) + return 1; + q = p->local->slave; + /* If this interface has slaves, do a hangup for them also. */ + while (q) { + isdn_net_hangup(q); + q = (((isdn_net_local *) q->priv)->slave); + } + isdn_net_hangup(&p->dev); + return 0; + } + return -ENODEV; +} + +/* + * Helper-function for isdn_net_rm: Do the real work. + */ static int -isdn_ether_init(isdn_net_local *lp) +isdn_net_realrm(isdn_net_dev * p, isdn_net_dev * q) { - struct net_device *dev = &lp->dev; + u_long flags; - ether_setup(dev); - dev->tx_queue_len = 10; - dev->hard_header_len += isdn_hard_header_len(); + if (isdn_net_device_started(p)) { + return -EBUSY; + } +#ifdef CONFIG_ISDN_X25 + if( p -> cprot && p -> cprot -> pops ) + p -> cprot -> pops -> proto_del ( p -> cprot ); +#endif + /* Free all phone-entries */ + isdn_net_rmallphone(p); + /* If interface is bound exclusive, free channel-usage */ + if (p->local->exclusive != -1) + isdn_unexclusive_channel(p->local->pre_device, p->local->pre_channel); + if (p->local->master) { + /* It's a slave-device, so update master's slave-pointer if necessary */ + if (((isdn_net_local *) (p->local->master->priv))->slave == &p->dev) + ((isdn_net_local *) (p->local->master->priv))->slave = p->local->slave; + } else { + /* Unregister only if it's a master-device */ + p->dev.hard_header_cache = p->local->org_hhc; + p->dev.header_cache_update = p->local->org_hcu; + unregister_netdev(&p->dev); + } + /* Unlink device from chain */ + spin_lock_irqsave(&dev->lock, flags); + if (q) + q->next = p->next; + else + dev->netdev = p->next; + if (p->local->slave) { + /* If this interface has a slave, remove it also */ + char *slavename = ((isdn_net_local *) (p->local->slave->priv))->name; + isdn_net_dev *n = dev->netdev; + q = NULL; + while (n) { + if (!strcmp(n->local->name, slavename)) { + spin_unlock_irqrestore(&dev->lock, flags); + isdn_net_realrm(n, q); + spin_lock_irqsave(&dev->lock, flags); + break; + } + q = n; + n = (isdn_net_dev *) n->next; + } + } + spin_unlock_irqrestore(&dev->lock, flags); + /* If no more net-devices remain, disable auto-hangup timer */ + if (dev->netdev == NULL) + isdn_timer_ctrl(ISDN_TIMER_NETHANGUP, 0); + kfree(p->local); + kfree(p); return 0; } -struct isdn_netif_ops isdn_ether_ops = { - .hard_start_xmit = isdn_net_start_xmit, - .receive = isdn_ether_receive, - .init = isdn_ether_init, - .open = isdn_ether_open, -}; +/* + * Remove a single network-interface. + */ +int +isdn_net_rm(char *name) +{ + u_long flags; + isdn_net_dev *p; + isdn_net_dev *q; + + /* Search name in netdev-chain */ + spin_lock_irqsave(&dev->lock, flags); + p = dev->netdev; + q = NULL; + while (p) { + if (!strcmp(p->local->name, name)) { + spin_unlock_irqrestore(&dev->lock, flags); + return (isdn_net_realrm(p, q)); + } + q = p; + p = (isdn_net_dev *) p->next; + } + spin_unlock_irqrestore(&dev->lock, flags); + /* If no more net-devices remain, disable auto-hangup timer */ + if (dev->netdev == NULL) + isdn_timer_ctrl(ISDN_TIMER_NETHANGUP, 0); + return -ENODEV; +} + +/* + * Remove all network-interfaces + */ +int +isdn_net_rmall(void) +{ + u_long flags; + int ret; + + /* Walk through netdev-chain */ + spin_lock_irqsave(&dev->lock, flags); + while (dev->netdev) { + if (!dev->netdev->local->master) { + /* Remove master-devices only, slaves get removed with their master */ + spin_unlock_irqrestore(&dev->lock, flags); + if ((ret = isdn_net_realrm(dev->netdev, NULL))) { + return ret; + } + spin_lock_irqsave(&dev->lock, flags); + } + } + dev->netdev = NULL; + spin_unlock_irqrestore(&dev->lock, flags); + return 0; +} diff -Nru a/drivers/isdn/i4l/isdn_net.h b/drivers/isdn/i4l/isdn_net.h --- a/drivers/isdn/i4l/isdn_net.h Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/i4l/isdn_net.h Thu Feb 19 23:44:27 2004 @@ -1,15 +1,189 @@ -/* Linux ISDN subsystem, network related functions +/* $Id: isdn_net.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * header for Linux ISDN subsystem, network related functions (linklevel). * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-2002 by Kai Germaschewski + * Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg + * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * + */ + + /* Definitions for hupflags: */ +#define ISDN_WAITCHARGE 1 /* did not get a charge info yet */ +#define ISDN_HAVECHARGE 2 /* We know a charge info */ +#define ISDN_CHARGEHUP 4 /* We want to use the charge mechanism */ +#define ISDN_INHUP 8 /* Even if incoming, close after huptimeout */ +#define ISDN_MANCHARGE 16 /* Charge Interval manually set */ + +/* + * Definitions for Cisco-HDLC header. + */ + +#define CISCO_ADDR_UNICAST 0x0f +#define CISCO_ADDR_BROADCAST 0x8f +#define CISCO_CTRL 0x00 +#define CISCO_TYPE_CDP 0x2000 +#define CISCO_TYPE_SLARP 0x8035 +#define CISCO_SLARP_REQUEST 0 +#define CISCO_SLARP_REPLY 1 +#define CISCO_SLARP_KEEPALIVE 2 + +extern char *isdn_net_new(char *, struct net_device *); +extern char *isdn_net_newslave(char *); +extern int isdn_net_rm(char *); +extern int isdn_net_rmall(void); +extern int isdn_net_stat_callback(int, isdn_ctrl *); +extern int isdn_net_setcfg(isdn_net_ioctl_cfg *); +extern int isdn_net_getcfg(isdn_net_ioctl_cfg *); +extern int isdn_net_addphone(isdn_net_ioctl_phone *); +extern int isdn_net_getphones(isdn_net_ioctl_phone *, char *); +extern int isdn_net_getpeer(isdn_net_ioctl_phone *, isdn_net_ioctl_phone *); +extern int isdn_net_delphone(isdn_net_ioctl_phone *); +extern int isdn_net_find_icall(int, int, int, setup_parm *); +extern void isdn_net_hangup(struct net_device *); +extern void isdn_net_dial(void); +extern void isdn_net_autohup(void); +extern int isdn_net_force_hangup(char *); +extern int isdn_net_force_dial(char *); +extern isdn_net_dev *isdn_net_findif(char *); +extern int isdn_net_rcv_skb(int, struct sk_buff *); +extern int isdn_net_dial_req(isdn_net_local *); +extern void isdn_net_writebuf_skb(isdn_net_local *lp, struct sk_buff *skb); +extern void isdn_net_write_super(isdn_net_local *lp, struct sk_buff *skb); + +#define ISDN_NET_MAX_QUEUE_LENGTH 2 + +/* + * is this particular channel busy? + */ +static __inline__ int isdn_net_lp_busy(isdn_net_local *lp) +{ + if (atomic_read(&lp->frame_cnt) < ISDN_NET_MAX_QUEUE_LENGTH) + return 0; + else + return 1; +} + +/* + * For the given net device, this will get a non-busy channel out of the + * corresponding bundle. The returned channel is locked. + */ +static __inline__ isdn_net_local * isdn_net_get_locked_lp(isdn_net_dev *nd) +{ + unsigned long flags; + isdn_net_local *lp; + + spin_lock_irqsave(&nd->queue_lock, flags); + lp = nd->queue; /* get lp on top of queue */ + spin_lock_bh(&nd->queue->xmit_lock); + while (isdn_net_lp_busy(nd->queue)) { + spin_unlock_bh(&nd->queue->xmit_lock); + nd->queue = nd->queue->next; + if (nd->queue == lp) { /* not found -- should never happen */ + lp = NULL; + goto errout; + } + spin_lock_bh(&nd->queue->xmit_lock); + } + lp = nd->queue; + nd->queue = nd->queue->next; +errout: + spin_unlock_irqrestore(&nd->queue_lock, flags); + return lp; +} + +/* + * add a channel to a bundle */ +static __inline__ void isdn_net_add_to_bundle(isdn_net_dev *nd, isdn_net_local *nlp) +{ + isdn_net_local *lp; + unsigned long flags; + + spin_lock_irqsave(&nd->queue_lock, flags); + + lp = nd->queue; +// printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) nlp:%s(%p) last(%p)\n", +// lp->name, lp, nlp->name, nlp, lp->last); + nlp->last = lp->last; + lp->last->next = nlp; + lp->last = nlp; + nlp->next = lp; + nd->queue = nlp; + + spin_unlock_irqrestore(&nd->queue_lock, flags); +} +/* + * remove a channel from the bundle it belongs to + */ +static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp) +{ + isdn_net_local *master_lp = lp; + unsigned long flags; + + if (lp->master) + master_lp = (isdn_net_local *) lp->master->priv; + +// printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n", +// lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); + spin_lock_irqsave(&master_lp->netdev->queue_lock, flags); + lp->last->next = lp->next; + lp->next->last = lp->last; + if (master_lp->netdev->queue == lp) { + master_lp->netdev->queue = lp->next; + if (lp->next == lp) { /* last in queue */ + master_lp->netdev->queue = master_lp->netdev->local; + } + } + lp->next = lp->last = lp; /* (re)set own pointers */ +// printk(KERN_DEBUG __FUNCTION__": mndq(%p)\n", +// master_lp->netdev->queue); + spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags); +} + +static inline int +put_u8(unsigned char *p, u8 x) +{ + *p = x; + return 1; +} + +static inline int +put_u16(unsigned char *p, u16 x) +{ + *((u16 *)p) = htons(x); + return 2; +} + +static inline int +put_u32(unsigned char *p, u32 x) +{ + *((u32 *)p) = htonl(x); + return 4; +} + +static inline int +get_u8(unsigned char *p, u8 *x) +{ + *x = *p; + return 1; +} + +static inline int +get_u16(unsigned char *p, u16 *x) +{ + *x = ntohs(*((u16 *)p)); + return 2; +} + +static inline int +get_u32(unsigned char *p, u32 *x) +{ + *x = ntohl(*((u32 *)p)); + return 4; +} + -extern struct isdn_netif_ops isdn_iptyp_ops; -extern struct isdn_netif_ops isdn_uihdlc_ops; -extern struct isdn_netif_ops isdn_rawip_ops; -extern struct isdn_netif_ops isdn_ether_ops; diff -Nru a/drivers/isdn/i4l/isdn_net_lib.c b/drivers/isdn/i4l/isdn_net_lib.c --- a/drivers/isdn/i4l/isdn_net_lib.c Thu Feb 19 23:44:22 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,2342 +0,0 @@ -/* Linux ISDN subsystem, network interface support code - * - * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -/* - * Data Over Voice (DOV) support added - Guy Ellis 23-Mar-02 - * guy@traverse.com.au - * Outgoing calls - looks for a 'V' in first char of dialed number - * Incoming calls - checks first character of eaz as follows: - * Numeric - accept DATA only - original functionality - * 'V' - accept VOICE (DOV) only - * 'B' - accept BOTH DATA and DOV types - * - */ - -/* Locking works as follows: - * - * The configuration of isdn_net_devs works via ioctl on - * /dev/isdnctrl (for legacy reasons). - * All configuration accesses are globally serialized by means of - * the global semaphore &sem. - * - * All other uses of isdn_net_dev will only happen when the corresponding - * struct net_device has been opened. So in the non-config code we can - * rely on the config data not changing under us. - * - * To achieve this, in the "writing" ioctls, that is those which may change - * data, additionally grep the rtnl semaphore and check to make sure - * that the net_device has not been openend ("netif_running()") - * - * isdn_net_dev's are added to the global list "isdn_net_devs" in the - * configuration ioctls, so accesses to that list are protected by - * &sem as well. - * - * Incoming calls are signalled in IRQ context, so we cannot take &sem - * while walking the list of devices. To handle this, we put devices - * onto a "running" list, which is protected by a spin lock and can thus - * be traversed in IRQ context. If a matching isdn_net_dev is found, - * it's ref count shall be incremented, to make sure no racing - * net_device::close() can take it away under us. - */ - -#include -#include -#include -#include -#include -#include -#include "isdn_common.h" -#include "isdn_net_lib.h" -#include "isdn_net.h" -#include "isdn_ppp.h" -#include "isdn_ciscohdlck.h" -#include "isdn_concap.h" - -#define ISDN_NET_TX_TIMEOUT (20*HZ) - -/* All of this configuration code is globally serialized */ - -static DECLARE_MUTEX(sem); -LIST_HEAD(isdn_net_devs); /* Linked list of isdn_net_dev's */ // FIXME static - -/* Reference counting for net devices (they work on isdn_net_local *, - * but count references to the related isdn_net_dev's as well. - * Basic rule: When state of isdn_net_dev changes from ST_NULL -> sth, - * get a reference, when it changes back to ST_NULL, put it - */ - -static inline void -lp_get(isdn_net_local *lp) -{ - if (atomic_read(&lp->refcnt) < 1) - isdn_BUG(); - - atomic_inc(&lp->refcnt); -} - -static inline void -lp_put(isdn_net_local *lp) -{ - atomic_dec(&lp->refcnt); - - /* the last reference, the list should always remain */ - if (atomic_read(&lp->refcnt) < 1) - isdn_BUG(); -} - -static int isdn_net_handle_event(isdn_net_dev *idev, int pr, void *arg); -static void isdn_net_tasklet(unsigned long data); -static void isdn_net_dial_timer(unsigned long data); -static int isdn_init_netif(struct net_device *ndev); -static void isdn_net_dev_debug(struct fsm_inst *fi, char *fmt, ...); -static int isdn_net_dial(isdn_net_dev *idev); -static int isdn_net_bsent(isdn_net_dev *idev, isdn_ctrl *c); - -static struct fsm isdn_net_fsm; - -enum { - ST_NULL, - ST_OUT_BOUND, - ST_OUT_WAIT_DCONN, - ST_OUT_WAIT_BCONN, - ST_IN_WAIT_DCONN, - ST_IN_WAIT_BCONN, - ST_ACTIVE, - ST_WAIT_DHUP, - ST_WAIT_BEFORE_CB, - ST_OUT_DIAL_WAIT, -}; - -static char *isdn_net_st_str[] = { - "ST_NULL", - "ST_OUT_BOUND", - "ST_OUT_WAIT_DCONN", - "ST_OUT_WAIT_BCONN", - "ST_IN_WAIT_DCONN", - "ST_IN_WAIT_BCONN", - "ST_ACTIVE", - "ST_WAIT_DHUP", - "ST_WAIT_BEFORE_CB", - "ST_OUT_DIAL_WAIT", -}; - -enum { - EV_NET_TIMER_INCOMING, - EV_NET_TIMER_DIAL, - EV_NET_TIMER_DIAL_WAIT, - EV_NET_TIMER_CB_OUT, - EV_NET_TIMER_CB_IN, - EV_NET_TIMER_HUP, - EV_NET_STAT_DCONN, - EV_NET_STAT_BCONN, - EV_NET_STAT_DHUP, - EV_NET_STAT_BHUP, - EV_NET_STAT_CINF, - EV_NET_STAT_BSENT, - EV_NET_DO_DIAL, - EV_NET_DO_CALLBACK, - EV_NET_DO_ACCEPT, -}; - -static char *isdn_net_ev_str[] = { - "EV_NET_TIMER_INCOMING", - "EV_NET_TIMER_DIAL", - "EV_NET_TIMER_DIAL_WAIT", - "EV_NET_TIMER_CB_OUT", - "EV_NET_TIMER_CB_IN", - "EV_NET_TIMER_HUP", - "EV_NET_STAT_DCONN", - "EV_NET_STAT_BCONN", - "EV_NET_STAT_DHUP", - "EV_NET_STAT_BHUP", - "EV_NET_STAT_CINF", - "EV_NET_STAT_BSENT", - "EV_NET_DO_DIAL", - "EV_NET_DO_CALLBACK", - "EV_NET_DO_ACCEPT", -}; - -/* Definitions for hupflags: */ - -#define ISDN_CHARGEHUP 4 /* We want to use the charge mechanism */ -#define ISDN_INHUP 8 /* Even if incoming, close after huptimeout */ -#define ISDN_MANCHARGE 16 /* Charge Interval manually set */ - -enum { - ST_CHARGE_NULL, - ST_CHARGE_GOT_CINF, /* got a first charge info */ - ST_CHARGE_HAVE_CINT, /* got a second chare info and thus the timing */ -}; - -/* ====================================================================== */ -/* Registration of ISDN network interface types */ -/* ====================================================================== */ - -static struct isdn_netif_ops *isdn_netif_ops[ISDN_NET_ENCAP_NR]; - -int -register_isdn_netif(int encap, struct isdn_netif_ops *ops) -{ - if (encap < 0 || encap >= ISDN_NET_ENCAP_NR) - return -EINVAL; - - if (isdn_netif_ops[encap]) - return -EBUSY; - - isdn_netif_ops[encap] = ops; - - return 0; -} - -/* ====================================================================== */ -/* Helpers */ -/* ====================================================================== */ - -/* Search list of net-interfaces for an interface with given name. */ - -static isdn_net_dev * -isdn_net_findif(char *name) -{ - isdn_net_dev *idev; - - list_for_each_entry(idev, &isdn_net_devs, global_list) { - if (!strcmp(idev->name, name)) - return idev; - } - return NULL; -} - -/* Set up a certain encapsulation */ - -static int -isdn_net_set_encap(isdn_net_local *lp, int encap) -{ - int retval = 0; - - if (lp->p_encap == encap){ - /* nothing to do */ - retval = 0; - goto out; - } - if (netif_running(&lp->dev)) { - retval = -EBUSY; - goto out; - } - if (lp->ops && lp->ops->cleanup) - lp->ops->cleanup(lp); - - if (encap < 0 || encap >= ISDN_NET_ENCAP_NR || - !isdn_netif_ops[encap]) { - lp->p_encap = -1; - lp->ops = NULL; - retval = -EINVAL; - goto out; - } - - lp->p_encap = encap; - lp->ops = isdn_netif_ops[encap]; - - lp->dev.hard_start_xmit = lp->ops->hard_start_xmit; - lp->dev.hard_header = lp->ops->hard_header; - lp->dev.do_ioctl = lp->ops->do_ioctl; - lp->dev.flags = lp->ops->flags; - lp->dev.type = lp->ops->type; - lp->dev.addr_len = lp->ops->addr_len; - if (lp->ops->init) - retval = lp->ops->init(lp); - - if (retval != 0) { - lp->p_encap = -1; - lp->ops = NULL; - } - out: - return retval; -} - -static int -isdn_net_bind(isdn_net_dev *idev, isdn_net_ioctl_cfg *cfg) -{ - isdn_net_local *mlp = idev->mlp; - int retval; - int drvidx = -1; - int chidx = -1; - char drvid[25]; - - strlcpy(drvid, cfg->drvid, sizeof(drvid)); - - if (cfg->exclusive && !strlen(drvid)) { - /* If we want to bind exclusively, need to specify drv/chan */ - retval = -ENODEV; - goto out; - } - if (strlen(drvid)) { - /* A bind has been requested ... */ - char *c = strchr(drvid, ','); - if (!c) { - retval = -ENODEV; - goto out; - } - /* The channel-number is appended to the driver-Id with a comma */ - *c = 0; - chidx = simple_strtol(c + 1, NULL, 10); - drvidx = isdn_drv_lookup(drvid); - if (drvidx == -1 || chidx == -1) { - /* Either driver-Id or channel-number invalid */ - retval = -ENODEV; - goto out; - } - } - if (cfg->exclusive == !!idev->exclusive && - drvidx == idev->pre_device && chidx == idev->pre_channel) { - /* no change */ - retval = 0; - goto out; - } - if (idev->exclusive) { - isdn_slot_free(idev->exclusive); - idev->exclusive = NULL; - } - if (cfg->exclusive) { - /* If binding is exclusive, try to grab the channel */ - idev->exclusive = isdn_get_free_slot(ISDN_USAGE_NET | ISDN_USAGE_EXCLUSIVE, - mlp->l2_proto, mlp->l3_proto, drvidx, chidx, cfg->eaz); - if (!idev->exclusive) { - /* Grab failed, because desired channel is in use */ - retval = -EBUSY; - goto out; - } - } - idev->pre_device = drvidx; - idev->pre_channel = chidx; - retval = 0; - out: - return retval; -} - -/* - * Delete all phone-numbers of an interface. - */ -static void -isdn_net_rmallphone(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - struct isdn_net_phone *n; - int i; - - for (i = 0; i < 2; i++) { - while (!list_empty(&mlp->phone[i])) { - n = list_entry(mlp->phone[i].next, struct isdn_net_phone, list); - list_del(&n->list); - kfree(n); - } - } -} - -/* ====================================================================== */ -/* /dev/isdnctrl net ioctl interface */ -/* ====================================================================== */ - -/* - * Allocate a new network-interface and initialize its data structures - */ -static int -isdn_net_addif(char *name, isdn_net_local *mlp) -{ - int retval; - struct net_device *dev = NULL; - isdn_net_dev *idev; - - /* Avoid creating an existing interface */ - if (isdn_net_findif(name)) - return -EEXIST; - - idev = kmalloc(sizeof(*idev), GFP_KERNEL); - if (!idev) - return -ENOMEM; - - memset(idev, 0, sizeof(*idev)); - strcpy(idev->name, name); - - tasklet_init(&idev->tlet, isdn_net_tasklet, (unsigned long) idev); - skb_queue_head_init(&idev->super_tx_queue); - - idev->isdn_slot = NULL; - idev->pre_device = -1; - idev->pre_channel = -1; - idev->exclusive = NULL; - - idev->pppbind = -1; - - init_timer(&idev->dial_timer); - idev->dial_timer.data = (unsigned long) idev; - idev->dial_timer.function = isdn_net_dial_timer; - - idev->fi.fsm = &isdn_net_fsm; - idev->fi.state = ST_NULL; - idev->fi.debug = 1; - idev->fi.userdata = idev; - idev->fi.printdebug = isdn_net_dev_debug; - - if (!mlp) { - /* Device shall be a master */ - mlp = kmalloc(sizeof(*mlp), GFP_KERNEL); - if (!mlp) - return -ENOMEM; - - memset(mlp, 0, sizeof(*mlp)); - - mlp->magic = ISDN_NET_MAGIC; - INIT_LIST_HEAD(&mlp->slaves); - INIT_LIST_HEAD(&mlp->online); - spin_lock_init(&mlp->xmit_lock); - - mlp->p_encap = -1; - isdn_net_set_encap(mlp, ISDN_NET_ENCAP_RAWIP); - - mlp->l2_proto = ISDN_PROTO_L2_X75I; - mlp->l3_proto = ISDN_PROTO_L3_TRANS; - mlp->triggercps = 6000; - mlp->slavedelay = 10 * HZ; - mlp->hupflags = ISDN_INHUP; - mlp->onhtime = 10; - mlp->dialmax = 1; - mlp->flags = ISDN_NET_CBHUP | ISDN_NET_DM_MANUAL | ISDN_NET_SECURE; - mlp->cbdelay = 5 * HZ; /* Wait 5 secs before call-back */ - mlp->dialtimeout = 60 * HZ;/* Wait 1 min for connection */ - mlp->dialwait = 5 * HZ; /* Wait 5 sec. after failed dial */ - INIT_LIST_HEAD(&mlp->phone[0]); - INIT_LIST_HEAD(&mlp->phone[1]); - dev = &mlp->dev; - } - idev->mlp = mlp; - list_add_tail(&idev->slaves, &mlp->slaves); - - if (dev) { - strcpy(dev->name, name); - dev->priv = mlp; - dev->init = isdn_init_netif; - SET_MODULE_OWNER(dev); - retval = register_netdev(dev); - if (retval) { - kfree(mlp); - kfree(idev); - return retval; - } - } - list_add(&idev->global_list, &isdn_net_devs); - - return 0; -} - -/* - * Add a new slave interface to an existing one - */ -static int -isdn_net_addslave(char *parm) -{ - char *p = strchr(parm, ','); - isdn_net_dev *idev; - isdn_net_local *mlp; - int retval; - - /* get slave name */ - if (!p || !p[1]) - return -EINVAL; - - *p++ = 0; - - /* find master */ - idev = isdn_net_findif(parm); - if (!idev) - return -ESRCH; - - mlp = idev->mlp; - - rtnl_lock(); - - if (netif_running(&mlp->dev)) { - retval = -EBUSY; - goto out; - } - retval = isdn_net_addif(p, mlp); - out: - rtnl_unlock(); - return retval; -} - -/* - * Delete a single network-interface - */ -static int -isdn_net_dev_delete(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - int retval; - - rtnl_lock(); - - if (netif_running(&mlp->dev)) { - retval = -EBUSY; - goto unlock; - } - isdn_net_set_encap(mlp, -1); - isdn_net_rmallphone(idev); - - if (idev->exclusive) - isdn_slot_free(idev->exclusive); - - list_del(&idev->slaves); - - rtnl_unlock(); - - if (list_empty(&mlp->slaves)) { - unregister_netdev(&mlp->dev); - kfree(mlp); - } - - list_del(&idev->global_list); - kfree(idev); - return 0; - - unlock: - rtnl_unlock(); - return retval; -} - -/* - * Delete a single network-interface - */ -static int -isdn_net_delif(char *name) -{ - /* FIXME: For compatibility, if a master isdn_net_dev is rm'ed, - * kill all slaves, too */ - - isdn_net_dev *idev = isdn_net_findif(name); - - if (!idev) - return -ENODEV; - - return isdn_net_dev_delete(idev); -} - -/* - * Set interface-parameters. - * Always set all parameters, so the user-level application is responsible - * for not overwriting existing setups. It has to get the current - * setup first, if only selected parameters are to be changed. - */ -static int -isdn_net_setcfg(isdn_net_ioctl_cfg *cfg) -{ - isdn_net_dev *idev = isdn_net_findif(cfg->name); - isdn_net_local *mlp; - int retval; - - if (!idev) - return -ENODEV; - - mlp = idev->mlp; - - rtnl_lock(); - - if (netif_running(&mlp->dev)) { - retval = -EBUSY; - goto out; - } - - retval = isdn_net_set_encap(mlp, cfg->p_encap); - if (retval) - goto out; - - retval = isdn_net_bind(idev, cfg); - if (retval) - goto out; - - strlcpy(mlp->msn, cfg->eaz, sizeof(mlp->msn)); - mlp->onhtime = cfg->onhtime; - idev->charge = cfg->charge; - mlp->l2_proto = cfg->l2_proto; - mlp->l3_proto = cfg->l3_proto; - mlp->cbdelay = cfg->cbdelay * HZ / 5; - mlp->dialmax = cfg->dialmax; - mlp->triggercps = cfg->triggercps; - mlp->slavedelay = cfg->slavedelay * HZ; - idev->pppbind = cfg->pppbind; - mlp->dialtimeout = cfg->dialtimeout >= 0 ? cfg->dialtimeout * HZ : -1; - mlp->dialwait = cfg->dialwait * HZ; - if (cfg->secure) - mlp->flags |= ISDN_NET_SECURE; - else - mlp->flags &= ~ISDN_NET_SECURE; - if (cfg->cbhup) - mlp->flags |= ISDN_NET_CBHUP; - else - mlp->flags &= ~ISDN_NET_CBHUP; - switch (cfg->callback) { - case 0: - mlp->flags &= ~(ISDN_NET_CALLBACK | ISDN_NET_CBOUT); - break; - case 1: - mlp->flags |= ISDN_NET_CALLBACK; - mlp->flags &= ~ISDN_NET_CBOUT; - break; - case 2: - mlp->flags |= ISDN_NET_CBOUT; - mlp->flags &= ~ISDN_NET_CALLBACK; - break; - } - mlp->flags &= ~ISDN_NET_DIALMODE_MASK; /* first all bits off */ - if (cfg->dialmode && !(cfg->dialmode & ISDN_NET_DIALMODE_MASK)) { - retval = -EINVAL; - goto out; - } - - mlp->flags |= cfg->dialmode; /* turn on selected bits */ - if (mlp->flags & ISDN_NET_DM_OFF) - isdn_net_hangup(idev); - - if (cfg->chargehup) - mlp->hupflags |= ISDN_CHARGEHUP; - else - mlp->hupflags &= ~ISDN_CHARGEHUP; - - if (cfg->ihup) - mlp->hupflags |= ISDN_INHUP; - else - mlp->hupflags &= ~ISDN_INHUP; - - if (cfg->chargeint > 10) { - idev->chargeint = cfg->chargeint * HZ; - idev->charge_state = ST_CHARGE_HAVE_CINT; - mlp->hupflags |= ISDN_MANCHARGE; - } - retval = 0; - - out: - rtnl_unlock(); - - return retval; -} - -/* - * Perform get-interface-parameters.ioctl - */ -static int -isdn_net_getcfg(isdn_net_ioctl_cfg *cfg) -{ - isdn_net_dev *idev = isdn_net_findif(cfg->name); - isdn_net_local *mlp; - - if (!idev) - return -ENODEV; - - mlp = idev->mlp; - - strcpy(cfg->eaz, mlp->msn); - cfg->exclusive = !!idev->exclusive; - if (idev->pre_device >= 0) { - sprintf(cfg->drvid, "%s,%d", isdn_drv_drvid(idev->pre_device), - idev->pre_channel); - } else { - cfg->drvid[0] = '\0'; - } - cfg->onhtime = mlp->onhtime; - cfg->charge = idev->charge; - cfg->l2_proto = mlp->l2_proto; - cfg->l3_proto = mlp->l3_proto; - cfg->p_encap = mlp->p_encap; - cfg->secure = (mlp->flags & ISDN_NET_SECURE) ? 1 : 0; - cfg->callback = 0; - if (mlp->flags & ISDN_NET_CALLBACK) - cfg->callback = 1; - if (mlp->flags & ISDN_NET_CBOUT) - cfg->callback = 2; - cfg->cbhup = (mlp->flags & ISDN_NET_CBHUP) ? 1 : 0; - cfg->dialmode = mlp->flags & ISDN_NET_DIALMODE_MASK; - cfg->chargehup = (mlp->hupflags & ISDN_CHARGEHUP) ? 1 : 0; - cfg->ihup = (mlp->hupflags & ISDN_INHUP) ? 1 : 0; - cfg->cbdelay = mlp->cbdelay * 5 / HZ; - cfg->dialmax = mlp->dialmax; - cfg->triggercps = mlp->triggercps; - cfg->slavedelay = mlp->slavedelay / HZ; - cfg->chargeint = (mlp->hupflags & ISDN_CHARGEHUP) ? - (idev->chargeint / HZ) : 0; - cfg->pppbind = idev->pppbind; - cfg->dialtimeout = mlp->dialtimeout >= 0 ? mlp->dialtimeout / HZ : -1; - cfg->dialwait = mlp->dialwait / HZ; - - if (idev->slaves.next != &mlp->slaves) - strcpy(cfg->slave, list_entry(idev->slaves.next, isdn_net_dev, slaves)->name); - else - cfg->slave[0] = '\0'; - if (strcmp(mlp->dev.name, idev->name)) - strcpy(cfg->master, mlp->dev.name); - else - cfg->master[0] = '\0'; - - return 0; -} - -/* - * Add a phone-number to an interface. - */ -static int -isdn_net_addphone(isdn_net_ioctl_phone *phone) -{ - isdn_net_dev *idev = isdn_net_findif(phone->name); - struct isdn_net_phone *n; - int retval = 0; - - if (!idev) - return -ENODEV; - - rtnl_lock(); - - if (netif_running(&idev->mlp->dev)) { - retval = -EBUSY; - goto out; - } - n = kmalloc(sizeof(*n), GFP_KERNEL); - if (!n) { - retval = -ENOMEM; - goto out; - } - strcpy(n->num, phone->phone); - list_add_tail(&n->list, &idev->mlp->phone[phone->outgoing & 1]); - - out: - rtnl_unlock(); - return retval; -} - -/* - * Delete a phone-number from an interface. - */ -static int -isdn_net_delphone(isdn_net_ioctl_phone *phone) -{ - isdn_net_dev *idev = isdn_net_findif(phone->name); - struct isdn_net_phone *n; - int retval; - - if (!idev) - return -ENODEV; - - rtnl_lock(); - - if (netif_running(&idev->mlp->dev)) { - retval = -EBUSY; - goto out; - } - retval = -EINVAL; - list_for_each_entry(n, &idev->mlp->phone[phone->outgoing & 1], list) { - if (!strcmp(n->num, phone->phone)) { - list_del(&n->list); - kfree(n); - retval = 0; - break; - } - } - out: - rtnl_unlock(); - return retval; -} - -/* - * Copy a string of all phone-numbers of an interface to user space. - */ -static int -isdn_net_getphone(isdn_net_ioctl_phone * phone, char *phones) -{ - isdn_net_dev *idev = isdn_net_findif(phone->name); - u_int count = 0; - char *buf = (char *)__get_free_page(GFP_KERNEL); - struct isdn_net_phone *n; - - if (!buf) - return -ENOMEM; - - if (!idev) { - count = -ENODEV; - goto free; - } - list_for_each_entry(n, &idev->mlp->phone[phone->outgoing & 1], list) { - strcpy(&buf[count], n->num); - count += strlen(n->num); - buf[count++] = ' '; - if (count > PAGE_SIZE - ISDN_MSNLEN - 1) - break; - } - if (!count) /* list was empty? */ - count++; - - buf[count-1] = 0; - - if (copy_to_user(phones, buf, count)) - count = -EFAULT; - - free: - free_page((unsigned long)buf); - return count; -} - -/* - * Force a net-interface to dial out. - */ -static int -isdn_net_dial_out(char *name) -{ - isdn_net_dev *idev = isdn_net_findif(name); - - if (!idev) - return -ENODEV; - - return isdn_net_dial(idev); -} - -static int -__isdn_net_dial_slave(isdn_net_local *mlp) -{ - isdn_net_dev *idev; - - list_for_each_entry(idev, &mlp->slaves, slaves) { - if (isdn_net_dial(idev) == 0) - return 0; - } - return -EBUSY; -} - -static int -isdn_net_dial_slave(char *name) -{ - isdn_net_dev *idev = isdn_net_findif(name); - - if (!idev) - return -ENODEV; - - return __isdn_net_dial_slave(idev->mlp); -} - -/* - * Force a hangup of a network-interface. - */ -static int -isdn_net_force_hangup(char *name) // FIXME rename? -{ - isdn_net_dev *idev = isdn_net_findif(name); - - if (!idev) - return -ENODEV; - - if (idev->isdn_slot == NULL) - return -ENOTCONN; - - isdn_net_hangup(idev); - return 0; -} - -/* - * Copy a string containing the peer's phone number of a connected interface - * to user space. - */ -static int -isdn_net_getpeer(isdn_net_ioctl_phone *phone, isdn_net_ioctl_phone *peer) -{ - isdn_net_dev *idev = isdn_net_findif(phone->name); - struct isdn_slot *slot; - - if (!idev) - return -ENODEV; - - if (idev->fi.state != ST_ACTIVE) - return -ENOTCONN; - - slot = idev->isdn_slot; - - strlcpy(phone->phone, slot->num, sizeof(phone->phone)); - phone->outgoing = USG_OUTGOING(slot->usage); - - if (copy_to_user(peer, phone, sizeof(*peer))) - return -EFAULT; - - return 0; -} - -/* - * ioctl on /dev/isdnctrl, used to configure ISDN net interfaces - */ -int -isdn_net_ioctl(struct inode *ino, struct file *file, uint cmd, ulong arg) -{ - /* Save stack space */ - union { - char name[10]; - char bname[20]; - isdn_net_ioctl_phone phone; - isdn_net_ioctl_cfg cfg; - } iocpar; - int retval; - -#define name iocpar.name -#define bname iocpar.bname -#define phone iocpar.phone -#define cfg iocpar.cfg - - name[sizeof(name)-1] = 0; - bname[sizeof(bname)-1] = 0; - - down(&sem); - - switch (cmd) { - case IIOCNETAIF: /* add an interface */ - if (copy_from_user(name, (char *) arg, sizeof(name) - 1)) { - retval = -EFAULT; - break; - } - retval = isdn_net_addif(name, NULL); - break; - case IIOCNETASL: /* add slave to an interface */ - if (copy_from_user(bname, (char *) arg, sizeof(bname) - 1)) { - retval = -EFAULT; - break; - } - retval = isdn_net_addslave(bname); - break; - case IIOCNETDIF: /* delete an interface */ - if (copy_from_user(name, (char *) arg, sizeof(name) - 1)) { - retval = -EFAULT; - break; - } - retval = isdn_net_delif(name); - break; - case IIOCNETSCF: /* set config */ - if (copy_from_user((char *) &cfg, (char *) arg, sizeof(cfg))) { - retval = -EFAULT; - break; - } - retval = isdn_net_setcfg(&cfg); - break; - case IIOCNETGCF: /* get config */ - if (copy_from_user((char *) &cfg, (char *) arg, sizeof(cfg))) { - retval = -EFAULT; - break; - } - retval = isdn_net_getcfg(&cfg); - if (retval) - break; - if (copy_to_user((char *) arg, (char *) &cfg, sizeof(cfg))) - retval = -EFAULT; - break; - case IIOCNETANM: /* add a phone number */ - if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) { - retval = -EFAULT; - break; - } - retval = isdn_net_addphone(&phone); - break; - case IIOCNETGNM: /* get list of phone numbers */ - if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) { - retval = -EFAULT; - break; - } - retval = isdn_net_getphone(&phone, (char *) arg); - break; - case IIOCNETDNM: /* delete a phone number */ - if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) { - retval = -EFAULT; - break; - } - retval = isdn_net_delphone(&phone); - break; - case IIOCNETDIL: /* trigger dial-out */ - if (copy_from_user(name, (char *) arg, sizeof(name))) { - retval = -EFAULT; - break; - } - retval = isdn_net_dial_out(name); - break; - case IIOCNETHUP: /* hangup */ - if (copy_from_user(name, (char *) arg, sizeof(name))) { - retval = -EFAULT; - break; - } - retval = isdn_net_force_hangup(name); - break; - case IIOCNETGPN: /* Get peer phone number of a connected interface */ - if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) { - retval = -EFAULT; - } - retval = isdn_net_getpeer(&phone, (isdn_net_ioctl_phone *) arg); - break; - case IIOCNETALN: /* Add link */ - if (copy_from_user(name, (char *) arg, sizeof(name))) { - retval = -EFAULT; - break; - } - retval = isdn_net_dial_slave(name); - break; - case IIOCNETDLN: /* Delete link */ - if (copy_from_user(name, (char *) arg, sizeof(name))) { - retval = -EFAULT; - break; - } - retval = isdn_net_force_hangup(name); - break; - default: - retval = -ENOTTY; - } - up(&sem); - return retval; - -#undef name -#undef bname -#undef iocts -#undef phone -#undef cfg -} - -/* - * Hang up all network-interfaces - */ -void -isdn_net_hangup_all(void) -{ - isdn_net_dev *idev; - - down(&sem); - - list_for_each_entry(idev, &isdn_net_devs, global_list) - isdn_net_hangup(idev); - - up(&sem); -} - -/* - * Remove all network-interfaces - */ -void -isdn_net_cleanup(void) -{ - isdn_net_dev *idev; - int retval; - - down(&sem); - - while (!list_empty(&isdn_net_devs)) { - idev = list_entry(isdn_net_devs.next, isdn_net_dev, global_list); - retval = isdn_net_dev_delete(idev); - /* can only fail if an interface is still running. - * In this case, an elevated module use count should - * have prevented this function from being called in - * the first place */ - if (retval) - isdn_BUG(); - } - up(&sem); -} - -/* ====================================================================== */ -/* interface to network layer */ -/* ====================================================================== */ - -static spinlock_t running_devs_lock = SPIN_LOCK_UNLOCKED; -static LIST_HEAD(running_devs); - -/* - * Open/initialize the board. - */ -static int -isdn_net_open(struct net_device *dev) -{ - isdn_net_local *lp = dev->priv; - unsigned long flags; - int retval = 0; - - if (!lp->ops) - return -ENODEV; - - if (lp->ops->open) - retval = lp->ops->open(lp); - - if (retval) - return retval; - - netif_start_queue(dev); - - atomic_set(&lp->refcnt, 1); - spin_lock_irqsave(&running_devs_lock, flags); - list_add(&lp->running_devs, &running_devs); - spin_unlock_irqrestore(&running_devs_lock, flags); - - return 0; -} - -/* - * Shutdown a net-interface. - */ -static int -isdn_net_close(struct net_device *dev) -{ - isdn_net_local *lp = dev->priv; - isdn_net_dev *sdev; - struct list_head *l, *n; - unsigned long flags; - - if (lp->ops->close) - lp->ops->close(lp); - - netif_stop_queue(dev); - - list_for_each_safe(l, n, &lp->slaves) { - sdev = list_entry(l, isdn_net_dev, slaves); - isdn_net_hangup(sdev); - } - /* The hangup will make the refcnt drop back to - * 1 (referenced by list only) soon. */ - spin_lock_irqsave(&running_devs_lock, flags); - while (atomic_read(&lp->refcnt) != 1) { - spin_unlock_irqrestore(&running_devs_lock, flags); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ/10); - spin_lock_irqsave(&running_devs_lock, flags); - } - /* We have the only reference and list lock, so - * nobody can get another reference. */ - list_del(&lp->running_devs); - spin_unlock_irqrestore(&running_devs_lock, flags); - - return 0; -} - -/* - * Get statistics - */ -static struct net_device_stats * -isdn_net_get_stats(struct net_device *dev) -{ - isdn_net_local *lp = dev->priv; - - return &lp->stats; -} - -/* - * Transmit timeout - */ -static void -isdn_net_tx_timeout(struct net_device *dev) -{ - printk(KERN_WARNING "isdn_tx_timeout dev %s\n", dev->name); - - netif_wake_queue(dev); -} - -/* - * Interface-setup. (just after registering a new interface) - */ -static int -isdn_init_netif(struct net_device *ndev) -{ - /* Setup the generic properties */ - - ndev->mtu = 1500; - ndev->tx_queue_len = 10; - ndev->open = &isdn_net_open; - ndev->hard_header_len = ETH_HLEN + isdn_hard_header_len(); - ndev->stop = &isdn_net_close; - ndev->get_stats = &isdn_net_get_stats; - ndev->tx_timeout = isdn_net_tx_timeout; - ndev->watchdog_timeo = ISDN_NET_TX_TIMEOUT; - - return 0; -} - -/* ====================================================================== */ -/* call control state machine */ -/* ====================================================================== */ - -// FIXME -static int -isdn_net_is_connected(isdn_net_dev *idev) -{ - return idev->fi.state == ST_ACTIVE; -} - -static void -isdn_net_dial_timer(unsigned long data) -{ - isdn_net_dev *idev = (isdn_net_dev *) data; - - isdn_net_handle_event(idev, idev->dial_event, NULL); -} - -/* - * Unbind a net-interface - */ -static void -isdn_net_unbind_channel(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - - if (idev->isdn_slot == NULL) { - isdn_BUG(); - return; - } - - if (mlp->ops->unbind) - mlp->ops->unbind(idev); - - idev->isdn_slot->priv = NULL; - idev->isdn_slot->event_cb = NULL; - - skb_queue_purge(&idev->super_tx_queue); - - if (idev->isdn_slot != idev->exclusive) - isdn_slot_free(idev->isdn_slot); - - idev->isdn_slot = NULL; - - if (idev->fi.state != ST_NULL) { - lp_put(mlp); - fsm_change_state(&idev->fi, ST_NULL); - } -} - -static int isdn_net_event_callback(struct isdn_slot *slot, int pr, void *arg); - -/* - * Assign an ISDN-channel to a net-interface - */ -static int -isdn_net_bind_channel(isdn_net_dev *idev, struct isdn_slot *slot) -{ - isdn_net_local *mlp = idev->mlp; - int retval = 0; - - if (mlp->ops->bind) - retval = mlp->ops->bind(idev); - - if (retval < 0) - goto out; - - idev->isdn_slot = slot; - slot->priv = idev; - slot->event_cb = isdn_net_event_callback; - slot->usage |= ISDN_USAGE_NET; - - out: - return retval; -} - -static int -isdn_net_dial(isdn_net_dev *idev) -{ - int retval; - - lp_get(idev->mlp); - retval = fsm_event(&idev->fi, EV_NET_DO_DIAL, NULL); - if (retval == -ESRCH) /* event not handled in this state */ - retval = -EBUSY; - - if (retval) - lp_put(idev->mlp); - - return retval; -} - -static void -isdn_net_unreachable(struct net_device *dev, struct sk_buff *skb, char *reason) -{ - u_short proto = ntohs(skb->protocol); - - printk(KERN_DEBUG "isdn_net: %s: %s, signalling dst_link_failure %s\n", - dev->name, - (reason != NULL) ? reason : "unknown", - (proto != ETH_P_IP) ? "Protocol != ETH_P_IP" : ""); - - dst_link_failure(skb); -} - -/* - * This is called from certain upper protocol layers (multilink ppp - * and x25iface encapsulation module) that want to initiate dialing - * themselves. - */ -int -isdn_net_dial_req(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - /* is there a better error code? */ - if (ISDN_NET_DIALMODE(*mlp) != ISDN_NET_DM_AUTO) - return -EBUSY; - - return isdn_net_dial(idev); -} - -static void -isdn_net_log_skb(struct sk_buff *skb, isdn_net_dev *idev) -{ - unsigned char *p = skb->nh.raw; /* hopefully, this was set correctly */ - unsigned short proto = ntohs(skb->protocol); - int data_ofs; - struct ip_ports { - unsigned short source; - unsigned short dest; - } *ipp; - char addinfo[100]; - - data_ofs = ((p[0] & 15) * 4); - switch (proto) { - case ETH_P_IP: - switch (p[9]) { - case IPPROTO_ICMP: - strcpy(addinfo, "ICMP"); - break; - case IPPROTO_TCP: - case IPPROTO_UDP: - ipp = (struct ip_ports *) (&p[data_ofs]); - sprintf(addinfo, "%s, port: %d -> %d", - p[9] == IPPROTO_TCP ? "TCP" : "UDP", - ntohs(ipp->source), ntohs(ipp->dest)); - break; - default: - sprintf(addinfo, "type %d", p[9]); - } - printk(KERN_INFO - "OPEN: %u.%u.%u.%u -> %u.%u.%u.%u %s\n", - - NIPQUAD(*(u32 *)(p + 12)), NIPQUAD(*(u32 *)(p + 16)), - addinfo); - break; - case ETH_P_ARP: - printk(KERN_INFO - "OPEN: ARP %d.%d.%d.%d -> *.*.*.* ?%d.%d.%d.%d\n", - NIPQUAD(*(u32 *)(p + 14)), NIPQUAD(*(u32 *)(p + 24))); - break; - default: - printk(KERN_INFO "OPEN: unknown proto %#x\n", proto); - } -} - -int -isdn_net_autodial(struct sk_buff *skb, struct net_device *ndev) -{ - isdn_net_local *mlp = ndev->priv; - isdn_net_dev *idev = list_entry(mlp->slaves.next, isdn_net_dev, slaves); - int retval; - - if (ISDN_NET_DIALMODE(*mlp) != ISDN_NET_DM_AUTO) - goto discard; - - retval = isdn_net_dial(idev); - if (retval == -ESRCH) - goto stop_queue; - - if (retval < 0) - goto discard; - - /* Log packet, which triggered dialing */ - if ((get_isdn_dev())->net_verbose) - isdn_net_log_skb(skb, idev); - - stop_queue: - netif_stop_queue(ndev); - return 1; - - discard: - isdn_net_unreachable(ndev, skb, "dial rejected"); - dev_kfree_skb(skb); - return 0; -} - -static int -accept_icall(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - isdn_ctrl cmd; - struct isdn_slot *slot = arg; - - isdn_net_bind_channel(idev, slot); - - idev->outgoing = 0; - idev->charge_state = ST_CHARGE_NULL; - /* Got incoming call, setup L2 and L3 protocols, - * then wait for D-Channel-connect - */ - cmd.arg = mlp->l2_proto << 8; - isdn_slot_command(idev->isdn_slot, ISDN_CMD_SETL2, &cmd); - cmd.arg = mlp->l3_proto << 8; - isdn_slot_command(idev->isdn_slot, ISDN_CMD_SETL3, &cmd); - isdn_slot_command(idev->isdn_slot, ISDN_CMD_ACCEPTD, &cmd); - - idev->dial_timer.expires = jiffies + mlp->dialtimeout; - idev->dial_event = EV_NET_TIMER_INCOMING; - add_timer(&idev->dial_timer); - fsm_change_state(&idev->fi, ST_IN_WAIT_DCONN); - return 0; -} - -static int -do_callback(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - - printk(KERN_DEBUG "%s: start callback\n", idev->name); - - idev->dial_timer.expires = jiffies + mlp->cbdelay; - idev->dial_event = EV_NET_TIMER_CB_IN; - add_timer(&idev->dial_timer); - fsm_change_state(&idev->fi, ST_WAIT_BEFORE_CB); - - return 0; -} - -static int -isdn_net_dev_icall(isdn_net_dev *idev, struct isdn_slot *slot, - int si1, char *eaz, char *nr) -{ - isdn_net_local *mlp = idev->mlp; - struct isdn_net_phone *ph; - char *my_eaz; - - /* check acceptable call types for DOV */ - dbg_net_icall("n_fi: if='%s', l.msn=%s, l.flags=%#x, l.dstate=%d\n", - idev->name, mlp->msn, mlp->flags, idev->fi.state); - - my_eaz = isdn_slot_map_eaz2msn(slot, mlp->msn); - if (si1 == 1) { /* it's a DOV call, check if we allow it */ - if (*my_eaz == 'v' || *my_eaz == 'V' || - *my_eaz == 'b' || *my_eaz == 'B') - my_eaz++; /* skip to allow a match */ - else - return 0; /* no match */ - } else { /* it's a DATA call, check if we allow it */ - if (*my_eaz == 'b' || *my_eaz == 'B') - my_eaz++; /* skip to allow a match */ - } - /* check called number */ - switch (isdn_msncmp(eaz, my_eaz)) { - case 1: /* no match */ - return 0; - case 2: /* matches so far */ - return 5; - } - - dbg_net_icall("%s: pdev=%d di=%d pch=%d ch = %d\n", idev->name, - idev->pre_device, slot->di, idev->pre_channel, slot->ch); - - /* check if exclusive */ - if ((slot->usage & ISDN_USAGE_EXCLUSIVE) && - (idev->pre_channel != slot->ch || idev->pre_device != slot->di)) { - dbg_net_icall("%s: excl check failed\n", idev->name); - return 0; - } - - /* check calling number */ - dbg_net_icall("%s: secure\n", idev->name); - if (mlp->flags & ISDN_NET_SECURE) { - list_for_each_entry(ph, &mlp->phone[0], list) { - if (isdn_msncmp(nr, ph->num) == 0) - goto found; - } - return 0; - } - found: - /* check dial mode */ - if (ISDN_NET_DIALMODE(*mlp) == ISDN_NET_DM_OFF) { - printk(KERN_INFO "%s: incoming call, stopped -> rejected\n", - idev->name); - return 3; - } - lp_get(mlp); - /* check callback */ - if (mlp->flags & ISDN_NET_CALLBACK) { - if (fsm_event(&idev->fi, EV_NET_DO_CALLBACK, NULL)) { - lp_put(mlp); - return 0; - } - /* Initiate dialing by returning 2 or 4 */ - return (mlp->flags & ISDN_NET_CBHUP) ? 2 : 4; - } - printk(KERN_INFO "%s: call from %s -> %s accepted\n", - idev->name, nr, eaz); - - if (fsm_event(&idev->fi, EV_NET_DO_ACCEPT, slot)) { - lp_put(mlp); - return 0; - } - return 1; // accepted -} - -/* - * An incoming call-request has arrived. - * Search the interface-chain for an appropriate interface. - * If found, connect the interface to the ISDN-channel and initiate - * D- and B-Channel-setup. If secure-flag is set, accept only - * configured phone-numbers. If callback-flag is set, initiate - * callback-dialing. - * - * Return-Value: 0 = No appropriate interface for this call. - * 1 = Call accepted - * 2 = Reject call, wait cbdelay, then call back - * 3 = Reject call - * 4 = Wait cbdelay, then call back - * 5 = No appropriate interface for this call, - * would eventually match if CID was longer. - */ -int -isdn_net_find_icall(struct isdn_slot *slot, setup_parm *setup) -{ - isdn_net_local *lp; - isdn_net_dev *idev; - char *nr, *eaz; - unsigned char si1, si2; - int retval; - int verbose = (get_isdn_dev())->net_verbose; - unsigned long flags; - - /* fix up calling number */ - if (!setup->phone[0]) { - printk(KERN_INFO - "isdn_net: Incoming call without OAD, assuming '0'\n"); - nr = "0"; - } else { - nr = setup->phone; - } - /* fix up called number */ - if (!setup->eazmsn[0]) { - printk(KERN_INFO - "isdn_net: Incoming call without CPN, assuming '0'\n"); - eaz = "0"; - } else { - eaz = setup->eazmsn; - } - si1 = setup->si1; - si2 = setup->si2; - if (verbose > 1) - printk(KERN_INFO "isdn_net: call from %s,%d,%d -> %s\n", - nr, si1, si2, eaz); - /* check service indicator */ - /* Accept DATA and VOICE calls at this stage - local eaz is checked later for allowed call types */ - if ((si1 != 7) && (si1 != 1)) { - if (verbose > 1) - printk(KERN_INFO "isdn_net: " - "Service-Indicator not 1 or 7, ignored\n"); - return 0; - } - - dbg_net_icall("n_fi: di=%d ch=%d usg=%#x\n", slot->di, slot->ch, - slot->usage); - - retval = 0; - spin_lock_irqsave(&running_devs_lock, flags); - list_for_each_entry(lp, &running_devs, running_devs) { - lp_get(lp); - spin_unlock_irqrestore(&running_devs_lock, flags); - - list_for_each_entry(idev, &lp->slaves, slaves) { - retval = isdn_net_dev_icall(idev, slot, si1, eaz, nr); - if (retval > 0) - break; - } - - spin_lock_irqsave(&running_devs_lock, flags); - lp_put(lp); - if (retval > 0) - break; - - } - spin_unlock_irqrestore(&running_devs_lock, flags); - if (!retval) { - if (verbose) - printk(KERN_INFO "isdn_net: call " - "from %s -> %s ignored\n", nr, eaz); - } - return retval; -} - -/* ---------------------------------------------------------------------- */ -/* callbacks in the state machine */ -/* ---------------------------------------------------------------------- */ - -/* Find the idev->dial'th outgoing number. */ - -static struct isdn_net_phone * -get_outgoing_phone(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - struct isdn_net_phone *phone; - int i = 0; - - list_for_each_entry(phone, &mlp->phone[1], list) { - if (i++ == idev->dial) - return phone; - } - return NULL; -} - -static int dialout_next(struct fsm_inst *fi, int pr, void *arg); - -/* Initiate dialout. */ - -static int -do_dial(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - struct isdn_slot *slot; - - if (ISDN_NET_DIALMODE(*mlp) == ISDN_NET_DM_OFF) - return -EPERM; - - if (list_empty(&mlp->phone[1])) /* no number to dial ? */ - return -EINVAL; - - if (idev->exclusive) - slot = idev->exclusive; - else - slot = isdn_get_free_slot(ISDN_USAGE_NET, mlp->l2_proto, - mlp->l3_proto, idev->pre_device, - idev->pre_channel, mlp->msn); - if (!slot) - return -EAGAIN; - - if (isdn_net_bind_channel(idev, slot) < 0) { - /* has freed the slot as well */ - return -EAGAIN; - } - - fsm_change_state(fi, ST_OUT_BOUND); - - idev->dial = 0; - idev->dialretry = 0; - - dialout_next(fi, pr, arg); - return 0; -} - -/* Try dialing the next number. */ - -static int -dialout_next(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - struct dial_info dial = { - .l2_proto = mlp->l2_proto, - .l3_proto = mlp->l3_proto, - .si1 = 7, - .si2 = 0, - .msn = mlp->msn, - .phone = get_outgoing_phone(idev)->num, - }; - - /* next time, try next number */ - idev->dial++; - - idev->outgoing = 1; - if (idev->chargeint) - idev->charge_state = ST_CHARGE_HAVE_CINT; - else - idev->charge_state = ST_CHARGE_NULL; - - /* For outgoing callback, use cbdelay instead of dialtimeout */ - if (mlp->cbdelay && (mlp->flags & ISDN_NET_CBOUT)) { - idev->dial_timer.expires = jiffies + mlp->cbdelay; - idev->dial_event = EV_NET_TIMER_CB_OUT; - } else { - idev->dial_timer.expires = jiffies + mlp->dialtimeout; - idev->dial_event = EV_NET_TIMER_DIAL; - } - fsm_change_state(&idev->fi, ST_OUT_WAIT_DCONN); - add_timer(&idev->dial_timer); - - /* Dial */ - isdn_slot_dial(idev->isdn_slot, &dial); - return 0; -} - -/* If we didn't connect within dialtimeout, we give up for now - * and wait for dialwait jiffies before trying again. - */ -static int -dial_timeout(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - isdn_ctrl cmd; - - fsm_change_state(&idev->fi, ST_OUT_DIAL_WAIT); - isdn_slot_command(idev->isdn_slot, ISDN_CMD_HANGUP, &cmd); - - /* get next phone number */ - if (!get_outgoing_phone(idev)) { - /* otherwise start over at first entry */ - idev->dial = 0; - idev->dialretry++; - } - if (idev->dialretry >= mlp->dialmax) { - isdn_net_hangup(idev); - return 0; - } - idev->dial_event = EV_NET_TIMER_DIAL_WAIT; - mod_timer(&idev->dial_timer, jiffies + mlp->dialwait); - return 0; -} - -static int -connect_fail(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - - del_timer(&idev->dial_timer); - printk(KERN_INFO "%s: connection failed\n", idev->name); - isdn_net_unbind_channel(idev); - return 0; -} - -static int -out_dconn(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_ctrl cmd; - - fsm_change_state(&idev->fi, ST_OUT_WAIT_BCONN); - isdn_slot_command(idev->isdn_slot, ISDN_CMD_ACCEPTB, &cmd); - return 0; -} - -static int -in_dconn(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_ctrl cmd; - - fsm_change_state(&idev->fi, ST_IN_WAIT_BCONN); - isdn_slot_command(idev->isdn_slot, ISDN_CMD_ACCEPTB, &cmd); - return 0; -} - -static int -bconn(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - - fsm_change_state(&idev->fi, ST_ACTIVE); - - if (mlp->onhtime) { - idev->huptimer = 0; - idev->dial_event = EV_NET_TIMER_HUP; - mod_timer(&idev->dial_timer, jiffies + HZ); - } else { - del_timer(&idev->dial_timer); - } - - printk(KERN_INFO "%s connected\n", idev->name); - /* If first Chargeinfo comes before B-Channel connect, - * we correct the timestamp here. - */ - idev->chargetime = jiffies; - idev->frame_cnt = 0; - idev->transcount = 0; - idev->cps = 0; - idev->last_jiffies = jiffies; - - if (mlp->ops->connected) - mlp->ops->connected(idev); - else - isdn_net_online(idev); - - return 0; -} - -static int -bhup(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - - del_timer(&idev->dial_timer); - if (mlp->ops->disconnected) - mlp->ops->disconnected(idev); - else - isdn_net_offline(idev); - - printk(KERN_INFO "%s: disconnected\n", idev->name); - fsm_change_state(fi, ST_WAIT_DHUP); - return 0; -} - -static int -dhup(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - - printk(KERN_INFO "%s: Chargesum is %d\n", idev->name, idev->charge); - isdn_net_unbind_channel(idev); - return 0; -} - -/* Check if it's time for idle hang-up */ - -static int -check_hup(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_net_local *mlp = idev->mlp; - - dbg_net_dial("%s: huptimer %d onhtime %d chargetime %ld chargeint %d\n", - idev->name, idev->huptimer, mlp->onhtime, idev->chargetime, idev->chargeint); - - if (idev->huptimer++ <= mlp->onhtime) - goto mod_timer; - - if (mlp->hupflags & ISDN_CHARGEHUP && - idev->charge_state == ST_CHARGE_HAVE_CINT) { - if (!time_after(jiffies, idev->chargetime - + idev->chargeint - 2 * HZ)) - goto mod_timer; - } - if (idev->outgoing || mlp->hupflags & ISDN_INHUP) { - isdn_net_hangup(idev); - return 0; - } - mod_timer: - mod_timer(&idev->dial_timer, idev->dial_timer.expires + HZ); - return 0; -} - -/* Charge-info from TelCo. */ - -static int -got_cinf(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - - idev->charge++; - switch (idev->charge_state) { - case ST_CHARGE_NULL: - idev->charge_state = ST_CHARGE_GOT_CINF; - break; - case ST_CHARGE_GOT_CINF: - idev->charge_state = ST_CHARGE_HAVE_CINT; - /* fall through */ - case ST_CHARGE_HAVE_CINT: - idev->chargeint = jiffies - idev->chargetime; - break; - } - idev->chargetime = jiffies; - dbg_net_dial("%s: got CINF\n", idev->name); - return 0; -} - -/* Perform hangup for a net-interface. */ - -int -isdn_net_hangup(isdn_net_dev *idev) -{ - isdn_ctrl cmd; - - del_timer(&idev->dial_timer); - - printk(KERN_INFO "%s: local hangup\n", idev->name); - // FIXME via state machine - if (idev->isdn_slot) - isdn_slot_command(idev->isdn_slot, ISDN_CMD_HANGUP, &cmd); - return 1; -} - -static int isdn_net_rcv_skb(struct isdn_slot *slot, struct sk_buff *skb); - -/* - * Handle status-messages from ISDN-interfacecard. - * This function is called from within the main-status-dispatcher - * isdn_status_callback, which itself is called from the low-level driver. - */ -static int -isdn_net_event_callback(struct isdn_slot *slot, int pr, void *arg) -{ - isdn_net_dev *idev = slot->priv; - - if (!idev) { - isdn_BUG(); - return 0; - } - switch (pr) { - case EV_DATA_IND: - return isdn_net_rcv_skb(slot, arg); - case EV_STAT_DCONN: - return fsm_event(&idev->fi, EV_NET_STAT_DCONN, arg); - case EV_STAT_BCONN: - return fsm_event(&idev->fi, EV_NET_STAT_BCONN, arg); - case EV_STAT_BHUP: - return fsm_event(&idev->fi, EV_NET_STAT_BHUP, arg); - case EV_STAT_DHUP: - return fsm_event(&idev->fi, EV_NET_STAT_DHUP, arg); - case EV_STAT_CINF: - return fsm_event(&idev->fi, EV_NET_STAT_CINF, arg); - case EV_STAT_BSENT: - return fsm_event(&idev->fi, EV_NET_STAT_BSENT, arg); - default: - printk("unknown pr %d\n", pr); - return 0; - } -} - -static int -isdn_net_handle_event(isdn_net_dev *idev, int pr, void *arg) -{ - return fsm_event(&idev->fi, pr, arg); -} - -static int -hang_up(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - - isdn_net_hangup(idev); - return 0; -} - -static int -got_bsent(struct fsm_inst *fi, int pr, void *arg) -{ - isdn_net_dev *idev = fi->userdata; - isdn_ctrl *c = arg; - - isdn_net_bsent(idev, c); - return 0; -} - -static struct fsm_node isdn_net_fn_tbl[] = { - { ST_NULL, EV_NET_DO_DIAL, do_dial }, - { ST_NULL, EV_NET_DO_ACCEPT, accept_icall }, - { ST_NULL, EV_NET_DO_CALLBACK, do_callback }, - - { ST_OUT_WAIT_DCONN, EV_NET_TIMER_DIAL, dial_timeout }, - { ST_OUT_WAIT_DCONN, EV_NET_STAT_DCONN, out_dconn }, - { ST_OUT_WAIT_DCONN, EV_NET_STAT_DHUP, connect_fail }, - { ST_OUT_WAIT_DCONN, EV_NET_TIMER_CB_OUT, hang_up }, - - { ST_OUT_WAIT_BCONN, EV_NET_TIMER_DIAL, dial_timeout }, - { ST_OUT_WAIT_BCONN, EV_NET_STAT_BCONN, bconn }, - { ST_OUT_WAIT_BCONN, EV_NET_STAT_DHUP, connect_fail }, - - { ST_IN_WAIT_DCONN, EV_NET_TIMER_INCOMING, hang_up }, - { ST_IN_WAIT_DCONN, EV_NET_STAT_DCONN, in_dconn }, - { ST_IN_WAIT_DCONN, EV_NET_STAT_DHUP, connect_fail }, - - { ST_IN_WAIT_BCONN, EV_NET_TIMER_INCOMING, hang_up }, - { ST_IN_WAIT_BCONN, EV_NET_STAT_BCONN, bconn }, - { ST_IN_WAIT_BCONN, EV_NET_STAT_DHUP, connect_fail }, - - { ST_ACTIVE, EV_NET_TIMER_HUP, check_hup }, - { ST_ACTIVE, EV_NET_STAT_BHUP, bhup }, - { ST_ACTIVE, EV_NET_STAT_CINF, got_cinf }, - { ST_ACTIVE, EV_NET_STAT_BSENT, got_bsent }, - - { ST_WAIT_DHUP, EV_NET_STAT_DHUP, dhup }, - - { ST_WAIT_BEFORE_CB, EV_NET_TIMER_CB_IN, do_dial }, - - { ST_OUT_DIAL_WAIT, EV_NET_TIMER_DIAL_WAIT, dialout_next }, -}; - -static struct fsm isdn_net_fsm = { - .st_cnt = ARRAY_SIZE(isdn_net_st_str), - .st_str = isdn_net_st_str, - .ev_cnt = ARRAY_SIZE(isdn_net_ev_str), - .ev_str = isdn_net_ev_str, - .fn_cnt = ARRAY_SIZE(isdn_net_fn_tbl), - .fn_tbl = isdn_net_fn_tbl, -}; - -static void isdn_net_dev_debug(struct fsm_inst *fi, char *fmt, ...) -{ - va_list args; - isdn_net_dev *idev = fi->userdata; - char buf[128]; - char *p = buf; - - va_start(args, fmt); - p += sprintf(p, "%s: ", idev->name); - p += vsprintf(p, fmt, args); - va_end(args); - printk(KERN_DEBUG "%s\n", buf); -} - -/* ====================================================================== */ -/* xmit path */ -/* ====================================================================== */ - -#define ISDN_NET_MAX_QUEUE_LENGTH 2 - -/* - * is this particular channel busy? - */ -static inline int -isdn_net_dev_busy(isdn_net_dev *idev) -{ - return idev->frame_cnt >= ISDN_NET_MAX_QUEUE_LENGTH; -} - -/* - * find out if the net_device which this mlp is belongs to is busy. - * It's busy iff all channels are busy. - * must hold mlp->xmit_lock - * FIXME: Use a mlp->frame_cnt instead of loop? - */ -static inline int -isdn_net_local_busy(isdn_net_local *mlp) -{ - isdn_net_dev *idev; - - list_for_each_entry(idev, &mlp->online, online) { - if (!isdn_net_dev_busy(idev)) - return 0; - } - return 1; -} - -/* - * For the given net device, this will get a non-busy channel out of the - * corresponding bundle. - * must hold mlp->xmit_lock - */ -isdn_net_dev * -isdn_net_get_xmit_dev(isdn_net_local *mlp) -{ - isdn_net_dev *idev; - - list_for_each_entry(idev, &mlp->online, online) { - if (!isdn_net_dev_busy(idev)) { - /* point the head to next online channel */ - list_del(&mlp->online); - list_add(&mlp->online, &idev->online); - return idev; - } - } - return NULL; -} - -/* mlp->xmit_lock must be held */ -static inline void -isdn_net_inc_frame_cnt(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - - if (isdn_net_dev_busy(idev)) - isdn_BUG(); - - idev->frame_cnt++; - if (isdn_net_local_busy(mlp)) - netif_stop_queue(&mlp->dev); -} - -/* mlp->xmit_lock must be held */ -static inline void -isdn_net_dec_frame_cnt(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - - idev->frame_cnt--; - - if (isdn_net_dev_busy(idev)) - isdn_BUG(); - - if (!skb_queue_empty(&idev->super_tx_queue)) - tasklet_schedule(&idev->tlet); - else - netif_wake_queue(&mlp->dev); -} - -static void -isdn_net_tasklet(unsigned long data) -{ - isdn_net_dev *idev = (isdn_net_dev *) data; - isdn_net_local *mlp = idev->mlp; - struct sk_buff *skb; - unsigned long flags; - - spin_lock_irqsave(&mlp->xmit_lock, flags); - while (!isdn_net_dev_busy(idev) && - (skb = skb_dequeue(&idev->super_tx_queue))) { - isdn_net_writebuf_skb(idev, skb); - } - spin_unlock_irqrestore(&mlp->xmit_lock, flags); -} - -/* We're good to accept (IP/whatever) traffic now */ - -void -isdn_net_online(isdn_net_dev *idev) -{ - // FIXME check we're connected - isdn_net_local *mlp = idev->mlp; - unsigned long flags; - - spin_lock_irqsave(&mlp->xmit_lock, flags); - list_add(&idev->online, &mlp->online); - spin_unlock_irqrestore(&mlp->xmit_lock, flags); - - netif_wake_queue(&mlp->dev); -} - -/* No more (IP/whatever) traffic over the net interface */ - -void -isdn_net_offline(isdn_net_dev *idev) -{ - isdn_net_local *mlp = idev->mlp; - unsigned long flags; - - spin_lock_irqsave(&mlp->xmit_lock, flags); - list_del(&idev->online); - spin_unlock_irqrestore(&mlp->xmit_lock, flags); - - skb_queue_purge(&idev->super_tx_queue); -} - -/* - * all frames sent from the (net) LL to a HL driver should go via this function - * must hold mlp->xmit_lock - */ -void -isdn_net_writebuf_skb(isdn_net_dev *idev, struct sk_buff *skb) -{ - isdn_net_local *mlp = idev->mlp; - int ret; - int len = skb->len; /* save len */ - - /* before obtaining the lock the caller should have checked that - the lp isn't busy */ - if (isdn_net_dev_busy(idev)) { - isdn_BUG(); - goto error; - } - - if (!isdn_net_is_connected(idev)) { - isdn_BUG(); - goto error; - } - ret = isdn_slot_write(idev->isdn_slot, skb); - if (ret != len) { - /* we should never get here */ - printk(KERN_WARNING "%s: HL driver queue full\n", idev->name); - goto error; - } - - idev->transcount += len; - isdn_net_inc_frame_cnt(idev); - return; - - error: - dev_kfree_skb(skb); - mlp->stats.tx_errors++; -} - -/* A packet has successfully been sent out. */ - -static int -isdn_net_bsent(isdn_net_dev *idev, isdn_ctrl *c) -{ - isdn_net_local *mlp = idev->mlp; - unsigned long flags; - - spin_lock_irqsave(&mlp->xmit_lock, flags); - isdn_net_dec_frame_cnt(idev); - spin_unlock_irqrestore(&mlp->xmit_lock, flags); - mlp->stats.tx_packets++; - mlp->stats.tx_bytes += c->parm.length; - return 1; -} - -/* - * Based on cps-calculation, check if device is overloaded. - * If so, and if a slave exists, trigger dialing for it. - * If any slave is online, deliver packets using a simple round robin - * scheme. - * - * Return: 0 on success, !0 on failure. - */ - -int -isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) -{ - isdn_net_dev *idev; - isdn_net_local *mlp = ndev->priv; - unsigned long flags; - int retval; - - ndev->trans_start = jiffies; - - spin_lock_irqsave(&mlp->xmit_lock, flags); - - if (list_empty(&mlp->online)) { - retval = isdn_net_autodial(skb, ndev); - goto out; - } - - idev = isdn_net_get_xmit_dev(mlp); - if (!idev) { - printk(KERN_INFO "%s: all channels busy - requeuing!\n", ndev->name); - netif_stop_queue(ndev); - retval = 1; - goto out; - } - - isdn_net_writebuf_skb(idev, skb); - - /* the following stuff is here for backwards compatibility. - * in future, start-up and hangup of slaves (based on current load) - * should move to userspace and get based on an overall cps - * calculation - */ - if (jiffies != idev->last_jiffies) { - idev->cps = idev->transcount * HZ / (jiffies - idev->last_jiffies); - idev->last_jiffies = jiffies; - idev->transcount = 0; - } - if ((get_isdn_dev())->net_verbose > 3) - printk(KERN_DEBUG "%s: %d bogocps\n", idev->name, idev->cps); - - if (idev->cps > mlp->triggercps) { - if (!idev->sqfull) { - /* First time overload: set timestamp only */ - idev->sqfull = 1; - idev->sqfull_stamp = jiffies; - } else { - /* subsequent overload: if slavedelay exceeded, start dialing */ - if (time_after(jiffies, idev->sqfull_stamp + mlp->slavedelay)) { - if (ISDN_NET_DIALMODE(*mlp) == ISDN_NET_DM_AUTO) - __isdn_net_dial_slave(mlp); - } - } - } else { - if (idev->sqfull && time_after(jiffies, idev->sqfull_stamp + mlp->slavedelay + 10 * HZ)) { - idev->sqfull = 0; - } - /* this is a hack to allow auto-hangup for slaves on moderate loads */ - list_del(&mlp->online); - list_add_tail(&mlp->online, &idev->online); - } - - retval = 0; - out: - spin_unlock_irqrestore(&mlp->xmit_lock, flags); - return retval; -} - -/* - * this function is used to send supervisory data, i.e. data which was - * not received from the network layer, but e.g. frames from ipppd, CCP - * reset frames etc. - * must hold mlp->xmit_lock - */ -void -isdn_net_write_super(isdn_net_dev *idev, struct sk_buff *skb) -{ - if (!isdn_net_dev_busy(idev)) { - isdn_net_writebuf_skb(idev, skb); - } else { - skb_queue_tail(&idev->super_tx_queue, skb); - } -} - -/* ====================================================================== */ -/* receive path */ -/* ====================================================================== */ - -/* - * A packet arrived via ISDN. Search interface-chain for a corresponding - * interface. If found, deliver packet to receiver-function and return 1, - * else return 0. - */ -static int -isdn_net_rcv_skb(struct isdn_slot *slot, struct sk_buff *skb) -{ - isdn_net_dev *idev = slot->priv; - isdn_net_local *mlp; - - if (!idev) { - isdn_BUG(); - return 0; - } - if (!isdn_net_is_connected(idev)) { - isdn_BUG(); - return 0; - } - - mlp = idev->mlp; - - idev->transcount += skb->len; - - mlp->stats.rx_packets++; - mlp->stats.rx_bytes += skb->len; - skb->dev = &mlp->dev; - skb->pkt_type = PACKET_HOST; - isdn_dumppkt("R:", skb->data, skb->len, 40); - - mlp->ops->receive(mlp, idev, skb); - - return 1; -} - -/* - * After handling connection-type specific stuff, the receiver function - * can use this function to pass the skb on to the network layer. - */ -void -isdn_netif_rx(isdn_net_dev *idev, struct sk_buff *skb, u16 protocol) -{ - idev->huptimer = 0; - - skb->protocol = protocol; - skb->dev = &idev->mlp->dev; - netif_rx(skb); -} - -/* ====================================================================== */ -/* init / exit */ -/* ====================================================================== */ - -void -isdn_net_lib_init(void) -{ - fsm_new(&isdn_net_fsm); - -#ifdef CONFIG_ISDN_NET_SIMPLE - register_isdn_netif(ISDN_NET_ENCAP_ETHER, &isdn_ether_ops); - register_isdn_netif(ISDN_NET_ENCAP_RAWIP, &isdn_rawip_ops); - register_isdn_netif(ISDN_NET_ENCAP_IPTYP, &isdn_iptyp_ops); - register_isdn_netif(ISDN_NET_ENCAP_UIHDLC, &isdn_uihdlc_ops); -#endif -#ifdef CONFIG_ISDN_NET_CISCO - register_isdn_netif(ISDN_NET_ENCAP_CISCOHDLC, &isdn_ciscohdlck_ops); - register_isdn_netif(ISDN_NET_ENCAP_CISCOHDLCK, &isdn_ciscohdlck_ops); -#endif -#ifdef CONFIG_ISDN_X25 - register_isdn_netif(ISDN_NET_ENCAP_X25IFACE, &isdn_x25_ops); -#endif -#ifdef CONFIG_ISDN_PPP - register_isdn_netif(ISDN_NET_ENCAP_SYNCPPP, &isdn_ppp_ops); -#endif -} - -void -isdn_net_lib_exit(void) -{ - fsm_free(&isdn_net_fsm); -} diff -Nru a/drivers/isdn/i4l/isdn_net_lib.h b/drivers/isdn/i4l/isdn_net_lib.h --- a/drivers/isdn/i4l/isdn_net_lib.h Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,224 +0,0 @@ -/* Linux ISDN subsystem, network interface support code - * - * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -#ifndef __ISDN_NET_LIB_H__ -#define __ISDN_NET_LIB_H__ - -#include - -typedef struct isdn_net_local_s isdn_net_local; -typedef struct isdn_net_dev_s isdn_net_dev; - -struct isdn_netif_ops { - int (*hard_start_xmit) (struct sk_buff *skb, - struct net_device *dev); - int (*hard_header) (struct sk_buff *skb, - struct net_device *dev, - unsigned short type, - void *daddr, - void *saddr, - unsigned len); - int (*do_ioctl)(struct net_device *dev, - struct ifreq *ifr, int cmd); - - unsigned short flags; /* interface flags (a la BSD) */ - unsigned short type; /* interface hardware type */ - unsigned char addr_len;/* hardware address length */ - void (*receive)(struct isdn_net_local_s *, - struct isdn_net_dev_s *, - struct sk_buff *); - void (*connected)(struct isdn_net_dev_s *); - void (*disconnected)(struct isdn_net_dev_s *); - int (*bind)(struct isdn_net_dev_s *); - void (*unbind)(struct isdn_net_dev_s *); - int (*init)(struct isdn_net_local_s *); - void (*cleanup)(struct isdn_net_local_s *); - int (*open)(struct isdn_net_local_s *); - void (*close)(struct isdn_net_local_s *); -}; - -/* our interface to isdn_common.c */ -void isdn_net_lib_init(void); -void isdn_net_lib_exit(void); -void isdn_net_hangup_all(void); -int isdn_net_ioctl(struct inode *, struct file *, uint, ulong); -int isdn_net_find_icall(struct isdn_slot *slot, setup_parm *setup); - -/* provided for interface types to use */ -void isdn_net_writebuf_skb(isdn_net_dev *, struct sk_buff *skb); -void isdn_net_write_super(isdn_net_dev *, struct sk_buff *skb); -void isdn_net_online(isdn_net_dev *idev); -void isdn_net_offline(isdn_net_dev *idev); -int isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev); -void isdn_netif_rx(isdn_net_dev *idev, struct sk_buff *skb, u16 protocol); -isdn_net_dev *isdn_net_get_xmit_dev(isdn_net_local *mlp); -int isdn_net_hangup(isdn_net_dev *); -int isdn_net_autodial(struct sk_buff *skb, struct net_device *ndev); -int isdn_net_dial_req(isdn_net_dev *); -int register_isdn_netif(int encap, struct isdn_netif_ops *ops); - -/* ====================================================================== */ - -/* Feature- and status-flags for a net-interface */ -#define ISDN_NET_SECURE 0x02 /* Accept calls from phonelist only */ -#define ISDN_NET_CALLBACK 0x04 /* activate callback */ -#define ISDN_NET_CBHUP 0x08 /* hangup before callback */ -#define ISDN_NET_CBOUT 0x10 /* remote machine does callback */ - -#define ISDN_NET_MAGIC 0x49344C02 /* for paranoia-checking */ - -/* Phone-list-element */ -struct isdn_net_phone { - struct list_head list; - char num[ISDN_MSNLEN]; -}; - -/* per network interface data (dev->priv) */ - -struct isdn_net_local_s { - ulong magic; - struct net_device dev; /* interface to upper levels */ - struct net_device_stats stats; /* Ethernet Statistics */ - struct isdn_netif_ops *ops; - void *inl_priv; /* interface types can put their - private data here */ - int flags; /* Connection-flags */ - int dialmax; /* Max. Number of Dial-retries */ - int dialtimeout; /* How long shall we try on dialing */ - int dialwait; /* wait after failed attempt */ - - int cbdelay; /* Delay before Callback starts */ - char msn[ISDN_MSNLEN]; /* MSNs/EAZs for this interface */ - - u_char cbhup; /* Flag: Reject Call before Callback*/ - int hupflags; /* Flags for charge-unit-hangup: */ - int onhtime; /* Time to keep link up */ - - u_char p_encap; /* Packet encapsulation */ - u_char l2_proto; /* Layer-2-protocol */ - u_char l3_proto; /* Layer-3-protocol */ - - ulong slavedelay; /* Dynamic bundling delaytime */ - int triggercps; /* BogoCPS needed for trigger slave */ - struct list_head phone[2]; /* List of remote-phonenumbers */ - /* phone[0] = Incoming Numbers */ - /* phone[1] = Outgoing Numbers */ - - struct list_head slaves; /* list of all bundled channels - protected by serializing config - ioctls / no change allowed when - interface is running */ - struct list_head online; /* list of all bundled channels - which can be used for actual - data (IP) transfer - protected by xmit_lock */ - - spinlock_t xmit_lock; /* used to protect the xmit path of - a net_device, including all - associated channels's frame_cnt */ - struct list_head running_devs; /* member of global running_devs */ - atomic_t refcnt; /* references held by ISDN code */ - -}; - - -/* per ISDN channel (ISDN interface) data */ - -struct isdn_net_dev_s { - struct isdn_slot *isdn_slot; /* Index to isdn device/channel */ - struct isdn_slot *exclusive; /* NULL if non excl */ - int pre_device; /* Preselected isdn-device */ - int pre_channel; /* Preselected isdn-channel */ - - struct timer_list dial_timer; /* dial events timer */ - struct fsm_inst fi; /* call control state machine */ - int dial_event; /* event in case of timer expiry */ - int dial; /* # of phone number just dialed */ - int outgoing; /* Flag: outgoing call */ - int dialretry; /* Counter for Dialout-retries */ - - int cps; /* current speed of this interface */ - int transcount; /* byte-counter for cps-calculation */ - u_long last_jiffies; /* when transcount was reset */ - int sqfull; /* Flag: netdev-queue overloaded */ - u_long sqfull_stamp; /* Start-Time of overload */ - - int huptimer; /* Timeout-counter for auto-hangup */ - int charge; /* Counter for charging units */ - int charge_state; /* ChargeInfo state machine */ - u_long chargetime; /* Timer for Charging info */ - int chargeint; /* Interval between charge-infos */ - - int pppbind; /* ippp device for bindings */ - - struct sk_buff_head super_tx_queue; /* List of supervisory frames to */ - /* be transmitted asap */ - int frame_cnt; /* number of frames currently */ - /* queued in HL driver */ - struct tasklet_struct tlet; - - isdn_net_local *mlp; /* Ptr to master device for all devs*/ - - struct list_head slaves; /* member of local->slaves */ - struct list_head online; /* member of local->online */ - - char name[10]; /* Name of device */ - struct list_head global_list; /* global list of all isdn_net_devs */ - void *ind_priv; /* interface types can put their - private data here */ -}; - -/* ====================================================================== */ - -static inline int -put_u8(unsigned char *p, u8 x) -{ - *p = x; - return 1; -} - -static inline int -put_u16(unsigned char *p, u16 x) -{ - *((u16 *)p) = htons(x); - return 2; -} - -static inline int -put_u32(unsigned char *p, u32 x) -{ - *((u32 *)p) = htonl(x); - return 4; -} - -static inline int -get_u8(unsigned char *p, u8 *x) -{ - *x = *p; - return 1; -} - -static inline int -get_u16(unsigned char *p, u16 *x) -{ - *x = ntohs(*((u16 *)p)); - return 2; -} - -static inline int -get_u32(unsigned char *p, u32 *x) -{ - *x = ntohl(*((u32 *)p)); - return 4; -} - - -#endif diff -Nru a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c --- a/drivers/isdn/i4l/isdn_ppp.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/i4l/isdn_ppp.c Thu Feb 19 23:44:26 2004 @@ -1,803 +1,843 @@ -/* Linux ISDN subsystem, functions for synchronous PPP (linklevel). +/* $Id: isdn_ppp.c,v 1.1.2.3 2004/02/10 01:07:13 keil Exp $ * - * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-2002 by Kai Germaschewski + * Linux ISDN subsystem, functions for synchronous PPP (linklevel). + * + * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ -#include +#include #include -#include #include #include -#include +#ifdef CONFIG_IPPP_FILTER +#include +#endif #include "isdn_common.h" -#include "isdn_net_lib.h" #include "isdn_ppp.h" -#include "isdn_ppp_ccp.h" -#include "isdn_ppp_vj.h" -#include "isdn_ppp_mp.h" +#include "isdn_net.h" -/* ====================================================================== */ +#ifndef PPP_IPX +#define PPP_IPX 0x002b +#endif -#define IPPP_MAX_RQ_LEN 8 /* max #frames queued for ipppd to read */ +/* Prototypes */ +static int isdn_ppp_fill_rq(unsigned char *buf, int len, int proto, int slot); +static int isdn_ppp_closewait(int slot); +static void isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, + struct sk_buff *skb, int proto); +static int isdn_ppp_if_get_unit(char *namebuf); +static int isdn_ppp_set_compressor(struct ippp_struct *is,struct isdn_ppp_comp_data *); +static struct sk_buff *isdn_ppp_decompress(struct sk_buff *, + struct ippp_struct *,struct ippp_struct *,int *proto); +static void isdn_ppp_receive_ccp(isdn_net_dev * net_dev, isdn_net_local * lp, + struct sk_buff *skb,int proto); +static struct sk_buff *isdn_ppp_compress(struct sk_buff *skb_in,int *proto, + struct ippp_struct *is,struct ippp_struct *master,int type); +static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, + struct sk_buff *skb); -static int -isdn_ppp_set_compressor(isdn_net_dev *idev, struct isdn_ppp_comp_data *); +/* New CCP stuff */ +static void isdn_ppp_ccp_kickup(struct ippp_struct *is); +static void isdn_ppp_ccp_xmit_reset(struct ippp_struct *is, int proto, + unsigned char code, unsigned char id, + unsigned char *data, int len); +static struct ippp_ccp_reset *isdn_ppp_ccp_reset_alloc(struct ippp_struct *is); +static void isdn_ppp_ccp_reset_free(struct ippp_struct *is); +static void isdn_ppp_ccp_reset_free_state(struct ippp_struct *is, + unsigned char id); +static void isdn_ppp_ccp_timer_callback(unsigned long closure); +static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_struct *is, + unsigned char id); +static void isdn_ppp_ccp_reset_trans(struct ippp_struct *is, + struct isdn_ppp_resetparams *rp); +static void isdn_ppp_ccp_reset_ack_rcvd(struct ippp_struct *is, + unsigned char id); -/* ====================================================================== */ -/* IPPPD handling */ -/* ====================================================================== */ - -/* We use reference counting for struct ipppd. It is alloced on - * open() on /dev/ipppX and saved into file->private, making for one - * reference. release() will release this reference, after all other - * references are gone, the destructor frees it. - * - * Another reference is taken by isdn_ppp_bind() and freed by - * isdn_ppp_unbind(). The callbacks from isdn_net_lib.c happen only - * between isdn_ppp_bind() and isdn_ppp_unbind(), i.e. access to - * idev->ipppd is safe without further locking. - */ -#undef IPPPD_DEBUG - -#ifdef IPPPD_DEBUG -#define ipppd_debug(i, fmt, arg...) \ - printk(KERN_DEBUG "ipppd %p minor %d state %#x %s: " fmt "\n", (i), \ - (i)->minor, (i)->state, __FUNCTION__ , ## arg) -#else -#define ipppd_debug(...) do { } while (0) -#endif -/* ipppd::flags */ -enum { - IPPPD_FL_HUP = 0x01, - IPPPD_FL_WAKEUP = 0x02, -}; - -/* ipppd::state */ -enum { - IPPPD_ST_OPEN, - IPPPD_ST_ASSIGNED, - IPPPD_ST_CONNECTED, -}; - -struct ipppd { - struct list_head ipppds; - int state; - int flags; - struct sk_buff_head rq; - wait_queue_head_t wq; - struct isdn_net_dev_s *idev; - int unit; - int minor; - unsigned long debug; - atomic_t refcnt; -}; +#ifdef CONFIG_ISDN_MPP +static ippp_bundle * isdn_ppp_bundle_arr = NULL; + +static int isdn_ppp_mp_bundle_array_init(void); +static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to ); +static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, + struct sk_buff *skb); +static void isdn_ppp_mp_cleanup( isdn_net_local * lp ); + +static int isdn_ppp_bundle(struct ippp_struct *, int unit); +#endif /* CONFIG_ISDN_MPP */ + +char *isdn_ppp_revision = "$Revision: 1.1.2.3 $"; -/* ====================================================================== */ +static struct ippp_struct *ippp_table[ISDN_MAX_CHANNELS]; -static spinlock_t ipppds_lock = SPIN_LOCK_UNLOCKED; -static LIST_HEAD(ipppds); +static struct isdn_ppp_compressor *ipc_head = NULL; +/* + * frame log (debug) + */ static void -ipppd_destroy(struct ipppd *ipppd) +isdn_ppp_frame_log(char *info, char *data, int len, int maxlen,int unit,int slot) { - HERE; + int cnt, + j, + i; + char buf[80]; - skb_queue_purge(&ipppd->rq); - kfree(ipppd); -} + if (len < maxlen) + maxlen = len; -static inline struct ipppd * -ipppd_get(struct ipppd *ipppd) -{ - atomic_inc(&ipppd->refcnt); - printk("%s: %d\n", __FUNCTION__, atomic_read(&ipppd->refcnt)); - return ipppd; + for (i = 0, cnt = 0; cnt < maxlen; i++) { + for (j = 0; j < 16 && cnt < maxlen; j++, cnt++) + sprintf(buf + j * 3, "%02x ", (unsigned char) data[cnt]); + printk(KERN_DEBUG "[%d/%d].%s[%d]: %s\n",unit,slot, info, i, buf); + } } -static inline void -ipppd_put(struct ipppd *ipppd) +/* + * unbind isdn_net_local <=> ippp-device + * note: it can happen, that we hangup/free the master before the slaves + * in this case we bind another lp to the master device + */ +int +isdn_ppp_free(isdn_net_local * lp) { - printk("%s: %d\n", __FUNCTION__, atomic_read(&ipppd->refcnt)); - - if (atomic_dec_and_test(&ipppd->refcnt)) - ipppd_destroy(ipppd); -} - -/* ====================================================================== */ -/* char dev ops */ + struct ippp_struct *is; -/* --- open ------------------------------------------------------------- */ - -static int -ipppd_open(struct inode *ino, struct file *file) -{ - unsigned long flags; - unsigned int minor = iminor(ino) - ISDN_MINOR_PPP; - struct ipppd *ipppd; + if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", + __FUNCTION__, lp->ppp_slot); + return 0; + } - ipppd = kmalloc(sizeof(*ipppd), GFP_KERNEL); - if (!ipppd) - return -ENOMEM; +#ifdef CONFIG_ISDN_MPP + spin_lock(&lp->netdev->pb->lock); +#endif + isdn_net_rm_from_bundle(lp); +#ifdef CONFIG_ISDN_MPP + if (lp->netdev->pb->ref_ct == 1) /* last link in queue? */ + isdn_ppp_mp_cleanup(lp); + + lp->netdev->pb->ref_ct--; + spin_unlock(&lp->netdev->pb->lock); +#endif /* CONFIG_ISDN_MPP */ + if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n", + __FUNCTION__, lp->ppp_slot); + return 0; + } + is = ippp_table[lp->ppp_slot]; + if ((is->state & IPPP_CONNECT)) + isdn_ppp_closewait(lp->ppp_slot); /* force wakeup on ippp device */ + else if (is->state & IPPP_ASSIGNED) + is->state = IPPP_OPEN; /* fallback to 'OPEN but not ASSIGNED' state */ - memset(ipppd, 0, sizeof(*ipppd)); - atomic_set(&ipppd->refcnt, 0); - - /* file->private_data holds a reference */ - file->private_data = ipppd_get(ipppd); + if (is->debug & 0x1) + printk(KERN_DEBUG "isdn_ppp_free %d %lx %lx\n", lp->ppp_slot, (long) lp, (long) is->lp); - ipppd->unit = -1; /* set by isdn_ppp_bind */ - ipppd->minor = minor; - ipppd->state = IPPPD_ST_OPEN; - init_waitqueue_head(&ipppd->wq); - skb_queue_head_init(&ipppd->rq); - - spin_lock_irqsave(&ipppds_lock, flags); - list_add(&ipppd->ipppds, &ipppds); - spin_unlock_irqrestore(&ipppds_lock, flags); - - ipppd_debug(ipppd, "minor %d", minor); + is->lp = NULL; /* link is down .. set lp to NULL */ + lp->ppp_slot = -1; /* is this OK ?? */ return 0; } -/* --- release --------------------------------------------------------- */ - -static int -ipppd_release(struct inode *ino, struct file *file) +/* + * bind isdn_net_local <=> ippp-device + * + * This function is allways called with holding dev->lock so + * no additional lock is needed + */ +int +isdn_ppp_bind(isdn_net_local * lp) { - unsigned long flags; - struct ipppd *ipppd = file->private_data; - - ipppd_debug(ipppd, ""); + int i; + int unit = 0; + struct ippp_struct *is; + int retval; - if (ipppd->state == IPPPD_ST_CONNECTED) - isdn_net_hangup(ipppd->idev); + if (lp->pppbind < 0) { /* device bounded to ippp device ? */ + isdn_net_dev *net_dev = dev->netdev; + char exclusive[ISDN_MAX_CHANNELS]; /* exclusive flags */ + memset(exclusive, 0, ISDN_MAX_CHANNELS); + while (net_dev) { /* step through net devices to find exclusive minors */ + isdn_net_local *lp = net_dev->local; + if (lp->pppbind >= 0) + exclusive[lp->pppbind] = 1; + net_dev = net_dev->next; + } + /* + * search a free device / slot + */ + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + if (ippp_table[i]->state == IPPP_OPEN && !exclusive[ippp_table[i]->minor]) { /* OPEN, but not connected! */ + break; + } + } + } else { + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + if (ippp_table[i]->minor == lp->pppbind && + (ippp_table[i]->state & IPPP_OPEN) == IPPP_OPEN) + break; + } + } - spin_lock_irqsave(&ipppds_lock, flags); - list_del(&ipppd->ipppds); - spin_unlock_irqrestore(&ipppds_lock, flags); + if (i >= ISDN_MAX_CHANNELS) { + printk(KERN_WARNING "isdn_ppp_bind: Can't find a (free) connection to the ipppd daemon.\n"); + retval = -1; + goto out; + } + unit = isdn_ppp_if_get_unit(lp->name); /* get unit number from interface name .. ugly! */ + if (unit < 0) { + printk(KERN_ERR "isdn_ppp_bind: illegal interface name %s.\n", lp->name); + retval = -1; + goto out; + } + + lp->ppp_slot = i; + is = ippp_table[i]; + is->lp = lp; + is->unit = unit; + is->state = IPPP_OPEN | IPPP_ASSIGNED; /* assigned to a netdevice but not connected */ +#ifdef CONFIG_ISDN_MPP + retval = isdn_ppp_mp_init(lp, NULL); + if (retval < 0) + goto out; +#endif /* CONFIG_ISDN_MPP */ - ipppd_put(ipppd); + retval = lp->ppp_slot; - return 0; + out: + return retval; } -/* --- read ------------------------------------------------------------- */ +/* + * kick the ipppd on the device + * (wakes up daemon after B-channel connect) + */ -/* read() is always non blocking */ -static ssize_t -ipppd_read(struct file *file, char *buf, size_t count, loff_t *off) +void +isdn_ppp_wakeup_daemon(isdn_net_local * lp) { - struct ipppd *is; - struct sk_buff *skb; - int retval; + if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", + __FUNCTION__, lp->ppp_slot); + return; + } + ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK; + wake_up_interruptible(&ippp_table[lp->ppp_slot]->wq); +} - if (off != &file->f_pos) - return -ESPIPE; - - is = file->private_data; +/* + * there was a hangup on the netdevice + * force wakeup of the ippp device + * go into 'device waits for release' state + */ +static int +isdn_ppp_closewait(int slot) +{ + struct ippp_struct *is; - skb = skb_dequeue(&is->rq); - if (!skb) { - retval = -EAGAIN; - goto out; - } - if (skb->len > count) { - retval = -EMSGSIZE; - goto out_free; - } - if (copy_to_user(buf, skb->data, skb->len)) { - retval = -EFAULT; - goto out_free; + if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: slot(%d) out of range\n", + __FUNCTION__, slot); + return 0; } - retval = skb->len; - - out_free: - dev_kfree_skb(skb); - out: - return retval; + is = ippp_table[slot]; + if (is->state) + wake_up_interruptible(&is->wq); + is->state = IPPP_CLOSEWAIT; + return 1; } -/* --- write ------------------------------------------------------------ */ +/* + * isdn_ppp_find_slot / isdn_ppp_free_slot + */ -/* write() is always non blocking */ -static ssize_t -ipppd_write(struct file *file, const char *buf, size_t count, loff_t *off) -{ - isdn_net_dev *idev; - struct inl_ppp *inl_ppp; - struct ind_ppp *ind_ppp; - struct ipppd *ipppd; - struct sk_buff *skb; - char *p; - int retval; - u16 proto; +static int +isdn_ppp_get_slot(void) +{ + int i; + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + if (!ippp_table[i]->state) + return i; + } + return -1; +} - if (off != &file->f_pos) - return -ESPIPE; +/* + * isdn_ppp_open + */ - ipppd = file->private_data; - ipppd_debug(ipppd, "count = %d", count); +int +isdn_ppp_open(int min, struct file *file) +{ + int slot; + struct ippp_struct *is; - if (ipppd->state != IPPPD_ST_CONNECTED) { - retval = -ENOTCONN; - goto out; - } + if (min < 0 || min > ISDN_MAX_CHANNELS) + return -ENODEV; - idev = ipppd->idev; - if (!idev) { - isdn_BUG(); - retval = -ENODEV; - goto out; + slot = isdn_ppp_get_slot(); + if (slot < 0) { + return -EBUSY; } - ind_ppp = idev->ind_priv; - inl_ppp = idev->mlp->inl_priv; - /* Daemon needs to send at least full header, AC + proto */ - if (count < 4) { - retval = -EMSGSIZE; - goto out; - } - skb = isdn_ppp_dev_alloc_skb(idev, count, GFP_KERNEL); - if (!skb) { - retval = -ENOMEM; - goto out; - } - p = skb_put(skb, count); - if (copy_from_user(p, buf, count)) { - kfree_skb(skb); - retval = -EFAULT; - goto out; - } - /* Don't reset huptimer for LCP packets. (Echo requests). */ - proto = PPP_PROTOCOL(p); - if (proto != PPP_LCP) - idev->huptimer = 0; + is = file->private_data = ippp_table[slot]; - /* Keeps CCP/compression states in sync */ - switch (proto) { - case PPP_CCP: - ippp_ccp_send_ccp(inl_ppp->ccp, skb); - break; - case PPP_CCPFRAG: - ippp_ccp_send_ccp(ind_ppp->ccp, skb); - break; - } - /* FIXME: Somewhere we need protection against the - * queue growing too large */ - isdn_net_write_super(idev, skb); + printk(KERN_DEBUG "ippp, open, slot: %d, minor: %d, state: %04x\n", + slot, min, is->state); - retval = count; - - out: - return retval; -} + /* compression stuff */ + is->link_compressor = is->compressor = NULL; + is->link_decompressor = is->decompressor = NULL; + is->link_comp_stat = is->comp_stat = NULL; + is->link_decomp_stat = is->decomp_stat = NULL; + is->compflags = 0; + + is->reset = isdn_ppp_ccp_reset_alloc(is); + + is->lp = NULL; + is->mp_seqno = 0; /* MP sequence number */ + is->pppcfg = 0; /* ppp configuration */ + is->mpppcfg = 0; /* mppp configuration */ + is->last_link_seqno = -1; /* MP: maybe set to Bundle-MIN, when joining a bundle ?? */ + is->unit = -1; /* set, when we have our interface */ + is->mru = 1524; /* MRU, default 1524 */ + is->maxcid = 16; /* VJ: maxcid */ + is->tk = current; + init_waitqueue_head(&is->wq); + is->first = is->rq + NUM_RCV_BUFFS - 1; /* receive queue */ + is->last = is->rq; + is->minor = min; +#ifdef CONFIG_ISDN_PPP_VJ + /* + * VJ header compression init + */ + is->slcomp = slhc_init(16, 16); /* not necessary for 2. link in bundle */ +#endif +#ifdef CONFIG_IPPP_FILTER + is->pass_filter.filter = NULL; + is->active_filter.filter = NULL; +#endif + is->state = IPPP_OPEN; -/* --- poll ------------------------------------------------------------- */ + return 0; +} -static unsigned int -ipppd_poll(struct file *file, poll_table * wait) +/* + * release ippp device + */ +void +isdn_ppp_release(int min, struct file *file) { - unsigned int mask; - struct ipppd *is; + int i; + struct ippp_struct *is; + if (min < 0 || min >= ISDN_MAX_CHANNELS) + return; is = file->private_data; - ipppd_debug(is, ""); + if (!is) { + printk(KERN_ERR "%s: no file->private_data\n", __FUNCTION__); + return; + } + if (is->debug & 0x1) + printk(KERN_DEBUG "ippp: release, minor: %d %lx\n", min, (long) is->lp); - /* just registers wait_queue hook. This doesn't really wait. */ - poll_wait(file, &is->wq, wait); + if (is->lp) { /* a lp address says: this link is still up */ + isdn_net_dev *p = is->lp->netdev; - if (is->flags & IPPPD_FL_HUP) { - mask = POLLHUP; - goto out; + if (!p) { + printk(KERN_ERR "%s: no lp->netdev\n", __FUNCTION__); + return; + } + is->state &= ~IPPP_CONNECT; /* -> effect: no call of wakeup */ + /* + * isdn_net_hangup() calls isdn_ppp_free() + * isdn_ppp_free() sets is->lp to NULL and lp->ppp_slot to -1 + * removing the IPPP_CONNECT flag omits calling of isdn_ppp_wakeup_daemon() + */ + isdn_net_hangup(&p->dev); } - /* we're always ready to send .. */ - mask = POLLOUT | POLLWRNORM; + for (i = 0; i < NUM_RCV_BUFFS; i++) { + if (is->rq[i].buf) { + kfree(is->rq[i].buf); + is->rq[i].buf = NULL; + } + } + is->first = is->rq + NUM_RCV_BUFFS - 1; /* receive queue */ + is->last = is->rq; - /* - * if IPPP_FL_WAKEUP is set we return even if we have nothing to read - */ - if (!skb_queue_empty(&is->rq) || is->flags & IPPPD_FL_WAKEUP) { - is->flags &= ~IPPPD_FL_WAKEUP; - mask |= POLLIN | POLLRDNORM; +#ifdef CONFIG_ISDN_PPP_VJ +/* TODO: if this was the previous master: link the slcomp to the new master */ + slhc_free(is->slcomp); + is->slcomp = NULL; +#endif +#ifdef CONFIG_IPPP_FILTER + if (is->pass_filter.filter) { + kfree(is->pass_filter.filter); + is->pass_filter.filter = NULL; + } + if (is->active_filter.filter) { + kfree(is->active_filter.filter); + is->active_filter.filter = NULL; } +#endif - out: - return mask; -} +/* TODO: if this was the previous master: link the stuff to the new master */ + if(is->comp_stat) + is->compressor->free(is->comp_stat); + if(is->link_comp_stat) + is->link_compressor->free(is->link_comp_stat); + if(is->link_decomp_stat) + is->link_decompressor->free(is->link_decomp_stat); + if(is->decomp_stat) + is->decompressor->free(is->decomp_stat); + is->compressor = is->link_compressor = NULL; + is->decompressor = is->link_decompressor = NULL; + is->comp_stat = is->link_comp_stat = NULL; + is->decomp_stat = is->link_decomp_stat = NULL; + + /* Clean up if necessary */ + if(is->reset) + isdn_ppp_ccp_reset_free(is); -/* --- ioctl ------------------------------------------------------------ */ + /* this slot is ready for new connections */ + is->state = 0; +} -/* get_arg .. ioctl helper */ +/* + * get_arg .. ioctl helper + */ static int -get_arg(unsigned long arg, void *val, int len) +get_arg(void *b, void *val, int len) { - if (copy_from_user((void *) val, (void *) arg, len)) + if (len <= 0) + len = sizeof(void *); + if (copy_from_user((void *) val, b, len)) return -EFAULT; return 0; } -/* set arg .. ioctl helper */ +/* + * set arg .. ioctl helper + */ static int -set_arg(unsigned long arg, void *val,int len) +set_arg(void *b, void *val,int len) { - if (copy_to_user((void *) arg, (void *) val, len)) + if(len <= 0) + len = sizeof(void *); + if (copy_to_user(b, (void *) val, len)) return -EFAULT; return 0; } -static int -ipppd_ioctl(struct inode *ino, struct file *file, unsigned int cmd, - unsigned long arg) +/* + * ippp device ioctl + */ +int +isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) { - isdn_net_dev *idev; - struct ind_ppp *ind_ppp = NULL; - struct inl_ppp *inl_ppp = NULL; unsigned long val; - int r; - struct ipppd *is; + int r,i,j; + struct ippp_struct *is; + isdn_net_local *lp; struct isdn_ppp_comp_data data; - unsigned int cfg; - - is = file->private_data; - ipppd_debug(is, "cmd %#x", cmd); + is = (struct ippp_struct *) file->private_data; + lp = is->lp; - // FIXME that needs locking? - idev = is->idev; - if (idev) { - ind_ppp = idev->ind_priv; - inl_ppp = idev->mlp->inl_priv; - } - switch (cmd) { - case PPPIOCGUNIT: /* get ppp/isdn unit number */ - r = set_arg(arg, &is->unit, sizeof(is->unit)); - break; - case PPPIOCGDEBUG: - r = set_arg(arg, &is->debug, sizeof(is->debug)); - break; - case PPPIOCSDEBUG: - r = get_arg(arg, &val, sizeof(val)); - if (r) - break; - is->debug = val; - if (idev) { - ind_ppp->debug = val; - inl_ppp->debug = val; - } - break; - case PPPIOCGCOMPRESSORS: - { - unsigned long protos[8]; - ippp_ccp_get_compressors(protos); - r = set_arg(arg, protos, sizeof(protos)); - break; - } - default: - r = -ENOTTY; - break; - } + if (is->debug & 0x1) + printk(KERN_DEBUG "isdn_ppp_ioctl: minor: %d cmd: %x state: %x\n", min, cmd, is->state); - if (r != -ENOTTY) - goto out; - - if (!idev) { - r = -ENODEV; - goto out; - } + if (!(is->state & IPPP_OPEN)) + return -EINVAL; switch (cmd) { - case PPPIOCBUNDLE: - r = get_arg(arg, &val, sizeof(val)); - if (r) + case PPPIOCBUNDLE: +#ifdef CONFIG_ISDN_MPP + if (!(is->state & IPPP_CONNECT)) + return -EINVAL; + if ((r = get_arg((void *) arg, &val, sizeof(val) ))) + return r; + printk(KERN_DEBUG "iPPP-bundle: minor: %d, slave unit: %d, master unit: %d\n", + (int) min, (int) is->unit, (int) val); + return isdn_ppp_bundle(is, val); +#else + return -1; +#endif break; - - r = ippp_mp_bundle(idev, val); - break; - case PPPIOCGIFNAME: - r = set_arg(arg, idev->name, strlen(idev->name)+1); - break; - case PPPIOCGMPFLAGS: /* get configuration flags */ - r = set_arg(arg, &inl_ppp->mp_cfg, sizeof(inl_ppp->mp_cfg)); - break; - case PPPIOCSMPFLAGS: /* set configuration flags */ - r = get_arg(arg, &val, sizeof(val)); - if (r) + case PPPIOCGUNIT: /* get ppp/isdn unit number */ + if ((r = set_arg((void *) arg, &is->unit, sizeof(is->unit) ))) + return r; break; - inl_ppp->mp_cfg = val; - break; - case PPPIOCGFLAGS: /* get configuration flags */ - cfg = ind_ppp->pppcfg | ippp_ccp_get_flags(ind_ppp->ccp); - r = set_arg(arg, &cfg, sizeof(cfg)); - break; - case PPPIOCSFLAGS: /* set configuration flags */ - r = get_arg(arg, &val, sizeof(val)); - if (r) + case PPPIOCGIFNAME: + if(!lp) + return -EINVAL; + if ((r = set_arg((void *) arg, lp->name, strlen(lp->name)))) + return r; break; - if ((val & SC_ENABLE_IP) && !(ind_ppp->pppcfg & SC_ENABLE_IP)) { - ind_ppp->pppcfg = val; - /* OK .. we are ready to send buffers */ - isdn_net_online(idev); + case PPPIOCGMPFLAGS: /* get configuration flags */ + if ((r = set_arg((void *) arg, &is->mpppcfg, sizeof(is->mpppcfg) ))) + return r; break; - } - ind_ppp->pppcfg = val; - break; - case PPPIOCGIDLE: /* get idle time information */ - { - struct ppp_idle pidle; - pidle.xmit_idle = pidle.recv_idle = idev->huptimer; - r = set_arg(arg, &pidle,sizeof(pidle)); - break; - } - case PPPIOCSMRU: /* set receive unit size for PPP */ - r = get_arg(arg, &val, sizeof(val)); - if (r) + case PPPIOCSMPFLAGS: /* set configuration flags */ + if ((r = get_arg((void *) arg, &val, sizeof(val) ))) + return r; + is->mpppcfg = val; break; - r = ippp_ccp_set_mru(ind_ppp->ccp, val); - break; - case PPPIOCSMPMRU: - break; - case PPPIOCSMPMTU: - break; - case PPPIOCSMAXCID: /* set the maximum compression slot id */ - r = get_arg(arg, &val, sizeof(val)); - if (r) + case PPPIOCGFLAGS: /* get configuration flags */ + if ((r = set_arg((void *) arg, &is->pppcfg,sizeof(is->pppcfg) ))) + return r; break; - r = ippp_vj_set_maxcid(idev, val); - break; - case PPPIOCSCOMPRESSOR: - r = get_arg(arg, &data, sizeof(data)); - if (r) + case PPPIOCSFLAGS: /* set configuration flags */ + if ((r = get_arg((void *) arg, &val, sizeof(val) ))) { + return r; + } + if (val & SC_ENABLE_IP && !(is->pppcfg & SC_ENABLE_IP) && (is->state & IPPP_CONNECT)) { + if (lp) { + /* OK .. we are ready to send buffers */ + is->pppcfg = val; /* isdn_ppp_xmit test for SC_ENABLE_IP !!! */ + netif_wake_queue(&lp->netdev->dev); + break; + } + } + is->pppcfg = val; break; - r = isdn_ppp_set_compressor(idev, &data); - break; - case PPPIOCGCALLINFO: - { - isdn_net_local *mlp; - struct isdn_net_phone *phone; - struct pppcallinfo pci; - int i; - memset(&pci, 0, sizeof(pci)); - - mlp = idev->mlp; - strlcpy(pci.local_num, mlp->msn, sizeof(pci.local_num)); - i = 0; - list_for_each_entry(phone, &mlp->phone[1], list) { - if (i++ == idev->dial) { - strlcpy(pci.remote_num,phone->num,sizeof(pci.remote_num)); + case PPPIOCGIDLE: /* get idle time information */ + if (lp) { + struct ppp_idle pidle; + pidle.xmit_idle = pidle.recv_idle = lp->huptimer; + if ((r = set_arg((void *) arg, &pidle,sizeof(struct ppp_idle)))) + return r; + } + break; + case PPPIOCSMRU: /* set receive unit size for PPP */ + if ((r = get_arg((void *) arg, &val, sizeof(val) ))) + return r; + is->mru = val; + break; + case PPPIOCSMPMRU: + break; + case PPPIOCSMPMTU: + break; + case PPPIOCSMAXCID: /* set the maximum compression slot id */ + if ((r = get_arg((void *) arg, &val, sizeof(val) ))) + return r; + val++; + if (is->maxcid != val) { +#ifdef CONFIG_ISDN_PPP_VJ + struct slcompress *sltmp; +#endif + if (is->debug & 0x1) + printk(KERN_DEBUG "ippp, ioctl: changed MAXCID to %ld\n", val); + is->maxcid = val; +#ifdef CONFIG_ISDN_PPP_VJ + sltmp = slhc_init(16, val); + if (!sltmp) { + printk(KERN_ERR "ippp, can't realloc slhc struct\n"); + return -ENOMEM; + } + if (is->slcomp) + slhc_free(is->slcomp); + is->slcomp = sltmp; +#endif + } + break; + case PPPIOCGDEBUG: + if ((r = set_arg((void *) arg, &is->debug, sizeof(is->debug) ))) + return r; + break; + case PPPIOCSDEBUG: + if ((r = get_arg((void *) arg, &val, sizeof(val) ))) + return r; + is->debug = val; + break; + case PPPIOCGCOMPRESSORS: + { + unsigned long protos[8] = {0,}; + struct isdn_ppp_compressor *ipc = ipc_head; + while(ipc) { + j = ipc->num / (sizeof(long)*8); + i = ipc->num % (sizeof(long)*8); + if(j < 8) + protos[j] |= (0x1<next; + } + if ((r = set_arg((void *) arg,protos,8*sizeof(long) ))) + return r; + } + break; + case PPPIOCSCOMPRESSOR: + if ((r = get_arg((void *) arg, &data, sizeof(struct isdn_ppp_comp_data)))) + return r; + return isdn_ppp_set_compressor(is, &data); + case PPPIOCGCALLINFO: + { + struct pppcallinfo pci; + memset((char *) &pci,0,sizeof(struct pppcallinfo)); + if(lp) + { + strncpy(pci.local_num,lp->msn,63); + if(lp->dial) { + strncpy(pci.remote_num,lp->dial->num,63); + } + pci.charge_units = lp->charge; + if(lp->outgoing) + pci.calltype = CALLTYPE_OUTGOING; + else + pci.calltype = CALLTYPE_INCOMING; + if(lp->flags & ISDN_NET_CALLBACK) + pci.calltype |= CALLTYPE_CALLBACK; + } + return set_arg((void *)arg,&pci,sizeof(struct pppcallinfo)); + } +#ifdef CONFIG_IPPP_FILTER + case PPPIOCSPASS: + case PPPIOCSACTIVE: + { + struct sock_fprog uprog, *filtp; + struct sock_filter *code = NULL; + int len, err; + + if (copy_from_user(&uprog, (void *) arg, sizeof(uprog))) + return -EFAULT; + if (uprog.len > 0 && uprog.len < 65536) { + len = uprog.len * sizeof(struct sock_filter); + code = kmalloc(len, GFP_KERNEL); + if (code == NULL) + return -ENOMEM; + if (copy_from_user(code, uprog.filter, len)) { + kfree(code); + return -EFAULT; + } + err = sk_chk_filter(code, uprog.len); + if (err) { + kfree(code); + return err; + } + } + filtp = (cmd == PPPIOCSPASS) ? &is->pass_filter : &is->active_filter; + if (filtp->filter) + kfree(filtp->filter); + filtp->filter = code; + filtp->len = uprog.len; break; } - } - pci.charge_units = idev->charge; - if (idev->outgoing) - pci.calltype = CALLTYPE_OUTGOING; - else - pci.calltype = CALLTYPE_INCOMING; - if (mlp->flags & ISDN_NET_CALLBACK) - pci.calltype |= CALLTYPE_CALLBACK; - r = set_arg(arg, &pci, sizeof(pci)); - break; - } - default: - r = -ENOTTY; - break; +#endif /* CONFIG_IPPP_FILTER */ + default: + break; } - out: - return r; + return 0; } -/* --- fops ------------------------------------------------------------- */ - -struct file_operations isdn_ppp_fops = +unsigned int +isdn_ppp_poll(struct file *file, poll_table * wait) { - .owner = THIS_MODULE, - .llseek = no_llseek, - .read = ipppd_read, - .write = ipppd_write, - .poll = ipppd_poll, - .ioctl = ipppd_ioctl, - .open = ipppd_open, - .release = ipppd_release, -}; + u_int mask; + struct ippp_buf_queue *bf, *bl; + u_long flags; + struct ippp_struct *is; -/* --- ipppd_queue_read ------------------------------------------------- */ + is = file->private_data; -/* Queue packets for ipppd to read(). */ + if (is->debug & 0x2) + printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n", + MINOR(file->f_dentry->d_inode->i_rdev)); -static int -ipppd_queue_read(struct ipppd *is, u16 proto, unsigned char *buf, int len) -{ - struct sk_buff *skb; - unsigned char *p; - int retval; + /* just registers wait_queue hook. This doesn't really wait. */ + poll_wait(file, &is->wq, wait); - if (is->state != IPPPD_ST_CONNECTED) { - printk(KERN_DEBUG "ippp: device not connected.\n"); - retval = -ENOTCONN; - goto out; - } - if (skb_queue_len(&is->rq) > IPPP_MAX_RQ_LEN) { - printk(KERN_WARNING "ippp: Queue is full\n"); - retval = -EBUSY; - goto out; - } - skb = dev_alloc_skb(len + 4); - if (!skb) { - printk(KERN_WARNING "ippp: Can't alloc buf\n"); - retval = -ENOMEM; - goto out; + if (!(is->state & IPPP_OPEN)) { + if(is->state == IPPP_CLOSEWAIT) + return POLLHUP; + printk(KERN_DEBUG "isdn_ppp: device not open\n"); + return POLLERR; } - p = skb_put(skb, 4); - p += put_u8(p, PPP_ALLSTATIONS); - p += put_u8(p, PPP_UI); - p += put_u16(p, proto); - memcpy(skb_put(skb, len), buf, len); - - skb_queue_tail(&is->rq, skb); - wake_up(&is->wq); + /* we're always ready to send .. */ + mask = POLLOUT | POLLWRNORM; - retval = len; - out: - return retval; + spin_lock_irqsave(&is->buflock, flags); + bl = is->last; + bf = is->first; + /* + * if IPPP_NOBLOCK is set we return even if we have nothing to read + */ + if (bf->next != bl || (is->state & IPPP_NOBLOCK)) { + is->state &= ~IPPP_NOBLOCK; + mask |= POLLIN | POLLRDNORM; + } + spin_unlock_irqrestore(&is->buflock, flags); + return mask; } -/* ====================================================================== */ -/* interface to isdn_net_lib */ -/* ====================================================================== */ - - -/* Prototypes */ -static int -isdn_ppp_if_get_unit(char *namebuf); - -static void -isdn_ppp_dev_xmit(void *priv, struct sk_buff *skb, u16 proto); - -static struct sk_buff * -isdn_ppp_lp_alloc_skb(void *priv, int len, int gfp_mask); - -/* New CCP stuff */ -static void -isdn_ppp_dev_kick_up(void *priv); - /* - * frame log (debug) + * fill up isdn_ppp_read() queue .. */ -void -isdn_ppp_frame_log(char *info, char *data, int len, int maxlen,int unit,int slot) -{ - int cnt, - j, - i; - char buf[80]; - if (len < maxlen) - maxlen = len; +static int +isdn_ppp_fill_rq(unsigned char *buf, int len, int proto, int slot) +{ + struct ippp_buf_queue *bf, *bl; + u_long flags; + u_char *nbuf; + struct ippp_struct *is; - for (i = 0, cnt = 0; cnt < maxlen; i++) { - for (j = 0; j < 16 && cnt < maxlen; j++, cnt++) - sprintf(buf + j * 3, "%02x ", (unsigned char) data[cnt]); - printk(KERN_DEBUG "[%d/%d].%s[%d]: %s\n",unit,slot, info, i, buf); + if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { + printk(KERN_WARNING "ippp: illegal slot(%d).\n", slot); + return 0; } -} + is = ippp_table[slot]; -void -ippp_push_proto(struct ind_ppp *ind_ppp, struct sk_buff *skb, u16 proto) -{ - if (skb_headroom(skb) < 2) { - isdn_BUG(); - return; + if (!(is->state & IPPP_CONNECT)) { + printk(KERN_DEBUG "ippp: device not activated.\n"); + return 0; } - if ((ind_ppp->pppcfg & SC_COMP_PROT) && proto <= 0xff) - put_u8(skb_push(skb, 1), proto); - else - put_u16(skb_push(skb, 2), proto); - -} - -static void -ippp_push_ac(struct ind_ppp *ind_ppp, struct sk_buff *skb) -{ - unsigned char *p; - - if (skb_headroom(skb) < 2) { - isdn_BUG(); - return; + nbuf = (unsigned char *) kmalloc(len + 4, GFP_ATOMIC); + if (!nbuf) { + printk(KERN_WARNING "ippp: Can't alloc buf\n"); + return 0; } - if (ind_ppp->pppcfg & SC_COMP_AC) - return; - - p = skb_push(skb, 2); - p += put_u8(p, PPP_ALLSTATIONS); - p += put_u8(p, PPP_UI); + nbuf[0] = PPP_ALLSTATIONS; + nbuf[1] = PPP_UI; + nbuf[2] = proto >> 8; + nbuf[3] = proto & 0xff; + memcpy(nbuf + 4, buf, len); + + spin_lock_irqsave(&is->buflock, flags); + bf = is->first; + bl = is->last; + + if (bf == bl) { + printk(KERN_WARNING "ippp: Queue is full; discarding first buffer\n"); + bf = bf->next; + kfree(bf->buf); + is->first = bf; + } + bl->buf = (char *) nbuf; + bl->len = len + 4; + + is->last = bl->next; + spin_unlock_irqrestore(&is->buflock, flags); + wake_up_interruptible(&is->wq); + return len; } /* - * unbind isdn_net_local <=> ippp-device - * note: it can happen, that we hangup/free the master before the slaves - * in this case we bind another lp to the master device + * read() .. non-blocking: ipppd calls it only after select() + * reports, that there is data */ -static void -isdn_ppp_unbind(isdn_net_dev *idev) -{ - struct ind_ppp *ind_ppp = idev->ind_priv; - struct ipppd *is = ind_ppp->ipppd; - - if (!is) { - isdn_BUG(); - return; - } - ipppd_debug(is, ""); - - if (is->state != IPPPD_ST_ASSIGNED) - isdn_BUG(); - is->state = IPPPD_ST_OPEN; - - /* is->idev will be invalid shortly */ - ippp_ccp_free(ind_ppp->ccp); - - is->idev = NULL; - /* lose the reference we took on isdn_ppp_bind */ - ipppd_put(is); - ind_ppp->ipppd = NULL; - - kfree(ind_ppp); - idev->ind_priv = NULL; - - return; -} - -/* - * bind isdn_net_local <=> ippp-device - */ int -isdn_ppp_bind(isdn_net_dev *idev) +isdn_ppp_read(int min, struct file *file, char *buf, int count) { - struct ind_ppp *ind_ppp; - int unit = 0; - unsigned long flags; - int retval = 0; - struct ipppd *ipppd; - - if (idev->ind_priv) { - isdn_BUG(); - return -EIO; - } - ind_ppp = kmalloc(sizeof(struct ind_ppp), GFP_KERNEL); - if (!ind_ppp) - return -ENOMEM; - - spin_lock_irqsave(&ipppds_lock, flags); - if (idev->pppbind < 0) { /* device not bound to ippp device ? */ - struct list_head *l; - char exclusive[ISDN_MAX_CHANNELS]; /* exclusive flags */ - memset(exclusive, 0, ISDN_MAX_CHANNELS); - /* step through net devices to find exclusive minors */ - list_for_each(l, &isdn_net_devs) { - isdn_net_dev *p = list_entry(l, isdn_net_dev, global_list); - if (p->pppbind >= 0 && p->pppbind < ISDN_MAX_CHANNELS) - exclusive[p->pppbind] = 1; - } - /* - * search a free device / slot - */ - list_for_each_entry(ipppd, &ipppds, ipppds) { - if (!ipppd) - continue; - if (ipppd->state != IPPPD_ST_OPEN) - continue; - if (!exclusive[ipppd->minor]) - goto found; - } - } else { - list_for_each_entry(ipppd, &ipppds, ipppds) { - if (!ipppd) - continue; - if (ipppd->state != IPPPD_ST_OPEN) - continue; - if (ipppd->minor == idev->pppbind) - goto found; - } - } + struct ippp_struct *is; + struct ippp_buf_queue *b; + int r; + u_long flags; + u_char *save_buf; - printk(KERN_INFO "isdn_ppp_bind: no ipppd\n"); - retval = -ESRCH; - goto err; + is = file->private_data; - found: - unit = isdn_ppp_if_get_unit(idev->name); /* get unit number from interface name .. ugly! */ - if (unit < 0) { - printk(KERN_INFO "isdn_ppp_bind: invalid interface name %s.\n", idev->name); - retval = -ENODEV; - goto err; - } - - ipppd->unit = unit; - ipppd->state = IPPPD_ST_ASSIGNED; - ipppd->idev = idev; - /* we hold a reference until isdn_ppp_unbind() */ - ipppd_get(ipppd); - spin_unlock_irqrestore(&ipppds_lock, flags); - - idev->ind_priv = ind_ppp; - ind_ppp->pppcfg = 0; /* config flags */ - ind_ppp->ipppd = ipppd; - ind_ppp->ccp = ippp_ccp_alloc(); - if (!ind_ppp->ccp) { - retval = -ENOMEM; - goto out; - } - ind_ppp->ccp->proto = PPP_COMPFRAG; - ind_ppp->ccp->priv = idev; - ind_ppp->ccp->alloc_skb = isdn_ppp_dev_alloc_skb; - ind_ppp->ccp->xmit = isdn_ppp_dev_xmit; - ind_ppp->ccp->kick_up = isdn_ppp_dev_kick_up; + if (!(is->state & IPPP_OPEN)) + return 0; - retval = ippp_mp_bind(idev); - if (retval) - goto out; - - return 0; + if ((r = verify_area(VERIFY_WRITE, (void *) buf, count))) + return r; - out: - ipppd->state = IPPPD_ST_OPEN; - ipppd_put(ipppd); - ind_ppp->ipppd = NULL; - kfree(ind_ppp); - idev->ind_priv = NULL; - return retval; + spin_lock_irqsave(&is->buflock, flags); + b = is->first->next; + save_buf = b->buf; + if (!save_buf) { + spin_unlock_irqrestore(&is->buflock, flags); + return -EAGAIN; + } + if (b->len < count) + count = b->len; + b->buf = NULL; + is->first = b; + + spin_unlock_irqrestore(&is->buflock, flags); + copy_to_user(buf, save_buf, count); + kfree(save_buf); - err: - spin_unlock_irqrestore(&ipppds_lock, flags); - kfree(ind_ppp); - return retval; + return count; } /* - * kick the ipppd on the device - * (wakes up daemon after B-channel connect) + * ipppd wanna write a packet to the card .. non-blocking */ -static void -isdn_ppp_connected(isdn_net_dev *idev) +int +isdn_ppp_write(int min, struct file *file, const char *buf, int count) { - struct ind_ppp *ind_ppp = idev->ind_priv; - struct ipppd *ipppd = ind_ppp->ipppd; + isdn_net_local *lp; + struct ippp_struct *is; + int proto; + unsigned char protobuf[4]; - ipppd_debug(ipppd, ""); + is = file->private_data; - ipppd->state = IPPPD_ST_CONNECTED; - ipppd->flags |= IPPPD_FL_WAKEUP; - wake_up(&ipppd->wq); -} + if (!(is->state & IPPP_CONNECT)) + return 0; -static void -isdn_ppp_disconnected(isdn_net_dev *idev) -{ - struct ind_ppp *ind_ppp = idev->ind_priv; - struct ipppd *ipppd = ind_ppp->ipppd; + lp = is->lp; - ipppd_debug(ipppd, ""); + /* -> push it directly to the lowlevel interface */ - if (ind_ppp->pppcfg & SC_ENABLE_IP) - isdn_net_offline(idev); + if (!lp) + printk(KERN_DEBUG "isdn_ppp_write: lp == NULL\n"); + else { + /* + * Don't reset huptimer for + * LCP packets. (Echo requests). + */ + if (copy_from_user(protobuf, buf, 4)) + return -EFAULT; + proto = PPP_PROTOCOL(protobuf); + if (proto != PPP_LCP) + lp->huptimer = 0; + + if (lp->isdn_device < 0 || lp->isdn_channel < 0) + return 0; + + if ((dev->drv[lp->isdn_device]->flags & DRV_FLAG_RUNNING) && + lp->dialstate == 0 && + (lp->flags & ISDN_NET_CONNECTED)) { + unsigned short hl; + struct sk_buff *skb; + /* + * we need to reserve enought space in front of + * sk_buff. old call to dev_alloc_skb only reserved + * 16 bytes, now we are looking what the driver want + */ + hl = dev->drv[lp->isdn_device]->interface->hl_hdrlen; + skb = alloc_skb(hl+count, GFP_ATOMIC); + if (!skb) { + printk(KERN_WARNING "isdn_ppp_write: out of memory!\n"); + return count; + } + skb_reserve(skb, hl); + if (copy_from_user(skb_put(skb, count), buf, count)) + { + kfree_skb(skb); + return -EFAULT; + } + if (is->debug & 0x40) { + printk(KERN_DEBUG "ppp xmit: len %d\n", (int) skb->len); + isdn_ppp_frame_log("xmit", skb->data, skb->len, 32,is->unit,lp->ppp_slot); + } - if (ipppd->state != IPPPD_ST_CONNECTED) - isdn_BUG(); - - ipppd->state = IPPPD_ST_ASSIGNED; - ipppd->flags |= IPPPD_FL_HUP; - wake_up(&ipppd->wq); + isdn_ppp_send_ccp(lp->netdev,lp,skb); /* keeps CCP/compression states in sync */ - ippp_mp_disconnected(idev); + isdn_net_write_super(lp, skb); + } + } + return count; } /* @@ -807,44 +847,76 @@ int isdn_ppp_init(void) { + int i, + j; + +#ifdef CONFIG_ISDN_MPP + if( isdn_ppp_mp_bundle_array_init() < 0 ) + return -ENOMEM; +#endif /* CONFIG_ISDN_MPP */ + + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + if (!(ippp_table[i] = (struct ippp_struct *) + kmalloc(sizeof(struct ippp_struct), GFP_KERNEL))) { + printk(KERN_WARNING "isdn_ppp_init: Could not alloc ippp_table\n"); + for (j = 0; j < i; j++) + kfree(ippp_table[j]); + return -1; + } + memset((char *) ippp_table[i], 0, sizeof(struct ippp_struct)); + spin_lock_init(&ippp_table[i]->buflock); + ippp_table[i]->state = 0; + ippp_table[i]->first = ippp_table[i]->rq + NUM_RCV_BUFFS - 1; + ippp_table[i]->last = ippp_table[i]->rq; + + for (j = 0; j < NUM_RCV_BUFFS; j++) { + ippp_table[i]->rq[j].buf = NULL; + ippp_table[i]->rq[j].last = ippp_table[i]->rq + + (NUM_RCV_BUFFS + j - 1) % NUM_RCV_BUFFS; + ippp_table[i]->rq[j].next = ippp_table[i]->rq + (j + 1) % NUM_RCV_BUFFS; + } + } return 0; } void isdn_ppp_cleanup(void) { + int i; + + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + kfree(ippp_table[i]); + +#ifdef CONFIG_ISDN_MPP + if (isdn_ppp_bundle_arr) + kfree(isdn_ppp_bundle_arr); +#endif /* CONFIG_ISDN_MPP */ + } /* * check for address/control field and skip if allowed * retval != 0 -> discard packet silently */ -static int -isdn_ppp_skip_ac(struct ind_ppp *ind_ppp, struct sk_buff *skb) +static int isdn_ppp_skip_ac(struct ippp_struct *is, struct sk_buff *skb) { - u8 val; - if (skb->len < 1) - return -EINVAL; - - get_u8(skb->data, &val); - if (val != PPP_ALLSTATIONS) { - /* if AC compression was not negotiated, but no AC present, - discard packet */ - if (ind_ppp->pppcfg & SC_REJ_COMP_AC) - return -EINVAL; + return -1; - return 0; - } - if (skb->len < 2) - return -EINVAL; + if (skb->data[0] == 0xff) { + if (skb->len < 2) + return -1; - get_u8(skb->data + 1, &val); - if (val != PPP_UI) - return -EINVAL; + if (skb->data[1] != 0x03) + return -1; - /* skip address/control (AC) field */ - skb_pull(skb, 2); + // skip address/control (AC) field + skb_pull(skb, 2); + } else { + if (is->pppcfg & SC_REJ_COMP_AC) + // if AC compression was not negotiated, but used, discard packet + return -1; + } return 0; } @@ -852,127 +924,262 @@ * get the PPP protocol header and pull skb * retval < 0 -> discard packet silently */ -int -isdn_ppp_strip_proto(struct sk_buff *skb, u16 *proto) +static int isdn_ppp_strip_proto(struct sk_buff *skb) { - u8 val; - + int proto; + if (skb->len < 1) - return -EINVAL; + return -1; - get_u8(skb->data, &val); - if (val & 0x1) { - /* protocol field is compressed */ - *proto = val; + if (skb->data[0] & 0x1) { + // protocol field is compressed + proto = skb->data[0]; skb_pull(skb, 1); } else { if (skb->len < 2) - return -EINVAL; - get_u16(skb->data, proto); + return -1; + proto = ((int) skb->data[0] << 8) + skb->data[1]; skb_pull(skb, 2); } - return 0; + return proto; } + /* * handler for incoming packets on a syncPPP interface */ -static void -isdn_ppp_receive(isdn_net_local *lp, isdn_net_dev *idev, struct sk_buff *skb) +void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff *skb) { - struct ind_ppp *ind_ppp = idev->ind_priv; - struct ipppd *is = ind_ppp->ipppd; - u16 proto; - - if (!is) - goto err; - - if (is->debug & 0x4) { - printk(KERN_DEBUG "ippp_receive: is:%p lp:%p unit:%d len:%d\n", - is, lp, is->unit, skb->len); - isdn_ppp_frame_log("receive", skb->data, skb->len, 32,is->unit,-1); + struct ippp_struct *is; + int slot; + int proto; + + if (net_dev->local->master) + BUG(); // we're called with the master device always + + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "isdn_ppp_receive: lp->ppp_slot(%d)\n", + lp->ppp_slot); + kfree_skb(skb); + return; } + is = ippp_table[slot]; - if (isdn_ppp_skip_ac(ind_ppp, skb) < 0) - goto err; - - if (isdn_ppp_strip_proto(skb, &proto)) - goto err; - - ippp_mp_receive(idev, skb, proto); - return; - - err: - lp->stats.rx_dropped++; - kfree_skb(skb); + if (is->debug & 0x4) { + printk(KERN_DEBUG "ippp_receive: is:%08lx lp:%08lx slot:%d unit:%d len:%d\n", + (long)is,(long)lp,lp->ppp_slot,is->unit,(int) skb->len); + isdn_ppp_frame_log("receive", skb->data, skb->len, 32,is->unit,lp->ppp_slot); + } + + if (isdn_ppp_skip_ac(is, skb) < 0) { + kfree_skb(skb); + return; + } + proto = isdn_ppp_strip_proto(skb); + if (proto < 0) { + kfree_skb(skb); + return; + } + +#ifdef CONFIG_ISDN_MPP + if (is->compflags & SC_LINK_DECOMP_ON) { + skb = isdn_ppp_decompress(skb, is, NULL, &proto); + if (!skb) // decompression error + return; + } + + if (!(is->mpppcfg & SC_REJ_MP_PROT)) { // we agreed to receive MPPP + if (proto == PPP_MP) { + isdn_ppp_mp_receive(net_dev, lp, skb); + return; + } + } +#endif + isdn_ppp_push_higher(net_dev, lp, skb, proto); } /* + * we receive a reassembled frame, MPPP has been taken care of before. * address/control and protocol have been stripped from the skb + * note: net_dev has to be master net_dev */ -void -ippp_receive(isdn_net_dev *idev, struct sk_buff *skb, u16 proto) +static void +isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff *skb, int proto) { - isdn_net_local *lp = idev->mlp; - struct inl_ppp *inl_ppp = lp->inl_priv; - struct ind_ppp *ind_ppp = idev->ind_priv; - struct ipppd *is = ind_ppp->ipppd; + struct net_device *dev = &net_dev->dev; + struct ippp_struct *is, *mis; + isdn_net_local *mlp = NULL; + int slot; + + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "isdn_ppp_push_higher: lp->ppp_slot(%d)\n", + lp->ppp_slot); + goto drop_packet; + } + is = ippp_table[slot]; + + if (lp->master) { // FIXME? + mlp = (isdn_net_local *) lp->master->priv; + slot = mlp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "isdn_ppp_push_higher: master->ppp_slot(%d)\n", + lp->ppp_slot); + goto drop_packet; + } + } + mis = ippp_table[slot]; if (is->debug & 0x10) { printk(KERN_DEBUG "push, skb %d %04x\n", (int) skb->len, proto); - isdn_ppp_frame_log("rpush", skb->data, skb->len, 256, is->unit, -1); + isdn_ppp_frame_log("rpush", skb->data, skb->len, 32,is->unit,lp->ppp_slot); } - /* all packets need to be passed through the compressor */ - skb = ippp_ccp_decompress(inl_ppp->ccp, skb, &proto); - if (!skb) /* decompression error */ - goto error; - + if (mis->compflags & SC_DECOMP_ON) { + skb = isdn_ppp_decompress(skb, is, mis, &proto); + if (!skb) // decompression error + return; + } switch (proto) { case PPP_IPX: /* untested */ if (is->debug & 0x20) printk(KERN_DEBUG "isdn_ppp: IPX\n"); - isdn_netif_rx(idev, skb, htons(ETH_P_IPX)); + skb->protocol = htons(ETH_P_IPX); break; case PPP_IP: if (is->debug & 0x20) printk(KERN_DEBUG "isdn_ppp: IP\n"); - isdn_netif_rx(idev, skb, htons(ETH_P_IP)); + skb->protocol = htons(ETH_P_IP); break; case PPP_COMP: case PPP_COMPFRAG: printk(KERN_INFO "isdn_ppp: unexpected compressed frame dropped\n"); - goto drop; + goto drop_packet; +#ifdef CONFIG_ISDN_PPP_VJ case PPP_VJC_UNCOMP: + if (is->debug & 0x20) + printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n"); + if (net_dev->local->ppp_slot < 0) { + printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", + __FUNCTION__, net_dev->local->ppp_slot); + goto drop_packet; + } + if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) { + printk(KERN_WARNING "isdn_ppp: received illegal VJC_UNCOMP frame!\n"); + goto drop_packet; + } + skb->protocol = htons(ETH_P_IP); + break; case PPP_VJC_COMP: - ippp_vj_decompress(idev, skb, proto); + if (is->debug & 0x20) + printk(KERN_DEBUG "isdn_ppp: VJC_COMP\n"); + { + struct sk_buff *skb_old = skb; + int pkt_len; + skb = dev_alloc_skb(skb_old->len + 128); + + if (!skb) { + printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name); + skb = skb_old; + goto drop_packet; + } + skb_put(skb, skb_old->len + 128); + memcpy(skb->data, skb_old->data, skb_old->len); + if (net_dev->local->ppp_slot < 0) { + printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", + __FUNCTION__, net_dev->local->ppp_slot); + goto drop_packet; + } + pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp, + skb->data, skb_old->len); + kfree_skb(skb_old); + if (pkt_len < 0) + goto drop_packet; + + skb_trim(skb, pkt_len); + skb->protocol = htons(ETH_P_IP); + } break; - case PPP_CCPFRAG: - ippp_ccp_receive_ccp(ind_ppp->ccp, skb); - goto ccp; +#endif case PPP_CCP: - ippp_ccp_receive_ccp(inl_ppp->ccp, skb); - ccp: + case PPP_CCPFRAG: + isdn_ppp_receive_ccp(net_dev,lp,skb,proto); /* Dont pop up ResetReq/Ack stuff to the daemon any longer - the job is done already */ if(skb->data[0] == CCP_RESETREQ || skb->data[0] == CCP_RESETACK) - goto free; + break; /* fall through */ default: - // FIXME use skb directly - ipppd_queue_read(is, proto, skb->data, skb->len); - goto free; + isdn_ppp_fill_rq(skb->data, skb->len, proto, lp->ppp_slot); /* push data to pppd device */ + kfree_skb(skb); + return; + } + +#ifdef CONFIG_IPPP_FILTER + /* check if the packet passes the pass and active filters + * the filter instructions are constructed assuming + * a four-byte PPP header on each packet (which is still present) */ + skb_push(skb, 4); + skb->data[0] = 0; /* indicate inbound */ + + if (is->pass_filter.filter + && sk_run_filter(skb, is->pass_filter.filter, + is->pass_filter.len) == 0) { + if (is->debug & 0x2) + printk(KERN_DEBUG "IPPP: inbound frame filtered.\n"); + kfree_skb(skb); + return; } + if (!(is->active_filter.filter + && sk_run_filter(skb, is->active_filter.filter, + is->active_filter.len) == 0)) { + if (is->debug & 0x2) + printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); + lp->huptimer = 0; + if (mlp) + mlp->huptimer = 0; + } + skb_pull(skb, 4); +#else /* CONFIG_IPPP_FILTER */ + lp->huptimer = 0; + if (mlp) + mlp->huptimer = 0; +#endif /* CONFIG_IPPP_FILTER */ + skb->dev = dev; + skb->mac.raw = skb->data; + netif_rx(skb); + /* net_dev->local->stats.rx_packets++; done in isdn_net.c */ return; - drop: - lp->stats.rx_dropped++; - free: + drop_packet: + net_dev->local->stats.rx_dropped++; kfree_skb(skb); - return; +} - error: - lp->stats.rx_dropped++; +/* + * isdn_ppp_skb_push .. + * checks whether we have enough space at the beginning of the skb + * and allocs a new SKB if necessary + */ +static unsigned char *isdn_ppp_skb_push(struct sk_buff **skb_p,int len) +{ + struct sk_buff *skb = *skb_p; + + if(skb_headroom(skb) < len) { + struct sk_buff *nskb = skb_realloc_headroom(skb, len); + + if (!nskb) { + printk(KERN_ERR "isdn_ppp_skb_push: can't realloc headroom!\n"); + dev_kfree_skb(skb); + return NULL; + } + printk(KERN_DEBUG "isdn_ppp_skb_push:under %d %d\n",skb_headroom(skb),len); + dev_kfree_skb(skb); + *skb_p = nskb; + return skb_push(nskb, len); + } + return skb_push(skb,len); } /* @@ -983,20 +1190,33 @@ * skb isn't allowed!! */ -static int -isdn_ppp_start_xmit(struct sk_buff *skb, struct net_device *ndev) +int +isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) { - isdn_net_local *mlp = ndev->priv; - struct inl_ppp *inl_ppp = mlp->inl_priv; - struct ind_ppp *ind_ppp; - isdn_net_dev *idev = list_entry(mlp->online.next, isdn_net_dev, online); - u16 proto = PPP_IP; /* 0x21 */ - struct ipppd *ipppd; - - ndev->trans_start = jiffies; + isdn_net_local *lp,*mlp; + isdn_net_dev *nd; + unsigned int proto = PPP_IP; /* 0x21 */ + struct ippp_struct *ipt,*ipts; + int slot, retval = 0; + + mlp = (isdn_net_local *) (netdev->priv); + nd = mlp->netdev; /* get master lp */ + + slot = mlp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot(%d)\n", + mlp->ppp_slot); + kfree_skb(skb); + goto out; + } + ipts = ippp_table[slot]; - if (list_empty(&mlp->online)) - return isdn_net_autodial(skb, ndev); + if (!(ipts->pppcfg & SC_ENABLE_IP)) { /* PPP connected ? */ + if (ipts->debug & 0x1) + printk(KERN_INFO "%s: IP frame delayed.\n", netdev->name); + retval = 1; + goto out; + } switch (ntohs(skb->protocol)) { case ETH_P_IP: @@ -1006,76 +1226,737 @@ proto = PPP_IPX; /* untested */ break; default: - printk(KERN_INFO "isdn_ppp: skipped unsupported protocol: %#x.\n", + printk(KERN_ERR "isdn_ppp: skipped unsupported protocol: %#x.\n", skb->protocol); - goto drop; + dev_kfree_skb(skb); + goto out; + } + + lp = isdn_net_get_locked_lp(nd); + if (!lp) { + printk(KERN_WARNING "%s: all channels busy - requeuing!\n", netdev->name); + retval = 1; + goto out; + } + /* we have our lp locked from now on */ + + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot(%d)\n", + lp->ppp_slot); + kfree_skb(skb); + goto unlock; + } + ipt = ippp_table[slot]; + + /* + * after this line .. requeueing in the device queue is no longer allowed!!! + */ + + /* Pull off the fake header we stuck on earlier to keep + * the fragmentation code happy. + */ + skb_pull(skb,IPPP_MAX_HEADER); + +#ifdef CONFIG_IPPP_FILTER + /* check if we should pass this packet + * the filter instructions are constructed assuming + * a four-byte PPP header on each packet */ + skb_push(skb, 4); + skb->data[0] = 1; /* indicate outbound */ + *(u_int16_t *)(skb->data + 2) = htons(proto); + + if (ipt->pass_filter.filter + && sk_run_filter(skb, ipt->pass_filter.filter, + ipt->pass_filter.len) == 0) { + if (ipt->debug & 0x4) + printk(KERN_DEBUG "IPPP: outbound frame filtered.\n"); + kfree_skb(skb); + goto unlock; + } + if (!(ipt->active_filter.filter + && sk_run_filter(skb, ipt->active_filter.filter, + ipt->active_filter.len) == 0)) { + if (ipt->debug & 0x4) + printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); + lp->huptimer = 0; + } + skb_pull(skb, 4); +#else /* CONFIG_IPPP_FILTER */ + lp->huptimer = 0; +#endif /* CONFIG_IPPP_FILTER */ + + if (ipt->debug & 0x4) + printk(KERN_DEBUG "xmit skb, len %d\n", (int) skb->len); + if (ipts->debug & 0x40) + isdn_ppp_frame_log("xmit0", skb->data, skb->len, 32,ipts->unit,lp->ppp_slot); + +#ifdef CONFIG_ISDN_PPP_VJ + if (proto == PPP_IP && ipts->pppcfg & SC_COMP_TCP) { /* ipts here? probably yes, but check this again */ + struct sk_buff *new_skb; + unsigned short hl; + /* + * we need to reserve enought space in front of + * sk_buff. old call to dev_alloc_skb only reserved + * 16 bytes, now we are looking what the driver want. + */ + hl = dev->drv[lp->isdn_device]->interface->hl_hdrlen + IPPP_MAX_HEADER; + /* + * Note: hl might still be insufficient because the method + * above does not account for a possibible MPPP slave channel + * which had larger HL header space requirements than the + * master. + */ + new_skb = alloc_skb(hl+skb->len, GFP_ATOMIC); + if (new_skb) { + u_char *buf; + int pktlen; + + skb_reserve(new_skb, hl); + new_skb->dev = skb->dev; + skb_put(new_skb, skb->len); + buf = skb->data; + + pktlen = slhc_compress(ipts->slcomp, skb->data, skb->len, new_skb->data, + &buf, !(ipts->pppcfg & SC_NO_TCP_CCID)); + + if (buf != skb->data) { + if (new_skb->data != buf) + printk(KERN_ERR "isdn_ppp: FATAL error after slhc_compress!!\n"); + dev_kfree_skb(skb); + skb = new_skb; + } else { + dev_kfree_skb(new_skb); + } + + skb_trim(skb, pktlen); + if (skb->data[0] & SL_TYPE_COMPRESSED_TCP) { /* cslip? style -> PPP */ + proto = PPP_VJC_COMP; + skb->data[0] ^= SL_TYPE_COMPRESSED_TCP; + } else { + if (skb->data[0] >= SL_TYPE_UNCOMPRESSED_TCP) + proto = PPP_VJC_UNCOMP; + skb->data[0] = (skb->data[0] & 0x0f) | 0x40; + } + } } +#endif - idev = isdn_net_get_xmit_dev(mlp); - if (!idev) { - printk(KERN_INFO "%s: IP frame delayed.\n", ndev->name); - goto stop; + /* + * normal (single link) or bundle compression + */ + if(ipts->compflags & SC_COMP_ON) { + /* We send compressed only if both down- und upstream + compression is negotiated, that means, CCP is up */ + if(ipts->compflags & SC_DECOMP_ON) { + skb = isdn_ppp_compress(skb,&proto,ipt,ipts,0); + } else { + printk(KERN_DEBUG "isdn_ppp: CCP not yet up - sending as-is\n"); + } } - ind_ppp = idev->ind_priv; - if (!(ind_ppp->pppcfg & SC_ENABLE_IP)) { /* PPP connected ? */ - isdn_BUG(); - goto stop; + + if (ipt->debug & 0x24) + printk(KERN_DEBUG "xmit2 skb, len %d, proto %04x\n", (int) skb->len, proto); + +#ifdef CONFIG_ISDN_MPP + if (ipt->mpppcfg & SC_MP_PROT) { + /* we get mp_seqno from static isdn_net_local */ + long mp_seqno = ipts->mp_seqno; + ipts->mp_seqno++; + if (ipt->mpppcfg & SC_OUT_SHORT_SEQ) { + unsigned char *data = isdn_ppp_skb_push(&skb, 3); + if(!data) + goto unlock; + mp_seqno &= 0xfff; + data[0] = MP_BEGIN_FRAG | MP_END_FRAG | ((mp_seqno >> 8) & 0xf); /* (B)egin & (E)ndbit .. */ + data[1] = mp_seqno & 0xff; + data[2] = proto; /* PID compression */ + } else { + unsigned char *data = isdn_ppp_skb_push(&skb, 5); + if(!data) + goto unlock; + data[0] = MP_BEGIN_FRAG | MP_END_FRAG; /* (B)egin & (E)ndbit .. */ + data[1] = (mp_seqno >> 16) & 0xff; /* sequence number: 24bit */ + data[2] = (mp_seqno >> 8) & 0xff; + data[3] = (mp_seqno >> 0) & 0xff; + data[4] = proto; /* PID compression */ + } + proto = PPP_MP; /* MP Protocol, 0x003d */ } - ipppd = ind_ppp->ipppd; - idev->huptimer = 0; +#endif - if (ipppd->debug & 0x40) - isdn_ppp_frame_log("xmit0", skb->data, skb->len, 256, ipppd->unit, -1); + /* + * 'link in bundle' compression ... + */ + if(ipt->compflags & SC_LINK_COMP_ON) + skb = isdn_ppp_compress(skb,&proto,ipt,ipts,1); - /* after this line,requeueing is no longer allowed! */ - skb = ippp_vj_compress(idev, skb, &proto); + if( (ipt->pppcfg & SC_COMP_PROT) && (proto <= 0xff) ) { + unsigned char *data = isdn_ppp_skb_push(&skb,1); + if(!data) + goto unlock; + data[0] = proto & 0xff; + } + else { + unsigned char *data = isdn_ppp_skb_push(&skb,2); + if(!data) + goto unlock; + data[0] = (proto >> 8) & 0xff; + data[1] = proto & 0xff; + } + if(!(ipt->pppcfg & SC_COMP_AC)) { + unsigned char *data = isdn_ppp_skb_push(&skb,2); + if(!data) + goto unlock; + data[0] = 0xff; /* All Stations */ + data[1] = 0x03; /* Unnumbered information */ + } + + /* tx-stats are now updated via BSENT-callback */ + + if (ipts->debug & 0x40) { + printk(KERN_DEBUG "skb xmit: len: %d\n", (int) skb->len); + isdn_ppp_frame_log("xmit", skb->data, skb->len, 32,ipt->unit,lp->ppp_slot); + } + + isdn_net_writebuf_skb(lp, skb); + + unlock: + spin_unlock_bh(&lp->xmit_lock); + out: + return retval; +} - /* normal (single link) or bundle compression */ - skb = ippp_ccp_compress(inl_ppp->ccp, skb, &proto); +#ifdef CONFIG_IPPP_FILTER +/* + * check if this packet may trigger auto-dial. + */ - if (ipppd->debug & 0x40) - isdn_ppp_frame_log("xmit1", skb->data, skb->len, 32, ipppd->unit, -1); +int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp) +{ + struct ippp_struct *is = ippp_table[lp->ppp_slot]; + u_int16_t proto; + int drop = 0; - ippp_push_proto(ind_ppp, skb, proto); - ippp_mp_xmit(idev, skb); + switch (ntohs(skb->protocol)) { + case ETH_P_IP: + proto = PPP_IP; + break; + case ETH_P_IPX: + proto = PPP_IPX; + break; + default: + printk(KERN_ERR "isdn_ppp_autodial_filter: unsupported protocol 0x%x.\n", + skb->protocol); + return 1; + } + + /* the filter instructions are constructed assuming + * a four-byte PPP header on each packet. we have to + * temporarily remove part of the fake header stuck on + * earlier. + */ + skb_pull(skb, IPPP_MAX_HEADER - 4); + skb->data[0] = 1; /* indicate outbound */ + *(u_int16_t *)(skb->data + 2) = htons(proto); + + drop |= is->pass_filter.filter + && sk_run_filter(skb, is->pass_filter.filter, + is->pass_filter.len) == 0; + drop |= is->active_filter.filter + && sk_run_filter(skb, is->active_filter.filter, + is->active_filter.len) == 0; + + skb_push(skb, IPPP_MAX_HEADER - 4); + return drop; +} +#endif +#ifdef CONFIG_ISDN_MPP + +/* this is _not_ rfc1990 header, but something we convert both short and long + * headers to for convinience's sake: + * byte 0 is flags as in rfc1990 + * bytes 1...4 is 24-bit seqence number converted to host byte order + */ +#define MP_HEADER_LEN 5 + +#define MP_LONGSEQ_MASK 0x00ffffff +#define MP_SHORTSEQ_MASK 0x00000fff +#define MP_LONGSEQ_MAX MP_LONGSEQ_MASK +#define MP_SHORTSEQ_MAX MP_SHORTSEQ_MASK +#define MP_LONGSEQ_MAXBIT ((MP_LONGSEQ_MASK+1)>>1) +#define MP_SHORTSEQ_MAXBIT ((MP_SHORTSEQ_MASK+1)>>1) + +/* sequence-wrap safe comparisions (for long sequence)*/ +#define MP_LT(a,b) ((a-b)&MP_LONGSEQ_MAXBIT) +#define MP_LE(a,b) !((b-a)&MP_LONGSEQ_MAXBIT) +#define MP_GT(a,b) ((b-a)&MP_LONGSEQ_MAXBIT) +#define MP_GE(a,b) !((a-b)&MP_LONGSEQ_MAXBIT) + +#define MP_SEQ(f) ((*(u32*)(f->data+1))) +#define MP_FLAGS(f) (f->data[0]) + +static int isdn_ppp_mp_bundle_array_init(void) +{ + int i; + int sz = ISDN_MAX_CHANNELS*sizeof(ippp_bundle); + if( (isdn_ppp_bundle_arr = (ippp_bundle*)kmalloc(sz, + GFP_KERNEL)) == NULL ) + return -ENOMEM; + memset(isdn_ppp_bundle_arr, 0, sz); + for( i = 0; i < ISDN_MAX_CHANNELS; i++ ) + spin_lock_init(&isdn_ppp_bundle_arr[i].lock); return 0; +} - drop: - kfree_skb(skb); - mlp->stats.tx_dropped++; +static ippp_bundle * isdn_ppp_mp_bundle_alloc(void) +{ + int i; + for( i = 0; i < ISDN_MAX_CHANNELS; i++ ) + if (isdn_ppp_bundle_arr[i].ref_ct <= 0) + return (isdn_ppp_bundle_arr + i); + return NULL; +} + +static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to ) +{ + struct ippp_struct * is; + + if (lp->ppp_slot < 0) { + printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", + __FUNCTION__, lp->ppp_slot); + return(-EINVAL); + } + + is = ippp_table[lp->ppp_slot]; + if (add_to) { + if( lp->netdev->pb ) + lp->netdev->pb->ref_ct--; + lp->netdev->pb = add_to; + } else { /* first link in a bundle */ + is->mp_seqno = 0; + if ((lp->netdev->pb = isdn_ppp_mp_bundle_alloc()) == NULL) + return -ENOMEM; + lp->next = lp->last = lp; /* nobody else in a queue */ + lp->netdev->pb->frags = NULL; + lp->netdev->pb->frames = 0; + lp->netdev->pb->seq = LONG_MAX; + } + lp->netdev->pb->ref_ct++; + + is->last_link_seqno = 0; return 0; +} - stop: - netif_stop_queue(ndev); - return 1; +static u32 isdn_ppp_mp_get_seq( int short_seq, + struct sk_buff * skb, u32 last_seq ); +static struct sk_buff * isdn_ppp_mp_discard( ippp_bundle * mp, + struct sk_buff * from, struct sk_buff * to ); +static void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp, + struct sk_buff * from, struct sk_buff * to ); +static void isdn_ppp_mp_free_skb( ippp_bundle * mp, struct sk_buff * skb ); +static void isdn_ppp_mp_print_recv_pkt( int slot, struct sk_buff * skb ); + +static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, + struct sk_buff *skb) +{ + struct ippp_struct *is; + isdn_net_local * lpq; + ippp_bundle * mp; + isdn_mppp_stats * stats; + struct sk_buff * newfrag, * frag, * start, *nextf; + u32 newseq, minseq, thisseq; + unsigned long flags; + int slot; + + spin_lock_irqsave(&net_dev->pb->lock, flags); + mp = net_dev->pb; + stats = &mp->stats; + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: lp->ppp_slot(%d)\n", + __FUNCTION__, lp->ppp_slot); + stats->frame_drops++; + dev_kfree_skb(skb); + spin_unlock_irqrestore(&mp->lock, flags); + return; + } + is = ippp_table[slot]; + if( ++mp->frames > stats->max_queue_len ) + stats->max_queue_len = mp->frames; + + if (is->debug & 0x8) + isdn_ppp_mp_print_recv_pkt(lp->ppp_slot, skb); + + newseq = isdn_ppp_mp_get_seq(is->mpppcfg & SC_IN_SHORT_SEQ, + skb, is->last_link_seqno); + + + /* if this packet seq # is less than last already processed one, + * toss it right away, but check for sequence start case first + */ + if( mp->seq > MP_LONGSEQ_MAX && (newseq & MP_LONGSEQ_MAXBIT) ) { + mp->seq = newseq; /* the first packet: required for + * rfc1990 non-compliant clients -- + * prevents constant packet toss */ + } else if( MP_LT(newseq, mp->seq) ) { + stats->frame_drops++; + isdn_ppp_mp_free_skb(mp, skb); + spin_unlock_irqrestore(&mp->lock, flags); + return; + } + + /* find the minimum received sequence number over all links */ + is->last_link_seqno = minseq = newseq; + for (lpq = net_dev->queue;;) { + slot = lpq->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n", + __FUNCTION__, lpq->ppp_slot); + } else { + u32 lls = ippp_table[slot]->last_link_seqno; + if (MP_LT(lls, minseq)) + minseq = lls; + } + if ((lpq = lpq->next) == net_dev->queue) + break; + } + if (MP_LT(minseq, mp->seq)) + minseq = mp->seq; /* can't go beyond already processed + * packets */ + newfrag = skb; + + /* if this new fragment is before the first one, then enqueue it now. */ + if ((frag = mp->frags) == NULL || MP_LT(newseq, MP_SEQ(frag))) { + newfrag->next = frag; + mp->frags = frag = newfrag; + newfrag = NULL; + } + + start = MP_FLAGS(frag) & MP_BEGIN_FRAG && + MP_SEQ(frag) == mp->seq ? frag : NULL; + + /* + * main fragment traversing loop + * + * try to accomplish several tasks: + * - insert new fragment into the proper sequence slot (once that's done + * newfrag will be set to NULL) + * - reassemble any complete fragment sequence (non-null 'start' + * indicates there is a continguous sequence present) + * - discard any incomplete sequences that are below minseq -- due + * to the fact that sender always increment sequence number, if there + * is an incomplete sequence below minseq, no new fragments would + * come to complete such sequence and it should be discarded + * + * loop completes when we accomplished the following tasks: + * - new fragment is inserted in the proper sequence ('newfrag' is + * set to NULL) + * - we hit a gap in the sequence, so no reassembly/processing is + * possible ('start' would be set to NULL) + * + * algorightm for this code is derived from code in the book + * 'PPP Design And Debugging' by James Carlson (Addison-Wesley) + */ + while (start != NULL || newfrag != NULL) { + + thisseq = MP_SEQ(frag); + nextf = frag->next; + + /* drop any duplicate fragments */ + if (newfrag != NULL && thisseq == newseq) { + isdn_ppp_mp_free_skb(mp, newfrag); + newfrag = NULL; + } + + /* insert new fragment before next element if possible. */ + if (newfrag != NULL && (nextf == NULL || + MP_LT(newseq, MP_SEQ(nextf)))) { + newfrag->next = nextf; + frag->next = nextf = newfrag; + newfrag = NULL; + } + + if (start != NULL) { + /* check for misplaced start */ + if (start != frag && (MP_FLAGS(frag) & MP_BEGIN_FRAG)) { + printk(KERN_WARNING"isdn_mppp(seq %d): new " + "BEGIN flag with no prior END", thisseq); + stats->seqerrs++; + stats->frame_drops++; + start = isdn_ppp_mp_discard(mp, start,frag); + nextf = frag->next; + } + } else if (MP_LE(thisseq, minseq)) { + if (MP_FLAGS(frag) & MP_BEGIN_FRAG) + start = frag; + else { + if (MP_FLAGS(frag) & MP_END_FRAG) + stats->frame_drops++; + if( mp->frags == frag ) + mp->frags = nextf; + isdn_ppp_mp_free_skb(mp, frag); + frag = nextf; + continue; + } + } + + /* if start is non-null and we have end fragment, then + * we have full reassembly sequence -- reassemble + * and process packet now + */ + if (start != NULL && (MP_FLAGS(frag) & MP_END_FRAG)) { + minseq = mp->seq = (thisseq+1) & MP_LONGSEQ_MASK; + /* Reassemble the packet then dispatch it */ + isdn_ppp_mp_reassembly(net_dev, lp, start, nextf); + + start = NULL; + frag = NULL; + + mp->frags = nextf; + } + + /* check if need to update start pointer: if we just + * reassembled the packet and sequence is contiguous + * then next fragment should be the start of new reassembly + * if sequence is contiguous, but we haven't reassembled yet, + * keep going. + * if sequence is not contiguous, either clear everyting + * below low watermark and set start to the next frag or + * clear start ptr. + */ + if (nextf != NULL && + ((thisseq+1) & MP_LONGSEQ_MASK) == MP_SEQ(nextf)) { + /* if we just reassembled and the next one is here, + * then start another reassembly. */ + + if (frag == NULL) { + if (MP_FLAGS(nextf) & MP_BEGIN_FRAG) + start = nextf; + else + { + printk(KERN_WARNING"isdn_mppp(seq %d):" + " END flag with no following " + "BEGIN", thisseq); + stats->seqerrs++; + } + } + + } else { + if ( nextf != NULL && frag != NULL && + MP_LT(thisseq, minseq)) { + /* we've got a break in the sequence + * and we not at the end yet + * and we did not just reassembled + *(if we did, there wouldn't be anything before) + * and we below the low watermark + * discard all the frames below low watermark + * and start over */ + stats->frame_drops++; + mp->frags = isdn_ppp_mp_discard(mp,start,nextf); + } + /* break in the sequence, no reassembly */ + start = NULL; + } + + frag = nextf; + } /* while -- main loop */ + + if (mp->frags == NULL) + mp->frags = frag; + + /* rather straighforward way to deal with (not very) possible + * queue overflow */ + if (mp->frames > MP_MAX_QUEUE_LEN) { + stats->overflows++; + while (mp->frames > MP_MAX_QUEUE_LEN) { + frag = mp->frags->next; + isdn_ppp_mp_free_skb(mp, mp->frags); + mp->frags = frag; + } + } + spin_unlock_irqrestore(&mp->lock, flags); } -void -ippp_xmit(isdn_net_dev *idev, struct sk_buff *skb) +static void isdn_ppp_mp_cleanup( isdn_net_local * lp ) { - struct ind_ppp *ind_ppp = idev->ind_priv; - struct ipppd *ipppd = ind_ppp->ipppd; - - ippp_push_ac(ind_ppp, skb); + struct sk_buff * frag = lp->netdev->pb->frags; + struct sk_buff * nextfrag; + while( frag ) { + nextfrag = frag->next; + isdn_ppp_mp_free_skb(lp->netdev->pb, frag); + frag = nextfrag; + } + lp->netdev->pb->frags = NULL; +} - if (ipppd->debug & 0x40) { - isdn_ppp_frame_log("xmit3", skb->data, skb->len, 32, ipppd->unit, -1); +static u32 isdn_ppp_mp_get_seq( int short_seq, + struct sk_buff * skb, u32 last_seq ) +{ + u32 seq; + int flags = skb->data[0] & (MP_BEGIN_FRAG | MP_END_FRAG); + + if( !short_seq ) + { + seq = ntohl(*(u32*)skb->data) & MP_LONGSEQ_MASK; + skb_push(skb,1); } + else + { + /* convert 12-bit short seq number to 24-bit long one + */ + seq = ntohs(*(u16*)skb->data) & MP_SHORTSEQ_MASK; - isdn_net_writebuf_skb(idev, skb); + /* check for seqence wrap */ + if( !(seq & MP_SHORTSEQ_MAXBIT) && + (last_seq & MP_SHORTSEQ_MAXBIT) && + (unsigned long)last_seq <= MP_LONGSEQ_MAX ) + seq |= (last_seq + MP_SHORTSEQ_MAX+1) & + (~MP_SHORTSEQ_MASK & MP_LONGSEQ_MASK); + else + seq |= last_seq & (~MP_SHORTSEQ_MASK & MP_LONGSEQ_MASK); + + skb_push(skb, 3); /* put converted seqence back in skb */ + } + *(u32*)(skb->data+1) = seq; /* put seqence back in _host_ byte + * order */ + skb->data[0] = flags; /* restore flags */ + return seq; +} + +struct sk_buff * isdn_ppp_mp_discard( ippp_bundle * mp, + struct sk_buff * from, struct sk_buff * to ) +{ + if( from ) + while (from != to) { + struct sk_buff * next = from->next; + isdn_ppp_mp_free_skb(mp, from); + from = next; + } + return from; +} + +void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp, + struct sk_buff * from, struct sk_buff * to ) +{ + ippp_bundle * mp = net_dev->pb; + int proto; + struct sk_buff * skb; + unsigned int tot_len; + + if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", + __FUNCTION__, lp->ppp_slot); + return; + } + if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) { + if( ippp_table[lp->ppp_slot]->debug & 0x40 ) + printk(KERN_DEBUG "isdn_mppp: reassembly: frame %d, " + "len %d\n", MP_SEQ(from), from->len ); + skb = from; + skb_pull(skb, MP_HEADER_LEN); + mp->frames--; + } else { + struct sk_buff * frag; + int n; + + for(tot_len=n=0, frag=from; frag != to; frag=frag->next, n++) + tot_len += frag->len - MP_HEADER_LEN; + + if( ippp_table[lp->ppp_slot]->debug & 0x40 ) + printk(KERN_DEBUG"isdn_mppp: reassembling frames %d " + "to %d, len %d\n", MP_SEQ(from), + (MP_SEQ(from)+n-1) & MP_LONGSEQ_MASK, tot_len ); + if( (skb = dev_alloc_skb(tot_len)) == NULL ) { + printk(KERN_ERR "isdn_mppp: cannot allocate sk buff " + "of size %d\n", tot_len); + isdn_ppp_mp_discard(mp, from, to); + return; + } + + while( from != to ) { + unsigned int len = from->len - MP_HEADER_LEN; + + memcpy(skb_put(skb,len), from->data+MP_HEADER_LEN, len); + frag = from->next; + isdn_ppp_mp_free_skb(mp, from); + from = frag; + } + } + proto = isdn_ppp_strip_proto(skb); + isdn_ppp_push_higher(net_dev, lp, skb, proto); +} + +static void isdn_ppp_mp_free_skb(ippp_bundle * mp, struct sk_buff * skb) +{ + dev_kfree_skb(skb); + mp->frames--; } +static void isdn_ppp_mp_print_recv_pkt( int slot, struct sk_buff * skb ) +{ + printk(KERN_DEBUG "mp_recv: %d/%d -> %02x %02x %02x %02x %02x %02x\n", + slot, (int) skb->len, + (int) skb->data[0], (int) skb->data[1], (int) skb->data[2], + (int) skb->data[3], (int) skb->data[4], (int) skb->data[5]); +} + +static int +isdn_ppp_bundle(struct ippp_struct *is, int unit) +{ + char ifn[IFNAMSIZ + 1]; + isdn_net_dev *p; + isdn_net_local *lp, *nlp; + int rc; + unsigned long flags; + + sprintf(ifn, "ippp%d", unit); + p = isdn_net_findif(ifn); + if (!p) { + printk(KERN_ERR "ippp_bundle: cannot find %s\n", ifn); + return -EINVAL; + } + + spin_lock_irqsave(&p->pb->lock, flags); + + nlp = is->lp; + lp = p->queue; + if( nlp->ppp_slot < 0 || nlp->ppp_slot >= ISDN_MAX_CHANNELS || + lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS ) { + printk(KERN_ERR "ippp_bundle: binding to invalid slot %d\n", + nlp->ppp_slot < 0 || nlp->ppp_slot >= ISDN_MAX_CHANNELS ? + nlp->ppp_slot : lp->ppp_slot ); + rc = -EINVAL; + goto out; + } + + isdn_net_add_to_bundle(p, nlp); + + ippp_table[nlp->ppp_slot]->unit = ippp_table[lp->ppp_slot]->unit; + + /* maybe also SC_CCP stuff */ + ippp_table[nlp->ppp_slot]->pppcfg |= ippp_table[lp->ppp_slot]->pppcfg & + (SC_ENABLE_IP | SC_NO_TCP_CCID | SC_REJ_COMP_TCP); + ippp_table[nlp->ppp_slot]->mpppcfg |= ippp_table[lp->ppp_slot]->mpppcfg & + (SC_MP_PROT | SC_REJ_MP_PROT | SC_OUT_SHORT_SEQ | SC_IN_SHORT_SEQ); + rc = isdn_ppp_mp_init(nlp, p->pb); +out: + spin_unlock_irqrestore(&p->pb->lock, flags); + return rc; +} + +#endif /* CONFIG_ISDN_MPP */ + /* * network device ioctl handlers */ static int -isdn_ppp_dev_ioctl_stats(struct ifreq *ifr, struct net_device *dev) +isdn_ppp_dev_ioctl_stats(int slot, struct ifreq *ifr, struct net_device *dev) { - struct ppp_stats *res, t; + struct ppp_stats *res, + t; isdn_net_local *lp = (isdn_net_local *) dev->priv; - struct inl_ppp *inl_ppp = lp->inl_priv; - struct slcompress *slcomp; int err; res = (struct ppp_stats *) ifr->ifr_ifru.ifru_data; @@ -1095,8 +1976,8 @@ t.p.ppp_obytes = lp->stats.tx_bytes; t.p.ppp_oerrors = lp->stats.tx_errors; #ifdef CONFIG_ISDN_PPP_VJ - slcomp = inl_ppp->slcomp; - if (slcomp) { + if (slot >= 0 && ippp_table[slot]->slcomp) { + struct slcompress *slcomp = ippp_table[slot]->slcomp; t.vj.vjs_packets = slcomp->sls_o_compressed + slcomp->sls_o_uncompressed; t.vj.vjs_compressed = slcomp->sls_o_compressed; t.vj.vjs_searches = slcomp->sls_o_searches; @@ -1125,18 +2006,20 @@ return -EINVAL; switch (cmd) { - case SIOCGPPPVER: - r = (char *) ifr->ifr_ifru.ifru_data; - len = strlen(PPP_VERSION) + 1; - if (copy_to_user(r, PPP_VERSION, len)) - error = -EFAULT; - break; - case SIOCGPPPSTATS: - error = isdn_ppp_dev_ioctl_stats(ifr, dev); - break; - default: - error = -EINVAL; - break; +#define PPP_VERSION "2.3.7" + case SIOCGPPPVER: + r = (char *) ifr->ifr_ifru.ifru_data; + len = strlen(PPP_VERSION) + 1; + if (copy_to_user(r, PPP_VERSION, len)) + error = -EFAULT; + break; + + case SIOCGPPPSTATS: + error = isdn_ppp_dev_ioctl_stats(lp->ppp_slot, ifr, dev); + break; + default: + error = -EINVAL; + break; } return error; } @@ -1167,6 +2050,76 @@ return unit; } + +int +isdn_ppp_dial_slave(char *name) +{ +#ifdef CONFIG_ISDN_MPP + isdn_net_dev *ndev; + isdn_net_local *lp; + struct net_device *sdev; + + if (!(ndev = isdn_net_findif(name))) + return 1; + lp = ndev->local; + if (!(lp->flags & ISDN_NET_CONNECTED)) + return 5; + + sdev = lp->slave; + while (sdev) { + isdn_net_local *mlp = (isdn_net_local *) sdev->priv; + if (!(mlp->flags & ISDN_NET_CONNECTED)) + break; + sdev = mlp->slave; + } + if (!sdev) + return 2; + + isdn_net_dial_req((isdn_net_local *) sdev->priv); + return 0; +#else + return -1; +#endif +} + +int +isdn_ppp_hangup_slave(char *name) +{ +#ifdef CONFIG_ISDN_MPP + isdn_net_dev *ndev; + isdn_net_local *lp; + struct net_device *sdev; + + if (!(ndev = isdn_net_findif(name))) + return 1; + lp = ndev->local; + if (!(lp->flags & ISDN_NET_CONNECTED)) + return 5; + + sdev = lp->slave; + while (sdev) { + isdn_net_local *mlp = (isdn_net_local *) sdev->priv; + + if (mlp->slave) { /* find last connected link in chain */ + isdn_net_local *nlp = (isdn_net_local *) mlp->slave->priv; + + if (!(nlp->flags & ISDN_NET_CONNECTED)) + break; + } else if (mlp->flags & ISDN_NET_CONNECTED) + break; + + sdev = mlp->slave; + } + if (!sdev) + return 2; + + isdn_net_hangup(sdev); + return 0; +#else + return -1; +#endif +} + /* * PPP compression stuff */ @@ -1175,172 +2128,860 @@ /* Push an empty CCP Data Frame up to the daemon to wake it up and let it generate a CCP Reset-Request or tear down CCP altogether */ -static void isdn_ppp_dev_kick_up(void *priv) +static void isdn_ppp_ccp_kickup(struct ippp_struct *is) { - isdn_net_dev *idev = priv; - struct ind_ppp *ind_ppp = idev->ind_priv; - - ipppd_queue_read(ind_ppp->ipppd, PPP_COMPFRAG, NULL, 0); + isdn_ppp_fill_rq(NULL, 0, PPP_COMP, is->lp->ppp_slot); } -static void isdn_ppp_lp_kick_up(void *priv) +/* In-kernel handling of CCP Reset-Request and Reset-Ack is necessary, + but absolutely nontrivial. The most abstruse problem we are facing is + that the generation, reception and all the handling of timeouts and + resends including proper request id management should be entirely left + to the (de)compressor, but indeed is not covered by the current API to + the (de)compressor. The API is a prototype version from PPP where only + some (de)compressors have yet been implemented and all of them are + rather simple in their reset handling. Especially, their is only one + outstanding ResetAck at a time with all of them and ResetReq/-Acks do + not have parameters. For this very special case it was sufficient to + just return an error code from the decompressor and have a single + reset() entry to communicate all the necessary information between + the framework and the (de)compressor. Bad enough, LZS is different + (and any other compressor may be different, too). It has multiple + histories (eventually) and needs to Reset each of them independently + and thus uses multiple outstanding Acks and history numbers as an + additional parameter to Reqs/Acks. + All that makes it harder to port the reset state engine into the + kernel because it is not just the same simple one as in (i)pppd but + it must be able to pass additional parameters and have multiple out- + standing Acks. We are trying to achieve the impossible by handling + reset transactions independent by their id. The id MUST change when + the data portion changes, thus any (de)compressor who uses more than + one resettable state must provide and recognize individual ids for + each individual reset transaction. The framework itself does _only_ + differentiate them by id, because it has no other semantics like the + (de)compressor might. + This looks like a major redesign of the interface would be nice, + but I don't have an idea how to do it better. */ + +/* Send a CCP Reset-Request or Reset-Ack directly from the kernel. This is + getting that lengthy because there is no simple "send-this-frame-out" + function above but every wrapper does a bit different. Hope I guess + correct in this hack... */ + +static void isdn_ppp_ccp_xmit_reset(struct ippp_struct *is, int proto, + unsigned char code, unsigned char id, + unsigned char *data, int len) { - isdn_net_local *lp = priv; - isdn_net_dev *idev; - struct ind_ppp *ind_ppp; - - if (list_empty(&lp->online)) { - isdn_BUG(); + struct sk_buff *skb; + unsigned char *p; + int hl; + int cnt = 0; + isdn_net_local *lp = is->lp; + + /* Alloc large enough skb */ + hl = dev->drv[lp->isdn_device]->interface->hl_hdrlen; + skb = alloc_skb(len + hl + 16,GFP_ATOMIC); + if(!skb) { + printk(KERN_WARNING + "ippp: CCP cannot send reset - out of memory\n"); return; } - idev = list_entry(lp->online.next, isdn_net_dev, online); - ind_ppp = idev->ind_priv; - ipppd_queue_read(ind_ppp->ipppd, PPP_COMP, NULL, 0); -} + skb_reserve(skb, hl); -/* Send a CCP Reset-Request or Reset-Ack directly from the kernel. */ + /* We may need to stuff an address and control field first */ + if(!(is->pppcfg & SC_COMP_AC)) { + p = skb_put(skb, 2); + *p++ = 0xff; + *p++ = 0x03; + } + + /* Stuff proto, code, id and length */ + p = skb_put(skb, 6); + *p++ = (proto >> 8); + *p++ = (proto & 0xff); + *p++ = code; + *p++ = id; + cnt = 4 + len; + *p++ = (cnt >> 8); + *p++ = (cnt & 0xff); + + /* Now stuff remaining bytes */ + if(len) { + p = skb_put(skb, len); + memcpy(p, data, len); + } + + /* skb is now ready for xmit */ + printk(KERN_DEBUG "Sending CCP Frame:\n"); + isdn_ppp_frame_log("ccp-xmit", skb->data, skb->len, 32, is->unit,lp->ppp_slot); + + isdn_net_write_super(lp, skb); +} + +/* Allocate the reset state vector */ +static struct ippp_ccp_reset *isdn_ppp_ccp_reset_alloc(struct ippp_struct *is) +{ + struct ippp_ccp_reset *r; + r = kmalloc(sizeof(struct ippp_ccp_reset), GFP_KERNEL); + if(!r) { + printk(KERN_ERR "ippp_ccp: failed to allocate reset data" + " structure - no mem\n"); + return NULL; + } + memset(r, 0, sizeof(struct ippp_ccp_reset)); + printk(KERN_DEBUG "ippp_ccp: allocated reset data structure %p\n", r); + is->reset = r; + return r; +} -static struct sk_buff * -__isdn_ppp_alloc_skb(isdn_net_dev *idev, int len, unsigned int gfp_mask) +/* Destroy the reset state vector. Kill all pending timers first. */ +static void isdn_ppp_ccp_reset_free(struct ippp_struct *is) { - int hl = IPPP_MAX_HEADER + isdn_slot_hdrlen(idev->isdn_slot); - struct sk_buff *skb; + unsigned int id; - skb = alloc_skb(hl + len, gfp_mask); - if (!skb) - return NULL; + printk(KERN_DEBUG "ippp_ccp: freeing reset data structure %p\n", + is->reset); + for(id = 0; id < 256; id++) { + if(is->reset->rs[id]) { + isdn_ppp_ccp_reset_free_state(is, (unsigned char)id); + } + } + kfree(is->reset); + is->reset = NULL; +} - skb_reserve(skb, hl); - return skb; +/* Free a given state and clear everything up for later reallocation */ +static void isdn_ppp_ccp_reset_free_state(struct ippp_struct *is, + unsigned char id) +{ + struct ippp_ccp_reset_state *rs; + + if(is->reset->rs[id]) { + printk(KERN_DEBUG "ippp_ccp: freeing state for id %d\n", id); + rs = is->reset->rs[id]; + /* Make sure the kernel will not call back later */ + if(rs->ta) + del_timer(&rs->timer); + is->reset->rs[id] = NULL; + kfree(rs); + } else { + printk(KERN_WARNING "ippp_ccp: id %d is not allocated\n", id); + } } -struct sk_buff * -isdn_ppp_dev_alloc_skb(void *priv, int len, int gfp_mask) +/* The timer callback function which is called when a ResetReq has timed out, + aka has never been answered by a ResetAck */ +static void isdn_ppp_ccp_timer_callback(unsigned long closure) { - isdn_net_dev *idev = priv; + struct ippp_ccp_reset_state *rs = + (struct ippp_ccp_reset_state *)closure; - return __isdn_ppp_alloc_skb(idev, len, gfp_mask); + if(!rs) { + printk(KERN_ERR "ippp_ccp: timer cb with zero closure.\n"); + return; + } + if(rs->ta && rs->state == CCPResetSentReq) { + /* We are correct here */ + if(!rs->expra) { + /* Hmm, there is no Ack really expected. We can clean + up the state now, it will be reallocated if the + decompressor insists on another reset */ + rs->ta = 0; + isdn_ppp_ccp_reset_free_state(rs->is, rs->id); + return; + } + printk(KERN_DEBUG "ippp_ccp: CCP Reset timed out for id %d\n", + rs->id); + /* Push it again */ + isdn_ppp_ccp_xmit_reset(rs->is, PPP_CCP, CCP_RESETREQ, rs->id, + rs->data, rs->dlen); + /* Restart timer */ + rs->timer.expires = jiffies + HZ*5; + add_timer(&rs->timer); + } else { + printk(KERN_WARNING "ippp_ccp: timer cb in wrong state %d\n", + rs->state); + } } -static struct sk_buff * -isdn_ppp_lp_alloc_skb(void *priv, int len, int gfp_mask) +/* Allocate a new reset transaction state */ +static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_struct *is, + unsigned char id) { - isdn_net_local *lp = priv; - isdn_net_dev *idev; - - if (list_empty(&lp->online)) { - isdn_BUG(); + struct ippp_ccp_reset_state *rs; + if(is->reset->rs[id]) { + printk(KERN_WARNING "ippp_ccp: old state exists for id %d\n", + id); return NULL; + } else { + rs = kmalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL); + if(!rs) + return NULL; + memset(rs, 0, sizeof(struct ippp_ccp_reset_state)); + rs->state = CCPResetIdle; + rs->is = is; + rs->id = id; + rs->timer.data = (unsigned long)rs; + rs->timer.function = isdn_ppp_ccp_timer_callback; + is->reset->rs[id] = rs; + } + return rs; +} + + +/* A decompressor wants a reset with a set of parameters - do what is + necessary to fulfill it */ +static void isdn_ppp_ccp_reset_trans(struct ippp_struct *is, + struct isdn_ppp_resetparams *rp) +{ + struct ippp_ccp_reset_state *rs; + + if(rp->valid) { + /* The decompressor defines parameters by itself */ + if(rp->rsend) { + /* And he wants us to send a request */ + if(!(rp->idval)) { + printk(KERN_ERR "ippp_ccp: decompressor must" + " specify reset id\n"); + return; + } + if(is->reset->rs[rp->id]) { + /* There is already a transaction in existence + for this id. May be still waiting for a + Ack or may be wrong. */ + rs = is->reset->rs[rp->id]; + if(rs->state == CCPResetSentReq && rs->ta) { + printk(KERN_DEBUG "ippp_ccp: reset" + " trans still in progress" + " for id %d\n", rp->id); + } else { + printk(KERN_WARNING "ippp_ccp: reset" + " trans in wrong state %d for" + " id %d\n", rs->state, rp->id); + } + } else { + /* Ok, this is a new transaction */ + printk(KERN_DEBUG "ippp_ccp: new trans for id" + " %d to be started\n", rp->id); + rs = isdn_ppp_ccp_reset_alloc_state(is, rp->id); + if(!rs) { + printk(KERN_ERR "ippp_ccp: out of mem" + " allocing ccp trans\n"); + return; + } + rs->state = CCPResetSentReq; + rs->expra = rp->expra; + if(rp->dtval) { + rs->dlen = rp->dlen; + memcpy(rs->data, rp->data, rp->dlen); + } + /* HACK TODO - add link comp here */ + isdn_ppp_ccp_xmit_reset(is, PPP_CCP, + CCP_RESETREQ, rs->id, + rs->data, rs->dlen); + /* Start the timer */ + rs->timer.expires = jiffies + 5*HZ; + add_timer(&rs->timer); + rs->ta = 1; + } + } else { + printk(KERN_DEBUG "ippp_ccp: no reset sent\n"); + } + } else { + /* The reset params are invalid. The decompressor does not + care about them, so we just send the minimal requests + and increase ids only when an Ack is received for a + given id */ + if(is->reset->rs[is->reset->lastid]) { + /* There is already a transaction in existence + for this id. May be still waiting for a + Ack or may be wrong. */ + rs = is->reset->rs[is->reset->lastid]; + if(rs->state == CCPResetSentReq && rs->ta) { + printk(KERN_DEBUG "ippp_ccp: reset" + " trans still in progress" + " for id %d\n", rp->id); + } else { + printk(KERN_WARNING "ippp_ccp: reset" + " trans in wrong state %d for" + " id %d\n", rs->state, rp->id); + } + } else { + printk(KERN_DEBUG "ippp_ccp: new trans for id" + " %d to be started\n", is->reset->lastid); + rs = isdn_ppp_ccp_reset_alloc_state(is, + is->reset->lastid); + if(!rs) { + printk(KERN_ERR "ippp_ccp: out of mem" + " allocing ccp trans\n"); + return; + } + rs->state = CCPResetSentReq; + /* We always expect an Ack if the decompressor doesn't + know better */ + rs->expra = 1; + rs->dlen = 0; + /* HACK TODO - add link comp here */ + isdn_ppp_ccp_xmit_reset(is, PPP_CCP, CCP_RESETREQ, + rs->id, NULL, 0); + /* Start the timer */ + rs->timer.expires = jiffies + 5*HZ; + add_timer(&rs->timer); + rs->ta = 1; + } } - idev = list_entry(lp->online.next, isdn_net_dev, online); - return __isdn_ppp_alloc_skb(idev, len, gfp_mask); } -static void -isdn_ppp_dev_xmit(void *priv, struct sk_buff *skb, u16 proto) -{ - isdn_net_dev *idev = priv; - struct ind_ppp *ind_ppp = idev->ind_priv; +/* An Ack was received for this id. This means we stop the timer and clean + up the state prior to calling the decompressors reset routine. */ +static void isdn_ppp_ccp_reset_ack_rcvd(struct ippp_struct *is, + unsigned char id) +{ + struct ippp_ccp_reset_state *rs = is->reset->rs[id]; + + if(rs) { + if(rs->ta && rs->state == CCPResetSentReq) { + /* Great, we are correct */ + if(!rs->expra) + printk(KERN_DEBUG "ippp_ccp: ResetAck received" + " for id %d but not expected\n", id); + } else { + printk(KERN_INFO "ippp_ccp: ResetAck received out of" + "sync for id %d\n", id); + } + if(rs->ta) { + rs->ta = 0; + del_timer(&rs->timer); + } + isdn_ppp_ccp_reset_free_state(is, id); + } else { + printk(KERN_INFO "ippp_ccp: ResetAck received for unknown id" + " %d\n", id); + } + /* Make sure the simple reset stuff uses a new id next time */ + is->reset->lastid++; +} + +/* + * decompress packet + * + * if master = 0, we're trying to uncompress an per-link compressed packet, + * as opposed to an compressed reconstructed-from-MPPP packet. + * proto is updated to protocol field of uncompressed packet. + * + * retval: decompressed packet, + * same packet if uncompressed, + * NULL if decompression error + */ - ippp_push_proto(ind_ppp, skb, proto); - ippp_push_ac(ind_ppp, skb); - isdn_net_write_super(idev, skb); +static struct sk_buff *isdn_ppp_decompress(struct sk_buff *skb,struct ippp_struct *is,struct ippp_struct *master, + int *proto) +{ + void *stat = NULL; + struct isdn_ppp_compressor *ipc = NULL; + struct sk_buff *skb_out; + int len; + struct ippp_struct *ri; + struct isdn_ppp_resetparams rsparm; + unsigned char rsdata[IPPP_RESET_MAXDATABYTES]; + + if(!master) { + // per-link decompression + stat = is->link_decomp_stat; + ipc = is->link_decompressor; + ri = is; + } else { + stat = master->decomp_stat; + ipc = master->decompressor; + ri = master; + } + + if (!ipc) { + // no decompressor -> we can't decompress. + printk(KERN_DEBUG "ippp: no decompressor defined!\n"); + return skb; + } + if (!stat) // if we have a compressor, stat has been set as well + BUG(); + + if((master && *proto == PPP_COMP) || (!master && *proto == PPP_COMPFRAG) ) { + // compressed packets are compressed by their protocol type + + // Set up reset params for the decompressor + memset(&rsparm, 0, sizeof(rsparm)); + rsparm.data = rsdata; + rsparm.maxdlen = IPPP_RESET_MAXDATABYTES; + + skb_out = dev_alloc_skb(is->mru + PPP_HDRLEN); + len = ipc->decompress(stat, skb, skb_out, &rsparm); + kfree_skb(skb); + if (len <= 0) { + switch(len) { + case DECOMP_ERROR: + printk(KERN_INFO "ippp: decomp wants reset %s params\n", + rsparm.valid ? "with" : "without"); + + isdn_ppp_ccp_reset_trans(ri, &rsparm); + break; + case DECOMP_FATALERROR: + ri->pppcfg |= SC_DC_FERROR; + /* Kick ipppd to recognize the error */ + isdn_ppp_ccp_kickup(ri); + break; + } + kfree_skb(skb_out); + return NULL; + } + *proto = isdn_ppp_strip_proto(skb_out); + if (*proto < 0) { + kfree_skb(skb_out); + return NULL; + } + return skb_out; + } else { + // uncompressed packets are fed through the decompressor to + // update the decompressor state + ipc->incomp(stat, skb, *proto); + return skb; + } } -static void -isdn_ppp_lp_xmit(void *priv, struct sk_buff *skb, u16 proto) +/* + * compress a frame + * type=0: normal/bundle compression + * =1: link compression + * returns original skb if we haven't compressed the frame + * and a new skb pointer if we've done it + */ +static struct sk_buff *isdn_ppp_compress(struct sk_buff *skb_in,int *proto, + struct ippp_struct *is,struct ippp_struct *master,int type) { - isdn_net_local *lp = priv; - isdn_net_dev *idev; - struct ind_ppp *ind_ppp; + int ret; + int new_proto; + struct isdn_ppp_compressor *compressor; + void *stat; + struct sk_buff *skb_out; + + /* we do not compress control protocols */ + if(*proto < 0 || *proto > 0x3fff) { + return skb_in; + } + + if(type) { /* type=1 => Link compression */ + return skb_in; + } + else { + if(!master) { + compressor = is->compressor; + stat = is->comp_stat; + } + else { + compressor = master->compressor; + stat = master->comp_stat; + } + new_proto = PPP_COMP; + } - if (list_empty(&lp->online)) { - isdn_BUG(); - return; + if(!compressor) { + printk(KERN_ERR "isdn_ppp: No compressor set!\n"); + return skb_in; + } + if(!stat) { + printk(KERN_ERR "isdn_ppp: Compressor not initialized?\n"); + return skb_in; + } + + /* Allow for at least 150 % expansion (for now) */ + skb_out = alloc_skb(skb_in->len + skb_in->len/2 + 32 + + skb_headroom(skb_in), GFP_ATOMIC); + if(!skb_out) + return skb_in; + skb_reserve(skb_out, skb_headroom(skb_in)); + + ret = (compressor->compress)(stat,skb_in,skb_out,*proto); + if(!ret) { + dev_kfree_skb(skb_out); + return skb_in; } - idev = list_entry(lp->online.next, isdn_net_dev, online); - ind_ppp = idev->ind_priv; - ippp_push_proto(ind_ppp, skb, proto); - ippp_push_ac(ind_ppp, skb); - isdn_net_write_super(idev, skb); + + dev_kfree_skb(skb_in); + *proto = new_proto; + return skb_out; } -static int -isdn_ppp_set_compressor(isdn_net_dev *idev, struct isdn_ppp_comp_data *data) +/* + * we received a CCP frame .. + * not a clean solution, but we MUST handle a few cases in the kernel + */ +static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, + struct sk_buff *skb,int proto) { - struct ippp_ccp *ccp; - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - struct ind_ppp *ind_ppp = idev->ind_priv; + struct ippp_struct *is; + struct ippp_struct *mis; + int len; + struct isdn_ppp_resetparams rsparm; + unsigned char rsdata[IPPP_RESET_MAXDATABYTES]; - if (data->flags & IPPP_COMP_FLAG_LINK) - ccp = ind_ppp->ccp; - else - ccp = inl_ppp->ccp; + printk(KERN_DEBUG "Received CCP frame from peer slot(%d)\n", + lp->ppp_slot); + if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", + __FUNCTION__, lp->ppp_slot); + return; + } + is = ippp_table[lp->ppp_slot]; + isdn_ppp_frame_log("ccp-rcv", skb->data, skb->len, 32, is->unit,lp->ppp_slot); + + if(lp->master) { + int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: slot(%d) out of range\n", + __FUNCTION__, slot); + return; + } + mis = ippp_table[slot]; + } else + mis = is; + + switch(skb->data[0]) { + case CCP_CONFREQ: + if(is->debug & 0x10) + printk(KERN_DEBUG "Disable compression here!\n"); + if(proto == PPP_CCP) + mis->compflags &= ~SC_COMP_ON; + else + is->compflags &= ~SC_LINK_COMP_ON; + break; + case CCP_TERMREQ: + case CCP_TERMACK: + if(is->debug & 0x10) + printk(KERN_DEBUG "Disable (de)compression here!\n"); + if(proto == PPP_CCP) + mis->compflags &= ~(SC_DECOMP_ON|SC_COMP_ON); + else + is->compflags &= ~(SC_LINK_DECOMP_ON|SC_LINK_COMP_ON); + break; + case CCP_CONFACK: + /* if we RECEIVE an ackowledge we enable the decompressor */ + if(is->debug & 0x10) + printk(KERN_DEBUG "Enable decompression here!\n"); + if(proto == PPP_CCP) { + if (!mis->decompressor) + break; + mis->compflags |= SC_DECOMP_ON; + } else { + if (!is->decompressor) + break; + is->compflags |= SC_LINK_DECOMP_ON; + } + break; - return ippp_ccp_set_compressor(ccp, ind_ppp->ipppd->unit, data); + case CCP_RESETACK: + printk(KERN_DEBUG "Received ResetAck from peer\n"); + len = (skb->data[2] << 8) | skb->data[3]; + len -= 4; + + if(proto == PPP_CCP) { + /* If a reset Ack was outstanding for this id, then + clean up the state engine */ + isdn_ppp_ccp_reset_ack_rcvd(mis, skb->data[1]); + if(mis->decompressor && mis->decomp_stat) + mis->decompressor-> + reset(mis->decomp_stat, + skb->data[0], + skb->data[1], + len ? &skb->data[4] : NULL, + len, NULL); + /* TODO: This is not easy to decide here */ + mis->compflags &= ~SC_DECOMP_DISCARD; + } + else { + isdn_ppp_ccp_reset_ack_rcvd(is, skb->data[1]); + if(is->link_decompressor && is->link_decomp_stat) + is->link_decompressor-> + reset(is->link_decomp_stat, + skb->data[0], + skb->data[1], + len ? &skb->data[4] : NULL, + len, NULL); + /* TODO: neither here */ + is->compflags &= ~SC_LINK_DECOMP_DISCARD; + } + break; + + case CCP_RESETREQ: + printk(KERN_DEBUG "Received ResetReq from peer\n"); + /* Receiving a ResetReq means we must reset our compressor */ + /* Set up reset params for the reset entry */ + memset(&rsparm, 0, sizeof(rsparm)); + rsparm.data = rsdata; + rsparm.maxdlen = IPPP_RESET_MAXDATABYTES; + /* Isolate data length */ + len = (skb->data[2] << 8) | skb->data[3]; + len -= 4; + if(proto == PPP_CCP) { + if(mis->compressor && mis->comp_stat) + mis->compressor-> + reset(mis->comp_stat, + skb->data[0], + skb->data[1], + len ? &skb->data[4] : NULL, + len, &rsparm); + } + else { + if(is->link_compressor && is->link_comp_stat) + is->link_compressor-> + reset(is->link_comp_stat, + skb->data[0], + skb->data[1], + len ? &skb->data[4] : NULL, + len, &rsparm); + } + /* Ack the Req as specified by rsparm */ + if(rsparm.valid) { + /* Compressor reset handler decided how to answer */ + if(rsparm.rsend) { + /* We should send a Frame */ + isdn_ppp_ccp_xmit_reset(is, proto, CCP_RESETACK, + rsparm.idval ? rsparm.id + : skb->data[1], + rsparm.dtval ? + rsparm.data : NULL, + rsparm.dtval ? + rsparm.dlen : 0); + } else { + printk(KERN_DEBUG "ResetAck suppressed\n"); + } + } else { + /* We answer with a straight reflected Ack */ + isdn_ppp_ccp_xmit_reset(is, proto, CCP_RESETACK, + skb->data[1], + len ? &skb->data[4] : NULL, + len); + } + break; + } } -// ISDN_NET_ENCAP_SYNCPPP -// ====================================================================== -static int -isdn_ppp_open(isdn_net_local *lp) +/* + * Daemon sends a CCP frame ... + */ + +/* TODO: Clean this up with new Reset semantics */ + +/* I believe the CCP handling as-is is done wrong. Compressed frames + * should only be sent/received after CCP reaches UP state, which means + * both sides have sent CONF_ACK. Currently, we handle both directions + * independently, which means we may accept compressed frames too early + * (supposedly not a problem), but may also mean we send compressed frames + * too early, which may turn out to be a problem. + * This part of state machine should actually be handled by (i)pppd, but + * that's too big of a change now. --kai + */ + +/* Actually, we might turn this into an advantage: deal with the RFC in + * the old tradition of beeing generous on what we accept, but beeing + * strict on what we send. Thus we should just + * - accept compressed frames as soon as decompression is negotiated + * - send compressed frames only when decomp *and* comp are negotiated + * - drop rx compressed frames if we cannot decomp (instead of pushing them + * up to ipppd) + * and I tried to modify this file according to that. --abp + */ + +static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct sk_buff *skb) { - struct inl_ppp *inl_ppp; + struct ippp_struct *mis,*is; + int proto, slot = lp->ppp_slot; + unsigned char *data; - inl_ppp = kmalloc(sizeof(*inl_ppp), GFP_KERNEL); - if (!inl_ppp) - return -ENOMEM; + if(!skb || skb->len < 3) + return; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", + __FUNCTION__, slot); + return; + } + is = ippp_table[slot]; + /* Daemon may send with or without address and control field comp */ + data = skb->data; + if(!(is->pppcfg & SC_COMP_AC) && data[0] == 0xff && data[1] == 0x03) { + data += 2; + if(skb->len < 5) + return; + } + + proto = ((int)data[0]<<8)+data[1]; + if(proto != PPP_CCP && proto != PPP_CCPFRAG) + return; - lp->inl_priv = inl_ppp; + printk(KERN_DEBUG "Received CCP frame from daemon:\n"); + isdn_ppp_frame_log("ccp-xmit", skb->data, skb->len, 32, is->unit,lp->ppp_slot); - inl_ppp->slcomp = ippp_vj_alloc(); - if (!inl_ppp->slcomp) - goto err; - - inl_ppp->ccp = ippp_ccp_alloc(); - if (!inl_ppp->ccp) - goto err_vj; - - inl_ppp->ccp->proto = PPP_COMP; - inl_ppp->ccp->priv = lp; - inl_ppp->ccp->alloc_skb = isdn_ppp_lp_alloc_skb; - inl_ppp->ccp->xmit = isdn_ppp_lp_xmit; - inl_ppp->ccp->kick_up = isdn_ppp_lp_kick_up; + if (lp->master) { + slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { + printk(KERN_ERR "%s: slot(%d) out of range\n", + __FUNCTION__, slot); + return; + } + mis = ippp_table[slot]; + } else + mis = is; + if (mis != is) + printk(KERN_DEBUG "isdn_ppp: Ouch! Master CCP sends on slave slot!\n"); - return 0; - - err_vj: - ippp_vj_free(inl_ppp->slcomp); - err: - kfree(inl_ppp); - lp->inl_priv = NULL; - return -ENOMEM; + switch(data[2]) { + case CCP_CONFREQ: + if(is->debug & 0x10) + printk(KERN_DEBUG "Disable decompression here!\n"); + if(proto == PPP_CCP) + is->compflags &= ~SC_DECOMP_ON; + else + is->compflags &= ~SC_LINK_DECOMP_ON; + break; + case CCP_TERMREQ: + case CCP_TERMACK: + if(is->debug & 0x10) + printk(KERN_DEBUG "Disable (de)compression here!\n"); + if(proto == PPP_CCP) + is->compflags &= ~(SC_DECOMP_ON|SC_COMP_ON); + else + is->compflags &= ~(SC_LINK_DECOMP_ON|SC_LINK_COMP_ON); + break; + case CCP_CONFACK: + /* if we SEND an ackowledge we can/must enable the compressor */ + if(is->debug & 0x10) + printk(KERN_DEBUG "Enable compression here!\n"); + if(proto == PPP_CCP) { + if (!is->compressor) + break; + is->compflags |= SC_COMP_ON; + } else { + if (!is->compressor) + break; + is->compflags |= SC_LINK_COMP_ON; + } + break; + case CCP_RESETACK: + /* If we send a ACK we should reset our compressor */ + if(is->debug & 0x10) + printk(KERN_DEBUG "Reset decompression state here!\n"); + printk(KERN_DEBUG "ResetAck from daemon passed by\n"); + if(proto == PPP_CCP) { + /* link to master? */ + if(is->compressor && is->comp_stat) + is->compressor->reset(is->comp_stat, 0, 0, + NULL, 0, NULL); + is->compflags &= ~SC_COMP_DISCARD; + } + else { + if(is->link_compressor && is->link_comp_stat) + is->link_compressor->reset(is->link_comp_stat, + 0, 0, NULL, 0, NULL); + is->compflags &= ~SC_LINK_COMP_DISCARD; + } + break; + case CCP_RESETREQ: + /* Just let it pass by */ + printk(KERN_DEBUG "ResetReq from daemon passed by\n"); + break; + } } -static void -isdn_ppp_close(isdn_net_local *lp) +int isdn_ppp_register_compressor(struct isdn_ppp_compressor *ipc) { - struct inl_ppp *inl_ppp = lp->inl_priv; - - ippp_ccp_free(inl_ppp->ccp); - ippp_vj_free(inl_ppp->slcomp); + ipc->next = ipc_head; + ipc->prev = NULL; + if(ipc_head) { + ipc_head->prev = ipc; + } + ipc_head = ipc; + return 0; +} - kfree(inl_ppp); - lp->inl_priv = NULL; +int isdn_ppp_unregister_compressor(struct isdn_ppp_compressor *ipc) +{ + if(ipc->prev) + ipc->prev->next = ipc->next; + else + ipc_head = ipc->next; + if(ipc->next) + ipc->next->prev = ipc->prev; + ipc->prev = ipc->next = NULL; + return 0; } -struct isdn_netif_ops isdn_ppp_ops = { - .hard_start_xmit = isdn_ppp_start_xmit, - .do_ioctl = isdn_ppp_dev_ioctl, - .flags = IFF_NOARP | IFF_POINTOPOINT, - .type = ARPHRD_PPP, - .receive = isdn_ppp_receive, - .connected = isdn_ppp_connected, - .disconnected = isdn_ppp_disconnected, - .bind = isdn_ppp_bind, - .unbind = isdn_ppp_unbind, - .open = isdn_ppp_open, - .close = isdn_ppp_close, -}; +static int isdn_ppp_set_compressor(struct ippp_struct *is, struct isdn_ppp_comp_data *data) +{ + struct isdn_ppp_compressor *ipc = ipc_head; + int ret; + void *stat; + int num = data->num; + + if(is->debug & 0x10) + printk(KERN_DEBUG "[%d] Set %s type %d\n",is->unit, + (data->flags&IPPP_COMP_FLAG_XMIT)?"compressor":"decompressor",num); + + /* If is has no valid reset state vector, we cannot allocate a + decompressor. The decompressor would cause reset transactions + sooner or later, and they need that vector. */ + + if(!(data->flags & IPPP_COMP_FLAG_XMIT) && !is->reset) { + printk(KERN_ERR "ippp_ccp: no reset data structure - can't" + " allow decompression.\n"); + return -ENOMEM; + } + + while(ipc) { + if(ipc->num == num) { + stat = ipc->alloc(data); + if(stat) { + ret = ipc->init(stat,data,is->unit,0); + if(!ret) { + printk(KERN_ERR "Can't init (de)compression!\n"); + ipc->free(stat); + stat = NULL; + break; + } + } + else { + printk(KERN_ERR "Can't alloc (de)compression!\n"); + break; + } + if(data->flags & IPPP_COMP_FLAG_XMIT) { + if(data->flags & IPPP_COMP_FLAG_LINK) { + if(is->link_comp_stat) + is->link_compressor->free(is->link_comp_stat); + is->link_comp_stat = stat; + is->link_compressor = ipc; + } + else { + if(is->comp_stat) + is->compressor->free(is->comp_stat); + is->comp_stat = stat; + is->compressor = ipc; + } + } + else { + if(data->flags & IPPP_COMP_FLAG_LINK) { + if(is->link_decomp_stat) + is->link_decompressor->free(is->link_decomp_stat); + is->link_decomp_stat = stat; + is->link_decompressor = ipc; + } + else { + if(is->decomp_stat) + is->decompressor->free(is->decomp_stat); + is->decomp_stat = stat; + is->decompressor = ipc; + } + } + return 0; + } + ipc = ipc->next; + } + return -EINVAL; +} diff -Nru a/drivers/isdn/i4l/isdn_ppp.h b/drivers/isdn/i4l/isdn_ppp.h --- a/drivers/isdn/i4l/isdn_ppp.h Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/i4l/isdn_ppp.h Thu Feb 19 23:44:24 2004 @@ -1,57 +1,43 @@ -/* Linux ISDN subsystem, functions for synchronous PPP (linklevel). +/* $Id: isdn_ppp.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * header for Linux ISDN subsystem, functions for synchronous PPP (linklevel). * * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. + * */ -#include "isdn_net_lib.h" - -extern struct file_operations isdn_ppp_fops; -extern struct isdn_netif_ops isdn_ppp_ops; +#include /* for PPP_PROTOCOL */ +#include /* for isdn_ppp info */ -int isdn_ppp_init(void); -void isdn_ppp_cleanup(void); -int isdn_ppp_dial_slave(char *); -int isdn_ppp_hangup_slave(char *); - -struct inl_ppp { - unsigned long debug; - struct slcompress *slcomp; - struct ippp_ccp *ccp; /* CCP for this channel */ - unsigned int mp_cfg; - struct sk_buff_head mp_frags; /* fragments list */ - u32 mp_rxseq; /* last processed packet seq # */ - u32 mp_txseq; /* current tx seq # */ -}; - -struct ind_ppp { - struct ipppd *ipppd; /* /dev/ipppX which controls us */ - unsigned int pppcfg; - unsigned long debug; - struct ippp_ccp *ccp; /* CCP for this channel (multilink) */ - u32 mp_rxseq; /* last seq no seen on this channel */ -}; - -void -isdn_ppp_frame_log(char *info, char *data, int len, int maxlen, - int unit, int slot); - -int -isdn_ppp_strip_proto(struct sk_buff *skb, u16 *proto); - -void -ippp_push_proto(struct ind_ppp *ind_ppp, struct sk_buff *skb, u16 proto); +extern int isdn_ppp_read(int, struct file *, char *, int); +extern int isdn_ppp_write(int, struct file *, const char *, int); +extern int isdn_ppp_open(int, struct file *); +extern int isdn_ppp_init(void); +extern void isdn_ppp_cleanup(void); +extern int isdn_ppp_free(isdn_net_local *); +extern int isdn_ppp_bind(isdn_net_local *); +extern int isdn_ppp_autodial_filter(struct sk_buff *, isdn_net_local *); +extern int isdn_ppp_xmit(struct sk_buff *, struct net_device *); +extern void isdn_ppp_receive(isdn_net_dev *, isdn_net_local *, struct sk_buff *); +extern int isdn_ppp_dev_ioctl(struct net_device *, struct ifreq *, int); +extern unsigned int isdn_ppp_poll(struct file *, struct poll_table_struct *); +extern int isdn_ppp_ioctl(int, struct file *, unsigned int, unsigned long); +extern void isdn_ppp_release(int, struct file *); +extern int isdn_ppp_dial_slave(char *); +extern void isdn_ppp_wakeup_daemon(isdn_net_local *); + +extern int isdn_ppp_register_compressor(struct isdn_ppp_compressor *ipc); +extern int isdn_ppp_unregister_compressor(struct isdn_ppp_compressor *ipc); + +#define IPPP_OPEN 0x01 +#define IPPP_CONNECT 0x02 +#define IPPP_CLOSEWAIT 0x04 +#define IPPP_NOBLOCK 0x08 +#define IPPP_ASSIGNED 0x10 -void -ippp_xmit(isdn_net_dev *idev, struct sk_buff *skb); - -void -ippp_receive(isdn_net_dev *idev, struct sk_buff *skb, u16 proto); +#define IPPP_MAX_HEADER 10 -struct sk_buff * -isdn_ppp_dev_alloc_skb(void *priv, int len, int gfp_mask); -#define IPPP_MAX_HEADER 10 diff -Nru a/drivers/isdn/i4l/isdn_ppp_ccp.c b/drivers/isdn/i4l/isdn_ppp_ccp.c --- a/drivers/isdn/i4l/isdn_ppp_ccp.c Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,657 +0,0 @@ -/* Linux ISDN subsystem, PPP CCP support - * - * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -#include "isdn_ppp_ccp.h" -#include "isdn_common.h" -#include "isdn_net_lib.h" -#include "isdn_ppp.h" -#include - -/* ====================================================================== */ -enum ippp_ccp_reset_states { - CCPResetIdle, - CCPResetSentReq, - CCPResetRcvdReq, - CCPResetSentAck, - CCPResetRcvdAck -}; - -struct ippp_ccp_reset_state { - enum ippp_ccp_reset_states state;/* State of this transaction */ - struct ippp_ccp *ccp; /* Backlink */ - unsigned char id; /* id index */ - unsigned char ta:1; /* The timer is active (flag) */ - unsigned char expra:1; /* We expect a ResetAck at all */ - int dlen; /* Databytes stored in data */ - struct timer_list timer; /* For timeouts/retries */ - /* This is a hack but seems sufficient for the moment. We do not want - to have this be yet another allocation for some bytes, it is more - memory management overhead than the whole mess is worth. */ - unsigned char data[IPPP_RESET_MAXDATABYTES]; -}; - -/* The data structure keeping track of the currently outstanding CCP Reset - transactions. */ -struct ippp_ccp_reset { - struct ippp_ccp_reset_state *rs[256]; /* One per possible id */ - unsigned char lastid; /* Last id allocated */ -}; - -/* In-kernel handling of CCP Reset-Request and Reset-Ack is necessary, - but absolutely nontrivial. The most abstruse problem we are facing is - that the generation, reception and all the handling of timeouts and - resends including proper request id management should be entirely left - to the (de)compressor, but indeed is not covered by the current API to - the (de)compressor. The API is a prototype version from PPP where only - some (de)compressors have yet been implemented and all of them are - rather simple in their reset handling. Especially, their is only one - outstanding ResetAck at a time with all of them and ResetReq/-Acks do - not have parameters. For this very special case it was sufficient to - just return an error code from the decompressor and have a single - reset() entry to communicate all the necessary information between - the framework and the (de)compressor. Bad enough, LZS is different - (and any other compressor may be different, too). It has multiple - histories (eventually) and needs to Reset each of them independently - and thus uses multiple outstanding Acks and history numbers as an - additional parameter to Reqs/Acks. - All that makes it harder to port the reset state engine into the - kernel because it is not just the same simple one as in (i)pppd but - it must be able to pass additional parameters and have multiple out- - standing Acks. We are trying to achieve the impossible by handling - reset transactions independent by their id. The id MUST change when - the data portion changes, thus any (de)compressor who uses more than - one resettable state must provide and recognize individual ids for - each individual reset transaction. The framework itself does _only_ - differentiate them by id, because it has no other semantics like the - (de)compressor might. - This looks like a major redesign of the interface would be nice, - but I don't have an idea how to do it better. */ - -/* ====================================================================== */ - -/* Free a given state and clear everything up for later reallocation */ -static void -ippp_ccp_reset_free_state(struct ippp_ccp *ccp, unsigned char id) -{ - struct ippp_ccp_reset_state *rs = ccp->reset->rs[id]; - - if (!rs) - return; - - if (rs->ta) // FIXME? - del_timer_sync(&rs->timer); - - kfree(rs); - ccp->reset->rs[id] = NULL; -} - -static void -do_xmit_reset(struct ippp_ccp *ccp, unsigned char code, unsigned char id, - unsigned char *data, int len) -{ - struct sk_buff *skb; - unsigned char *p; - u16 proto = ccp->proto == PPP_COMP ? PPP_CCP : PPP_CCPFRAG; - - skb = ccp->alloc_skb(ccp->priv, 4 + len, GFP_ATOMIC); - - p = skb_put(skb, 4); - p += put_u8 (p, code); - p += put_u8 (p, id); - p += put_u16(p, len + 4); - - if (len) - memcpy(skb_put(skb, len), data, len); - - isdn_ppp_frame_log("ccp-xmit", skb->data, skb->len, 32, -1, -1); - - ccp->xmit(ccp->priv, skb, proto); -} - -/* The timer callback function which is called when a ResetReq has timed out, - aka has never been answered by a ResetAck */ -static void -isdn_ppp_ccp_timer_callback(unsigned long data) -{ - struct ippp_ccp_reset_state *rs = (struct ippp_ccp_reset_state *) data; - - if (!rs->ta) { - isdn_BUG(); - return; - } - if (rs->state != CCPResetSentReq) { - printk(KERN_WARNING "ippp_ccp: timer cb in wrong state %d\n", - rs->state); - rs->ta = 0; - return; - } - /* We are correct here */ - if (!rs->expra) { - /* Hmm, there is no Ack really expected. We can clean - up the state now, it will be reallocated if the - decompressor insists on another reset */ - rs->ta = 0; - ippp_ccp_reset_free_state(rs->ccp, rs->id); - return; - } - printk(KERN_DEBUG "ippp_ccp: CCP Reset timed out for id %d\n", - rs->id); - /* Push it again */ - do_xmit_reset(rs->ccp, CCP_RESETREQ, rs->id, rs->data, rs->dlen); - - mod_timer(&rs->timer, jiffies + 5 * HZ); -} - -/* Allocate a new reset transaction state */ -static struct ippp_ccp_reset_state * -ippp_ccp_reset_alloc_state(struct ippp_ccp *ccp, unsigned char id) -{ - struct ippp_ccp_reset_state *rs; - - rs = kmalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL); - if(!rs) - return NULL; - memset(rs, 0, sizeof(struct ippp_ccp_reset_state)); - rs->state = CCPResetIdle; - rs->ccp = ccp; - rs->id = id; - init_timer(&rs->timer); - rs->timer.data = (unsigned long)rs; - rs->timer.function = isdn_ppp_ccp_timer_callback; - - ccp->reset->rs[id] = rs; - return rs; -} - -/* A decompressor wants a reset with a set of parameters - do what is - necessary to fulfill it */ -static void -ippp_ccp_reset_xmit(struct ippp_ccp *ccp, - struct isdn_ppp_resetparams *rp) -{ - struct ippp_ccp_reset_state *rs; - int id; - - if (rp->valid) { - /* The decompressor defines parameters by itself */ - if (!rp->rsend) - return; - - /* And it wants us to send a request */ - if (!rp->idval) { - isdn_BUG(); - return; - } - id = rp->id; - } else { - /* The reset params are invalid. The decompressor does not - care about them, so we just send the minimal requests - and increase ids only when an Ack is received for a - given id */ - id = ccp->reset->lastid++; - /* We always expect an Ack if the decompressor doesn't - know better */ - rp->expra = 1; - rp->dtval = 0; - } - rs = ccp->reset->rs[id]; - if (rs) { - printk(KERN_INFO "ippp_ccp: reset xmit in wrong state %d " - "for id %d (%d)\n", rs->state, id, rs->ta); - return; - } - /* Ok, this is a new transaction */ - printk(KERN_DEBUG "ippp_ccp: new xmit for id %d\n", id); - rs = ippp_ccp_reset_alloc_state(ccp, id); - if(!rs) { - printk(KERN_INFO "ippp_ccp: out of mem allocing ccp trans\n"); - return; - } - rs->expra = rp->expra; - rs->id = id; - if (rp->dtval) { - rs->dlen = rp->dlen; - memcpy(rs->data, rp->data, rp->dlen); - } else { - rs->dlen = 0; - } - - rs->state = CCPResetSentReq; - do_xmit_reset(rs->ccp, CCP_RESETREQ, rs->id, rs->data, rs->dlen); - - /* Start the timer */ - rs->timer.expires = jiffies + 5*HZ; - add_timer(&rs->timer); - rs->ta = 1; -} - -/* ====================================================================== */ - -struct ippp_ccp * -ippp_ccp_alloc(void) -{ - struct ippp_ccp *ccp; - - ccp = kmalloc(sizeof(*ccp), GFP_ATOMIC); // FIXME - if (!ccp) - return NULL; - memset(ccp, 0, sizeof(*ccp)); - ccp->mru = 1524; /* MRU, default 1524 */ - ccp->reset = kmalloc(sizeof(*ccp->reset), GFP_ATOMIC); // FIXME alloc together? - if (!ccp->reset) { - kfree(ccp); - return NULL; - } - memset(ccp->reset, 0, sizeof(*ccp->reset)); - return ccp; -} - -void -ippp_ccp_free(struct ippp_ccp *ccp) -{ - int id; - - if (ccp->comp_stat) { - ccp->compressor->free(ccp->comp_stat); - module_put(ccp->compressor->owner); - } - if (ccp->decomp_stat) { - ccp->decompressor->free(ccp->decomp_stat); - module_put(ccp->decompressor->owner); - } - for (id = 0; id < 256; id++) { - if (ccp->reset->rs[id]) - ippp_ccp_reset_free_state(ccp, id); - } - kfree(ccp->reset); - kfree(ccp); -} - -int -ippp_ccp_set_mru(struct ippp_ccp *ccp, unsigned int mru) -{ - ccp->mru = mru; - return 0; -} - -unsigned int -ippp_ccp_get_flags(struct ippp_ccp *ccp) -{ - return ccp->compflags & (SC_DC_ERROR|SC_DC_FERROR); -} - -/* - * compress a frame - * returns original skb if we did not compress the frame - * and a new skb otherwise - */ -struct sk_buff * -ippp_ccp_compress(struct ippp_ccp *ccp, struct sk_buff *skb_in, u16 *proto) -{ - struct sk_buff *skb; - - if (!(ccp->compflags & (SC_COMP_ON|SC_DECOMP_ON))) { - /* We send compressed only if both down- und upstream - compression is negotiated, that means, CCP is up */ - return skb_in; - } - /* we do not compress control protocols */ - if (*proto > 0x3fff) { - return skb_in; - } - if (!ccp->compressor || !ccp->comp_stat) { - isdn_BUG(); - return skb_in; - } - /* Allow for at least 150 % expansion (for now) */ - skb = alloc_skb(skb_in->len*2 + skb_headroom(skb_in), GFP_ATOMIC); - if (!skb) - return skb_in; - - skb_reserve(skb, skb_headroom(skb_in)); - if (!ccp->compressor->compress(ccp->comp_stat, skb_in, skb, *proto)) { - dev_kfree_skb(skb); - return skb_in; - } - isdn_ppp_frame_log("comp in:", skb_in->data, skb_in->len, 20, -1, -1); - isdn_ppp_frame_log("comp out:", skb->data, skb->len, 20, -1, -1); - dev_kfree_skb(skb_in); - *proto = ccp->proto; - return skb; -} - -/* - * decompress packet - * - * proto is updated to protocol field of uncompressed packet. - * retval: decompressed packet, - * same packet if uncompressed, - * NULL if decompression error - */ - -struct sk_buff * -ippp_ccp_decompress(struct ippp_ccp *ccp, struct sk_buff *skb_in, u16 *proto) -{ - struct sk_buff *skb; - struct isdn_ppp_resetparams rsparm; - unsigned char rsdata[IPPP_RESET_MAXDATABYTES]; - int len; - - if (!(ccp->compflags & SC_DECOMP_ON)) { - return skb_in; - } - if (!ccp->decompressor || !ccp->decomp_stat) { - isdn_BUG(); - return skb_in; - } - if (*proto != ccp->proto) { - /* uncompressed packets are fed through the decompressor to - * update the decompressor state */ - ccp->decompressor->incomp(ccp->decomp_stat, skb_in, *proto); - return skb_in; - } - skb = dev_alloc_skb(ccp->mru + PPP_HDRLEN); // FIXME oom? - - // Set up reset params for the decompressor - memset(&rsparm, 0, sizeof(rsparm)); - rsparm.data = rsdata; - rsparm.maxdlen = IPPP_RESET_MAXDATABYTES; - - len = ccp->decompressor->decompress(ccp->decomp_stat, skb_in, skb, - &rsparm); - isdn_ppp_frame_log("deco in:", skb_in->data, skb_in->len, 20, -1, -1); - isdn_ppp_frame_log("deco out:", skb->data, skb->len, 20, -1, -1); - kfree_skb(skb_in); - - if (len <= 0) { - switch(len) { - case DECOMP_ERROR: - printk(KERN_INFO "ippp: decomp wants reset with%s params\n", - rsparm.valid ? "" : "out"); - - ippp_ccp_reset_xmit(ccp, &rsparm); - break; - case DECOMP_FATALERROR: - ccp->compflags |= SC_DC_FERROR; - /* Kick ipppd to recognize the error */ - ccp->kick_up(ccp->priv); - break; - } - kfree_skb(skb); - return NULL; - } - if (isdn_ppp_strip_proto(skb, proto)) { - kfree_skb(skb); - return NULL; - } - return skb; -} - -/* An Ack was received for this id. This means we stop the timer and clean - up the state prior to calling the decompressors reset routine. */ -static void -isdn_ppp_ccp_reset_ack_rcvd(struct ippp_ccp *ccp, unsigned char id) -{ - struct ippp_ccp_reset_state *rs = ccp->reset->rs[id]; - - if (!rs) { - printk(KERN_INFO "ippp_ccp: ResetAck received for unknown id" - " %d\n", id); - return; - } - - if (rs->ta && rs->state == CCPResetSentReq) { - /* Great, we are correct */ - if(!rs->expra) - printk(KERN_DEBUG "ippp_ccp: ResetAck received" - " for id %d but not expected\n", id); - } else { - printk(KERN_INFO "ippp_ccp: ResetAck received out of" - "sync for id %d\n", id); - } - if(rs->ta) { - rs->ta = 0; - del_timer(&rs->timer); - } - ippp_ccp_reset_free_state(ccp, id); -} - -void -ippp_ccp_receive_ccp(struct ippp_ccp *ccp, struct sk_buff *skb) -{ - int len; - struct isdn_ppp_resetparams rsparm; - unsigned char rsdata[IPPP_RESET_MAXDATABYTES]; - - isdn_ppp_frame_log("ccp-recv", skb->data, skb->len, 32, -1, -1); - - switch(skb->data[0]) { - case CCP_CONFREQ: - if (ccp->debug & 0x10) - printk(KERN_DEBUG "Disable compression here!\n"); - - ccp->compflags &= ~SC_COMP_ON; - break; - case CCP_TERMREQ: - case CCP_TERMACK: - if (ccp->debug & 0x10) - printk(KERN_DEBUG "Disable (de)compression here!\n"); - - ccp->compflags &= ~(SC_DECOMP_ON|SC_COMP_ON); - break; - case CCP_CONFACK: - /* if we RECEIVE an ackowledge we enable the decompressor */ - if (ccp->debug & 0x10) - printk(KERN_DEBUG "Enable decompression here!\n"); - - if (!ccp->decomp_stat) - break; - ccp->compflags |= SC_DECOMP_ON; - break; - case CCP_RESETACK: - printk(KERN_DEBUG "Received ResetAck from peer\n"); - len = (skb->data[2] << 8) | skb->data[3]; - len -= 4; - - /* If a reset Ack was outstanding for this id, then - clean up the state engine */ - isdn_ppp_ccp_reset_ack_rcvd(ccp, skb->data[1]); - if (ccp->decomp_stat) - ccp->decompressor->reset(ccp->decomp_stat, - skb->data[0], skb->data[1], - len ? &skb->data[4] : NULL, - len, NULL); - /* TODO: This is not easy to decide here */ - ccp->compflags &= ~SC_DECOMP_DISCARD; - break; - case CCP_RESETREQ: - printk(KERN_DEBUG "Received ResetReq from peer\n"); - /* Receiving a ResetReq means we must reset our compressor */ - /* Set up reset params for the reset entry */ - memset(&rsparm, 0, sizeof(rsparm)); - rsparm.data = rsdata; - rsparm.maxdlen = IPPP_RESET_MAXDATABYTES; - /* Isolate data length */ - len = (skb->data[2] << 8) | skb->data[3]; - len -= 4; - if (ccp->comp_stat) - ccp->compressor->reset(ccp->comp_stat, - skb->data[0], skb->data[1], - len ? &skb->data[4] : NULL, - len, &rsparm); - /* Ack the Req as specified by rsparm */ - if (rsparm.valid) { - /* Compressor reset handler decided how to answer */ - if (!rsparm.rsend) { - printk(KERN_DEBUG "ResetAck suppressed\n"); - return; - } - /* We should send a Frame */ - do_xmit_reset(ccp, CCP_RESETACK, - rsparm.idval ? rsparm.id : skb->data[1], - rsparm.data, - rsparm.dtval ? rsparm.dlen : 0); - return; - } - /* We answer with a straight reflected Ack */ - do_xmit_reset(ccp, CCP_RESETACK, skb->data[1], - skb->data + 4, len); - } -} - -void -ippp_ccp_send_ccp(struct ippp_ccp *ccp, struct sk_buff *skb) -{ - isdn_ppp_frame_log("ccp-xmit", skb->data, skb->len, 32, -1, -1); - - switch (skb->data[2]) { - case CCP_CONFREQ: - if (ccp->debug & 0x10) - printk(KERN_DEBUG "Disable decompression here!\n"); - - ccp->compflags &= ~SC_DECOMP_ON; - break; - case CCP_TERMREQ: - case CCP_TERMACK: - if (ccp->debug & 0x10) - printk(KERN_DEBUG "Disable (de)compression here!\n"); - - ccp->compflags &= ~(SC_DECOMP_ON|SC_COMP_ON); - break; - case CCP_CONFACK: - /* if we SEND an ackowledge we can/must enable the compressor */ - if (ccp->debug & 0x10) - printk(KERN_DEBUG "Enable compression here!\n"); - - if (!ccp->compressor) - break; - - ccp->compflags |= SC_COMP_ON; - break; - case CCP_RESETACK: - /* If we send a ACK we should reset our compressor */ - if (ccp->debug & 0x10) - printk(KERN_DEBUG "Reset decompression state here!\n"); - - printk(KERN_DEBUG "ResetAck from daemon passed by\n"); - - if (!ccp->comp_stat) - break; - - ccp->compressor->reset(ccp->comp_stat, 0, 0, NULL, 0, NULL); - ccp->compflags &= ~SC_COMP_DISCARD; - break; - case CCP_RESETREQ: - /* Just let it pass by */ - printk(KERN_DEBUG "ResetReq from daemon passed by\n"); - break; - } -} - -static LIST_HEAD(ipc_head); -static spinlock_t ipc_head_lock = SPIN_LOCK_UNLOCKED; - -int -ippp_ccp_set_compressor(struct ippp_ccp *ccp, int unit, - struct isdn_ppp_comp_data *data) -{ - struct isdn_ppp_compressor *ipc; - int ret; - void *stat; - int num = data->num; - - if (ccp->debug & 0x10) - printk(KERN_DEBUG "[%d] Set %scompressor type %d\n", unit, - data->flags & IPPP_COMP_FLAG_XMIT ? "" : "de", num); - - spin_lock(&ipc_head_lock); - list_for_each_entry(ipc, &ipc_head, list) { - if (ipc->num == num && - try_module_get(ipc->owner)) - goto found; - } - spin_unlock(&ipc_head_lock); - return -EINVAL; - - found: - spin_unlock(&ipc_head_lock); - - stat = ipc->alloc(data); - if (!stat) { - printk(KERN_ERR "Can't alloc (de)compression!\n"); - goto err; - } - ret = ipc->init(stat, data, unit, 0); - if(!ret) { - printk(KERN_ERR "Can't init (de)compression!\n"); - ipc->free(stat); - goto err; - } - if (data->flags & IPPP_COMP_FLAG_XMIT) { - if (ccp->comp_stat) { - ccp->compressor->free(ccp->comp_stat); - module_put(ccp->compressor->owner); - } - ccp->comp_stat = stat; - ccp->compressor = ipc; - } else { - if (ccp->decomp_stat) { - ccp->decompressor->free(ccp->decomp_stat); - module_put(ccp->decompressor->owner); - } - ccp->decomp_stat = stat; - ccp->decompressor = ipc; - } - return 0; - - err: - module_put(ipc->owner); - return -EINVAL; -} - -void -ippp_ccp_get_compressors(unsigned long protos[8]) -{ - struct isdn_ppp_compressor *ipc; - int i, j; - - memset(protos, 0, sizeof(unsigned long) * 8); - - spin_lock(&ipc_head_lock); - list_for_each_entry(ipc, &ipc_head, list) { - j = ipc->num / (sizeof(long)*8); - i = ipc->num % (sizeof(long)*8); - if (j < 8) - protos[j] |= 1 << i; - } - spin_unlock(&ipc_head_lock); -} - -int -isdn_ppp_register_compressor(struct isdn_ppp_compressor *ipc) -{ - spin_lock(&ipc_head_lock); - list_add_tail(&ipc->list, &ipc_head); - spin_unlock(&ipc_head_lock); - - return 0; -} - -int -isdn_ppp_unregister_compressor(struct isdn_ppp_compressor *ipc) -{ - spin_lock(&ipc_head_lock); - list_del(&ipc->list); - spin_unlock(&ipc_head_lock); - - return 0; -} - diff -Nru a/drivers/isdn/i4l/isdn_ppp_ccp.h b/drivers/isdn/i4l/isdn_ppp_ccp.h --- a/drivers/isdn/i4l/isdn_ppp_ccp.h Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,75 +0,0 @@ -/* Linux ISDN subsystem, PPP CCP support - * - * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -#include -#include - -/* for ippp_ccp::flags */ - -#define SC_DECOMP_ON 0x01 -#define SC_COMP_ON 0x02 -#define SC_DECOMP_DISCARD 0x04 -#define SC_COMP_DISCARD 0x08 - -/* SC_DC_ERROR/FERROR go in here as well, but are defined elsewhere - - #define SC_DC_FERROR 0x00800000 - #define SC_DC_ERROR 0x00400000 -*/ - -struct ippp_ccp { - u16 proto; - struct isdn_ppp_compressor *compressor; - struct isdn_ppp_compressor *decompressor; - void *comp_stat; - void *decomp_stat; - unsigned long compflags; - struct ippp_ccp_reset *reset; - int mru; - int debug; - void *priv; - void (*xmit)(void *priv, struct sk_buff *skb, u16 proto); - void (*kick_up)(void *priv); - struct sk_buff *(*alloc_skb)(void *priv, int len, int gfp_mask); -}; - -struct ippp_ccp * -ippp_ccp_alloc(void); - -void -ippp_ccp_free(struct ippp_ccp *ccp); - -int -ippp_ccp_set_mru(struct ippp_ccp *ccp, unsigned int mru); - -unsigned int -ippp_ccp_get_flags(struct ippp_ccp *ccp); - -struct sk_buff * -ippp_ccp_compress(struct ippp_ccp *ccp, struct sk_buff *skb, u16 *proto); - -struct sk_buff * -ippp_ccp_decompress(struct ippp_ccp *ccp, struct sk_buff *skb, u16 *proto); - -void -ippp_ccp_send_ccp(struct ippp_ccp *ccp, struct sk_buff *skb); - -void -ippp_ccp_receive_ccp(struct ippp_ccp *ccp, struct sk_buff *skb); - -void -ippp_ccp_get_compressors(unsigned long protos[8]); - -int -ippp_ccp_set_compressor(struct ippp_ccp *ccp, int unit, - struct isdn_ppp_comp_data *data); - - diff -Nru a/drivers/isdn/i4l/isdn_ppp_mp.c b/drivers/isdn/i4l/isdn_ppp_mp.c --- a/drivers/isdn/i4l/isdn_ppp_mp.c Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,353 +0,0 @@ -/* Linux ISDN subsystem, PPP CCP support - * - * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -#include "isdn_ppp_mp.h" -#include "isdn_ppp_ccp.h" -#include "isdn_common.h" -#include "isdn_net_lib.h" -#include "isdn_ppp.h" - -/* ====================================================================== */ - -#define MP_END_FRAG 0x40 -#define MP_BEGIN_FRAG 0x80 - -#define MP_MAX_QUEUE_LEN 16 - -/* ====================================================================== */ - -int -ippp_mp_bind(isdn_net_dev *idev) -{ - struct ind_ppp *ind_ppp = idev->ind_priv; - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - - /* seq no last seen, maybe set to bundle min, when joining? */ - ind_ppp->mp_rxseq = 0; - - if (!list_empty(&idev->mlp->online)) - return 0; - - /* first channel for this link, do some setup */ - - inl_ppp->mp_cfg = 0; /* MPPP configuration */ - inl_ppp->mp_txseq = 0; /* MPPP tx sequence number */ - inl_ppp->mp_rxseq = (u32) -1; - skb_queue_head_init(&inl_ppp->mp_frags); - - return 0; -} - -int -ippp_mp_bundle(isdn_net_dev *idev, int unit) -{ - isdn_net_local *lp = idev->mlp; - char ifn[IFNAMSIZ + 1]; - isdn_net_dev *n_idev; - struct ind_ppp *ind_ppp; - - printk(KERN_DEBUG "%s: %s: slave unit: %d\n", - __FUNCTION__, idev->name, unit); - - sprintf(ifn, "ippp%d", unit); - list_for_each_entry(n_idev, &lp->slaves, slaves) { - if (strcmp(n_idev->name, ifn) == 0) - goto found; - } - - printk(KERN_INFO "%s: cannot find %s\n", __FUNCTION__, ifn); - return -ENODEV; - - found: - ind_ppp = n_idev->ind_priv; - if (!ind_ppp->ipppd) { - printk(KERN_INFO "%s: no ipppd?\n", __FUNCTION__); - return -ENXIO; - } - ind_ppp->pppcfg |= SC_ENABLE_IP; - isdn_net_online(n_idev); - - return 0; -} - -void -ippp_mp_disconnected(isdn_net_dev *idev) -{ - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - - if (!list_empty(&idev->mlp->online)) - return; - - /* we're the last link going down */ - skb_queue_purge(&inl_ppp->mp_frags); -} - -void -ippp_mp_xmit(isdn_net_dev *idev, struct sk_buff *skb) -{ - struct ind_ppp *ind_ppp = idev->ind_priv; - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - unsigned char *p; - u32 txseq; - u16 proto; - - if (!(inl_ppp->mp_cfg & SC_MP_PROT)) { - return ippp_xmit(idev, skb); - } - - /* we could do something smarter than just sending - * the complete packet as fragment... */ - - txseq = inl_ppp->mp_txseq++; - - if (inl_ppp->mp_cfg & SC_OUT_SHORT_SEQ) { - /* sequence number: 12bit */ - p = skb_push(skb, 2); - p[0] = MP_BEGIN_FRAG | MP_END_FRAG | ((txseq >> 8) & 0xf); - p[1] = txseq & 0xff; - } else { - /* sequence number: 24bit */ - p = skb_push(skb, 4); - p[0] = MP_BEGIN_FRAG | MP_END_FRAG; - p[1] = (txseq >> 16) & 0xff; - p[2] = (txseq >> 8) & 0xff; - p[3] = (txseq >> 0) & 0xff; - } - proto = PPP_MP; - skb = ippp_ccp_compress(ind_ppp->ccp, skb, &proto); - ippp_push_proto(ind_ppp, skb, proto); - ippp_xmit(idev, skb); -} - -static void mp_receive(isdn_net_dev *idev, struct sk_buff *skb); - -void -ippp_mp_receive(isdn_net_dev *idev, struct sk_buff *skb, u16 proto) -{ - struct ind_ppp *ind_ppp = idev->ind_priv; - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - - if (inl_ppp->mp_cfg & SC_REJ_MP_PROT) - goto out; - - skb = ippp_ccp_decompress(ind_ppp->ccp, skb, &proto); - if (!skb) - goto drop; - - if (proto == PPP_MP) - return mp_receive(idev, skb); - - out: - return ippp_receive(idev, skb, proto); - - drop: - idev->mlp->stats.rx_errors++; - kfree_skb(skb); -} - -#define MP_LONGSEQ_MASK 0x00ffffff -#define MP_SHORTSEQ_MASK 0x00000fff -#define MP_LONGSEQ_MAX MP_LONGSEQ_MASK -#define MP_SHORTSEQ_MAX MP_SHORTSEQ_MASK -#define MP_LONGSEQ_MAXBIT ((MP_LONGSEQ_MASK+1)>>1) -#define MP_SHORTSEQ_MAXBIT ((MP_SHORTSEQ_MASK+1)>>1) - -/* sequence-wrap safe comparisions (for long sequence)*/ -#define MP_LT(a,b) ((a-b)&MP_LONGSEQ_MAXBIT) -#define MP_LE(a,b) !((b-a)&MP_LONGSEQ_MAXBIT) -#define MP_GT(a,b) ((b-a)&MP_LONGSEQ_MAXBIT) -#define MP_GE(a,b) !((a-b)&MP_LONGSEQ_MAXBIT) - -#define MP_SEQUENCE(skb) (skb)->priority -#define MP_FLAGS(skb) (skb)->cb[0] - -static u32 -get_seq(struct sk_buff *skb, u32 last_seq, int short_seq) -{ - u32 seq; - u16 shseq; - u8 flags; - int delta; - - get_u8(skb->data, &flags); - if (short_seq) { - /* convert 12-bit short seq number to 24-bit long one */ - get_u16(skb->data, &shseq); - delta = (shseq & MP_SHORTSEQ_MASK) - - (last_seq & MP_SHORTSEQ_MASK); - /* check for seqence wrap */ - if (delta < 0) - delta += MP_SHORTSEQ_MAX + 1; - - seq = last_seq + delta; - skb_pull(skb, 2); - } else { - get_u32(skb->data, &seq); - skb_pull(skb, 4); - } - seq &= MP_LONGSEQ_MASK; - MP_SEQUENCE(skb) = seq; - MP_FLAGS(skb) = flags; - return seq; -} - -static int -mp_insert_frag(struct sk_buff_head *frags, struct sk_buff *skb) -{ - struct sk_buff *p; - - /* If our queue of not yet reassembled fragments grows too - large, throw away the oldest fragment */ - if (skb_queue_len(frags) > MP_MAX_QUEUE_LEN) - kfree_skb(skb_dequeue(frags)); - - for (p = frags->next; p != (struct sk_buff *) frags; p = p->next) { - if (MP_LE(MP_SEQUENCE(skb), MP_SEQUENCE(p))) - break; - } - /* duplicate ? */ - if (MP_SEQUENCE(skb) == MP_SEQUENCE(p)) - return -EBUSY; - - __skb_insert(skb, p->prev, p, frags); - return 0; -} - -struct sk_buff * -mp_complete_seq(isdn_net_local *lp, struct sk_buff *b, struct sk_buff *e) -{ - struct sk_buff *p, *n, *skb; - int len = 0; - - if (b->next == e) { - /* sequence with only one frag */ - skb_unlink(b); - return b; - } - for (p = b, n = p->next; p != e; p = n, n = p->next ) { - len += p->len; - } - // FIXME check against mrru? - skb = dev_alloc_skb(len); - if (!skb) - lp->stats.rx_errors++; - - for (p = b, n = p->next; p != e; p = n, n = p->next ) { - if (skb) - memcpy(skb_put(skb, p->len), p->data, p->len); - - skb_unlink(p); - kfree_skb(p); - } - return skb; -} - -struct sk_buff * -mp_reassemble(isdn_net_local *lp) -{ - struct inl_ppp *inl_ppp = lp->inl_priv; - struct sk_buff_head *frags = &inl_ppp->mp_frags; - struct sk_buff *p, *n, *pp, *start; - u32 min_seq = inl_ppp->mp_rxseq; - u32 next_seq = 0; - - again: - start = NULL; - for (p = frags->next, n = p->next; p != (struct sk_buff *) frags; p = n, n = p->next ) { - if (!start) { - if (MP_FLAGS(p) & MP_BEGIN_FRAG) { - start = p; - next_seq = MP_SEQUENCE(p); - } else { - /* start frag is missing */ - goto frag_missing; - } - } - /* we've seen the first fragment of this series */ - if (MP_SEQUENCE(p) != next_seq) { - /* previous frag is missing */ - goto frag_missing; - } - if (MP_FLAGS(p) & MP_END_FRAG) { - /* we got a full sequence */ - return mp_complete_seq(lp, start, p->next); - } - next_seq = MP_SEQUENCE(p) + 1; - } - return NULL; - - frag_missing: - if (MP_SEQUENCE(p) - 1 > min_seq) - /* may come later */ - return NULL; - - /* for all fragments up to p */ - p = p->next; - for (pp = frags->next, n = pp->next; pp != p; pp = n, n = pp->next ) { - skb_unlink(pp); - kfree_skb(pp); - lp->stats.rx_errors++; - } - goto again; - -} - -static void -mp_receive(isdn_net_dev *idev, struct sk_buff *skb) -{ - isdn_net_local *lp = idev->mlp; - struct inl_ppp *inl_ppp = lp->inl_priv; - struct ind_ppp *ind_ppp = idev->ind_priv; - isdn_net_dev *qdev; - struct sk_buff_head *frags = &inl_ppp->mp_frags; - u32 seq; - u16 proto; - - if (skb->len < (inl_ppp->mp_cfg & SC_IN_SHORT_SEQ ? 2 : 4)) - goto drop; - - seq = get_seq(skb, ind_ppp->mp_rxseq, inl_ppp->mp_cfg & SC_IN_SHORT_SEQ); - ind_ppp->mp_rxseq = seq; - - if (inl_ppp->mp_rxseq == (u32) -1) { - /* first packet */ - inl_ppp->mp_rxseq = seq; - } - if (MP_LT(seq, inl_ppp->mp_rxseq)) { - goto drop; - } - /* Find the minimum sequence number received over all channels. - * No fragments with numbers lower than this will arrive later. */ - inl_ppp->mp_rxseq = seq; - list_for_each_entry(qdev, &lp->online, online) { - struct ind_ppp *ind_ppp = qdev->ind_priv; - if (MP_LT(ind_ppp->mp_rxseq, inl_ppp->mp_rxseq)) - inl_ppp->mp_rxseq = ind_ppp->mp_rxseq; - } - - /* Insert the skb into the list of received fragments, ordered by - * sequence number */ - if (mp_insert_frag(frags, skb)) - goto drop; - - while ((skb = mp_reassemble(lp))) { - if (isdn_ppp_strip_proto(skb, &proto)) { - kfree_skb(skb); - continue; - } - ippp_receive(idev, skb, proto); - } - return; - - drop: - lp->stats.rx_errors++; - kfree_skb(skb); -} diff -Nru a/drivers/isdn/i4l/isdn_ppp_mp.h b/drivers/isdn/i4l/isdn_ppp_mp.h --- a/drivers/isdn/i4l/isdn_ppp_mp.h Thu Feb 19 23:44:29 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,58 +0,0 @@ -/* Linux ISDN subsystem, PPP CCP support - * - * Copyright 1994-1998 by Fritz Elfert (fritz@isdn4linux.de) - * 1995,96 by Thinking Objects Software GmbH Wuerzburg - * 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -#ifndef __ISDN_PPP_MP_H__ -#define __ISDN_PPP_MP_H__ - -#include "isdn_net_lib.h" - -#ifdef CONFIG_ISDN_MPP - -int ippp_mp_bind(isdn_net_dev *idev); -void ippp_mp_disconnected(isdn_net_dev *idev); -int ippp_mp_bundle(isdn_net_dev *idev, int val); -void ippp_mp_xmit(isdn_net_dev *idev, struct sk_buff *skb); -void ippp_mp_receive(isdn_net_dev *idev, struct sk_buff *skb, u16 proto); - -#else - -static inline int -ippp_mp_bind(isdn_net_dev *idev) -{ - return 0; -} - -static void -ippp_mp_disconnected(isdn_net_dev *idev) -{ -} - -static inline int -ippp_mp_bundle(isdn_net_dev *idev, int val) -{ - return -EINVAL; -} - -static inline void -ippp_mp_xmit(isdn_net_dev *idev, struct sk_buff *skb) -{ - ippp_xmit(idev, skb); -} - -static inline void -ippp_mp_receive(isdn_net_dev *idev, struct sk_buff *skb, u16 proto) -{ - ippp_receive(idev, skb, proto); -} - -#endif - -#endif diff -Nru a/drivers/isdn/i4l/isdn_ppp_vj.c b/drivers/isdn/i4l/isdn_ppp_vj.c --- a/drivers/isdn/i4l/isdn_ppp_vj.c Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,128 +0,0 @@ -/* Linux ISDN subsystem, PPP VJ header compression - * - * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -#include "isdn_ppp_vj.h" -#include "isdn_common.h" -#include "isdn_net_lib.h" -#include "isdn_ppp.h" - -struct slcompress * -ippp_vj_alloc(void) -{ - return slhc_init(16, 16); -} - -void -ippp_vj_free(struct slcompress *slcomp) -{ - slhc_free(slcomp); -} - -int -ippp_vj_set_maxcid(isdn_net_dev *idev, int val) -{ - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - struct slcompress *sltmp; - - sltmp = slhc_init(16, val + 1); - if (!sltmp) - return -ENOMEM; - - if (inl_ppp->slcomp) - slhc_free(inl_ppp->slcomp); - - inl_ppp->slcomp = sltmp; - return 0; -} - -void -ippp_vj_decompress(isdn_net_dev *idev, struct sk_buff *skb_old, u16 proto) -{ - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - struct slcompress *slcomp = inl_ppp->slcomp; - struct sk_buff *skb; - int len; - - switch (proto) { - case PPP_VJC_UNCOMP: - if (slhc_remember(slcomp, skb_old->data, skb_old->len) <= 0) - goto drop; - - skb = skb_old; - break; - case PPP_VJC_COMP: - skb = dev_alloc_skb(skb_old->len + 128); - if (!skb) - goto drop; - - memcpy(skb->data, skb_old->data, skb_old->len); - len = slhc_uncompress(slcomp, skb->data, skb_old->len); - if (len < 0) - goto drop_both; - - skb_put(skb, len); - kfree_skb(skb_old); - break; - default: - isdn_BUG(); - goto drop; - } - isdn_netif_rx(idev, skb, htons(ETH_P_IP)); - return; - - drop_both: - kfree_skb(skb); - drop: - kfree_skb(skb_old); - idev->mlp->stats.rx_dropped++; -} - -struct sk_buff * -ippp_vj_compress(isdn_net_dev *idev, struct sk_buff *skb_old, u16 *proto) -{ - struct inl_ppp *inl_ppp = idev->mlp->inl_priv; - struct ind_ppp *ind_ppp = idev->ind_priv; - struct slcompress *slcomp = inl_ppp->slcomp; - struct sk_buff *skb; - unsigned char *buf; - int len; - - if (!(ind_ppp->pppcfg & SC_COMP_TCP) || *proto != PPP_IP) - return skb_old; - - skb = isdn_ppp_dev_alloc_skb(idev, skb_old->len, GFP_ATOMIC); - if (!skb) - return skb_old; - - skb_put(skb, skb_old->len); - buf = skb_old->data; - // FIXME flag should be per bundle - len = slhc_compress(slcomp, skb_old->data, skb_old->len, skb->data, - &buf, !(ind_ppp->pppcfg & SC_NO_TCP_CCID)); - - if (buf == skb_old->data) { - kfree_skb(skb); - skb = skb_old; - } else { - kfree_skb(skb_old); - } - skb_trim(skb, len); - - /* cslip style -> PPP */ - if ((skb->data[0] & SL_TYPE_COMPRESSED_TCP) == SL_TYPE_COMPRESSED_TCP) { - skb->data[0] &= ~SL_TYPE_COMPRESSED_TCP; - *proto = PPP_VJC_COMP; - } else if ((skb->data[0] & SL_TYPE_UNCOMPRESSED_TCP) == SL_TYPE_UNCOMPRESSED_TCP) { - skb->data[0] &= ~SL_TYPE_UNCOMPRESSED_TCP; - skb->data[0] |= SL_TYPE_IP; - *proto = PPP_VJC_UNCOMP; - } - return skb; -} - diff -Nru a/drivers/isdn/i4l/isdn_ppp_vj.h b/drivers/isdn/i4l/isdn_ppp_vj.h --- a/drivers/isdn/i4l/isdn_ppp_vj.h Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,61 +0,0 @@ -/* Linux ISDN subsystem, PPP VJ header compression - * - * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * 1999-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. - */ - -#ifndef __ISDN_PPP_VJ_H__ -#define __ISDN_PPP_VJ_H__ - -#include "isdn_net_lib.h" - -#ifdef CONFIG_ISDN_PPP_VJ - - -struct slcompress * -ippp_vj_alloc(void); - -void -ippp_vj_free(struct slcompress *slcomp); - -int -ippp_vj_set_maxcid(isdn_net_dev *idev, int val); - -void -ippp_vj_decompress(isdn_net_dev *idev, struct sk_buff *skb_old, u16 proto); - -struct sk_buff * -ippp_vj_compress(isdn_net_dev *idev, struct sk_buff *skb_old, u16 *proto); - - -#else - - -static inline struct slcompress * -ippp_vj_alloc(void) -{ return (struct slcompress *) !NULL; } - -static inline void -ippp_vj_free(struct slcompress *slcomp) -{ } - -static inline int -ippp_vj_set_maxcid(isdn_net_dev *idev, int val) -{ return -EINVAL; } - -static inline struct sk_buff * -ippp_vj_decompress(struct slcompress *slcomp, struct sk_buff *skb_old, - u16 proto) -{ return skb_old; } - -static inline struct sk_buff * -ippp_vj_compress(isdn_net_dev *idev, struct sk_buff *skb_old, u16 *proto) -{ return skb_old; } - - -#endif - -#endif diff -Nru a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c --- a/drivers/isdn/i4l/isdn_tty.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/i4l/isdn_tty.c Thu Feb 19 23:44:27 2004 @@ -1,20 +1,17 @@ -/* Linux ISDN subsystem, tty functions and AT-command emulator +/* $Id: isdn_tty.c,v 1.1.2.3 2004/02/10 01:07:13 keil Exp $ + * + * Linux ISDN subsystem, tty functions and AT-command emulator (linklevel). * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) * Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ +#undef ISDN_TTY_STAT_DEBUG -#define ISDN_TTY_STAT_DEBUG -#define ISDN_DEBUG_MODEM_HUP -#define ISDN_DEBUG_MODEM_VOICE -#define ISDN_DEBUG_MODEM_OPEN -#define ISDN_DEBUG_MODEM_IOCTL -#define ISDN_DEBUG_MODEM_ICALL - -#include +#include #include #include "isdn_common.h" #include "isdn_tty.h" @@ -24,51 +21,33 @@ #define VBUFX (VBUF/16) #endif -#define RING_TIMEOUT (5*HZ) /* repeat RING every 5 secs */ #define FIX_FILE_TRANSFER #define DUMMY_HAYES_AT /* Prototypes */ -static void isdn_tty_modem_xmit(struct modem_info *info); static int isdn_tty_edit_at(const char *, int, modem_info *, int); -static void isdn_tty_escape_timer(unsigned long data); -static void isdn_tty_ring_timer(unsigned long data); -static void isdn_tty_connect_timer(unsigned long data); -static void isdn_tty_check_esc(struct modem_info *info, - const unsigned char *p, int count); +static void isdn_tty_check_esc(const u_char *, u_char, int, int *, u_long *, int); static void isdn_tty_modem_reset_regs(modem_info *, int); static void isdn_tty_cmd_ATA(modem_info *); static void isdn_tty_flush_buffer(struct tty_struct *); static void isdn_tty_modem_result(int, modem_info *); -static int isdn_tty_stat_callback(struct isdn_slot *slot, isdn_ctrl *c); -static int isdn_tty_rcv_skb(struct isdn_slot *slot, struct sk_buff *skb); #ifdef CONFIG_ISDN_AUDIO static int isdn_tty_countDLE(unsigned char *, int); #endif -static int -isdn_tty_event_callback(struct isdn_slot *slot, int pr, void *arg) -{ - switch (pr) { - case EV_DATA_IND: - return isdn_tty_rcv_skb(slot, arg); - default: - return isdn_tty_stat_callback(slot, arg); - } -} - /* Leave this unchanged unless you know what you do! */ #define MODEM_PARANOIA_CHECK #define MODEM_DO_RESTART -struct isdn_modem isdn_mdm; - static int bit2si[8] = {1, 5, 7, 7, 7, 7, 7, 7}; static int si2bit[8] = {4, 1, 4, 4, 4, 4, 4, 4}; +char *isdn_tty_revision = "$Revision: 1.1.2.3 $"; + + /* isdn_tty_try_read() is called from within isdn_tty_rcv_skb() * to stuff incoming data directly into a tty's flip-buffer. This * is done to speed up tty-receiving if the receive-queue is empty. @@ -124,166 +103,78 @@ return 0; } -/* - * isdn_slot_readbchan() tries to get data from the read-queue. - * It MUST be called with interrupts off. - */ -static int -isdn_tty_readbchan(struct modem_info *info, u_char * buf, u_char * fp, int len) -{ - int count; - u_int count_pull; - int count_put; - int dflag; - struct sk_buff *skb; - u_char *cp; - - if (skb_queue_empty(&info->rpqueue)) - return 0; - - if (len > info->rcvcount) - len = info->rcvcount; - cp = buf; - count = 0; - while (len) { - if (!(skb = skb_peek(&info->rpqueue))) - break; -#ifdef CONFIG_ISDN_AUDIO - if (ISDN_AUDIO_SKB_LOCK(skb)) - break; - ISDN_AUDIO_SKB_LOCK(skb) = 1; - if (ISDN_AUDIO_SKB_DLECOUNT(skb) || info->DLEflag) { - char *p = skb->data; - - dflag = 0; - count_pull = count_put = 0; - while ((count_pull < skb->len) && (len > 0)) { - len--; - if (info->DLEflag) { - *cp++ = DLE; - info->DLEflag = 0; - } else { - *cp++ = *p; - if (*p == DLE) { - info->DLEflag = 1; - (ISDN_AUDIO_SKB_DLECOUNT(skb))--; - } - p++; - count_pull++; - } - count_put++; - } - if (count_pull >= skb->len) - dflag = 1; - } else { -#endif - /* No DLE's in buff, so simply copy it */ - dflag = 1; - if ((int)(count_pull = skb->len) > len) { - count_pull = len; - dflag = 0; - } - count_put = count_pull; - memcpy(cp, skb->data, count_put); - cp += count_put; - len -= count_put; -#ifdef CONFIG_ISDN_AUDIO - } -#endif - count += count_put; - if (fp) { - memset(fp, 0, count_put); - fp += count_put; - } - if (dflag) { - /* We got all the data in this buff. - * Now we can dequeue it. - */ - if (fp) - *(fp - 1) = 0xff; -#ifdef CONFIG_ISDN_AUDIO - ISDN_AUDIO_SKB_LOCK(skb) = 0; -#endif - skb = skb_dequeue(&info->rpqueue); - dev_kfree_skb(skb); - } else { - /* Not yet emptied this buff, so it - * must stay in the queue, for further calls - * but we pull off the data we got until now. - */ - skb_pull(skb, count_pull); -#ifdef CONFIG_ISDN_AUDIO - ISDN_AUDIO_SKB_LOCK(skb) = 0; -#endif - } - info->rcvcount -= count_put; - } - return count; -} - /* isdn_tty_readmodem() is called periodically from within timer-interrupt. * It tries getting received data from the receive queue an stuff it into * the tty's flip-buffer. */ -static void -isdn_tty_readmodem(unsigned long data) +void +isdn_tty_readmodem(void) { - struct modem_info *info = (struct modem_info *) data; + int resched = 0; + int midx; + int i; int c; int r; - ulong flags; struct tty_struct *tty; + modem_info *info; - if (!info->online) - return; - - r = 0; -#ifdef CONFIG_ISDN_AUDIO - isdn_audio_eval_dtmf(info); - if ((info->vonline & 1) && (info->emu.vpar[1])) - isdn_audio_eval_silence(info); -#endif - if ((tty = info->tty)) { - if (info->mcr & UART_MCR_RTS) { - c = TTY_FLIPBUF_SIZE - tty->flip.count; - if (c > 0) { - save_flags(flags); - cli(); - r = isdn_tty_readbchan(info, - tty->flip.char_buf_ptr, - tty->flip.flag_buf_ptr, c); - /* CISCO AsyncPPP Hack */ - if (!(info->emu.mdmreg[REG_CPPP] & BIT_CPPP)) - memset(tty->flip.flag_buf_ptr, 0, r); - tty->flip.count += r; - tty->flip.flag_buf_ptr += r; - tty->flip.char_buf_ptr += r; - if (r) - schedule_delayed_work(&tty->flip.work, 1); - restore_flags(flags); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + if ((midx = dev->m_idx[i]) >= 0) { + info = &dev->mdm.info[midx]; + if (info->online) { + r = 0; +#ifdef CONFIG_ISDN_AUDIO + isdn_audio_eval_dtmf(info); + if ((info->vonline & 1) && (info->emu.vpar[1])) + isdn_audio_eval_silence(info); +#endif + if ((tty = info->tty)) { + if (info->mcr & UART_MCR_RTS) { + c = TTY_FLIPBUF_SIZE - tty->flip.count; + if (c > 0) { + r = isdn_readbchan(info->isdn_driver, info->isdn_channel, + tty->flip.char_buf_ptr, + tty->flip.flag_buf_ptr, c, 0); + /* CISCO AsyncPPP Hack */ + if (!(info->emu.mdmreg[REG_CPPP] & BIT_CPPP)) + memset(tty->flip.flag_buf_ptr, 0, r); + tty->flip.count += r; + tty->flip.flag_buf_ptr += r; + tty->flip.char_buf_ptr += r; + if (r) + schedule_delayed_work(&tty->flip.work, 1); + } + } else + r = 1; + } else + r = 1; + if (r) { + info->rcvsched = 0; + resched = 1; + } else + info->rcvsched = 1; } - } else - r = 1; - } else - r = 1; - - if (r) { - info->rcvsched = 0; - mod_timer(&info->read_timer, jiffies + 4); - } else - info->rcvsched = 1; + } + } + if (!resched) + isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 0); } -static int -isdn_tty_rcv_skb(struct isdn_slot *slot, struct sk_buff *skb) +int +isdn_tty_rcv_skb(int i, int di, int channel, struct sk_buff *skb) { ulong flags; + int midx; #ifdef CONFIG_ISDN_AUDIO int ifmt; #endif modem_info *info; - info = slot->priv; + if ((midx = dev->m_idx[i]) < 0) { + /* if midx is invalid, packet is not for tty */ + return 0; + } + info = &dev->mdm.info[midx]; #ifdef CONFIG_ISDN_AUDIO ifmt = 1; @@ -315,12 +206,6 @@ skb_pull(skb, 4); } #ifdef CONFIG_ISDN_AUDIO - if ((size_t)skb_headroom(skb) < sizeof(isdnaudio_header)) { - printk(KERN_WARNING - "isdn_audio: insufficient skb_headroom, dropping\n"); - kfree_skb(skb); - return 1; - } ISDN_AUDIO_SKB_DLECOUNT(skb) = 0; ISDN_AUDIO_SKB_LOCK(skb) = 0; if (info->vonline & 1) { @@ -364,53 +249,49 @@ #endif #endif /* Try to deliver directly via tty-flip-buf if queue is empty */ - save_flags(flags); - cli(); - if (skb_queue_empty(&info->rpqueue)) + spin_lock_irqsave(&info->readlock, flags); + if (skb_queue_empty(&dev->drv[di]->rpqueue[channel])) if (isdn_tty_try_read(info, skb)) { - restore_flags(flags); + spin_unlock_irqrestore(&info->readlock, flags); return 1; } /* Direct deliver failed or queue wasn't empty. * Queue up for later dequeueing via timer-irq. */ - isdn_tty_queue_tail(info, skb, skb->len + __skb_queue_tail(&dev->drv[di]->rpqueue[channel], skb); + dev->drv[di]->rcvcount[channel] += + (skb->len #ifdef CONFIG_ISDN_AUDIO + ISDN_AUDIO_SKB_DLECOUNT(skb) #endif - ); - restore_flags(flags); + ); + spin_unlock_irqrestore(&info->readlock, flags); /* Schedule dequeuing */ - if ((get_isdn_dev())->modempoll && info->rcvsched) - mod_timer(&info->read_timer, jiffies + 4); + if ((dev->modempoll) && (info->rcvsched)) + isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1); return 1; } void isdn_tty_cleanup_xmit(modem_info * info) { - unsigned long flags; - - save_flags(flags); - cli(); skb_queue_purge(&info->xmit_queue); #ifdef CONFIG_ISDN_AUDIO skb_queue_purge(&info->dtmf_queue); #endif - restore_flags(flags); } static void isdn_tty_tint(modem_info * info) { struct sk_buff *skb = skb_dequeue(&info->xmit_queue); - int len, - slen; + int len, slen; if (!skb) return; len = skb->len; - if ((slen = isdn_slot_write(info->isdn_slot, skb)) == len) { + if ((slen = isdn_writebuf_skb_stub(info->isdn_driver, + info->isdn_channel, 1, skb)) == len) { struct tty_struct *tty = info->tty; info->send_outstanding++; info->msr &= ~UART_MSR_CTS; @@ -573,11 +454,11 @@ atomic_inc(&info->xmit_lock); if (!(atomic_dec_and_test(&info->xmit_lock))) return; - if (info->isdn_slot < 0) { + if (info->isdn_driver < 0) { info->xmit_count = 0; return; } - skb_res = isdn_slot_hdrlen(info->isdn_slot); + skb_res = dev->drv[info->isdn_driver]->interface->hl_hdrlen + 4; #ifdef CONFIG_ISDN_AUDIO if (info->vonline & 2) audio_len = buflen * voice_cf[info->emu.vpar[3]]; @@ -677,8 +558,6 @@ { if (info->ncarrier) { info->nc_timer.expires = jiffies + HZ; - info->nc_timer.function = isdn_tty_modem_do_ncarrier; - info->nc_timer.data = (unsigned long) info; add_timer(&info->nc_timer); } } @@ -721,8 +600,9 @@ int usg = ISDN_USAGE_MODEM; int si = 7; int l2 = m->mdmreg[REG_L2PROT]; - ulong flags; - struct isdn_slot *slot; + u_long flags; + isdn_ctrl cmd; + int i; int j; for (j = 7; j >= 0; j--) @@ -743,39 +623,58 @@ } #endif m->mdmreg[REG_SI1I] = si2bit[si]; - save_flags(flags); - cli(); - slot = isdn_get_free_slot(usg, l2, m->mdmreg[REG_L3PROT], -1, -1, m->msn); - if (!slot) { - restore_flags(flags); + spin_lock_irqsave(&dev->lock, flags); + i = isdn_get_free_channel(usg, l2, m->mdmreg[REG_L3PROT], -1, -1, m->msn); + if (i < 0) { + spin_unlock_irqrestore(&dev->lock, flags); isdn_tty_modem_result(RESULT_NO_DIALTONE, info); } else { - struct dial_info dial = { - .l2_proto = l2, - .l3_proto = m->mdmreg[REG_L3PROT], - .si1 = si, - .si2 = m->mdmreg[REG_SI2], - .msn = m->msn, - .phone = n, - }; - - info->isdn_slot = slot; - slot->usage |= ISDN_USAGE_MODEM; - slot->priv = info; - slot->event_cb = isdn_tty_event_callback; + info->isdn_driver = dev->drvmap[i]; + info->isdn_channel = dev->chanmap[i]; + info->drv_index = i; + dev->m_idx[i] = info->line; + dev->usage[i] |= ISDN_USAGE_OUTGOING; info->last_dir = 1; - info->last_l2 = l2; strcpy(info->last_num, n); - restore_flags(flags); + isdn_info_update(); + spin_unlock_irqrestore(&dev->lock, flags); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + cmd.command = ISDN_CMD_CLREAZ; + isdn_command(&cmd); + strcpy(cmd.parm.num, isdn_map_eaz2msn(m->msn, info->isdn_driver)); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETEAZ; + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL2; + info->last_l2 = l2; + cmd.arg = info->isdn_channel + (l2 << 8); + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL3; + cmd.arg = info->isdn_channel + (m->mdmreg[REG_L3PROT] << 8); #ifdef CONFIG_ISDN_TTY_FAX if (l2 == ISDN_PROTO_L2_FAX) { - dial.fax = info->fax; + cmd.parm.fax = info->fax; info->fax->direction = ISDN_TTY_FAX_CONN_OUT; } #endif + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + sprintf(cmd.parm.setup.phone, "%s", n); + sprintf(cmd.parm.setup.eazmsn, "%s", + isdn_map_eaz2msn(m->msn, info->isdn_driver)); + cmd.parm.setup.si1 = si; + cmd.parm.setup.si2 = m->mdmreg[REG_SI2]; + cmd.command = ISDN_CMD_DIAL; info->dialing = 1; - isdn_slot_dial(info->isdn_slot, &dial); - mod_timer(&info->connect_timer, jiffies + info->emu.mdmreg[REG_WAITC] * HZ); + info->emu.carrierwait = 0; + strcpy(dev->num[i], n); + isdn_info_update(); + isdn_command(&cmd); + isdn_timer_ctrl(ISDN_TIMER_CARRIER, 1); } } @@ -787,15 +686,19 @@ isdn_tty_modem_hup(modem_info * info, int local) { isdn_ctrl cmd; - struct isdn_slot *slot; + int di, ch; if (!info) return; - slot = info->isdn_slot; - if (!slot) + di = info->isdn_driver; + ch = info->isdn_channel; + if (di < 0 || ch < 0) return; + info->isdn_driver = -1; + info->isdn_channel = -1; + #ifdef ISDN_DEBUG_MODEM_HUP printk(KERN_DEBUG "Mhup ttyI%d\n", info->line); #endif @@ -837,15 +740,21 @@ info->msr &= ~(UART_MSR_DCD | UART_MSR_RI); info->lsr |= UART_LSR_TEMT; - if (local) - isdn_slot_command(slot, ISDN_CMD_HANGUP, &cmd); + if (local) { + cmd.driver = di; + cmd.command = ISDN_CMD_HANGUP; + cmd.arg = ch; + isdn_command(&cmd); + } + isdn_all_eaz(di, ch); info->emu.mdmreg[REG_RINGCNT] = 0; - skb_queue_purge(&info->rpqueue); - slot->priv = NULL; - slot->event_cb = NULL; - isdn_slot_free(slot); - info->isdn_slot = NULL; + isdn_free_channel(di, ch, 0); + + if (info->drv_index >= 0) { + dev->m_idx[info->drv_index] = -1; + info->drv_index = -1; + } } /* @@ -875,10 +784,11 @@ printk(KERN_DEBUG "Msusp ttyI%d\n", info->line); #endif l = strlen(id); - if ((info->isdn_slot >= 0)) { + if ((info->isdn_driver >= 0)) { cmd.parm.cmsg.Length = l+18; cmd.parm.cmsg.Command = CAPI_FACILITY; cmd.parm.cmsg.Subcommand = CAPI_REQ; + cmd.parm.cmsg.adr.Controller = info->isdn_driver + 1; cmd.parm.cmsg.para[0] = 3; /* 16 bit 0x0003 suplementary service */ cmd.parm.cmsg.para[1] = 0; cmd.parm.cmsg.para[2] = l + 3; @@ -886,7 +796,10 @@ cmd.parm.cmsg.para[4] = 0; cmd.parm.cmsg.para[5] = l; strncpy(&cmd.parm.cmsg.para[6], id, l); - isdn_slot_command(info->isdn_slot, CAPI_PUT_MESSAGE, &cmd); + cmd.command = CAPI_PUT_MESSAGE; + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + isdn_command(&cmd); } } @@ -905,7 +818,7 @@ int l2 = m->mdmreg[REG_L2PROT]; isdn_ctrl cmd; ulong flags; - struct isdn_slot *slot; + int i; int j; int l; @@ -928,28 +841,44 @@ } #endif m->mdmreg[REG_SI1I] = si2bit[si]; - save_flags(flags); - cli(); - slot = isdn_get_free_slot(usg, l2, m->mdmreg[REG_L3PROT], -1, -1, m->msn); - if (!slot) { - restore_flags(flags); + spin_lock_irqsave(&dev->lock, flags); + i = isdn_get_free_channel(usg, l2, m->mdmreg[REG_L3PROT], -1, -1, m->msn); + if (i < 0) { + spin_unlock_irqrestore(&dev->lock, flags); isdn_tty_modem_result(RESULT_NO_DIALTONE, info); } else { - info->isdn_slot = slot; - slot->usage |= ISDN_USAGE_MODEM; - slot->priv = info; - slot->event_cb = isdn_tty_event_callback; + info->isdn_driver = dev->drvmap[i]; + info->isdn_channel = dev->chanmap[i]; + info->drv_index = i; + dev->m_idx[i] = info->line; + dev->usage[i] |= ISDN_USAGE_OUTGOING; info->last_dir = 1; // strcpy(info->last_num, n); - restore_flags(flags); + isdn_info_update(); + spin_unlock_irqrestore(&dev->lock, flags); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + cmd.command = ISDN_CMD_CLREAZ; + isdn_command(&cmd); + strcpy(cmd.parm.num, isdn_map_eaz2msn(m->msn, info->isdn_driver)); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETEAZ; + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL2; info->last_l2 = l2; - cmd.arg = l2 << 8; - isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL2, &cmd); - cmd.arg = m->mdmreg[REG_L3PROT] << 8; - isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL3, &cmd); + cmd.arg = info->isdn_channel + (l2 << 8); + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL3; + cmd.arg = info->isdn_channel + (m->mdmreg[REG_L3PROT] << 8); + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; cmd.parm.cmsg.Length = l+18; cmd.parm.cmsg.Command = CAPI_FACILITY; cmd.parm.cmsg.Subcommand = CAPI_REQ; + cmd.parm.cmsg.adr.Controller = info->isdn_driver + 1; cmd.parm.cmsg.para[0] = 3; /* 16 bit 0x0003 suplementary service */ cmd.parm.cmsg.para[1] = 0; cmd.parm.cmsg.para[2] = l+3; @@ -957,11 +886,12 @@ cmd.parm.cmsg.para[4] = 0; cmd.parm.cmsg.para[5] = l; strncpy(&cmd.parm.cmsg.para[6], id, l); + cmd.command =CAPI_PUT_MESSAGE; info->dialing = 1; // strcpy(dev->num[i], n); isdn_info_update(); - isdn_slot_command(info->isdn_slot, CAPI_PUT_MESSAGE, &cmd); - mod_timer(&info->connect_timer, jiffies + info->emu.mdmreg[REG_WAITC] * HZ); + isdn_command(&cmd); + isdn_timer_ctrl(ISDN_TIMER_CARRIER, 1); } } @@ -977,7 +907,7 @@ int l2 = m->mdmreg[REG_L2PROT]; isdn_ctrl cmd; ulong flags; - struct isdn_slot *slot; + int i; int j; int l; @@ -1004,45 +934,62 @@ } #endif m->mdmreg[REG_SI1I] = si2bit[si]; - save_flags(flags); - cli(); - slot = isdn_get_free_slot(usg, l2, m->mdmreg[REG_L3PROT], -1, -1, m->msn); - if (!slot) { - restore_flags(flags); + spin_lock_irqsave(&dev->lock, flags); + i = isdn_get_free_channel(usg, l2, m->mdmreg[REG_L3PROT], -1, -1, m->msn); + if (i < 0) { + spin_unlock_irqrestore(&dev->lock, flags); isdn_tty_modem_result(RESULT_NO_DIALTONE, info); } else { - info->isdn_slot = slot; - slot->usage |= ISDN_USAGE_MODEM; - slot->priv = info; - slot->event_cb = isdn_tty_event_callback; + info->isdn_driver = dev->drvmap[i]; + info->isdn_channel = dev->chanmap[i]; + info->drv_index = i; + dev->m_idx[i] = info->line; + dev->usage[i] |= ISDN_USAGE_OUTGOING; info->last_dir = 1; - restore_flags(flags); + isdn_info_update(); + spin_unlock_irqrestore(&dev->lock, flags); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + cmd.command = ISDN_CMD_CLREAZ; + isdn_command(&cmd); + strcpy(cmd.parm.num, isdn_map_eaz2msn(m->msn, info->isdn_driver)); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETEAZ; + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL2; info->last_l2 = l2; - cmd.arg = l2 << 8; - isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL2, &cmd); - cmd.arg = m->mdmreg[REG_L3PROT] << 8; - isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL3, &cmd); + cmd.arg = info->isdn_channel + (l2 << 8); + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL3; + cmd.arg = info->isdn_channel + (m->mdmreg[REG_L3PROT] << 8); + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; cmd.parm.cmsg.Length = l+14; cmd.parm.cmsg.Command = CAPI_MANUFACTURER; cmd.parm.cmsg.Subcommand = CAPI_REQ; + cmd.parm.cmsg.adr.Controller = info->isdn_driver + 1; cmd.parm.cmsg.para[0] = l+1; strncpy(&cmd.parm.cmsg.para[1], msg, l); cmd.parm.cmsg.para[l+1] = 0xd; + cmd.command =CAPI_PUT_MESSAGE; /* info->dialing = 1; strcpy(dev->num[i], n); isdn_info_update(); */ - isdn_slot_command(info->isdn_slot, CAPI_PUT_MESSAGE, &cmd); + isdn_command(&cmd); } } static inline int -isdn_tty_paranoia_check(modem_info * info, char *name, const char *routine) +isdn_tty_paranoia_check(modem_info *info, char *name, const char *routine) { #ifdef MODEM_PARANOIA_CHECK if (!info) { printk(KERN_WARNING "isdn_tty: null info_struct for %s in %s\n", - name, routine); + name, routine); return 1; } if (info->magic != ISDN_ASYNC_MAGIC) { @@ -1119,12 +1066,9 @@ static int isdn_tty_startup(modem_info * info) { - ulong flags; - if (info->flags & ISDN_ASYNC_INITIALIZED) return 0; - save_flags(flags); - cli(); + isdn_lock_drivers(); #ifdef ISDN_DEBUG_MODEM_OPEN printk(KERN_DEBUG "starting up ttyi%d ...\n", info->line); #endif @@ -1142,7 +1086,6 @@ info->flags |= ISDN_ASYNC_INITIALIZED; info->msr |= (UART_MSR_DSR | UART_MSR_CTS); info->send_outstanding = 0; - restore_flags(flags); return 0; } @@ -1153,15 +1096,12 @@ static void isdn_tty_shutdown(modem_info * info) { - ulong flags; - if (!(info->flags & ISDN_ASYNC_INITIALIZED)) return; #ifdef ISDN_DEBUG_MODEM_OPEN printk(KERN_DEBUG "Shutting down isdnmodem port %d ....\n", info->line); #endif - save_flags(flags); - cli(); /* Disable interrupts */ + isdn_unlock_drivers(); info->msr &= ~UART_MSR_RI; if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) { info->mcr &= ~(UART_MCR_DTR | UART_MCR_RTS); @@ -1177,7 +1117,6 @@ set_bit(TTY_IO_ERROR, &info->tty->flags); info->flags &= ~ISDN_ASYNC_INITIALIZED; - restore_flags(flags); } /* isdn_tty_write() is the main send-routine. It is called from the upper @@ -1207,8 +1146,8 @@ c = count; if (c > info->xmit_size - info->xmit_count) c = info->xmit_size - info->xmit_count; - if (info->isdn_slot && c > isdn_slot_maxbufsize(info->isdn_slot)) - c = isdn_slot_maxbufsize(info->isdn_slot); + if (info->isdn_driver >= 0 && c > dev->drv[info->isdn_driver]->maxbufsize) + c = dev->drv[info->isdn_driver]->maxbufsize; if (c <= 0) break; if ((info->online > 1) @@ -1216,17 +1155,17 @@ || (info->vonline & 3) #endif ) { - if (from_user) { - if (copy_from_user(&(info->xmit_buf[info->xmit_count]), buf, c)) { - total = -EFAULT; - goto out; - } - } else - memcpy(&(info->xmit_buf[info->xmit_count]), buf, c); #ifdef CONFIG_ISDN_AUDIO if (!info->vonline) #endif - isdn_tty_check_esc(info, &info->xmit_buf[info->xmit_count], c); + isdn_tty_check_esc(buf, m->mdmreg[REG_ESC], c, + &(m->pluscount), + &(m->lastplus), + from_user); + if (from_user) + copy_from_user(&(info->xmit_buf[info->xmit_count]), buf, c); + else + memcpy(&(info->xmit_buf[info->xmit_count]), buf, c); #ifdef CONFIG_ISDN_AUDIO if (info->vonline) { int cc = isdn_tty_handleDLEdown(info, m, c); @@ -1265,9 +1204,12 @@ if (info->vonline & 4) { /* ETX seen */ isdn_ctrl c; + c.command = ISDN_CMD_FAXCMD; + c.driver = info->isdn_driver; + c.arg = info->isdn_channel; c.parm.aux.cmd = ISDN_FAX_CLASS1_CTRL; c.parm.aux.subcmd = ETX; - isdn_slot_command(info->isdn_slot, ISDN_CMD_FAXCMD, &c); + isdn_command(&c); } info->vonline = 0; #ifdef ISDN_DEBUG_MODEM_VOICE @@ -1296,9 +1238,12 @@ } atomic_dec(&info->xmit_lock); if ((info->xmit_count) || (skb_queue_len(&info->xmit_queue))) { - isdn_tty_modem_xmit(info); + if (m->mdmreg[REG_DXMT] & BIT_DXMT) { + isdn_tty_senddown(info); + isdn_tty_tint(info); + } + isdn_timer_ctrl(ISDN_TIMER_MODEMXMIT, 1); } -out: if (from_user) up(&info->write_sem); return total; @@ -1334,22 +1279,16 @@ isdn_tty_flush_buffer(struct tty_struct *tty) { modem_info *info; - unsigned long flags; - save_flags(flags); - cli(); if (!tty) { - restore_flags(flags); return; } info = (modem_info *) tty->driver_data; if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_flush_buffer")) { - restore_flags(flags); return; } isdn_tty_cleanup_xmit(info); info->xmit_count = 0; - restore_flags(flags); wake_up_interruptible(&tty->write_wait); if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup) @@ -1364,7 +1303,7 @@ if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_flush_chars")) return; if ((info->xmit_count) || (skb_queue_len(&info->xmit_queue))) - isdn_tty_modem_xmit(info); + isdn_timer_ctrl(ISDN_TIMER_MODEMXMIT, 1); } /* @@ -1424,105 +1363,73 @@ { u_char status; uint result; - ulong flags; - save_flags(flags); - cli(); status = info->lsr; - restore_flags(flags); result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0); return put_user(result, (uint *) value); } static int -isdn_tty_get_modem_info(modem_info * info, uint * value) +isdn_tty_tiocmget(struct tty_struct *tty, struct file *file) { - u_char control, - status; - uint result; - ulong flags; + modem_info *info = (modem_info *) tty->driver_data; + u_char control, status; + + if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__)) + return -ENODEV; + if (tty->flags & (1 << TTY_IO_ERROR)) + return -EIO; + +#ifdef ISDN_DEBUG_MODEM_IOCTL + printk(KERN_DEBUG "ttyI%d ioctl TIOCMGET\n", info->line); +#endif control = info->mcr; - save_flags(flags); - cli(); status = info->msr; - restore_flags(flags); - result = ((control & UART_MCR_RTS) ? TIOCM_RTS : 0) + return ((control & UART_MCR_RTS) ? TIOCM_RTS : 0) | ((control & UART_MCR_DTR) ? TIOCM_DTR : 0) | ((status & UART_MSR_DCD) ? TIOCM_CAR : 0) | ((status & UART_MSR_RI) ? TIOCM_RNG : 0) | ((status & UART_MSR_DSR) ? TIOCM_DSR : 0) | ((status & UART_MSR_CTS) ? TIOCM_CTS : 0); - return put_user(result, (uint *) value); } static int -isdn_tty_set_modem_info(modem_info * info, uint cmd, uint * value) +isdn_tty_tiocmset(struct tty_struct *tty, struct file *file, + unsigned int set, unsigned int clear) { - uint arg; - int pre_dtr; + modem_info *info = (modem_info *) tty->driver_data; + + if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__)) + return -ENODEV; + if (tty->flags & (1 << TTY_IO_ERROR)) + return -EIO; - if (get_user(arg, (uint *) value)) - return -EFAULT; - switch (cmd) { - case TIOCMBIS: -#ifdef ISDN_DEBUG_MODEM_IOCTL - printk(KERN_DEBUG "ttyI%d ioctl TIOCMBIS\n", info->line); -#endif - if (arg & TIOCM_RTS) { - info->mcr |= UART_MCR_RTS; - } - if (arg & TIOCM_DTR) { - info->mcr |= UART_MCR_DTR; - isdn_tty_modem_ncarrier(info); - } - break; - case TIOCMBIC: -#ifdef ISDN_DEBUG_MODEM_IOCTL - printk(KERN_DEBUG "ttyI%d ioctl TIOCMBIC\n", info->line); -#endif - if (arg & TIOCM_RTS) { - info->mcr &= ~UART_MCR_RTS; - } - if (arg & TIOCM_DTR) { - info->mcr &= ~UART_MCR_DTR; - if (info->emu.mdmreg[REG_DTRHUP] & BIT_DTRHUP) { - isdn_tty_modem_reset_regs(info, 0); -#ifdef ISDN_DEBUG_MODEM_HUP - printk(KERN_DEBUG "Mhup in TIOCMBIC\n"); -#endif - if (info->online) - info->ncarrier = 1; - isdn_tty_modem_hup(info, 1); - } - } - break; - case TIOCMSET: #ifdef ISDN_DEBUG_MODEM_IOCTL - printk(KERN_DEBUG "ttyI%d ioctl TIOCMSET\n", info->line); + printk(KERN_DEBUG "ttyI%d ioctl TIOCMxxx: %x %x\n", info->line, set, clear); #endif - pre_dtr = (info->mcr & UART_MCR_DTR); - info->mcr = ((info->mcr & ~(UART_MCR_RTS | UART_MCR_DTR)) - | ((arg & TIOCM_RTS) ? UART_MCR_RTS : 0) - | ((arg & TIOCM_DTR) ? UART_MCR_DTR : 0)); - if (pre_dtr |= (info->mcr & UART_MCR_DTR)) { - if (!(info->mcr & UART_MCR_DTR)) { - if (info->emu.mdmreg[REG_DTRHUP] & BIT_DTRHUP) { - isdn_tty_modem_reset_regs(info, 0); + + if (set & TIOCM_RTS) + info->mcr |= UART_MCR_RTS; + if (set & TIOCM_DTR) { + info->mcr |= UART_MCR_DTR; + isdn_tty_modem_ncarrier(info); + } + + if (clear & TIOCM_RTS) + info->mcr &= ~UART_MCR_RTS; + if (clear & TIOCM_DTR) { + info->mcr &= ~UART_MCR_DTR; + if (info->emu.mdmreg[REG_DTRHUP] & BIT_DTRHUP) { + isdn_tty_modem_reset_regs(info, 0); #ifdef ISDN_DEBUG_MODEM_HUP - printk(KERN_DEBUG "Mhup in TIOCMSET\n"); + printk(KERN_DEBUG "Mhup in TIOCMSET\n"); #endif - if (info->online) - info->ncarrier = 1; - isdn_tty_modem_hup(info, 1); - } - } else - isdn_tty_modem_ncarrier(info); - } - break; - default: - return -EINVAL; + if (info->online) + info->ncarrier = 1; + isdn_tty_modem_hup(info, 1); + } } return 0; } @@ -1572,15 +1479,6 @@ ((tty->termios->c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0)); return 0; - case TIOCMGET: -#ifdef ISDN_DEBUG_MODEM_IOCTL - printk(KERN_DEBUG "ttyI%d ioctl TIOCMGET\n", info->line); -#endif - return isdn_tty_get_modem_info(info, (uint *) arg); - case TIOCMBIS: - case TIOCMBIC: - case TIOCMSET: - return isdn_tty_set_modem_info(info, cmd, (uint *) arg); case TIOCSERGETLSR: /* Get line status register */ #ifdef ISDN_DEBUG_MODEM_IOCTL printk(KERN_DEBUG "ttyI%d ioctl TIOCSERGETLSR\n", info->line); @@ -1623,7 +1521,6 @@ { DECLARE_WAITQUEUE(wait, NULL); int do_clocal = 0; - unsigned long flags; int retval; /* @@ -1649,11 +1546,18 @@ */ if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) { + if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) + return -EBUSY; info->flags |= ISDN_ASYNC_NORMAL_ACTIVE; return 0; } - if (tty->termios->c_cflag & CLOCAL) - do_clocal = 1; + if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) { + if (info->normal_termios.c_cflag & CLOCAL) + do_clocal = 1; + } else { + if (tty->termios->c_cflag & CLOCAL) + do_clocal = 1; + } /* * Block waiting for the carrier detect and the line to become * free (i.e., not in use by the callout). While we are in @@ -1667,11 +1571,8 @@ printk(KERN_DEBUG "isdn_tty_block_til_ready before block: ttyi%d, count = %d\n", info->line, info->count); #endif - save_flags(flags); - cli(); if (!(tty_hung_up_p(filp))) info->count--; - restore_flags(flags); info->blocked_open++; while (1) { set_current_state(TASK_INTERRUPTIBLE); @@ -1687,7 +1588,8 @@ #endif break; } - if (!(info->flags & ISDN_ASYNC_CLOSING) && + if (!(info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) && + !(info->flags & ISDN_ASYNC_CLOSING) && (do_clocal || (info->msr & UART_MSR_DCD))) { break; } @@ -1728,11 +1630,10 @@ modem_info *info; int retval, line; - line = tty->index; if (line < 0 || line > ISDN_MAX_CHANNELS) return -ENODEV; - info = &isdn_mdm.info[line]; + info = &dev->mdm.info[line]; if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_open")) return -ENODEV; if (!try_module_get(info->owner)) { @@ -1740,7 +1641,7 @@ return -ENODEV; } #ifdef ISDN_DEBUG_MODEM_OPEN - printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name, + printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name, info->count); #endif info->count++; @@ -1768,7 +1669,7 @@ #ifdef ISDN_DEBUG_MODEM_OPEN printk(KERN_DEBUG "isdn_tty_open ttyi%d successful...\n", info->line); #endif - (get_isdn_dev())->modempoll++; + dev->modempoll++; #ifdef ISDN_DEBUG_MODEM_OPEN printk(KERN_DEBUG "isdn_tty_open normal exit\n"); #endif @@ -1779,23 +1680,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp) { modem_info *info = (modem_info *) tty->driver_data; - ulong flags; ulong timeout; - if (!info) + if (!info || isdn_tty_paranoia_check(info, tty->name, "isdn_tty_close")) return; - if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_close")) - goto out; - - #warning need fixing /kkeil - save_flags(flags); - cli(); if (tty_hung_up_p(filp)) { - restore_flags(flags); #ifdef ISDN_DEBUG_MODEM_OPEN printk(KERN_DEBUG "isdn_tty_close return after tty_hung_up_p\n"); #endif - goto out; + return; } if ((tty->count == 1) && (info->count != 1)) { /* @@ -1815,13 +1708,21 @@ info->count = 0; } if (info->count) { - restore_flags(flags); #ifdef ISDN_DEBUG_MODEM_OPEN printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n"); #endif - goto out; + return; } info->flags |= ISDN_ASYNC_CLOSING; + /* + * Save the termios structure, since this port may have + * separate termios for callout and dialin. + */ + if (info->flags & ISDN_ASYNC_NORMAL_ACTIVE) + info->normal_termios = *tty->termios; + if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) + info->callout_termios = *tty->termios; + tty->closing = 1; /* * At this point we stop accepting input. To do this, we @@ -1830,7 +1731,7 @@ * line status register. */ if (info->flags & ISDN_ASYNC_INITIALIZED) { - tty_wait_until_sent(tty, 30 * HZ); /* 30 seconds timeout */ + tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */ /* * Before we drop DTR, make sure the UART transmitter * has completely drained; this is especially @@ -1844,7 +1745,7 @@ break; } } - (get_isdn_dev())->modempoll--; + dev->modempoll--; isdn_tty_shutdown(info); if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty); @@ -1853,6 +1754,7 @@ info->tty = 0; info->ncarrier = 0; tty->closing = 0; + module_put(info->owner); if (info->blocked_open) { set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/2); @@ -1860,12 +1762,9 @@ } info->flags &= ~(ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CLOSING); wake_up_interruptible(&info->close_wait); - restore_flags(flags); #ifdef ISDN_DEBUG_MODEM_OPEN printk(KERN_DEBUG "isdn_tty_close normal exit\n"); #endif - out: - module_put(info->owner); } /* @@ -1880,7 +1779,7 @@ return; isdn_tty_shutdown(info); info->count = 0; - info->flags &= ~ISDN_ASYNC_NORMAL_ACTIVE; + info->flags &= ~(ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE); info->tty = 0; wake_up_interruptible(&info->open_wait); } @@ -1988,13 +1887,12 @@ memcpy(m->profile, m->mdmreg, ISDN_MODEM_NUMREG); memcpy(m->pmsn, m->msn, ISDN_MSNLEN); memcpy(m->plmsn, m->lmsn, ISDN_LMSNLEN); - if ((get_isdn_dev())->profd) - kill_pg_info(SIGIO, SEND_SIG_PRIV, - process_group((get_isdn_dev())->profd)); + if (dev->profd) + send_sig(SIGIO, dev->profd, 1); } static struct tty_operations modem_ops = { - .open = isdn_tty_open, + .open = isdn_tty_open, .close = isdn_tty_close, .write = isdn_tty_write, .flush_chars = isdn_tty_flush_chars, @@ -2006,16 +1904,18 @@ .unthrottle = isdn_tty_unthrottle, .set_termios = isdn_tty_set_termios, .hangup = isdn_tty_hangup, + .tiocmget = isdn_tty_tiocmget, + .tiocmset = isdn_tty_tiocmset, }; int -isdn_tty_init(void) +isdn_tty_modem_init(void) { - struct isdn_modem *m; - int i, retval; - modem_info *info; + isdn_modem_t *m; + int i, retval; + modem_info *info; - m = &isdn_mdm; + m = &dev->mdm; m->tty_modem = alloc_tty_driver(ISDN_MAX_CHANNELS); if (!m->tty_modem) return -ENOMEM; @@ -2027,7 +1927,7 @@ m->tty_modem->subtype = SERIAL_TYPE_NORMAL; m->tty_modem->init_termios = tty_std_termios; m->tty_modem->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; - m->tty_modem->flags = TTY_DRIVER_REAL_RAW; + m->tty_modem->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; m->tty_modem->driver_name = "isdn_tty"; tty_set_operations(m->tty_modem, &modem_ops); retval = tty_register_driver(m->tty_modem); @@ -2040,10 +1940,14 @@ #ifdef CONFIG_ISDN_TTY_FAX if (!(info->fax = kmalloc(sizeof(T30_s), GFP_KERNEL))) { printk(KERN_ERR "Could not allocate fax t30-buffer\n"); - return -3; + retval = -ENOMEM; + goto err_unregister; } #endif +#ifdef MODULE info->owner = THIS_MODULE; +#endif + spin_lock_init(&info->readlock); init_MUTEX(&info->write_sem); sprintf(info->last_cause, "0000"); sprintf(info->last_num, "none"); @@ -2061,41 +1965,27 @@ info->blocked_open = 0; init_waitqueue_head(&info->open_wait); init_waitqueue_head(&info->close_wait); - info->isdn_slot = NULL; - init_timer(&info->escape_timer); - info->escape_timer.data = (unsigned long) info; - info->escape_timer.function = isdn_tty_escape_timer; - init_timer(&info->ring_timer); - info->ring_timer.data = (unsigned long) info; - info->ring_timer.function = isdn_tty_ring_timer; - init_timer(&info->connect_timer); - info->connect_timer.data = (unsigned long) info; - info->connect_timer.function = isdn_tty_connect_timer; - init_timer(&info->read_timer); - info->read_timer.data = (unsigned long) info; - info->read_timer.function = isdn_tty_readmodem; - init_waitqueue_head(&info->open_wait); - init_waitqueue_head(&info->close_wait); - skb_queue_head_init(&info->rpqueue); + info->isdn_driver = -1; + info->isdn_channel = -1; + info->drv_index = -1; info->xmit_size = ISDN_SERIAL_XMIT_SIZE; + init_timer(&info->nc_timer); + info->nc_timer.function = isdn_tty_modem_do_ncarrier; + info->nc_timer.data = (unsigned long) info; skb_queue_head_init(&info->xmit_queue); #ifdef CONFIG_ISDN_AUDIO skb_queue_head_init(&info->dtmf_queue); #endif - info->xmit_buf = kmalloc(ISDN_SERIAL_XMIT_MAX + 5, GFP_KERNEL); - if (!info->xmit_buf) { + if (!(info->xmit_buf = kmalloc(ISDN_SERIAL_XMIT_MAX + 5, GFP_KERNEL))) { printk(KERN_ERR "Could not allocate modem xmit-buffer\n"); -#ifdef CONFIG_ISDN_TTY_FAX - kfree(info->fax); -#endif - goto err_unregister_cua; + retval = -ENOMEM; + goto err_unregister; } /* Make room for T.70 header */ info->xmit_buf += 4; } return 0; - - err_unregister_cua: +err_unregister: for (i--; i >= 0; i--) { info = &m->info[i]; #ifdef CONFIG_ISDN_TTY_FAX @@ -2117,19 +2007,19 @@ int i; for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - info = &isdn_mdm.info[i]; + info = &dev->mdm.info[i]; isdn_tty_cleanup_xmit(info); - skb_queue_purge(&info->rpqueue); #ifdef CONFIG_ISDN_TTY_FAX kfree(info->fax); #endif kfree(info->xmit_buf - 4); } - tty_unregister_driver(isdn_mdm.tty_modem); - put_tty_driver(isdn_mdm.tty_modem); - isdn_mdm.tty_modem = NULL; + tty_unregister_driver(dev->mdm.tty_modem); + put_tty_driver(dev->mdm.tty_modem); + dev->mdm.tty_modem = NULL; } + /* * isdn_tty_match_icall(char *MSN, atemu *tty_emulator, int dev_idx) * match the MSN against the MSNs (glob patterns) defined for tty_emulator, @@ -2193,11 +2083,12 @@ * CID is longer. */ int -isdn_tty_find_icall(struct isdn_slot *slot, setup_parm *setup) +isdn_tty_find_icall(int di, int ch, setup_parm *setup) { char *eaz; int i; int wret; + int idx; int si1; int si2; char *nr; @@ -2219,69 +2110,76 @@ printk(KERN_DEBUG "m_fi: eaz=%s si1=%d si2=%d\n", eaz, si1, si2); #endif wret = 0; - save_flags(flags); - cli(); + spin_lock_irqsave(&dev->lock, flags); for (i = 0; i < ISDN_MAX_CHANNELS; i++) { - modem_info *info = &isdn_mdm.info[i]; + modem_info *info = &dev->mdm.info[i]; if (info->count == 0) continue; if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */ (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */ + idx = isdn_dc2minor(di, ch); #ifdef ISDN_DEBUG_MODEM_ICALL printk(KERN_DEBUG "m_fi: match1 wret=%d\n", wret); - printk(KERN_DEBUG "m_fi: sl=%d flags=%08lx drv=%d ch=%d usg=%d\n", sl, + printk(KERN_DEBUG "m_fi: idx=%d flags=%08lx drv=%d ch=%d usg=%d\n", idx, info->flags, info->isdn_driver, info->isdn_channel, - slot->usage); + dev->usage[idx]); #endif if ( #ifndef FIX_FILE_TRANSFER (info->flags & ISDN_ASYNC_NORMAL_ACTIVE) && #endif - (!info->isdn_slot)) { + (info->isdn_driver == -1) && + (info->isdn_channel == -1) && + (USG_NONE(dev->usage[idx]))) { int matchret; - if ((matchret = isdn_tty_match_icall(eaz, &info->emu, slot->di)) > wret) + if ((matchret = isdn_tty_match_icall(eaz, &info->emu, di)) > wret) wret = matchret; if (!matchret) { /* EAZ is matching */ - info->isdn_slot = slot; - slot->usage |= isdn_calc_usage(si1, info->emu.mdmreg[REG_L2PROT]); - slot->priv = info; - slot->event_cb = isdn_tty_event_callback; - strcpy(slot->num, nr); + info->isdn_driver = di; + info->isdn_channel = ch; + info->drv_index = idx; + dev->m_idx[idx] = info->line; + dev->usage[idx] &= ISDN_USAGE_EXCLUSIVE; + dev->usage[idx] |= isdn_calc_usage(si1, info->emu.mdmreg[REG_L2PROT]); + strcpy(dev->num[idx], nr); strcpy(info->emu.cpn, eaz); info->emu.mdmreg[REG_SI1I] = si2bit[si1]; info->emu.mdmreg[REG_PLAN] = setup->plan; info->emu.mdmreg[REG_SCREEN] = setup->screen; - restore_flags(flags); + isdn_info_update(); + spin_unlock_irqrestore(&dev->lock, flags); printk(KERN_INFO "isdn_tty: call from %s, -> RING on ttyI%d\n", nr, info->line); info->msr |= UART_MSR_RI; isdn_tty_modem_result(RESULT_RING, info); - mod_timer(&info->ring_timer, jiffies + RING_TIMEOUT); + isdn_timer_ctrl(ISDN_TIMER_MODEMRING, 1); return 1; } } } } - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); printk(KERN_INFO "isdn_tty: call from %s -> %s %s\n", nr, eaz, - (wret != 2)? "rejected" : "ignored"); + ((dev->drv[di]->flags & DRV_FLAG_REJBUS) && (wret != 2))? "rejected" : "ignored"); return (wret == 2)?3:0; } #define TTY_IS_ACTIVE(info) \ - (info->flags & ISDN_ASYNC_NORMAL_ACTIVE) + (info->flags & (ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE)) -static int -isdn_tty_stat_callback(struct isdn_slot *slot, isdn_ctrl *c) +int +isdn_tty_stat_callback(int i, isdn_ctrl *c) { - isdn_ctrl cmd; + int mi; modem_info *info; char *e; - info = slot->priv; - if (1) { + if (i < 0) + return 0; + if ((mi = dev->m_idx[i]) >= 0) { + info = &dev->mdm.info[mi]; switch (c->command) { case ISDN_STAT_CINF: printk(KERN_DEBUG "CHARGEINFO on ttyI%d: %ld %s\n", info->line, c->arg, c->parm.num); @@ -2294,12 +2192,16 @@ #ifdef ISDN_TTY_STAT_DEBUG printk(KERN_DEBUG "tty_STAT_BSENT ttyI%d\n", info->line); #endif - info->msr |= UART_MSR_CTS; - if (info->send_outstanding) - if (!(--info->send_outstanding)) - info->lsr |= UART_LSR_TEMT; - isdn_tty_tint(info); - return 1; + if ((info->isdn_driver == c->driver) && + (info->isdn_channel == c->arg)) { + info->msr |= UART_MSR_CTS; + if (info->send_outstanding) + if (!(--info->send_outstanding)) + info->lsr |= UART_LSR_TEMT; + isdn_tty_tint(info); + return 1; + } + break; case ISDN_STAT_CAUSE: #ifdef ISDN_TTY_STAT_DEBUG printk(KERN_DEBUG "tty_STAT_CAUSE ttyI%d\n", info->line); @@ -2326,7 +2228,6 @@ #endif if (TTY_IS_ACTIVE(info)) { if (info->dialing == 1) { - isdn_slot_command(info->isdn_slot, ISDN_CMD_ACCEPTB, &cmd); info->dialing = 2; return 1; } @@ -2376,14 +2277,14 @@ info->last_dir = 0; info->dialing = 0; info->rcvsched = 1; - if (USG_MODEM(slot->usage)) { + if (USG_MODEM(dev->usage[i])) { if (info->emu.mdmreg[REG_L2PROT] == ISDN_PROTO_L2_MODEM) { strcpy(info->emu.connmsg, c->parm.num); isdn_tty_modem_result(RESULT_CONNECT, info); } else isdn_tty_modem_result(RESULT_CONNECT64000, info); } - if (USG_VOICE(slot->usage)) + if (USG_VOICE(dev->usage[i])) isdn_tty_modem_result(RESULT_VCON, info); return 1; } @@ -2400,6 +2301,34 @@ return 1; } break; + case ISDN_STAT_NODCH: +#ifdef ISDN_TTY_STAT_DEBUG + printk(KERN_DEBUG "tty_STAT_NODCH ttyI%d\n", info->line); +#endif + if (TTY_IS_ACTIVE(info)) { + if (info->dialing) { + info->dialing = 0; + info->last_l2 = -1; + info->last_si = 0; + sprintf(info->last_cause, "0000"); + isdn_tty_modem_result(RESULT_NO_DIALTONE, info); + } + isdn_tty_modem_hup(info, 0); + return 1; + } + break; + case ISDN_STAT_UNLOAD: +#ifdef ISDN_TTY_STAT_DEBUG + printk(KERN_DEBUG "tty_STAT_UNLOAD ttyI%d\n", info->line); +#endif + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + info = &dev->mdm.info[i]; + if (info->isdn_driver == c->driver) { + if (info->online) + isdn_tty_modem_hup(info, 1); + } + } + return 1; #ifdef CONFIG_ISDN_TTY_FAX case ISDN_STAT_FAXIND: if (TTY_IS_ACTIVE(info)) { @@ -2443,7 +2372,7 @@ atemu *m = &info->emu; char *p; char c; - ulong flags; + u_long flags; struct sk_buff *skb = 0; char *sp = 0; @@ -2451,30 +2380,22 @@ printk(KERN_WARNING "isdn_tty: Null-Message in isdn_tty_at_cout\n"); return; } - save_flags(flags); - cli(); + spin_lock_irqsave(&info->readlock, flags); tty = info->tty; if ((info->flags & ISDN_ASYNC_CLOSING) || (!tty)) { - restore_flags(flags); + spin_unlock_irqrestore(&info->readlock, flags); return; } /* use queue instead of direct flip, if online and */ /* data is in queue or flip buffer is full */ if ((info->online) && (((tty->flip.count + strlen(msg)) >= TTY_FLIPBUF_SIZE) || - (!skb_queue_empty(&info->rpqueue)))) { - skb = alloc_skb(strlen(msg) -#ifdef CONFIG_ISDN_AUDIO - + sizeof(isdnaudio_header) -#endif - , GFP_ATOMIC); + (!skb_queue_empty(&dev->drv[info->isdn_driver]->rpqueue[info->isdn_channel])))) { + skb = alloc_skb(strlen(msg), GFP_ATOMIC); if (!skb) { - restore_flags(flags); + spin_unlock_irqrestore(&info->readlock, flags); return; } -#ifdef CONFIG_ISDN_AUDIO - skb_reserve(skb, sizeof(isdnaudio_header)); -#endif sp = skb_put(skb, strlen(msg)); #ifdef CONFIG_ISDN_AUDIO ISDN_AUDIO_SKB_DLECOUNT(skb) = 0; @@ -2505,13 +2426,15 @@ } } if (skb) { - isdn_tty_queue_tail(info, skb, skb->len); - restore_flags(flags); + __skb_queue_tail(&dev->drv[info->isdn_driver]->rpqueue[info->isdn_channel], skb); + dev->drv[info->isdn_driver]->rcvcount[info->isdn_channel] += skb->len; + spin_unlock_irqrestore(&info->readlock, flags); /* Schedule dequeuing */ - if ((get_isdn_dev())->modempoll && info->rcvsched) - mod_timer(&info->read_timer, jiffies + 4); + if ((dev->modempoll) && (info->rcvsched)) + isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 1); + } else { - restore_flags(flags); + spin_unlock_irqrestore(&info->readlock, flags); schedule_delayed_work(&tty->flip.work, 1); } } @@ -2522,7 +2445,7 @@ static void isdn_tty_on_hook(modem_info * info) { - if (info->isdn_slot) { + if (info->isdn_channel >= 0) { #ifdef ISDN_DEBUG_MODEM_HUP printk(KERN_DEBUG "Mhup in isdn_tty_on_hook\n"); #endif @@ -2539,56 +2462,54 @@ #define PLUSWAIT1 (HZ/2) /* 0.5 sec. */ #define PLUSWAIT2 (HZ*3/2) /* 1.5 sec */ -static void -isdn_tty_escape_timer(unsigned long data) -{ - struct modem_info *info = (struct modem_info *) data; - - if (!info->online) - return; - - info->emu.pluscount = 0; - info->online = 0; - isdn_tty_modem_result(RESULT_OK, info); -} - /* * Check Buffer for Modem-escape-sequence, activate timer-callback to * isdn_tty_modem_escape() if sequence found. + * + * Parameters: + * p pointer to databuffer + * plus escape-character + * count length of buffer + * pluscount count of valid escape-characters so far + * lastplus timestamp of last character */ -static void isdn_tty_check_esc(struct modem_info *info, - const unsigned char *p, int count) +static void +isdn_tty_check_esc(const u_char * p, u_char plus, int count, int *pluscount, + u_long *lastplus, int from_user) { - unsigned char plus = info->emu.mdmreg[REG_ESC]; + char cbuf[3]; if (plus > 127) return; - if (count > 3) { p += count - 3; count = 3; - info->emu.pluscount = 0; - info->emu.lastplus = jiffies; + *pluscount = 0; } - for (; count > 0; info->emu.lastplus = jiffies, count--) { - if (*(p++) != plus) { - info->emu.pluscount = 0; - continue; - } - if (info->emu.pluscount == 0) { - if (time_after(jiffies, info->emu.lastplus + PLUSWAIT2)) - info->emu.pluscount = 1; - } else { - if (time_after(jiffies, info->emu.lastplus + PLUSWAIT1)) - info->emu.pluscount = 1; - else - info->emu.pluscount++; - } + if (from_user) { + copy_from_user(cbuf, p, count); + p = cbuf; + } + while (count > 0) { + if (*(p++) == plus) { + if ((*pluscount)++) { + /* Time since last '+' > 0.5 sec. ? */ + if (time_after(jiffies, *lastplus + PLUSWAIT1)) + *pluscount = 1; + } else { + /* Time since last non-'+' < 1.5 sec. ? */ + if (time_before(jiffies, *lastplus + PLUSWAIT2)) + *pluscount = 0; + } + if ((*pluscount == 3) && (count == 1)) + isdn_timer_ctrl(ISDN_TIMER_MODEMPLUS, 1); + if (*pluscount > 3) + *pluscount = 1; + } else + *pluscount = 0; + *lastplus = jiffies; + count--; } - if (info->emu.pluscount == 3) - mod_timer(&info->escape_timer, jiffies + PLUSWAIT2); - else - del_timer(&info->escape_timer); } /* @@ -2606,7 +2527,6 @@ {"OK", "CONNECT", "RING", "NO CARRIER", "ERROR", "CONNECT 64000", "NO DIALTONE", "BUSY", "NO ANSWER", "RINGING", "NO MSN/EAZ", "VCON", "RUNG"}; - ulong flags; char s[ISDN_MSNLEN+10]; switch (code) { @@ -2622,16 +2542,12 @@ (info->flags & ISDN_ASYNC_CLOSING), (!info->tty)); #endif - save_flags(flags); - cli(); m->mdmreg[REG_RINGCNT] = 0; del_timer(&info->nc_timer); info->ncarrier = 0; if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) { - restore_flags(flags); return; } - restore_flags(flags); #ifdef CONFIG_ISDN_AUDIO if (info->vonline & 1) { #ifdef ISDN_DEBUG_MODEM_VOICE @@ -2683,7 +2599,7 @@ /* print CID, _before_ _every_ ring */ if (!(m->mdmreg[REG_CIDONCE] & BIT_CIDONCE)) { isdn_tty_at_cout("\r\nCALLER NUMBER: ", info); - isdn_tty_at_cout(info->isdn_slot->num, info); + isdn_tty_at_cout(dev->num[info->drv_index], info); if (m->mdmreg[REG_CDN] & BIT_CDN) { isdn_tty_at_cout("\r\nCALLED NUMBER: ", info); isdn_tty_at_cout(info->emu.cpn, info); @@ -2712,7 +2628,7 @@ (m->mdmreg[REG_RINGCNT] == 1)) { isdn_tty_at_cout("\r\n", info); isdn_tty_at_cout("CALLER NUMBER: ", info); - isdn_tty_at_cout(info->isdn_slot->num, info); + isdn_tty_at_cout(dev->num[info->drv_index], info); if (m->mdmreg[REG_CDN] & BIT_CDN) { isdn_tty_at_cout("\r\nCALLED NUMBER: ", info); isdn_tty_at_cout(info->emu.cpn, info); @@ -2762,18 +2678,16 @@ } } if (code == RESULT_NO_CARRIER) { - save_flags(flags); - cli(); if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) { - restore_flags(flags); return; } if (info->tty->ldisc.flush_buffer) info->tty->ldisc.flush_buffer(info->tty); - if (info->flags & ISDN_ASYNC_CHECK_CD) { + if ((info->flags & ISDN_ASYNC_CHECK_CD) && + (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) && + (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) { tty_hangup(info->tty); } - restore_flags(flags); } } @@ -3222,7 +3136,7 @@ if (info->msr & UART_MSR_RI) { /* Accept incoming call */ info->last_dir = 0; - strcpy(info->last_num, info->isdn_slot->num); + strcpy(info->last_num, dev->num[info->drv_index]); m->mdmreg[REG_RINGCNT] = 0; info->msr &= ~UART_MSR_RI; l2 = m->mdmreg[REG_L2PROT]; @@ -3236,20 +3150,28 @@ l2 = ISDN_PROTO_L2_X75I; } #endif - cmd.arg = l2 << 8; + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL2; + cmd.arg = info->isdn_channel + (l2 << 8); info->last_l2 = l2; - isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL2, &cmd); - cmd.arg = m->mdmreg[REG_L3PROT] << 8; + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_SETL3; + cmd.arg = info->isdn_channel + (m->mdmreg[REG_L3PROT] << 8); #ifdef CONFIG_ISDN_TTY_FAX if (l2 == ISDN_PROTO_L2_FAX) { cmd.parm.fax = info->fax; info->fax->direction = ISDN_TTY_FAX_CONN_IN; } #endif - isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL3, &cmd); + isdn_command(&cmd); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + cmd.command = ISDN_CMD_ACCEPTD; info->dialing = 16; - isdn_slot_command(info->isdn_slot, ISDN_CMD_ACCEPTD, &cmd); - mod_timer(&info->connect_timer, jiffies + info->emu.mdmreg[REG_WAITC] * HZ); + info->emu.carrierwait = 0; + isdn_command(&cmd); + isdn_timer_ctrl(ISDN_TIMER_CARRIER, 1); } else isdn_tty_modem_result(RESULT_NO_ANSWER, info); } @@ -3293,7 +3215,7 @@ #ifdef CONFIG_ISDN_TTY_FAX case '1': p[0]++; - if (!((get_isdn_dev())->global_features & + if (!(dev->global_features & ISDN_FEATURE_L3_FCLASS1)) PARSE_ERROR1; m->mdmreg[REG_SI1] = 1; @@ -3304,7 +3226,7 @@ break; case '2': p[0]++; - if (!((get_isdn_dev())->global_features & + if (!(dev->global_features & ISDN_FEATURE_L3_FCLASS2)) PARSE_ERROR1; m->mdmreg[REG_SI1] = 1; @@ -3326,10 +3248,10 @@ p[0]++; strcpy(rs, "\r\n0,"); #ifdef CONFIG_ISDN_TTY_FAX - if ((get_isdn_dev())->global_features & + if (dev->global_features & ISDN_FEATURE_L3_FCLASS1) strcat(rs, "1,"); - if ((get_isdn_dev())->global_features & + if (dev->global_features & ISDN_FEATURE_L3_FCLASS2) strcat(rs, "2,"); #endif @@ -3604,10 +3526,12 @@ PARSE_ERROR1; m->vpar[4] = par1; m->vpar[5] = par2; - cmd.arg = ISDN_AUDIO_SETDD << 8; + cmd.driver = info->isdn_driver; + cmd.command = ISDN_CMD_AUDIO; + cmd.arg = info->isdn_channel + (ISDN_AUDIO_SETDD << 8); cmd.parm.num[0] = par1; cmd.parm.num[1] = par2; - isdn_slot_command(info->isdn_slot, ISDN_CMD_AUDIO, &cmd); + isdn_command(&cmd); break; } else if (*p[0] == '?') { @@ -3919,34 +3843,99 @@ return total; } -static void -isdn_tty_ring_timer(unsigned long data) +/* + * Switch all modem-channels who are online and got a valid + * escape-sequence 1.5 seconds ago, to command-mode. + * This function is called every second via timer-interrupt from within + * timer-dispatcher isdn_timer_function() + */ +void +isdn_tty_modem_escape(void) { - struct modem_info *info = (struct modem_info *) data; - - if (!(info->msr & UART_MSR_RI)) - return; + int ton = 0; + int i; + int midx; - isdn_tty_modem_result(RESULT_RING, info); - mod_timer(&info->ring_timer, jiffies + RING_TIMEOUT); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + if (USG_MODEM(dev->usage[i])) + if ((midx = dev->m_idx[i]) >= 0) { + modem_info *info = &dev->mdm.info[midx]; + if (info->online) { + ton = 1; + if ((info->emu.pluscount == 3) && + time_after(jiffies , info->emu.lastplus + PLUSWAIT2)) { + info->emu.pluscount = 0; + info->online = 0; + isdn_tty_modem_result(RESULT_OK, info); + } + } + } + isdn_timer_ctrl(ISDN_TIMER_MODEMPLUS, ton); } - -static void -isdn_tty_modem_xmit(struct modem_info *info) + +/* + * Put a RING-message to all modem-channels who have the RI-bit set. + * This function is called every second via timer-interrupt from within + * timer-dispatcher isdn_timer_function() + */ +void +isdn_tty_modem_ring(void) { - isdn_tty_senddown(info); - isdn_tty_tint(info); + int ton = 0; + int i; + + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + modem_info *info = &dev->mdm.info[i]; + if (info->msr & UART_MSR_RI) { + ton = 1; + isdn_tty_modem_result(RESULT_RING, info); + } + } + isdn_timer_ctrl(ISDN_TIMER_MODEMRING, ton); } -static void -isdn_tty_connect_timer(unsigned long data) +/* + * For all online tty's, try sending data to + * the lower levels. + */ +void +isdn_tty_modem_xmit(void) { - struct modem_info *info = (struct modem_info *) data; + int ton = 1; + int i; - if (info->dialing) { - info->dialing = 0; - isdn_tty_modem_result(RESULT_NO_CARRIER, info); - isdn_tty_modem_hup(info, 1); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + modem_info *info = &dev->mdm.info[i]; + if (info->online) { + ton = 1; + isdn_tty_senddown(info); + isdn_tty_tint(info); + } } + isdn_timer_ctrl(ISDN_TIMER_MODEMXMIT, ton); } +/* + * Check all channels if we have a 'no carrier' timeout. + * Timeout value is set by Register S7. + */ +void +isdn_tty_carrier_timeout(void) +{ + int ton = 0; + int i; + + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + modem_info *info = &dev->mdm.info[i]; + if (info->dialing) { + if (info->emu.carrierwait++ > info->emu.mdmreg[REG_WAITC]) { + info->dialing = 0; + isdn_tty_modem_result(RESULT_NO_CARRIER, info); + isdn_tty_modem_hup(info, 1); + } + else + ton = 1; + } + } + isdn_timer_ctrl(ISDN_TIMER_CARRIER, ton); +} diff -Nru a/drivers/isdn/i4l/isdn_tty.h b/drivers/isdn/i4l/isdn_tty.h --- a/drivers/isdn/i4l/isdn_tty.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/i4l/isdn_tty.h Thu Feb 19 23:44:26 2004 @@ -1,10 +1,13 @@ -/* Linux ISDN subsystem, tty related functions +/* $Id: isdn_tty.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * header for Linux ISDN subsystem, tty related functions (linklevel). * * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) * Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ #include @@ -98,31 +101,22 @@ ((info->emu.mdmreg[REG_L2PROT] == ISDN_PROTO_L2_FAX) && \ (info->emu.mdmreg[REG_L3PROT] == ISDN_PROTO_L3_FCLASS2)) -extern int isdn_tty_init(void); -extern int isdn_tty_find_icall(struct isdn_slot *slot, setup_parm *setup); +extern void isdn_tty_modem_escape(void); +extern void isdn_tty_modem_ring(void); +extern void isdn_tty_carrier_timeout(void); +extern void isdn_tty_modem_xmit(void); +extern int isdn_tty_modem_init(void); +extern void isdn_tty_exit(void); +extern void isdn_tty_readmodem(void); +extern int isdn_tty_find_icall(int, int, setup_parm *); extern void isdn_tty_cleanup_xmit(modem_info *); -extern int isdn_tty_capi_facility(capi_msg *cm); +extern int isdn_tty_stat_callback(int, isdn_ctrl *); +extern int isdn_tty_rcv_skb(int, int, int, struct sk_buff *); +extern int isdn_tty_capi_facility(capi_msg *cm); extern void isdn_tty_at_cout(char *, modem_info *); extern void isdn_tty_modem_hup(modem_info *, int); #ifdef CONFIG_ISDN_TTY_FAX -extern int isdn_tty_cmd_PLUSF_FAX(char **, modem_info *); -extern int isdn_tty_fax_command(modem_info *, isdn_ctrl *); +extern int isdn_tty_cmd_PLUSF_FAX(char **, modem_info *); +extern int isdn_tty_fax_command(modem_info *, isdn_ctrl *); extern void isdn_tty_fax_bitorder(modem_info *, struct sk_buff *); #endif - -extern int isdn_tty_init(void); -extern void isdn_tty_exit(void); - -struct isdn_modem { - struct tty_driver *tty_modem; /* tty-device */ - modem_info info[ISDN_MAX_CHANNELS]; /* Private data */ -}; - -extern struct isdn_modem isdn_mdm; - -static inline void -isdn_tty_queue_tail(modem_info *info, struct sk_buff *skb, int len) -{ - __skb_queue_tail(&info->rpqueue, skb); - info->rcvcount += len; -} diff -Nru a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c --- a/drivers/isdn/i4l/isdn_ttyfax.c Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/i4l/isdn_ttyfax.c Thu Feb 19 23:44:22 2004 @@ -1,4 +1,6 @@ -/* Linux ISDN subsystem, tty_fax AT-command emulator +/* $Id: isdn_ttyfax.c,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * Linux ISDN subsystem, tty_fax AT-command emulator (linklevel). * * Copyright 1999 by Armin Schindler (mac@melware.de) * Copyright 1999 by Ralf Spachmann (mel@melware.de) @@ -6,6 +8,7 @@ * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ #undef ISDN_TTY_FAX_STAT_DEBUG @@ -16,8 +19,26 @@ #include "isdn_tty.h" #include "isdn_ttyfax.h" + +static char *isdn_tty_fax_revision = "$Revision: 1.1.2.2 $"; + #define PARSE_ERROR1 { isdn_tty_fax_modem_result(1, info); return 1; } +static char * +isdn_getrev(const char *revision) +{ + char *rev; + char *p; + + if ((p = strchr(revision, ':'))) { + rev = p + 2; + p = strchr(rev, '$'); + *--p = 0; + } else + rev = "???"; + return rev; +} + /* * Fax Class 2 Modem results * @@ -53,7 +74,7 @@ case 2: /* +FCON */ /* Append CPN, if enabled */ if ((m->mdmreg[REG_CPNFCON] & BIT_CPNFCON) && - (!(info->isdn_slot->usage & ISDN_USAGE_OUTGOING))) { + (!(dev->usage[info->isdn_channel] & ISDN_USAGE_OUTGOING))) { sprintf(rs, "/%s", m->cpn); isdn_tty_at_cout(rs, info); } @@ -265,7 +286,7 @@ __u8 RightMask; __u8 fBit; __u8 Data; - u_int i; + int i; if (!info->fax->bor) { for (i = 0; i < skb->len; i++) { @@ -301,9 +322,8 @@ static char *cmd[] = {"AE", "TS", "RS", "TM", "RM", "TH", "RH"}; isdn_ctrl c; - int par; - struct isdn_slot *slot; - unsigned long flags; + int par, i; + u_long flags; for (c.parm.aux.cmd = 0; c.parm.aux.cmd < 7; c.parm.aux.cmd++) if (!strncmp(p[0], cmd[c.parm.aux.cmd], 2)) @@ -340,32 +360,46 @@ default: PARSE_ERROR1; } + c.command = ISDN_CMD_FAXCMD; #ifdef ISDN_TTY_FAX_CMD_DEBUG printk(KERN_DEBUG "isdn_tty_cmd_FCLASS1 %d/%d/%d)\n", c.parm.aux.cmd, c.parm.aux.subcmd, c.parm.aux.para[0]); #endif - if (!info->isdn_slot) { - save_flags(flags); - cli(); + if (info->isdn_driver < 0) { if ((c.parm.aux.subcmd == AT_EQ_VALUE) || (c.parm.aux.subcmd == AT_COMMAND)) { - restore_flags(flags); PARSE_ERROR1; } + spin_lock_irqsave(&dev->lock, flags); /* get a temporary connection to the first free fax driver */ - slot = isdn_get_free_slot(ISDN_USAGE_FAX, ISDN_PROTO_L2_FAX, - ISDN_PROTO_L3_FCLASS1, -1, -1, "00"); - if (!slot) { - restore_flags(flags); + i = isdn_get_free_channel(ISDN_USAGE_FAX, ISDN_PROTO_L2_FAX, + ISDN_PROTO_L3_FCLASS1, -1, -1, "00"); + if (i < 0) { + spin_unlock_irqrestore(&dev->lock, flags); PARSE_ERROR1; } - info->isdn_slot = slot; - isdn_slot_command(slot, ISDN_CMD_FAXCMD, &c); - isdn_slot_free(slot); - info->isdn_slot = NULL; - restore_flags(flags); + info->isdn_driver = dev->drvmap[i]; + info->isdn_channel = dev->chanmap[i]; + info->drv_index = i; + dev->m_idx[i] = info->line; + spin_unlock_irqrestore(&dev->lock, flags); + c.driver = info->isdn_driver; + c.arg = info->isdn_channel; + isdn_command(&c); + spin_lock_irqsave(&dev->lock, flags); + isdn_free_channel(info->isdn_driver, info->isdn_channel, + ISDN_USAGE_FAX); + info->isdn_driver = -1; + info->isdn_channel = -1; + if (info->drv_index >= 0) { + dev->m_idx[info->drv_index] = -1; + info->drv_index = -1; + } + spin_unlock_irqrestore(&dev->lock, flags); } else { - isdn_slot_command(info->isdn_slot, ISDN_CMD_FAXCMD, &c); + c.driver = info->isdn_driver; + c.arg = info->isdn_channel; + isdn_command(&c); } return 1; } @@ -766,7 +800,10 @@ printk(KERN_DEBUG "isdn_tty: Fax FDR\n"); #endif f->code = ISDN_TTY_FAX_DR; - isdn_slot_command(info->isdn_slot, ISDN_CMD_FAXCMD, &cmd); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + cmd.command = ISDN_CMD_FAXCMD; + isdn_command(&cmd); if (f->phase == ISDN_FAX_PHASE_B) { f->phase = ISDN_FAX_PHASE_C; } else if (f->phase == ISDN_FAX_PHASE_D) { @@ -818,7 +855,10 @@ #endif if ((f->phase == ISDN_FAX_PHASE_B) || (f->phase == ISDN_FAX_PHASE_D)) { f->code = ISDN_TTY_FAX_DT; - isdn_slot_command(info->isdn_slot, ISDN_CMD_FAXCMD, &cmd); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + cmd.command = ISDN_CMD_FAXCMD; + isdn_command(&cmd); if (f->phase == ISDN_FAX_PHASE_D) { f->phase = ISDN_FAX_PHASE_C; isdn_tty_fax_modem_result(7, info); /* CONNECT */ @@ -873,7 +913,10 @@ PARSE_ERROR1; f->fet = par; f->code = ISDN_TTY_FAX_ET; - isdn_slot_command(info->isdn_slot, ISDN_CMD_FAXCMD, &cmd); + cmd.driver = info->isdn_driver; + cmd.arg = info->isdn_channel; + cmd.command = ISDN_CMD_FAXCMD; + isdn_command(&cmd); #ifdef ISDN_TTY_FAX_STAT_DEBUG printk(KERN_DEBUG "isdn_tty: Fax FET=%d\n", par); #endif @@ -1043,7 +1086,8 @@ #ifdef ISDN_TTY_FAX_STAT_DEBUG printk(KERN_DEBUG "isdn_tty: FREV?\n"); #endif - sprintf(rs, "\r\nRev: 1.0"); + strcpy(rss, isdn_tty_fax_revision); + sprintf(rs, "\r\nRev: %s", isdn_getrev(rss)); isdn_tty_at_cout(rs, info); return 0; } diff -Nru a/drivers/isdn/i4l/isdn_ttyfax.h b/drivers/isdn/i4l/isdn_ttyfax.h --- a/drivers/isdn/i4l/isdn_ttyfax.h Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/i4l/isdn_ttyfax.h Thu Feb 19 23:44:24 2004 @@ -1,4 +1,6 @@ -/* Linux ISDN subsystem, tty_fax related functions +/* $Id: isdn_ttyfax.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * header for Linux ISDN subsystem, tty_fax related functions (linklevel). * * Copyright 1999 by Armin Schindler (mac@melware.de) * Copyright 1999 by Ralf Spachmann (mel@melware.de) @@ -6,6 +8,7 @@ * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ diff -Nru a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c --- a/drivers/isdn/i4l/isdn_v110.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/i4l/isdn_v110.c Thu Feb 19 23:44:28 2004 @@ -1,22 +1,27 @@ -/* Linux ISDN subsystem, V.110 +/* $Id: isdn_v110.c,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * Linux ISDN subsystem, V.110 related functions (linklevel). * * Copyright by Thomas Pfeiffer (pfeiffer@pds.de) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ #include #include #include #include +#include #include #include "isdn_v110.h" -#include "isdn_common.h" #undef ISDN_V110_DEBUG +char *isdn_v110_revision = "$Revision: 1.1.2.2 $"; + #define V110_38400 255 #define V110_19200 15 #define V110_9600 3 @@ -82,7 +87,7 @@ * structures and returns a pointer to these. */ static isdn_v110_stream * -do_isdn_v110_open(unsigned char key, int hdrlen, int maxsize) +isdn_v110_open(unsigned char key, int hdrlen, int maxsize) { int i; isdn_v110_stream *v; @@ -127,8 +132,8 @@ } /* isdn_v110_close frees private V.110 data structures */ -static void -do_isdn_v110_close(isdn_v110_stream * v) +void +isdn_v110_close(isdn_v110_stream * v) { if (v == NULL) return; @@ -510,94 +515,101 @@ return nskb; } - -void -isdn_v110_open(struct isdn_slot *slot, struct isdn_v110 *iv110) -{ - isdn_v110_stream *v; - int hdrlen = isdn_slot_hdrlen(slot); - int maxsize = isdn_slot_maxbufsize(slot); - - atomic_inc(&iv110->v110use); - switch (iv110->v110emu) { - case ISDN_PROTO_L2_V11096: - iv110->v110 = do_isdn_v110_open(V110_9600, hdrlen, maxsize); - break; - case ISDN_PROTO_L2_V11019: - iv110->v110 = do_isdn_v110_open(V110_19200, hdrlen, maxsize); - break; - case ISDN_PROTO_L2_V11038: - iv110->v110 = do_isdn_v110_open(V110_38400, hdrlen, maxsize); - break; - } - if ((v = iv110->v110)) { - while (v->SyncInit) { - struct sk_buff *skb = isdn_v110_sync(v); - if (isdn_slot_write(slot, skb) <= 0) { - dev_kfree_skb(skb); - /* Unable to send, try later */ - break; - } - v->SyncInit--; - v->skbidle++; - } - } else - printk(KERN_WARNING "isdn_v110: Couldn't open stream\n"); - atomic_dec(&iv110->v110use); -} - -void -isdn_v110_close(struct isdn_slot *slot, struct isdn_v110 *iv110) -{ - while (1) { - atomic_inc(&iv110->v110use); - if (atomic_dec_and_test(&iv110->v110use)) { - do_isdn_v110_close(iv110->v110); - iv110->v110 = NULL; - break; - } - } -} - int -isdn_v110_bsent(struct isdn_slot *slot, struct isdn_v110 *iv110) +isdn_v110_stat_callback(int idx, isdn_ctrl * c) { - isdn_v110_stream *v = iv110->v110; - int i, ret; + isdn_v110_stream *v = NULL; + int i; + int ret; - /* Keep the send-queue of the driver filled - * with frames: - * If number of outstanding frames < 3, - * send down an Idle-Frame (or an Sync-Frame, if - * v->SyncInit != 0). - */ - atomic_inc(&iv110->v110use); - if (v->skbidle > 0) { - v->skbidle--; - ret = 1; - } else { - if (v->skbuser > 0) - v->skbuser--; - ret = 0; - } - for (i = v->skbuser + v->skbidle; i < 2; i++) { - struct sk_buff *skb; - if (v->SyncInit > 0) - skb = isdn_v110_sync(v); - else - skb = isdn_v110_idle(v); - if (skb) { - if (isdn_slot_write(slot, skb) <= 0) { - dev_kfree_skb(skb); - break; + if (idx < 0) + return 0; + switch (c->command) { + case ISDN_STAT_BSENT: + /* Keep the send-queue of the driver filled + * with frames: + * If number of outstanding frames < 3, + * send down an Idle-Frame (or an Sync-Frame, if + * v->SyncInit != 0). + */ + if (!(v = dev->v110[idx])) + return 0; + atomic_inc(&dev->v110use[idx]); + if (v->skbidle > 0) { + v->skbidle--; + ret = 1; } else { - if (v->SyncInit) - v->SyncInit--; - v->skbidle++; + if (v->skbuser > 0) + v->skbuser--; + ret = 0; + } + for (i = v->skbuser + v->skbidle; i < 2; i++) { + struct sk_buff *skb; + if (v->SyncInit > 0) + skb = isdn_v110_sync(v); + else + skb = isdn_v110_idle(v); + if (skb) { + if (dev->drv[c->driver]->interface->writebuf_skb(c->driver, c->arg, 1, skb) <= 0) { + dev_kfree_skb(skb); + break; + } else { + if (v->SyncInit) + v->SyncInit--; + v->skbidle++; + } + } else + break; + } + atomic_dec(&dev->v110use[idx]); + return ret; + case ISDN_STAT_DHUP: + case ISDN_STAT_BHUP: + while (1) { + atomic_inc(&dev->v110use[idx]); + if (atomic_dec_and_test(&dev->v110use[idx])) { + isdn_v110_close(dev->v110[idx]); + dev->v110[idx] = NULL; + break; + } + mdelay(1); } - } else break; + case ISDN_STAT_BCONN: + if (dev->v110emu[idx] && (dev->v110[idx] == NULL)) { + int hdrlen = dev->drv[c->driver]->interface->hl_hdrlen; + int maxsize = dev->drv[c->driver]->interface->maxbufsize; + atomic_inc(&dev->v110use[idx]); + switch (dev->v110emu[idx]) { + case ISDN_PROTO_L2_V11096: + dev->v110[idx] = isdn_v110_open(V110_9600, hdrlen, maxsize); + break; + case ISDN_PROTO_L2_V11019: + dev->v110[idx] = isdn_v110_open(V110_19200, hdrlen, maxsize); + break; + case ISDN_PROTO_L2_V11038: + dev->v110[idx] = isdn_v110_open(V110_38400, hdrlen, maxsize); + break; + default:; + } + if ((v = dev->v110[idx])) { + while (v->SyncInit) { + struct sk_buff *skb = isdn_v110_sync(v); + if (dev->drv[c->driver]->interface->writebuf_skb(c->driver, c->arg, 1, skb) <= 0) { + dev_kfree_skb(skb); + /* Unable to send, try later */ + break; + } + v->SyncInit--; + v->skbidle++; + } + } else + printk(KERN_WARNING "isdn_v110: Couldn't open stream for chan %d\n", idx); + atomic_dec(&dev->v110use[idx]); + } + break; + default: + return 0; } - atomic_dec(&iv110->v110use); - return ret; + return 0; } diff -Nru a/drivers/isdn/i4l/isdn_v110.h b/drivers/isdn/i4l/isdn_v110.h --- a/drivers/isdn/i4l/isdn_v110.h Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/i4l/isdn_v110.h Thu Feb 19 23:44:26 2004 @@ -1,19 +1,16 @@ -/* Linux ISDN subsystem, V.110 related functions +/* $Id: isdn_v110.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * Linux ISDN subsystem, V.110 related functions (linklevel). * * Copyright by Thomas Pfeiffer (pfeiffer@pds.de) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ -#ifndef ISDN_V110_H -#define ISDN_V110_H - -struct isdn_v110 { - int v110emu; /* V.110 emulator-mode 0=none */ - atomic_t v110use; /* Usage-Semaphore for stream */ - isdn_v110_stream *v110; /* V.110 private data */ -}; +#ifndef _isdn_v110_h_ +#define _isdn_v110_h_ /* * isdn_v110_encode will take raw data and encode it using V.110 @@ -26,10 +23,7 @@ */ extern struct sk_buff *isdn_v110_decode(isdn_v110_stream *, struct sk_buff *); -extern void isdn_v110_open(struct isdn_slot *slot, struct isdn_v110 *iv110); - -extern void isdn_v110_close(struct isdn_slot *slot, struct isdn_v110 *iv110); - -extern int isdn_v110_bsent(struct isdn_slot *slot, struct isdn_v110 *iv110); +extern int isdn_v110_stat_callback(int, isdn_ctrl *); +extern void isdn_v110_close(isdn_v110_stream * v); #endif diff -Nru a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c --- a/drivers/isdn/i4l/isdn_x25iface.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/i4l/isdn_x25iface.c Thu Feb 19 23:44:24 2004 @@ -1,10 +1,10 @@ -/* * Linux ISDN subsystem, X.25 related functions +/* $Id: isdn_x25iface.c,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * Linux ISDN subsystem, X.25 related functions * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. - */ - -/* + * * stuff needed to support the Linux X.25 PLP code on top of devices that * can provide a lab_b service using the concap_proto mechanism. * This module supports a network interface wich provides lapb_sematics @@ -17,6 +17,7 @@ * */ +/* #include */ #include #include #include @@ -63,7 +64,7 @@ /* error message helper function */ static void illegal_state_warn( unsigned state, unsigned char firstbyte) { - printk( KERN_WARNING "isdn_x25iface: firstbyte %x invalid in" + printk( KERN_WARNING "isdn_x25iface: firstbyte %x illegal in" "current state %d\n",firstbyte, state ); } @@ -72,7 +73,7 @@ if( pda && pda -> magic == ISDN_X25IFACE_MAGIC ) return 0; printk( KERN_WARNING - "isdn_x25iface_xxx: invalid pointer to proto data\n" ); + "isdn_x25iface_xxx: illegal pointer to proto data\n" ); return 1; } @@ -87,6 +88,7 @@ tmp -> state = WAN_UNCONFIGURED; /* private data space used to hold the concap_proto data. Only to be accessed via the returned pointer */ + spin_lock_init(&tmp->priv.lock); tmp -> priv.dops = NULL; tmp -> priv.net_dev = NULL; tmp -> priv.pops = &ix25_pops; @@ -111,9 +113,7 @@ return -1; } IX25DEBUG( "isdn_x25iface_proto_close %s \n", MY_DEVNAME(cprot -> net_dev) ); - save_flags(flags); - cli(); /* avoid races with incoming events calling pops methods while - cprot members are inconsistent */ + spin_lock_irqsave(&cprot->lock, flags); cprot -> dops = NULL; cprot -> net_dev = NULL; tmp = cprot -> proto_data; @@ -122,8 +122,7 @@ } else { tmp -> state = WAN_UNCONFIGURED; } - restore_flags(flags); - + spin_unlock_irqrestore(&cprot->lock, flags); return ret; } @@ -176,14 +175,12 @@ isdn_x25iface_proto_close(cprot); return -1; } - save_flags(flags); - cli(); /* avoid races with incoming events calling pops methods while - cprot members are inconsistent */ + spin_lock_irqsave(&cprot->lock, flags); cprot -> net_dev = ndev; cprot -> pops = &ix25_pops; cprot -> dops = dops; pda -> state = WAN_DISCONNECTED; - restore_flags(flags); + spin_unlock_irqrestore(&cprot->lock, flags); return 0; } @@ -222,8 +219,6 @@ printk(KERN_WARNING "isdn_x25iface_connect_ind while unconfigured %s\n" , MY_DEVNAME(cprot->net_dev) ); - if (skb) - dev_kfree_skb(skb); return -1; } *state_p = WAN_CONNECTED; @@ -334,7 +329,7 @@ " options not yet supported\n"); break; default: - printk(KERN_WARNING "isdn_x25iface_xmit: frame with invalid" + printk(KERN_WARNING "isdn_x25iface_xmit: frame with illegal" " first byte %x ignored:\n", firstbyte); } dev_kfree_skb(skb); diff -Nru a/drivers/isdn/i4l/isdn_x25iface.h b/drivers/isdn/i4l/isdn_x25iface.h --- a/drivers/isdn/i4l/isdn_x25iface.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/i4l/isdn_x25iface.h Thu Feb 19 23:44:23 2004 @@ -1,16 +1,17 @@ -/* Linux ISDN subsystem, x.25 related functions +/* $Id: isdn_x25iface.h,v 1.1.2.2 2004/01/12 22:37:19 keil Exp $ + * + * header for Linux ISDN subsystem, x.25 related functions * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. + * */ #ifndef _LINUX_ISDN_X25IFACE_H #define _LINUX_ISDN_X25IFACE_H #define ISDN_X25IFACE_MAGIC 0x1e75a2b9 - -#undef DEBUG_ISDN_X25 - +/* #define DEBUG_ISDN_X25 if you want isdn_x25 debugging messages */ #ifdef DEBUG_ISDN_X25 # define IX25DEBUG(fmt,args...) printk(KERN_DEBUG fmt , ## args) #else @@ -24,6 +25,8 @@ extern struct concap_proto_ops * isdn_x25iface_concap_proto_ops_pt; extern struct concap_proto * isdn_x25iface_proto_new(void); + + #endif diff -Nru a/drivers/isdn/icn/Kconfig b/drivers/isdn/icn/Kconfig --- a/drivers/isdn/icn/Kconfig Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/icn/Kconfig Thu Feb 19 23:44:24 2004 @@ -3,7 +3,7 @@ # config ISDN_DRV_ICN tristate "ICN 2B and 4B support" - depends on ISDN && ISA + depends on ISDN_I4L && ISA help This enables support for two kinds of ISDN-cards made by a German company called ICN. 2B is the standard version for a single ISDN diff -Nru a/drivers/isdn/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig --- a/drivers/isdn/pcbit/Kconfig Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/pcbit/Kconfig Thu Feb 19 23:44:27 2004 @@ -3,7 +3,7 @@ # config ISDN_DRV_PCBIT tristate "PCBIT-D support" - depends on ISDN && ISA + depends on ISDN_I4L && ISA help This enables support for the PCBIT ISDN-card. This card is manufactured in Portugal by Octal. For running this card, diff -Nru a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c --- a/drivers/isdn/pcbit/drv.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/pcbit/drv.c Thu Feb 19 23:44:27 2004 @@ -84,6 +84,7 @@ dev_pcbit[board] = dev; memset(dev, 0, sizeof(struct pcbit_dev)); init_waitqueue_head(&dev->set_running_wq); + spin_lock_init(&dev->lock); if (mem_base >= 0xA0000 && mem_base <= 0xFFFFF ) { dev->ph_mem = mem_base; diff -Nru a/drivers/isdn/pcbit/edss1.c b/drivers/isdn/pcbit/edss1.c --- a/drivers/isdn/pcbit/edss1.c Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/pcbit/edss1.c Thu Feb 19 23:44:23 2004 @@ -278,9 +278,7 @@ struct fsm_timer_entry *tentry; unsigned long flags; - save_flags(flags); - cli(); - + spin_lock_irqsave(&dev->lock, flags); for (action = fsm_table; action->init != 0xff; action++) if (action->init == chan->fsm_state && action->event == event) @@ -288,9 +286,9 @@ if (action->init == 0xff) { + spin_unlock_irqrestore(&dev->lock, flags); printk(KERN_DEBUG "fsm error: event %x on state %x\n", event, chan->fsm_state); - restore_flags(flags); return; } @@ -315,7 +313,7 @@ add_timer(&chan->fsm_timer); } - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); if (action->callb) action->callb(dev, chan, data); diff -Nru a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c --- a/drivers/isdn/pcbit/layer2.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/pcbit/layer2.c Thu Feb 19 23:44:27 2004 @@ -121,18 +121,17 @@ frame->next = NULL; - save_flags(flags); - cli(); + spin_lock_irqsave(&dev->lock, flags); if (dev->write_queue == NULL) { dev->write_queue = frame; - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); pcbit_transmit(dev); } else { for (ptr = dev->write_queue; ptr->next; ptr = ptr->next); ptr->next = frame; - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); } return 0; } @@ -174,15 +173,14 @@ unacked = (dev->send_seq + (8 - dev->unack_seq)) & 0x07; - save_flags(flags); - cli(); + spin_lock_irqsave(&dev->lock, flags); if (dev->free > 16 && dev->write_queue && unacked < 7) { if (!dev->w_busy) dev->w_busy = 1; else { - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); return; } @@ -190,7 +188,7 @@ frame = dev->write_queue; free = dev->free; - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); if (frame->copied == 0) { @@ -271,9 +269,7 @@ dev->free -= flen; pcbit_tx_update(dev, flen); - save_flags(flags); - cli(); - + spin_lock_irqsave(&dev->lock, flags); if (frame->skb == NULL || frame->copied == frame->skb->len) { @@ -286,9 +282,9 @@ kfree(frame); } dev->w_busy = 0; - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); } else { - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); #ifdef DEBUG printk(KERN_DEBUG "unacked %d free %d write_queue %s\n", unacked, dev->free, dev->write_queue ? "not empty" : @@ -309,12 +305,11 @@ unsigned long flags, msg; struct pcbit_dev *dev = (struct pcbit_dev *) data; - save_flags(flags); - cli(); + spin_lock_irqsave(&dev->lock, flags); while ((frame = dev->read_queue)) { dev->read_queue = frame->next; - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); SET_MSG_CPU(msg, 0); SET_MSG_PROC(msg, 0); @@ -331,11 +326,10 @@ kfree(frame); - save_flags(flags); - cli(); + spin_lock_irqsave(&dev->lock, flags); } - restore_flags(flags); + spin_unlock_irqrestore(&dev->lock, flags); } /* @@ -460,12 +454,9 @@ memcpy_frompcbit(dev, skb_put(frame->skb, tt), tt); frame->copied += tt; - + spin_lock_irqsave(&dev->lock, flags); if (frame->copied == frame->hdr_len + frame->dt_len) { - save_flags(flags); - cli(); - if (type1) { dev->read_frame = NULL; } @@ -476,14 +467,10 @@ } else dev->read_queue = frame; - restore_flags(flags); - } else { - save_flags(flags); - cli(); dev->read_frame = frame; - restore_flags(flags); } + spin_unlock_irqrestore(&dev->lock, flags); } /* diff -Nru a/drivers/isdn/pcbit/pcbit.h b/drivers/isdn/pcbit/pcbit.h --- a/drivers/isdn/pcbit/pcbit.h Thu Feb 19 23:44:23 2004 +++ b/drivers/isdn/pcbit/pcbit.h Thu Feb 19 23:44:23 2004 @@ -51,7 +51,7 @@ unsigned int id; unsigned int interrupt; /* set during interrupt processing */ - + spinlock_t lock; /* isdn4linux */ struct msn_entry * msn_list; /* ISDN address list */ diff -Nru a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig --- a/drivers/isdn/sc/Kconfig Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/sc/Kconfig Thu Feb 19 23:44:24 2004 @@ -3,7 +3,7 @@ # config ISDN_DRV_SC tristate "Spellcaster support" - depends on ISDN && ISA + depends on ISDN_I4L && ISA help This enables support for the Spellcaster BRI ISDN boards. This driver currently builds only in a modularized version. diff -Nru a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c --- a/drivers/isdn/sc/command.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/sc/command.c Thu Feb 19 23:44:24 2004 @@ -32,7 +32,7 @@ int acceptb(int card, unsigned long channel); extern int cinst; -extern board *adapter[]; +extern board *sc_adapter[]; extern int sc_ioctl(int, scs_ioctl *); extern int setup_buffers(int, int, unsigned int); @@ -84,7 +84,7 @@ int i; for(i = 0 ; i < cinst ; i++) { - if(adapter[i]->driverId == driver) + if(sc_adapter[i]->driverId == driver) return i; } return -ENODEV; @@ -105,7 +105,7 @@ } pr_debug("%s: Received %s command from Link Layer\n", - adapter[card]->devicename, commands[cmd->command]); + sc_adapter[card]->devicename, commands[cmd->command]); /* * Dispatch the command @@ -120,7 +120,7 @@ if (copy_from_user(&ioc, (scs_ioctl *)cmdptr, sizeof(scs_ioctl))) { pr_debug("%s: Failed to verify user space 0x%x\n", - adapter[card]->devicename, cmdptr); + sc_adapter[card]->devicename, cmdptr); return -EFAULT; } return sc_ioctl(card, &ioc); @@ -163,8 +163,8 @@ return -ENODEV; } - pr_debug("%s: Sending loopback message\n", adapter[card]->devicename); - + pr_debug("%s: Sending loopback message\n", + sc_adapter[card]->devicename); /* * Send the loopback message to confirm that memory transfer is @@ -181,17 +181,17 @@ if (!status) { pr_debug("%s: Loopback message successfully sent\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); if(strcmp(rspmsg.msg_data.byte_array, testmsg)) { pr_debug("%s: Loopback return != sent\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return -EIO; } return 0; } else { pr_debug("%s: Send loopback message failed\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return -EIO; } @@ -216,7 +216,7 @@ cmReqClass0, cmReqStartProc, 0,0,0); - pr_debug("%s: Sent startProc\n", adapter[card]->devicename); + pr_debug("%s: Sent startProc\n", sc_adapter[card]->devicename); return status; } @@ -253,7 +253,7 @@ (unsigned int *) Phone); pr_debug("%s: Dialing %s on channel %d\n", - adapter[card]->devicename, Phone, channel+1); + sc_adapter[card]->devicename, Phone, channel+1); return status; } @@ -275,7 +275,7 @@ indicate_status(card, ISDN_STAT_BCONN,channel,NULL); pr_debug("%s: Answered incoming call on channel %s\n", - adapter[card]->devicename, channel+1); + sc_adapter[card]->devicename, channel+1); return 0; } @@ -298,7 +298,7 @@ 0, NULL); pr_debug("%s: Sent HANGUP message to channel %d\n", - adapter[card]->devicename, channel+1); + sc_adapter[card]->devicename, channel+1); return status; } @@ -316,15 +316,16 @@ } protocol = arg >> 8; channel = arg & 0xff; - adapter[card]->channel[channel].l2_proto = protocol; + sc_adapter[card]->channel[channel].l2_proto = protocol; pr_debug("%s: Level 2 protocol for channel %d set to %s from %d\n", - adapter[card]->devicename, channel+1,l2protos[adapter[card]->channel[channel].l2_proto],protocol); + sc_adapter[card]->devicename, channel+1, + l2protos[sc_adapter[card]->channel[channel].l2_proto],protocol); /* * check that the adapter is also set to the correct protocol */ pr_debug("%s: Sending GetFrameFormat for channel %d\n", - adapter[card]->devicename, channel+1); + sc_adapter[card]->devicename, channel+1); status = sendmessage(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetFrameFormat, @@ -348,9 +349,9 @@ return -ENODEV; } - adapter[card]->channel[channel].l3_proto = protocol; + sc_adapter[card]->channel[channel].l3_proto = protocol; pr_debug("%s: Level 3 protocol for channel %d set to %s\n", - adapter[card]->devicename, channel+1, l3protos[protocol]); + sc_adapter[card]->devicename, channel+1, l3protos[protocol]); return 0; } @@ -368,7 +369,7 @@ } pr_debug("%s: B-Channel connection accepted on channel %d\n", - adapter[card]->devicename, channel+1); + sc_adapter[card]->devicename, channel+1); indicate_status(card, ISDN_STAT_BCONN, channel, NULL); return 0; } @@ -380,10 +381,10 @@ return -ENODEV; } - strcpy(adapter[card]->channel[arg].eazlist, ""); - adapter[card]->channel[arg].eazclear = 1; + strcpy(sc_adapter[card]->channel[arg].eazlist, ""); + sc_adapter[card]->channel[arg].eazclear = 1; pr_debug("%s: EAZ List cleared for channel %d\n", - adapter[card]->devicename, arg+1); + sc_adapter[card]->devicename, arg+1); return 0; } @@ -394,11 +395,11 @@ return -ENODEV; } - strcpy(adapter[card]->channel[arg].eazlist, num); - adapter[card]->channel[arg].eazclear = 0; + strcpy(sc_adapter[card]->channel[arg].eazlist, num); + sc_adapter[card]->channel[arg].eazclear = 0; pr_debug("%s: EAZ list for channel %d set to: %s\n", - adapter[card]->devicename, arg+1, - adapter[card]->channel[arg].eazlist); + sc_adapter[card]->devicename, arg+1, + sc_adapter[card]->channel[arg].eazlist); return 0; } @@ -413,28 +414,28 @@ indicate_status(card, ISDN_STAT_STOP, 0, NULL); - if(adapter[card]->EngineUp) { - del_timer(&adapter[card]->stat_timer); + if(sc_adapter[card]->EngineUp) { + del_timer(&sc_adapter[card]->stat_timer); } - adapter[card]->EngineUp = 0; + sc_adapter[card]->EngineUp = 0; - spin_lock_irqsave(&adapter[card]->lock, flags); - init_timer(&adapter[card]->reset_timer); - adapter[card]->reset_timer.function = check_reset; - adapter[card]->reset_timer.data = card; - adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME; - add_timer(&adapter[card]->reset_timer); - spin_unlock_irqrestore(&adapter[card]->lock, flags); + spin_lock_irqsave(&sc_adapter[card]->lock, flags); + init_timer(&sc_adapter[card]->reset_timer); + sc_adapter[card]->reset_timer.function = check_reset; + sc_adapter[card]->reset_timer.data = card; + sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME; + add_timer(&sc_adapter[card]->reset_timer); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); - outb(0x1,adapter[card]->ioport[SFT_RESET]); + outb(0x1,sc_adapter[card]->ioport[SFT_RESET]); - pr_debug("%s: Adapter Reset\n", adapter[card]->devicename); + pr_debug("%s: Adapter Reset\n", sc_adapter[card]->devicename); return 0; } void flushreadfifo (int card) { - while(inb(adapter[card]->ioport[FIFO_STATUS]) & RF_HAS_DATA) - inb(adapter[card]->ioport[FIFO_READ]); + while(inb(sc_adapter[card]->ioport[FIFO_STATUS]) & RF_HAS_DATA) + inb(sc_adapter[card]->ioport[FIFO_READ]); } diff -Nru a/drivers/isdn/sc/event.c b/drivers/isdn/sc/event.c --- a/drivers/isdn/sc/event.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/sc/event.c Thu Feb 19 23:44:26 2004 @@ -21,7 +21,7 @@ #include "card.h" extern int cinst; -extern board *adapter[]; +extern board *sc_adapter[]; #ifdef DEBUG static char *events[] = { "ISDN_STAT_STAVAIL", @@ -46,9 +46,9 @@ isdn_ctrl cmd; pr_debug("%s: Indicating event %s on Channel %d\n", - adapter[card]->devicename, events[event-256], Channel); + sc_adapter[card]->devicename, events[event-256], Channel); if (Data != NULL){ - pr_debug("%s: Event data: %s\n", adapter[card]->devicename, + pr_debug("%s: Event data: %s\n", sc_adapter[card]->devicename, Data); switch (event) { case ISDN_STAT_BSENT: @@ -63,7 +63,7 @@ } cmd.command = event; - cmd.driver = adapter[card]->driverId; + cmd.driver = sc_adapter[card]->driverId; cmd.arg = Channel; - return adapter[card]->card->statcallb(&cmd); + return sc_adapter[card]->card->statcallb(&cmd); } diff -Nru a/drivers/isdn/sc/hardware.h b/drivers/isdn/sc/hardware.h --- a/drivers/isdn/sc/hardware.h Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/sc/hardware.h Thu Feb 19 23:44:28 2004 @@ -108,6 +108,6 @@ #define milliseconds(x) (x/(1000/HZ)) /* Determine if a channel number is valid for the adapter */ -#define IS_VALID_CHANNEL(y,x) ((x>0) && (x <= adapter[y]->channels)) +#define IS_VALID_CHANNEL(y,x) ((x>0) && (x <= sc_adapter[y]->channels)) #endif diff -Nru a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c --- a/drivers/isdn/sc/init.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/sc/init.c Thu Feb 19 23:44:26 2004 @@ -19,7 +19,7 @@ MODULE_PARM(ram, "1-" __MODULE_STRING(MAX_CARDS) "i"); MODULE_PARM(do_reset, "i"); -board *adapter[MAX_CARDS]; +board *sc_adapter[MAX_CARDS]; int cinst; static char devname[] = "scX"; @@ -305,78 +305,84 @@ /* * Allocate the board structure */ - adapter[cinst] = kmalloc(sizeof(board), GFP_KERNEL); - if (adapter[cinst] == NULL) { + sc_adapter[cinst] = kmalloc(sizeof(board), GFP_KERNEL); + if (sc_adapter[cinst] == NULL) { /* * Oops, can't alloc memory for the board */ kfree(interface); continue; } - memset(adapter[cinst], 0, sizeof(board)); - spin_lock_init(&adapter[cinst]->lock); + memset(sc_adapter[cinst], 0, sizeof(board)); + spin_lock_init(&sc_adapter[cinst]->lock); if(!register_isdn(interface)) { /* * Oops, couldn't register for some reason */ kfree(interface); - kfree(adapter[cinst]); + kfree(sc_adapter[cinst]); continue; } - adapter[cinst]->card = interface; - adapter[cinst]->driverId = interface->channels; - strcpy(adapter[cinst]->devicename, interface->id); - adapter[cinst]->nChannels = channels; - adapter[cinst]->ramsize = memsize; - adapter[cinst]->shmem_magic = magic; - adapter[cinst]->shmem_pgport = pgport; - adapter[cinst]->StartOnReset = 1; + sc_adapter[cinst]->card = interface; + sc_adapter[cinst]->driverId = interface->channels; + strcpy(sc_adapter[cinst]->devicename, interface->id); + sc_adapter[cinst]->nChannels = channels; + sc_adapter[cinst]->ramsize = memsize; + sc_adapter[cinst]->shmem_magic = magic; + sc_adapter[cinst]->shmem_pgport = pgport; + sc_adapter[cinst]->StartOnReset = 1; /* * Allocate channels status structures */ - adapter[cinst]->channel = kmalloc(sizeof(bchan) * channels, GFP_KERNEL); - if (adapter[cinst]->channel == NULL) { + sc_adapter[cinst]->channel = kmalloc(sizeof(bchan) * channels, GFP_KERNEL); + if (sc_adapter[cinst]->channel == NULL) { /* * Oops, can't alloc memory for the channels */ indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL); /* Fix me */ kfree(interface); - kfree(adapter[cinst]); + kfree(sc_adapter[cinst]); continue; } - memset(adapter[cinst]->channel, 0, sizeof(bchan) * channels); + memset(sc_adapter[cinst]->channel, 0, sizeof(bchan) * channels); /* * Lock down the hardware resources */ - adapter[cinst]->interrupt = irq[b]; - if (request_irq(adapter[cinst]->interrupt, interrupt_handler, SA_INTERRUPT, - interface->id, NULL)) + sc_adapter[cinst]->interrupt = irq[b]; + if (request_irq(sc_adapter[cinst]->interrupt, interrupt_handler, + SA_INTERRUPT, interface->id, NULL)) { - kfree(adapter[cinst]->channel); + kfree(sc_adapter[cinst]->channel); indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL); /* Fix me */ kfree(interface); - kfree(adapter[cinst]); + kfree(sc_adapter[cinst]); continue; } - adapter[cinst]->iobase = io[b]; + sc_adapter[cinst]->iobase = io[b]; for(i = 0 ; i < MAX_IO_REGS - 1 ; i++) { - adapter[cinst]->ioport[i] = io[b] + i * 0x400; - request_region(adapter[cinst]->ioport[i], 1, interface->id); - pr_debug("Requesting I/O Port %#x\n", adapter[cinst]->ioport[i]); - } - adapter[cinst]->ioport[IRQ_SELECT] = io[b] + 0x2; - request_region(adapter[cinst]->ioport[IRQ_SELECT], 1, interface->id); - pr_debug("Requesting I/O Port %#x\n", adapter[cinst]->ioport[IRQ_SELECT]); - adapter[cinst]->rambase = ram[b]; - request_region(adapter[cinst]->rambase, SRAM_PAGESIZE, interface->id); + sc_adapter[cinst]->ioport[i] = io[b] + i * 0x400; + request_region(sc_adapter[cinst]->ioport[i], 1, + interface->id); + pr_debug("Requesting I/O Port %#x\n", + sc_adapter[cinst]->ioport[i]); + } + sc_adapter[cinst]->ioport[IRQ_SELECT] = io[b] + 0x2; + request_region(sc_adapter[cinst]->ioport[IRQ_SELECT], 1, + interface->id); + pr_debug("Requesting I/O Port %#x\n", + sc_adapter[cinst]->ioport[IRQ_SELECT]); + sc_adapter[cinst]->rambase = ram[b]; + request_region(sc_adapter[cinst]->rambase, SRAM_PAGESIZE, + interface->id); pr_info(" %s (%d) - %s %d channels IRQ %d, I/O Base 0x%x, RAM Base 0x%lx\n", - adapter[cinst]->devicename, adapter[cinst]->driverId, + sc_adapter[cinst]->devicename, + sc_adapter[cinst]->driverId, boardname[model], channels, irq[b], io[b], ram[b]); /* @@ -401,8 +407,8 @@ /* * kill the timers */ - del_timer(&(adapter[i]->reset_timer)); - del_timer(&(adapter[i]->stat_timer)); + del_timer(&(sc_adapter[i]->reset_timer)); + del_timer(&(sc_adapter[i]->stat_timer)); /* * Tell I4L we're toast @@ -413,34 +419,36 @@ /* * Release shared RAM */ - release_region(adapter[i]->rambase, SRAM_PAGESIZE); + release_region(sc_adapter[i]->rambase, SRAM_PAGESIZE); /* * Release the IRQ */ - FREE_IRQ(adapter[i]->interrupt, NULL); + FREE_IRQ(sc_adapter[i]->interrupt, NULL); /* * Reset for a clean start */ - outb(0xFF, adapter[i]->ioport[SFT_RESET]); + outb(0xFF, sc_adapter[i]->ioport[SFT_RESET]); /* * Release the I/O Port regions */ for(j = 0 ; j < MAX_IO_REGS - 1; j++) { - release_region(adapter[i]->ioport[j], 1); - pr_debug("Releasing I/O Port %#x\n", adapter[i]->ioport[j]); - } - release_region(adapter[i]->ioport[IRQ_SELECT], 1); - pr_debug("Releasing I/O Port %#x\n", adapter[i]->ioport[IRQ_SELECT]); + release_region(sc_adapter[i]->ioport[j], 1); + pr_debug("Releasing I/O Port %#x\n", + sc_adapter[i]->ioport[j]); + } + release_region(sc_adapter[i]->ioport[IRQ_SELECT], 1); + pr_debug("Releasing I/O Port %#x\n", + sc_adapter[i]->ioport[IRQ_SELECT]); /* * Release any memory we alloced */ - kfree(adapter[i]->channel); - kfree(adapter[i]->card); - kfree(adapter[i]); + kfree(sc_adapter[i]->channel); + kfree(sc_adapter[i]->card); + kfree(sc_adapter[i]); } pr_info("SpellCaster ISA ISDN Adapter Driver Unloaded.\n"); } diff -Nru a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c --- a/drivers/isdn/sc/interrupt.c Thu Feb 19 23:44:26 2004 +++ b/drivers/isdn/sc/interrupt.c Thu Feb 19 23:44:26 2004 @@ -29,14 +29,14 @@ extern void rcvpkt(int, RspMessage *); extern int cinst; -extern board *adapter[]; +extern board *sc_adapter[]; int get_card_from_irq(int irq) { int i; for(i = 0 ; i < cinst ; i++) { - if(adapter[i]->interrupt == irq) + if(sc_adapter[i]->interrupt == irq) return i; } return -1; @@ -59,7 +59,8 @@ return IRQ_NONE; } - pr_debug("%s: Entered Interrupt handler\n", adapter[card]->devicename); + pr_debug("%s: Entered Interrupt handler\n", + sc_adapter[card]->devicename); /* * Pull all of the waiting messages off the response queue @@ -69,8 +70,9 @@ * Push the message to the adapter structure for * send_and_receive to snoop */ - if(adapter[card]->want_async_messages) - memcpy(&(adapter[card]->async_msg), &rcvmsg, sizeof(RspMessage)); + if(sc_adapter[card]->want_async_messages) + memcpy(&(sc_adapter[card]->async_msg), + &rcvmsg, sizeof(RspMessage)); channel = (unsigned int) rcvmsg.phy_link_no; @@ -79,7 +81,8 @@ */ if(IS_CM_MESSAGE(rcvmsg, 0, 0, Invalid)) { pr_debug("%s: Invalid request Message, rsp_status = %d\n", - adapter[card]->devicename, rcvmsg.rsp_status); + sc_adapter[card]->devicename, + rcvmsg.rsp_status); break; } @@ -89,7 +92,7 @@ if (IS_CE_MESSAGE(rcvmsg, Lnk, 1, Read)) { pr_debug("%s: Received packet 0x%x bytes long at 0x%x\n", - adapter[card]->devicename, + sc_adapter[card]->devicename, rcvmsg.msg_data.response.msg_len, rcvmsg.msg_data.response.buff_offset); rcvpkt(card, &rcvmsg); @@ -101,9 +104,10 @@ * Handle a write acknoledgement */ if(IS_CE_MESSAGE(rcvmsg, Lnk, 1, Write)) { - pr_debug("%s: Packet Send ACK on channel %d\n", adapter[card]->devicename, + pr_debug("%s: Packet Send ACK on channel %d\n", + sc_adapter[card]->devicename, rcvmsg.phy_link_no); - adapter[card]->channel[rcvmsg.phy_link_no-1].free_sendbufs++; + sc_adapter[card]->channel[rcvmsg.phy_link_no-1].free_sendbufs++; continue; } @@ -115,7 +119,7 @@ unsigned int callid; setup_parm setup; pr_debug("%s: Connect message: line %d: status %d: cause 0x%x\n", - adapter[card]->devicename, + sc_adapter[card]->devicename, rcvmsg.phy_link_no, rcvmsg.rsp_status, rcvmsg.msg_data.byte_array[2]); @@ -123,16 +127,19 @@ memcpy(&callid,rcvmsg.msg_data.byte_array,sizeof(int)); if(callid>=0x8000 && callid<=0xFFFF) { - pr_debug("%s: Got Dial-Out Rsp\n", adapter[card]->devicename); + pr_debug("%s: Got Dial-Out Rsp\n", + sc_adapter[card]->devicename); indicate_status(card, ISDN_STAT_DCONN, (unsigned long)rcvmsg.phy_link_no-1,NULL); } else if(callid>=0x0000 && callid<=0x7FFF) { - pr_debug("%s: Got Incoming Call\n", adapter[card]->devicename); + pr_debug("%s: Got Incoming Call\n", + sc_adapter[card]->devicename); strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4])); - strcpy(setup.eazmsn,adapter[card]->channel[rcvmsg.phy_link_no-1].dn); + strcpy(setup.eazmsn, + sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn); setup.si1 = 7; setup.si2 = 0; setup.plan = 0; @@ -150,7 +157,7 @@ if (IS_CE_MESSAGE(rcvmsg, Phy, 1, Disconnect)) { pr_debug("%s: disconnect message: line %d: status %d: cause 0x%x\n", - adapter[card]->devicename, + sc_adapter[card]->devicename, rcvmsg.phy_link_no, rcvmsg.rsp_status, rcvmsg.msg_data.byte_array[2]); @@ -165,15 +172,16 @@ * Handle a startProc engine up message */ if (IS_CM_MESSAGE(rcvmsg, 5, 0, MiscEngineUp)) { - pr_debug("%s: Received EngineUp message\n", adapter[card]->devicename); - adapter[card]->EngineUp = 1; + pr_debug("%s: Received EngineUp message\n", + sc_adapter[card]->devicename); + sc_adapter[card]->EngineUp = 1; sendmessage(card, CEPID,ceReqTypeCall,ceReqClass0,ceReqCallGetMyNumber,1,0,NULL); sendmessage(card, CEPID,ceReqTypeCall,ceReqClass0,ceReqCallGetMyNumber,2,0,NULL); - init_timer(&adapter[card]->stat_timer); - adapter[card]->stat_timer.function = check_phystat; - adapter[card]->stat_timer.data = card; - adapter[card]->stat_timer.expires = jiffies + CHECKSTAT_TIME; - add_timer(&adapter[card]->stat_timer); + init_timer(&sc_adapter[card]->stat_timer); + sc_adapter[card]->stat_timer.function = check_phystat; + sc_adapter[card]->stat_timer.data = card; + sc_adapter[card]->stat_timer.expires = jiffies + CHECKSTAT_TIME; + add_timer(&sc_adapter[card]->stat_timer); continue; } @@ -181,7 +189,8 @@ * Start proc response */ if (IS_CM_MESSAGE(rcvmsg, 2, 0, StartProc)) { - pr_debug("%s: StartProc Response Status %d\n", adapter[card]->devicename, + pr_debug("%s: StartProc Response Status %d\n", + sc_adapter[card]->devicename, rcvmsg.rsp_status); continue; } @@ -190,7 +199,7 @@ * Handle a GetMyNumber Rsp */ if (IS_CE_MESSAGE(rcvmsg,Call,0,GetMyNumber)){ - strcpy(adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array); + strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array); continue; } @@ -206,9 +215,10 @@ b1stat = (unsigned int) rcvmsg.msg_data.byte_array[0]; b2stat = (unsigned int) rcvmsg.msg_data.byte_array[1]; - adapter[card]->nphystat = (b2stat >> 8) | b1stat; /* endian?? */ - pr_debug("%s: PhyStat is 0x%2x\n", adapter[card]->devicename, - adapter[card]->nphystat); + sc_adapter[card]->nphystat = (b2stat >> 8) | b1stat; /* endian?? */ + pr_debug("%s: PhyStat is 0x%2x\n", + sc_adapter[card]->devicename, + sc_adapter[card]->nphystat); continue; } @@ -223,7 +233,7 @@ * Set board format to HDLC if it wasn't already */ pr_debug("%s: current frame format: 0x%x, will change to HDLC\n", - adapter[card]->devicename, + sc_adapter[card]->devicename, rcvmsg.msg_data.byte_array[0]); sendmessage(card, CEPID, ceReqTypeCall, ceReqClass0, @@ -238,11 +248,13 @@ * Hmm... */ pr_debug("%s: Received unhandled message (%d,%d,%d) link %d\n", - adapter[card]->devicename, rcvmsg.type, rcvmsg.class, rcvmsg.code, + sc_adapter[card]->devicename, + rcvmsg.type, rcvmsg.class, rcvmsg.code, rcvmsg.phy_link_no); } /* while */ - pr_debug("%s: Exiting Interrupt Handler\n", adapter[card]->devicename); + pr_debug("%s: Exiting Interrupt Handler\n", + sc_adapter[card]->devicename); return IRQ_HANDLED; } diff -Nru a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c --- a/drivers/isdn/sc/ioctl.c Thu Feb 19 23:44:25 2004 +++ b/drivers/isdn/sc/ioctl.c Thu Feb 19 23:44:25 2004 @@ -20,7 +20,7 @@ unsigned char,unsigned char, unsigned char, unsigned char *, RspMessage *, int); -extern board *adapter[]; +extern board *sc_adapter[]; int GetStatus(int card, boardInfo *); @@ -33,8 +33,9 @@ switch(data->command) { case SCIOCRESET: /* Perform a hard reset of the adapter */ { - pr_debug("%s: SCIOCRESET: ioctl received\n", adapter[card]->devicename); - adapter[card]->StartOnReset = 0; + pr_debug("%s: SCIOCRESET: ioctl received\n", + sc_adapter[card]->devicename); + sc_adapter[card]->StartOnReset = 0; return (reset(card)); } @@ -44,10 +45,11 @@ char srec[SCIOC_SRECSIZE]; int status; - pr_debug("%s: SCIOLOAD: ioctl received\n", adapter[card]->devicename); - if(adapter[card]->EngineUp) { + pr_debug("%s: SCIOLOAD: ioctl received\n", + sc_adapter[card]->devicename); + if(sc_adapter[card]->EngineUp) { pr_debug("%s: SCIOCLOAD: command failed, LoadProc while engine running.\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return -1; } @@ -61,25 +63,27 @@ 0, sizeof(srec), srec, &rcvmsg, SAR_TIMEOUT); if(status) { pr_debug("%s: SCIOCLOAD: command failed, status = %d\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return -1; } else { - pr_debug("%s: SCIOCLOAD: command successful\n", adapter[card]->devicename); + pr_debug("%s: SCIOCLOAD: command successful\n", + sc_adapter[card]->devicename); return 0; } } case SCIOCSTART: { - pr_debug("%s: SCIOSTART: ioctl received\n", adapter[card]->devicename); - if(adapter[card]->EngineUp) { + pr_debug("%s: SCIOSTART: ioctl received\n", + sc_adapter[card]->devicename); + if(sc_adapter[card]->EngineUp) { pr_debug("%s: SCIOCSTART: command failed, engine already running.\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return -1; } - adapter[card]->StartOnReset = 1; + sc_adapter[card]->StartOnReset = 1; startproc(card); return 0; } @@ -90,7 +94,8 @@ char switchtype; int status; - pr_debug("%s: SCIOSETSWITCH: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOSETSWITCH: ioctl received\n", + sc_adapter[card]->devicename); /* * Get the switch type from user space @@ -99,17 +104,19 @@ sizeof(char))) return -EFAULT; - pr_debug("%s: SCIOCSETSWITCH: setting switch type to %d\n", adapter[card]->devicename, + pr_debug("%s: SCIOCSETSWITCH: setting switch type to %d\n", + sc_adapter[card]->devicename, switchtype); status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallSetSwitchType, 0, sizeof(char),&switchtype,&rcvmsg, SAR_TIMEOUT); if(!status && !rcvmsg.rsp_status) { - pr_debug("%s: SCIOCSETSWITCH: command successful\n", adapter[card]->devicename); + pr_debug("%s: SCIOCSETSWITCH: command successful\n", + sc_adapter[card]->devicename); return 0; } else { pr_debug("%s: SCIOCSETSWITCH: command failed (status = %d)\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return status; } } @@ -120,7 +127,8 @@ char switchtype; int status; - pr_debug("%s: SCIOGETSWITCH: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOGETSWITCH: ioctl received\n", + sc_adapter[card]->devicename); /* * Get the switch type from the board @@ -128,11 +136,12 @@ status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetSwitchType, 0, 0, 0, &rcvmsg, SAR_TIMEOUT); if (!status && !rcvmsg.rsp_status) { - pr_debug("%s: SCIOCGETSWITCH: command successful\n", adapter[card]->devicename); + pr_debug("%s: SCIOCGETSWITCH: command successful\n", + sc_adapter[card]->devicename); } else { pr_debug("%s: SCIOCGETSWITCH: command failed (status = %d)\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return status; } @@ -154,7 +163,8 @@ char spid[SCIOC_SPIDSIZE]; int status; - pr_debug("%s: SCIOGETSPID: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOGETSPID: ioctl received\n", + sc_adapter[card]->devicename); /* * Get the spid from the board @@ -162,11 +172,12 @@ status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetSPID, data->channel, 0, 0, &rcvmsg, SAR_TIMEOUT); if (!status) { - pr_debug("%s: SCIOCGETSPID: command successful\n", adapter[card]->devicename); + pr_debug("%s: SCIOCGETSPID: command successful\n", + sc_adapter[card]->devicename); } else { pr_debug("%s: SCIOCGETSPID: command failed (status = %d)\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return status; } strcpy(spid, rcvmsg.msg_data.byte_array); @@ -186,7 +197,8 @@ char spid[SCIOC_SPIDSIZE]; int status; - pr_debug("%s: DCBIOSETSPID: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: DCBIOSETSPID: ioctl received\n", + sc_adapter[card]->devicename); /* * Get the spid from user space @@ -195,18 +207,18 @@ return -EFAULT; pr_debug("%s: SCIOCSETSPID: setting channel %d spid to %s\n", - adapter[card]->devicename, data->channel, spid); + sc_adapter[card]->devicename, data->channel, spid); status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallSetSPID, data->channel, strlen(spid), spid, &rcvmsg, SAR_TIMEOUT); if(!status && !rcvmsg.rsp_status) { pr_debug("%s: SCIOCSETSPID: command successful\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return 0; } else { pr_debug("%s: SCIOCSETSPID: command failed (status = %d)\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return status; } } @@ -217,7 +229,8 @@ char dn[SCIOC_DNSIZE]; int status; - pr_debug("%s: SCIOGETDN: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOGETDN: ioctl received\n", + sc_adapter[card]->devicename); /* * Get the dn from the board @@ -225,11 +238,12 @@ status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetMyNumber, data->channel, 0, 0, &rcvmsg, SAR_TIMEOUT); if (!status) { - pr_debug("%s: SCIOCGETDN: command successful\n", adapter[card]->devicename); + pr_debug("%s: SCIOCGETDN: command successful\n", + sc_adapter[card]->devicename); } else { pr_debug("%s: SCIOCGETDN: command failed (status = %d)\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return status; } @@ -250,7 +264,8 @@ char dn[SCIOC_DNSIZE]; int status; - pr_debug("%s: SCIOSETDN: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOSETDN: ioctl received\n", + sc_adapter[card]->devicename); /* * Get the spid from user space @@ -259,35 +274,38 @@ return -EFAULT; pr_debug("%s: SCIOCSETDN: setting channel %d dn to %s\n", - adapter[card]->devicename, data->channel, dn); + sc_adapter[card]->devicename, data->channel, dn); status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallSetMyNumber, data->channel, strlen(dn),dn,&rcvmsg, SAR_TIMEOUT); if(!status && !rcvmsg.rsp_status) { pr_debug("%s: SCIOCSETDN: command successful\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return 0; } else { pr_debug("%s: SCIOCSETDN: command failed (status = %d)\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return status; } } case SCIOCTRACE: - pr_debug("%s: SCIOTRACE: ioctl received\n", adapter[card]->devicename); -/* adapter[card]->trace = !adapter[card]->trace; - pr_debug("%s: SCIOCTRACE: tracing turned %s\n", adapter[card]->devicename, - adapter[card]->trace ? "ON" : "OFF"); */ + pr_debug("%s: SCIOTRACE: ioctl received\n", + sc_adapter[card]->devicename); +/* sc_adapter[card]->trace = !sc_adapter[card]->trace; + pr_debug("%s: SCIOCTRACE: tracing turned %s\n", + sc_adapter[card]->devicename, + sc_adapter[card]->trace ? "ON" : "OFF"); */ break; case SCIOCSTAT: { boardInfo bi; - pr_debug("%s: SCIOSTAT: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOSTAT: ioctl received\n", + sc_adapter[card]->devicename); GetStatus(card, &bi); if (copy_to_user((boardInfo *)data->dataptr, &bi, @@ -303,7 +321,8 @@ char speed; int status; - pr_debug("%s: SCIOGETSPEED: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOGETSPEED: ioctl received\n", + sc_adapter[card]->devicename); /* * Get the speed from the board @@ -312,11 +331,11 @@ ceReqCallGetCallType, data->channel, 0, 0, &rcvmsg, SAR_TIMEOUT); if (!status && !rcvmsg.rsp_status) { pr_debug("%s: SCIOCGETSPEED: command successful\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); } else { pr_debug("%s: SCIOCGETSPEED: command failed (status = %d)\n", - adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return status; } @@ -332,11 +351,13 @@ } case SCIOCSETSPEED: - pr_debug("%s: SCIOCSETSPEED: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOCSETSPEED: ioctl received\n", + sc_adapter[card]->devicename); break; case SCIOCLOOPTST: - pr_debug("%s: SCIOCLOOPTST: ioctl received\n", adapter[card]->devicename); + pr_debug("%s: SCIOCLOOPTST: ioctl received\n", + sc_adapter[card]->devicename); break; default: @@ -354,16 +375,16 @@ /* * Fill in some of the basic info about the board */ - bi->modelid = adapter[card]->model; - strcpy(bi->serial_no, adapter[card]->hwconfig.serial_no); - strcpy(bi->part_no, adapter[card]->hwconfig.part_no); - bi->iobase = adapter[card]->iobase; - bi->rambase = adapter[card]->rambase; - bi->irq = adapter[card]->interrupt; - bi->ramsize = adapter[card]->hwconfig.ram_size; - bi->interface = adapter[card]->hwconfig.st_u_sense; - strcpy(bi->load_ver, adapter[card]->load_ver); - strcpy(bi->proc_ver, adapter[card]->proc_ver); + bi->modelid = sc_adapter[card]->model; + strcpy(bi->serial_no, sc_adapter[card]->hwconfig.serial_no); + strcpy(bi->part_no, sc_adapter[card]->hwconfig.part_no); + bi->iobase = sc_adapter[card]->iobase; + bi->rambase = sc_adapter[card]->rambase; + bi->irq = sc_adapter[card]->interrupt; + bi->ramsize = sc_adapter[card]->hwconfig.ram_size; + bi->interface = sc_adapter[card]->hwconfig.st_u_sense; + strcpy(bi->load_ver, sc_adapter[card]->load_ver); + strcpy(bi->proc_ver, sc_adapter[card]->proc_ver); /* * Get the current PhyStats and LnkStats @@ -371,7 +392,7 @@ status = send_and_receive(card, CEPID, ceReqTypePhy, ceReqClass2, ceReqPhyStatus, 0, 0, NULL, &rcvmsg, SAR_TIMEOUT); if(!status) { - if(adapter[card]->model < PRI_BOARD) { + if(sc_adapter[card]->model < PRI_BOARD) { bi->l1_status = rcvmsg.msg_data.byte_array[2]; for(i = 0 ; i < BRI_CHANNELS ; i++) bi->status.bristats[i].phy_stat = @@ -389,11 +410,11 @@ /* * Get the call types for each channel */ - for (i = 0 ; i < adapter[card]->nChannels ; i++) { + for (i = 0 ; i < sc_adapter[card]->nChannels ; i++) { status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetCallType, 0, 0, NULL, &rcvmsg, SAR_TIMEOUT); if(!status) { - if (adapter[card]->model == PRI_BOARD) { + if (sc_adapter[card]->model == PRI_BOARD) { bi->status.pristats[i].call_type = rcvmsg.msg_data.byte_array[0]; } @@ -407,7 +428,7 @@ /* * If PRI, get the call states and service states for each channel */ - if (adapter[card]->model == PRI_BOARD) { + if (sc_adapter[card]->model == PRI_BOARD) { /* * Get the call states */ diff -Nru a/drivers/isdn/sc/message.c b/drivers/isdn/sc/message.c --- a/drivers/isdn/sc/message.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/sc/message.c Thu Feb 19 23:44:27 2004 @@ -22,7 +22,7 @@ #include "message.h" #include "card.h" -extern board *adapter[]; +extern board *sc_adapter[]; extern unsigned int cinst; /* @@ -46,31 +46,32 @@ return -EINVAL; } - pr_debug("%s: Entered receivemessage\n",adapter[card]->devicename); + pr_debug("%s: Entered receivemessage\n", + sc_adapter[card]->devicename); /* * See if there are messages waiting */ - if (inb(adapter[card]->ioport[FIFO_STATUS]) & RF_HAS_DATA) { + if (inb(sc_adapter[card]->ioport[FIFO_STATUS]) & RF_HAS_DATA) { /* * Map in the DPM to the base page and copy the message */ - spin_lock_irqsave(&adapter[card]->lock, flags); - outb((adapter[card]->shmem_magic >> 14) | 0x80, - adapter[card]->ioport[adapter[card]->shmem_pgport]); - dpm = (DualPortMemory *) adapter[card]->rambase; + spin_lock_irqsave(&sc_adapter[card]->lock, flags); + outb((sc_adapter[card]->shmem_magic >> 14) | 0x80, + sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]); + dpm = (DualPortMemory *) sc_adapter[card]->rambase; memcpy_fromio(rspmsg, &(dpm->rsp_queue[dpm->rsp_tail]), MSG_LEN); dpm->rsp_tail = (dpm->rsp_tail+1) % MAX_MESSAGES; - inb(adapter[card]->ioport[FIFO_READ]); - spin_unlock_irqrestore(&adapter[card]->lock, flags); + inb(sc_adapter[card]->ioport[FIFO_READ]); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); /* * Tell the board that the message is received */ pr_debug("%s: Received Message seq:%d pid:%d time:%d cmd:%d " "cnt:%d (type,class,code):(%d,%d,%d) " "link:%d stat:0x%x\n", - adapter[card]->devicename, + sc_adapter[card]->devicename, rspmsg->sequence_no, rspmsg->process_id, rspmsg->time_stamp, @@ -112,15 +113,15 @@ * Make sure we only send CEPID messages when the engine is up * and CMPID messages when it is down */ - if(adapter[card]->EngineUp && procid == CMPID) { + if(sc_adapter[card]->EngineUp && procid == CMPID) { pr_debug("%s: Attempt to send CM message with engine up\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return -ESRCH; } - if(!adapter[card]->EngineUp && procid == CEPID) { + if(!sc_adapter[card]->EngineUp && procid == CEPID) { pr_debug("%s: Attempt to send CE message with engine down\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return -ESRCH; } @@ -139,30 +140,30 @@ } sndmsg.process_id = procid; - sndmsg.sequence_no = adapter[card]->seq_no++ % 256; + sndmsg.sequence_no = sc_adapter[card]->seq_no++ % 256; /* * wait for an empty slot in the queue */ - while (!(inb(adapter[card]->ioport[FIFO_STATUS]) & WF_NOT_FULL)) + while (!(inb(sc_adapter[card]->ioport[FIFO_STATUS]) & WF_NOT_FULL)) udelay(1); /* * Disable interrupts and map in shared memory */ - spin_lock_irqsave(&adapter[card]->lock, flags); - outb((adapter[card]->shmem_magic >> 14) | 0x80, - adapter[card]->ioport[adapter[card]->shmem_pgport]); - dpm = (DualPortMemory *) adapter[card]->rambase; /* Fix me */ + spin_lock_irqsave(&sc_adapter[card]->lock, flags); + outb((sc_adapter[card]->shmem_magic >> 14) | 0x80, + sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]); + dpm = (DualPortMemory *) sc_adapter[card]->rambase; /* Fix me */ memcpy_toio(&(dpm->req_queue[dpm->req_head]),&sndmsg,MSG_LEN); dpm->req_head = (dpm->req_head+1) % MAX_MESSAGES; - outb(sndmsg.sequence_no, adapter[card]->ioport[FIFO_WRITE]); - spin_unlock_irqrestore(&adapter[card]->lock, flags); + outb(sndmsg.sequence_no, sc_adapter[card]->ioport[FIFO_WRITE]); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); pr_debug("%s: Sent Message seq:%d pid:%d time:%d " "cnt:%d (type,class,code):(%d,%d,%d) " "link:%d\n ", - adapter[card]->devicename, + sc_adapter[card]->devicename, sndmsg.sequence_no, sndmsg.process_id, sndmsg.time_stamp, @@ -194,14 +195,14 @@ return -EINVAL; } - adapter[card]->want_async_messages = 1; + sc_adapter[card]->want_async_messages = 1; retval = sendmessage(card, procid, type, class, code, link, data_len, (unsigned int *) data); if (retval) { pr_debug("%s: SendMessage failed in SAR\n", - adapter[card]->devicename); - adapter[card]->want_async_messages = 0; + sc_adapter[card]->devicename); + sc_adapter[card]->want_async_messages = 0; return -EIO; } @@ -216,26 +217,26 @@ /* * See if we got our message back */ - if ((adapter[card]->async_msg.type == type) && - (adapter[card]->async_msg.class == class) && - (adapter[card]->async_msg.code == code) && - (adapter[card]->async_msg.phy_link_no == link)) { + if ((sc_adapter[card]->async_msg.type == type) && + (sc_adapter[card]->async_msg.class == class) && + (sc_adapter[card]->async_msg.code == code) && + (sc_adapter[card]->async_msg.phy_link_no == link)) { /* * Got it! */ pr_debug("%s: Got ASYNC message\n", - adapter[card]->devicename); - memcpy(mesgdata, &(adapter[card]->async_msg), + sc_adapter[card]->devicename); + memcpy(mesgdata, &(sc_adapter[card]->async_msg), sizeof(RspMessage)); - adapter[card]->want_async_messages = 0; + sc_adapter[card]->want_async_messages = 0; return 0; } tries++; } - pr_debug("%s: SAR message timeout\n", adapter[card]->devicename); - adapter[card]->want_async_messages = 0; + pr_debug("%s: SAR message timeout\n", sc_adapter[card]->devicename); + sc_adapter[card]->want_async_messages = 0; return -ETIME; } diff -Nru a/drivers/isdn/sc/packet.c b/drivers/isdn/sc/packet.c --- a/drivers/isdn/sc/packet.c Thu Feb 19 23:44:28 2004 +++ b/drivers/isdn/sc/packet.c Thu Feb 19 23:44:28 2004 @@ -20,7 +20,7 @@ #include "message.h" #include "card.h" -extern board *adapter[]; +extern board *sc_adapter[]; extern unsigned int cinst; extern int get_card_from_id(int); @@ -45,26 +45,29 @@ } pr_debug("%s: sndpkt: frst = 0x%x nxt = %d f = %d n = %d\n", - adapter[card]->devicename, - adapter[card]->channel[channel].first_sendbuf, - adapter[card]->channel[channel].next_sendbuf, - adapter[card]->channel[channel].free_sendbufs, - adapter[card]->channel[channel].num_sendbufs); - - if(!adapter[card]->channel[channel].free_sendbufs) { - pr_debug("%s: out of TX buffers\n", adapter[card]->devicename); + sc_adapter[card]->devicename, + sc_adapter[card]->channel[channel].first_sendbuf, + sc_adapter[card]->channel[channel].next_sendbuf, + sc_adapter[card]->channel[channel].free_sendbufs, + sc_adapter[card]->channel[channel].num_sendbufs); + + if(!sc_adapter[card]->channel[channel].free_sendbufs) { + pr_debug("%s: out of TX buffers\n", + sc_adapter[card]->devicename); return -EINVAL; } if(data->len > BUFFER_SIZE) { - pr_debug("%s: data overflows buffer size (data > buffer)\n", adapter[card]->devicename); + pr_debug("%s: data overflows buffer size (data > buffer)\n", + sc_adapter[card]->devicename); return -EINVAL; } - ReqLnkWrite.buff_offset = adapter[card]->channel[channel].next_sendbuf * - BUFFER_SIZE + adapter[card]->channel[channel].first_sendbuf; + ReqLnkWrite.buff_offset = sc_adapter[card]->channel[channel].next_sendbuf * + BUFFER_SIZE + sc_adapter[card]->channel[channel].first_sendbuf; ReqLnkWrite.msg_len = data->len; /* sk_buff size */ - pr_debug("%s: writing %d bytes to buffer offset 0x%x\n", adapter[card]->devicename, + pr_debug("%s: writing %d bytes to buffer offset 0x%x\n", + sc_adapter[card]->devicename, ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset); memcpy_toshmem(card, (char *)ReqLnkWrite.buff_offset, data->data, ReqLnkWrite.msg_len); @@ -72,24 +75,25 @@ * sendmessage */ pr_debug("%s: sndpkt size=%d, buf_offset=0x%x buf_indx=%d\n", - adapter[card]->devicename, + sc_adapter[card]->devicename, ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset, - adapter[card]->channel[channel].next_sendbuf); + sc_adapter[card]->channel[channel].next_sendbuf); status = sendmessage(card, CEPID, ceReqTypeLnk, ceReqClass1, ceReqLnkWrite, channel+1, sizeof(LLData), (unsigned int*)&ReqLnkWrite); len = data->len; if(status) { - pr_debug("%s: failed to send packet, status = %d\n", adapter[card]->devicename, status); + pr_debug("%s: failed to send packet, status = %d\n", + sc_adapter[card]->devicename, status); return -1; } else { - adapter[card]->channel[channel].free_sendbufs--; - adapter[card]->channel[channel].next_sendbuf = - ++adapter[card]->channel[channel].next_sendbuf == - adapter[card]->channel[channel].num_sendbufs ? 0 : - adapter[card]->channel[channel].next_sendbuf; - pr_debug("%s: packet sent successfully\n", adapter[card]->devicename); + sc_adapter[card]->channel[channel].free_sendbufs--; + sc_adapter[card]->channel[channel].next_sendbuf = + ++sc_adapter[card]->channel[channel].next_sendbuf == + sc_adapter[card]->channel[channel].num_sendbufs ? 0 : + sc_adapter[card]->channel[channel].next_sendbuf; + pr_debug("%s: packet sent successfully\n", sc_adapter[card]->devicename); dev_kfree_skb(data); indicate_status(card,ISDN_STAT_BSENT,channel, (char *)&len); } @@ -110,33 +114,37 @@ case 0x01: case 0x02: case 0x70: - pr_debug("%s: error status code: 0x%x\n", adapter[card]->devicename, rcvmsg->rsp_status); + pr_debug("%s: error status code: 0x%x\n", + sc_adapter[card]->devicename, rcvmsg->rsp_status); return; case 0x00: if (!(skb = dev_alloc_skb(rcvmsg->msg_data.response.msg_len))) { printk(KERN_WARNING "%s: rcvpkt out of memory, dropping packet\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); return; } skb_put(skb, rcvmsg->msg_data.response.msg_len); pr_debug("%s: getting data from offset: 0x%x\n", - adapter[card]->devicename,rcvmsg->msg_data.response.buff_offset); + sc_adapter[card]->devicename, + rcvmsg->msg_data.response.buff_offset); memcpy_fromshmem(card, skb_put(skb, rcvmsg->msg_data.response.msg_len), (char *)rcvmsg->msg_data.response.buff_offset, rcvmsg->msg_data.response.msg_len); - adapter[card]->card->rcvcallb_skb(adapter[card]->driverId, + sc_adapter[card]->card->rcvcallb_skb(sc_adapter[card]->driverId, rcvmsg->phy_link_no-1, skb); case 0x03: /* * Recycle the buffer */ - pr_debug("%s: buffer size : %d\n", adapter[card]->devicename, BUFFER_SIZE); + pr_debug("%s: buffer size : %d\n", + sc_adapter[card]->devicename, BUFFER_SIZE); /* memset_shmem(card, rcvmsg->msg_data.response.buff_offset, 0, BUFFER_SIZE); */ newll.buff_offset = rcvmsg->msg_data.response.buff_offset; newll.msg_len = BUFFER_SIZE; - pr_debug("%s: recycled buffer at offset 0x%x size %d\n", adapter[card]->devicename, + pr_debug("%s: recycled buffer at offset 0x%x size %d\n", + sc_adapter[card]->devicename, newll.buff_offset, newll.msg_len); sendmessage(card, CEPID, ceReqTypeLnk, ceReqClass1, ceReqLnkRead, rcvmsg->phy_link_no, sizeof(LLData), (unsigned int *)&newll); @@ -158,40 +166,45 @@ /* * Calculate the buffer offsets (send/recv/send/recv) */ - pr_debug("%s: setting up channel buffer space in shared RAM\n", adapter[card]->devicename); + pr_debug("%s: setting up channel buffer space in shared RAM\n", + sc_adapter[card]->devicename); buffer_size = BUFFER_SIZE; - nBuffers = ((adapter[card]->ramsize - BUFFER_BASE) / buffer_size) / 2; + nBuffers = ((sc_adapter[card]->ramsize - BUFFER_BASE) / buffer_size) / 2; nBuffers = nBuffers > BUFFERS_MAX ? BUFFERS_MAX : nBuffers; - pr_debug("%s: calculating buffer space: %d buffers, %d big\n", adapter[card]->devicename, + pr_debug("%s: calculating buffer space: %d buffers, %d big\n", + sc_adapter[card]->devicename, nBuffers, buffer_size); if(nBuffers < 2) { - pr_debug("%s: not enough buffer space\n", adapter[card]->devicename); + pr_debug("%s: not enough buffer space\n", + sc_adapter[card]->devicename); return -1; } cBase = (nBuffers * buffer_size) * (c - 1); - pr_debug("%s: channel buffer offset from shared RAM: 0x%x\n", adapter[card]->devicename, cBase); - adapter[card]->channel[c-1].first_sendbuf = BUFFER_BASE + cBase; - adapter[card]->channel[c-1].num_sendbufs = nBuffers / 2; - adapter[card]->channel[c-1].free_sendbufs = nBuffers / 2; - adapter[card]->channel[c-1].next_sendbuf = 0; + pr_debug("%s: channel buffer offset from shared RAM: 0x%x\n", + sc_adapter[card]->devicename, cBase); + sc_adapter[card]->channel[c-1].first_sendbuf = BUFFER_BASE + cBase; + sc_adapter[card]->channel[c-1].num_sendbufs = nBuffers / 2; + sc_adapter[card]->channel[c-1].free_sendbufs = nBuffers / 2; + sc_adapter[card]->channel[c-1].next_sendbuf = 0; pr_debug("%s: send buffer setup complete: first=0x%x n=%d f=%d, nxt=%d\n", - adapter[card]->devicename, - adapter[card]->channel[c-1].first_sendbuf, - adapter[card]->channel[c-1].num_sendbufs, - adapter[card]->channel[c-1].free_sendbufs, - adapter[card]->channel[c-1].next_sendbuf); + sc_adapter[card]->devicename, + sc_adapter[card]->channel[c-1].first_sendbuf, + sc_adapter[card]->channel[c-1].num_sendbufs, + sc_adapter[card]->channel[c-1].free_sendbufs, + sc_adapter[card]->channel[c-1].next_sendbuf); /* * Prep the receive buffers */ - pr_debug("%s: adding %d RecvBuffers:\n", adapter[card]->devicename, nBuffers /2); + pr_debug("%s: adding %d RecvBuffers:\n", + sc_adapter[card]->devicename, nBuffers /2); for (i = 0 ; i < nBuffers / 2; i++) { RcvBuffOffset.buff_offset = - ((adapter[card]->channel[c-1].first_sendbuf + + ((sc_adapter[card]->channel[c-1].first_sendbuf + (nBuffers / 2) * buffer_size) + (buffer_size * i)); RcvBuffOffset.msg_len = buffer_size; pr_debug("%s: adding RcvBuffer #%d offset=0x%x sz=%d bufsz:%d\n", - adapter[card]->devicename, + sc_adapter[card]->devicename, i + 1, RcvBuffOffset.buff_offset, RcvBuffOffset.msg_len,buffer_size); sendmessage(card, CEPID, ceReqTypeLnk, ceReqClass1, ceReqLnkRead, @@ -202,11 +215,11 @@ int print_skb(int card,char *skb_p, int len){ int i,data; - pr_debug("%s: data at 0x%x len: 0x%x\n",adapter[card]->devicename, + pr_debug("%s: data at 0x%x len: 0x%x\n", sc_adapter[card]->devicename, skb_p,len); for(i=1;i<=len;i++,skb_p++){ data = (int) (0xff & (*skb_p)); - pr_debug("%s: data = 0x%x",adapter[card]->devicename,data); + pr_debug("%s: data = 0x%x", sc_adapter[card]->devicename,data); if(!(i%4)) pr_debug(" "); if(!(i%32)) diff -Nru a/drivers/isdn/sc/shmem.c b/drivers/isdn/sc/shmem.c --- a/drivers/isdn/sc/shmem.c Thu Feb 19 23:44:24 2004 +++ b/drivers/isdn/sc/shmem.c Thu Feb 19 23:44:24 2004 @@ -24,7 +24,7 @@ /* * Main adapter array */ -extern board *adapter[]; +extern board *sc_adapter[]; extern int cinst; /* @@ -49,21 +49,23 @@ * determine the page to load from the address */ ch = (unsigned long) dest / SRAM_PAGESIZE; - pr_debug("%s: loaded page %d\n",adapter[card]->devicename,ch); + pr_debug("%s: loaded page %d\n", sc_adapter[card]->devicename,ch); /* * Block interrupts and load the page */ - spin_lock_irqsave(&adapter[card]->lock, flags); + spin_lock_irqsave(&sc_adapter[card]->lock, flags); - outb(((adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80, - adapter[card]->ioport[adapter[card]->shmem_pgport]); - ret = memcpy_toio(adapter[card]->rambase + + outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80, + sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]); + ret = memcpy_toio(sc_adapter[card]->rambase + ((unsigned long) dest % 0x4000), src, n); - spin_unlock_irqrestore(&adapter[card]->lock, flags); - pr_debug("%s: set page to %#x\n",adapter[card]->devicename, - ((adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); - pr_debug("%s: copying %d bytes from %#x to %#x\n",adapter[card]->devicename, n, - (unsigned long) src, adapter[card]->rambase + ((unsigned long) dest %0x4000)); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); + pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename, + ((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); + pr_debug("%s: copying %d bytes from %#x to %#x\n", + sc_adapter[card]->devicename, n, + (unsigned long) src, + sc_adapter[card]->rambase + ((unsigned long) dest %0x4000)); return ret; } @@ -90,24 +92,24 @@ * determine the page to load from the address */ ch = (unsigned long) src / SRAM_PAGESIZE; - pr_debug("%s: loaded page %d\n",adapter[card]->devicename,ch); + pr_debug("%s: loaded page %d\n", sc_adapter[card]->devicename,ch); /* * Block interrupts and load the page */ - spin_lock_irqsave(&adapter[card]->lock, flags); + spin_lock_irqsave(&sc_adapter[card]->lock, flags); - outb(((adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80, - adapter[card]->ioport[adapter[card]->shmem_pgport]); - ret = memcpy_fromio(dest,(void *)(adapter[card]->rambase + + outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80, + sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]); + ret = memcpy_fromio(dest,(void *)(sc_adapter[card]->rambase + ((unsigned long) src % 0x4000)), n); - spin_unlock_irqrestore(&adapter[card]->lock, flags); - pr_debug("%s: set page to %#x\n",adapter[card]->devicename, - ((adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); + pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename, + ((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); /* pr_debug("%s: copying %d bytes from %#x to %#x\n", - adapter[card]->devicename, n, - adapter[card]->rambase + ((unsigned long) src %0x4000), (unsigned long) dest); */ + sc_adapter[card]->devicename, n, + sc_adapter[card]->rambase + ((unsigned long) src %0x4000), (unsigned long) dest); */ return ret; } @@ -131,20 +133,20 @@ * determine the page to load from the address */ ch = (unsigned long) dest / SRAM_PAGESIZE; - pr_debug("%s: loaded page %d\n",adapter[card]->devicename,ch); + pr_debug("%s: loaded page %d\n",sc_adapter[card]->devicename,ch); /* * Block interrupts and load the page */ - spin_lock_irqsave(&adapter[card]->lock, flags); + spin_lock_irqsave(&sc_adapter[card]->lock, flags); - outb(((adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80, - adapter[card]->ioport[adapter[card]->shmem_pgport]); - ret = memset_io(adapter[card]->rambase + + outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80, + sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]); + ret = memset_io(sc_adapter[card]->rambase + ((unsigned long) dest % 0x4000), c, n); - pr_debug("%s: set page to %#x\n",adapter[card]->devicename, - ((adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); - spin_unlock_irqrestore(&adapter[card]->lock, flags); + pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename, + ((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); return ret; } diff -Nru a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c --- a/drivers/isdn/sc/timer.c Thu Feb 19 23:44:27 2004 +++ b/drivers/isdn/sc/timer.c Thu Feb 19 23:44:27 2004 @@ -20,7 +20,7 @@ #include "message.h" #include "card.h" -extern board *adapter[]; +extern board *sc_adapter[]; extern void flushreadfifo(int); extern int startproc(int); @@ -35,11 +35,11 @@ void setup_ports(int card) { - outb((adapter[card]->rambase >> 12), adapter[card]->ioport[EXP_BASE]); + outb((sc_adapter[card]->rambase >> 12), sc_adapter[card]->ioport[EXP_BASE]); /* And the IRQ */ - outb((adapter[card]->interrupt | 0x80), - adapter[card]->ioport[IRQ_SELECT]); + outb((sc_adapter[card]->interrupt | 0x80), + sc_adapter[card]->ioport[IRQ_SELECT]); } /* @@ -57,28 +57,29 @@ unsigned long sig; int card = (unsigned int) data; - pr_debug("%s: check_timer timer called\n", adapter[card]->devicename); + pr_debug("%s: check_timer timer called\n", + sc_adapter[card]->devicename); /* Setup the io ports */ setup_ports(card); - spin_lock_irqsave(&adapter[card]->lock, flags); - outb(adapter[card]->ioport[adapter[card]->shmem_pgport], - (adapter[card]->shmem_magic>>14) | 0x80); - sig = (unsigned long) *((unsigned long *)(adapter[card]->rambase + SIG_OFFSET)); + spin_lock_irqsave(&sc_adapter[card]->lock, flags); + outb(sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport], + (sc_adapter[card]->shmem_magic>>14) | 0x80); + sig = (unsigned long) *((unsigned long *)(sc_adapter[card]->rambase + SIG_OFFSET)); /* check the signature */ if(sig == SIGNATURE) { flushreadfifo(card); - spin_unlock_irqrestore(&adapter[card]->lock, flags); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); /* See if we need to do a startproc */ - if (adapter[card]->StartOnReset) + if (sc_adapter[card]->StartOnReset) startproc(card); } else { pr_debug("%s: No signature yet, waiting another %d jiffies.\n", - adapter[card]->devicename, CHECKRESET_TIME); - mod_timer(&adapter[card]->reset_timer, jiffies+CHECKRESET_TIME); - spin_unlock_irqrestore(&adapter[card]->lock, flags); + sc_adapter[card]->devicename, CHECKRESET_TIME); + mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); } } @@ -87,7 +88,7 @@ * Must be very fast as this function runs in the context of * an interrupt handler. * - * Send check adapter->phystat to see if the channels are up + * Send check sc_adapter->phystat to see if the channels are up * If they are, tell ISDN4Linux that the board is up. If not, * tell IADN4Linux that it is up. Always reset the timer to * fire again (endless loop). @@ -97,31 +98,31 @@ unsigned long flags; int card = (unsigned int) data; - pr_debug("%s: Checking status...\n", adapter[card]->devicename); + pr_debug("%s: Checking status...\n", sc_adapter[card]->devicename); /* * check the results of the last PhyStat and change only if * has changed drastically */ - if (adapter[card]->nphystat && !adapter[card]->phystat) { /* All is well */ + if (sc_adapter[card]->nphystat && !sc_adapter[card]->phystat) { /* All is well */ pr_debug("PhyStat transition to RUN\n"); pr_info("%s: Switch contacted, transmitter enabled\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); indicate_status(card, ISDN_STAT_RUN, 0, NULL); } - else if (!adapter[card]->nphystat && adapter[card]->phystat) { /* All is not well */ + else if (!sc_adapter[card]->nphystat && sc_adapter[card]->phystat) { /* All is not well */ pr_debug("PhyStat transition to STOP\n"); pr_info("%s: Switch connection lost, transmitter disabled\n", - adapter[card]->devicename); + sc_adapter[card]->devicename); indicate_status(card, ISDN_STAT_STOP, 0, NULL); } - adapter[card]->phystat = adapter[card]->nphystat; + sc_adapter[card]->phystat = sc_adapter[card]->nphystat; /* Reinitialize the timer */ - spin_lock_irqsave(&adapter[card]->lock, flags); - mod_timer(&adapter[card]->stat_timer, jiffies+CHECKSTAT_TIME); - spin_unlock_irqrestore(&adapter[card]->lock, flags); + spin_lock_irqsave(&sc_adapter[card]->lock, flags); + mod_timer(&sc_adapter[card]->stat_timer, jiffies+CHECKSTAT_TIME); + spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); /* Send a new cePhyStatus message */ sendmessage(card, CEPID,ceReqTypePhy,ceReqClass2, diff -Nru a/drivers/isdn/tpam/Kconfig b/drivers/isdn/tpam/Kconfig --- a/drivers/isdn/tpam/Kconfig Thu Feb 19 23:44:22 2004 +++ b/drivers/isdn/tpam/Kconfig Thu Feb 19 23:44:22 2004 @@ -3,7 +3,7 @@ # config ISDN_DRV_TPAM tristate "Auvertech TurboPAM support (EXPERIMENTAL)" - depends on EXPERIMENTAL && ISDN && PCI + depends on EXPERIMENTAL && ISDN_I4L && PCI help This enables support for the Auvertech TurboPAM ISDN-card. For running this card, additional firmware is necessary, which has diff -Nru a/drivers/md/Kconfig b/drivers/md/Kconfig --- a/drivers/md/Kconfig Thu Feb 19 23:44:23 2004 +++ b/drivers/md/Kconfig Thu Feb 19 23:44:23 2004 @@ -170,5 +170,23 @@ Recent tools use a new version of the ioctl interface, only select this option if you intend using such tools. +config DM_CRYPT + tristate "Crypt target support" + depends on BLK_DEV_DM && EXPERIMENTAL + select CRYPTO + ---help--- + This device-mapper target allows you to create a device that + transparently encrypts the data on it. You'll need to activate + the ciphers you're going to use in the cryptoapi configuration. + + Information on how to use dm-crypt can be found on + + http://www.saout.de/misc/dm-crypt/ + + To compile this code as a module, choose M here: the module will + be called dm-crypt. + + If unsure, say N. + endmenu diff -Nru a/drivers/md/Makefile b/drivers/md/Makefile --- a/drivers/md/Makefile Thu Feb 19 23:44:25 2004 +++ b/drivers/md/Makefile Thu Feb 19 23:44:25 2004 @@ -23,6 +23,7 @@ obj-$(CONFIG_MD_MULTIPATH) += multipath.o obj-$(CONFIG_BLK_DEV_MD) += md.o obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o +obj-$(CONFIG_DM_CRYPT) += dm-crypt.o quiet_cmd_unroll = UNROLL $@ cmd_unroll = $(PERL) $(srctree)/$(src)/unroll.pl $(UNROLL) \ diff -Nru a/drivers/md/dm-bio-list.h b/drivers/md/dm-bio-list.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/md/dm-bio-list.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2004 Red Hat UK Ltd. + * + * This file is released under the GPL. + */ + +#ifndef DM_BIO_LIST_H +#define DM_BIO_LIST_H + +#include + +struct bio_list { + struct bio *head; + struct bio *tail; +}; + +static inline void bio_list_init(struct bio_list *bl) +{ + bl->head = bl->tail = NULL; +} + +static inline void bio_list_add(struct bio_list *bl, struct bio *bio) +{ + bio->bi_next = NULL; + + if (bl->tail) + bl->tail->bi_next = bio; + else + bl->head = bio; + + bl->tail = bio; +} + +static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2) +{ + if (bl->tail) + bl->tail->bi_next = bl2->head; + else + bl->head = bl2->head; + + bl->tail = bl2->tail; +} + +static inline struct bio *bio_list_pop(struct bio_list *bl) +{ + struct bio *bio = bl->head; + + if (bio) { + bl->head = bl->head->bi_next; + if (!bl->head) + bl->tail = NULL; + + bio->bi_next = NULL; + } + + return bio; +} + +static inline struct bio *bio_list_get(struct bio_list *bl) +{ + struct bio *bio = bl->head; + + bl->head = bl->tail = NULL; + + return bio; +} + +#endif diff -Nru a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/md/dm-crypt.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,777 @@ +/* + * Copyright (C) 2003 Christophe Saout + * + * This file is released under the GPL. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dm.h" + +/* + * per bio private data + */ +struct crypt_io { + struct dm_target *target; + struct bio *bio; + struct bio *first_clone; + struct work_struct work; + atomic_t pending; + int error; +}; + +/* + * context holding the current state of a multi-part conversion + */ +struct convert_context { + struct bio *bio_in; + struct bio *bio_out; + unsigned int offset_in; + unsigned int offset_out; + int idx_in; + int idx_out; + sector_t sector; + int write; +}; + +/* + * Crypt: maps a linear range of a block device + * and encrypts / decrypts at the same time. + */ +struct crypt_config { + struct dm_dev *dev; + sector_t start; + + /* + * pool for per bio private data and + * for encryption buffer pages + */ + mempool_t *io_pool; + mempool_t *page_pool; + + /* + * crypto related data + */ + struct crypto_tfm *tfm; + sector_t iv_offset; + int (*iv_generator)(struct crypt_config *cc, u8 *iv, sector_t sector); + int iv_size; + int key_size; + u8 key[0]; +}; + +#define MIN_IOS 256 +#define MIN_POOL_PAGES 32 +#define MIN_BIO_PAGES 8 + +static kmem_cache_t *_crypt_io_pool; + +/* + * Mempool alloc and free functions for the page + */ +static void *mempool_alloc_page(int gfp_mask, void *data) +{ + return alloc_page(gfp_mask); +} + +static void mempool_free_page(void *page, void *data) +{ + __free_page(page); +} + + +/* + * Different IV generation algorithms + */ +static int crypt_iv_plain(struct crypt_config *cc, u8 *iv, sector_t sector) +{ + *(u32 *)iv = cpu_to_le32(sector & 0xffffffff); + if (cc->iv_size > sizeof(u32) / sizeof(u8)) + memset(iv + (sizeof(u32) / sizeof(u8)), 0, + cc->iv_size - (sizeof(u32) / sizeof(u8))); + + return 0; +} + +static inline int +crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out, + struct scatterlist *in, unsigned int length, + int write, sector_t sector) +{ + u8 iv[cc->iv_size]; + int r; + + if (cc->iv_generator) { + r = cc->iv_generator(cc, iv, sector); + if (r < 0) + return r; + + if (write) + r = crypto_cipher_encrypt_iv(cc->tfm, out, in, length, iv); + else + r = crypto_cipher_decrypt_iv(cc->tfm, out, in, length, iv); + } else { + if (write) + r = crypto_cipher_encrypt(cc->tfm, out, in, length); + else + r = crypto_cipher_decrypt(cc->tfm, out, in, length); + } + + return r; +} + +static void +crypt_convert_init(struct crypt_config *cc, struct convert_context *ctx, + struct bio *bio_out, struct bio *bio_in, + sector_t sector, int write) +{ + ctx->bio_in = bio_in; + ctx->bio_out = bio_out; + ctx->offset_in = 0; + ctx->offset_out = 0; + ctx->idx_in = bio_in ? bio_in->bi_idx : 0; + ctx->idx_out = bio_out ? bio_out->bi_idx : 0; + ctx->sector = sector + cc->iv_offset; + ctx->write = write; +} + +/* + * Encrypt / decrypt data from one bio to another one (can be the same one) + */ +static int crypt_convert(struct crypt_config *cc, + struct convert_context *ctx) +{ + int r = 0; + + while(ctx->idx_in < ctx->bio_in->bi_vcnt && + ctx->idx_out < ctx->bio_out->bi_vcnt) { + struct bio_vec *bv_in = bio_iovec_idx(ctx->bio_in, ctx->idx_in); + struct bio_vec *bv_out = bio_iovec_idx(ctx->bio_out, ctx->idx_out); + struct scatterlist sg_in = { + .page = bv_in->bv_page, + .offset = bv_in->bv_offset + ctx->offset_in, + .length = 1 << SECTOR_SHIFT + }; + struct scatterlist sg_out = { + .page = bv_out->bv_page, + .offset = bv_out->bv_offset + ctx->offset_out, + .length = 1 << SECTOR_SHIFT + }; + + ctx->offset_in += sg_in.length; + if (ctx->offset_in >= bv_in->bv_len) { + ctx->offset_in = 0; + ctx->idx_in++; + } + + ctx->offset_out += sg_out.length; + if (ctx->offset_out >= bv_out->bv_len) { + ctx->offset_out = 0; + ctx->idx_out++; + } + + r = crypt_convert_scatterlist(cc, &sg_out, &sg_in, sg_in.length, + ctx->write, ctx->sector); + if (r < 0) + break; + + ctx->sector++; + } + + return r; +} + +/* + * Generate a new unfragmented bio with the given size + * This should never violate the device limitations + * May return a smaller bio when running out of pages + */ +static struct bio * +crypt_alloc_buffer(struct crypt_config *cc, unsigned int size, + struct bio *base_bio, int *bio_vec_idx) +{ + struct bio *bio; + int nr_iovecs = dm_div_up(size, PAGE_SIZE); + int gfp_mask = GFP_NOIO | __GFP_HIGHMEM; + int flags = current->flags; + int i; + + /* + * Tell VM to act less aggressively and fail earlier. + * This is not necessary but increases throughput. + * FIXME: Is this really intelligent? + */ + current->flags &= ~PF_MEMALLOC; + + if (base_bio) + bio = bio_clone(base_bio, GFP_NOIO); + else + bio = bio_alloc(GFP_NOIO, nr_iovecs); + if (!bio) { + if (flags & PF_MEMALLOC) + current->flags |= PF_MEMALLOC; + return NULL; + } + + /* if the last bio was not complete, continue where that one ended */ + bio->bi_idx = *bio_vec_idx; + bio->bi_vcnt = *bio_vec_idx; + bio->bi_size = 0; + bio->bi_flags &= ~(1 << BIO_SEG_VALID); + + /* bio->bi_idx pages have already been allocated */ + size -= bio->bi_idx * PAGE_SIZE; + + for(i = bio->bi_idx; i < nr_iovecs; i++) { + struct bio_vec *bv = bio_iovec_idx(bio, i); + + bv->bv_page = mempool_alloc(cc->page_pool, gfp_mask); + if (!bv->bv_page) + break; + + /* + * if additional pages cannot be allocated without waiting, + * return a partially allocated bio, the caller will then try + * to allocate additional bios while submitting this partial bio + */ + if ((i - bio->bi_idx) == (MIN_BIO_PAGES - 1)) + gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT; + + bv->bv_offset = 0; + if (size > PAGE_SIZE) + bv->bv_len = PAGE_SIZE; + else + bv->bv_len = size; + + bio->bi_size += bv->bv_len; + bio->bi_vcnt++; + size -= bv->bv_len; + } + + if (flags & PF_MEMALLOC) + current->flags |= PF_MEMALLOC; + + if (!bio->bi_size) { + bio_put(bio); + return NULL; + } + + /* + * Remember the last bio_vec allocated to be able + * to correctly continue after the splitting. + */ + *bio_vec_idx = bio->bi_vcnt; + + return bio; +} + +static void crypt_free_buffer_pages(struct crypt_config *cc, + struct bio *bio, unsigned int bytes) +{ + unsigned int start, end; + struct bio_vec *bv; + int i; + + /* + * This is ugly, but Jens Axboe thinks that using bi_idx in the + * endio function is too dangerous at the moment, so I calculate the + * correct position using bi_vcnt and bi_size. + * The bv_offset and bv_len fields might already be modified but we + * know that we always allocated whole pages. + * A fix to the bi_idx issue in the kernel is in the works, so + * we will hopefully be able to revert to the cleaner solution soon. + */ + i = bio->bi_vcnt - 1; + bv = bio_iovec_idx(bio, i); + end = (i << PAGE_SHIFT) + (bv->bv_offset + bv->bv_len) - bio->bi_size; + start = end - bytes; + + start >>= PAGE_SHIFT; + if (!bio->bi_size) + end = bio->bi_vcnt; + else + end >>= PAGE_SHIFT; + + for(i = start; i < end; i++) { + bv = bio_iovec_idx(bio, i); + BUG_ON(!bv->bv_page); + mempool_free(bv->bv_page, cc->page_pool); + bv->bv_page = NULL; + } +} + +/* + * One of the bios was finished. Check for completion of + * the whole request and correctly clean up the buffer. + */ +static void dec_pending(struct crypt_io *io, int error) +{ + struct crypt_config *cc = (struct crypt_config *) io->target->private; + + if (error < 0) + io->error = error; + + if (!atomic_dec_and_test(&io->pending)) + return; + + if (io->first_clone) + bio_put(io->first_clone); + + bio_endio(io->bio, io->bio->bi_size, io->error); + + mempool_free(io, cc->io_pool); +} + +/* + * kcryptd: + * + * Needed because it would be very unwise to do decryption in an + * interrupt context, so bios returning from read requests get + * queued here. + */ +static struct workqueue_struct *_kcryptd_workqueue; + +static void kcryptd_do_work(void *data) +{ + struct crypt_io *io = (struct crypt_io *) data; + struct crypt_config *cc = (struct crypt_config *) io->target->private; + struct convert_context ctx; + int r; + + crypt_convert_init(cc, &ctx, io->bio, io->bio, + io->bio->bi_sector - io->target->begin, 0); + r = crypt_convert(cc, &ctx); + + dec_pending(io, r); +} + +static void kcryptd_queue_io(struct crypt_io *io) +{ + INIT_WORK(&io->work, kcryptd_do_work, io); + queue_work(_kcryptd_workqueue, &io->work); +} + +/* + * Decode key from its hex representation + */ +static int crypt_decode_key(u8 *key, char *hex, int size) +{ + char buffer[3]; + char *endp; + int i; + + buffer[2] = '\0'; + + for(i = 0; i < size; i++) { + buffer[0] = *hex++; + buffer[1] = *hex++; + + key[i] = (u8)simple_strtoul(buffer, &endp, 16); + + if (endp != &buffer[2]) + return -EINVAL; + } + + if (*hex != '\0') + return -EINVAL; + + return 0; +} + +/* + * Encode key into its hex representation + */ +static void crypt_encode_key(char *hex, u8 *key, int size) +{ + int i; + + for(i = 0; i < size; i++) { + sprintf(hex, "%02x", *key); + hex += 2; + key++; + } +} + +/* + * Construct an encryption mapping: + * + */ +static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) +{ + struct crypt_config *cc; + struct crypto_tfm *tfm; + char *tmp; + char *cipher; + char *mode; + int crypto_flags; + int key_size; + + if (argc != 5) { + ti->error = "dm-crypt: Not enough arguments"; + return -EINVAL; + } + + tmp = argv[0]; + cipher = strsep(&tmp, "-"); + mode = strsep(&tmp, "-"); + + if (tmp) + DMWARN("dm-crypt: Unexpected additional cipher options"); + + key_size = strlen(argv[1]) >> 1; + + cc = kmalloc(sizeof(*cc) + key_size * sizeof(u8), GFP_KERNEL); + if (cc == NULL) { + ti->error = + "dm-crypt: Cannot allocate transparent encryption context"; + return -ENOMEM; + } + + if (!mode || strcmp(mode, "plain") == 0) + cc->iv_generator = crypt_iv_plain; + else if (strcmp(mode, "ecb") == 0) + cc->iv_generator = NULL; + else { + ti->error = "dm-crypt: Invalid chaining mode"; + goto bad1; + } + + if (cc->iv_generator) + crypto_flags = CRYPTO_TFM_MODE_CBC; + else + crypto_flags = CRYPTO_TFM_MODE_ECB; + + tfm = crypto_alloc_tfm(cipher, crypto_flags); + if (!tfm) { + ti->error = "dm-crypt: Error allocating crypto tfm"; + goto bad1; + } + + if (tfm->crt_u.cipher.cit_decrypt_iv && tfm->crt_u.cipher.cit_encrypt_iv) + /* at least a 32 bit sector number should fit in our buffer */ + cc->iv_size = max(crypto_tfm_alg_ivsize(tfm), + (unsigned int)(sizeof(u32) / sizeof(u8))); + else { + cc->iv_size = 0; + if (cc->iv_generator) { + DMWARN("dm-crypt: Selected cipher does not support IVs"); + cc->iv_generator = NULL; + } + } + + cc->io_pool = mempool_create(MIN_IOS, mempool_alloc_slab, + mempool_free_slab, _crypt_io_pool); + if (!cc->io_pool) { + ti->error = "dm-crypt: Cannot allocate crypt io mempool"; + goto bad2; + } + + cc->page_pool = mempool_create(MIN_POOL_PAGES, mempool_alloc_page, + mempool_free_page, NULL); + if (!cc->page_pool) { + ti->error = "dm-crypt: Cannot allocate page mempool"; + goto bad3; + } + + cc->tfm = tfm; + cc->key_size = key_size; + if ((key_size == 0 && strcmp(argv[1], "-") != 0) + || crypt_decode_key(cc->key, argv[1], key_size) < 0) { + ti->error = "dm-crypt: Error decoding key"; + goto bad4; + } + + if (tfm->crt_u.cipher.cit_setkey(tfm, cc->key, key_size) < 0) { + ti->error = "dm-crypt: Error setting key"; + goto bad4; + } + + if (sscanf(argv[2], SECTOR_FORMAT, &cc->iv_offset) != 1) { + ti->error = "dm-crypt: Invalid iv_offset sector"; + goto bad4; + } + + if (sscanf(argv[4], SECTOR_FORMAT, &cc->start) != 1) { + ti->error = "dm-crypt: Invalid device sector"; + goto bad4; + } + + if (dm_get_device(ti, argv[3], cc->start, ti->len, + dm_table_get_mode(ti->table), &cc->dev)) { + ti->error = "dm-crypt: Device lookup failed"; + goto bad4; + } + + ti->private = cc; + return 0; + +bad4: + mempool_destroy(cc->page_pool); +bad3: + mempool_destroy(cc->io_pool); +bad2: + crypto_free_tfm(tfm); +bad1: + kfree(cc); + return -EINVAL; +} + +static void crypt_dtr(struct dm_target *ti) +{ + struct crypt_config *cc = (struct crypt_config *) ti->private; + + mempool_destroy(cc->page_pool); + mempool_destroy(cc->io_pool); + + crypto_free_tfm(cc->tfm); + dm_put_device(ti, cc->dev); + kfree(cc); +} + +static int crypt_endio(struct bio *bio, unsigned int done, int error) +{ + struct crypt_io *io = (struct crypt_io *) bio->bi_private; + struct crypt_config *cc = (struct crypt_config *) io->target->private; + + if (bio_data_dir(bio) == WRITE) { + /* + * free the processed pages, even if + * it's only a partially completed write + */ + crypt_free_buffer_pages(cc, bio, done); + } + + if (bio->bi_size) + return 1; + + bio_put(bio); + + /* + * successful reads are decrypted by the worker thread + */ + if ((bio_data_dir(bio) == READ) + && bio_flagged(bio, BIO_UPTODATE)) { + kcryptd_queue_io(io); + return 0; + } + + dec_pending(io, error); + return error; +} + +static inline struct bio * +crypt_clone(struct crypt_config *cc, struct crypt_io *io, struct bio *bio, + sector_t sector, int *bvec_idx, struct convert_context *ctx) +{ + struct bio *clone; + + if (bio_data_dir(bio) == WRITE) { + clone = crypt_alloc_buffer(cc, bio->bi_size, + io->first_clone, bvec_idx); + if (clone) { + ctx->bio_out = clone; + if (crypt_convert(cc, ctx) < 0) { + crypt_free_buffer_pages(cc, clone, + clone->bi_size); + bio_put(clone); + return NULL; + } + } + } else + clone = bio_clone(bio, GFP_NOIO); + + if (!clone) + return NULL; + + clone->bi_private = io; + clone->bi_end_io = crypt_endio; + clone->bi_bdev = cc->dev->bdev; + clone->bi_sector = cc->start + sector; + clone->bi_rw = bio->bi_rw; + + return clone; +} + +static int crypt_map(struct dm_target *ti, struct bio *bio) +{ + struct crypt_config *cc = (struct crypt_config *) ti->private; + struct crypt_io *io = mempool_alloc(cc->io_pool, GFP_NOIO); + struct convert_context ctx; + struct bio *clone; + unsigned int remaining = bio->bi_size; + sector_t sector = bio->bi_sector - ti->begin; + int bvec_idx = 0; + + io->target = ti; + io->bio = bio; + io->first_clone = NULL; + io->error = 0; + atomic_set(&io->pending, 1); /* hold a reference */ + + if (bio_data_dir(bio) == WRITE) + crypt_convert_init(cc, &ctx, NULL, bio, sector, 1); + + /* + * The allocated buffers can be smaller than the whole bio, + * so repeat the whole process until all the data can be handled. + */ + while (remaining) { + clone = crypt_clone(cc, io, bio, sector, &bvec_idx, &ctx); + if (!clone) + goto cleanup; + + if (!io->first_clone) { + /* + * hold a reference to the first clone, because it + * holds the bio_vec array and that can't be freed + * before all other clones are released + */ + bio_get(clone); + io->first_clone = clone; + } + atomic_inc(&io->pending); + + remaining -= clone->bi_size; + sector += bio_sectors(clone); + + generic_make_request(clone); + + /* out of memory -> run queues */ + if (remaining) + blk_run_queues(); + } + + /* drop reference, clones could have returned before we reach this */ + dec_pending(io, 0); + return 0; + +cleanup: + if (io->first_clone) { + dec_pending(io, -ENOMEM); + return 0; + } + + /* if no bio has been dispatched yet, we can directly return the error */ + mempool_free(io, cc->io_pool); + return -ENOMEM; +} + +static int crypt_status(struct dm_target *ti, status_type_t type, + char *result, unsigned int maxlen) +{ + struct crypt_config *cc = (struct crypt_config *) ti->private; + char buffer[32]; + const char *cipher; + const char *mode = NULL; + int offset; + + switch (type) { + case STATUSTYPE_INFO: + result[0] = '\0'; + break; + + case STATUSTYPE_TABLE: + cipher = crypto_tfm_alg_name(cc->tfm); + + switch(cc->tfm->crt_u.cipher.cit_mode) { + case CRYPTO_TFM_MODE_CBC: + mode = "plain"; + break; + case CRYPTO_TFM_MODE_ECB: + mode = "ecb"; + break; + default: + BUG(); + } + + snprintf(result, maxlen, "%s-%s ", cipher, mode); + offset = strlen(result); + + if (cc->key_size > 0) { + if ((maxlen - offset) < ((cc->key_size << 1) + 1)) + return -ENOMEM; + + crypt_encode_key(result + offset, cc->key, cc->key_size); + offset += cc->key_size << 1; + } else { + if (offset >= maxlen) + return -ENOMEM; + result[offset++] = '-'; + } + + format_dev_t(buffer, cc->dev->bdev->bd_dev); + snprintf(result + offset, maxlen - offset, " " SECTOR_FORMAT + " %s " SECTOR_FORMAT, cc->iv_offset, + buffer, cc->start); + break; + } + return 0; +} + +static struct target_type crypt_target = { + .name = "crypt", + .module = THIS_MODULE, + .ctr = crypt_ctr, + .dtr = crypt_dtr, + .map = crypt_map, + .status = crypt_status, +}; + +static int __init dm_crypt_init(void) +{ + int r; + + _crypt_io_pool = kmem_cache_create("dm-crypt_io", + sizeof(struct crypt_io), + 0, 0, NULL, NULL); + if (!_crypt_io_pool) + return -ENOMEM; + + _kcryptd_workqueue = create_workqueue("kcryptd"); + if (!_kcryptd_workqueue) { + r = -ENOMEM; + DMERR("couldn't create kcryptd"); + goto bad1; + } + + r = dm_register_target(&crypt_target); + if (r < 0) { + DMERR("crypt: register failed %d", r); + goto bad2; + } + + return 0; + +bad2: + destroy_workqueue(_kcryptd_workqueue); +bad1: + kmem_cache_destroy(_crypt_io_pool); + return r; +} + +static void __exit dm_crypt_exit(void) +{ + int r = dm_unregister_target(&crypt_target); + + if (r < 0) + DMERR("crypt: unregister failed %d", r); + + destroy_workqueue(_kcryptd_workqueue); + kmem_cache_destroy(_crypt_io_pool); +} + +module_init(dm_crypt_init); +module_exit(dm_crypt_exit); + +MODULE_AUTHOR("Christophe Saout "); +MODULE_DESCRIPTION(DM_NAME " target for transparent encryption / decryption"); +MODULE_LICENSE("GPL"); diff -Nru a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c --- a/drivers/md/dm-stripe.c Thu Feb 19 23:44:25 2004 +++ b/drivers/md/dm-stripe.c Thu Feb 19 23:44:25 2004 @@ -195,12 +195,12 @@ break; case STATUSTYPE_TABLE: - offset = snprintf(result, maxlen, "%d " SECTOR_FORMAT, + offset = scnprintf(result, maxlen, "%d " SECTOR_FORMAT, sc->stripes, sc->chunk_mask + 1); for (i = 0; i < sc->stripes; i++) { format_dev_t(buffer, sc->stripe[i].dev->bdev->bd_dev); offset += - snprintf(result + offset, maxlen - offset, + scnprintf(result + offset, maxlen - offset, " %s " SECTOR_FORMAT, buffer, sc->stripe[i].physical_start); } diff -Nru a/drivers/md/dm-table.c b/drivers/md/dm-table.c --- a/drivers/md/dm-table.c Thu Feb 19 23:44:28 2004 +++ b/drivers/md/dm-table.c Thu Feb 19 23:44:28 2004 @@ -149,7 +149,7 @@ return 0; } -static void *dm_vcalloc(unsigned long nmemb, unsigned long elem_size) +void *dm_vcalloc(unsigned long nmemb, unsigned long elem_size) { unsigned long size; void *addr; @@ -205,7 +205,7 @@ int dm_table_create(struct dm_table **result, int mode, unsigned num_targets) { - struct dm_table *t = kmalloc(sizeof(*t), GFP_NOIO); + struct dm_table *t = kmalloc(sizeof(*t), GFP_KERNEL); if (!t) return -ENOMEM; @@ -353,12 +353,12 @@ if (d->bdev) BUG(); - bdev = open_by_devnum(dev, d->mode, BDEV_RAW); + bdev = open_by_devnum(dev, d->mode); if (IS_ERR(bdev)) return PTR_ERR(bdev); r = bd_claim(bdev, _claim_ptr); if (r) - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); else d->bdev = bdev; return r; @@ -373,7 +373,7 @@ return; bd_release(d->bdev); - blkdev_put(d->bdev, BDEV_RAW); + blkdev_put(d->bdev); d->bdev = NULL; } @@ -655,6 +655,11 @@ memset(tgt, 0, sizeof(*tgt)); set_default_limits(&tgt->limits); + if (!len) { + tgt->error = "zero-length target"; + return -EINVAL; + } + tgt->type = dm_get_target_type(type); if (!tgt->type) { tgt->error = "unknown target type"; @@ -858,6 +863,7 @@ } +EXPORT_SYMBOL(dm_vcalloc); EXPORT_SYMBOL(dm_get_device); EXPORT_SYMBOL(dm_put_device); EXPORT_SYMBOL(dm_table_event); diff -Nru a/drivers/md/dm.c b/drivers/md/dm.c --- a/drivers/md/dm.c Thu Feb 19 23:44:27 2004 +++ b/drivers/md/dm.c Thu Feb 19 23:44:27 2004 @@ -5,6 +5,7 @@ */ #include "dm.h" +#include "dm-bio-list.h" #include #include @@ -27,11 +28,6 @@ atomic_t io_count; }; -struct deferred_io { - struct bio *bio; - struct deferred_io *next; -}; - /* * Bits for the md->flags field. */ @@ -52,7 +48,7 @@ */ atomic_t pending; wait_queue_head_t wait; - struct deferred_io *deferred; + struct bio_list deferred; /* * The current mapping. @@ -188,38 +184,19 @@ mempool_free(io, md->io_pool); } -static inline struct deferred_io *alloc_deferred(void) -{ - return kmalloc(sizeof(struct deferred_io), GFP_NOIO); -} - -static inline void free_deferred(struct deferred_io *di) -{ - kfree(di); -} - /* * Add the bio to the list of deferred io. */ static int queue_io(struct mapped_device *md, struct bio *bio) { - struct deferred_io *di; - - di = alloc_deferred(); - if (!di) - return -ENOMEM; - down_write(&md->lock); if (!test_bit(DMF_BLOCK_IO, &md->flags)) { up_write(&md->lock); - free_deferred(di); return 1; } - di->bio = bio; - di->next = md->deferred; - md->deferred = di; + bio_list_add(&md->deferred, bio); up_write(&md->lock); return 0; /* deferred successfully */ @@ -233,15 +210,6 @@ * interests of getting something for people to use I give * you this clearly demarcated crap. *---------------------------------------------------------------*/ -static inline sector_t to_sector(unsigned int bytes) -{ - return bytes >> SECTOR_SHIFT; -} - -static inline unsigned int to_bytes(sector_t sector) -{ - return sector << SECTOR_SHIFT; -} /* * Decrements the number of outstanding ios that a bio has been @@ -249,14 +217,8 @@ */ static inline void dec_pending(struct dm_io *io, int error) { - static spinlock_t _uptodate_lock = SPIN_LOCK_UNLOCKED; - unsigned long flags; - - if (error) { - spin_lock_irqsave(&_uptodate_lock, flags); + if (error) io->error = error; - spin_unlock_irqrestore(&_uptodate_lock, flags); - } if (atomic_dec_and_test(&io->io_count)) { if (atomic_dec_and_test(&io->md->pending)) @@ -376,6 +338,7 @@ clone->bi_idx = idx; clone->bi_vcnt = idx + bv_count; clone->bi_size = to_bytes(len); + clone->bi_flags &= ~(1 << BIO_SEG_VALID); return clone; } @@ -592,41 +555,28 @@ /* get a minor number for the dev */ r = persistent ? specific_minor(minor) : next_free_minor(&minor); - if (r < 0) { - kfree(md); - return NULL; - } + if (r < 0) + goto bad1; memset(md, 0, sizeof(*md)); init_rwsem(&md->lock); atomic_set(&md->holders, 1); md->queue = blk_alloc_queue(GFP_KERNEL); - if (!md->queue) { - kfree(md); - return NULL; - } + if (!md->queue) + goto bad1; md->queue->queuedata = md; blk_queue_make_request(md->queue, dm_request); md->io_pool = mempool_create(MIN_IOS, mempool_alloc_slab, mempool_free_slab, _io_cache); - if (!md->io_pool) { - free_minor(minor); - blk_put_queue(md->queue); - kfree(md); - return NULL; - } + if (!md->io_pool) + goto bad2; md->disk = alloc_disk(1); - if (!md->disk) { - mempool_destroy(md->io_pool); - free_minor(minor); - blk_put_queue(md->queue); - kfree(md); - return NULL; - } + if (!md->disk) + goto bad3; md->disk->major = _major; md->disk->first_minor = minor; @@ -641,6 +591,16 @@ init_waitqueue_head(&md->eventq); return md; + + + bad3: + mempool_destroy(md->io_pool); + bad2: + blk_put_queue(md->queue); + free_minor(minor); + bad1: + kfree(md); + return NULL; } static void free_dev(struct mapped_device *md) @@ -752,14 +712,14 @@ /* * Requeue the deferred bios by calling generic_make_request. */ -static void flush_deferred_io(struct deferred_io *c) +static void flush_deferred_io(struct bio *c) { - struct deferred_io *n; + struct bio *n; while (c) { - n = c->next; - generic_make_request(c->bio); - free_deferred(c); + n = c->bi_next; + c->bi_next = NULL; + generic_make_request(c); c = n; } } @@ -841,7 +801,7 @@ int dm_resume(struct mapped_device *md) { - struct deferred_io *def; + struct bio *def; down_write(&md->lock); if (!md->map || @@ -854,8 +814,7 @@ dm_table_resume_targets(md->map); clear_bit(DMF_SUSPENDED, &md->flags); clear_bit(DMF_BLOCK_IO, &md->flags); - def = md->deferred; - md->deferred = NULL; + def = bio_list_get(&md->deferred); up_write(&md->lock); flush_deferred_io(def); diff -Nru a/drivers/md/dm.h b/drivers/md/dm.h --- a/drivers/md/dm.h Thu Feb 19 23:44:25 2004 +++ b/drivers/md/dm.h Thu Feb 19 23:44:25 2004 @@ -151,6 +151,16 @@ return dm_round_up(n, size) / size; } +static inline sector_t to_sector(unsigned long n) +{ + return (n >> 9); +} + +static inline unsigned long to_bytes(sector_t n) +{ + return (n << 9); +} + /* * The device-mapper can be driven through one of two interfaces; * ioctl or filesystem, depending which patch you have applied. @@ -166,5 +176,7 @@ int dm_stripe_init(void); void dm_stripe_exit(void); + +void *dm_vcalloc(unsigned long nmemb, unsigned long elem_size); #endif diff -Nru a/drivers/md/md.c b/drivers/md/md.c --- a/drivers/md/md.c Thu Feb 19 23:44:24 2004 +++ b/drivers/md/md.c Thu Feb 19 23:44:24 2004 @@ -52,6 +52,9 @@ #define MAJOR_NR MD_MAJOR #define MD_DRIVER +/* 63 partitions with the alternate major number (mdp) */ +#define MdpMinorShift 6 + #define DEBUG 0 #define dprintk(x...) ((void)(DEBUG && printk(x))) @@ -178,14 +181,14 @@ spin_unlock(&all_mddevs_lock); } -static mddev_t * mddev_find(int unit) +static mddev_t * mddev_find(dev_t unit) { mddev_t *mddev, *new = NULL; retry: spin_lock(&all_mddevs_lock); list_for_each_entry(mddev, &all_mddevs, all_mddevs) - if (mdidx(mddev) == unit) { + if (mddev->unit == unit) { mddev_get(mddev); spin_unlock(&all_mddevs_lock); if (new) @@ -206,7 +209,12 @@ memset(new, 0, sizeof(*new)); - new->__minor = unit; + new->unit = unit; + if (MAJOR(unit) == MD_MAJOR) + new->md_minor = MINOR(unit); + else + new->md_minor = MINOR(unit) >> MdpMinorShift; + init_MUTEX(&new->reconfig_sem); INIT_LIST_HEAD(&new->disks); INIT_LIST_HEAD(&new->all_mddevs); @@ -660,7 +668,7 @@ sb->level = mddev->level; sb->size = mddev->size; sb->raid_disks = mddev->raid_disks; - sb->md_minor = mddev->__minor; + sb->md_minor = mddev->md_minor; sb->not_persistent = !mddev->persistent; sb->utime = mddev->utime; sb->state = 0; @@ -1045,12 +1053,12 @@ int err = 0; struct block_device *bdev; - bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE, BDEV_RAW); + bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE); if (IS_ERR(bdev)) return PTR_ERR(bdev); err = bd_claim(bdev, rdev); if (err) { - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); return err; } rdev->bdev = bdev; @@ -1064,7 +1072,7 @@ if (!bdev) MD_BUG(); bd_release(bdev); - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); } void md_autodetect_dev(dev_t dev); @@ -1442,13 +1450,16 @@ return 1; } +static int mdp_major = 0; static struct kobject *md_probe(dev_t dev, int *part, void *data) { static DECLARE_MUTEX(disks_sem); - int unit = *part; - mddev_t *mddev = mddev_find(unit); + mddev_t *mddev = mddev_find(dev); struct gendisk *disk; + int partitioned = (MAJOR(dev) != MD_MAJOR); + int shift = partitioned ? MdpMinorShift : 0; + int unit = MINOR(dev) >> shift; if (!mddev) return NULL; @@ -1459,15 +1470,18 @@ mddev_put(mddev); return NULL; } - disk = alloc_disk(1); + disk = alloc_disk(1 << shift); if (!disk) { up(&disks_sem); mddev_put(mddev); return NULL; } - disk->major = MD_MAJOR; - disk->first_minor = mdidx(mddev); - sprintf(disk->disk_name, "md%d", mdidx(mddev)); + disk->major = MAJOR(dev); + disk->first_minor = unit << shift; + if (partitioned) + sprintf(disk->disk_name, "md_d%d", unit); + else + sprintf(disk->disk_name, "md%d", unit); disk->fops = &md_fops; disk->private_data = mddev; disk->queue = mddev->queue; @@ -1496,7 +1510,6 @@ mdk_rdev_t *rdev; struct gendisk *disk; char b[BDEVNAME_SIZE]; - int unit; if (list_empty(&mddev->disks)) { MD_BUG(); @@ -1588,8 +1601,7 @@ invalidate_bdev(rdev->bdev, 0); } - unit = mdidx(mddev); - md_probe(0, &unit, NULL); + md_probe(mddev->unit, NULL, NULL); disk = mddev->gendisk; if (!disk) return -ENOMEM; @@ -1636,6 +1648,7 @@ mddev->queue->queuedata = mddev; mddev->queue->make_request_fn = mddev->pers->make_request; + mddev->changed = 1; return 0; } @@ -1735,6 +1748,7 @@ disk = mddev->gendisk; if (disk) set_capacity(disk, 0); + mddev->changed = 1; } else printk(KERN_INFO "md: %s switched to read-only mode.\n", mdname(mddev)); @@ -1791,6 +1805,7 @@ printk(KERN_INFO "md: autorun ...\n"); while (!list_empty(&pending_raid_disks)) { + dev_t dev; rdev0 = list_entry(pending_raid_disks.next, mdk_rdev_t, same_set); @@ -1808,8 +1823,14 @@ * mostly sane superblocks. It's time to allocate the * mddev. */ - - mddev = mddev_find(rdev0->preferred_minor); + if (rdev0->preferred_minor < 0 || rdev0->preferred_minor >= MAX_MD_DEVS) { + printk(KERN_INFO "md: unit number in %s is bad: %d\n", + bdevname(rdev0->bdev, b), rdev0->preferred_minor); + break; + } + dev = MKDEV(MD_MAJOR, rdev0->preferred_minor); + md_probe(dev, NULL, NULL); + mddev = mddev_find(dev); if (!mddev) { printk(KERN_ERR "md: cannot allocate memory for md drive.\n"); @@ -1824,7 +1845,7 @@ "md: %s already running, cannot run %s\n", mdname(mddev), bdevname(rdev0->bdev,b)); mddev_unlock(mddev); - } else if (rdev0->preferred_minor >= 0 && rdev0->preferred_minor < MAX_MD_DEVS) { + } else { printk(KERN_INFO "md: created %s\n", mdname(mddev)); ITERATE_RDEV_GENERIC(candidates,rdev,tmp) { list_del_init(&rdev->same_set); @@ -1833,9 +1854,7 @@ } autorun_array(mddev); mddev_unlock(mddev); - } else - printk(KERN_WARNING "md: %s had invalid preferred minor %d\n", - bdevname(rdev->bdev, b), rdev0->preferred_minor); + } /* on success, candidates will be empty, on error * it won't... */ @@ -1955,7 +1974,7 @@ info.size = mddev->size; info.nr_disks = nr; info.raid_disks = mddev->raid_disks; - info.md_minor = mddev->__minor; + info.md_minor = mddev->md_minor; info.not_persistent= !mddev->persistent; info.utime = mddev->utime; @@ -2326,7 +2345,7 @@ mddev->level = info->level; mddev->size = info->size; mddev->raid_disks = info->raid_disks; - /* don't set __minor, it is determined by which /dev/md* was + /* don't set md_minor, it is determined by which /dev/md* was * openned */ if (info->state & (1<= MAX_MD_DEVS) { - MD_BUG(); - return -EINVAL; - } - /* * Commands dealing with the RAID driver but not any * particular array: @@ -2419,6 +2432,14 @@ /* START_ARRAY doesn't need to lock the array as autostart_array * does the locking, and it could even be a different array */ + static int cnt = 3; + if (cnt > 0 ) { + printk(KERN_WARNING + "md: %s(pid %d) used deprecated START_ARRAY ioctl. " + "This will not be supported beyond 2.6\n", + current->comm, current->pid); + cnt--; + } err = autostart_array(new_decode_dev(arg)); if (err) { printk(KERN_WARNING "md: autostart %s failed!\n", @@ -2612,6 +2633,7 @@ mddev_get(mddev); mddev_unlock(mddev); + check_disk_change(inode->i_bdev); out: return err; } @@ -2627,12 +2649,28 @@ return 0; } +static int md_media_changed(struct gendisk *disk) +{ + mddev_t *mddev = disk->private_data; + + return mddev->changed; +} + +static int md_revalidate(struct gendisk *disk) +{ + mddev_t *mddev = disk->private_data; + + mddev->changed = 0; + return 0; +} static struct block_device_operations md_fops = { .owner = THIS_MODULE, .open = md_open, .release = md_release, .ioctl = md_ioctl, + .media_changed = md_media_changed, + .revalidate_disk= md_revalidate, }; int md_thread(void * arg) @@ -3497,16 +3535,26 @@ if (register_blkdev(MAJOR_NR, "md")) return -1; - + if ((mdp_major=register_blkdev(0, "mdp"))<=0) { + unregister_blkdev(MAJOR_NR, "md"); + return -1; + } devfs_mk_dir("md"); blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE, md_probe, NULL, NULL); + blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<raid_disks, gfp_flags); if (r1_bio) @@ -56,8 +56,8 @@ kfree(r1_bio); } -//#define RESYNC_BLOCK_SIZE (64*1024) -#define RESYNC_BLOCK_SIZE PAGE_SIZE +#define RESYNC_BLOCK_SIZE (64*1024) +//#define RESYNC_BLOCK_SIZE PAGE_SIZE #define RESYNC_SECTORS (RESYNC_BLOCK_SIZE >> 9) #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE) #define RESYNC_WINDOW (2048*1024) @@ -73,38 +73,39 @@ r1_bio = r1bio_pool_alloc(gfp_flags, conf->mddev); if (!r1_bio) return NULL; - bio = bio_alloc(gfp_flags, RESYNC_PAGES); - if (!bio) - goto out_free_r1_bio; + /* + * Allocate bios : 1 for reading, n-1 for writing + */ + for (j = conf->raid_disks ; j-- ; ) { + bio = bio_alloc(gfp_flags, RESYNC_PAGES); + if (!bio) + goto out_free_bio; + r1_bio->bios[j] = bio; + } + /* + * Allocate RESYNC_PAGES data pages and attach them to + * the first bio; + */ + bio = r1_bio->bios[0]; for (i = 0; i < RESYNC_PAGES; i++) { page = alloc_page(gfp_flags); if (unlikely(!page)) goto out_free_pages; bio->bi_io_vec[i].bv_page = page; - bio->bi_io_vec[i].bv_len = PAGE_SIZE; - bio->bi_io_vec[i].bv_offset = 0; } - /* - * Allocate a single data page for this iovec. - */ - bio->bi_vcnt = RESYNC_PAGES; - bio->bi_idx = 0; - bio->bi_size = RESYNC_BLOCK_SIZE; - bio->bi_end_io = NULL; - atomic_set(&bio->bi_cnt, 1); - r1_bio->master_bio = bio; return r1_bio; out_free_pages: - for (j = 0; j < i; j++) - __free_page(bio->bi_io_vec[j].bv_page); - bio_put(bio); -out_free_r1_bio: + for ( ; i > 0 ; i--) + __free_page(bio->bi_io_vec[i-1].bv_page); +out_free_bio: + while ( j < conf->raid_disks ) + bio_put(r1_bio->bios[++j]); r1bio_pool_free(r1_bio, conf->mddev); return NULL; } @@ -114,17 +115,15 @@ int i; conf_t *conf = data; r1bio_t *r1bio = __r1_bio; - struct bio *bio = r1bio->master_bio; + struct bio *bio = r1bio->bios[0]; - if (atomic_read(&bio->bi_cnt) != 1) - BUG(); for (i = 0; i < RESYNC_PAGES; i++) { __free_page(bio->bi_io_vec[i].bv_page); bio->bi_io_vec[i].bv_page = NULL; } - if (atomic_read(&bio->bi_cnt) != 1) - BUG(); - bio_put(bio); + for (i=0 ; i < conf->raid_disks; i++) + bio_put(r1bio->bios[i]); + r1bio_pool_free(r1bio, conf->mddev); } @@ -132,19 +131,10 @@ { int i; - if (r1_bio->read_bio) { - if (atomic_read(&r1_bio->read_bio->bi_cnt) != 1) - BUG(); - bio_put(r1_bio->read_bio); - r1_bio->read_bio = NULL; - } for (i = 0; i < conf->raid_disks; i++) { - struct bio **bio = r1_bio->write_bios + i; - if (*bio) { - if (atomic_read(&(*bio)->bi_cnt) != 1) - BUG(); + struct bio **bio = r1_bio->bios + i; + if (*bio) bio_put(*bio); - } *bio = NULL; } } @@ -173,15 +163,8 @@ static inline void put_buf(r1bio_t *r1_bio) { conf_t *conf = mddev_to_conf(r1_bio->mddev); - struct bio *bio = r1_bio->master_bio; unsigned long flags; - /* - * undo any possible partial request fixup magic: - */ - if (bio->bi_size != RESYNC_BLOCK_SIZE) - bio->bi_io_vec[bio->bi_vcnt-1].bv_len = PAGE_SIZE; - put_all_bios(conf, r1_bio); mempool_free(r1_bio, conf->r1buf_pool); spin_lock_irqsave(&conf->resync_lock, flags); @@ -258,10 +241,10 @@ conf_t *conf = mddev_to_conf(r1_bio->mddev); conf->mirrors[disk].head_position = - r1_bio->sector + (r1_bio->master_bio->bi_size >> 9); + r1_bio->sector + (r1_bio->sectors); } -static int raid1_end_request(struct bio *bio, unsigned int bytes_done, int error) +static int raid1_end_read_request(struct bio *bio, unsigned int bytes_done, int error) { int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private); @@ -271,13 +254,7 @@ if (bio->bi_size) return 1; - if (r1_bio->cmd == READ || r1_bio->cmd == READA) - mirror = r1_bio->read_disk; - else { - for (mirror = 0; mirror < conf->raid_disks; mirror++) - if (r1_bio->write_bios[mirror] == bio) - break; - } + mirror = r1_bio->read_disk; /* * this branch is our 'one mirror IO has finished' event handler: */ @@ -296,42 +273,74 @@ set_bit(R1BIO_Uptodate, &r1_bio->state); update_head_pos(mirror, r1_bio); - if ((r1_bio->cmd == READ) || (r1_bio->cmd == READA)) { - if (!r1_bio->read_bio) - BUG(); + + /* + * we have only one bio on the read side + */ + if (uptodate) + raid_end_bio_io(r1_bio); + else { /* - * we have only one bio on the read side + * oops, read error: */ - if (uptodate) - raid_end_bio_io(r1_bio); - else { - /* - * oops, read error: - */ - char b[BDEVNAME_SIZE]; - printk(KERN_ERR "raid1: %s: rescheduling sector %llu\n", - bdevname(conf->mirrors[mirror].rdev->bdev,b), (unsigned long long)r1_bio->sector); - reschedule_retry(r1_bio); - } - } else { + char b[BDEVNAME_SIZE]; + printk(KERN_ERR "raid1: %s: rescheduling sector %llu\n", + bdevname(conf->mirrors[mirror].rdev->bdev,b), (unsigned long long)r1_bio->sector); + reschedule_retry(r1_bio); + } - if (r1_bio->read_bio) - BUG(); + atomic_dec(&conf->mirrors[mirror].rdev->nr_pending); + return 0; +} + +static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int error) +{ + int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); + r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private); + int mirror; + conf_t *conf = mddev_to_conf(r1_bio->mddev); + + if (bio->bi_size) + return 1; + + for (mirror = 0; mirror < conf->raid_disks; mirror++) + if (r1_bio->bios[mirror] == bio) + break; + + /* + * this branch is our 'one mirror IO has finished' event handler: + */ + if (!uptodate) + md_error(r1_bio->mddev, conf->mirrors[mirror].rdev); + else /* - * WRITE: + * Set R1BIO_Uptodate in our master bio, so that + * we will return a good error code for to the higher + * levels even if IO on some other mirrored buffer fails. * - * Let's see if all mirrored write operations have finished - * already. + * The 'master' represents the composite IO operation to + * user-side. So if something waits for IO, then it will + * wait for the 'master' bio. */ - if (atomic_dec_and_test(&r1_bio->remaining)) { - md_write_end(r1_bio->mddev); - raid_end_bio_io(r1_bio); - } + set_bit(R1BIO_Uptodate, &r1_bio->state); + + update_head_pos(mirror, r1_bio); + + /* + * + * Let's see if all mirrored write operations have finished + * already. + */ + if (atomic_dec_and_test(&r1_bio->remaining)) { + md_write_end(r1_bio->mddev); + raid_end_bio_io(r1_bio); } + atomic_dec(&conf->mirrors[mirror].rdev->nr_pending); return 0; } + /* * This routine returns the disk from which the requested read should * be done. There is a per-array 'next expected sequential IO' sector @@ -490,26 +499,25 @@ r1_bio = mempool_alloc(conf->r1bio_pool, GFP_NOIO); r1_bio->master_bio = bio; + r1_bio->sectors = bio->bi_size >> 9; r1_bio->mddev = mddev; r1_bio->sector = bio->bi_sector; - r1_bio->cmd = bio_data_dir(bio); - if (r1_bio->cmd == READ) { + if (bio_data_dir(bio) == READ) { /* * read balancing logic: */ mirror = conf->mirrors + read_balance(conf, bio, r1_bio); read_bio = bio_clone(bio, GFP_NOIO); - if (r1_bio->read_bio) - BUG(); - r1_bio->read_bio = read_bio; + + r1_bio->bios[r1_bio->read_disk] = read_bio; read_bio->bi_sector = r1_bio->sector + mirror->rdev->data_offset; read_bio->bi_bdev = mirror->rdev->bdev; - read_bio->bi_end_io = raid1_end_request; - read_bio->bi_rw = r1_bio->cmd; + read_bio->bi_end_io = raid1_end_read_request; + read_bio->bi_rw = READ; read_bio->bi_private = r1_bio; generic_make_request(read_bio); @@ -521,16 +529,16 @@ */ /* first select target devices under spinlock and * inc refcount on their rdev. Record them by setting - * write_bios[x] to bio + * bios[x] to bio */ spin_lock_irq(&conf->device_lock); for (i = 0; i < disks; i++) { if (conf->mirrors[i].rdev && !conf->mirrors[i].rdev->faulty) { atomic_inc(&conf->mirrors[i].rdev->nr_pending); - r1_bio->write_bios[i] = bio; + r1_bio->bios[i] = bio; } else - r1_bio->write_bios[i] = NULL; + r1_bio->bios[i] = NULL; } spin_unlock_irq(&conf->device_lock); @@ -538,16 +546,16 @@ md_write_start(mddev); for (i = 0; i < disks; i++) { struct bio *mbio; - if (!r1_bio->write_bios[i]) + if (!r1_bio->bios[i]) continue; mbio = bio_clone(bio, GFP_NOIO); - r1_bio->write_bios[i] = mbio; + r1_bio->bios[i] = mbio; mbio->bi_sector = r1_bio->sector + conf->mirrors[i].rdev->data_offset; mbio->bi_bdev = conf->mirrors[i].rdev->bdev; - mbio->bi_end_io = raid1_end_request; - mbio->bi_rw = r1_bio->cmd; + mbio->bi_end_io = raid1_end_write_request; + mbio->bi_rw = WRITE; mbio->bi_private = r1_bio; atomic_inc(&r1_bio->remaining); @@ -744,7 +752,7 @@ if (bio->bi_size) return 1; - if (r1_bio->read_bio != bio) + if (r1_bio->bios[r1_bio->read_disk] != bio) BUG(); update_head_pos(r1_bio->read_disk, r1_bio); /* @@ -775,7 +783,7 @@ return 1; for (i = 0; i < conf->raid_disks; i++) - if (r1_bio->write_bios[i] == bio) { + if (r1_bio->bios[i] == bio) { mirror = i; break; } @@ -784,7 +792,7 @@ update_head_pos(mirror, r1_bio); if (atomic_dec_and_test(&r1_bio->remaining)) { - md_done_sync(mddev, r1_bio->master_bio->bi_size >> 9, uptodate); + md_done_sync(mddev, r1_bio->sectors, uptodate); put_buf(r1_bio); } atomic_dec(&conf->mirrors[mirror].rdev->nr_pending); @@ -796,12 +804,11 @@ conf_t *conf = mddev_to_conf(mddev); int i; int disks = conf->raid_disks; - struct bio *bio, *mbio; + struct bio *bio, *wbio; - bio = r1_bio->master_bio; + bio = r1_bio->bios[r1_bio->read_disk]; /* - * have to allocate lots of bio structures and * schedule writes */ if (!test_bit(R1BIO_Uptodate, &r1_bio->state)) { @@ -814,52 +821,25 @@ " for block %llu\n", bdevname(bio->bi_bdev,b), (unsigned long long)r1_bio->sector); - md_done_sync(mddev, r1_bio->master_bio->bi_size >> 9, 0); + md_done_sync(mddev, r1_bio->sectors, 0); put_buf(r1_bio); return; } - spin_lock_irq(&conf->device_lock); - for (i = 0; i < disks ; i++) { - r1_bio->write_bios[i] = NULL; - if (!conf->mirrors[i].rdev || - conf->mirrors[i].rdev->faulty) - continue; - if (conf->mirrors[i].rdev->bdev == bio->bi_bdev) - /* - * we read from here, no need to write - */ - continue; - if (conf->mirrors[i].rdev->in_sync && - r1_bio->sector + (bio->bi_size>>9) <= mddev->recovery_cp) - /* - * don't need to write this we are just rebuilding - */ - continue; - atomic_inc(&conf->mirrors[i].rdev->nr_pending); - r1_bio->write_bios[i] = bio; - } - spin_unlock_irq(&conf->device_lock); - atomic_set(&r1_bio->remaining, 1); - for (i = disks; i-- ; ) { - if (!r1_bio->write_bios[i]) + for (i = 0; i < disks ; i++) { + wbio = r1_bio->bios[i]; + if (wbio->bi_end_io != end_sync_write) continue; - mbio = bio_clone(bio, GFP_NOIO); - r1_bio->write_bios[i] = mbio; - mbio->bi_bdev = conf->mirrors[i].rdev->bdev; - mbio->bi_sector = r1_bio->sector + conf->mirrors[i].rdev->data_offset; - mbio->bi_end_io = end_sync_write; - mbio->bi_rw = WRITE; - mbio->bi_private = r1_bio; + atomic_inc(&conf->mirrors[i].rdev->nr_pending); atomic_inc(&r1_bio->remaining); - md_sync_acct(conf->mirrors[i].rdev, mbio->bi_size >> 9); - generic_make_request(mbio); + md_sync_acct(conf->mirrors[i].rdev, wbio->bi_size >> 9); + generic_make_request(wbio); } if (atomic_dec_and_test(&r1_bio->remaining)) { - md_done_sync(mddev, r1_bio->master_bio->bi_size >> 9, 1); + md_done_sync(mddev, r1_bio->sectors, 1); put_buf(r1_bio); } } @@ -896,30 +876,26 @@ mddev = r1_bio->mddev; conf = mddev_to_conf(mddev); bio = r1_bio->master_bio; - switch(r1_bio->cmd) { - case SPECIAL: + if (test_bit(R1BIO_IsSync, &r1_bio->state)) { sync_request_write(mddev, r1_bio); - break; - case READ: - case READA: + } else { if (map(mddev, &rdev) == -1) { printk(KERN_ALERT "raid1: %s: unrecoverable I/O" - " read error for block %llu\n", - bdevname(bio->bi_bdev,b), - (unsigned long long)r1_bio->sector); + " read error for block %llu\n", + bdevname(bio->bi_bdev,b), + (unsigned long long)r1_bio->sector); raid_end_bio_io(r1_bio); - break; - } - printk(KERN_ERR "raid1: %s: redirecting sector %llu to" - " another mirror\n", - bdevname(rdev->bdev,b), - (unsigned long long)r1_bio->sector); - bio->bi_bdev = rdev->bdev; - bio->bi_sector = r1_bio->sector + rdev->data_offset; - bio->bi_rw = r1_bio->cmd; + } else { + printk(KERN_ERR "raid1: %s: redirecting sector %llu to" + " another mirror\n", + bdevname(rdev->bdev,b), + (unsigned long long)r1_bio->sector); + bio->bi_bdev = rdev->bdev; + bio->bi_sector = r1_bio->sector + rdev->data_offset; + bio->bi_rw = READ; - generic_make_request(bio); - break; + generic_make_request(bio); + } } } spin_unlock_irqrestore(&retry_list_lock, flags); @@ -955,9 +931,10 @@ conf_t *conf = mddev_to_conf(mddev); mirror_info_t *mirror; r1bio_t *r1_bio; - struct bio *read_bio, *bio; + struct bio *bio; sector_t max_sector, nr_sectors; - int disk, partial; + int disk; + int i; if (!conf->r1buf_pool) if (init_resync(conf)) @@ -1007,38 +984,77 @@ r1_bio->mddev = mddev; r1_bio->sector = sector_nr; - r1_bio->cmd = SPECIAL; + set_bit(R1BIO_IsSync, &r1_bio->state); r1_bio->read_disk = disk; - bio = r1_bio->master_bio; - nr_sectors = RESYNC_BLOCK_SIZE >> 9; - if (max_sector - sector_nr < nr_sectors) - nr_sectors = max_sector - sector_nr; - bio->bi_size = nr_sectors << 9; - bio->bi_vcnt = (bio->bi_size + PAGE_SIZE-1) / PAGE_SIZE; - /* - * Is there a partial page at the end of the request? - */ - partial = bio->bi_size % PAGE_SIZE; - if (partial) - bio->bi_io_vec[bio->bi_vcnt-1].bv_len = partial; - + for (i=0; i < conf->raid_disks; i++) { + bio = r1_bio->bios[i]; - read_bio = bio_clone(r1_bio->master_bio, GFP_NOIO); - - read_bio->bi_sector = sector_nr + mirror->rdev->data_offset; - read_bio->bi_bdev = mirror->rdev->bdev; - read_bio->bi_end_io = end_sync_read; - read_bio->bi_rw = READ; - read_bio->bi_private = r1_bio; - - if (r1_bio->read_bio) - BUG(); - r1_bio->read_bio = read_bio; + /* take from bio_init */ + bio->bi_next = NULL; + bio->bi_flags |= 1 << BIO_UPTODATE; + bio->bi_rw = 0; + bio->bi_vcnt = 0; + bio->bi_idx = 0; + bio->bi_phys_segments = 0; + bio->bi_hw_segments = 0; + bio->bi_size = 0; + bio->bi_end_io = NULL; + bio->bi_private = NULL; + + if (i == disk) { + bio->bi_rw = READ; + bio->bi_end_io = end_sync_read; + } else if (conf->mirrors[i].rdev && + !conf->mirrors[i].rdev->faulty && + (!conf->mirrors[i].rdev->in_sync || + sector_nr + RESYNC_SECTORS > mddev->recovery_cp)) { + bio->bi_rw = WRITE; + bio->bi_end_io = end_sync_write; + } else + continue; + bio->bi_sector = sector_nr + conf->mirrors[i].rdev->data_offset; + bio->bi_bdev = conf->mirrors[i].rdev->bdev; + bio->bi_private = r1_bio; + } + nr_sectors = 0; + do { + struct page *page; + int len = PAGE_SIZE; + if (sector_nr + (len>>9) > max_sector) + len = (max_sector - sector_nr) << 9; + if (len == 0) + break; + for (i=0 ; i < conf->raid_disks; i++) { + bio = r1_bio->bios[i]; + if (bio->bi_end_io) { + page = r1_bio->bios[0]->bi_io_vec[bio->bi_vcnt].bv_page; + if (bio_add_page(bio, page, len, 0) == 0) { + /* stop here */ + r1_bio->bios[0]->bi_io_vec[bio->bi_vcnt].bv_page = page; + while (i > 0) { + i--; + bio = r1_bio->bios[i]; + if (bio->bi_end_io==NULL) continue; + /* remove last page from this bio */ + bio->bi_vcnt--; + bio->bi_size -= len; + bio->bi_flags &= ~(1<< BIO_SEG_VALID); + } + goto bio_full; + } + } + } + nr_sectors += len>>9; + sector_nr += len>>9; + } while (r1_bio->bios[disk]->bi_vcnt < RESYNC_PAGES); + bio_full: + bio = r1_bio->bios[disk]; + r1_bio->sectors = nr_sectors; md_sync_acct(mirror->rdev, nr_sectors); - generic_make_request(read_bio); + generic_make_request(bio); return nr_sectors; } diff -Nru a/drivers/md/raid5.c b/drivers/md/raid5.c --- a/drivers/md/raid5.c Thu Feb 19 23:44:23 2004 +++ b/drivers/md/raid5.c Thu Feb 19 23:44:23 2004 @@ -284,7 +284,7 @@ kmem_cache_t *sc; int devs = conf->raid_disks; - sprintf(conf->cache_name, "md/raid5-%d", conf->mddev->__minor); + sprintf(conf->cache_name, "raid5/%s", mdname(conf->mddev)); sc = kmem_cache_create(conf->cache_name, sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev), diff -Nru a/drivers/md/raid6main.c b/drivers/md/raid6main.c --- a/drivers/md/raid6main.c Thu Feb 19 23:44:22 2004 +++ b/drivers/md/raid6main.c Thu Feb 19 23:44:22 2004 @@ -303,7 +303,7 @@ kmem_cache_t *sc; int devs = conf->raid_disks; - sprintf(conf->cache_name, "md/raid6-%d", conf->mddev->__minor); + sprintf(conf->cache_name, "raid6/%s", mdname(conf->mddev)); sc = kmem_cache_create(conf->cache_name, sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev), diff -Nru a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig --- a/drivers/media/dvb/Kconfig Thu Feb 19 23:44:24 2004 +++ b/drivers/media/dvb/Kconfig Thu Feb 19 23:44:24 2004 @@ -18,11 +18,12 @@ Please report problems regarding this driver to the LinuxDVB mailing list. - You might want add the following lines to your /etc/modules.conf: + You might want add the following lines to your /etc/modprobe.conf: alias char-major-250 dvb alias dvb dvb-ttpci - below dvb-ttpci alps_bsru6 alps_bsrv2 \ + install dvb-ttpci /sbin/modprobe --first-time -i dvb-ttpci && \ + /sbin/modprobe -a alps_bsru6 alps_bsrv2 \ grundig_29504-401 grundig_29504-491 \ ves1820 diff -Nru a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c --- a/drivers/media/dvb/dvb-core/dvb_net.c Thu Feb 19 23:44:23 2004 +++ b/drivers/media/dvb/dvb-core/dvb_net.c Thu Feb 19 23:44:23 2004 @@ -523,7 +523,8 @@ net->base_addr = pid; if ((result = register_netdev(net)) < 0) { - kfree(net); + dvbnet->device[if_num] = NULL; + free_netdev(net); return result; } @@ -545,6 +546,7 @@ flush_scheduled_work(); unregister_netdev(net); dvbnet->state[num]=0; + dvbnet->device[num] = NULL; free_netdev(net); return 0; diff -Nru a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig --- a/drivers/media/radio/Kconfig Thu Feb 19 23:44:26 2004 +++ b/drivers/media/radio/Kconfig Thu Feb 19 23:44:26 2004 @@ -223,6 +223,20 @@ To compile this driver as a module, choose M here: the module will be called radio-sf16fmi. +config RADIO_SF16FMR2 + tristate "SF16FMR2 Radio" + depends on ISA && VIDEO_DEV + ---help--- + Choose Y here if you have one of these FM radio cards. + + In order to control your radio card, you will need to use programs + that are compatible with the Video For Linux API. Information on + this API and pointers to "v4l" programs may be found on the WWW at + . + + To compile this driver as a module, choose M here: the + module will be called radio-sf16fmr2. + config RADIO_TERRATEC tristate "TerraTec ActiveRadio ISA Standalone" depends on ISA && VIDEO_DEV diff -Nru a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile --- a/drivers/media/radio/Makefile Thu Feb 19 23:44:26 2004 +++ b/drivers/media/radio/Makefile Thu Feb 19 23:44:26 2004 @@ -7,6 +7,7 @@ obj-$(CONFIG_RADIO_AZTECH) += radio-aztech.o obj-$(CONFIG_RADIO_RTRACK2) += radio-rtrack2.o obj-$(CONFIG_RADIO_SF16FMI) += radio-sf16fmi.o +obj-$(CONFIG_RADIO_SF16FMR2) += radio-sf16fmr2.o obj-$(CONFIG_RADIO_CADET) += radio-cadet.o obj-$(CONFIG_RADIO_TYPHOON) += radio-typhoon.o obj-$(CONFIG_RADIO_TERRATEC) += radio-terratec.o diff -Nru a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/media/radio/radio-sf16fmr2.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,447 @@ +/* SF16FMR2 radio driver for Linux radio support + * heavily based on fmi driver... + * (c) 2000-2002 Ziglio Frediano, freddy77@angelfire.com + * + * Notes on the hardware + * + * Frequency control is done digitally -- ie out(port,encodefreq(95.8)); + * No volume control - only mute/unmute - you have to use line volume + * + * For read stereo/mono you must wait 0.1 sec after set frequency and + * card unmuted so I set frequency on unmute + * Signal handling seem to work only on autoscanning (not implemented) + */ + +#include /* Modules */ +#include /* Initdata */ +#include /* check_region, request_region */ +#include /* udelay */ +#include /* outb, outb_p */ +#include /* copy to/from user */ +#include /* kernel radio structs */ +#include + +static struct semaphore lock; + +#undef DEBUG +//#define DEBUG 1 + +#ifdef DEBUG +# define debug_print(s) printk s +#else +# define debug_print(s) +#endif + +/* this should be static vars for module size */ +struct fmr2_device +{ + int port; + int curvol; /* 0-65535, if not volume 0 or 65535 */ + int mute; + int stereo; /* card is producing stereo audio */ + unsigned long curfreq; /* freq in kHz */ + int card_type; + __u32 flags; +}; + +static int io = 0x384; +static int radio_nr = -1; + +/* hw precision is 12.5 kHz + * It is only usefull to give freq in intervall of 200 (=0.0125Mhz), + * other bits will be truncated + */ +#define RSF16_ENCODE(x) ((x)/200+856) +#define RSF16_MINFREQ 87*16000 +#define RSF16_MAXFREQ 108*16000 + +/* from radio-aimslab */ +static void sleep_delay(unsigned long n) +{ + unsigned d=n/(1000000U/HZ); + if (!d) + udelay(n); + else + { + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(d); + } +} + +static inline void wait(int n,int port) +{ + for (;n;--n) inb(port); +} + +static void outbits(int bits, unsigned int data, int nWait, int port) +{ + int bit; + for(;--bits>=0;) { + bit = (data>>bits) & 1; + outb(bit,port); + wait(nWait,port); + outb(bit|2,port); + wait(nWait,port); + outb(bit,port); + wait(nWait,port); + } +} + +static inline void fmr2_mute(int port) +{ + outb(0x00, port); + wait(4,port); +} + +static inline void fmr2_unmute(int port) +{ + outb(0x04, port); + wait(4,port); +} + +static inline int fmr2_stereo_mode(int port) +{ + int n = inb(port); + outb(6,port); + inb(port); + n = ((n>>3)&1)^1; + debug_print((KERN_DEBUG "stereo: %d\n", n)); + return n; +} + +static int fmr2_product_info(struct fmr2_device *dev) +{ + int n = inb(dev->port); + n &= 0xC1; + if (n == 0) + { + /* this should support volume set */ + dev->card_type = 12; + return 0; + } + /* not volume (mine is 11) */ + dev->card_type = (n==128)?11:0; + return n; +} + +static inline int fmr2_getsigstr(struct fmr2_device *dev) +{ + /* !!! work only if scanning freq */ + int port = dev->port, res = 0xffff; + outb(5,port); + wait(4,port); + if (!(inb(port)&1)) res = 0; + debug_print((KERN_DEBUG "signal: %d\n", res)); + return res; +} + +/* set frequency and unmute card */ +static int fmr2_setfreq(struct fmr2_device *dev) +{ + int port = dev->port; + unsigned long freq = dev->curfreq; + + fmr2_mute(port); + + /* 0x42 for mono output + * 0x102 forward scanning + * 0x182 scansione avanti + */ + outbits(9,0x2,3,port); + outbits(16,RSF16_ENCODE(freq),2,port); + + fmr2_unmute(port); + + /* wait 0.11 sec */ + sleep_delay(110000LU); + + /* NOTE if mute this stop radio + you must set freq on unmute */ + dev->stereo = fmr2_stereo_mode(port); + return 0; +} + +/* !!! not tested, in my card this does't work !!! */ +static int fmr2_setvolume(struct fmr2_device *dev) +{ + int i,a,n, port = dev->port; + + if (dev->card_type != 11) return 1; + + switch( (dev->curvol+(1<<11)) >> 12 ) + { + case 0: case 1: n = 0x21; break; + case 2: n = 0x84; break; + case 3: n = 0x90; break; + case 4: n = 0x104; break; + case 5: n = 0x110; break; + case 6: n = 0x204; break; + case 7: n = 0x210; break; + case 8: n = 0x402; break; + case 9: n = 0x404; break; + default: + case 10: n = 0x408; break; + case 11: n = 0x410; break; + case 12: n = 0x801; break; + case 13: n = 0x802; break; + case 14: n = 0x804; break; + case 15: n = 0x808; break; + case 16: n = 0x810; break; + } + for(i=12;--i>=0;) + { + a = ((n >> i) & 1) << 6; /* if (a=0) a= 0; else a= 0x40; */ + outb(a|4, port); + wait(4,port); + outb(a|0x24, port); + wait(4,port); + outb(a|4, port); + wait(4,port); + } + for(i=6;--i>=0;) + { + a = ((0x18 >> i) & 1) << 6; + outb(a|4, port); + wait(4,port); + outb(a|0x24, port); + wait(4,port); + outb(a|4, port); + wait(4,port); + } + wait(4,port); + outb(0x14, port); + + return 0; +} + +static int fmr2_do_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, void *arg) +{ + struct video_device *dev = video_devdata(file); + struct fmr2_device *fmr2 = dev->priv; + debug_print((KERN_DEBUG "freq %ld flags %d vol %d mute %d " + "stereo %d type %d\n", + fmr2->curfreq, fmr2->flags, fmr2->curvol, fmr2->mute, + fmr2->stereo, fmr2->card_type)); + + switch(cmd) + { + case VIDIOCGCAP: + { + struct video_capability *v = arg; + memset(v,0,sizeof(*v)); + strcpy(v->name, "SF16-FMR2 radio"); + v->type=VID_TYPE_TUNER; + v->channels=1; + v->audios=1; + return 0; + } + case VIDIOCGTUNER: + { + struct video_tuner *v = arg; + int mult; + + if(v->tuner) /* Only 1 tuner */ + return -EINVAL; + strcpy(v->name, "FM"); + mult = (fmr2->flags & VIDEO_TUNER_LOW) ? 1 : 1000; + v->rangelow = RSF16_MINFREQ/mult; + v->rangehigh = RSF16_MAXFREQ/mult; + v->flags = fmr2->flags | VIDEO_AUDIO_MUTABLE; + if (fmr2->mute) + v->flags |= VIDEO_AUDIO_MUTE; + v->mode=VIDEO_MODE_AUTO; + down(&lock); + v->signal = fmr2_getsigstr(fmr2); + up(&lock); + return 0; + } + case VIDIOCSTUNER: + { + struct video_tuner *v = arg; + if (v->tuner!=0) + return -EINVAL; + fmr2->flags = v->flags & VIDEO_TUNER_LOW; + return 0; + } + case VIDIOCGFREQ: + { + unsigned long *freq = arg; + *freq = fmr2->curfreq; + if (!(fmr2->flags & VIDEO_TUNER_LOW)) + *freq /= 1000; + return 0; + } + case VIDIOCSFREQ: + { + unsigned long *freq = arg; + if (!(fmr2->flags & VIDEO_TUNER_LOW)) + *freq *= 1000; + if ( *freq < RSF16_MINFREQ || *freq > RSF16_MAXFREQ ) + return -EINVAL; + /* rounding in steps of 200 to match th freq + * that will be used + */ + fmr2->curfreq = (*freq/200)*200; + + /* set card freq (if not muted) */ + if (fmr2->curvol && !fmr2->mute) + { + down(&lock); + fmr2_setfreq(fmr2); + up(&lock); + } + return 0; + } + case VIDIOCGAUDIO: + { + struct video_audio *v = arg; + memset(v,0,sizeof(*v)); + /* !!! do not return VIDEO_AUDIO_MUTE */ + v->flags = VIDEO_AUDIO_MUTABLE; + strcpy(v->name, "Radio"); + /* get current stereo mode */ + v->mode = fmr2->stereo ? VIDEO_SOUND_STEREO: VIDEO_SOUND_MONO; + /* volume supported ? */ + if (fmr2->card_type == 11) + { + v->flags |= VIDEO_AUDIO_VOLUME; + v->step = 1 << 12; + v->volume = fmr2->curvol; + } + debug_print((KERN_DEBUG "Get flags %d vol %d\n", v->flags, v->volume)); + return 0; + } + case VIDIOCSAUDIO: + { + struct video_audio *v = arg; + if(v->audio) + return -EINVAL; + debug_print((KERN_DEBUG "Set flags %d vol %d\n", v->flags, v->volume)); + /* set volume */ + if (v->flags & VIDEO_AUDIO_VOLUME) + fmr2->curvol = v->volume; /* !!! set with precision */ + if (fmr2->card_type != 11) fmr2->curvol = 65535; + fmr2->mute = 0; + if (v->flags & VIDEO_AUDIO_MUTE) + fmr2->mute = 1; +#ifdef DEBUG + if (fmr2->curvol && !fmr2->mute) + printk(KERN_DEBUG "unmute\n"); + else + printk(KERN_DEBUG "mute\n"); +#endif + down(&lock); + if (fmr2->curvol && !fmr2->mute) + { + fmr2_setvolume(fmr2); + fmr2_setfreq(fmr2); + } + else fmr2_mute(fmr2->port); + up(&lock); + return 0; + } + case VIDIOCGUNIT: + { + struct video_unit *v = arg; + v->video=VIDEO_NO_UNIT; + v->vbi=VIDEO_NO_UNIT; + v->radio=dev->minor; + v->audio=0; /* How do we find out this??? */ + v->teletext=VIDEO_NO_UNIT; + return 0; + } + default: + return -ENOIOCTLCMD; + } +} + +static int fmr2_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) + { + return video_usercopy(inode, file, cmd, arg, fmr2_do_ioctl); +} + +static struct fmr2_device fmr2_unit; + +static struct file_operations fmr2_fops = { + .owner = THIS_MODULE, + .open = video_exclusive_open, + .release = video_exclusive_release, + .ioctl = fmr2_ioctl, + .llseek = no_llseek, +}; + +static struct video_device fmr2_radio= +{ + .owner = THIS_MODULE, + .name = "SF16FMR2 radio", + . type = VID_TYPE_TUNER, + .hardware = VID_HARDWARE_SF16FMR2, + .fops = &fmr2_fops, +}; + +static int __init fmr2_init(void) +{ + fmr2_unit.port = io; + fmr2_unit.curvol = 0; + fmr2_unit.mute = 0; + fmr2_unit.curfreq = 0; + fmr2_unit.stereo = 1; + fmr2_unit.flags = VIDEO_TUNER_LOW; + fmr2_unit.card_type = 0; + fmr2_radio.priv = &fmr2_unit; + + init_MUTEX(&lock); + + if (request_region(io, 2, "sf16fmr2")) + { + printk(KERN_ERR "fmr2: port 0x%x already in use\n", io); + return -EBUSY; + } + + if(video_register_device(&fmr2_radio, VFL_TYPE_RADIO, radio_nr)==-1) + { + release_region(io, 2); + return -EINVAL; + } + + printk(KERN_INFO "SF16FMR2 radio card driver at 0x%x.\n", io); + debug_print((KERN_DEBUG "Mute %d Low %d\n",VIDEO_AUDIO_MUTE,VIDEO_TUNER_LOW)); + /* mute card - prevents noisy bootups */ + down(&lock); + fmr2_mute(io); + fmr2_product_info(&fmr2_unit); + up(&lock); + debug_print((KERN_DEBUG "card_type %d\n", fmr2_unit.card_type)); + return 0; +} + +MODULE_AUTHOR("Ziglio Frediano, freddy77@angelfire.com"); +MODULE_DESCRIPTION("A driver for the SF16FMR2 radio."); +MODULE_LICENSE("GPL"); + +MODULE_PARM(io, "i"); +MODULE_PARM_DESC(io, "I/O address of the SF16FMR2 card (should be 0x384, if do not work try 0x284)"); +MODULE_PARM(radio_nr, "i"); + +static void __exit fmr2_cleanup_module(void) +{ + video_unregister_device(&fmr2_radio); + release_region(io,2); +} + +module_init(fmr2_init); +module_exit(fmr2_cleanup_module); + +#ifndef MODULE + +static int __init fmr2_setup_io(char *str) +{ + get_option(&str, &io); + return 1; +} + +__setup("sf16fmr2=", fmr2_setup_io); + +#endif diff -Nru a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c --- a/drivers/media/video/tuner.c Thu Feb 19 23:44:27 2004 +++ b/drivers/media/video/tuner.c Thu Feb 19 23:44:27 2004 @@ -234,6 +234,12 @@ 16*157.25,16*454.00,0xa0,0x90,0x30,0x8e,732}, { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC, 16*160.00,16*442.00,0x01,0x02,0x04,0x8,732}, + + { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC, + 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732}, + { "Microtune 4049 FM5",Microtune,PAL, + 16*141.00,16*464.00,0xa0,0x90,0x30,0x8e,623}, + }; #define TUNERS ARRAY_SIZE(tuners) @@ -984,19 +990,22 @@ t->radio_freq(c,freq); } -static void set_type(struct i2c_client *c, unsigned int type) +static void set_type(struct i2c_client *c, unsigned int type, char *source) { struct tuner *t = i2c_get_clientdata(c); if (t->type != UNSET) { - printk("tuner: type already set (%d)\n",t->type); + if (t->type != type) + printk("tuner: type already set to %d, " + "ignoring request for %d\n", t->type, type); return; } if (type >= TUNERS) return; t->type = type; - printk("tuner: type set to %d (%s)\n", t->type,tuners[t->type].name); + printk("tuner: type set to %d (%s) by %s\n", + t->type,tuners[t->type].name, source); strlcpy(c->name, tuners[t->type].name, sizeof(c->name)); switch (t->type) { @@ -1024,7 +1033,8 @@ client_template.adapter = adap; client_template.addr = addr; - printk("tuner: chip found @ 0x%x\n", addr<<1); + printk("tuner: chip found at addr 0x%x i2c-bus %s\n", + addr<<1, adap->name); if (NULL == (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL))) return -ENOMEM; @@ -1040,12 +1050,8 @@ t->radio_if2 = 10700*1000; // 10.7MHz - FM radio i2c_attach_client(client); - if (type < TUNERS) { - t->type = type; - printk("tuner: type forced to %d (%s) [insmod]\n", - t->type,tuners[t->type].name); - set_type(client,type); - } + if (type < TUNERS) + set_type(client, type, "insmod option"); return 0; } @@ -1094,7 +1100,7 @@ /* --- configuration --- */ case TUNER_SET_TYPE: - set_type(client,*iarg); + set_type(client,*iarg,client->adapter->name); break; case AUDC_SET_RADIO: if (!t->radio) { diff -Nru a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c --- a/drivers/media/video/videocodec.c Thu Feb 19 23:44:25 2004 +++ b/drivers/media/video/videocodec.c Thu Feb 19 23:44:25 2004 @@ -392,15 +392,15 @@ videocodec_buf = (char *) kmalloc(size, GFP_KERNEL); i = 0; - i += snprintf(videocodec_buf + i, size - 1, + i += scnprintf(videocodec_buf + i, size - 1, "lave or attached aster name type flags magic "); - i += snprintf(videocodec_buf + i, size - 1, "(connected as)\n"); + i += scnprintf(videocodec_buf + i, size -i - 1, "(connected as)\n"); h = codeclist_top; while (h) { if (i > (size - LINESIZE)) break; // security check - i += snprintf(videocodec_buf + i, size, + i += scnprintf(videocodec_buf + i, size -i -1, "S %32s %04x %08lx %08lx (TEMPLATE)\n", h->codec->name, h->codec->type, h->codec->flags, h->codec->magic); @@ -408,7 +408,7 @@ while (a) { if (i > (size - LINESIZE)) break; // security check - i += snprintf(videocodec_buf + i, size, + i += scnprintf(videocodec_buf + i, size -i -1, "M %32s %04x %08lx %08lx (%s)\n", a->codec->master_data->name, a->codec->master_data->type, diff -Nru a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c --- a/drivers/message/fusion/mptlan.c Thu Feb 19 23:44:25 2004 +++ b/drivers/message/fusion/mptlan.c Thu Feb 19 23:44:25 2004 @@ -1437,7 +1437,7 @@ SET_MODULE_OWNER(dev); if (register_netdev(dev) != 0) { - kfree(dev); + free_netdev(dev); dev = NULL; } return dev; diff -Nru a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c --- a/drivers/mtd/devices/blkmtd.c Thu Feb 19 23:44:22 2004 +++ b/drivers/mtd/devices/blkmtd.c Thu Feb 19 23:44:22 2004 @@ -550,7 +550,7 @@ if(dev->blkdev) { invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping); - close_bdev_excl(dev->blkdev, BDEV_RAW); + close_bdev_excl(dev->blkdev); } kfree(dev); } @@ -637,10 +637,10 @@ #ifdef MODULE mode = (readonly) ? O_RDONLY : O_RDWR; - bdev = open_bdev_excl(devname, mode, BDEV_RAW, NULL); + bdev = open_bdev_excl(devname, mode, NULL); #else mode = (readonly) ? FMODE_READ : FMODE_WRITE; - bdev = open_by_devnum(name_to_dev_t(devname), mode, BDEV_RAW); + bdev = open_by_devnum(name_to_dev_t(devname), mode); #endif if(IS_ERR(bdev)) { err("error: cannot open device %s", devname); @@ -653,13 +653,13 @@ if(MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) { err("attempting to use an MTD device as a block device"); - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); return NULL; } dev = kmalloc(sizeof(struct blkmtd_dev), GFP_KERNEL); if(dev == NULL) { - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); return NULL; } diff -Nru a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c --- a/drivers/mtd/maps/solutionengine.c Thu Feb 19 23:44:28 2004 +++ b/drivers/mtd/maps/solutionengine.c Thu Feb 19 23:44:28 2004 @@ -97,7 +97,7 @@ nr_parts = parse_mtd_partitions(flash_mtd, probes, &parsed_parts, 0); -#if CONFIG_MTD_SUPERH_RESERVE +#ifdef CONFIG_MTD_SUPERH_RESERVE if (nr_parts <= 0) { printk(KERN_NOTICE "Using configured partition at 0x%08x.\n", CONFIG_MTD_SUPERH_RESERVE); diff -Nru a/drivers/net/3c509.c b/drivers/net/3c509.c --- a/drivers/net/3c509.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/3c509.c Thu Feb 19 23:44:22 2004 @@ -678,6 +678,8 @@ err = el3_common_init(dev); if (err) { + device->driver_data = NULL; + free_netdev(dev); return -ENOMEM; } @@ -737,6 +739,8 @@ err = el3_common_init(dev); if (err) { + eisa_set_drvdata (edev, NULL); + free_netdev(dev); return err; } diff -Nru a/drivers/net/3c59x.c b/drivers/net/3c59x.c --- a/drivers/net/3c59x.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/3c59x.c Thu Feb 19 23:44:22 2004 @@ -291,6 +291,8 @@ MODULE_PARM(full_duplex, "1-" __MODULE_STRING(8) "i"); MODULE_PARM(hw_checksums, "1-" __MODULE_STRING(8) "i"); MODULE_PARM(flow_ctrl, "1-" __MODULE_STRING(8) "i"); +MODULE_PARM(global_enable_wol, "i"); +MODULE_PARM(enable_wol, "1-" __MODULE_STRING(8) "i"); MODULE_PARM(rx_copybreak, "i"); MODULE_PARM(max_interrupt_work, "i"); MODULE_PARM(compaq_ioaddr, "i"); @@ -304,6 +306,8 @@ MODULE_PARM_DESC(global_full_duplex, "3c59x: same as full_duplex, but applies to all NICs if options is unset"); MODULE_PARM_DESC(hw_checksums, "3c59x Hardware checksum checking by adapter(s) (0-1)"); MODULE_PARM_DESC(flow_ctrl, "3c59x 802.3x flow control usage (PAUSE only) (0-1)"); +MODULE_PARM_DESC(enable_wol, "3c59x: Turn on Wake-on-LAN for adapter(s) (0-1)"); +MODULE_PARM_DESC(global_enable_wol, "3c59x: same as enable_wol, but applies to all NICs if options is unset"); MODULE_PARM_DESC(rx_copybreak, "3c59x copy breakpoint for copy-only-tiny-frames"); MODULE_PARM_DESC(max_interrupt_work, "3c59x maximum events handled per interrupt"); MODULE_PARM_DESC(compaq_ioaddr, "3c59x PCI I/O base address (Compaq BIOS problem workaround)"); @@ -813,6 +817,7 @@ flow_ctrl:1, /* Use 802.3x flow control (PAUSE only) */ partner_flow_ctrl:1, /* Partner supports flow control */ has_nway:1, + enable_wol:1, /* Wake-on-LAN is enabled */ pm_state_valid:1, /* power_state[] has sane contents */ open:1, medialock:1, @@ -909,8 +914,10 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; static int hw_checksums[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; static int flow_ctrl[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; +static int enable_wol[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; static int global_options = -1; static int global_full_duplex = -1; +static int global_enable_wol = -1; /* #define dev_alloc_skb dev_alloc_skb_debug */ @@ -1130,6 +1137,8 @@ vortex_debug = 7; if (option & 0x4000) vortex_debug = 2; + if (option & 0x0400) + vp->enable_wol = 1; } print_info = (vortex_debug > 1); @@ -1217,12 +1226,16 @@ if (global_full_duplex > 0) vp->full_duplex = 1; + if (global_enable_wol > 0) + vp->enable_wol = 1; if (card_idx < MAX_UNITS) { if (full_duplex[card_idx] > 0) vp->full_duplex = 1; if (flow_ctrl[card_idx] > 0) vp->flow_ctrl = 1; + if (enable_wol[card_idx] > 0) + vp->enable_wol = 1; } vp->force_fd = vp->full_duplex; @@ -1450,7 +1463,7 @@ dev->set_multicast_list = set_rx_mode; dev->tx_timeout = vortex_tx_timeout; dev->watchdog_timeo = (watchdog * HZ) / 1000; - if (pdev) { + if (pdev && vp->enable_wol) { vp->pm_state_valid = 1; pci_save_state(VORTEX_PCI(vp), vp->power_state); acpi_set_WOL(dev); @@ -1507,7 +1520,7 @@ unsigned int config; int i; - if (VORTEX_PCI(vp)) { + if (VORTEX_PCI(vp) && vp->enable_wol) { pci_set_power_state(VORTEX_PCI(vp), 0); /* Go active */ pci_restore_state(VORTEX_PCI(vp), vp->power_state); } @@ -2656,7 +2669,7 @@ if (vp->full_bus_master_tx) outl(0, ioaddr + DownListPtr); - if (VORTEX_PCI(vp)) { + if (VORTEX_PCI(vp) && vp->enable_wol) { pci_save_state(VORTEX_PCI(vp), vp->power_state); acpi_set_WOL(dev); } @@ -3033,7 +3046,7 @@ /* Should really use issue_and_wait() here */ outw(TotalReset|0x14, dev->base_addr + EL3_CMD); - if (VORTEX_PCI(vp)) { + if (VORTEX_PCI(vp) && vp->enable_wol) { pci_set_power_state(VORTEX_PCI(vp), 0); /* Go active */ if (vp->pm_state_valid) pci_restore_state(VORTEX_PCI(vp), vp->power_state); diff -Nru a/drivers/net/Kconfig b/drivers/net/Kconfig --- a/drivers/net/Kconfig Thu Feb 19 23:44:27 2004 +++ b/drivers/net/Kconfig Thu Feb 19 23:44:27 2004 @@ -1354,8 +1354,9 @@ say N. config E100 - tristate "EtherExpressPro/100 support (e100, Alternate Intel driver)" + tristate "Intel(R) PRO/100+ support" depends on NET_PCI && PCI + select MII ---help--- This driver supports Intel(R) PRO/100 family of adapters, which includes: @@ -1428,6 +1429,10 @@ . The module will be called e100. +config E100_NAPI + bool "Use Rx Polling (NAPI)" + depends on E100 + config LNE390 tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)" depends on NET_PCI && EISA && EXPERIMENTAL @@ -1715,7 +1720,8 @@ ) and you can say N here. Laptop users should read the Linux Laptop home page at - . + or + Tuxmobil - Linux on Mobile Computers at . Note that the answer to this question doesn't directly affect the kernel: saying N will just cause the configurator to skip all @@ -1984,6 +1990,7 @@ - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter - Allied Telesyn AT-2971T Gigabit Ethernet Adapter + - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45 - DGE-530T Gigabit Ethernet Adapter - EG1032 v2 Instant Gigabit Network Adapter - EG1064 v2 Instant Gigabit Network Adapter @@ -1995,6 +2002,7 @@ - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn) - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte) - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill) + - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel) - Marvell RDK-8001 Adapter - Marvell RDK-8002 Adapter - Marvell RDK-8003 Adapter @@ -2006,6 +2014,7 @@ - Marvell RDK-8010 Adapter - Marvell RDK-8011 Adapter - Marvell RDK-8012 Adapter + - Marvell RDK-8052 Adapter - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit) - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit) - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L) diff -Nru a/drivers/net/Makefile b/drivers/net/Makefile --- a/drivers/net/Makefile Thu Feb 19 23:44:24 2004 +++ b/drivers/net/Makefile Thu Feb 19 23:44:24 2004 @@ -8,7 +8,6 @@ obj-$(CONFIG_ISDN) += slhc.o endif -obj-$(CONFIG_E100) += e100/ obj-$(CONFIG_E1000) += e1000/ obj-$(CONFIG_IXGB) += ixgb/ obj-$(CONFIG_BONDING) += bonding/ @@ -39,13 +38,13 @@ obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o obj-$(CONFIG_PCNET32) += pcnet32.o obj-$(CONFIG_EEPRO100) += eepro100.o +obj-$(CONFIG_E100) += e100.o obj-$(CONFIG_TLAN) += tlan.o obj-$(CONFIG_EPIC100) += epic100.o obj-$(CONFIG_SIS190) += sis190.o obj-$(CONFIG_SIS900) += sis900.o obj-$(CONFIG_YELLOWFIN) += yellowfin.o obj-$(CONFIG_ACENIC) += acenic.o -obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_NATSEMI) += natsemi.o obj-$(CONFIG_NS83820) += ns83820.o obj-$(CONFIG_STNIC) += stnic.o 8390.o diff -Nru a/drivers/net/acenic.c b/drivers/net/acenic.c --- a/drivers/net/acenic.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/acenic.c Thu Feb 19 23:44:25 2004 @@ -731,12 +731,6 @@ break; } - if (register_netdev(dev)) { - printk(KERN_ERR "acenic: device registration failed\n"); - free_netdev(dev); - continue; - } - switch(pdev->vendor) { case PCI_VENDOR_ID_ALTEON: if (pdev->device == PCI_DEVICE_ID_FARALLON_PN9100T) { @@ -824,6 +818,13 @@ continue; } + if (register_netdev(dev)) { + printk(KERN_ERR "acenic: device registration failed\n"); + ace_init_cleanup(dev); + free_netdev(dev); + continue; + } + if (ap->pci_using_dac) dev->features |= NETIF_F_HIGHDMA; @@ -874,6 +875,7 @@ while (root_dev) { ap = root_dev->priv; next = ap->next; + unregister_netdev(root_dev); regs = ap->regs; @@ -1133,7 +1135,6 @@ if (dev->irq) free_irq(dev->irq, dev); - unregister_netdev(dev); iounmap(ap->regs); } diff -Nru a/drivers/net/apne.c b/drivers/net/apne.c --- a/drivers/net/apne.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/apne.c Thu Feb 19 23:44:28 2004 @@ -580,6 +580,8 @@ pcmcia_reset(); + release_region(IOBASE, 0x20); + free_netdev(apne_dev); } diff -Nru a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c --- a/drivers/net/appletalk/cops.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/appletalk/cops.c Thu Feb 19 23:44:25 2004 @@ -262,7 +262,7 @@ out1: cleanup_card(dev); out: - kfree(dev); + free_netdev(dev); return ERR_PTR(err); } diff -Nru a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c --- a/drivers/net/arm/am79c961a.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/arm/am79c961a.c Thu Feb 19 23:44:27 2004 @@ -672,6 +672,10 @@ dev->base_addr = 0x220; dev->irq = IRQ_EBSA110_ETHERNET; + ret = -ENODEV; + if (!request_region(dev->base_addr, 0x18, dev->name)) + goto nodev; + /* * Reset the device. */ @@ -682,14 +686,10 @@ * Check the manufacturer part of the * ether address. */ - ret = -ENODEV; if (inb(dev->base_addr) != 0x08 || inb(dev->base_addr + 2) != 0x00 || inb(dev->base_addr + 4) != 0x2b) - goto nodev; - - if (!request_region(dev->base_addr, 0x18, dev->name)) - goto nodev; + goto release; am79c961_banner(); printk(KERN_INFO "%s: ether address ", dev->name); diff -Nru a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c --- a/drivers/net/bonding/bond_3ad.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/bonding/bond_3ad.c Thu Feb 19 23:44:27 2004 @@ -1,5 +1,5 @@ /* - * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. + * Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. * * 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 @@ -48,7 +48,7 @@ * problem on very high Tx traffic load where packets may get dropped * by the slave. * - * 2003/09/24 - Shmulik Hen + * 2003/12/01 - Shmulik Hen * - Code cleanup and style changes */ @@ -2362,6 +2362,7 @@ int agg_id; int i; struct ad_info ad_info; + int res = 1; /* make sure that the slaves list will * not change during tx @@ -2369,12 +2370,12 @@ read_lock(&bond->lock); if (!BOND_IS_OK(bond)) { - goto free_out; + goto out; } if (bond_3ad_get_active_agg_info(bond, &ad_info)) { printk(KERN_DEBUG "ERROR: bond_3ad_get_active_agg_info failed\n"); - goto free_out; + goto out; } slaves_in_agg = ad_info.ports; @@ -2383,7 +2384,7 @@ if (slaves_in_agg == 0) { /*the aggregator is empty*/ printk(KERN_DEBUG "ERROR: active aggregator is empty\n"); - goto free_out; + goto out; } slave_agg_no = (data->h_dest[5]^bond->dev->dev_addr[5]) % slaves_in_agg; @@ -2401,7 +2402,7 @@ if (slave_agg_no >= 0) { printk(KERN_ERR DRV_NAME ": Error: Couldn't find a slave to tx on for aggregator ID %d\n", agg_id); - goto free_out; + goto out; } start_at = slave; @@ -2414,24 +2415,19 @@ slave_agg_id = agg->aggregator_identifier; } - if (SLAVE_IS_OK(slave) && - agg && (slave_agg_id == agg_id)) { - skb->dev = slave->dev; - skb->priority = 1; - dev_queue_xmit(skb); - - goto out; + if (SLAVE_IS_OK(slave) && agg && (slave_agg_id == agg_id)) { + res = bond_dev_queue_xmit(bond, skb, slave->dev); + break; } } out: + if (res) { + /* no suitable interface, frame not sent */ + dev_kfree_skb(skb); + } read_unlock(&bond->lock); return 0; - -free_out: - /* no suitable interface, frame not sent */ - dev_kfree_skb(skb); - goto out; } int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype) diff -Nru a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h --- a/drivers/net/bonding/bond_3ad.h Thu Feb 19 23:44:28 2004 +++ b/drivers/net/bonding/bond_3ad.h Thu Feb 19 23:44:28 2004 @@ -1,5 +1,5 @@ /* - * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. + * Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. * * 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 @@ -29,7 +29,7 @@ * - Renamed bond_3ad_link_status_changed() to * bond_3ad_handle_link_change() for compatibility with TLB. * - * 2003/09/24 - Shmulik Hen + * 2003/12/01 - Shmulik Hen * - Code cleanup and style changes */ diff -Nru a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c --- a/drivers/net/bonding/bond_alb.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/bonding/bond_alb.c Thu Feb 19 23:44:26 2004 @@ -1,5 +1,5 @@ /* - * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. + * Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. * * 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 @@ -29,8 +29,14 @@ * - Add support for setting bond's MAC address with special * handling required for ALB/TLB. * - * 2003/09/24 - Shmulik Hen + * 2003/12/01 - Shmulik Hen * - Code cleanup and style changes + * + * 2003/12/30 - Amir Noam + * - Fixed: Cannot remove and re-enslave the original active slave. + * + * 2004/01/14 - Shmulik Hen + * - Add capability to tag self generated packets in ALB/TLB modes. */ //#define BONDING_DEBUG 1 @@ -47,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -76,7 +83,7 @@ #define TLB_NULL_INDEX 0xffffffff -#define MAX_LP_RETRY 3 +#define MAX_LP_BURST 3 /* rlb defs */ #define RLB_HASH_TABLE_SIZE 256 @@ -495,13 +502,33 @@ } for (i = 0; i < RLB_ARP_BURST_SIZE; i++) { - arp_send(ARPOP_REPLY, ETH_P_ARP, - client_info->ip_dst, - client_info->slave->dev, - client_info->ip_src, - client_info->mac_dst, - client_info->slave->dev->dev_addr, - client_info->mac_dst); + struct sk_buff *skb; + + skb = arp_create(ARPOP_REPLY, ETH_P_ARP, + client_info->ip_dst, + client_info->slave->dev, + client_info->ip_src, + client_info->mac_dst, + client_info->slave->dev->dev_addr, + client_info->mac_dst); + if (!skb) { + printk(KERN_ERR DRV_NAME + ": Error: failed to create an ARP packet\n"); + continue; + } + + skb->dev = client_info->slave->dev; + + if (client_info->tag) { + skb = vlan_put_tag(skb, client_info->vlan_id); + if (!skb) { + printk(KERN_ERR DRV_NAME + ": Error: failed to insert VLAN tag\n"); + continue; + } + } + + arp_xmit(skb); } } @@ -600,9 +627,10 @@ } /* Caller must hold both bond and ptr locks for read */ -struct slave *rlb_choose_channel(struct bonding *bond, struct arp_pkt *arp) +struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bond) { struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); + struct arp_pkt *arp = (struct arp_pkt *)skb->nh.raw; struct slave *assigned_slave; struct rlb_client_info *client_info; u32 hash_index = 0; @@ -658,6 +686,15 @@ client_info->ntt = 0; } + if (!list_empty(&bond->vlan_list)) { + unsigned short vlan_id; + int res = vlan_get_tag(skb, &vlan_id); + if (!res) { + client_info->tag = 1; + client_info->vlan_id = vlan_id; + } + } + if (!client_info->assigned) { u32 prev_tbl_head = bond_info->rx_hashtbl_head; bond_info->rx_hashtbl_head = hash_index; @@ -688,7 +725,7 @@ /* the arp must be sent on the selected * rx channel */ - tx_slave = rlb_choose_channel(bond, arp); + tx_slave = rlb_choose_channel(skb, bond); if (tx_slave) { memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN); } @@ -699,7 +736,7 @@ * When the arp reply is received the entry will be updated * with the correct unicast address of the client. */ - rlb_choose_channel(bond, arp); + rlb_choose_channel(skb, bond); /* The ARP relpy packets must be delayed so that * they can cancel out the influence of the ARP request. @@ -805,6 +842,40 @@ kfree(bond_info->rx_hashtbl); bond_info->rx_hashtbl = NULL; + bond_info->rx_hashtbl_head = RLB_NULL_INDEX; + + _unlock_rx_hashtbl(bond); +} + +static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id) +{ + struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); + u32 curr_index; + + _lock_rx_hashtbl(bond); + + curr_index = bond_info->rx_hashtbl_head; + while (curr_index != RLB_NULL_INDEX) { + struct rlb_client_info *curr = &(bond_info->rx_hashtbl[curr_index]); + u32 next_index = bond_info->rx_hashtbl[curr_index].next; + u32 prev_index = bond_info->rx_hashtbl[curr_index].prev; + + if (curr->tag && (curr->vlan_id == vlan_id)) { + if (curr_index == bond_info->rx_hashtbl_head) { + bond_info->rx_hashtbl_head = next_index; + } + if (prev_index != RLB_NULL_INDEX) { + bond_info->rx_hashtbl[prev_index].next = next_index; + } + if (next_index != RLB_NULL_INDEX) { + bond_info->rx_hashtbl[next_index].prev = prev_index; + } + + rlb_init_table_entry(curr); + } + + curr_index = next_index; + } _unlock_rx_hashtbl(bond); } @@ -813,6 +884,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[]) { + struct bonding *bond = bond_get_bond_by_slave(slave); struct learning_pkt pkt; int size = sizeof(struct learning_pkt); int i; @@ -822,7 +894,7 @@ memcpy(pkt.mac_src, mac_addr, ETH_ALEN); pkt.type = __constant_htons(ETH_P_LOOP); - for (i = 0; i < MAX_LP_RETRY; i++) { + for (i = 0; i < MAX_LP_BURST; i++) { struct sk_buff *skb; char *data; @@ -840,6 +912,26 @@ skb->priority = TC_PRIO_CONTROL; skb->dev = slave->dev; + if (!list_empty(&bond->vlan_list)) { + struct vlan_entry *vlan; + + vlan = bond_next_vlan(bond, + bond->alb_info.current_alb_vlan); + + bond->alb_info.current_alb_vlan = vlan; + if (!vlan) { + kfree_skb(skb); + continue; + } + + skb = vlan_put_tag(skb, vlan->vlan_id); + if (!skb) { + printk(KERN_ERR DRV_NAME + ": Error: failed to insert VLAN tag\n"); + continue; + } + } + dev_queue_xmit(skb); } } @@ -992,6 +1084,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slave *slave) { struct slave *tmp_slave1, *tmp_slave2, *free_mac_slave; + struct slave *has_bond_addr = bond->curr_active_slave; int i, j, found = 0; if (bond->slave_cnt == 0) { @@ -1049,6 +1142,15 @@ free_mac_slave = tmp_slave1; break; } + + if (!has_bond_addr) { + if (!memcmp(tmp_slave1->dev->dev_addr, + bond->dev->dev_addr, + ETH_ALEN)) { + + has_bond_addr = tmp_slave1; + } + } } if (free_mac_slave) { @@ -1059,7 +1161,8 @@ ": Warning: the hw address of slave %s is in use by " "the bond; giving it the hw address of %s\n", slave->dev->name, free_mac_slave->dev->name); - } else { + + } else if (has_bond_addr) { printk(KERN_ERR DRV_NAME ": Error: the hw address of slave %s is in use by the " "bond; couldn't find a slave with a free hw address to " @@ -1171,7 +1274,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) { struct bonding *bond = bond_dev->priv; - struct ethhdr *eth_data = (struct ethhdr *)skb->mac.raw = skb->data; + struct ethhdr *eth_data; struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); struct slave *tx_slave = NULL; static u32 ip_bcast = 0xffffffff; @@ -1179,6 +1282,10 @@ int do_tx_balance = 1; u32 hash_index = 0; u8 *hash_start = NULL; + int res = 1; + + skb->mac.raw = (unsigned char *)skb->data; + eth_data = (struct ethhdr *)skb->data; /* make sure that the curr_active_slave and the slaves list do * not change during tx @@ -1187,7 +1294,7 @@ read_lock(&bond->curr_slave_lock); if (!BOND_IS_OK(bond)) { - goto free_out; + goto out; } switch (ntohs(skb->protocol)) { @@ -1217,8 +1324,7 @@ break; } - if (ipx_hdr(skb)->ipx_type != - __constant_htons(IPX_TYPE_NCP)) { + if (ipx_hdr(skb)->ipx_type != IPX_TYPE_NCP) { /* The only protocol worth balancing in * this family since it has an "ARP" like * mechanism @@ -1253,29 +1359,27 @@ } if (tx_slave && SLAVE_IS_OK(tx_slave)) { - skb->dev = tx_slave->dev; if (tx_slave != bond->curr_active_slave) { memcpy(eth_data->h_source, tx_slave->dev->dev_addr, ETH_ALEN); } - dev_queue_xmit(skb); + + res = bond_dev_queue_xmit(bond, skb, tx_slave->dev); } else { - /* no suitable interface, frame not sent */ if (tx_slave) { tlb_clear_slave(bond, tx_slave, 0); } - goto free_out; } out: + if (res) { + /* no suitable interface, frame not sent */ + dev_kfree_skb(skb); + } read_unlock(&bond->curr_slave_lock); read_unlock(&bond->lock); return 0; - -free_out: - dev_kfree_skb(skb); - goto out; } void bond_alb_monitor(struct bonding *bond) @@ -1574,5 +1678,17 @@ } return 0; +} + +void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id) +{ + if (bond->alb_info.current_alb_vlan && + (bond->alb_info.current_alb_vlan->vlan_id == vlan_id)) { + bond->alb_info.current_alb_vlan = NULL; + } + + if (bond->alb_info.rlb_enabled) { + rlb_clear_vlan(bond, vlan_id); + } } diff -Nru a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h --- a/drivers/net/bonding/bond_alb.h Thu Feb 19 23:44:23 2004 +++ b/drivers/net/bonding/bond_alb.h Thu Feb 19 23:44:23 2004 @@ -1,5 +1,5 @@ /* - * Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. + * Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. * * 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 @@ -25,7 +25,7 @@ * - Add support for setting bond's MAC address with special * handling required for ALB/TLB. * - * 2003/09/24 - Shmulik Hen + * 2003/12/01 - Shmulik Hen * - Code cleanup and style changes */ @@ -77,6 +77,8 @@ u8 assigned; /* checking whether this entry is assigned */ u8 ntt; /* flag - need to transmit client info */ struct slave *slave; /* the slave assigned to this client */ + u8 tag; /* flag - need to tag skb */ + unsigned short vlan_id; /* VLAN tag associated with IP address */ }; struct tlb_slave_info { @@ -122,6 +124,7 @@ * rx traffic should be * rebalanced */ + struct vlan_entry *current_alb_vlan; }; int bond_alb_initialize(struct bonding *bond, int rlb_enabled); @@ -133,6 +136,6 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); void bond_alb_monitor(struct bonding *bond); int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr); - +void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id); #endif /* __BOND_ALB_H__ */ diff -Nru a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c --- a/drivers/net/bonding/bond_main.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/bonding/bond_main.c Thu Feb 19 23:44:28 2004 @@ -452,6 +452,23 @@ * o Change struct member names and types. * o Chomp trailing spaces, remove empty lines, fix indentations. * o Re-organize code according to context. + * + * 2003/12/30 - Amir Noam + * - Fixed: Cannot remove and re-enslave the original active slave. + * - Fixed: Releasing the original active slave causes mac address + * duplication. + * - Add support for slaves that use ethtool_ops. + * Set version to 2.5.3. + * + * 2004/01/05 - Amir Noam + * - Save bonding parameters per bond instead of using the global values. + * Set version to 2.5.4. + * + * 2004/01/14 - Shmulik Hen + * - Enhance VLAN support: + * * Add support for VLAN hardware acceleration capable slaves. + * * Add capability to tag self generated packets in ALB/TLB modes. + * Set version to 2.6.0. */ //#define BONDING_DEBUG 1 @@ -493,6 +510,7 @@ #include #include #include +#include #include #include "bonding.h" #include "bond_3ad.h" @@ -503,7 +521,6 @@ /* monitor all links that often (in milliseconds). <=0 disables monitoring */ #define BOND_LINK_MON_INTERV 0 #define BOND_LINK_ARP_INTERV 0 -#define MAX_ARP_IP_TARGETS 16 static int max_bonds = BOND_DEFAULT_MAX_BONDS; static int miimon = BOND_LINK_MON_INTERV; @@ -514,7 +531,7 @@ static char *primary = NULL; static char *lacp_rate = NULL; static int arp_interval = BOND_LINK_ARP_INTERV; -static char *arp_ip_target[MAX_ARP_IP_TARGETS] = { NULL, }; +static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, }; MODULE_PARM(max_bonds, "i"); MODULE_PARM_DESC(max_bonds, "Max number of bonded devices"); @@ -534,7 +551,7 @@ MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner (slow/fast)"); MODULE_PARM(arp_interval, "i"); MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds"); -MODULE_PARM(arp_ip_target, "1-" __MODULE_STRING(MAX_ARP_IP_TARGETS) "s"); +MODULE_PARM(arp_ip_target, "1-" __MODULE_STRING(BOND_MAX_ARP_TARGETS) "s"); MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form"); /*----------------------------- Global variables ----------------------------*/ @@ -548,7 +565,7 @@ static struct proc_dir_entry *bond_proc_dir = NULL; #endif -static u32 arp_target[MAX_ARP_IP_TARGETS] = { 0, } ; +static u32 arp_target[BOND_MAX_ARP_TARGETS] = { 0, } ; static int arp_ip_count = 0; static u32 my_ip = 0; static int bond_mode = BOND_MODE_ROUNDROBIN; @@ -584,11 +601,15 @@ { NULL, -1}, }; +/*-------------------------- Forward declarations ---------------------------*/ + +static inline void bond_set_mode_ops(struct net_device *bond_dev, int mode); + /*---------------------------- General routines -----------------------------*/ -static const char *bond_mode_name(void) +static const char *bond_mode_name(int mode) { - switch (bond_mode) { + switch (mode) { case BOND_MODE_ROUNDROBIN : return "load balancing (round-robin)"; case BOND_MODE_ACTIVEBACKUP : @@ -608,6 +629,371 @@ } } +/*---------------------------------- VLAN -----------------------------------*/ + +/** + * bond_add_vlan - add a new vlan id on bond + * @bond: bond that got the notification + * @vlan_id: the vlan id to add + * + * Returns -ENOMEM if allocation failed. + */ +static int bond_add_vlan(struct bonding *bond, unsigned short vlan_id) +{ + struct vlan_entry *vlan; + + dprintk("bond: %s, vlan id %d\n", + (bond ? bond->dev->name: "None"), vlan_id); + + vlan = kmalloc(sizeof(struct vlan_entry), GFP_KERNEL); + if (!vlan) { + return -ENOMEM; + } + + INIT_LIST_HEAD(&vlan->vlan_list); + vlan->vlan_id = vlan_id; + + write_lock_bh(&bond->lock); + + list_add_tail(&vlan->vlan_list, &bond->vlan_list); + + write_unlock_bh(&bond->lock); + + dprintk("added VLAN ID %d on bond %s\n", vlan_id, bond->dev->name); + + return 0; +} + +/** + * bond_del_vlan - delete a vlan id from bond + * @bond: bond that got the notification + * @vlan_id: the vlan id to delete + * + * returns -ENODEV if @vlan_id was not found in @bond. + */ +static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id) +{ + struct vlan_entry *vlan, *next; + int res = -ENODEV; + + dprintk("bond: %s, vlan id %d\n", bond->dev->name, vlan_id); + + write_lock_bh(&bond->lock); + + list_for_each_entry_safe(vlan, next, &bond->vlan_list, vlan_list) { + if (vlan->vlan_id == vlan_id) { + list_del(&vlan->vlan_list); + + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { + bond_alb_clear_vlan(bond, vlan_id); + } + + dprintk("removed VLAN ID %d from bond %s\n", vlan_id, + bond->dev->name); + + kfree(vlan); + + if (list_empty(&bond->vlan_list) && + (bond->slave_cnt == 0)) { + /* Last VLAN removed and no slaves, so + * restore block on adding VLANs. This will + * be removed once new slaves that are not + * VLAN challenged will be added. + */ + bond->dev->features |= NETIF_F_VLAN_CHALLENGED; + } + + res = 0; + goto out; + } + } + + dprintk("couldn't find VLAN ID %d in bond %s\n", vlan_id, + bond->dev->name); + +out: + write_unlock_bh(&bond->lock); + return res; +} + +/** + * bond_has_challenged_slaves + * @bond: the bond we're working on + * + * Searches the slave list. Returns 1 if a vlan challenged slave + * was found, 0 otherwise. + * + * Assumes bond->lock is held. + */ +static int bond_has_challenged_slaves(struct bonding *bond) +{ + struct slave *slave; + int i; + + bond_for_each_slave(bond, slave, i) { + if (slave->dev->features & NETIF_F_VLAN_CHALLENGED) { + dprintk("found VLAN challenged slave - %s\n", + slave->dev->name); + return 1; + } + } + + dprintk("no VLAN challenged slaves found\n"); + return 0; +} + +/** + * bond_next_vlan - safely skip to the next item in the vlans list. + * @bond: the bond we're working on + * @curr: item we're advancing from + * + * Returns %NULL if list is empty, bond->next_vlan if @curr is %NULL, + * or @curr->next otherwise (even if it is @curr itself again). + * + * Caller must hold bond->lock + */ +struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr) +{ + struct vlan_entry *next, *last; + + if (list_empty(&bond->vlan_list)) { + return NULL; + } + + if (!curr) { + next = list_entry(bond->vlan_list.next, + struct vlan_entry, vlan_list); + } else { + last = list_entry(bond->vlan_list.prev, + struct vlan_entry, vlan_list); + if (last == curr) { + next = list_entry(bond->vlan_list.next, + struct vlan_entry, vlan_list); + } else { + next = list_entry(curr->vlan_list.next, + struct vlan_entry, vlan_list); + } + } + + return next; +} + +/** + * bond_dev_queue_xmit - Prepare skb for xmit. + * + * @bond: bond device that got this skb for tx. + * @skb: hw accel VLAN tagged skb to transmit + * @slave_dev: slave that is supposed to xmit this skbuff + * + * When the bond gets an skb to tarnsmit that is + * already hardware accelerated VLAN tagged, and it + * needs to relay this skb to a slave that is not + * hw accel capable, the skb needs to be "unaccelerated", + * i.e. strip the hwaccel tag and re-insert it as part + * of the payload. + * + * Assumption - once a VLAN device is created over the bond device, all + * packets are going to be hardware accelerated VLAN tagged since the IP + * binding is done over the VLAN device + */ +int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev) +{ + unsigned short vlan_id; + int res; + + if (!list_empty(&bond->vlan_list) && + !(slave_dev->features & NETIF_F_HW_VLAN_TX)) { + res = vlan_get_tag(skb, &vlan_id); + if (res) { + return -EINVAL; + } + + skb->dev = slave_dev; + skb = vlan_put_tag(skb, vlan_id); + if (!skb) { + /* vlan_put_tag() frees the skb in case of error, + * so return success here so the calling functions + * won't attempt to free is again. + */ + return 0; + } + } else { + skb->dev = slave_dev; + } + + skb->priority = 1; + dev_queue_xmit(skb); + + return 0; +} + +/* + * In the following 3 functions, bond_vlan_rx_register(), bond_vlan_rx_add_vid + * and bond_vlan_rx_kill_vid, We don't protect the slave list iteration with a + * lock because: + * a. This operation is performed in IOCTL context, + * b. The operation is protected by the RTNL semaphore in the 8021q code, + * c. Holding a lock with BH disabled while directly calling a base driver + * entry point is generally a BAD idea. + * + * The design of synchronization/protection for this operation in the 8021q + * module is good for one or more VLAN devices over a single physical device + * and cannot be extended for a teaming solution like bonding, so there is a + * potential race condition here where a net device from the vlan group might + * be referenced (either by a base driver or the 8021q code) while it is being + * removed from the system. However, it turns out we're not making matters + * worse, and if it works for regular VLAN usage it will work here too. +*/ + +/** + * bond_vlan_rx_register - Propagates registration to slaves + * @bond_dev: bonding net device that got called + * @grp: vlan group being registered + */ +static void bond_vlan_rx_register(struct net_device *bond_dev, struct vlan_group *grp) +{ + struct bonding *bond = bond_dev->priv; + struct slave *slave; + int i; + + bond->vlgrp = grp; + + bond_for_each_slave(bond, slave, i) { + struct net_device *slave_dev = slave->dev; + + if ((slave_dev->features & NETIF_F_HW_VLAN_RX) && + slave_dev->vlan_rx_register) { + slave_dev->vlan_rx_register(slave_dev, grp); + } + } +} + +/** + * bond_vlan_rx_add_vid - Propagates adding an id to slaves + * @bond_dev: bonding net device that got called + * @vid: vlan id being added + */ +static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid) +{ + struct bonding *bond = bond_dev->priv; + struct slave *slave; + int i, res; + + bond_for_each_slave(bond, slave, i) { + struct net_device *slave_dev = slave->dev; + + if ((slave_dev->features & NETIF_F_HW_VLAN_FILTER) && + slave_dev->vlan_rx_add_vid) { + slave_dev->vlan_rx_add_vid(slave_dev, vid); + } + } + + res = bond_add_vlan(bond, vid); + if (res) { + printk(KERN_ERR DRV_NAME + ": %s: Failed to add vlan id %d\n", + bond_dev->name, vid); + } +} + +/** + * bond_vlan_rx_kill_vid - Propagates deleting an id to slaves + * @bond_dev: bonding net device that got called + * @vid: vlan id being removed + */ +static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid) +{ + struct bonding *bond = bond_dev->priv; + struct slave *slave; + struct net_device *vlan_dev; + int i, res; + + bond_for_each_slave(bond, slave, i) { + struct net_device *slave_dev = slave->dev; + + if ((slave_dev->features & NETIF_F_HW_VLAN_FILTER) && + slave_dev->vlan_rx_kill_vid) { + /* Save and then restore vlan_dev in the grp array, + * since the slave's driver might clear it. + */ + vlan_dev = bond->vlgrp->vlan_devices[vid]; + slave_dev->vlan_rx_kill_vid(slave_dev, vid); + bond->vlgrp->vlan_devices[vid] = vlan_dev; + } + } + + res = bond_del_vlan(bond, vid); + if (res) { + printk(KERN_ERR DRV_NAME + ": %s: Failed to remove vlan id %d\n", + bond_dev->name, vid); + } +} + +static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *slave_dev) +{ + struct vlan_entry *vlan; + + write_lock_bh(&bond->lock); + + if (list_empty(&bond->vlan_list)) { + goto out; + } + + if ((slave_dev->features & NETIF_F_HW_VLAN_RX) && + slave_dev->vlan_rx_register) { + slave_dev->vlan_rx_register(slave_dev, bond->vlgrp); + } + + if (!(slave_dev->features & NETIF_F_HW_VLAN_FILTER) || + !(slave_dev->vlan_rx_add_vid)) { + goto out; + } + + list_for_each_entry(vlan, &bond->vlan_list, vlan_list) { + slave_dev->vlan_rx_add_vid(slave_dev, vlan->vlan_id); + } + +out: + write_unlock_bh(&bond->lock); +} + +static void bond_del_vlans_from_slave(struct bonding *bond, struct net_device *slave_dev) +{ + struct vlan_entry *vlan; + struct net_device *vlan_dev; + + write_lock_bh(&bond->lock); + + if (list_empty(&bond->vlan_list)) { + goto out; + } + + if (!(slave_dev->features & NETIF_F_HW_VLAN_FILTER) || + !(slave_dev->vlan_rx_kill_vid)) { + goto unreg; + } + + list_for_each_entry(vlan, &bond->vlan_list, vlan_list) { + /* Save and then restore vlan_dev in the grp array, + * since the slave's driver might clear it. + */ + vlan_dev = bond->vlgrp->vlan_devices[vlan->vlan_id]; + slave_dev->vlan_rx_kill_vid(slave_dev, vlan->vlan_id); + bond->vlgrp->vlan_devices[vlan->vlan_id] = vlan_dev; + } + +unreg: + if ((slave_dev->features & NETIF_F_HW_VLAN_RX) && + slave_dev->vlan_rx_register) { + slave_dev->vlan_rx_register(slave_dev, NULL); + } + +out: + write_unlock_bh(&bond->lock); +} + /*------------------------------- Link status -------------------------------*/ /* @@ -623,44 +1009,55 @@ struct ifreq ifr; struct ethtool_cmd etool; - ioctl = slave_dev->do_ioctl; - if (ioctl) { - etool.cmd = ETHTOOL_GSET; - ifr.ifr_data = (char*)&etool; - if (IOCTL(slave_dev, &ifr, SIOCETHTOOL) == 0) { - slave->speed = etool.speed; - slave->duplex = etool.duplex; - } else { - goto err_out; + /* Fake speed and duplex */ + slave->speed = SPEED_100; + slave->duplex = DUPLEX_FULL; + + if (slave_dev->ethtool_ops) { + u32 res; + + if (!slave_dev->ethtool_ops->get_settings) { + return -1; } - } else { - goto err_out; + + res = slave_dev->ethtool_ops->get_settings(slave_dev, &etool); + if (res < 0) { + return -1; + } + + goto verify; + } + + ioctl = slave_dev->do_ioctl; + strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ); + etool.cmd = ETHTOOL_GSET; + ifr.ifr_data = (char*)&etool; + if (!ioctl || (IOCTL(slave_dev, &ifr, SIOCETHTOOL) < 0)) { + return -1; } - switch (slave->speed) { +verify: + switch (etool.speed) { case SPEED_10: case SPEED_100: case SPEED_1000: break; default: - goto err_out; + return -1; } - switch (slave->duplex) { + switch (etool.duplex) { case DUPLEX_FULL: case DUPLEX_HALF: break; default: - goto err_out; + return -1; } - return 0; + slave->speed = etool.speed; + slave->duplex = etool.duplex; -err_out: - /* Fake speed and duplex */ - slave->speed = SPEED_100; - slave->duplex = DUPLEX_FULL; - return -1; + return 0; } /* @@ -679,14 +1076,14 @@ * It'd be nice if there was a good way to tell if a driver supports * netif_carrier, but there really isn't. */ -static int bond_check_dev_link(struct net_device *slave_dev, int reporting) +static int bond_check_dev_link(struct bonding *bond, struct net_device *slave_dev, int reporting) { static int (* ioctl)(struct net_device *, struct ifreq *, int); struct ifreq ifr; struct mii_ioctl_data *mii; struct ethtool_value etool; - if (use_carrier) { + if (bond->params.use_carrier) { return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0; } @@ -705,6 +1102,7 @@ */ /* Yes, the mii is overlaid on the ifreq.ifr_ifru */ + strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ); mii = (struct mii_ioctl_data *)&ifr.ifr_data; if (IOCTL(slave_dev, &ifr, SIOCGMIIPHY) == 0) { mii->reg_num = MII_BMSR; @@ -712,10 +1110,23 @@ return (mii->val_out & BMSR_LSTATUS); } } + } - /* try SIOCETHTOOL ioctl, some drivers cache ETHTOOL_GLINK */ - /* for a period of time so we attempt to get link status */ - /* from it last if the above MII ioctls fail... */ + /* try SIOCETHTOOL ioctl, some drivers cache ETHTOOL_GLINK */ + /* for a period of time so we attempt to get link status */ + /* from it last if the above MII ioctls fail... */ + if (slave_dev->ethtool_ops) { + if (slave_dev->ethtool_ops->get_link) { + u32 link; + + link = slave_dev->ethtool_ops->get_link(slave_dev); + + return link ? BMSR_LSTATUS : 0; + } + } + + if (ioctl) { + strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ); etool.cmd = ETHTOOL_GLINK; ifr.ifr_data = (char*)&etool; if (IOCTL(slave_dev, &ifr, SIOCETHTOOL) == 0) { @@ -769,7 +1180,7 @@ */ static void bond_set_promiscuity(struct bonding *bond, int inc) { - if (USES_PRIMARY(bond_mode)) { + if (USES_PRIMARY(bond->params.mode)) { /* write lock already acquired */ if (bond->curr_active_slave) { dev_set_promiscuity(bond->curr_active_slave->dev, inc); @@ -788,7 +1199,7 @@ */ static void bond_set_allmulti(struct bonding *bond, int inc) { - if (USES_PRIMARY(bond_mode)) { + if (USES_PRIMARY(bond->params.mode)) { /* write lock already acquired */ if (bond->curr_active_slave) { dev_set_allmulti(bond->curr_active_slave->dev, inc); @@ -808,7 +1219,7 @@ */ static void bond_mc_add(struct bonding *bond, void *addr, int alen) { - if (USES_PRIMARY(bond_mode)) { + if (USES_PRIMARY(bond->params.mode)) { /* write lock already acquired */ if (bond->curr_active_slave) { dev_mc_add(bond->curr_active_slave->dev, addr, alen, 0); @@ -828,7 +1239,7 @@ */ static void bond_mc_delete(struct bonding *bond, void *addr, int alen) { - if (USES_PRIMARY(bond_mode)) { + if (USES_PRIMARY(bond->params.mode)) { /* write lock already acquired */ if (bond->curr_active_slave) { dev_mc_delete(bond->curr_active_slave->dev, addr, alen, 0); @@ -888,13 +1299,14 @@ */ static void bond_mc_list_flush(struct net_device *bond_dev, struct net_device *slave_dev) { + struct bonding *bond = bond_dev->priv; struct dev_mc_list *dmi; for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) { dev_mc_delete(slave_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0); } - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { /* del lacpdu mc addr from mc list */ u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR; @@ -913,7 +1325,7 @@ { struct dev_mc_list *dmi; - if (!USES_PRIMARY(bond_mode)) { + if (!USES_PRIMARY(bond->params.mode)) { /* nothing to do - mc list is already up-to-date on * all slaves */ @@ -959,7 +1371,7 @@ { struct slave *new_active, *old_active; struct slave *bestslave = NULL; - int mintime; + int mintime = bond->params.updelay; int i; new_active = old_active = bond->curr_active_slave; @@ -972,15 +1384,13 @@ } } - mintime = updelay; - /* first try the primary link; if arping, a link must tx/rx traffic * before it can be considered the curr_active_slave - also, we would skip * slaves between the curr_active_slave and primary_slave that may be up * and able to arp */ if ((bond->primary_slave) && - (!arp_interval) && + (!bond->params.arp_interval) && (IS_UP(bond->primary_slave->dev))) { new_active = bond->primary_slave; } @@ -1030,28 +1440,28 @@ if (new_active) { if (new_active->link == BOND_LINK_BACK) { - if (USES_PRIMARY(bond_mode)) { + if (USES_PRIMARY(bond->params.mode)) { printk(KERN_INFO DRV_NAME ": %s: making interface %s the new " "active one %d ms earlier.\n", bond->dev->name, new_active->dev->name, - (updelay - new_active->delay) * miimon); + (bond->params.updelay - new_active->delay) * bond->params.miimon); } new_active->delay = 0; new_active->link = BOND_LINK_UP; new_active->jiffies = jiffies; - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { bond_3ad_handle_link_change(new_active, BOND_LINK_UP); } - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP); } } else { - if (USES_PRIMARY(bond_mode)) { + if (USES_PRIMARY(bond->params.mode)) { printk(KERN_INFO DRV_NAME ": %s: making interface %s the new " "active one.\n", @@ -1060,7 +1470,7 @@ } } - if (bond_mode == BOND_MODE_ACTIVEBACKUP) { + if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) { if (old_active) { bond_set_slave_inactive_flags(old_active); } @@ -1070,12 +1480,12 @@ } } - if (USES_PRIMARY(bond_mode)) { + if (USES_PRIMARY(bond->params.mode)) { bond_mc_swap(bond, new_active, old_active); } - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { bond_alb_handle_active_change(bond, new_active); } else { bond->curr_active_slave = new_active; @@ -1178,6 +1588,7 @@ struct dev_mc_list *dmi; struct sockaddr addr; int link_reporting; + int old_features = bond_dev->features; int res = 0; if (slave_dev->do_ioctl == NULL) { @@ -1198,6 +1609,36 @@ return -EBUSY; } + /* vlan challenged mutual exclusion */ + /* no need to lock since we're protected by rtnl_lock */ + if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) { + dprintk("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name); + if (!list_empty(&bond->vlan_list)) { + printk(KERN_ERR DRV_NAME + ": Error: cannot enslave VLAN " + "challenged slave %s on VLAN enabled " + "bond %s\n", slave_dev->name, + bond_dev->name); + return -EPERM; + } else { + printk(KERN_WARNING DRV_NAME + ": Warning: enslaved VLAN challenged " + "slave %s. Adding VLANs will be blocked as " + "long as %s is part of bond %s\n", + slave_dev->name, slave_dev->name, + bond_dev->name); + bond_dev->features |= NETIF_F_VLAN_CHALLENGED; + } + } else { + dprintk("%s: ! NETIF_F_VLAN_CHALLENGED\n", slave_dev->name); + if (bond->slave_cnt == 0) { + /* First slave, and it is not VLAN challenged, + * so remove the block of adding VLANs over the bond. + */ + bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED; + } + } + if (app_abi_ver >= 1) { /* The application is using an ABI, which requires the * slave interface to be closed. @@ -1206,7 +1647,8 @@ printk(KERN_ERR DRV_NAME ": Error: %s is up\n", slave_dev->name); - return -EPERM; + res = -EPERM; + goto err_undo_flags; } if (slave_dev->set_mac_address == NULL) { @@ -1217,7 +1659,8 @@ "Your kernel likely does not support slave " "devices.\n"); - return -EOPNOTSUPP; + res = -EOPNOTSUPP; + goto err_undo_flags; } } else { /* The application is not using an ABI, which requires the @@ -1227,23 +1670,26 @@ printk(KERN_ERR DRV_NAME ": Error: %s is not running\n", slave_dev->name); - return -EINVAL; + res = -EINVAL; + goto err_undo_flags; } - if ((bond_mode == BOND_MODE_8023AD) || - (bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_8023AD) || + (bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { printk(KERN_ERR DRV_NAME ": Error: to use %s mode, you must upgrade " "ifenslave.\n", - bond_mode_name()); - return -EOPNOTSUPP; + bond_mode_name(bond->params.mode)); + res = -EOPNOTSUPP; + goto err_undo_flags; } } new_slave = kmalloc(sizeof(struct slave), GFP_KERNEL); if (!new_slave) { - return -ENOMEM; + res = -ENOMEM; + goto err_undo_flags; } memset(new_slave, 0, sizeof(struct slave)); @@ -1292,8 +1738,8 @@ new_slave->dev = slave_dev; - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { /* bond_alb_init_slave() must be called before all other stages since * it might fail and we do not want to have to undo everything */ @@ -1308,7 +1754,7 @@ * curr_active_slave, and that is taken care of later when calling * bond_change_active() */ - if (!USES_PRIMARY(bond_mode)) { + if (!USES_PRIMARY(bond->params.mode)) { /* set promiscuity level to new slave */ if (bond_dev->flags & IFF_PROMISC) { dev_set_promiscuity(slave_dev, 1); @@ -1325,13 +1771,15 @@ } } - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { /* add lacpdu mc addr to mc list */ u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR; dev_mc_add(slave_dev, lacpdu_multicast, ETH_ALEN, 0); } + bond_add_vlans_on_slave(bond, slave_dev); + write_lock_bh(&bond->lock); bond_attach_slave(bond, new_slave); @@ -1339,10 +1787,10 @@ new_slave->delay = 0; new_slave->link_failure_count = 0; - if (miimon && !use_carrier) { - link_reporting = bond_check_dev_link(slave_dev, 1); + if (bond->params.miimon && !bond->params.use_carrier) { + link_reporting = bond_check_dev_link(bond, slave_dev, 1); - if ((link_reporting == -1) && !arp_interval) { + if ((link_reporting == -1) && !bond->params.arp_interval) { /* * miimon is set but a bonded network driver * does not support ETHTOOL/MII and @@ -1372,13 +1820,13 @@ } /* check for initial state */ - if (!miimon || - (bond_check_dev_link(slave_dev, 0) == BMSR_LSTATUS)) { - if (updelay) { + if (!bond->params.miimon || + (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) { + if (bond->params.updelay) { dprintk("Initial state of slave_dev is " "BOND_LINK_BACK\n"); new_slave->link = BOND_LINK_BACK; - new_slave->delay = updelay; + new_slave->delay = bond->params.updelay; } else { dprintk("Initial state of slave_dev is " "BOND_LINK_UP\n"); @@ -1398,7 +1846,7 @@ "forced to 100Mbps, duplex forced to Full.\n", new_slave->dev->name); - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { printk(KERN_WARNING "Operation of 802.3ad mode requires ETHTOOL " "support in base driver for proper aggregator " @@ -1406,14 +1854,14 @@ } } - if (USES_PRIMARY(bond_mode) && primary) { + if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) { /* if there is a primary slave, remember it */ - if (strcmp(primary, new_slave->dev->name) == 0) { + if (strcmp(bond->params.primary, new_slave->dev->name) == 0) { bond->primary_slave = new_slave; } } - switch (bond_mode) { + switch (bond->params.mode) { case BOND_MODE_ACTIVEBACKUP: /* if we're in active-backup mode, we need one and only one active * interface. The backup interfaces will have their NOARP flag set @@ -1447,7 +1895,7 @@ * can be called only after the mac address of the bond is set */ bond_3ad_initialize(bond, 1000/AD_TIMER_INTERVAL, - lacp_fast); + bond->params.lacp_fast); } else { SLAVE_AD_INFO(new_slave).id = SLAVE_AD_INFO(new_slave->prev).id + 1; @@ -1540,6 +1988,10 @@ err_free: kfree(new_slave); + +err_undo_flags: + bond_dev->features = old_features; + return res; } @@ -1557,7 +2009,7 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) { struct bonding *bond = bond_dev->priv; - struct slave *slave; + struct slave *slave, *oldcurrent; struct sockaddr addr; int mac_addr_differ; @@ -1603,7 +2055,7 @@ } /* Inform AD package of unbinding of slave. */ - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { /* must be called before the slave is * detached from the list */ @@ -1617,6 +2069,8 @@ ? "active" : "backup", slave_dev->name); + oldcurrent = bond->curr_active_slave; + bond->current_arp_slave = NULL; /* release the slave from its bond */ @@ -1626,34 +2080,67 @@ bond->primary_slave = NULL; } - if (bond->curr_active_slave == slave) { + if (oldcurrent == slave) { bond_change_active_slave(bond, NULL); - bond_select_active_slave(bond); - } - - if (!bond->curr_active_slave) { - printk(KERN_INFO DRV_NAME - ": %s: now running without any active " - "interface !\n", - bond_dev->name); } - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { - /* must be called only after the slave has been + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { + /* Must be called only after the slave has been * detached from the list and the curr_active_slave - * has been replaced (if our_slave == old_current) + * has been cleared (if our_slave == old_current), + * but before a new active slave is selected. */ bond_alb_deinit_slave(bond, slave); } + if (oldcurrent == slave) { + bond_select_active_slave(bond); + + if (!bond->curr_active_slave) { + printk(KERN_INFO DRV_NAME + ": %s: now running without any active " + "interface !\n", + bond_dev->name); + } + } + + if (bond->slave_cnt == 0) { + /* if the last slave was removed, zero the mac address + * of the master so it will be set by the application + * to the mac address of the first slave + */ + memset(bond_dev->dev_addr, 0, bond_dev->addr_len); + + if (list_empty(&bond->vlan_list)) { + bond_dev->features |= NETIF_F_VLAN_CHALLENGED; + } else { + printk(KERN_WARNING DRV_NAME + ": Warning: clearing HW address of %s while it " + "still has VLANs.\n", + bond_dev->name); + printk(KERN_WARNING DRV_NAME + ": When re-adding slaves, make sure the bond's " + "HW address matches its VLANs'.\n"); + } + } else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) && + !bond_has_challenged_slaves(bond)) { + printk(KERN_INFO DRV_NAME + ": last VLAN challenged slave %s " + "left bond %s. VLAN blocking is removed\n", + slave_dev->name, bond_dev->name); + bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED; + } + write_unlock_bh(&bond->lock); + bond_del_vlans_from_slave(bond, slave_dev); + /* If the mode USES_PRIMARY, then we should only remove its * promisc and mc settings if it was the curr_active_slave, but that was * already taken care of above when we detached the slave */ - if (!USES_PRIMARY(bond_mode)) { + if (!USES_PRIMARY(bond->params.mode)) { /* unset promiscuity level from slave */ if (bond_dev->flags & IFF_PROMISC) { dev_set_promiscuity(slave_dev, -1); @@ -1690,14 +2177,6 @@ kfree(slave); - /* if the last slave was removed, zero the mac address - * of the master so it will be set by the application - * to the mac address of the first slave - */ - if (bond->slave_cnt == 0) { - memset(bond_dev->dev_addr, 0, bond_dev->addr_len); - } - return 0; /* deletion OK */ } @@ -1725,15 +2204,15 @@ /* Inform AD package of unbinding of slave * before slave is detached from the list. */ - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { bond_3ad_unbind_slave(slave); } slave_dev = slave->dev; bond_detach_slave(bond, slave); - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { /* must be called only after the slave * has been detached from the list */ @@ -1746,11 +2225,13 @@ */ write_unlock_bh(&bond->lock); + bond_del_vlans_from_slave(bond, slave_dev); + /* If the mode USES_PRIMARY, then we should only remove its * promisc and mc settings if it was the curr_active_slave, but that was * already taken care of above when we detached the slave */ - if (!USES_PRIMARY(bond_mode)) { + if (!USES_PRIMARY(bond->params.mode)) { /* unset promiscuity level from slave */ if (bond_dev->flags & IFF_PROMISC) { dev_set_promiscuity(slave_dev, -1); @@ -1796,6 +2277,18 @@ */ memset(bond_dev->dev_addr, 0, bond_dev->addr_len); + if (list_empty(&bond->vlan_list)) { + bond_dev->features |= NETIF_F_VLAN_CHALLENGED; + } else { + printk(KERN_WARNING DRV_NAME + ": Warning: clearing HW address of %s while it " + "still has VLANs.\n", + bond_dev->name); + printk(KERN_WARNING DRV_NAME + ": When re-adding slaves, make sure the bond's " + "HW address matches its VLANs'.\n"); + } + printk(KERN_INFO DRV_NAME ": %s: released all slaves\n", bond_dev->name); @@ -1824,6 +2317,10 @@ struct slave *new_active = NULL; int res = 0; + if (!USES_PRIMARY(bond->params.mode)) { + return -EINVAL; + } + /* Verify that master_dev is indeed the master of slave_dev */ if (!(slave_dev->flags & IFF_SLAVE) || (slave_dev->master != bond_dev)) { @@ -1912,8 +2409,8 @@ { struct bonding *bond = bond_dev->priv; - info->bond_mode = bond_mode; - info->miimon = miimon; + info->bond_mode = bond->params.mode; + info->miimon = bond->params.miimon; read_lock_bh(&bond->lock); info->num_slaves = bond->slave_cnt; @@ -1963,11 +2460,13 @@ struct bonding *bond = bond_dev->priv; struct slave *slave, *oldcurrent; int do_failover = 0; - int delta_in_ticks = (miimon * HZ) / 1000; + int delta_in_ticks; int i; read_lock(&bond->lock); + delta_in_ticks = (bond->params.miimon * HZ) / 1000; + if (bond->kill_timers) { goto out; } @@ -1992,7 +2491,7 @@ u16 old_speed = slave->speed; u8 old_duplex = slave->duplex; - link_state = bond_check_dev_link(slave_dev, 0); + link_state = bond_check_dev_link(bond, slave_dev, 0); switch (slave->link) { case BOND_LINK_UP: /* the link was up */ @@ -2001,26 +2500,26 @@ break; } else { /* link going down */ slave->link = BOND_LINK_FAIL; - slave->delay = downdelay; + slave->delay = bond->params.downdelay; if (slave->link_failure_count < UINT_MAX) { slave->link_failure_count++; } - if (downdelay) { + if (bond->params.downdelay) { printk(KERN_INFO DRV_NAME ": %s: link status down for %s " "interface %s, disabling it in " "%d ms.\n", bond_dev->name, IS_UP(slave_dev) - ? ((bond_mode == BOND_MODE_ACTIVEBACKUP) + ? ((bond->params.mode == BOND_MODE_ACTIVEBACKUP) ? ((slave == oldcurrent) ? "active " : "backup ") : "") : "idle ", slave_dev->name, - downdelay * miimon); + bond->params.downdelay * bond->params.miimon); } } /* no break ! fall through the BOND_LINK_FAIL test to @@ -2036,8 +2535,8 @@ /* in active/backup mode, we must * completely disable this interface */ - if ((bond_mode == BOND_MODE_ACTIVEBACKUP) || - (bond_mode == BOND_MODE_8023AD)) { + if ((bond->params.mode == BOND_MODE_ACTIVEBACKUP) || + (bond->params.mode == BOND_MODE_8023AD)) { bond_set_slave_inactive_flags(slave); } @@ -2049,12 +2548,12 @@ slave_dev->name); /* notify ad that the link status has changed */ - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { bond_3ad_handle_link_change(slave, BOND_LINK_DOWN); } - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { bond_alb_handle_link_change(bond, slave, BOND_LINK_DOWN); } @@ -2072,7 +2571,7 @@ ": %s: link status up again after %d " "ms for interface %s.\n", bond_dev->name, - (downdelay - slave->delay) * miimon, + (bond->params.downdelay - slave->delay) * bond->params.miimon, slave_dev->name); } break; @@ -2082,9 +2581,9 @@ break; } else { /* link going up */ slave->link = BOND_LINK_BACK; - slave->delay = updelay; + slave->delay = bond->params.updelay; - if (updelay) { + if (bond->params.updelay) { /* if updelay == 0, no need to advertise about a 0 ms delay */ printk(KERN_INFO DRV_NAME @@ -2093,7 +2592,7 @@ "in %d ms.\n", bond_dev->name, slave_dev->name, - updelay * miimon); + bond->params.updelay * bond->params.miimon); } } /* no break ! fall through the BOND_LINK_BACK state in @@ -2108,7 +2607,7 @@ ": %s: link status down again after %d " "ms for interface %s.\n", bond_dev->name, - (updelay - slave->delay) * miimon, + (bond->params.updelay - slave->delay) * bond->params.miimon, slave_dev->name); } else { /* link stays up */ @@ -2117,10 +2616,10 @@ slave->link = BOND_LINK_UP; slave->jiffies = jiffies; - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { /* prevent it from being the active one */ slave->state = BOND_STATE_BACKUP; - } else if (bond_mode != BOND_MODE_ACTIVEBACKUP) { + } else if (bond->params.mode != BOND_MODE_ACTIVEBACKUP) { /* make it immediately active */ slave->state = BOND_STATE_ACTIVE; } else if (slave != bond->primary_slave) { @@ -2135,12 +2634,12 @@ slave_dev->name); /* notify ad that the link status has changed */ - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { bond_3ad_handle_link_change(slave, BOND_LINK_UP); } - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { bond_alb_handle_link_change(bond, slave, BOND_LINK_UP); } @@ -2162,7 +2661,7 @@ bond_update_speed_duplex(slave); - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { if (old_speed != slave->speed) { bond_3ad_adapter_speed_changed(slave); } @@ -2190,17 +2689,20 @@ } re_arm: - mod_timer(&bond->mii_timer, jiffies + delta_in_ticks); + if (bond->params.miimon) { + mod_timer(&bond->mii_timer, jiffies + delta_in_ticks); + } out: read_unlock(&bond->lock); } -static void bond_arp_send_all(struct slave *slave) +static void bond_arp_send_all(struct bonding *bond, struct slave *slave) { int i; + u32 *targets = bond->params.arp_targets; - for (i = 0; (idev, + for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) { + arp_send(ARPOP_REQUEST, ETH_P_ARP, targets[i], slave->dev, my_ip, NULL, slave->dev->dev_addr, NULL); } @@ -2218,11 +2720,13 @@ struct bonding *bond = bond_dev->priv; struct slave *slave, *oldcurrent; int do_failover = 0; - int delta_in_ticks = (arp_interval * HZ) / 1000; + int delta_in_ticks; int i; read_lock(&bond->lock); + delta_in_ticks = (bond->params.arp_interval * HZ) / 1000; + if (bond->kill_timers) { goto out; } @@ -2307,7 +2811,7 @@ * to be unstable during low/no traffic periods */ if (IS_UP(slave->dev)) { - bond_arp_send_all(slave); + bond_arp_send_all(bond, slave); } } @@ -2327,7 +2831,9 @@ } re_arm: - mod_timer(&bond->arp_timer, jiffies + delta_in_ticks); + if (bond->params.arp_interval) { + mod_timer(&bond->arp_timer, jiffies + delta_in_ticks); + } out: read_unlock(&bond->lock); } @@ -2351,11 +2857,13 @@ { struct bonding *bond = bond_dev->priv; struct slave *slave; - int delta_in_ticks = (arp_interval * HZ) / 1000; + int delta_in_ticks; int i; read_lock(&bond->lock); + delta_in_ticks = (bond->params.arp_interval * HZ) / 1000; + if (bond->kill_timers) { goto out; } @@ -2514,7 +3022,7 @@ * rx traffic */ if (slave && my_ip) { - bond_arp_send_all(slave); + bond_arp_send_all(bond, slave); } } @@ -2535,7 +3043,7 @@ if (IS_UP(slave->dev)) { slave->link = BOND_LINK_BACK; bond_set_slave_active_flags(slave); - bond_arp_send_all(slave); + bond_arp_send_all(bond, slave); slave->jiffies = jiffies; bond->current_arp_slave = slave; break; @@ -2567,7 +3075,9 @@ } re_arm: - mod_timer(&bond->arp_timer, jiffies + delta_in_ticks); + if (bond->params.arp_interval) { + mod_timer(&bond->arp_timer, jiffies + delta_in_ticks); + } out: read_unlock(&bond->lock); } @@ -2625,33 +3135,40 @@ read_unlock(&dev_base_lock); } -static void bond_info_show_master(struct seq_file *seq, struct bonding *bond) +static void bond_info_show_master(struct seq_file *seq) { + struct bonding *bond = seq->private; struct slave *curr; read_lock(&bond->curr_slave_lock); curr = bond->curr_active_slave; read_unlock(&bond->curr_slave_lock); - seq_printf(seq, "Bonding Mode: %s\n", bond_mode_name()); + seq_printf(seq, "Bonding Mode: %s\n", + bond_mode_name(bond->params.mode)); - if (USES_PRIMARY(bond_mode)) { - if (curr) { - seq_printf(seq, - "Currently Active Slave: %s\n", - curr->dev->name); - } + if (USES_PRIMARY(bond->params.mode)) { + seq_printf(seq, "Primary Slave: %s\n", + (bond->params.primary[0]) ? + bond->params.primary : "None"); + + seq_printf(seq, "Currently Active Slave: %s\n", + (curr) ? curr->dev->name : "None"); } seq_printf(seq, "MII Status: %s\n", (curr) ? "up" : "down"); - seq_printf(seq, "MII Polling Interval (ms): %d\n", miimon); - seq_printf(seq, "Up Delay (ms): %d\n", updelay * miimon); - seq_printf(seq, "Down Delay (ms): %d\n", downdelay * miimon); + seq_printf(seq, "MII Polling Interval (ms): %d\n", bond->params.miimon); + seq_printf(seq, "Up Delay (ms): %d\n", + bond->params.updelay * bond->params.miimon); + seq_printf(seq, "Down Delay (ms): %d\n", + bond->params.downdelay * bond->params.miimon); - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { struct ad_info ad_info; seq_puts(seq, "\n802.3ad info\n"); + seq_printf(seq, "LACP rate: %s\n", + (bond->params.lacp_fast) ? "fast" : "slow"); if (bond_3ad_get_active_agg_info(bond, &ad_info)) { seq_printf(seq, "bond %s has no active aggregator\n", @@ -2680,6 +3197,8 @@ static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave) { + struct bonding *bond = seq->private; + seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name); seq_printf(seq, "MII Status: %s\n", (slave->link == BOND_LINK_UP) ? "up" : "down"); @@ -2697,7 +3216,7 @@ slave->perm_hwaddr[5]); } - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { const struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator; @@ -2714,7 +3233,7 @@ { if (v == SEQ_START_TOKEN) { seq_printf(seq, "%s\n", version); - bond_info_show_master(seq, seq->private); + bond_info_show_master(seq); } else { bond_info_show_slave(seq, v); } @@ -2989,14 +3508,14 @@ bond->kill_timers = 0; - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { struct timer_list *alb_timer = &(BOND_ALB_INFO(bond).alb_timer); /* bond_alb_initialize must be called before the timer * is started. */ - if (bond_alb_initialize(bond, (bond_mode == BOND_MODE_ALB))) { + if (bond_alb_initialize(bond, (bond->params.mode == BOND_MODE_ALB))) { /* something went wrong - fail the open operation */ return -1; } @@ -3008,7 +3527,7 @@ add_timer(alb_timer); } - if (miimon) { /* link check interval, in milliseconds. */ + if (bond->params.miimon) { /* link check interval, in milliseconds. */ init_timer(mii_timer); mii_timer->expires = jiffies + 1; mii_timer->data = (unsigned long)bond_dev; @@ -3016,11 +3535,11 @@ add_timer(mii_timer); } - if (arp_interval) { /* arp interval, in milliseconds. */ + if (bond->params.arp_interval) { /* arp interval, in milliseconds. */ init_timer(arp_timer); arp_timer->expires = jiffies + 1; arp_timer->data = (unsigned long)bond_dev; - if (bond_mode == BOND_MODE_ACTIVEBACKUP) { + if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) { arp_timer->function = (void *)&bond_activebackup_arp_mon; } else { arp_timer->function = (void *)&bond_loadbalance_arp_mon; @@ -3028,7 +3547,7 @@ add_timer(arp_timer); } - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { struct timer_list *ad_timer = &(BOND_AD_INFO(bond).ad_timer); init_timer(ad_timer); ad_timer->expires = jiffies + 1; @@ -3051,7 +3570,7 @@ bond_mc_list_destroy(bond); - if (bond_mode == BOND_MODE_8023AD) { + if (bond->params.mode == BOND_MODE_8023AD) { /* Unregister the receive of LACPDUs */ bond_unregister_lacpdu(bond); } @@ -3065,15 +3584,15 @@ * because a running timer might be trying to hold it too */ - if (miimon) { /* link check interval, in milliseconds. */ + if (bond->params.miimon) { /* link check interval, in milliseconds. */ del_timer_sync(&bond->mii_timer); } - if (arp_interval) { /* arp interval, in milliseconds. */ + if (bond->params.arp_interval) { /* arp interval, in milliseconds. */ del_timer_sync(&bond->arp_timer); } - switch (bond_mode) { + switch (bond->params.mode) { case BOND_MODE_8023AD: del_timer_sync(&(BOND_AD_INFO(bond).ad_timer)); break; @@ -3088,8 +3607,8 @@ /* Release the bonded slaves */ bond_release_all(bond_dev); - if ((bond_mode == BOND_MODE_TLB) || - (bond_mode == BOND_MODE_ALB)) { + if ((bond->params.mode == BOND_MODE_TLB) || + (bond->params.mode == BOND_MODE_ALB)) { /* Must be called only after all * slaves have been released */ @@ -3269,11 +3788,7 @@ break; case BOND_CHANGE_ACTIVE_OLD: case SIOCBONDCHANGEACTIVE: - if (USES_PRIMARY(bond_mode)) { - res = bond_ioctl_change_active(bond_dev, slave_dev); - } else { - res = -EINVAL; - } + res = bond_ioctl_change_active(bond_dev, slave_dev); break; default: res = -EOPNOTSUPP; @@ -3505,11 +4020,12 @@ struct bonding *bond = bond_dev->priv; struct slave *slave, *start_at; int i; + int res = 1; read_lock(&bond->lock); if (!BOND_IS_OK(bond)) { - goto free_out; + goto out; } read_lock(&bond->curr_slave_lock); @@ -3517,33 +4033,31 @@ read_unlock(&bond->curr_slave_lock); if (!slave) { - goto free_out; + goto out; } bond_for_each_slave_from(bond, slave, i, start_at) { if (IS_UP(slave->dev) && (slave->link == BOND_LINK_UP) && (slave->state == BOND_STATE_ACTIVE)) { - skb->dev = slave->dev; - skb->priority = 1; - dev_queue_xmit(skb); + res = bond_dev_queue_xmit(bond, skb, slave->dev); write_lock(&bond->curr_slave_lock); bond->curr_active_slave = slave->next; write_unlock(&bond->curr_slave_lock); - goto out; + break; } } + out: + if (res) { + /* no suitable interface, frame not sent */ + dev_kfree_skb(skb); + } read_unlock(&bond->lock); return 0; - -free_out: - /* no suitable interface, frame not sent */ - dev_kfree_skb(skb); - goto out; } /* @@ -3553,10 +4067,11 @@ static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_dev) { struct bonding *bond = bond_dev->priv; + int res = 1; /* if we are sending arp packets, try to at least identify our own ip address */ - if (arp_interval && !my_ip && + if (bond->params.arp_interval && !my_ip && (skb->protocol == __constant_htons(ETH_P_ARP))) { char *the_ip = (char *)skb->data + sizeof(struct ethhdr) + @@ -3569,26 +4084,21 @@ read_lock(&bond->curr_slave_lock); if (!BOND_IS_OK(bond)) { - goto free_out; + goto out; } if (bond->curr_active_slave) { /* one usable interface */ - skb->dev = bond->curr_active_slave->dev; - skb->priority = 1; - dev_queue_xmit(skb); - goto out; - } else { - goto free_out; + res = bond_dev_queue_xmit(bond, skb, bond->curr_active_slave->dev); } + out: + if (res) { + /* no suitable interface, frame not sent */ + dev_kfree_skb(skb); + } read_unlock(&bond->curr_slave_lock); read_unlock(&bond->lock); return 0; - -free_out: - /* no suitable interface, frame not sent */ - dev_kfree_skb(skb); - goto out; } /* @@ -3603,11 +4113,12 @@ struct slave *slave, *start_at; int slave_no; int i; + int res = 1; read_lock(&bond->lock); if (!BOND_IS_OK(bond)) { - goto free_out; + goto out; } slave_no = (data->h_dest[5]^bond_dev->dev_addr[5]) % bond->slave_cnt; @@ -3625,22 +4136,18 @@ if (IS_UP(slave->dev) && (slave->link == BOND_LINK_UP) && (slave->state == BOND_STATE_ACTIVE)) { - skb->dev = slave->dev; - skb->priority = 1; - dev_queue_xmit(skb); - - goto out; + res = bond_dev_queue_xmit(bond, skb, slave->dev); + break; } } out: + if (res) { + /* no suitable interface, frame not sent */ + dev_kfree_skb(skb); + } read_unlock(&bond->lock); return 0; - -free_out: - /* no suitable interface, frame not sent */ - dev_kfree_skb(skb); - goto out; } /* @@ -3652,11 +4159,12 @@ struct slave *slave, *start_at; struct net_device *tx_dev = NULL; int i; + int res = 1; read_lock(&bond->lock); if (!BOND_IS_OK(bond)) { - goto free_out; + goto out; } read_lock(&bond->curr_slave_lock); @@ -3664,7 +4172,7 @@ read_unlock(&bond->curr_slave_lock); if (!start_at) { - goto free_out; + goto out; } bond_for_each_slave_from(bond, slave, i, start_at) { @@ -3680,31 +4188,28 @@ continue; } - skb2->dev = tx_dev; - skb2->priority = 1; - dev_queue_xmit(skb2); + res = bond_dev_queue_xmit(bond, skb2, tx_dev); + if (res) { + dev_kfree_skb(skb2); + continue; + } } tx_dev = slave->dev; } } if (tx_dev) { - skb->dev = tx_dev; - skb->priority = 1; - dev_queue_xmit(skb); - } else { - goto free_out; + res = bond_dev_queue_xmit(bond, skb, tx_dev); } out: + if (res) { + /* no suitable interface, frame not sent */ + dev_kfree_skb(skb); + } /* frame sent to all suitable interfaces */ read_unlock(&bond->lock); return 0; - -free_out: - /* no suitable interface, frame not sent */ - dev_kfree_skb(skb); - goto out; } #ifdef CONFIG_NET_FASTROUTE @@ -3717,13 +4222,47 @@ /*------------------------- Device initialization ---------------------------*/ /* + * set bond mode specific net device operations + */ +static inline void bond_set_mode_ops(struct net_device *bond_dev, int mode) +{ + switch (mode) { + case BOND_MODE_ROUNDROBIN: + bond_dev->hard_start_xmit = bond_xmit_roundrobin; + break; + case BOND_MODE_ACTIVEBACKUP: + bond_dev->hard_start_xmit = bond_xmit_activebackup; + break; + case BOND_MODE_XOR: + bond_dev->hard_start_xmit = bond_xmit_xor; + break; + case BOND_MODE_BROADCAST: + bond_dev->hard_start_xmit = bond_xmit_broadcast; + break; + case BOND_MODE_8023AD: + bond_dev->hard_start_xmit = bond_3ad_xmit_xor; + break; + case BOND_MODE_TLB: + case BOND_MODE_ALB: + bond_dev->hard_start_xmit = bond_alb_xmit; + bond_dev->set_mac_address = bond_alb_set_mac_address; + break; + default: + /* Should never happen, mode already checked */ + printk(KERN_ERR DRV_NAME + ": Error: Unknown bonding mode %d\n", + mode); + break; + } +} + +/* * Does not allocate but creates a /proc entry. * Allowed to fail. */ -static int __init bond_init(struct net_device *bond_dev) +static int __init bond_init(struct net_device *bond_dev, struct bond_params *params) { struct bonding *bond = bond_dev->priv; - int count; dprintk("Begin bond_init for %s\n", bond_dev->name); @@ -3731,12 +4270,15 @@ rwlock_init(&bond->lock); rwlock_init(&bond->curr_slave_lock); + bond->params = *params; /* copy params struct */ + /* Initialize pointers */ bond->first_slave = NULL; bond->curr_active_slave = NULL; bond->current_arp_slave = NULL; bond->primary_slave = NULL; bond->dev = bond_dev; + INIT_LIST_HEAD(&bond->vlan_list); /* Initialize the device entry points */ bond_dev->open = bond_open; @@ -3747,33 +4289,7 @@ bond_dev->change_mtu = bond_change_mtu; bond_dev->set_mac_address = bond_set_mac_address; - switch (bond_mode) { - case BOND_MODE_ROUNDROBIN: - bond_dev->hard_start_xmit = bond_xmit_roundrobin; - break; - case BOND_MODE_ACTIVEBACKUP: - bond_dev->hard_start_xmit = bond_xmit_activebackup; - break; - case BOND_MODE_XOR: - bond_dev->hard_start_xmit = bond_xmit_xor; - break; - case BOND_MODE_BROADCAST: - bond_dev->hard_start_xmit = bond_xmit_broadcast; - break; - case BOND_MODE_8023AD: - bond_dev->hard_start_xmit = bond_3ad_xmit_xor; /* extern */ - break; - case BOND_MODE_TLB: - case BOND_MODE_ALB: - bond_dev->hard_start_xmit = bond_alb_xmit; /* extern */ - bond_dev->set_mac_address = bond_alb_set_mac_address; /* extern */ - break; - default: - printk(KERN_ERR DRV_NAME - ": Error: Unknown bonding mode %d\n", - bond_mode); - return -EINVAL; - } + bond_set_mode_ops(bond_dev, bond->params.mode); bond_dev->destructor = free_netdev; #ifdef CONFIG_NET_FASTROUTE @@ -3784,27 +4300,25 @@ bond_dev->tx_queue_len = 0; bond_dev->flags |= IFF_MASTER|IFF_MULTICAST; - printk(KERN_INFO DRV_NAME ": %s registered with", bond_dev->name); - if (miimon) { - printk(" MII link monitoring set to %d ms", miimon); - updelay /= miimon; - downdelay /= miimon; - } else { - printk("out MII link monitoring"); - } - printk(", in %s mode.\n", bond_mode_name()); + /* At first, we block adding VLANs. That's the only way to + * prevent problems that occur when adding VLANs over an + * empty bond. The block will be removed once non-challenged + * slaves are enslaved. + */ + bond_dev->features |= NETIF_F_VLAN_CHALLENGED; - printk(KERN_INFO DRV_NAME ": %s registered with", bond_dev->name); - if (arp_interval > 0) { - printk(" ARP monitoring set to %d ms with %d target(s):", - arp_interval, arp_ip_count); - for (count=0 ; countvlan_rx_register = bond_vlan_rx_register; + bond_dev->vlan_rx_add_vid = bond_vlan_rx_add_vid; + bond_dev->vlan_rx_kill_vid = bond_vlan_rx_kill_vid; + bond_dev->features |= (NETIF_F_HW_VLAN_TX | + NETIF_F_HW_VLAN_RX | + NETIF_F_HW_VLAN_FILTER); #ifdef CONFIG_PROC_FS bond_create_proc_entry(bond); @@ -3870,7 +4384,7 @@ return -1; } -static int bond_check_params(void) +static int bond_check_params(struct bond_params *params) { /* * Convert string parameters. @@ -3889,7 +4403,7 @@ if (bond_mode != BOND_MODE_8023AD) { printk(KERN_INFO DRV_NAME ": lacp_rate param is irrelevant in mode %s\n", - bond_mode_name()); + bond_mode_name(bond_mode)); } else { lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl); if (lacp_fast == -1) { @@ -3933,17 +4447,17 @@ downdelay = 0; } + if ((use_carrier != 0) && (use_carrier != 1)) { + printk(KERN_WARNING DRV_NAME + ": Warning: use_carrier module parameter (%d), " + "not of valid value (0/1), so it was set to 1\n", + use_carrier); + use_carrier = 1; + } + /* reset values for 802.3ad */ if (bond_mode == BOND_MODE_8023AD) { - if (arp_interval) { - printk(KERN_WARNING DRV_NAME - ": Warning: ARP monitoring can't be used " - "simultaneously with 802.3ad, disabling ARP " - "monitoring\n"); - arp_interval = 0; - } - - if (miimon) { + if (!miimon) { printk(KERN_WARNING DRV_NAME ": Warning: miimon must be specified, " "otherwise bonding will not detect link " @@ -4002,25 +4516,23 @@ } if ((updelay % miimon) != 0) { - /* updelay will be rounded in bond_init() when it - * is divided by miimon, we just inform user here - */ printk(KERN_WARNING DRV_NAME ": Warning: updelay (%d) is not a multiple " "of miimon (%d), updelay rounded to %d ms\n", updelay, miimon, (updelay / miimon) * miimon); } + updelay /= miimon; + if ((downdelay % miimon) != 0) { - /* downdelay will be rounded in bond_init() when it - * is divided by miimon, we just inform user here - */ printk(KERN_WARNING DRV_NAME ": Warning: downdelay (%d) is not a multiple " "of miimon (%d), downdelay rounded to %d ms\n", downdelay, miimon, (downdelay / miimon) * miimon); } + + downdelay /= miimon; } if (arp_interval < 0) { @@ -4032,7 +4544,7 @@ } for (arp_ip_count = 0; - (arp_ip_count < MAX_ARP_IP_TARGETS) && arp_ip_target[arp_ip_count]; + (arp_ip_count < BOND_MAX_ARP_TARGETS) && arp_ip_target[arp_ip_count]; arp_ip_count++) { /* not complete check, but should be good enough to catch mistakes */ @@ -4058,7 +4570,23 @@ arp_interval = 0; } - if (!miimon && !arp_interval) { + if (miimon) { + printk(KERN_INFO DRV_NAME + ": MII link monitoring set to %d ms\n", + miimon); + } else if (arp_interval) { + int i; + + printk(KERN_INFO DRV_NAME + ": ARP monitoring set to %d ms with %d target(s):", + arp_interval, arp_ip_count); + + for (i = 0; i < arp_ip_count; i++) + printk (" %s", arp_ip_target[i]); + + printk("\n"); + + } else { /* miimon and arp_interval not set, we need one so things * work as expected, see bonding.txt for details */ @@ -4076,21 +4604,39 @@ printk(KERN_WARNING DRV_NAME ": Warning: %s primary device specified but has no " "effect in %s mode\n", - primary, bond_mode_name()); + primary, bond_mode_name(bond_mode)); primary = NULL; } + /* fill params struct with the proper values */ + params->mode = bond_mode; + params->miimon = miimon; + params->arp_interval = arp_interval; + params->updelay = updelay; + params->downdelay = downdelay; + params->use_carrier = use_carrier; + params->lacp_fast = lacp_fast; + params->primary[0] = 0; + + if (primary) { + strncpy(params->primary, primary, IFNAMSIZ); + params->primary[IFNAMSIZ - 1] = 0; + } + + memcpy(params->arp_targets, arp_target, sizeof(arp_target)); + return 0; } static int __init bonding_init(void) { + struct bond_params params; int i; int res; printk(KERN_INFO "%s", version); - res = bond_check_params(); + res = bond_check_params(¶ms); if (res) { return res; } @@ -4120,7 +4666,7 @@ * /proc files), but before register_netdevice(), because we * need to set function pointers. */ - res = bond_init(bond_dev); + res = bond_init(bond_dev, ¶ms); if (res < 0) { free_netdev(bond_dev); goto out_err; diff -Nru a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h --- a/drivers/net/bonding/bonding.h Thu Feb 19 23:44:23 2004 +++ b/drivers/net/bonding/bonding.h Thu Feb 19 23:44:23 2004 @@ -23,7 +23,7 @@ * 2003/05/01 - Shmulik Hen * - Added support for Transmit load balancing mode. * - * 2003/09/24 - Shmulik Hen + * 2003/12/01 - Shmulik Hen * - Code cleanup and style changes */ @@ -36,11 +36,13 @@ #include "bond_3ad.h" #include "bond_alb.h" -#define DRV_VERSION "2.5.0" -#define DRV_RELDATE "December 1, 2003" +#define DRV_VERSION "2.6.0" +#define DRV_RELDATE "January 14, 2004" #define DRV_NAME "bonding" #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" +#define BOND_MAX_ARP_TARGETS 16 + #ifdef BONDING_DEBUG #define dprintk(fmt, args...) \ printk(KERN_DEBUG \ @@ -133,6 +135,23 @@ bond_for_each_slave_from(bond, pos, cnt, (bond)->first_slave) +struct bond_params { + int mode; + int miimon; + int arp_interval; + int use_carrier; + int updelay; + int downdelay; + int lacp_fast; + char primary[IFNAMSIZ]; + u32 arp_targets[BOND_MAX_ARP_TARGETS]; +}; + +struct vlan_entry { + struct list_head vlan_list; + unsigned short vlan_id; +}; + struct slave { struct net_device *dev; /* first - usefull for panic debug */ struct slave *next; @@ -181,6 +200,9 @@ u16 flags; struct ad_bond_info ad_info; struct alb_bond_info alb_info; + struct bond_params params; + struct list_head vlan_list; + struct vlan_group *vlgrp; }; /** @@ -222,6 +244,9 @@ slave->state = BOND_STATE_ACTIVE; slave->dev->flags &= ~IFF_NOARP; } + +struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); +int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); #endif /* _LINUX_BONDING_H */ diff -Nru a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c --- a/drivers/net/bsd_comp.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/bsd_comp.c Thu Feb 19 23:44:25 2004 @@ -1176,3 +1176,4 @@ module_init(bsdcomp_init); module_exit(bsdcomp_cleanup); MODULE_LICENSE("Dual BSD/GPL"); +MODULE_ALIAS("ppp-compress-" __stringify(CI_BSD_COMPRESS)); diff -Nru a/drivers/net/depca.c b/drivers/net/depca.c --- a/drivers/net/depca.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/depca.c Thu Feb 19 23:44:25 2004 @@ -1461,7 +1461,7 @@ out_unclaim: mca_device_set_claim(mdev, 0); - return err;; + return err; } #endif @@ -2086,7 +2086,7 @@ { int err = 0; -#if CONFIG_MCA +#ifdef CONFIG_MCA err = mca_register_driver (&depca_mca_driver); #endif #ifdef CONFIG_EISA @@ -2101,7 +2101,7 @@ static void __exit depca_module_exit (void) { int i; -#if CONFIG_MCA +#ifdef CONFIG_MCA mca_unregister_driver (&depca_mca_driver); #endif #ifdef CONFIG_EISA diff -Nru a/drivers/net/dgrs.c b/drivers/net/dgrs.c --- a/drivers/net/dgrs.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/dgrs.c Thu Feb 19 23:44:22 2004 @@ -121,11 +121,22 @@ #include "dgrs_asstruct.h" #include "dgrs_bcomm.h" +#ifdef CONFIG_PCI static struct pci_device_id dgrs_pci_tbl[] = { { SE6_PCI_VENDOR_ID, SE6_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, }, { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(pci, dgrs_pci_tbl); +#endif + +#ifdef CONFIG_EISA +static struct eisa_device_id dgrs_eisa_tbl[] = { + { "DBI0A01" }, + { } +}; +MODULE_DEVICE_TABLE(eisa, dgrs_eisa_tbl); +#endif + MODULE_LICENSE("GPL"); @@ -179,11 +190,6 @@ static int dgrs_nicmode; /* - * Chain of device structures - */ -static struct net_device *dgrs_root_dev; - -/* * Private per-board data structure (dev->priv) */ typedef struct @@ -191,7 +197,6 @@ /* * Stuff for generic ethercard I/F */ - struct net_device *next_dev; struct net_device_stats stats; /* @@ -1187,7 +1192,7 @@ priv->intrcnt = 0; for (i = jiffies + 2*HZ + HZ/2; time_after(i, jiffies); ) { - barrier(); /* gcc 2.95 needs this */ + cpu_relax(); if (priv->intrcnt >= 2) break; } @@ -1200,16 +1205,6 @@ } /* - * Register the /proc/ioports information... - */ - if (!request_region(dev->base_addr, 256, "RightSwitch")) { - printk(KERN_ERR "%s: io 0x%3lX, which is busy.\n", dev->name, - dev->base_addr); - rc = -EBUSY; - goto err_free_irq; - } - - /* * Entry points... */ dev->open = &dgrs_open; @@ -1242,22 +1237,23 @@ return (0); } -static int __init +static struct net_device * __init dgrs_found_device( int io, ulong mem, int irq, ulong plxreg, - ulong plxdma + ulong plxdma, + struct device *pdev ) { - DGRS_PRIV *priv; - struct net_device *dev, *aux; - int i, ret; + DGRS_PRIV *priv; + struct net_device *dev; + int i, ret = -ENOMEM; dev = alloc_etherdev(sizeof(DGRS_PRIV)); if (!dev) - return -ENOMEM; + goto err0; priv = (DGRS_PRIV *)dev->priv; @@ -1272,19 +1268,19 @@ priv->chan = 1; priv->devtbl[0] = dev; - dev->init = dgrs_probe1; SET_MODULE_OWNER(dev); - - if (register_netdev(dev) != 0) { - free_netdev(dev); - return -EIO; - } - - priv->next_dev = dgrs_root_dev; - dgrs_root_dev = dev; + SET_NETDEV_DEV(dev, pdev); + + ret = dgrs_probe1(dev); + if (ret) + goto err1; + + ret = register_netdev(dev); + if (ret) + goto err2; if ( !dgrs_nicmode ) - return (0); /* Switch mode, we are done */ + return dev; /* Switch mode, we are done */ /* * Operating card as N separate NICs @@ -1302,8 +1298,7 @@ if (!devN) goto fail; - /* Make it an exact copy of dev[0]... */ - *devN = *dev; + /* Don't copy the network device structure! */ /* copy the priv structure of dev[0] */ privN = (DGRS_PRIV *)devN->priv; @@ -1316,123 +1311,212 @@ devN->irq = 0; /* ... and base MAC address off address of 1st port */ devN->dev_addr[5] += i; - /* ... choose a new name */ - strncpy(devN->name, "eth%d", IFNAMSIZ); - devN->init = dgrs_initclone; + + ret = dgrs_initclone(devN); + if (ret) + goto fail; + SET_MODULE_OWNER(devN); + SET_NETDEV_DEV(dev, pdev); - ret = -EIO; - if (register_netdev(devN)) { + ret = register_netdev(devN); + if (ret) { free_netdev(devN); goto fail; } privN->chan = i+1; priv->devtbl[i] = devN; - privN->next_dev = dgrs_root_dev; - dgrs_root_dev = devN; } - return 0; -fail: aux = priv->next_dev; - while (dgrs_root_dev != aux) { - struct net_device *d = dgrs_root_dev; - - dgrs_root_dev = ((DGRS_PRIV *)d->priv)->next_dev; + return dev; + + fail: + while (i >= 0) { + struct net_device *d = priv->devtbl[i--]; unregister_netdev(d); free_netdev(d); } - return ret; + + err2: + free_irq(dev->irq, dev); + err1: + free_netdev(dev); + err0: + return ERR_PTR(ret); } -/* - * Scan for all boards - */ -static int is2iv[8] __initdata = { 0, 3, 5, 7, 10, 11, 12, 15 }; +static void __devexit dgrs_remove(struct net_device *dev) +{ + DGRS_PRIV *priv = dev->priv; + int i; + + unregister_netdev(dev); + + for (i = 1; i < priv->nports; ++i) { + struct net_device *d = priv->devtbl[i]; + if (d) { + unregister_netdev(d); + free_netdev(d); + } + } + + proc_reset(priv->devtbl[0], 1); -static int __init dgrs_scan(void) + if (priv->vmem) + iounmap(priv->vmem); + if (priv->vplxdma) + iounmap((uchar *) priv->vplxdma); + + if (dev->irq) + free_irq(dev->irq, dev); + + for (i = 1; i < priv->nports; ++i) { + if (priv->devtbl[i]) + unregister_netdev(priv->devtbl[i]); + } +} + +#ifdef CONFIG_PCI +static int __init dgrs_pci_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) { - int cards_found = 0; + struct net_device *dev; + int err; uint io; uint mem; uint irq; uint plxreg; uint plxdma; - struct pci_dev *pdev = NULL; /* - * First, check for PCI boards - */ - while ((pdev = pci_find_device(SE6_PCI_VENDOR_ID, SE6_PCI_DEVICE_ID, pdev)) != NULL) - { - /* - * Get and check the bus-master and latency values. - * Some PCI BIOSes fail to set the master-enable bit, - * and the latency timer must be set to the maximum - * value to avoid data corruption that occurs when the - * timer expires during a transfer. Yes, it's a bug. - */ - if (pci_enable_device(pdev)) - continue; - pci_set_master(pdev); - - plxreg = pci_resource_start (pdev, 0); - io = pci_resource_start (pdev, 1); - mem = pci_resource_start (pdev, 2); - pci_read_config_dword(pdev, 0x30, &plxdma); - irq = pdev->irq; - plxdma &= ~15; + * Get and check the bus-master and latency values. + * Some PCI BIOSes fail to set the master-enable bit, + * and the latency timer must be set to the maximum + * value to avoid data corruption that occurs when the + * timer expires during a transfer. Yes, it's a bug. + */ + err = pci_enable_device(pdev); + if (err) + return err; + err = pci_request_regions(pdev, "RightSwitch"); + if (err) + return err; + + pci_set_master(pdev); + + plxreg = pci_resource_start (pdev, 0); + io = pci_resource_start (pdev, 1); + mem = pci_resource_start (pdev, 2); + pci_read_config_dword(pdev, 0x30, &plxdma); + irq = pdev->irq; + plxdma &= ~15; + + /* + * On some BIOSES, the PLX "expansion rom" (used for DMA) + * address comes up as "0". This is probably because + * the BIOS doesn't see a valid 55 AA ROM signature at + * the "ROM" start and zeroes the address. To get + * around this problem the SE-6 is configured to ask + * for 4 MB of space for the dual port memory. We then + * must set its range back to 2 MB, and use the upper + * half for DMA register access + */ + OUTL(io + PLX_SPACE0_RANGE, 0xFFE00000L); + if (plxdma == 0) + plxdma = mem + (2048L * 1024L); + pci_write_config_dword(pdev, 0x30, plxdma + 1); + pci_read_config_dword(pdev, 0x30, &plxdma); + plxdma &= ~15; + + dev = dgrs_found_device(io, mem, irq, plxreg, plxdma, &pdev->dev); + if (IS_ERR(dev)) { + pci_release_regions(pdev); + return PTR_ERR(dev); + } - /* - * On some BIOSES, the PLX "expansion rom" (used for DMA) - * address comes up as "0". This is probably because - * the BIOS doesn't see a valid 55 AA ROM signature at - * the "ROM" start and zeroes the address. To get - * around this problem the SE-6 is configured to ask - * for 4 MB of space for the dual port memory. We then - * must set its range back to 2 MB, and use the upper - * half for DMA register access - */ - OUTL(io + PLX_SPACE0_RANGE, 0xFFE00000L); - if (plxdma == 0) - plxdma = mem + (2048L * 1024L); - pci_write_config_dword(pdev, 0x30, plxdma + 1); - pci_read_config_dword(pdev, 0x30, &plxdma); - plxdma &= ~15; + pci_set_drvdata(pdev, dev); + return 0; +} - dgrs_found_device(io, mem, irq, plxreg, plxdma); +static void __devexit dgrs_pci_remove(struct pci_dev *pdev) +{ + struct net_device *dev = pci_get_drvdata(pdev); - cards_found++; - } + dgrs_remove(dev); + pci_release_regions(pdev); + free_netdev(dev); +} - /* - * Second, check for EISA boards - */ - if (EISA_bus) - { - for (io = 0x1000; io < 0x9000; io += 0x1000) - { - if (inb(io+ES4H_MANUFmsb) != 0x10 - || inb(io+ES4H_MANUFlsb) != 0x49 - || inb(io+ES4H_PRODUCT) != ES4H_PRODUCT_CODE) - continue; +static struct pci_driver dgrs_pci_driver = { + .name = "dgrs", + .id_table = dgrs_pci_tbl, + .probe = dgrs_pci_probe, + .remove = __devexit_p(dgrs_pci_remove), +}; +#endif + + +#ifdef CONFIG_EISA +static int is2iv[8] __initdata = { 0, 3, 5, 7, 10, 11, 12, 15 }; - if ( ! (inb(io+ES4H_EC) & ES4H_EC_ENABLE) ) - continue; /* Not EISA configured */ +static int __init dgrs_eisa_probe (struct device *gendev) +{ + struct net_device *dev; + struct eisa_device *edev = to_eisa_device(gendev); + uint io = edev->base_addr; + uint mem; + uint irq; + int rc = -ENODEV; /* Not EISA configured */ + + if (!request_region(io, 256, "RightSwitch")) { + printk(KERN_ERR "%s: io 0x%3lX, which is busy.\n", dev->name, + dev->base_addr); + return -EBUSY; + } - mem = (inb(io+ES4H_AS_31_24) << 24) - + (inb(io+ES4H_AS_23_16) << 16); + if ( ! (inb(io+ES4H_EC) & ES4H_EC_ENABLE) ) + goto err_out; - irq = is2iv[ inb(io+ES4H_IS) & ES4H_IS_INTMASK ]; + mem = (inb(io+ES4H_AS_31_24) << 24) + + (inb(io+ES4H_AS_23_16) << 16); - dgrs_found_device(io, mem, irq, 0L, 0L); + irq = is2iv[ inb(io+ES4H_IS) & ES4H_IS_INTMASK ]; - ++cards_found; - } + dev = dgrs_found_device(io, mem, irq, 0L, 0L, gendev); + if (IS_ERR(dev)) { + rc = PTR_ERR(dev); + goto err_out; } - return cards_found; + gendev->driver_data = dev; + return 0; + err_out: + release_region(io, 256); + return rc; +} + +static int __devexit dgrs_eisa_remove(struct device *gendev) +{ + struct net_device *dev = gendev->driver_data; + + dgrs_remove(dev); + + release_region(dev->base_addr, 256); + + free_netdev(dev); + return 0; } +static struct eisa_driver dgrs_eisa_driver = { + .id_table = dgrs_eisa_tbl, + .driver = { + .name = "dgrs", + .probe = dgrs_eisa_probe, + .remove = __devexit_p(dgrs_eisa_remove), + } +}; +#endif + /* * Variables that can be overriden from module command line */ @@ -1459,8 +1543,8 @@ static int __init dgrs_init_module (void) { - int cards_found; int i; + int eisacount = 0, pcicount = 0; /* * Command line variable overrides @@ -1501,38 +1585,27 @@ /* * Find and configure all the cards */ - dgrs_root_dev = NULL; - cards_found = dgrs_scan(); - - return cards_found ? 0 : -ENODEV; +#ifdef CONFIG_EISA + eisacount = eisa_driver_register(&dgrs_eisa_driver); + if (eisacount < 0) + return eisacount; +#endif +#ifdef CONFIG_PCI + pcicount = pci_register_driver(&dgrs_pci_driver); + if (pcicount < 0) + return pcicount; +#endif + return (eisacount + pcicount) == 0 ? -ENODEV : 0; } static void __exit dgrs_cleanup_module (void) { - while (dgrs_root_dev) - { - struct net_device *next_dev; - DGRS_PRIV *priv; - - priv = (DGRS_PRIV *) dgrs_root_dev->priv; - next_dev = priv->next_dev; - unregister_netdev(dgrs_root_dev); - - proc_reset(priv->devtbl[0], 1); - - if (priv->vmem) - iounmap(priv->vmem); - if (priv->vplxdma) - iounmap((uchar *) priv->vplxdma); - - release_region(dgrs_root_dev->base_addr, 256); - - if (dgrs_root_dev->irq) - free_irq(dgrs_root_dev->irq, dgrs_root_dev); - - free_netdev(dgrs_root_dev); - dgrs_root_dev = next_dev; - } +#ifdef CONFIG_EISA + eisa_driver_unregister (&dgrs_eisa_driver); +#endif +#ifdef CONFIG_PCI + pci_unregister_driver (&dgrs_pci_driver); +#endif } module_init(dgrs_init_module); diff -Nru a/drivers/net/e100/LICENSE b/drivers/net/e100/LICENSE --- a/drivers/net/e100/LICENSE Thu Feb 19 23:44:26 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,339 +0,0 @@ - -"This software program is licensed subject to the GNU General Public License -(GPL). Version 2, June 1991, available at -" - -GNU General Public License - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to -share and change it. By contrast, the GNU General Public License is intended -to guarantee your freedom to share and change free software--to make sure -the software is free for all its users. This General Public License applies -to most of the Free Software Foundation's software and to any other program -whose authors commit to using it. (Some other Free Software Foundation -software is covered by the GNU Library General Public License instead.) You -can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you -wish), that you receive source code or can get it if you want it, that you -can change the software or use pieces of it in new free programs; and that -you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to -deny you these rights or to ask you to surrender the rights. These -restrictions translate to certain responsibilities for you if you distribute -copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or -for a fee, you must give the recipients all the rights that you have. You -must make sure that they, too, receive or can get the source code. And you -must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If -the software is modified by someone else and passed on, we want its -recipients to know that what they have is not the original, so that any -problems introduced by others will not reflect on the original authors' -reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program -proprietary. To prevent this, we have made it clear that any patent must be -licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice - placed by the copyright holder saying it may be distributed under the - terms of this General Public License. The "Program", below, refers to any - such program or work, and a "work based on the Program" means either the - Program or any derivative work under copyright law: that is to say, a - work containing the Program or a portion of it, either verbatim or with - modifications and/or translated into another language. (Hereinafter, - translation is included without limitation in the term "modification".) - Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is covered - only if its contents constitute a work based on the Program (independent - of having been made by running the Program). Whether that is true depends - on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code - as you receive it, in any medium, provided that you conspicuously and - appropriately publish on each copy an appropriate copyright notice and - disclaimer of warranty; keep intact all the notices that refer to this - License and to the absence of any warranty; and give any other recipients - of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and you - may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, - thus forming a work based on the Program, and copy and distribute such - modifications or work under the terms of Section 1 above, provided that - you also meet all of these conditions: - - * a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - * b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - * c) If the modified program normally reads commands interactively when - run, you must cause it, when started running for such interactive - use in the most ordinary way, to print or display an announcement - including an appropriate copyright notice and a notice that there is - no warranty (or else, saying that you provide a warranty) and that - users may redistribute the program under these conditions, and - telling the user how to view a copy of this License. (Exception: if - the Program itself is interactive but does not normally print such - an announcement, your work based on the Program is not required to - print an announcement.) - - These requirements apply to the modified work as a whole. If identifiable - sections of that work are not derived from the Program, and can be - reasonably considered independent and separate works in themselves, then - this License, and its terms, do not apply to those sections when you - distribute them as separate works. But when you distribute the same - sections as part of a whole which is a work based on the Program, the - distribution of the whole must be on the terms of this License, whose - permissions for other licensees extend to the entire whole, and thus to - each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under - Section 2) in object code or executable form under the terms of Sections - 1 and 2 above provided that you also do one of the following: - - * a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 - above on a medium customarily used for software interchange; or, - - * b) Accompany it with a written offer, valid for at least three years, - to give any third party, for a charge no more than your cost of - physically performing source distribution, a complete machine- - readable copy of the corresponding source code, to be distributed - under the terms of Sections 1 and 2 above on a medium customarily - used for software interchange; or, - - * c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on which - the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as - expressly provided under this License. Any attempt otherwise to copy, - modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will not - have their licenses terminated so long as such parties remain in full - compliance. - -5. You are not required to accept this License, since you have not signed - it. However, nothing else grants you permission to modify or distribute - the Program or its derivative works. These actions are prohibited by law - if you do not accept this License. Therefore, by modifying or - distributing the Program (or any work based on the Program), you - indicate your acceptance of this License to do so, and all its terms and - conditions for copying, distributing or modifying the Program or works - based on it. - -6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under any - particular circumstance, the balance of the section is intended to apply - and the section as a whole is intended to apply in other circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous contributions - to the wide range of software distributed through that system in - reliance on consistent application of that system; it is up to the - author/donor to decide if he or she is willing to distribute software - through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain - countries either by patents or by copyrighted interfaces, the original - copyright holder who places the Program under this License may add an - explicit geographical distribution limitation excluding those countries, - so that distribution is permitted only in or among countries not thus - excluded. In such case, this License incorporates the limitation as if - written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of - the General Public License from time to time. Such new versions will be - similar in spirit to the present version, but may differ in detail to - address new problems or concerns. - - Each version is given a distinguishing version number. If the Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs - whose distribution conditions are different, write to the author to ask - for permission. For software which is copyrighted by the Free Software - Foundation, write to the Free Software Foundation; we sometimes make - exceptions for this. Our decision will be guided by the two goals of - preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - - NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN - OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES - PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER - EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING - WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR - REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it free -software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively convey the -exclusion of warranty; and each file should have at least the "copyright" -line and a pointer to where the full notice is found. - -one line to give the program's name and an idea of what it does. -Copyright (C) yyyy name of author - -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. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when -it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) year name of author Gnomovision comes -with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free -software, and you are welcome to redistribute it under certain conditions; -type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in the program -'Gnomovision' (which makes passes at compilers) written by James Hacker. - -signature of Ty Coon, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. diff -Nru a/drivers/net/e100/Makefile b/drivers/net/e100/Makefile --- a/drivers/net/e100/Makefile Thu Feb 19 23:44:28 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,8 +0,0 @@ -# -# Makefile for the Intel's E100 ethernet driver -# - -obj-$(CONFIG_E100) += e100.o - -e100-objs := e100_main.o e100_config.o e100_phy.o \ - e100_eeprom.o e100_test.o diff -Nru a/drivers/net/e100/e100.h b/drivers/net/e100/e100.h --- a/drivers/net/e100/e100.h Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,999 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -#ifndef _E100_INC_ -#define _E100_INC_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#define E100_CABLE_UNKNOWN 0 -#define E100_CABLE_OK 1 -#define E100_CABLE_OPEN_NEAR 2 /* Open Circuit Near End */ -#define E100_CABLE_OPEN_FAR 3 /* Open Circuit Far End */ -#define E100_CABLE_SHORT_NEAR 4 /* Short Circuit Near End */ -#define E100_CABLE_SHORT_FAR 5 /* Short Circuit Far End */ - -#define E100_REGS_LEN 2 -/* - * Configure parameters for buffers per controller. - * If the machine this is being used on is a faster machine (i.e. > 150MHz) - * and running on a 10MBS network then more queueing of data occurs. This - * may indicate the some of the numbers below should be adjusted. Here are - * some typical numbers: - * MAX_TCB 64 - * MAX_RFD 64 - * The default numbers give work well on most systems tests so no real - * adjustments really need to take place. Also, if the machine is connected - * to a 100MBS network the numbers described above can be lowered from the - * defaults as considerably less data will be queued. - */ - -#define TX_FRAME_CNT 8 /* consecutive transmit frames per interrupt */ -/* TX_FRAME_CNT must be less than MAX_TCB */ - -#define E100_DEFAULT_TCB 64 -#define E100_MIN_TCB 2*TX_FRAME_CNT + 3 /* make room for at least 2 interrupts */ -#define E100_MAX_TCB 1024 - -#define E100_DEFAULT_RFD 64 -#define E100_MIN_RFD 8 -#define E100_MAX_RFD 1024 - -#define E100_DEFAULT_XSUM true -#define E100_DEFAULT_BER ZLOCK_MAX_ERRORS -#define E100_DEFAULT_SPEED_DUPLEX 0 -#define E100_DEFAULT_FC 0 -#define E100_DEFAULT_IFS true -#define E100_DEFAULT_UCODE true - -#define TX_THRSHLD 8 - -/* IFS parameters */ -#define MIN_NUMBER_OF_TRANSMITS_100 1000 -#define MIN_NUMBER_OF_TRANSMITS_10 100 - -#define E100_MAX_NIC 16 - -#define E100_MAX_SCB_WAIT 100 /* Max udelays in wait_scb */ -#define E100_MAX_CU_IDLE_WAIT 50 /* Max udelays in wait_cus_idle */ - -/* HWI feature related constant */ -#define HWI_REGISTER_GRANULARITY 80 /* register granularity = 80 Cm */ -#define HWI_NEAR_END_BOUNDARY 1000 /* Near end is defined as < 10 meters */ - -/* CPUSAVER_BUNDLE_MAX: Sets the maximum number of frames that will be bundled. - * In some situations, such as the TCP windowing algorithm, it may be - * better to limit the growth of the bundle size than let it go as - * high as it can, because that could cause too much added latency. - * The default is six, because this is the number of packets in the - * default TCP window size. A value of 1 would make CPUSaver indicate - * an interrupt for every frame received. If you do not want to put - * a limit on the bundle size, set this value to xFFFF. - */ -#define E100_DEFAULT_CPUSAVER_BUNDLE_MAX 6 -#define E100_DEFAULT_CPUSAVER_INTERRUPT_DELAY 0x600 -#define E100_DEFAULT_BUNDLE_SMALL_FR false - -/* end of configurables */ - -/* ====================================================================== */ -/* hw */ -/* ====================================================================== */ - -/* timeout for command completion */ -#define E100_CMD_WAIT 100 /* iterations */ - -struct driver_stats { - struct net_device_stats net_stats; - - unsigned long tx_late_col; - unsigned long tx_ok_defrd; - unsigned long tx_one_retry; - unsigned long tx_mt_one_retry; - unsigned long rcv_cdt_frames; - unsigned long xmt_fc_pkts; - unsigned long rcv_fc_pkts; - unsigned long rcv_fc_unsupported; - unsigned long xmt_tco_pkts; - unsigned long rcv_tco_pkts; - unsigned long rx_intr_pkts; -}; - -/* TODO: kill me when we can do C99 */ -#define false (0) -#define true (1) - -/* Changed for 82558 and 82559 enhancements */ -/* defines for 82558/9 flow control CSR values */ -#define DFLT_FC_THLD 0x00 /* Rx FIFO threshold of 0.5KB free */ -#define DFLT_FC_CMD 0x00 /* FC Command in CSR */ - -/* ====================================================================== */ -/* equates */ -/* ====================================================================== */ - -/* - * These are general purpose defines - */ - -/* Bit Mask definitions */ -#define BIT_0 0x0001 -#define BIT_1 0x0002 -#define BIT_2 0x0004 -#define BIT_3 0x0008 -#define BIT_4 0x0010 -#define BIT_5 0x0020 -#define BIT_6 0x0040 -#define BIT_7 0x0080 -#define BIT_8 0x0100 -#define BIT_9 0x0200 -#define BIT_10 0x0400 -#define BIT_11 0x0800 -#define BIT_12 0x1000 -#define BIT_13 0x2000 -#define BIT_14 0x4000 -#define BIT_15 0x8000 -#define BIT_28 0x10000000 - -#define BIT_0_2 0x0007 -#define BIT_0_3 0x000F -#define BIT_0_4 0x001F -#define BIT_0_5 0x003F -#define BIT_0_6 0x007F -#define BIT_0_7 0x00FF -#define BIT_0_8 0x01FF -#define BIT_0_13 0x3FFF -#define BIT_0_15 0xFFFF -#define BIT_1_2 0x0006 -#define BIT_1_3 0x000E -#define BIT_2_5 0x003C -#define BIT_3_4 0x0018 -#define BIT_4_5 0x0030 -#define BIT_4_6 0x0070 -#define BIT_4_7 0x00F0 -#define BIT_5_7 0x00E0 -#define BIT_5_12 0x1FE0 -#define BIT_5_15 0xFFE0 -#define BIT_6_7 0x00c0 -#define BIT_7_11 0x0F80 -#define BIT_8_10 0x0700 -#define BIT_9_13 0x3E00 -#define BIT_12_15 0xF000 -#define BIT_8_15 0xFF00 - -#define BIT_16_20 0x001F0000 -#define BIT_21_25 0x03E00000 -#define BIT_26_27 0x0C000000 - -/* Transmit Threshold related constants */ -#define DEFAULT_TX_PER_UNDERRUN 20000 - -#define MAX_MULTICAST_ADDRS 64 -#define MAX_FILTER 16 - -#define FULL_DUPLEX 2 -#define HALF_DUPLEX 1 - -/* - * These defines are specific to the 82557 - */ - -/* E100 PORT functions -- lower 4 bits */ -#define PORT_SOFTWARE_RESET 0 -#define PORT_SELFTEST 1 -#define PORT_SELECTIVE_RESET 2 -#define PORT_DUMP 3 - -/* SCB Status Word bit definitions */ -/* Interrupt status/ack fields */ -/* ER and FCP interrupts for 82558 masks */ -#define SCB_STATUS_ACK_MASK BIT_8_15 /* Status Mask */ -#define SCB_STATUS_ACK_CX BIT_15 /* CU Completed Action Cmd */ -#define SCB_STATUS_ACK_FR BIT_14 /* RU Received A Frame */ -#define SCB_STATUS_ACK_CNA BIT_13 /* CU Became Inactive (IDLE) */ -#define SCB_STATUS_ACK_RNR BIT_12 /* RU Became Not Ready */ -#define SCB_STATUS_ACK_MDI BIT_11 /* MDI read or write done */ -#define SCB_STATUS_ACK_SWI BIT_10 /* S/W generated interrupt */ -#define SCB_STATUS_ACK_ER BIT_9 /* Early Receive */ -#define SCB_STATUS_ACK_FCP BIT_8 /* Flow Control Pause */ - -/*- CUS Fields */ -#define SCB_CUS_MASK (BIT_6 | BIT_7) /* CUS 2-bit Mask */ -#define SCB_CUS_IDLE 0 /* CU Idle */ -#define SCB_CUS_SUSPEND BIT_6 /* CU Suspended */ -#define SCB_CUS_ACTIVE BIT_7 /* CU Active */ - -/*- RUS Fields */ -#define SCB_RUS_IDLE 0 /* RU Idle */ -#define SCB_RUS_MASK BIT_2_5 /* RUS 3-bit Mask */ -#define SCB_RUS_SUSPEND BIT_2 /* RU Suspended */ -#define SCB_RUS_NO_RESOURCES BIT_3 /* RU Out Of Resources */ -#define SCB_RUS_READY BIT_4 /* RU Ready */ -#define SCB_RUS_SUSP_NO_RBDS (BIT_2 | BIT_5) /* RU No More RBDs */ -#define SCB_RUS_NO_RBDS (BIT_3 | BIT_5) /* RU No More RBDs */ -#define SCB_RUS_READY_NO_RBDS (BIT_4 | BIT_5) /* RU Ready, No RBDs */ - -/* SCB Command Word bit definitions */ -/*- CUC fields */ -/* Changing mask to 4 bits */ -#define SCB_CUC_MASK BIT_4_7 /* CUC 4-bit Mask */ -#define SCB_CUC_NOOP 0 -#define SCB_CUC_START BIT_4 /* CU Start */ -#define SCB_CUC_RESUME BIT_5 /* CU Resume */ -#define SCB_CUC_UNKNOWN BIT_7 /* CU unknown command */ -/* Changed for 82558 enhancements */ -#define SCB_CUC_STATIC_RESUME (BIT_5 | BIT_7) /* 82558/9 Static Resume */ -#define SCB_CUC_DUMP_ADDR BIT_6 /* CU Dump Counters Address */ -#define SCB_CUC_DUMP_STAT (BIT_4 | BIT_6) /* CU Dump stat. counters */ -#define SCB_CUC_LOAD_BASE (BIT_5 | BIT_6) /* Load the CU base */ -/* Below was defined as BIT_4_7 */ -#define SCB_CUC_DUMP_RST_STAT BIT_4_6 /* CU Dump & reset statistics cntrs */ - -/*- RUC fields */ -#define SCB_RUC_MASK BIT_0_2 /* RUC 3-bit Mask */ -#define SCB_RUC_START BIT_0 /* RU Start */ -#define SCB_RUC_RESUME BIT_1 /* RU Resume */ -#define SCB_RUC_ABORT BIT_2 /* RU Abort */ -#define SCB_RUC_LOAD_HDS (BIT_0 | BIT_2) /* Load RFD Header Data Size */ -#define SCB_RUC_LOAD_BASE (BIT_1 | BIT_2) /* Load the RU base */ -#define SCB_RUC_RBD_RESUME BIT_0_2 /* RBD resume */ - -/* Interrupt fields (assuming byte addressing) */ -#define SCB_INT_MASK BIT_0 /* Mask interrupts */ -#define SCB_SOFT_INT BIT_1 /* Generate a S/W interrupt */ -/* Specific Interrupt Mask Bits (upper byte of SCB Command word) */ -#define SCB_FCP_INT_MASK BIT_2 /* Flow Control Pause */ -#define SCB_ER_INT_MASK BIT_3 /* Early Receive */ -#define SCB_RNR_INT_MASK BIT_4 /* RU Not Ready */ -#define SCB_CNA_INT_MASK BIT_5 /* CU Not Active */ -#define SCB_FR_INT_MASK BIT_6 /* Frame Received */ -#define SCB_CX_INT_MASK BIT_7 /* CU eXecution w/ I-bit done */ -#define SCB_BACHELOR_INT_MASK BIT_2_7 /* 82558 interrupt mask bits */ - -#define SCB_GCR2_EEPROM_ACCESS_SEMAPHORE BIT_7 - -/* EEPROM bit definitions */ -/*- EEPROM control register bits */ -#define EEPROM_FLAG_ASF 0x8000 -#define EEPROM_FLAG_GCL 0x4000 - -#define EN_TRNF 0x10 /* Enable turnoff */ -#define EEDO 0x08 /* EEPROM data out */ -#define EEDI 0x04 /* EEPROM data in (set for writing data) */ -#define EECS 0x02 /* EEPROM chip select (1=hi, 0=lo) */ -#define EESK 0x01 /* EEPROM shift clock (1=hi, 0=lo) */ - -/*- EEPROM opcodes */ -#define EEPROM_READ_OPCODE 06 -#define EEPROM_WRITE_OPCODE 05 -#define EEPROM_ERASE_OPCODE 07 -#define EEPROM_EWEN_OPCODE 19 /* Erase/write enable */ -#define EEPROM_EWDS_OPCODE 16 /* Erase/write disable */ - -/*- EEPROM data locations */ -#define EEPROM_NODE_ADDRESS_BYTE_0 0 -#define EEPROM_COMPATIBILITY_WORD 3 -#define EEPROM_PWA_NO 8 -#define EEPROM_ID_WORD 0x0A -#define EEPROM_CONFIG_ASF 0x0D -#define EEPROM_SMBUS_ADDR 0x90 - -#define EEPROM_SUM 0xbaba - -// Zero Locking Algorithm definitions: -#define ZLOCK_ZERO_MASK 0x00F0 -#define ZLOCK_MAX_READS 50 -#define ZLOCK_SET_ZERO 0x2010 -#define ZLOCK_MAX_SLEEP 300 * HZ -#define ZLOCK_MAX_ERRORS 300 - -/* E100 Action Commands */ -#define CB_IA_ADDRESS 1 -#define CB_CONFIGURE 2 -#define CB_MULTICAST 3 -#define CB_TRANSMIT 4 -#define CB_LOAD_MICROCODE 5 -#define CB_LOAD_FILTER 8 -#define CB_MAX_NONTX_CMD 9 -#define CB_IPCB_TRANSMIT 9 - -/* Pre-defined Filter Bits */ -#define CB_FILTER_EL 0x80000000 -#define CB_FILTER_FIX 0x40000000 -#define CB_FILTER_ARP 0x08000000 -#define CB_FILTER_IA_MATCH 0x02000000 - -/* Command Block (CB) Field Definitions */ -/*- CB Command Word */ -#define CB_EL_BIT BIT_15 /* CB EL Bit */ -#define CB_S_BIT BIT_14 /* CB Suspend Bit */ -#define CB_I_BIT BIT_13 /* CB Interrupt Bit */ -#define CB_TX_SF_BIT BIT_3 /* TX CB Flexible Mode */ -#define CB_CMD_MASK BIT_0_3 /* CB 4-bit CMD Mask */ -#define CB_CID_DEFAULT (0x1f << 8) /* CB 5-bit CID (max value) */ - -/*- CB Status Word */ -#define CB_STATUS_MASK BIT_12_15 /* CB Status Mask (4-bits) */ -#define CB_STATUS_COMPLETE BIT_15 /* CB Complete Bit */ -#define CB_STATUS_OK BIT_13 /* CB OK Bit */ -#define CB_STATUS_VLAN BIT_12 /* CB Valn detected Bit */ -#define CB_STATUS_FAIL BIT_11 /* CB Fail (F) Bit */ - -/*misc command bits */ -#define CB_TX_EOF_BIT BIT_15 /* TX CB/TBD EOF Bit */ - -/* Config params */ -#define CB_CFIG_BYTE_COUNT 22 /* 22 config bytes */ -#define CB_CFIG_D102_BYTE_COUNT 10 - -/* Receive Frame Descriptor Fields */ - -/*- RFD Status Bits */ -#define RFD_RECEIVE_COLLISION BIT_0 /* Collision detected on Receive */ -#define RFD_IA_MATCH BIT_1 /* Indv Address Match Bit */ -#define RFD_RX_ERR BIT_4 /* RX_ERR pin on Phy was set */ -#define RFD_FRAME_TOO_SHORT BIT_7 /* Receive Frame Short */ -#define RFD_DMA_OVERRUN BIT_8 /* Receive DMA Overrun */ -#define RFD_NO_RESOURCES BIT_9 /* No Buffer Space */ -#define RFD_ALIGNMENT_ERROR BIT_10 /* Alignment Error */ -#define RFD_CRC_ERROR BIT_11 /* CRC Error */ -#define RFD_STATUS_OK BIT_13 /* RFD OK Bit */ -#define RFD_STATUS_COMPLETE BIT_15 /* RFD Complete Bit */ - -/*- RFD Command Bits*/ -#define RFD_EL_BIT BIT_15 /* RFD EL Bit */ -#define RFD_S_BIT BIT_14 /* RFD Suspend Bit */ -#define RFD_H_BIT BIT_4 /* Header RFD Bit */ -#define RFD_SF_BIT BIT_3 /* RFD Flexible Mode */ - -/*- RFD misc bits*/ -#define RFD_EOF_BIT BIT_15 /* RFD End-Of-Frame Bit */ -#define RFD_F_BIT BIT_14 /* RFD Buffer Fetch Bit */ -#define RFD_ACT_COUNT_MASK BIT_0_13 /* RFD Actual Count Mask */ - -/* Receive Buffer Descriptor Fields*/ -#define RBD_EOF_BIT BIT_15 /* RBD End-Of-Frame Bit */ -#define RBD_F_BIT BIT_14 /* RBD Buffer Fetch Bit */ -#define RBD_ACT_COUNT_MASK BIT_0_13 /* RBD Actual Count Mask */ - -#define SIZE_FIELD_MASK BIT_0_13 /* Size of the associated buffer */ -#define RBD_EL_BIT BIT_15 /* RBD EL Bit */ - -/* Self Test Results*/ -#define CB_SELFTEST_FAIL_BIT BIT_12 -#define CB_SELFTEST_DIAG_BIT BIT_5 -#define CB_SELFTEST_REGISTER_BIT BIT_3 -#define CB_SELFTEST_ROM_BIT BIT_2 - -#define CB_SELFTEST_ERROR_MASK ( \ - CB_SELFTEST_FAIL_BIT | CB_SELFTEST_DIAG_BIT | \ - CB_SELFTEST_REGISTER_BIT | CB_SELFTEST_ROM_BIT) - -/* adapter vendor & device ids */ -#define PCI_OHIO_BOARD 0x10f0 /* subdevice ID, Ohio dual port nic */ - -/* Values for PCI_REV_ID_REGISTER values */ -#define D101A4_REV_ID 4 /* 82558 A4 stepping */ -#define D101B0_REV_ID 5 /* 82558 B0 stepping */ -#define D101MA_REV_ID 8 /* 82559 A0 stepping */ -#define D101S_REV_ID 9 /* 82559S A-step */ -#define D102_REV_ID 12 -#define D102C_REV_ID 13 /* 82550 step C */ -#define D102E_REV_ID 15 - -/* ############Start of 82555 specific defines################## */ - -#define PHY_82555_LED_SWITCH_CONTROL 0x1b /* 82555 led switch control register */ - -/* 82555 led switch control reg. opcodes */ -#define PHY_82555_LED_NORMAL_CONTROL 0 // control back to the 8255X -#define PHY_82555_LED_DRIVER_CONTROL BIT_2 // the driver is in control -#define PHY_82555_LED_OFF BIT_2 // activity LED is off -#define PHY_82555_LED_ON_559 (BIT_0 | BIT_2) // activity LED is on for 559 and later -#define PHY_82555_LED_ON_PRE_559 (BIT_0 | BIT_1 | BIT_2) // activity LED is on for 558 and before - -// Describe the state of the phy led. -// needed for the function : 'e100_blink_timer' -enum led_state_e { - LED_OFF = 0, - LED_ON, -}; - -/* ############End of 82555 specific defines##################### */ - -#define RFD_PARSE_BIT BIT_3 -#define RFD_TCP_PACKET 0x00 -#define RFD_UDP_PACKET 0x01 -#define TCPUDP_CHECKSUM_BIT_VALID BIT_4 -#define TCPUDP_CHECKSUM_VALID BIT_5 -#define CHECKSUM_PROTOCOL_MASK 0x03 - -#define VLAN_SIZE 4 -#define CHKSUM_SIZE 2 -#define RFD_DATA_SIZE (ETH_FRAME_LEN + CHKSUM_SIZE + VLAN_SIZE) - -/* Bits for bdp->flags */ -#define DF_LINK_FC_CAP 0x00000001 /* Link is flow control capable */ -#define DF_CSUM_OFFLOAD 0x00000002 -#define DF_UCODE_LOADED 0x00000004 -#define USE_IPCB 0x00000008 /* set if using ipcb for transmits */ -#define IS_BACHELOR 0x00000010 /* set if 82558 or newer board */ -#define IS_ICH 0x00000020 -#define DF_SPEED_FORCED 0x00000040 /* set if speed is forced */ -#define LED_IS_ON 0x00000080 /* LED is turned ON by the driver */ -#define DF_LINK_FC_TX_ONLY 0x00000100 /* Received PAUSE frames are honored*/ - -typedef struct net_device_stats net_dev_stats_t; - -/* needed macros */ -/* These macros use the bdp pointer. If you use them it better be defined */ -#define PREV_TCB_USED(X) ((X).tail ? (X).tail - 1 : bdp->params.TxDescriptors - 1) -#define NEXT_TCB_TOUSE(X) ((((X) + 1) >= bdp->params.TxDescriptors) ? 0 : (X) + 1) -#define TCB_TO_USE(X) ((X).tail) -#define TCBS_AVAIL(X) (NEXT_TCB_TOUSE( NEXT_TCB_TOUSE((X).tail)) != (X).head) - -#define RFD_POINTER(skb,bdp) ((rfd_t *) (((unsigned char *)((skb)->data))-((bdp)->rfd_size))) -#define SKB_RFD_STATUS(skb,bdp) ((RFD_POINTER((skb),(bdp)))->rfd_header.cb_status) - -/* ====================================================================== */ -/* 82557 */ -/* ====================================================================== */ - -/* Changed for 82558 enhancement */ -typedef struct _d101_scb_ext_t { - u32 scb_rx_dma_cnt; /* Rx DMA byte count */ - u8 scb_early_rx_int; /* Early Rx DMA byte count */ - u8 scb_fc_thld; /* Flow Control threshold */ - u8 scb_fc_xon_xoff; /* Flow Control XON/XOFF values */ - u8 scb_pmdr; /* Power Mgmt. Driver Reg */ -} d101_scb_ext __attribute__ ((__packed__)); - -/* Changed for 82559 enhancement */ -typedef struct _d101m_scb_ext_t { - u32 scb_rx_dma_cnt; /* Rx DMA byte count */ - u8 scb_early_rx_int; /* Early Rx DMA byte count */ - u8 scb_fc_thld; /* Flow Control threshold */ - u8 scb_fc_xon_xoff; /* Flow Control XON/XOFF values */ - u8 scb_pmdr; /* Power Mgmt. Driver Reg */ - u8 scb_gen_ctrl; /* General Control */ - u8 scb_gen_stat; /* General Status */ - u16 scb_reserved; /* Reserved */ - u32 scb_function_event; /* Cardbus Function Event */ - u32 scb_function_event_mask; /* Cardbus Function Mask */ - u32 scb_function_present_state; /* Cardbus Function state */ - u32 scb_force_event; /* Cardbus Force Event */ -} d101m_scb_ext __attribute__ ((__packed__)); - -/* Changed for 82550 enhancement */ -typedef struct _d102_scb_ext_t { - u32 scb_rx_dma_cnt; /* Rx DMA byte count */ - u8 scb_early_rx_int; /* Early Rx DMA byte count */ - u8 scb_fc_thld; /* Flow Control threshold */ - u8 scb_fc_xon_xoff; /* Flow Control XON/XOFF values */ - u8 scb_pmdr; /* Power Mgmt. Driver Reg */ - u8 scb_gen_ctrl; /* General Control */ - u8 scb_gen_stat; /* General Status */ - u8 scb_gen_ctrl2; - u8 scb_reserved; /* Reserved */ - u32 scb_scheduling_reg; - u32 scb_reserved2; - u32 scb_function_event; /* Cardbus Function Event */ - u32 scb_function_event_mask; /* Cardbus Function Mask */ - u32 scb_function_present_state; /* Cardbus Function state */ - u32 scb_force_event; /* Cardbus Force Event */ -} d102_scb_ext __attribute__ ((__packed__)); - -/* - * 82557 status control block. this will be memory mapped & will hang of the - * the bdp, which hangs of the bdp. This is the brain of it. - */ -typedef struct _scb_t { - u16 scb_status; /* SCB Status register */ - u8 scb_cmd_low; /* SCB Command register (low byte) */ - u8 scb_cmd_hi; /* SCB Command register (high byte) */ - u32 scb_gen_ptr; /* SCB General pointer */ - u32 scb_port; /* PORT register */ - u16 scb_flsh_cntrl; /* Flash Control register */ - u16 scb_eprm_cntrl; /* EEPROM control register */ - u32 scb_mdi_cntrl; /* MDI Control Register */ - /* Changed for 82558 enhancement */ - union { - u32 scb_rx_dma_cnt; /* Rx DMA byte count */ - d101_scb_ext d101_scb; /* 82558/9 specific fields */ - d101m_scb_ext d101m_scb; /* 82559 specific fields */ - d102_scb_ext d102_scb; - } scb_ext; -} scb_t __attribute__ ((__packed__)); - -/* Self test - * This is used to dump results of the self test - */ -typedef struct _self_test_t { - u32 st_sign; /* Self Test Signature */ - u32 st_result; /* Self Test Results */ -} self_test_t __attribute__ ((__packed__)); - -/* - * Statistical Counters - */ -/* 82557 counters */ -typedef struct _basic_cntr_t { - u32 xmt_gd_frames; /* Good frames transmitted */ - u32 xmt_max_coll; /* Fatal frames -- had max collisions */ - u32 xmt_late_coll; /* Fatal frames -- had a late coll. */ - u32 xmt_uruns; /* Xmit underruns (fatal or re-transmit) */ - u32 xmt_lost_crs; /* Frames transmitted without CRS */ - u32 xmt_deferred; /* Deferred transmits */ - u32 xmt_sngl_coll; /* Transmits that had 1 and only 1 coll. */ - u32 xmt_mlt_coll; /* Transmits that had multiple coll. */ - u32 xmt_ttl_coll; /* Transmits that had 1+ collisions. */ - u32 rcv_gd_frames; /* Good frames received */ - u32 rcv_crc_errs; /* Aligned frames that had a CRC error */ - u32 rcv_algn_errs; /* Receives that had alignment errors */ - u32 rcv_rsrc_err; /* Good frame dropped cuz no resources */ - u32 rcv_oruns; /* Overrun errors - bus was busy */ - u32 rcv_err_coll; /* Received frms. that encountered coll. */ - u32 rcv_shrt_frames; /* Received frames that were to short */ -} basic_cntr_t; - -/* 82558 extended statistic counters */ -typedef struct _ext_cntr_t { - u32 xmt_fc_frames; - u32 rcv_fc_frames; - u32 rcv_fc_unsupported; -} ext_cntr_t; - -/* 82559 TCO statistic counters */ -typedef struct _tco_cntr_t { - u16 xmt_tco_frames; - u16 rcv_tco_frames; -} tco_cntr_t; - -/* Structures to access thet physical dump area */ -/* Use one of these types, according to the statisitcal counters mode, - to cast the pointer to the physical dump area and access the cmd_complete - DWORD. */ - -/* 557-mode : only basic counters + cmd_complete */ -typedef struct _err_cntr_557_t { - basic_cntr_t basic_stats; - u32 cmd_complete; -} err_cntr_557_t; - -/* 558-mode : basic + extended counters + cmd_complete */ -typedef struct _err_cntr_558_t { - basic_cntr_t basic_stats; - ext_cntr_t extended_stats; - u32 cmd_complete; -} err_cntr_558_t; - -/* 559-mode : basic + extended + TCO counters + cmd_complete */ -typedef struct _err_cntr_559_t { - basic_cntr_t basic_stats; - ext_cntr_t extended_stats; - tco_cntr_t tco_stats; - u32 cmd_complete; -} err_cntr_559_t; - -/* This typedef defines the struct needed to hold the largest number of counters */ -typedef err_cntr_559_t max_counters_t; - -/* Different statistical-counters mode the controller may be in */ -typedef enum _stat_mode_t { - E100_BASIC_STATS = 0, /* 82557 stats : 16 counters / 16 dw */ - E100_EXTENDED_STATS, /* 82558 stats : 19 counters / 19 dw */ - E100_TCO_STATS /* 82559 stats : 21 counters / 20 dw */ -} stat_mode_t; - -/* dump statistical counters complete codes */ -#define DUMP_STAT_COMPLETED 0xA005 -#define DUMP_RST_STAT_COMPLETED 0xA007 - -/* Command Block (CB) Generic Header Structure*/ -typedef struct _cb_header_t { - u16 cb_status; /* Command Block Status */ - u16 cb_cmd; /* Command Block Command */ - u32 cb_lnk_ptr; /* Link To Next CB */ -} cb_header_t __attribute__ ((__packed__)); - -//* Individual Address Command Block (IA_CB)*/ -typedef struct _ia_cb_t { - cb_header_t ia_cb_hdr; - u8 ia_addr[ETH_ALEN]; -} ia_cb_t __attribute__ ((__packed__)); - -/* Configure Command Block (CONFIG_CB)*/ -typedef struct _config_cb_t { - cb_header_t cfg_cbhdr; - u8 cfg_byte[CB_CFIG_BYTE_COUNT + CB_CFIG_D102_BYTE_COUNT]; -} config_cb_t __attribute__ ((__packed__)); - -/* MultiCast Command Block (MULTICAST_CB)*/ -typedef struct _multicast_cb_t { - cb_header_t mc_cbhdr; - u16 mc_count; /* Number of multicast addresses */ - u8 mc_addr[(ETH_ALEN * MAX_MULTICAST_ADDRS)]; -} mltcst_cb_t __attribute__ ((__packed__)); - -#define UCODE_MAX_DWORDS 134 -/* Load Microcode Command Block (LOAD_UCODE_CB)*/ -typedef struct _load_ucode_cb_t { - cb_header_t load_ucode_cbhdr; - u32 ucode_dword[UCODE_MAX_DWORDS]; -} load_ucode_cb_t __attribute__ ((__packed__)); - -/* Load Programmable Filter Data*/ -typedef struct _filter_cb_t { - cb_header_t filter_cb_hdr; - u32 filter_data[MAX_FILTER]; -} filter_cb_t __attribute__ ((__packed__)); - -/* NON_TRANSMIT_CB -- Generic Non-Transmit Command Block - */ -typedef struct _nxmit_cb_t { - union { - config_cb_t config; - ia_cb_t setup; - load_ucode_cb_t load_ucode; - mltcst_cb_t multicast; - filter_cb_t filter; - } ntcb; -} nxmit_cb_t __attribute__ ((__packed__)); - -/*Block for queuing for postponed execution of the non-transmit commands*/ -typedef struct _nxmit_cb_entry_t { - struct list_head list_elem; - nxmit_cb_t *non_tx_cmd; - dma_addr_t dma_addr; - unsigned long expiration_time; -} nxmit_cb_entry_t; - -/* States for postponed non tx commands execution */ -typedef enum _non_tx_cmd_state_t { - E100_NON_TX_IDLE = 0, /* No queued NON-TX commands */ - E100_WAIT_TX_FINISH, /* Wait for completion of the TX activities */ - E100_WAIT_NON_TX_FINISH /* Wait for completion of the non TX command */ -} non_tx_cmd_state_t; - -/* some defines for the ipcb */ -#define IPCB_IP_CHECKSUM_ENABLE BIT_4 -#define IPCB_TCPUDP_CHECKSUM_ENABLE BIT_5 -#define IPCB_TCP_PACKET BIT_6 -#define IPCB_LARGESEND_ENABLE BIT_7 -#define IPCB_HARDWAREPARSING_ENABLE BIT_0 -#define IPCB_INSERTVLAN_ENABLE BIT_1 -#define IPCB_IP_ACTIVATION_DEFAULT IPCB_HARDWAREPARSING_ENABLE - -/* Transmit Buffer Descriptor (TBD)*/ -typedef struct _tbd_t { - u32 tbd_buf_addr; /* Physical Transmit Buffer Address */ - u16 tbd_buf_cnt; /* Actual Count Of Bytes */ - u16 padd; -} tbd_t __attribute__ ((__packed__)); - -/* d102 specific fields */ -typedef struct _tcb_ipcb_t { - u16 schedule_low; - u8 ip_schedule; - u8 ip_activation_high; - u16 vlan; - u8 ip_header_offset; - u8 tcp_header_offset; - union { - u32 sec_rec_phys_addr; - u32 tbd_zero_address; - } tbd_sec_addr; - union { - u16 sec_rec_size; - u16 tbd_zero_size; - } tbd_sec_size; - u16 total_tcp_payload; -} tcb_ipcb_t __attribute__ ((__packed__)); - -#define E100_TBD_ARRAY_SIZE (2+MAX_SKB_FRAGS) - -/* Transmit Command Block (TCB)*/ -struct _tcb_t { - cb_header_t tcb_hdr; - u32 tcb_tbd_ptr; /* TBD address */ - u16 tcb_cnt; /* Data Bytes In TCB past header */ - u8 tcb_thrshld; /* TX Threshold for FIFO Extender */ - u8 tcb_tbd_num; - - union { - tcb_ipcb_t ipcb; /* d102 ipcb fields */ - tbd_t tbd_array[E100_TBD_ARRAY_SIZE]; - } tcbu; - - /* From here onward we can dump anything we want as long as the - * size of the total structure is a multiple of a paragraph - * boundary ( i.e. -16 bit aligned ). - */ - tbd_t *tbd_ptr; - - u32 tcb_tbd_dflt_ptr; /* TBD address for non-segmented packet */ - u32 tcb_tbd_expand_ptr; /* TBD address for segmented packet */ - - struct sk_buff *tcb_skb; /* the associated socket buffer */ - dma_addr_t tcb_phys; /* phys addr of the TCB */ -} __attribute__ ((__packed__)); - -#define _TCB_T_ -typedef struct _tcb_t tcb_t; - -/* Receive Frame Descriptor (RFD) - will be using the simple model*/ -struct _rfd_t { - /* 8255x */ - cb_header_t rfd_header; - u32 rfd_rbd_ptr; /* Receive Buffer Descriptor Addr */ - u16 rfd_act_cnt; /* Number Of Bytes Received */ - u16 rfd_sz; /* Number Of Bytes In RFD */ - /* D102 aka Gamla */ - u16 vlanid; - u8 rcvparserstatus; - u8 reserved; - u16 securitystatus; - u8 checksumstatus; - u8 zerocopystatus; - u8 pad[8]; /* data should be 16 byte aligned */ - u8 data[RFD_DATA_SIZE]; - -} __attribute__ ((__packed__)); - -#define _RFD_T_ -typedef struct _rfd_t rfd_t; - -/* Receive Buffer Descriptor (RBD)*/ -typedef struct _rbd_t { - u16 rbd_act_cnt; /* Number Of Bytes Received */ - u16 rbd_filler; - u32 rbd_lnk_addr; /* Link To Next RBD */ - u32 rbd_rcb_addr; /* Receive Buffer Address */ - u16 rbd_sz; /* Receive Buffer Size */ - u16 rbd_filler1; -} rbd_t __attribute__ ((__packed__)); - -/* - * This structure is used to maintain a FIFO access to a resource that is - * maintained as a circular queue. The resource to be maintained is pointed - * to by the "data" field in the structure below. In this driver the TCBs', - * TBDs' & RFDs' are maintained as a circular queue & are managed thru this - * structure. - */ -typedef struct _buf_pool_t { - unsigned int head; /* index to first used resource */ - unsigned int tail; /* index to last used resource */ - void *data; /* points to resource pool */ -} buf_pool_t; - -/*Rx skb holding structure*/ -struct rx_list_elem { - struct list_head list_elem; - dma_addr_t dma_addr; - struct sk_buff *skb; -}; - -enum next_cu_cmd_e { RESUME_NO_WAIT = 0, RESUME_WAIT, START_WAIT }; -enum zlock_state_e { ZLOCK_INITIAL, ZLOCK_READING, ZLOCK_SLEEPING }; -enum tx_queue_stop_type { LONG_STOP = 0, SHORT_STOP }; - -/* 64 bit aligned size */ -#define E100_SIZE_64A(X) ((sizeof(X) + 7) & ~0x7) - -typedef struct _bd_dma_able_t { - char selftest[E100_SIZE_64A(self_test_t)]; - char stats_counters[E100_SIZE_64A(max_counters_t)]; -} bd_dma_able_t; - -/* bit masks for bool parameters */ -#define PRM_XSUMRX 0x00000001 -#define PRM_UCODE 0x00000002 -#define PRM_FC 0x00000004 -#define PRM_IFS 0x00000008 -#define PRM_BUNDLE_SMALL 0x00000010 - -struct cfg_params { - int e100_speed_duplex; - int RxDescriptors; - int TxDescriptors; - int IntDelay; - int BundleMax; - int ber; - u32 b_params; -}; -struct ethtool_lpbk_data{ - dma_addr_t dma_handle; - tcb_t *tcb; - rfd_t *rfd; - -}; - -struct e100_private { - struct vlan_group *vlgrp; - u32 flags; /* board management flags */ - u32 tx_per_underrun; /* number of good tx frames per underrun */ - unsigned int tx_count; /* count of tx frames, so we can request an interrupt */ - u8 tx_thld; /* stores transmit threshold */ - u16 eeprom_size; - u32 pwa_no; /* PWA: xxxxxx-0xx */ - u8 perm_node_address[ETH_ALEN]; - struct list_head active_rx_list; /* list of rx buffers */ - struct list_head rx_struct_pool; /* pool of rx buffer struct headers */ - u16 rfd_size; /* size of the adapter's RFD struct */ - int skb_req; /* number of skbs neede by the adapter */ - u8 intr_mask; /* mask for interrupt status */ - - void *dma_able; /* dma allocated structs */ - dma_addr_t dma_able_phys; - self_test_t *selftest; /* pointer to self test area */ - dma_addr_t selftest_phys; /* phys addr of selftest */ - max_counters_t *stats_counters; /* pointer to stats table */ - dma_addr_t stat_cnt_phys; /* phys addr of stat counter area */ - - stat_mode_t stat_mode; /* statistics mode: extended, TCO, basic */ - scb_t *scb; /* memory mapped ptr to 82557 scb */ - - tcb_t *last_tcb; /* pointer to last tcb sent */ - buf_pool_t tcb_pool; /* adapter's TCB array */ - dma_addr_t tcb_phys; /* phys addr of start of TCBs */ - - u16 cur_line_speed; - u16 cur_dplx_mode; - - struct net_device *device; - struct pci_dev *pdev; - struct driver_stats drv_stats; - - u8 rev_id; /* adapter PCI revision ID */ - - unsigned int phy_addr; /* address of PHY component */ - unsigned int PhyId; /* ID of PHY component */ - unsigned int PhyState; /* state for the fix squelch algorithm */ - unsigned int PhyDelay; /* delay for the fix squelch algorithm */ - - /* Lock defintions for the driver */ - spinlock_t bd_lock; /* board lock */ - spinlock_t bd_non_tx_lock; /* Non transmit command lock */ - spinlock_t config_lock; /* config block lock */ - spinlock_t mdi_access_lock; /* mdi lock */ - - struct timer_list watchdog_timer; /* watchdog timer id */ - - /* non-tx commands parameters */ - struct timer_list nontx_timer_id; /* non-tx timer id */ - struct list_head non_tx_cmd_list; - non_tx_cmd_state_t non_tx_command_state; - nxmit_cb_entry_t *same_cmd_entry[CB_MAX_NONTX_CMD]; - - enum next_cu_cmd_e next_cu_cmd; - - /* Zero Locking Algorithm data members */ - enum zlock_state_e zlock_state; - u8 zlock_read_data[16]; /* number of times each value 0-15 was read */ - u16 zlock_read_cnt; /* counts number of reads */ - ulong zlock_sleep_cnt; /* keeps track of "sleep" time */ - - u8 config[CB_CFIG_BYTE_COUNT + CB_CFIG_D102_BYTE_COUNT]; - - /* IFS params */ - u8 ifs_state; - u8 ifs_value; - - struct cfg_params params; /* adapter's command line parameters */ - - u32 speed_duplex_caps; /* adapter's speed/duplex capabilities */ - - /* WOL params for ethtool */ - u32 wolsupported; - u32 wolopts; - u16 ip_lbytes; - struct ethtool_lpbk_data loopback; - struct timer_list blink_timer; /* led blink timer id */ - -#ifdef CONFIG_PM - u32 pci_state[16]; -#endif -#ifdef E100_CU_DEBUG - u8 last_cmd; - u8 last_sub_cmd; -#endif -}; - -#define E100_AUTONEG 0 -#define E100_SPEED_10_HALF 1 -#define E100_SPEED_10_FULL 2 -#define E100_SPEED_100_HALF 3 -#define E100_SPEED_100_FULL 4 - -/********* function prototypes *************/ -extern int e100_open(struct net_device *); -extern int e100_close(struct net_device *); -extern void e100_isolate_driver(struct e100_private *bdp); -extern unsigned char e100_hw_init(struct e100_private *); -extern void e100_sw_reset(struct e100_private *bdp, u32 reset_cmd); -extern u8 e100_start_cu(struct e100_private *bdp, tcb_t *tcb); -extern void e100_free_non_tx_cmd(struct e100_private *bdp, - nxmit_cb_entry_t *non_tx_cmd); -extern nxmit_cb_entry_t *e100_alloc_non_tx_cmd(struct e100_private *bdp); -extern unsigned char e100_exec_non_cu_cmd(struct e100_private *bdp, - nxmit_cb_entry_t *cmd); -extern unsigned char e100_selftest(struct e100_private *bdp, u32 *st_timeout, - u32 *st_result); -extern unsigned char e100_get_link_state(struct e100_private *bdp); -extern unsigned char e100_wait_scb(struct e100_private *bdp); - -extern void e100_deisolate_driver(struct e100_private *bdp, u8 full_reset); -extern unsigned char e100_configure_device(struct e100_private *bdp); -#ifdef E100_CU_DEBUG -extern unsigned char e100_cu_unknown_state(struct e100_private *bdp); -#endif - -#define ROM_TEST_FAIL 0x01 -#define REGISTER_TEST_FAIL 0x02 -#define SELF_TEST_FAIL 0x04 -#define TEST_TIMEOUT 0x08 - -enum test_offsets { - test_link, - test_eeprom, - test_self_test, - test_loopback_mac, - test_loopback_phy, - cable_diag, - max_test_res, /* must be last */ -}; - -#endif diff -Nru a/drivers/net/e100/e100_config.c b/drivers/net/e100/e100_config.c --- a/drivers/net/e100/e100_config.c Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,639 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -/********************************************************************** -* * -* INTEL CORPORATION * -* * -* This software is supplied under the terms of the license included * -* above. All use of this driver must be in accordance with the terms * -* of that license. * -* * -* Module Name: e100_config.c * -* * -* Abstract: Functions for configuring the network adapter. * -* * -* Environment: This file is intended to be specific to the Linux * -* operating system. * -* * -**********************************************************************/ -#include "e100_config.h" - -static void e100_config_long_rx(struct e100_private *bdp, unsigned char enable); - -static const u8 def_config[] = { - CB_CFIG_BYTE_COUNT, - 0x08, 0x00, 0x00, 0x00, 0x00, 0x32, 0x07, 0x01, - 0x00, 0x2e, 0x00, 0x60, 0x00, 0xf2, 0xc8, 0x00, - 0x40, 0xf2, 0x80, 0x3f, 0x05 -}; - -/** - * e100_config_init_82557 - config the 82557 adapter - * @bdp: atapter's private data struct - * - * This routine will initialize the 82557 configure block. - * All other init functions will only set values that are - * different from the 82557 default. - */ -void -e100_config_init_82557(struct e100_private *bdp) -{ - /* initialize config block */ - memcpy(bdp->config, def_config, sizeof (def_config)); - bdp->config[0] = CB_CFIG_BYTE_COUNT; /* just in case */ - - e100_config_ifs(bdp); - - /* - * Enable extended statistical counters (82558 and up) and TCO counters - * (82559 and up) and set the statistical counters' mode in bdp - * - * stat. mode | TCO stat. bit (2) | Extended stat. bit (5) - * ------------------------------------------------------------------ - * Basic (557) | 0 | 1 - * ------------------------------------------------------------------ - * Extended (558) | 0 | 0 - * ------------------------------------------------------------------ - * TCO (559) | 1 | 1 - * ------------------------------------------------------------------ - * Reserved | 1 | 0 - * ------------------------------------------------------------------ - */ - bdp->config[6] &= ~CB_CFIG_TCO_STAT; - bdp->config[6] |= CB_CFIG_EXT_STAT_DIS; - bdp->stat_mode = E100_BASIC_STATS; - - /* Setup for MII or 503 operation. The CRS+CDT bit should only be set */ - /* when operating in 503 mode. */ - if (bdp->phy_addr == 32) { - bdp->config[8] &= ~CB_CFIG_503_MII; - bdp->config[15] |= CB_CFIG_CRS_OR_CDT; - } else { - bdp->config[8] |= CB_CFIG_503_MII; - bdp->config[15] &= ~CB_CFIG_CRS_OR_CDT; - } - - e100_config_fc(bdp); - e100_config_force_dplx(bdp); - e100_config_promisc(bdp, false); - e100_config_mulcast_enbl(bdp, false); -} - -static void -e100_config_init_82558(struct e100_private *bdp) -{ - /* MWI enable. This should be turned on only if the adapter is a 82558/9 - * and if the PCI command reg. has enabled the MWI bit. */ - bdp->config[3] |= CB_CFIG_MWI_EN; - - bdp->config[6] &= ~CB_CFIG_EXT_TCB_DIS; - - if (bdp->rev_id >= D101MA_REV_ID) { - /* this is 82559 and up - enable TCO counters */ - bdp->config[6] |= CB_CFIG_TCO_STAT; - bdp->config[6] |= CB_CFIG_EXT_STAT_DIS; - bdp->stat_mode = E100_TCO_STATS; - - if ((bdp->rev_id < D102_REV_ID) && - (bdp->params.b_params & PRM_XSUMRX) && - (bdp->pdev->device != 0x1209)) { - - bdp->flags |= DF_CSUM_OFFLOAD; - bdp->config[9] |= 1; - } - } else { - /* this is 82558 */ - bdp->config[6] &= ~CB_CFIG_TCO_STAT; - bdp->config[6] &= ~CB_CFIG_EXT_STAT_DIS; - bdp->stat_mode = E100_EXTENDED_STATS; - } - - e100_config_long_rx(bdp, true); -} - -static void -e100_config_init_82550(struct e100_private *bdp) -{ - /* The D102 chip allows for 32 config bytes. This value is - * supposed to be in Byte 0. Just add the extra bytes to - * what was already setup in the block. */ - bdp->config[0] += CB_CFIG_D102_BYTE_COUNT; - - /* now we need to enable the extended RFD. When this is - * enabled, the immediated receive data buffer starts at offset - * 32 from the RFD base address, instead of at offset 16. */ - bdp->config[7] |= CB_CFIG_EXTENDED_RFD; - - /* put the chip into D102 receive mode. This is necessary - * for any parsing and offloading features. */ - bdp->config[22] = CB_CFIG_RECEIVE_GAMLA_MODE; - - /* set the flag if checksum offloading was enabled */ - if (bdp->params.b_params & PRM_XSUMRX) { - bdp->flags |= DF_CSUM_OFFLOAD; - } -} - -/* Initialize the adapter's configure block */ -void -e100_config_init(struct e100_private *bdp) -{ - e100_config_init_82557(bdp); - - if (bdp->flags & IS_BACHELOR) - e100_config_init_82558(bdp); - - if (bdp->rev_id >= D102_REV_ID) - e100_config_init_82550(bdp); -} - -/** - * e100_force_config - force a configure command - * @bdp: atapter's private data struct - * - * This routine will force a configure command to the adapter. - * The command will be executed in polled mode as interrupts - * are _disabled_ at this time. - * - * Returns: - * true: if the configure command was successfully issued and completed - * false: otherwise - */ -unsigned char -e100_force_config(struct e100_private *bdp) -{ - spin_lock_bh(&(bdp->config_lock)); - - bdp->config[0] = CB_CFIG_BYTE_COUNT; - if (bdp->rev_id >= D102_REV_ID) { - /* The D102 chip allows for 32 config bytes. This value is - supposed to be in Byte 0. Just add the extra bytes to - what was already setup in the block. */ - bdp->config[0] += CB_CFIG_D102_BYTE_COUNT; - } - - spin_unlock_bh(&(bdp->config_lock)); - - // although we call config outside the lock, there is no - // race condition because config byte count has maximum value - return e100_config(bdp); -} - -/** - * e100_config - issue a configure command - * @bdp: atapter's private data struct - * - * This routine will issue a configure command to the 82557. - * This command will be executed in polled mode as interrupts - * are _disabled_ at this time. - * - * Returns: - * true: if the configure command was successfully issued and completed - * false: otherwise - */ -unsigned char -e100_config(struct e100_private *bdp) -{ - cb_header_t *pntcb_hdr; - unsigned char res = true; - nxmit_cb_entry_t *cmd; - - if (bdp->config[0] == 0) { - goto exit; - } - - if ((cmd = e100_alloc_non_tx_cmd(bdp)) == NULL) { - res = false; - goto exit; - } - - pntcb_hdr = (cb_header_t *) cmd->non_tx_cmd; - pntcb_hdr->cb_cmd = __constant_cpu_to_le16(CB_CONFIGURE); - - spin_lock_bh(&bdp->config_lock); - - if (bdp->config[0] < CB_CFIG_MIN_PARAMS) { - bdp->config[0] = CB_CFIG_MIN_PARAMS; - } - - /* Copy the device's config block to the device's memory */ - memcpy(cmd->non_tx_cmd->ntcb.config.cfg_byte, bdp->config, - bdp->config[0]); - /* reset number of bytes to config next time */ - bdp->config[0] = 0; - - spin_unlock_bh(&bdp->config_lock); - - res = e100_exec_non_cu_cmd(bdp, cmd); - -exit: - if (netif_running(bdp->device)) - netif_wake_queue(bdp->device); - return res; -} - -/** - * e100_config_fc - config flow-control state - * @bdp: adapter's private data struct - * - * This routine will enable or disable flow control support in the adapter's - * config block. Flow control will be enable only if requested using the command - * line option, and if the link is flow-contorl capable (both us and the link - * partner). But, if link partner is capable of autoneg, but not capable of - * flow control, received PAUSE frames are still honored. - */ -void -e100_config_fc(struct e100_private *bdp) -{ - unsigned char enable = false; - /* 82557 doesn't support fc. Don't touch this option */ - if (!(bdp->flags & IS_BACHELOR)) - return; - - /* Enable fc if requested and if the link supports it */ - if ((bdp->params.b_params & PRM_FC) && (bdp->flags & - (DF_LINK_FC_CAP | DF_LINK_FC_TX_ONLY))) { - enable = true; - } - - spin_lock_bh(&(bdp->config_lock)); - - if (enable) { - if (bdp->flags & DF_LINK_FC_TX_ONLY) { - /* If link partner is capable of autoneg, but */ - /* not capable of flow control, Received PAUSE */ - /* frames are still honored, i.e., */ - /* transmitted frames would be paused by */ - /* incoming PAUSE frames */ - bdp->config[16] = DFLT_NO_FC_DELAY_LSB; - bdp->config[17] = DFLT_NO_FC_DELAY_MSB; - bdp->config[19] &= ~(CB_CFIG_FC_RESTOP | CB_CFIG_FC_RESTART); - bdp->config[19] |= CB_CFIG_FC_REJECT; - bdp->config[19] &= ~CB_CFIG_TX_FC_DIS; - } else { - bdp->config[16] = DFLT_FC_DELAY_LSB; - bdp->config[17] = DFLT_FC_DELAY_MSB; - bdp->config[19] |= CB_CFIG_FC_OPTS; - bdp->config[19] &= ~CB_CFIG_TX_FC_DIS; - } - } else { - bdp->config[16] = DFLT_NO_FC_DELAY_LSB; - bdp->config[17] = DFLT_NO_FC_DELAY_MSB; - bdp->config[19] &= ~CB_CFIG_FC_OPTS; - bdp->config[19] |= CB_CFIG_TX_FC_DIS; - } - E100_CONFIG(bdp, 19); - spin_unlock_bh(&(bdp->config_lock)); - - return; -} - -/** - * e100_config_promisc - configure promiscuous mode - * @bdp: atapter's private data struct - * @enable: should we enable this option or not - * - * This routine will enable or disable promiscuous mode - * in the adapter's config block. - */ -void -e100_config_promisc(struct e100_private *bdp, unsigned char enable) -{ - spin_lock_bh(&(bdp->config_lock)); - - /* if in promiscuous mode, save bad frames */ - if (enable) { - - if (!(bdp->config[6] & CB_CFIG_SAVE_BAD_FRAMES)) { - bdp->config[6] |= CB_CFIG_SAVE_BAD_FRAMES; - E100_CONFIG(bdp, 6); - } - - if (bdp->config[7] & (u8) BIT_0) { - bdp->config[7] &= (u8) (~BIT_0); - E100_CONFIG(bdp, 7); - } - - if (!(bdp->config[15] & CB_CFIG_PROMISCUOUS)) { - bdp->config[15] |= CB_CFIG_PROMISCUOUS; - E100_CONFIG(bdp, 15); - } - - } else { /* not in promiscuous mode */ - - if (bdp->config[6] & CB_CFIG_SAVE_BAD_FRAMES) { - bdp->config[6] &= ~CB_CFIG_SAVE_BAD_FRAMES; - E100_CONFIG(bdp, 6); - } - - if (!(bdp->config[7] & (u8) BIT_0)) { - bdp->config[7] |= (u8) (BIT_0); - E100_CONFIG(bdp, 7); - } - - if (bdp->config[15] & CB_CFIG_PROMISCUOUS) { - bdp->config[15] &= ~CB_CFIG_PROMISCUOUS; - E100_CONFIG(bdp, 15); - } - } - - spin_unlock_bh(&(bdp->config_lock)); -} - -/** - * e100_config_mulcast_enbl - configure allmulti mode - * @bdp: atapter's private data struct - * @enable: should we enable this option or not - * - * This routine will enable or disable reception of all multicast packets - * in the adapter's config block. - */ -void -e100_config_mulcast_enbl(struct e100_private *bdp, unsigned char enable) -{ - spin_lock_bh(&(bdp->config_lock)); - - /* this flag is used to enable receiving all multicast packet */ - if (enable) { - if (!(bdp->config[21] & CB_CFIG_MULTICAST_ALL)) { - bdp->config[21] |= CB_CFIG_MULTICAST_ALL; - E100_CONFIG(bdp, 21); - } - - } else { - if (bdp->config[21] & CB_CFIG_MULTICAST_ALL) { - bdp->config[21] &= ~CB_CFIG_MULTICAST_ALL; - E100_CONFIG(bdp, 21); - } - } - - spin_unlock_bh(&(bdp->config_lock)); -} - -/** - * e100_config_ifs - configure the IFS parameter - * @bdp: atapter's private data struct - * - * This routine will configure the adaptive IFS value - * in the adapter's config block. IFS values are only - * relevant in half duplex, so set to 0 in full duplex. - */ -void -e100_config_ifs(struct e100_private *bdp) -{ - u8 value = 0; - - spin_lock_bh(&(bdp->config_lock)); - - /* IFS value is only needed to be specified at half-duplex mode */ - if (bdp->cur_dplx_mode == HALF_DUPLEX) { - value = (u8) bdp->ifs_value; - } - - if (bdp->config[2] != value) { - bdp->config[2] = value; - E100_CONFIG(bdp, 2); - } - - spin_unlock_bh(&(bdp->config_lock)); -} - -/** - * e100_config_force_dplx - configure the forced full duplex mode - * @bdp: atapter's private data struct - * - * This routine will enable or disable force full duplex - * in the adapter's config block. If the PHY is 503, and - * the duplex is full, consider the adapter forced. - */ -void -e100_config_force_dplx(struct e100_private *bdp) -{ - spin_lock_bh(&(bdp->config_lock)); - - /* We must force full duplex on if we are using PHY 0, and we are */ - /* supposed to run in FDX mode. We do this because the e100 has only */ - /* one FDX# input pin, and that pin will be connected to PHY 1. */ - /* Changed the 'if' condition below to fix performance problem * at 10 - * full. The Phy was getting forced to full duplex while the MAC * was - * not, because the cur_dplx_mode was not being set to 2 by SetupPhy. * - * This is how the condition was, initially. * This has been changed so - * that the MAC gets forced to full duplex * simply if the user has - * forced full duplex. * * if (( bdp->phy_addr == 0 ) && ( - * bdp->cur_dplx_mode == 2 )) */ - /* The rest of the fix is in the PhyDetect code. */ - if ((bdp->params.e100_speed_duplex == E100_SPEED_10_FULL) || - (bdp->params.e100_speed_duplex == E100_SPEED_100_FULL) || - ((bdp->phy_addr == 32) && (bdp->cur_dplx_mode == FULL_DUPLEX))) { - if (!(bdp->config[19] & (u8) CB_CFIG_FORCE_FDX)) { - bdp->config[19] |= (u8) CB_CFIG_FORCE_FDX; - E100_CONFIG(bdp, 19); - } - - } else { - if (bdp->config[19] & (u8) CB_CFIG_FORCE_FDX) { - bdp->config[19] &= (u8) (~CB_CFIG_FORCE_FDX); - E100_CONFIG(bdp, 19); - } - } - - spin_unlock_bh(&(bdp->config_lock)); -} - -/** - * e100_config_long_rx - * @bdp: atapter's private data struct - * @enable: should we enable this option or not - * - * This routine will enable or disable reception of larger packets. - * This is needed by VLAN implementations. - */ -static void -e100_config_long_rx(struct e100_private *bdp, unsigned char enable) -{ - if (enable) { - if (!(bdp->config[18] & CB_CFIG_LONG_RX_OK)) { - bdp->config[18] |= CB_CFIG_LONG_RX_OK; - E100_CONFIG(bdp, 18); - } - - } else { - if ((bdp->config[18] & CB_CFIG_LONG_RX_OK)) { - bdp->config[18] &= ~CB_CFIG_LONG_RX_OK; - E100_CONFIG(bdp, 18); - } - } -} - -/** - * e100_config_wol - * @bdp: atapter's private data struct - * - * This sets configuration options for PHY and Magic Packet WoL - */ -void -e100_config_wol(struct e100_private *bdp) -{ - spin_lock_bh(&(bdp->config_lock)); - - if (bdp->wolopts & WAKE_PHY) { - bdp->config[9] |= CB_LINK_STATUS_WOL; - } - else { - /* Disable PHY WoL */ - bdp->config[9] &= ~CB_LINK_STATUS_WOL; - } - - if (bdp->wolopts & WAKE_MAGIC) { - bdp->config[19] &= ~CB_DISABLE_MAGPAK_WAKE; - } - else { - /* Disable Magic Packet WoL */ - bdp->config[19] |= CB_DISABLE_MAGPAK_WAKE; - } - - E100_CONFIG(bdp, 19); - spin_unlock_bh(&(bdp->config_lock)); -} - -void -e100_config_vlan_drop(struct e100_private *bdp, unsigned char enable) -{ - spin_lock_bh(&(bdp->config_lock)); - if (enable) { - if (!(bdp->config[22] & CB_CFIG_VLAN_DROP_ENABLE)) { - bdp->config[22] |= CB_CFIG_VLAN_DROP_ENABLE; - E100_CONFIG(bdp, 22); - } - - } else { - if ((bdp->config[22] & CB_CFIG_VLAN_DROP_ENABLE)) { - bdp->config[22] &= ~CB_CFIG_VLAN_DROP_ENABLE; - E100_CONFIG(bdp, 22); - } - } - spin_unlock_bh(&(bdp->config_lock)); -} - -/** - * e100_config_loopback_mode - * @bdp: atapter's private data struct - * @mode: loopback mode(phy/mac/none) - * - */ -unsigned char -e100_config_loopback_mode(struct e100_private *bdp, u8 mode) -{ - unsigned char bc_changed = false; - u8 config_byte; - - spin_lock_bh(&(bdp->config_lock)); - - switch (mode) { - case NO_LOOPBACK: - config_byte = CB_CFIG_LOOPBACK_NORMAL; - break; - case MAC_LOOPBACK: - config_byte = CB_CFIG_LOOPBACK_INTERNAL; - break; - case PHY_LOOPBACK: - config_byte = CB_CFIG_LOOPBACK_EXTERNAL; - break; - default: - printk(KERN_NOTICE "e100: e100_config_loopback_mode: " - "Invalid argument 'mode': %d\n", mode); - goto exit; - } - - if ((bdp->config[10] & CB_CFIG_LOOPBACK_MODE) != config_byte) { - - bdp->config[10] &= (~CB_CFIG_LOOPBACK_MODE); - bdp->config[10] |= config_byte; - E100_CONFIG(bdp, 10); - bc_changed = true; - } - -exit: - spin_unlock_bh(&(bdp->config_lock)); - return bc_changed; -} -unsigned char -e100_config_tcb_ext_enable(struct e100_private *bdp, unsigned char enable) -{ - unsigned char bc_changed = false; - - spin_lock_bh(&(bdp->config_lock)); - - if (enable) { - if (bdp->config[6] & CB_CFIG_EXT_TCB_DIS) { - - bdp->config[6] &= (~CB_CFIG_EXT_TCB_DIS); - E100_CONFIG(bdp, 6); - bc_changed = true; - } - - } else { - if (!(bdp->config[6] & CB_CFIG_EXT_TCB_DIS)) { - - bdp->config[6] |= CB_CFIG_EXT_TCB_DIS; - E100_CONFIG(bdp, 6); - bc_changed = true; - } - } - spin_unlock_bh(&(bdp->config_lock)); - - return bc_changed; -} -unsigned char -e100_config_dynamic_tbd(struct e100_private *bdp, unsigned char enable) -{ - unsigned char bc_changed = false; - - spin_lock_bh(&(bdp->config_lock)); - - if (enable) { - if (!(bdp->config[7] & CB_CFIG_DYNTBD_EN)) { - - bdp->config[7] |= CB_CFIG_DYNTBD_EN; - E100_CONFIG(bdp, 7); - bc_changed = true; - } - - } else { - if (bdp->config[7] & CB_CFIG_DYNTBD_EN) { - - bdp->config[7] &= (~CB_CFIG_DYNTBD_EN); - E100_CONFIG(bdp, 7); - bc_changed = true; - } - } - spin_unlock_bh(&(bdp->config_lock)); - - return bc_changed; -} - diff -Nru a/drivers/net/e100/e100_config.h b/drivers/net/e100/e100_config.h --- a/drivers/net/e100/e100_config.h Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,168 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -#ifndef _E100_CONFIG_INC_ -#define _E100_CONFIG_INC_ - -#include "e100.h" - -#define E100_CONFIG(bdp, X) ((bdp)->config[0] = max_t(u8, (bdp)->config[0], (X)+1)) - -#define CB_CFIG_MIN_PARAMS 8 - -/* byte 0 bit definitions*/ -#define CB_CFIG_BYTE_COUNT_MASK BIT_0_5 /* Byte count occupies bit 5-0 */ - -/* byte 1 bit definitions*/ -#define CB_CFIG_RXFIFO_LIMIT_MASK BIT_0_4 /* RxFifo limit mask */ -#define CB_CFIG_TXFIFO_LIMIT_MASK BIT_4_7 /* TxFifo limit mask */ - -/* byte 2 bit definitions -- ADAPTIVE_IFS*/ - -/* word 3 bit definitions -- RESERVED*/ -/* Changed for 82558 enhancements */ -/* byte 3 bit definitions */ -#define CB_CFIG_MWI_EN BIT_0 /* Enable MWI on PCI bus */ -#define CB_CFIG_TYPE_EN BIT_1 /* Type Enable */ -#define CB_CFIG_READAL_EN BIT_2 /* Enable Read Align */ -#define CB_CFIG_TERMCL_EN BIT_3 /* Cache line write */ - -/* byte 4 bit definitions*/ -#define CB_CFIG_RX_MIN_DMA_MASK BIT_0_6 /* Rx minimum DMA count mask */ - -/* byte 5 bit definitions*/ -#define CB_CFIG_TX_MIN_DMA_MASK BIT_0_6 /* Tx minimum DMA count mask */ -#define CB_CFIG_DMBC_EN BIT_7 /* Enable Tx/Rx min. DMA counts */ - -/* Changed for 82558 enhancements */ -/* byte 6 bit definitions*/ -#define CB_CFIG_LATE_SCB BIT_0 /* Update SCB After New Tx Start */ -#define CB_CFIG_DIRECT_DMA_DIS BIT_1 /* Direct DMA mode */ -#define CB_CFIG_TNO_INT BIT_2 /* Tx Not OK Interrupt */ -#define CB_CFIG_TCO_STAT BIT_2 /* TCO statistics in 559 and above */ -#define CB_CFIG_CI_INT BIT_3 /* Command Complete Interrupt */ -#define CB_CFIG_EXT_TCB_DIS BIT_4 /* Extended TCB */ -#define CB_CFIG_EXT_STAT_DIS BIT_5 /* Extended Stats */ -#define CB_CFIG_SAVE_BAD_FRAMES BIT_7 /* Save Bad Frames Enabled */ - -/* byte 7 bit definitions*/ -#define CB_CFIG_DISC_SHORT_FRAMES BIT_0 /* Discard Short Frames */ -#define CB_CFIG_DYNTBD_EN BIT_7 /* Enable dynamic TBD */ -/* Enable extended RFD's on D102 */ -#define CB_CFIG_EXTENDED_RFD BIT_5 - -/* byte 8 bit definitions*/ -#define CB_CFIG_503_MII BIT_0 /* 503 vs. MII mode */ - -/* byte 9 bit definitions -- pre-defined all zeros*/ -#define CB_LINK_STATUS_WOL BIT_5 - -/* byte 10 bit definitions*/ -#define CB_CFIG_NO_SRCADR BIT_3 /* No Source Address Insertion */ -#define CB_CFIG_PREAMBLE_LEN BIT_4_5 /* Preamble Length */ -#define CB_CFIG_LOOPBACK_MODE BIT_6_7 /* Loopback Mode */ -#define CB_CFIG_LOOPBACK_NORMAL 0 -#define CB_CFIG_LOOPBACK_INTERNAL BIT_6 -#define CB_CFIG_LOOPBACK_EXTERNAL BIT_6_7 - -/* byte 11 bit definitions*/ -#define CB_CFIG_LINEAR_PRIORITY BIT_0_2 /* Linear Priority */ - -/* byte 12 bit definitions*/ -#define CB_CFIG_LINEAR_PRI_MODE BIT_0 /* Linear Priority mode */ -#define CB_CFIG_IFS_MASK BIT_4_7 /* Interframe Spacing mask */ - -/* byte 13 bit definitions -- pre-defined all zeros*/ - -/* byte 14 bit definitions -- pre-defined 0xf2*/ - -/* byte 15 bit definitions*/ -#define CB_CFIG_PROMISCUOUS BIT_0 /* Promiscuous Mode Enable */ -#define CB_CFIG_BROADCAST_DIS BIT_1 /* Broadcast Mode Disable */ -#define CB_CFIG_CRS_OR_CDT BIT_7 /* CRS Or CDT */ - -/* byte 16 bit definitions -- pre-defined all zeros*/ -#define DFLT_FC_DELAY_LSB 0x1f /* Delay for outgoing Pause frames */ -#define DFLT_NO_FC_DELAY_LSB 0x00 /* no flow control default value */ - -/* byte 17 bit definitions -- pre-defined 0x40*/ -#define DFLT_FC_DELAY_MSB 0x01 /* Delay for outgoing Pause frames */ -#define DFLT_NO_FC_DELAY_MSB 0x40 /* no flow control default value */ - -/* byte 18 bit definitions*/ -#define CB_CFIG_STRIPPING BIT_0 /* Padding Disabled */ -#define CB_CFIG_PADDING BIT_1 /* Padding Disabled */ -#define CB_CFIG_CRC_IN_MEM BIT_2 /* Transfer CRC To Memory */ - -/* byte 19 bit definitions*/ -#define CB_CFIG_TX_ADDR_WAKE BIT_0 /* Address Wakeup */ -#define CB_DISABLE_MAGPAK_WAKE BIT_1 /* Magic Packet Wakeup disable */ -/* Changed TX_FC_EN to TX_FC_DIS because 0 enables, 1 disables. Jul 8, 1999 */ -#define CB_CFIG_TX_FC_DIS BIT_2 /* Tx Flow Control Disable */ -#define CB_CFIG_FC_RESTOP BIT_3 /* Rx Flow Control Restop */ -#define CB_CFIG_FC_RESTART BIT_4 /* Rx Flow Control Restart */ -#define CB_CFIG_FC_REJECT BIT_5 /* Rx Flow Control Restart */ -#define CB_CFIG_FC_OPTS (CB_CFIG_FC_RESTOP | CB_CFIG_FC_RESTART | CB_CFIG_FC_REJECT) - -/* end 82558/9 specifics */ - -#define CB_CFIG_FORCE_FDX BIT_6 /* Force Full Duplex */ -#define CB_CFIG_FDX_ENABLE BIT_7 /* Full Duplex Enabled */ - -/* byte 20 bit definitions*/ -#define CB_CFIG_MULTI_IA BIT_6 /* Multiple IA Addr */ - -/* byte 21 bit definitions*/ -#define CB_CFIG_MULTICAST_ALL BIT_3 /* Multicast All */ - -/* byte 22 bit defines */ -#define CB_CFIG_RECEIVE_GAMLA_MODE BIT_0 /* D102 receive mode */ -#define CB_CFIG_VLAN_DROP_ENABLE BIT_1 /* vlan stripping */ - -#define CB_CFIG_LONG_RX_OK BIT_3 - -#define NO_LOOPBACK 0 -#define MAC_LOOPBACK 0x01 -#define PHY_LOOPBACK 0x02 - -/* function prototypes */ -extern void e100_config_init(struct e100_private *bdp); -extern void e100_config_init_82557(struct e100_private *bdp); -extern unsigned char e100_force_config(struct e100_private *bdp); -extern unsigned char e100_config(struct e100_private *bdp); -extern void e100_config_fc(struct e100_private *bdp); -extern void e100_config_promisc(struct e100_private *bdp, unsigned char enable); -extern void e100_config_brdcast_dsbl(struct e100_private *bdp); -extern void e100_config_mulcast_enbl(struct e100_private *bdp, - unsigned char enable); -extern void e100_config_ifs(struct e100_private *bdp); -extern void e100_config_force_dplx(struct e100_private *bdp); -extern u8 e100_config_loopback_mode(struct e100_private *bdp, u8 mode); -extern u8 e100_config_dynamic_tbd(struct e100_private *bdp, u8 enable); -extern u8 e100_config_tcb_ext_enable(struct e100_private *bdp, u8 enable); -extern void e100_config_vlan_drop(struct e100_private *bdp, unsigned char enable); -#endif /* _E100_CONFIG_INC_ */ diff -Nru a/drivers/net/e100/e100_eeprom.c b/drivers/net/e100/e100_eeprom.c --- a/drivers/net/e100/e100_eeprom.c Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,565 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -/********************************************************************** -* * -* INTEL CORPORATION * -* * -* This software is supplied under the terms of the license included * -* above. All use of this driver must be in accordance with the terms * -* of that license. * -* * -* Module Name: e100_eeprom.c * -* * -* Abstract: This module contains routines to read and write to a * -* serial EEPROM * -* * -* Environment: This file is intended to be specific to the Linux * -* operating system. * -* * -**********************************************************************/ -#include "e100.h" - -#define CSR_EEPROM_CONTROL_FIELD(bdp) ((bdp)->scb->scb_eprm_cntrl) - -#define CSR_GENERAL_CONTROL2_FIELD(bdp) \ - ((bdp)->scb->scb_ext.d102_scb.scb_gen_ctrl2) - -#define EEPROM_STALL_TIME 4 -#define EEPROM_CHECKSUM ((u16) 0xBABA) -#define EEPROM_MAX_WORD_SIZE 256 - -void e100_eeprom_cleanup(struct e100_private *adapter); -u16 e100_eeprom_calculate_chksum(struct e100_private *adapter); -static void e100_eeprom_write_word(struct e100_private *adapter, u16 reg, - u16 data); -void e100_eeprom_write_block(struct e100_private *adapter, u16 start, u16 *data, - u16 size); -u16 e100_eeprom_size(struct e100_private *adapter); -u16 e100_eeprom_read(struct e100_private *adapter, u16 reg); - -static void shift_out_bits(struct e100_private *adapter, u16 data, u16 count); -static u16 shift_in_bits(struct e100_private *adapter); -static void raise_clock(struct e100_private *adapter, u16 *x); -static void lower_clock(struct e100_private *adapter, u16 *x); -static u16 eeprom_wait_cmd_done(struct e100_private *adapter); -static void eeprom_stand_by(struct e100_private *adapter); - -//---------------------------------------------------------------------------------------- -// Procedure: eeprom_set_semaphore -// -// Description: This function set (write 1) Gamla EEPROM semaphore bit (bit 23 word 0x1C in the CSR). -// -// Arguments: -// Adapter - Adapter context -// -// Returns: true if success -// else return false -// -//---------------------------------------------------------------------------------------- - -inline u8 -eeprom_set_semaphore(struct e100_private *adapter) -{ - u16 data = 0; - unsigned long expiration_time = jiffies + HZ / 100 + 1; - - do { - // Get current value of General Control 2 - data = readb(&CSR_GENERAL_CONTROL2_FIELD(adapter)); - - // Set bit 23 word 0x1C in the CSR. - data |= SCB_GCR2_EEPROM_ACCESS_SEMAPHORE; - writeb(data, &CSR_GENERAL_CONTROL2_FIELD(adapter)); - - // Check to see if this bit set or not. - data = readb(&CSR_GENERAL_CONTROL2_FIELD(adapter)); - - if (data & SCB_GCR2_EEPROM_ACCESS_SEMAPHORE) { - return true; - } - - if (time_before(jiffies, expiration_time)) - yield(); - else - return false; - - } while (true); -} - -//---------------------------------------------------------------------------------------- -// Procedure: eeprom_reset_semaphore -// -// Description: This function reset (write 0) Gamla EEPROM semaphore bit -// (bit 23 word 0x1C in the CSR). -// -// Arguments: struct e100_private * adapter - Adapter context -//---------------------------------------------------------------------------------------- - -inline void -eeprom_reset_semaphore(struct e100_private *adapter) -{ - u16 data = 0; - - data = readb(&CSR_GENERAL_CONTROL2_FIELD(adapter)); - data &= ~(SCB_GCR2_EEPROM_ACCESS_SEMAPHORE); - writeb(data, &CSR_GENERAL_CONTROL2_FIELD(adapter)); -} - -//---------------------------------------------------------------------------------------- -// Procedure: e100_eeprom_size -// -// Description: This routine determines the size of the EEPROM. This value should be -// checked for validity - ie. is it too big or too small. The size returned -// is then passed to the read/write functions. -// -// Returns: -// Size of the eeprom, or zero if an error occurred -//---------------------------------------------------------------------------------------- -u16 -e100_eeprom_size(struct e100_private *adapter) -{ - u16 x, size = 1; // must be one to accumulate a product - - // if we've already stored this data, read from memory - if (adapter->eeprom_size) { - return adapter->eeprom_size; - } - // otherwise, read from the eeprom - // Set EEPROM semaphore. - if (adapter->rev_id >= D102_REV_ID) { - if (!eeprom_set_semaphore(adapter)) - return 0; - } - // enable the eeprom by setting EECS. - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - x &= ~(EEDI | EEDO | EESK); - x |= EECS; - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - - // write the read opcode - shift_out_bits(adapter, EEPROM_READ_OPCODE, 3); - - // experiment to discover the size of the eeprom. request register zero - // and wait for the eeprom to tell us it has accepted the entire address. - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - do { - size *= 2; // each bit of address doubles eeprom size - x |= EEDO; // set bit to detect "dummy zero" - x &= ~EEDI; // address consists of all zeros - - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - readw(&(adapter->scb->scb_status)); - udelay(EEPROM_STALL_TIME); - raise_clock(adapter, &x); - lower_clock(adapter, &x); - - // check for "dummy zero" - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - if (size > EEPROM_MAX_WORD_SIZE) { - size = 0; - break; - } - } while (x & EEDO); - - // read in the value requested - (void) shift_in_bits(adapter); - e100_eeprom_cleanup(adapter); - - // Clear EEPROM Semaphore. - if (adapter->rev_id >= D102_REV_ID) { - eeprom_reset_semaphore(adapter); - } - - return size; -} - -//---------------------------------------------------------------------------------------- -// Procedure: eeprom_address_size -// -// Description: determines the number of bits in an address for the eeprom acceptable -// values are 64, 128, and 256 -// Arguments: size of the eeprom -// Returns: bits in an address for that size eeprom -//---------------------------------------------------------------------------------------- - -static inline int -eeprom_address_size(u16 size) -{ - int isize = size; - - return (ffs(isize) - 1); -} - -//---------------------------------------------------------------------------------------- -// Procedure: e100_eeprom_read -// -// Description: This routine serially reads one word out of the EEPROM. -// -// Arguments: -// adapter - our adapter context -// reg - EEPROM word to read. -// -// Returns: -// Contents of EEPROM word (reg). -//---------------------------------------------------------------------------------------- - -u16 -e100_eeprom_read(struct e100_private *adapter, u16 reg) -{ - u16 x, data, bits; - - // Set EEPROM semaphore. - if (adapter->rev_id >= D102_REV_ID) { - if (!eeprom_set_semaphore(adapter)) - return 0; - } - // eeprom size is initialized to zero - if (!adapter->eeprom_size) - adapter->eeprom_size = e100_eeprom_size(adapter); - - bits = eeprom_address_size(adapter->eeprom_size); - - // select EEPROM, reset bits, set EECS - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - - x &= ~(EEDI | EEDO | EESK); - x |= EECS; - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - - // write the read opcode and register number in that order - // The opcode is 3bits in length, reg is 'bits' bits long - shift_out_bits(adapter, EEPROM_READ_OPCODE, 3); - shift_out_bits(adapter, reg, bits); - - // Now read the data (16 bits) in from the selected EEPROM word - data = shift_in_bits(adapter); - - e100_eeprom_cleanup(adapter); - - // Clear EEPROM Semaphore. - if (adapter->rev_id >= D102_REV_ID) { - eeprom_reset_semaphore(adapter); - } - - return data; -} - -//---------------------------------------------------------------------------------------- -// Procedure: shift_out_bits -// -// Description: This routine shifts data bits out to the EEPROM. -// -// Arguments: -// data - data to send to the EEPROM. -// count - number of data bits to shift out. -// -// Returns: (none) -//---------------------------------------------------------------------------------------- - -static void -shift_out_bits(struct e100_private *adapter, u16 data, u16 count) -{ - u16 x, mask; - - mask = 1 << (count - 1); - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - x &= ~(EEDO | EEDI); - - do { - x &= ~EEDI; - if (data & mask) - x |= EEDI; - - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - readw(&(adapter->scb->scb_status)); /* flush command to card */ - udelay(EEPROM_STALL_TIME); - raise_clock(adapter, &x); - lower_clock(adapter, &x); - mask = mask >> 1; - } while (mask); - - x &= ~EEDI; - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); -} - -//---------------------------------------------------------------------------------------- -// Procedure: raise_clock -// -// Description: This routine raises the EEPROM's clock input (EESK) -// -// Arguments: -// x - Ptr to the EEPROM control register's current value -// -// Returns: (none) -//---------------------------------------------------------------------------------------- - -void -raise_clock(struct e100_private *adapter, u16 *x) -{ - *x = *x | EESK; - writew(*x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - readw(&(adapter->scb->scb_status)); /* flush command to card */ - udelay(EEPROM_STALL_TIME); -} - -//---------------------------------------------------------------------------------------- -// Procedure: lower_clock -// -// Description: This routine lower's the EEPROM's clock input (EESK) -// -// Arguments: -// x - Ptr to the EEPROM control register's current value -// -// Returns: (none) -//---------------------------------------------------------------------------------------- - -void -lower_clock(struct e100_private *adapter, u16 *x) -{ - *x = *x & ~EESK; - writew(*x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - readw(&(adapter->scb->scb_status)); /* flush command to card */ - udelay(EEPROM_STALL_TIME); -} - -//---------------------------------------------------------------------------------------- -// Procedure: shift_in_bits -// -// Description: This routine shifts data bits in from the EEPROM. -// -// Arguments: -// -// Returns: -// The contents of that particular EEPROM word -//---------------------------------------------------------------------------------------- - -static u16 -shift_in_bits(struct e100_private *adapter) -{ - u16 x, d, i; - - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - x &= ~(EEDO | EEDI); - d = 0; - - for (i = 0; i < 16; i++) { - d <<= 1; - raise_clock(adapter, &x); - - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - - x &= ~EEDI; - if (x & EEDO) - d |= 1; - - lower_clock(adapter, &x); - } - - return d; -} - -//---------------------------------------------------------------------------------------- -// Procedure: e100_eeprom_cleanup -// -// Description: This routine returns the EEPROM to an idle state -//---------------------------------------------------------------------------------------- - -void -e100_eeprom_cleanup(struct e100_private *adapter) -{ - u16 x; - - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - - x &= ~(EECS | EEDI); - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - - raise_clock(adapter, &x); - lower_clock(adapter, &x); -} - -//********************************************************************************** -// Procedure: e100_eeprom_update_chksum -// -// Description: Calculates the checksum and writes it to the EEProm. -// It calculates the checksum accroding to the formula: -// Checksum = 0xBABA - (sum of first 63 words). -// -//----------------------------------------------------------------------------------- -u16 -e100_eeprom_calculate_chksum(struct e100_private *adapter) -{ - u16 idx, xsum_index, checksum = 0; - - // eeprom size is initialized to zero - if (!adapter->eeprom_size) - adapter->eeprom_size = e100_eeprom_size(adapter); - - xsum_index = adapter->eeprom_size - 1; - for (idx = 0; idx < xsum_index; idx++) - checksum += e100_eeprom_read(adapter, idx); - - checksum = EEPROM_CHECKSUM - checksum; - return checksum; -} - -//---------------------------------------------------------------------------------------- -// Procedure: e100_eeprom_write_word -// -// Description: This routine writes a word to a specific EEPROM location without. -// taking EEPROM semaphore and updating checksum. -// Use e100_eeprom_write_block for the EEPROM update -// Arguments: reg - The EEPROM word that we are going to write to. -// data - The data (word) that we are going to write to the EEPROM. -//---------------------------------------------------------------------------------------- -static void -e100_eeprom_write_word(struct e100_private *adapter, u16 reg, u16 data) -{ - u16 x; - u16 bits; - - bits = eeprom_address_size(adapter->eeprom_size); - - /* select EEPROM, mask off ASIC and reset bits, set EECS */ - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - x &= ~(EEDI | EEDO | EESK); - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - readw(&(adapter->scb->scb_status)); /* flush command to card */ - udelay(EEPROM_STALL_TIME); - x |= EECS; - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - - shift_out_bits(adapter, EEPROM_EWEN_OPCODE, 5); - shift_out_bits(adapter, reg, (u16) (bits - 2)); - if (!eeprom_wait_cmd_done(adapter)) - return; - - /* write the new word to the EEPROM & send the write opcode the EEPORM */ - shift_out_bits(adapter, EEPROM_WRITE_OPCODE, 3); - - /* select which word in the EEPROM that we are writing to */ - shift_out_bits(adapter, reg, bits); - - /* write the data to the selected EEPROM word */ - shift_out_bits(adapter, data, 16); - if (!eeprom_wait_cmd_done(adapter)) - return; - - shift_out_bits(adapter, EEPROM_EWDS_OPCODE, 5); - shift_out_bits(adapter, reg, (u16) (bits - 2)); - if (!eeprom_wait_cmd_done(adapter)) - return; - - e100_eeprom_cleanup(adapter); -} - -//---------------------------------------------------------------------------------------- -// Procedure: e100_eeprom_write_block -// -// Description: This routine writes a block of words starting from specified EEPROM -// location and updates checksum -// Arguments: reg - The EEPROM word that we are going to write to. -// data - The data (word) that we are going to write to the EEPROM. -//---------------------------------------------------------------------------------------- -void -e100_eeprom_write_block(struct e100_private *adapter, u16 start, u16 *data, - u16 size) -{ - u16 checksum; - u16 i; - - if (!adapter->eeprom_size) - adapter->eeprom_size = e100_eeprom_size(adapter); - - // Set EEPROM semaphore. - if (adapter->rev_id >= D102_REV_ID) { - if (!eeprom_set_semaphore(adapter)) - return; - } - - for (i = 0; i < size; i++) { - e100_eeprom_write_word(adapter, start + i, data[i]); - } - //Update checksum - checksum = e100_eeprom_calculate_chksum(adapter); - e100_eeprom_write_word(adapter, (adapter->eeprom_size - 1), checksum); - - // Clear EEPROM Semaphore. - if (adapter->rev_id >= D102_REV_ID) { - eeprom_reset_semaphore(adapter); - } -} - -//---------------------------------------------------------------------------------------- -// Procedure: eeprom_wait_cmd_done -// -// Description: This routine waits for the the EEPROM to finish its command. -// Specifically, it waits for EEDO (data out) to go high. -// Returns: true - If the command finished -// false - If the command never finished (EEDO stayed low) -//---------------------------------------------------------------------------------------- -static u16 -eeprom_wait_cmd_done(struct e100_private *adapter) -{ - u16 x; - unsigned long expiration_time = jiffies + HZ / 100 + 1; - - eeprom_stand_by(adapter); - - do { - rmb(); - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - if (x & EEDO) - return true; - if (time_before(jiffies, expiration_time)) - yield(); - else - return false; - } while (true); -} - -//---------------------------------------------------------------------------------------- -// Procedure: eeprom_stand_by -// -// Description: This routine lowers the EEPROM chip select (EECS) for a few microseconds. -//---------------------------------------------------------------------------------------- -static void -eeprom_stand_by(struct e100_private *adapter) -{ - u16 x; - - x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter)); - x &= ~(EECS | EESK); - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - readw(&(adapter->scb->scb_status)); /* flush command to card */ - udelay(EEPROM_STALL_TIME); - x |= EECS; - writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter)); - readw(&(adapter->scb->scb_status)); /* flush command to card */ - udelay(EEPROM_STALL_TIME); -} diff -Nru a/drivers/net/e100/e100_main.c b/drivers/net/e100/e100_main.c --- a/drivers/net/e100/e100_main.c Thu Feb 19 23:44:25 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,4341 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -/********************************************************************** -* * -* INTEL CORPORATION * -* * -* This software is supplied under the terms of the license included * -* above. All use of this driver must be in accordance with the terms * -* of that license. * -* * -* Module Name: e100_main.c * -* * -* Abstract: Functions for the driver entry points like load, * -* unload, open and close. All board specific calls made * -* by the network interface section of the driver. * -* * -* Environment: This file is intended to be specific to the Linux * -* operating system. * -* * -**********************************************************************/ - -/* Change Log - * - * 2.3.36 11/13/03 - * o Moved to 2.6 APIs: pci_name() and free_netdev(). - * o Removed some __devinit from some functions that shouldn't be marked - * as such (Anton Blanchard [anton@samba.org]). - * - * 2.3.33 10/21/03 - * o Bug fix (Bugzilla 97908): Loading e100 was causing crash on Itanium2 - * with HP chipset - * o Bug fix (Bugzilla 101583): e100 can't pass traffic with ipv6 - * o Bug fix (Bugzilla 101360): PRO/10+ can't pass traffic - * - * 2.3.27 08/08/03 - */ - -#include -#include -#include -#include -#include "e100.h" -#include "e100_ucode.h" -#include "e100_config.h" -#include "e100_phy.h" - -extern void e100_force_speed_duplex_to_phy(struct e100_private *bdp); - -static char e100_gstrings_stats[][ETH_GSTRING_LEN] = { - "rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors", - "tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions", - "rx_length_errors", "rx_over_errors", "rx_crc_errors", - "rx_frame_errors", "rx_fifo_errors", "rx_missed_errors", - "tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors", - "tx_heartbeat_errors", "tx_window_errors", -}; -#define E100_STATS_LEN sizeof(e100_gstrings_stats) / ETH_GSTRING_LEN - -static int e100_do_ethtool_ioctl(struct net_device *, struct ifreq *); -static void e100_get_speed_duplex_caps(struct e100_private *); -static int e100_ethtool_get_settings(struct net_device *, struct ifreq *); -static int e100_ethtool_set_settings(struct net_device *, struct ifreq *); - -static int e100_ethtool_get_drvinfo(struct net_device *, struct ifreq *); -static int e100_ethtool_eeprom(struct net_device *, struct ifreq *); - -#define E100_EEPROM_MAGIC 0x1234 -static int e100_ethtool_glink(struct net_device *, struct ifreq *); -static int e100_ethtool_gregs(struct net_device *, struct ifreq *); -static int e100_ethtool_nway_rst(struct net_device *, struct ifreq *); -static int e100_ethtool_wol(struct net_device *, struct ifreq *); -#ifdef CONFIG_PM -static unsigned char e100_setup_filter(struct e100_private *bdp); -static void e100_do_wol(struct pci_dev *pcid, struct e100_private *bdp); -#endif -static u16 e100_get_ip_lbytes(struct net_device *dev); -extern void e100_config_wol(struct e100_private *bdp); -extern u32 e100_run_diag(struct net_device *dev, u64 *test_info, u32 flags); -static int e100_ethtool_test(struct net_device *, struct ifreq *); -static int e100_ethtool_gstrings(struct net_device *, struct ifreq *); -static char test_strings[][ETH_GSTRING_LEN] = { - "Link test (on/offline)", - "Eeprom test (on/offline)", - "Self test (offline)", - "Mac loopback (offline)", - "Phy loopback (offline)", - "Cable diagnostic (offline)" -}; - -static int e100_ethtool_led_blink(struct net_device *, struct ifreq *); - -static int e100_mii_ioctl(struct net_device *, struct ifreq *, int); - -static unsigned char e100_delayed_exec_non_cu_cmd(struct e100_private *, - nxmit_cb_entry_t *); -static void e100_free_nontx_list(struct e100_private *); -static void e100_non_tx_background(unsigned long); -static inline void e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb); -/* Global Data structures and variables */ -char e100_copyright[] = "Copyright (c) 2003 Intel Corporation"; -char e100_driver_version[]="2.3.36-k1"; -const char *e100_full_driver_name = "Intel(R) PRO/100 Network Driver"; -char e100_short_driver_name[] = "e100"; -static int e100nics = 0; -static void e100_vlan_rx_register(struct net_device *netdev, struct vlan_group - *grp); -static void e100_vlan_rx_add_vid(struct net_device *netdev, u16 vid); -static void e100_vlan_rx_kill_vid(struct net_device *netdev, u16 vid); - -#ifdef CONFIG_PM -static int e100_notify_reboot(struct notifier_block *, unsigned long event, void *ptr); -static int e100_suspend(struct pci_dev *pcid, u32 state); -static int e100_resume(struct pci_dev *pcid); -static unsigned char e100_asf_enabled(struct e100_private *bdp); -struct notifier_block e100_notifier_reboot = { - .notifier_call = e100_notify_reboot, - .next = NULL, - .priority = 0 -}; -#endif - -/*********************************************************************/ -/*! This is a GCC extension to ANSI C. - * See the item "Labeled Elements in Initializers" in the section - * "Extensions to the C Language Family" of the GCC documentation. - *********************************************************************/ -#define E100_PARAM_INIT { [0 ... E100_MAX_NIC] = -1 } - -/* All parameters are treated the same, as an integer array of values. - * This macro just reduces the need to repeat the same declaration code - * over and over (plus this helps to avoid typo bugs). - */ -#define E100_PARAM(X, S) \ - static const int X[E100_MAX_NIC + 1] = E100_PARAM_INIT; \ - MODULE_PARM(X, "1-" __MODULE_STRING(E100_MAX_NIC) "i"); \ - MODULE_PARM_DESC(X, S); - -/* ====================================================================== */ -static u8 e100_D101M_checksum(struct e100_private *, struct sk_buff *); -static u8 e100_D102_check_checksum(rfd_t *); -static int e100_ioctl(struct net_device *, struct ifreq *, int); -static int e100_change_mtu(struct net_device *, int); -static int e100_xmit_frame(struct sk_buff *, struct net_device *); -static unsigned char e100_init(struct e100_private *); -static int e100_set_mac(struct net_device *, void *); -struct net_device_stats *e100_get_stats(struct net_device *); - -static irqreturn_t e100intr(int, void *, struct pt_regs *); -static void e100_print_brd_conf(struct e100_private *); -static void e100_set_multi(struct net_device *); - -static u8 e100_pci_setup(struct pci_dev *, struct e100_private *); -static u8 e100_sw_init(struct e100_private *); -static void e100_tco_workaround(struct e100_private *); -static unsigned char e100_alloc_space(struct e100_private *); -static void e100_dealloc_space(struct e100_private *); -static int e100_alloc_tcb_pool(struct e100_private *); -static void e100_setup_tcb_pool(tcb_t *, unsigned int, struct e100_private *); -static void e100_free_tcb_pool(struct e100_private *); -static int e100_alloc_rfd_pool(struct e100_private *); -static void e100_free_rfd_pool(struct e100_private *); - -static void e100_rd_eaddr(struct e100_private *); -static void e100_rd_pwa_no(struct e100_private *); -extern u16 e100_eeprom_read(struct e100_private *, u16); -extern void e100_eeprom_write_block(struct e100_private *, u16, u16 *, u16); -extern u16 e100_eeprom_size(struct e100_private *); -u16 e100_eeprom_calculate_chksum(struct e100_private *adapter); - -static unsigned char e100_clr_cntrs(struct e100_private *); -static unsigned char e100_load_microcode(struct e100_private *); -static unsigned char e100_setup_iaaddr(struct e100_private *, u8 *); -static unsigned char e100_update_stats(struct e100_private *bdp); - -static void e100_start_ru(struct e100_private *); -static void e100_dump_stats_cntrs(struct e100_private *); - -static void e100_check_options(int board, struct e100_private *bdp); -static void e100_set_int_option(int *, int, int, int, int, char *); -static void e100_set_bool_option(struct e100_private *bdp, int, u32, int, - char *); -unsigned char e100_wait_exec_cmplx(struct e100_private *, u32, u8, u8); -void e100_exec_cmplx(struct e100_private *, u32, u8); - -/** - * e100_get_rx_struct - retrieve cell to hold skb buff from the pool - * @bdp: atapter's private data struct - * - * Returns the new cell to hold sk_buff or %NULL. - */ -static inline struct rx_list_elem * -e100_get_rx_struct(struct e100_private *bdp) -{ - struct rx_list_elem *rx_struct = NULL; - - if (!list_empty(&(bdp->rx_struct_pool))) { - rx_struct = list_entry(bdp->rx_struct_pool.next, - struct rx_list_elem, list_elem); - list_del(&(rx_struct->list_elem)); - } - - return rx_struct; -} - -/** - * e100_alloc_skb - allocate an skb for the adapter - * @bdp: atapter's private data struct - * - * Allocates skb with enough room for rfd, and data, and reserve non-data space. - * Returns the new cell with sk_buff or %NULL. - */ -static inline struct rx_list_elem * -e100_alloc_skb(struct e100_private *bdp) -{ - struct sk_buff *new_skb; - u32 skb_size = sizeof (rfd_t); - struct rx_list_elem *rx_struct; - - new_skb = (struct sk_buff *) dev_alloc_skb(skb_size); - if (new_skb) { - /* The IP data should be - DWORD aligned. since the ethernet header is 14 bytes long, - we need to reserve 2 extra bytes so that the TCP/IP headers - will be DWORD aligned. */ - skb_reserve(new_skb, 2); - if ((rx_struct = e100_get_rx_struct(bdp)) == NULL) - goto err; - rx_struct->skb = new_skb; - rx_struct->dma_addr = pci_map_single(bdp->pdev, new_skb->data, - sizeof (rfd_t), - PCI_DMA_FROMDEVICE); - if (!rx_struct->dma_addr) - goto err; - skb_reserve(new_skb, bdp->rfd_size); - return rx_struct; - } else { - return NULL; - } - -err: - dev_kfree_skb_irq(new_skb); - return NULL; -} - -/** - * e100_add_skb_to_end - add an skb to the end of our rfd list - * @bdp: atapter's private data struct - * @rx_struct: rx_list_elem with the new skb - * - * Adds a newly allocated skb to the end of our rfd list. - */ -inline void -e100_add_skb_to_end(struct e100_private *bdp, struct rx_list_elem *rx_struct) -{ - rfd_t *rfdn; /* The new rfd */ - rfd_t *rfd; /* The old rfd */ - struct rx_list_elem *rx_struct_last; - - (rx_struct->skb)->dev = bdp->device; - rfdn = RFD_POINTER(rx_struct->skb, bdp); - rfdn->rfd_header.cb_status = 0; - rfdn->rfd_header.cb_cmd = __constant_cpu_to_le16(RFD_EL_BIT); - rfdn->rfd_act_cnt = 0; - rfdn->rfd_sz = __constant_cpu_to_le16(RFD_DATA_SIZE); - - pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr, bdp->rfd_size, - PCI_DMA_TODEVICE); - - if (!list_empty(&(bdp->active_rx_list))) { - rx_struct_last = list_entry(bdp->active_rx_list.prev, - struct rx_list_elem, list_elem); - rfd = RFD_POINTER(rx_struct_last->skb, bdp); - pci_dma_sync_single(bdp->pdev, rx_struct_last->dma_addr, - 4, PCI_DMA_FROMDEVICE); - put_unaligned(cpu_to_le32(rx_struct->dma_addr), - ((u32 *) (&(rfd->rfd_header.cb_lnk_ptr)))); - - pci_dma_sync_single(bdp->pdev, rx_struct_last->dma_addr, - 8, PCI_DMA_TODEVICE); - rfd->rfd_header.cb_cmd &= - __constant_cpu_to_le16((u16) ~RFD_EL_BIT); - - pci_dma_sync_single(bdp->pdev, rx_struct_last->dma_addr, - 4, PCI_DMA_TODEVICE); - } - - list_add_tail(&(rx_struct->list_elem), &(bdp->active_rx_list)); -} - -static inline void -e100_alloc_skbs(struct e100_private *bdp) -{ - for (; bdp->skb_req > 0; bdp->skb_req--) { - struct rx_list_elem *rx_struct; - - if ((rx_struct = e100_alloc_skb(bdp)) == NULL) - return; - - e100_add_skb_to_end(bdp, rx_struct); - } -} - -void e100_tx_srv(struct e100_private *); -u32 e100_rx_srv(struct e100_private *); - -void e100_watchdog(struct net_device *); -void e100_refresh_txthld(struct e100_private *); -void e100_manage_adaptive_ifs(struct e100_private *); -void e100_clear_pools(struct e100_private *); -static void e100_clear_structs(struct net_device *); -static inline tcb_t *e100_prepare_xmit_buff(struct e100_private *, - struct sk_buff *); -static void e100_set_multi_exec(struct net_device *dev); - -MODULE_AUTHOR("Intel Corporation, "); -MODULE_DESCRIPTION("Intel(R) PRO/100 Network Driver"); -MODULE_LICENSE("GPL"); - -E100_PARAM(TxDescriptors, "Number of transmit descriptors"); -E100_PARAM(RxDescriptors, "Number of receive descriptors"); -E100_PARAM(XsumRX, "Disable or enable Receive Checksum offload"); -E100_PARAM(e100_speed_duplex, "Speed and Duplex settings"); -E100_PARAM(ucode, "Disable or enable microcode loading"); -E100_PARAM(ber, "Value for the BER correction algorithm"); -E100_PARAM(flow_control, "Disable or enable Ethernet PAUSE frames processing"); -E100_PARAM(IntDelay, "Value for CPU saver's interrupt delay"); -E100_PARAM(BundleSmallFr, "Disable or enable interrupt bundling of small frames"); -E100_PARAM(BundleMax, "Maximum number for CPU saver's packet bundling"); -E100_PARAM(IFS, "Disable or enable the adaptive IFS algorithm"); - -/** - * e100_exec_cmd - issue a comand - * @bdp: atapter's private data struct - * @scb_cmd_low: the command that is to be issued - * - * This general routine will issue a command to the e100. - */ -static inline void -e100_exec_cmd(struct e100_private *bdp, u8 cmd_low) -{ - writeb(cmd_low, &(bdp->scb->scb_cmd_low)); - readw(&(bdp->scb->scb_status)); /* flushes last write, read-safe */ -} - -/** - * e100_wait_scb - wait for SCB to clear - * @bdp: atapter's private data struct - * - * This routine checks to see if the e100 has accepted a command. - * It does so by checking the command field in the SCB, which will - * be zeroed by the e100 upon accepting a command. The loop waits - * for up to 1 millisecond for command acceptance. - * - * Returns: - * true if the SCB cleared within 1 millisecond. - * false if it didn't clear within 1 millisecond - */ -unsigned char -e100_wait_scb(struct e100_private *bdp) -{ - int i; - - /* loop on the scb for a few times */ - for (i = 0; i < 100; i++) { - if (!readb(&bdp->scb->scb_cmd_low)) - return true; - cpu_relax(); - } - - /* it didn't work. do it the slow way using udelay()s */ - for (i = 0; i < E100_MAX_SCB_WAIT; i++) { - if (!readb(&bdp->scb->scb_cmd_low)) - return true; - cpu_relax(); - udelay(1); - } - - return false; -} - -/** - * e100_wait_exec_simple - issue a command - * @bdp: atapter's private data struct - * @scb_cmd_low: the command that is to be issued - * - * This general routine will issue a command to the e100 after waiting for - * the previous command to finish. - * - * Returns: - * true if the command was issued to the chip successfully - * false if the command was not issued to the chip - */ -inline unsigned char -e100_wait_exec_simple(struct e100_private *bdp, u8 scb_cmd_low) -{ - if (!e100_wait_scb(bdp)) { - printk(KERN_DEBUG "e100: %s: e100_wait_exec_simple: failed\n", - bdp->device->name); -#ifdef E100_CU_DEBUG - printk(KERN_ERR "e100: %s: Last command (%x/%x) " - "timeout\n", bdp->device->name, - bdp->last_cmd, bdp->last_sub_cmd); - printk(KERN_ERR "e100: %s: Current simple command (%x) " - "can't be executed\n", - bdp->device->name, scb_cmd_low); -#endif - return false; - } - e100_exec_cmd(bdp, scb_cmd_low); -#ifdef E100_CU_DEBUG - bdp->last_cmd = scb_cmd_low; - bdp->last_sub_cmd = 0; -#endif - return true; -} - -void -e100_exec_cmplx(struct e100_private *bdp, u32 phys_addr, u8 cmd) -{ - writel(phys_addr, &(bdp->scb->scb_gen_ptr)); - readw(&(bdp->scb->scb_status)); /* flushes last write, read-safe */ - e100_exec_cmd(bdp, cmd); -} - -unsigned char -e100_wait_exec_cmplx(struct e100_private *bdp, u32 phys_addr, u8 cmd, u8 sub_cmd) -{ - if (!e100_wait_scb(bdp)) { -#ifdef E100_CU_DEBUG - printk(KERN_ERR "e100: %s: Last command (%x/%x) " - "timeout\n", bdp->device->name, - bdp->last_cmd, bdp->last_sub_cmd); - printk(KERN_ERR "e100: %s: Current complex command " - "(%x/%x) can't be executed\n", - bdp->device->name, cmd, sub_cmd); -#endif - return false; - } - e100_exec_cmplx(bdp, phys_addr, cmd); -#ifdef E100_CU_DEBUG - bdp->last_cmd = cmd; - bdp->last_sub_cmd = sub_cmd; -#endif - return true; -} - -inline u8 -e100_wait_cus_idle(struct e100_private *bdp) -{ - int i; - - /* loop on the scb for a few times */ - for (i = 0; i < 100; i++) { - if (((readw(&(bdp->scb->scb_status)) & SCB_CUS_MASK) != - SCB_CUS_ACTIVE)) { - return true; - } - cpu_relax(); - } - - for (i = 0; i < E100_MAX_CU_IDLE_WAIT; i++) { - if (((readw(&(bdp->scb->scb_status)) & SCB_CUS_MASK) != - SCB_CUS_ACTIVE)) { - return true; - } - cpu_relax(); - udelay(1); - } - - return false; -} - -/** - * e100_disable_clear_intr - disable and clear/ack interrupts - * @bdp: atapter's private data struct - * - * This routine disables interrupts at the hardware, by setting - * the M (mask) bit in the adapter's CSR SCB command word. - * It also clear/ack interrupts. - */ -static inline void -e100_disable_clear_intr(struct e100_private *bdp) -{ - u16 intr_status; - /* Disable interrupts on our PCI board by setting the mask bit */ - writeb(SCB_INT_MASK, &bdp->scb->scb_cmd_hi); - intr_status = readw(&bdp->scb->scb_status); - /* ack and clear intrs */ - writew(intr_status, &bdp->scb->scb_status); - readw(&bdp->scb->scb_status); -} - -/** - * e100_set_intr_mask - set interrupts - * @bdp: atapter's private data struct - * - * This routine sets interrupts at the hardware, by resetting - * the M (mask) bit in the adapter's CSR SCB command word - */ -static inline void -e100_set_intr_mask(struct e100_private *bdp) -{ - writeb(bdp->intr_mask, &bdp->scb->scb_cmd_hi); - readw(&(bdp->scb->scb_status)); /* flushes last write, read-safe */ -} - -static inline void -e100_trigger_SWI(struct e100_private *bdp) -{ - /* Trigger interrupt on our PCI board by asserting SWI bit */ - writeb(SCB_SOFT_INT, &bdp->scb->scb_cmd_hi); - readw(&(bdp->scb->scb_status)); /* flushes last write, read-safe */ -} - -static int -e100_found1(struct pci_dev *pcid, const struct pci_device_id *ent) -{ - static int first_time = true; - struct net_device *dev = NULL; - struct e100_private *bdp = NULL; - int rc = 0; - u16 cal_checksum, read_checksum; - - dev = alloc_etherdev(sizeof (struct e100_private)); - if (dev == NULL) { - printk(KERN_ERR "e100: Not able to alloc etherdev struct\n"); - rc = -ENODEV; - goto out; - } - - SET_MODULE_OWNER(dev); - - if (first_time) { - first_time = false; - printk(KERN_NOTICE "%s - version %s\n", - e100_full_driver_name, e100_driver_version); - printk(KERN_NOTICE "%s\n", e100_copyright); - printk(KERN_NOTICE "\n"); - } - - bdp = dev->priv; - bdp->pdev = pcid; - bdp->device = dev; - - pci_set_drvdata(pcid, dev); - SET_NETDEV_DEV(dev, &pcid->dev); - - bdp->flags = 0; - bdp->ifs_state = 0; - bdp->ifs_value = 0; - bdp->scb = 0; - - init_timer(&bdp->nontx_timer_id); - bdp->nontx_timer_id.data = (unsigned long) bdp; - bdp->nontx_timer_id.function = (void *) &e100_non_tx_background; - INIT_LIST_HEAD(&(bdp->non_tx_cmd_list)); - bdp->non_tx_command_state = E100_NON_TX_IDLE; - - init_timer(&bdp->watchdog_timer); - bdp->watchdog_timer.data = (unsigned long) dev; - bdp->watchdog_timer.function = (void *) &e100_watchdog; - - if ((rc = e100_pci_setup(pcid, bdp)) != 0) { - goto err_dev; - } - - if ((rc = e100_alloc_space(bdp)) != 0) { - goto err_pci; - } - - if (((bdp->pdev->device > 0x1030) - && (bdp->pdev->device < 0x103F)) - || ((bdp->pdev->device >= 0x1050) - && (bdp->pdev->device <= 0x1057)) - || (bdp->pdev->device == 0x2449) - || (bdp->pdev->device == 0x2459) - || (bdp->pdev->device == 0x245D)) { - bdp->rev_id = D101MA_REV_ID; /* workaround for ICH3 */ - bdp->flags |= IS_ICH; - } - - if (bdp->rev_id == 0xff) - bdp->rev_id = 1; - - if ((u8) bdp->rev_id >= D101A4_REV_ID) - bdp->flags |= IS_BACHELOR; - - if ((u8) bdp->rev_id >= D102_REV_ID) { - bdp->flags |= USE_IPCB; - bdp->rfd_size = 32; - } else { - bdp->rfd_size = 16; - } - - dev->vlan_rx_register = e100_vlan_rx_register; - dev->vlan_rx_add_vid = e100_vlan_rx_add_vid; - dev->vlan_rx_kill_vid = e100_vlan_rx_kill_vid; - dev->irq = pcid->irq; - dev->open = &e100_open; - dev->hard_start_xmit = &e100_xmit_frame; - dev->stop = &e100_close; - dev->change_mtu = &e100_change_mtu; - dev->get_stats = &e100_get_stats; - dev->set_multicast_list = &e100_set_multi; - dev->set_mac_address = &e100_set_mac; - dev->do_ioctl = &e100_ioctl; - - if (bdp->flags & USE_IPCB) - dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | - NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; - - if ((rc = register_netdev(dev)) != 0) { - goto err_dealloc; - } - - e100_check_options(e100nics, bdp); - - if (!e100_init(bdp)) { - printk(KERN_ERR "e100: Failed to initialize, instance #%d\n", - e100nics); - rc = -ENODEV; - goto err_unregister_netdev; - } - - /* Check if checksum is valid */ - cal_checksum = e100_eeprom_calculate_chksum(bdp); - read_checksum = e100_eeprom_read(bdp, (bdp->eeprom_size - 1)); - if (cal_checksum != read_checksum) { - printk(KERN_ERR "e100: Corrupted EEPROM on instance #%d\n", - e100nics); - rc = -ENODEV; - goto err_unregister_netdev; - } - - e100nics++; - - e100_get_speed_duplex_caps(bdp); - - printk(KERN_NOTICE - "e100: %s: %s\n", - bdp->device->name, "Intel(R) PRO/100 Network Connection"); - e100_print_brd_conf(bdp); - - bdp->wolsupported = 0; - bdp->wolopts = 0; - if (bdp->rev_id >= D101A4_REV_ID) - bdp->wolsupported = WAKE_PHY | WAKE_MAGIC; - if (bdp->rev_id >= D101MA_REV_ID) - bdp->wolsupported |= WAKE_UCAST | WAKE_ARP; - - /* Check if WoL is enabled on EEPROM */ - if (e100_eeprom_read(bdp, EEPROM_ID_WORD) & BIT_5) { - /* Magic Packet WoL is enabled on device by default */ - /* if EEPROM WoL bit is TRUE */ - bdp->wolopts = WAKE_MAGIC; - } - - printk(KERN_NOTICE "\n"); - - goto out; - -err_unregister_netdev: - unregister_netdev(dev); -err_dealloc: - e100_dealloc_space(bdp); -err_pci: - iounmap(bdp->scb); - pci_release_regions(pcid); - pci_disable_device(pcid); -err_dev: - pci_set_drvdata(pcid, NULL); - free_netdev(dev); -out: - return rc; -} - -/** - * e100_clear_structs - free resources - * @dev: adapter's net_device struct - * - * Free all device specific structs, unmap i/o address, etc. - */ -static void __devexit -e100_clear_structs(struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - - iounmap(bdp->scb); - pci_release_regions(bdp->pdev); - pci_disable_device(bdp->pdev); - - e100_dealloc_space(bdp); - pci_set_drvdata(bdp->pdev, NULL); - free_netdev(dev); -} - -static void __devexit -e100_remove1(struct pci_dev *pcid) -{ - struct net_device *dev; - struct e100_private *bdp; - - if (!(dev = (struct net_device *) pci_get_drvdata(pcid))) - return; - - bdp = dev->priv; - - unregister_netdev(dev); - - e100_sw_reset(bdp, PORT_SELECTIVE_RESET); - - if (bdp->non_tx_command_state != E100_NON_TX_IDLE) { - del_timer_sync(&bdp->nontx_timer_id); - e100_free_nontx_list(bdp); - bdp->non_tx_command_state = E100_NON_TX_IDLE; - } - - e100_clear_structs(dev); - - --e100nics; -} - -static struct pci_device_id e100_id_table[] = { - {0x8086, 0x1229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x2449, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1209, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1031, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1032, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1033, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1034, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1038, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x103A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x103B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x103C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x103D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x103E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1052, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x1055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x2459, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0x8086, 0x245D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, - {0,} /* This has to be the last entry*/ -}; -MODULE_DEVICE_TABLE(pci, e100_id_table); - -static struct pci_driver e100_driver = { - .name = "e100", - .id_table = e100_id_table, - .probe = e100_found1, - .remove = __devexit_p(e100_remove1), -#ifdef CONFIG_PM - .suspend = e100_suspend, - .resume = e100_resume, -#endif -}; - -static int __init -e100_init_module(void) -{ - int ret; - ret = pci_module_init(&e100_driver); - - if(ret >= 0) { -#ifdef CONFIG_PM - register_reboot_notifier(&e100_notifier_reboot); -#endif - } - - return ret; -} - -static void __exit -e100_cleanup_module(void) -{ -#ifdef CONFIG_PM - unregister_reboot_notifier(&e100_notifier_reboot); -#endif - - pci_unregister_driver(&e100_driver); -} - -module_init(e100_init_module); -module_exit(e100_cleanup_module); - -/** - * e100_check_options - check command line options - * @board: board number - * @bdp: atapter's private data struct - * - * This routine does range checking on command-line options - */ -void -e100_check_options(int board, struct e100_private *bdp) -{ - if (board >= E100_MAX_NIC) { - printk(KERN_NOTICE - "e100: No configuration available for board #%d\n", - board); - printk(KERN_NOTICE "e100: Using defaults for all values\n"); - board = E100_MAX_NIC; - } - - e100_set_int_option(&(bdp->params.TxDescriptors), TxDescriptors[board], - E100_MIN_TCB, E100_MAX_TCB, E100_DEFAULT_TCB, - "TxDescriptor count"); - - e100_set_int_option(&(bdp->params.RxDescriptors), RxDescriptors[board], - E100_MIN_RFD, E100_MAX_RFD, E100_DEFAULT_RFD, - "RxDescriptor count"); - - e100_set_int_option(&(bdp->params.e100_speed_duplex), - e100_speed_duplex[board], 0, 4, - E100_DEFAULT_SPEED_DUPLEX, "speed/duplex mode"); - - e100_set_int_option(&(bdp->params.ber), ber[board], 0, ZLOCK_MAX_ERRORS, - E100_DEFAULT_BER, "Bit Error Rate count"); - - e100_set_bool_option(bdp, XsumRX[board], PRM_XSUMRX, E100_DEFAULT_XSUM, - "XsumRX value"); - - /* Default ucode value depended on controller revision */ - if (bdp->rev_id >= D101MA_REV_ID) { - e100_set_bool_option(bdp, ucode[board], PRM_UCODE, - E100_DEFAULT_UCODE, "ucode value"); - } else { - e100_set_bool_option(bdp, ucode[board], PRM_UCODE, false, - "ucode value"); - } - - e100_set_bool_option(bdp, flow_control[board], PRM_FC, E100_DEFAULT_FC, - "flow control value"); - - e100_set_bool_option(bdp, IFS[board], PRM_IFS, E100_DEFAULT_IFS, - "IFS value"); - - e100_set_bool_option(bdp, BundleSmallFr[board], PRM_BUNDLE_SMALL, - E100_DEFAULT_BUNDLE_SMALL_FR, - "CPU saver bundle small frames value"); - - e100_set_int_option(&(bdp->params.IntDelay), IntDelay[board], 0x0, - 0xFFFF, E100_DEFAULT_CPUSAVER_INTERRUPT_DELAY, - "CPU saver interrupt delay value"); - - e100_set_int_option(&(bdp->params.BundleMax), BundleMax[board], 0x1, - 0xFFFF, E100_DEFAULT_CPUSAVER_BUNDLE_MAX, - "CPU saver bundle max value"); - -} - -/** - * e100_set_int_option - check and set an integer option - * @option: a pointer to the relevant option field - * @val: the value specified - * @min: the minimum valid value - * @max: the maximum valid value - * @default_val: the default value - * @name: the name of the option - * - * This routine does range checking on a command-line option. - * If the option's value is '-1' use the specified default. - * Otherwise, if the value is invalid, change it to the default. - */ -void -e100_set_int_option(int *option, int val, int min, int max, int default_val, - char *name) -{ - if (val == -1) { /* no value specified. use default */ - *option = default_val; - - } else if ((val < min) || (val > max)) { - printk(KERN_NOTICE - "e100: Invalid %s specified (%i). " - "Valid range is %i-%i\n", - name, val, min, max); - printk(KERN_NOTICE "e100: Using default %s of %i\n", name, - default_val); - *option = default_val; - } else { - printk(KERN_INFO "e100: Using specified %s of %i\n", name, val); - *option = val; - } -} - -/** - * e100_set_bool_option - check and set a boolean option - * @bdp: atapter's private data struct - * @val: the value specified - * @mask: the mask for the relevant option - * @default_val: the default value - * @name: the name of the option - * - * This routine checks a boolean command-line option. - * If the option's value is '-1' use the specified default. - * Otherwise, if the value is invalid (not 0 or 1), - * change it to the default. - */ -void -e100_set_bool_option(struct e100_private *bdp, int val, u32 mask, - int default_val, char *name) -{ - if (val == -1) { - if (default_val) - bdp->params.b_params |= mask; - - } else if ((val != true) && (val != false)) { - printk(KERN_NOTICE - "e100: Invalid %s specified (%i). " - "Valid values are %i/%i\n", - name, val, false, true); - printk(KERN_NOTICE "e100: Using default %s of %i\n", name, - default_val); - - if (default_val) - bdp->params.b_params |= mask; - } else { - printk(KERN_INFO "e100: Using specified %s of %i\n", name, val); - if (val) - bdp->params.b_params |= mask; - } -} - -int -e100_open(struct net_device *dev) -{ - struct e100_private *bdp; - int rc = 0; - - bdp = dev->priv; - - /* setup the tcb pool */ - if (!e100_alloc_tcb_pool(bdp)) { - rc = -ENOMEM; - goto err_exit; - } - bdp->last_tcb = NULL; - - bdp->tcb_pool.head = 0; - bdp->tcb_pool.tail = 1; - - e100_setup_tcb_pool((tcb_t *) bdp->tcb_pool.data, - bdp->params.TxDescriptors, bdp); - - if (!e100_alloc_rfd_pool(bdp)) { - rc = -ENOMEM; - goto err_exit; - } - - if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0)) { - rc = -EAGAIN; - goto err_exit; - } - - if (!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0)) { - rc = -EAGAIN; - goto err_exit; - } - - mod_timer(&(bdp->watchdog_timer), jiffies + (2 * HZ)); - - if (dev->flags & IFF_UP) - /* Otherwise process may sleep forever */ - netif_wake_queue(dev); - else - netif_start_queue(dev); - - e100_start_ru(bdp); - if ((rc = request_irq(dev->irq, &e100intr, SA_SHIRQ, - dev->name, dev)) != 0) { - del_timer_sync(&bdp->watchdog_timer); - goto err_exit; - } - bdp->intr_mask = 0; - e100_set_intr_mask(bdp); - - e100_force_config(bdp); - - goto exit; - -err_exit: - e100_clear_pools(bdp); -exit: - return rc; -} - -int -e100_close(struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - - e100_disable_clear_intr(bdp); - free_irq(dev->irq, dev); - bdp->intr_mask = SCB_INT_MASK; - e100_isolate_driver(bdp); - - netif_carrier_off(bdp->device); - bdp->cur_line_speed = 0; - bdp->cur_dplx_mode = 0; - e100_clear_pools(bdp); - - return 0; -} - -static int -e100_change_mtu(struct net_device *dev, int new_mtu) -{ - if ((new_mtu < 68) || (new_mtu > (ETH_DATA_LEN + VLAN_SIZE))) - return -EINVAL; - - dev->mtu = new_mtu; - return 0; -} - -static int -e100_xmit_frame(struct sk_buff *skb, struct net_device *dev) -{ - int rc = 0; - int notify_stop = false; - struct e100_private *bdp = dev->priv; - - if (!spin_trylock(&bdp->bd_non_tx_lock)) { - notify_stop = true; - rc = 1; - goto exit2; - } - - /* tcb list may be empty temporarily during releasing resources */ - if (!TCBS_AVAIL(bdp->tcb_pool) || (bdp->tcb_phys == 0) || - (bdp->non_tx_command_state != E100_NON_TX_IDLE)) { - notify_stop = true; - rc = 1; - goto exit1; - } - - bdp->drv_stats.net_stats.tx_bytes += skb->len; - - e100_prepare_xmit_buff(bdp, skb); - - dev->trans_start = jiffies; - -exit1: - spin_unlock(&bdp->bd_non_tx_lock); -exit2: - if (notify_stop) { - netif_stop_queue(dev); - } - - return rc; -} - -/** - * e100_get_stats - get driver statistics - * @dev: adapter's net_device struct - * - * This routine is called when the OS wants the adapter's stats returned. - * It returns the address of the net_device_stats stucture for the device. - * If the statistics are currently being updated, then they might be incorrect - * for a short while. However, since this cannot actually cause damage, no - * locking is used. - */ -struct net_device_stats * -e100_get_stats(struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - - bdp->drv_stats.net_stats.tx_errors = - bdp->drv_stats.net_stats.tx_carrier_errors + - bdp->drv_stats.net_stats.tx_aborted_errors; - - bdp->drv_stats.net_stats.rx_errors = - bdp->drv_stats.net_stats.rx_crc_errors + - bdp->drv_stats.net_stats.rx_frame_errors + - bdp->drv_stats.net_stats.rx_length_errors + - bdp->drv_stats.rcv_cdt_frames; - - return &(bdp->drv_stats.net_stats); -} - -/** - * e100_set_mac - set the MAC address - * @dev: adapter's net_device struct - * @addr: the new address - * - * This routine sets the ethernet address of the board - * Returns: - * 0 - if successful - * -1 - otherwise - */ -static int -e100_set_mac(struct net_device *dev, void *addr) -{ - struct e100_private *bdp; - int rc = -1; - struct sockaddr *p_sockaddr = (struct sockaddr *) addr; - - if (!is_valid_ether_addr(p_sockaddr->sa_data)) - return -EADDRNOTAVAIL; - bdp = dev->priv; - - if (e100_setup_iaaddr(bdp, (u8 *) (p_sockaddr->sa_data))) { - memcpy(&(dev->dev_addr[0]), p_sockaddr->sa_data, ETH_ALEN); - rc = 0; - } - - return rc; -} - -static void -e100_set_multi_exec(struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - mltcst_cb_t *mcast_buff; - cb_header_t *cb_hdr; - struct dev_mc_list *mc_list; - unsigned int i; - nxmit_cb_entry_t *cmd = e100_alloc_non_tx_cmd(bdp); - - if (cmd != NULL) { - mcast_buff = &((cmd->non_tx_cmd)->ntcb.multicast); - cb_hdr = &((cmd->non_tx_cmd)->ntcb.multicast.mc_cbhdr); - } else { - return; - } - - /* initialize the multi cast command */ - cb_hdr->cb_cmd = __constant_cpu_to_le16(CB_MULTICAST); - - /* now fill in the rest of the multicast command */ - *(u16 *) (&(mcast_buff->mc_count)) = cpu_to_le16(dev->mc_count * 6); - for (i = 0, mc_list = dev->mc_list; - (i < dev->mc_count) && (i < MAX_MULTICAST_ADDRS); - i++, mc_list = mc_list->next) { - /* copy into the command */ - memcpy(&(mcast_buff->mc_addr[i * ETH_ALEN]), - (u8 *) &(mc_list->dmi_addr), ETH_ALEN); - } - - if (!e100_exec_non_cu_cmd(bdp, cmd)) { - printk(KERN_WARNING "e100: %s: Multicast setup failed\n", - dev->name); - } -} - -/** - * e100_set_multi - set multicast status - * @dev: adapter's net_device struct - * - * This routine is called to add or remove multicast addresses, and/or to - * change the adapter's promiscuous state. - */ -static void -e100_set_multi(struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - unsigned char promisc_enbl; - unsigned char mulcast_enbl; - - promisc_enbl = ((dev->flags & IFF_PROMISC) == IFF_PROMISC); - mulcast_enbl = ((dev->flags & IFF_ALLMULTI) || - (dev->mc_count > MAX_MULTICAST_ADDRS)); - - e100_config_promisc(bdp, promisc_enbl); - e100_config_mulcast_enbl(bdp, mulcast_enbl); - - /* reconfigure the chip if something has changed in its config space */ - e100_config(bdp); - - if (promisc_enbl || mulcast_enbl) { - return; /* no need for Multicast Cmd */ - } - - /* get the multicast CB */ - e100_set_multi_exec(dev); -} - -static int -e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -{ - - switch (cmd) { - - case SIOCETHTOOL: - return e100_do_ethtool_ioctl(dev, ifr); - break; - - case SIOCGMIIPHY: /* Get address of MII PHY in use. */ - case SIOCGMIIREG: /* Read MII PHY register. */ - case SIOCSMIIREG: /* Write to MII PHY register. */ - return e100_mii_ioctl(dev, ifr, cmd); - break; - - default: - return -EOPNOTSUPP; - } - return 0; - -} - -/** - * e100init - initialize the adapter - * @bdp: atapter's private data struct - * - * This routine is called when this driver is loaded. This is the initialization - * routine which allocates memory, configures the adapter and determines the - * system resources. - * - * Returns: - * true: if successful - * false: otherwise - */ -static unsigned char -e100_init(struct e100_private *bdp) -{ - u32 st_timeout = 0; - u32 st_result = 0; - e100_sw_init(bdp); - - if (!e100_selftest(bdp, &st_timeout, &st_result)) { - if (st_timeout) { - printk(KERN_ERR "e100: selftest timeout\n"); - } else { - printk(KERN_ERR "e100: selftest failed. Results: %x\n", - st_result); - } - return false; - } - else - printk(KERN_DEBUG "e100: selftest OK.\n"); - - /* read the MAC address from the eprom */ - e100_rd_eaddr(bdp); - if (!is_valid_ether_addr(bdp->device->dev_addr)) { - printk(KERN_ERR "e100: Invalid Ethernet address\n"); - return false; - } - /* read NIC's part number */ - e100_rd_pwa_no(bdp); - - if (!e100_hw_init(bdp)) - return false; - /* Interrupts are enabled after device reset */ - e100_disable_clear_intr(bdp); - - return true; -} - -/** - * e100_sw_init - initialize software structs - * @bdp: atapter's private data struct - * - * This routine initializes all software structures. Sets up the - * circular structures for the RFD's & TCB's. Allocates the per board - * structure for storing adapter information. The CSR is also memory - * mapped in this routine. - * - * Returns : - * true: if S/W was successfully initialized - * false: otherwise - */ -static unsigned char -e100_sw_init(struct e100_private *bdp) -{ - bdp->next_cu_cmd = START_WAIT; // init the next cu state - - /* - * Set the value for # of good xmits per underrun. the value assigned - * here is an intelligent suggested default. Nothing magical about it. - */ - bdp->tx_per_underrun = DEFAULT_TX_PER_UNDERRUN; - - /* get the default transmit threshold value */ - bdp->tx_thld = TX_THRSHLD; - - /* get the EPROM size */ - bdp->eeprom_size = e100_eeprom_size(bdp); - - /* Initialize our spinlocks */ - spin_lock_init(&(bdp->bd_lock)); - spin_lock_init(&(bdp->bd_non_tx_lock)); - spin_lock_init(&(bdp->config_lock)); - spin_lock_init(&(bdp->mdi_access_lock)); - /* Initialize configuration data */ - e100_config_init(bdp); - - return 1; -} - -static void -e100_tco_workaround(struct e100_private *bdp) -{ - int i; - - /* Do software reset */ - e100_sw_reset(bdp, PORT_SOFTWARE_RESET); - - /* Do a dummy LOAD CU BASE command. */ - /* This gets us out of pre-driver to post-driver. */ - e100_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE); - - /* Wait 20 msec for reset to take effect */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ / 50 + 1); - - /* disable interrupts since they are enabled */ - /* after device reset */ - e100_disable_clear_intr(bdp); - - /* Wait for command to be cleared up to 1 sec */ - for (i=0; i<100; i++) { - if (!readb(&bdp->scb->scb_cmd_low)) - break; - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ / 100 + 1); - } - - /* Wait for TCO request bit in PMDR register to be clear */ - for (i=0; i<50; i++) { - if (!(readb(&bdp->scb->scb_ext.d101m_scb.scb_pmdr) & BIT_1)) - break; - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ / 100 + 1); - } -} - -/** - * e100_hw_init - initialized tthe hardware - * @bdp: atapter's private data struct - * - * This routine performs a reset on the adapter, and configures the adapter. - * This includes configuring the 82557 LAN controller, validating and setting - * the node address, detecting and configuring the Phy chip on the adapter, - * and initializing all of the on chip counters. - * - * Returns: - * true - If the adapter was initialized - * false - If the adapter failed initialization - */ -unsigned char -e100_hw_init(struct e100_private *bdp) -{ - if (!e100_phy_init(bdp)) - goto err; - - e100_sw_reset(bdp, PORT_SELECTIVE_RESET); - - /* Only 82559 or above needs TCO workaround */ - if (bdp->rev_id >= D101MA_REV_ID) - e100_tco_workaround(bdp); - - /* Load the CU BASE (set to 0, because we use linear mode) */ - if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0)) - goto err; - - if (!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0)) - goto err; - - /* Load interrupt microcode */ - if (e100_load_microcode(bdp)) { - bdp->flags |= DF_UCODE_LOADED; - } - - if ((u8) bdp->rev_id < D101A4_REV_ID) - e100_config_init_82557(bdp); - - if (!e100_config(bdp)) - goto err; - - if (!e100_setup_iaaddr(bdp, bdp->device->dev_addr)) - goto err; - - /* Clear the internal counters */ - if (!e100_clr_cntrs(bdp)) - goto err; - - /* Change for 82558 enhancement */ - /* If 82558/9 and if the user has enabled flow control, set up the - * Flow Control Reg. in the CSR */ - if ((bdp->flags & IS_BACHELOR) - && (bdp->params.b_params & PRM_FC)) { - writeb(DFLT_FC_THLD, &bdp->scb->scb_ext.d101_scb.scb_fc_thld); - writeb(DFLT_FC_CMD, - &bdp->scb->scb_ext.d101_scb.scb_fc_xon_xoff); - } - - return true; -err: - printk(KERN_ERR "e100: hw init failed\n"); - return false; -} - -/** - * e100_setup_tcb_pool - setup TCB circular list - * @head: Pointer to head of the allocated TCBs - * @qlen: Number of elements in the queue - * @bdp: atapter's private data struct - * - * This routine arranges the contigiously allocated TCB's in a circular list. - * Also does the one time initialization of the TCBs. - */ -static void -e100_setup_tcb_pool(tcb_t *head, unsigned int qlen, struct e100_private *bdp) -{ - int ele_no; - tcb_t *pcurr_tcb; /* point to current tcb */ - u32 next_phys; /* the next phys addr */ - u16 txcommand = CB_S_BIT | CB_TX_SF_BIT; - - bdp->tx_count = 0; - if (bdp->flags & USE_IPCB) { - txcommand |= CB_IPCB_TRANSMIT | CB_CID_DEFAULT; - } else if (bdp->flags & IS_BACHELOR) { - txcommand |= CB_TRANSMIT | CB_CID_DEFAULT; - } else { - txcommand |= CB_TRANSMIT; - } - - for (ele_no = 0, next_phys = bdp->tcb_phys, pcurr_tcb = head; - ele_no < qlen; ele_no++, pcurr_tcb++) { - - /* set the phys addr for this TCB, next_phys has not incr. yet */ - pcurr_tcb->tcb_phys = next_phys; - next_phys += sizeof (tcb_t); - - /* set the link to next tcb */ - if (ele_no == (qlen - 1)) - pcurr_tcb->tcb_hdr.cb_lnk_ptr = - cpu_to_le32(bdp->tcb_phys); - else - pcurr_tcb->tcb_hdr.cb_lnk_ptr = cpu_to_le32(next_phys); - - pcurr_tcb->tcb_hdr.cb_status = 0; - pcurr_tcb->tcb_hdr.cb_cmd = cpu_to_le16(txcommand); - pcurr_tcb->tcb_cnt = 0; - pcurr_tcb->tcb_thrshld = bdp->tx_thld; - if (ele_no < 2) { - pcurr_tcb->tcb_hdr.cb_status = - cpu_to_le16(CB_STATUS_COMPLETE); - } - pcurr_tcb->tcb_tbd_num = 1; - - if (bdp->flags & IS_BACHELOR) { - pcurr_tcb->tcb_tbd_ptr = - __constant_cpu_to_le32(0xFFFFFFFF); - } else { - pcurr_tcb->tcb_tbd_ptr = - cpu_to_le32(pcurr_tcb->tcb_phys + 0x10); - } - - if (bdp->flags & IS_BACHELOR) { - pcurr_tcb->tcb_tbd_expand_ptr = - cpu_to_le32(pcurr_tcb->tcb_phys + 0x20); - } else { - pcurr_tcb->tcb_tbd_expand_ptr = - cpu_to_le32(pcurr_tcb->tcb_phys + 0x10); - } - pcurr_tcb->tcb_tbd_dflt_ptr = pcurr_tcb->tcb_tbd_ptr; - - if (bdp->flags & USE_IPCB) { - pcurr_tcb->tbd_ptr = &(pcurr_tcb->tcbu.tbd_array[1]); - pcurr_tcb->tcbu.ipcb.ip_activation_high = - IPCB_IP_ACTIVATION_DEFAULT; - pcurr_tcb->tcbu.ipcb.vlan = 0; - } else { - pcurr_tcb->tbd_ptr = &(pcurr_tcb->tcbu.tbd_array[0]); - } - - pcurr_tcb->tcb_skb = NULL; - } - - wmb(); -} - -/***************************************************************************/ -/***************************************************************************/ -/* Memory Management Routines */ -/***************************************************************************/ - -/** - * e100_alloc_space - allocate private driver data - * @bdp: atapter's private data struct - * - * This routine allocates memory for the driver. Memory allocated is for the - * selftest and statistics structures. - * - * Returns: - * 0: if the operation was successful - * %-ENOMEM: if memory allocation failed - */ -unsigned char -e100_alloc_space(struct e100_private *bdp) -{ - unsigned long off; - - /* allocate all the dma-able structures in one call: - * selftest results, adapter stats, and non-tx cb commands */ - if (!(bdp->dma_able = - pci_alloc_consistent(bdp->pdev, sizeof (bd_dma_able_t), - &(bdp->dma_able_phys)))) { - goto err; - } - - /* now assign the various pointers into the struct we've just allocated */ - off = offsetof(bd_dma_able_t, selftest); - - bdp->selftest = (self_test_t *) (bdp->dma_able + off); - bdp->selftest_phys = bdp->dma_able_phys + off; - - off = offsetof(bd_dma_able_t, stats_counters); - - bdp->stats_counters = (max_counters_t *) (bdp->dma_able + off); - bdp->stat_cnt_phys = bdp->dma_able_phys + off; - - return 0; - -err: - printk(KERN_ERR - "e100: Failed to allocate memory\n"); - return -ENOMEM; -} - -/** - * e100_alloc_tcb_pool - allocate TCB circular list - * @bdp: atapter's private data struct - * - * This routine allocates memory for the circular list of transmit descriptors. - * - * Returns: - * 0: if allocation has failed. - * 1: Otherwise. - */ -int -e100_alloc_tcb_pool(struct e100_private *bdp) -{ - int stcb = sizeof (tcb_t) * bdp->params.TxDescriptors; - - /* allocate space for the TCBs */ - if (!(bdp->tcb_pool.data = - pci_alloc_consistent(bdp->pdev, stcb, &bdp->tcb_phys))) - return 0; - - memset(bdp->tcb_pool.data, 0x00, stcb); - - return 1; -} - -void -e100_free_tcb_pool(struct e100_private *bdp) -{ - tcb_t *tcb; - int i; - /* Return tx skbs */ - for (i = 0; i < bdp->params.TxDescriptors; i++) { - tcb = bdp->tcb_pool.data; - tcb += bdp->tcb_pool.head; - e100_tx_skb_free(bdp, tcb); - if (NEXT_TCB_TOUSE(bdp->tcb_pool.head) == bdp->tcb_pool.tail) - break; - bdp->tcb_pool.head = NEXT_TCB_TOUSE(bdp->tcb_pool.head); - } - pci_free_consistent(bdp->pdev, - sizeof (tcb_t) * bdp->params.TxDescriptors, - bdp->tcb_pool.data, bdp->tcb_phys); - bdp->tcb_pool.head = 0; - bdp->tcb_pool.tail = 1; - bdp->tcb_phys = 0; -} - -static void -e100_dealloc_space(struct e100_private *bdp) -{ - if (bdp->dma_able) { - pci_free_consistent(bdp->pdev, sizeof (bd_dma_able_t), - bdp->dma_able, bdp->dma_able_phys); - } - - bdp->selftest_phys = 0; - bdp->stat_cnt_phys = 0; - bdp->dma_able_phys = 0; - bdp->dma_able = 0; -} - -static void -e100_free_rfd_pool(struct e100_private *bdp) -{ - struct rx_list_elem *rx_struct; - - while (!list_empty(&(bdp->active_rx_list))) { - - rx_struct = list_entry(bdp->active_rx_list.next, - struct rx_list_elem, list_elem); - list_del(&(rx_struct->list_elem)); - pci_unmap_single(bdp->pdev, rx_struct->dma_addr, - sizeof (rfd_t), PCI_DMA_TODEVICE); - dev_kfree_skb(rx_struct->skb); - kfree(rx_struct); - } - - while (!list_empty(&(bdp->rx_struct_pool))) { - rx_struct = list_entry(bdp->rx_struct_pool.next, - struct rx_list_elem, list_elem); - list_del(&(rx_struct->list_elem)); - kfree(rx_struct); - } -} - -/** - * e100_alloc_rfd_pool - allocate RFDs - * @bdp: atapter's private data struct - * - * Allocates initial pool of skb which holds both rfd and data, - * and return a pointer to the head of the list - */ -static int -e100_alloc_rfd_pool(struct e100_private *bdp) -{ - struct rx_list_elem *rx_struct; - int i; - - INIT_LIST_HEAD(&(bdp->active_rx_list)); - INIT_LIST_HEAD(&(bdp->rx_struct_pool)); - bdp->skb_req = bdp->params.RxDescriptors; - for (i = 0; i < bdp->skb_req; i++) { - rx_struct = kmalloc(sizeof (struct rx_list_elem), GFP_ATOMIC); - list_add(&(rx_struct->list_elem), &(bdp->rx_struct_pool)); - } - e100_alloc_skbs(bdp); - return !list_empty(&(bdp->active_rx_list)); - -} - -void -e100_clear_pools(struct e100_private *bdp) -{ - bdp->last_tcb = NULL; - e100_free_rfd_pool(bdp); - e100_free_tcb_pool(bdp); -} - -/*****************************************************************************/ -/*****************************************************************************/ -/* Run Time Functions */ -/*****************************************************************************/ - -/** - * e100_watchdog - * @dev: adapter's net_device struct - * - * This routine runs every 2 seconds and updates our statitics and link state, - * and refreshs txthld value. - */ -void -e100_watchdog(struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - -#ifdef E100_CU_DEBUG - if (e100_cu_unknown_state(bdp)) { - printk(KERN_ERR "e100: %s: CU unknown state in e100_watchdog\n", - dev->name); - } -#endif - if (!netif_running(dev)) { - return; - } - - /* check if link state has changed */ - if (e100_phy_check(bdp)) { - if (netif_carrier_ok(dev)) { - printk(KERN_ERR - "e100: %s NIC Link is Up %d Mbps %s duplex\n", - bdp->device->name, bdp->cur_line_speed, - (bdp->cur_dplx_mode == HALF_DUPLEX) ? - "Half" : "Full"); - - e100_config_fc(bdp); - e100_config(bdp); - - } else { - printk(KERN_ERR "e100: %s NIC Link is Down\n", - bdp->device->name); - } - } - - // toggle the tx queue according to link status - // this also resolves a race condition between tx & non-cu cmd flows - if (netif_carrier_ok(dev)) { - if (netif_running(dev)) - netif_wake_queue(dev); - } else { - if (netif_running(dev)) - netif_stop_queue(dev); - /* When changing to non-autoneg, device may lose */ - /* link with some switches. e100 will try to */ - /* revover link by sending command to PHY layer */ - if (bdp->params.e100_speed_duplex != E100_AUTONEG) - e100_force_speed_duplex_to_phy(bdp); - } - - rmb(); - - if (e100_update_stats(bdp)) { - - /* Check if a change in the IFS parameter is needed, - and configure the device accordingly */ - if (bdp->params.b_params & PRM_IFS) - e100_manage_adaptive_ifs(bdp); - - /* Now adjust our dynamic tx threshold value */ - e100_refresh_txthld(bdp); - - /* Now if we are on a 557 and we havn't received any frames then we - * should issue a multicast command to reset the RU */ - if (bdp->rev_id < D101A4_REV_ID) { - if (!(bdp->stats_counters->basic_stats.rcv_gd_frames)) { - e100_set_multi(dev); - } - } - } - /* Issue command to dump statistics from device. */ - /* Check for command completion on next watchdog timer. */ - e100_dump_stats_cntrs(bdp); - - wmb(); - - /* relaunch watchdog timer in 2 sec */ - mod_timer(&(bdp->watchdog_timer), jiffies + (2 * HZ)); - - if (list_empty(&bdp->active_rx_list)) - e100_trigger_SWI(bdp); -} - -/** - * e100_manage_adaptive_ifs - * @bdp: atapter's private data struct - * - * This routine manages the adaptive Inter-Frame Spacing algorithm - * using a state machine. - */ -void -e100_manage_adaptive_ifs(struct e100_private *bdp) -{ - static u16 state_table[9][4] = { // rows are states - {2, 0, 0, 0}, // state0 // column0: next state if increasing - {2, 0, 5, 30}, // state1 // column1: next state if decreasing - {5, 1, 5, 30}, // state2 // column2: IFS value for 100 mbit - {5, 3, 0, 0}, // state3 // column3: IFS value for 10 mbit - {5, 3, 10, 60}, // state4 - {8, 4, 10, 60}, // state5 - {8, 6, 0, 0}, // state6 - {8, 6, 20, 60}, // state7 - {8, 7, 20, 60} // state8 - }; - - u32 transmits = - le32_to_cpu(bdp->stats_counters->basic_stats.xmt_gd_frames); - u32 collisions = - le32_to_cpu(bdp->stats_counters->basic_stats.xmt_ttl_coll); - u32 state = bdp->ifs_state; - u32 old_value = bdp->ifs_value; - int next_col; - u32 min_transmits; - - if (bdp->cur_dplx_mode == FULL_DUPLEX) { - bdp->ifs_state = 0; - bdp->ifs_value = 0; - - } else { /* Half Duplex */ - /* Set speed specific parameters */ - if (bdp->cur_line_speed == 100) { - next_col = 2; - min_transmits = MIN_NUMBER_OF_TRANSMITS_100; - - } else { /* 10 Mbps */ - next_col = 3; - min_transmits = MIN_NUMBER_OF_TRANSMITS_10; - } - - if ((transmits / 32 < collisions) - && (transmits > min_transmits)) { - state = state_table[state][0]; /* increment */ - - } else if (transmits < min_transmits) { - state = state_table[state][1]; /* decrement */ - } - - bdp->ifs_value = state_table[state][next_col]; - bdp->ifs_state = state; - } - - /* If the IFS value has changed, configure the device */ - if (bdp->ifs_value != old_value) { - e100_config_ifs(bdp); - e100_config(bdp); - } -} - -/** - * e100intr - interrupt handler - * @irq: the IRQ number - * @dev_inst: the net_device struct - * @regs: registers (unused) - * - * This routine is the ISR for the e100 board. It services - * the RX & TX queues & starts the RU if it has stopped due - * to no resources. - */ -irqreturn_t -e100intr(int irq, void *dev_inst, struct pt_regs *regs) -{ - struct net_device *dev; - struct e100_private *bdp; - u16 intr_status; - - dev = dev_inst; - bdp = dev->priv; - - intr_status = readw(&bdp->scb->scb_status); - /* If not my interrupt, just return */ - if (!(intr_status & SCB_STATUS_ACK_MASK) || (intr_status == 0xffff)) { - return IRQ_NONE; - } - - /* disable and ack intr */ - e100_disable_clear_intr(bdp); - - /* the device is closed, don't continue or else bad things may happen. */ - if (!netif_running(dev)) { - e100_set_intr_mask(bdp); - return IRQ_NONE; - } - - /* SWI intr (triggered by watchdog) is signal to allocate new skb buffers */ - if (intr_status & SCB_STATUS_ACK_SWI) { - e100_alloc_skbs(bdp); - } - - /* do recv work if any */ - if (intr_status & - (SCB_STATUS_ACK_FR | SCB_STATUS_ACK_RNR | SCB_STATUS_ACK_SWI)) - bdp->drv_stats.rx_intr_pkts += e100_rx_srv(bdp); - - /* clean up after tx'ed packets */ - if (intr_status & (SCB_STATUS_ACK_CNA | SCB_STATUS_ACK_CX)) - e100_tx_srv(bdp); - - e100_set_intr_mask(bdp); - return IRQ_HANDLED; -} - -/** - * e100_tx_skb_free - free TX skbs resources - * @bdp: atapter's private data struct - * @tcb: associated tcb of the freed skb - * - * This routine frees resources of TX skbs. - */ -static inline void -e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb) -{ - if (tcb->tcb_skb) { - int i; - tbd_t *tbd_arr = tcb->tbd_ptr; - int frags = skb_shinfo(tcb->tcb_skb)->nr_frags; - - for (i = 0; i <= frags; i++, tbd_arr++) { - pci_unmap_single(bdp->pdev, - le32_to_cpu(tbd_arr->tbd_buf_addr), - le16_to_cpu(tbd_arr->tbd_buf_cnt), - PCI_DMA_TODEVICE); - } - dev_kfree_skb_irq(tcb->tcb_skb); - tcb->tcb_skb = NULL; - } -} - -/** - * e100_tx_srv - service TX queues - * @bdp: atapter's private data struct - * - * This routine services the TX queues. It reclaims the TCB's & TBD's & other - * resources used during the transmit of this buffer. It is called from the ISR. - * We don't need a tx_lock since we always access buffers which were already - * prepared. - */ -void -e100_tx_srv(struct e100_private *bdp) -{ - tcb_t *tcb; - int i; - - /* go over at most TxDescriptors buffers */ - for (i = 0; i < bdp->params.TxDescriptors; i++) { - tcb = bdp->tcb_pool.data; - tcb += bdp->tcb_pool.head; - - rmb(); - - /* if the buffer at 'head' is not complete, break */ - if (!(tcb->tcb_hdr.cb_status & - __constant_cpu_to_le16(CB_STATUS_COMPLETE))) - break; - - /* service next buffer, clear the out of resource condition */ - e100_tx_skb_free(bdp, tcb); - - if (netif_running(bdp->device)) - netif_wake_queue(bdp->device); - - /* if we've caught up with 'tail', break */ - if (NEXT_TCB_TOUSE(bdp->tcb_pool.head) == bdp->tcb_pool.tail) { - break; - } - - bdp->tcb_pool.head = NEXT_TCB_TOUSE(bdp->tcb_pool.head); - } -} - -/** - * e100_rx_srv - service RX queue - * @bdp: atapter's private data struct - * @max_number_of_rfds: max number of RFDs to process - * @rx_congestion: flag pointer, to inform the calling function of congestion. - * - * This routine processes the RX interrupt & services the RX queues. - * For each successful RFD, it allocates a new msg block, links that - * into the RFD list, and sends the old msg upstream. - * The new RFD is then put at the end of the free list of RFD's. - * It returns the number of serviced RFDs. - */ -u32 -e100_rx_srv(struct e100_private *bdp) -{ - rfd_t *rfd; /* new rfd, received rfd */ - int i; - u16 rfd_status; - struct sk_buff *skb; - struct net_device *dev; - unsigned int data_sz; - struct rx_list_elem *rx_struct; - u32 rfd_cnt = 0; - - dev = bdp->device; - - /* current design of rx is as following: - * 1. socket buffer (skb) used to pass network packet to upper layer - * 2. all HW host memory structures (like RFDs, RBDs and data buffers) - * are placed in a skb's data room - * 3. when rx process is complete, we change skb internal pointers to exclude - * from data area all unrelated things (RFD, RDB) and to leave - * just rx'ed packet netto - * 4. for each skb passed to upper layer, new one is allocated instead. - * 5. if no skb left, in 2 sec another atempt to allocate skbs will be made - * (watchdog trigger SWI intr and isr should allocate new skbs) - */ - for (i = 0; i < bdp->params.RxDescriptors; i++) { - if (list_empty(&(bdp->active_rx_list))) { - break; - } - - rx_struct = list_entry(bdp->active_rx_list.next, - struct rx_list_elem, list_elem); - skb = rx_struct->skb; - - rfd = RFD_POINTER(skb, bdp); /* locate RFD within skb */ - - // sync only the RFD header - pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr, - bdp->rfd_size, PCI_DMA_FROMDEVICE); - rfd_status = le16_to_cpu(rfd->rfd_header.cb_status); /* get RFD's status */ - if (!(rfd_status & RFD_STATUS_COMPLETE)) /* does not contains data yet - exit */ - break; - - /* to allow manipulation with current skb we need to unlink it */ - list_del(&(rx_struct->list_elem)); - - /* do not free & unmap badly received packet. - * move it to the end of skb list for reuse */ - if (!(rfd_status & RFD_STATUS_OK)) { - e100_add_skb_to_end(bdp, rx_struct); - continue; - } - - data_sz = min_t(u16, (le16_to_cpu(rfd->rfd_act_cnt) & 0x3fff), - (sizeof (rfd_t) - bdp->rfd_size)); - - /* now sync all the data */ - pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr, - (data_sz + bdp->rfd_size), - PCI_DMA_FROMDEVICE); - - pci_unmap_single(bdp->pdev, rx_struct->dma_addr, - sizeof (rfd_t), PCI_DMA_FROMDEVICE); - - list_add(&(rx_struct->list_elem), &(bdp->rx_struct_pool)); - - /* end of dma access to rfd */ - bdp->skb_req++; /* incr number of requested skbs */ - e100_alloc_skbs(bdp); /* and get them */ - - /* set packet size, excluding checksum (2 last bytes) if it is present */ - if ((bdp->flags & DF_CSUM_OFFLOAD) - && (bdp->rev_id < D102_REV_ID)) - skb_put(skb, (int) data_sz - 2); - else - skb_put(skb, (int) data_sz); - - /* set the protocol */ - skb->protocol = eth_type_trans(skb, dev); - - /* set the checksum info */ - if (bdp->flags & DF_CSUM_OFFLOAD) { - if (bdp->rev_id >= D102_REV_ID) { - skb->ip_summed = e100_D102_check_checksum(rfd); - } else { - skb->ip_summed = e100_D101M_checksum(bdp, skb); - } - } else { - skb->ip_summed = CHECKSUM_NONE; - } - - bdp->drv_stats.net_stats.rx_bytes += skb->len; - - if(bdp->vlgrp && (rfd_status & CB_STATUS_VLAN)) { - vlan_hwaccel_rx(skb, bdp->vlgrp, be16_to_cpu(rfd->vlanid)); - } else { - netif_rx(skb); - } - dev->last_rx = jiffies; - - rfd_cnt++; - } /* end of rfd loop */ - - /* restart the RU if it has stopped */ - if ((readw(&bdp->scb->scb_status) & SCB_RUS_MASK) != SCB_RUS_READY) { - e100_start_ru(bdp); - } - - return rfd_cnt; -} - -void -e100_refresh_txthld(struct e100_private *bdp) -{ - basic_cntr_t *pstat = &(bdp->stats_counters->basic_stats); - - /* as long as tx_per_underrun is not 0, we can go about dynamically * - * adjusting the xmit threshold. we stop doing that & resort to defaults - * * once the adjustments become meaningless. the value is adjusted by * - * dumping the error counters & checking the # of xmit underrun errors * - * we've had. */ - if (bdp->tx_per_underrun) { - /* We are going to last values dumped from the dump statistics - * command */ - if (le32_to_cpu(pstat->xmt_gd_frames)) { - if (le32_to_cpu(pstat->xmt_uruns)) { - /* - * if we have had more than one underrun per "DEFAULT # - * OF XMITS ALLOWED PER UNDERRUN" good xmits, raise the - * THRESHOLD. - */ - if ((le32_to_cpu(pstat->xmt_gd_frames) / - le32_to_cpu(pstat->xmt_uruns)) < - bdp->tx_per_underrun) { - bdp->tx_thld += 3; - } - } - - /* - * if we've had less than one underrun per the DEFAULT number of - * of good xmits allowed, lower the THOLD but not less than 0 - */ - if (le32_to_cpu(pstat->xmt_gd_frames) > - bdp->tx_per_underrun) { - bdp->tx_thld--; - - if (bdp->tx_thld < 6) - bdp->tx_thld = 6; - - } - } - - /* end good xmits */ - /* - * * if our adjustments are becoming unresonable, stop adjusting & - * resort * to defaults & pray. A THOLD value > 190 means that the - * adapter will * wait for 190*8=1520 bytes in TX FIFO before it - * starts xmit. Since * MTU is 1514, it doesn't make any sense for - * further increase. */ - if (bdp->tx_thld >= 190) { - bdp->tx_per_underrun = 0; - bdp->tx_thld = 189; - } - } /* end underrun check */ -} - -/** - * e100_prepare_xmit_buff - prepare a buffer for transmission - * @bdp: atapter's private data struct - * @skb: skb to send - * - * This routine prepare a buffer for transmission. It checks - * the message length for the appropiate size. It picks up a - * free tcb from the TCB pool and sets up the corresponding - * TBD's. If the number of fragments are more than the number - * of TBD/TCB it copies all the fragments in a coalesce buffer. - * It returns a pointer to the prepared TCB. - */ -static inline tcb_t * -e100_prepare_xmit_buff(struct e100_private *bdp, struct sk_buff *skb) -{ - tcb_t *tcb, *prev_tcb; - - tcb = bdp->tcb_pool.data; - tcb += TCB_TO_USE(bdp->tcb_pool); - - if (bdp->flags & USE_IPCB) { - tcb->tcbu.ipcb.ip_activation_high = IPCB_IP_ACTIVATION_DEFAULT; - tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCP_PACKET; - tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCPUDP_CHECKSUM_ENABLE; - } - - if(bdp->vlgrp && vlan_tx_tag_present(skb)) { - (tcb->tcbu).ipcb.ip_activation_high |= IPCB_INSERTVLAN_ENABLE; - (tcb->tcbu).ipcb.vlan = cpu_to_be16(vlan_tx_tag_get(skb)); - } - - tcb->tcb_hdr.cb_status = 0; - tcb->tcb_thrshld = bdp->tx_thld; - tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_S_BIT); - - /* Set I (Interrupt) bit on every (TX_FRAME_CNT)th packet */ - if (!(++bdp->tx_count % TX_FRAME_CNT)) - tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_I_BIT); - else - /* Clear I bit on other packets */ - tcb->tcb_hdr.cb_cmd &= ~__constant_cpu_to_le16(CB_I_BIT); - - tcb->tcb_skb = skb; - - if (skb->ip_summed == CHECKSUM_HW) { - const struct iphdr *ip = skb->nh.iph; - - if ((ip->protocol == IPPROTO_TCP) || - (ip->protocol == IPPROTO_UDP)) { - - tcb->tcbu.ipcb.ip_activation_high |= - IPCB_HARDWAREPARSING_ENABLE; - tcb->tcbu.ipcb.ip_schedule |= - IPCB_TCPUDP_CHECKSUM_ENABLE; - - if (ip->protocol == IPPROTO_TCP) - tcb->tcbu.ipcb.ip_schedule |= IPCB_TCP_PACKET; - } - } - - if (!skb_shinfo(skb)->nr_frags) { - (tcb->tbd_ptr)->tbd_buf_addr = - cpu_to_le32(pci_map_single(bdp->pdev, skb->data, - skb->len, PCI_DMA_TODEVICE)); - (tcb->tbd_ptr)->tbd_buf_cnt = cpu_to_le16(skb->len); - tcb->tcb_tbd_num = 1; - tcb->tcb_tbd_ptr = tcb->tcb_tbd_dflt_ptr; - } else { - int i; - void *addr; - tbd_t *tbd_arr_ptr = &(tcb->tbd_ptr[1]); - skb_frag_t *frag = &skb_shinfo(skb)->frags[0]; - - (tcb->tbd_ptr)->tbd_buf_addr = - cpu_to_le32(pci_map_single(bdp->pdev, skb->data, - skb_headlen(skb), - PCI_DMA_TODEVICE)); - (tcb->tbd_ptr)->tbd_buf_cnt = - cpu_to_le16(skb_headlen(skb)); - - for (i = 0; i < skb_shinfo(skb)->nr_frags; - i++, tbd_arr_ptr++, frag++) { - - addr = ((void *) page_address(frag->page) + - frag->page_offset); - - tbd_arr_ptr->tbd_buf_addr = - cpu_to_le32(pci_map_single(bdp->pdev, - addr, frag->size, - PCI_DMA_TODEVICE)); - tbd_arr_ptr->tbd_buf_cnt = cpu_to_le16(frag->size); - } - tcb->tcb_tbd_num = skb_shinfo(skb)->nr_frags + 1; - tcb->tcb_tbd_ptr = tcb->tcb_tbd_expand_ptr; - } - - /* clear the S-BIT on the previous tcb */ - prev_tcb = bdp->tcb_pool.data; - prev_tcb += PREV_TCB_USED(bdp->tcb_pool); - prev_tcb->tcb_hdr.cb_cmd &= __constant_cpu_to_le16((u16) ~CB_S_BIT); - - bdp->tcb_pool.tail = NEXT_TCB_TOUSE(bdp->tcb_pool.tail); - - wmb(); - - e100_start_cu(bdp, tcb); - - return tcb; -} - -/* Changed for 82558 enhancement */ -/** - * e100_start_cu - start the adapter's CU - * @bdp: atapter's private data struct - * @tcb: TCB to be transmitted - * - * This routine issues a CU Start or CU Resume command to the 82558/9. - * This routine was added because the prepare_ext_xmit_buff takes advantage - * of the 82558/9's Dynamic TBD chaining feature and has to start the CU as - * soon as the first TBD is ready. - * - * e100_start_cu must be called while holding the tx_lock ! - */ -u8 -e100_start_cu(struct e100_private *bdp, tcb_t *tcb) -{ - unsigned long lock_flag; - u8 ret = true; - - spin_lock_irqsave(&(bdp->bd_lock), lock_flag); - switch (bdp->next_cu_cmd) { - case RESUME_NO_WAIT: - /*last cu command was a CU_RESMUE if this is a 558 or newer we don't need to - * wait for command word to clear, we reach here only if we are bachlor - */ - e100_exec_cmd(bdp, SCB_CUC_RESUME); - break; - - case RESUME_WAIT: - if ((bdp->flags & IS_ICH) && - (bdp->cur_line_speed == 10) && - (bdp->cur_dplx_mode == HALF_DUPLEX)) { - e100_wait_exec_simple(bdp, SCB_CUC_NOOP); - udelay(1); - } - if ((e100_wait_exec_simple(bdp, SCB_CUC_RESUME)) && - (bdp->flags & IS_BACHELOR) && (!(bdp->flags & IS_ICH))) { - bdp->next_cu_cmd = RESUME_NO_WAIT; - } - break; - - case START_WAIT: - // The last command was a non_tx CU command - if (!e100_wait_cus_idle(bdp)) - printk(KERN_DEBUG - "e100: %s: cu_start: timeout waiting for cu\n", - bdp->device->name); - if (!e100_wait_exec_cmplx(bdp, (u32) (tcb->tcb_phys), - SCB_CUC_START, CB_TRANSMIT)) { - printk(KERN_DEBUG - "e100: %s: cu_start: timeout waiting for scb\n", - bdp->device->name); - e100_exec_cmplx(bdp, (u32) (tcb->tcb_phys), - SCB_CUC_START); - ret = false; - } - - bdp->next_cu_cmd = RESUME_WAIT; - - break; - } - - /* save the last tcb */ - bdp->last_tcb = tcb; - - spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag); - return ret; -} - -/* ====================================================================== */ -/* hw */ -/* ====================================================================== */ - -/** - * e100_selftest - perform H/W self test - * @bdp: atapter's private data struct - * @st_timeout: address to return timeout value, if fails - * @st_result: address to return selftest result, if fails - * - * This routine will issue PORT Self-test command to test the e100. - * The self-test will fail if the adapter's master-enable bit is not - * set in the PCI Command Register, or if the adapter is not seated - * in a PCI master-enabled slot. we also disable interrupts when the - * command is completed. - * - * Returns: - * true: if adapter passes self_test - * false: otherwise - */ -unsigned char -e100_selftest(struct e100_private *bdp, u32 *st_timeout, u32 *st_result) -{ - u32 selftest_cmd; - - /* initialize the nic state before running test */ - e100_sw_reset(bdp, PORT_SOFTWARE_RESET); - /* Setup the address of the self_test area */ - selftest_cmd = bdp->selftest_phys; - - /* Setup SELF TEST Command Code in D3 - D0 */ - selftest_cmd |= PORT_SELFTEST; - - /* Initialize the self-test signature and results DWORDS */ - bdp->selftest->st_sign = 0; - bdp->selftest->st_result = 0xffffffff; - - /* Do the port command */ - writel(selftest_cmd, &bdp->scb->scb_port); - readw(&(bdp->scb->scb_status)); /* flushes last write, read-safe */ - - /* Wait at least 10 milliseconds for the self-test to complete */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ / 100 + 1); - - /* disable interrupts since they are enabled */ - /* after device reset during selftest */ - e100_disable_clear_intr(bdp); - - /* if The First Self Test DWORD Still Zero, We've timed out. If the - * second DWORD is not zero then we have an error. */ - if ((bdp->selftest->st_sign == 0) || (bdp->selftest->st_result != 0)) { - - if (st_timeout) - *st_timeout = !(le32_to_cpu(bdp->selftest->st_sign)); - - if (st_result) - *st_result = le32_to_cpu(bdp->selftest->st_result); - - return false; - } - - return true; -} - -/** - * e100_setup_iaaddr - issue IA setup sommand - * @bdp: atapter's private data struct - * @eaddr: new ethernet address - * - * This routine will issue the IA setup command. This command - * will notify the 82557 (e100) of what its individual (node) - * address is. This command will be executed in polled mode. - * - * Returns: - * true: if the IA setup command was successfully issued and completed - * false: otherwise - */ -unsigned char -e100_setup_iaaddr(struct e100_private *bdp, u8 *eaddr) -{ - unsigned int i; - cb_header_t *ntcb_hdr; - unsigned char res; - nxmit_cb_entry_t *cmd; - - if ((cmd = e100_alloc_non_tx_cmd(bdp)) == NULL) { - res = false; - goto exit; - } - - ntcb_hdr = (cb_header_t *) cmd->non_tx_cmd; - ntcb_hdr->cb_cmd = __constant_cpu_to_le16(CB_IA_ADDRESS); - - for (i = 0; i < ETH_ALEN; i++) { - (cmd->non_tx_cmd)->ntcb.setup.ia_addr[i] = eaddr[i]; - } - - res = e100_exec_non_cu_cmd(bdp, cmd); - if (!res) - printk(KERN_WARNING "e100: %s: IA setup failed\n", - bdp->device->name); - -exit: - return res; -} - -/** - * e100_start_ru - start the RU if needed - * @bdp: atapter's private data struct - * - * This routine checks the status of the 82557's receive unit(RU), - * and starts the RU if it was not already active. However, - * before restarting the RU, the driver gives the RU the buffers - * it freed up during the servicing of the ISR. If there are - * no free buffers to give to the RU, (i.e. we have reached a - * no resource condition) the RU will not be started till the - * next ISR. - */ -void -e100_start_ru(struct e100_private *bdp) -{ - struct rx_list_elem *rx_struct = NULL; - int buffer_found = 0; - struct list_head *entry_ptr; - - list_for_each(entry_ptr, &(bdp->active_rx_list)) { - rx_struct = - list_entry(entry_ptr, struct rx_list_elem, list_elem); - pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr, - bdp->rfd_size, PCI_DMA_FROMDEVICE); - if (!((SKB_RFD_STATUS(rx_struct->skb, bdp) & - __constant_cpu_to_le16(RFD_STATUS_COMPLETE)))) { - buffer_found = 1; - break; - } - } - - /* No available buffers */ - if (!buffer_found) { - return; - } - - spin_lock(&bdp->bd_lock); - - if (!e100_wait_exec_cmplx(bdp, rx_struct->dma_addr, SCB_RUC_START, 0)) { - printk(KERN_DEBUG - "e100: %s: start_ru: wait_scb failed\n", - bdp->device->name); - e100_exec_cmplx(bdp, rx_struct->dma_addr, SCB_RUC_START); - } - if (bdp->next_cu_cmd == RESUME_NO_WAIT) { - bdp->next_cu_cmd = RESUME_WAIT; - } - spin_unlock(&bdp->bd_lock); -} - -/** - * e100_cmd_complete_location - * @bdp: atapter's private data struct - * - * This routine returns a pointer to the location of the command-complete - * DWord in the dump statistical counters area, according to the statistical - * counters mode (557 - basic, 558 - extended, or 559 - TCO mode). - * See e100_config_init() for the setting of the statistical counters mode. - */ -static u32 * -e100_cmd_complete_location(struct e100_private *bdp) -{ - u32 *cmd_complete; - max_counters_t *stats = bdp->stats_counters; - - switch (bdp->stat_mode) { - case E100_EXTENDED_STATS: - cmd_complete = - (u32 *) &(((err_cntr_558_t *) (stats))->cmd_complete); - break; - - case E100_TCO_STATS: - cmd_complete = - (u32 *) &(((err_cntr_559_t *) (stats))->cmd_complete); - break; - - case E100_BASIC_STATS: - default: - cmd_complete = - (u32 *) &(((err_cntr_557_t *) (stats))->cmd_complete); - break; - } - - return cmd_complete; -} - -/** - * e100_clr_cntrs - clear statistics counters - * @bdp: atapter's private data struct - * - * This routine will clear the adapter error statistic counters. - * - * Returns: - * true: if successfully cleared stat counters - * false: otherwise - */ -static unsigned char -e100_clr_cntrs(struct e100_private *bdp) -{ - volatile u32 *pcmd_complete; - - /* clear the dump counter complete word */ - pcmd_complete = e100_cmd_complete_location(bdp); - *pcmd_complete = 0; - wmb(); - - if (!e100_wait_exec_cmplx(bdp, bdp->stat_cnt_phys, SCB_CUC_DUMP_ADDR, 0)) - return false; - - /* wait 10 microseconds for the command to complete */ - udelay(10); - - if (!e100_wait_exec_simple(bdp, SCB_CUC_DUMP_RST_STAT)) - return false; - - if (bdp->next_cu_cmd == RESUME_NO_WAIT) { - bdp->next_cu_cmd = RESUME_WAIT; - } - - return true; -} - -static unsigned char -e100_update_stats(struct e100_private *bdp) -{ - u32 *pcmd_complete; - basic_cntr_t *pstat = &(bdp->stats_counters->basic_stats); - - // check if last dump command completed - pcmd_complete = e100_cmd_complete_location(bdp); - if (*pcmd_complete != le32_to_cpu(DUMP_RST_STAT_COMPLETED) && - *pcmd_complete != le32_to_cpu(DUMP_STAT_COMPLETED)) { - *pcmd_complete = 0; - return false; - } - - /* increment the statistics */ - bdp->drv_stats.net_stats.rx_packets += - le32_to_cpu(pstat->rcv_gd_frames); - bdp->drv_stats.net_stats.tx_packets += - le32_to_cpu(pstat->xmt_gd_frames); - bdp->drv_stats.net_stats.rx_dropped += le32_to_cpu(pstat->rcv_rsrc_err); - bdp->drv_stats.net_stats.collisions += le32_to_cpu(pstat->xmt_ttl_coll); - bdp->drv_stats.net_stats.rx_length_errors += - le32_to_cpu(pstat->rcv_shrt_frames); - bdp->drv_stats.net_stats.rx_over_errors += - le32_to_cpu(pstat->rcv_rsrc_err); - bdp->drv_stats.net_stats.rx_crc_errors += - le32_to_cpu(pstat->rcv_crc_errs); - bdp->drv_stats.net_stats.rx_frame_errors += - le32_to_cpu(pstat->rcv_algn_errs); - bdp->drv_stats.net_stats.rx_fifo_errors += - le32_to_cpu(pstat->rcv_oruns); - bdp->drv_stats.net_stats.tx_aborted_errors += - le32_to_cpu(pstat->xmt_max_coll); - bdp->drv_stats.net_stats.tx_carrier_errors += - le32_to_cpu(pstat->xmt_lost_crs); - bdp->drv_stats.net_stats.tx_fifo_errors += - le32_to_cpu(pstat->xmt_uruns); - - bdp->drv_stats.tx_late_col += le32_to_cpu(pstat->xmt_late_coll); - bdp->drv_stats.tx_ok_defrd += le32_to_cpu(pstat->xmt_deferred); - bdp->drv_stats.tx_one_retry += le32_to_cpu(pstat->xmt_sngl_coll); - bdp->drv_stats.tx_mt_one_retry += le32_to_cpu(pstat->xmt_mlt_coll); - bdp->drv_stats.rcv_cdt_frames += le32_to_cpu(pstat->rcv_err_coll); - - if (bdp->stat_mode != E100_BASIC_STATS) { - ext_cntr_t *pex_stat = &bdp->stats_counters->extended_stats; - - bdp->drv_stats.xmt_fc_pkts += - le32_to_cpu(pex_stat->xmt_fc_frames); - bdp->drv_stats.rcv_fc_pkts += - le32_to_cpu(pex_stat->rcv_fc_frames); - bdp->drv_stats.rcv_fc_unsupported += - le32_to_cpu(pex_stat->rcv_fc_unsupported); - } - - if (bdp->stat_mode == E100_TCO_STATS) { - tco_cntr_t *ptco_stat = &bdp->stats_counters->tco_stats; - - bdp->drv_stats.xmt_tco_pkts += - le16_to_cpu(ptco_stat->xmt_tco_frames); - bdp->drv_stats.rcv_tco_pkts += - le16_to_cpu(ptco_stat->rcv_tco_frames); - } - - *pcmd_complete = 0; - return true; -} - -/** - * e100_dump_stat_cntrs - * @bdp: atapter's private data struct - * - * This routine will dump the board statistical counters without waiting - * for stat_dump to complete. Any access to this stats should verify the completion - * of the command - */ -void -e100_dump_stats_cntrs(struct e100_private *bdp) -{ - unsigned long lock_flag_bd; - - spin_lock_irqsave(&(bdp->bd_lock), lock_flag_bd); - - /* dump h/w stats counters */ - if (e100_wait_exec_simple(bdp, SCB_CUC_DUMP_RST_STAT)) { - if (bdp->next_cu_cmd == RESUME_NO_WAIT) { - bdp->next_cu_cmd = RESUME_WAIT; - } - } - - spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag_bd); -} - -/** - * e100_exec_non_cu_cmd - * @bdp: atapter's private data struct - * @command: the non-cu command to execute - * - * This routine will submit a command block to be executed, - */ -unsigned char -e100_exec_non_cu_cmd(struct e100_private *bdp, nxmit_cb_entry_t *command) -{ - cb_header_t *ntcb_hdr; - unsigned long lock_flag; - unsigned long expiration_time; - unsigned char rc = true; - u8 sub_cmd; - - ntcb_hdr = (cb_header_t *) command->non_tx_cmd; /* get hdr of non tcb cmd */ - sub_cmd = cpu_to_le16(ntcb_hdr->cb_cmd); - - /* Set the Command Block to be the last command block */ - ntcb_hdr->cb_cmd |= __constant_cpu_to_le16(CB_EL_BIT); - ntcb_hdr->cb_status = 0; - ntcb_hdr->cb_lnk_ptr = 0; - - wmb(); - if (in_interrupt()) - return e100_delayed_exec_non_cu_cmd(bdp, command); - - if (netif_running(bdp->device) && netif_carrier_ok(bdp->device)) - return e100_delayed_exec_non_cu_cmd(bdp, command); - - spin_lock_bh(&(bdp->bd_non_tx_lock)); - - if (bdp->non_tx_command_state != E100_NON_TX_IDLE) { - goto delayed_exec; - } - - if (bdp->last_tcb) { - rmb(); - if ((bdp->last_tcb->tcb_hdr.cb_status & - __constant_cpu_to_le16(CB_STATUS_COMPLETE)) == 0) - goto delayed_exec; - } - - if ((readw(&bdp->scb->scb_status) & SCB_CUS_MASK) == SCB_CUS_ACTIVE) { - goto delayed_exec; - } - - spin_lock_irqsave(&bdp->bd_lock, lock_flag); - - if (!e100_wait_exec_cmplx(bdp, command->dma_addr, SCB_CUC_START, sub_cmd)) { - spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag); - rc = false; - goto exit; - } - - bdp->next_cu_cmd = START_WAIT; - spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag); - - /* now wait for completion of non-cu CB up to 20 msec */ - expiration_time = jiffies + HZ / 50 + 1; - rmb(); - while (!(ntcb_hdr->cb_status & - __constant_cpu_to_le16(CB_STATUS_COMPLETE))) { - - if (time_before(jiffies, expiration_time)) { - spin_unlock_bh(&(bdp->bd_non_tx_lock)); - yield(); - spin_lock_bh(&(bdp->bd_non_tx_lock)); - } else { -#ifdef E100_CU_DEBUG - printk(KERN_ERR "e100: %s: non-TX command (%x) " - "timeout\n", bdp->device->name, sub_cmd); -#endif - rc = false; - goto exit; - } - rmb(); - } - -exit: - e100_free_non_tx_cmd(bdp, command); - - if (netif_running(bdp->device)) - netif_wake_queue(bdp->device); - - spin_unlock_bh(&(bdp->bd_non_tx_lock)); - return rc; - -delayed_exec: - spin_unlock_bh(&(bdp->bd_non_tx_lock)); - return e100_delayed_exec_non_cu_cmd(bdp, command); -} - -/** - * e100_sw_reset - * @bdp: atapter's private data struct - * @reset_cmd: s/w reset or selective reset - * - * This routine will issue a software reset to the adapter. It - * will also disable interrupts, as the are enabled after reset. - */ -void -e100_sw_reset(struct e100_private *bdp, u32 reset_cmd) -{ - /* Do a selective reset first to avoid a potential PCI hang */ - writel(PORT_SELECTIVE_RESET, &bdp->scb->scb_port); - readw(&(bdp->scb->scb_status)); /* flushes last write, read-safe */ - - /* wait for the reset to take effect */ - udelay(20); - if (reset_cmd == PORT_SOFTWARE_RESET) { - writel(PORT_SOFTWARE_RESET, &bdp->scb->scb_port); - - /* wait 20 micro seconds for the reset to take effect */ - udelay(20); - } - - /* Mask off our interrupt line -- it is unmasked after reset */ - e100_disable_clear_intr(bdp); -#ifdef E100_CU_DEBUG - bdp->last_cmd = 0; - bdp->last_sub_cmd = 0; -#endif -} - -/** - * e100_load_microcode - Download microsocde to controller. - * @bdp: atapter's private data struct - * - * This routine downloads microcode on to the controller. This - * microcode is available for the 82558/9, 82550. Currently the - * microcode handles interrupt bundling and TCO workaround. - * - * Returns: - * true: if successfull - * false: otherwise - */ -static unsigned char -e100_load_microcode(struct e100_private *bdp) -{ - static struct { - u8 rev_id; - u32 ucode[UCODE_MAX_DWORDS + 1]; - int timer_dword; - int bundle_dword; - int min_size_dword; - } ucode_opts[] = { - { D101A4_REV_ID, - D101_A_RCVBUNDLE_UCODE, - D101_CPUSAVER_TIMER_DWORD, - D101_CPUSAVER_BUNDLE_DWORD, - D101_CPUSAVER_MIN_SIZE_DWORD }, - { D101B0_REV_ID, - D101_B0_RCVBUNDLE_UCODE, - D101_CPUSAVER_TIMER_DWORD, - D101_CPUSAVER_BUNDLE_DWORD, - D101_CPUSAVER_MIN_SIZE_DWORD }, - { D101MA_REV_ID, - D101M_B_RCVBUNDLE_UCODE, - D101M_CPUSAVER_TIMER_DWORD, - D101M_CPUSAVER_BUNDLE_DWORD, - D101M_CPUSAVER_MIN_SIZE_DWORD }, - { D101S_REV_ID, - D101S_RCVBUNDLE_UCODE, - D101S_CPUSAVER_TIMER_DWORD, - D101S_CPUSAVER_BUNDLE_DWORD, - D101S_CPUSAVER_MIN_SIZE_DWORD }, - { D102_REV_ID, - D102_B_RCVBUNDLE_UCODE, - D102_B_CPUSAVER_TIMER_DWORD, - D102_B_CPUSAVER_BUNDLE_DWORD, - D102_B_CPUSAVER_MIN_SIZE_DWORD }, - { D102C_REV_ID, - D102_C_RCVBUNDLE_UCODE, - D102_C_CPUSAVER_TIMER_DWORD, - D102_C_CPUSAVER_BUNDLE_DWORD, - D102_C_CPUSAVER_MIN_SIZE_DWORD }, - { D102E_REV_ID, - D102_E_RCVBUNDLE_UCODE, - D102_E_CPUSAVER_TIMER_DWORD, - D102_E_CPUSAVER_BUNDLE_DWORD, - D102_E_CPUSAVER_MIN_SIZE_DWORD }, - { 0, {0}, 0, 0, 0} - }, *opts; - - opts = ucode_opts; - - /* User turned ucode loading off */ - if (!(bdp->params.b_params & PRM_UCODE)) - return false; - - /* These controllers do not need ucode */ - if (bdp->flags & IS_ICH) - return false; - - /* Search for ucode match against h/w rev_id */ - while (opts->rev_id) { - if (bdp->rev_id == opts->rev_id) { - int i; - u32 *ucode_dword; - load_ucode_cb_t *ucode_cmd_ptr; - nxmit_cb_entry_t *cmd = e100_alloc_non_tx_cmd(bdp); - - if (cmd != NULL) { - ucode_cmd_ptr = - (load_ucode_cb_t *) cmd->non_tx_cmd; - ucode_dword = ucode_cmd_ptr->ucode_dword; - } else { - return false; - } - - memcpy(ucode_dword, opts->ucode, sizeof (opts->ucode)); - - /* Insert user-tunable settings */ - ucode_dword[opts->timer_dword] &= 0xFFFF0000; - ucode_dword[opts->timer_dword] |= - (u16) bdp->params.IntDelay; - ucode_dword[opts->bundle_dword] &= 0xFFFF0000; - ucode_dword[opts->bundle_dword] |= - (u16) bdp->params.BundleMax; - ucode_dword[opts->min_size_dword] &= 0xFFFF0000; - ucode_dword[opts->min_size_dword] |= - (bdp->params.b_params & PRM_BUNDLE_SMALL) ? - 0xFFFF : 0xFF80; - - for (i = 0; i < UCODE_MAX_DWORDS; i++) - cpu_to_le32s(&(ucode_dword[i])); - - ucode_cmd_ptr->load_ucode_cbhdr.cb_cmd = - __constant_cpu_to_le16(CB_LOAD_MICROCODE); - - return e100_exec_non_cu_cmd(bdp, cmd); - } - opts++; - } - - return false; -} - -/***************************************************************************/ -/***************************************************************************/ -/* EEPROM Functions */ -/***************************************************************************/ - -/* Read PWA (printed wired assembly) number */ -void -e100_rd_pwa_no(struct e100_private *bdp) -{ - bdp->pwa_no = e100_eeprom_read(bdp, EEPROM_PWA_NO); - bdp->pwa_no <<= 16; - bdp->pwa_no |= e100_eeprom_read(bdp, EEPROM_PWA_NO + 1); -} - -/* Read the permanent ethernet address from the eprom. */ -void -e100_rd_eaddr(struct e100_private *bdp) -{ - int i; - u16 eeprom_word; - - for (i = 0; i < 6; i += 2) { - eeprom_word = - e100_eeprom_read(bdp, - EEPROM_NODE_ADDRESS_BYTE_0 + (i / 2)); - - bdp->device->dev_addr[i] = - bdp->perm_node_address[i] = (u8) eeprom_word; - bdp->device->dev_addr[i + 1] = - bdp->perm_node_address[i + 1] = (u8) (eeprom_word >> 8); - } -} - -/* Check the D102 RFD flags to see if the checksum passed */ -static unsigned char -e100_D102_check_checksum(rfd_t *rfd) -{ - if (((le16_to_cpu(rfd->rfd_header.cb_status)) & RFD_PARSE_BIT) - && (((rfd->rcvparserstatus & CHECKSUM_PROTOCOL_MASK) == - RFD_TCP_PACKET) - || ((rfd->rcvparserstatus & CHECKSUM_PROTOCOL_MASK) == - RFD_UDP_PACKET)) - && (rfd->checksumstatus & TCPUDP_CHECKSUM_BIT_VALID) - && (rfd->checksumstatus & TCPUDP_CHECKSUM_VALID)) { - return CHECKSUM_UNNECESSARY; - } - return CHECKSUM_NONE; -} - -/** - * e100_D101M_checksum - * @bdp: atapter's private data struct - * @skb: skb received - * - * Sets the skb->csum value from D101 csum found at the end of the Rx frame. The - * D101M sums all words in frame excluding the ethernet II header (14 bytes) so - * in case the packet is ethernet II and the protocol is IP, all is need is to - * assign this value to skb->csum. - */ -static unsigned char -e100_D101M_checksum(struct e100_private *bdp, struct sk_buff *skb) -{ - unsigned short proto = (skb->protocol); - - if (proto == __constant_htons(ETH_P_IP)) { - - skb->csum = get_unaligned((u16 *) (skb->tail)); - return CHECKSUM_HW; - } - return CHECKSUM_NONE; -} - -/***************************************************************************/ -/***************************************************************************/ -/***************************************************************************/ -/***************************************************************************/ -/* Auxilary Functions */ -/***************************************************************************/ - -/* Print the board's configuration */ -void -e100_print_brd_conf(struct e100_private *bdp) -{ - /* Print the string if checksum Offloading was enabled */ - if (bdp->flags & DF_CSUM_OFFLOAD) - printk(KERN_NOTICE " Hardware receive checksums enabled\n"); - else { - if (bdp->rev_id >= D101MA_REV_ID) - printk(KERN_NOTICE " Hardware receive checksums disabled\n"); - } - - if ((bdp->flags & DF_UCODE_LOADED)) - printk(KERN_NOTICE " cpu cycle saver enabled\n"); -} - -/** - * e100_pci_setup - setup the adapter's PCI information - * @pcid: adapter's pci_dev struct - * @bdp: atapter's private data struct - * - * This routine sets up all PCI information for the adapter. It enables the bus - * master bit (some BIOS don't do this), requests memory ans I/O regions, and - * calls ioremap() on the adapter's memory region. - * - * Returns: - * true: if successfull - * false: otherwise - */ -static unsigned char -e100_pci_setup(struct pci_dev *pcid, struct e100_private *bdp) -{ - struct net_device *dev = bdp->device; - int rc = 0; - - if ((rc = pci_enable_device(pcid)) != 0) { - goto err; - } - - /* dev and ven ID have already been checked so it is our device */ - pci_read_config_byte(pcid, PCI_REVISION_ID, (u8 *) &(bdp->rev_id)); - - /* address #0 is a memory region */ - dev->mem_start = pci_resource_start(pcid, 0); - dev->mem_end = dev->mem_start + sizeof (scb_t); - - /* address #1 is a IO region */ - dev->base_addr = pci_resource_start(pcid, 1); - - if ((rc = pci_request_regions(pcid, e100_short_driver_name)) != 0) { - goto err_disable; - } - - pci_enable_wake(pcid, 0, 0); - - /* if Bus Mastering is off, turn it on! */ - pci_set_master(pcid); - - /* address #0 is a memory mapping */ - bdp->scb = (scb_t *) ioremap_nocache(dev->mem_start, sizeof (scb_t)); - - if (!bdp->scb) { - printk(KERN_ERR "e100: %s: Failed to map PCI address 0x%lX\n", - dev->name, pci_resource_start(pcid, 0)); - rc = -ENOMEM; - goto err_region; - } - - return 0; - -err_region: - pci_release_regions(pcid); -err_disable: - pci_disable_device(pcid); -err: - return rc; -} - -void -e100_isolate_driver(struct e100_private *bdp) -{ - - /* Check if interface is up */ - /* NOTE: Can't use netif_running(bdp->device) because */ - /* dev_close clears __LINK_STATE_START before calling */ - /* e100_close (aka dev->stop) */ - if (bdp->device->flags & IFF_UP) { - e100_disable_clear_intr(bdp); - del_timer_sync(&bdp->watchdog_timer); - netif_carrier_off(bdp->device); - netif_stop_queue(bdp->device); - bdp->last_tcb = NULL; - } - e100_sw_reset(bdp, PORT_SELECTIVE_RESET); -} - -static void -e100_tcb_add_C_bit(struct e100_private *bdp) -{ - tcb_t *tcb = (tcb_t *) bdp->tcb_pool.data; - int i; - - for (i = 0; i < bdp->params.TxDescriptors; i++, tcb++) { - tcb->tcb_hdr.cb_status |= cpu_to_le16(CB_STATUS_COMPLETE); - } -} - -/* - * Procedure: e100_configure_device - * - * Description: This routine will configure device - * - * Arguments: - * bdp - Ptr to this card's e100_bdconfig structure - * - * Returns: - * true upon success - * false upon failure - */ -unsigned char -e100_configure_device(struct e100_private *bdp) -{ - /*load CU & RU base */ - if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0)) - return false; - - if (e100_load_microcode(bdp)) - bdp->flags |= DF_UCODE_LOADED; - - if (!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0)) - return false; - - /* Issue the load dump counters address command */ - if (!e100_wait_exec_cmplx(bdp, bdp->stat_cnt_phys, SCB_CUC_DUMP_ADDR, 0)) - return false; - - if (!e100_setup_iaaddr(bdp, bdp->device->dev_addr)) { - printk(KERN_ERR "e100: e100_configure_device: " - "setup iaaddr failed\n"); - return false; - } - - e100_set_multi_exec(bdp->device); - - /* Change for 82558 enhancement */ - /* If 82558/9 and if the user has enabled flow control, set up */ - /* flow Control Reg. in the CSR */ - if ((bdp->flags & IS_BACHELOR) - && (bdp->params.b_params & PRM_FC)) { - writeb(DFLT_FC_THLD, - &bdp->scb->scb_ext.d101_scb.scb_fc_thld); - writeb(DFLT_FC_CMD, - &bdp->scb->scb_ext.d101_scb.scb_fc_xon_xoff); - } - - e100_force_config(bdp); - - return true; -} - -void -e100_deisolate_driver(struct e100_private *bdp, u8 full_reset) -{ - u32 cmd = full_reset ? PORT_SOFTWARE_RESET : PORT_SELECTIVE_RESET; - e100_sw_reset(bdp, cmd); - if (cmd == PORT_SOFTWARE_RESET) { - if (!e100_configure_device(bdp)) - printk(KERN_ERR "e100: e100_deisolate_driver:" - " device configuration failed\n"); - } - - if (netif_running(bdp->device)) { - - bdp->next_cu_cmd = START_WAIT; - bdp->last_tcb = NULL; - - e100_start_ru(bdp); - - /* relaunch watchdog timer in 2 sec */ - mod_timer(&(bdp->watchdog_timer), jiffies + (2 * HZ)); - - // we must clear tcbs since we may have lost Tx intrrupt - // or have unsent frames on the tcb chain - e100_tcb_add_C_bit(bdp); - e100_tx_srv(bdp); - netif_wake_queue(bdp->device); - e100_set_intr_mask(bdp); - } -} - -static int -e100_do_ethtool_ioctl(struct net_device *dev, struct ifreq *ifr) -{ - struct ethtool_cmd ecmd; - int rc = -EOPNOTSUPP; - - if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd.cmd))) - return -EFAULT; - - switch (ecmd.cmd) { - case ETHTOOL_GSET: - rc = e100_ethtool_get_settings(dev, ifr); - break; - case ETHTOOL_SSET: - rc = e100_ethtool_set_settings(dev, ifr); - break; - case ETHTOOL_GDRVINFO: - rc = e100_ethtool_get_drvinfo(dev, ifr); - break; - case ETHTOOL_GREGS: - rc = e100_ethtool_gregs(dev, ifr); - break; - case ETHTOOL_NWAY_RST: - rc = e100_ethtool_nway_rst(dev, ifr); - break; - case ETHTOOL_GLINK: - rc = e100_ethtool_glink(dev, ifr); - break; - case ETHTOOL_GEEPROM: - case ETHTOOL_SEEPROM: - rc = e100_ethtool_eeprom(dev, ifr); - break; - case ETHTOOL_GSTATS: { - struct { - struct ethtool_stats cmd; - uint64_t data[E100_STATS_LEN]; - } stats = { {ETHTOOL_GSTATS, E100_STATS_LEN} }; - struct e100_private *bdp = dev->priv; - void *addr = ifr->ifr_data; - int i; - - for(i = 0; i < E100_STATS_LEN; i++) - stats.data[i] = - ((unsigned long *)&bdp->drv_stats.net_stats)[i]; - if(copy_to_user(addr, &stats, sizeof(stats))) - return -EFAULT; - return 0; - } - case ETHTOOL_GWOL: - case ETHTOOL_SWOL: - rc = e100_ethtool_wol(dev, ifr); - break; - case ETHTOOL_TEST: - rc = e100_ethtool_test(dev, ifr); - break; - case ETHTOOL_GSTRINGS: - rc = e100_ethtool_gstrings(dev,ifr); - break; - case ETHTOOL_PHYS_ID: - rc = e100_ethtool_led_blink(dev,ifr); - break; -#ifdef ETHTOOL_GRINGPARAM - case ETHTOOL_GRINGPARAM: { - struct ethtool_ringparam ering; - struct e100_private *bdp = dev->priv; - memset((void *) &ering, 0, sizeof(ering)); - ering.rx_max_pending = E100_MAX_RFD; - ering.tx_max_pending = E100_MAX_TCB; - ering.rx_pending = bdp->params.RxDescriptors; - ering.tx_pending = bdp->params.TxDescriptors; - rc = copy_to_user(ifr->ifr_data, &ering, sizeof(ering)) - ? -EFAULT : 0; - return rc; - } -#endif -#ifdef ETHTOOL_SRINGPARAM - case ETHTOOL_SRINGPARAM: { - struct ethtool_ringparam ering; - struct e100_private *bdp = dev->priv; - if (copy_from_user(&ering, ifr->ifr_data, sizeof(ering))) - return -EFAULT; - if (ering.rx_pending > E100_MAX_RFD - || ering.rx_pending < E100_MIN_RFD) - return -EINVAL; - if (ering.tx_pending > E100_MAX_TCB - || ering.tx_pending < E100_MIN_TCB) - return -EINVAL; - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - /* Use new values to open interface */ - bdp->params.RxDescriptors = ering.rx_pending; - bdp->params.TxDescriptors = ering.tx_pending; - e100_hw_init(bdp); - e100_open(dev); - } - else { - bdp->params.RxDescriptors = ering.rx_pending; - bdp->params.TxDescriptors = ering.tx_pending; - } - return 0; - } -#endif -#ifdef ETHTOOL_GPAUSEPARAM - case ETHTOOL_GPAUSEPARAM: { - struct ethtool_pauseparam epause; - struct e100_private *bdp = dev->priv; - memset((void *) &epause, 0, sizeof(epause)); - if ((bdp->flags & IS_BACHELOR) - && (bdp->params.b_params & PRM_FC)) { - epause.autoneg = 1; - if (bdp->flags && DF_LINK_FC_CAP) { - epause.rx_pause = 1; - epause.tx_pause = 1; - } - if (bdp->flags && DF_LINK_FC_TX_ONLY) - epause.tx_pause = 1; - } - rc = copy_to_user(ifr->ifr_data, &epause, sizeof(epause)) - ? -EFAULT : 0; - return rc; - } -#endif -#ifdef ETHTOOL_SPAUSEPARAM - case ETHTOOL_SPAUSEPARAM: { - struct ethtool_pauseparam epause; - struct e100_private *bdp = dev->priv; - if (!(bdp->flags & IS_BACHELOR)) - return -EINVAL; - if (copy_from_user(&epause, ifr->ifr_data, sizeof(epause))) - return -EFAULT; - if (epause.autoneg == 1) - bdp->params.b_params |= PRM_FC; - else - bdp->params.b_params &= ~PRM_FC; - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - e100_hw_init(bdp); - e100_open(dev); - } - return 0; - } -#endif -#ifdef ETHTOOL_GRXCSUM - case ETHTOOL_GRXCSUM: - case ETHTOOL_GTXCSUM: - case ETHTOOL_GSG: - { struct ethtool_value eval; - struct e100_private *bdp = dev->priv; - memset((void *) &eval, 0, sizeof(eval)); - if ((ecmd.cmd == ETHTOOL_GRXCSUM) - && (bdp->params.b_params & PRM_XSUMRX)) - eval.data = 1; - else - eval.data = 0; - rc = copy_to_user(ifr->ifr_data, &eval, sizeof(eval)) - ? -EFAULT : 0; - return rc; - } -#endif -#ifdef ETHTOOL_SRXCSUM - case ETHTOOL_SRXCSUM: - case ETHTOOL_STXCSUM: - case ETHTOOL_SSG: - { struct ethtool_value eval; - struct e100_private *bdp = dev->priv; - if (copy_from_user(&eval, ifr->ifr_data, sizeof(eval))) - return -EFAULT; - if (ecmd.cmd == ETHTOOL_SRXCSUM) { - if (eval.data == 1) { - if (bdp->rev_id >= D101MA_REV_ID) - bdp->params.b_params |= PRM_XSUMRX; - else - return -EINVAL; - } else { - if (bdp->rev_id >= D101MA_REV_ID) - bdp->params.b_params &= ~PRM_XSUMRX; - else - return 0; - } - } else { - if (eval.data == 1) - return -EINVAL; - else - return 0; - } - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - e100_hw_init(bdp); - e100_open(dev); - } - return 0; - } -#endif - default: - break; - } //switch - return rc; -} - -static int -e100_ethtool_get_settings(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - struct ethtool_cmd ecmd; - u16 advert = 0; - - memset((void *) &ecmd, 0, sizeof (ecmd)); - - bdp = dev->priv; - - ecmd.supported = bdp->speed_duplex_caps; - - ecmd.port = - (bdp->speed_duplex_caps & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE; - ecmd.transceiver = XCVR_INTERNAL; - ecmd.phy_address = bdp->phy_addr; - - if (netif_carrier_ok(bdp->device)) { - ecmd.speed = bdp->cur_line_speed; - ecmd.duplex = - (bdp->cur_dplx_mode == HALF_DUPLEX) ? DUPLEX_HALF : DUPLEX_FULL; - } - else { - ecmd.speed = -1; - ecmd.duplex = -1; - } - - ecmd.advertising = ADVERTISED_TP; - - if (bdp->params.e100_speed_duplex == E100_AUTONEG) { - ecmd.autoneg = AUTONEG_ENABLE; - ecmd.advertising |= ADVERTISED_Autoneg; - } else { - ecmd.autoneg = AUTONEG_DISABLE; - } - - if (bdp->speed_duplex_caps & SUPPORTED_MII) { - e100_mdi_read(bdp, MII_ADVERTISE, bdp->phy_addr, &advert); - - if (advert & ADVERTISE_10HALF) - ecmd.advertising |= ADVERTISED_10baseT_Half; - if (advert & ADVERTISE_10FULL) - ecmd.advertising |= ADVERTISED_10baseT_Full; - if (advert & ADVERTISE_100HALF) - ecmd.advertising |= ADVERTISED_100baseT_Half; - if (advert & ADVERTISE_100FULL) - ecmd.advertising |= ADVERTISED_100baseT_Full; - } else { - ecmd.autoneg = AUTONEG_DISABLE; - ecmd.advertising &= ~ADVERTISED_Autoneg; - } - - if (copy_to_user(ifr->ifr_data, &ecmd, sizeof (ecmd))) - return -EFAULT; - - return 0; -} - -static int -e100_ethtool_set_settings(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - int e100_new_speed_duplex; - int ethtool_new_speed_duplex; - struct ethtool_cmd ecmd; - - bdp = dev->priv; - if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd))) { - return -EFAULT; - } - - if ((ecmd.autoneg == AUTONEG_ENABLE) - && (bdp->speed_duplex_caps & SUPPORTED_Autoneg)) { - bdp->params.e100_speed_duplex = E100_AUTONEG; - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - e100_hw_init(bdp); - e100_open(dev); - } - } else { - if (ecmd.speed == SPEED_10) { - if (ecmd.duplex == DUPLEX_HALF) { - e100_new_speed_duplex = - E100_SPEED_10_HALF; - ethtool_new_speed_duplex = - SUPPORTED_10baseT_Half; - } else { - e100_new_speed_duplex = - E100_SPEED_10_FULL; - ethtool_new_speed_duplex = - SUPPORTED_10baseT_Full; - } - } else { - if (ecmd.duplex == DUPLEX_HALF) { - e100_new_speed_duplex = - E100_SPEED_100_HALF; - ethtool_new_speed_duplex = - SUPPORTED_100baseT_Half; - } else { - e100_new_speed_duplex = - E100_SPEED_100_FULL; - ethtool_new_speed_duplex = - SUPPORTED_100baseT_Full; - } - } - - if (bdp->speed_duplex_caps & ethtool_new_speed_duplex) { - bdp->params.e100_speed_duplex = - e100_new_speed_duplex; - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - e100_hw_init(bdp); - e100_open(dev); - } - } else { - return -EOPNOTSUPP; - } - } - - return 0; -} - -static int -e100_ethtool_glink(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - struct ethtool_value info; - - memset((void *) &info, 0, sizeof (info)); - - bdp = dev->priv; - info.cmd = ETHTOOL_GLINK; - - /* Consider both PHY link and netif_running */ - info.data = e100_update_link_state(bdp); - - if (copy_to_user(ifr->ifr_data, &info, sizeof (info))) - return -EFAULT; - - return 0; -} - -static int -e100_ethtool_test(struct net_device *dev, struct ifreq *ifr) -{ - struct ethtool_test *info; - int rc = -EFAULT; - - info = kmalloc(sizeof(*info) + max_test_res * sizeof(u64), - GFP_ATOMIC); - - if (!info) - return -ENOMEM; - - memset((void *) info, 0, sizeof(*info) + - max_test_res * sizeof(u64)); - - if (copy_from_user(info, ifr->ifr_data, sizeof(*info))) - goto exit; - - info->flags = e100_run_diag(dev, info->data, info->flags); - - if (!copy_to_user(ifr->ifr_data, info, - sizeof(*info) + max_test_res * sizeof(u64))) - rc = 0; -exit: - kfree(info); - return rc; -} - -static int -e100_ethtool_gregs(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - u32 regs_buff[E100_REGS_LEN]; - struct ethtool_regs regs = {ETHTOOL_GREGS}; - void *addr = ifr->ifr_data; - u16 mdi_reg; - - bdp = dev->priv; - - if(copy_from_user(®s, addr, sizeof(regs))) - return -EFAULT; - - regs.version = (1 << 24) | bdp->rev_id; - regs_buff[0] = readb(&(bdp->scb->scb_cmd_hi)) << 24 | - readb(&(bdp->scb->scb_cmd_low)) << 16 | - readw(&(bdp->scb->scb_status)); - e100_mdi_read(bdp, MII_NCONFIG, bdp->phy_addr, &mdi_reg); - regs_buff[1] = mdi_reg; - - if(copy_to_user(addr, ®s, sizeof(regs))) - return -EFAULT; - - addr += offsetof(struct ethtool_regs, data); - if(copy_to_user(addr, regs_buff, regs.len)) - return -EFAULT; - - return 0; -} - -static int -e100_ethtool_nway_rst(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - - bdp = dev->priv; - - if ((bdp->speed_duplex_caps & SUPPORTED_Autoneg) && - (bdp->params.e100_speed_duplex == E100_AUTONEG)) { - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - e100_hw_init(bdp); - e100_open(dev); - } - } else { - return -EFAULT; - } - return 0; -} - -static int -e100_ethtool_get_drvinfo(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - struct ethtool_drvinfo info; - - memset((void *) &info, 0, sizeof (info)); - - bdp = dev->priv; - - strncpy(info.driver, e100_short_driver_name, sizeof (info.driver) - 1); - strncpy(info.version, e100_driver_version, sizeof (info.version) - 1); - strncpy(info.fw_version, "N/A", - sizeof (info.fw_version) - 1); - strncpy(info.bus_info, pci_name(bdp->pdev), - sizeof (info.bus_info) - 1); - info.n_stats = E100_STATS_LEN; - info.regdump_len = E100_REGS_LEN * sizeof(u32); - info.eedump_len = (bdp->eeprom_size << 1); - info.testinfo_len = max_test_res; - if (copy_to_user(ifr->ifr_data, &info, sizeof (info))) - return -EFAULT; - - return 0; -} - -static int -e100_ethtool_eeprom(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - struct ethtool_eeprom ecmd; - u16 eeprom_data[256]; - u16 *usr_eeprom_ptr; - u16 first_word, last_word; - int i, max_len; - void *ptr; - u8 *eeprom_data_bytes = (u8 *)eeprom_data; - - bdp = dev->priv; - - if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd))) - return -EFAULT; - - usr_eeprom_ptr = - (u16 *) (ifr->ifr_data + offsetof(struct ethtool_eeprom, data)); - - max_len = bdp->eeprom_size * 2; - - if (ecmd.offset > ecmd.offset + ecmd.len) - return -EINVAL; - - if ((ecmd.offset + ecmd.len) > max_len) - ecmd.len = (max_len - ecmd.offset); - - first_word = ecmd.offset >> 1; - last_word = (ecmd.offset + ecmd.len - 1) >> 1; - - if (first_word >= bdp->eeprom_size) - return -EFAULT; - - if (ecmd.cmd == ETHTOOL_GEEPROM) { - for(i = 0; i <= (last_word - first_word); i++) - eeprom_data[i] = e100_eeprom_read(bdp, first_word + i); - - ecmd.magic = E100_EEPROM_MAGIC; - - if (copy_to_user(ifr->ifr_data, &ecmd, sizeof (ecmd))) - return -EFAULT; - - if(ecmd.offset & 1) - eeprom_data_bytes++; - if (copy_to_user(usr_eeprom_ptr, eeprom_data_bytes, ecmd.len)) - return -EFAULT; - } else { - if (ecmd.magic != E100_EEPROM_MAGIC) - return -EFAULT; - - ptr = (void *)eeprom_data; - if(ecmd.offset & 1) { - /* need modification of first changed EEPROM word */ - /* only the second byte of the word is being modified */ - eeprom_data[0] = e100_eeprom_read(bdp, first_word); - ptr++; - } - if((ecmd.offset + ecmd.len) & 1) { - /* need modification of last changed EEPROM word */ - /* only the first byte of the word is being modified */ - eeprom_data[last_word - first_word] = - e100_eeprom_read(bdp, last_word); - } - if(copy_from_user(ptr, usr_eeprom_ptr, ecmd.len)) - return -EFAULT; - - e100_eeprom_write_block(bdp, first_word, eeprom_data, - last_word - first_word + 1); - - if (copy_to_user(ifr->ifr_data, &ecmd, sizeof (ecmd))) - return -EFAULT; - } - return 0; -} - -#define E100_BLINK_INTERVAL (HZ/4) -/** - * e100_led_control - * @bdp: atapter's private data struct - * @led_mdi_op: led operation - * - * Software control over adapter's led. The possible operations are: - * TURN LED OFF, TURN LED ON and RETURN LED CONTROL TO HARDWARE. - */ -static void -e100_led_control(struct e100_private *bdp, u16 led_mdi_op) -{ - e100_mdi_write(bdp, PHY_82555_LED_SWITCH_CONTROL, - bdp->phy_addr, led_mdi_op); - -} -/** - * e100_led_blink_callback - * @data: pointer to atapter's private data struct - * - * Blink timer callback function. Toggles ON/OFF led status bit and calls - * led hardware access function. - */ -static void -e100_led_blink_callback(unsigned long data) -{ - struct e100_private *bdp = (struct e100_private *) data; - - if(bdp->flags & LED_IS_ON) { - bdp->flags &= ~LED_IS_ON; - e100_led_control(bdp, PHY_82555_LED_OFF); - } else { - bdp->flags |= LED_IS_ON; - if (bdp->rev_id >= D101MA_REV_ID) - e100_led_control(bdp, PHY_82555_LED_ON_559); - else - e100_led_control(bdp, PHY_82555_LED_ON_PRE_559); - } - - mod_timer(&bdp->blink_timer, jiffies + E100_BLINK_INTERVAL); -} -/** - * e100_ethtool_led_blink - * @dev: pointer to atapter's net_device struct - * @ifr: pointer to ioctl request structure - * - * Blink led ioctl handler. Initialtes blink timer and sleeps until - * blink period expires. Than it kills timer and returns. The led control - * is returned back to hardware when blink timer is killed. - */ -static int -e100_ethtool_led_blink(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - struct ethtool_value ecmd; - - bdp = dev->priv; - - if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd))) - return -EFAULT; - - if(!bdp->blink_timer.function) { - init_timer(&bdp->blink_timer); - bdp->blink_timer.function = e100_led_blink_callback; - bdp->blink_timer.data = (unsigned long) bdp; - } - - mod_timer(&bdp->blink_timer, jiffies); - - set_current_state(TASK_INTERRUPTIBLE); - - if ((!ecmd.data) || (ecmd.data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))) - ecmd.data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); - - schedule_timeout(ecmd.data * HZ); - - del_timer_sync(&bdp->blink_timer); - - e100_led_control(bdp, PHY_82555_LED_NORMAL_CONTROL); - - return 0; -} - -static inline int -e100_10BaseT_adapter(struct e100_private *bdp) -{ - return ((bdp->pdev->device == 0x1229) && - (bdp->pdev->subsystem_vendor == 0x8086) && - (bdp->pdev->subsystem_device == 0x0003)); -} - -static void -e100_get_speed_duplex_caps(struct e100_private *bdp) -{ - u16 status; - - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &status); - - bdp->speed_duplex_caps = 0; - - bdp->speed_duplex_caps |= - (status & BMSR_ANEGCAPABLE) ? SUPPORTED_Autoneg : 0; - - bdp->speed_duplex_caps |= - (status & BMSR_10HALF) ? SUPPORTED_10baseT_Half : 0; - - bdp->speed_duplex_caps |= - (status & BMSR_10FULL) ? SUPPORTED_10baseT_Full : 0; - - bdp->speed_duplex_caps |= - (status & BMSR_100HALF) ? SUPPORTED_100baseT_Half : 0; - - bdp->speed_duplex_caps |= - (status & BMSR_100FULL) ? SUPPORTED_100baseT_Full : 0; - - if (IS_NC3133(bdp)) - bdp->speed_duplex_caps = - (SUPPORTED_FIBRE | SUPPORTED_100baseT_Full); - else - bdp->speed_duplex_caps |= SUPPORTED_TP; - - if ((status == 0xFFFF) && e100_10BaseT_adapter(bdp)) { - bdp->speed_duplex_caps = - (SUPPORTED_10baseT_Half | SUPPORTED_TP); - } else { - bdp->speed_duplex_caps |= SUPPORTED_MII; - } - -} - -#ifdef CONFIG_PM -static unsigned char -e100_setup_filter(struct e100_private *bdp) -{ - cb_header_t *ntcb_hdr; - unsigned char res = false; - nxmit_cb_entry_t *cmd; - - if ((cmd = e100_alloc_non_tx_cmd(bdp)) == NULL) { - goto exit; - } - - ntcb_hdr = (cb_header_t *) cmd->non_tx_cmd; - ntcb_hdr->cb_cmd = __constant_cpu_to_le16(CB_LOAD_FILTER); - - /* Set EL and FIX bit */ - (cmd->non_tx_cmd)->ntcb.filter.filter_data[0] = - __constant_cpu_to_le32(CB_FILTER_EL | CB_FILTER_FIX); - - if (bdp->wolopts & WAKE_UCAST) { - (cmd->non_tx_cmd)->ntcb.filter.filter_data[0] |= - __constant_cpu_to_le32(CB_FILTER_IA_MATCH); - } - - if (bdp->wolopts & WAKE_ARP) { - /* Setup ARP bit and lower IP parts */ - /* bdp->ip_lbytes contains 2 lower bytes of IP address in network byte order */ - (cmd->non_tx_cmd)->ntcb.filter.filter_data[0] |= - cpu_to_le32(CB_FILTER_ARP | bdp->ip_lbytes); - } - - res = e100_exec_non_cu_cmd(bdp, cmd); - if (!res) - printk(KERN_WARNING "e100: %s: Filter setup failed\n", - bdp->device->name); - -exit: - return res; - -} - -static void -e100_do_wol(struct pci_dev *pcid, struct e100_private *bdp) -{ - e100_config_wol(bdp); - - if (e100_config(bdp)) { - if (bdp->wolopts & (WAKE_UCAST | WAKE_ARP)) - if (!e100_setup_filter(bdp)) - printk(KERN_ERR - "e100: WOL options failed\n"); - } else { - printk(KERN_ERR "e100: config WOL failed\n"); - } -} -#endif - -static u16 -e100_get_ip_lbytes(struct net_device *dev) -{ - struct in_ifaddr *ifa; - struct in_device *in_dev; - u32 res = 0; - - in_dev = (struct in_device *) dev->ip_ptr; - /* Check if any in_device bound to interface */ - if (in_dev) { - /* Check if any IP address is bound to interface */ - if ((ifa = in_dev->ifa_list) != NULL) { - res = __constant_ntohl(ifa->ifa_address); - res = __constant_htons(res & 0x0000ffff); - } - } - return res; -} - -static int -e100_ethtool_wol(struct net_device *dev, struct ifreq *ifr) -{ - struct e100_private *bdp; - struct ethtool_wolinfo wolinfo; - int res = 0; - - bdp = dev->priv; - - if (copy_from_user(&wolinfo, ifr->ifr_data, sizeof (wolinfo))) { - return -EFAULT; - } - - switch (wolinfo.cmd) { - case ETHTOOL_GWOL: - wolinfo.supported = bdp->wolsupported; - wolinfo.wolopts = bdp->wolopts; - if (copy_to_user(ifr->ifr_data, &wolinfo, sizeof (wolinfo))) - res = -EFAULT; - break; - case ETHTOOL_SWOL: - /* If ALL requests are supported or request is DISABLE wol */ - if (((wolinfo.wolopts & bdp->wolsupported) == wolinfo.wolopts) - || (wolinfo.wolopts == 0)) { - bdp->wolopts = wolinfo.wolopts; - } else { - res = -EOPNOTSUPP; - } - if (wolinfo.wolopts & WAKE_ARP) - bdp->ip_lbytes = e100_get_ip_lbytes(dev); - break; - default: - break; - } - return res; -} - -static int e100_ethtool_gstrings(struct net_device *dev, struct ifreq *ifr) -{ - struct ethtool_gstrings info; - char *strings = NULL; - char *usr_strings; - int i; - - memset((void *) &info, 0, sizeof(info)); - - usr_strings = (u8 *) (ifr->ifr_data + - offsetof(struct ethtool_gstrings, data)); - - if (copy_from_user(&info, ifr->ifr_data, sizeof (info))) - return -EFAULT; - - switch (info.string_set) { - case ETH_SS_TEST: { - int ret = 0; - if (info.len > max_test_res) - info.len = max_test_res; - strings = kmalloc(info.len * ETH_GSTRING_LEN, GFP_ATOMIC); - if (!strings) - return -ENOMEM; - memset(strings, 0, info.len * ETH_GSTRING_LEN); - - for (i = 0; i < info.len; i++) { - sprintf(strings + i * ETH_GSTRING_LEN, "%s", - test_strings[i]); - } - if (copy_to_user(ifr->ifr_data, &info, sizeof (info))) - ret = -EFAULT; - if (copy_to_user(usr_strings, strings, info.len * ETH_GSTRING_LEN)) - ret = -EFAULT; - kfree(strings); - return ret; - } - case ETH_SS_STATS: { - char *strings = NULL; - void *addr = ifr->ifr_data; - info.len = E100_STATS_LEN; - strings = *e100_gstrings_stats; - if(copy_to_user(ifr->ifr_data, &info, sizeof(info))) - return -EFAULT; - addr += offsetof(struct ethtool_gstrings, data); - if(copy_to_user(addr, strings, - info.len * ETH_GSTRING_LEN)) - return -EFAULT; - return 0; - } - default: - return -EOPNOTSUPP; - } -} - -static int -e100_mii_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -{ - struct e100_private *bdp; - struct mii_ioctl_data *data_ptr = - (struct mii_ioctl_data *) &(ifr->ifr_data); - - bdp = dev->priv; - - switch (cmd) { - case SIOCGMIIPHY: - data_ptr->phy_id = bdp->phy_addr & 0x1f; - break; - - case SIOCGMIIREG: - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - e100_mdi_read(bdp, data_ptr->reg_num & 0x1f, bdp->phy_addr, - &(data_ptr->val_out)); - break; - - case SIOCSMIIREG: - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - /* If reg = 0 && change speed/duplex */ - if (data_ptr->reg_num == 0 && - (data_ptr->val_in == (BMCR_ANENABLE | BMCR_ANRESTART) /* restart cmd */ - || data_ptr->val_in == (BMCR_RESET) /* reset cmd */ - || data_ptr->val_in & (BMCR_SPEED100 | BMCR_FULLDPLX) - || data_ptr->val_in == 0)) { - if (data_ptr->val_in == (BMCR_ANENABLE | BMCR_ANRESTART) - || data_ptr->val_in == (BMCR_RESET)) - bdp->params.e100_speed_duplex = E100_AUTONEG; - else if (data_ptr->val_in == (BMCR_SPEED100 | BMCR_FULLDPLX)) - bdp->params.e100_speed_duplex = E100_SPEED_100_FULL; - else if (data_ptr->val_in == (BMCR_SPEED100)) - bdp->params.e100_speed_duplex = E100_SPEED_100_HALF; - else if (data_ptr->val_in == (BMCR_FULLDPLX)) - bdp->params.e100_speed_duplex = E100_SPEED_10_FULL; - else - bdp->params.e100_speed_duplex = E100_SPEED_10_HALF; - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - e100_hw_init(bdp); - e100_open(dev); - } - } - else - /* Only allows changing speed/duplex */ - return -EINVAL; - - break; - - default: - return -EOPNOTSUPP; - } - return 0; -} - -nxmit_cb_entry_t * -e100_alloc_non_tx_cmd(struct e100_private *bdp) -{ - nxmit_cb_entry_t *non_tx_cmd_elem; - - if (!(non_tx_cmd_elem = (nxmit_cb_entry_t *) - kmalloc(sizeof (nxmit_cb_entry_t), GFP_ATOMIC))) { - return NULL; - } - non_tx_cmd_elem->non_tx_cmd = - pci_alloc_consistent(bdp->pdev, sizeof (nxmit_cb_t), - &(non_tx_cmd_elem->dma_addr)); - if (non_tx_cmd_elem->non_tx_cmd == NULL) { - kfree(non_tx_cmd_elem); - return NULL; - } - return non_tx_cmd_elem; -} - -void -e100_free_non_tx_cmd(struct e100_private *bdp, - nxmit_cb_entry_t *non_tx_cmd_elem) -{ - pci_free_consistent(bdp->pdev, sizeof (nxmit_cb_t), - non_tx_cmd_elem->non_tx_cmd, - non_tx_cmd_elem->dma_addr); - kfree(non_tx_cmd_elem); -} - -static void -e100_free_nontx_list(struct e100_private *bdp) -{ - nxmit_cb_entry_t *command; - int i; - - while (!list_empty(&bdp->non_tx_cmd_list)) { - command = list_entry(bdp->non_tx_cmd_list.next, - nxmit_cb_entry_t, list_elem); - list_del(&(command->list_elem)); - e100_free_non_tx_cmd(bdp, command); - } - - for (i = 0; i < CB_MAX_NONTX_CMD; i++) { - bdp->same_cmd_entry[i] = NULL; - } -} - -static unsigned char -e100_delayed_exec_non_cu_cmd(struct e100_private *bdp, - nxmit_cb_entry_t *command) -{ - nxmit_cb_entry_t *same_command; - cb_header_t *ntcb_hdr; - u16 cmd; - - ntcb_hdr = (cb_header_t *) command->non_tx_cmd; - - cmd = CB_CMD_MASK & le16_to_cpu(ntcb_hdr->cb_cmd); - - spin_lock_bh(&(bdp->bd_non_tx_lock)); - - same_command = bdp->same_cmd_entry[cmd]; - - if (same_command != NULL) { - memcpy((void *) (same_command->non_tx_cmd), - (void *) (command->non_tx_cmd), sizeof (nxmit_cb_t)); - e100_free_non_tx_cmd(bdp, command); - } else { - list_add_tail(&(command->list_elem), &(bdp->non_tx_cmd_list)); - bdp->same_cmd_entry[cmd] = command; - } - - if (bdp->non_tx_command_state == E100_NON_TX_IDLE) { - bdp->non_tx_command_state = E100_WAIT_TX_FINISH; - mod_timer(&(bdp->nontx_timer_id), jiffies + 1); - } - - spin_unlock_bh(&(bdp->bd_non_tx_lock)); - return true; -} - -static void -e100_non_tx_background(unsigned long ptr) -{ - struct e100_private *bdp = (struct e100_private *) ptr; - nxmit_cb_entry_t *active_command; - int restart = true; - cb_header_t *non_tx_cmd; - u8 sub_cmd; - - spin_lock_bh(&(bdp->bd_non_tx_lock)); - - switch (bdp->non_tx_command_state) { - case E100_WAIT_TX_FINISH: - if (bdp->last_tcb != NULL) { - rmb(); - if ((bdp->last_tcb->tcb_hdr.cb_status & - __constant_cpu_to_le16(CB_STATUS_COMPLETE)) == 0) - goto exit; - } - if ((readw(&bdp->scb->scb_status) & SCB_CUS_MASK) == - SCB_CUS_ACTIVE) { - goto exit; - } - break; - - case E100_WAIT_NON_TX_FINISH: - active_command = list_entry(bdp->non_tx_cmd_list.next, - nxmit_cb_entry_t, list_elem); - rmb(); - - if (((((cb_header_t *) (active_command->non_tx_cmd))->cb_status - & __constant_cpu_to_le16(CB_STATUS_COMPLETE)) == 0) - && time_before(jiffies, active_command->expiration_time)) { - goto exit; - } else { - non_tx_cmd = (cb_header_t *) active_command->non_tx_cmd; - sub_cmd = CB_CMD_MASK & le16_to_cpu(non_tx_cmd->cb_cmd); -#ifdef E100_CU_DEBUG - if (!(non_tx_cmd->cb_status - & __constant_cpu_to_le16(CB_STATUS_COMPLETE))) - printk(KERN_ERR "e100: %s: Queued " - "command (%x) timeout\n", - bdp->device->name, sub_cmd); -#endif - list_del(&(active_command->list_elem)); - e100_free_non_tx_cmd(bdp, active_command); - } - break; - - default: - break; - } //switch - - if (list_empty(&bdp->non_tx_cmd_list)) { - bdp->non_tx_command_state = E100_NON_TX_IDLE; - spin_lock_irq(&(bdp->bd_lock)); - bdp->next_cu_cmd = START_WAIT; - spin_unlock_irq(&(bdp->bd_lock)); - restart = false; - goto exit; - } else { - u16 cmd_type; - - bdp->non_tx_command_state = E100_WAIT_NON_TX_FINISH; - active_command = list_entry(bdp->non_tx_cmd_list.next, - nxmit_cb_entry_t, list_elem); - sub_cmd = ((cb_header_t *) active_command->non_tx_cmd)->cb_cmd; - spin_lock_irq(&(bdp->bd_lock)); - e100_wait_exec_cmplx(bdp, active_command->dma_addr, - SCB_CUC_START, sub_cmd); - spin_unlock_irq(&(bdp->bd_lock)); - active_command->expiration_time = jiffies + HZ; - cmd_type = CB_CMD_MASK & - le16_to_cpu(((cb_header_t *) - (active_command->non_tx_cmd))->cb_cmd); - bdp->same_cmd_entry[cmd_type] = NULL; - } - -exit: - if (restart) { - mod_timer(&(bdp->nontx_timer_id), jiffies + 1); - } else { - if (netif_running(bdp->device)) - netif_wake_queue(bdp->device); - } - spin_unlock_bh(&(bdp->bd_non_tx_lock)); -} - -static void -e100_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) -{ - struct e100_private *bdp = netdev->priv; - - e100_disable_clear_intr(bdp); - bdp->vlgrp = grp; - - if(grp) { - /* enable VLAN tag insert/strip */ - e100_config_vlan_drop(bdp, true); - - } else { - /* disable VLAN tag insert/strip */ - e100_config_vlan_drop(bdp, false); - } - - e100_config(bdp); - e100_set_intr_mask(bdp); -} - -static void -e100_vlan_rx_add_vid(struct net_device *netdev, u16 vid) -{ - /* We don't do Vlan filtering */ - return; -} - -static void -e100_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) -{ - struct e100_private *bdp = netdev->priv; - - if(bdp->vlgrp) - bdp->vlgrp->vlan_devices[vid] = NULL; - /* We don't do Vlan filtering */ - return; -} - -#ifdef CONFIG_PM -static int -e100_notify_reboot(struct notifier_block *nb, unsigned long event, void *p) -{ - struct pci_dev *pdev = NULL; - - switch(event) { - case SYS_DOWN: - case SYS_HALT: - case SYS_POWER_OFF: - while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) { - if(pci_dev_driver(pdev) == &e100_driver) { - /* If net_device struct is allocated? */ - if (pci_get_drvdata(pdev)) - e100_suspend(pdev, 3); - - } - } - } - return NOTIFY_DONE; -} - -static int -e100_suspend(struct pci_dev *pcid, u32 state) -{ - struct net_device *netdev = pci_get_drvdata(pcid); - struct e100_private *bdp = netdev->priv; - - e100_isolate_driver(bdp); - pci_save_state(pcid, bdp->pci_state); - - /* Enable or disable WoL */ - e100_do_wol(pcid, bdp); - - /* If wol is enabled */ - if (bdp->wolopts || e100_asf_enabled(bdp)) { - pci_enable_wake(pcid, 3, 1); /* Enable PME for power state D3 */ - pci_set_power_state(pcid, 3); /* Set power state to D3. */ - } else { - /* Disable bus mastering */ - pci_disable_device(pcid); - pci_set_power_state(pcid, state); - } - return 0; -} - -static int -e100_resume(struct pci_dev *pcid) -{ - struct net_device *netdev = pci_get_drvdata(pcid); - struct e100_private *bdp = netdev->priv; - - pci_set_power_state(pcid, 0); - pci_enable_wake(pcid, 0, 0); /* Clear PME status and disable PME */ - pci_restore_state(pcid, bdp->pci_state); - - /* Also do device full reset because device was in D3 state */ - e100_deisolate_driver(bdp, true); - - return 0; -} - -/** - * e100_asf_enabled - checks if ASF is configured on the current adaper - * by reading registers 0xD and 0x90 in the EEPROM - * @bdp: atapter's private data struct - * - * Returns: true if ASF is enabled - */ -static unsigned char -e100_asf_enabled(struct e100_private *bdp) -{ - u16 asf_reg; - u16 smbus_addr_reg; - if ((bdp->pdev->device >= 0x1050) && (bdp->pdev->device <= 0x1055)) { - asf_reg = e100_eeprom_read(bdp, EEPROM_CONFIG_ASF); - if ((asf_reg & EEPROM_FLAG_ASF) - && !(asf_reg & EEPROM_FLAG_GCL)) { - smbus_addr_reg = - e100_eeprom_read(bdp, EEPROM_SMBUS_ADDR); - if ((smbus_addr_reg & 0xFF) != 0xFE) - return true; - } - } - return false; -} -#endif /* CONFIG_PM */ - -#ifdef E100_CU_DEBUG -unsigned char -e100_cu_unknown_state(struct e100_private *bdp) -{ - u8 scb_cmd_low; - u16 scb_status; - scb_cmd_low = bdp->scb->scb_cmd_low; - scb_status = le16_to_cpu(bdp->scb->scb_status); - /* If CU is active and executing unknown cmd */ - if (scb_status & SCB_CUS_ACTIVE && scb_cmd_low & SCB_CUC_UNKNOWN) - return true; - else - return false; -} -#endif - diff -Nru a/drivers/net/e100/e100_phy.c b/drivers/net/e100/e100_phy.c --- a/drivers/net/e100/e100_phy.c Thu Feb 19 23:44:29 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,1163 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -#include "e100_phy.h" - -void e100_handle_zlock(struct e100_private *bdp); - -/* - * Procedure: e100_mdi_write - * - * Description: This routine will write a value to the specified MII register - * of an external MDI compliant device (e.g. PHY 100). The - * command will execute in polled mode. - * - * Arguments: - * bdp - Ptr to this card's e100_bdconfig structure - * reg_addr - The MII register that we are writing to - * phy_addr - The MDI address of the Phy component. - * data - The value that we are writing to the MII register. - * - * Returns: - * NOTHING - */ -int -e100_mdi_write(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 data) -{ - int e100_retry; - u32 temp_val; - unsigned int mdi_cntrl; - - spin_lock_bh(&bdp->mdi_access_lock); - temp_val = (((u32) data) | (reg_addr << 16) | - (phy_addr << 21) | (MDI_WRITE << 26)); - writel(temp_val, &bdp->scb->scb_mdi_cntrl); - readw(&bdp->scb->scb_status); - - /* wait 20usec before checking status */ - udelay(20); - - /* poll for the mdi write to complete */ - e100_retry = E100_CMD_WAIT; - while ((!((mdi_cntrl = readl(&bdp->scb->scb_mdi_cntrl)) & MDI_PHY_READY)) && (e100_retry)) { - - udelay(20); - e100_retry--; - } - spin_unlock_bh(&bdp->mdi_access_lock); - if (mdi_cntrl & MDI_PHY_READY) - return 0; - else { - printk(KERN_ERR "e100: MDI write timeout\n"); - return 1; - } -} - -/* - * Procedure: e100_mdi_read - * - * Description: This routine will read a value from the specified MII register - * of an external MDI compliant device (e.g. PHY 100), and return - * it to the calling routine. The command will execute in polled - * mode. - * - * Arguments: - * bdp - Ptr to this card's e100_bdconfig structure - * reg_addr - The MII register that we are reading from - * phy_addr - The MDI address of the Phy component. - * - * Results: - * data - The value that we read from the MII register. - * - * Returns: - * NOTHING - */ -int -e100_mdi_read(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 *data) -{ - int e100_retry; - u32 temp_val; - unsigned int mdi_cntrl; - - spin_lock_bh(&bdp->mdi_access_lock); - /* Issue the read command to the MDI control register. */ - temp_val = ((reg_addr << 16) | (phy_addr << 21) | (MDI_READ << 26)); - writel(temp_val, &bdp->scb->scb_mdi_cntrl); - readw(&bdp->scb->scb_status); - - /* wait 20usec before checking status */ - udelay(20); - - /* poll for the mdi read to complete */ - e100_retry = E100_CMD_WAIT; - while ((!((mdi_cntrl = readl(&bdp->scb->scb_mdi_cntrl)) & MDI_PHY_READY)) && (e100_retry)) { - - udelay(20); - e100_retry--; - } - - spin_unlock_bh(&bdp->mdi_access_lock); - if (mdi_cntrl & MDI_PHY_READY) { - /* return the lower word */ - *data = (u16) mdi_cntrl; - return 0; - } - else { - printk(KERN_ERR "e100: MDI read timeout\n"); - return 1; - } -} - -static unsigned char -e100_phy_valid(struct e100_private *bdp, unsigned int phy_address) -{ - u16 ctrl_reg, stat_reg; - - /* Read the MDI control register */ - e100_mdi_read(bdp, MII_BMCR, phy_address, &ctrl_reg); - - /* Read the status register twice, bacause of sticky bits */ - e100_mdi_read(bdp, MII_BMSR, phy_address, &stat_reg); - e100_mdi_read(bdp, MII_BMSR, phy_address, &stat_reg); - - if ((ctrl_reg == 0xffff) || ((stat_reg == 0) && (ctrl_reg == 0))) - return false; - - return true; -} - -static void -e100_phy_address_detect(struct e100_private *bdp) -{ - unsigned int addr; - unsigned char valid_phy_found = false; - - if (IS_NC3133(bdp)) { - bdp->phy_addr = 0; - return; - } - - if (e100_phy_valid(bdp, PHY_DEFAULT_ADDRESS)) { - bdp->phy_addr = PHY_DEFAULT_ADDRESS; - valid_phy_found = true; - - } else { - for (addr = MIN_PHY_ADDR; addr <= MAX_PHY_ADDR; addr++) { - if (e100_phy_valid(bdp, addr)) { - bdp->phy_addr = addr; - valid_phy_found = true; - break; - } - } - } - - if (!valid_phy_found) { - bdp->phy_addr = PHY_ADDRESS_503; - } -} - -static void -e100_phy_id_detect(struct e100_private *bdp) -{ - u16 low_id_reg, high_id_reg; - - if (bdp->phy_addr == PHY_ADDRESS_503) { - bdp->PhyId = PHY_503; - return; - } - if (!(bdp->flags & IS_ICH)) { - if (bdp->rev_id >= D102_REV_ID) { - bdp->PhyId = PHY_82562ET; - return; - } - } - - /* Read phy id from the MII register */ - e100_mdi_read(bdp, MII_PHYSID1, bdp->phy_addr, &low_id_reg); - e100_mdi_read(bdp, MII_PHYSID2, bdp->phy_addr, &high_id_reg); - - bdp->PhyId = ((unsigned int) low_id_reg | - ((unsigned int) high_id_reg << 16)); -} - -static void -e100_phy_isolate(struct e100_private *bdp) -{ - unsigned int phy_address; - u16 ctrl_reg; - - /* Go over all phy addresses. Deisolate the selected one, and isolate - * all the rest */ - for (phy_address = 0; phy_address <= MAX_PHY_ADDR; phy_address++) { - if (phy_address != bdp->phy_addr) { - e100_mdi_write(bdp, MII_BMCR, phy_address, - BMCR_ISOLATE); - - } else { - e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &ctrl_reg); - ctrl_reg &= ~BMCR_ISOLATE; - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg); - } - - udelay(100); - } -} - -static unsigned char -e100_phy_specific_setup(struct e100_private *bdp) -{ - u16 misc_reg; - - if (bdp->phy_addr == PHY_ADDRESS_503) { - switch (bdp->params.e100_speed_duplex) { - case E100_AUTONEG: - /* The adapter can't autoneg. so set to 10/HALF */ - printk(KERN_INFO - "e100: 503 serial component detected which " - "cannot autonegotiate\n"); - printk(KERN_INFO - "e100: speed/duplex forced to " - "10Mbps / Half duplex\n"); - bdp->params.e100_speed_duplex = E100_SPEED_10_HALF; - break; - - case E100_SPEED_100_HALF: - case E100_SPEED_100_FULL: - printk(KERN_ERR - "e100: 503 serial component detected " - "which does not support 100Mbps\n"); - printk(KERN_ERR - "e100: Change the forced speed/duplex " - "to a supported setting\n"); - return false; - } - - return true; - } - - if (IS_NC3133(bdp)) { - u16 int_reg; - - /* enable 100BASE fiber interface */ - e100_mdi_write(bdp, MDI_NC3133_CONFIG_REG, bdp->phy_addr, - MDI_NC3133_100FX_ENABLE); - - if ((bdp->params.e100_speed_duplex != E100_AUTONEG) && - (bdp->params.e100_speed_duplex != E100_SPEED_100_FULL)) { - /* just inform user about 100 full */ - printk(KERN_ERR "e100: NC3133 NIC can only run " - "at 100Mbps full duplex\n"); - } - - bdp->params.e100_speed_duplex = E100_SPEED_100_FULL; - - /* enable interrupts */ - e100_mdi_read(bdp, MDI_NC3133_INT_ENABLE_REG, - bdp->phy_addr, &int_reg); - int_reg |= MDI_NC3133_INT_ENABLE; - e100_mdi_write(bdp, MDI_NC3133_INT_ENABLE_REG, - bdp->phy_addr, int_reg); - } - - /* Handle the National TX */ - if ((bdp->PhyId & PHY_MODEL_REV_ID_MASK) == PHY_NSC_TX) { - e100_mdi_read(bdp, NSC_CONG_CONTROL_REG, - bdp->phy_addr, &misc_reg); - - misc_reg |= NSC_TX_CONG_TXREADY; - - /* disable the congestion control bit in the National Phy */ - misc_reg &= ~NSC_TX_CONG_ENABLE; - - e100_mdi_write(bdp, NSC_CONG_CONTROL_REG, - bdp->phy_addr, misc_reg); - } - - return true; -} - -/* - * Procedure: e100_phy_fix_squelch - * - * Description: - * Help find link on certain rare scenarios. - * NOTE: This routine must be called once per watchdog, - * and *after* setting the current link state. - * - * Arguments: - * bdp - Ptr to this card's e100_bdconfig structure - * - * Returns: - * NOTHING - */ -static void -e100_phy_fix_squelch(struct e100_private *bdp) -{ - if ((bdp->PhyId != PHY_82555_TX) || (bdp->flags & DF_SPEED_FORCED)) - return; - - if (netif_carrier_ok(bdp->device)) { - switch (bdp->PhyState) { - case 0: - break; - case 1: - e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, 0x0000); - break; - case 2: - e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR, - bdp->phy_addr, 0x3000); - break; - } - bdp->PhyState = 0; - bdp->PhyDelay = 0; - - } else if (!bdp->PhyDelay--) { - switch (bdp->PhyState) { - case 0: - e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, EXTENDED_SQUELCH_BIT); - bdp->PhyState = 1; - break; - case 1: - e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, 0x0000); - e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR, - bdp->phy_addr, 0x2010); - bdp->PhyState = 2; - break; - case 2: - e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR, - bdp->phy_addr, 0x3000); - bdp->PhyState = 0; - break; - } - - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, - BMCR_ANENABLE | BMCR_ANRESTART); - bdp->PhyDelay = 3; - } -} - -/* - * Procedure: e100_fix_polarity - * - * Description: - * Fix for 82555 auto-polarity toggle problem. With a short cable - * connecting an 82555 with an 840A link partner, if the medium is noisy, - * the 82555 sometime thinks that the polarity might be wrong and so - * toggles polarity. This happens repeatedly and results in a high bit - * error rate. - * NOTE: This happens only at 10 Mbps - * - * Arguments: - * bdp - Ptr to this card's e100_bdconfig structure - * - * Returns: - * NOTHING - */ -static void -e100_fix_polarity(struct e100_private *bdp) -{ - u16 status; - u16 errors; - u16 misc_reg; - int speed; - - if ((bdp->PhyId != PHY_82555_TX) && (bdp->PhyId != PHY_82562ET) && - (bdp->PhyId != PHY_82562EM)) - return; - - /* If the user wants auto-polarity disabled, do only that and nothing * - * else. * e100_autopolarity == 0 means disable --- we do just the - * disabling * e100_autopolarity == 1 means enable --- we do nothing at - * all * e100_autopolarity >= 2 means we do the workaround code. */ - /* Change for 82558 enhancement */ - switch (E100_AUTOPOLARITY) { - case 0: - e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, &misc_reg); - e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, bdp->phy_addr, - (u16) (misc_reg | DISABLE_AUTO_POLARITY)); - break; - - case 1: - e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, &misc_reg); - e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, bdp->phy_addr, - (u16) (misc_reg & ~DISABLE_AUTO_POLARITY)); - break; - - case 2: - /* we do this only if link is up */ - if (!netif_carrier_ok(bdp->device)) { - break; - } - - e100_mdi_read(bdp, PHY_82555_CSR, bdp->phy_addr, &status); - speed = (status & PHY_82555_SPEED_BIT) ? 100 : 10; - - /* we need to do this only if speed is 10 */ - if (speed != 10) { - break; - } - - /* see if we have any end of frame errors */ - e100_mdi_read(bdp, PHY_82555_EOF_COUNTER, - bdp->phy_addr, &errors); - - /* if non-zero, wait for 100 ms before reading again */ - if (errors) { - udelay(200); - e100_mdi_read(bdp, PHY_82555_EOF_COUNTER, - bdp->phy_addr, &errors); - - /* if non-zero again, we disable polarity */ - if (errors) { - e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, &misc_reg); - e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, - (u16) (misc_reg | - DISABLE_AUTO_POLARITY)); - } - } - - if (!errors) { - /* it is safe to read the polarity now */ - e100_mdi_read(bdp, PHY_82555_CSR, - bdp->phy_addr, &status); - - /* if polarity is normal, disable polarity */ - if (!(status & PHY_82555_POLARITY_BIT)) { - e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, &misc_reg); - e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, - bdp->phy_addr, - (u16) (misc_reg | - DISABLE_AUTO_POLARITY)); - } - } - break; - - default: - break; - } -} - -/* - * Procedure: e100_find_speed_duplex - * - * Description: This routine will figure out what line speed and duplex mode - * the PHY is currently using. - * - * Arguments: - * bdp - Ptr to this card's e100_bdconfig structure - * - * Returns: - * NOTHING - */ -static void -e100_find_speed_duplex(struct e100_private *bdp) -{ - unsigned int PhyId; - u16 stat_reg, misc_reg; - u16 ad_reg, lp_ad_reg; - - PhyId = bdp->PhyId & PHY_MODEL_REV_ID_MASK; - - /* First we should check to see if we have link */ - /* If we don't have a link no reason to print a speed and duplex */ - if (!e100_update_link_state(bdp)) { - bdp->cur_line_speed = 0; - bdp->cur_dplx_mode = 0; - return; - } - - /* On the 82559 and later controllers, speed/duplex is part of the * - * SCB. So, we save an mdi_read and get these from the SCB. * */ - if (bdp->rev_id >= D101MA_REV_ID) { - /* Read speed */ - if (readb(&bdp->scb->scb_ext.d101m_scb.scb_gen_stat) & BIT_1) - bdp->cur_line_speed = 100; - else - bdp->cur_line_speed = 10; - - /* Read duplex */ - if (readb(&bdp->scb->scb_ext.d101m_scb.scb_gen_stat) & BIT_2) - bdp->cur_dplx_mode = FULL_DUPLEX; - else - bdp->cur_dplx_mode = HALF_DUPLEX; - - return; - } - - /* If this is a Phy 100, then read bits 1 and 0 of extended register 0, - * to get the current speed and duplex settings. */ - if ((PhyId == PHY_100_A) || (PhyId == PHY_100_C) || - (PhyId == PHY_82555_TX)) { - - /* Read Phy 100 extended register 0 */ - e100_mdi_read(bdp, EXTENDED_REG_0, bdp->phy_addr, &misc_reg); - - /* Get current speed setting */ - if (misc_reg & PHY_100_ER0_SPEED_INDIC) - bdp->cur_line_speed = 100; - else - bdp->cur_line_speed = 10; - - /* Get current duplex setting -- FDX enabled if bit is set */ - if (misc_reg & PHY_100_ER0_FDX_INDIC) - bdp->cur_dplx_mode = FULL_DUPLEX; - else - bdp->cur_dplx_mode = HALF_DUPLEX; - - return; - } - - /* See if link partner is capable of Auto-Negotiation (bit 0, reg 6) */ - e100_mdi_read(bdp, MII_EXPANSION, bdp->phy_addr, &misc_reg); - - /* See if Auto-Negotiation was complete (bit 5, reg 1) */ - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg); - - /* If a True NWAY connection was made, then we can detect speed/dplx - * by ANDing our adapter's advertised abilities with our link partner's - * advertised ablilities, and then assuming that the highest common - * denominator was chosed by NWAY. */ - if ((misc_reg & EXPANSION_NWAY) && (stat_reg & BMSR_ANEGCOMPLETE)) { - - /* Read our advertisement register */ - e100_mdi_read(bdp, MII_ADVERTISE, bdp->phy_addr, &ad_reg); - - /* Read our link partner's advertisement register */ - e100_mdi_read(bdp, MII_LPA, bdp->phy_addr, &lp_ad_reg); - - /* AND the two advertisement registers together, and get rid - * of any extraneous bits. */ - ad_reg &= (lp_ad_reg & NWAY_LP_ABILITY); - - /* Get speed setting */ - if (ad_reg & - (ADVERTISE_100HALF | ADVERTISE_100FULL | - ADVERTISE_100BASE4)) - - bdp->cur_line_speed = 100; - else - bdp->cur_line_speed = 10; - - /* Get duplex setting -- use priority resolution algorithm */ - if (ad_reg & ADVERTISE_100BASE4) { - bdp->cur_dplx_mode = HALF_DUPLEX; - } else if (ad_reg & ADVERTISE_100FULL) { - bdp->cur_dplx_mode = FULL_DUPLEX; - } else if (ad_reg & ADVERTISE_100HALF) { - bdp->cur_dplx_mode = HALF_DUPLEX; - } else if (ad_reg & ADVERTISE_10FULL) { - bdp->cur_dplx_mode = FULL_DUPLEX; - } else { - bdp->cur_dplx_mode = HALF_DUPLEX; - } - - return; - } - - /* If we are connected to a dumb (non-NWAY) repeater or hub, and the - * line speed was determined automatically by parallel detection, then - * we have no way of knowing exactly what speed the PHY is set to - * unless that PHY has a propietary register which indicates speed in - * this situation. The NSC TX PHY does have such a register. Also, - * since NWAY didn't establish the connection, the duplex setting - * should HALF duplex. */ - bdp->cur_dplx_mode = HALF_DUPLEX; - - if (PhyId == PHY_NSC_TX) { - /* Read register 25 to get the SPEED_10 bit */ - e100_mdi_read(bdp, NSC_SPEED_IND_REG, bdp->phy_addr, &misc_reg); - - /* If bit 6 was set then we're at 10Mbps */ - if (misc_reg & NSC_TX_SPD_INDC_SPEED) - bdp->cur_line_speed = 10; - else - bdp->cur_line_speed = 100; - - } else { - /* If we don't know the line speed, default to 10Mbps */ - bdp->cur_line_speed = 10; - } -} - -/* - * Procedure: e100_force_speed_duplex - * - * Description: This routine forces line speed and duplex mode of the - * adapter based on the values the user has set in e100.c. - * - * Arguments: bdp - Pointer to the e100_private structure for the board - * - * Returns: void - * - */ -void -e100_force_speed_duplex(struct e100_private *bdp) -{ - u16 control; - unsigned long expires; - - bdp->flags |= DF_SPEED_FORCED; - - e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &control); - control &= ~BMCR_ANENABLE; - control &= ~BMCR_LOOPBACK; - - switch (bdp->params.e100_speed_duplex) { - case E100_SPEED_10_HALF: - control &= ~BMCR_SPEED100; - control &= ~BMCR_FULLDPLX; - bdp->cur_line_speed = 10; - bdp->cur_dplx_mode = HALF_DUPLEX; - break; - - case E100_SPEED_10_FULL: - control &= ~BMCR_SPEED100; - control |= BMCR_FULLDPLX; - bdp->cur_line_speed = 10; - bdp->cur_dplx_mode = FULL_DUPLEX; - break; - - case E100_SPEED_100_HALF: - control |= BMCR_SPEED100; - control &= ~BMCR_FULLDPLX; - bdp->cur_line_speed = 100; - bdp->cur_dplx_mode = HALF_DUPLEX; - break; - - case E100_SPEED_100_FULL: - control |= BMCR_SPEED100; - control |= BMCR_FULLDPLX; - bdp->cur_line_speed = 100; - bdp->cur_dplx_mode = FULL_DUPLEX; - break; - } - - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, control); - - /* loop must run at least once */ - expires = jiffies + 2 * HZ; - do { - if (e100_update_link_state(bdp) || - time_after(jiffies, expires)) { - break; - } else { - yield(); - } - - } while (true); -} - -void -e100_force_speed_duplex_to_phy(struct e100_private *bdp) -{ - u16 control; - - e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &control); - control &= ~BMCR_ANENABLE; - control &= ~BMCR_LOOPBACK; - - switch (bdp->params.e100_speed_duplex) { - case E100_SPEED_10_HALF: - control &= ~BMCR_SPEED100; - control &= ~BMCR_FULLDPLX; - break; - - case E100_SPEED_10_FULL: - control &= ~BMCR_SPEED100; - control |= BMCR_FULLDPLX; - break; - - case E100_SPEED_100_HALF: - control |= BMCR_SPEED100; - control &= ~BMCR_FULLDPLX; - break; - - case E100_SPEED_100_FULL: - control |= BMCR_SPEED100; - control |= BMCR_FULLDPLX; - break; - } - - /* Send speed/duplex command to PHY layer. */ - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, control); -} - -/* - * Procedure: e100_set_fc - * - * Description: Checks the link's capability for flow control. - * - * Arguments: bdp - Pointer to the e100_private structure for the board - * - * Returns: void - * - */ -static void -e100_set_fc(struct e100_private *bdp) -{ - u16 ad_reg; - u16 lp_ad_reg; - u16 exp_reg; - - /* no flow control for 82557, forced links or half duplex */ - if (!netif_carrier_ok(bdp->device) || (bdp->flags & DF_SPEED_FORCED) || - (bdp->cur_dplx_mode == HALF_DUPLEX) || - !(bdp->flags & IS_BACHELOR)) { - - bdp->flags &= ~DF_LINK_FC_CAP; - return; - } - - /* See if link partner is capable of Auto-Negotiation (bit 0, reg 6) */ - e100_mdi_read(bdp, MII_EXPANSION, bdp->phy_addr, &exp_reg); - - if (exp_reg & EXPANSION_NWAY) { - /* Read our advertisement register */ - e100_mdi_read(bdp, MII_ADVERTISE, bdp->phy_addr, &ad_reg); - - /* Read our link partner's advertisement register */ - e100_mdi_read(bdp, MII_LPA, bdp->phy_addr, &lp_ad_reg); - - ad_reg &= lp_ad_reg; /* AND the 2 ad registers */ - - if (ad_reg & NWAY_AD_FC_SUPPORTED) - bdp->flags |= DF_LINK_FC_CAP; - else - /* If link partner is capable of autoneg, but */ - /* not capable of flow control, Received PAUSE */ - /* frames are still honored, i.e., */ - /* transmitted frames would be paused */ - /* by incoming PAUSE frames */ - bdp->flags |= DF_LINK_FC_TX_ONLY; - - } else { - bdp->flags &= ~DF_LINK_FC_CAP; - } -} - -/* - * Procedure: e100_phy_check - * - * Arguments: bdp - Pointer to the e100_private structure for the board - * - * Returns: true if link state was changed - * false otherwise - * - */ -unsigned char -e100_phy_check(struct e100_private *bdp) -{ - unsigned char old_link; - unsigned char changed = false; - - old_link = netif_carrier_ok(bdp->device) ? 1 : 0; - e100_find_speed_duplex(bdp); - - if (!old_link && netif_carrier_ok(bdp->device)) { - e100_set_fc(bdp); - changed = true; - } - - if (old_link && !netif_carrier_ok(bdp->device)) { - /* reset the zero lock state */ - bdp->zlock_state = ZLOCK_INITIAL; - - // set auto lock for phy auto-negotiation on link up - if ((bdp->PhyId & PHY_MODEL_REV_ID_MASK) == PHY_82555_TX) - e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR, - bdp->phy_addr, 0); - changed = true; - } - - e100_phy_fix_squelch(bdp); - e100_handle_zlock(bdp); - - return changed; -} - -/* - * Procedure: e100_auto_neg - * - * Description: This routine will start autonegotiation and wait - * for it to complete - * - * Arguments: - * bdp - pointer to this card's e100_bdconfig structure - * force_restart - defines if autoneg should be restarted even if it - * has been completed before - * Returns: - * NOTHING - */ -static void -e100_auto_neg(struct e100_private *bdp, unsigned char force_restart) -{ - u16 stat_reg; - unsigned long expires; - - bdp->flags &= ~DF_SPEED_FORCED; - - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg); - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg); - - /* if we are capable of performing autoneg then we restart if needed */ - if ((stat_reg != 0xFFFF) && (stat_reg & BMSR_ANEGCAPABLE)) { - - if ((!force_restart) && - (stat_reg & BMSR_ANEGCOMPLETE)) { - goto exit; - } - - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, - BMCR_ANENABLE | BMCR_ANRESTART); - - /* wait for autoneg to complete (up to 3 seconds) */ - expires = jiffies + HZ * 3; - do { - /* now re-read the value. Sticky so read twice */ - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg); - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg); - - if ((stat_reg & BMSR_ANEGCOMPLETE) || - time_after(jiffies, expires) ) { - goto exit; - } else { - yield(); - } - } while (true); - } - -exit: - e100_find_speed_duplex(bdp); -} - -void -e100_phy_set_speed_duplex(struct e100_private *bdp, unsigned char force_restart) -{ - if (bdp->params.e100_speed_duplex == E100_AUTONEG) { - if (bdp->rev_id >= D102_REV_ID) - /* Enable MDI/MDI-X auto switching */ - e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr, - MDI_MDIX_AUTO_SWITCH_ENABLE); - e100_auto_neg(bdp, force_restart); - - } else { - if (bdp->rev_id >= D102_REV_ID) - /* Disable MDI/MDI-X auto switching */ - e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr, - MDI_MDIX_RESET_ALL_MASK); - e100_force_speed_duplex(bdp); - } - - e100_set_fc(bdp); -} - -void -e100_phy_autoneg(struct e100_private *bdp) -{ - u16 ctrl_reg; - - ctrl_reg = BMCR_ANENABLE | BMCR_ANRESTART | BMCR_RESET; - - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg); - - udelay(100); -} - -void -e100_phy_set_loopback(struct e100_private *bdp) -{ - u16 ctrl_reg; - ctrl_reg = BMCR_LOOPBACK; - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg); - udelay(100); -} - -void -e100_phy_reset(struct e100_private *bdp) -{ - u16 ctrl_reg; - ctrl_reg = BMCR_RESET; - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg); - /* ieee 802.3 : The reset process shall be completed */ - /* within 0.5 seconds from the settting of PHY reset bit. */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ / 2); -} - -unsigned char -e100_phy_init(struct e100_private *bdp) -{ - e100_phy_reset(bdp); - e100_phy_address_detect(bdp); - e100_phy_isolate(bdp); - e100_phy_id_detect(bdp); - - if (!e100_phy_specific_setup(bdp)) - return false; - - bdp->PhyState = 0; - bdp->PhyDelay = 0; - bdp->zlock_state = ZLOCK_INITIAL; - - e100_phy_set_speed_duplex(bdp, false); - e100_fix_polarity(bdp); - - return true; -} - -/* - * Procedure: e100_get_link_state - * - * Description: This routine checks the link status of the adapter - * - * Arguments: bdp - Pointer to the e100_private structure for the board - * - * - * Returns: true - If a link is found - * false - If there is no link - * - */ -unsigned char -e100_get_link_state(struct e100_private *bdp) -{ - unsigned char link = false; - u16 status; - - /* Check link status */ - /* If the controller is a 82559 or later one, link status is available - * from the CSR. This avoids the mdi_read. */ - if (bdp->rev_id >= D101MA_REV_ID) { - if (readb(&bdp->scb->scb_ext.d101m_scb.scb_gen_stat) & BIT_0) { - link = true; - } else { - link = false; - } - - } else { - /* Read the status register twice because of sticky bits */ - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &status); - e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &status); - - if (status & BMSR_LSTATUS) { - link = true; - } else { - link = false; - } - } - - return link; -} - -/* - * Procedure: e100_update_link_state - * - * Description: This routine updates the link status of the adapter, - * also considering netif_running - * - * Arguments: bdp - Pointer to the e100_private structure for the board - * - * - * Returns: true - If a link is found - * false - If there is no link - * - */ -unsigned char -e100_update_link_state(struct e100_private *bdp) -{ - unsigned char link; - - /* Logical AND PHY link & netif_running */ - link = e100_get_link_state(bdp) && netif_running(bdp->device); - - if (link) { - if (!netif_carrier_ok(bdp->device)) - netif_carrier_on(bdp->device); - } else { - if (netif_carrier_ok(bdp->device)) - netif_carrier_off(bdp->device); - } - - return link; -} - -/**************************************************************************\ - ** - ** PROC NAME: e100_handle_zlock - ** This function manages a state machine that controls - ** the driver's zero locking algorithm. - ** This function is called by e100_watchdog() every ~2 second. - ** States: - ** The current link handling state is stored in - ** bdp->zlock_state, and is one of: - ** ZLOCK_INITIAL, ZLOCK_READING, ZLOCK_SLEEPING - ** Detailed description of the states and the transitions - ** between states is found below. - ** Note that any time the link is down / there is a reset - ** state will be changed outside this function to ZLOCK_INITIAL - ** Algorithm: - ** 1. If link is up & 100 Mbps continue else stay in #1: - ** 2. Set 'auto lock' - ** 3. Read & Store 100 times 'Zero' locked in 1 sec interval - ** 4. If max zero read >= 0xB continue else goto 1 - ** 5. Set most popular 'Zero' read in #3 - ** 6. Sleep 5 minutes - ** 7. Read number of errors, if it is > 300 goto 2 else goto 6 - ** Data Structures (in DRIVER_DATA): - ** zlock_state - current state of the algorithm - ** zlock_read_cnt - counts number of reads (up to 100) - ** zlock_read_data[i] - counts number of times 'Zero' read was i, 0 <= i <= 15 - ** zlock_sleep_cnt - keeps track of "sleep" time (up to 300 secs = 5 minutes) - ** - ** Parameters: DRIVER_DATA *bdp - ** - ** bdp - Pointer to HSM's adapter data space - ** - ** Return Value: NONE - ** - ** See Also: e100_watchdog() - ** - \**************************************************************************/ -void -e100_handle_zlock(struct e100_private *bdp) -{ - u16 pos; - u16 eq_reg; - u16 err_cnt; - u8 mpz; /* Most Popular Zero */ - - switch (bdp->zlock_state) { - case ZLOCK_INITIAL: - - if (((u8) bdp->rev_id <= D102_REV_ID) || - !(bdp->cur_line_speed == 100) || - !netif_carrier_ok(bdp->device)) { - break; - } - - /* initialize hw and sw and start reading */ - e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR, - bdp->phy_addr, 0); - /* reset read counters: */ - bdp->zlock_read_cnt = 0; - for (pos = 0; pos < 16; pos++) - bdp->zlock_read_data[pos] = 0; - /* start reading in the next call back: */ - bdp->zlock_state = ZLOCK_READING; - - /* FALL THROUGH !! */ - - case ZLOCK_READING: - /* state: reading (100 times) zero locked in 1 sec interval - * prev states: ZLOCK_INITIAL - * next states: ZLOCK_INITIAL, ZLOCK_SLEEPING */ - - e100_mdi_read(bdp, PHY_82555_MDI_EQUALIZER_CSR, - bdp->phy_addr, &eq_reg); - pos = (eq_reg & ZLOCK_ZERO_MASK) >> 4; - bdp->zlock_read_data[pos]++; - bdp->zlock_read_cnt++; - - if (bdp->zlock_read_cnt == ZLOCK_MAX_READS) { - /* check if we read a 'Zero' value of 0xB or greater */ - if ((bdp->zlock_read_data[0xB]) || - (bdp->zlock_read_data[0xC]) || - (bdp->zlock_read_data[0xD]) || - (bdp->zlock_read_data[0xE]) || - (bdp->zlock_read_data[0xF])) { - - /* we've read 'Zero' value of 0xB or greater, - * find most popular 'Zero' value and lock it */ - mpz = 0; - /* this loop finds the most popular 'Zero': */ - for (pos = 1; pos < 16; pos++) { - if (bdp->zlock_read_data[pos] > - bdp->zlock_read_data[mpz]) - - mpz = pos; - } - /* now lock the most popular 'Zero': */ - eq_reg = (ZLOCK_SET_ZERO | mpz); - e100_mdi_write(bdp, - PHY_82555_MDI_EQUALIZER_CSR, - bdp->phy_addr, eq_reg); - - /* sleep for 5 minutes: */ - bdp->zlock_sleep_cnt = jiffies; - bdp->zlock_state = ZLOCK_SLEEPING; - /* we will be reading the # of errors after 5 - * minutes, so we need to reset the error - * counters - these registers are self clearing - * on read, so read them */ - e100_mdi_read(bdp, PHY_82555_SYMBOL_ERR, - bdp->phy_addr, &err_cnt); - - } else { - /* we did not read a 'Zero' value of 0xB or - * above. go back to the start */ - bdp->zlock_state = ZLOCK_INITIAL; - } - - } - break; - - case ZLOCK_SLEEPING: - /* state: sleeping for 5 minutes - * prev states: ZLOCK_READING - * next states: ZLOCK_READING, ZLOCK_SLEEPING */ - - /* if 5 minutes have passed: */ - if ((jiffies - bdp->zlock_sleep_cnt) >= ZLOCK_MAX_SLEEP) { - /* read and sum up the number of errors: */ - e100_mdi_read(bdp, PHY_82555_SYMBOL_ERR, - bdp->phy_addr, &err_cnt); - /* if we've more than 300 errors (this number was - * calculated according to the spec max allowed errors - * (80 errors per 1 million frames) for 5 minutes in - * 100 Mbps (or the user specified max BER number) */ - if (err_cnt > bdp->params.ber) { - /* start again in the next callback: */ - bdp->zlock_state = ZLOCK_INITIAL; - } else { - /* we don't have more errors than allowed, - * sleep for 5 minutes */ - bdp->zlock_sleep_cnt = jiffies; - } - } - break; - - default: - break; - } -} diff -Nru a/drivers/net/e100/e100_phy.h b/drivers/net/e100/e100_phy.h --- a/drivers/net/e100/e100_phy.h Thu Feb 19 23:44:23 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,158 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -#ifndef _E100_PHY_INC_ -#define _E100_PHY_INC_ - -#include "e100.h" - -/* - * Auto-polarity enable/disable - * e100_autopolarity = 0 => disable auto-polarity - * e100_autopolarity = 1 => enable auto-polarity - * e100_autopolarity = 2 => let software determine - */ -#define E100_AUTOPOLARITY 2 - -#define IS_NC3133(bdp) (((bdp)->pdev->subsystem_vendor == 0x0E11) && \ - ((bdp)->pdev->subsystem_device == 0xB0E1)) - -#define PHY_503 0 -#define PHY_100_A 0x000003E0 -#define PHY_100_C 0x035002A8 -#define PHY_NSC_TX 0x5c002000 -#define PHY_82562ET 0x033002A8 -#define PHY_82562EM 0x032002A8 -#define PHY_82562EH 0x017002A8 -#define PHY_82555_TX 0x015002a8 /* added this for 82555 */ -#define PHY_OTHER 0xFFFF -#define MAX_PHY_ADDR 31 -#define MIN_PHY_ADDR 0 - -#define PHY_MODEL_REV_ID_MASK 0xFFF0FFFF - -#define PHY_DEFAULT_ADDRESS 1 -#define PHY_ADDRESS_503 32 - -/* MDI Control register bit definitions */ -#define MDI_PHY_READY BIT_28 /* PHY is ready for next MDI cycle */ - -#define MDI_NC3133_CONFIG_REG 0x19 -#define MDI_NC3133_100FX_ENABLE BIT_2 -#define MDI_NC3133_INT_ENABLE_REG 0x17 -#define MDI_NC3133_INT_ENABLE BIT_1 - -/* MDI Control register opcode definitions */ -#define MDI_WRITE 1 /* Phy Write */ -#define MDI_READ 2 /* Phy read */ - -/* MDI register set*/ -#define AUTO_NEG_NEXT_PAGE_REG 0x07 /* Auto-negotiation next page xmit */ -#define EXTENDED_REG_0 0x10 /* Extended reg 0 (Phy 100 modes) */ -#define EXTENDED_REG_1 0x14 /* Extended reg 1 (Phy 100 error indications) */ -#define NSC_CONG_CONTROL_REG 0x17 /* National (TX) congestion control */ -#define NSC_SPEED_IND_REG 0x19 /* National (TX) speed indication */ - -#define HWI_CONTROL_REG 0x1D /* HWI Control register */ -/* MDI/MDI-X Control Register bit definitions */ -#define MDI_MDIX_RES_TIMER BIT_0_3 /* minimum slot time for resolution timer */ -#define MDI_MDIX_CONFIG_IS_OK BIT_4 /* 1 = resolution algorithm completes OK */ -#define MDI_MDIX_STATUS BIT_5 /* 1 = MDIX (croos over), 0 = MDI (straight through) */ -#define MDI_MDIX_SWITCH BIT_6 /* 1 = Forces to MDIX, 0 = Forces to MDI */ -#define MDI_MDIX_AUTO_SWITCH_ENABLE BIT_7 /* 1 = MDI/MDI-X feature enabled */ -#define MDI_MDIX_CONCT_CONFIG BIT_8 /* Sets the MDI/MDI-X connectivity configuration (test prupose only) */ -#define MDI_MDIX_CONCT_TEST_ENABLE BIT_9 /* 1 = Enables connectivity testing */ -#define MDI_MDIX_RESET_ALL_MASK 0x0000 - -/* HWI Control Register bit definitions */ -#define HWI_TEST_DISTANCE BIT_0_8 /* distance to cable problem */ -#define HWI_TEST_HIGHZ_PROBLEM BIT_9 /* 1 = Open Circuit */ -#define HWI_TEST_LOWZ_PROBLEM BIT_10 /* 1 = Short Circuit */ -#define HWI_TEST_RESERVED (BIT_11 | BIT_12) /* reserved */ -#define HWI_TEST_EXECUTE BIT_13 /* 1 = Execute the HWI test on the PHY */ -#define HWI_TEST_ABILITY BIT_14 /* 1 = test passed */ -#define HWI_TEST_ENABLE BIT_15 /* 1 = Enables the HWI feature */ -#define HWI_RESET_ALL_MASK 0x0000 - -/* ############Start of 82555 specific defines################## */ - -/* Intel 82555 specific registers */ -#define PHY_82555_CSR 0x10 /* 82555 CSR */ -#define PHY_82555_SPECIAL_CONTROL 0x11 /* 82555 special control register */ - -#define PHY_82555_RCV_ERR 0x15 /* 82555 100BaseTx Receive Error - * Frame Counter */ -#define PHY_82555_SYMBOL_ERR 0x16 /* 82555 RCV Symbol Error Counter */ -#define PHY_82555_PREM_EOF_ERR 0x17 /* 82555 100BaseTx RCV Premature End - * of Frame Error Counter */ -#define PHY_82555_EOF_COUNTER 0x18 /* 82555 end of frame error counter */ -#define PHY_82555_MDI_EQUALIZER_CSR 0x1a /* 82555 specific equalizer reg. */ - -/* 82555 CSR bits */ -#define PHY_82555_SPEED_BIT BIT_1 -#define PHY_82555_POLARITY_BIT BIT_8 - -/* 82555 equalizer reg. opcodes */ -#define ENABLE_ZERO_FORCING 0x2010 /* write to ASD conf. reg. 0 */ -#define DISABLE_ZERO_FORCING 0x2000 /* write to ASD conf. reg. 0 */ - -/* 82555 special control reg. opcodes */ -#define DISABLE_AUTO_POLARITY 0x0010 -#define EXTENDED_SQUELCH_BIT BIT_2 - -/* ############End of 82555 specific defines##################### */ - -/* Auto-Negotiation advertisement register bit definitions*/ -#define NWAY_AD_FC_SUPPORTED 0x0400 /* Flow Control supported */ - -/* Auto-Negotiation link partner ability register bit definitions*/ -#define NWAY_LP_ABILITY 0x07e0 /* technologies supported */ - -/* PHY 100 Extended Register 0 bit definitions*/ -#define PHY_100_ER0_FDX_INDIC BIT_0 /* 1 = FDX, 0 = half duplex */ -#define PHY_100_ER0_SPEED_INDIC BIT_1 /* 1 = 100Mbps, 0= 10Mbps */ - -/* National Semiconductor TX phy congestion control register bit definitions*/ -#define NSC_TX_CONG_TXREADY BIT_10 /* Makes TxReady an input */ -#define NSC_TX_CONG_ENABLE BIT_8 /* Enables congestion control */ - -/* National Semiconductor TX phy speed indication register bit definitions*/ -#define NSC_TX_SPD_INDC_SPEED BIT_6 /* 0 = 100Mbps, 1=10Mbps */ - -/************* function prototypes ************/ -extern unsigned char e100_phy_init(struct e100_private *bdp); -extern unsigned char e100_update_link_state(struct e100_private *bdp); -extern unsigned char e100_phy_check(struct e100_private *bdp); -extern void e100_phy_set_speed_duplex(struct e100_private *bdp, - unsigned char force_restart); -extern void e100_phy_autoneg(struct e100_private *bdp); -extern void e100_phy_reset(struct e100_private *bdp); -extern void e100_phy_set_loopback(struct e100_private *bdp); -extern int e100_mdi_write(struct e100_private *, u32, u32, u16); -extern int e100_mdi_read(struct e100_private *, u32, u32, u16 *); - -#endif diff -Nru a/drivers/net/e100/e100_test.c b/drivers/net/e100/e100_test.c --- a/drivers/net/e100/e100_test.c Thu Feb 19 23:44:24 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,500 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -#include "e100_phy.h" -#include "e100_config.h" - -extern u16 e100_eeprom_read(struct e100_private *, u16); -extern int e100_wait_exec_cmplx(struct e100_private *, u32,u8, u8); -extern void e100_phy_reset(struct e100_private *bdp); -extern void e100_phy_autoneg(struct e100_private *bdp); -extern void e100_phy_set_loopback(struct e100_private *bdp); -extern void e100_force_speed_duplex(struct e100_private *bdp); - -static u8 e100_diag_selftest(struct net_device *); -static u8 e100_diag_eeprom(struct net_device *); -static u8 e100_diag_loopback(struct net_device *); - -static u8 e100_diag_one_loopback (struct net_device *, u8); -static u8 e100_diag_rcv_loopback_pkt(struct e100_private *); -static void e100_diag_config_loopback(struct e100_private *, u8, u8, u8 *,u8 *); -static u8 e100_diag_loopback_alloc(struct e100_private *); -static void e100_diag_loopback_cu_ru_exec(struct e100_private *); -static u8 e100_diag_check_pkt(u8 *); -static void e100_diag_loopback_free(struct e100_private *); -static int e100_cable_diag(struct e100_private *bdp); - -#define LB_PACKET_SIZE 1500 - -/** - * e100_run_diag - main test execution handler - checks mask of requests and calls the diag routines - * @dev: atapter's net device data struct - * @test_info: array with test request mask also used to store test results - * - * RETURNS: updated flags field of struct ethtool_test - */ -u32 -e100_run_diag(struct net_device *dev, u64 *test_info, u32 flags) -{ - struct e100_private* bdp = dev->priv; - u8 test_result = 0; - - if (!e100_get_link_state(bdp)) { - test_result = ETH_TEST_FL_FAILED; - test_info[test_link] = true; - } - if (!e100_diag_eeprom(dev)) { - test_result = ETH_TEST_FL_FAILED; - test_info[test_eeprom] = true; - } - if (flags & ETH_TEST_FL_OFFLINE) { - u8 fail_mask; - if (netif_running(dev)) { - spin_lock_bh(&dev->xmit_lock); - e100_close(dev); - spin_unlock_bh(&dev->xmit_lock); - } - if (e100_diag_selftest(dev)) { - test_result = ETH_TEST_FL_FAILED; - test_info[test_self_test] = true; - } - - fail_mask = e100_diag_loopback(dev); - if (fail_mask) { - test_result = ETH_TEST_FL_FAILED; - if (fail_mask & PHY_LOOPBACK) - test_info[test_loopback_phy] = true; - if (fail_mask & MAC_LOOPBACK) - test_info[test_loopback_mac] = true; - } - - test_info[cable_diag] = e100_cable_diag(bdp); - /* Need hw init regardless of netif_running */ - e100_hw_init(bdp); - if (netif_running(dev)) { - e100_open(dev); - } - } - else { - test_info[test_self_test] = false; - test_info[test_loopback_phy] = false; - test_info[test_loopback_mac] = false; - test_info[cable_diag] = false; - } - - return flags | test_result; -} - -/** - * e100_diag_selftest - run hardware selftest - * @dev: atapter's net device data struct - */ -static u8 -e100_diag_selftest(struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - u32 st_timeout, st_result; - u8 retval = 0; - - if (!e100_selftest(bdp, &st_timeout, &st_result)) { - if (!st_timeout) { - if (st_result & CB_SELFTEST_REGISTER_BIT) - retval |= REGISTER_TEST_FAIL; - if (st_result & CB_SELFTEST_DIAG_BIT) - retval |= SELF_TEST_FAIL; - if (st_result & CB_SELFTEST_ROM_BIT) - retval |= ROM_TEST_FAIL; - } else { - retval = TEST_TIMEOUT; - } - } - - return retval; -} - -/** - * e100_diag_eeprom - validate eeprom checksum correctness - * @dev: atapter's net device data struct - * - */ -static u8 -e100_diag_eeprom (struct net_device *dev) -{ - struct e100_private *bdp = dev->priv; - u16 i, eeprom_sum, eeprom_actual_csm; - - for (i = 0, eeprom_sum = 0; i < (bdp->eeprom_size - 1); i++) { - eeprom_sum += e100_eeprom_read(bdp, i); - } - - eeprom_actual_csm = e100_eeprom_read(bdp, bdp->eeprom_size - 1); - - if (eeprom_actual_csm == (u16)(EEPROM_SUM - eeprom_sum)) { - return true; - } - - return false; -} - -/** - * e100_diag_loopback - performs loopback test - * @dev: atapter's net device data struct - */ -static u8 -e100_diag_loopback (struct net_device *dev) -{ - u8 rc = 0; - - printk(KERN_DEBUG "%s: PHY loopback test starts\n", dev->name); - e100_hw_init(dev->priv); - if (!e100_diag_one_loopback(dev, PHY_LOOPBACK)) { - rc |= PHY_LOOPBACK; - } - printk(KERN_DEBUG "%s: PHY loopback test ends\n", dev->name); - - printk(KERN_DEBUG "%s: MAC loopback test starts\n", dev->name); - e100_hw_init(dev->priv); - if (!e100_diag_one_loopback(dev, MAC_LOOPBACK)) { - rc |= MAC_LOOPBACK; - } - printk(KERN_DEBUG "%s: MAC loopback test ends\n", dev->name); - - return rc; -} - -/** - * e100_diag_loopback - performs loopback test - * @dev: atapter's net device data struct - * @mode: lopback test type - */ -static u8 -e100_diag_one_loopback (struct net_device *dev, u8 mode) -{ - struct e100_private *bdp = dev->priv; - u8 res = false; - u8 saved_dynamic_tbd = false; - u8 saved_extended_tcb = false; - - if (!e100_diag_loopback_alloc(bdp)) - return false; - - /* change the config block to standard tcb and the correct loopback */ - e100_diag_config_loopback(bdp, true, mode, - &saved_extended_tcb, &saved_dynamic_tbd); - - e100_diag_loopback_cu_ru_exec(bdp); - - if (e100_diag_rcv_loopback_pkt(bdp)) { - res = true; - } - - e100_diag_loopback_free(bdp); - - /* change the config block to previous tcb mode and the no loopback */ - e100_diag_config_loopback(bdp, false, mode, - &saved_extended_tcb, &saved_dynamic_tbd); - return res; -} - -/** - * e100_diag_config_loopback - setup/clear loopback before/after lpbk test - * @bdp: atapter's private data struct - * @set_loopback: true if the function is called to set lb - * @loopback_mode: the loopback mode(MAC or PHY) - * @tcb_extended: true if need to set extended tcb mode after clean loopback - * @dynamic_tbd: true if needed to set dynamic tbd mode after clean loopback - * - */ -void -e100_diag_config_loopback(struct e100_private* bdp, - u8 set_loopback, - u8 loopback_mode, - u8* tcb_extended, - u8* dynamic_tbd) -{ - /* if set_loopback == true - we want to clear tcb_extended/dynamic_tbd. - * the previous values are saved in the params tcb_extended/dynamic_tbd - * if set_loopback == false - we want to restore previous value. - */ - if (set_loopback || (*tcb_extended)) - *tcb_extended = e100_config_tcb_ext_enable(bdp,*tcb_extended); - - if (set_loopback || (*dynamic_tbd)) - *dynamic_tbd = e100_config_dynamic_tbd(bdp,*dynamic_tbd); - - if (set_loopback) { - /* ICH PHY loopback is broken */ - if (bdp->flags & IS_ICH && loopback_mode == PHY_LOOPBACK) - loopback_mode = MAC_LOOPBACK; - /* Configure loopback on MAC */ - e100_config_loopback_mode(bdp,loopback_mode); - } else { - e100_config_loopback_mode(bdp,NO_LOOPBACK); - } - - e100_config(bdp); - - if (loopback_mode == PHY_LOOPBACK) { - if (set_loopback) - /* Set PHY loopback mode */ - e100_phy_set_loopback(bdp); - else - /* Reset PHY loopback mode */ - e100_phy_reset(bdp); - /* Wait for PHY state change */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ); - } else { /* For MAC loopback wait 500 msec to take effect */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ / 2); - } -} - -/** - * e100_diag_loopback_alloc - alloc & initate tcb and rfd for the loopback - * @bdp: atapter's private data struct - * - */ -static u8 -e100_diag_loopback_alloc(struct e100_private *bdp) -{ - dma_addr_t dma_handle; - tcb_t *tcb; - rfd_t *rfd; - tbd_t *tbd; - - /* tcb, tbd and transmit buffer are allocated */ - tcb = pci_alloc_consistent(bdp->pdev, - (sizeof (tcb_t) + sizeof (tbd_t) + - LB_PACKET_SIZE), - &dma_handle); - if (tcb == NULL) - return false; - - memset(tcb, 0x00, sizeof (tcb_t) + sizeof (tbd_t) + LB_PACKET_SIZE); - tcb->tcb_phys = dma_handle; - tcb->tcb_hdr.cb_status = 0; - tcb->tcb_hdr.cb_cmd = - cpu_to_le16(CB_EL_BIT | CB_TRANSMIT | CB_TX_SF_BIT); - /* Next command is null */ - tcb->tcb_hdr.cb_lnk_ptr = cpu_to_le32(0xffffffff); - tcb->tcb_cnt = 0; - tcb->tcb_thrshld = bdp->tx_thld; - tcb->tcb_tbd_num = 1; - /* Set up tcb tbd pointer */ - tcb->tcb_tbd_ptr = cpu_to_le32(tcb->tcb_phys + sizeof (tcb_t)); - tbd = (tbd_t *) ((u8 *) tcb + sizeof (tcb_t)); - /* Set up tbd transmit buffer */ - tbd->tbd_buf_addr = - cpu_to_le32(le32_to_cpu(tcb->tcb_tbd_ptr) + sizeof (tbd_t)); - tbd->tbd_buf_cnt = __constant_cpu_to_le16(1024); - /* The value of first 512 bytes is FF */ - memset((void *) ((u8 *) tbd + sizeof (tbd_t)), 0xFF, 512); - /* The value of second 512 bytes is BA */ - memset((void *) ((u8 *) tbd + sizeof (tbd_t) + 512), 0xBA, 512); - wmb(); - rfd = pci_alloc_consistent(bdp->pdev, sizeof (rfd_t), &dma_handle); - - if (rfd == NULL) { - pci_free_consistent(bdp->pdev, - sizeof (tcb_t) + sizeof (tbd_t) + - LB_PACKET_SIZE, tcb, tcb->tcb_phys); - return false; - } - - memset(rfd, 0x00, sizeof (rfd_t)); - - /* init all fields in rfd */ - rfd->rfd_header.cb_cmd = cpu_to_le16(RFD_EL_BIT); - rfd->rfd_sz = cpu_to_le16(ETH_FRAME_LEN + CHKSUM_SIZE); - /* dma_handle is physical address of rfd */ - bdp->loopback.dma_handle = dma_handle; - bdp->loopback.tcb = tcb; - bdp->loopback.rfd = rfd; - wmb(); - return true; -} - -/** - * e100_diag_loopback_cu_ru_exec - activates cu and ru to send & receive the pkt - * @bdp: atapter's private data struct - * - */ -static void -e100_diag_loopback_cu_ru_exec(struct e100_private *bdp) -{ - /*load CU & RU base */ - if(!e100_wait_exec_cmplx(bdp, bdp->loopback.dma_handle, SCB_RUC_START, 0)) - printk(KERN_ERR "e100: SCB_RUC_START failed!\n"); - - bdp->next_cu_cmd = START_WAIT; - e100_start_cu(bdp, bdp->loopback.tcb); - bdp->last_tcb = NULL; - rmb(); -} -/** - * e100_diag_check_pkt - checks if a given packet is a loopback packet - * @bdp: atapter's private data struct - * - * Returns true if OK false otherwise. - */ -static u8 -e100_diag_check_pkt(u8 *datap) -{ - int i; - for (i = 0; i<512; i++) { - if( !((*datap)==0xFF && (*(datap + 512) == 0xBA)) ) { - printk (KERN_ERR "e100: check loopback packet failed at: %x\n", i); - return false; - } - } - printk (KERN_DEBUG "e100: Check received loopback packet OK\n"); - return true; -} - -/** - * e100_diag_rcv_loopback_pkt - waits for receive and checks lpbk packet - * @bdp: atapter's private data struct - * - * Returns true if OK false otherwise. - */ -static u8 -e100_diag_rcv_loopback_pkt(struct e100_private* bdp) -{ - rfd_t *rfdp; - u16 rfd_status; - unsigned long expires = jiffies + HZ * 2; - - rfdp =bdp->loopback.rfd; - - rfd_status = le16_to_cpu(rfdp->rfd_header.cb_status); - - while (!(rfd_status & RFD_STATUS_COMPLETE)) { - if (time_before(jiffies, expires)) { - yield(); - rmb(); - rfd_status = le16_to_cpu(rfdp->rfd_header.cb_status); - } else { - break; - } - } - - if (rfd_status & RFD_STATUS_COMPLETE) { - printk(KERN_DEBUG "e100: Loopback packet received\n"); - return e100_diag_check_pkt(((u8 *)rfdp+bdp->rfd_size)); - } - else { - printk(KERN_ERR "e100: Loopback packet not received\n"); - return false; - } -} - -/** - * e100_diag_loopback_free - free data allocated for loopback pkt send/receive - * @bdp: atapter's private data struct - * - */ -static void -e100_diag_loopback_free (struct e100_private *bdp) -{ - pci_free_consistent(bdp->pdev, - sizeof(tcb_t) + sizeof(tbd_t) + LB_PACKET_SIZE, - bdp->loopback.tcb, bdp->loopback.tcb->tcb_phys); - - pci_free_consistent(bdp->pdev, sizeof(rfd_t), bdp->loopback.rfd, - bdp->loopback.dma_handle); -} - -static int -e100_cable_diag(struct e100_private *bdp) -{ - int saved_open_circut = 0xffff; - int saved_short_circut = 0xffff; - int saved_distance = 0xffff; - int saved_same = 0; - int cable_status = E100_CABLE_UNKNOWN; - int i; - - /* If we have link, */ - if (e100_get_link_state(bdp)) - return E100_CABLE_OK; - - if (bdp->rev_id < D102_REV_ID) - return E100_CABLE_UNKNOWN; - - /* Disable MDI/MDI-X auto switching */ - e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr, - MDI_MDIX_RESET_ALL_MASK); - /* Set to 100 Full as required by cable test */ - e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, - BMCR_SPEED100 | BMCR_FULLDPLX); - - /* Test up to 100 times */ - for (i = 0; i < 100; i++) { - u16 ctrl_reg; - int distance, open_circut, short_circut, near_end; - - /* Enable and execute cable test */ - e100_mdi_write(bdp, HWI_CONTROL_REG, bdp->phy_addr, - (HWI_TEST_ENABLE | HWI_TEST_EXECUTE)); - /* Wait for cable test finished */ - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ/100 + 1); - /* Read results */ - e100_mdi_read(bdp, HWI_CONTROL_REG, bdp->phy_addr, &ctrl_reg); - distance = ctrl_reg & HWI_TEST_DISTANCE; - open_circut = ctrl_reg & HWI_TEST_HIGHZ_PROBLEM; - short_circut = ctrl_reg & HWI_TEST_LOWZ_PROBLEM; - - if ((distance == saved_distance) && - (open_circut == saved_open_circut) && - (short_circut == saved_short_circut)) - saved_same++; - else { - saved_same = 0; - saved_distance = distance; - saved_open_circut = open_circut; - saved_short_circut = short_circut; - } - /* If results are the same 3 times */ - if (saved_same == 3) { - near_end = ((distance * HWI_REGISTER_GRANULARITY) < - HWI_NEAR_END_BOUNDARY); - if (open_circut) - cable_status = (near_end) ? - E100_CABLE_OPEN_NEAR : E100_CABLE_OPEN_FAR; - if (short_circut) - cable_status = (near_end) ? - E100_CABLE_SHORT_NEAR : E100_CABLE_SHORT_FAR; - break; - } - } - /* Reset cable test */ - e100_mdi_write(bdp, HWI_CONTROL_REG, bdp->phy_addr, HWI_RESET_ALL_MASK); - return cable_status; -} - diff -Nru a/drivers/net/e100/e100_ucode.h b/drivers/net/e100/e100_ucode.h --- a/drivers/net/e100/e100_ucode.h Thu Feb 19 23:44:28 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,365 +0,0 @@ -/******************************************************************************* - - - Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved. - - 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. - - The full GNU General Public License is included in this distribution in the - file called LICENSE. - - Contact Information: - Linux NICS - Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 -*******************************************************************************/ - -#ifndef _E100_UCODE_H_ -#define _E100_UCODE_H_ - -/* -e100_ucode.h - -This file contains the loadable micro code arrays to implement receive -bundling on the D101 A-step, D101 B-step, D101M (B-step only), D101S, -D102 B-step, D102 B-step with TCO work around and D102 C-step. - -Each controller has its own specific micro code array. The array for one -controller is totally incompatible with any other controller, and if used -will most likely cause the controller to lock up and stop responding to -the driver. Each micro code array has its own parameter offsets (described -below), and they each have their own version number. -*/ - -/************************************************************************* -* CPUSaver parameters -* -* All CPUSaver parameters are 16-bit literals that are part of a -* "move immediate value" instruction. By changing the value of -* the literal in the instruction before the code is loaded, the -* driver can change algorithm. -* -* CPUSAVER_DWORD - This is the location of the instruction that loads -* the dead-man timer with its inital value. By writing a 16-bit -* value to the low word of this instruction, the driver can change -* the timer value. The current default is either x600 or x800; -* experiments show that the value probably should stay within the -* range of x200 - x1000. -* -* CPUSAVER_BUNDLE_MAX_DWORD - This is the location of the instruction -* that sets the maximum number of frames that will be bundled. In -* some situations, such as the TCP windowing algorithm, it may be -* better to limit the growth of the bundle size than let it go as -* high as it can, because that could cause too much added latency. -* The default is six, because this is the number of packets in the -* default TCP window size. A value of 1 would make CPUSaver indicate -* an interrupt for every frame received. If you do not want to put -* a limit on the bundle size, set this value to xFFFF. -* -* CPUSAVER_MIN_SIZE_DWORD - This is the location of the instruction -* that contains a bit-mask describing the minimum size frame that -* will be bundled. The default masks the lower 7 bits, which means -* that any frame less than 128 bytes in length will not be bundled, -* but will instead immediately generate an interrupt. This does -* not affect the current bundle in any way. Any frame that is 128 -* bytes or large will be bundled normally. This feature is meant -* to provide immediate indication of ACK frames in a TCP environment. -* Customers were seeing poor performance when a machine with CPUSaver -* enabled was sending but not receiving. The delay introduced when -* the ACKs were received was enough to reduce total throughput, because -* the sender would sit idle until the ACK was finally seen. -* -* The current default is 0xFF80, which masks out the lower 7 bits. -* This means that any frame which is x7F (127) bytes or smaller -* will cause an immediate interrupt. Because this value must be a -* bit mask, there are only a few valid values that can be used. To -* turn this feature off, the driver can write the value xFFFF to the -* lower word of this instruction (in the same way that the other -* parameters are used). Likewise, a value of 0xF800 (2047) would -* cause an interrupt to be generated for every frame, because all -* standard Ethernet frames are <= 2047 bytes in length. -*************************************************************************/ - -#ifndef UCODE_MAX_DWORDS -#define UCODE_MAX_DWORDS 134 -#endif - -/********************************************************/ -/* CPUSaver micro code for the D101A */ -/********************************************************/ - -/* Version 2.0 */ - -/* This value is the same for both A and B step of 558. */ - -#define D101_CPUSAVER_TIMER_DWORD 72 -#define D101_CPUSAVER_BUNDLE_DWORD UCODE_MAX_DWORDS -#define D101_CPUSAVER_MIN_SIZE_DWORD UCODE_MAX_DWORDS - -#define D101_A_RCVBUNDLE_UCODE \ -{\ -0x03B301BB, 0x0046FFFF, 0xFFFFFFFF, 0x051DFFFF, 0xFFFFFFFF, 0xFFFFFFFF, \ -0x000C0001, 0x00101212, 0x000C0008, 0x003801BC, \ -0x00000000, 0x00124818, 0x000C1000, 0x00220809, \ -0x00010200, 0x00124818, 0x000CFFFC, 0x003803B5, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x0010009C, 0x0024B81D, 0x00130836, 0x000C0001, \ -0x0026081C, 0x0020C81B, 0x00130824, 0x00222819, \ -0x00101213, 0x00041000, 0x003A03B3, 0x00010200, \ -0x00101B13, 0x00238081, 0x00213049, 0x0038003B, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x0010009C, 0x0024B83E, 0x00130826, 0x000C0001, \ -0x0026083B, 0x00010200, 0x00134824, 0x000C0001, \ -0x00101213, 0x00041000, 0x0038051E, 0x00101313, \ -0x00010400, 0x00380521, 0x00050600, 0x00100824, \ -0x00101310, 0x00041000, 0x00080600, 0x00101B10, \ -0x0038051E, 0x00000000, 0x00000000, 0x00000000 \ -} - -/********************************************************/ -/* CPUSaver micro code for the D101B */ -/********************************************************/ - -/* Version 2.0 */ - -#define D101_B0_RCVBUNDLE_UCODE \ -{\ -0x03B401BC, 0x0047FFFF, 0xFFFFFFFF, 0x051EFFFF, 0xFFFFFFFF, 0xFFFFFFFF, \ -0x000C0001, 0x00101B92, 0x000C0008, 0x003801BD, \ -0x00000000, 0x00124818, 0x000C1000, 0x00220809, \ -0x00010200, 0x00124818, 0x000CFFFC, 0x003803B6, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x0010009C, 0x0024B81D, 0x0013082F, 0x000C0001, \ -0x0026081C, 0x0020C81B, 0x00130837, 0x00222819, \ -0x00101B93, 0x00041000, 0x003A03B4, 0x00010200, \ -0x00101793, 0x00238082, 0x0021304A, 0x0038003C, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x0010009C, 0x0024B83E, 0x00130826, 0x000C0001, \ -0x0026083B, 0x00010200, 0x00134837, 0x000C0001, \ -0x00101B93, 0x00041000, 0x0038051F, 0x00101313, \ -0x00010400, 0x00380522, 0x00050600, 0x00100837, \ -0x00101310, 0x00041000, 0x00080600, 0x00101790, \ -0x0038051F, 0x00000000, 0x00000000, 0x00000000 \ -} - -/********************************************************/ -/* CPUSaver micro code for the D101M (B-step only) */ -/********************************************************/ - -/* Version 2.10.1 */ - -/* Parameter values for the D101M B-step */ -#define D101M_CPUSAVER_TIMER_DWORD 78 -#define D101M_CPUSAVER_BUNDLE_DWORD 65 -#define D101M_CPUSAVER_MIN_SIZE_DWORD 126 - -#define D101M_B_RCVBUNDLE_UCODE \ -{\ -0x00550215, 0xFFFF0437, 0xFFFFFFFF, 0x06A70789, 0xFFFFFFFF, 0x0558FFFF, \ -0x000C0001, 0x00101312, 0x000C0008, 0x00380216, \ -0x0010009C, 0x00204056, 0x002380CC, 0x00380056, \ -0x0010009C, 0x00244C0B, 0x00000800, 0x00124818, \ -0x00380438, 0x00000000, 0x00140000, 0x00380555, \ -0x00308000, 0x00100662, 0x00100561, 0x000E0408, \ -0x00134861, 0x000C0002, 0x00103093, 0x00308000, \ -0x00100624, 0x00100561, 0x000E0408, 0x00100861, \ -0x000C007E, 0x00222C21, 0x000C0002, 0x00103093, \ -0x00380C7A, 0x00080000, 0x00103090, 0x00380C7A, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x0010009C, 0x00244C2D, 0x00010004, 0x00041000, \ -0x003A0437, 0x00044010, 0x0038078A, 0x00000000, \ -0x00100099, 0x00206C7A, 0x0010009C, 0x00244C48, \ -0x00130824, 0x000C0001, 0x00101213, 0x00260C75, \ -0x00041000, 0x00010004, 0x00130826, 0x000C0006, \ -0x002206A8, 0x0013C926, 0x00101313, 0x003806A8, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00080600, 0x00101B10, 0x00050004, 0x00100826, \ -0x00101210, 0x00380C34, 0x00000000, 0x00000000, \ -0x0021155B, 0x00100099, 0x00206559, 0x0010009C, \ -0x00244559, 0x00130836, 0x000C0000, 0x00220C62, \ -0x000C0001, 0x00101B13, 0x00229C0E, 0x00210C0E, \ -0x00226C0E, 0x00216C0E, 0x0022FC0E, 0x00215C0E, \ -0x00214C0E, 0x00380555, 0x00010004, 0x00041000, \ -0x00278C67, 0x00040800, 0x00018100, 0x003A0437, \ -0x00130826, 0x000C0001, 0x00220559, 0x00101313, \ -0x00380559, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00130831, 0x0010090B, 0x00124813, \ -0x000CFF80, 0x002606AB, 0x00041000, 0x00010004, \ -0x003806A8, 0x00000000, 0x00000000, 0x00000000, \ -} - -/********************************************************/ -/* CPUSaver micro code for the D101S */ -/********************************************************/ - -/* Version 1.20.1 */ - -/* Parameter values for the D101S */ -#define D101S_CPUSAVER_TIMER_DWORD 78 -#define D101S_CPUSAVER_BUNDLE_DWORD 67 -#define D101S_CPUSAVER_MIN_SIZE_DWORD 128 - -#define D101S_RCVBUNDLE_UCODE \ -{\ -0x00550242, 0xFFFF047E, 0xFFFFFFFF, 0x06FF0818, 0xFFFFFFFF, 0x05A6FFFF, \ -0x000C0001, 0x00101312, 0x000C0008, 0x00380243, \ -0x0010009C, 0x00204056, 0x002380D0, 0x00380056, \ -0x0010009C, 0x00244F8B, 0x00000800, 0x00124818, \ -0x0038047F, 0x00000000, 0x00140000, 0x003805A3, \ -0x00308000, 0x00100610, 0x00100561, 0x000E0408, \ -0x00134861, 0x000C0002, 0x00103093, 0x00308000, \ -0x00100624, 0x00100561, 0x000E0408, 0x00100861, \ -0x000C007E, 0x00222FA1, 0x000C0002, 0x00103093, \ -0x00380F90, 0x00080000, 0x00103090, 0x00380F90, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x0010009C, 0x00244FAD, 0x00010004, 0x00041000, \ -0x003A047E, 0x00044010, 0x00380819, 0x00000000, \ -0x00100099, 0x00206FFD, 0x0010009A, 0x0020AFFD, \ -0x0010009C, 0x00244FC8, 0x00130824, 0x000C0001, \ -0x00101213, 0x00260FF7, 0x00041000, 0x00010004, \ -0x00130826, 0x000C0006, 0x00220700, 0x0013C926, \ -0x00101313, 0x00380700, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00080600, 0x00101B10, 0x00050004, 0x00100826, \ -0x00101210, 0x00380FB6, 0x00000000, 0x00000000, \ -0x002115A9, 0x00100099, 0x002065A7, 0x0010009A, \ -0x0020A5A7, 0x0010009C, 0x002445A7, 0x00130836, \ -0x000C0000, 0x00220FE4, 0x000C0001, 0x00101B13, \ -0x00229F8E, 0x00210F8E, 0x00226F8E, 0x00216F8E, \ -0x0022FF8E, 0x00215F8E, 0x00214F8E, 0x003805A3, \ -0x00010004, 0x00041000, 0x00278FE9, 0x00040800, \ -0x00018100, 0x003A047E, 0x00130826, 0x000C0001, \ -0x002205A7, 0x00101313, 0x003805A7, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00130831, \ -0x0010090B, 0x00124813, 0x000CFF80, 0x00260703, \ -0x00041000, 0x00010004, 0x00380700 \ -} - -/********************************************************/ -/* CPUSaver micro code for the D102 B-step */ -/********************************************************/ - -/* Version 2.0 */ -/* Parameter values for the D102 B-step */ -#define D102_B_CPUSAVER_TIMER_DWORD 82 -#define D102_B_CPUSAVER_BUNDLE_DWORD 106 -#define D102_B_CPUSAVER_MIN_SIZE_DWORD 70 - -#define D102_B_RCVBUNDLE_UCODE \ -{\ -0x006F0276, 0x0EF71FFF, 0x0ED30F86, 0x0D250ED9, 0x1FFF1FFF, 0x1FFF04D2, \ -0x00300001, 0x0140D871, 0x00300008, 0x00E00277, \ -0x01406C57, 0x00816073, 0x008700FA, 0x00E00070, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x01406CBA, 0x00807F9A, 0x00901F9A, 0x0024FFFF, \ -0x014B6F6F, 0x0030FFFE, 0x01407172, 0x01496FBA, \ -0x014B6F72, 0x00308000, 0x01406C52, 0x00912EFC, \ -0x00E00EF8, 0x00000000, 0x00000000, 0x00000000, \ -0x00906F8C, 0x00900F8C, 0x00E00F87, 0x00000000, \ -0x00906ED8, 0x01406C55, 0x00E00ED4, 0x00000000, \ -0x01406C51, 0x0080DFC2, 0x01406C52, 0x00815FC2, \ -0x01406C57, 0x00917FCC, 0x00E01FDD, 0x00000000, \ -0x00822D30, 0x01406C51, 0x0080CD26, 0x01406C52, \ -0x00814D26, 0x01406C57, 0x00916D26, 0x014C6FD7, \ -0x00300000, 0x00841FD2, 0x00300001, 0x0140D772, \ -0x00E012B3, 0x014C6F91, 0x0150710B, 0x01496F72, \ -0x0030FF80, 0x00940EDD, 0x00102000, 0x00038400, \ -0x00E00EDA, 0x00000000, 0x00000000, 0x00000000, \ -0x01406C57, 0x00917FE9, 0x00001000, 0x00E01FE9, \ -0x00200600, 0x0140D76F, 0x00138400, 0x01406FD8, \ -0x0140D96F, 0x00E01FDD, 0x00038400, 0x00102000, \ -0x00971FD7, 0x00101000, 0x00050200, 0x00E804D2, \ -0x014C6FD8, 0x00300001, 0x00840D26, 0x0140D872, \ -0x00E00D26, 0x014C6FD9, 0x00300001, 0x0140D972, \ -0x00941FBD, 0x00102000, 0x00038400, 0x014C6FD8, \ -0x00300006, 0x00840EDA, 0x014F71D8, 0x0140D872, \ -0x00E00EDA, 0x01496F50, 0x00E004D3, 0x00000000, \ -} - -/********************************************************/ -/* Micro code for the D102 C-step */ -/********************************************************/ - -/* Parameter values for the D102 C-step */ -#define D102_C_CPUSAVER_TIMER_DWORD 46 -#define D102_C_CPUSAVER_BUNDLE_DWORD 74 -#define D102_C_CPUSAVER_MIN_SIZE_DWORD 54 - -#define D102_C_RCVBUNDLE_UCODE \ -{ \ -0x00700279, 0x0E6604E2, 0x02BF0CAE, 0x1508150C, 0x15190E5B, 0x0E840F13, \ -0x00E014D8, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014DC, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014F4, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014E0, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014E7, 0x00000000, 0x00000000, 0x00000000, \ -0x00141000, 0x015D6F0D, 0x00E002C0, 0x00000000, \ -0x00200600, 0x00E0150D, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x0030FF80, 0x00940E6A, 0x00038200, 0x00102000, \ -0x00E00E67, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00906E65, 0x00800E60, 0x00E00E5D, 0x00000000, \ -0x00300006, 0x00E0151A, 0x00000000, 0x00000000, \ -0x00906F19, 0x00900F19, 0x00E00F14, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x01406CBA, 0x00807FDA, 0x00901FDA, 0x0024FFFF, \ -0x014B6F6F, 0x0030FFFE, 0x01407172, 0x01496FBA, \ -0x014B6F72, 0x00308000, 0x01406C52, 0x00912E89, \ -0x00E00E85, 0x00000000, 0x00000000, 0x00000000 \ -} - -/********************************************************/ -/* Micro code for the D102 E-step */ -/********************************************************/ - -/* Parameter values for the D102 E-step */ -#define D102_E_CPUSAVER_TIMER_DWORD 42 -#define D102_E_CPUSAVER_BUNDLE_DWORD 54 -#define D102_E_CPUSAVER_MIN_SIZE_DWORD 46 - -#define D102_E_RCVBUNDLE_UCODE \ -{\ -0x007D028F, 0x0E4204F9, 0x14ED0C85, 0x14FA14E9, 0x1FFF1FFF, 0x1FFF1FFF, \ -0x00E014B9, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014BD, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014D5, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014C1, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00000000, 0x00000000, 0x00000000, 0x00000000, \ -0x00E014C8, 0x00000000, 0x00000000, 0x00000000, \ -0x00200600, 0x00E014EE, 0x00000000, 0x00000000, \ -0x0030FF80, 0x00940E46, 0x00038200, 0x00102000, \ -0x00E00E43, 0x00000000, 0x00000000, 0x00000000, \ -0x00300006, 0x00E014FB, 0x00000000, 0x00000000 \ -} - -#endif /* _E100_UCODE_H_ */ diff -Nru a/drivers/net/e100.c b/drivers/net/e100.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/net/e100.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,2297 @@ +/******************************************************************************* + + + Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. + + 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. + + The full GNU General Public License is included in this distribution in the + file called LICENSE. + + Contact Information: + Linux NICS + Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 + +*******************************************************************************/ + +/* + * e100.c: Intel(R) PRO/100 ethernet driver + * + * (Re)written 2003 by scott.feldman@intel.com. Based loosely on + * original e100 driver, but better described as a munging of + * e100, e1000, eepro100, tg3, 8139cp, and other drivers. + * + * References: + * Intel 8255x 10/100 Mbps Ethernet Controller Family, + * Open Source Software Developers Manual, + * http://sourceforge.net/projects/e1000 + * + * + * Theory of Operation + * + * I. General + * + * The driver supports Intel(R) 10/100 Mbps PCI Fast Ethernet + * controller family, which includes the 82557, 82558, 82559, 82550, + * 82551, and 82562 devices. 82558 and greater controllers + * integrate the Intel 82555 PHY. The controllers are used in + * server and client network interface cards, as well as in + * LAN-On-Motherboard (LOM), CardBus, MiniPCI, and ICHx + * configurations. 8255x supports a 32-bit linear addressing + * mode and operates at 33Mhz PCI clock rate. + * + * II. Driver Operation + * + * Memory-mapped mode is used exclusively to access the device's + * shared-memory structure, the Control/Status Registers (CSR). All + * setup, configuration, and control of the device, including queuing + * of Tx, Rx, and configuration commands is through the CSR. + * cmd_lock serializes accesses to the CSR command register. cb_lock + * protects the shared Command Block List (CBL). + * + * 8255x is highly MII-compliant and all access to the PHY go + * through the Management Data Interface (MDI). Consequently, the + * driver leverages the mii.c library shared with other MII-compliant + * devices. + * + * Big- and Little-Endian byte order as well as 32- and 64-bit + * archs are supported. Weak-ordered memory and non-cache-coherent + * archs are supported. + * + * III. Transmit + * + * A Tx skb is mapped and hangs off of a TCB. TCBs are linked + * together in a fixed-size ring (CBL) thus forming the flexible mode + * memory structure. A TCB marked with the suspend-bit indicates + * the end of the ring. The last TCB processed suspends the + * controller, and the controller can be restarted by issue a CU + * resume command to continue from the suspend point, or a CU start + * command to start at a given position in the ring. + * + * Non-Tx commands (config, multicast setup, etc) are linked + * into the CBL ring along with Tx commands. The common structure + * used for both Tx and non-Tx commands is the Command Block (CB). + * + * cb_to_use is the next CB to use for queuing a command; cb_to_clean + * is the next CB to check for completion; cb_to_send is the first + * CB to start on in case of a previous failure to resume. CB clean + * up happens in interrupt context in response to a CU interrupt, or + * in dev->poll in the case where NAPI is enabled. cbs_avail keeps + * track of number of free CB resources available. + * + * Hardware padding of short packets to minimum packet size is + * enabled. 82557 pads with 7Eh, while the later controllers pad + * with 00h. + * + * IV. Recieve + * + * The Receive Frame Area (RFA) comprises a ring of Receive Frame + * Descriptors (RFD) + data buffer, thus forming the simplified mode + * memory structure. Rx skbs are allocated to contain both the RFD + * and the data buffer, but the RFD is pulled off before the skb is + * indicated. The data buffer is aligned such that encapsulated + * protocol headers are u32-aligned. Since the RFD is part of the + * mapped shared memory, and completion status is contained within + * the RFD, the RFD must be dma_sync'ed to maintain a consistent + * view from software and hardware. + * + * Under typical operation, the receive unit (RU) is start once, + * and the controller happily fills RFDs as frames arrive. If + * replacement RFDs cannot be allocated, or the RU goes non-active, + * the RU must be restarted. Frame arrival generates an interrupt, + * and Rx indication and re-allocation happen in the same context, + * therefore no locking is required. If NAPI is enabled, this work + * happens in dev->poll. A software-generated interrupt is gen- + * erated from the watchdog to recover from a failed allocation + * senario where all Rx resources have been indicated and none re- + * placed. + * + * V. Miscellaneous + * + * VLAN offloading of tagging, stripping and filtering is not + * supported, but driver will accommodate the extra 4-byte VLAN tag + * for processing by upper layers. Tx/Rx Checksum offloading is not + * supported. Tx Scatter/Gather is not supported. Jumbo Frames is + * not supported (hardware limitation). + * + * NAPI support is enabled with CONFIG_E100_NAPI. + * + * MagicPacket(tm) WoL support is enabled/disabled via ethtool. + * + * Thanks to JC (jchapman@katalix.com) for helping with + * testing/troubleshooting the development driver. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define DRV_NAME "e100" +#define DRV_VERSION "3.0.13_dev" +#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" +#define DRV_COPYRIGHT "Copyright(c) 1999-2004 Intel Corporation" +#define PFX DRV_NAME ": " + +#define E100_WATCHDOG_PERIOD 2 * HZ +#define E100_NAPI_WEIGHT 16 + +MODULE_DESCRIPTION(DRV_DESCRIPTION); +MODULE_AUTHOR(DRV_COPYRIGHT); +MODULE_LICENSE("GPL"); + +static int debug = 3; +module_param(debug, int, 0); +MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); +#define DPRINTK(nlevel, klevel, fmt, args...) \ + (void)((NETIF_MSG_##nlevel & nic->msg_enable) && \ + printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \ + __FUNCTION__ , ## args)) + +#define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\ + PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \ + PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich } +static struct pci_device_id e100_id_table[] = { + INTEL_8255X_ETHERNET_DEVICE(0x1029, 0), + INTEL_8255X_ETHERNET_DEVICE(0x1030, 0), + INTEL_8255X_ETHERNET_DEVICE(0x1031, 3), + INTEL_8255X_ETHERNET_DEVICE(0x1032, 3), + INTEL_8255X_ETHERNET_DEVICE(0x1033, 3), + INTEL_8255X_ETHERNET_DEVICE(0x1034, 3), + INTEL_8255X_ETHERNET_DEVICE(0x1038, 3), + INTEL_8255X_ETHERNET_DEVICE(0x1039, 4), + INTEL_8255X_ETHERNET_DEVICE(0x103A, 4), + INTEL_8255X_ETHERNET_DEVICE(0x103B, 4), + INTEL_8255X_ETHERNET_DEVICE(0x103C, 4), + INTEL_8255X_ETHERNET_DEVICE(0x103D, 4), + INTEL_8255X_ETHERNET_DEVICE(0x103E, 4), + INTEL_8255X_ETHERNET_DEVICE(0x1050, 5), + INTEL_8255X_ETHERNET_DEVICE(0x1051, 5), + INTEL_8255X_ETHERNET_DEVICE(0x1052, 5), + INTEL_8255X_ETHERNET_DEVICE(0x1053, 5), + INTEL_8255X_ETHERNET_DEVICE(0x1054, 5), + INTEL_8255X_ETHERNET_DEVICE(0x1055, 5), + INTEL_8255X_ETHERNET_DEVICE(0x1064, 6), + INTEL_8255X_ETHERNET_DEVICE(0x1065, 6), + INTEL_8255X_ETHERNET_DEVICE(0x1066, 6), + INTEL_8255X_ETHERNET_DEVICE(0x1067, 6), + INTEL_8255X_ETHERNET_DEVICE(0x1068, 6), + INTEL_8255X_ETHERNET_DEVICE(0x1069, 6), + INTEL_8255X_ETHERNET_DEVICE(0x106A, 6), + INTEL_8255X_ETHERNET_DEVICE(0x106B, 6), + INTEL_8255X_ETHERNET_DEVICE(0x1059, 0), + INTEL_8255X_ETHERNET_DEVICE(0x1209, 0), + INTEL_8255X_ETHERNET_DEVICE(0x1229, 0), + INTEL_8255X_ETHERNET_DEVICE(0x2449, 2), + INTEL_8255X_ETHERNET_DEVICE(0x2459, 2), + INTEL_8255X_ETHERNET_DEVICE(0x245D, 2), + { 0, } +}; +MODULE_DEVICE_TABLE(pci, e100_id_table); + +enum mac { + mac_82557_D100_A = 0, + mac_82557_D100_B = 1, + mac_82557_D100_C = 2, + mac_82558_D101_A4 = 4, + mac_82558_D101_B0 = 5, + mac_82559_D101M = 8, + mac_82559_D101S = 9, + mac_82550_D102 = 12, + mac_82550_D102_C = 13, + mac_82551_E = 14, + mac_82551_F = 15, + mac_82551_10 = 16, + mac_unknown = 0xFF, +}; + +enum phy { + phy_100a = 0x000003E0, + phy_100c = 0x035002A8, + phy_82555_tx = 0x015002A8, + phy_nsc_tx = 0x5C002000, + phy_82562_et = 0x033002A8, + phy_82562_em = 0x032002A8, + phy_82562_eh = 0x017002A8, + phy_unknown = 0xFFFFFFFF, +}; + +/* CSR (Control/Status Registers) */ +struct csr { + struct { + u8 status; + u8 stat_ack; + u8 cmd_lo; + u8 cmd_hi; + u32 gen_ptr; + } scb; + u32 port; + u16 flash_ctrl; + u8 eeprom_ctrl_lo; + u8 eeprom_ctrl_hi; + u32 mdi_ctrl; + u32 rx_dma_count; +}; + +enum scb_status { + rus_ready = 0x10, + rus_mask = 0x3C, +}; + +enum scb_stat_ack { + stat_ack_not_ours = 0x00, + stat_ack_sw_gen = 0x04, + stat_ack_rnr = 0x10, + stat_ack_cu_idle = 0x20, + stat_ack_frame_rx = 0x40, + stat_ack_cu_cmd_done = 0x80, + stat_ack_not_present = 0xFF, + stat_ack_rx = (stat_ack_sw_gen | stat_ack_rnr | stat_ack_frame_rx), + stat_ack_tx = (stat_ack_cu_idle | stat_ack_cu_cmd_done), +}; + +enum scb_cmd_hi { + irq_mask_none = 0x00, + irq_mask_all = 0x01, + irq_sw_gen = 0x02, +}; + +enum scb_cmd_lo { + ruc_start = 0x01, + ruc_load_base = 0x06, + cuc_start = 0x10, + cuc_resume = 0x20, + cuc_dump_addr = 0x40, + cuc_dump_stats = 0x50, + cuc_load_base = 0x60, + cuc_dump_reset = 0x70, +}; + +enum port { + software_reset = 0x0000, + selftest = 0x0001, + selective_reset = 0x0002, +}; + +enum eeprom_ctrl_lo { + eesk = 0x01, + eecs = 0x02, + eedi = 0x04, + eedo = 0x08, +}; + +enum mdi_ctrl { + mdi_write = 0x04000000, + mdi_read = 0x08000000, + mdi_ready = 0x10000000, +}; + +enum eeprom_op { + op_write = 0x05, + op_read = 0x06, + op_ewds = 0x10, + op_ewen = 0x13, +}; + +enum eeprom_offsets { + eeprom_id = 0x0A, + eeprom_config_asf = 0x0D, + eeprom_smbus_addr = 0x90, +}; + +enum eeprom_id { + eeprom_id_wol = 0x0020, +}; + +enum eeprom_config_asf { + eeprom_asf = 0x8000, + eeprom_gcl = 0x4000, +}; + +enum cb_status { + cb_complete = 0x8000, + cb_ok = 0x2000, +}; + +enum cb_command { + cb_iaaddr = 0x0001, + cb_config = 0x0002, + cb_multi = 0x0003, + cb_tx = 0x0004, + cb_dump = 0x0006, + cb_tx_sf = 0x0008, + cb_cid = 0x1f00, + cb_i = 0x2000, + cb_s = 0x4000, + cb_el = 0x8000, +}; + +struct rfd { + u16 status; + u16 command; + u32 link; + u32 rbd; + u16 actual_size; + u16 size; +}; + +struct rx { + struct rx *next, *prev; + struct sk_buff *skb; + dma_addr_t dma_addr; +}; + +#if defined(__BIG_ENDIAN_BITFIELD) +#define X(a,b) b,a +#else +#define X(a,b) a,b +#endif +struct config { +/*0*/ u8 X(byte_count:6, pad0:2); +/*1*/ u8 X(X(rx_fifo_limit:4, tx_fifo_limit:3), pad1:1); +/*2*/ u8 adaptive_ifs; +/*3*/ u8 X(X(X(X(mwi_enable:1, type_enable:1), read_align_enable:1), + term_write_cache_line:1), pad3:4); +/*4*/ u8 X(rx_dma_max_count:7, pad4:1); +/*5*/ u8 X(tx_dma_max_count:7, dma_max_count_enable:1); +/*6*/ u8 X(X(X(X(X(X(X(late_scb_update:1, direct_rx_dma:1), + tno_intr:1), cna_intr:1), standard_tcb:1), standard_stat_counter:1), + rx_discard_overruns:1), rx_save_bad_frames:1); +/*7*/ u8 X(X(X(X(X(rx_discard_short_frames:1, tx_underrun_retry:2), + pad7:2), rx_extended_rfd:1), tx_two_frames_in_fifo:1), + tx_dynamic_tbd:1); +/*8*/ u8 X(X(mii_mode:1, pad8:6), csma_disabled:1); +/*9*/ u8 X(X(X(X(X(rx_tcpudp_checksum:1, pad9:3), vlan_arp_tco:1), + link_status_wake:1), arp_wake:1), mcmatch_wake:1); +/*10*/ u8 X(X(X(pad10:3, no_source_addr_insertion:1), preamble_length:2), + loopback:2); +/*11*/ u8 X(linear_priority:3, pad11:5); +/*12*/ u8 X(X(linear_priority_mode:1, pad12:3), ifs:4); +/*13*/ u8 ip_addr_lo; +/*14*/ u8 ip_addr_hi; +/*15*/ u8 X(X(X(X(X(X(X(promiscuous_mode:1, broadcast_disabled:1), + wait_after_win:1), pad15_1:1), ignore_ul_bit:1), crc_16_bit:1), + pad15_2:1), crs_or_cdt:1); +/*16*/ u8 fc_delay_lo; +/*17*/ u8 fc_delay_hi; +/*18*/ u8 X(X(X(X(X(rx_stripping:1, tx_padding:1), rx_crc_transfer:1), + rx_long_ok:1), fc_priority_threshold:3), pad18:1); +/*19*/ u8 X(X(X(X(X(X(X(addr_wake:1, magic_packet_disable:1), + fc_disable:1), fc_restop:1), fc_restart:1), fc_reject:1), + full_duplex_force:1), full_duplex_pin:1); +/*20*/ u8 X(X(X(pad20_1:5, fc_priority_location:1), multi_ia:1), pad20_2:1); +/*21*/ u8 X(X(pad21_1:3, multicast_all:1), pad21_2:4); +/*22*/ u8 X(X(rx_d102_mode:1, rx_vlan_drop:1), pad22:6); + u8 pad_d102[9]; +}; + +#define E100_MAX_MULTICAST_ADDRS 64 +struct multi { + u16 count; + u8 addr[E100_MAX_MULTICAST_ADDRS * ETH_ALEN + 2/*pad*/]; +}; + +/* Important: keep total struct u32-aligned */ +struct cb { + u16 status; + u16 command; + u32 link; + union { + u8 iaaddr[ETH_ALEN]; + struct config config; + struct multi multi; + struct { + u32 tbd_array; + u16 tcb_byte_count; + u8 threshold; + u8 tbd_count; + struct { + u32 buf_addr; + u16 size; + u16 eol; + } tbd; + } tcb; + u32 dump_buffer_addr; + } u; + struct cb *next, *prev; + dma_addr_t dma_addr; + struct sk_buff *skb; +}; + +enum loopback { + lb_none = 0, lb_mac = 1, lb_phy = 3, +}; + +struct stats { + u32 tx_good_frames, tx_max_collisions, tx_late_collisions, + tx_underruns, tx_lost_crs, tx_deferred, tx_single_collisions, + tx_multiple_collisions, tx_total_collisions; + u32 rx_good_frames, rx_crc_errors, rx_alignment_errors, + rx_resource_errors, rx_overrun_errors, rx_cdt_errors, + rx_short_frame_errors; + u32 fc_xmt_pause, fc_rcv_pause, fc_rcv_unsupported; + u16 xmt_tco_frames, rcv_tco_frames; + u32 complete; +}; + +struct mem { + struct { + u32 signature; + u32 result; + } selftest; + struct stats stats; + u8 dump_buf[596]; +}; + +struct param_range { + u32 min; + u32 max; + u32 count; +}; + +struct params { + struct param_range rfds; + struct param_range cbs; +}; + +struct nic { + /* Begin: frequently used values: keep adjacent for cache effect */ + u32 msg_enable ____cacheline_aligned; + struct net_device *netdev; + struct pci_dev *pdev; + + struct rx *rxs ____cacheline_aligned; + struct rx *rx_to_use; + struct rx *rx_to_clean; + struct rfd blank_rfd; + int ru_running; + + spinlock_t cb_lock ____cacheline_aligned; + spinlock_t cmd_lock; + struct csr *csr; + enum scb_cmd_lo cuc_cmd; + unsigned int cbs_avail; + struct cb *cbs; + struct cb *cb_to_use; + struct cb *cb_to_send; + struct cb *cb_to_clean; + u16 tx_command; + /* End: frequently used values: keep adjacent for cache effect */ + + enum { + ich = (1 << 0), + promiscuous = (1 << 1), + multicast_all = (1 << 2), + wol_magic = (1 << 3), + } flags ____cacheline_aligned; + + enum mac mac; + enum phy phy; + struct params params; + struct net_device_stats net_stats; + struct timer_list watchdog; + struct timer_list blink_timer; + struct mii_if_info mii; + enum loopback loopback; + + struct mem *mem; + dma_addr_t dma_addr; + + dma_addr_t cbs_dma_addr; + u8 adaptive_ifs; + u8 tx_threshold; + u32 tx_frames; + u32 tx_collisions; + u32 tx_deferred; + u32 tx_single_collisions; + u32 tx_multiple_collisions; + u32 tx_fc_pause; + u32 tx_tco_frames; + + u32 rx_fc_pause; + u32 rx_fc_unsupported; + u32 rx_tco_frames; + + u8 rev_id; + u16 leds; + u16 eeprom_wc; + u16 eeprom[256]; + u32 pm_state[16]; +}; + +static inline void e100_write_flush(struct nic *nic) +{ + /* Flush previous PCI writes through intermediate bridges + * by doing a benign read */ + (void)readb(&nic->csr->scb.status); +} + +static inline void e100_enable_irq(struct nic *nic) +{ + writeb(irq_mask_none, &nic->csr->scb.cmd_hi); + e100_write_flush(nic); +} + +static inline void e100_disable_irq(struct nic *nic) +{ + writeb(irq_mask_all, &nic->csr->scb.cmd_hi); + e100_write_flush(nic); +} + +static void e100_hw_reset(struct nic *nic) +{ + /* Put CU and RU into idle with a selective reset to get + * device off of PCI bus */ + writel(selective_reset, &nic->csr->port); + e100_write_flush(nic); udelay(20); + + /* Now fully reset device */ + writel(software_reset, &nic->csr->port); + e100_write_flush(nic); udelay(20); + + /* TCO workaround - 82559 and greater */ + if(nic->mac >= mac_82559_D101M) { + /* Issue a redundant CU load base without setting + * general pointer, and without waiting for scb to + * clear. This gets us into post-driver. Finally, + * wait 20 msec for reset to take effect. */ + writeb(cuc_load_base, &nic->csr->scb.cmd_lo); + mdelay(20); + } + + /* Mask off our interrupt line - it's unmasked after reset */ + e100_disable_irq(nic); +} + +static int e100_self_test(struct nic *nic) +{ + u32 dma_addr = nic->dma_addr + offsetof(struct mem, selftest); + + /* Passing the self-test is a pretty good indication + * that the device can DMA to/from host memory */ + + nic->mem->selftest.signature = 0; + nic->mem->selftest.result = 0xFFFFFFFF; + + writel(selftest | dma_addr, &nic->csr->port); + e100_write_flush(nic); + /* Wait 10 msec for self-test to complete */ + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(HZ / 100 + 1); + + /* Interrupts are enabled after self-test */ + e100_disable_irq(nic); + + /* Check results of self-test */ + if(nic->mem->selftest.result != 0) { + DPRINTK(HW, ERR, "Self-test failed: result=0x%08X\n", + nic->mem->selftest.result); + return -ETIMEDOUT; + } + if(nic->mem->selftest.signature == 0) { + DPRINTK(HW, ERR, "Self-test failed: timed out\n"); + return -ETIMEDOUT; + } + + return 0; +} + +static void e100_eeprom_write(struct nic *nic, u16 addr_len, u16 addr, u16 data) +{ + u32 cmd_addr_data[3]; + u8 ctrl; + int i, j; + + /* Three cmds: write/erase enable, write data, write/erase disable */ + cmd_addr_data[0] = op_ewen << (addr_len - 2); + cmd_addr_data[1] = (((op_write << addr_len) | addr) << 16) | data; + cmd_addr_data[2] = op_ewds << (addr_len - 2); + + /* Bit-bang cmds to write word to eeprom */ + for(j = 0; j < 3; j++) { + + /* Chip select */ + writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + + for(i = 31; i >= 0; i--) { + ctrl = (cmd_addr_data[j] & (1 << i)) ? + eecs | eedi : eecs; + writeb(ctrl, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + } + /* Wait 10 msec for cmd to complete */ + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(HZ / 100 + 1); + + /* Chip deselect */ + writeb(0, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + } + +}; + +/* General technique stolen from the eepro100 driver - very clever */ +static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr) +{ + u32 cmd_addr_data; + u16 data = 0; + u8 ctrl; + int i; + + cmd_addr_data = ((op_read << *addr_len) | addr) << 16; + + /* Chip select */ + writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + + /* Bit-bang to read word from eeprom */ + for(i = 31; i >= 0; i--) { + ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs; + writeb(ctrl, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + /* Eeprom drives a dummy zero to EEDO after receiving + * complete address. Use this to adjust addr_len. */ + ctrl = readb(&nic->csr->eeprom_ctrl_lo); + if(!(ctrl & eedo) && i > 16) { + *addr_len -= (i - 16); + i = 17; + } + data = (data << 1) | (ctrl & eedo ? 1 : 0); + } + + /* Chip deselect */ + writeb(0, &nic->csr->eeprom_ctrl_lo); + e100_write_flush(nic); udelay(4); + + return data; +}; + +/* Load entire EEPROM image into driver cache and validate checksum */ +static int e100_eeprom_load(struct nic *nic) +{ + u16 addr, addr_len = 8, checksum = 0; + + /* Try reading with an 8-bit addr len to discover actual addr len */ + e100_eeprom_read(nic, &addr_len, 0); + nic->eeprom_wc = 1 << addr_len; + + for(addr = 0; addr < nic->eeprom_wc; addr++) { + nic->eeprom[addr] = e100_eeprom_read(nic, &addr_len, addr); + if(addr < nic->eeprom_wc - 1) + checksum += nic->eeprom[addr]; + } + + /* The checksum, stored in the last word, is calculated such that + * the sum of words should be 0xBABA */ + checksum = 0xBABA - checksum; + if(checksum != nic->eeprom[nic->eeprom_wc - 1]) { + DPRINTK(PROBE, ERR, "EEPROM corrupted\n"); + return -EAGAIN; + } + + return 0; +} + +/* Save (portion of) driver EEPROM cache to device and update checksum */ +static int e100_eeprom_save(struct nic *nic, u16 start, u16 count) +{ + u16 addr, addr_len = 8, checksum = 0; + + /* Try reading with an 8-bit addr len to discover actual addr len */ + e100_eeprom_read(nic, &addr_len, 0); + nic->eeprom_wc = 1 << addr_len; + + if(start + count >= nic->eeprom_wc) + return -EINVAL; + + for(addr = start; addr < start + count; addr++) + e100_eeprom_write(nic, addr_len, addr, nic->eeprom[addr]); + + /* The checksum, stored in the last word, is calculated such that + * the sum of words should be 0xBABA */ + for(addr = 0; addr < nic->eeprom_wc - 1; addr++) + checksum += nic->eeprom[addr]; + nic->eeprom[nic->eeprom_wc - 1] = 0xBABA - checksum; + e100_eeprom_write(nic, addr_len, nic->eeprom_wc - 1, 0xBABA - checksum); + + return 0; +} + +#define E100_WAIT_SCB_TIMEOUT 40 +static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr) +{ + unsigned long flags; + unsigned int i; + int err = 0; + + spin_lock_irqsave(&nic->cmd_lock, flags); + + /* Previous command is accepted when SCB clears */ + for(i = 0; i < E100_WAIT_SCB_TIMEOUT; i++) { + if(likely(!readb(&nic->csr->scb.cmd_lo))) + break; + cpu_relax(); + if(unlikely(i > (E100_WAIT_SCB_TIMEOUT >> 1))) + udelay(5); + } + if(unlikely(i == E100_WAIT_SCB_TIMEOUT)) { + err = -EAGAIN; + goto err_unlock; + } + + if(unlikely(cmd != cuc_resume)) + writel(dma_addr, &nic->csr->scb.gen_ptr); + writeb(cmd, &nic->csr->scb.cmd_lo); + +err_unlock: + spin_unlock_irqrestore(&nic->cmd_lock, flags); + + return err; +} + +static inline int e100_exec_cb(struct nic *nic, struct sk_buff *skb, + void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *)) +{ + struct cb *cb; + unsigned long flags; + int err = 0; + + spin_lock_irqsave(&nic->cb_lock, flags); + + if(unlikely(!nic->cbs_avail)) { + err = -ENOMEM; + goto err_unlock; + } + + cb = nic->cb_to_use; + nic->cb_to_use = cb->next; + nic->cbs_avail--; + cb->skb = skb; + + if(unlikely(!nic->cbs_avail)) + err = -ENOSPC; + + cb_prepare(nic, cb, skb); + + /* Order is important otherwise we'll be in a race with h/w: + * set S-bit in current first, then clear S-bit in previous. */ + cb->command |= cpu_to_le16(cb_s); + cb->prev->command &= cpu_to_le16(~cb_s); + + while(nic->cb_to_send != nic->cb_to_use) { + if(unlikely((err = e100_exec_cmd(nic, nic->cuc_cmd, + nic->cb_to_send->dma_addr)))) { + /* Ok, here's where things get sticky. It's + * possible that we can't schedule the command + * because the controller is too busy, so + * let's just queue the command and try again + * when another command is scheduled. */ + break; + } else { + nic->cuc_cmd = cuc_resume; + nic->cb_to_send = nic->cb_to_send->next; + } + } + +err_unlock: + spin_unlock_irqrestore(&nic->cb_lock, flags); + + return err; +} + +static u16 mdio_ctrl(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data) +{ + u32 data_out = 0; + unsigned int i; + + writel((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl); + + for(i = 0; i < 100; i++) { + udelay(20); + if((data_out = readl(&nic->csr->mdi_ctrl)) & mdi_ready) + break; + } + + DPRINTK(HW, DEBUG, + "%s:addr=%d, reg=%d, data_in=0x%04X, data_out=0x%04X\n", + dir == mdi_read ? "READ" : "WRITE", addr, reg, data, data_out); + return (u16)data_out; +} + +static int mdio_read(struct net_device *netdev, int addr, int reg) +{ + return mdio_ctrl(netdev->priv, addr, mdi_read, reg, 0); +} + +static void mdio_write(struct net_device *netdev, int addr, int reg, int data) +{ + mdio_ctrl(netdev->priv, addr, mdi_write, reg, data); +} + +static void e100_get_defaults(struct nic *nic) +{ + struct param_range rfds = { .min = 64, .max = 256, .count = 64 }; + struct param_range cbs = { .min = 64, .max = 256, .count = 64 }; + + pci_read_config_byte(nic->pdev, PCI_REVISION_ID, &nic->rev_id); + /* MAC type is encoded as rev ID; exception: ICH is treated as 82559 */ + nic->mac = (nic->flags & ich) ? mac_82559_D101M : nic->rev_id; + if(nic->mac == mac_unknown) + nic->mac = mac_82557_D100_A; + + nic->params.rfds = rfds; + nic->params.cbs = cbs; + + /* Quadwords to DMA into FIFO before starting frame transmit */ + nic->tx_threshold = 0xE0; + + nic->tx_command = cpu_to_le16(cb_tx | cb_i | cb_tx_sf | + ((nic->mac >= mac_82558_D101_A4) ? cb_cid : 0)); + + /* Template for a freshly allocated RFD */ + nic->blank_rfd.command = cpu_to_le16(cb_el); + nic->blank_rfd.rbd = 0xFFFFFFFF; + nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN); + + /* MII setup */ + nic->mii.phy_id_mask = 0x1F; + nic->mii.reg_num_mask = 0x1F; + nic->mii.dev = nic->netdev; + nic->mii.mdio_read = mdio_read; + nic->mii.mdio_write = mdio_write; +} + +static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) +{ + struct config *config = &cb->u.config; + u8 *c = (u8 *)config; + + cb->command = cpu_to_le16(cb_config); + + memset(config, 0, sizeof(struct config)); + + config->byte_count = 0x16; /* bytes in this struct */ + config->rx_fifo_limit = 0x8; /* bytes in FIFO before DMA */ + config->direct_rx_dma = 0x1; /* reserved */ + config->standard_tcb = 0x1; /* 1=standard, 0=extended */ + config->standard_stat_counter = 0x1; /* 1=standard, 0=extended */ + config->rx_discard_short_frames = 0x1; /* 1=discard, 0=pass */ + config->tx_underrun_retry = 0x3; /* # of underrun retries */ + config->mii_mode = 0x1; /* 1=MII mode, 0=503 mode */ + config->pad10 = 0x6; + config->no_source_addr_insertion = 0x1; /* 1=no, 0=yes */ + config->preamble_length = 0x2; /* 0=1, 1=3, 2=7, 3=15 bytes */ + config->ifs = 0x6; /* x16 = inter frame spacing */ + config->ip_addr_hi = 0xF2; /* ARP IP filter - not used */ + config->pad15_1 = 0x1; + config->pad15_2 = 0x1; + config->crs_or_cdt = 0x0; /* 0=CRS only, 1=CRS or CDT */ + config->fc_delay_hi = 0x40; /* time delay for fc frame */ + config->tx_padding = 0x1; /* 1=pad short frames */ + config->fc_priority_threshold = 0x7; /* 7=priority fc disabled */ + config->pad18 = 0x1; + config->full_duplex_pin = 0x1; /* 1=examine FDX# pin */ + config->pad20_1 = 0x1F; + config->fc_priority_location = 0x1; /* 1=byte#31, 0=byte#19 */ + config->pad21_1 = 0x5; + + config->adaptive_ifs = nic->adaptive_ifs; + config->loopback = nic->loopback; + + if(nic->mii.force_media && nic->mii.full_duplex) + config->full_duplex_force = 0x1; /* 1=force, 0=auto */ + + if(nic->flags & promiscuous || nic->loopback) { + config->rx_save_bad_frames = 0x1; /* 1=save, 0=discard */ + config->rx_discard_short_frames = 0x0; /* 1=discard, 0=save */ + config->promiscuous_mode = 0x1; /* 1=on, 0=off */ + } + + if(nic->flags & multicast_all) + config->multicast_all = 0x1; /* 1=accept, 0=no */ + + if(!(nic->flags & wol_magic)) + config->magic_packet_disable = 0x1; /* 1=off, 0=on */ + + if(nic->mac >= mac_82558_D101_A4) { + config->fc_disable = 0x1; /* 1=Tx fc off, 0=Tx fc on */ + config->mwi_enable = 0x1; /* 1=enable, 0=disable */ + config->standard_tcb = 0x0; /* 1=standard, 0=extended */ + config->rx_long_ok = 0x1; /* 1=VLANs ok, 0=standard */ + if(nic->mac >= mac_82559_D101M) + config->tno_intr = 0x1; /* TCO stats enable */ + else + config->standard_stat_counter = 0x0; + } + + DPRINTK(HW, DEBUG, "[00-07]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", + c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]); + DPRINTK(HW, DEBUG, "[08-15]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", + c[8], c[9], c[10], c[11], c[12], c[13], c[14], c[15]); + DPRINTK(HW, DEBUG, "[16-23]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", + c[16], c[17], c[18], c[19], c[20], c[21], c[22], c[23]); +} + +static void e100_setup_iaaddr(struct nic *nic, struct cb *cb, + struct sk_buff *skb) +{ + cb->command = cpu_to_le16(cb_iaaddr); + memcpy(cb->u.iaaddr, nic->netdev->dev_addr, ETH_ALEN); +} + +static void e100_dump(struct nic *nic, struct cb *cb, struct sk_buff *skb) +{ + cb->command = cpu_to_le16(cb_dump); + cb->u.dump_buffer_addr = cpu_to_le32(nic->dma_addr + + offsetof(struct mem, dump_buf)); +} + +#define NCONFIG_AUTO_SWITCH 0x0080 +#define MII_NSC_CONG MII_RESV1 +#define NSC_CONG_ENABLE 0x0100 +#define NSC_CONG_TXREADY 0x0400 +#define ADVERTISE_FC_SUPPORTED 0x0400 +static int e100_phy_init(struct nic *nic) +{ + struct net_device *netdev = nic->netdev; + u32 addr; + u16 bmcr, stat, id_lo, id_hi, cong; + + /* Discover phy addr by searching addrs in order {1,0,2,..., 31} */ + for(addr = 0; addr < 32; addr++) { + nic->mii.phy_id = (addr == 0) ? 1 : (addr == 1) ? 0 : addr; + bmcr = mdio_read(netdev, nic->mii.phy_id, MII_BMCR); + stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR); + stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR); + if(!((bmcr == 0xFFFF) || ((stat == 0) && (bmcr == 0)))) + break; + } + DPRINTK(HW, DEBUG, "phy_addr = %d\n", nic->mii.phy_id); + if(addr == 32) + return -EAGAIN; + + /* Selected the phy and isolate the rest */ + for(addr = 0; addr < 32; addr++) { + if(addr != nic->mii.phy_id) { + mdio_write(netdev, addr, MII_BMCR, BMCR_ISOLATE); + } else { + bmcr = mdio_read(netdev, addr, MII_BMCR); + mdio_write(netdev, addr, MII_BMCR, + bmcr & ~BMCR_ISOLATE); + } + } + + /* Get phy ID */ + id_lo = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID1); + id_hi = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID2); + nic->phy = (u32)id_hi << 16 | (u32)id_lo; + DPRINTK(HW, DEBUG, "phy ID = 0x%08X\n", nic->phy); + + /* Handle National tx phy */ + if(nic->phy == phy_nsc_tx) { + /* Disable congestion control */ + cong = mdio_read(netdev, nic->mii.phy_id, MII_NSC_CONG); + cong |= NSC_CONG_TXREADY; + cong &= ~NSC_CONG_ENABLE; + mdio_write(netdev, nic->mii.phy_id, MII_NSC_CONG, cong); + } + + if(nic->mac >= mac_82550_D102) + /* enable/disable MDI/MDI-X auto-switching */ + mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, + nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH); + + return 0; +} + +static int e100_hw_init(struct nic *nic) +{ + int err; + + e100_hw_reset(nic); + + DPRINTK(HW, ERR, "e100_hw_init\n"); + if(!in_interrupt() && (err = e100_self_test(nic))) + return err; + + if((err = e100_phy_init(nic))) + return err; + if((err = e100_exec_cmd(nic, cuc_load_base, 0))) + return err; + if((err = e100_exec_cmd(nic, ruc_load_base, 0))) + return err; + if((err = e100_exec_cb(nic, NULL, e100_configure))) + return err; + if((err = e100_exec_cb(nic, NULL, e100_setup_iaaddr))) + return err; + if((err = e100_exec_cmd(nic, cuc_dump_addr, + nic->dma_addr + offsetof(struct mem, stats)))) + return err; + if((err = e100_exec_cmd(nic, cuc_dump_reset, 0))) + return err; + + e100_disable_irq(nic); + + return 0; +} + +static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb) +{ + struct net_device *netdev = nic->netdev; + struct dev_mc_list *list = netdev->mc_list; + u16 i, count = min(netdev->mc_count, E100_MAX_MULTICAST_ADDRS); + + cb->command = cpu_to_le16(cb_multi); + cb->u.multi.count = cpu_to_le16(count * ETH_ALEN); + for(i = 0; list && i < count; i++, list = list->next) + memcpy(&cb->u.multi.addr[i*ETH_ALEN], &list->dmi_addr, + ETH_ALEN); +} + +static void e100_set_multicast_list(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + + DPRINTK(HW, DEBUG, "mc_count=%d, flags=0x%04X\n", + netdev->mc_count, netdev->flags); + + if(netdev->flags & IFF_PROMISC) + nic->flags |= promiscuous; + else + nic->flags &= ~promiscuous; + + if(netdev->flags & IFF_ALLMULTI || + netdev->mc_count > E100_MAX_MULTICAST_ADDRS) + nic->flags |= multicast_all; + else + nic->flags &= ~multicast_all; + + e100_exec_cb(nic, NULL, e100_configure); + e100_exec_cb(nic, NULL, e100_multi); +} + +static void e100_update_stats(struct nic *nic) +{ + struct net_device_stats *ns = &nic->net_stats; + struct stats *s = &nic->mem->stats; + u32 *complete = (nic->mac < mac_82558_D101_A4) ? &s->fc_xmt_pause : + (nic->mac < mac_82559_D101M) ? (u32 *)&s->xmt_tco_frames : + &s->complete; + + /* Device's stats reporting may take several microseconds to + * complete, so where always waiting for results of the + * previous command. */ + + if(*complete == le32_to_cpu(0x0000A007)) { + *complete = 0; + nic->tx_frames = le32_to_cpu(s->tx_good_frames); + nic->tx_collisions = le32_to_cpu(s->tx_total_collisions); + ns->tx_aborted_errors += le32_to_cpu(s->tx_max_collisions); + ns->tx_window_errors += le32_to_cpu(s->tx_late_collisions); + ns->tx_carrier_errors += le32_to_cpu(s->tx_lost_crs); + ns->tx_fifo_errors += le32_to_cpu(s->tx_underruns); + ns->collisions += nic->tx_collisions; + ns->tx_errors += le32_to_cpu(s->tx_max_collisions) + + le32_to_cpu(s->tx_lost_crs); + ns->rx_dropped += le32_to_cpu(s->rx_resource_errors); + ns->rx_length_errors += le32_to_cpu(s->rx_short_frame_errors); + ns->rx_over_errors += le32_to_cpu(s->rx_resource_errors); + ns->rx_crc_errors += le32_to_cpu(s->rx_crc_errors); + ns->rx_frame_errors += le32_to_cpu(s->rx_alignment_errors); + ns->rx_fifo_errors += le32_to_cpu(s->rx_overrun_errors); + ns->rx_errors += le32_to_cpu(s->rx_crc_errors) + + le32_to_cpu(s->rx_alignment_errors) + + le32_to_cpu(s->rx_short_frame_errors) + + le32_to_cpu(s->rx_cdt_errors); + nic->tx_deferred += le32_to_cpu(s->tx_deferred); + nic->tx_single_collisions += + le32_to_cpu(s->tx_single_collisions); + nic->tx_multiple_collisions += + le32_to_cpu(s->tx_multiple_collisions); + if(nic->mac >= mac_82558_D101_A4) { + nic->tx_fc_pause += le32_to_cpu(s->fc_xmt_pause); + nic->rx_fc_pause += le32_to_cpu(s->fc_rcv_pause); + nic->rx_fc_unsupported += + le32_to_cpu(s->fc_rcv_unsupported); + if(nic->mac >= mac_82559_D101M) { + nic->tx_tco_frames += + le16_to_cpu(s->xmt_tco_frames); + nic->rx_tco_frames += + le16_to_cpu(s->rcv_tco_frames); + } + } + } + + e100_exec_cmd(nic, cuc_dump_reset, 0); +} + +static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex) +{ + /* Adjust inter-frame-spacing (IFS) between two transmits if + * we're getting collisions on a half-duplex connection. */ + + if(duplex == DUPLEX_HALF) { + u32 prev = nic->adaptive_ifs; + u32 min_frames = (speed == SPEED_100) ? 1000 : 100; + + if((nic->tx_frames / 32 < nic->tx_collisions) && + (nic->tx_frames > min_frames)) { + if(nic->adaptive_ifs < 60) + nic->adaptive_ifs += 5; + } else if (nic->tx_frames < min_frames) { + if(nic->adaptive_ifs >= 5) + nic->adaptive_ifs -= 5; + } + if(nic->adaptive_ifs != prev) + e100_exec_cb(nic, NULL, e100_configure); + } +} + +static void e100_watchdog(unsigned long data) +{ + struct nic *nic = (struct nic *)data; + struct ethtool_cmd cmd; + + DPRINTK(TIMER, DEBUG, "right now = %ld\n", jiffies); + + /* mii library handles link maintenance tasks */ + + mii_ethtool_gset(&nic->mii, &cmd); + + if(mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) { + DPRINTK(LINK, INFO, "link up, %sMbps, %s-duplex\n", + cmd.speed == SPEED_100 ? "100" : "10", + cmd.duplex == DUPLEX_FULL ? "full" : "half"); + } else if(!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) { + DPRINTK(LINK, INFO, "link down\n"); + } + + mii_check_link(&nic->mii); + + /* Software generated interrupt to recover from (rare) Rx + * allocation failure */ + writeb(irq_sw_gen, &nic->csr->scb.cmd_hi); + e100_write_flush(nic); + + e100_update_stats(nic); + e100_adjust_adaptive_ifs(nic, cmd.speed, cmd.duplex); + + if(nic->mac <= mac_82557_D100_C) + /* Issue a multicast command to workaround a 557 lock up */ + e100_set_multicast_list(nic->netdev); + + mod_timer(&nic->watchdog, jiffies + E100_WATCHDOG_PERIOD); +} + +static inline void e100_xmit_prepare(struct nic *nic, struct cb *cb, + struct sk_buff *skb) +{ + cb->command = nic->tx_command; + cb->u.tcb.tbd_array = cb->dma_addr + offsetof(struct cb, u.tcb.tbd); + cb->u.tcb.tcb_byte_count = 0; + cb->u.tcb.threshold = nic->tx_threshold; + cb->u.tcb.tbd_count = 1; + cb->u.tcb.tbd.buf_addr = cpu_to_le32(pci_map_single(nic->pdev, + skb->data, skb->len, PCI_DMA_TODEVICE)); + cb->u.tcb.tbd.size = cpu_to_le16(skb->len); +} + +static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + int err = e100_exec_cb(nic, skb, e100_xmit_prepare); + + switch(err) { + case -ENOSPC: + /* We queued the skb, but now we're out of space. */ + netif_stop_queue(netdev); + break; + case -ENOMEM: + /* This is a hard error - log it. */ + DPRINTK(TX_ERR, DEBUG, "Out of Tx resources, returning skb\n"); + netif_stop_queue(netdev); + return 1; + } + + netdev->trans_start = jiffies; + return 0; +} + +static inline int e100_tx_clean(struct nic *nic) +{ + struct cb *cb; + int tx_cleaned = 0; + + spin_lock(&nic->cb_lock); + + DPRINTK(TX_DONE, DEBUG, "cb->status = 0x%04X\n", + nic->cb_to_clean->status); + + /* Clean CBs marked complete */ + for(cb = nic->cb_to_clean; + cb->status & cpu_to_le16(cb_complete); + cb = nic->cb_to_clean = cb->next) { + if(likely(cb->skb)) { + nic->net_stats.tx_packets++; + nic->net_stats.tx_bytes += cb->skb->len; + + pci_unmap_single(nic->pdev, + le32_to_cpu(cb->u.tcb.tbd.buf_addr), + le16_to_cpu(cb->u.tcb.tbd.size), + PCI_DMA_TODEVICE); + dev_kfree_skb_any(cb->skb); + tx_cleaned = 1; + } + cb->status = 0; + nic->cbs_avail++; + } + + spin_unlock(&nic->cb_lock); + + /* Recover from running out of Tx resources in xmit_frame */ + if(unlikely(tx_cleaned && netif_queue_stopped(nic->netdev))) + netif_wake_queue(nic->netdev); + + return tx_cleaned; +} + +static void e100_clean_cbs(struct nic *nic) +{ + if(nic->cbs) { + while(nic->cb_to_clean != nic->cb_to_use) { + struct cb *cb = nic->cb_to_clean; + if(cb->skb) { + pci_unmap_single(nic->pdev, + le32_to_cpu(cb->u.tcb.tbd.buf_addr), + le16_to_cpu(cb->u.tcb.tbd.size), + PCI_DMA_TODEVICE); + dev_kfree_skb(cb->skb); + } + nic->cb_to_clean = nic->cb_to_clean->next; + } + nic->cbs_avail = nic->params.cbs.count; + pci_free_consistent(nic->pdev, + sizeof(struct cb) * nic->params.cbs.count, + nic->cbs, nic->cbs_dma_addr); + nic->cbs = NULL; + nic->cbs_avail = 0; + } + nic->cuc_cmd = cuc_start; + nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = + nic->cbs; +} + +static int e100_alloc_cbs(struct nic *nic) +{ + struct cb *cb; + unsigned int i, count = nic->params.cbs.count; + + nic->cuc_cmd = cuc_start; + nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL; + nic->cbs_avail = 0; + + nic->cbs = pci_alloc_consistent(nic->pdev, + sizeof(struct cb) * count, &nic->cbs_dma_addr); + if(!nic->cbs) + return -ENOMEM; + + for(cb = nic->cbs, i = 0; i < count; cb++, i++) { + cb->next = (i + 1 < count) ? cb + 1 : nic->cbs; + cb->prev = (i == 0) ? nic->cbs + count - 1 : cb - 1; + + cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb); + cb->link = cpu_to_le32(nic->cbs_dma_addr + + ((i+1) % count) * sizeof(struct cb)); + } + + nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs; + nic->cbs_avail = count; + + return 0; +} + +static inline void e100_start_receiver(struct nic *nic) +{ + /* (Re)start RU if suspended or idle and RFA is non-NULL */ + if(!nic->ru_running && nic->rx_to_clean->skb) { + e100_exec_cmd(nic, ruc_start, nic->rx_to_clean->dma_addr); + nic->ru_running = 1; + } +} + +#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN) +static inline int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) +{ + unsigned int rx_offset = 2; /* u32 align protocol headers */ + + if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + rx_offset))) + return -ENOMEM; + + /* Align, init, and map the RFA. */ + rx->skb->dev = nic->netdev; + skb_reserve(rx->skb, rx_offset); + memcpy(rx->skb->data, &nic->blank_rfd, sizeof(struct rfd)); + rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data, + RFD_BUF_LEN, PCI_DMA_FROMDEVICE); + + /* Link the RFD to end of RFA by linking previous RFD to + * this one, and clearing EL bit of previous. */ + if(rx->prev->skb) { + struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data; + put_unaligned(cpu_to_le32(rx->dma_addr), + (u32 *)&prev_rfd->link); + prev_rfd->command &= ~cpu_to_le16(cb_el); + pci_dma_sync_single(nic->pdev, rx->prev->dma_addr, + sizeof(struct rfd), PCI_DMA_TODEVICE); + } + + return 0; +} + +static inline int e100_rx_indicate(struct nic *nic, struct rx *rx, + unsigned int *work_done, unsigned int work_to_do) +{ + struct sk_buff *skb = rx->skb; + struct rfd *rfd = (struct rfd *)skb->data; + u16 rfd_status, actual_size; + + if(unlikely(work_done && *work_done >= work_to_do)) + return -EAGAIN; + + /* Need to sync before taking a peek at cb_complete bit */ + pci_dma_sync_single(nic->pdev, rx->dma_addr, + sizeof(struct rfd), PCI_DMA_FROMDEVICE); + rfd_status = le16_to_cpu(rfd->status); + + DPRINTK(RX_STATUS, DEBUG, "status=0x%04X\n", rfd_status); + + /* If data isn't ready, nothing to indicate */ + if(unlikely(!(rfd_status & cb_complete))) + return -EAGAIN; + + /* Get actual data size */ + actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF; + if(unlikely(actual_size > RFD_BUF_LEN - sizeof(struct rfd))) + actual_size = RFD_BUF_LEN - sizeof(struct rfd); + + /* Get data */ + pci_dma_sync_single(nic->pdev, rx->dma_addr, + sizeof(struct rfd) + actual_size, + PCI_DMA_FROMDEVICE); + pci_unmap_single(nic->pdev, rx->dma_addr, + RFD_BUF_LEN, PCI_DMA_FROMDEVICE); + + /* Pull off the RFD and put the actual data (minus eth hdr) */ + skb_reserve(skb, sizeof(struct rfd)); + skb_put(skb, actual_size); + skb->protocol = eth_type_trans(skb, nic->netdev); + + if(unlikely(!(rfd_status & cb_ok)) || + actual_size > nic->netdev->mtu + VLAN_ETH_HLEN) { + /* Don't indicate if errors */ + dev_kfree_skb_any(skb); + } else { + nic->net_stats.rx_packets++; + nic->net_stats.rx_bytes += actual_size; + nic->netdev->last_rx = jiffies; +#ifdef CONFIG_E100_NAPI + netif_receive_skb(skb); +#else + netif_rx(skb); +#endif + if(work_done) + (*work_done)++; + } + + rx->skb = NULL; + + return 0; +} + +static inline void e100_rx_clean(struct nic *nic, unsigned int *work_done, + unsigned int work_to_do) +{ + struct rx *rx; + + /* Indicate newly arrived packets */ + for(rx = nic->rx_to_clean; rx->skb; rx = nic->rx_to_clean = rx->next) { + if(e100_rx_indicate(nic, rx, work_done, work_to_do)) + break; /* No more to clean */ + } + + /* Alloc new skbs to refill list */ + for(rx = nic->rx_to_use; !rx->skb; rx = nic->rx_to_use = rx->next) { + if(unlikely(e100_rx_alloc_skb(nic, rx))) + break; /* Better luck next time (see watchdog) */ + } + + e100_start_receiver(nic); +} + +static void e100_rx_clean_list(struct nic *nic) +{ + struct rx *rx; + unsigned int i, count = nic->params.rfds.count; + + if(nic->rxs) { + for(rx = nic->rxs, i = 0; i < count; rx++, i++) { + if(rx->skb) { + pci_unmap_single(nic->pdev, rx->dma_addr, + RFD_BUF_LEN, PCI_DMA_FROMDEVICE); + dev_kfree_skb(rx->skb); + } + } + kfree(nic->rxs); + nic->rxs = NULL; + } + + nic->rx_to_use = nic->rx_to_clean = NULL; + nic->ru_running = 0; +} + +static int e100_rx_alloc_list(struct nic *nic) +{ + struct rx *rx; + unsigned int i, count = nic->params.rfds.count; + + nic->rx_to_use = nic->rx_to_clean = NULL; + + if(!(nic->rxs = kmalloc(sizeof(struct rx) * count, GFP_ATOMIC))) + return -ENOMEM; + memset(nic->rxs, 0, sizeof(struct rx) * count); + + for(rx = nic->rxs, i = 0; i < count; rx++, i++) { + rx->next = (i + 1 < count) ? rx + 1 : nic->rxs; + rx->prev = (i == 0) ? nic->rxs + count - 1 : rx - 1; + if(e100_rx_alloc_skb(nic, rx)) { + e100_rx_clean_list(nic); + return -ENOMEM; + } + } + + nic->rx_to_use = nic->rx_to_clean = nic->rxs; + + return 0; +} + +static irqreturn_t e100_intr(int irq, void *dev_id, struct pt_regs *regs) +{ + struct net_device *netdev = dev_id; + struct nic *nic = netdev->priv; + u8 stat_ack = readb(&nic->csr->scb.stat_ack); + + DPRINTK(INTR, DEBUG, "stat_ack = 0x%02X\n", stat_ack); + + if(stat_ack == stat_ack_not_ours || /* Not our interrupt */ + stat_ack == stat_ack_not_present) /* Hardware is ejected */ + return IRQ_NONE; + + /* Ack interrupt(s) */ + writeb(stat_ack, &nic->csr->scb.stat_ack); + + /* We hit Receive No Resource (RNR); restart RU after cleaning */ + if(stat_ack & stat_ack_rnr) + nic->ru_running = 0; + +#ifdef CONFIG_E100_NAPI + e100_disable_irq(nic); + netif_rx_schedule(netdev); +#else + if(stat_ack & stat_ack_rx) + e100_rx_clean(nic, NULL, 0); + if(stat_ack & stat_ack_tx) + e100_tx_clean(nic); +#endif + + return IRQ_HANDLED; +} + +#ifdef CONFIG_E100_NAPI +static int e100_poll(struct net_device *netdev, int *budget) +{ + struct nic *nic = netdev->priv; + unsigned int work_to_do = min(netdev->quota, *budget); + unsigned int work_done = 0; + int tx_cleaned; + + e100_rx_clean(nic, &work_done, work_to_do); + tx_cleaned = e100_tx_clean(nic); + + /* If no Rx and Tx cleanup work was done, exit polling mode. */ + if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) { + netif_rx_complete(netdev); + e100_enable_irq(nic); + return 0; + } + + *budget -= work_done; + netdev->quota -= work_done; + + return 1; +} +#endif + +#ifdef CONFIG_NET_POLL_CONTROLLER +static void e100_netpoll(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + e100_disable_irq(nic); + e100_intr(nic->pdev->irq, netdev, NULL); + e100_enable_irq(nic); +} +#endif + +static struct net_device_stats *e100_get_stats(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + return &nic->net_stats; +} + +static int e100_set_mac_address(struct net_device *netdev, void *p) +{ + struct nic *nic = netdev->priv; + struct sockaddr *addr = p; + + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; + + memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); + e100_exec_cb(nic, NULL, e100_setup_iaaddr); + + return 0; +} + +static int e100_change_mtu(struct net_device *netdev, int new_mtu) +{ + if(new_mtu < ETH_ZLEN || new_mtu > ETH_DATA_LEN) + return -EINVAL; + netdev->mtu = new_mtu; + return 0; +} + +static int e100_asf(struct nic *nic) +{ + /* ASF can be enabled from eeprom */ + return((nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1055) && + (nic->eeprom[eeprom_config_asf] & eeprom_asf) && + !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) && + ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE)); +} + +static int e100_up(struct nic *nic) +{ + int err; + + if((err = e100_rx_alloc_list(nic))) + return err; + if((err = e100_alloc_cbs(nic))) + goto err_rx_clean_list; + if((err = e100_hw_init(nic))) + goto err_clean_cbs; + e100_set_multicast_list(nic->netdev); + e100_start_receiver(nic); + netif_start_queue(nic->netdev); + mod_timer(&nic->watchdog, jiffies); + if((err = request_irq(nic->pdev->irq, e100_intr, SA_SHIRQ, + nic->netdev->name, nic->netdev))) + goto err_no_irq; + e100_enable_irq(nic); + return 0; + +err_no_irq: + del_timer_sync(&nic->watchdog); + netif_stop_queue(nic->netdev); +err_clean_cbs: + e100_clean_cbs(nic); +err_rx_clean_list: + e100_rx_clean_list(nic); + return err; +} + +static void e100_down(struct nic *nic) +{ + e100_hw_reset(nic); + free_irq(nic->pdev->irq, nic->netdev); + del_timer_sync(&nic->watchdog); + netif_carrier_off(nic->netdev); + netif_stop_queue(nic->netdev); + e100_clean_cbs(nic); + e100_rx_clean_list(nic); +} + +static void e100_tx_timeout(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + + DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n", + readb(&nic->csr->scb.status)); + e100_down(netdev->priv); + e100_up(netdev->priv); +} + +static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) +{ + int err; + struct sk_buff *skb; + + /* Use driver resources to perform internal MAC or PHY + * loopback test. A single packet is prepared and transmitted + * in loopback mode, and the test passes if the received + * packet compares byte-for-byte to the transmitted packet. */ + + if((err = e100_rx_alloc_list(nic))) + return err; + if((err = e100_alloc_cbs(nic))) + goto err_clean_rx; + + /* ICH PHY loopback is broken so do MAC loopback instead */ + if(nic->flags & ich && loopback_mode == lb_phy) + loopback_mode = lb_mac; + + nic->loopback = loopback_mode; + if((err = e100_hw_init(nic))) + goto err_loopback_none; + + if(loopback_mode == lb_phy) + mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, + BMCR_LOOPBACK); + + e100_start_receiver(nic); + + if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) { + err = -ENOMEM; + goto err_loopback_none; + } + skb_put(skb, ETH_DATA_LEN); + memset(skb->data, 0xFF, ETH_DATA_LEN); + e100_xmit_frame(skb, nic->netdev); + + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(HZ / 100 + 1); + + if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd), + skb->data, ETH_DATA_LEN)) + err = -EAGAIN; + +err_loopback_none: + mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0); + nic->loopback = lb_none; + e100_hw_init(nic); + e100_clean_cbs(nic); +err_clean_rx: + e100_rx_clean_list(nic); + return err; +} + +#define MII_LED_CONTROL 0x1B +static void e100_blink_led(unsigned long data) +{ + struct nic *nic = (struct nic *)data; + enum led_state { + led_on = 0x01, + led_off = 0x04, + led_on_559 = 0x05, + led_on_557 = 0x07, + }; + + nic->leds = (nic->leds & led_on) ? led_off : + (nic->mac < mac_82559_D101M) ? led_on_557 : led_on_559; + mdio_write(nic->netdev, nic->mii.phy_id, MII_LED_CONTROL, nic->leds); + mod_timer(&nic->blink_timer, jiffies + HZ / 4); +} + +static int e100_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) +{ + struct nic *nic = netdev->priv; + return mii_ethtool_gset(&nic->mii, cmd); +} + +static int e100_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd) +{ + struct nic *nic = netdev->priv; + int err; + + mdio_write(netdev, nic->mii.phy_id, MII_BMCR, BMCR_RESET); + err = mii_ethtool_sset(&nic->mii, cmd); + e100_exec_cb(nic, NULL, e100_configure); + + return err; +} + +static void e100_get_drvinfo(struct net_device *netdev, + struct ethtool_drvinfo *info) +{ + struct nic *nic = netdev->priv; + strcpy(info->driver, DRV_NAME); + strcpy(info->version, DRV_VERSION); + strcpy(info->fw_version, "N/A"); + strcpy(info->bus_info, pci_name(nic->pdev)); +} + +static int e100_get_regs_len(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; +#define E100_PHY_REGS 0x1C +#define E100_REGS_LEN 1 + E100_PHY_REGS + \ + sizeof(nic->mem->dump_buf) / sizeof(u32) + return E100_REGS_LEN * sizeof(u32); +} + +static void e100_get_regs(struct net_device *netdev, + struct ethtool_regs *regs, void *p) +{ + struct nic *nic = netdev->priv; + u32 *buff = p; + int i; + + regs->version = (1 << 24) | nic->rev_id; + buff[0] = readb(&nic->csr->scb.cmd_hi) << 24 | + readb(&nic->csr->scb.cmd_lo) << 16 | + readw(&nic->csr->scb.status); + for(i = E100_PHY_REGS; i >= 0; i--) + buff[1 + E100_PHY_REGS - i] = + mdio_read(netdev, nic->mii.phy_id, i); + memset(nic->mem->dump_buf, 0, sizeof(nic->mem->dump_buf)); + e100_exec_cb(nic, NULL, e100_dump); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(HZ / 100 + 1); + memcpy(&buff[2 + E100_PHY_REGS], nic->mem->dump_buf, + sizeof(nic->mem->dump_buf)); +} + +static void e100_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) +{ + struct nic *nic = netdev->priv; + wol->supported = (nic->mac >= mac_82558_D101_A4) ? WAKE_MAGIC : 0; + wol->wolopts = (nic->flags & wol_magic) ? WAKE_MAGIC : 0; +} + +static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) +{ + struct nic *nic = netdev->priv; + + if(wol->wolopts != WAKE_MAGIC && wol->wolopts != 0) + return -EOPNOTSUPP; + + if(wol->wolopts) + nic->flags |= wol_magic; + else + nic->flags &= ~wol_magic; + + pci_enable_wake(nic->pdev, 0, nic->flags & (wol_magic | e100_asf(nic))); + e100_exec_cb(nic, NULL, e100_configure); + + return 0; +} + +static u32 e100_get_msglevel(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + return nic->msg_enable; +} + +static void e100_set_msglevel(struct net_device *netdev, u32 value) +{ + struct nic *nic = netdev->priv; + nic->msg_enable = value; +} + +static int e100_nway_reset(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + return mii_nway_restart(&nic->mii); +} + +static u32 e100_get_link(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + return mii_link_ok(&nic->mii); +} + +static int e100_get_eeprom_len(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + return nic->eeprom_wc << 1; +} + +#define E100_EEPROM_MAGIC 0x1234 +static int e100_get_eeprom(struct net_device *netdev, + struct ethtool_eeprom *eeprom, u8 *bytes) +{ + struct nic *nic = netdev->priv; + + eeprom->magic = E100_EEPROM_MAGIC; + memcpy(bytes, &((u8 *)nic->eeprom)[eeprom->offset], eeprom->len); + + return 0; +} + +static int e100_set_eeprom(struct net_device *netdev, + struct ethtool_eeprom *eeprom, u8 *bytes) +{ + struct nic *nic = netdev->priv; + + if(eeprom->magic != E100_EEPROM_MAGIC) + return -EINVAL; + memcpy(&((u8 *)nic->eeprom)[eeprom->offset], bytes, eeprom->len); + + return e100_eeprom_save(nic, eeprom->offset >> 1, + (eeprom->len >> 1) + 1); +} + +static void e100_get_ringparam(struct net_device *netdev, + struct ethtool_ringparam *ring) +{ + struct nic *nic = netdev->priv; + struct param_range *rfds = &nic->params.rfds; + struct param_range *cbs = &nic->params.cbs; + + ring->rx_max_pending = rfds->max; + ring->tx_max_pending = cbs->max; + ring->rx_mini_max_pending = 0; + ring->rx_jumbo_max_pending = 0; + ring->rx_pending = rfds->count; + ring->tx_pending = cbs->count; + ring->rx_mini_pending = 0; + ring->rx_jumbo_pending = 0; +} + +static int e100_set_ringparam(struct net_device *netdev, + struct ethtool_ringparam *ring) +{ + struct nic *nic = netdev->priv; + struct param_range *rfds = &nic->params.rfds; + struct param_range *cbs = &nic->params.cbs; + + if(netif_running(netdev)) + e100_down(nic); + rfds->count = max(ring->rx_pending, rfds->min); + rfds->count = min(rfds->count, rfds->max); + cbs->count = max(ring->tx_pending, cbs->min); + cbs->count = min(cbs->count, cbs->max); + if(netif_running(netdev)) + e100_up(nic); + + return 0; +} + +static const char e100_gstrings_test[][ETH_GSTRING_LEN] = { + "Link test (on/offline)", + "Eeprom test (on/offline)", + "Self test (offline)", + "Mac loopback (offline)", + "Phy loopback (offline)", +}; +#define E100_TEST_LEN sizeof(e100_gstrings_test) / ETH_GSTRING_LEN + +static int e100_diag_test_count(struct net_device *netdev) +{ + return E100_TEST_LEN; +} + +static void e100_diag_test(struct net_device *netdev, + struct ethtool_test *test, u64 *data) +{ + struct nic *nic = netdev->priv; + int i; + + memset(data, 0, E100_TEST_LEN * sizeof(u64)); + data[0] = !mii_link_ok(&nic->mii); + data[1] = e100_eeprom_load(nic); + if(test->flags & ETH_TEST_FL_OFFLINE) { + if(netif_running(netdev)) + e100_down(nic); + data[2] = e100_self_test(nic); + data[3] = e100_loopback_test(nic, lb_mac); + data[4] = e100_loopback_test(nic, lb_phy); + if(netif_running(netdev)) + e100_up(nic); + } + for(i = 0; i < E100_TEST_LEN; i++) + test->flags |= data[i] ? ETH_TEST_FL_FAILED : 0; +} + +static int e100_phys_id(struct net_device *netdev, u32 data) +{ + struct nic *nic = netdev->priv; + + if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ)) + data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); + mod_timer(&nic->blink_timer, jiffies); + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout(data * HZ); + del_timer_sync(&nic->blink_timer); + mdio_write(netdev, nic->mii.phy_id, MII_LED_CONTROL, 0); + + return 0; +} + +static const char e100_gstrings_stats[][ETH_GSTRING_LEN] = { + "rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors", + "tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions", + "rx_length_errors", "rx_over_errors", "rx_crc_errors", + "rx_frame_errors", "rx_fifo_errors", "rx_missed_errors", + "tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors", + "tx_heartbeat_errors", "tx_window_errors", + /* device-specific stats */ + "tx_deferred", "tx_single_collisions", "tx_multi_collisions", + "tx_flow_control_pause", "rx_flow_control_pause", + "rx_flow_control_unsupported", "tx_tco_packets", "rx_tco_packets", +}; +#define E100_NET_STATS_LEN 21 +#define E100_STATS_LEN sizeof(e100_gstrings_stats) / ETH_GSTRING_LEN + +static int e100_get_stats_count(struct net_device *netdev) +{ + return E100_STATS_LEN; +} + +static void e100_get_ethtool_stats(struct net_device *netdev, + struct ethtool_stats *stats, u64 *data) +{ + struct nic *nic = netdev->priv; + int i; + + for(i = 0; i < E100_NET_STATS_LEN; i++) + data[i] = ((unsigned long *)&nic->net_stats)[i]; + + data[i++] = nic->tx_deferred; + data[i++] = nic->tx_single_collisions; + data[i++] = nic->tx_multiple_collisions; + data[i++] = nic->tx_fc_pause; + data[i++] = nic->rx_fc_pause; + data[i++] = nic->rx_fc_unsupported; + data[i++] = nic->tx_tco_frames; + data[i++] = nic->rx_tco_frames; +} + +static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 *data) +{ + switch(stringset) { + case ETH_SS_TEST: + memcpy(data, *e100_gstrings_test, sizeof(e100_gstrings_test)); + break; + case ETH_SS_STATS: + memcpy(data, *e100_gstrings_stats, sizeof(e100_gstrings_stats)); + break; + } +} + +static struct ethtool_ops e100_ethtool_ops = { + .get_settings = e100_get_settings, + .set_settings = e100_set_settings, + .get_drvinfo = e100_get_drvinfo, + .get_regs_len = e100_get_regs_len, + .get_regs = e100_get_regs, + .get_wol = e100_get_wol, + .set_wol = e100_set_wol, + .get_msglevel = e100_get_msglevel, + .set_msglevel = e100_set_msglevel, + .nway_reset = e100_nway_reset, + .get_link = e100_get_link, + .get_eeprom_len = e100_get_eeprom_len, + .get_eeprom = e100_get_eeprom, + .set_eeprom = e100_set_eeprom, + .get_ringparam = e100_get_ringparam, + .set_ringparam = e100_set_ringparam, + .self_test_count = e100_diag_test_count, + .self_test = e100_diag_test, + .get_strings = e100_get_strings, + .phys_id = e100_phys_id, + .get_stats_count = e100_get_stats_count, + .get_ethtool_stats = e100_get_ethtool_stats, +}; + +static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) +{ + struct nic *nic = netdev->priv; + struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr->ifr_data; + + return generic_mii_ioctl(&nic->mii, mii, cmd, NULL); +} + +static int e100_alloc(struct nic *nic) +{ + nic->mem = pci_alloc_consistent(nic->pdev, sizeof(struct mem), + &nic->dma_addr); + return nic->mem ? 0 : -ENOMEM; +} + +static void e100_free(struct nic *nic) +{ + if(nic->mem) { + pci_free_consistent(nic->pdev, sizeof(struct mem), + nic->mem, nic->dma_addr); + nic->mem = NULL; + } +} + +static int e100_open(struct net_device *netdev) +{ + struct nic *nic = netdev->priv; + int err = 0; + + netif_carrier_off(netdev); + if((err = e100_up(nic))) + DPRINTK(IFUP, ERR, "Cannot open interface, aborting.\n"); + return err; +} + +static int e100_close(struct net_device *netdev) +{ + e100_down(netdev->priv); + return 0; +} + +static int __devinit e100_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct net_device *netdev; + struct nic *nic; + int err; + + if(!(netdev = alloc_etherdev(sizeof(struct nic)))) { + if(((1 << debug) - 1) & NETIF_MSG_PROBE) + printk(KERN_ERR PFX "Etherdev alloc failed, abort.\n"); + return -ENOMEM; + } + + netdev->open = e100_open; + netdev->stop = e100_close; + netdev->hard_start_xmit = e100_xmit_frame; + netdev->get_stats = e100_get_stats; + netdev->set_multicast_list = e100_set_multicast_list; + netdev->set_mac_address = e100_set_mac_address; + netdev->change_mtu = e100_change_mtu; + netdev->do_ioctl = e100_do_ioctl; + SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops); + netdev->tx_timeout = e100_tx_timeout; + netdev->watchdog_timeo = E100_WATCHDOG_PERIOD; +#ifdef CONFIG_E100_NAPI + netdev->poll = e100_poll; + netdev->weight = E100_NAPI_WEIGHT; +#endif +#ifdef CONFIG_NET_POLL_CONTROLLER + netdev->poll_controller = e100_netpoll; +#endif + + nic = netdev->priv; + nic->netdev = netdev; + nic->pdev = pdev; + nic->msg_enable = (1 << debug) - 1; + pci_set_drvdata(pdev, netdev); + + if((err = pci_enable_device(pdev))) { + DPRINTK(PROBE, ERR, "Cannot enable PCI device, aborting.\n"); + goto err_out_free_dev; + } + + if(!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) { + DPRINTK(PROBE, ERR, "Cannot find proper PCI device " + "base address, aborting.\n"); + err = -ENODEV; + goto err_out_disable_pdev; + } + + if((err = pci_request_regions(pdev, DRV_NAME))) { + DPRINTK(PROBE, ERR, "Cannot obtain PCI resources, aborting.\n"); + goto err_out_disable_pdev; + } + + pci_set_master(pdev); + + if((err = pci_set_dma_mask(pdev, 0xFFFFFFFFULL))) { + DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n"); + goto err_out_free_res; + } + + SET_MODULE_OWNER(netdev); + SET_NETDEV_DEV(netdev, &pdev->dev); + + nic->csr = ioremap(pci_resource_start(pdev, 0), sizeof(struct csr)); + if(!nic->csr) { + DPRINTK(PROBE, ERR, "Cannot map device registers, aborting.\n"); + err = -ENOMEM; + goto err_out_free_res; + } + + if(ent->driver_data) + nic->flags |= ich; + else + nic->flags &= ~ich; + + spin_lock_init(&nic->cb_lock); + spin_lock_init(&nic->cmd_lock); + + init_timer(&nic->watchdog); + nic->watchdog.function = e100_watchdog; + nic->watchdog.data = (unsigned long)nic; + init_timer(&nic->blink_timer); + nic->blink_timer.function = e100_blink_led; + nic->blink_timer.data = (unsigned long)nic; + + if((err = e100_alloc(nic))) { + DPRINTK(PROBE, ERR, "Cannot alloc driver memory, aborting.\n"); + goto err_out_iounmap; + } + + e100_get_defaults(nic); + e100_hw_reset(nic); + e100_phy_init(nic); + + if((err = e100_eeprom_load(nic))) + goto err_out_free; + ((u16 *)netdev->dev_addr)[0] = le16_to_cpu(nic->eeprom[0]); + ((u16 *)netdev->dev_addr)[1] = le16_to_cpu(nic->eeprom[1]); + ((u16 *)netdev->dev_addr)[2] = le16_to_cpu(nic->eeprom[2]); + if(!is_valid_ether_addr(netdev->dev_addr)) { + DPRINTK(PROBE, ERR, "Invalid MAC address from " + "EEPROM, aborting.\n"); + err = -EAGAIN; + goto err_out_free; + } + + /* Wol magic packet can be enabled from eeprom */ + if((nic->mac >= mac_82558_D101_A4) && + (nic->eeprom[eeprom_id] & eeprom_id_wol)) + nic->flags |= wol_magic; + + pci_enable_wake(pdev, 0, nic->flags & (wol_magic | e100_asf(nic))); + + if((err = register_netdev(netdev))) { + DPRINTK(PROBE, ERR, "Cannot register net device, aborting.\n"); + goto err_out_free; + } + + DPRINTK(PROBE, INFO, "addr 0x%lx, irq %d, " + "MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n", + pci_resource_start(pdev, 0), pdev->irq, + netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2], + netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]); + + return 0; + +err_out_free: + e100_free(nic); +err_out_iounmap: + iounmap(nic->csr); +err_out_free_res: + pci_release_regions(pdev); +err_out_disable_pdev: + pci_disable_device(pdev); +err_out_free_dev: + pci_set_drvdata(pdev, NULL); + free_netdev(netdev); + return err; +} + +static void __devexit e100_remove(struct pci_dev *pdev) +{ + struct net_device *netdev = pci_get_drvdata(pdev); + + if(netdev) { + struct nic *nic = netdev->priv; + unregister_netdev(netdev); + e100_free(nic); + iounmap(nic->csr); + free_netdev(netdev); + pci_release_regions(pdev); + pci_disable_device(pdev); + pci_set_drvdata(pdev, NULL); + } +} + +#ifdef CONFIG_PM +static int e100_suspend(struct pci_dev *pdev, u32 state) +{ + struct net_device *netdev = pci_get_drvdata(pdev); + struct nic *nic = netdev->priv; + + if(netif_running(netdev)) + e100_down(nic); + e100_hw_reset(nic); + netif_device_detach(netdev); + + pci_save_state(pdev, nic->pm_state); + pci_enable_wake(pdev, state, nic->flags & (wol_magic | e100_asf(nic))); + pci_disable_device(pdev); + pci_set_power_state(pdev, state); + + return 0; +} + +static int e100_resume(struct pci_dev *pdev) +{ + struct net_device *netdev = pci_get_drvdata(pdev); + struct nic *nic = netdev->priv; + + pci_set_power_state(pdev, 0); + pci_restore_state(pdev, nic->pm_state); + e100_hw_init(nic); + + netif_device_attach(netdev); + if(netif_running(netdev)) + e100_up(nic); + + return 0; +} +#endif + +static struct pci_driver e100_driver = { + .name = DRV_NAME, + .id_table = e100_id_table, + .probe = e100_probe, + .remove = __devexit_p(e100_remove), +#ifdef CONFIG_PM + .suspend = e100_suspend, + .resume = e100_resume, +#endif +}; + +static int __init e100_init_module(void) +{ + if(((1 << debug) - 1) & NETIF_MSG_DRV) { + printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION); + printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT); + } + return pci_module_init(&e100_driver); +} + +static void __exit e100_cleanup_module(void) +{ + pci_unregister_driver(&e100_driver); +} + +module_init(e100_init_module); +module_exit(e100_cleanup_module); diff -Nru a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c --- a/drivers/net/fc/iph5526.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/fc/iph5526.c Thu Feb 19 23:44:23 2004 @@ -4501,7 +4501,7 @@ iph5526_probe_pci(dev); err = register_netdev(dev); if (err < 0) { - kfree(dev); + free_netdev(dev); printk("iph5526.c: init_fcdev failed for card #%d\n", i+1); break; } diff -Nru a/drivers/net/fec.c b/drivers/net/fec.c --- a/drivers/net/fec.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/fec.c Thu Feb 19 23:44:23 2004 @@ -1638,9 +1638,12 @@ /* Initialize the FEC Ethernet on 860T (or ColdFire 5272). */ + /* + * XXX: We need to clean up on failure exits here. + */ int __init fec_enet_init(struct net_device *dev) { - struct fec_enet_private *fep; + struct fec_enet_private *fep = dev->priv; unsigned long mem_addr; volatile cbd_t *bdp; cbd_t *cbd_base; @@ -1651,13 +1654,6 @@ if (found) return(-ENXIO); - /* Allocate some private information. - */ - fep = (struct fec_enet_private *)kmalloc(sizeof(*fep), GFP_KERNEL); - if (!fep) - return -ENOMEM; - memset(fep, 0, sizeof(*fep)); - /* Create an Ethernet device instance. */ fecp = fec_hwp; @@ -1694,6 +1690,7 @@ } mem_addr = __get_free_page(GFP_KERNEL); cbd_base = (cbd_t *)mem_addr; + /* XXX: missing check for allocation failure */ fec_uncache(mem_addr); @@ -1715,6 +1712,7 @@ /* Allocate a page. */ mem_addr = __get_free_page(GFP_KERNEL); + /* XXX: missing check for allocation failure */ fec_uncache(mem_addr); @@ -1761,9 +1759,6 @@ fec_request_intrs(dev, fecp); dev->base_addr = (unsigned long)fecp; - dev->priv = fep; - - ether_setup(dev); /* The FEC Ethernet specific entries in the device structure. */ dev->open = fec_enet_open; @@ -1949,14 +1944,28 @@ fecp->fec_mii_speed = fep->phy_speed; } -static struct net_device fec_dev = { - .init = fec_enet_init, -}; +static struct net_device *fec_dev; static int __init fec_enet_module_init(void) { - if (register_netdev(&fec_dev) != 0) + struct net_device *dev; + int err; + + dev = alloc_etherdev(sizeof(struct fec_enet_private)); + if (!dev) + return -ENOMEM; + err = fec_enet_init(dev); + if (err) { + free_netdev(dev); + return err; + } + + if (register_netdev(dev) != 0) { + /* XXX: missing cleanup here */ + free_netdev(dev); return -EIO; + } + fec_dev = dev; return(0); } diff -Nru a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c --- a/drivers/net/hamradio/6pack.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/hamradio/6pack.c Thu Feb 19 23:44:23 2004 @@ -178,17 +178,17 @@ (sixpack_ctrls[i] = (sixpack_ctrl_t *)kmalloc(sizeof(sixpack_ctrl_t), GFP_KERNEL)) != NULL) { spp = sixpack_ctrls[i]; - 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; } + 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 */ diff -Nru a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig --- a/drivers/net/hamradio/Kconfig Thu Feb 19 23:44:23 2004 +++ b/drivers/net/hamradio/Kconfig Thu Feb 19 23:44:23 2004 @@ -72,8 +72,8 @@ certain parameters, such as channel access timing, clock mode, and DMA channel. This is accomplished with a small utility program, dmascc_cfg, available at - . Please be sure to get - at least version 1.27 of dmascc_cfg, as older versions will not + . Please be sure to + get at least version 1.27 of dmascc_cfg, as older versions will not work with the current driver. config SCC @@ -96,8 +96,9 @@ help Say Y here if you experience problems with the SCC driver not working properly; please read - for details. If unsure, - say N. + for details. + + If unsure, say N. config SCC_TRXECHO bool "support for TRX that feedback the tx signal to rx" @@ -105,7 +106,9 @@ help Some transmitters feed the transmitted signal back to the receive line. Say Y here to foil this by explicitly disabling the receiver - during data transmission. If in doubt, say Y. + during data transmission. + + If in doubt, say Y. config BAYCOM_SER_FDX tristate "BAYCOM ser12 fullduplex driver for AX.25" diff -Nru a/drivers/net/hp100.c b/drivers/net/hp100.c --- a/drivers/net/hp100.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/hp100.c Thu Feb 19 23:44:24 2004 @@ -3043,14 +3043,27 @@ int err; err = hp100_isa_init(); - + if (err && err != -ENODEV) + goto out; #ifdef CONFIG_EISA - err |= eisa_driver_register(&hp100_eisa_driver); + err = eisa_driver_register(&hp100_eisa_driver); + if (err && err != -ENODEV) + goto out2; #endif #ifdef CONFIG_PCI - err |= pci_module_init(&hp100_pci_driver); + err = pci_module_init(&hp100_pci_driver); + if (err && err != -ENODEV) + goto out3; #endif + out: return err; + out3: +#ifdef CONFIG_EISA + eisa_driver_unregister (&hp100_eisa_driver); + out2: +#endif + hp100_isa_cleanup(); + goto out; } diff -Nru a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig --- a/drivers/net/irda/Kconfig Thu Feb 19 23:44:27 2004 +++ b/drivers/net/irda/Kconfig Thu Feb 19 23:44:27 2004 @@ -269,7 +269,7 @@ information, download the following tar gzip file. There is a pre-compiled module on - + config EP7211_IR tristate "EP7211 I/R support" @@ -291,6 +291,22 @@ Please note that the driver is still experimental. And of course, you will need both USB and IrDA support in your kernel... + +config SIGMATEL_FIR + tristate "SigmaTel STIr4200 bridge (EXPERIMENTAL)" + depends on IRDA && USB && EXPERIMENTAL + select CRC32 + ---help--- + Say Y here if you want to build support for the SigmaTel STIr4200 + USB IrDA FIR bridge device driver. + + USB bridge based on the SigmaTel STIr4200 don't conform to the + IrDA-USB device class specification, and therefore need their + own specific driver. Those dongles support SIR and FIR (4Mbps) + speeds. + + To compile it as a module, choose M here: the module will be called + stir4200. config NSC_FIR tristate "NSC PC87108/PC87338" diff -Nru a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile --- a/drivers/net/irda/Makefile Thu Feb 19 23:44:25 2004 +++ b/drivers/net/irda/Makefile Thu Feb 19 23:44:25 2004 @@ -9,6 +9,7 @@ obj-$(CONFIG_IRPORT_SIR) += irport.o # FIR drivers obj-$(CONFIG_USB_IRDA) += irda-usb.o +obj-$(CONFIG_SIGMATEL_FIR) += stir4200.o obj-$(CONFIG_NSC_FIR) += nsc-ircc.o obj-$(CONFIG_WINBOND_FIR) += w83977af_ir.o obj-$(CONFIG_SA1100_FIR) += sa1100_ir.o diff -Nru a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/net/irda/stir4200.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,1283 @@ +/***************************************************************************** +* +* Filename: stir4200.c +* Version: 0.4 +* Description: Irda SigmaTel USB Dongle +* Status: Experimental +* Author: Stephen Hemminger +* +* Based on earlier driver by Paul Stewart +* +* Copyright (C) 2000, Roman Weissgaerber +* Copyright (C) 2001, Dag Brattli +* Copyright (C) 2001, Jean Tourrilhes +* Copyright (C) 2004, Stephen Hemminger +* +* 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. +* +*****************************************************************************/ + +/* + * This dongle does no framing, and requires polling to receive the + * data. The STIr4200 has bulk in and out endpoints just like + * usr-irda devices, but the data it sends and receives is raw; like + * irtty, it needs to call the wrap and unwrap functions to add and + * remove SOF/BOF and escape characters to/from the frame. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +MODULE_AUTHOR("Stephen Hemminger "); +MODULE_DESCRIPTION("IrDA-USB Dongle Driver for SigmaTel STIr4200"); +MODULE_LICENSE("GPL"); + +static int qos_mtt_bits = 0x07; /* 1 ms or more */ +module_param(qos_mtt_bits, int, 0); +MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); + +static int rx_sensitivity = 1; /* FIR 0..4, SIR 0..6 */ +module_param(rx_sensitivity, int, 0); +MODULE_PARM_DESC(rx_sensitivity, "Set Receiver sensitivity (0-6, 0 is most sensitive)"); + +static int tx_power = 0; /* 0 = highest ... 3 = lowest */ +module_param(tx_power, int, 0); +MODULE_PARM_DESC(tx_power, "Set Transmitter power (0-3, 0 is highest power)"); + +static int rx_interval = 5; /* milliseconds */ +module_param(rx_interval, int, 0); +MODULE_PARM_DESC(rx_interval, "Receive polling interval (ms)"); + +#define STIR_IRDA_HEADER 4 +#define CTRL_TIMEOUT 100 /* milliseconds */ +#define TRANSMIT_TIMEOUT 200 /* milliseconds */ +#define STIR_FIFO_SIZE 4096 +#define NUM_RX_URBS 2 + +enum FirChars { + FIR_CE = 0x7d, + FIR_XBOF = 0x7f, + FIR_EOF = 0x7e, +}; + +enum StirRequests { + REQ_WRITE_REG = 0x00, + REQ_READ_REG = 0x01, + REQ_READ_ROM = 0x02, + REQ_WRITE_SINGLE = 0x03, +}; + +/* Register offsets */ +enum StirRegs { + REG_RSVD=0, + REG_MODE, + REG_PDCLK, + REG_CTRL1, + REG_CTRL2, + REG_FIFOCTL, + REG_FIFOLSB, + REG_FIFOMSB, + REG_DPLL, + REG_IRDIG, + REG_TEST=15, +}; + +enum StirModeMask { + MODE_FIR = 0x80, + MODE_SIR = 0x20, + MODE_ASK = 0x10, + MODE_FASTRX = 0x08, + MODE_FFRSTEN = 0x04, + MODE_NRESET = 0x02, + MODE_2400 = 0x01, +}; + +enum StirPdclkMask { + PDCLK_4000000 = 0x02, + PDCLK_115200 = 0x09, + PDCLK_57600 = 0x13, + PDCLK_38400 = 0x1D, + PDCLK_19200 = 0x3B, + PDCLK_9600 = 0x77, + PDCLK_2400 = 0xDF, +}; + +enum StirCtrl1Mask { + CTRL1_SDMODE = 0x80, + CTRL1_RXSLOW = 0x40, + CTRL1_TXPWD = 0x10, + CTRL1_RXPWD = 0x08, + CTRL1_SRESET = 0x01, +}; + +enum StirCtrl2Mask { + CTRL2_SPWIDTH = 0x08, + CTRL2_REVID = 0x03, +}; + +enum StirFifoCtlMask { + FIFOCTL_EOF = 0x80, + FIFOCTL_UNDER = 0x40, + FIFOCTL_OVER = 0x20, + FIFOCTL_DIR = 0x10, + FIFOCTL_CLR = 0x08, + FIFOCTL_EMPTY = 0x04, + FIFOCTL_RXERR = 0x02, + FIFOCTL_TXERR = 0x01, +}; + +enum StirDiagMask { + IRDIG_RXHIGH = 0x80, + IRDIG_RXLOW = 0x40, +}; + +enum StirTestMask { + TEST_PLLDOWN = 0x80, + TEST_LOOPIR = 0x40, + TEST_LOOPUSB = 0x20, + TEST_TSTENA = 0x10, + TEST_TSTOSC = 0x0F, +}; + +enum StirState { + STIR_STATE_RECEIVING=0, + STIR_STATE_TXREADY, +}; + +struct stir_cb { + struct usb_device *usbdev; /* init: probe_irda */ + struct net_device *netdev; /* network layer */ + struct irlap_cb *irlap; /* The link layer we are binded to */ + struct net_device_stats stats; /* network statistics */ + struct qos_info qos; + unsigned long state; + unsigned speed; /* Current speed */ + + wait_queue_head_t thr_wait; /* transmit thread wakeup */ + struct completion thr_exited; + pid_t thr_pid; + + unsigned int tx_bulkpipe; + void *tx_data; /* wrapped data out */ + unsigned tx_len; + unsigned tx_newspeed; + unsigned tx_mtt; + + unsigned int rx_intpipe; + iobuff_t rx_buff; /* receive unwrap state machine */ + struct timespec rx_time; + + struct urb *rx_urbs[NUM_RX_URBS]; + void *rx_data[NUM_RX_URBS]; +}; + + +/* These are the currently known USB ids */ +static struct usb_device_id dongles[] = { + /* SigmaTel, Inc, STIr4200 IrDA/USB Bridge */ + { USB_DEVICE(0x066f, 0x4200) }, + { } +}; + +MODULE_DEVICE_TABLE(usb, dongles); + +static int fifo_txwait(struct stir_cb *stir, unsigned space); +static void stir_usb_receive(struct urb *urb, struct pt_regs *regs); + +/* Send control message to set dongle register */ +static int write_reg(struct stir_cb *stir, __u16 reg, __u8 value) +{ + struct usb_device *dev = stir->usbdev; + + pr_debug("%s: write reg %d = 0x%x\n", + stir->netdev->name, reg, value); + return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), + REQ_WRITE_SINGLE, + USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_DEVICE, + value, reg, NULL, 0, + MSECS_TO_JIFFIES(CTRL_TIMEOUT)); +} + +/* Send control message to read multiple registers */ +static inline int read_reg(struct stir_cb *stir, __u16 reg, + __u8 *data, __u16 count) +{ + struct usb_device *dev = stir->usbdev; + + return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), + REQ_READ_REG, + USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, + 0, reg, data, count, + MSECS_TO_JIFFIES(CTRL_TIMEOUT)); +} + +/* + * Prepare a FIR IrDA frame for transmission to the USB dongle. The + * FIR transmit frame is documented in the datasheet. It consists of + * a two byte 0x55 0xAA sequence, two little-endian length bytes, a + * sequence of exactly 16 XBOF bytes of 0x7E, two BOF bytes of 0x7E, + * then the data escaped as follows: + * + * 0x7D -> 0x7D 0x5D + * 0x7E -> 0x7D 0x5E + * 0x7F -> 0x7D 0x5F + * + * Then, 4 bytes of little endian (stuffed) FCS follow, then two + * trailing EOF bytes of 0x7E. + */ +static inline __u8 *stuff_fir(__u8 *p, __u8 c) +{ + switch(c) { + case 0x7d: + case 0x7e: + case 0x7f: + *p++ = 0x7d; + c ^= IRDA_TRANS; + /* fall through */ + default: + *p++ = c; + } + return p; +} + +/* Take raw data in skb and put it wrapped into buf */ +static unsigned wrap_fir_skb(const struct sk_buff *skb, __u8 *buf) +{ + __u8 *ptr = buf; + __u32 fcs = ~(crc32_le(~0, skb->data, skb->len)); + __u16 wraplen; + int i; + + /* Header */ + buf[0] = 0x55; + buf[1] = 0xAA; + + ptr = buf + STIR_IRDA_HEADER; + memset(ptr, 0x7f, 16); + ptr += 16; + + /* BOF */ + *ptr++ = 0x7e; + *ptr++ = 0x7e; + + /* Address / Control / Information */ + for (i = 0; i < skb->len; i++) + ptr = stuff_fir(ptr, skb->data[i]); + + /* FCS */ + ptr = stuff_fir(ptr, fcs & 0xff); + ptr = stuff_fir(ptr, (fcs >> 8) & 0xff); + ptr = stuff_fir(ptr, (fcs >> 16) & 0xff); + ptr = stuff_fir(ptr, (fcs >> 24) & 0xff); + + /* EOFs */ + *ptr++ = 0x7e; + *ptr++ = 0x7e; + + /* Total length, minus the header */ + wraplen = (ptr - buf) - STIR_IRDA_HEADER; + buf[2] = wraplen & 0xff; + buf[3] = (wraplen >> 8) & 0xff; + + return wraplen + STIR_IRDA_HEADER; +} + +static unsigned wrap_sir_skb(struct sk_buff *skb, __u8 *buf) +{ + __u16 wraplen; + + wraplen = async_wrap_skb(skb, buf + STIR_IRDA_HEADER, + STIR_FIFO_SIZE - STIR_IRDA_HEADER); + buf[0] = 0x55; + buf[1] = 0xAA; + buf[2] = wraplen & 0xff; + buf[3] = (wraplen >> 8) & 0xff; + + return wraplen + STIR_IRDA_HEADER; +} + +/* + * Frame is fully formed in the rx_buff so check crc + * and pass up to irlap + * setup for next receive + */ +static void fir_eof(struct stir_cb *stir) +{ + iobuff_t *rx_buff = &stir->rx_buff; + int len = rx_buff->len - 4; + __u32 fcs; + struct sk_buff *nskb; + + if (unlikely(len <= 0)) { + pr_debug("%s: short frame len %d\n", + stir->netdev->name, len); + + ++stir->stats.rx_errors; + ++stir->stats.rx_length_errors; + return; + } + + fcs = rx_buff->data[len] | + rx_buff->data[len+1] << 8 | + rx_buff->data[len+2] << 16 | + rx_buff->data[len+3] << 24; + + if (unlikely(fcs != ~(crc32_le(~0, rx_buff->data, len)))) { + pr_debug("%s: crc error\n", stir->netdev->name); + irda_device_set_media_busy(stir->netdev, TRUE); + stir->stats.rx_errors++; + stir->stats.rx_crc_errors++; + return; + } + + /* If can't get new buffer, just drop and reuse */ + nskb = dev_alloc_skb(IRDA_SKB_MAX_MTU); + if (unlikely(!nskb)) + ++stir->stats.rx_dropped; + else { + struct sk_buff *oskb = rx_buff->skb; + skb_reserve(nskb, 1); + + /* Set correct length in socket buffer */ + skb_put(oskb, len); + + oskb->mac.raw = oskb->data; + oskb->protocol = htons(ETH_P_IRDA); + oskb->dev = stir->netdev; + + netif_rx(oskb); + + stir->stats.rx_packets++; + stir->stats.rx_bytes += len; + rx_buff->skb = nskb; + rx_buff->head = nskb->data; + } + + rx_buff->data = rx_buff->head; + rx_buff->len = 0; +} + +/* Unwrap FIR stuffed data and bump it to IrLAP */ +static void stir_fir_chars(struct stir_cb *stir, + const __u8 *bytes, int len) +{ + iobuff_t *rx_buff = &stir->rx_buff; + int i; + + for (i = 0; i < len; i++) { + __u8 byte = bytes[i]; + + switch(rx_buff->state) { + case OUTSIDE_FRAME: + /* ignore garbage till start of frame */ + if (unlikely(byte != FIR_EOF)) + continue; + /* Now receiving frame */ + rx_buff->state = BEGIN_FRAME; + rx_buff->in_frame = TRUE; + + /* Time to initialize receive buffer */ + rx_buff->data = rx_buff->head; + rx_buff->len = 0; + continue; + + case LINK_ESCAPE: + if (byte == FIR_EOF) { + pr_debug("%s: got EOF after escape\n", + stir->netdev->name); + goto frame_error; + } + rx_buff->state = INSIDE_FRAME; + byte ^= IRDA_TRANS; + break; + + case BEGIN_FRAME: + /* ignore multiple BOF/EOF */ + if (byte == FIR_EOF) + continue; + rx_buff->state = INSIDE_FRAME; + + /* fall through */ + case INSIDE_FRAME: + switch(byte) { + case FIR_CE: + rx_buff->state = LINK_ESCAPE; + continue; + case FIR_XBOF: + /* 0x7f is not used in this framing */ + pr_debug("%s: got XBOF without escape\n", + stir->netdev->name); + goto frame_error; + case FIR_EOF: + rx_buff->state = OUTSIDE_FRAME; + rx_buff->in_frame = FALSE; + fir_eof(stir); + continue; + } + break; + } + + /* add byte to rx buffer */ + if (unlikely(rx_buff->len >= rx_buff->truesize)) { + pr_debug("%s: fir frame exceeds %d\n", + stir->netdev->name, rx_buff->truesize); + ++stir->stats.rx_over_errors; + goto error_recovery; + } + + rx_buff->data[rx_buff->len++] = byte; + continue; + + frame_error: + ++stir->stats.rx_frame_errors; + + error_recovery: + ++stir->stats.rx_errors; + irda_device_set_media_busy(stir->netdev, TRUE); + rx_buff->state = OUTSIDE_FRAME; + rx_buff->in_frame = FALSE; + } +} + +/* Unwrap SIR stuffed data and bump it up to IrLAP */ +static void stir_sir_chars(struct stir_cb *stir, + const __u8 *bytes, int len) +{ + int i; + + for (i = 0; i < len; i++) + async_unwrap_char(stir->netdev, &stir->stats, + &stir->rx_buff, bytes[i]); +} + +static inline int isfir(u32 speed) +{ + return (speed == 4000000); +} + +static inline void unwrap_chars(struct stir_cb *stir, + const __u8 *bytes, int length) +{ + if (isfir(stir->speed)) + stir_fir_chars(stir, bytes, length); + else + stir_sir_chars(stir, bytes, length); +} + +/* Mode parameters for each speed */ +static const struct { + unsigned speed; + __u8 pdclk; +} stir_modes[] = { + { 2400, PDCLK_2400 }, + { 9600, PDCLK_9600 }, + { 19200, PDCLK_19200 }, + { 38400, PDCLK_38400 }, + { 57600, PDCLK_57600 }, + { 115200, PDCLK_115200 }, + { 4000000, PDCLK_4000000 }, +}; + + +/* + * Setup chip for speed. + * Called at startup to initialize the chip + * and on speed changes. + * + * Note: Write multiple registers doesn't appear to work + */ +static int change_speed(struct stir_cb *stir, unsigned speed) +{ + int i, err; + __u8 mode; + + pr_debug("%s: change speed %d\n", stir->netdev->name, speed); + for (i = 0; i < ARRAY_SIZE(stir_modes); ++i) { + if (speed == stir_modes[i].speed) + goto found; + } + + ERROR("%s: invalid speed %d\n", stir->netdev->name, speed); + return -EINVAL; + + found: + pr_debug("%s: speed change from %d to %d\n", + stir->netdev->name, stir->speed, speed); + + /* Make sure any previous Tx is really finished. This happens + * when we answer an incomming request ; the ua:rsp and the + * speed change are bundled together, so we need to wait until + * the packet we just submitted has been sent. Jean II */ + if (fifo_txwait(stir, 0)) + return -EIO; + + /* Set clock */ + err = write_reg(stir, REG_PDCLK, stir_modes[i].pdclk); + if (err) + goto out; + + mode = MODE_NRESET | MODE_FASTRX; + if (isfir(speed)) + mode |= MODE_FIR | MODE_FFRSTEN; + else + mode |= MODE_SIR; + + if (speed == 2400) + mode |= MODE_2400; + + err = write_reg(stir, REG_MODE, mode); + if (err) + goto out; + + /* This resets TEMIC style transceiver if any. */ + err = write_reg(stir, REG_CTRL1, + CTRL1_SDMODE | (tx_power & 3) << 1); + if (err) + goto out; + + err = write_reg(stir, REG_CTRL1, (tx_power & 3) << 1); + + out: + stir->speed = speed; + return err; +} + +static int stir_reset(struct stir_cb *stir) +{ + int err; + + /* reset state */ + stir->rx_buff.in_frame = FALSE; + stir->rx_buff.state = OUTSIDE_FRAME; + stir->speed = -1; + + /* Undocumented magic to tweak the DPLL */ + err = write_reg(stir, REG_DPLL, 0x15); + if (err) + goto out; + + /* Reset sensitivity */ + err = write_reg(stir, REG_CTRL2, (rx_sensitivity & 7) << 5); + if (err) + goto out; + + err = change_speed(stir, 9600); + out: + return err; +} + +/* + * Called from net/core when new frame is available. + */ +static int stir_hard_xmit(struct sk_buff *skb, struct net_device *netdev) +{ + struct stir_cb *stir = netdev->priv; + + netif_stop_queue(netdev); + + /* the IRDA wrapping routines don't deal with non linear skb */ + SKB_LINEAR_ASSERT(skb); + + if (unlikely(skb->len) == 0) /* speed change only */ + stir->tx_len = 0; + else if (isfir(stir->speed)) + stir->tx_len = wrap_fir_skb(skb, stir->tx_data); + else + stir->tx_len = wrap_sir_skb(skb, stir->tx_data); + + stir->stats.tx_packets++; + stir->stats.tx_bytes += skb->len; + + stir->tx_mtt = irda_get_mtt(skb); + stir->tx_newspeed = irda_get_next_speed(skb); + + if (!test_and_set_bit(STIR_STATE_TXREADY, &stir->state)) + wake_up(&stir->thr_wait); + + dev_kfree_skb(skb); + return 0; +} + +/* + * Wait for the transmit FIFO to have space for next data + */ +static int fifo_txwait(struct stir_cb *stir, unsigned space) +{ + int err; + unsigned count; + __u8 regs[3]; + unsigned long timeout = jiffies + HZ/10; + + for(;;) { + /* Read FIFO status and count */ + err = read_reg(stir, REG_FIFOCTL, regs, 3); + if (unlikely(err != 3)) { + WARNING("%s: FIFO register read error: %d\n", + stir->netdev->name, err); + return err; + } + + /* is fifo receiving already, or empty */ + if (!(regs[0] & FIFOCTL_DIR) + || (regs[0] & FIFOCTL_EMPTY)) + return 0; + + if (signal_pending(current)) + return -EINTR; + + /* shutting down? */ + if (!netif_running(stir->netdev) + || !netif_device_present(stir->netdev)) + return -ESHUTDOWN; + + count = (unsigned)(regs[2] & 0x1f) << 8 | regs[1]; + + pr_debug("%s: fifo status 0x%x count %u\n", + stir->netdev->name, regs[0], count); + + /* only waiting for some space */ + if (space && STIR_FIFO_SIZE - 4 > space + count) + return 0; + + if (time_after(jiffies, timeout)) { + WARNING("%s: transmit fifo timeout status=0x%x count=%d\n", + stir->netdev->name, regs[0], count); + ++stir->stats.tx_errors; + irda_device_set_media_busy(stir->netdev, TRUE); + return -ETIMEDOUT; + } + + /* estimate transfer time for remaining chars */ + wait_ms((count * 8000) / stir->speed); + } +} + + +/* Wait for turnaround delay before starting transmit. */ +static void turnaround_delay(long us, const struct timespec *last) +{ + long ticks; + struct timespec now = CURRENT_TIME; + + if (us <= 0) + return; + + us -= (now.tv_sec - last->tv_sec) * USEC_PER_SEC; + us -= (now.tv_nsec - last->tv_nsec) / NSEC_PER_USEC; + if (us < 10) + return; + + ticks = us / (1000000 / HZ); + if (ticks > 0) { + current->state = TASK_INTERRUPTIBLE; + schedule_timeout(1 + ticks); + } else + udelay(us); +} + +/* + * Start receiver by submitting a request to the receive pipe. + * If nothing is available it will return after rx_interval. + */ +static void receive_start(struct stir_cb *stir) +{ + int i; + + if (test_and_set_bit(STIR_STATE_RECEIVING, &stir->state)) + return; + + if (fifo_txwait(stir, 0)) + return; + + for (i = 0; i < NUM_RX_URBS; i++) { + struct urb *urb = stir->rx_urbs[i]; + + usb_fill_int_urb(urb, stir->usbdev, stir->rx_intpipe, + stir->rx_data[i], STIR_FIFO_SIZE, + stir_usb_receive, stir, rx_interval); + + if (usb_submit_urb(urb, GFP_KERNEL)) + urb->status = -EINVAL; + } + + if (i == 0) { + /* if nothing got queued, then just retry next time */ + if (net_ratelimit()) + WARNING("%s: no receive buffers avaiable\n", + stir->netdev->name); + + clear_bit(STIR_STATE_RECEIVING, &stir->state); + } +} + +/* Stop all pending receive Urb's */ +static void receive_stop(struct stir_cb *stir) +{ + int i; + + for (i = 0; i < NUM_RX_URBS; i++) { + struct urb *urb = stir->rx_urbs[i]; + usb_unlink_urb(urb); + } +} + +/* Send wrapped data (in tx_data) to device */ +static void stir_send(struct stir_cb *stir) +{ + int rc; + + if (test_and_clear_bit(STIR_STATE_RECEIVING, &stir->state)) { + receive_stop(stir); + + turnaround_delay(stir->tx_mtt, &stir->rx_time); + + if (stir->rx_buff.in_frame) + ++stir->stats.collisions; + } + else if (fifo_txwait(stir, stir->tx_len)) + return; /* shutdown or major errors */ + + stir->netdev->trans_start = jiffies; + + pr_debug("%s: send %d\n", stir->netdev->name, stir->tx_len); + rc = usb_bulk_msg(stir->usbdev, + stir->tx_bulkpipe, + stir->tx_data, stir->tx_len, + NULL, MSECS_TO_JIFFIES(TRANSMIT_TIMEOUT)); + + if (unlikely(rc)) { + WARNING("%s: usb bulk message failed %d\n", + stir->netdev->name, rc); + stir->stats.tx_errors++; + } +} + +/* + * Transmit state machine thread + */ +static int stir_transmit_thread(void *arg) +{ + struct stir_cb *stir = arg; + struct net_device *dev = stir->netdev; + DECLARE_WAITQUEUE(wait, current); + + daemonize("%s", dev->name); + allow_signal(SIGTERM); + + while (netif_running(dev) + && netif_device_present(dev) + && !signal_pending(current)) + { + /* make swsusp happy with our thread */ + if (current->flags & PF_FREEZE) { + receive_stop(stir); + + write_reg(stir, REG_CTRL1, CTRL1_TXPWD|CTRL1_RXPWD); + + refrigerator(PF_IOTHREAD); + + stir_reset(stir); + } + + /* if something to send? */ + if (test_and_clear_bit(STIR_STATE_TXREADY, &stir->state)) { + unsigned new_speed = stir->tx_newspeed; + + /* Note that we may both send a packet and + * change speed in some cases. Jean II */ + + if (stir->tx_len != 0) + stir_send(stir); + + if (stir->speed != new_speed) + change_speed(stir, new_speed); + + netif_wake_queue(stir->netdev); + continue; + } + + if (irda_device_txqueue_empty(dev)) + receive_start(stir); + + set_task_state(current, TASK_INTERRUPTIBLE); + add_wait_queue(&stir->thr_wait, &wait); + if (test_bit(STIR_STATE_TXREADY, &stir->state)) + __set_task_state(current, TASK_RUNNING); + else + schedule_timeout(HZ/10); + remove_wait_queue(&stir->thr_wait, &wait); + } + + complete_and_exit (&stir->thr_exited, 0); +} + + +/* + * Receive wrapped data into rx_data buffer. + * This chip doesn't block until data is available, we just have + * to read the FIFO perodically (ugh). + */ +static void stir_usb_receive(struct urb *urb, struct pt_regs *regs) +{ + struct stir_cb *stir = urb->context; + int err; + + if (!netif_running(stir->netdev)) + return; + + switch (urb->status) { + case 0: + if(urb->actual_length > 0) { + pr_debug("%s: receive %d\n", + stir->netdev->name, urb->actual_length); + unwrap_chars(stir, urb->transfer_buffer, + urb->actual_length); + + stir->netdev->last_rx = jiffies; + stir->rx_time = CURRENT_TIME; + } + break; + + case -ECONNRESET: /* killed but pending */ + case -ENOENT: /* killed but not in use */ + case -ESHUTDOWN: + /* These are normal errors when URB is cancelled */ + stir->rx_buff.in_frame = FALSE; + stir->rx_buff.state = OUTSIDE_FRAME; + return; + + default: + WARNING("%s: received status %d\n", stir->netdev->name, + urb->status); + stir->stats.rx_errors++; + urb->status = 0; + } + + /* kernel thread is stopping receiver don't resubmit */ + if (!test_bit(STIR_STATE_RECEIVING, &stir->state)) + return; + + /* resubmit existing urb */ + err = usb_submit_urb(urb, GFP_ATOMIC); + + /* in case of error, the kernel thread will restart us */ + if (err) { + WARNING("%s: usb receive submit error: %d\n", + stir->netdev->name, err); + urb->status = -ENOENT; + wake_up(&stir->thr_wait); + } +} + + +/* + * Function stir_net_open (dev) + * + * Network device is taken up. Usually this is done by "ifconfig irda0 up" + */ +static int stir_net_open(struct net_device *netdev) +{ + struct stir_cb *stir = netdev->priv; + int i, err; + char hwname[16]; + + err = stir_reset(stir); + if (err) + goto err_out1; + + err = -ENOMEM; + + /* Note: Max SIR frame possible is 4273 */ + stir->tx_data = kmalloc(STIR_FIFO_SIZE, GFP_KERNEL); + if (!stir->tx_data) { + ERROR("%s(), alloc failed for rxbuf!\n", __FUNCTION__); + goto err_out1; + } + + /* Initialize for SIR/FIR to copy data directly into skb. */ + stir->rx_buff.truesize = IRDA_SKB_MAX_MTU; + stir->rx_buff.skb = dev_alloc_skb(IRDA_SKB_MAX_MTU); + if (!stir->rx_buff.skb) { + ERROR("%s(), dev_alloc_skb() failed for rxbuf!\n", + __FUNCTION__); + goto err_out2; + } + skb_reserve(stir->rx_buff.skb, 1); + stir->rx_buff.head = stir->rx_buff.skb->data; + stir->rx_time = CURRENT_TIME; + + /* Allocate N receive buffer's and urbs */ + for (i = 0; i < NUM_RX_URBS; i++) { + stir->rx_urbs[i] = usb_alloc_urb(0, GFP_KERNEL); + if (!stir->rx_urbs[i]){ + ERROR("%s(), usb_alloc_urb failed\n", __FUNCTION__); + goto err_out3; + } + + stir->rx_data[i] = kmalloc(STIR_FIFO_SIZE, GFP_KERNEL); + if (!stir->rx_data) { + usb_free_urb(stir->rx_urbs[i]); + ERROR("%s(), alloc failed for rxbuf!\n", __FUNCTION__); + goto err_out3; + } + } + + /* + * Now that everything should be initialized properly, + * Open new IrLAP layer instance to take care of us... + * Note : will send immediately a speed change... + */ + sprintf(hwname, "usb#%d", stir->usbdev->devnum); + stir->irlap = irlap_open(netdev, &stir->qos, hwname); + if (!stir->irlap) { + ERROR("%s(): irlap_open failed\n", __FUNCTION__); + goto err_out3; + } + + /** Start kernel thread for transmit. */ + stir->thr_pid = kernel_thread(stir_transmit_thread, stir, + CLONE_FS|CLONE_FILES); + if (stir->thr_pid < 0) { + err = stir->thr_pid; + WARNING("%s: unable to start kernel thread\n", + stir->netdev->name); + goto err_out4; + } + + netif_start_queue(netdev); + + return 0; + + err_out4: + irlap_close(stir->irlap); + err_out3: + while(--i >= 0) { + usb_free_urb(stir->rx_urbs[i]); + kfree(stir->rx_data[i]); + } + kfree_skb(stir->rx_buff.skb); + err_out2: + kfree(stir->tx_data); + err_out1: + return err; +} + +/* + * Function stir_net_close (stir) + * + * Network device is taken down. Usually this is done by + * "ifconfig irda0 down" + */ +static int stir_net_close(struct net_device *netdev) +{ + struct stir_cb *stir = netdev->priv; + int i; + + /* Stop transmit processing */ + netif_stop_queue(netdev); + + /* Kill transmit thread */ + kill_proc(stir->thr_pid, SIGTERM, 1); + wait_for_completion(&stir->thr_exited); + kfree(stir->tx_data); + + clear_bit(STIR_STATE_RECEIVING, &stir->state); + receive_stop(stir); + + for (i = 0; i < NUM_RX_URBS; i++) { + usb_free_urb(stir->rx_urbs[i]); + kfree(stir->rx_data[i]); + } + kfree_skb(stir->rx_buff.skb); + + /* Stop and remove instance of IrLAP */ + if (stir->irlap) + irlap_close(stir->irlap); + + stir->irlap = NULL; + + return 0; +} + +/* + * IOCTLs : Extra out-of-band network commands... + */ +static int stir_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +{ + struct if_irda_req *irq = (struct if_irda_req *) rq; + struct stir_cb *stir = dev->priv; + int ret = 0; + + switch (cmd) { + case SIOCSBANDWIDTH: /* Set bandwidth */ + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + + /* Check if the device is still there */ + if (netif_device_present(stir->netdev)) + ret = change_speed(stir, irq->ifr_baudrate); + break; + + case SIOCSMEDIABUSY: /* Set media busy */ + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + + /* Check if the IrDA stack is still there */ + if (netif_running(stir->netdev)) + irda_device_set_media_busy(stir->netdev, TRUE); + break; + + case SIOCGRECEIVING: + /* Only approximately true */ + irq->ifr_receiving = test_bit(STIR_STATE_RECEIVING, &stir->state); + break; + + default: + ret = -EOPNOTSUPP; + } + + return ret; +} + +/* + * Get device stats (for /proc/net/dev and ifconfig) + */ +static struct net_device_stats *stir_net_get_stats(struct net_device *dev) +{ + struct stir_cb *stir = dev->priv; + return &stir->stats; +} + +/* + * Parse the various endpoints and find the one we need. + * + * The endpoint are the pipes used to communicate with the USB device. + * The spec defines 2 endpoints of type bulk transfer, one in, and one out. + * These are used to pass frames back and forth with the dongle. + */ +static int stir_setup_usb(struct stir_cb *stir, struct usb_interface *intf) +{ + struct usb_device *usbdev = interface_to_usbdev(intf); + const struct usb_host_interface *interface + = &intf->altsetting[intf->act_altsetting]; + const struct usb_endpoint_descriptor *ep_in = NULL; + const struct usb_endpoint_descriptor *ep_out = NULL; + int i; + + if (interface->desc.bNumEndpoints != 2) { + WARNING("%s: expected two endpoints\n", __FUNCTION__); + return -ENODEV; + } + + for(i = 0; i < interface->desc.bNumEndpoints; i++) { + const struct usb_endpoint_descriptor *ep + = &interface->endpoint[i].desc; + + if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) + == USB_ENDPOINT_XFER_BULK) { + /* We need to find an IN and an OUT */ + if ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) + ep_in = ep; + else + ep_out = ep; + } else + WARNING("%s: unknown endpoint type 0x%x\n", + __FUNCTION__, ep->bmAttributes); + } + + if (!ep_in || !ep_out) + return -EIO; + + stir->tx_bulkpipe = usb_sndbulkpipe(usbdev, + ep_out->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); + stir->rx_intpipe = usb_rcvintpipe(usbdev, + ep_in->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); + return 0; +} + +/* + * This routine is called by the USB subsystem for each new device + * in the system. We need to check if the device is ours, and in + * this case start handling it. + * Note : it might be worth protecting this function by a global + * spinlock... Or not, because maybe USB already deal with that... + */ +static int stir_probe(struct usb_interface *intf, + const struct usb_device_id *id) +{ + struct usb_device *dev = interface_to_usbdev(intf); + struct stir_cb *stir = NULL; + struct net_device *net; + int ret = -ENOMEM; + + /* Allocate network device container. */ + net = alloc_irdadev(sizeof(*stir)); + if(!net) + goto err_out1; + + SET_MODULE_OWNER(net); + SET_NETDEV_DEV(net, &intf->dev); + stir = net->priv; + stir->netdev = net; + stir->usbdev = dev; + + ret = stir_setup_usb(stir, intf); + if (ret != 0) { + ERROR("%s(), Bogus endpoints...\n", __FUNCTION__); + goto err_out2; + } + + printk(KERN_INFO "SigmaTel STIr4200 IRDA/USB found at address %d, " + "Vendor: %x, Product: %x\n", + dev->devnum, dev->descriptor.idVendor, + dev->descriptor.idProduct); + + /* Initialize QoS for this device */ + irda_init_max_qos_capabilies(&stir->qos); + + /* That's the Rx capability. */ + stir->qos.baud_rate.bits &= IR_2400 | IR_9600 | IR_19200 | + IR_38400 | IR_57600 | IR_115200 | + (IR_4000000 << 8); + stir->qos.min_turn_time.bits &= qos_mtt_bits; + irda_qos_bits_to_value(&stir->qos); + + init_completion (&stir->thr_exited); + init_waitqueue_head (&stir->thr_wait); + + /* Override the network functions we need to use */ + net->hard_start_xmit = stir_hard_xmit; + net->open = stir_net_open; + net->stop = stir_net_close; + net->get_stats = stir_net_get_stats; + net->do_ioctl = stir_net_ioctl; + + ret = stir_reset(stir); + if (ret) + goto err_out2; + + ret = register_netdev(net); + if (ret != 0) + goto err_out2; + + MESSAGE("IrDA: Registered SigmaTel device %s\n", net->name); + + usb_set_intfdata(intf, stir); + + return 0; + +err_out2: + free_netdev(net); +err_out1: + return ret; +} + +/* + * The current device is removed, the USB layer tell us to shut it down... + */ +static void stir_disconnect(struct usb_interface *intf) +{ + struct stir_cb *stir = usb_get_intfdata(intf); + struct net_device *net; + + usb_set_intfdata(intf, NULL); + if (!stir) + return; + + /* Stop transmitter */ + net = stir->netdev; + netif_device_detach(net); + + /* Remove netdevice */ + unregister_netdev(net); + + /* No longer attached to USB bus */ + stir->usbdev = NULL; + + free_netdev(net); +} + + +/* Power management suspend, so power off the transmitter/receiver */ +static int stir_suspend(struct usb_interface *intf, u32 state) +{ + struct stir_cb *stir = usb_get_intfdata(intf); + + netif_device_detach(stir->netdev); + return 0; +} + +/* Coming out of suspend, so reset hardware */ +static int stir_resume(struct usb_interface *intf) +{ + struct stir_cb *stir = usb_get_intfdata(intf); + + netif_device_attach(stir->netdev); + + /* receiver restarted when send thread wakes up */ + return 0; +} + +/* + * USB device callbacks + */ +static struct usb_driver irda_driver = { + .owner = THIS_MODULE, + .name = "stir4200", + .probe = stir_probe, + .disconnect = stir_disconnect, + .id_table = dongles, + .suspend = stir_suspend, + .resume = stir_resume, +}; + +/* + * Module insertion + */ +static int __init stir_init(void) +{ + if (usb_register(&irda_driver) < 0) + return -1; + + MESSAGE("SigmaTel support registered\n"); + return 0; +} +module_init(stir_init); + +/* + * Module removal + */ +static void __exit stir_cleanup(void) +{ + /* Deregister the driver and remove all pending instances */ + usb_deregister(&irda_driver); +} +module_exit(stir_cleanup); diff -Nru a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c --- a/drivers/net/isa-skeleton.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/isa-skeleton.c Thu Feb 19 23:44:28 2004 @@ -104,8 +104,6 @@ /* Index to functions, as function prototypes. */ -extern int netcard_probe(struct net_device *dev); - static int netcard_probe1(struct net_device *dev, int ioaddr); static int net_open(struct net_device *dev); static int net_send_packet(struct sk_buff *skb, struct net_device *dev); @@ -129,11 +127,11 @@ * If dev->base_addr == 2, allocate space for the device and return success * (detachable devices only). */ -int __init -netcard_probe(struct net_device *dev) +static int __init do_netcard_probe(struct net_device *dev) { int i; int base_addr = dev->base_addr; + int irq = dev->irq; SET_MODULE_OWNER(dev); @@ -144,14 +142,49 @@ for (i = 0; netcard_portlist[i]; i++) { int ioaddr = netcard_portlist[i]; - if (check_region(ioaddr, NETCARD_IO_EXTENT)) - continue; if (netcard_probe1(dev, ioaddr) == 0) return 0; + dev->irq = irq; } return -ENODEV; } + +static void cleanup_card(struct net_device *dev) +{ +#ifdef jumpered_dma + free_dma(dev->dma); +#endif +#ifdef jumpered_interrupts + free_irq(dev->irq, dev); +#endif + release_region(dev->base_addr, NETCARD_IO_EXTENT); +} + +struct net_device * __init netcard_probe(int unit) +{ + struct net_device *dev = alloc_etherdev(sizeof(struct net_local)); + int err; + + if (!dev) + return ERR_PTR(-ENOMEM); + + sprintf(dev->name, "eth%d", unit); + netdev_boot_setup_check(dev); + + err = do_netcard_probe(dev); + if (err) + goto out; + err = register_netdev(dev); + if (err) + goto out1; + return dev; +out1: + cleanup_card(dev); +out: + free_netdev(dev); + return ERR_PTR(err); +} /* * This is the real probe routine. Linux has a history of friendly device @@ -163,6 +196,11 @@ struct net_local *np; static unsigned version_printed; int i; + int err = -ENODEV; + + /* Grab the region so that no one else tries to probe our ioports. */ + if (!request_region(ioaddr, NETCARD_IO_EXTENT, cardname)) + return -EBUSY; /* * For ethernet adaptors the first three octets of the station address @@ -171,9 +209,8 @@ */ if (inb(ioaddr + 0) != SA_ADDR0 || inb(ioaddr + 1) != SA_ADDR1 - || inb(ioaddr + 2) != SA_ADDR2) { - return -ENODEV; - } + || inb(ioaddr + 2) != SA_ADDR2) + goto out; if (net_debug && version_printed++ == 0) printk(KERN_DEBUG "%s", version); @@ -187,6 +224,7 @@ for (i = 0; i < 6; i++) printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i)); + err = -EAGAIN; #ifdef jumpered_interrupts /* * If this board has jumpered interrupts, allocate the interrupt @@ -217,7 +255,7 @@ if (irqval) { printk("%s: unable to get IRQ %d (irqval=%d).\n", dev->name, dev->irq, irqval); - return -EAGAIN; + goto out; } } #endif /* jumpered interrupt */ @@ -229,7 +267,7 @@ if (dev->dma == 0) { if (request_dma(dev->dma, cardname)) { printk("DMA %d allocation failed.\n", dev->dma); - return -EAGAIN; + goto out1; } else printk(", assigned DMA %d.\n", dev->dma); } else { @@ -256,30 +294,18 @@ } if (i <= 0) { printk("DMA probe failed.\n"); - return -EAGAIN; + goto out1; } if (request_dma(dev->dma, cardname)) { printk("probed DMA %d allocation failed.\n", dev->dma); - return -EAGAIN; + goto out1; } } #endif /* jumpered DMA */ - /* Initialize the device structure. */ - if (dev->priv == NULL) { - dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL); - if (dev->priv == NULL) - return -ENOMEM; - } - - memset(dev->priv, 0, sizeof(struct net_local)); - np = (struct net_local *)dev->priv; spin_lock_init(&np->lock); - /* Grab the region so that no one else tries to probe our ioports. */ - request_region(ioaddr, NETCARD_IO_EXTENT, cardname); - dev->open = net_open; dev->stop = net_close; dev->hard_start_xmit = net_send_packet; @@ -288,11 +314,14 @@ dev->tx_timeout = &net_tx_timeout; dev->watchdog_timeo = MY_TX_TIMEOUT; - - /* Fill in the fields of the device structure with ethernet values. */ - ether_setup(dev); - return 0; +out1: +#ifdef jumpered_interrupts + free_irq(dev->irq, dev); +#endif +out: + release_region(base_addr, NETCARD_IO_EXTENT); + return err; } static void net_tx_timeout(struct net_device *dev) @@ -635,7 +664,7 @@ #ifdef MODULE -static struct net_device this_device; +static struct net_device *this_device; static int io = 0x300; static int irq; static int dma; @@ -644,42 +673,38 @@ int init_module(void) { + struct net_device *dev; int result; if (io == 0) printk(KERN_WARNING "%s: You shouldn't use auto-probing with insmod!\n", cardname); + dev = alloc_etherdev(sizeof(struct net_local)); + if (!dev) + return -ENOMEM; /* Copy the parameters from insmod into the device structure. */ - this_device.base_addr = io; - this_device.irq = irq; - this_device.dma = dma; - this_device.mem_start = mem; - this_device.init = netcard_probe; - - if ((result = register_netdev(&this_device)) != 0) - return result; - - return 0; + dev->base_addr = io; + dev->irq = irq; + dev->dma = dma; + dev->mem_start = mem; + if (do_netcard_probe(dev) == 0) { + if (register_netdev(dev) == 0) + this_device = dev; + return 0; + } + cleanup_card(dev); + } + free_netdev(dev); + return -ENXIO; } void cleanup_module(void) { - unregister_netdev(&this_device); - /* - * If we don't do this, we can't re-insmod it later. - * Release irq/dma here, when you have jumpered versions and - * allocate them in net_probe1(). - */ - /* - free_irq(this_device.irq, dev); - free_dma(this_device.dma); - */ - release_region(this_device.base_addr, NETCARD_IO_EXTENT); - - if (this_device.priv) - kfree(this_device.priv); + unregister_netdev(this_device); + cleanup_card(this_device); + free_netdev(this_device); } #endif /* MODULE */ diff -Nru a/drivers/net/loopback.c b/drivers/net/loopback.c --- a/drivers/net/loopback.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/loopback.c Thu Feb 19 23:44:23 2004 @@ -173,7 +173,7 @@ .rebuild_header = eth_rebuild_header, .flags = IFF_LOOPBACK, .features = NETIF_F_SG|NETIF_F_FRAGLIST - |NETIF_F_NO_CSUM|NETIF_F_HIGHDMA|NETIF_F_TSO, + |NETIF_F_NO_CSUM|NETIF_F_HIGHDMA, }; /* Setup and register the of the LOOPBACK device. */ diff -Nru a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c --- a/drivers/net/pcnet32.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/pcnet32.c Thu Feb 19 23:44:24 2004 @@ -720,6 +720,8 @@ lp->name = chipname; lp->shared_irq = shared; lp->mii_if.full_duplex = fdx; + lp->mii_if.phy_id_mask = 0x1f; + lp->mii_if.reg_num_mask = 0x1f; lp->dxsuflo = dxsuflo; lp->ltint = ltint; lp->mii = mii; @@ -1006,9 +1008,10 @@ } if (lp->rx_dma_addr[i] == 0) - lp->rx_dma_addr[i] = pci_map_single(lp->pci_dev, rx_skbuff->tail, rx_skbuff->len, PCI_DMA_FROMDEVICE); + lp->rx_dma_addr[i] = pci_map_single(lp->pci_dev, + rx_skbuff->tail, PKT_BUF_SZ-2, PCI_DMA_FROMDEVICE); lp->rx_ring[i].base = (u32)le32_to_cpu(lp->rx_dma_addr[i]); - lp->rx_ring[i].buf_length = le16_to_cpu(-PKT_BUF_SZ); + lp->rx_ring[i].buf_length = le16_to_cpu(2-PKT_BUF_SZ); lp->rx_ring[i].status = le16_to_cpu(0x8000); } /* The Tx buffer address is filled in as needed, but we do need to clear @@ -1079,7 +1082,7 @@ pcnet32_restart(dev, 0x0042); dev->trans_start = jiffies; - netif_start_queue(dev); + netif_wake_queue(dev); spin_unlock_irqrestore(&lp->lock, flags); } @@ -1105,9 +1108,10 @@ * interrupt when that option is available to us. */ status = 0x8300; + entry = (lp->cur_tx - lp->dirty_tx) & TX_RING_MOD_MASK; if ((lp->ltint) && - ((lp->cur_tx - lp->dirty_tx == TX_RING_SIZE/2) || - (lp->cur_tx - lp->dirty_tx >= TX_RING_SIZE-2))) + ((entry == TX_RING_SIZE/2) || + (entry >= TX_RING_SIZE-2))) { /* Enable Successful-TxDone interrupt if we have * 1/2 of, or nearly all of, our ring buffer Tx'd @@ -1122,7 +1126,7 @@ /* Mask to ring buffer boundary. */ entry = lp->cur_tx & TX_RING_MOD_MASK; - /* Caution: the write order is important here, set the base address + /* Caution: the write order is important here, set the status with the "ownership" bits last. */ lp->tx_ring[entry].length = le16_to_cpu(-skb->len); @@ -1144,7 +1148,7 @@ dev->trans_start = jiffies; if (lp->tx_ring[(entry+1) & TX_RING_MOD_MASK].base == 0) - netif_start_queue(dev); + netif_wake_queue(dev); else { lp->tx_full = 1; netif_stop_queue(dev); @@ -1191,8 +1195,9 @@ if (csr0 & 0x0200) { /* Tx-done interrupt */ unsigned int dirty_tx = lp->dirty_tx; + int delta; - while (dirty_tx < lp->cur_tx) { + while (dirty_tx != lp->cur_tx) { int entry = dirty_tx & TX_RING_MOD_MASK; int status = (short)le16_to_cpu(lp->tx_ring[entry].status); @@ -1246,15 +1251,17 @@ dirty_tx++; } - if (lp->cur_tx - dirty_tx >= TX_RING_SIZE) { + delta = (lp->cur_tx - dirty_tx) & (TX_RING_MOD_MASK + TX_RING_SIZE); + if (delta >= TX_RING_SIZE) { printk(KERN_ERR "%s: out-of-sync dirty pointer, %d vs. %d, full=%d.\n", dev->name, dirty_tx, lp->cur_tx, lp->tx_full); dirty_tx += TX_RING_SIZE; + delta -= TX_RING_SIZE; } if (lp->tx_full && netif_queue_stopped(dev) && - dirty_tx > lp->cur_tx - TX_RING_SIZE + 2) { + delta < TX_RING_SIZE - 2) { /* The ring is no longer full, clear tbusy. */ lp->tx_full = 0; netif_wake_queue (dev); @@ -1344,13 +1351,14 @@ if ((newskb = dev_alloc_skb (PKT_BUF_SZ))) { skb_reserve (newskb, 2); skb = lp->rx_skbuff[entry]; - pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[entry], skb->len, PCI_DMA_FROMDEVICE); + pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[entry], + PKT_BUF_SZ-2, PCI_DMA_FROMDEVICE); skb_put (skb, pkt_len); lp->rx_skbuff[entry] = newskb; newskb->dev = dev; lp->rx_dma_addr[entry] = pci_map_single(lp->pci_dev, newskb->tail, - newskb->len, PCI_DMA_FROMDEVICE); + PKT_BUF_SZ-2, PCI_DMA_FROMDEVICE); lp->rx_ring[entry].base = le32_to_cpu(lp->rx_dma_addr[entry]); rx_in_place = 1; } else @@ -1379,7 +1387,7 @@ skb_put(skb,pkt_len); /* Make room */ pci_dma_sync_single(lp->pci_dev, lp->rx_dma_addr[entry], - PKT_BUF_SZ, + PKT_BUF_SZ-2, PCI_DMA_FROMDEVICE); eth_copy_and_sum(skb, (unsigned char *)(lp->rx_skbuff[entry]->tail), @@ -1396,7 +1404,7 @@ * The docs say that the buffer length isn't touched, but Andrew Boyd * of QNX reports that some revs of the 79C965 clear it. */ - lp->rx_ring[entry].buf_length = le16_to_cpu(-PKT_BUF_SZ); + lp->rx_ring[entry].buf_length = le16_to_cpu(2-PKT_BUF_SZ); lp->rx_ring[entry].status |= le16_to_cpu(0x8000); entry = (++lp->cur_rx) & RX_RING_MOD_MASK; } @@ -1436,7 +1444,8 @@ for (i = 0; i < RX_RING_SIZE; i++) { lp->rx_ring[i].status = 0; if (lp->rx_skbuff[i]) { - pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i], lp->rx_skbuff[i]->len, PCI_DMA_FROMDEVICE); + pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i], PKT_BUF_SZ-2, + PCI_DMA_FROMDEVICE); dev_kfree_skb(lp->rx_skbuff[i]); } lp->rx_skbuff[i] = NULL; @@ -1625,12 +1634,18 @@ } /* restart autonegotiation */ case ETHTOOL_NWAY_RST: { - return mii_nway_restart(&lp->mii_if); + int r; + spin_lock_irq(&lp->lock); + r = mii_nway_restart(&lp->mii_if); + spin_unlock_irq(&lp->lock); + return r; } /* get link status */ case ETHTOOL_GLINK: { struct ethtool_value edata = {ETHTOOL_GLINK}; + spin_lock_irq(&lp->lock); edata.data = mii_link_ok(&lp->mii_if); + spin_unlock_irq(&lp->lock); if (copy_to_user(useraddr, &edata, sizeof(edata))) return -EFAULT; return 0; @@ -1661,45 +1676,37 @@ static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - unsigned long ioaddr = dev->base_addr; struct pcnet32_private *lp = dev->priv; struct mii_ioctl_data *data = (struct mii_ioctl_data *)&rq->ifr_data; - int phyaddr = lp->a.read_bcr (ioaddr, 33); + int rc; + unsigned long flags; if (cmd == SIOCETHTOOL) return pcnet32_ethtool_ioctl(dev, (void *) rq->ifr_data); + /* SIOC[GS]MIIxxx ioctls */ if (lp->mii) { - switch(cmd) { - case SIOCGMIIPHY: /* Get address of MII PHY in use. */ - data->phy_id = (phyaddr >> 5) & 0x1f; - /* Fall Through */ - case SIOCGMIIREG: /* Read MII PHY register. */ - lp->a.write_bcr (ioaddr, 33, ((data->phy_id & 0x1f) << 5) | (data->reg_num & 0x1f)); - data->val_out = lp->a.read_bcr (ioaddr, 34); - lp->a.write_bcr (ioaddr, 33, phyaddr); - return 0; - case SIOCSMIIREG: /* Write MII PHY register. */ - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - lp->a.write_bcr (ioaddr, 33, ((data->phy_id & 0x1f) << 5) | (data->reg_num & 0x1f)); - lp->a.write_bcr (ioaddr, 34, data->val_in); - lp->a.write_bcr (ioaddr, 33, phyaddr); - return 0; - default: - return -EOPNOTSUPP; - } + spin_lock_irqsave(&lp->lock, flags); + rc = generic_mii_ioctl(&lp->mii_if, data, cmd, NULL); + spin_unlock_irqrestore(&lp->lock, flags); + } else { + rc = -EOPNOTSUPP; } - return -EOPNOTSUPP; + + return rc; } static void pcnet32_watchdog(struct net_device *dev) { struct pcnet32_private *lp = dev->priv; + unsigned long flags; /* Print the link status if it has changed */ - if (lp->mii) + if (lp->mii) { + spin_lock_irqsave(&lp->lock, flags); mii_check_media (&lp->mii_if, 1, 0); + spin_unlock_irqrestore(&lp->lock, flags); + } mod_timer (&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT); } diff -Nru a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c --- a/drivers/net/ppp_deflate.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/ppp_deflate.c Thu Feb 19 23:44:27 2004 @@ -655,3 +655,5 @@ module_init(deflate_init); module_exit(deflate_cleanup); MODULE_LICENSE("Dual BSD/GPL"); +MODULE_ALIAS("ppp-compress-" __stringify(CI_DEFLATE)); +MODULE_ALIAS("ppp-compress-" __stringify(CI_DEFLATE_DRAFT)); diff -Nru a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c --- a/drivers/net/ppp_generic.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/ppp_generic.c Thu Feb 19 23:44:28 2004 @@ -675,20 +675,25 @@ if (copy_from_user(&uprog, (void __user *) arg, sizeof(uprog))) break; - err = -ENOMEM; - len = uprog.len * sizeof(struct sock_filter); - code = kmalloc(len, GFP_KERNEL); - if (code == 0) - break; - err = -EFAULT; - if (copy_from_user(code, (void __user *) uprog.filter, len)) { - kfree(code); - break; - } - err = sk_chk_filter(code, uprog.len); - if (err) { - kfree(code); + err = -EINVAL; + if (uprog.len > BPF_MAXINSNS) break; + err = -ENOMEM; + if (uprog.len > 0) { + len = uprog.len * sizeof(struct sock_filter); + code = kmalloc(len, GFP_KERNEL); + if (code == NULL) + break; + err = -EFAULT; + if (copy_from_user(code, (void __user *) uprog.filter, len)) { + kfree(code); + break; + } + err = sk_chk_filter(code, uprog.len); + if (err) { + kfree(code); + break; + } } filtp = (cmd == PPPIOCSPASS)? &ppp->pass_filter: &ppp->active_filter; ppp_lock(ppp); @@ -2668,3 +2673,4 @@ EXPORT_SYMBOL(all_channels); /* for debugging */ MODULE_LICENSE("GPL"); MODULE_ALIAS_CHARDEV_MAJOR(PPP_MAJOR); +MODULE_ALIAS("/dev/ppp"); diff -Nru a/drivers/net/pppoe.c b/drivers/net/pppoe.c --- a/drivers/net/pppoe.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/pppoe.c Thu Feb 19 23:44:26 2004 @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include diff -Nru a/drivers/net/saa9730.c b/drivers/net/saa9730.c --- a/drivers/net/saa9730.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/saa9730.c Thu Feb 19 23:44:25 2004 @@ -1028,6 +1028,9 @@ * Make certain the data structures used by the controller are aligned * and DMAble. */ + /* + * XXX: that is obviously broken - kfree() won't be happy with us. + */ lp = (struct lan_saa9730_private *) (((unsigned long) kmalloc(sizeof(*lp) + 7, GFP_DMA | GFP_KERNEL) @@ -1095,7 +1098,6 @@ out: if (dev->priv) kfree(dev->priv); - free_netdev(dev); return ret; } diff -Nru a/drivers/net/shaper.c b/drivers/net/shaper.c --- a/drivers/net/shaper.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/shaper.c Thu Feb 19 23:44:27 2004 @@ -642,7 +642,6 @@ dev->open = shaper_open; dev->stop = shaper_close; - dev->destructor = free_netdev; dev->hard_start_xmit = shaper_start_xmit; dev->get_stats = shaper_get_stats; dev->set_multicast_list = NULL; diff -Nru a/drivers/net/sis190.c b/drivers/net/sis190.c --- a/drivers/net/sis190.c Thu Feb 19 23:44:29 2004 +++ b/drivers/net/sis190.c Thu Feb 19 23:44:29 2004 @@ -954,8 +954,7 @@ SiS190_tx_interrupt(struct net_device *dev, struct sis190_private *tp, void *ioaddr) { - unsigned long dirty_tx, tx_left = 0; - int entry = tp->cur_tx % NUM_TX_DESC; + unsigned long dirty_tx, tx_left; assert(dev != NULL); assert(tp != NULL); @@ -965,6 +964,8 @@ tx_left = tp->cur_tx - dirty_tx; while (tx_left > 0) { + int entry = dirty_tx % NUM_TX_DESC; + if ((le32_to_cpu(tp->TxDescArray[entry].status) & OWNbit) == 0) { struct sk_buff *skb; @@ -980,7 +981,6 @@ tp->stats.tx_packets++; dirty_tx++; tx_left--; - entry++; } } diff -Nru a/drivers/net/sis900.c b/drivers/net/sis900.c --- a/drivers/net/sis900.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/sis900.c Thu Feb 19 23:44:24 2004 @@ -2093,7 +2093,7 @@ i++, mclist = mclist->next) { unsigned int bit_nr = sis900_mcast_bitnr(mclist->dmi_addr, revision); - mc_filter[bit_nr >> 4] |= (1 << bit_nr); + mc_filter[bit_nr >> 4] |= (1 << (bit_nr & 0xf)); } } diff -Nru a/drivers/net/sk98lin/h/lm80.h b/drivers/net/sk98lin/h/lm80.h --- a/drivers/net/sk98lin/h/lm80.h Thu Feb 19 23:44:27 2004 +++ b/drivers/net/sk98lin/h/lm80.h Thu Feb 19 23:44:27 2004 @@ -2,6 +2,8 @@ * * Name: lm80.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.6 $ + * Date: $Date: 2003/05/13 17:26:52 $ * Purpose: Contains all defines for the LM80 Chip * (National Semiconductor). * diff -Nru a/drivers/net/sk98lin/h/skaddr.h b/drivers/net/sk98lin/h/skaddr.h --- a/drivers/net/sk98lin/h/skaddr.h Thu Feb 19 23:44:25 2004 +++ b/drivers/net/sk98lin/h/skaddr.h Thu Feb 19 23:44:25 2004 @@ -2,6 +2,8 @@ * * Name: skaddr.h * Project: Gigabit Ethernet Adapters, ADDR-Modul + * Version: $Revision: 1.29 $ + * Date: $Date: 2003/05/13 16:57:24 $ * Purpose: Header file for Address Management (MC, UC, Prom). * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skcsum.h b/drivers/net/sk98lin/h/skcsum.h --- a/drivers/net/sk98lin/h/skcsum.h Thu Feb 19 23:44:22 2004 +++ b/drivers/net/sk98lin/h/skcsum.h Thu Feb 19 23:44:22 2004 @@ -2,6 +2,8 @@ * * Name: skcsum.h * Project: GEnesis - SysKonnect SK-NET Gigabit Ethernet (SK-98xx) + * Version: $Revision: 1.10 $ + * Date: $Date: 2003/08/20 13:59:57 $ * Purpose: Store/verify Internet checksum in send/receive packets. * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skdebug.h b/drivers/net/sk98lin/h/skdebug.h --- a/drivers/net/sk98lin/h/skdebug.h Thu Feb 19 23:44:25 2004 +++ b/drivers/net/sk98lin/h/skdebug.h Thu Feb 19 23:44:25 2004 @@ -2,6 +2,8 @@ * * Name: skdebug.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.14 $ + * Date: $Date: 2003/05/13 17:26:00 $ * Purpose: SK specific DEBUG support * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h --- a/drivers/net/sk98lin/h/skdrv1st.h Thu Feb 19 23:44:22 2004 +++ b/drivers/net/sk98lin/h/skdrv1st.h Thu Feb 19 23:44:22 2004 @@ -2,6 +2,8 @@ * * Name: skdrv1st.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.4 $ + * Date: $Date: 2003/11/12 14:28:14 $ * Purpose: First header file for driver and all other modules * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h --- a/drivers/net/sk98lin/h/skdrv2nd.h Thu Feb 19 23:44:28 2004 +++ b/drivers/net/sk98lin/h/skdrv2nd.h Thu Feb 19 23:44:28 2004 @@ -2,6 +2,8 @@ * * Name: skdrv2nd.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.10 $ + * Date: $Date: 2003/12/11 16:04:45 $ * Purpose: Second header file for driver and all other modules * ******************************************************************************/ @@ -76,7 +78,13 @@ /* Marvell (0x11ab) */ \ } else if (pdev->vendor == 0x11ab) { \ /* Gigabit Ethernet Adapter (0x4320) */ \ - if ((pdev->device == 0x4320)) { \ + /* Gigabit Ethernet Adapter (0x4360) */ \ + /* Gigabit Ethernet Adapter (0x4361) */ \ + /* Belkin (0x5005) */ \ + if ((pdev->device == 0x4320) || \ + (pdev->device == 0x4360) || \ + (pdev->device == 0x4361) || \ + (pdev->device == 0x5005)) { \ result = SK_TRUE; \ } \ /* CNet (0x1371) */ \ diff -Nru a/drivers/net/sk98lin/h/skerror.h b/drivers/net/sk98lin/h/skerror.h --- a/drivers/net/sk98lin/h/skerror.h Thu Feb 19 23:44:25 2004 +++ b/drivers/net/sk98lin/h/skerror.h Thu Feb 19 23:44:25 2004 @@ -2,6 +2,8 @@ * * Name: skerror.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.7 $ + * Date: $Date: 2003/05/13 17:25:13 $ * Purpose: SK specific Error log support * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgedrv.h b/drivers/net/sk98lin/h/skgedrv.h --- a/drivers/net/sk98lin/h/skgedrv.h Thu Feb 19 23:44:26 2004 +++ b/drivers/net/sk98lin/h/skgedrv.h Thu Feb 19 23:44:26 2004 @@ -2,6 +2,8 @@ * * Name: skgedrv.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.10 $ + * Date: $Date: 2003/07/04 12:25:01 $ * Purpose: Interface with the driver * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgehw.h b/drivers/net/sk98lin/h/skgehw.h --- a/drivers/net/sk98lin/h/skgehw.h Thu Feb 19 23:44:28 2004 +++ b/drivers/net/sk98lin/h/skgehw.h Thu Feb 19 23:44:28 2004 @@ -2,6 +2,8 @@ * * Name: skgehw.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.56 $ + * Date: $Date: 2003/09/23 09:01:00 $ * Purpose: Defines and Macros for the Gigabit Ethernet Adapter Product Family * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgehwt.h b/drivers/net/sk98lin/h/skgehwt.h --- a/drivers/net/sk98lin/h/skgehwt.h Thu Feb 19 23:44:24 2004 +++ b/drivers/net/sk98lin/h/skgehwt.h Thu Feb 19 23:44:24 2004 @@ -2,6 +2,8 @@ * * Name: skhwt.h * Project: Gigabit Ethernet Adapters, Event Scheduler Module + * Version: $Revision: 1.7 $ + * Date: $Date: 2003/09/16 12:55:08 $ * Purpose: Defines for the hardware timer functions * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgei2c.h b/drivers/net/sk98lin/h/skgei2c.h --- a/drivers/net/sk98lin/h/skgei2c.h Thu Feb 19 23:44:27 2004 +++ b/drivers/net/sk98lin/h/skgei2c.h Thu Feb 19 23:44:27 2004 @@ -2,6 +2,8 @@ * * Name: skgei2c.h * Project: Gigabit Ethernet Adapters, TWSI-Module + * Version: $Revision: 1.25 $ + * Date: $Date: 2003/10/20 09:06:05 $ * Purpose: Special defines for TWSI * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgeinit.h b/drivers/net/sk98lin/h/skgeinit.h --- a/drivers/net/sk98lin/h/skgeinit.h Thu Feb 19 23:44:27 2004 +++ b/drivers/net/sk98lin/h/skgeinit.h Thu Feb 19 23:44:27 2004 @@ -2,6 +2,8 @@ * * Name: skgeinit.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.83 $ + * Date: $Date: 2003/09/16 14:07:37 $ * Purpose: Structures and prototypes for the GE Init Module * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgepnm2.h b/drivers/net/sk98lin/h/skgepnm2.h --- a/drivers/net/sk98lin/h/skgepnm2.h Thu Feb 19 23:44:26 2004 +++ b/drivers/net/sk98lin/h/skgepnm2.h Thu Feb 19 23:44:26 2004 @@ -2,6 +2,8 @@ * * Name: skgepnm2.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.36 $ + * Date: $Date: 2003/05/23 12:45:13 $ * Purpose: Defines for Private Network Management Interface * ****************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgepnmi.h b/drivers/net/sk98lin/h/skgepnmi.h --- a/drivers/net/sk98lin/h/skgepnmi.h Thu Feb 19 23:44:23 2004 +++ b/drivers/net/sk98lin/h/skgepnmi.h Thu Feb 19 23:44:23 2004 @@ -2,6 +2,8 @@ * * Name: skgepnmi.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.62 $ + * Date: $Date: 2003/08/15 12:31:52 $ * Purpose: Defines for Private Network Management Interface * ****************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skgesirq.h b/drivers/net/sk98lin/h/skgesirq.h --- a/drivers/net/sk98lin/h/skgesirq.h Thu Feb 19 23:44:28 2004 +++ b/drivers/net/sk98lin/h/skgesirq.h Thu Feb 19 23:44:28 2004 @@ -2,6 +2,8 @@ * * Name: skgesirq.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.30 $ + * Date: $Date: 2003/07/04 12:34:13 $ * Purpose: SK specific Gigabit Ethernet special IRQ functions * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/ski2c.h b/drivers/net/sk98lin/h/ski2c.h --- a/drivers/net/sk98lin/h/ski2c.h Thu Feb 19 23:44:24 2004 +++ b/drivers/net/sk98lin/h/ski2c.h Thu Feb 19 23:44:24 2004 @@ -2,6 +2,8 @@ * * Name: ski2c.h * Project: Gigabit Ethernet Adapters, TWSI-Module + * Version: $Revision: 1.35 $ + * Date: $Date: 2003/10/20 09:06:30 $ * Purpose: Defines to access Voltage and Temperature Sensor * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skqueue.h b/drivers/net/sk98lin/h/skqueue.h --- a/drivers/net/sk98lin/h/skqueue.h Thu Feb 19 23:44:28 2004 +++ b/drivers/net/sk98lin/h/skqueue.h Thu Feb 19 23:44:28 2004 @@ -2,6 +2,8 @@ * * Name: skqueue.h * Project: Gigabit Ethernet Adapters, Event Scheduler Module + * Version: $Revision: 1.16 $ + * Date: $Date: 2003/09/16 12:50:32 $ * Purpose: Defines for the Event queue * ******************************************************************************/ @@ -19,6 +21,10 @@ * The information in this file is provided "AS IS" without warranty. * ******************************************************************************/ + +/* + * SKQUEUE.H contains all defines and types for the event queue + */ #ifndef _SKQUEUE_H_ #define _SKQUEUE_H_ diff -Nru a/drivers/net/sk98lin/h/skrlmt.h b/drivers/net/sk98lin/h/skrlmt.h --- a/drivers/net/sk98lin/h/skrlmt.h Thu Feb 19 23:44:29 2004 +++ b/drivers/net/sk98lin/h/skrlmt.h Thu Feb 19 23:44:29 2004 @@ -2,6 +2,8 @@ * * Name: skrlmt.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.37 $ + * Date: $Date: 2003/04/15 09:43:43 $ * Purpose: Header file for Redundant Link ManagemenT. * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/sktimer.h b/drivers/net/sk98lin/h/sktimer.h --- a/drivers/net/sk98lin/h/sktimer.h Thu Feb 19 23:44:23 2004 +++ b/drivers/net/sk98lin/h/sktimer.h Thu Feb 19 23:44:23 2004 @@ -2,6 +2,8 @@ * * Name: sktimer.h * Project: Gigabit Ethernet Adapters, Event Scheduler Module + * Version: $Revision: 1.11 $ + * Date: $Date: 2003/09/16 12:58:18 $ * Purpose: Defines for the timer functions * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/sktypes.h b/drivers/net/sk98lin/h/sktypes.h --- a/drivers/net/sk98lin/h/sktypes.h Thu Feb 19 23:44:28 2004 +++ b/drivers/net/sk98lin/h/sktypes.h Thu Feb 19 23:44:28 2004 @@ -2,6 +2,8 @@ * * Name: sktypes.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.2 $ + * Date: $Date: 2003/10/07 08:16:51 $ * Purpose: Define data types for Linux * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/skversion.h b/drivers/net/sk98lin/h/skversion.h --- a/drivers/net/sk98lin/h/skversion.h Thu Feb 19 23:44:25 2004 +++ b/drivers/net/sk98lin/h/skversion.h Thu Feb 19 23:44:25 2004 @@ -2,6 +2,8 @@ * * Name: version.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.5 $ + * Date: $Date: 2003/10/07 08:16:51 $ * Purpose: SK specific Error log support * ******************************************************************************/ @@ -23,14 +25,14 @@ #ifdef lint static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH."; static const char SysKonnectBuildNumber[] = - "@(#)SK-BUILD: 6.22 PL: 01"; + "@(#)SK-BUILD: 6.23 PL: 01"; #endif /* !defined(lint) */ -#define BOOT_STRING "sk98lin: Network Device Driver v6.22\n" \ +#define BOOT_STRING "sk98lin: Network Device Driver v6.23\n" \ "(C)Copyright 1999-2004 Marvell(R)." -#define VER_STRING "6.22" +#define VER_STRING "6.23" #define DRIVER_FILE_NAME "sk98lin" -#define DRIVER_REL_DATE "Jan-30-2004" +#define DRIVER_REL_DATE "Feb-13-2004" diff -Nru a/drivers/net/sk98lin/h/skvpd.h b/drivers/net/sk98lin/h/skvpd.h --- a/drivers/net/sk98lin/h/skvpd.h Thu Feb 19 23:44:24 2004 +++ b/drivers/net/sk98lin/h/skvpd.h Thu Feb 19 23:44:24 2004 @@ -2,6 +2,8 @@ * * Name: skvpd.h * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.15 $ + * Date: $Date: 2003/01/13 10:39:38 $ * Purpose: Defines and Macros for VPD handling * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/h/xmac_ii.h b/drivers/net/sk98lin/h/xmac_ii.h --- a/drivers/net/sk98lin/h/xmac_ii.h Thu Feb 19 23:44:27 2004 +++ b/drivers/net/sk98lin/h/xmac_ii.h Thu Feb 19 23:44:27 2004 @@ -2,6 +2,8 @@ * * Name: xmac_ii.h * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.52 $ + * Date: $Date: 2003/10/02 16:35:50 $ * Purpose: Defines and Macros for Gigabit Ethernet Controller * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/skaddr.c b/drivers/net/sk98lin/skaddr.c --- a/drivers/net/sk98lin/skaddr.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/sk98lin/skaddr.c Thu Feb 19 23:44:26 2004 @@ -2,6 +2,8 @@ * * Name: skaddr.c * Project: Gigabit Ethernet Adapters, ADDR-Module + * Version: $Revision: 1.52 $ + * Date: $Date: 2003/06/02 13:46:15 $ * Purpose: Manage Addresses (Multicast and Unicast) and Promiscuous Mode. * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/skcsum.c b/drivers/net/sk98lin/skcsum.c --- a/drivers/net/sk98lin/skcsum.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/sk98lin/skcsum.c Thu Feb 19 23:44:22 2004 @@ -2,6 +2,8 @@ * * Name: skcsum.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.12 $ + * Date: $Date: 2003/08/20 13:55:53 $ * Purpose: Store/verify Internet checksum in send/receive packets. * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c --- a/drivers/net/sk98lin/skdim.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/sk98lin/skdim.c Thu Feb 19 23:44:24 2004 @@ -2,6 +2,8 @@ * * Name: skdim.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.5 $ + * Date: $Date: 2003/11/28 12:55:40 $ * Purpose: All functions to maintain interrupt moderation * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c --- a/drivers/net/sk98lin/skge.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/sk98lin/skge.c Thu Feb 19 23:44:23 2004 @@ -2,6 +2,8 @@ * * Name: skge.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.45 $ + * Date: $Date: 2004/02/12 14:41:02 $ * Purpose: The main driver source module * ******************************************************************************/ @@ -294,7 +296,6 @@ SK_BOOL BootStringCount = SK_FALSE; int retval; #ifdef CONFIG_PROC_FS - int proc_root_initialized = 0; struct proc_dir_entry *pProcFile; #endif @@ -311,6 +312,12 @@ dev = NULL; pNet = NULL; + /* Don't handle Yukon2 cards at the moment */ + /* 12-feb-2004 ---- mlindner@syskonnect.de */ + if (pdev->vendor == 0x11ab) { + if ( (pdev->device == 0x4360) || (pdev->device == 0x4361) ) + continue; + } SK_PCI_ISCOMPLIANT(vendor_flag, pdev); if (!vendor_flag) diff -Nru a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c --- a/drivers/net/sk98lin/skgehwt.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/sk98lin/skgehwt.c Thu Feb 19 23:44:27 2004 @@ -2,6 +2,8 @@ * * Name: skgehwt.c * Project: Gigabit Ethernet Adapters, Event Scheduler Module + * Version: $Revision: 1.15 $ + * Date: $Date: 2003/09/16 13:41:23 $ * Purpose: Hardware Timer * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c --- a/drivers/net/sk98lin/skgeinit.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/sk98lin/skgeinit.c Thu Feb 19 23:44:25 2004 @@ -2,6 +2,8 @@ * * Name: skgeinit.c * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.97 $ + * Date: $Date: 2003/10/02 16:45:31 $ * Purpose: Contains functions to initialize the adapter * ******************************************************************************/ @@ -19,7 +21,6 @@ * The information in this file is provided "AS IS" without warranty. * ******************************************************************************/ - #include "h/skdrv1st.h" #include "h/skdrv2nd.h" diff -Nru a/drivers/net/sk98lin/skgemib.c b/drivers/net/sk98lin/skgemib.c --- a/drivers/net/sk98lin/skgemib.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/sk98lin/skgemib.c Thu Feb 19 23:44:22 2004 @@ -2,6 +2,8 @@ * * Name: skgemib.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.11 $ + * Date: $Date: 2003/09/15 13:38:12 $ * Purpose: Private Network Management Interface Management Database * ****************************************************************************/ diff -Nru a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c --- a/drivers/net/sk98lin/skgepnmi.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/sk98lin/skgepnmi.c Thu Feb 19 23:44:27 2004 @@ -2,6 +2,8 @@ * * Name: skgepnmi.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.111 $ + * Date: $Date: 2003/09/15 13:35:35 $ * Purpose: Private Network Management Interface * ****************************************************************************/ @@ -19,6 +21,7 @@ * The information in this file is provided "AS IS" without warranty. * ******************************************************************************/ + #ifndef _lint static const char SysKonnectFileId[] = diff -Nru a/drivers/net/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c --- a/drivers/net/sk98lin/skgesirq.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/sk98lin/skgesirq.c Thu Feb 19 23:44:22 2004 @@ -2,6 +2,8 @@ * * Name: skgesirq.c * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.92 $ + * Date: $Date: 2003/09/16 14:37:07 $ * Purpose: Special IRQ module * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c --- a/drivers/net/sk98lin/ski2c.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/sk98lin/ski2c.c Thu Feb 19 23:44:22 2004 @@ -2,6 +2,8 @@ * * Name: ski2c.c * Project: Gigabit Ethernet Adapters, TWSI-Module + * Version: $Revision: 1.59 $ + * Date: $Date: 2003/10/20 09:07:25 $ * Purpose: Functions to access Voltage and Temperature Sensor * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/sklm80.c b/drivers/net/sk98lin/sklm80.c --- a/drivers/net/sk98lin/sklm80.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/sk98lin/sklm80.c Thu Feb 19 23:44:27 2004 @@ -2,6 +2,8 @@ * * Name: sklm80.c * Project: Gigabit Ethernet Adapters, TWSI-Module + * Version: $Revision: 1.22 $ + * Date: $Date: 2003/10/20 09:08:21 $ * Purpose: Functions to access Voltage and Temperature Sensor (LM80) * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/skproc.c b/drivers/net/sk98lin/skproc.c --- a/drivers/net/sk98lin/skproc.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/sk98lin/skproc.c Thu Feb 19 23:44:23 2004 @@ -2,6 +2,8 @@ * * Name: skproc.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.11 $ + * Date: $Date: 2003/12/11 16:03:57 $ * Purpose: Funktions to display statictic data * ******************************************************************************/ @@ -22,7 +24,6 @@ * The information in this file is provided "AS IS" without warranty. * ******************************************************************************/ - #include #include diff -Nru a/drivers/net/sk98lin/skqueue.c b/drivers/net/sk98lin/skqueue.c --- a/drivers/net/sk98lin/skqueue.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/sk98lin/skqueue.c Thu Feb 19 23:44:23 2004 @@ -2,6 +2,8 @@ * * Name: skqueue.c * Project: Gigabit Ethernet Adapters, Event Scheduler Module + * Version: $Revision: 1.20 $ + * Date: $Date: 2003/09/16 13:44:00 $ * Purpose: Management of an event queue. * ******************************************************************************/ @@ -19,6 +21,7 @@ * The information in this file is provided "AS IS" without warranty. * ******************************************************************************/ + /* * Event queue and dispatcher diff -Nru a/drivers/net/sk98lin/skrlmt.c b/drivers/net/sk98lin/skrlmt.c --- a/drivers/net/sk98lin/skrlmt.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/sk98lin/skrlmt.c Thu Feb 19 23:44:26 2004 @@ -2,6 +2,8 @@ * * Name: skrlmt.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.69 $ + * Date: $Date: 2003/04/15 09:39:22 $ * Purpose: Manage links on SK-NET Adapters, esp. redundant ones. * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/sktimer.c b/drivers/net/sk98lin/sktimer.c --- a/drivers/net/sk98lin/sktimer.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/sk98lin/sktimer.c Thu Feb 19 23:44:23 2004 @@ -2,6 +2,8 @@ * * Name: sktimer.c * Project: Gigabit Ethernet Adapters, Event Scheduler Module + * Version: $Revision: 1.14 $ + * Date: $Date: 2003/09/16 13:46:51 $ * Purpose: High level timer functions. * ******************************************************************************/ @@ -19,6 +21,7 @@ * The information in this file is provided "AS IS" without warranty. * ******************************************************************************/ + /* * Event queue and dispatcher diff -Nru a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c --- a/drivers/net/sk98lin/skvpd.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/sk98lin/skvpd.c Thu Feb 19 23:44:26 2004 @@ -2,6 +2,8 @@ * * Name: skvpd.c * Project: GEnesis, PCI Gigabit Ethernet Adapter + * Version: $Revision: 1.37 $ + * Date: $Date: 2003/01/13 10:42:45 $ * Purpose: Shared software to read and write VPD data * ******************************************************************************/ diff -Nru a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c --- a/drivers/net/sk98lin/skxmac2.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/sk98lin/skxmac2.c Thu Feb 19 23:44:28 2004 @@ -2,6 +2,8 @@ * * Name: skxmac2.c * Project: Gigabit Ethernet Adapters, Common Modules + * Version: $Revision: 1.102 $ + * Date: $Date: 2003/10/02 16:53:58 $ * Purpose: Contains functions to initialize the MACs and PHYs * ******************************************************************************/ diff -Nru a/drivers/net/sungem.c b/drivers/net/sungem.c --- a/drivers/net/sungem.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/sungem.c Thu Feb 19 23:44:28 2004 @@ -654,6 +654,7 @@ cluster_start = curr = (gp->rx_new & ~(4 - 1)); count = 0; kick = -1; + wmb(); while (curr != limit) { curr = NEXT_RX(curr); if (++count == 4) { @@ -670,8 +671,10 @@ count = 0; } } - if (kick >= 0) + if (kick >= 0) { + mb(); writel(kick, gp->regs + RXDMA_KICK); + } } static void gem_rx(struct gem *gp) @@ -884,6 +887,7 @@ if (gem_intme(entry)) ctrl |= TXDCTRL_INTME; txd->buffer = cpu_to_le64(mapping); + wmb(); txd->control_word = cpu_to_le64(ctrl); entry = NEXT_TX(entry); } else { @@ -923,6 +927,7 @@ txd = &gp->init_block->txd[entry]; txd->buffer = cpu_to_le64(mapping); + wmb(); txd->control_word = cpu_to_le64(this_ctrl | len); if (gem_intme(entry)) @@ -932,6 +937,7 @@ } txd = &gp->init_block->txd[first_entry]; txd->buffer = cpu_to_le64(first_mapping); + wmb(); txd->control_word = cpu_to_le64(ctrl | TXDCTRL_SOF | intme | first_len); } @@ -943,6 +949,7 @@ if (netif_msg_tx_queued(gp)) printk(KERN_DEBUG "%s: tx queued, slot %d, skblen %d\n", dev->name, entry, skb->len); + mb(); writel(gp->tx_new, gp->regs + TXDMA_KICK); spin_unlock_irq(&gp->lock); @@ -1418,6 +1425,7 @@ gp->rx_skbs[i] = NULL; } rxd->status_word = 0; + wmb(); rxd->buffer = 0; } @@ -1478,6 +1486,7 @@ RX_BUF_ALLOC_SIZE(gp), PCI_DMA_FROMDEVICE); rxd->buffer = cpu_to_le64(dma_addr); + wmb(); rxd->status_word = cpu_to_le64(RXDCTRL_FRESH(gp)); skb_reserve(skb, RX_OFFSET); } @@ -1486,8 +1495,10 @@ struct gem_txd *txd = &gb->txd[i]; txd->control_word = 0; + wmb(); txd->buffer = 0; } + wmb(); } /* Must be invoked under gp->lock. */ @@ -1961,7 +1972,6 @@ */ static void gem_apple_powerup(struct gem *gp) { - u16 cmd; u32 mif_cfg; mb(); diff -Nru a/drivers/net/tg3.c b/drivers/net/tg3.c --- a/drivers/net/tg3.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/tg3.c Thu Feb 19 23:44:25 2004 @@ -56,8 +56,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "2.6" -#define DRV_MODULE_RELDATE "February 3, 2004" +#define DRV_MODULE_VERSION "2.7" +#define DRV_MODULE_RELDATE "February 17, 2004" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -213,8 +213,30 @@ } } + +static inline void _tw32_rx_mbox(struct tg3 *tp, u32 off, u32 val) +{ + unsigned long mbox = tp->regs + off; + writel(val, mbox); + if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) + readl(mbox); +} + +static inline void _tw32_tx_mbox(struct tg3 *tp, u32 off, u32 val) +{ + unsigned long mbox = tp->regs + off; + writel(val, mbox); + if (tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) + writel(val, mbox); + if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) + readl(mbox); +} + +#define tw32_mailbox(reg, val) writel(((val) & 0xffffffff), tp->regs + (reg)) +#define tw32_rx_mbox(reg, val) _tw32_rx_mbox(tp, reg, val) +#define tw32_tx_mbox(reg, val) _tw32_tx_mbox(tp, reg, val) + #define tw32(reg,val) tg3_write_indirect_reg32(tp,(reg),(val)) -#define tw32_mailbox(reg, val) writel(((val) & 0xffffffff), tp->regs + (reg)) #define tw16(reg,val) writew(((val) & 0xffff), tp->regs + (reg)) #define tw8(reg,val) writeb(((val) & 0xff), tp->regs + (reg)) #define tr32(reg) readl(tp->regs + (reg)) @@ -656,6 +678,18 @@ return err; out: + if (tp->tg3_flags2 & TG3_FLG2_PHY_ADC_BUG) { + tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00); + tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f); + tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x2aaa); + tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a); + tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0323); + tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400); + } + if (tp->tg3_flags2 & TG3_FLG2_PHY_5704_A0_BUG) { + tg3_writephy(tp, 0x1c, 0x8d68); + tg3_writephy(tp, 0x1c, 0x8d68); + } tg3_phy_set_wirespeed(tp); return 0; } @@ -1211,9 +1245,13 @@ u8 current_duplex; int i, err; + tw32(MAC_EVENT, 0); + tw32(MAC_STATUS, (MAC_STATUS_SYNC_CHANGED | - MAC_STATUS_CFG_CHANGED)); + MAC_STATUS_CFG_CHANGED | + MAC_STATUS_MI_COMPLETION | + MAC_STATUS_LNKSTATE_CHANGED)); tr32(MAC_STATUS); udelay(40); @@ -2325,25 +2363,19 @@ /* ACK the status ring. */ tp->rx_rcb_ptr = rx_rcb_ptr; - tw32_mailbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, + tw32_rx_mbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, (rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp))); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW); /* Refill RX ring(s). */ if (work_mask & RXD_OPAQUE_RING_STD) { sw_idx = tp->rx_std_ptr % TG3_RX_RING_SIZE; - tw32_mailbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW, + tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW, sw_idx); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW); } if (work_mask & RXD_OPAQUE_RING_JUMBO) { sw_idx = tp->rx_jumbo_ptr % TG3_RX_JUMBO_RING_SIZE; - tw32_mailbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW, + tw32_rx_mbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW, sw_idx); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW); } return received; @@ -2795,32 +2827,17 @@ /* Packets are ready, update Tx producer idx local and on card. */ if (tp->tg3_flags & TG3_FLAG_HOST_TXDS) { - tw32_mailbox((MAILBOX_SNDHOST_PROD_IDX_0 + + tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry); - if (tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) - tw32_mailbox((MAILBOX_SNDHOST_PROD_IDX_0 + - TG3_64BIT_REG_LOW), entry); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_SNDHOST_PROD_IDX_0 + - TG3_64BIT_REG_LOW); } else { /* First, make sure tg3 sees last descriptor fully * in SRAM. */ if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_SNDNIC_PROD_IDX_0 + - TG3_64BIT_REG_LOW); + tr32(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW); - tw32_mailbox((MAILBOX_SNDNIC_PROD_IDX_0 + + tw32_tx_mbox((MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry); - if (tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) - tw32_mailbox((MAILBOX_SNDNIC_PROD_IDX_0 + - TG3_64BIT_REG_LOW), entry); - - /* Now post the mailbox write itself. */ - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_SNDNIC_PROD_IDX_0 + - TG3_64BIT_REG_LOW); } tp->tx_prod = entry; @@ -2965,11 +2982,8 @@ * the double-write bug tests. */ if (tp->tg3_flags & TG3_FLAG_HOST_TXDS) { - tw32_mailbox((MAILBOX_SNDHOST_PROD_IDX_0 + + tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_SNDHOST_PROD_IDX_0 + - TG3_64BIT_REG_LOW); } else { /* First, make sure tg3 sees last descriptor fully * in SRAM. @@ -2978,13 +2992,8 @@ tr32(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW); - tw32_mailbox((MAILBOX_SNDNIC_PROD_IDX_0 + + tw32_tx_mbox((MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry); - - /* Now post the mailbox write itself. */ - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_SNDNIC_PROD_IDX_0 + - TG3_64BIT_REG_LOW); } tp->tx_prod = entry; @@ -3420,7 +3429,10 @@ if (err) goto out; - memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE); + if (tp->hw_status) + memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE); + if (tp->hw_stats) + memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats)); out: return err; @@ -4794,9 +4806,7 @@ tp->tx_prod = 0; tp->tx_cons = 0; tw32_mailbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0); - tw32_mailbox(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW); + tw32_tx_mbox(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0); if (tp->tg3_flags & TG3_FLAG_HOST_TXDS) { tg3_set_bdinfo(tp, NIC_SRAM_SEND_RCB, @@ -4823,9 +4833,7 @@ } tp->rx_rcb_ptr = 0; - tw32_mailbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, 0); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW); + tw32_rx_mbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, 0); tg3_set_bdinfo(tp, NIC_SRAM_RCV_RET_RCB, tp->rx_rcb_mapping, @@ -4834,19 +4842,13 @@ 0); tp->rx_std_ptr = tp->rx_pending; - tw32_mailbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW, + tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW, tp->rx_std_ptr); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW); - if (tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE) - tp->rx_jumbo_ptr = tp->rx_jumbo_pending; - else - tp->rx_jumbo_ptr = 0; - tw32_mailbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW, + tp->rx_jumbo_ptr = (tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE) ? + tp->rx_jumbo_pending : 0; + tw32_rx_mbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW, tp->rx_jumbo_ptr); - if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER) - tr32(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW); /* Initialize MAC address and backoff seed. */ __tg3_set_mac_addr(tp); @@ -6919,6 +6921,12 @@ (tp->pci_chip_rev_id != CHIPREV_ID_5705_A1))) tp->tg3_flags2 |= TG3_FLG2_NO_ETH_WIRE_SPEED; + if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5703_AX || + GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5704_AX) + tp->tg3_flags2 |= TG3_FLG2_PHY_ADC_BUG; + if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0) + tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG; + /* Only 5701 and later support tagged irq status mode. * Also, 5788 chips cannot use tagged irq status. * @@ -7421,8 +7429,8 @@ for (i = 0; i < TEST_BUFFER_SIZE / sizeof(u32); i++) { u32 val; tg3_read_mem(tp, 0x2100 + (i*4), &val); - if (val != p[i]) { - printk( KERN_ERR " tg3_test_dma() Card buffer currupted on write! (%d != %d)\n", val, i); + if (le32_to_cpu(val) != p[i]) { + printk(KERN_ERR " tg3_test_dma() Card buffer corrupted on write! (%d != %d)\n", val, i); /* ret = -ENODEV here? */ } p[i] = 0; @@ -7523,23 +7531,24 @@ static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp) { - struct pci_dev *peer = NULL; - unsigned int func; - - for (func = 0; func < 7; func++) { - unsigned int devfn = tp->pdev->devfn; - - devfn &= ~7; - devfn |= func; + struct pci_dev *peer; + unsigned int func, devnr = tp->pdev->devfn & ~7; - if (devfn == tp->pdev->devfn) - continue; - peer = pci_find_slot(tp->pdev->bus->number, devfn); - if (peer) + for (func = 0; func < 8; func++) { + peer = pci_get_slot(tp->pdev->bus, devnr | func); + if (peer && peer != tp->pdev) break; + pci_dev_put(peer); } if (!peer || peer == tp->pdev) BUG(); + + /* + * We don't need to keep the refcount elevated; there's no way + * to remove one half of this device without removing the other + */ + pci_dev_put(peer); + return peer; } @@ -7747,6 +7756,18 @@ printk(KERN_ERR PFX "Could not obtain valid ethernet address, " "aborting.\n"); goto err_out_iounmap; + } + + /* + * Reset chip in case UNDI or EFI driver did not shutdown + * DMA self test will enable WDMAC and we'll see (spurious) + * pending DMA on the PCI bus at that point. + */ + if ((tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE) || + (tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) { + pci_save_state(tp->pdev, tp->pci_cfg_state); + tw32(MEMARB_MODE, MEMARB_MODE_ENABLE); + tg3_halt(tp); } err = tg3_test_dma(tp); diff -Nru a/drivers/net/tg3.h b/drivers/net/tg3.h --- a/drivers/net/tg3.h Thu Feb 19 23:44:23 2004 +++ b/drivers/net/tg3.h Thu Feb 19 23:44:23 2004 @@ -129,6 +129,9 @@ #define CHIPREV_5700_BX 0x71 #define CHIPREV_5700_CX 0x72 #define CHIPREV_5701_AX 0x00 +#define CHIPREV_5703_AX 0x10 +#define CHIPREV_5704_AX 0x20 +#define CHIPREV_5704_BX 0x21 #define GET_METAL_REV(CHIP_REV_ID) ((CHIP_REV_ID) & 0xff) #define METAL_REV_A0 0x00 #define METAL_REV_A1 0x01 @@ -1889,7 +1892,11 @@ #define TG3_FLAG_ENABLE_ASF 0x00000020 #define TG3_FLAG_5701_REG_WRITE_BUG 0x00000040 #define TG3_FLAG_POLL_SERDES 0x00000080 +#if defined(CONFIG_X86) #define TG3_FLAG_MBOX_WRITE_REORDER 0x00000100 +#else +#define TG3_FLAG_MBOX_WRITE_REORDER 0 /* disables code too */ +#endif #define TG3_FLAG_PCIX_TARGET_HWBUG 0x00000200 #define TG3_FLAG_WOL_SPEED_100MB 0x00000400 #define TG3_FLAG_WOL_ENABLE 0x00000800 @@ -1920,6 +1927,8 @@ #define TG3_FLG2_IS_5788 0x00000008 #define TG3_FLG2_MAX_RXPEND_64 0x00000010 #define TG3_FLG2_TSO_CAPABLE 0x00000020 +#define TG3_FLG2_PHY_ADC_BUG 0x00000040 +#define TG3_FLG2_PHY_5704_A0_BUG 0x00000080 u32 split_mode_max_reqs; #define SPLIT_MODE_5704_MAX_REQ 3 diff -Nru a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c --- a/drivers/net/tokenring/3c359.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/tokenring/3c359.c Thu Feb 19 23:44:28 2004 @@ -641,7 +641,20 @@ */ /* These MUST be on 8 byte boundaries */ xl_priv->xl_tx_ring = kmalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL) ; + if (xl_priv->xl_tx_ring == NULL) { + printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n", + dev->name); + free_irq(dev->irq,dev); + return -ENOMEM; + } xl_priv->xl_rx_ring = kmalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL) ; + if (xl_priv->xl_tx_ring == NULL) { + printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n", + dev->name); + free_irq(dev->irq,dev); + kfree(xl_priv->xl_tx_ring); + return -ENOMEM; + } memset(xl_priv->xl_tx_ring,0,sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) ; memset(xl_priv->xl_rx_ring,0,sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) ; @@ -1129,7 +1142,7 @@ xl_freemem(dev) ; free_irq(dev->irq,dev); unregister_netdev(dev) ; - kfree(dev) ; + free_netdev(dev) ; xl_reset(dev) ; writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; spin_unlock(&xl_priv->xl_lock) ; diff -Nru a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c --- a/drivers/net/tulip/de4x5.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/tulip/de4x5.c Thu Feb 19 23:44:22 2004 @@ -5745,7 +5745,7 @@ { int err = 0; -#if CONFIG_PCI +#ifdef CONFIG_PCI err = pci_module_init (&de4x5_pci_driver); #endif #ifdef CONFIG_EISA @@ -5757,7 +5757,7 @@ static void __exit de4x5_module_exit (void) { -#if CONFIG_PCI +#ifdef CONFIG_PCI pci_unregister_driver (&de4x5_pci_driver); #endif #ifdef CONFIG_EISA diff -Nru a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c --- a/drivers/net/tulip/interrupt.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/tulip/interrupt.c Thu Feb 19 23:44:23 2004 @@ -211,10 +211,10 @@ if (tp->rx_buffers[entry].mapping != le32_to_cpu(tp->rx_ring[entry].buffer1)) { printk(KERN_ERR "%s: Internal fault: The skbuff addresses " - "do not match in tulip_rx: %08x vs. %08x %p / %p.\n", + "do not match in tulip_rx: %08x vs. %llx %p / %p.\n", dev->name, le32_to_cpu(tp->rx_ring[entry].buffer1), - tp->rx_buffers[entry].mapping, + (unsigned long long)tp->rx_buffers[entry].mapping, skb->head, temp); } #endif diff -Nru a/drivers/net/tun.c b/drivers/net/tun.c --- a/drivers/net/tun.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/tun.c Thu Feb 19 23:44:25 2004 @@ -118,12 +118,10 @@ } /* Initialize net device. */ -int tun_net_init(struct net_device *dev) +static void tun_net_init(struct net_device *dev) { struct tun_struct *tun = (struct tun_struct *)dev->priv; - DBG(KERN_INFO "%s: tun_net_init\n", tun->dev->name); - switch (tun->flags & TUN_TYPE_MASK) { case TUN_TUN_DEV: /* Point-to-Point TUN Device */ @@ -147,9 +145,7 @@ ether_setup(dev); break; - }; - - return 0; + } } /* Character device part */ @@ -351,7 +347,6 @@ init_waitqueue_head(&tun->read_wait); tun->owner = -1; - dev->init = tun_net_init; SET_MODULE_OWNER(dev); dev->open = tun_net_open; @@ -421,6 +416,8 @@ tun = dev->priv; tun->dev = dev; tun->flags = flags; + + tun_net_init(dev); if (strchr(dev->name, '%')) { err = dev_alloc_name(dev, dev->name); diff -Nru a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig --- a/drivers/net/wan/Kconfig Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/Kconfig Thu Feb 19 23:44:23 2004 @@ -8,17 +8,18 @@ config WAN bool "Wan interfaces support" ---help--- - Wide Area Networks (WANs), such as X.25, frame relay and leased + Wide Area Networks (WANs), such as X.25, Frame Relay and leased lines, are used to interconnect Local Area Networks (LANs) over vast distances with data transfer rates significantly higher than those achievable with commonly used asynchronous modem connections. + Usually, a quite expensive external device called a `WAN router' is - needed to connect to a WAN. + needed to connect to a WAN. As an alternative, a relatively + inexpensive WAN interface card can allow your Linux box to directly + connect to a WAN. - As an alternative, a relatively inexpensive WAN interface card can - allow your Linux box to directly connect to a WAN. If you have one - of those cards and wish to use it under Linux, say Y here and also - to the WAN driver for your card, below. + If you have one of those cards and wish to use it under Linux, + say Y here and also to the WAN driver for your card. If unsure, say N. @@ -27,32 +28,34 @@ tristate "Comtrol Hostess SV-11 support" depends on WAN && ISA && m help - This is a network card for low speed synchronous serial links, at - up to 256Kbps. It supports both PPP and Cisco HDLC. + Driver for Comtrol Hostess SV-11 network card which + operates on low speed synchronous serial links at up to + 256Kbps, supporting PPP and Cisco HDLC. - At this point, the driver can only be compiled as a module. + The driver will be compiled as a module: the + module will be called hostess_sv11. # The COSA/SRP driver has not been tested as non-modular yet. config COSA tristate "COSA/SRP sync serial boards support" depends on WAN && ISA && m ---help--- - This is a driver for COSA and SRP synchronous serial boards. These - boards allow to connect synchronous serial devices (for example + Driver for COSA and SRP synchronous serial boards. + + These boards allow to connect synchronous serial devices (for example base-band modems, or any other device with the X.21, V.24, V.35 or V.36 interface) to your Linux box. The cards can work as the character device, synchronous PPP network device, or the Cisco HDLC network device. - To actually use the COSA or SRP board, you will need user-space - utilities for downloading the firmware to the cards and to set them - up. Look at the for more - information about the cards (including the pointer to the user-space - utilities). You can also read the comment at the top of the - for details about the cards and the driver - itself. + You will need user-space utilities COSA or SRP boards for downloading + the firmware to the cards and to set them up. Look at the + for more information. You can also + read the comment at the top of the for + details about the cards and the driver itself. - The driver will be compiled as a module: the module will be called cosa. + The driver will be compiled as a module: the + module will be called cosa. # # COMX drivers @@ -62,16 +65,16 @@ tristate "MultiGate (COMX) synchronous serial boards support" depends on WAN && (ISA || PCI) && BROKEN ---help--- - Say Y if you want to use any board from the MultiGate (COMX) family. - These boards are synchronous serial adapters for the PC, - manufactured by ITConsult-Pro Co, Hungary. - - Read for help on - configuring and using COMX interfaces. Further info on these cards - can be found at or . + Drivers for the PC synchronous serial adapters by + ITConsult-Pro Co, Hungary. - You must say Y to "/proc file system support" (CONFIG_PROC_FS) to - use this driver. + Read for help on configuring + and using COMX interfaces. Further info on these cards can be found + at or . + + Say Y if you want to use any board from the MultiGate (COMX) + family, you must also say Y to "/proc file system support" + (CONFIG_PROC_FS) in order to use these drivers. To compile this driver as a module, choose M here: the module will be called comx. @@ -80,12 +83,13 @@ tristate "Support for COMX/CMX/HiCOMX boards" depends on COMX help - Hardware driver for the 'CMX', 'COMX' and 'HiCOMX' boards from the - MultiGate family. Say Y if you have one of these. + Driver for the 'CMX', 'COMX' and 'HiCOMX' boards. You will need additional firmware to use these cards, which are downloadable from . + Say Y if you have a board like this. + To compile this driver as a module, choose M here: the module will be called comx-hw-comx. @@ -93,7 +97,8 @@ tristate "Support for LoCOMX board" depends on COMX help - Hardware driver for the 'LoCOMX' board from the MultiGate family. + Driver for the 'LoCOMX' board. + Say Y if you have a board like this. To compile this driver as a module, choose M here: the @@ -103,8 +108,7 @@ tristate "Support for MixCOM board" depends on COMX ---help--- - Hardware driver for the 'MixCOM' board from the MultiGate family. - Say Y if you have a board like this. + Driver for the 'MixCOM' board. If you want to use the watchdog device on this card, you should select it in the Watchdog Cards section of the Character Devices @@ -113,6 +117,8 @@ driver for the flash ROM of this card is available separately on . + Say Y if you have a board like this. + To compile this driver as a module, choose M here: the module will be called comx-hw-mixcom. @@ -120,58 +126,63 @@ tristate "Support for MUNICH based boards: SliceCOM, PCICOM (WelCOM)" depends on COMX ---help--- - Hardware driver for the 'SliceCOM' (channelized E1) and 'PciCOM' - boards (X21) from the MultiGate family. + Driver for the 'SliceCOM' (channelized E1) and 'PciCOM' (X21) boards. + + Read for help on + configuring and using SliceCOM interfaces. Further info on these + cards can be found at or . + + Say Y if you have a board like this. To compile this driver as a module, choose M here: the module will be called comx-hw-munich. - Read linux/Documentation/networking/slicecom.txt for help on - configuring and using SliceCOM interfaces. Further info on these cards - can be found at http://www.itc.hu or . - config COMX_PROTO_PPP tristate "Support for HDLC and syncPPP protocols on MultiGate boards" depends on COMX help - Cisco-HDLC and synchronous PPP protocol driver for all MultiGate - boards. Say Y if you want to use either protocol on your MultiGate - boards. + Cisco-HDLC and synchronous PPP protocol driver. - To compile this as a module, choose M here: the module will be called - comx-proto-ppp. + Say Y if you want to use either protocol. + + To compile this as a module, choose M here: the + module will be called comx-proto-ppp. config COMX_PROTO_LAPB tristate "Support for LAPB protocol on MultiGate boards" depends on WAN && (COMX!=n && LAPB=m && LAPB || LAPB=y && COMX) help - LAPB protocol driver for all MultiGate boards. Say Y if you - want to use this protocol on your MultiGate boards. + LAPB protocol driver. + + Say Y if you want to use this protocol. - To compile this as a module, choose M here: the module will be called - comx-proto-lapb. + To compile this as a module, choose M here: the + module will be called comx-proto-lapb. config COMX_PROTO_FR tristate "Support for Frame Relay on MultiGate boards" depends on COMX help - Frame Relay protocol driver for all MultiGate boards. Say Y if you - want to use this protocol on your MultiGate boards. + Frame Relay protocol driver. + + Say Y if you want to use this protocol. - To compile this as a module, choose M here: the module will be called - comx-proto-fr. + To compile this as a module, choose M here: the + module will be called comx-proto-fr. config DSCC4 tristate "Etinc PCISYNC serial board support" depends on WAN && PCI && m help - This is a driver for Etinc PCISYNC boards based on the Infineon - (ex. Siemens) DSCC4 chipset. It is supposed to work with the four - ports card. Take a look at - for further informations about the driver and his configuration. + Driver for Etinc PCISYNC boards based on the Infineon (ex. Siemens) + DSCC4 chipset. - To compile this driver as a module, choose M here: the module - will be called dscc4. + This is supposed to work with the four port card. Take a look at + for further information about the + driver. + + To compile this driver as a module, choose M here: the + module will be called dscc4. config DSCC4_PCISYNC bool "Etinc PCISYNC features" @@ -188,13 +199,12 @@ bool "Hard reset support" depends on DSCC4 help - Various DSCC4 bugs forbid any reliable software reset of the asic. + Various DSCC4 bugs forbid any reliable software reset of the ASIC. As a replacement, some vendors provide a way to assert the PCI #RST pin of DSCC4 through the GPIO port of the card. If you choose Y, the driver will make use of this feature before module removal - (i.e. rmmod). - The feature is known to be available on Commtech's cards. - Contact your manufacturer for details. + (i.e. rmmod). The feature is known to be available on Commtech's + cards. Contact your manufacturer for details. Say Y if your card supports this feature. @@ -205,27 +215,27 @@ tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards" depends on WAN && PCI ---help--- - This is a driver for the following Lan Media family of serial - boards. + Driver for the following Lan Media family of serial boards: - LMC 1000 board allows you to connect synchronous serial devices (for - example base-band modems, or any other device with the X.21, V.24, - V.35 or V.36 interface) to your Linux box. + - LMC 1000 board allows you to connect synchronous serial devices + (for example base-band modems, or any other device with the X.21, + V.24, V.35 or V.36 interface) to your Linux box. - LMC 1200 with on board DSU board allows you to connect your Linux + - LMC 1200 with on board DSU board allows you to connect your Linux box dirrectly to a T1 or E1 circuit. - LMC 5200 board provides a HSSI interface capable of running up to - 52 mbits per second. + - LMC 5200 board provides a HSSI interface capable of running up to + 52 Mbits per second. - LMC 5245 board connects directly to a T3 circuit saving the + - LMC 5245 board connects directly to a T3 circuit saving the additional external hardware. - To change setting such as syncPPP vs cisco HDLC or clock source you - will need lmcctl. It is available at . + To change setting such as syncPPP vs Cisco HDLC or clock source you + will need lmcctl. It is available at + (broken link). - To compile this driver as a module, choose M here: the module - will be called lmc. + To compile this driver as a module, choose M here: the + module will be called lmc. # There is no way to detect a Sealevel board. Force it modular config SEALEVEL_4021 @@ -234,93 +244,89 @@ help This is a driver for the Sealevel Systems ACB 56 serial I/O adapter. - This driver can only be compiled as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to do that, say M here. The module will be called - sealevel. + The driver will be compiled as a module: the + module will be called sealevel. config SYNCLINK_SYNCPPP tristate "SyncLink HDLC/SYNCPPP support" depends on WAN help Enables HDLC/SYNCPPP support for the SyncLink WAN driver. - Normally the SyncLink WAN driver works with the main PPP - driver (ppp.c) and pppd program. HDLC/SYNCPPP support allows use - of the Cisco HDLC/PPP driver (syncppp.c). - The SyncLink WAN driver (in character devices) must also be enabled. + + Normally the SyncLink WAN driver works with the main PPP driver + and pppd program. + HDLC/SYNCPPP support allows use of the Cisco HDLC/PPP driver + . The SyncLink WAN driver (in + character devices) must also be enabled. # Generic HDLC config HDLC tristate "Generic HDLC layer" depends on WAN help - Say Y to this option if your Linux box contains a WAN card supported - by this driver and you are planning to connect the box to a WAN - ( = Wide Area Network). You will need supporting software from - . + Say Y to this option if your Linux box contains a WAN (Wide Area + Network) card supported by this driver and you are planning to + connect the box to a WAN. + + You will need supporting software from . Generic HDLC driver currently supports raw HDLC, Cisco HDLC, Frame Relay, synchronous Point-to-Point Protocol (PPP) and X.25. - To compile this driver as a module, choose M here: the module - will be called hdlc. + To compile this driver as a module, choose M here: the + module will be called hdlc. - If unsure, say N here. + If unsure, say N. config HDLC_RAW bool "Raw HDLC support" depends on HDLC help - Say Y to this option if you want generic HDLC driver to support - raw HDLC over WAN (Wide Area Network) connections. + Generic HDLC driver supporting raw HDLC over WAN connections. - If unsure, say N here. + If unsure, say N. config HDLC_RAW_ETH bool "Raw HDLC Ethernet device support" depends on HDLC help - Say Y to this option if you want generic HDLC driver to support - raw HDLC Ethernet device emulation over WAN (Wide Area Network) - connections. + Generic HDLC driver supporting raw HDLC Ethernet device emulation + over WAN connections. + You will need it for Ethernet over HDLC bridges. - If unsure, say N here. + If unsure, say N. config HDLC_CISCO bool "Cisco HDLC support" depends on HDLC help - Say Y to this option if you want generic HDLC driver to support - Cisco HDLC over WAN (Wide Area Network) connections. + Generic HDLC driver supporting Cisco HDLC over WAN connections. - If unsure, say N here. + If unsure, say N. config HDLC_FR bool "Frame Relay support" depends on HDLC help - Say Y to this option if you want generic HDLC driver to support - Frame-Relay protocol over WAN (Wide Area Network) connections. + Generic HDLC driver supporting Frame Relay over WAN connections. - If unsure, say N here. + If unsure, say N. config HDLC_PPP bool "Synchronous Point-to-Point Protocol (PPP) support" depends on HDLC help - Say Y to this option if you want generic HDLC driver to support - PPP over WAN (Wide Area Network) connections. + Generic HDLC driver supporting PPP over WAN connections. - If unsure, say N here. + If unsure, say N. config HDLC_X25 bool "X.25 protocol support" depends on HDLC && (LAPB=m && HDLC=m || LAPB=y) help - Say Y to this option if you want generic HDLC driver to support - X.25 protocol over WAN (Wide Area Network) connections. + Generic HDLC driver supporting X.25 over WAN connections. - If unsure, say N here. + If unsure, say N. comment "X.25/LAPB support is disabled" depends on WAN && HDLC && (LAPB!=m || HDLC!=m) && LAPB!=y @@ -329,63 +335,61 @@ tristate "Goramo PCI200SYN support" depends on HDLC && PCI help - This driver is for PCI200SYN cards made by Goramo sp. j. + Driver for PCI200SYN cards by Goramo sp. j. + If you have such a card, say Y here and see - + . - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read . The module - will be called pci200syn. + To compile this as a module, choose M here: the + module will be called pci200syn. - If unsure, say N here. + If unsure, say N. config WANXL tristate "SBE Inc. wanXL support" depends on HDLC && PCI help - This driver is for wanXL PCI cards made by SBE Inc. If you have - such a card, say Y here and see . + Driver for wanXL PCI cards by SBE Inc. + + If you have such a card, say Y here and see + . - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read . The module - will be called wanxl. + To compile this as a module, choose M here: the + module will be called wanxl. - If unsure, say N here. + If unsure, say N. config WANXL_BUILD_FIRMWARE bool "rebuild wanXL firmware" depends on WANXL help - This option allows you to rebuild firmware run by the QUICC - processor. It requires as68k, ld68k and hexdump programs. - You should never need this option. + Allows you to rebuild firmware run by the QUICC processor. + It requires as68k, ld68k and hexdump programs. - If unsure, say N here. + You should never need this option, say N. config PC300 tristate "Cyclades-PC300 support (RS-232/V.35, X.21, T1/E1 boards)" depends on HDLC && PCI ---help--- - This is a driver for the Cyclades-PC300 synchronous communication - boards. These boards provide synchronous serial interfaces to your + Driver for the Cyclades-PC300 synchronous communication boards. + + These boards provide synchronous serial interfaces to your Linux box (interfaces currently available are RS-232/V.35, X.21 and T1/E1). If you wish to support Multilink PPP, please select the - option below this one and read the file README.mlppp provided by PC300 + option later and read the file README.mlppp provided by PC300 package. - To compile this as a module, choose M here: the module will be - called pc300. + To compile this as a module, choose M here: the module + will be called pc300. - If you haven't heard about it, it's safe to say N. + If unsure, say N. config PC300_MLPPP bool "Cyclades-PC300 MLPPP support" depends on PC300 && PPP_MULTILINK && PPP_SYNC_TTY && HDLC_PPP help - Say 'Y' to this option if you are planning to use Multilink PPP over the - PC300 synchronous communication boards. + Multilink PPP over the PC300 synchronous communication boards. comment "Cyclades-PC300 MLPPP support is disabled." depends on WAN && HDLC && PC300 && (PPP=n || !PPP_MULTILINK || PPP_SYNC_TTY=n || !HDLC_PPP) @@ -397,129 +401,141 @@ tristate "SDL RISCom/N2 support" depends on HDLC && ISA help - This driver is for RISCom/N2 single or dual channel ISA cards - made by SDL Communications Inc. If you have such a card, - say Y here and see . + Driver for RISCom/N2 single or dual channel ISA cards by + SDL Communications Inc. + + If you have such a card, say Y here and see + . Note that N2csu and N2dds cards are not supported by this driver. To compile this driver as a module, choose M here: the module will be called n2. - If unsure, say N here. + If unsure, say N. config C101 tristate "Moxa C101 support" depends on HDLC && ISA help - This driver is for C101 SuperSync ISA cards made by Moxa - Technologies Co., Ltd. If you have such a card, - say Y here and see + Driver for C101 SuperSync ISA cards by Moxa Technologies Co., Ltd. - To compile this driver as a module, choose M here: the module - will be called c101. + If you have such a card, say Y here and see + - If unsure, say N here. + To compile this driver as a module, choose M here: the + module will be called c101. + + If unsure, say N. config FARSYNC tristate "FarSync T-Series support" depends on HDLC && PCI ---help--- - This driver supports the FarSync T-Series X.21 (and V.35/V.24) cards - from FarSite Communications Ltd. + Support for the FarSync T-Series X.21 (and V.35/V.24) cards by + FarSite Communications Ltd. + Synchronous communication is supported on all ports at speeds up to 8Mb/s (128K on V.24) using synchronous PPP, Cisco HDLC, raw HDLC, Frame Relay or X.25/LAPB. - To compile this driver as a module, choose M here: the module will be - called farsync. If you want the module to be automatically loaded - when the interface is referenced then you should add - "alias hdlcX farsync" to /etc/modules.conf for each interface, where - X is 0, 1, 2, ... + If you want the module to be automatically loaded when the interface + is referenced then you should add "alias hdlcX farsync" to + /etc/modprobe.conf for each interface, where X is 0, 1, 2, ..., or + simply use "alias hdlc* farsync" to indicate all of them. + + To compile this driver as a module, choose M here: the + module will be called farsync. config DLCI - tristate "Frame relay DLCI support" + tristate "Frame Relay DLCI support" depends on WAN ---help--- - This is support for the frame relay protocol; frame relay is a fast - low-cost way to connect to a remote Internet access provider or to - form a private wide area network. The one physical line from your - box to the local "switch" (i.e. the entry point to the frame relay - network, usually at the phone company) can carry several logical - point-to-point connections to other computers connected to the frame - relay network. For a general explanation of the protocol, check out - on the WWW. To use frame relay, you need - supporting hardware (called FRAD) and certain programs from the - net-tools package as explained in + Support for the Frame Relay protocol. + + Frame Relay is a fast low-cost way to connect to a remote Internet + access provider or to form a private wide area network. The one + physical line from your box to the local "switch" (i.e. the entry + point to the Frame Relay network, usually at the phone company) can + carry several logical point-to-point connections to other computers + connected to the Frame Relay network. For a general explanation of + the protocol, check out . + + To use frame relay, you need supporting hardware (called FRAD) and + certain programs from the net-tools package as explained in . - To compile this driver as a module, choose M here: the module will be - called dlci. + To compile this driver as a module, choose M here: the + module will be called dlci. config DLCI_COUNT int "Max open DLCI" depends on DLCI default "24" help - This is the maximal number of logical point-to-point frame relay - connections (the identifiers of which are called DCLIs) that - the driver can handle. The default is probably fine. + Maximal number of logical point-to-point frame relay connections + (the identifiers of which are called DCLIs) that the driver can + handle. + + The default is probably fine. config DLCI_MAX int "Max DLCI per device" depends on DLCI default "8" help - You can specify here how many logical point-to-point frame relay - connections (the identifiers of which are called DCLIs) should be - handled by each of your hardware frame relay access devices. Go with - the default. + How many logical point-to-point frame relay connections (the + identifiers of which are called DCLIs) should be handled by each + of your hardware frame relay access devices. + + Go with the default. config SDLA tristate "SDLA (Sangoma S502/S508) support" depends on DLCI && ISA help - Say Y here if you need a driver for the Sangoma S502A, S502E, and - S508 Frame Relay Access Devices. These are multi-protocol cards, but - only frame relay is supported by the driver at this time. Please - read . + Driver for the Sangoma S502A, S502E, and S508 Frame Relay Access + Devices. + + These are multi-protocol cards, but only Frame Relay is supported + by the driver at this time. Please read + . - To compile this driver as a module, choose M here: the module will be - called sdla. + To compile this driver as a module, choose M here: the + module will be called sdla. # Wan router core. config WAN_ROUTER_DRIVERS bool "WAN router drivers" depends on WAN && WAN_ROUTER ---help--- - If you have a WAN interface card and you want your Linux box to act - as a WAN router, thereby connecting you Local Area Network to the - outside world over the WAN connection, say Y here and then to the - driver for your card below. In addition, you need to say Y to "Wan - Router". + Connect LAN to WAN via Linux box. + Select driver your card and remember to say Y to "Wan Router." You will need the wan-tools package which is available from - . Read - for more information. + . For more information read: + . Note that the answer to this question won't directly affect the kernel: saying N will just cause the configurator to skip all - the questions about WAN router drivers. If unsure, say N. + the questions about WAN router drivers. + + If unsure, say N. config VENDOR_SANGOMA tristate "Sangoma WANPIPE(tm) multiprotocol cards" depends on WAN_ROUTER_DRIVERS && WAN_ROUTER && (PCI || ISA) && BROKEN ---help--- - WANPIPE from Sangoma Technologies Inc. () + Driver for S514-PCI/ISA Synchronous Data Link Adapters (SDLA). + + WANPIPE from Sangoma Technologies Inc. is a family of intelligent multiprotocol WAN adapters with data - transfer rates up to 4Mbps. They are also known as Synchronous - Data Link Adapters (SDLA) and are designated as S514-PCI or - S508-ISA. These cards support + transfer rates up to 4Mbps. Cards support: - X.25, Frame Relay, PPP, Cisco HDLC protocols. - - API support for protocols like HDLC (LAPB), - HDLC Streaming, X.25, Frame Relay and BiSync. + - API for protocols like HDLC (LAPB), HDLC Streaming, X.25, + Frame Relay and BiSync. - Ethernet Bridging over Frame Relay protocol. @@ -527,88 +543,89 @@ - Async PPP (Modem Dialup) - If you have one or more of these cards, say M to this option; you - may then also want to read the file - . The next questions - will ask you about the protocols you want the driver to support. + The next questions will ask you about the protocols you want + the driver to support. + + If you have one or more of these cards, say M to this option; + and read . - To compile this driver as a module, choose M here: the module will - be called wanpipe. + To compile this driver as a module, choose M here: the + module will be called wanpipe. config WANPIPE_CHDLC bool "WANPIPE Cisco HDLC support" depends on VENDOR_SANGOMA ---help--- - Say Y to this option if you are planning to connect a WANPIPE card - to a leased line using the Cisco HDLC protocol. This now supports - Dual Port Cisco HDLC on the S514-PCI/S508-ISA cards. - This support also allows user to build applications using the - HDLC streaming API. - - CHDLC Streaming driver also supports MULTILINK PPP - support that can bind multiple WANPIPE T1 cards into - a single logical channel. - - If you say N, the Cisco HDLC support and - HDLC streaming API and MULTILINK PPP will not be - included in the driver. + Connect a WANPIPE card to a leased line using the Cisco HDLC. + + - Supports Dual Port Cisco HDLC on the S514-PCI/S508-ISA cards + which allows user to build applications using the HDLC streaming API. + + - CHDLC Streaming MULTILINK PPP that can bind multiple WANPIPE T1 + cards into a single logical channel. + + Say Y and the Cisco HDLC support, HDLC streaming API and + MULTILINK PPP will be included in the driver. config WANPIPE_FR bool "WANPIPE Frame Relay support" depends on VENDOR_SANGOMA help - Say Y to this option if you are planning to connect a WANPIPE card - to a frame relay network, or use frame relay API to develope - custom applications over the Frame Relay protocol. - This feature also contains the Ethernet Bridging over Frame Relay, - where a WANPIPE frame relay link can be directly connected to the - Linux kernel bridge. If you say N, the frame relay support will - not be included in the driver. The Frame Relay option is - supported on S514-PCI and S508-ISA cards. + Connect a WANPIPE card to a Frame Relay network, or use Frame Felay + API to develope custom applications. + + Contains the Ethernet Bridging over Frame Relay feature, where + a WANPIPE frame relay link can be directly connected to the Linux + kernel bridge. The Frame Relay option is supported on S514-PCI + and S508-ISA cards. + + Say Y and the Frame Relay support will be included in the driver. config WANPIPE_X25 bool "WANPIPE X.25 support" depends on VENDOR_SANGOMA help - Say Y to this option if you are planning to connect a WANPIPE card - to an X.25 network. Note, this feature also includes the X.25 API - support used to develope custom applications over the X.25 protocol. - If you say N, the X.25 support will not be included in the driver. - The X.25 option is supported on S514-PCI and S508-ISA cards. + Connect a WANPIPE card to an X.25 network. + + Includes the X.25 API support for custom applications over the + X.25 protocol. The X.25 option is supported on S514-PCI and + S508-ISA cards. + + Say Y and the X.25 support will be included in the driver. config WANPIPE_PPP bool "WANPIPE PPP support" depends on VENDOR_SANGOMA help - Say Y to this option if you are planning to connect a WANPIPE card - to a leased line using Point-to-Point protocol (PPP). If you say N, - the PPP support will not be included in the driver. The PPP option - is supported on S514-PCI/S508-ISA cards. + Connect a WANPIPE card to a leased line using Point-to-Point + Protocol (PPP). + + The PPP option is supported on S514-PCI/S508-ISA cards. + + Say Y and the PPP support will be included in the driver. config WANPIPE_MULTPPP bool "WANPIPE Multi-Port PPP support" depends on VENDOR_SANGOMA help - Say Y to this option if you are planning to connect a WANPIPE card - to a leased line using Point-to-Point protocol (PPP). Note, the - MultiPort PPP uses the Linux Kernel SyncPPP protocol over the - Sangoma HDLC Streaming adapter. In this case each Sangoma adapter - port can support an independent PPP connection. For example, a - single Quad-Port PCI adapter can support up to four independent - PPP links. If you say N,the PPP support will not be included in the - driver. The PPP option is supported on S514-PCI/S508-ISA cards. + Connect a WANPIPE card to a leased line using Point-to-Point + Protocol (PPP). + + Uses in-kernel SyncPPP protocol over the Sangoma HDLC Streaming + adapter. In this case each Sangoma adapter port can support an + independent PPP connection. For example, a single Quad-Port PCI + adapter can support up to four independent PPP links. The PPP + option is supported on S514-PCI/S508-ISA cards. + + Say Y and the Multi-Port PPP support will be included in the driver. config CYCLADES_SYNC tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)" depends on WAN_ROUTER_DRIVERS && (PCI || ISA) ---help--- - Cyclom 2X from Cyclades Corporation ( and - ) is an intelligent multiprotocol WAN - adapter with data transfer rates up to 512 Kbps. These cards support - the X.25 and SNA related protocols. If you have one or more of these - cards, say Y to this option. The next questions will ask you about - the protocols you want the driver to support (for now only X.25 is - supported). + Cyclom 2X from Cyclades Corporation is an + intelligent multiprotocol WAN adapter with data transfer rates up to + 512 Kbps. These cards support the X.25 and SNA related protocols. While no documentation is available at this time please grab the wanconfig tarball in @@ -618,75 +635,85 @@ ). Feel free to contact me or the cycsyn-devel mailing list at - acme@conectiva.com.br and cycsyn-devel@bazar.conectiva.com.br for - additional details, I hope to have documentation available as soon - as possible. (Cyclades Brazil is writing the Documentation). + and for + additional details, I hope to have documentation available as soon as + possible. (Cyclades Brazil is writing the Documentation). - To compile this driver as a module, choose M here: the module will be - called cyclomx. + The next questions will ask you about the protocols you want the + driver to support (for now only X.25 is supported). + + If you have one or more of these cards, say Y to this option. + + To compile this driver as a module, choose M here: the + module will be called cyclomx. config CYCLOMX_X25 bool "Cyclom 2X X.25 support (EXPERIMENTAL)" depends on CYCLADES_SYNC help - Say Y to this option if you are planning to connect a Cyclom 2X card - to an X.25 network. + Connect a Cyclom 2X card to an X.25 network. - If you say N, the X.25 support will not be included in the driver - (saves about 11 KB of kernel memory). + Enabling X.25 support will enlarge your kernel by about 11 kB. # X.25 network drivers config LAPBETHER tristate "LAPB over Ethernet driver (EXPERIMENTAL)" depends on WAN && LAPB && X25 ---help--- - This is a driver for a pseudo device (typically called /dev/lapb0) - which allows you to open an LAPB point-to-point connection to some - other computer on your Ethernet network. In order to do this, you - need to say Y or M to the driver for your Ethernet card as well as - to "LAPB Data Link Driver". + Driver for a pseudo device (typically called /dev/lapb0) which allows + you to open an LAPB point-to-point connection to some other computer + on your Ethernet network. - To compile this driver as a module, choose M here: the module - will be called lapbether. If unsure, say N. + In order to do this, you need to say Y or M to the driver for your + Ethernet card as well as to "LAPB Data Link Driver". + + To compile this driver as a module, choose M here: the + module will be called lapbether. + + If unsure, say N. config X25_ASY tristate "X.25 async driver (EXPERIMENTAL)" depends on WAN && LAPB && X25 ---help--- - This is a driver for sending and receiving X.25 frames over regular - asynchronous serial lines such as telephone lines equipped with - ordinary modems. Experts should note that this driver doesn't - currently comply with the asynchronous HDLS framing protocols in - CCITT recommendation X.25. + Send and receive X.25 frames over regular asynchronous serial + lines such as telephone lines equipped with ordinary modems. - To compile this driver as a module, choose M here: the module - will be called x25_asy. If unsure, say N. + Experts should note that this driver doesn't currently comply with + the asynchronous HDLS framing protocols in CCITT recommendation X.25. + + To compile this driver as a module, choose M here: the + module will be called x25_asy. + + If unsure, say N. config SBNI tristate "Granch SBNI12 Leased Line adapter support" depends on WAN && X86 ---help--- - This is a driver for ISA SBNI12-xx cards which are low cost - alternatives to leased line modems. Say Y if you want to insert - the driver into the kernel or say M to compile it as a module (the - module will be called sbni). + Driver for ISA SBNI12-xx cards which are low cost alternatives to + leased line modems. You can find more information and last versions of drivers and utilities at . If you have any question you - can send email to sbni@granch.ru. + can send email to . + + To compile this driver as a module, choose M here: the + module will be called sbni. - Say N if unsure. + If unsure, say N. config SBNI_MULTILINE bool "Multiple line feature support" depends on SBNI help Schedule traffic for some parallel lines, via SBNI12 adapters. + If you have two computers connected with two parallel lines it's possible to increase transfer rate nearly twice. You should have a program named 'sbniconfig' to configure adapters. - Say N if unsure. + If unsure, say N. endmenu diff -Nru a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c --- a/drivers/net/wan/c101.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/wan/c101.c Thu Feb 19 23:44:27 2004 @@ -54,7 +54,7 @@ typedef struct card_s { - hdlc_device hdlc; /* HDLC device struct - must be first */ + struct net_device *dev; spinlock_t lock; /* TX lock */ u8 *win0base; /* ISA window base address */ u32 phy_winbase; /* ISA physical base address */ @@ -121,6 +121,7 @@ static void sca_msci_intr(port_t *port) { + struct net_device *dev = port_to_dev(port); card_t* card = port_to_card(port); u8 stat = sca_in(MSCI1_OFFSET + ST1, card); /* read MSCI ST1 status */ @@ -128,8 +129,9 @@ sca_out(stat & ST1_UDRN, MSCI0_OFFSET + ST1, card); if (stat & ST1_UDRN) { - port->hdlc.stats.tx_errors++; /* TX Underrun error detected */ - port->hdlc.stats.tx_fifo_errors++; + struct net_device_stats *stats = hdlc_stats(dev); + stats->tx_errors++; /* TX Underrun error detected */ + stats->tx_fifo_errors++; } /* Reset MSCI CDCD status bit - uses ch#2 DCD input */ @@ -137,7 +139,7 @@ if (stat & ST1_CDCD) hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, card) & ST3_DCD), - &port->hdlc); + dev); } @@ -177,22 +179,21 @@ static int c101_open(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); int result; - result = hdlc_open(hdlc); + result = hdlc_open(dev); if (result) return result; writeb(1, port->win0base + C101_DTR); sca_out(0, MSCI1_OFFSET + CTL, port); /* RTS uses ch#2 output */ - sca_open(hdlc); + sca_open(dev); /* DCD is connected to port 2 !@#$%^& - disable MSCI0 CDCD interrupt */ sca_out(IE1_UDRN, MSCI0_OFFSET + IE1, port); sca_out(IE0_TXINT, MSCI0_OFFSET + IE0, port); - hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, port) & ST3_DCD), hdlc); + hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, port) & ST3_DCD), dev); printk(KERN_DEBUG "0x%X\n", sca_in(MSCI1_OFFSET + ST3, port)); /* enable MSCI1 CDCD interrupt */ @@ -206,13 +207,12 @@ static int c101_close(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); - sca_close(hdlc); + sca_close(dev); writeb(0, port->win0base + C101_DTR); sca_out(CTL_NORTS, MSCI1_OFFSET + CTL, port); - hdlc_close(hdlc); + hdlc_close(dev); return 0; } @@ -221,12 +221,11 @@ { const size_t size = sizeof(sync_serial_settings); sync_serial_settings new_line, *line = ifr->ifr_settings.ifs_ifsu.sync; - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); #ifdef DEBUG_RINGS if (cmd == SIOCDEVPRIVATE) { - sca_dump_rings(hdlc); + sca_dump_rings(dev); printk(KERN_DEBUG "MSCI1: ST: %02x %02x %02x %02x\n", sca_in(MSCI1_OFFSET + ST0, port), sca_in(MSCI1_OFFSET + ST1, port), @@ -288,6 +287,8 @@ release_mem_region(card->phy_winbase, C101_MAPPED_RAM_SIZE); } + free_netdev(card->dev); + kfree(card); } @@ -296,6 +297,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) { struct net_device *dev; + hdlc_device *hdlc; card_t *card; int result; @@ -316,6 +318,13 @@ } memset(card, 0, sizeof(card_t)); + card->dev = alloc_hdlcdev(card); + if (!card->dev) { + printk(KERN_ERR "c101: unable to allocate memory\n"); + kfree(card); + return -ENOBUFS; + } + if (request_irq(irq, sca_intr, 0, devname, card)) { printk(KERN_ERR "c101: could not allocate IRQ\n"); c101_destroy_card(card); @@ -347,7 +356,8 @@ sca_init(card, 0); - dev = hdlc_to_dev(&card->hdlc); + dev = port_to_dev(card); + hdlc = dev_to_hdlc(dev); spin_lock_init(&card->lock); SET_MODULE_OWNER(dev); @@ -358,24 +368,25 @@ dev->do_ioctl = c101_ioctl; dev->open = c101_open; dev->stop = c101_close; - card->hdlc.attach = sca_attach; - card->hdlc.xmit = sca_xmit; + hdlc->attach = sca_attach; + hdlc->xmit = sca_xmit; card->settings.clock_type = CLOCK_EXT; - result = register_hdlc_device(&card->hdlc); + result = register_hdlc_device(dev); if (result) { printk(KERN_WARNING "c101: unable to register hdlc device\n"); c101_destroy_card(card); return result; } + /* XXX: are we OK with having that done when card is already up? */ + sca_init_sync_port(card); /* Set up C101 memory */ - hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, card) & ST3_DCD), - &card->hdlc); + hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, card) & ST3_DCD), dev); printk(KERN_INFO "%s: Moxa C101 on IRQ%u," " using %u TX + %u RX packets rings\n", - hdlc_to_name(&card->hdlc), card->irq, + dev->name, card->irq, card->tx_ring_buffers, card->rx_ring_buffers); *new_card = card; @@ -424,7 +435,7 @@ while (card) { card_t *ptr = card; card = card->next_card; - unregister_hdlc_device(&ptr->hdlc); + unregister_hdlc_device(port_to_dev(ptr)); c101_destroy_card(ptr); } } diff -Nru a/drivers/net/wan/comx-hw-munich.c b/drivers/net/wan/comx-hw-munich.c --- a/drivers/net/wan/comx-hw-munich.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/comx-hw-munich.c Thu Feb 19 23:44:23 2004 @@ -2058,30 +2058,30 @@ { frs0 = readb(lbi + FRS0); fmr2 = readb(lbi + FMR2); - len += snprintf(page + len, PAGE_SIZE - len, "Controller status:\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "Controller status:\n"); if (frs0 == 0) - len += snprintf(page + len, PAGE_SIZE - len, "\tNo alarms\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "\tNo alarms\n"); else { if (frs0 & FRS0_LOS) - len += snprintf(page + len, PAGE_SIZE - len, "\tLoss Of Signal\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "\tLoss Of Signal\n"); else { if (frs0 & FRS0_AIS) - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "\tAlarm Indication Signal\n"); else { if (frs0 & FRS0_AUXP) - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "\tAuxiliary Pattern Indication\n"); if (frs0 & FRS0_LFA) - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "\tLoss of Frame Alignment\n"); else { if (frs0 & FRS0_RRA) - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "\tReceive Remote Alarm\n"); /* You can't set this framing with the /proc interface, but it */ @@ -2089,11 +2089,11 @@ if ((board->framing == SLICECOM_FRAMING_CRC4) && (frs0 & FRS0_LMFA)) - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "\tLoss of CRC4 Multiframe Alignment\n"); if (((fmr2 & 0xc0) == 0xc0) && (frs0 & FRS0_NMF)) - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "\tNo CRC4 Multiframe alignment Found after 400 msec\n"); } } @@ -2102,27 +2102,27 @@ frs1 = readb(lbi + FRS1); if (FRS1_XLS & frs1) - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "\tTransmit Line Short\n"); /* debug Rx ring: DEL: - vagy meghagyni, de akkor legyen kicsit altalanosabb */ } - len += snprintf(page + len, PAGE_SIZE - len, "Rx ring:\n"); - len += snprintf(page + len, PAGE_SIZE - len, "\trafutott: %d\n", hw->rafutott); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "Rx ring:\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "\trafutott: %d\n", hw->rafutott); + len += scnprintf(page + len, PAGE_SIZE - len, "\tlastcheck: %ld, jiffies: %ld\n", board->lastcheck, jiffies); - len += snprintf(page + len, PAGE_SIZE - len, "\tbase: %08x\n", + len += scnprintf(page + len, PAGE_SIZE - len, "\tbase: %08x\n", (u32) virt_to_phys(&hw->rx_desc[0])); - len += snprintf(page + len, PAGE_SIZE - len, "\trx_desc_ptr: %d\n", + len += scnprintf(page + len, PAGE_SIZE - len, "\trx_desc_ptr: %d\n", hw->rx_desc_ptr); - len += snprintf(page + len, PAGE_SIZE - len, "\trx_desc_ptr: %08x\n", + len += scnprintf(page + len, PAGE_SIZE - len, "\trx_desc_ptr: %08x\n", (u32) virt_to_phys(&hw->rx_desc[hw->rx_desc_ptr])); - len += snprintf(page + len, PAGE_SIZE - len, "\thw_curr_ptr: %08x\n", + len += scnprintf(page + len, PAGE_SIZE - len, "\thw_curr_ptr: %08x\n", board->ccb->current_rx_desc[hw->channel]); for (i = 0; i < RX_DESC_MAX; i++) - len += snprintf(page + len, PAGE_SIZE - len, "\t%08x %08x %08x %08x\n", + len += scnprintf(page + len, PAGE_SIZE - len, "\t%08x %08x %08x %08x\n", *((u32 *) & hw->rx_desc[i] + 0), *((u32 *) & hw->rx_desc[i] + 1), *((u32 *) & hw->rx_desc[i] + 2), @@ -2130,7 +2130,7 @@ if (!board->isx21) { - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "Interfaces using this board: (channel-group, interface, timeslots)\n"); for (i = 0; i < 32; i++) { @@ -2141,26 +2141,26 @@ ((struct slicecom_privdata *)((struct comx_channel *)devp-> priv)->HW_privdata)-> timeslots; - len += snprintf(page + len, PAGE_SIZE - len, "\t%2d %s: ", i, + len += scnprintf(page + len, PAGE_SIZE - len, "\t%2d %s: ", i, devp->name); for (j = 0; j < 32; j++) if ((1 << j) & timeslots) - len += snprintf(page + len, PAGE_SIZE - len, "%d ", j); - len += snprintf(page + len, PAGE_SIZE - len, "\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "%d ", j); + len += scnprintf(page + len, PAGE_SIZE - len, "\n"); } } } - len += snprintf(page + len, PAGE_SIZE - len, "Interrupt work histogram:\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "Interrupt work histogram:\n"); for (i = 0; i < MAX_WORK; i++) - len += snprintf(page + len, PAGE_SIZE - len, "hist[%2d]: %8u%c", i, + len += scnprintf(page + len, PAGE_SIZE - len, "hist[%2d]: %8u%c", i, board->histogram[i], (i && ((i + 1) % 4 == 0 || i == MAX_WORK - 1)) ? '\n' : ' '); - len += snprintf(page + len, PAGE_SIZE - len, "Tx ring histogram:\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "Tx ring histogram:\n"); for (i = 0; i < TX_DESC_MAX; i++) - len += snprintf(page + len, PAGE_SIZE - len, "hist[%2d]: %8u%c", i, + len += scnprintf(page + len, PAGE_SIZE - len, "hist[%2d]: %8u%c", i, hw->tx_ring_hist[i], (i && ((i + 1) % 4 == 0 || i == @@ -2196,72 +2196,72 @@ sump[j] += p[j]; } - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "Data in current interval (%d seconds elapsed):\n", board->elapsed_seconds); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Line Code Violations, %d Path Code Violations, %d E-Bit Errors\n", curr_int->line_code_violations, curr_int->path_code_violations, curr_int->e_bit_errors); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Slip Secs, %d Fr Loss Secs, %d Line Err Secs, %d Degraded Mins\n", curr_int->slip_secs, curr_int->fr_loss_secs, curr_int->line_err_secs, curr_int->degraded_mins); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Errored Secs, %d Bursty Err Secs, %d Severely Err Secs, %d Unavail Secs\n", curr_int->errored_secs, curr_int->bursty_err_secs, curr_int->severely_err_secs, curr_int->unavail_secs); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "Data in Interval 1 (15 minutes):\n"); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Line Code Violations, %d Path Code Violations, %d E-Bit Errors\n", prev_int->line_code_violations, prev_int->path_code_violations, prev_int->e_bit_errors); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Slip Secs, %d Fr Loss Secs, %d Line Err Secs, %d Degraded Mins\n", prev_int->slip_secs, prev_int->fr_loss_secs, prev_int->line_err_secs, prev_int->degraded_mins); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Errored Secs, %d Bursty Err Secs, %d Severely Err Secs, %d Unavail Secs\n", prev_int->errored_secs, prev_int->bursty_err_secs, prev_int->severely_err_secs, prev_int->unavail_secs); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "Data in last 4 intervals (1 hour):\n"); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Line Code Violations, %d Path Code Violations, %d E-Bit Errors\n", last4.line_code_violations, last4.path_code_violations, last4.e_bit_errors); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Slip Secs, %d Fr Loss Secs, %d Line Err Secs, %d Degraded Mins\n", last4.slip_secs, last4.fr_loss_secs, last4.line_err_secs, last4.degraded_mins); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Errored Secs, %d Bursty Err Secs, %d Severely Err Secs, %d Unavail Secs\n", last4.errored_secs, last4.bursty_err_secs, last4.severely_err_secs, last4.unavail_secs); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "Data in last 96 intervals (24 hours):\n"); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Line Code Violations, %d Path Code Violations, %d E-Bit Errors\n", last96.line_code_violations, last96.path_code_violations, last96.e_bit_errors); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Slip Secs, %d Fr Loss Secs, %d Line Err Secs, %d Degraded Mins\n", last96.slip_secs, last96.fr_loss_secs, last96.line_err_secs, last96.degraded_mins); - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, " %d Errored Secs, %d Bursty Err Secs, %d Severely Err Secs, %d Unavail Secs\n", last96.errored_secs, last96.bursty_err_secs, last96.severely_err_secs, last96.unavail_secs); } -// len +=snprintf( page + len, PAGE_SIZE - len, "Special events:\n" ); -// len +=snprintf( page + len, PAGE_SIZE - len, "\tstat_pri/missed: %u / %u\n", board->stat_pri_races, board->stat_pri_races_missed ); -// len +=snprintf( page + len, PAGE_SIZE - len, "\tstat_pti/missed: %u / %u\n", board->stat_pti_races, board->stat_pti_races_missed ); +// len +=scnprintf( page + len, PAGE_SIZE - len, "Special events:\n" ); +// len +=scnprintf( page + len, PAGE_SIZE - len, "\tstat_pri/missed: %u / %u\n", board->stat_pri_races, board->stat_pri_races_missed ); +// len +=scnprintf( page + len, PAGE_SIZE - len, "\tstat_pti/missed: %u / %u\n", board->stat_pti_races, board->stat_pti_races_missed ); return len; } @@ -2305,8 +2305,8 @@ { for (i = 0; i < 32; i++) if ((1 << i) & timeslots) - len += snprintf(page + len, PAGE_SIZE - len, "%d ", i); - len += snprintf(page + len, PAGE_SIZE - len, "\n"); + len += scnprintf(page + len, PAGE_SIZE - len, "%d ", i); + len += scnprintf(page + len, PAGE_SIZE - len, "\n"); } else if (!strcmp(file->name, FILENAME_FRAMING)) { @@ -2314,7 +2314,7 @@ while (slicecom_framings[i].value && slicecom_framings[i].value != board->framing) i++; - len += snprintf(page + len, PAGE_SIZE - len, "%s\n", + len += scnprintf(page + len, PAGE_SIZE - len, "%s\n", slicecom_framings[i].name); } else if (!strcmp(file->name, FILENAME_LINECODE)) @@ -2323,7 +2323,7 @@ while (slicecom_linecodes[i].value && slicecom_linecodes[i].value != board->linecode) i++; - len += snprintf(page + len, PAGE_SIZE - len, "%s\n", + len += scnprintf(page + len, PAGE_SIZE - len, "%s\n", slicecom_linecodes[i].name); } else if (!strcmp(file->name, FILENAME_CLOCK_SOURCE)) @@ -2333,7 +2333,7 @@ slicecom_clock_sources[i].value != board->clock_source) i++; len += - snprintf(page + len, PAGE_SIZE - len, "%s\n", + scnprintf(page + len, PAGE_SIZE - len, "%s\n", slicecom_clock_sources[i].name); } else if (!strcmp(file->name, FILENAME_LOOPBACK)) @@ -2342,18 +2342,18 @@ while (slicecom_loopbacks[i].value && slicecom_loopbacks[i].value != board->loopback) i++; - len += snprintf(page + len, PAGE_SIZE - len, "%s\n", + len += scnprintf(page + len, PAGE_SIZE - len, "%s\n", slicecom_loopbacks[i].name); } /* We set permissions to write-only for REG and LBIREG, but root can read them anyway: */ else if (!strcmp(file->name, FILENAME_REG)) { - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "%s: " FILENAME_REG ": write-only file\n", dev->name); } else if (!strcmp(file->name, FILENAME_LBIREG)) { - len += snprintf(page + len, PAGE_SIZE - len, + len += scnprintf(page + len, PAGE_SIZE - len, "%s: " FILENAME_LBIREG ": write-only file\n", dev->name); } else diff -Nru a/drivers/net/wan/comx-proto-lapb.c b/drivers/net/wan/comx-proto-lapb.c --- a/drivers/net/wan/comx-proto-lapb.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/comx-proto-lapb.c Thu Feb 19 23:44:23 2004 @@ -44,7 +44,7 @@ if (!dev || !dev->priv) { dev_kfree_skb(skb); } else { - lapb_data_received(dev->priv, skb); + lapb_data_received(dev, skb); } } @@ -82,7 +82,7 @@ return -ENODEV; } - err = lapb_connect_request(ch); + err = lapb_connect_request(dev); if (ch->debug_flags & DEBUG_COMX_LAPB) { comx_debug(dev, "%s: lapb opened, error code: %d\n", @@ -108,7 +108,7 @@ comx_debug(dev, "%s: lapb closed\n", dev->name); } - lapb_disconnect_request(ch); + lapb_disconnect_request(dev); ch->init_status &= ~LINE_OPEN; ch->line_status &= ~PROTO_UP; @@ -130,11 +130,11 @@ case 0x00: break; // transmit case 0x01: - lapb_connect_request(ch); + lapb_connect_request(dev); kfree_skb(skb); return 0; case 0x02: - lapb_disconnect_request(ch); + lapb_disconnect_request(dev); default: kfree_skb(skb); return 0; @@ -145,7 +145,7 @@ netif_stop_queue(dev); if ((skb2 = skb_clone(skb, GFP_ATOMIC)) != NULL) { - lapb_data_request(ch, skb2); + lapb_data_request(dev, skb2); } return FRAME_ACCEPTED; @@ -157,7 +157,7 @@ int len = 0; len += sprintf(page + len, "Line status: "); - if (lapb_getparms(dev->priv, &parms) != LAPB_OK) { + if (lapb_getparms(dev, &parms) != LAPB_OK) { len += sprintf(page + len, "not initialized\n"); return len; } @@ -178,7 +178,7 @@ struct lapb_parms_struct parms; int len = 0; - if (lapb_getparms(dev->priv, &parms)) { + if (lapb_getparms(dev, &parms)) { return -ENODEV; } @@ -223,7 +223,7 @@ unsigned long parm; char *page; - if (lapb_getparms(dev->priv, &parms)) { + if (lapb_getparms(dev, &parms)) { return -ENODEV; } @@ -243,23 +243,23 @@ parm=simple_strtoul(page,NULL,10); if (parm > 0 && parm < 100) { parms.t1=parm; - lapb_setparms(dev->priv, &parms); + lapb_setparms(dev, &parms); } } else if (strcmp(entry->name, FILENAME_T2) == 0) { parm=simple_strtoul(page, NULL, 10); if (parm > 0 && parm < 100) { parms.t2=parm; - lapb_setparms(dev->priv, &parms); + lapb_setparms(dev, &parms); } } else if (strcmp(entry->name, FILENAME_N2) == 0) { parm=simple_strtoul(page, NULL, 10); if (parm > 0 && parm < 100) { parms.n2=parm; - lapb_setparms(dev->priv, &parms); + lapb_setparms(dev, &parms); } } else if (strcmp(entry->name, FILENAME_WINDOW) == 0) { parms.window = simple_strtoul(page, NULL, 10); - lapb_setparms(dev->priv, &parms); + lapb_setparms(dev, &parms); } else if (strcmp(entry->name, FILENAME_MODE) == 0) { if (comx_strcasecmp(page, "dte") == 0) { parms.mode &= ~(LAPB_DCE | LAPB_DTE); @@ -276,7 +276,7 @@ parms.mode &= ~LAPB_STANDARD; parms.mode |= LAPB_EXTENDED; } - lapb_setparms(dev->priv, &parms); + lapb_setparms(dev, &parms); } else { printk(KERN_ERR "comxlapb_write_proc: internal error, filename %s\n", entry->name); @@ -287,9 +287,9 @@ return count; } -static void comxlapb_connected(void *token, int reason) +static void comxlapb_connected(struct net_device *dev, int reason) { - struct comx_channel *ch = token; + struct comx_channel *ch = dev->priv; struct proc_dir_entry *comxdir = ch->procdir->subdir; if (ch->debug_flags & DEBUG_COMX_LAPB) { @@ -327,9 +327,9 @@ comx_status(ch->dev, ch->line_status); } -static void comxlapb_disconnected(void *token, int reason) +static void comxlapb_disconnected(struct net_device *dev, int reason) { - struct comx_channel *ch = token; + struct comx_channel *ch = dev->priv; struct proc_dir_entry *comxdir = ch->procdir->subdir; if (ch->debug_flags & DEBUG_COMX_LAPB) { @@ -366,9 +366,9 @@ comx_status(ch->dev, ch->line_status); } -static int comxlapb_data_indication(void *token, struct sk_buff *skb) +static int comxlapb_data_indication(struct net_device *dev, struct sk_buff *skb) { - struct comx_channel *ch = token; + struct comx_channel *ch = dev->priv; if (ch->dev->type == ARPHRD_X25) { skb_push(skb, 1); @@ -387,9 +387,9 @@ return comx_rx(ch->dev, skb); } -static void comxlapb_data_transmit(void *token, struct sk_buff *skb) +static void comxlapb_data_transmit(struct net_device *dev, struct sk_buff *skb) { - struct comx_channel *ch = token; + struct comx_channel *ch = dev->priv; if (ch->HW_send_packet) { ch->HW_send_packet(ch->dev, skb); @@ -417,7 +417,7 @@ if (ch->debug_flags & DEBUG_COMX_LAPB) { comx_debug(dev, "%s: unregistering lapb\n", dev->name); } - lapb_unregister(dev->priv); + lapb_unregister(dev); remove_proc_entry(FILENAME_T1, ch->procdir); remove_proc_entry(FILENAME_T2, ch->procdir); @@ -453,7 +453,7 @@ lapbreg.disconnect_indication = comxlapb_disconnected; lapbreg.data_indication = comxlapb_data_indication; lapbreg.data_transmit = comxlapb_data_transmit; - if (lapb_register(dev->priv, &lapbreg)) { + if (lapb_register(dev, &lapbreg)) { return -ENOMEM; } if (ch->debug_flags & DEBUG_COMX_LAPB) { diff -Nru a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c --- a/drivers/net/wan/dlci.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/wan/dlci.c Thu Feb 19 23:44:25 2004 @@ -414,7 +414,7 @@ err2: rtnl_unlock(); - kfree(master); + free_netdev(master); err1: dev_put(slave); return(err); diff -Nru a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c --- a/drivers/net/wan/dscc4.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/wan/dscc4.c Thu Feb 19 23:44:24 2004 @@ -228,7 +228,7 @@ unsigned short encoding; unsigned short parity; - hdlc_device hdlc; + struct net_device *dev; sync_serial_settings settings; u32 __pad __attribute__ ((aligned (4))); }; @@ -364,7 +364,7 @@ static void dscc4_timer(unsigned long); static void dscc4_tx_timeout(struct net_device *); static irqreturn_t dscc4_irq(int irq, void *dev_id, struct pt_regs *ptregs); -static int dscc4_hdlc_attach(hdlc_device *, unsigned short, unsigned short); +static int dscc4_hdlc_attach(struct net_device *, unsigned short, unsigned short); static int dscc4_set_iface(struct dscc4_dev_priv *, struct net_device *); static inline int dscc4_set_quartz(struct dscc4_dev_priv *, int); #ifdef DSCC4_POLLING @@ -373,7 +373,12 @@ static inline struct dscc4_dev_priv *dscc4_priv(struct net_device *dev) { - return list_entry(dev, struct dscc4_dev_priv, hdlc.netdev); + return dev_to_hdlc(dev)->priv; +} + +static inline struct net_device *dscc4_to_dev(struct dscc4_dev_priv *p) +{ + return p->dev; } static void scc_patchl(u32 mask, u32 value, struct dscc4_dev_priv *dpriv, @@ -636,7 +641,7 @@ struct net_device *dev) { struct RxFD *rx_fd = dpriv->rx_fd + dpriv->rx_current%RX_RING_SIZE; - struct net_device_stats *stats = &dpriv->hdlc.stats; + struct net_device_stats *stats = hdlc_stats(dev); struct pci_dev *pdev = dpriv->pci_priv->pdev; struct sk_buff *skb; int pkt_len; @@ -689,10 +694,12 @@ root = ppriv->root; for (i = 0; i < dev_per_card; i++) - unregister_hdlc_device(&root[i].hdlc); + unregister_hdlc_device(dscc4_to_dev(&root[i])); pci_set_drvdata(pdev, NULL); + for (i = 0; i < dev_per_card; i++) + free_netdev(root[i].dev); kfree(root); kfree(ppriv); } @@ -874,17 +881,31 @@ } memset(root, 0, dev_per_card*sizeof(*root)); + for (i = 0; i < dev_per_card; i++) { + root[i].dev = alloc_hdlcdev(root + i); + if (!root[i].dev) { + while (i--) + free_netdev(root[i].dev); + goto err_free_dev; + } + } + ppriv = (struct dscc4_pci_priv *) kmalloc(sizeof(*ppriv), GFP_KERNEL); if (!ppriv) { printk(KERN_ERR "%s: can't allocate private data\n", DRV_NAME); - goto err_free_dev; + goto err_free_dev2; } memset(ppriv, 0, sizeof(struct dscc4_pci_priv)); + ret = dscc4_set_quartz(root, quartz); + if (ret < 0) + goto err_free_priv; + ppriv->root = root; + spin_lock_init(&ppriv->lock); for (i = 0; i < dev_per_card; i++) { struct dscc4_dev_priv *dpriv = root + i; - hdlc_device *hdlc = &dpriv->hdlc; - struct net_device *d = hdlc_to_dev(hdlc); + struct net_device *d = dscc4_to_dev(dpriv); + hdlc_device *hdlc = dev_to_hdlc(d); d->base_addr = ioaddr; d->init = NULL; @@ -905,36 +926,34 @@ hdlc->xmit = dscc4_start_xmit; hdlc->attach = dscc4_hdlc_attach; - ret = register_hdlc_device(hdlc); - if (ret < 0) { - printk(KERN_ERR "%s: unable to register\n", DRV_NAME); - goto err_unregister; - } - dscc4_init_registers(dpriv, d); dpriv->parity = PARITY_CRC16_PR0_CCITT; dpriv->encoding = ENCODING_NRZ; - + ret = dscc4_init_ring(d); + if (ret < 0) + goto err_unregister; + + ret = register_hdlc_device(d); if (ret < 0) { - unregister_hdlc_device(hdlc); + printk(KERN_ERR "%s: unable to register\n", DRV_NAME); + dscc4_release_ring(dpriv); goto err_unregister; - } + } } - ret = dscc4_set_quartz(root, quartz); - if (ret < 0) - goto err_unregister; - ppriv->root = root; - spin_lock_init(&ppriv->lock); pci_set_drvdata(pdev, ppriv); return ret; err_unregister: while (--i >= 0) { dscc4_release_ring(root + i); - unregister_hdlc_device(&root[i].hdlc); + unregister_hdlc_device(dscc4_to_dev(&root[i])); } +err_free_priv: kfree(ppriv); +err_free_dev2: + for (i = 0; i < dev_per_card; i++) + free_netdev(root[i].dev); err_free_dev: kfree(root); err_out: @@ -964,7 +983,7 @@ sync_serial_settings *settings = &dpriv->settings; if (settings->loopback && (settings->clock_type != CLOCK_INT)) { - struct net_device *dev = hdlc_to_dev(&dpriv->hdlc); + struct net_device *dev = dscc4_to_dev(dpriv); printk(KERN_INFO "%s: loopback requires clock\n", dev->name); return -1; @@ -1015,14 +1034,13 @@ static int dscc4_open(struct net_device *dev) { struct dscc4_dev_priv *dpriv = dscc4_priv(dev); - hdlc_device *hdlc = &dpriv->hdlc; struct dscc4_pci_priv *ppriv; int ret = -EAGAIN; if ((dscc4_loopback_check(dpriv) < 0) || !dev->hard_start_xmit) goto err; - if ((ret = hdlc_open(hdlc))) + if ((ret = hdlc_open(dev))) goto err; ppriv = dpriv->pci_priv; @@ -1103,7 +1121,7 @@ scc_writel(0xffffffff, dpriv, dev, IMR); scc_patchl(PowerUp | Vis, 0, dpriv, dev, CCR0); err_out: - hdlc_close(hdlc); + hdlc_close(dev); err: return ret; } @@ -1155,7 +1173,6 @@ static int dscc4_close(struct net_device *dev) { struct dscc4_dev_priv *dpriv = dscc4_priv(dev); - hdlc_device *hdlc = dev_to_hdlc(dev); del_timer_sync(&dpriv->timer); netif_stop_queue(dev); @@ -1166,7 +1183,7 @@ dpriv->flags |= FakeReset; - hdlc_close(hdlc); + hdlc_close(dev); return 0; } @@ -1467,7 +1484,7 @@ int i, handled = 1; priv = root->pci_priv; - dev = hdlc_to_dev(&root->hdlc); + dev = dscc4_to_dev(root); spin_lock_irqsave(&priv->lock, flags); @@ -1518,7 +1535,7 @@ static inline void dscc4_tx_irq(struct dscc4_pci_priv *ppriv, struct dscc4_dev_priv *dpriv) { - struct net_device *dev = hdlc_to_dev(&dpriv->hdlc); + struct net_device *dev = dscc4_to_dev(dpriv); u32 state; int cur, loop = 0; @@ -1549,7 +1566,7 @@ if (state & SccEvt) { if (state & Alls) { - struct net_device_stats *stats = &dpriv->hdlc.stats; + struct net_device_stats *stats = hdlc_stats(dev); struct sk_buff *skb; struct TxFD *tx_fd; @@ -1677,7 +1694,7 @@ } if (state & Err) { printk(KERN_INFO "%s: Tx ERR\n", dev->name); - dev_to_hdlc(dev)->stats.tx_errors++; + hdlc_stats(dev)->tx_errors++; state &= ~Err; } } @@ -1687,7 +1704,7 @@ static inline void dscc4_rx_irq(struct dscc4_pci_priv *priv, struct dscc4_dev_priv *dpriv) { - struct net_device *dev = hdlc_to_dev(&dpriv->hdlc); + struct net_device *dev = dscc4_to_dev(dpriv); u32 state; int cur; @@ -1813,7 +1830,7 @@ if (!(rx_fd->state2 & DataComplete)) break; if (rx_fd->state2 & FrameAborted) { - dev_to_hdlc(dev)->stats.rx_over_errors++; + hdlc_stats(dev)->rx_over_errors++; rx_fd->state1 |= Hold; rx_fd->state2 = 0x00000000; rx_fd->end = 0xbabeface; @@ -1961,7 +1978,7 @@ ppriv = pci_get_drvdata(pdev); root = ppriv->root; - ioaddr = hdlc_to_dev(&root->hdlc)->base_addr; + ioaddr = dscc4_to_dev(root)->base_addr; dscc4_pci_reset(pdev, ioaddr); @@ -1988,10 +2005,9 @@ pci_resource_len(pdev, 0)); } -static int dscc4_hdlc_attach(hdlc_device *hdlc, unsigned short encoding, +static int dscc4_hdlc_attach(struct net_device *dev, unsigned short encoding, unsigned short parity) { - struct net_device *dev = hdlc_to_dev(hdlc); struct dscc4_dev_priv *dpriv = dscc4_priv(dev); if (encoding != ENCODING_NRZ && diff -Nru a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c --- a/drivers/net/wan/farsync.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/wan/farsync.c Thu Feb 19 23:44:26 2004 @@ -328,7 +328,7 @@ /* Per port (line or channel) information */ struct fst_port_info { - hdlc_device hdlc; /* HDLC device struct - must be first */ + struct net_device *dev; struct fst_card_info *card; /* Card we're associated with */ int index; /* Port index on the card */ int hwif; /* Line hardware (lineInterface copy) */ @@ -357,9 +357,8 @@ }; /* Convert an HDLC device pointer into a port info pointer and similar */ -#define hdlc_to_port(H) ((struct fst_port_info *)(H)) -#define dev_to_port(D) hdlc_to_port(dev_to_hdlc(D)) -#define port_to_dev(P) hdlc_to_dev(&(P)->hdlc) +#define dev_to_port(D) (dev_to_hdlc(D)->priv) +#define port_to_dev(P) ((P)->dev) /* @@ -651,6 +650,8 @@ int rxp; unsigned short len; struct sk_buff *skb; + struct net_device *dev = port_to_dev(port); + struct net_device_stats *stats = hdlc_stats(dev); int i; @@ -678,24 +679,24 @@ len ); if ( dmabits != ( RX_STP | RX_ENP ) || len > LEN_RX_BUFFER - 2 ) { - port->hdlc.stats.rx_errors++; + stats->rx_errors++; /* Update error stats and discard buffer */ if ( dmabits & RX_OFLO ) { - port->hdlc.stats.rx_fifo_errors++; + stats->rx_fifo_errors++; } if ( dmabits & RX_CRC ) { - port->hdlc.stats.rx_crc_errors++; + stats->rx_crc_errors++; } if ( dmabits & RX_FRAM ) { - port->hdlc.stats.rx_frame_errors++; + stats->rx_frame_errors++; } if ( dmabits == ( RX_STP | RX_ENP )) { - port->hdlc.stats.rx_length_errors++; + stats->rx_length_errors++; } /* Discard buffer descriptors until we see the end of packet @@ -732,7 +733,7 @@ { dbg ( DBG_RX,"intr_rx: can't allocate buffer\n"); - port->hdlc.stats.rx_dropped++; + stats->rx_dropped++; /* Return descriptor to card */ FST_WRB ( card, rxDescrRing[pi][rxp].bits, DMA_OWN ); @@ -756,16 +757,16 @@ port->rxpos = rxp; /* Update stats */ - port->hdlc.stats.rx_packets++; - port->hdlc.stats.rx_bytes += len; + stats->rx_packets++; + stats->rx_bytes += len; /* Push upstream */ skb->mac.raw = skb->data; - skb->dev = hdlc_to_dev ( &port->hdlc ); + skb->dev = dev; skb->protocol = hdlc_type_trans(skb, skb->dev); netif_rx ( skb ); - port_to_dev ( port )->last_rx = jiffies; + dev->last_rx = jiffies; } @@ -835,8 +836,8 @@ * always load up the entire packet for DMA. */ dbg ( DBG_TX,"Tx underflow port %d\n", event & 0x03 ); - port->hdlc.stats.tx_errors++; - port->hdlc.stats.tx_fifo_errors++; + hdlc_stats(port_to_dev(port))->tx_errors++; + hdlc_stats(port_to_dev(port))->tx_fifo_errors++; break; case INIT_CPLT: @@ -1309,7 +1310,7 @@ { int err; - err = hdlc_open ( dev_to_hdlc ( dev )); + err = hdlc_open (dev); if ( err ) return err; @@ -1323,12 +1324,12 @@ { netif_stop_queue ( dev ); fst_closeport ( dev_to_port ( dev )); - hdlc_close ( dev_to_hdlc ( dev )); + hdlc_close ( dev ); return 0; } static int -fst_attach ( hdlc_device *hdlc, unsigned short encoding, unsigned short parity ) +fst_attach ( struct net_device *dev, unsigned short encoding, unsigned short parity ) { /* Setting currently fixed in FarSync card so we check and forget */ if ( encoding != ENCODING_NRZ || parity != PARITY_CRC16_PR1_CCITT ) @@ -1341,13 +1342,14 @@ fst_tx_timeout ( struct net_device *dev ) { struct fst_port_info *port; + struct net_device_stats *stats = hdlc_stats(dev); dbg ( DBG_INTR | DBG_TX,"tx_timeout\n"); port = dev_to_port ( dev ); - port->hdlc.stats.tx_errors++; - port->hdlc.stats.tx_aborted_errors++; + stats->tx_errors++; + stats->tx_aborted_errors++; if ( port->txcnt > 0 ) fst_issue_cmd ( port, ABORTTX ); @@ -1360,6 +1362,7 @@ static int fst_start_xmit ( struct sk_buff *skb, struct net_device *dev ) { + struct net_device_stats *stats = hdlc_stats(dev); struct fst_card_info *card; struct fst_port_info *port; unsigned char dmabits; @@ -1374,8 +1377,8 @@ if ( ! netif_carrier_ok ( dev )) { dev_kfree_skb ( skb ); - port->hdlc.stats.tx_errors++; - port->hdlc.stats.tx_carrier_errors++; + stats->tx_errors++; + stats->tx_carrier_errors++; return 0; } @@ -1385,7 +1388,7 @@ dbg ( DBG_TX,"Packet too large %d vs %d\n", skb->len, LEN_TX_BUFFER ); dev_kfree_skb ( skb ); - port->hdlc.stats.tx_errors++; + stats->tx_errors++; return 0; } @@ -1399,7 +1402,7 @@ spin_unlock_irqrestore ( &card->card_lock, flags ); dbg ( DBG_TX,"Out of Tx buffers\n"); dev_kfree_skb ( skb ); - port->hdlc.stats.tx_errors++; + stats->tx_errors++; return 0; } if ( ++port->txpos >= NUM_TX_BUFFER ) @@ -1419,8 +1422,8 @@ FST_WRW ( card, txDescrRing[pi][txp].bcnt, cnv_bcnt ( skb->len )); FST_WRB ( card, txDescrRing[pi][txp].bits, DMA_OWN | TX_STP | TX_ENP ); - port->hdlc.stats.tx_packets++; - port->hdlc.stats.tx_bytes += skb->len; + stats->tx_packets++; + stats->tx_bytes += skb->len; dev_kfree_skb ( skb ); @@ -1447,55 +1450,29 @@ { int i; int err; - struct net_device *dev; /* We're working on a number of ports based on the card ID. If the * firmware detects something different later (should never happen) * we'll have to revise it in some way then. */ - for ( i = 0 ; i < card->nports ; i++ ) - { - card->ports[i].card = card; - card->ports[i].index = i; - card->ports[i].run = 0; - - dev = hdlc_to_dev ( &card->ports[i].hdlc ); - - /* Fill in the net device info */ - /* Since this is a PCI setup this is purely - * informational. Give them the buffer addresses - * and basic card I/O. - */ - dev->mem_start = card->phys_mem - + BUF_OFFSET ( txBuffer[i][0][0]); - dev->mem_end = card->phys_mem - + BUF_OFFSET ( txBuffer[i][NUM_TX_BUFFER][0]); - dev->base_addr = card->pci_conf; - dev->irq = card->irq; - - dev->tx_queue_len = FST_TX_QUEUE_LEN; - dev->open = fst_open; - dev->stop = fst_close; - dev->do_ioctl = fst_ioctl; - dev->watchdog_timeo = FST_TX_TIMEOUT; - dev->tx_timeout = fst_tx_timeout; - card->ports[i].hdlc.attach = fst_attach; - card->ports[i].hdlc.xmit = fst_start_xmit; - - if (( err = register_hdlc_device ( &card->ports[i].hdlc )) < 0 ) - { + for ( i = 0 ; i < card->nports ; i++ ) { + err = register_hdlc_device(card->ports[i].dev); + if (err < 0) { + int j; printk_err ("Cannot register HDLC device for port %d" " (errno %d)\n", i, -err ); + for (j = i; j < card->nports; j++) { + free_netdev(card->ports[j].dev); + card->ports[j].dev = NULL; + } card->nports = i; break; } } - spin_lock_init ( &card->card_lock ); - printk ( KERN_INFO "%s-%s: %s IRQ%d, %d ports\n", - hdlc_to_dev(&card->ports[0].hdlc)->name, - hdlc_to_dev(&card->ports[card->nports-1].hdlc)->name, + port_to_dev(&card->ports[0])->name, + port_to_dev(&card->ports[card->nports-1])->name, type_strings[card->type], card->irq, card->nports ); } @@ -1510,6 +1487,7 @@ static int firsttime_done = 0; struct fst_card_info *card; int err = 0; + int i; if ( ! firsttime_done ) { @@ -1546,6 +1524,46 @@ card->state = FST_UNINIT; + spin_lock_init ( &card->card_lock ); + + for ( i = 0 ; i < card->nports ; i++ ) { + struct net_device *dev = alloc_hdlcdev(&card->ports[i]); + hdlc_device *hdlc; + if (!dev) { + while (i--) + free_netdev(card->ports[i].dev); + printk_err ("FarSync: out of memory\n"); + goto error_free_card; + } + card->ports[i].dev = dev; + card->ports[i].card = card; + card->ports[i].index = i; + card->ports[i].run = 0; + + hdlc = dev_to_hdlc(dev); + + /* Fill in the net device info */ + /* Since this is a PCI setup this is purely + * informational. Give them the buffer addresses + * and basic card I/O. + */ + dev->mem_start = card->phys_mem + + BUF_OFFSET ( txBuffer[i][0][0]); + dev->mem_end = card->phys_mem + + BUF_OFFSET ( txBuffer[i][NUM_TX_BUFFER][0]); + dev->base_addr = card->pci_conf; + dev->irq = card->irq; + + dev->tx_queue_len = FST_TX_QUEUE_LEN; + dev->open = fst_open; + dev->stop = fst_close; + dev->do_ioctl = fst_ioctl; + dev->watchdog_timeo = FST_TX_TIMEOUT; + dev->tx_timeout = fst_tx_timeout; + hdlc->attach = fst_attach; + hdlc->xmit = fst_start_xmit; + } + dbg ( DBG_PCI,"type %d nports %d irq %d\n", card->type, card->nports, card->irq ); dbg ( DBG_PCI,"conf %04x mem %08x ctlmem %08x\n", @@ -1557,7 +1575,7 @@ printk_err ("Unable to get config I/O @ 0x%04X\n", card->pci_conf ); err = -ENODEV; - goto error_free_card; + goto error_free_ports; } if ( ! request_mem_region ( card->phys_mem, FST_MEMSIZE,"Shared RAM")) { @@ -1628,6 +1646,9 @@ error_release_io: release_region ( card->pci_conf, 0x80 ); +error_free_ports: + for (i = 0; i < card->nports; i++) + free_netdev(card->ports[i].dev); error_free_card: kfree ( card ); return err; @@ -1647,7 +1668,8 @@ for ( i = 0 ; i < card->nports ; i++ ) { - unregister_hdlc_device ( &card->ports[i].hdlc ); + struct net_device *dev = port_to_dev(&card->ports[i]); + unregister_hdlc_device(dev); } fst_disable_intr ( card ); @@ -1659,6 +1681,9 @@ release_mem_region ( card->phys_ctlmem, 0x10 ); release_mem_region ( card->phys_mem, FST_MEMSIZE ); release_region ( card->pci_conf, 0x80 ); + + for (i = 0; i < card->nports; i++) + free_netdev(card->ports[i].dev); kfree ( card ); } diff -Nru a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c --- a/drivers/net/wan/hd6457x.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/hd6457x.c Thu Feb 19 23:44:23 2004 @@ -73,6 +73,11 @@ #define writea(value, ptr) writel(value, ptr) #endif +static inline struct net_device *port_to_dev(port_t *port) +{ + return port->dev; +} + static inline int sca_intr_status(card_t *card) { u8 result = 0; @@ -110,22 +115,11 @@ return result; } - - -static inline port_t* hdlc_to_port(hdlc_device *hdlc) -{ - return (port_t*)hdlc; -} - - - static inline port_t* dev_to_port(struct net_device *dev) { - return hdlc_to_port(dev_to_hdlc(dev)); + return dev_to_hdlc(dev)->priv; } - - static inline u16 next_desc(port_t *port, u16 desc, int transmit) { return (desc + 1) % (transmit ? port_to_card(port)->tx_ring_buffers @@ -245,7 +239,7 @@ } hdlc_set_carrier(!(sca_in(get_msci(port) + ST3, card) & ST3_DCD), - &port->hdlc); + port_to_dev(port)); } @@ -262,13 +256,14 @@ sca_out(stat & (ST1_UDRN | ST1_CDCD), msci + ST1, card); if (stat & ST1_UDRN) { - port->hdlc.stats.tx_errors++; /* TX Underrun error detected */ - port->hdlc.stats.tx_fifo_errors++; + struct net_device_stats *stats = hdlc_stats(port_to_dev(port)); + stats->tx_errors++; /* TX Underrun error detected */ + stats->tx_fifo_errors++; } if (stat & ST1_CDCD) hdlc_set_carrier(!(sca_in(msci + ST3, card) & ST3_DCD), - &port->hdlc); + port_to_dev(port)); } #endif @@ -276,6 +271,8 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc *desc, u16 rxin) { + struct net_device *dev = port_to_dev(port); + struct net_device_stats *stats = hdlc_stats(dev); struct sk_buff *skb; u16 len; u32 buff; @@ -287,7 +284,7 @@ len = readw(&desc->len); skb = dev_alloc_skb(len); if (!skb) { - port->hdlc.stats.rx_dropped++; + stats->rx_dropped++; return; } @@ -313,15 +310,15 @@ #endif skb_put(skb, len); #ifdef DEBUG_PKT - printk(KERN_DEBUG "%s RX(%i):", hdlc_to_name(&port->hdlc), skb->len); + printk(KERN_DEBUG "%s RX(%i):", dev->name, skb->len); debug_frame(skb); #endif - port->hdlc.stats.rx_packets++; - port->hdlc.stats.rx_bytes += skb->len; + stats->rx_packets++; + stats->rx_bytes += skb->len; skb->mac.raw = skb->data; - skb->dev = hdlc_to_dev(&port->hdlc); + skb->dev = dev; skb->dev->last_rx = jiffies; - skb->protocol = hdlc_type_trans(skb, hdlc_to_dev(&port->hdlc)); + skb->protocol = hdlc_type_trans(skb, dev); netif_rx(skb); } @@ -333,7 +330,7 @@ u16 dmac = get_dmac_rx(port); card_t *card = port_to_card(port); u8 stat = sca_in(DSR_RX(phy_node(port)), card); /* read DMA Status */ - struct net_device_stats *stats = &port->hdlc.stats; + struct net_device_stats *stats = hdlc_stats(port_to_dev(port)); /* Reset DSR status bits */ sca_out((stat & (DSR_EOT | DSR_EOM | DSR_BOF | DSR_COF)) | DSR_DWE, @@ -380,6 +377,8 @@ /* Transmit DMA interrupt service */ static inline void sca_tx_intr(port_t *port) { + struct net_device *dev = port_to_dev(port); + struct net_device_stats *stats = hdlc_stats(dev); u16 dmac = get_dmac_tx(port); card_t* card = port_to_card(port); u8 stat; @@ -401,13 +400,13 @@ break; /* Transmitter is/will_be sending this frame */ desc = desc_address(port, port->txlast, 1); - port->hdlc.stats.tx_packets++; - port->hdlc.stats.tx_bytes += readw(&desc->len); + stats->tx_packets++; + stats->tx_bytes += readw(&desc->len); writeb(0, &desc->stat); /* Free descriptor */ port->txlast = next_desc(port, port->txlast, 1); } - netif_wake_queue(hdlc_to_dev(&port->hdlc)); + netif_wake_queue(dev); spin_unlock(&port->lock); } @@ -508,9 +507,9 @@ -static void sca_open(hdlc_device *hdlc) +static void sca_open(struct net_device *dev) { - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); card_t* card = port_to_card(port); u16 msci = get_msci(port); u8 md0, md2; @@ -569,7 +568,7 @@ - all DMA interrupts */ - hdlc_set_carrier(!(sca_in(msci + ST3, card) & ST3_DCD), hdlc); + hdlc_set_carrier(!(sca_in(msci + ST3, card) & ST3_DCD), dev); #ifdef __HD64570_H /* MSCI TX INT and RX INT A IRQ enable */ @@ -600,18 +599,18 @@ sca_out(CMD_TX_ENABLE, msci + CMD, card); sca_out(CMD_RX_ENABLE, msci + CMD, card); - netif_start_queue(hdlc_to_dev(hdlc)); + netif_start_queue(dev); } -static void sca_close(hdlc_device *hdlc) +static void sca_close(struct net_device *dev) { - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); card_t* card = port_to_card(port); /* reset channel */ - netif_stop_queue(hdlc_to_dev(hdlc)); + netif_stop_queue(dev); sca_out(CMD_RESET, get_msci(port) + CMD, port_to_card(port)); #ifdef __HD64570_H /* disable MSCI interrupts */ @@ -629,7 +628,7 @@ -static int sca_attach(hdlc_device *hdlc, unsigned short encoding, +static int sca_attach(struct net_device *dev, unsigned short encoding, unsigned short parity) { if (encoding != ENCODING_NRZ && @@ -650,17 +649,17 @@ parity != PARITY_CRC16_PR1_CCITT) return -EINVAL; - hdlc_to_port(hdlc)->encoding = encoding; - hdlc_to_port(hdlc)->parity = parity; + dev_to_port(dev)->encoding = encoding; + dev_to_port(dev)->parity = parity; return 0; } #ifdef DEBUG_RINGS -static void sca_dump_rings(hdlc_device *hdlc) +static void sca_dump_rings(struct net_device *dev) { - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); card_t *card = port_to_card(port); u16 cnt; #if !defined(PAGE0_ALWAYS_MAPPED) && !defined(ALL_PAGES_ALWAYS_MAPPED) @@ -729,8 +728,7 @@ static int sca_xmit(struct sk_buff *skb, struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); card_t *card = port_to_card(port); pkt_desc *desc; u32 buff, len; @@ -753,7 +751,7 @@ } #ifdef DEBUG_PKT - printk(KERN_DEBUG "%s TX(%i):", hdlc_to_name(hdlc), skb->len); + printk(KERN_DEBUG "%s TX(%i):", dev->name, skb->len); debug_frame(skb); #endif @@ -790,7 +788,7 @@ desc = desc_address(port, port->txin + 1, 1); if (readb(&desc->stat)) /* allow 1 packet gap */ - netif_stop_queue(hdlc_to_dev(&port->hdlc)); + netif_stop_queue(dev); spin_unlock_irq(&port->lock); diff -Nru a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c --- a/drivers/net/wan/hdlc_cisco.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/wan/hdlc_cisco.c Thu Feb 19 23:44:24 2004 @@ -57,7 +57,7 @@ -static void cisco_keepalive_send(hdlc_device *hdlc, u32 type, +static void cisco_keepalive_send(struct net_device *dev, u32 type, u32 par1, u32 par2) { struct sk_buff *skb; @@ -67,12 +67,11 @@ if (!skb) { printk(KERN_WARNING "%s: Memory squeeze on cisco_keepalive_send()\n", - hdlc_to_name(hdlc)); + dev->name); return; } skb_reserve(skb, 4); - cisco_hard_header(skb, hdlc_to_dev(hdlc), CISCO_KEEPALIVE, - NULL, NULL, 0); + cisco_hard_header(skb, dev, CISCO_KEEPALIVE, NULL, NULL, 0); data = (cisco_packet*)skb->tail; data->type = htonl(type); @@ -84,7 +83,7 @@ skb_put(skb, sizeof(cisco_packet)); skb->priority = TC_PRIO_CONTROL; - skb->dev = hdlc_to_dev(hdlc); + skb->dev = dev; skb->nh.raw = skb->data; dev_queue_xmit(skb); @@ -118,7 +117,8 @@ static int cisco_rx(struct sk_buff *skb) { - hdlc_device *hdlc = dev_to_hdlc(skb->dev); + struct net_device *dev = skb->dev; + hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_header *data = (hdlc_header*)skb->data; cisco_packet *cisco_data; struct in_device *in_dev; @@ -142,7 +142,7 @@ skb->len != sizeof(hdlc_header) + CISCO_BIG_PACKET_LEN) { printk(KERN_INFO "%s: Invalid length of Cisco " "control packet (%d bytes)\n", - hdlc_to_name(hdlc), skb->len); + dev->name, skb->len); goto rx_error; } @@ -150,7 +150,7 @@ switch(ntohl (cisco_data->type)) { case CISCO_ADDR_REQ: /* Stolen from syncppp.c :-) */ - in_dev = hdlc_to_dev(hdlc)->ip_ptr; + in_dev = dev->ip_ptr; addr = 0; mask = ~0; /* is the mask correct? */ @@ -158,7 +158,7 @@ struct in_ifaddr **ifap = &in_dev->ifa_list; while (*ifap != NULL) { - if (strcmp(hdlc_to_name(hdlc), + if (strcmp(dev->name, (*ifap)->ifa_label) == 0) { addr = (*ifap)->ifa_local; mask = (*ifap)->ifa_mask; @@ -167,7 +167,7 @@ ifap = &(*ifap)->ifa_next; } - cisco_keepalive_send(hdlc, CISCO_ADDR_REPLY, + cisco_keepalive_send(dev, CISCO_ADDR_REPLY, addr, mask); } dev_kfree_skb_any(skb); @@ -175,7 +175,7 @@ case CISCO_ADDR_REPLY: printk(KERN_INFO "%s: Unexpected Cisco IP address " - "reply\n", hdlc_to_name(hdlc)); + "reply\n", dev->name); goto rx_error; case CISCO_KEEPALIVE_REQ: @@ -190,7 +190,7 @@ days = hrs / 24; hrs -= days * 24; printk(KERN_INFO "%s: Link up (peer " "uptime %ud%uh%um%us)\n", - hdlc_to_name(hdlc), days, hrs, + dev->name, days, hrs, min, sec); } hdlc->state.cisco.up = 1; @@ -201,7 +201,7 @@ } /* switch(keepalive type) */ } /* switch(protocol) */ - printk(KERN_INFO "%s: Unsupported protocol %x\n", hdlc_to_name(hdlc), + printk(KERN_INFO "%s: Unsupported protocol %x\n", dev->name, data->protocol); dev_kfree_skb_any(skb); return NET_RX_DROP; @@ -216,17 +216,18 @@ static void cisco_timer(unsigned long arg) { - hdlc_device *hdlc = (hdlc_device*)arg; + struct net_device *dev = (struct net_device *)arg; + hdlc_device *hdlc = dev_to_hdlc(dev); if (hdlc->state.cisco.up && jiffies - hdlc->state.cisco.last_poll >= hdlc->state.cisco.settings.timeout * HZ) { hdlc->state.cisco.up = 0; - printk(KERN_INFO "%s: Link down\n", hdlc_to_name(hdlc)); - if (netif_carrier_ok(&hdlc->netdev)) - netif_carrier_off(&hdlc->netdev); + printk(KERN_INFO "%s: Link down\n", dev->name); + if (netif_carrier_ok(dev)) + netif_carrier_off(dev); } - cisco_keepalive_send(hdlc, CISCO_KEEPALIVE_REQ, + cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ, ++hdlc->state.cisco.txseq, hdlc->state.cisco.rxseq); hdlc->state.cisco.timer.expires = jiffies + @@ -238,8 +239,9 @@ -static void cisco_start(hdlc_device *hdlc) +static void cisco_start(struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); hdlc->state.cisco.last_poll = 0; hdlc->state.cisco.up = 0; hdlc->state.cisco.txseq = hdlc->state.cisco.rxseq = 0; @@ -247,27 +249,27 @@ init_timer(&hdlc->state.cisco.timer); hdlc->state.cisco.timer.expires = jiffies + HZ; /*First poll after 1s*/ hdlc->state.cisco.timer.function = cisco_timer; - hdlc->state.cisco.timer.data = (unsigned long)hdlc; + hdlc->state.cisco.timer.data = (unsigned long)dev; add_timer(&hdlc->state.cisco.timer); } -static void cisco_stop(hdlc_device *hdlc) +static void cisco_stop(struct net_device *dev) { - del_timer_sync(&hdlc->state.cisco.timer); - if (netif_carrier_ok(&hdlc->netdev)) - netif_carrier_off(&hdlc->netdev); + del_timer_sync(&dev_to_hdlc(dev)->state.cisco.timer); + if (netif_carrier_ok(dev)) + netif_carrier_off(dev); } -int hdlc_cisco_ioctl(hdlc_device *hdlc, struct ifreq *ifr) +int hdlc_cisco_ioctl(struct net_device *dev, struct ifreq *ifr) { cisco_proto *cisco_s = ifr->ifr_settings.ifs_ifsu.cisco; const size_t size = sizeof(cisco_proto); cisco_proto new_settings; - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); int result; switch (ifr->ifr_settings.type) { @@ -295,7 +297,7 @@ new_settings.timeout < 2) return -EINVAL; - result=hdlc->attach(hdlc, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); + result=hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); if (result) return result; diff -Nru a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c --- a/drivers/net/wan/hdlc_fr.c Thu Feb 19 23:44:27 2004 +++ b/drivers/net/wan/hdlc_fr.c Thu Feb 19 23:44:27 2004 @@ -146,8 +146,9 @@ } -static inline pvc_device* add_pvc(hdlc_device *hdlc, u16 dlci) +static inline pvc_device* add_pvc(struct net_device *dev, u16 dlci) { + hdlc_device *hdlc = dev_to_hdlc(dev); pvc_device *pvc, **pvc_p = &hdlc->state.fr.first_pvc; while (*pvc_p) { @@ -164,7 +165,7 @@ memset(pvc, 0, sizeof(pvc_device)); pvc->dlci = dlci; - pvc->master = hdlc; + pvc->master = dev; pvc->next = *pvc_p; /* Put it in the chain */ *pvc_p = pvc; return pvc; @@ -311,15 +312,16 @@ { pvc_device *pvc = dev_to_pvc(dev); - if ((hdlc_to_dev(pvc->master)->flags & IFF_UP) == 0) + if ((pvc->master->flags & IFF_UP) == 0) return -EIO; /* Master must be UP in order to activate PVC */ if (pvc->open_count++ == 0) { - if (pvc->master->state.fr.settings.lmi == LMI_NONE) - pvc->state.active = pvc->master->carrier; + hdlc_device *hdlc = dev_to_hdlc(pvc->master); + if (hdlc->state.fr.settings.lmi == LMI_NONE) + pvc->state.active = hdlc->carrier; pvc_carrier(pvc->state.active, pvc); - pvc->master->state.fr.dce_changed = 1; + hdlc->state.fr.dce_changed = 1; } return 0; } @@ -331,11 +333,12 @@ pvc_device *pvc = dev_to_pvc(dev); if (--pvc->open_count == 0) { - if (pvc->master->state.fr.settings.lmi == LMI_NONE) + hdlc_device *hdlc = dev_to_hdlc(pvc->master); + if (hdlc->state.fr.settings.lmi == LMI_NONE) pvc->state.active = 0; - if (pvc->master->state.fr.settings.dce) { - pvc->master->state.fr.dce_changed = 1; + if (hdlc->state.fr.settings.dce) { + hdlc->state.fr.dce_changed = 1; pvc->state.active = 0; } } @@ -362,7 +365,7 @@ } info.dlci = pvc->dlci; - memcpy(info.master, hdlc_to_name(pvc->master), IFNAMSIZ); + memcpy(info.master, pvc->master->name, IFNAMSIZ); if (copy_to_user(ifr->ifr_settings.ifs_ifsu.fr_pvc_info, &info, sizeof(info))) return -EFAULT; @@ -375,8 +378,7 @@ static inline struct net_device_stats *pvc_get_stats(struct net_device *dev) { - return (struct net_device_stats *) - ((char *)dev + sizeof(struct net_device)); + return netdev_priv(dev); } @@ -408,7 +410,7 @@ stats->tx_packets++; if (pvc->state.fecn) /* TX Congestion counter */ stats->tx_compressed++; - skb->dev = hdlc_to_dev(pvc->master); + skb->dev = pvc->master; dev_queue_xmit(skb); return 0; } @@ -434,7 +436,7 @@ static inline void fr_log_dlci_active(pvc_device *pvc) { printk(KERN_INFO "%s: DLCI %d [%s%s%s]%s %s\n", - hdlc_to_name(pvc->master), + pvc->master->name, pvc->dlci, pvc->main ? pvc->main->name : "", pvc->main && pvc->ether ? " " : "", @@ -454,8 +456,9 @@ -static void fr_lmi_send(hdlc_device *hdlc, int fullrep) +static void fr_lmi_send(struct net_device *dev, int fullrep) { + hdlc_device *hdlc = dev_to_hdlc(dev); struct sk_buff *skb; pvc_device *pvc = hdlc->state.fr.first_pvc; int len = (hdlc->state.fr.settings.lmi == LMI_ANSI) ? LMI_ANSI_LENGTH @@ -468,7 +471,7 @@ len += hdlc->state.fr.dce_pvc_count * (2 + stat_len); if (len > HDLC_MAX_MRU) { printk(KERN_WARNING "%s: Too many PVCs while sending " - "LMI full report\n", hdlc_to_name(hdlc)); + "LMI full report\n", dev->name); return; } } @@ -476,7 +479,7 @@ skb = dev_alloc_skb(len); if (!skb) { printk(KERN_WARNING "%s: Memory squeeze on fr_lmi_send()\n", - hdlc_to_name(hdlc)); + dev->name); return; } memset(skb->data, 0, len); @@ -529,7 +532,7 @@ skb_put(skb, i); skb->priority = TC_PRIO_CONTROL; - skb->dev = hdlc_to_dev(hdlc); + skb->dev = dev; skb->nh.raw = skb->data; dev_queue_xmit(skb); @@ -537,14 +540,15 @@ -static void fr_set_link_state(int reliable, hdlc_device *hdlc) +static void fr_set_link_state(int reliable, struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); pvc_device *pvc = hdlc->state.fr.first_pvc; hdlc->state.fr.reliable = reliable; if (reliable) { - if (!netif_carrier_ok(&hdlc->netdev)) - netif_carrier_on(&hdlc->netdev); + if (!netif_carrier_ok(dev)) + netif_carrier_on(dev); hdlc->state.fr.n391cnt = 0; /* Request full status */ hdlc->state.fr.dce_changed = 1; @@ -558,8 +562,8 @@ } } } else { - if (netif_carrier_ok(&hdlc->netdev)) - netif_carrier_off(&hdlc->netdev); + if (netif_carrier_ok(dev)) + netif_carrier_off(dev); while (pvc) { /* Deactivate all PVCs */ pvc_carrier(0, pvc); @@ -574,7 +578,8 @@ static void fr_timer(unsigned long arg) { - hdlc_device *hdlc = (hdlc_device*)arg; + struct net_device *dev = (struct net_device *)arg; + hdlc_device *hdlc = dev_to_hdlc(dev); int i, cnt = 0, reliable; u32 list; @@ -586,7 +591,7 @@ if (hdlc->state.fr.request) { if (hdlc->state.fr.reliable) printk(KERN_INFO "%s: No LMI status reply " - "received\n", hdlc_to_name(hdlc)); + "received\n", dev->name); hdlc->state.fr.last_errors |= 1; } @@ -598,9 +603,9 @@ } if (hdlc->state.fr.reliable != reliable) { - printk(KERN_INFO "%s: Link %sreliable\n", hdlc_to_name(hdlc), + printk(KERN_INFO "%s: Link %sreliable\n", dev->name, reliable ? "" : "un"); - fr_set_link_state(reliable, hdlc); + fr_set_link_state(reliable, dev); } if (hdlc->state.fr.settings.dce) @@ -610,7 +615,7 @@ if (hdlc->state.fr.n391cnt) hdlc->state.fr.n391cnt--; - fr_lmi_send(hdlc, hdlc->state.fr.n391cnt == 0); + fr_lmi_send(dev, hdlc->state.fr.n391cnt == 0); hdlc->state.fr.request = 1; hdlc->state.fr.timer.expires = jiffies + @@ -624,8 +629,9 @@ -static int fr_lmi_recv(hdlc_device *hdlc, struct sk_buff *skb) +static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb) { + hdlc_device *hdlc = dev_to_hdlc(dev); int stat_len; pvc_device *pvc; int reptype = -1, error, no_ram; @@ -634,14 +640,14 @@ if (skb->len < ((hdlc->state.fr.settings.lmi == LMI_ANSI) ? LMI_ANSI_LENGTH : LMI_LENGTH)) { - printk(KERN_INFO "%s: Short LMI frame\n", hdlc_to_name(hdlc)); + printk(KERN_INFO "%s: Short LMI frame\n", dev->name); return 1; } if (skb->data[5] != (!hdlc->state.fr.settings.dce ? LMI_STATUS : LMI_STATUS_ENQUIRY)) { printk(KERN_INFO "%s: LMI msgtype=%x, Not LMI status %s\n", - hdlc_to_name(hdlc), skb->data[2], + dev->name, skb->data[2], hdlc->state.fr.settings.dce ? "enquiry" : "reply"); return 1; } @@ -652,7 +658,7 @@ ((hdlc->state.fr.settings.lmi == LMI_CCITT) ? LMI_CCITT_REPTYPE : LMI_REPTYPE)) { printk(KERN_INFO "%s: Not a report type=%x\n", - hdlc_to_name(hdlc), skb->data[i]); + dev->name, skb->data[i]); return 1; } i++; @@ -665,7 +671,7 @@ ((hdlc->state.fr.settings.lmi == LMI_CCITT) ? LMI_CCITT_ALIVE : LMI_ALIVE)) { printk(KERN_INFO "%s: Unsupported status element=%x\n", - hdlc_to_name(hdlc), skb->data[i]); + dev->name, skb->data[i]); return 1; } i++; @@ -680,7 +686,7 @@ if (hdlc->state.fr.settings.dce) { if (reptype != LMI_FULLREP && reptype != LMI_INTEGRITY) { printk(KERN_INFO "%s: Unsupported report type=%x\n", - hdlc_to_name(hdlc), reptype); + dev->name, reptype); return 1; } } @@ -716,7 +722,7 @@ hdlc->state.fr.dce_changed = 0; } - fr_lmi_send(hdlc, reptype == LMI_FULLREP ? 1 : 0); + fr_lmi_send(dev, reptype == LMI_FULLREP ? 1 : 0); return 0; } @@ -741,26 +747,26 @@ if (skb->data[i] != ((hdlc->state.fr.settings.lmi == LMI_CCITT) ? LMI_CCITT_PVCSTAT : LMI_PVCSTAT)) { printk(KERN_WARNING "%s: Invalid PVCSTAT ID: %x\n", - hdlc_to_name(hdlc), skb->data[i]); + dev->name, skb->data[i]); return 1; } i++; if (skb->data[i] != stat_len) { printk(KERN_WARNING "%s: Invalid PVCSTAT length: %x\n", - hdlc_to_name(hdlc), skb->data[i]); + dev->name, skb->data[i]); return 1; } i++; dlci = status_to_dlci(skb->data + i, &active, &new); - pvc = add_pvc(hdlc, dlci); + pvc = add_pvc(dev, dlci); if (!pvc && !no_ram) { printk(KERN_WARNING "%s: Memory squeeze on fr_lmi_recv()\n", - hdlc_to_name(hdlc)); + dev->name); no_ram = 1; } @@ -802,7 +808,8 @@ static int fr_rx(struct sk_buff *skb) { - hdlc_device *hdlc = dev_to_hdlc(skb->dev); + struct net_device *ndev = skb->dev; + hdlc_device *hdlc = dev_to_hdlc(ndev); fr_hdr *fh = (fr_hdr*)skb->data; u8 *data = skb->data; u16 dlci; @@ -819,7 +826,7 @@ goto rx_error; /* LMI packet with no LMI? */ if (data[3] == LMI_PROTO) { - if (fr_lmi_recv(hdlc, skb)) + if (fr_lmi_recv(ndev, skb)) goto rx_error; else { /* No request pending */ @@ -831,7 +838,7 @@ } printk(KERN_INFO "%s: Received non-LMI frame with LMI DLCI\n", - hdlc_to_name(hdlc)); + ndev->name); goto rx_error; } @@ -839,7 +846,7 @@ if (!pvc) { #ifdef DEBUG_PKT printk(KERN_INFO "%s: No PVC for received frame's DLCI %d\n", - hdlc_to_name(hdlc), dlci); + ndev->name, dlci); #endif dev_kfree_skb_any(skb); return NET_RX_DROP; @@ -847,7 +854,7 @@ if (pvc->state.fecn != fh->fecn) { #ifdef DEBUG_ECN - printk(KERN_DEBUG "%s: DLCI %d FECN O%s\n", hdlc_to_name(pvc), + printk(KERN_DEBUG "%s: DLCI %d FECN O%s\n", ndev->name, dlci, fh->fecn ? "N" : "FF"); #endif pvc->state.fecn ^= 1; @@ -855,7 +862,7 @@ if (pvc->state.becn != fh->becn) { #ifdef DEBUG_ECN - printk(KERN_DEBUG "%s: DLCI %d BECN O%s\n", hdlc_to_name(pvc), + printk(KERN_DEBUG "%s: DLCI %d BECN O%s\n", ndev->name, dlci, fh->becn ? "N" : "FF"); #endif pvc->state.becn ^= 1; @@ -899,13 +906,13 @@ default: printk(KERN_INFO "%s: Unsupported protocol, OUI=%x " - "PID=%x\n", hdlc_to_name(hdlc), oui, pid); + "PID=%x\n", ndev->name, oui, pid); dev_kfree_skb_any(skb); return NET_RX_DROP; } } else { printk(KERN_INFO "%s: Unsupported protocol, NLPID=%x " - "length = %i\n", hdlc_to_name(hdlc), data[3], skb->len); + "length = %i\n", ndev->name, data[3], skb->len); dev_kfree_skb_any(skb); return NET_RX_DROP; } @@ -932,14 +939,15 @@ -static void fr_start(hdlc_device *hdlc) +static void fr_start(struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); #ifdef DEBUG_LINK printk(KERN_DEBUG "fr_start\n"); #endif if (hdlc->state.fr.settings.lmi != LMI_NONE) { - if (netif_carrier_ok(&hdlc->netdev)) - netif_carrier_off(&hdlc->netdev); + if (netif_carrier_ok(dev)) + netif_carrier_off(dev); hdlc->state.fr.last_poll = 0; hdlc->state.fr.reliable = 0; hdlc->state.fr.dce_changed = 1; @@ -953,28 +961,30 @@ /* First poll after 1 s */ hdlc->state.fr.timer.expires = jiffies + HZ; hdlc->state.fr.timer.function = fr_timer; - hdlc->state.fr.timer.data = (unsigned long)hdlc; + hdlc->state.fr.timer.data = (unsigned long)dev; add_timer(&hdlc->state.fr.timer); } else - fr_set_link_state(1, hdlc); + fr_set_link_state(1, dev); } -static void fr_stop(hdlc_device *hdlc) +static void fr_stop(struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); #ifdef DEBUG_LINK printk(KERN_DEBUG "fr_stop\n"); #endif if (hdlc->state.fr.settings.lmi != LMI_NONE) del_timer_sync(&hdlc->state.fr.timer); - fr_set_link_state(0, hdlc); + fr_set_link_state(0, dev); } -static void fr_close(hdlc_device *hdlc) +static void fr_close(struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); pvc_device *pvc = hdlc->state.fr.first_pvc; while (pvc) { /* Shutdown all PVCs for this FRAD */ @@ -986,10 +996,17 @@ } } +static void dlci_setup(struct net_device *dev) +{ + dev->type = ARPHRD_DLCI; + dev->flags = IFF_POINTOPOINT; + dev->hard_header_len = 10; + dev->addr_len = 2; +} - -static int fr_add_pvc(hdlc_device *hdlc, unsigned int dlci, int type) +static int fr_add_pvc(struct net_device *master, unsigned int dlci, int type) { + hdlc_device *hdlc = dev_to_hdlc(master); pvc_device *pvc = NULL; struct net_device *dev; int result, used; @@ -998,9 +1015,9 @@ if (type == ARPHRD_ETHER) prefix = "pvceth%d"; - if ((pvc = add_pvc(hdlc, dlci)) == NULL) { + if ((pvc = add_pvc(master, dlci)) == NULL) { printk(KERN_WARNING "%s: Memory squeeze on fr_add_pvc()\n", - hdlc_to_name(hdlc)); + master->name); return -ENOBUFS; } @@ -1009,26 +1026,24 @@ used = pvc_is_used(pvc); - dev = kmalloc(sizeof(struct net_device) + - sizeof(struct net_device_stats), GFP_KERNEL); + if (type == ARPHRD_ETHER) + dev = alloc_netdev(sizeof(struct net_device_stats), + "pvceth%d", ether_setup); + else + dev = alloc_netdev(sizeof(struct net_device_stats), + "pvc%d", dlci_setup); + if (!dev) { printk(KERN_WARNING "%s: Memory squeeze on fr_pvc()\n", - hdlc_to_name(hdlc)); + master->name); delete_unused_pvcs(hdlc); return -ENOBUFS; } - memset(dev, 0, sizeof(struct net_device) + - sizeof(struct net_device_stats)); if (type == ARPHRD_ETHER) { - ether_setup(dev); memcpy(dev->dev_addr, "\x00\x01", 2); get_random_bytes(dev->dev_addr + 2, ETH_ALEN - 2); } else { - dev->type = ARPHRD_DLCI; - dev->flags = IFF_POINTOPOINT; - dev->hard_header_len = 10; - dev->addr_len = 2; *(u16*)dev->dev_addr = htons(dlci); dlci_to_q922(dev->broadcast, dlci); } @@ -1042,15 +1057,15 @@ dev->tx_queue_len = 0; dev->priv = pvc; - result = dev_alloc_name(dev, prefix); + result = dev_alloc_name(dev, dev->name); if (result < 0) { - kfree(dev); + free_netdev(dev); delete_unused_pvcs(hdlc); return result; } if (register_netdevice(dev) != 0) { - kfree(dev); + free_netdev(dev); delete_unused_pvcs(hdlc); return -EIO; } @@ -1080,7 +1095,7 @@ if (dev->flags & IFF_UP) return -EBUSY; /* PVC in use */ - unregister_netdevice(dev); /* the destructor will kfree(dev) */ + unregister_netdevice(dev); /* the destructor will free_netdev(dev) */ *get_dev_p(pvc, type) = NULL; if (!pvc_is_used(pvc)) { @@ -1104,7 +1119,8 @@ while (pvc) { pvc_device *next = pvc->next; - if (pvc->main) /* the destructor will kfree(main + ether) */ + /* destructors will free_netdev() main and ether */ + if (pvc->main) unregister_netdevice(pvc->main); if (pvc->ether) @@ -1117,12 +1133,12 @@ -int hdlc_fr_ioctl(hdlc_device *hdlc, struct ifreq *ifr) +int hdlc_fr_ioctl(struct net_device *dev, struct ifreq *ifr) { fr_proto *fr_s = ifr->ifr_settings.ifs_ifsu.fr; const size_t size = sizeof(fr_proto); fr_proto new_settings; - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); fr_proto_pvc pvc; int result; @@ -1163,7 +1179,7 @@ new_settings.dce != 1)) return -EINVAL; - result=hdlc->attach(hdlc, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); + result=hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); if (result) return result; @@ -1210,7 +1226,7 @@ if (ifr->ifr_settings.type == IF_PROTO_FR_ADD_PVC || ifr->ifr_settings.type == IF_PROTO_FR_ADD_ETH_PVC) - return fr_add_pvc(hdlc, pvc.dlci, result); + return fr_add_pvc(dev, pvc.dlci, result); else return fr_del_pvc(hdlc, pvc.dlci, result); } diff -Nru a/drivers/net/wan/hdlc_generic.c b/drivers/net/wan/hdlc_generic.c --- a/drivers/net/wan/hdlc_generic.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/hdlc_generic.c Thu Feb 19 23:44:23 2004 @@ -50,7 +50,7 @@ static struct net_device_stats *hdlc_get_stats(struct net_device *dev) { - return &dev_to_hdlc(dev)->stats; + return hdlc_stats(dev); } @@ -69,8 +69,9 @@ -void hdlc_set_carrier(int on, hdlc_device *hdlc) +void hdlc_set_carrier(int on, struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); on = on ? 1 : 0; #ifdef DEBUG_LINK @@ -82,7 +83,7 @@ if (hdlc->carrier == on) goto carrier_exit; /* no change in DCD line level */ - printk(KERN_INFO "%s: carrier %s\n", hdlc_to_name(hdlc), + printk(KERN_INFO "%s: carrier %s\n", dev->name, on ? "ON" : "off"); hdlc->carrier = on; @@ -91,15 +92,15 @@ if (hdlc->carrier) { if (hdlc->proto.start) - hdlc->proto.start(hdlc); - else if (!netif_carrier_ok(&hdlc->netdev)) - netif_carrier_on(&hdlc->netdev); + hdlc->proto.start(dev); + else if (!netif_carrier_ok(dev)) + netif_carrier_on(dev); } else { /* no carrier */ if (hdlc->proto.stop) - hdlc->proto.stop(hdlc); - else if (netif_carrier_ok(&hdlc->netdev)) - netif_carrier_off(&hdlc->netdev); + hdlc->proto.stop(dev); + else if (netif_carrier_ok(dev)) + netif_carrier_off(dev); } carrier_exit: @@ -108,8 +109,9 @@ /* Must be called by hardware driver when HDLC device is being opened */ -int hdlc_open(hdlc_device *hdlc) +int hdlc_open(struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); #ifdef DEBUG_LINK printk(KERN_DEBUG "hdlc_open carrier %i open %i\n", hdlc->carrier, hdlc->open); @@ -119,7 +121,7 @@ return -ENOSYS; /* no protocol attached */ if (hdlc->proto.open) { - int result = hdlc->proto.open(hdlc); + int result = hdlc->proto.open(dev); if (result) return result; } @@ -128,12 +130,12 @@ if (hdlc->carrier) { if (hdlc->proto.start) - hdlc->proto.start(hdlc); - else if (!netif_carrier_ok(&hdlc->netdev)) - netif_carrier_on(&hdlc->netdev); + hdlc->proto.start(dev); + else if (!netif_carrier_ok(dev)) + netif_carrier_on(dev); - } else if (netif_carrier_ok(&hdlc->netdev)) - netif_carrier_off(&hdlc->netdev); + } else if (netif_carrier_ok(dev)) + netif_carrier_off(dev); hdlc->open = 1; @@ -144,8 +146,9 @@ /* Must be called by hardware driver when HDLC device is being closed */ -void hdlc_close(hdlc_device *hdlc) +void hdlc_close(struct net_device *dev) { + hdlc_device *hdlc = dev_to_hdlc(dev); #ifdef DEBUG_LINK printk(KERN_DEBUG "hdlc_close carrier %i open %i\n", hdlc->carrier, hdlc->open); @@ -155,38 +158,38 @@ hdlc->open = 0; if (hdlc->carrier && hdlc->proto.stop) - hdlc->proto.stop(hdlc); + hdlc->proto.stop(dev); spin_unlock_irq(&hdlc->state_lock); if (hdlc->proto.close) - hdlc->proto.close(hdlc); + hdlc->proto.close(dev); } #ifndef CONFIG_HDLC_RAW -#define hdlc_raw_ioctl(hdlc, ifr) -ENOSYS +#define hdlc_raw_ioctl(dev, ifr) -ENOSYS #endif #ifndef CONFIG_HDLC_RAW_ETH -#define hdlc_raw_eth_ioctl(hdlc, ifr) -ENOSYS +#define hdlc_raw_eth_ioctl(dev, ifr) -ENOSYS #endif #ifndef CONFIG_HDLC_PPP -#define hdlc_ppp_ioctl(hdlc, ifr) -ENOSYS +#define hdlc_ppp_ioctl(dev, ifr) -ENOSYS #endif #ifndef CONFIG_HDLC_CISCO -#define hdlc_cisco_ioctl(hdlc, ifr) -ENOSYS +#define hdlc_cisco_ioctl(dev, ifr) -ENOSYS #endif #ifndef CONFIG_HDLC_FR -#define hdlc_fr_ioctl(hdlc, ifr) -ENOSYS +#define hdlc_fr_ioctl(dev, ifr) -ENOSYS #endif #ifndef CONFIG_HDLC_X25 -#define hdlc_x25_ioctl(hdlc, ifr) -ENOSYS +#define hdlc_x25_ioctl(dev, ifr) -ENOSYS #endif @@ -213,22 +216,49 @@ } switch(proto) { - case IF_PROTO_HDLC: return hdlc_raw_ioctl(hdlc, ifr); - case IF_PROTO_HDLC_ETH: return hdlc_raw_eth_ioctl(hdlc, ifr); - case IF_PROTO_PPP: return hdlc_ppp_ioctl(hdlc, ifr); - case IF_PROTO_CISCO: return hdlc_cisco_ioctl(hdlc, ifr); - case IF_PROTO_FR: return hdlc_fr_ioctl(hdlc, ifr); - case IF_PROTO_X25: return hdlc_x25_ioctl(hdlc, ifr); + case IF_PROTO_HDLC: return hdlc_raw_ioctl(dev, ifr); + case IF_PROTO_HDLC_ETH: return hdlc_raw_eth_ioctl(dev, ifr); + case IF_PROTO_PPP: return hdlc_ppp_ioctl(dev, ifr); + case IF_PROTO_CISCO: return hdlc_cisco_ioctl(dev, ifr); + case IF_PROTO_FR: return hdlc_fr_ioctl(dev, ifr); + case IF_PROTO_X25: return hdlc_x25_ioctl(dev, ifr); default: return -EINVAL; } } +static void hdlc_setup(struct net_device *dev) +{ + hdlc_device *hdlc = dev_to_hdlc(dev); + + dev->get_stats = hdlc_get_stats; + dev->change_mtu = hdlc_change_mtu; + dev->mtu = HDLC_MAX_MTU; + + dev->type = ARPHRD_RAWHDLC; + dev->hard_header_len = 16; + + dev->flags = IFF_POINTOPOINT | IFF_NOARP; + + hdlc->proto.id = -1; + hdlc->proto.detach = NULL; + hdlc->carrier = 1; + hdlc->open = 0; + spin_lock_init(&hdlc->state_lock); +} +struct net_device *alloc_hdlcdev(void *priv) +{ + struct net_device *dev; + dev = alloc_netdev(sizeof(hdlc_device), "hdlc%d", hdlc_setup); + if (dev) + dev_to_hdlc(dev)->priv = priv; + return dev; +} -int register_hdlc_device(hdlc_device *hdlc) +int register_hdlc_device(struct net_device *dev) { int result; - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); dev->get_stats = hdlc_get_stats; dev->change_mtu = hdlc_change_mtu; @@ -258,11 +288,11 @@ -void unregister_hdlc_device(hdlc_device *hdlc) +void unregister_hdlc_device(struct net_device *dev) { rtnl_lock(); - hdlc_proto_detach(hdlc); - unregister_netdevice(hdlc_to_dev(hdlc)); + hdlc_proto_detach(dev_to_hdlc(dev)); + unregister_netdevice(dev); rtnl_unlock(); } @@ -276,6 +306,7 @@ EXPORT_SYMBOL(hdlc_close); EXPORT_SYMBOL(hdlc_set_carrier); EXPORT_SYMBOL(hdlc_ioctl); +EXPORT_SYMBOL(alloc_hdlcdev); EXPORT_SYMBOL(register_hdlc_device); EXPORT_SYMBOL(unregister_hdlc_device); diff -Nru a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c --- a/drivers/net/wan/hdlc_ppp.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/hdlc_ppp.c Thu Feb 19 23:44:23 2004 @@ -24,9 +24,9 @@ #include -static int ppp_open(hdlc_device *hdlc) +static int ppp_open(struct net_device *dev) { - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); void *old_ioctl; int result; @@ -52,9 +52,9 @@ -static void ppp_close(hdlc_device *hdlc) +static void ppp_close(struct net_device *dev) { - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); sppp_close(dev); sppp_detach(dev); @@ -74,9 +74,9 @@ -int hdlc_ppp_ioctl(hdlc_device *hdlc, struct ifreq *ifr) +int hdlc_ppp_ioctl(struct net_device *dev, struct ifreq *ifr) { - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); int result; switch (ifr->ifr_settings.type) { @@ -93,7 +93,7 @@ /* no settable parameters */ - result=hdlc->attach(hdlc, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); + result=hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); if (result) return result; diff -Nru a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c --- a/drivers/net/wan/hdlc_raw.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/wan/hdlc_raw.c Thu Feb 19 23:44:26 2004 @@ -32,12 +32,12 @@ -int hdlc_raw_ioctl(hdlc_device *hdlc, struct ifreq *ifr) +int hdlc_raw_ioctl(struct net_device *dev, struct ifreq *ifr) { raw_hdlc_proto *raw_s = ifr->ifr_settings.ifs_ifsu.raw_hdlc; const size_t size = sizeof(raw_hdlc_proto); raw_hdlc_proto new_settings; - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); int result; switch (ifr->ifr_settings.type) { @@ -67,7 +67,7 @@ if (new_settings.parity == PARITY_DEFAULT) new_settings.parity = PARITY_CRC16_PR1_CCITT; - result = hdlc->attach(hdlc, new_settings.encoding, + result = hdlc->attach(dev, new_settings.encoding, new_settings.parity); if (result) return result; diff -Nru a/drivers/net/wan/hdlc_raw_eth.c b/drivers/net/wan/hdlc_raw_eth.c --- a/drivers/net/wan/hdlc_raw_eth.c Thu Feb 19 23:44:25 2004 +++ b/drivers/net/wan/hdlc_raw_eth.c Thu Feb 19 23:44:25 2004 @@ -33,7 +33,7 @@ int len = skb->len; if (skb_tailroom(skb) < pad) if (pskb_expand_head(skb, 0, pad, GFP_ATOMIC)) { - dev_to_hdlc(dev)->stats.tx_dropped++; + hdlc_stats(dev)->tx_dropped++; dev_kfree_skb(skb); return 0; } @@ -44,12 +44,12 @@ } -int hdlc_raw_eth_ioctl(hdlc_device *hdlc, struct ifreq *ifr) +int hdlc_raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr) { raw_hdlc_proto *raw_s = ifr->ifr_settings.ifs_ifsu.raw_hdlc; const size_t size = sizeof(raw_hdlc_proto); raw_hdlc_proto new_settings; - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); int result; void *old_ch_mtu; int old_qlen; @@ -81,7 +81,7 @@ if (new_settings.parity == PARITY_DEFAULT) new_settings.parity = PARITY_CRC16_PR1_CCITT; - result = hdlc->attach(hdlc, new_settings.encoding, + result = hdlc->attach(dev, new_settings.encoding, new_settings.parity); if (result) return result; diff -Nru a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c --- a/drivers/net/wan/hdlc_x25.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/wan/hdlc_x25.c Thu Feb 19 23:44:28 2004 @@ -25,21 +25,20 @@ /* These functions are callbacks called by LAPB layer */ -static void x25_connect_disconnect(void *token, int reason, int code) +static void x25_connect_disconnect(struct net_device *dev, int reason, int code) { - hdlc_device *hdlc = token; struct sk_buff *skb; unsigned char *ptr; if ((skb = dev_alloc_skb(1)) == NULL) { - printk(KERN_ERR "%s: out of memory\n", hdlc_to_name(hdlc)); + printk(KERN_ERR "%s: out of memory\n", dev->name); return; } ptr = skb_put(skb, 1); *ptr = code; - skb->dev = hdlc_to_dev(hdlc); + skb->dev = dev; skb->protocol = htons(ETH_P_X25); skb->mac.raw = skb->data; skb->pkt_type = PACKET_HOST; @@ -49,23 +48,22 @@ -static void x25_connected(void *token, int reason) +static void x25_connected(struct net_device *dev, int reason) { - x25_connect_disconnect(token, reason, 1); + x25_connect_disconnect(dev, reason, 1); } -static void x25_disconnected(void *token, int reason) +static void x25_disconnected(struct net_device *dev, int reason) { - x25_connect_disconnect(token, reason, 2); + x25_connect_disconnect(dev, reason, 2); } -static int x25_data_indication(void *token, struct sk_buff *skb) +static int x25_data_indication(struct net_device *dev, struct sk_buff *skb) { - hdlc_device *hdlc = token; unsigned char *ptr; skb_push(skb, 1); @@ -76,7 +74,7 @@ ptr = skb->data; *ptr = 0; - skb->dev = hdlc_to_dev(hdlc); + skb->dev = dev; skb->protocol = htons(ETH_P_X25); skb->mac.raw = skb->data; skb->pkt_type = PACKET_HOST; @@ -86,17 +84,16 @@ -static void x25_data_transmit(void *token, struct sk_buff *skb) +static void x25_data_transmit(struct net_device *dev, struct sk_buff *skb) { - hdlc_device *hdlc = token; - hdlc->xmit(skb, hdlc_to_dev(hdlc)); /* Ignore return value :-( */ + hdlc_device *hdlc = dev_to_hdlc(dev); + hdlc->xmit(skb, dev); /* Ignore return value :-( */ } static int x25_xmit(struct sk_buff *skb, struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); int result; @@ -104,31 +101,31 @@ switch (skb->data[0]) { case 0: /* Data to be transmitted */ skb_pull(skb, 1); - if ((result = lapb_data_request(hdlc, skb)) != LAPB_OK) + if ((result = lapb_data_request(dev, skb)) != LAPB_OK) dev_kfree_skb(skb); return 0; case 1: - if ((result = lapb_connect_request(hdlc))!= LAPB_OK) { + if ((result = lapb_connect_request(dev))!= LAPB_OK) { if (result == LAPB_CONNECTED) /* Send connect confirm. msg to level 3 */ - x25_connected(hdlc, 0); + x25_connected(dev, 0); else printk(KERN_ERR "%s: LAPB connect request " "failed, error code = %i\n", - hdlc_to_name(hdlc), result); + dev->name, result); } break; case 2: - if ((result = lapb_disconnect_request(hdlc)) != LAPB_OK) { + if ((result = lapb_disconnect_request(dev)) != LAPB_OK) { if (result == LAPB_NOTCONNECTED) /* Send disconnect confirm. msg to level 3 */ - x25_disconnected(hdlc, 0); + x25_disconnected(dev, 0); else printk(KERN_ERR "%s: LAPB disconnect request " "failed, error code = %i\n", - hdlc_to_name(hdlc), result); + dev->name, result); } break; @@ -142,7 +139,7 @@ -static int x25_open(hdlc_device *hdlc) +static int x25_open(struct net_device *dev) { struct lapb_register_struct cb; int result; @@ -154,7 +151,7 @@ cb.data_indication = x25_data_indication; cb.data_transmit = x25_data_transmit; - result = lapb_register(hdlc, &cb); + result = lapb_register(dev, &cb); if (result != LAPB_OK) return result; return 0; @@ -162,9 +159,9 @@ -static void x25_close(hdlc_device *hdlc) +static void x25_close(struct net_device *dev) { - lapb_unregister(hdlc); + lapb_unregister(dev); } @@ -178,7 +175,7 @@ return NET_RX_DROP; } - if (lapb_data_received(hdlc, skb) == LAPB_OK) + if (lapb_data_received(skb->dev, skb) == LAPB_OK) return NET_RX_SUCCESS; hdlc->stats.rx_errors++; @@ -188,9 +185,9 @@ -int hdlc_x25_ioctl(hdlc_device *hdlc, struct ifreq *ifr) +int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr) { - struct net_device *dev = hdlc_to_dev(hdlc); + hdlc_device *hdlc = dev_to_hdlc(dev); int result; switch (ifr->ifr_settings.type) { @@ -205,7 +202,7 @@ if(dev->flags & IFF_UP) return -EBUSY; - result=hdlc->attach(hdlc, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); + result=hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT); if (result) return result; diff -Nru a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c --- a/drivers/net/wan/hostess_sv11.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/wan/hostess_sv11.c Thu Feb 19 23:44:26 2004 @@ -122,7 +122,6 @@ */ netif_start_queue(d); - MOD_INC_USE_COUNT; return 0; } @@ -154,7 +153,6 @@ z8530_sync_txdma_close(d, &sv11->sync.chanA); break; } - MOD_DEC_USE_COUNT; return 0; } @@ -203,6 +201,16 @@ return 0; } +static void sv11_setup(struct net_device *dev) +{ + dev->open = hostess_open; + dev->stop = hostess_close; + dev->hard_start_xmit = hostess_queue_xmit; + dev->get_stats = hostess_get_stats; + dev->do_ioctl = hostess_ioctl; + dev->neigh_setup = hostess_neigh_setup_dev; +} + /* * Description block for a Comtrol Hostess SV11 card */ @@ -229,10 +237,12 @@ memset(sv, 0, sizeof(*sv)); sv->if_ptr=&sv->netdev; - sv->netdev.dev=(struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL); + sv->netdev.dev = alloc_netdev(0, "hdlc%d", sv11_setup); if(!sv->netdev.dev) goto fail2; + SET_MODULE_OWNER(sv->netdev.dev); + dev=&sv->sync; /* @@ -326,23 +336,14 @@ d->base_addr = iobase; d->irq = irq; d->priv = sv; - d->init = NULL; - - d->open = hostess_open; - d->stop = hostess_close; - d->hard_start_xmit = hostess_queue_xmit; - d->get_stats = hostess_get_stats; - d->set_multicast_list = NULL; - d->do_ioctl = hostess_ioctl; - d->neigh_setup = hostess_neigh_setup_dev; - d->set_mac_address = NULL; if(register_netdev(d)) { printk(KERN_ERR "%s: unable to register device.\n", d->name); - goto fail; - } + sppp_detach(d); + goto dmafail2; + } z8530_describe(dev, "I/O", iobase); dev->active=1; @@ -357,7 +358,7 @@ fail: free_irq(irq, dev); fail1: - kfree(sv->netdev.dev); + free_netdev(sv->netdev.dev); fail2: kfree(sv); fail3: @@ -368,8 +369,8 @@ static void sv11_shutdown(struct sv11_device *dev) { sppp_detach(dev->netdev.dev); - z8530_shutdown(&dev->sync); unregister_netdev(dev->netdev.dev); + z8530_shutdown(&dev->sync); free_irq(dev->sync.irq, dev); if(dma) { @@ -378,6 +379,8 @@ free_dma(dev->sync.chanA.txdma); } release_region(dev->sync.chanA.ctrlio-1, 8); + free_netdev(dev->netdev.dev); + kfree(dev); } #ifdef MODULE diff -Nru a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c --- a/drivers/net/wan/lapbether.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/wan/lapbether.c Thu Feb 19 23:44:24 2004 @@ -110,7 +110,7 @@ skb_pull(skb, 2); /* Remove the length bytes */ skb_trim(skb, len); /* Set the length of the data */ - if ((err = lapb_data_received(lapbeth, skb)) != LAPB_OK) { + if ((err = lapb_data_received(lapbeth->axdev, skb)) != LAPB_OK) { printk(KERN_DEBUG "lapbether: lapb_data_received err - %d\n", err); goto drop_unlock; } @@ -125,9 +125,8 @@ return 0; } -static int lapbeth_data_indication(void *token, struct sk_buff *skb) +static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb) { - struct lapbethdev *lapbeth = (struct lapbethdev *)token; unsigned char *ptr; skb_push(skb, 1); @@ -138,7 +137,7 @@ ptr = skb->data; *ptr = 0x00; - skb->dev = lapbeth->axdev; + skb->dev = dev; skb->protocol = htons(ETH_P_X25); skb->mac.raw = skb->data; skb->pkt_type = PACKET_HOST; @@ -152,7 +151,6 @@ */ static int lapbeth_xmit(struct sk_buff *skb, struct net_device *dev) { - struct lapbethdev *lapbeth = (struct lapbethdev *)dev->priv; int err = -ENODEV; /* @@ -168,12 +166,12 @@ err = 0; break; case 0x01: - if ((err = lapb_connect_request(lapbeth)) != LAPB_OK) + if ((err = lapb_connect_request(dev)) != LAPB_OK) printk(KERN_ERR "lapbeth: lapb_connect_request " "error: %d\n", err); goto drop_ok; case 0x02: - if ((err = lapb_disconnect_request(lapbeth)) != LAPB_OK) + if ((err = lapb_disconnect_request(dev)) != LAPB_OK) printk(KERN_ERR "lapbeth: lapb_disconnect_request " "err: %d\n", err); /* Fall thru */ @@ -183,7 +181,7 @@ skb_pull(skb, 1); - if ((err = lapb_data_request(lapbeth, skb)) != LAPB_OK) { + if ((err = lapb_data_request(dev, skb)) != LAPB_OK) { printk(KERN_ERR "lapbeth: lapb_data_request error - %d\n", err); err = -ENOMEM; goto drop; @@ -198,9 +196,9 @@ goto out; } -static void lapbeth_data_transmit(void *token, struct sk_buff *skb) +static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb) { - struct lapbethdev *lapbeth = (struct lapbethdev *)token; + struct lapbethdev *lapbeth = ndev->priv; unsigned char *ptr; struct net_device *dev; int size = skb->len; @@ -222,9 +220,8 @@ dev_queue_xmit(skb); } -static void lapbeth_connected(void *token, int reason) +static void lapbeth_connected(struct net_device *dev, int reason) { - struct lapbethdev *lapbeth = (struct lapbethdev *)token; unsigned char *ptr; struct sk_buff *skb = dev_alloc_skb(1); @@ -236,7 +233,7 @@ ptr = skb_put(skb, 1); *ptr = 0x01; - skb->dev = lapbeth->axdev; + skb->dev = dev; skb->protocol = htons(ETH_P_X25); skb->mac.raw = skb->data; skb->pkt_type = PACKET_HOST; @@ -245,9 +242,8 @@ netif_rx(skb); } -static void lapbeth_disconnected(void *token, int reason) +static void lapbeth_disconnected(struct net_device *dev, int reason) { - struct lapbethdev *lapbeth = (struct lapbethdev *)token; unsigned char *ptr; struct sk_buff *skb = dev_alloc_skb(1); @@ -259,7 +255,7 @@ ptr = skb_put(skb, 1); *ptr = 0x02; - skb->dev = lapbeth->axdev; + skb->dev = dev; skb->protocol = htons(ETH_P_X25); skb->mac.raw = skb->data; skb->pkt_type = PACKET_HOST; @@ -303,11 +299,9 @@ */ static int lapbeth_open(struct net_device *dev) { - struct lapbethdev *lapbeth; int err; - lapbeth = (struct lapbethdev *)dev->priv; - if ((err = lapb_register(lapbeth, &lapbeth_callbacks)) != LAPB_OK) { + if ((err = lapb_register(dev, &lapbeth_callbacks)) != LAPB_OK) { printk(KERN_ERR "lapbeth: lapb_register error - %d\n", err); return -ENODEV; } @@ -318,12 +312,11 @@ static int lapbeth_close(struct net_device *dev) { - struct lapbethdev *lapbeth = (struct lapbethdev *)dev->priv; int err; netif_stop_queue(dev); - if ((err = lapb_unregister(lapbeth)) != LAPB_OK) + if ((err = lapb_unregister(dev)) != LAPB_OK) printk(KERN_ERR "lapbeth: lapb_unregister error - %d\n", err); return 0; @@ -382,6 +375,7 @@ return rc; fail: dev_put(dev); + free_netdev(ndev); kfree(lapbeth); goto out; } diff -Nru a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c --- a/drivers/net/wan/n2.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/n2.c Thu Feb 19 23:44:23 2004 @@ -92,7 +92,7 @@ typedef struct port_s { - hdlc_device hdlc; /* HDLC device struct - must be first */ + struct net_device *dev; struct card_s *card; spinlock_t lock; /* TX lock */ sync_serial_settings settings; @@ -215,13 +215,12 @@ static int n2_open(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); int io = port->card->io; u8 mcr = inb(io + N2_MCR) | (port->phy_node ? TX422_PORT1:TX422_PORT0); int result; - result = hdlc_open(hdlc); + result = hdlc_open(dev); if (result) return result; @@ -230,7 +229,7 @@ outb(inb(io + N2_PCR) | PCR_ENWIN, io + N2_PCR); /* open window */ outb(inb(io + N2_PSR) | PSR_DMAEN, io + N2_PSR); /* enable dma */ - sca_open(hdlc); + sca_open(dev); n2_set_iface(port); return 0; } @@ -239,15 +238,14 @@ static int n2_close(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); int io = port->card->io; u8 mcr = inb(io+N2_MCR) | (port->phy_node ? TX422_PORT1 : TX422_PORT0); - sca_close(hdlc); + sca_close(dev); mcr |= port->phy_node ? DTR_PORT1 : DTR_PORT0; /* set DTR OFF */ outb(mcr, io + N2_MCR); - hdlc_close(hdlc); + hdlc_close(dev); return 0; } @@ -257,12 +255,11 @@ { const size_t size = sizeof(sync_serial_settings); sync_serial_settings new_line, *line = ifr->ifr_settings.ifs_ifsu.sync; - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); #ifdef DEBUG_RINGS if (cmd == SIOCDEVPRIVATE) { - sca_dump_rings(hdlc); + sca_dump_rings(dev); return 0; } #endif @@ -312,8 +309,10 @@ int cnt; for (cnt = 0; cnt < 2; cnt++) - if (card->ports[cnt].card) - unregister_hdlc_device(&card->ports[cnt].hdlc); + if (card->ports[cnt].card) { + struct net_device *dev = port_to_dev(&card->ports[cnt]); + unregister_hdlc_device(dev); + } if (card->irq) free_irq(card->irq, card); @@ -325,6 +324,10 @@ if (card->io) release_region(card->io, N2_IOPORTS); + if (card->ports[0].dev) + free_netdev(card->ports[0].dev); + if (card->ports[1].dev) + free_netdev(card->ports[1].dev); kfree(card); } @@ -359,6 +362,14 @@ } memset(card, 0, sizeof(card_t)); + card->ports[0].dev = alloc_hdlcdev(&card->ports[0]); + card->ports[1].dev = alloc_hdlcdev(&card->ports[1]); + if (!card->ports[0].dev || !card->ports[1].dev) { + printk(KERN_ERR "n2: unable to allocate memory\n"); + n2_destroy_card(card); + return -ENOMEM; + } + if (!request_region(io, N2_IOPORTS, devname)) { printk(KERN_ERR "n2: I/O port region in use\n"); n2_destroy_card(card); @@ -435,7 +446,8 @@ sca_init(card, 0); for (cnt = 0; cnt < 2; cnt++) { port_t *port = &card->ports[cnt]; - struct net_device *dev = hdlc_to_dev(&port->hdlc); + struct net_device *dev = port_to_dev(port); + hdlc_device *hdlc = dev_to_hdlc(dev); if ((cnt == 0 && !valid0) || (cnt == 1 && !valid1)) continue; @@ -455,21 +467,22 @@ dev->do_ioctl = n2_ioctl; dev->open = n2_open; dev->stop = n2_close; - port->hdlc.attach = sca_attach; - port->hdlc.xmit = sca_xmit; + hdlc->attach = sca_attach; + hdlc->xmit = sca_xmit; port->settings.clock_type = CLOCK_EXT; + port->card = card; - if (register_hdlc_device(&port->hdlc)) { + if (register_hdlc_device(dev)) { printk(KERN_WARNING "n2: unable to register hdlc " "device\n"); + port->card = NULL; n2_destroy_card(card); return -ENOBUFS; } - port->card = card; sca_init_sync_port(port); /* Set up SCA memory */ printk(KERN_INFO "%s: RISCom/N2 node %d\n", - hdlc_to_name(&port->hdlc), port->phy_node); + dev->name, port->phy_node); } *new_card = card; diff -Nru a/drivers/net/wan/pc300.h b/drivers/net/wan/pc300.h --- a/drivers/net/wan/pc300.h Thu Feb 19 23:44:24 2004 +++ b/drivers/net/wan/pc300.h Thu Feb 19 23:44:24 2004 @@ -331,7 +331,7 @@ uclong line_off; #ifdef __KERNEL__ char name[16]; - hdlc_device *hdlc; + struct net_device *dev; void *private; struct sk_buff *tx_skb; @@ -483,7 +483,7 @@ void tx_dma_stop(pc300_t *, int); void rx_dma_stop(pc300_t *, int); int cpc_queue_xmit(struct sk_buff *, struct net_device *); -void cpc_net_rx(hdlc_device *); +void cpc_net_rx(struct net_device *); void cpc_sca_status(pc300_t *, int); int cpc_change_mtu(struct net_device *, int); int cpc_ioctl(struct net_device *, struct ifreq *, int); diff -Nru a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c --- a/drivers/net/wan/pc300_drv.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/wan/pc300_drv.c Thu Feb 19 23:44:28 2004 @@ -290,7 +290,7 @@ static uclong detect_ram(pc300_t *); static void plx_init(pc300_t *); static void cpc_trace(struct net_device *, struct sk_buff *, char); -static int cpc_attach(hdlc_device *, unsigned short, unsigned short); +static int cpc_attach(struct net_device *, unsigned short, unsigned short); #ifdef CONFIG_PC300_MLPPP void cpc_tty_init(pc300dev_t * dev); @@ -1774,7 +1774,7 @@ pc300dev_t *d = (pc300dev_t *) dev->priv; pc300ch_t *chan = (pc300ch_t *) d->chan; pc300_t *card = (pc300_t *) chan->card; - struct net_device_stats *stats = &d->hdlc->stats; + struct net_device_stats *stats = hdlc_stats(dev); int ch = chan->channel; uclong flags; ucchar ilar; @@ -1802,7 +1802,7 @@ pc300dev_t *d = (pc300dev_t *) dev->priv; pc300ch_t *chan = (pc300ch_t *) d->chan; pc300_t *card = (pc300_t *) chan->card; - struct net_device_stats *stats = &d->hdlc->stats; + struct net_device_stats *stats = hdlc_stats(dev); int ch = chan->channel; uclong flags; #ifdef PC300_DEBUG_TX @@ -1880,13 +1880,12 @@ return 0; } -void cpc_net_rx(hdlc_device * hdlc) +void cpc_net_rx(struct net_device *dev) { - struct net_device *dev = hdlc_to_dev(hdlc); pc300dev_t *d = (pc300dev_t *) dev->priv; pc300ch_t *chan = (pc300ch_t *) d->chan; pc300_t *card = (pc300_t *) chan->card; - struct net_device_stats *stats = &d->hdlc->stats; + struct net_device_stats *stats = hdlc_stats(dev); int ch = chan->channel; #ifdef PC300_DEBUG_RX int i; @@ -1975,7 +1974,7 @@ pc300_t *card = (pc300_t *)chan->card; int ch = chan->channel; volatile pcsca_bd_t * ptdescr; - struct net_device_stats *stats = &dev->hdlc->stats; + struct net_device_stats *stats = hdlc_stats(dev->dev); /* Clean up descriptors from previous transmission */ ptdescr = (pcsca_bd_t *)(card->hw.rambase + @@ -1999,7 +1998,7 @@ } else { #endif /* Tell the upper layer we are ready to transmit more packets */ - netif_wake_queue((struct net_device*)dev->hdlc); + netif_wake_queue(dev->dev); #ifdef CONFIG_PC300_MLPPP } #endif @@ -2017,8 +2016,8 @@ for (ch = 0; ch < card->hw.nchan; ch++) { pc300ch_t *chan = &card->chan[ch]; pc300dev_t *d = &chan->d; - hdlc_device *hdlc = d->hdlc; - struct net_device *dev = hdlc_to_dev(hdlc); + struct net_device *dev = d->dev; + hdlc_device *hdlc = dev_to_hdlc(dev); spin_lock(&card->card_lock); @@ -2049,7 +2048,7 @@ if ((cpc_readb(scabase + DSR_RX(ch)) & DSR_DE)) { rx_dma_stop(card, ch); } - cpc_net_rx(hdlc); + cpc_net_rx(dev); /* Discard invalid frames */ hdlc->stats.rx_errors++; hdlc->stats.rx_over_errors++; @@ -2073,10 +2072,10 @@ /* verify if driver is TTY */ cpc_tty_receive(d); } else { - cpc_net_rx(hdlc); + cpc_net_rx(dev); } #else - cpc_net_rx(hdlc); + cpc_net_rx(dev); #endif if (card->hw.type == PC300_TE) { cpc_writeb(card->hw.falcbase + @@ -2829,12 +2828,7 @@ static struct net_device_stats *cpc_get_stats(struct net_device *dev) { - pc300dev_t *d = (pc300dev_t *) dev->priv; - - if (d) - return &d->hdlc->stats; - else - return NULL; + return hdlc_stats(dev); } static int clock_rate_calc(uclong rate, uclong clock, int *br_io) @@ -3075,10 +3069,9 @@ return 0; } -static int cpc_attach(hdlc_device * hdlc, unsigned short encoding, +static int cpc_attach(struct net_device *dev, unsigned short encoding, unsigned short parity) { - struct net_device * dev = hdlc_to_dev(hdlc); pc300dev_t *d = (pc300dev_t *)dev->priv; pc300ch_t *chan = (pc300ch_t *)d->chan; pc300_t *card = (pc300_t *)chan->card; @@ -3168,7 +3161,7 @@ d->if_ptr = &hdlc->state.ppp.pppdev; } - result = hdlc_open(hdlc); + result = hdlc_open(dev); if (hdlc->proto.id == IF_PROTO_PPP) { dev->priv = d; } @@ -3200,7 +3193,7 @@ cpc_closech(d); CPC_UNLOCK(card, flags); - hdlc_close(hdlc); + hdlc_close(dev); if (hdlc->proto.id == IF_PROTO_PPP) { d->if_ptr = NULL; } @@ -3369,17 +3362,14 @@ d->line_on = 0; d->line_off = 0; - d->hdlc = (hdlc_device *) kmalloc(sizeof(hdlc_device), GFP_KERNEL); - if (d->hdlc == NULL) + dev = alloc_hdlcdev(NULL); + if (dev == NULL) continue; - memset(d->hdlc, 0, sizeof(hdlc_device)); - hdlc = d->hdlc; + hdlc = dev_to_hdlc(dev); hdlc->xmit = cpc_queue_xmit; hdlc->attach = cpc_attach; - - dev = hdlc_to_dev(hdlc); - + d->dev = dev; dev->mem_start = card->hw.ramphys; dev->mem_end = card->hw.ramphys + card->hw.ramsize - 1; dev->irq = card->hw.irq; @@ -3397,7 +3387,7 @@ dev->change_mtu = cpc_change_mtu; dev->do_ioctl = cpc_ioctl; - if (register_hdlc_device(hdlc) == 0) { + if (register_hdlc_device(dev) == 0) { dev->priv = d; /* We need 'priv', hdlc doesn't */ printk("%s: Cyclades-PC300/", dev->name); switch (card->hw.type) { @@ -3425,8 +3415,7 @@ } else { printk ("Dev%d on card(0x%08lx): unable to allocate i/f name.\n", i + 1, card->hw.ramphys); - *(dev->name) = 0; - kfree(d->hdlc); + free_netdev(dev); continue; } } @@ -3658,7 +3647,7 @@ cpc_readw(card->hw.plxbase + card->hw.intctl_reg) & ~(0x0040)); for (i = 0; i < card->hw.nchan; i++) { - unregister_hdlc_device(card->chan[i].d.hdlc); + unregister_hdlc_device(card->chan[i].d.dev); } iounmap((void *) card->hw.plxbase); iounmap((void *) card->hw.scabase); @@ -3671,6 +3660,9 @@ iounmap((void *) card->hw.falcbase); release_mem_region(card->hw.falcphys, card->hw.falcsize); } + for (i = 0; i < card->hw.nchan; i++) + if (card->chan[i].d.dev); + free_netdev(card->chan[i].d.dev); if (card->hw.irq) free_irq(card->hw.irq, card); kfree(card); diff -Nru a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c --- a/drivers/net/wan/pc300_tty.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/wan/pc300_tty.c Thu Feb 19 23:44:24 2004 @@ -155,7 +155,7 @@ unsigned long flags; CPC_TTY_DBG("%s-tty: Clear signal %x\n", - ((struct net_device*)(pc300dev->hdlc))->name, signal); + pc300dev->dev->name, signal); CPC_TTY_LOCK(card, flags); cpc_writeb(card->hw.scabase + M_REG(CTL,ch), cpc_readb(card->hw.scabase+M_REG(CTL,ch))& signal); @@ -173,7 +173,7 @@ unsigned long flags; CPC_TTY_DBG("%s-tty: Set signal %x\n", - ((struct net_device*)(pc300dev->hdlc))->name, signal); + pc300dev->dev->name, signal); CPC_TTY_LOCK(card, flags); cpc_writeb(card->hw.scabase + M_REG(CTL,ch), cpc_readb(card->hw.scabase+M_REG(CTL,ch))& ~signal); @@ -196,17 +196,17 @@ st_cpc_tty_area * cpc_tty; /* hdlcX - X=interface number */ - port = ((struct net_device*)(pc300dev->hdlc))->name[4] - '0'; + port = pc300dev->dev->name[4] - '0'; if (port >= CPC_TTY_NPORTS) { printk("%s-tty: invalid interface selected (0-%i): %i", - ((struct net_device*)(pc300dev->hdlc))->name, + pc300dev->dev->name, CPC_TTY_NPORTS-1,port); return; } if (cpc_tty_cnt == 0) { /* first TTY connection -> register driver */ CPC_TTY_DBG("%s-tty: driver init, major:%i, minor range:%i=%i\n", - ((struct net_device*)(pc300dev->hdlc))->name, + pc300dev->dev->name, CPC_TTY_MAJOR, CPC_TTY_MINOR_START, CPC_TTY_MINOR_START+CPC_TTY_NPORTS); /* initialize tty driver struct */ @@ -239,7 +239,7 @@ /* register the TTY driver */ if (tty_register_driver(&serial_drv)) { printk("%s-tty: Failed to register serial driver! ", - ((struct net_device*)(pc300dev->hdlc))->name); + pc300dev->dev->name); return; } @@ -251,7 +251,7 @@ if (cpc_tty->state != CPC_TTY_ST_IDLE) { CPC_TTY_DBG("%s-tty: TTY port %i, already in use.\n", - ((struct net_device*)(pc300dev->hdlc))->name,port); + pc300dev->dev->name, port); return; } @@ -268,11 +268,11 @@ pc300dev->cpc_tty = (void *)cpc_tty; - aux = strlen(((struct net_device*)(pc300dev->hdlc))->name); - memcpy(cpc_tty->name,((struct net_device*)(pc300dev->hdlc))->name,aux); + aux = strlen(pc300dev->dev->name); + memcpy(cpc_tty->name, pc300dev->dev->name, aux); memcpy(&cpc_tty->name[aux], "-tty", 5); - cpc_open((struct net_device *)pc300dev->hdlc); + cpc_open(pc300dev->dev); cpc_tty_signal_off(pc300dev, CTL_DTR); CPC_TTY_DBG("%s: Initializing TTY Sync Driver, tty major#%d minor#%i\n", @@ -457,7 +457,7 @@ (from_user)?"from user" : "from kernel",count); pc300chan = (pc300ch_t *)((pc300dev_t*)cpc_tty->pc300dev)->chan; - stats = &((pc300dev_t*)cpc_tty->pc300dev)->hdlc->stats; + stats = hdlc_stats(((pc300dev_t*)cpc_tty->pc300dev)->dev); card = (pc300_t *) pc300chan->card; ch = pc300chan->channel; @@ -756,7 +756,7 @@ pc300_t *card = (pc300_t *)pc300chan->card; int ch = pc300chan->channel; volatile pcsca_bd_t * ptdescr; - struct net_device_stats *stats = &pc300dev->hdlc->stats; + struct net_device_stats *stats = hdlc_stats(pc300dev->dev); int rx_len, rx_aux; volatile unsigned char status; unsigned short first_bd = pc300chan->rx_first_bd; @@ -932,7 +932,7 @@ pc300ch_t *chan = (pc300ch_t *)dev->chan; pc300_t *card = (pc300_t *)chan->card; int ch = chan->channel; - struct net_device_stats *stats = &dev->hdlc->stats; + struct net_device_stats *stats = hdlc_stats(dev->dev); unsigned long flags; volatile pcsca_bd_t * ptdescr; int i, nchar; @@ -1016,19 +1016,18 @@ if ((skb = dev_alloc_skb(10 + len)) == NULL) { /* out of memory */ - CPC_TTY_DBG("%s: tty_trace - out of memory\n", - ((struct net_device *)(dev->hdlc))->name); + CPC_TTY_DBG("%s: tty_trace - out of memory\n", dev->dev->name); return; } skb_put (skb, 10 + len); - skb->dev = (struct net_device *) dev->hdlc; + skb->dev = dev->dev; skb->protocol = htons(ETH_P_CUST); skb->mac.raw = skb->data; skb->pkt_type = PACKET_HOST; skb->len = 10 + len; - memcpy(skb->data,((struct net_device *)(dev->hdlc))->name,5); + memcpy(skb->data,dev->dev->name,5); skb->data[5] = '['; skb->data[6] = rxtx; skb->data[7] = ']'; @@ -1050,15 +1049,14 @@ int res; if ((cpc_tty= (st_cpc_tty_area *) pc300dev->cpc_tty) == 0) { - CPC_TTY_DBG("%s: interface is not TTY\n", - ((struct net_device *)(pc300dev->hdlc))->name); + CPC_TTY_DBG("%s: interface is not TTY\n", pc300dev->dev->name); return; } CPC_TTY_DBG("%s: cpc_tty_unregister_service", cpc_tty->name); if (cpc_tty->pc300dev != pc300dev) { CPC_TTY_DBG("%s: invalid tty ptr=%s\n", - ((struct net_device *)(pc300dev->hdlc))->name, cpc_tty->name); + pc300dev->dev->name, cpc_tty->name); return; } diff -Nru a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c --- a/drivers/net/wan/pci200syn.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/pci200syn.c Thu Feb 19 23:44:23 2004 @@ -73,7 +73,7 @@ typedef struct port_s { - hdlc_device hdlc; /* HDLC device struct - must be first */ + struct net_device *dev; struct card_s *card; spinlock_t lock; /* TX lock */ sync_serial_settings settings; @@ -177,14 +177,13 @@ static int pci200_open(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); - int result = hdlc_open(hdlc); + int result = hdlc_open(dev); if (result) return result; - sca_open(hdlc); + sca_open(dev); pci200_set_iface(port); sca_flush(port_to_card(port)); return 0; @@ -194,10 +193,9 @@ static int pci200_close(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - sca_close(hdlc); + sca_close(dev); sca_flush(port_to_card(dev_to_port(dev))); - hdlc_close(hdlc); + hdlc_close(dev); return 0; } @@ -207,12 +205,11 @@ { const size_t size = sizeof(sync_serial_settings); sync_serial_settings new_line, *line = ifr->ifr_settings.ifs_ifsu.sync; - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); #ifdef DEBUG_RINGS if (cmd == SIOCDEVPRIVATE) { - sca_dump_rings(hdlc); + sca_dump_rings(dev); return 0; } #endif @@ -265,8 +262,10 @@ card_t *card = pci_get_drvdata(pdev); for(i = 0; i < 2; i++) - if (card->ports[i].card) - unregister_hdlc_device(&card->ports[i].hdlc); + if (card->ports[i].card) { + struct net_device *dev = port_to_dev(&card->ports[i]); + unregister_hdlc_device(dev); + } if (card->irq) free_irq(card->irq, card); @@ -281,6 +280,10 @@ pci_release_regions(pdev); pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); + if (card->ports[0].dev) + free_netdev(card->ports[0].dev); + if (card->ports[1].dev) + free_netdev(card->ports[1].dev); kfree(card); } @@ -323,6 +326,13 @@ } memset(card, 0, sizeof(card_t)); pci_set_drvdata(pdev, card); + card->ports[0].dev = alloc_hdlcdev(&card->ports[0]); + card->ports[1].dev = alloc_hdlcdev(&card->ports[1]); + if (!card->ports[0].dev || !card->ports[1].dev) { + printk(KERN_ERR "pci200syn: unable to allocate memory\n"); + pci200_pci_remove_one(pdev); + return -ENOMEM; + } pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id); if (pci_resource_len(pdev, 0) != PCI200SYN_PLX_SIZE || @@ -397,7 +407,8 @@ for(i = 0; i < 2; i++) { port_t *port = &card->ports[i]; - struct net_device *dev = hdlc_to_dev(&port->hdlc); + struct net_device *dev = port_to_dev(port); + hdlc_device *hdlc = dev_to_hdlc(dev); port->phy_node = i; spin_lock_init(&port->lock); @@ -409,20 +420,21 @@ dev->do_ioctl = pci200_ioctl; dev->open = pci200_open; dev->stop = pci200_close; - port->hdlc.attach = sca_attach; - port->hdlc.xmit = sca_xmit; + hdlc->attach = sca_attach; + hdlc->xmit = sca_xmit; port->settings.clock_type = CLOCK_EXT; - if(register_hdlc_device(&port->hdlc)) { + port->card = card; + if(register_hdlc_device(dev)) { printk(KERN_ERR "pci200syn: unable to register hdlc " "device\n"); + port->card = NULL; pci200_pci_remove_one(pdev); return -ENOBUFS; } - port->card = card; sca_init_sync_port(port); /* Set up SCA memory */ printk(KERN_INFO "%s: PCI200SYN node %d\n", - hdlc_to_name(&port->hdlc), port->phy_node); + dev->name, port->phy_node); } sca_flush(card); diff -Nru a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c --- a/drivers/net/wan/sbni.c Thu Feb 19 23:44:24 2004 +++ b/drivers/net/wan/sbni.c Thu Feb 19 23:44:24 2004 @@ -210,7 +210,6 @@ static void __init sbni_devsetup(struct net_device *dev) { ether_setup( dev ); - dev->init = &sbni_init; dev->open = &sbni_open; dev->stop = &sbni_close; dev->hard_start_xmit = &sbni_start_xmit; @@ -234,8 +233,15 @@ sprintf(dev->name, "sbni%d", unit); netdev_boot_setup_check(dev); + err = sbni_init(dev); + if (err) { + free_netdev(dev); + return err; + } + err = register_netdev(dev); if (err) { + release_region( dev->base_addr, SBNI_IO_EXTENT ); free_netdev(dev); return err; } @@ -304,8 +310,13 @@ /* Avoid already found cards from previous calls */ if( !request_region( pci_ioaddr, SBNI_IO_EXTENT, dev->name ) ) { pci_read_config_word( pdev, PCI_SUBSYSTEM_ID, &subsys ); - if( subsys != 2 || /* Dual adapter is present */ - check_region( pci_ioaddr += 4, SBNI_IO_EXTENT ) ) + + if (subsys != 2) + continue; + + /* Dual adapter is present */ + if (!request_region(pci_ioaddr += 4, SBNI_IO_EXTENT, + dev->name ) ) continue; } @@ -318,8 +329,10 @@ pci_irq_line ); /* avoiding re-enable dual adapters */ - if( (pci_ioaddr & 7) == 0 && pci_enable_device( pdev ) ) + if( (pci_ioaddr & 7) == 0 && pci_enable_device( pdev ) ) { + release_region( pci_ioaddr, SBNI_IO_EXTENT ); return -EIO; + } if( sbni_probe1( dev, pci_ioaddr, pci_irq_line ) ) return 0; } @@ -1482,19 +1495,25 @@ init_module( void ) { struct net_device *dev; + int err; while( num < SBNI_MAX_NUM_CARDS ) { dev = alloc_netdev(sizeof(struct net_local), "sbni%d", sbni_devsetup); - if( !dev) { - printk( KERN_ERR "sbni: unable to allocate device!\n" ); - return -ENOMEM; - } + if( !dev) + break; sprintf( dev->name, "sbni%d", num ); + err = sbni_init(dev); + if (err) { + free_netdev(dev); + break; + } + if( register_netdev( dev ) ) { - kfree( dev ); + release_region( dev->base_addr, SBNI_IO_EXTENT ); + free_netdev( dev ); break; } } diff -Nru a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c --- a/drivers/net/wan/sdla.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/wan/sdla.c Thu Feb 19 23:44:28 2004 @@ -1339,6 +1339,8 @@ struct frad_local *flp; int i; char byte; + unsigned base; + int err = -EINVAL; flp = dev->priv; @@ -1352,108 +1354,90 @@ if (i == sizeof(valid_port) / sizeof(int)) return(-EINVAL); - dev->base_addr = map->base_addr; - if (!request_region(dev->base_addr, SDLA_IO_EXTENTS, dev->name)){ + if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){ printk(KERN_WARNING "SDLA: io-port 0x%04lx in use \n", dev->base_addr); return(-EINVAL); } + base = map->base_addr; + /* test for card types, S502A, S502E, S507, S508 */ /* these tests shut down the card completely, so clear the state */ flp->type = SDLA_UNKNOWN; flp->state = 0; for(i=1;ibase_addr + i) != 0xFF) + if (inb(base + i) != 0xFF) break; - if (i == SDLA_IO_EXTENTS) - { - outb(SDLA_HALT, dev->base_addr + SDLA_REG_Z80_CONTROL); - if ((inb(dev->base_addr + SDLA_S502_STS) & 0x0F) == 0x08) - { - outb(SDLA_S502E_INTACK, dev->base_addr + SDLA_REG_CONTROL); - if ((inb(dev->base_addr + SDLA_S502_STS) & 0x0F) == 0x0C) - { - outb(SDLA_HALT, dev->base_addr + SDLA_REG_CONTROL); + if (i == SDLA_IO_EXTENTS) { + outb(SDLA_HALT, base + SDLA_REG_Z80_CONTROL); + if ((inb(base + SDLA_S502_STS) & 0x0F) == 0x08) { + outb(SDLA_S502E_INTACK, base + SDLA_REG_CONTROL); + if ((inb(base + SDLA_S502_STS) & 0x0F) == 0x0C) { + outb(SDLA_HALT, base + SDLA_REG_CONTROL); flp->type = SDLA_S502E; + goto got_type; } } } - if (flp->type == SDLA_UNKNOWN) - { - for(byte=inb(dev->base_addr),i=0;ibase_addr + i) != byte) - break; + for(byte=inb(base),i=0;ibase_addr + SDLA_REG_CONTROL); - if ((inb(dev->base_addr + SDLA_S502_STS) & 0x7E) == 0x30) - { - outb(SDLA_S507_ENABLE, dev->base_addr + SDLA_REG_CONTROL); - if ((inb(dev->base_addr + SDLA_S502_STS) & 0x7E) == 0x32) - { - outb(SDLA_HALT, dev->base_addr + SDLA_REG_CONTROL); - flp->type = SDLA_S507; - } + if (i == SDLA_IO_EXTENTS) { + outb(SDLA_HALT, base + SDLA_REG_CONTROL); + if ((inb(base + SDLA_S502_STS) & 0x7E) == 0x30) { + outb(SDLA_S507_ENABLE, base + SDLA_REG_CONTROL); + if ((inb(base + SDLA_S502_STS) & 0x7E) == 0x32) { + outb(SDLA_HALT, base + SDLA_REG_CONTROL); + flp->type = SDLA_S507; + goto got_type; } } } - if (flp->type == SDLA_UNKNOWN) - { - outb(SDLA_HALT, dev->base_addr + SDLA_REG_CONTROL); - if ((inb(dev->base_addr + SDLA_S508_STS) & 0x3F) == 0x00) - { - outb(SDLA_S508_INTEN, dev->base_addr + SDLA_REG_CONTROL); - if ((inb(dev->base_addr + SDLA_S508_STS) & 0x3F) == 0x10) - { - outb(SDLA_HALT, dev->base_addr + SDLA_REG_CONTROL); - flp->type = SDLA_S508; - } + outb(SDLA_HALT, base + SDLA_REG_CONTROL); + if ((inb(base + SDLA_S508_STS) & 0x3F) == 0x00) { + outb(SDLA_S508_INTEN, base + SDLA_REG_CONTROL); + if ((inb(base + SDLA_S508_STS) & 0x3F) == 0x10) { + outb(SDLA_HALT, base + SDLA_REG_CONTROL); + flp->type = SDLA_S508; + goto got_type; } } - if (flp->type == SDLA_UNKNOWN) - { - outb(SDLA_S502A_HALT, dev->base_addr + SDLA_REG_CONTROL); - if (inb(dev->base_addr + SDLA_S502_STS) == 0x40) - { - outb(SDLA_S502A_START, dev->base_addr + SDLA_REG_CONTROL); - if (inb(dev->base_addr + SDLA_S502_STS) == 0x40) - { - outb(SDLA_S502A_INTEN, dev->base_addr + SDLA_REG_CONTROL); - if (inb(dev->base_addr + SDLA_S502_STS) == 0x44) - { - outb(SDLA_S502A_START, dev->base_addr + SDLA_REG_CONTROL); - flp->type = SDLA_S502A; - } + outb(SDLA_S502A_HALT, base + SDLA_REG_CONTROL); + if (inb(base + SDLA_S502_STS) == 0x40) { + outb(SDLA_S502A_START, base + SDLA_REG_CONTROL); + if (inb(base + SDLA_S502_STS) == 0x40) { + outb(SDLA_S502A_INTEN, base + SDLA_REG_CONTROL); + if (inb(base + SDLA_S502_STS) == 0x44) { + outb(SDLA_S502A_START, base + SDLA_REG_CONTROL); + flp->type = SDLA_S502A; + goto got_type; } } } - if (flp->type == SDLA_UNKNOWN) - { - printk(KERN_NOTICE "%s: Unknown card type\n", dev->name); - return(-ENODEV); - } + printk(KERN_NOTICE "%s: Unknown card type\n", dev->name); + err = -ENODEV; + goto fail; - switch(dev->base_addr) - { +got_type: + switch(base) { case 0x270: case 0x280: case 0x380: case 0x390: - if ((flp->type != SDLA_S508) && (flp->type != SDLA_S507)) - return(-EINVAL); + if (flp->type != SDLA_S508 && flp->type != SDLA_S507) + goto fail; } - switch (map->irq) - { + switch (map->irq) { case 2: if (flp->type != SDLA_S502E) - return(-EINVAL); + goto fail; break; case 10: @@ -1461,28 +1445,26 @@ case 12: case 15: case 4: - if ((flp->type != SDLA_S508) && (flp->type != SDLA_S507)) - return(-EINVAL); - + if (flp->type != SDLA_S508 && flp->type != SDLA_S507) + goto fail; + break; case 3: case 5: case 7: if (flp->type == SDLA_S502A) - return(-EINVAL); + goto fail; break; default: - return(-EINVAL); + goto fail; } - dev->irq = map->irq; + err = -EAGAIN; if (request_irq(dev->irq, &sdla_isr, 0, dev->name, dev)) - return(-EAGAIN); + goto fail; - if (flp->type == SDLA_S507) - { - switch(dev->irq) - { + if (flp->type == SDLA_S507) { + switch(dev->irq) { case 3: flp->state = SDLA_S507_IRQ3; break; @@ -1514,35 +1496,25 @@ if (valid_mem[i] == map->mem_start) break; + err = -EINVAL; if (i == sizeof(valid_mem) / sizeof(int)) - /* - * FIXME: - * BUG BUG BUG: MUST RELEASE THE IRQ WE ALLOCATED IN - * ALL THESE CASES - * - */ - return(-EINVAL); + goto fail2; - if ((flp->type == SDLA_S502A) && (((map->mem_start & 0xF000) >> 12) == 0x0E)) - return(-EINVAL); - - if ((flp->type != SDLA_S507) && ((map->mem_start >> 16) == 0x0B)) - return(-EINVAL); + if (flp->type == SDLA_S502A && (map->mem_start & 0xF000) >> 12 == 0x0E) + goto fail2; - if ((flp->type == SDLA_S507) && ((map->mem_start >> 16) == 0x0D)) - return(-EINVAL); + if (flp->type != SDLA_S507 && map->mem_start >> 16 == 0x0B) + goto fail2; - dev->mem_start = map->mem_start; - dev->mem_end = dev->mem_start + 0x2000; + if (flp->type == SDLA_S507 && map->mem_start >> 16 == 0x0D) + goto fail2; byte = flp->type != SDLA_S508 ? SDLA_8K_WINDOW : 0; byte |= (map->mem_start & 0xF000) >> (12 + (flp->type == SDLA_S508 ? 1 : 0)); - switch(flp->type) - { + switch(flp->type) { case SDLA_S502A: case SDLA_S502E: - switch (map->mem_start >> 16) - { + switch (map->mem_start >> 16) { case 0x0A: byte |= SDLA_S502_SEG_A; break; @@ -1558,8 +1530,7 @@ } break; case SDLA_S507: - switch (map->mem_start >> 16) - { + switch (map->mem_start >> 16) { case 0x0A: byte |= SDLA_S507_SEG_A; break; @@ -1575,8 +1546,7 @@ } break; case SDLA_S508: - switch (map->mem_start >> 16) - { + switch (map->mem_start >> 16) { case 0x0A: byte |= SDLA_S508_SEG_A; break; @@ -1594,7 +1564,7 @@ } /* set the memory bits, and enable access */ - outb(byte, dev->base_addr + SDLA_REG_PC_WINDOW); + outb(byte, base + SDLA_REG_PC_WINDOW); switch(flp->type) { @@ -1608,10 +1578,20 @@ flp->state = SDLA_MEMEN; break; } - outb(flp->state, dev->base_addr + SDLA_REG_CONTROL); + outb(flp->state, base + SDLA_REG_CONTROL); + dev->irq = map->irq; + dev->base_addr = base; + dev->mem_start = map->mem_start; + dev->mem_end = dev->mem_start + 0x2000; flp->initialized = 1; - return(0); + return 0; + +fail2: + free_irq(map->irq, dev); +fail: + release_region(base, SDLA_IO_EXTENTS); + return err; } static struct net_device_stats *sdla_stats(struct net_device *dev) @@ -1676,13 +1656,13 @@ static void __exit exit_sdla(void) { - struct frad_local *flp; + struct frad_local *flp = sdla->priv; unregister_netdev(sdla); - if (sdla->irq) + if (flp->initialized) { free_irq(sdla->irq, sdla); - - flp = sdla->priv; + release_region(sdla->base_addr, SDLA_IO_EXTENTS); + } del_timer_sync(&flp->timer); free_netdev(sdla); } diff -Nru a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c --- a/drivers/net/wan/sealevel.c Thu Feb 19 23:44:26 2004 +++ b/drivers/net/wan/sealevel.c Thu Feb 19 23:44:26 2004 @@ -420,6 +420,7 @@ /* DMA off on the card, drop DTR */ outb(0, b->iobase); release_region(b->iobase, 8); + kfree(b); } diff -Nru a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c --- a/drivers/net/wan/wanxl.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/wan/wanxl.c Thu Feb 19 23:44:28 2004 @@ -51,7 +51,7 @@ typedef struct { - hdlc_device hdlc; /* HDLC device struct - must be first */ + struct net_device *dev; struct card_t *card; spinlock_t lock; /* for wanxl_xmit */ int node; /* physical port #0 - 3 */ @@ -78,31 +78,26 @@ struct sk_buff *rx_skbs[RX_QUEUE_LENGTH]; card_status_t *status; /* shared between host and card */ dma_addr_t status_address; + port_t __ports[0]; }card_t; -static inline port_t* hdlc_to_port(hdlc_device *hdlc) -{ - return (port_t*)hdlc; -} - - static inline port_t* dev_to_port(struct net_device *dev) { - return hdlc_to_port(dev_to_hdlc(dev)); + return (port_t *)dev_to_hdlc(dev)->priv; } static inline struct net_device *port_to_dev(port_t* port) { - return hdlc_to_dev(&port->hdlc); + return port->dev; } static inline const char* port_name(port_t *port) { - return hdlc_to_name((hdlc_device*)port); + return port_to_dev(port)->name; } @@ -172,7 +167,7 @@ printk(KERN_INFO "%s: %s%s module, %s cable%s%s\n", port_name(port), pm, dte, cable, dsr, dcd); - hdlc_set_carrier(value & STATUS_CABLE_DCD, &port->hdlc); + hdlc_set_carrier(value & STATUS_CABLE_DCD, port_to_dev(port)); } @@ -180,6 +175,8 @@ /* Transmit complete interrupt service */ static inline void wanxl_tx_intr(port_t *port) { + struct net_device *dev = port_to_dev(port); + struct net_device_stats *stats = hdlc_stats(dev); while (1) { desc_t *desc = &get_status(port)->tx_descs[port->tx_in]; struct sk_buff *skb = port->tx_skbs[port->tx_in]; @@ -187,17 +184,17 @@ switch (desc->stat) { case PACKET_FULL: case PACKET_EMPTY: - netif_wake_queue(port_to_dev(port)); + netif_wake_queue(dev); return; case PACKET_UNDERRUN: - port->hdlc.stats.tx_errors++; - port->hdlc.stats.tx_fifo_errors++; + stats->tx_errors++; + stats->tx_fifo_errors++; break; default: - port->hdlc.stats.tx_packets++; - port->hdlc.stats.tx_bytes += skb->len; + stats->tx_packets++; + stats->tx_bytes += skb->len; } desc->stat = PACKET_EMPTY; /* Free descriptor */ pci_unmap_single(port->card->pdev, desc->address, skb->len, @@ -218,13 +215,14 @@ struct sk_buff *skb = card->rx_skbs[card->rx_in]; port_t *port = card->ports[desc->stat & PACKET_PORT_MASK]; struct net_device *dev = port_to_dev(port); + struct net_device_stats *stats = hdlc_stats(dev); if ((desc->stat & PACKET_PORT_MASK) > card->n_ports) printk(KERN_CRIT "wanXL %s: received packet for" " nonexistent port\n", card_name(card->pdev)); else if (!skb) - port->hdlc.stats.rx_dropped++; + stats->rx_dropped++; else { pci_unmap_single(card->pdev, desc->address, @@ -236,8 +234,8 @@ skb->len); debug_frame(skb); #endif - port->hdlc.stats.rx_packets++; - port->hdlc.stats.rx_bytes += skb->len; + stats->rx_packets++; + stats->rx_bytes += skb->len; skb->mac.raw = skb->data; skb->dev = dev; dev->last_rx = jiffies; @@ -290,8 +288,7 @@ static int wanxl_xmit(struct sk_buff *skb, struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); desc_t *desc; spin_lock(&port->lock); @@ -338,10 +335,10 @@ -static int wanxl_attach(hdlc_device *hdlc, unsigned short encoding, +static int wanxl_attach(struct net_device *dev, unsigned short encoding, unsigned short parity) { - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); if (encoding != ENCODING_NRZ && encoding != ENCODING_NRZI) @@ -365,8 +362,7 @@ { const size_t size = sizeof(sync_serial_settings); sync_serial_settings line; - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); if (cmd != SIOCWANDEV) return hdlc_ioctl(dev, ifr, cmd); @@ -415,8 +411,7 @@ static int wanxl_open(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); u8 *dbr = port->card->plx + PLX_DOORBELL_TO_CARD; unsigned long timeout; int i; @@ -425,7 +420,7 @@ printk(KERN_ERR "%s: port already open\n", port_name(port)); return -EIO; } - if ((i = hdlc_open(hdlc)) != 0) + if ((i = hdlc_open(dev)) != 0) return i; port->tx_in = port->tx_out = 0; @@ -450,12 +445,11 @@ static int wanxl_close(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + port_t *port = dev_to_port(dev); unsigned long timeout; int i; - hdlc_close(hdlc); + hdlc_close(dev); /* signal the card */ writel(1 << (DOORBELL_TO_CARD_CLOSE_0 + port->node), port->card->plx + PLX_DOORBELL_TO_CARD); @@ -487,14 +481,13 @@ static struct net_device_stats *wanxl_get_stats(struct net_device *dev) { - hdlc_device *hdlc = dev_to_hdlc(dev); - port_t *port = hdlc_to_port(hdlc); + struct net_device_stats *stats = hdlc_stats(dev); + port_t *port = dev_to_port(dev); - hdlc->stats.rx_over_errors = get_status(port)->rx_overruns; - hdlc->stats.rx_frame_errors = get_status(port)->rx_frame_errors; - hdlc->stats.rx_errors = hdlc->stats.rx_over_errors + - hdlc->stats.rx_frame_errors; - return &hdlc->stats; + stats->rx_over_errors = get_status(port)->rx_overruns; + stats->rx_frame_errors = get_status(port)->rx_frame_errors; + stats->rx_errors = stats->rx_over_errors + stats->rx_frame_errors; + return stats; } @@ -535,14 +528,16 @@ card_t *card = pci_get_drvdata(pdev); int i; + for (i = 0; i < 4; i++) + if (card->ports[i]) { + struct net_device *dev = port_to_dev(card->ports[i]); + unregister_hdlc_device(dev); + } + /* unregister and free all host resources */ if (card->irq) free_irq(card->irq, card); - for (i = 0; i < 4; i++) - if (card->ports[i]) - unregister_hdlc_device(&card->ports[i]->hdlc); - wanxl_reset(card); for (i = 0; i < RX_QUEUE_LENGTH; i++) @@ -560,6 +555,10 @@ pci_free_consistent(pdev, sizeof(card_status_t), card->status, card->status_address); + for (i = 0; i < card->n_ports; i++) + if (card->__ports[i].dev) + free_netdev(card->__ports[i].dev); + pci_set_drvdata(pdev, NULL); kfree(card); pci_release_regions(pdev); @@ -628,6 +627,16 @@ card->pdev = pdev; card->n_ports = ports; + for (i = 0; i < ports; i++) { + card->__ports[i].dev = alloc_hdlcdev(&card->__ports[i]); + if (!card->__ports[i].dev) { + printk(KERN_ERR "wanXL %s: unable to allocate memory\n", + card_name(pdev)); + wanxl_pci_remove_one(pdev); + return -ENOMEM; + } + } + card->status = pci_alloc_consistent(pdev, sizeof(card_status_t), &card->status_address); if (card->status == NULL) { @@ -708,31 +717,6 @@ return -ENODEV; } - for (i = 0; i < ports; i++) { - port_t *port = (void *)card + sizeof(card_t) + - i * sizeof(port_t); - struct net_device *dev = hdlc_to_dev(&port->hdlc); - spin_lock_init(&port->lock); - SET_MODULE_OWNER(dev); - dev->tx_queue_len = 50; - dev->do_ioctl = wanxl_ioctl; - dev->open = wanxl_open; - dev->stop = wanxl_close; - port->hdlc.attach = wanxl_attach; - port->hdlc.xmit = wanxl_xmit; - if(register_hdlc_device(&port->hdlc)) { - printk(KERN_ERR "wanXL %s: unable to register hdlc" - " device\n", card_name(pdev)); - wanxl_pci_remove_one(pdev); - return -ENOBUFS; - } - card->ports[i] = port; - dev->get_stats = wanxl_get_stats; - port->card = card; - port->node = i; - get_status(port)->clocking = CLOCK_EXT; - } - for (i = 0; i < RX_QUEUE_LENGTH; i++) { struct sk_buff *skb = dev_alloc_skb(BUFFER_LENGTH); card->rx_skbs[i] = skb; @@ -800,6 +784,32 @@ return -EBUSY; } card->irq = pdev->irq; + + for (i = 0; i < ports; i++) { + port_t *port = &card->__ports[i]; + struct net_device *dev = port_to_dev(port); + hdlc_device *hdlc = dev_to_hdlc(dev); + spin_lock_init(&port->lock); + SET_MODULE_OWNER(dev); + dev->tx_queue_len = 50; + dev->do_ioctl = wanxl_ioctl; + dev->open = wanxl_open; + dev->stop = wanxl_close; + hdlc->attach = wanxl_attach; + hdlc->xmit = wanxl_xmit; + card->ports[i] = port; + dev->get_stats = wanxl_get_stats; + port->card = card; + port->node = i; + get_status(port)->clocking = CLOCK_EXT; + if (register_hdlc_device(dev)) { + printk(KERN_ERR "wanXL %s: unable to register hdlc" + " device\n", card_name(pdev)); + card->ports[i] = NULL; + wanxl_pci_remove_one(pdev); + return -ENOBUFS; + } + } return 0; } diff -Nru a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c --- a/drivers/net/wan/x25_asy.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wan/x25_asy.c Thu Feb 19 23:44:23 2004 @@ -213,7 +213,7 @@ memcpy(skb_put(skb,count), sl->rbuff, count); skb->mac.raw=skb->data; skb->protocol=htons(ETH_P_X25); - if((err=lapb_data_received(sl,skb))!=LAPB_OK) + if((err=lapb_data_received(skb->dev, skb))!=LAPB_OK) { kfree_skb(skb); printk(KERN_DEBUG "x25_asy: data received err - %d\n",err); @@ -324,12 +324,12 @@ { case 0x00:break; case 0x01: /* Connection request .. do nothing */ - if((err=lapb_connect_request(sl))!=LAPB_OK) + if((err=lapb_connect_request(dev))!=LAPB_OK) printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err); kfree_skb(skb); return 0; case 0x02: /* Disconnect request .. do nothing - hang up ?? */ - if((err=lapb_disconnect_request(sl))!=LAPB_OK) + if((err=lapb_disconnect_request(dev))!=LAPB_OK) printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err); default: kfree_skb(skb); @@ -347,7 +347,7 @@ * 14 Oct 1994 Dmitry Gorodchanin. */ - if((err=lapb_data_request(sl,skb))!=LAPB_OK) + if((err=lapb_data_request(dev,skb))!=LAPB_OK) { printk(KERN_ERR "lapbeth: lapb_data_request error - %d\n", err); kfree_skb(skb); @@ -366,7 +366,7 @@ * at the net layer. */ -static int x25_asy_data_indication(void *token, struct sk_buff *skb) +static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb) { skb->dev->last_rx = jiffies; return netif_rx(skb); @@ -378,9 +378,9 @@ * perhaps lapb should allow us to bounce this ? */ -static void x25_asy_data_transmit(void *token, struct sk_buff *skb) +static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb) { - struct x25_asy *sl=token; + struct x25_asy *sl=dev->priv; spin_lock(&sl->lock); if (netif_queue_stopped(sl->dev) || sl->tty == NULL) @@ -405,9 +405,9 @@ * LAPB connection establish/down information. */ -static void x25_asy_connected(void *token, int reason) +static void x25_asy_connected(struct net_device *dev, int reason) { - struct x25_asy *sl = token; + struct x25_asy *sl = dev->priv; struct sk_buff *skb; unsigned char *ptr; @@ -428,9 +428,9 @@ sl->dev->last_rx = jiffies; } -static void x25_asy_disconnected(void *token, int reason) +static void x25_asy_disconnected(struct net_device *dev, int reason) { - struct x25_asy *sl = token; + struct x25_asy *sl = dev->priv; struct sk_buff *skb; unsigned char *ptr; @@ -500,7 +500,7 @@ /* * Now attach LAPB */ - if((err=lapb_register(sl, &x25_asy_callbacks))==LAPB_OK) + if((err=lapb_register(dev, &x25_asy_callbacks))==LAPB_OK) return 0; /* Cleanup */ @@ -525,7 +525,7 @@ netif_stop_queue(dev); sl->rcount = 0; sl->xleft = 0; - if((err=lapb_unregister(sl))!=LAPB_OK) + if((err=lapb_unregister(dev))!=LAPB_OK) printk(KERN_ERR "x25_asy_close: lapb_unregister error -%d\n",err); spin_unlock(&sl->lock); return 0; diff -Nru a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig --- a/drivers/net/wireless/Kconfig Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wireless/Kconfig Thu Feb 19 23:44:23 2004 @@ -224,8 +224,8 @@ config ATMEL tristate "Atmel at76c50x chipset 802.11b support" depends on NET_RADIO && EXPERIMENTAL - enable FW_LOADER - enable CRC32 + select FW_LOADER + select CRC32 ---help--- A driver 802.11b wireless cards based on the Atmel fast-vnet chips. This driver supports standard Linux wireless extensions. diff -Nru a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c --- a/drivers/net/wireless/airo.c Thu Feb 19 23:44:23 2004 +++ b/drivers/net/wireless/airo.c Thu Feb 19 23:44:23 2004 @@ -2599,10 +2599,8 @@ return rc; } -static void wifi_setup(struct net_device *dev, struct net_device *ethdev) +static void wifi_setup(struct net_device *dev) { - struct airo_info *ai = ethdev->priv; - dev->priv = ai; dev->hard_header = 0; dev->rebuild_header = 0; dev->hard_header_cache = 0; @@ -2620,14 +2618,11 @@ dev->change_mtu = &airo_change_mtu; dev->open = &airo_open; dev->stop = &airo_close; - dev->irq = ethdev->irq; - dev->base_addr = ethdev->base_addr; dev->type = ARPHRD_IEEE80211; dev->hard_header_len = ETH_HLEN; dev->mtu = 2312; dev->addr_len = ETH_ALEN; - memcpy(dev->dev_addr, ethdev->dev_addr, dev->addr_len); dev->tx_queue_len = 100; memset(dev->broadcast,0xFF, ETH_ALEN); @@ -2639,17 +2634,17 @@ struct net_device *ethdev) { int err; - struct net_device *dev = (struct net_device*)kmalloc(sizeof *dev,GFP_KERNEL); - if (!dev) return 0; - memset(dev, 0, sizeof(*dev)); - - strcpy(dev->name, "wifi%d"); - dev->priv = ai; - wifi_setup(dev, ethdev); + struct net_device *dev = alloc_netdev(0, "wifi%d", wifi_setup); + if (!dev) + return NULL; + dev->priv = ethdev->priv; + dev->irq = ethdev->irq; + dev->base_addr = ethdev->base_addr; + memcpy(dev->dev_addr, ethdev->dev_addr, dev->addr_len); err = register_netdev(dev); if (err<0) { - kfree(dev); - return 0; + free_netdev(dev); + return NULL; } return dev; } @@ -2809,7 +2804,7 @@ kill_proc(ai->thr_pid, SIGTERM, 1); wait_for_completion(&ai->thr_exited); err_out_free: - kfree(dev); + free_netdev(dev); return NULL; } diff -Nru a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c --- a/drivers/net/wireless/orinoco.c Thu Feb 19 23:44:28 2004 +++ b/drivers/net/wireless/orinoco.c Thu Feb 19 23:44:28 2004 @@ -4129,6 +4129,8 @@ struct orinoco_private *priv; dev = alloc_etherdev(sizeof(struct orinoco_private) + sizeof_card); + if (!dev) + return NULL; priv = (struct orinoco_private *)dev->priv; priv->ndev = dev; if (sizeof_card) diff -Nru a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c --- a/drivers/net/wireless/wl3501_cs.c Thu Feb 19 23:44:22 2004 +++ b/drivers/net/wireless/wl3501_cs.c Thu Feb 19 23:44:22 2004 @@ -1580,7 +1580,7 @@ *linkp = link->next; if (link->priv) - kfree(link->priv); + free_netdev(link->priv); kfree(link); out: return; diff -Nru a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c --- a/drivers/oprofile/timer_int.c Thu Feb 19 23:44:24 2004 +++ b/drivers/oprofile/timer_int.c Thu Feb 19 23:44:24 2004 @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff -Nru a/drivers/parisc/dino.c b/drivers/parisc/dino.c --- a/drivers/parisc/dino.c Thu Feb 19 23:44:22 2004 +++ b/drivers/parisc/dino.c Thu Feb 19 23:44:22 2004 @@ -475,7 +475,7 @@ res = &dino_dev->hba.lmmio_space; res->flags = IORESOURCE_MEM; - size = snprintf(name, sizeof(name), "Dino LMMIO (%s)", bus->bridge->bus_id); + size = scnprintf(name, sizeof(name), "Dino LMMIO (%s)", bus->bridge->bus_id); res->name = kmalloc(size+1, GFP_KERNEL); if(res->name) strcpy((char *)res->name, name); diff -Nru a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c --- a/drivers/pci/hotplug.c Thu Feb 19 23:44:28 2004 +++ b/drivers/pci/hotplug.c Thu Feb 19 23:44:28 2004 @@ -29,7 +29,7 @@ /* stuff we want to pass to /sbin/hotplug */ envp[i++] = scratch; - length += snprintf (scratch, buffer_size - length, "PCI_CLASS=%04X", + length += scnprintf (scratch, buffer_size - length, "PCI_CLASS=%04X", pdev->class); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; @@ -37,7 +37,7 @@ scratch += length; envp[i++] = scratch; - length += snprintf (scratch, buffer_size - length, "PCI_ID=%04X:%04X", + length += scnprintf (scratch, buffer_size - length, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; @@ -45,7 +45,7 @@ scratch += length; envp[i++] = scratch; - length += snprintf (scratch, buffer_size - length, + length += scnprintf (scratch, buffer_size - length, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor, pdev->subsystem_device); if ((buffer_size - length <= 0) || (i >= num_envp)) @@ -54,7 +54,7 @@ scratch += length; envp[i++] = scratch; - length += snprintf (scratch, buffer_size - length, "PCI_SLOT_NAME=%s", + length += scnprintf (scratch, buffer_size - length, "PCI_SLOT_NAME=%s", pci_name(pdev)); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; diff -Nru a/drivers/pci/probe.c b/drivers/pci/probe.c --- a/drivers/pci/probe.c Thu Feb 19 23:44:26 2004 +++ b/drivers/pci/probe.c Thu Feb 19 23:44:26 2004 @@ -55,7 +55,7 @@ cpumask_t cpumask = pcibus_to_cpumask((to_pci_bus(class_dev))->number); int ret; - ret = cpumask_snprintf(buf, PAGE_SIZE, cpumask); + ret = cpumask_scnprintf(buf, PAGE_SIZE, cpumask); if (ret < PAGE_SIZE) buf[ret++] = '\n'; return ret; diff -Nru a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c --- a/drivers/s390/block/dasd_genhd.c Thu Feb 19 23:44:27 2004 +++ b/drivers/s390/block/dasd_genhd.c Thu Feb 19 23:44:27 2004 @@ -85,10 +85,10 @@ /* See fs/partition/check.c:register_disk,rescan_partitions */ bdev = bdget_disk(device->gdp, 0); if (bdev) { - if (blkdev_get(bdev, FMODE_READ, 1, BDEV_RAW) >= 0) { + if (blkdev_get(bdev, FMODE_READ, 1) >= 0) { /* Can't call rescan_partitions directly. Use ioctl. */ ioctl_by_bdev(bdev, BLKRRPART, 0); - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); } } } diff -Nru a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c --- a/drivers/s390/char/tape_core.c Thu Feb 19 23:44:23 2004 +++ b/drivers/s390/char/tape_core.c Thu Feb 19 23:44:23 2004 @@ -81,7 +81,7 @@ struct tape_device *tdev; tdev = (struct tape_device *) dev->driver_data; - return snprintf(buf, PAGE_SIZE, "%i\n", tdev->medium_state); + return scnprintf(buf, PAGE_SIZE, "%i\n", tdev->medium_state); } static @@ -93,7 +93,7 @@ struct tape_device *tdev; tdev = (struct tape_device *) dev->driver_data; - return snprintf(buf, PAGE_SIZE, "%i\n", tdev->first_minor); + return scnprintf(buf, PAGE_SIZE, "%i\n", tdev->first_minor); } static @@ -105,7 +105,7 @@ struct tape_device *tdev; tdev = (struct tape_device *) dev->driver_data; - return snprintf(buf, PAGE_SIZE, "%s\n", (tdev->first_minor < 0) ? + return scnprintf(buf, PAGE_SIZE, "%s\n", (tdev->first_minor < 0) ? "OFFLINE" : tape_state_verbose[tdev->tape_state]); } @@ -120,17 +120,17 @@ tdev = (struct tape_device *) dev->driver_data; if (tdev->first_minor < 0) - return snprintf(buf, PAGE_SIZE, "N/A\n"); + return scnprintf(buf, PAGE_SIZE, "N/A\n"); spin_lock_irq(get_ccwdev_lock(tdev->cdev)); if (list_empty(&tdev->req_queue)) - rc = snprintf(buf, PAGE_SIZE, "---\n"); + rc = scnprintf(buf, PAGE_SIZE, "---\n"); else { struct tape_request *req; req = list_entry(tdev->req_queue.next, struct tape_request, list); - rc = snprintf(buf, PAGE_SIZE, "%s\n", tape_op_verbose[req->op]); + rc = scnprintf(buf,PAGE_SIZE, "%s\n", tape_op_verbose[req->op]); } spin_unlock_irq(get_ccwdev_lock(tdev->cdev)); return rc; @@ -146,7 +146,7 @@ tdev = (struct tape_device *) dev->driver_data; - return snprintf(buf, PAGE_SIZE, "%i\n", tdev->char_data.block_size); + return scnprintf(buf, PAGE_SIZE, "%i\n", tdev->char_data.block_size); } static diff -Nru a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c --- a/drivers/s390/cio/device.c Thu Feb 19 23:44:27 2004 +++ b/drivers/s390/cio/device.c Thu Feb 19 23:44:27 2004 @@ -73,7 +73,7 @@ /* what we want to pass to /sbin/hotplug */ envp[i++] = buffer; - length += snprintf(buffer, buffer_size - length, "CU_TYPE=%04X", + length += scnprintf(buffer, buffer_size - length, "CU_TYPE=%04X", cdev->id.cu_type); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; @@ -81,7 +81,7 @@ buffer += length; envp[i++] = buffer; - length += snprintf(buffer, buffer_size - length, "CU_MODEL=%02X", + length += scnprintf(buffer, buffer_size - length, "CU_MODEL=%02X", cdev->id.cu_model); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; @@ -90,7 +90,7 @@ /* The next two can be zero, that's ok for us */ envp[i++] = buffer; - length += snprintf(buffer, buffer_size - length, "DEV_TYPE=%04X", + length += scnprintf(buffer, buffer_size - length, "DEV_TYPE=%04X", cdev->id.dev_type); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; @@ -98,7 +98,7 @@ buffer += length; envp[i++] = buffer; - length += snprintf(buffer, buffer_size - length, "DEV_MODEL=%02X", + length += scnprintf(buffer, buffer_size - length, "DEV_MODEL=%02X", cdev->id.dev_model); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; diff -Nru a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c --- a/drivers/s390/net/lcs.c Thu Feb 19 23:44:23 2004 +++ b/drivers/s390/net/lcs.c Thu Feb 19 23:44:23 2004 @@ -360,7 +360,7 @@ kfree(ipm_list); } #endif - kfree(card->dev); + free_netdev(card->dev); /* Cleanup channels. */ lcs_cleanup_channel(&card->write); lcs_cleanup_channel(&card->read); @@ -1858,8 +1858,7 @@ lcs_stopcard(card); return 0; out: - lcs_cleanup_channel(&card->read); - lcs_cleanup_channel(&card->write); + lcs_cleanup_card(card); lcs_free_card(card); return -ENODEV; } diff -Nru a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c --- a/drivers/s390/net/netiucv.c Thu Feb 19 23:44:25 2004 +++ b/drivers/s390/net/netiucv.c Thu Feb 19 23:44:25 2004 @@ -1473,6 +1473,14 @@ sysfs_remove_group(&dev->kobj, &netiucv_attr_group); } +/* + * XXX: Don't use sysfs unless you know WTF you are doing. + * This particular turd registers sysfs objects embedded into netiucv_priv + * which is kfreed without any regard to possible sysfs references. + * As the result, the wanker who'd decided that sysfs exports were too hip and + * cute to resist had generated a set of user-exploitable holes in this driver. + */ + static int netiucv_register_device(struct net_device *ndev, int ifno) { @@ -1592,6 +1600,22 @@ } } +static void setup_netiucv(struct net_device *dev) +{ + dev->mtu = NETIUCV_MTU_DEFAULT; + dev->hard_start_xmit = netiucv_tx; + dev->open = netiucv_open; + dev->stop = netiucv_close; + dev->get_stats = netiucv_stats; + dev->change_mtu = netiucv_change_mtu; + dev->hard_header_len = NETIUCV_HDRLEN; + dev->addr_len = 0; + dev->type = ARPHRD_SLIP; + dev->tx_queue_len = NETIUCV_QUEUELEN_DEFAULT; + dev->flags = IFF_POINTOPOINT | IFF_NOARP; + SET_MODULE_OWNER(dev); +} + /** * Allocate and initialize everything of a net device. */ @@ -1601,16 +1625,15 @@ struct netiucv_priv *privptr; int priv_size; - struct net_device *dev = kmalloc(sizeof(struct net_device), GFP_KERNEL); + struct net_device *dev = alloc_netdev(0, "", setup_netiucv); if (!dev) return NULL; - memset(dev, 0, sizeof(struct net_device)); sprintf(dev->name, "iucv%d", ifno); priv_size = sizeof(struct netiucv_priv); dev->priv = kmalloc(priv_size, GFP_KERNEL); if (dev->priv == NULL) { - kfree(dev); + free_netdev(dev); return NULL; } memset(dev->priv, 0, priv_size); @@ -1620,30 +1643,18 @@ dev_fsm, DEV_FSM_LEN, GFP_KERNEL); if (privptr->fsm == NULL) { kfree(privptr); - kfree(dev); + free_netdev(dev); return NULL; } privptr->conn = netiucv_new_connection(dev, username); if (!privptr->conn) { kfree_fsm(privptr->fsm); kfree(privptr); - kfree(dev); + free_netdev(dev); return NULL; } fsm_newstate(privptr->fsm, DEV_STATE_STOPPED); - dev->mtu = NETIUCV_MTU_DEFAULT; - dev->hard_start_xmit = netiucv_tx; - dev->open = netiucv_open; - dev->stop = netiucv_close; - dev->get_stats = netiucv_stats; - dev->change_mtu = netiucv_change_mtu; - dev->hard_header_len = NETIUCV_HDRLEN; - dev->addr_len = 0; - dev->type = ARPHRD_SLIP; - dev->tx_queue_len = NETIUCV_QUEUELEN_DEFAULT; - dev->flags = IFF_POINTOPOINT | IFF_NOARP; - SET_MODULE_OWNER(dev); return dev; } diff -Nru a/drivers/s390/net/qeth.c b/drivers/s390/net/qeth.c --- a/drivers/s390/net/qeth.c Thu Feb 19 23:44:28 2004 +++ b/drivers/s390/net/qeth.c Thu Feb 19 23:44:29 2004 @@ -6707,15 +6707,6 @@ } static void -qeth_destructor(struct net_device *dev) -{ - struct qeth_card *card; - - card = (struct qeth_card *) (dev->priv); - QETH_DBF_CARD2(0, trace, "dstr", card); -} - -static void qeth_set_multicast_list(struct net_device *dev) { struct qeth_card *card = dev->priv; @@ -7655,28 +7646,11 @@ QETH_DBF_CARD3(0, trace, "inid", card); - dev->tx_timeout = &qeth_tx_timeout; - dev->watchdog_timeo = QETH_TX_TIMEOUT; - dev->open = qeth_open; - dev->stop = qeth_stop; - dev->set_config = qeth_set_config; - dev->hard_start_xmit = qeth_hard_start_xmit; - dev->do_ioctl = qeth_do_ioctl; - dev->get_stats = qeth_get_stats; - dev->change_mtu = qeth_change_mtu; -#ifdef QETH_VLAN - dev->vlan_rx_register = qeth_vlan_rx_register; - dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid; -#endif dev->rebuild_header = __qeth_rebuild_header_func(card); dev->hard_header = __qeth_hard_header_func(card); dev->header_cache_update = __qeth_header_cache_update_func(card); dev->hard_header_cache = __qeth_hard_header_cache_func(card); dev->hard_header_parse = NULL; - dev->destructor = qeth_destructor; - dev->set_multicast_list = qeth_set_multicast_list; - dev->set_mac_address = qeth_set_mac_address; - dev->neigh_setup = qeth_neigh_setup; dev->flags |= qeth_get_additional_dev_flags(card->type); @@ -7694,8 +7668,6 @@ dev->tx_queue_len = qeth_get_device_tx_q_len(card->type); dev->hard_header_len = qeth_get_hlen(card->link_type) + card->options.add_hhlen; - dev->addr_len = OSA_ADDR_LEN; /* is ok for eth, tr, atm lane */ - SET_MODULE_OWNER(dev); netif_start_queue(dev); dev->mtu = card->initial_mtu; @@ -8358,6 +8330,28 @@ card->options.fake_ll = DONT_FAKE_LL; } +static void qeth_setup(struct net_device *dev) +{ + dev->tx_timeout = &qeth_tx_timeout; + dev->watchdog_timeo = QETH_TX_TIMEOUT; + dev->open = qeth_open; + dev->stop = qeth_stop; + dev->set_config = qeth_set_config; + dev->hard_start_xmit = qeth_hard_start_xmit; + dev->do_ioctl = qeth_do_ioctl; + dev->get_stats = qeth_get_stats; + dev->change_mtu = qeth_change_mtu; +#ifdef QETH_VLAN + dev->vlan_rx_register = qeth_vlan_rx_register; + dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid; +#endif + dev->set_multicast_list = qeth_set_multicast_list; + dev->set_mac_address = qeth_set_mac_address; + dev->neigh_setup = qeth_neigh_setup; + dev->addr_len = OSA_ADDR_LEN; /* is ok for eth, tr, atm lane */ + SET_MODULE_OWNER(dev); +} + static int qeth_alloc_card_stuff(struct qeth_card *card) { @@ -8385,11 +8379,9 @@ goto exit_dma2; memset(card->dma_stuff->sendbuf, 0, QETH_BUFSIZE); - card->dev = (struct net_device *) kmalloc(sizeof (struct net_device), - GFP_KERNEL); + card->dev = alloc_netdev(0, "", qeth_setup); if (!card->dev) goto exit_dev; - memset(card->dev, 0, sizeof (struct net_device)); card->stats = (struct net_device_stats *) diff -Nru a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c --- a/drivers/scsi/aic7xxx/aic79xx_osm.c Thu Feb 19 23:44:25 2004 +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c Thu Feb 19 23:44:25 2004 @@ -452,14 +452,14 @@ " seltime: Selection Timeout:\n" " (0/256ms,1/128ms,2/64ms,3/32ms)\n" "\n" -" Sample /etc/modules.conf line:\n" +" Sample /etc/modprobe.conf line:\n" " Enable verbose logging\n" " Set tag depth on Controller 2/Target 2 to 10 tags\n" " Shorten the selection timeout to 128ms\n" "\n" " options aic79xx 'aic79xx=verbose.tag_info:{{}.{}.{..10}}.seltime:1'\n" "\n" -" Sample /etc/modules.conf line:\n" +" Sample /etc/modprobe.conf line:\n" " Change Read Streaming for Controller's 2 and 3\n" "\n" " options aic79xx 'aic79xx=rd_strm:{..0xFFF0.0xC0F0}'"); diff -Nru a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c Thu Feb 19 23:44:23 2004 +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c Thu Feb 19 23:44:23 2004 @@ -472,7 +472,7 @@ " seltime: Selection Timeout\n" " (0/256ms,1/128ms,2/64ms,3/32ms)\n" "\n" -" Sample /etc/modules.conf line:\n" +" Sample /etc/modprobe.conf line:\n" " Toggle EISA/VLB probing\n" " Set tag depth on Controller 1/Target 1 to 10 tags\n" " Shorten the selection timeout to 128ms\n" diff -Nru a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c --- a/drivers/scsi/ide-scsi.c Thu Feb 19 23:44:26 2004 +++ b/drivers/scsi/ide-scsi.c Thu Feb 19 23:44:26 2004 @@ -971,8 +971,7 @@ drive->driver_data = host; idescsi = scsihost_to_idescsi(host); idescsi->drive = drive; - err = ide_register_subdriver (drive, &idescsi_driver, - IDE_SUBDRIVER_VERSION); + err = ide_register_subdriver(drive, &idescsi_driver); if (!err) { idescsi_setup (drive, idescsi); drive->disk->fops = &idescsi_ops; diff -Nru a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c --- a/drivers/scsi/qla2xxx/qla_os.c Thu Feb 19 23:44:28 2004 +++ b/drivers/scsi/qla2xxx/qla_os.c Thu Feb 19 23:44:28 2004 @@ -70,7 +70,7 @@ int displayConfig; module_param(displayConfig, int, 0); MODULE_PARM_DESC(displayConfig, - "If 1 then display the configuration used in /etc/modules.conf."); + "If 1 then display the configuration used in /etc/modprobe.conf."); int ql2xplogiabsentdevice; module_param(ql2xplogiabsentdevice, int, 0); diff -Nru a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c --- a/drivers/scsi/scsi.c Thu Feb 19 23:44:25 2004 +++ b/drivers/scsi/scsi.c Thu Feb 19 23:44:25 2004 @@ -22,7 +22,7 @@ * support added by Michael Neuffer * * Added request_module("scsi_hostadapter") for kerneld: - * (Put an "alias scsi_hostadapter your_hostadapter" in /etc/modules.conf) + * (Put an "alias scsi_hostadapter your_hostadapter" in /etc/modprobe.conf) * Bjorn Ekwall * (changed to kmod) * diff -Nru a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c --- a/drivers/scsi/scsi_debug.c Thu Feb 19 23:44:26 2004 +++ b/drivers/scsi/scsi_debug.c Thu Feb 19 23:44:26 2004 @@ -557,8 +557,7 @@ dev_id_num = ((devip->sdbg_host->shost->host_no + 1) * 2000) + (devip->target * 1000) + devip->lun; - len = snprintf(dev_id_str, 6, "%d", dev_id_num); - len = (len > 6) ? 6 : len; + len = scnprintf(dev_id_str, 6, "%d", dev_id_num); if (0 == cmd[2]) { /* supported vital product data pages */ arr[3] = 3; arr[4] = 0x0; /* this page */ @@ -1309,7 +1308,7 @@ static ssize_t sdebug_delay_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_delay); + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_delay); } static ssize_t sdebug_delay_store(struct device_driver * ddp, @@ -1331,7 +1330,7 @@ static ssize_t sdebug_opts_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "0x%x\n", scsi_debug_opts); + return scnprintf(buf, PAGE_SIZE, "0x%x\n", scsi_debug_opts); } static ssize_t sdebug_opts_store(struct device_driver * ddp, @@ -1360,7 +1359,7 @@ static ssize_t sdebug_num_tgts_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_num_tgts); + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_num_tgts); } static ssize_t sdebug_num_tgts_store(struct device_driver * ddp, const char * buf, size_t count) @@ -1378,13 +1377,13 @@ static ssize_t sdebug_dev_size_mb_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_dev_size_mb); + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_dev_size_mb); } DRIVER_ATTR(dev_size_mb, S_IRUGO, sdebug_dev_size_mb_show, NULL) static ssize_t sdebug_every_nth_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_every_nth); + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_every_nth); } static ssize_t sdebug_every_nth_store(struct device_driver * ddp, const char * buf, size_t count) @@ -1403,7 +1402,7 @@ static ssize_t sdebug_max_luns_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_max_luns); + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_max_luns); } static ssize_t sdebug_max_luns_store(struct device_driver * ddp, const char * buf, size_t count) @@ -1421,13 +1420,13 @@ static ssize_t sdebug_scsi_level_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_scsi_level); + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_scsi_level); } DRIVER_ATTR(scsi_level, S_IRUGO, sdebug_scsi_level_show, NULL) static ssize_t sdebug_add_host_show(struct device_driver * ddp, char * buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_add_host); + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_add_host); } static ssize_t sdebug_add_host_store(struct device_driver * ddp, diff -Nru a/drivers/serial/Kconfig b/drivers/serial/Kconfig --- a/drivers/serial/Kconfig Thu Feb 19 23:44:28 2004 +++ b/drivers/serial/Kconfig Thu Feb 19 23:44:28 2004 @@ -256,6 +256,27 @@ help ::: To be written ::: +config SERIAL_DZ + bool "DECstation DZ serial driver" + depends on DECSTATION + select SERIAL_CORE + help + DZ11-family serial controllers for VAXstations, including the + DC7085, M7814, and M7819. + +config SERIAL_DZ_CONSOLE + bool "Support console on DECstation DZ serial driver" + depends on SERIAL_DZ=y + select SERIAL_CORE_CONSOLE + help + If you say Y here, it will be possible to use a serial port as the + system console (the system console is the device which receives all + kernel messages and warnings and which allows logins in single user + mode). Note that the firmware uses ttyS0 as the serial console on + the Maxine and ttyS2 on the others. + + If unsure, say Y. + config SERIAL_21285 tristate "DC21285 serial port support" depends on ARM && FOOTBRIDGE @@ -422,6 +443,20 @@ on your Sparc system as the console, you can do so by answering Y to this option. +config SERIAL_IP22_ZILOG + tristate "IP22 Zilog8530 serial support" + depends on SGI_IP22 + select SERIAL_CORE + help + This driver supports the Zilog8530 serial ports found on SGI IP22 + systems. Say Y or M if you want to be able to these serial ports. + +config SERIAL_IP22_ZILOG_CONSOLE + bool "Console on IP22 Zilog8530 serial port" + depends on SERIAL_IP22_ZILOG=y + select SERIAL_CORE_CONSOLE + help + config V850E_UART bool "NEC V850E on-chip UART support" depends on V850E_MA1 || V850E_ME2 || V850E_TEG || V850E2_ANNA || V850E_AS85EP1 @@ -450,6 +485,22 @@ bool "Support for console on PC-9800 standard serial port" depends on SERIAL98=y select SERIAL_CORE_CONSOLE + +config SERIAL_AU1X00 + bool "Enable Au1x00 UART Support" + depends on MIPS && SOC_AU1X00 + select SERIAL_CORE + help + If you have an Alchemy AU1X00 processor (MIPS based) and you want + to use serial ports, say Y. Otherwise, say N. + +config SERIAL_AU1X00_CONSOLE + bool "Enable Au1x00 serial console" + depends on SERIAL_AU1X00 + select SERIAL_CORE_CONSOLE + help + If you have an Alchemy AU1X00 processor (MIPS based) and you want + to use a console on a serial port, say Y. Otherwise, say N. config SERIAL_CORE tristate diff -Nru a/drivers/serial/Makefile b/drivers/serial/Makefile --- a/drivers/serial/Makefile Thu Feb 19 23:44:25 2004 +++ b/drivers/serial/Makefile Thu Feb 19 23:44:25 2004 @@ -23,6 +23,7 @@ obj-$(CONFIG_SERIAL_UART00) += uart00.o obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o +obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o obj-$(CONFIG_SERIAL_MUX) += mux.o @@ -32,3 +33,5 @@ obj-$(CONFIG_V850E_UART) += v850e_uart.o obj-$(CONFIG_SERIAL98) += serial98.o obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o +obj-$(CONFIG_SERIAL_AU1X00) += au1x00_uart.o +obj-$(CONFIG_SERIAL_DZ) += dz.o diff -Nru a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/serial/au1x00_uart.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,1393 @@ +/* + * Driver for 8250/16550-type serial ports + * + * Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o. + * + * Copyright (C) 2001 Russell King. + * + * 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. + * + * A note about mapbase / membase + * + * mapbase is the physical address of the IO port. Currently, we don't + * support this very well, and it may well be dropped from this driver + * in future. As such, mapbase should be NULL. + * + * membase is an 'ioremapped' cookie. This is compatible with the old + * serial.c driver, and is currently the preferred form. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) +#define SUPPORT_SYSRQ +#endif + +#include +#include "8250.h" + +/* + * Debugging. + */ +#if 0 +#define DEBUG_AUTOCONF(fmt...) printk(fmt) +#else +#define DEBUG_AUTOCONF(fmt...) do { } while (0) +#endif + +#if 0 +#define DEBUG_INTR(fmt...) printk(fmt) +#else +#define DEBUG_INTR(fmt...) do { } while (0) +#endif + +#define PASS_LIMIT 256 + +/* + * We default to IRQ0 for the "no irq" hack. Some + * machine types want others as well - they're free + * to redefine this in their header file. + */ +#define is_real_interrupt(irq) ((irq) != 0) + +static struct old_serial_port old_serial_port[] = { + { .baud_base = 0, + .iomem_base = (u8 *)UART0_ADDR, + .irq = AU1000_UART0_INT, + .flags = STD_COM_FLAGS, + .iomem_reg_shift = 2, + }, { + .baud_base = 0, + .iomem_base = (u8 *)UART1_ADDR, + .irq = AU1000_UART1_INT, + .flags = STD_COM_FLAGS, + .iomem_reg_shift = 2 + }, { + .baud_base = 0, + .iomem_base = (u8 *)UART2_ADDR, + .irq = AU1000_UART2_INT, + .flags = STD_COM_FLAGS, + .iomem_reg_shift = 2 + }, { + .baud_base = 0, + .iomem_base = (u8 *)UART3_ADDR, + .irq = AU1000_UART3_INT, + .flags = STD_COM_FLAGS, + .iomem_reg_shift = 2 + } +}; + +#define UART_NR ARRAY_SIZE(old_serial_port) + +struct uart_8250_port { + struct uart_port port; + struct timer_list timer; /* "no irq" timer */ + struct list_head list; /* ports on this IRQ */ + unsigned short rev; + unsigned char acr; + unsigned char ier; + unsigned char lcr; + unsigned char mcr_mask; /* mask of user bits */ + unsigned char mcr_force; /* mask of forced bits */ + unsigned char lsr_break_flag; + + /* + * We provide a per-port pm hook. + */ + void (*pm)(struct uart_port *port, + unsigned int state, unsigned int old); +}; + +struct irq_info { + spinlock_t lock; + struct list_head *head; +}; + +static struct irq_info irq_lists[NR_IRQS]; + +/* + * Here we define the default xmit fifo size used for each type of UART. + */ +static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = { + { "unknown", 1, 0 }, + { "8250", 1, 0 }, + { "16450", 1, 0 }, + { "16550", 1, 0 }, + /* PORT_16550A */ + { "AU1X00_UART",16, UART_CLEAR_FIFO | UART_USE_FIFO }, +}; + +static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset) +{ + return au_readl((unsigned long)up->port.membase + offset); +} + +static _INLINE_ void +serial_out(struct uart_8250_port *up, int offset, int value) +{ + au_writel(value, (unsigned long)up->port.membase + offset); +} + +#define serial_inp(up, offset) serial_in(up, offset) +#define serial_outp(up, offset, value) serial_out(up, offset, value) + +/* + * This routine is called by rs_init() to initialize a specific serial + * port. It determines what type of UART chip this serial port is + * using: 8250, 16450, 16550, 16550A. The important question is + * whether or not this UART is a 16550A or not, since this will + * determine whether or not we can use its FIFO features or not. + */ +static void autoconfig(struct uart_8250_port *up, unsigned int probeflags) +{ + unsigned char save_lcr, save_mcr; + unsigned long flags; + + if (!up->port.iobase && !up->port.mapbase && !up->port.membase) + return; + + DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04x, 0x%08lx): ", + up->port.line, up->port.iobase, up->port.membase); + + /* + * We really do need global IRQs disabled here - we're going to + * be frobbing the chips IRQ enable register to see if it exists. + */ + spin_lock_irqsave(&up->port.lock, flags); +// save_flags(flags); cli(); + + save_mcr = serial_in(up, UART_MCR); + save_lcr = serial_in(up, UART_LCR); + + up->port.type = PORT_16550A; + serial_outp(up, UART_LCR, save_lcr); + + up->port.fifosize = uart_config[up->port.type].dfl_xmit_fifo_size; + + if (up->port.type == PORT_UNKNOWN) + goto out; + + /* + * Reset the UART. + */ + serial_outp(up, UART_MCR, save_mcr); + serial_outp(up, UART_FCR, (UART_FCR_ENABLE_FIFO | + UART_FCR_CLEAR_RCVR | + UART_FCR_CLEAR_XMIT)); + serial_outp(up, UART_FCR, 0); + (void)serial_in(up, UART_RX); + serial_outp(up, UART_IER, 0); + + out: + spin_unlock_irqrestore(&up->port.lock, flags); +// restore_flags(flags); + DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name); +} + +static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + + if (up->ier & UART_IER_THRI) { + up->ier &= ~UART_IER_THRI; + serial_out(up, UART_IER, up->ier); + } +} + +static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + + if (!(up->ier & UART_IER_THRI)) { + up->ier |= UART_IER_THRI; + serial_out(up, UART_IER, up->ier); + } +} + +static void serial8250_stop_rx(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + + up->ier &= ~UART_IER_RLSI; + up->port.read_status_mask &= ~UART_LSR_DR; + serial_out(up, UART_IER, up->ier); +} + +static void serial8250_enable_ms(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + + up->ier |= UART_IER_MSI; + serial_out(up, UART_IER, up->ier); +} + +static _INLINE_ void +receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs) +{ + struct tty_struct *tty = up->port.info->tty; + unsigned char ch; + int max_count = 256; + + do { + if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) { + tty->flip.work.func((void *)tty); + if (tty->flip.count >= TTY_FLIPBUF_SIZE) + return; // if TTY_DONT_FLIP is set + } + ch = serial_inp(up, UART_RX); + *tty->flip.char_buf_ptr = ch; + *tty->flip.flag_buf_ptr = TTY_NORMAL; + up->port.icount.rx++; + + if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE | + UART_LSR_FE | UART_LSR_OE))) { + /* + * For statistics only + */ + if (*status & UART_LSR_BI) { + *status &= ~(UART_LSR_FE | UART_LSR_PE); + up->port.icount.brk++; + /* + * We do the SysRQ and SAK checking + * here because otherwise the break + * may get masked by ignore_status_mask + * or read_status_mask. + */ + if (uart_handle_break(&up->port)) + goto ignore_char; + } else if (*status & UART_LSR_PE) + up->port.icount.parity++; + else if (*status & UART_LSR_FE) + up->port.icount.frame++; + if (*status & UART_LSR_OE) + up->port.icount.overrun++; + + /* + * Mask off conditions which should be ingored. + */ + *status &= up->port.read_status_mask; + +#ifdef CONFIG_SERIAL_AU1X00_CONSOLE + if (up->port.line == up->port.cons->index) { + /* Recover the break flag from console xmit */ + *status |= up->lsr_break_flag; + up->lsr_break_flag = 0; + } +#endif + if (*status & UART_LSR_BI) { + DEBUG_INTR("handling break...."); + *tty->flip.flag_buf_ptr = TTY_BREAK; + } else if (*status & UART_LSR_PE) + *tty->flip.flag_buf_ptr = TTY_PARITY; + else if (*status & UART_LSR_FE) + *tty->flip.flag_buf_ptr = TTY_FRAME; + } + if (uart_handle_sysrq_char(&up->port, ch, regs)) + goto ignore_char; + if ((*status & up->port.ignore_status_mask) == 0) { + tty->flip.flag_buf_ptr++; + tty->flip.char_buf_ptr++; + tty->flip.count++; + } + if ((*status & UART_LSR_OE) && + tty->flip.count < TTY_FLIPBUF_SIZE) { + /* + * Overrun is special, since it's reported + * immediately, and doesn't affect the current + * character. + */ + *tty->flip.flag_buf_ptr = TTY_OVERRUN; + tty->flip.flag_buf_ptr++; + tty->flip.char_buf_ptr++; + tty->flip.count++; + } + ignore_char: + *status = serial_inp(up, UART_LSR); + } while ((*status & UART_LSR_DR) && (max_count-- > 0)); + tty_flip_buffer_push(tty); +} + +static _INLINE_ void transmit_chars(struct uart_8250_port *up) +{ + struct circ_buf *xmit = &up->port.info->xmit; + int count; + + if (up->port.x_char) { + serial_outp(up, UART_TX, up->port.x_char); + up->port.icount.tx++; + up->port.x_char = 0; + return; + } + if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { + serial8250_stop_tx(&up->port, 0); + return; + } + + count = up->port.fifosize; + do { + serial_out(up, UART_TX, xmit->buf[xmit->tail]); + xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); + up->port.icount.tx++; + if (uart_circ_empty(xmit)) + break; + } while (--count > 0); + + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(&up->port); + + DEBUG_INTR("THRE..."); + + if (uart_circ_empty(xmit)) + serial8250_stop_tx(&up->port, 0); +} + +static _INLINE_ void check_modem_status(struct uart_8250_port *up) +{ + int status; + + status = serial_in(up, UART_MSR); + + if ((status & UART_MSR_ANY_DELTA) == 0) + return; + + if (status & UART_MSR_TERI) + up->port.icount.rng++; + if (status & UART_MSR_DDSR) + up->port.icount.dsr++; + if (status & UART_MSR_DDCD) + uart_handle_dcd_change(&up->port, status & UART_MSR_DCD); + if (status & UART_MSR_DCTS) + uart_handle_cts_change(&up->port, status & UART_MSR_CTS); + + wake_up_interruptible(&up->port.info->delta_msr_wait); +} + +/* + * This handles the interrupt from one port. + */ +static inline void +serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs) +{ + unsigned int status = serial_inp(up, UART_LSR); + + DEBUG_INTR("status = %x...", status); + + if (status & UART_LSR_DR) + receive_chars(up, &status, regs); + check_modem_status(up); + if (status & UART_LSR_THRE) + transmit_chars(up); +} + +/* + * This is the serial driver's interrupt routine. + * + * Arjan thinks the old way was overly complex, so it got simplified. + * Alan disagrees, saying that need the complexity to handle the weird + * nature of ISA shared interrupts. (This is a special exception.) + * + * In order to handle ISA shared interrupts properly, we need to check + * that all ports have been serviced, and therefore the ISA interrupt + * line has been de-asserted. + * + * This means we need to loop through all ports. checking that they + * don't have an interrupt pending. + */ +static irqreturn_t serial8250_interrupt(int irq, void *dev_id, struct pt_regs *regs) +{ + struct irq_info *i = dev_id; + struct list_head *l, *end = NULL; + int pass_counter = 0; + + DEBUG_INTR("serial8250_interrupt(%d)...", irq); + + spin_lock(&i->lock); + + l = i->head; + do { + struct uart_8250_port *up; + unsigned int iir; + + up = list_entry(l, struct uart_8250_port, list); + + iir = serial_in(up, UART_IIR); + if (!(iir & UART_IIR_NO_INT)) { + spin_lock(&up->port.lock); + serial8250_handle_port(up, regs); + spin_unlock(&up->port.lock); + + end = NULL; + } else if (end == NULL) + end = l; + + l = l->next; + + if (l == i->head && pass_counter++ > PASS_LIMIT) { + /* If we hit this, we're dead. */ + printk(KERN_ERR "serial8250: too much work for " + "irq%d\n", irq); + break; + } + } while (l != end); + + spin_unlock(&i->lock); + + DEBUG_INTR("end.\n"); + /* FIXME! Was it really ours? */ + return IRQ_HANDLED; +} + +/* + * To support ISA shared interrupts, we need to have one interrupt + * handler that ensures that the IRQ line has been deasserted + * before returning. Failing to do this will result in the IRQ + * line being stuck active, and, since ISA irqs are edge triggered, + * no more IRQs will be seen. + */ +static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up) +{ + spin_lock_irq(&i->lock); + + if (!list_empty(i->head)) { + if (i->head == &up->list) + i->head = i->head->next; + list_del(&up->list); + } else { + BUG_ON(i->head != &up->list); + i->head = NULL; + } + + spin_unlock_irq(&i->lock); +} + +static int serial_link_irq_chain(struct uart_8250_port *up) +{ + struct irq_info *i = irq_lists + up->port.irq; + int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0; + + spin_lock_irq(&i->lock); + + if (i->head) { + list_add(&up->list, i->head); + spin_unlock_irq(&i->lock); + + ret = 0; + } else { + INIT_LIST_HEAD(&up->list); + i->head = &up->list; + spin_unlock_irq(&i->lock); + + ret = request_irq(up->port.irq, serial8250_interrupt, + irq_flags, "serial", i); + if (ret < 0) + serial_do_unlink(i, up); + } + + return ret; +} + +static void serial_unlink_irq_chain(struct uart_8250_port *up) +{ + struct irq_info *i = irq_lists + up->port.irq; + + BUG_ON(i->head == NULL); + + if (list_empty(i->head)) + free_irq(up->port.irq, i); + + serial_do_unlink(i, up); +} + +/* + * This function is used to handle ports that do not have an + * interrupt. This doesn't work very well for 16450's, but gives + * barely passable results for a 16550A. (Although at the expense + * of much CPU overhead). + */ +static void serial8250_timeout(unsigned long data) +{ + struct uart_8250_port *up = (struct uart_8250_port *)data; + unsigned int timeout; + unsigned int iir; + + iir = serial_in(up, UART_IIR); + if (!(iir & UART_IIR_NO_INT)) { + spin_lock(&up->port.lock); + serial8250_handle_port(up, NULL); + spin_unlock(&up->port.lock); + } + + timeout = up->port.timeout; + timeout = timeout > 6 ? (timeout / 2 - 2) : 1; + mod_timer(&up->timer, jiffies + timeout); +} + +static unsigned int serial8250_tx_empty(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned long flags; + unsigned int ret; + + spin_lock_irqsave(&up->port.lock, flags); + ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0; + spin_unlock_irqrestore(&up->port.lock, flags); + + return ret; +} + +static unsigned int serial8250_get_mctrl(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned long flags; + unsigned char status; + unsigned int ret; + + spin_lock_irqsave(&up->port.lock, flags); + status = serial_in(up, UART_MSR); + spin_unlock_irqrestore(&up->port.lock, flags); + + ret = 0; + if (status & UART_MSR_DCD) + ret |= TIOCM_CAR; + if (status & UART_MSR_RI) + ret |= TIOCM_RNG; + if (status & UART_MSR_DSR) + ret |= TIOCM_DSR; + if (status & UART_MSR_CTS) + ret |= TIOCM_CTS; + return ret; +} + +static void serial8250_set_mctrl(struct uart_port *port, unsigned int mctrl) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned char mcr = 0; + + if (mctrl & TIOCM_RTS) + mcr |= UART_MCR_RTS; + if (mctrl & TIOCM_DTR) + mcr |= UART_MCR_DTR; + if (mctrl & TIOCM_OUT1) + mcr |= UART_MCR_OUT1; + if (mctrl & TIOCM_OUT2) + mcr |= UART_MCR_OUT2; + if (mctrl & TIOCM_LOOP) + mcr |= UART_MCR_LOOP; + + mcr = (mcr & up->mcr_mask) | up->mcr_force; + + serial_out(up, UART_MCR, mcr); +} + +static void serial8250_break_ctl(struct uart_port *port, int break_state) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned long flags; + + spin_lock_irqsave(&up->port.lock, flags); + if (break_state == -1) + up->lcr |= UART_LCR_SBC; + else + up->lcr &= ~UART_LCR_SBC; + serial_out(up, UART_LCR, up->lcr); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static int serial8250_startup(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned long flags; + int retval; + + /* + * Clear the FIFO buffers and disable them. + * (they will be reeanbled in set_termios()) + */ + if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) { + serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO); + serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | + UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); + serial_outp(up, UART_FCR, 0); + } + + /* + * Clear the interrupt registers. + */ + (void) serial_inp(up, UART_LSR); + (void) serial_inp(up, UART_RX); + (void) serial_inp(up, UART_IIR); + (void) serial_inp(up, UART_MSR); + + /* + * At this point, there's no way the LSR could still be 0xff; + * if it is, then bail out, because there's likely no UART + * here. + */ + if (!(up->port.flags & UPF_BUGGY_UART) && + (serial_inp(up, UART_LSR) == 0xff)) { + printk("ttyS%d: LSR safety check engaged!\n", up->port.line); + return -ENODEV; + } + + retval = serial_link_irq_chain(up); + if (retval) + return retval; + + /* + * Now, initialize the UART + */ + serial_outp(up, UART_LCR, UART_LCR_WLEN8); + + spin_lock_irqsave(&up->port.lock, flags); + if (up->port.flags & UPF_FOURPORT) { + if (!is_real_interrupt(up->port.irq)) + up->port.mctrl |= TIOCM_OUT1; + } else + /* + * Most PC uarts need OUT2 raised to enable interrupts. + */ + if (is_real_interrupt(up->port.irq)) + up->port.mctrl |= TIOCM_OUT2; + + serial8250_set_mctrl(&up->port, up->port.mctrl); + spin_unlock_irqrestore(&up->port.lock, flags); + + /* + * Finally, enable interrupts. Note: Modem status interrupts + * are set via set_termios(), which will be occurring imminently + * anyway, so we don't enable them here. + */ + up->ier = UART_IER_RLSI | UART_IER_RDI; + serial_outp(up, UART_IER, up->ier); + + if (up->port.flags & UPF_FOURPORT) { + unsigned int icp; + /* + * Enable interrupts on the AST Fourport board + */ + icp = (up->port.iobase & 0xfe0) | 0x01f; + outb_p(0x80, icp); + (void) inb_p(icp); + } + + /* + * And clear the interrupt registers again for luck. + */ + (void) serial_inp(up, UART_LSR); + (void) serial_inp(up, UART_RX); + (void) serial_inp(up, UART_IIR); + (void) serial_inp(up, UART_MSR); + + return 0; +} + +static void serial8250_shutdown(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned long flags; + + /* + * Disable interrupts from this port + */ + up->ier = 0; + serial_outp(up, UART_IER, 0); + + spin_lock_irqsave(&up->port.lock, flags); + if (up->port.flags & UPF_FOURPORT) { + /* reset interrupts on the AST Fourport board */ + inb((up->port.iobase & 0xfe0) | 0x1f); + up->port.mctrl |= TIOCM_OUT1; + } else + up->port.mctrl &= ~TIOCM_OUT2; + + serial8250_set_mctrl(&up->port, up->port.mctrl); + spin_unlock_irqrestore(&up->port.lock, flags); + + /* + * Disable break condition and FIFOs + */ + serial_out(up, UART_LCR, serial_inp(up, UART_LCR) & ~UART_LCR_SBC); + serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | + UART_FCR_CLEAR_RCVR | + UART_FCR_CLEAR_XMIT); + serial_outp(up, UART_FCR, 0); + + /* + * Read data port to reset things, and then unlink from + * the IRQ chain. + */ + (void) serial_in(up, UART_RX); + + if (!is_real_interrupt(up->port.irq)) + del_timer_sync(&up->timer); + else + serial_unlink_irq_chain(up); +} + +static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud) +{ + unsigned int quot; + + /* + * Handle magic divisors for baud rates above baud_base on + * SMSC SuperIO chips. + */ + if ((port->flags & UPF_MAGIC_MULTIPLIER) && + baud == (port->uartclk/4)) + quot = 0x8001; + else if ((port->flags & UPF_MAGIC_MULTIPLIER) && + baud == (port->uartclk/8)) + quot = 0x8002; + else + quot = uart_get_divisor(port, baud); + + return quot; +} + +static void +serial8250_set_termios(struct uart_port *port, struct termios *termios, + struct termios *old) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned char cval, fcr = 0; + unsigned long flags; + unsigned int baud, quot; + + switch (termios->c_cflag & CSIZE) { + case CS5: + cval = 0x00; + break; + case CS6: + cval = 0x01; + break; + case CS7: + cval = 0x02; + break; + default: + case CS8: + cval = 0x03; + break; + } + + if (termios->c_cflag & CSTOPB) + cval |= 0x04; + if (termios->c_cflag & PARENB) + cval |= UART_LCR_PARITY; + if (!(termios->c_cflag & PARODD)) + cval |= UART_LCR_EPAR; +#ifdef CMSPAR + if (termios->c_cflag & CMSPAR) + cval |= UART_LCR_SPAR; +#endif + + /* + * Ask the core to calculate the divisor for us. + */ + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + quot = serial8250_get_divisor(port, baud); + quot = 0x35; /* FIXME */ + + /* + * Work around a bug in the Oxford Semiconductor 952 rev B + * chip which causes it to seriously miscalculate baud rates + * when DLL is 0. + */ + if ((quot & 0xff) == 0 && up->port.type == PORT_16C950 && + up->rev == 0x5201) + quot ++; + + if (uart_config[up->port.type].flags & UART_USE_FIFO) { + if (baud < 2400) + fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIGGER_1; + else + fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIGGER_8; + } + + /* + * Ok, we're now changing the port state. Do it with + * interrupts disabled. + */ + spin_lock_irqsave(&up->port.lock, flags); + + /* + * Update the per-port timeout. + */ + uart_update_timeout(port, termios->c_cflag, baud); + + up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR; + if (termios->c_iflag & INPCK) + up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE; + if (termios->c_iflag & (BRKINT | PARMRK)) + up->port.read_status_mask |= UART_LSR_BI; + + /* + * Characteres to ignore + */ + up->port.ignore_status_mask = 0; + if (termios->c_iflag & IGNPAR) + up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE; + if (termios->c_iflag & IGNBRK) { + up->port.ignore_status_mask |= UART_LSR_BI; + /* + * If we're ignoring parity and break indicators, + * ignore overruns too (for real raw support). + */ + if (termios->c_iflag & IGNPAR) + up->port.ignore_status_mask |= UART_LSR_OE; + } + + /* + * ignore all characters if CREAD is not set + */ + if ((termios->c_cflag & CREAD) == 0) + up->port.ignore_status_mask |= UART_LSR_DR; + + /* + * CTS flow control flag and modem status interrupts + */ + up->ier &= ~UART_IER_MSI; + if (UART_ENABLE_MS(&up->port, termios->c_cflag)) + up->ier |= UART_IER_MSI; + + serial_out(up, UART_IER, up->ier); + serial_outp(up, 0x28, quot & 0xffff); + up->lcr = cval; /* Save LCR */ + if (up->port.type != PORT_16750) { + if (fcr & UART_FCR_ENABLE_FIFO) { + /* emulated UARTs (Lucent Venus 167x) need two steps */ + serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO); + } + serial_outp(up, UART_FCR, fcr); /* set fcr */ + } + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static void +serial8250_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + if (state) { + /* sleep */ + if (up->pm) + up->pm(port, state, oldstate); + } else { + /* wake */ + if (up->pm) + up->pm(port, state, oldstate); + } +} + +/* + * Resource handling. This is complicated by the fact that resources + * depend on the port type. Maybe we should be claiming the standard + * 8250 ports, and then trying to get other resources as necessary? + */ +static int +serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res) +{ + unsigned int size = 8 << up->port.regshift; + int ret = 0; + + switch (up->port.iotype) { + case SERIAL_IO_MEM: + if (up->port.mapbase) { + *res = request_mem_region(up->port.mapbase, size, "serial"); + if (!*res) + ret = -EBUSY; + } + break; + + case SERIAL_IO_HUB6: + case SERIAL_IO_PORT: + *res = request_region(up->port.iobase, size, "serial"); + if (!*res) + ret = -EBUSY; + break; + } + return ret; +} + + +static void serial8250_release_port(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + unsigned long start, offset = 0, size = 0; + + size <<= up->port.regshift; + + switch (up->port.iotype) { + case SERIAL_IO_MEM: + if (up->port.mapbase) { + /* + * Unmap the area. + */ + iounmap(up->port.membase); + up->port.membase = NULL; + + start = up->port.mapbase; + + if (size) + release_mem_region(start + offset, size); + release_mem_region(start, 8 << up->port.regshift); + } + break; + + case SERIAL_IO_HUB6: + case SERIAL_IO_PORT: + start = up->port.iobase; + + if (size) + release_region(start + offset, size); + release_region(start + offset, 8 << up->port.regshift); + break; + + default: + break; + } +} + +static int serial8250_request_port(struct uart_port *port) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + struct resource *res = NULL, *res_rsa = NULL; + int ret = 0; + + if (up->port.flags & UPF_RESOURCES) { + ret = serial8250_request_std_resource(up, &res); + } + + /* + * If we have a mapbase, then request that as well. + */ + if (ret == 0 && up->port.flags & UPF_IOREMAP) { + int size = res->end - res->start + 1; + + up->port.membase = ioremap(up->port.mapbase, size); + if (!up->port.membase) + ret = -ENOMEM; + } + + if (ret < 0) { + if (res_rsa) + release_resource(res_rsa); + if (res) + release_resource(res); + } + return ret; +} + +static void serial8250_config_port(struct uart_port *port, int flags) +{ + struct uart_8250_port *up = (struct uart_8250_port *)port; + struct resource *res_std = NULL, *res_rsa = NULL; + int probeflags = PROBE_ANY; + + probeflags &= ~PROBE_RSA; + + if (flags & UART_CONFIG_TYPE) + autoconfig(up, probeflags); + + /* + * If the port wasn't an RSA port, release the resource. + */ + if (up->port.type != PORT_RSA && res_rsa) + release_resource(res_rsa); + + if (up->port.type == PORT_UNKNOWN && res_std) + release_resource(res_std); +} + +static int +serial8250_verify_port(struct uart_port *port, struct serial_struct *ser) +{ + if (ser->irq >= NR_IRQS || ser->irq < 0 || + ser->baud_base < 9600 || ser->type < PORT_UNKNOWN || + ser->type > PORT_MAX_8250 || ser->type == PORT_CIRRUS || + ser->type == PORT_STARTECH) + return -EINVAL; + return 0; +} + +static const char * +serial8250_type(struct uart_port *port) +{ + int type = port->type; + + if (type >= ARRAY_SIZE(uart_config)) + type = 0; + return uart_config[type].name; +} + +static struct uart_ops serial8250_pops = { + .tx_empty = serial8250_tx_empty, + .set_mctrl = serial8250_set_mctrl, + .get_mctrl = serial8250_get_mctrl, + .stop_tx = serial8250_stop_tx, + .start_tx = serial8250_start_tx, + .stop_rx = serial8250_stop_rx, + .enable_ms = serial8250_enable_ms, + .break_ctl = serial8250_break_ctl, + .startup = serial8250_startup, + .shutdown = serial8250_shutdown, + .set_termios = serial8250_set_termios, + .pm = serial8250_pm, + .type = serial8250_type, + .release_port = serial8250_release_port, + .request_port = serial8250_request_port, + .config_port = serial8250_config_port, + .verify_port = serial8250_verify_port, +}; + +static struct uart_8250_port serial8250_ports[UART_NR]; + +static void __init serial8250_isa_init_ports(void) +{ + struct uart_8250_port *up; + static int first = 1; + int i; + + if (!first) + return; + first = 0; + + for (i = 0, up = serial8250_ports; i < ARRAY_SIZE(old_serial_port); + i++, up++) { + up->port.iobase = old_serial_port[i].port; + up->port.irq = old_serial_port[i].irq; + up->port.uartclk = get_au1x00_uart_baud_base(); + up->port.flags = old_serial_port[i].flags | + UPF_RESOURCES; + up->port.hub6 = old_serial_port[i].hub6; + up->port.membase = old_serial_port[i].iomem_base; + up->port.iotype = old_serial_port[i].io_type; + up->port.regshift = old_serial_port[i].iomem_reg_shift; + up->port.ops = &serial8250_pops; + } +} + +static void __init serial8250_register_ports(struct uart_driver *drv) +{ + int i; + + serial8250_isa_init_ports(); + + for (i = 0; i < UART_NR; i++) { + struct uart_8250_port *up = &serial8250_ports[i]; + + up->port.line = i; + up->port.ops = &serial8250_pops; + init_timer(&up->timer); + up->timer.function = serial8250_timeout; + + /* + * ALPHA_KLUDGE_MCR needs to be killed. + */ + up->mcr_mask = ~ALPHA_KLUDGE_MCR; + up->mcr_force = ALPHA_KLUDGE_MCR; + + uart_add_one_port(drv, &up->port); + } +} + +#ifdef CONFIG_SERIAL_AU1X00_CONSOLE + +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) + +/* + * Wait for transmitter & holding register to empty + */ +static inline void wait_for_xmitr(struct uart_8250_port *up) +{ + unsigned int status, tmout = 10000; + + /* Wait up to 10ms for the character(s) to be sent. */ + do { + status = serial_in(up, UART_LSR); + + if (status & UART_LSR_BI) + up->lsr_break_flag = UART_LSR_BI; + + if (--tmout == 0) + break; + udelay(1); + } while ((status & BOTH_EMPTY) != BOTH_EMPTY); + + /* Wait up to 1s for flow control if necessary */ + if (up->port.flags & UPF_CONS_FLOW) { + tmout = 1000000; + while (--tmout && + ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0)) + udelay(1); + } +} + +/* + * Print a string to the serial port trying not to disturb + * any possible real use of the port... + * + * The console_lock must be held when we get here. + */ +static void +serial8250_console_write(struct console *co, const char *s, unsigned int count) +{ + struct uart_8250_port *up = &serial8250_ports[co->index]; + unsigned int ier; + int i; + + /* + * First save the UER then disable the interrupts + */ + ier = serial_in(up, UART_IER); + serial_out(up, UART_IER, 0); + + /* + * Now, do each character + */ + for (i = 0; i < count; i++, s++) { + wait_for_xmitr(up); + + /* + * Send the character out. + * If a LF, also do CR... + */ + serial_out(up, UART_TX, *s); + if (*s == 10) { + wait_for_xmitr(up); + serial_out(up, UART_TX, 13); + } + } + + /* + * Finally, wait for transmitter to become empty + * and restore the IER + */ + wait_for_xmitr(up); + serial_out(up, UART_IER, ier); +} + +static int __init serial8250_console_setup(struct console *co, char *options) +{ + struct uart_port *port; + int baud = 9600; + int bits = 8; + int parity = 'n'; + int flow = 'n'; + + /* + * Check whether an invalid uart number has been specified, and + * if so, search for the first available port that does have + * console support. + */ + if (co->index >= UART_NR) + co->index = 0; + port = &serial8250_ports[co->index].port; + + /* + * Temporary fix. + */ + spin_lock_init(&port->lock); + + if (options) + uart_parse_options(options, &baud, &parity, &bits, &flow); + + return uart_set_options(port, co, baud, parity, bits, flow); +} + +extern struct uart_driver serial8250_reg; +static struct console serial8250_console = { + .name = "ttyS", + .write = serial8250_console_write, + .device = uart_console_device, + .setup = serial8250_console_setup, + .flags = CON_PRINTBUFFER, + .index = -1, + .data = &serial8250_reg, +}; + +static int __init serial8250_console_init(void) +{ + serial8250_isa_init_ports(); + register_console(&serial8250_console); + return 0; +} +console_initcall(serial8250_console_init); + +#define SERIAL8250_CONSOLE &serial8250_console +#else +#define SERIAL8250_CONSOLE NULL +#endif + +static struct uart_driver serial8250_reg = { + .owner = THIS_MODULE, + .driver_name = "serial", + .devfs_name = "tts/", + .dev_name = "ttyS", + .major = TTY_MAJOR, + .minor = 64, + .nr = UART_NR, + .cons = SERIAL8250_CONSOLE, +}; + +/* + * register_serial and unregister_serial allows for 16x50 serial ports to be + * configured at run-time, to support PCMCIA modems. + */ + +static int __register_serial(struct serial_struct *req, int line) +{ + struct uart_port port; + + port.iobase = req->port; + port.membase = req->iomem_base; + port.irq = req->irq; + port.uartclk = req->baud_base * 16; + port.fifosize = req->xmit_fifo_size; + port.regshift = req->iomem_reg_shift; + port.iotype = req->io_type; + port.flags = req->flags | UPF_BOOT_AUTOCONF; + port.mapbase = req->iomap_base; + port.line = line; + + if (HIGH_BITS_OFFSET) + port.iobase |= (long) req->port_high << HIGH_BITS_OFFSET; + + /* + * If a clock rate wasn't specified by the low level + * driver, then default to the standard clock rate. + */ + if (port.uartclk == 0) + port.uartclk = BASE_BAUD * 16; + + return uart_register_port(&serial8250_reg, &port); +} + +/** + * register_serial - configure a 16x50 serial port at runtime + * @req: request structure + * + * Configure the serial port specified by the request. If the + * port exists and is in use an error is returned. If the port + * is not currently in the table it is added. + * + * The port is then probed and if necessary the IRQ is autodetected + * If this fails an error is returned. + * + * On success the port is ready to use and the line number is returned. + */ +int register_serial(struct serial_struct *req) +{ + return __register_serial(req, -1); +} + +int __init early_serial_setup(struct uart_port *port) +{ + serial8250_isa_init_ports(); + serial8250_ports[port->line].port = *port; + serial8250_ports[port->line].port.ops = &serial8250_pops; + return 0; +} + +/** + * unregister_serial - remove a 16x50 serial port at runtime + * @line: serial line number + * + * Remove one serial port. This may be called from interrupt + * context. + */ +void unregister_serial(int line) +{ + uart_unregister_port(&serial8250_reg, line); +} + +/* + * This is for ISAPNP only. + */ +void serial8250_get_irq_map(unsigned int *map) +{ + int i; + + for (i = 0; i < UART_NR; i++) { + if (serial8250_ports[i].port.type != PORT_UNKNOWN && + serial8250_ports[i].port.irq < 16) + *map |= 1 << serial8250_ports[i].port.irq; + } +} + +/** + * serial8250_suspend_port - suspend one serial port + * @line: serial line number + * @level: the level of port suspension, as per uart_suspend_port + * + * Suspend one serial port. + */ +void serial8250_suspend_port(int line) +{ + uart_suspend_port(&serial8250_reg, &serial8250_ports[line].port); +} + +/** + * serial8250_resume_port - resume one serial port + * @line: serial line number + * @level: the level of port resumption, as per uart_resume_port + * + * Resume one serial port. + */ +void serial8250_resume_port(int line) +{ + uart_resume_port(&serial8250_reg, &serial8250_ports[line].port); +} + +static int __init serial8250_init(void) +{ + int ret, i; + + printk(KERN_INFO "Serial: Au1x00 driver\n"); + + for (i = 0; i < NR_IRQS; i++) + spin_lock_init(&irq_lists[i].lock); + + ret = uart_register_driver(&serial8250_reg); + if (ret >= 0) + serial8250_register_ports(&serial8250_reg); + + return ret; +} + +static void __exit serial8250_exit(void) +{ + int i; + + for (i = 0; i < UART_NR; i++) + uart_remove_one_port(&serial8250_reg, &serial8250_ports[i].port); + + uart_unregister_driver(&serial8250_reg); +} + +module_init(serial8250_init); +module_exit(serial8250_exit); + +EXPORT_SYMBOL(register_serial); +EXPORT_SYMBOL(unregister_serial); +EXPORT_SYMBOL(serial8250_get_irq_map); +EXPORT_SYMBOL(serial8250_suspend_port); +EXPORT_SYMBOL(serial8250_resume_port); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Au1x00 serial driver\n"); diff -Nru a/drivers/serial/dz.c b/drivers/serial/dz.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/serial/dz.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,827 @@ +/* + * dz.c: Serial port driver for DECStations equiped + * with the DZ chipset. + * + * Copyright (C) 1998 Olivier A. D. Lebaillif + * + * Email: olivier.lebaillif@ifrsys.com + * + * [31-AUG-98] triemer + * Changed IRQ to use Harald's dec internals interrupts.h + * removed base_addr code - moving address assignment to setup.c + * Changed name of dz_init to rs_init to be consistent with tc code + * [13-NOV-98] triemer fixed code to receive characters + * after patches by harald to irq code. + * [09-JAN-99] triemer minor fix for schedule - due to removal of timeout + * field from "current" - somewhere between 2.1.121 and 2.1.131 + Qua Jun 27 15:02:26 BRT 2001 + * [27-JUN-2001] Arnaldo Carvalho de Melo - cleanups + * + * Parts (C) 1999 David Airlie, airlied@linux.ie + * [07-SEP-99] Bugfixes + * + * [06-Jan-2002] Russell King + * Converted to new serial core + */ + +#undef DEBUG_DZ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define CONSOLE_LINE (3) /* for definition of struct console */ + +#include "dz.h" + +#define DZ_INTR_DEBUG 1 + +static char *dz_name = "DECstation DZ serial driver version "; +static char *dz_version = "1.02"; + +struct dz_port { + struct uart_port port; + unsigned int cflag; +}; + +static struct dz_port dz_ports[DZ_NB_PORT]; + +#ifdef DEBUG_DZ +/* + * debugging code to send out chars via prom + */ +static void debug_console(const char *s, int count) +{ + unsigned i; + + for (i = 0; i < count; i++) { + if (*s == 10) + prom_printf("%c", 13); + prom_printf("%c", *s++); + } +} +#endif + +/* + * ------------------------------------------------------------ + * dz_in () and dz_out () + * + * These routines are used to access the registers of the DZ + * chip, hiding relocation differences between implementation. + * ------------------------------------------------------------ + */ + +static inline unsigned short dz_in(struct dz_port *dport, unsigned offset) +{ + volatile unsigned short *addr = + (volatile unsigned short *) (dport->port.membase + offset); + return *addr; +} + +static inline void dz_out(struct dz_port *dport, unsigned offset, + unsigned short value) +{ + volatile unsigned short *addr = + (volatile unsigned short *) (dport->port.membase + offset); + *addr = value; +} + +/* + * ------------------------------------------------------------ + * rs_stop () and rs_start () + * + * These routines are called before setting or resetting + * tty->stopped. They enable or disable transmitter interrupts, + * as necessary. + * ------------------------------------------------------------ + */ + +static void dz_stop_tx(struct uart_port *uport, unsigned int tty_stop) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned short tmp, mask = 1 << dport->port.line; + unsigned long flags; + + spin_lock_irqsave(&dport->port.lock, flags); + tmp = dz_in(dport, DZ_TCR); /* read the TX flag */ + tmp &= ~mask; /* clear the TX flag */ + dz_out(dport, DZ_TCR, tmp); + spin_unlock_irqrestore(&dport->port.lock, flags); +} + +static void dz_start_tx(struct uart_port *uport, unsigned int tty_start) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned short tmp, mask = 1 << dport->port.line; + unsigned long flags; + + spin_lock_irqsave(&dport->port.lock, flags); + tmp = dz_in(dport, DZ_TCR); /* read the TX flag */ + tmp |= mask; /* set the TX flag */ + dz_out(dport, DZ_TCR, tmp); + spin_unlock_irqrestore(&dport->port.lock, flags); +} + +static void dz_stop_rx(struct uart_port *uport) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned long flags; + + spin_lock_irqsave(&dport->port.lock, flags); + dport->cflag &= ~DZ_CREAD; + dz_out(dport, DZ_LPR, dport->cflag); + spin_unlock_irqrestore(&dport->port.lock, flags); +} + +static void dz_enable_ms(struct uart_port *port) +{ + /* nothing to do */ +} + +/* + * ------------------------------------------------------------ + * Here starts the interrupt handling routines. All of the + * following subroutines are declared as inline and are folded + * into dz_interrupt. They were separated out for readability's + * sake. + * + * Note: rs_interrupt() is a "fast" interrupt, which means that it + * runs with interrupts turned off. People who may want to modify + * rs_interrupt() should try to keep the interrupt handler as fast as + * possible. After you are done making modifications, it is not a bad + * idea to do: + * + * make drivers/serial/dz.s + * + * and look at the resulting assemble code in dz.s. + * + * ------------------------------------------------------------ + */ + +/* + * ------------------------------------------------------------ + * receive_char () + * + * This routine deals with inputs from any lines. + * ------------------------------------------------------------ + */ +static inline void dz_receive_chars(struct dz_port *dport) +{ + struct tty_struct *tty = NULL; + struct uart_icount *icount; + int ignore = 0; + unsigned short status, tmp; + unsigned char ch; + + /* this code is going to be a problem... + the call to tty_flip_buffer is going to need + to be rethought... + */ + do { + status = dz_in(dport, DZ_RBUF); + + /* punt so we don't get duplicate characters */ + if (!(status & DZ_DVAL)) + goto ignore_char; + + + ch = UCHAR(status); /* grab the char */ + +#if 0 + if (info->is_console) { + if (ch == 0) + return; /* it's a break ... */ + } +#endif + + tty = dport->port.info->tty;/* now tty points to the proper dev */ + icount = &dport->port.icount; + + if (!tty) + break; + if (tty->flip.count >= TTY_FLIPBUF_SIZE) + break; + + *tty->flip.char_buf_ptr = ch; + *tty->flip.flag_buf_ptr = 0; + icount->rx++; + + /* keep track of the statistics */ + if (status & (DZ_OERR | DZ_FERR | DZ_PERR)) { + if (status & DZ_PERR) /* parity error */ + icount->parity++; + else if (status & DZ_FERR) /* frame error */ + icount->frame++; + if (status & DZ_OERR) /* overrun error */ + icount->overrun++; + + /* check to see if we should ignore the character + and mask off conditions that should be ignored + */ + + if (status & dport->port.ignore_status_mask) { + if (++ignore > 100) + break; + goto ignore_char; + } + /* mask off the error conditions we want to ignore */ + tmp = status & dport->port.read_status_mask; + + if (tmp & DZ_PERR) { + *tty->flip.flag_buf_ptr = TTY_PARITY; +#ifdef DEBUG_DZ + debug_console("PERR\n", 5); +#endif + } else if (tmp & DZ_FERR) { + *tty->flip.flag_buf_ptr = TTY_FRAME; +#ifdef DEBUG_DZ + debug_console("FERR\n", 5); +#endif + } + if (tmp & DZ_OERR) { +#ifdef DEBUG_DZ + debug_console("OERR\n", 5); +#endif + if (tty->flip.count < TTY_FLIPBUF_SIZE) { + tty->flip.count++; + tty->flip.flag_buf_ptr++; + tty->flip.char_buf_ptr++; + *tty->flip.flag_buf_ptr = TTY_OVERRUN; + } + } + } + tty->flip.flag_buf_ptr++; + tty->flip.char_buf_ptr++; + tty->flip.count++; + ignore_char: + } while (status & DZ_DVAL); + + if (tty) + tty_flip_buffer_push(tty); +} + +/* + * ------------------------------------------------------------ + * transmit_char () + * + * This routine deals with outputs to any lines. + * ------------------------------------------------------------ + */ +static inline void dz_transmit_chars(struct dz_port *dport) +{ + struct circ_buf *xmit = &dport->port.info->xmit; + unsigned char tmp; + + if (dport->port.x_char) { /* XON/XOFF chars */ + dz_out(dport, DZ_TDR, dport->port.x_char); + dport->port.icount.tx++; + dport->port.x_char = 0; + return; + } + /* if nothing to do or stopped or hardware stopped */ + if (uart_circ_empty(xmit) || uart_tx_stopped(&dport->port)) { + dz_stop_tx(&dport->port, 0); + return; + } + + /* + * if something to do ... (rember the dz has no output fifo so we go + * one char at a time :-< + */ + tmp = xmit->buf[xmit->tail]; + xmit->tail = (xmit->tail + 1) & (DZ_XMIT_SIZE - 1); + dz_out(dport, DZ_TDR, tmp); + dport->port.icount.tx++; + + if (uart_circ_chars_pending(xmit) < DZ_WAKEUP_CHARS) + uart_write_wakeup(&dport->port); + + /* Are we done */ + if (uart_circ_empty(xmit)) + dz_stop_tx(&dport->port, 0); +} + +/* + * ------------------------------------------------------------ + * check_modem_status () + * + * Only valid for the MODEM line duh ! + * ------------------------------------------------------------ + */ +static inline void check_modem_status(struct dz_port *dport) +{ + unsigned short status; + + /* if not ne modem line just return */ + if (dport->port.line != DZ_MODEM) + return; + + status = dz_in(dport, DZ_MSR); + + /* it's easy, since DSR2 is the only bit in the register */ + if (status) + dport->port.icount.dsr++; +} + +/* + * ------------------------------------------------------------ + * dz_interrupt () + * + * this is the main interrupt routine for the DZ chip. + * It deals with the multiple ports. + * ------------------------------------------------------------ + */ +static irqreturn_t dz_interrupt(int irq, void *dev, struct pt_regs *regs) +{ + struct dz_port *dport; + unsigned short status; + + /* get the reason why we just got an irq */ + status = dz_in((struct dz_port *)dev, DZ_CSR); + dport = &dz_ports[LINE(status)]; + + if (status & DZ_RDONE) + dz_receive_chars(dport); + + if (status & DZ_TRDY) + dz_transmit_chars(dport); + + /* FIXME: what about check modem status??? --rmk */ + + return IRQ_HANDLED; +} + +/* + * ------------------------------------------------------------------- + * Here ends the DZ interrupt routines. + * ------------------------------------------------------------------- + */ + +static unsigned int dz_get_mctrl(struct uart_port *uport) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned int mctrl = TIOCM_CAR | TIOCM_DSR | TIOCM_CTS; + + if (dport->port.line == DZ_MODEM) { + /* + * CHECKME: This is a guess from the other code... --rmk + */ + if (dz_in(dport, DZ_MSR) & DZ_MODEM_DSR) + mctrl &= ~TIOCM_DSR; + } + + return mctrl; +} + +static void dz_set_mctrl(struct uart_port *uport, unsigned int mctrl) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned short tmp; + + if (dport->port.line == DZ_MODEM) { + tmp = dz_in(dport, DZ_TCR); + if (mctrl & TIOCM_DTR) + tmp &= ~DZ_MODEM_DTR; + else + tmp |= DZ_MODEM_DTR; + dz_out(dport, DZ_TCR, tmp); + } +} + +/* + * ------------------------------------------------------------------- + * startup () + * + * various initialization tasks + * ------------------------------------------------------------------- + */ +static int dz_startup(struct uart_port *uport) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned long flags; + unsigned short tmp; + + /* The dz lines for the mouse/keyboard must be + * opened using their respective drivers. + */ + if ((dport->port.line == DZ_KEYBOARD) || + (dport->port.line == DZ_MOUSE)) + return -ENODEV; + + spin_lock_irqsave(&dport->port.lock, flags); + + /* enable the interrupt and the scanning */ + tmp = dz_in(dport, DZ_CSR); + tmp |= DZ_RIE | DZ_TIE | DZ_MSE; + dz_out(dport, DZ_CSR, tmp); + + spin_unlock_irqrestore(&dport->port.lock, flags); + + return 0; +} + +/* + * ------------------------------------------------------------------- + * shutdown () + * + * This routine will shutdown a serial port; interrupts are disabled, and + * DTR is dropped if the hangup on close termio flag is on. + * ------------------------------------------------------------------- + */ +static void dz_shutdown(struct uart_port *uport) +{ + dz_stop_tx(uport, 0); +} + +/* + * get_lsr_info - get line status register info + * + * Purpose: Let user call ioctl() to get info when the UART physically + * is emptied. On bus types like RS485, the transmitter must + * release the bus after transmitting. This must be done when + * the transmit shift register is empty, not be done when the + * transmit holding register is empty. This functionality + * allows an RS485 driver to be written in user space. + */ +static unsigned int dz_tx_empty(struct uart_port *uport) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned short status = dz_in(dport, DZ_LPR); + + /* FIXME: this appears to be obviously broken --rmk. */ + return status ? TIOCSER_TEMT : 0; +} + +static void dz_break_ctl(struct uart_port *uport, int break_state) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned long flags; + unsigned short tmp, mask = 1 << uport->line; + + spin_lock_irqsave(&uport->lock, flags); + tmp = dz_in(dport, DZ_TCR); + if (break_state) + tmp |= mask; + else + tmp &= ~mask; + dz_out(dport, DZ_TCR, tmp); + spin_unlock_irqrestore(&uport->lock, flags); +} + +static void dz_set_termios(struct uart_port *uport, struct termios *termios, + struct termios *old_termios) +{ + struct dz_port *dport = (struct dz_port *)uport; + unsigned long flags; + unsigned int cflag, baud; + + cflag = dport->port.line; + + switch (termios->c_cflag & CSIZE) { + case CS5: + cflag |= DZ_CS5; + break; + case CS6: + cflag |= DZ_CS6; + break; + case CS7: + cflag |= DZ_CS7; + break; + case CS8: + default: + cflag |= DZ_CS8; + } + + if (termios->c_cflag & CSTOPB) + cflag |= DZ_CSTOPB; + if (termios->c_cflag & PARENB) + cflag |= DZ_PARENB; + if (termios->c_cflag & PARODD) + cflag |= DZ_PARODD; + + baud = uart_get_baud_rate(uport, termios, old_termios, 50, 9600); + switch (baud) { + case 50: + cflag |= DZ_B50; + break; + case 75: + cflag |= DZ_B75; + break; + case 110: + cflag |= DZ_B110; + break; + case 134: + cflag |= DZ_B134; + break; + case 150: + cflag |= DZ_B150; + break; + case 300: + cflag |= DZ_B300; + break; + case 600: + cflag |= DZ_B600; + break; + case 1200: + cflag |= DZ_B1200; + break; + case 1800: + cflag |= DZ_B1800; + break; + case 2000: + cflag |= DZ_B2000; + break; + case 2400: + cflag |= DZ_B2400; + break; + case 3600: + cflag |= DZ_B3600; + break; + case 4800: + cflag |= DZ_B4800; + break; + case 7200: + cflag |= DZ_B7200; + break; + case 9600: + default: + cflag |= DZ_B9600; + } + + if (termios->c_cflag & CREAD) + cflag |= DZ_RXENAB; + + spin_lock_irqsave(&dport->port.lock, flags); + + dz_out(dport, DZ_LPR, cflag); + dport->cflag = cflag; + + /* setup accept flag */ + dport->port.read_status_mask = DZ_OERR; + if (termios->c_iflag & INPCK) + dport->port.read_status_mask |= DZ_FERR | DZ_PERR; + + /* characters to ignore */ + uport->ignore_status_mask = 0; + if (termios->c_iflag & IGNPAR) + dport->port.ignore_status_mask |= DZ_FERR | DZ_PERR; + + spin_unlock_irqrestore(&dport->port.lock, flags); +} + +static const char *dz_type(struct uart_port *port) +{ + return "DZ"; +} + +static void dz_release_port(struct uart_port *port) +{ + /* nothing to do */ +} + +static int dz_request_port(struct uart_port *port) +{ + return 0; +} + +static void dz_config_port(struct uart_port *port, int flags) +{ + if (flags & UART_CONFIG_TYPE) + port->type = PORT_DZ; +} + +/* + * verify the new serial_struct (for TIOCSSERIAL). + */ +static int dz_verify_port(struct uart_port *port, struct serial_struct *ser) +{ + int ret = 0; + if (ser->type != PORT_UNKNOWN && ser->type != PORT_DZ) + ret = -EINVAL; + if (ser->irq != port->irq) + ret = -EINVAL; + return ret; +} + +static struct uart_ops dz_ops = { + .tx_empty = dz_tx_empty, + .get_mctrl = dz_get_mctrl, + .set_mctrl = dz_set_mctrl, + .stop_tx = dz_stop_tx, + .start_tx = dz_start_tx, + .stop_rx = dz_stop_rx, + .enable_ms = dz_enable_ms, + .break_ctl = dz_break_ctl, + .startup = dz_startup, + .shutdown = dz_shutdown, + .set_termios = dz_set_termios, + .type = dz_type, + .release_port = dz_release_port, + .request_port = dz_request_port, + .config_port = dz_config_port, + .verify_port = dz_verify_port, +}; + +static void __init dz_init_ports(void) +{ + static int first = 1; + struct dz_port *dport; + unsigned long base; + int i; + + if (!first) + return; + first = 0; + + if (mips_machtype == MACH_DS23100 || + mips_machtype == MACH_DS5100) + base = (unsigned long) KN01_DZ11_BASE; + else + base = (unsigned long) KN02_DZ11_BASE; + + for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) { + spin_lock_init(&dport->port.lock); + dport->port.membase = (char *) base; + dport->port.iotype = SERIAL_IO_PORT; + dport->port.irq = dec_interrupt[DEC_IRQ_DZ11]; + dport->port.line = i; + dport->port.fifosize = 1; + dport->port.ops = &dz_ops; + dport->port.flags = UPF_BOOT_AUTOCONF; + } +} + +static void dz_reset(struct dz_port *dport) +{ + dz_out(dport, DZ_CSR, DZ_CLR); + + while (dz_in(dport, DZ_CSR) & DZ_CLR); + /* FIXME: cpu_relax? */ + + iob(); + + /* enable scanning */ + dz_out(dport, DZ_CSR, DZ_MSE); +} + +#ifdef CONFIG_SERIAL_DZ_CONSOLE +static void dz_console_put_char(struct dz_port *dport, unsigned char ch) +{ + unsigned long flags; + int loops = 2500; + unsigned short tmp = ch; + /* this code sends stuff out to serial device - spinning its + wheels and waiting. */ + + spin_lock_irqsave(&dport->port.lock, flags); + + /* spin our wheels */ + while (((dz_in(dport, DZ_CSR) & DZ_TRDY) != DZ_TRDY) && loops--) + /* FIXME: cpu_relax, udelay? --rmk */ + ; + + /* Actually transmit the character. */ + dz_out(dport, DZ_TDR, tmp); + + spin_unlock_irqrestore(&dport->port.lock, flags); +} +/* + * ------------------------------------------------------------------- + * dz_console_print () + * + * dz_console_print is registered for printk. + * The console must be locked when we get here. + * ------------------------------------------------------------------- + */ +static void dz_console_print(struct console *cons, + const char *str, + unsigned int count) +{ + struct dz_port *dport = &dz_ports[CONSOLE_LINE]; +#ifdef DEBUG_DZ + prom_printf((char *) str); +#endif + while (count--) { + if (*str == '\n') + dz_console_put_char(dport, '\r'); + dz_console_put_char(dport, *str++); + } +} + +static int __init dz_console_setup(struct console *co, char *options) +{ + struct dz_port *dport = &dz_ports[CONSOLE_LINE]; + int baud = 9600; + int bits = 8; + int parity = 'n'; + int flow = 'n'; + int ret; + unsigned short mask, tmp; + + if (options) + uart_parse_options(options, &baud, &parity, &bits, &flow); + + dz_reset(dport); + + ret = uart_set_options(&dport->port, co, baud, parity, bits, flow); + if (ret == 0) { + mask = 1 << dport->port.line; + tmp = dz_in(dport, DZ_TCR); /* read the TX flag */ + if (!(tmp & mask)) { + tmp |= mask; /* set the TX flag */ + dz_out(dport, DZ_TCR, tmp); + } + } + + return ret; +} + +static struct console dz_sercons = +{ + .name = "ttyS", + .write = dz_console_print, + .device = uart_console_device, + .setup = dz_console_setup, + .flags = CON_CONSDEV | CON_PRINTBUFFER, + .index = CONSOLE_LINE, +}; + +void __init dz_serial_console_init(void) +{ + dz_init_ports(); + + register_console(&dz_sercons); +} + +#define SERIAL_DZ_CONSOLE &dz_sercons +#else +#define SERIAL_DZ_CONSOLE NULL +#endif /* CONFIG_SERIAL_DZ_CONSOLE */ + +static struct uart_driver dz_reg = { + .owner = THIS_MODULE, + .driver_name = "serial", +#ifdef CONFIG_DEVFS + .dev_name = "tts/%d", +#else + .dev_name = "ttyS%d", +#endif + .major = TTY_MAJOR, + .minor = 64, + .nr = DZ_NB_PORT, + .cons = SERIAL_DZ_CONSOLE, +}; + +int __init dz_init(void) +{ + unsigned long flags; + int ret, i; + + printk("%s%s\n", dz_name, dz_version); + + dz_init_ports(); + + save_flags(flags); + cli(); + +#ifndef CONFIG_SERIAL_DZ_CONSOLE + /* reset the chip */ + dz_reset(&dz_ports[0]); +#endif + + /* order matters here... the trick is that flags + is updated... in request_irq - to immediatedly obliterate + it is unwise. */ + restore_flags(flags); + + if (request_irq(dz_ports[0].port.irq, dz_interrupt, + SA_INTERRUPT, "DZ", &dz_ports[0])) + panic("Unable to register DZ interrupt"); + + ret = uart_register_driver(&dz_reg); + if (ret != 0) + return ret; + + for (i = 0; i < DZ_NB_PORT; i++) + uart_add_one_port(&dz_reg, &dz_ports[i].port); + + return ret; +} + +MODULE_DESCRIPTION("DECstation DZ serial driver"); +MODULE_LICENSE("GPL"); diff -Nru a/drivers/serial/dz.h b/drivers/serial/dz.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/serial/dz.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,118 @@ +/* + * dz.h: Serial port driver for DECStations equiped + * with the DZ chipset. + * + * Copyright (C) 1998 Olivier A. D. Lebaillif + * + * Email: olivier.lebaillif@ifrsys.com + * + */ +#ifndef DZ_SERIAL_H +#define DZ_SERIAL_H + +/* + * Definitions for the Control and Status Received. + */ +#define DZ_TRDY 0x8000 /* Transmitter empty */ +#define DZ_TIE 0x4000 /* Transmitter Interrupt Enable */ +#define DZ_RDONE 0x0080 /* Receiver data ready */ +#define DZ_RIE 0x0040 /* Receive Interrupt Enable */ +#define DZ_MSE 0x0020 /* Master Scan Enable */ +#define DZ_CLR 0x0010 /* Master reset */ +#define DZ_MAINT 0x0008 /* Loop Back Mode */ + +/* + * Definitions for the Received buffer. + */ +#define DZ_RBUF_MASK 0x00FF /* Data Mask in the Receive Buffer */ +#define DZ_LINE_MASK 0x0300 /* Line Mask in the Receive Buffer */ +#define DZ_DVAL 0x8000 /* Valid Data indicator */ +#define DZ_OERR 0x4000 /* Overrun error indicator */ +#define DZ_FERR 0x2000 /* Frame error indicator */ +#define DZ_PERR 0x1000 /* Parity error indicator */ + +#define LINE(x) (x & DZ_LINE_MASK) >> 8 /* Get the line number from the input buffer */ +#define UCHAR(x) (unsigned char)(x & DZ_RBUF_MASK) + +/* + * Definitions for the Transmit Register. + */ +#define DZ_LINE_KEYBOARD 0x0001 +#define DZ_LINE_MOUSE 0x0002 +#define DZ_LINE_MODEM 0x0004 +#define DZ_LINE_PRINTER 0x0008 + +#define DZ_MODEM_DTR 0x0400 /* DTR for the modem line (2) */ + +/* + * Definitions for the Modem Status Register. + */ +#define DZ_MODEM_DSR 0x0200 /* DSR for the modem line (2) */ + +/* + * Definitions for the Transmit Data Register. + */ +#define DZ_BRK0 0x0100 /* Break assertion for line 0 */ +#define DZ_BRK1 0x0200 /* Break assertion for line 1 */ +#define DZ_BRK2 0x0400 /* Break assertion for line 2 */ +#define DZ_BRK3 0x0800 /* Break assertion for line 3 */ + +/* + * Definitions for the Line Parameter Register. + */ +#define DZ_KEYBOARD 0x0000 /* line 0 = keyboard */ +#define DZ_MOUSE 0x0001 /* line 1 = mouse */ +#define DZ_MODEM 0x0002 /* line 2 = modem */ +#define DZ_PRINTER 0x0003 /* line 3 = printer */ + +#define DZ_CSIZE 0x0018 /* Number of bits per byte (mask) */ +#define DZ_CS5 0x0000 /* 5 bits per byte */ +#define DZ_CS6 0x0008 /* 6 bits per byte */ +#define DZ_CS7 0x0010 /* 7 bits per byte */ +#define DZ_CS8 0x0018 /* 8 bits per byte */ + +#define DZ_CSTOPB 0x0020 /* 2 stop bits instead of one */ + +#define DZ_PARENB 0x0040 /* Parity enable */ +#define DZ_PARODD 0x0080 /* Odd parity instead of even */ + +#define DZ_CBAUD 0x0E00 /* Baud Rate (mask) */ +#define DZ_B50 0x0000 +#define DZ_B75 0x0100 +#define DZ_B110 0x0200 +#define DZ_B134 0x0300 +#define DZ_B150 0x0400 +#define DZ_B300 0x0500 +#define DZ_B600 0x0600 +#define DZ_B1200 0x0700 +#define DZ_B1800 0x0800 +#define DZ_B2000 0x0900 +#define DZ_B2400 0x0A00 +#define DZ_B3600 0x0B00 +#define DZ_B4800 0x0C00 +#define DZ_B7200 0x0D00 +#define DZ_B9600 0x0E00 + +#define DZ_CREAD 0x1000 /* Enable receiver */ +#define DZ_RXENAB 0x1000 /* enable receive char */ +/* + * Addresses for the DZ registers + */ +#define DZ_CSR 0x00 /* Control and Status Register */ +#define DZ_RBUF 0x08 /* Receive Buffer */ +#define DZ_LPR 0x08 /* Line Parameters Register */ +#define DZ_TCR 0x10 /* Transmitter Control Register */ +#define DZ_MSR 0x18 /* Modem Status Register */ +#define DZ_TDR 0x18 /* Transmit Data Register */ + +#define DZ_NB_PORT 4 + +#define DZ_XMIT_SIZE 4096 /* buffer size */ +#define DZ_WAKEUP_CHARS DZ_XMIT_SIZE/4 + +#ifdef MODULE +int init_module (void) +void cleanup_module (void) +#endif + +#endif /* DZ_SERIAL_H */ diff -Nru a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/serial/ip22zilog.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,1307 @@ +/* + * Driver for Zilog serial chips found on SGI workstations and + * servers. This driver could actually be made more generic. + * + * This is based on the drivers/serial/sunzilog.c code as of 2.6.0-test7 and the + * old drivers/sgi/char/sgiserial.c code which itself is based of the original + * drivers/sbus/char/zs.c code. A lot of code has been simply moved over + * directly from there but much has been rewritten. Credits therefore go out + * to David S. Miller, Eddie C. Dost, Pete Zaitcev, Ted Ts'o and Alex Buell + * for their work there. + * + * Copyright (C) 2002 Ralf Baechle (ralf@linux-mips.org) + * Copyright (C) 2002 David S. Miller (davem@redhat.com) + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#if defined(CONFIG_SERIAL_IP22_ZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) +#define SUPPORT_SYSRQ +#endif + +#include + +#include "ip22zilog.h" + +int ip22serial_current_minor = 64; + +void ip22_do_break(void); + +/* + * On IP22 we need to delay after register accesses but we do not need to + * flush writes. + */ +#define ZSDELAY() udelay(5) +#define ZSDELAY_LONG() udelay(20) +#define ZS_WSYNC(channel) do { } while (0) + +#define NUM_IP22ZILOG 1 +#define NUM_CHANNELS (NUM_IP22ZILOG * 2) + +#define ZS_CLOCK 4915200 /* Zilog input clock rate. */ +#define ZS_CLOCK_DIVISOR 16 /* Divisor this driver uses. */ + +/* + * We wrap our port structure around the generic uart_port. + */ +struct uart_ip22zilog_port { + struct uart_port port; + + /* IRQ servicing chain. */ + struct uart_ip22zilog_port *next; + + /* Current values of Zilog write registers. */ + unsigned char curregs[NUM_ZSREGS]; + + unsigned int flags; +#define IP22ZILOG_FLAG_IS_CONS 0x00000004 +#define IP22ZILOG_FLAG_IS_KGDB 0x00000008 +#define IP22ZILOG_FLAG_MODEM_STATUS 0x00000010 +#define IP22ZILOG_FLAG_IS_CHANNEL_A 0x00000020 +#define IP22ZILOG_FLAG_REGS_HELD 0x00000040 +#define IP22ZILOG_FLAG_TX_STOPPED 0x00000080 +#define IP22ZILOG_FLAG_TX_ACTIVE 0x00000100 + + unsigned int cflag; + + /* L1-A keyboard break state. */ + int kbd_id; + int l1_down; + + unsigned char parity_mask; + unsigned char prev_status; +}; + +#define ZILOG_CHANNEL_FROM_PORT(PORT) ((struct zilog_channel *)((PORT)->membase)) +#define UART_ZILOG(PORT) ((struct uart_ip22zilog_port *)(PORT)) +#define IP22ZILOG_GET_CURR_REG(PORT, REGNUM) \ + (UART_ZILOG(PORT)->curregs[REGNUM]) +#define IP22ZILOG_SET_CURR_REG(PORT, REGNUM, REGVAL) \ + ((UART_ZILOG(PORT)->curregs[REGNUM]) = (REGVAL)) +#define ZS_IS_CONS(UP) ((UP)->flags & IP22ZILOG_FLAG_IS_CONS) +#define ZS_IS_KGDB(UP) ((UP)->flags & IP22ZILOG_FLAG_IS_KGDB) +#define ZS_WANTS_MODEM_STATUS(UP) ((UP)->flags & IP22ZILOG_FLAG_MODEM_STATUS) +#define ZS_IS_CHANNEL_A(UP) ((UP)->flags & IP22ZILOG_FLAG_IS_CHANNEL_A) +#define ZS_REGS_HELD(UP) ((UP)->flags & IP22ZILOG_FLAG_REGS_HELD) +#define ZS_TX_STOPPED(UP) ((UP)->flags & IP22ZILOG_FLAG_TX_STOPPED) +#define ZS_TX_ACTIVE(UP) ((UP)->flags & IP22ZILOG_FLAG_TX_ACTIVE) + +/* Reading and writing Zilog8530 registers. The delays are to make this + * driver work on the IP22 which needs a settling delay after each chip + * register access, other machines handle this in hardware via auxiliary + * flip-flops which implement the settle time we do in software. + * + * The port lock must be held and local IRQs must be disabled + * when {read,write}_zsreg is invoked. + */ +static unsigned char read_zsreg(struct zilog_channel *channel, + unsigned char reg) +{ + unsigned char retval; + + writeb(reg, &channel->control); + ZSDELAY(); + retval = readb(&channel->control); + ZSDELAY(); + + return retval; +} + +static void write_zsreg(struct zilog_channel *channel, + unsigned char reg, unsigned char value) +{ + writeb(reg, &channel->control); + ZSDELAY(); + writeb(value, &channel->control); + ZSDELAY(); +} + +static void ip22zilog_clear_fifo(struct zilog_channel *channel) +{ + int i; + + for (i = 0; i < 32; i++) { + unsigned char regval; + + regval = readb(&channel->control); + ZSDELAY(); + if (regval & Rx_CH_AV) + break; + + regval = read_zsreg(channel, R1); + readb(&channel->data); + ZSDELAY(); + + if (regval & (PAR_ERR | Rx_OVR | CRC_ERR)) { + writeb(ERR_RES, &channel->control); + ZSDELAY(); + ZS_WSYNC(channel); + } + } +} + +/* This function must only be called when the TX is not busy. The UART + * port lock must be held and local interrupts disabled. + */ +static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs) +{ + int i; + + /* Let pending transmits finish. */ + for (i = 0; i < 1000; i++) { + unsigned char stat = read_zsreg(channel, R1); + if (stat & ALL_SNT) + break; + udelay(100); + } + + writeb(ERR_RES, &channel->control); + ZSDELAY(); + ZS_WSYNC(channel); + + ip22zilog_clear_fifo(channel); + + /* Disable all interrupts. */ + write_zsreg(channel, R1, + regs[R1] & ~(RxINT_MASK | TxINT_ENAB | EXT_INT_ENAB)); + + /* Set parity, sync config, stop bits, and clock divisor. */ + write_zsreg(channel, R4, regs[R4]); + + /* Set misc. TX/RX control bits. */ + write_zsreg(channel, R10, regs[R10]); + + /* Set TX/RX controls sans the enable bits. */ + write_zsreg(channel, R3, regs[R3] & ~RxENAB); + write_zsreg(channel, R5, regs[R5] & ~TxENAB); + + /* Synchronous mode config. */ + write_zsreg(channel, R6, regs[R6]); + write_zsreg(channel, R7, regs[R7]); + + /* Don't mess with the interrupt vector (R2, unused by us) and + * master interrupt control (R9). We make sure this is setup + * properly at probe time then never touch it again. + */ + + /* Disable baud generator. */ + write_zsreg(channel, R14, regs[R14] & ~BRENAB); + + /* Clock mode control. */ + write_zsreg(channel, R11, regs[R11]); + + /* Lower and upper byte of baud rate generator divisor. */ + write_zsreg(channel, R12, regs[R12]); + write_zsreg(channel, R13, regs[R13]); + + /* Now rewrite R14, with BRENAB (if set). */ + write_zsreg(channel, R14, regs[R14]); + + /* External status interrupt control. */ + write_zsreg(channel, R15, regs[R15]); + + /* Reset external status interrupts. */ + write_zsreg(channel, R0, RES_EXT_INT); + write_zsreg(channel, R0, RES_EXT_INT); + + /* Rewrite R3/R5, this time without enables masked. */ + write_zsreg(channel, R3, regs[R3]); + write_zsreg(channel, R5, regs[R5]); + + /* Rewrite R1, this time without IRQ enabled masked. */ + write_zsreg(channel, R1, regs[R1]); +} + +/* Reprogram the Zilog channel HW registers with the copies found in the + * software state struct. If the transmitter is busy, we defer this update + * until the next TX complete interrupt. Else, we do it right now. + * + * The UART port lock must be held and local interrupts disabled. + */ +static void ip22zilog_maybe_update_regs(struct uart_ip22zilog_port *up, + struct zilog_channel *channel) +{ + if (!ZS_REGS_HELD(up)) { + if (ZS_TX_ACTIVE(up)) { + up->flags |= IP22ZILOG_FLAG_REGS_HELD; + } else { + __load_zsregs(channel, up->curregs); + } + } +} + +static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up, + struct zilog_channel *channel, + struct pt_regs *regs) +{ + struct tty_struct *tty = up->port.info->tty; /* XXX info==NULL? */ + + while (1) { + unsigned char ch, r1; + + if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) { + tty->flip.work.func((void *)tty); + if (tty->flip.count >= TTY_FLIPBUF_SIZE) + return; /* XXX Ignores SysRq when we need it most. Fix. */ + } + + r1 = read_zsreg(channel, R1); + if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) { + writeb(ERR_RES, &channel->control); + ZSDELAY(); + ZS_WSYNC(channel); + } + + ch = readb(&channel->control); + ZSDELAY(); + + /* This funny hack depends upon BRK_ABRT not interfering + * with the other bits we care about in R1. + */ + if (ch & BRK_ABRT) + r1 |= BRK_ABRT; + + ch = readb(&channel->data); + ZSDELAY(); + + ch &= up->parity_mask; + + if (ZS_IS_CONS(up) && (r1 & BRK_ABRT)) { + /* Wait for BREAK to deassert to avoid potentially + * confusing the PROM. + */ + while (1) { + ch = readb(&channel->control); + ZSDELAY(); + if (!(ch & BRK_ABRT)) + break; + } + ip22_do_break(); + return; + } + + /* A real serial line, record the character and status. */ + *tty->flip.char_buf_ptr = ch; + *tty->flip.flag_buf_ptr = TTY_NORMAL; + up->port.icount.rx++; + if (r1 & (BRK_ABRT | PAR_ERR | Rx_OVR | CRC_ERR)) { + if (r1 & BRK_ABRT) { + r1 &= ~(PAR_ERR | CRC_ERR); + up->port.icount.brk++; + if (uart_handle_break(&up->port)) + goto next_char; + } + else if (r1 & PAR_ERR) + up->port.icount.parity++; + else if (r1 & CRC_ERR) + up->port.icount.frame++; + if (r1 & Rx_OVR) + up->port.icount.overrun++; + r1 &= up->port.read_status_mask; + if (r1 & BRK_ABRT) + *tty->flip.flag_buf_ptr = TTY_BREAK; + else if (r1 & PAR_ERR) + *tty->flip.flag_buf_ptr = TTY_PARITY; + else if (r1 & CRC_ERR) + *tty->flip.flag_buf_ptr = TTY_FRAME; + } + if (uart_handle_sysrq_char(&up->port, ch, regs)) + goto next_char; + + if (up->port.ignore_status_mask == 0xff || + (r1 & up->port.ignore_status_mask) == 0) { + tty->flip.flag_buf_ptr++; + tty->flip.char_buf_ptr++; + tty->flip.count++; + } + if ((r1 & Rx_OVR) && + tty->flip.count < TTY_FLIPBUF_SIZE) { + *tty->flip.flag_buf_ptr = TTY_OVERRUN; + tty->flip.flag_buf_ptr++; + tty->flip.char_buf_ptr++; + tty->flip.count++; + } + next_char: + ch = readb(&channel->control); + ZSDELAY(); + if (!(ch & Rx_CH_AV)) + break; + } + + tty_flip_buffer_push(tty); +} + +static void ip22zilog_status_handle(struct uart_ip22zilog_port *up, + struct zilog_channel *channel, + struct pt_regs *regs) +{ + unsigned char status; + + status = readb(&channel->control); + ZSDELAY(); + + writeb(RES_EXT_INT, &channel->control); + ZSDELAY(); + ZS_WSYNC(channel); + + if (ZS_WANTS_MODEM_STATUS(up)) { + if (status & SYNC) + up->port.icount.dsr++; + + /* The Zilog just gives us an interrupt when DCD/CTS/etc. change. + * But it does not tell us which bit has changed, we have to keep + * track of this ourselves. + */ + if ((status & DCD) ^ up->prev_status) + uart_handle_dcd_change(&up->port, + (status & DCD)); + if ((status & CTS) ^ up->prev_status) + uart_handle_cts_change(&up->port, + (status & CTS)); + + wake_up_interruptible(&up->port.info->delta_msr_wait); + } + + up->prev_status = status; +} + +static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up, + struct zilog_channel *channel) +{ + struct circ_buf *xmit; + + if (ZS_IS_CONS(up)) { + unsigned char status = readb(&channel->control); + ZSDELAY(); + + /* TX still busy? Just wait for the next TX done interrupt. + * + * It can occur because of how we do serial console writes. It would + * be nice to transmit console writes just like we normally would for + * a TTY line. (ie. buffered and TX interrupt driven). That is not + * easy because console writes cannot sleep. One solution might be + * to poll on enough port->xmit space becomming free. -DaveM + */ + if (!(status & Tx_BUF_EMP)) + return; + } + + up->flags &= ~IP22ZILOG_FLAG_TX_ACTIVE; + + if (ZS_REGS_HELD(up)) { + __load_zsregs(channel, up->curregs); + up->flags &= ~IP22ZILOG_FLAG_REGS_HELD; + } + + if (ZS_TX_STOPPED(up)) { + up->flags &= ~IP22ZILOG_FLAG_TX_STOPPED; + goto ack_tx_int; + } + + if (up->port.x_char) { + up->flags |= IP22ZILOG_FLAG_TX_ACTIVE; + writeb(up->port.x_char, &channel->data); + ZSDELAY(); + ZS_WSYNC(channel); + + up->port.icount.tx++; + up->port.x_char = 0; + return; + } + + if (up->port.info == NULL) + goto ack_tx_int; + xmit = &up->port.info->xmit; + if (uart_circ_empty(xmit)) { + uart_write_wakeup(&up->port); + goto ack_tx_int; + } + if (uart_tx_stopped(&up->port)) + goto ack_tx_int; + + up->flags |= IP22ZILOG_FLAG_TX_ACTIVE; + writeb(xmit->buf[xmit->tail], &channel->data); + ZSDELAY(); + ZS_WSYNC(channel); + + xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); + up->port.icount.tx++; + + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(&up->port); + + return; + +ack_tx_int: + writeb(RES_Tx_P, &channel->control); + ZSDELAY(); + ZS_WSYNC(channel); +} + +static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id, struct pt_regs *regs) +{ + struct uart_ip22zilog_port *up = dev_id; + + while (up) { + struct zilog_channel *channel + = ZILOG_CHANNEL_FROM_PORT(&up->port); + unsigned char r3; + + spin_lock(&up->port.lock); + r3 = read_zsreg(channel, R3); + + /* Channel A */ + if (r3 & (CHAEXT | CHATxIP | CHARxIP)) { + writeb(RES_H_IUS, &channel->control); + ZSDELAY(); + ZS_WSYNC(channel); + + if (r3 & CHARxIP) + ip22zilog_receive_chars(up, channel, regs); + if (r3 & CHAEXT) + ip22zilog_status_handle(up, channel, regs); + if (r3 & CHATxIP) + ip22zilog_transmit_chars(up, channel); + } + spin_unlock(&up->port.lock); + + /* Channel B */ + up = up->next; + channel = ZILOG_CHANNEL_FROM_PORT(&up->port); + + spin_lock(&up->port.lock); + if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) { + writeb(RES_H_IUS, &channel->control); + ZSDELAY(); + ZS_WSYNC(channel); + + if (r3 & CHBRxIP) + ip22zilog_receive_chars(up, channel, regs); + if (r3 & CHBEXT) + ip22zilog_status_handle(up, channel, regs); + if (r3 & CHBTxIP) + ip22zilog_transmit_chars(up, channel); + } + spin_unlock(&up->port.lock); + + up = up->next; + } + + return IRQ_HANDLED; +} + +/* A convenient way to quickly get R0 status. The caller must _not_ hold the + * port lock, it is acquired here. + */ +static __inline__ unsigned char ip22zilog_read_channel_status(struct uart_port *port) +{ + struct zilog_channel *channel; + unsigned long flags; + unsigned char status; + + spin_lock_irqsave(&port->lock, flags); + + channel = ZILOG_CHANNEL_FROM_PORT(port); + status = readb(&channel->control); + ZSDELAY(); + + spin_unlock_irqrestore(&port->lock, flags); + + return status; +} + +/* The port lock is not held. */ +static unsigned int ip22zilog_tx_empty(struct uart_port *port) +{ + unsigned char status; + unsigned int ret; + + status = ip22zilog_read_channel_status(port); + if (status & Tx_BUF_EMP) + ret = TIOCSER_TEMT; + else + ret = 0; + + return ret; +} + +/* The port lock is not held. */ +static unsigned int ip22zilog_get_mctrl(struct uart_port *port) +{ + unsigned char status; + unsigned int ret; + + status = ip22zilog_read_channel_status(port); + + ret = 0; + if (status & DCD) + ret |= TIOCM_CAR; + if (status & SYNC) + ret |= TIOCM_DSR; + if (status & CTS) + ret |= TIOCM_CTS; + + return ret; +} + +/* The port lock is held and interrupts are disabled. */ +static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl) +{ + struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; + struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + unsigned char set_bits, clear_bits; + + set_bits = clear_bits = 0; + + if (mctrl & TIOCM_RTS) + set_bits |= RTS; + else + clear_bits |= RTS; + if (mctrl & TIOCM_DTR) + set_bits |= DTR; + else + clear_bits |= DTR; + + /* NOTE: Not subject to 'transmitter active' rule. */ + up->curregs[R5] |= set_bits; + up->curregs[R5] &= ~clear_bits; + write_zsreg(channel, R5, up->curregs[R5]); +} + +/* The port lock is held and interrupts are disabled. */ +static void ip22zilog_stop_tx(struct uart_port *port, unsigned int tty_stop) +{ + struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; + + up->flags |= IP22ZILOG_FLAG_TX_STOPPED; +} + +/* The port lock is held and interrupts are disabled. */ +static void ip22zilog_start_tx(struct uart_port *port, unsigned int tty_start) +{ + struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; + struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + unsigned char status; + + up->flags |= IP22ZILOG_FLAG_TX_ACTIVE; + up->flags &= ~IP22ZILOG_FLAG_TX_STOPPED; + + status = readb(&channel->control); + ZSDELAY(); + + /* TX busy? Just wait for the TX done interrupt. */ + if (!(status & Tx_BUF_EMP)) + return; + + /* Send the first character to jump-start the TX done + * IRQ sending engine. + */ + if (port->x_char) { + writeb(port->x_char, &channel->data); + ZSDELAY(); + ZS_WSYNC(channel); + + port->icount.tx++; + port->x_char = 0; + } else { + struct circ_buf *xmit = &port->info->xmit; + + writeb(xmit->buf[xmit->tail], &channel->data); + ZSDELAY(); + ZS_WSYNC(channel); + + xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); + port->icount.tx++; + + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(&up->port); + } +} + +/* The port lock is not held. */ +static void ip22zilog_stop_rx(struct uart_port *port) +{ + struct uart_ip22zilog_port *up = UART_ZILOG(port); + struct zilog_channel *channel; + unsigned long flags; + + if (ZS_IS_CONS(up)) + return; + + spin_lock_irqsave(&port->lock, flags); + + channel = ZILOG_CHANNEL_FROM_PORT(port); + + /* Disable all RX interrupts. */ + up->curregs[R1] &= ~RxINT_MASK; + ip22zilog_maybe_update_regs(up, channel); + + spin_unlock_irqrestore(&port->lock, flags); +} + +/* The port lock is not held. */ +static void ip22zilog_enable_ms(struct uart_port *port) +{ + struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; + struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + unsigned char new_reg; + unsigned long flags; + + spin_lock_irqsave(&port->lock, flags); + + new_reg = up->curregs[R15] | (DCDIE | SYNCIE | CTSIE); + if (new_reg != up->curregs[R15]) { + up->curregs[R15] = new_reg; + + /* NOTE: Not subject to 'transmitter active' rule. */ + write_zsreg(channel, R15, up->curregs[R15]); + } + + spin_unlock_irqrestore(&port->lock, flags); +} + +/* The port lock is not held. */ +static void ip22zilog_break_ctl(struct uart_port *port, int break_state) +{ + struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; + struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + unsigned char set_bits, clear_bits, new_reg; + unsigned long flags; + + set_bits = clear_bits = 0; + + if (break_state) + set_bits |= SND_BRK; + else + clear_bits |= SND_BRK; + + spin_lock_irqsave(&port->lock, flags); + + new_reg = (up->curregs[R5] | set_bits) & ~clear_bits; + if (new_reg != up->curregs[R5]) { + up->curregs[R5] = new_reg; + + /* NOTE: Not subject to 'transmitter active' rule. */ + write_zsreg(channel, R5, up->curregs[R5]); + } + + spin_unlock_irqrestore(&port->lock, flags); +} + +static void __ip22zilog_startup(struct uart_ip22zilog_port *up) +{ + struct zilog_channel *channel; + + channel = ZILOG_CHANNEL_FROM_PORT(&up->port); + up->prev_status = readb(&channel->control); + + /* Enable receiver and transmitter. */ + up->curregs[R3] |= RxENAB; + up->curregs[R5] |= TxENAB; + + up->curregs[R1] |= EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB; + ip22zilog_maybe_update_regs(up, channel); +} + +static int ip22zilog_startup(struct uart_port *port) +{ + struct uart_ip22zilog_port *up = UART_ZILOG(port); + unsigned long flags; + + if (ZS_IS_CONS(up)) + return 0; + + spin_lock_irqsave(&port->lock, flags); + __ip22zilog_startup(up); + spin_unlock_irqrestore(&port->lock, flags); + return 0; +} + +/* + * The test for ZS_IS_CONS is explained by the following e-mail: + ***** + * From: Russell King + * Date: Sun, 8 Dec 2002 10:18:38 +0000 + * + * On Sun, Dec 08, 2002 at 02:43:36AM -0500, Pete Zaitcev wrote: + * > I boot my 2.5 boxes using "console=ttyS0,9600" argument, + * > and I noticed that something is not right with reference + * > counting in this case. It seems that when the console + * > is open by kernel initially, this is not accounted + * > as an open, and uart_startup is not called. + * + * That is correct. We are unable to call uart_startup when the serial + * console is initialised because it may need to allocate memory (as + * request_irq does) and the memory allocators may not have been + * initialised. + * + * 1. initialise the port into a state where it can send characters in the + * console write method. + * + * 2. don't do the actual hardware shutdown in your shutdown() method (but + * do the normal software shutdown - ie, free irqs etc) + ***** + */ +static void ip22zilog_shutdown(struct uart_port *port) +{ + struct uart_ip22zilog_port *up = UART_ZILOG(port); + struct zilog_channel *channel; + unsigned long flags; + + if (ZS_IS_CONS(up)) + return; + + spin_lock_irqsave(&port->lock, flags); + + channel = ZILOG_CHANNEL_FROM_PORT(port); + + /* Disable receiver and transmitter. */ + up->curregs[R3] &= ~RxENAB; + up->curregs[R5] &= ~TxENAB; + + /* Disable all interrupts and BRK assertion. */ + up->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK); + up->curregs[R5] &= ~SND_BRK; + ip22zilog_maybe_update_regs(up, channel); + + spin_unlock_irqrestore(&port->lock, flags); +} + +/* Shared by TTY driver and serial console setup. The port lock is held + * and local interrupts are disabled. + */ +static void +ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag, + unsigned int iflag, int brg) +{ + + up->curregs[R10] = NRZ; + up->curregs[R11] = TCBR | RCBR; + + /* Program BAUD and clock source. */ + up->curregs[R4] &= ~XCLK_MASK; + up->curregs[R4] |= X16CLK; + up->curregs[R12] = brg & 0xff; + up->curregs[R13] = (brg >> 8) & 0xff; + up->curregs[R14] = BRSRC | BRENAB; + + /* Character size, stop bits, and parity. */ + up->curregs[3] &= ~RxN_MASK; + up->curregs[5] &= ~TxN_MASK; + switch (cflag & CSIZE) { + case CS5: + up->curregs[3] |= Rx5; + up->curregs[5] |= Tx5; + up->parity_mask = 0x1f; + break; + case CS6: + up->curregs[3] |= Rx6; + up->curregs[5] |= Tx6; + up->parity_mask = 0x3f; + break; + case CS7: + up->curregs[3] |= Rx7; + up->curregs[5] |= Tx7; + up->parity_mask = 0x7f; + break; + case CS8: + default: + up->curregs[3] |= Rx8; + up->curregs[5] |= Tx8; + up->parity_mask = 0xff; + break; + }; + up->curregs[4] &= ~0x0c; + if (cflag & CSTOPB) + up->curregs[4] |= SB2; + else + up->curregs[4] |= SB1; + if (cflag & PARENB) + up->curregs[4] |= PAR_ENAB; + else + up->curregs[4] &= ~PAR_ENAB; + if (!(cflag & PARODD)) + up->curregs[4] |= PAR_EVEN; + else + up->curregs[4] &= ~PAR_EVEN; + + up->port.read_status_mask = Rx_OVR; + if (iflag & INPCK) + up->port.read_status_mask |= CRC_ERR | PAR_ERR; + if (iflag & (BRKINT | PARMRK)) + up->port.read_status_mask |= BRK_ABRT; + + up->port.ignore_status_mask = 0; + if (iflag & IGNPAR) + up->port.ignore_status_mask |= CRC_ERR | PAR_ERR; + if (iflag & IGNBRK) { + up->port.ignore_status_mask |= BRK_ABRT; + if (iflag & IGNPAR) + up->port.ignore_status_mask |= Rx_OVR; + } + + if ((cflag & CREAD) == 0) + up->port.ignore_status_mask = 0xff; +} + +/* The port lock is not held. */ +static void +ip22zilog_set_termios(struct uart_port *port, struct termios *termios, + struct termios *old) +{ + struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; + unsigned long flags; + int baud, brg; + + baud = uart_get_baud_rate(port, termios, old, 1200, 76800); + + spin_lock_irqsave(&up->port.lock, flags); + + brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); + + ip22zilog_convert_to_zs(up, termios->c_cflag, termios->c_iflag, brg); + + if (UART_ENABLE_MS(&up->port, termios->c_cflag)) + up->flags |= IP22ZILOG_FLAG_MODEM_STATUS; + else + up->flags &= ~IP22ZILOG_FLAG_MODEM_STATUS; + + up->cflag = termios->c_cflag; + + ip22zilog_maybe_update_regs(up, ZILOG_CHANNEL_FROM_PORT(port)); + + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static const char *ip22zilog_type(struct uart_port *port) +{ + return "IP22-Zilog"; +} + +/* We do not request/release mappings of the registers here, this + * happens at early serial probe time. + */ +static void ip22zilog_release_port(struct uart_port *port) +{ +} + +static int ip22zilog_request_port(struct uart_port *port) +{ + return 0; +} + +/* These do not need to do anything interesting either. */ +static void ip22zilog_config_port(struct uart_port *port, int flags) +{ +} + +/* We do not support letting the user mess with the divisor, IRQ, etc. */ +static int ip22zilog_verify_port(struct uart_port *port, struct serial_struct *ser) +{ + return -EINVAL; +} + +static struct uart_ops ip22zilog_pops = { + .tx_empty = ip22zilog_tx_empty, + .set_mctrl = ip22zilog_set_mctrl, + .get_mctrl = ip22zilog_get_mctrl, + .stop_tx = ip22zilog_stop_tx, + .start_tx = ip22zilog_start_tx, + .stop_rx = ip22zilog_stop_rx, + .enable_ms = ip22zilog_enable_ms, + .break_ctl = ip22zilog_break_ctl, + .startup = ip22zilog_startup, + .shutdown = ip22zilog_shutdown, + .set_termios = ip22zilog_set_termios, + .type = ip22zilog_type, + .release_port = ip22zilog_release_port, + .request_port = ip22zilog_request_port, + .config_port = ip22zilog_config_port, + .verify_port = ip22zilog_verify_port, +}; + +static struct uart_ip22zilog_port *ip22zilog_port_table; +static struct zilog_layout **ip22zilog_chip_regs; + +static struct uart_ip22zilog_port *ip22zilog_irq_chain; +static int zilog_irq = -1; + +static struct uart_driver ip22zilog_reg = { + .owner = THIS_MODULE, + .driver_name = "ttyS", + .devfs_name = "tty/", + .major = TTY_MAJOR, +}; + +static void * __init alloc_one_table(unsigned long size) +{ + void *ret; + + ret = kmalloc(size, GFP_KERNEL); + if (ret != NULL) + memset(ret, 0, size); + + return ret; +} + +static void __init ip22zilog_alloc_tables(void) +{ + ip22zilog_port_table = (struct uart_ip22zilog_port *) + alloc_one_table(NUM_CHANNELS * sizeof(struct uart_ip22zilog_port)); + ip22zilog_chip_regs = (struct zilog_layout **) + alloc_one_table(NUM_IP22ZILOG * sizeof(struct zilog_layout *)); + + if (ip22zilog_port_table == NULL || ip22zilog_chip_regs == NULL) { + panic("IP22-Zilog: Cannot allocate IP22-Zilog tables."); + } +} + +/* Get the address of the registers for IP22-Zilog instance CHIP. */ +static struct zilog_layout * __init get_zs(int chip) +{ + unsigned long base; + + if (chip < 0 || chip >= NUM_IP22ZILOG) { + panic("IP22-Zilog: Illegal chip number %d in get_zs.", chip); + } + + /* Not probe-able, hard code it. */ + base = (unsigned long) &sgioc->serport; + + zilog_irq = SGI_SERIAL_IRQ; + request_mem_region(base, 8, "IP22-Zilog"); + + return (struct zilog_layout *) base; +} + +#define ZS_PUT_CHAR_MAX_DELAY 2000 /* 10 ms */ + +#ifdef CONFIG_SERIAL_IP22_ZILOG_CONSOLE +static void ip22zilog_put_char(struct zilog_channel *channel, unsigned char ch) +{ + int loops = ZS_PUT_CHAR_MAX_DELAY; + + /* This is a timed polling loop so do not switch the explicit + * udelay with ZSDELAY as that is a NOP on some platforms. -DaveM + */ + do { + unsigned char val = readb(&channel->control); + if (val & Tx_BUF_EMP) { + ZSDELAY(); + break; + } + udelay(5); + } while (--loops); + + writeb(ch, &channel->data); + ZSDELAY(); + ZS_WSYNC(channel); +} + +static void +ip22zilog_console_write(struct console *con, const char *s, unsigned int count) +{ + struct uart_ip22zilog_port *up = &ip22zilog_port_table[con->index]; + struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port); + unsigned long flags; + int i; + + spin_lock_irqsave(&up->port.lock, flags); + for (i = 0; i < count; i++, s++) { + ip22zilog_put_char(channel, *s); + if (*s == 10) + ip22zilog_put_char(channel, 13); + } + udelay(2); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +void +ip22serial_console_termios(struct console *con, char *options) +{ + int baud = 9600, bits = 8, cflag; + int parity = 'n'; + int flow = 'n'; + + if (!serial_console) + return; + + if (options) + uart_parse_options(options, &baud, &parity, &bits, &flow); + + cflag = CREAD | HUPCL | CLOCAL; + + switch (baud) { + case 150: cflag |= B150; break; + case 300: cflag |= B300; break; + case 600: cflag |= B600; break; + case 1200: cflag |= B1200; break; + case 2400: cflag |= B2400; break; + case 4800: cflag |= B4800; break; + case 9600: cflag |= B9600; break; + case 19200: cflag |= B19200; break; + case 38400: cflag |= B38400; break; + default: baud = 9600; cflag |= B9600; break; + } + + con->cflag = cflag | CS8; /* 8N1 */ +} + +static int __init ip22zilog_console_setup(struct console *con, char *options) +{ + struct uart_ip22zilog_port *up = &ip22zilog_port_table[con->index]; + unsigned long flags; + int baud, brg; + + printk("Console: ttyS%d (IP22-Zilog)\n", + (ip22zilog_reg.minor - 64) + con->index); + + /* Get firmware console settings. */ + ip22serial_console_termios(con, options); + + /* Firmware console speed is limited to 150-->38400 baud so + * this hackish cflag thing is OK. + */ + switch (con->cflag & CBAUD) { + case B150: baud = 150; break; + case B300: baud = 300; break; + case B600: baud = 600; break; + case B1200: baud = 1200; break; + case B2400: baud = 2400; break; + case B4800: baud = 4800; break; + default: case B9600: baud = 9600; break; + case B19200: baud = 19200; break; + case B38400: baud = 38400; break; + }; + + brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); + + spin_lock_irqsave(&up->port.lock, flags); + + up->curregs[R15] = BRKIE; + ip22zilog_convert_to_zs(up, con->cflag, 0, brg); + + __ip22zilog_startup(up); + + spin_unlock_irqrestore(&up->port.lock, flags); + + return 0; +} + +static struct console ip22zilog_console = { + .name = "ttyS", + .write = ip22zilog_console_write, + .device = uart_console_device, + .setup = ip22zilog_console_setup, + .flags = CON_PRINTBUFFER, + .index = -1, + .data = &ip22zilog_reg, +}; +#define IP22ZILOG_CONSOLE (&ip22zilog_console) + +static int __init ip22zilog_console_init(void) +{ + int i; + + if (con_is_present()) + return 0; + + for (i = 0; i < NUM_CHANNELS; i++) { + int this_minor = ip22zilog_reg.minor + i; + + if ((this_minor - 64) == (serial_console - 1)) + break; + } + if (i == NUM_CHANNELS) + return 0; + + ip22zilog_console.index = i; + register_console(&ip22zilog_console); + return 0; +} +#else /* CONFIG_SERIAL_IP22_ZILOG_CONSOLE */ +#define IP22ZILOG_CONSOLE (NULL) +#define ip22zilog_console_init() do { } while (0) +#endif + +static void __init ip22zilog_prepare(void) +{ + struct uart_ip22zilog_port *up; + struct zilog_layout *rp; + int channel, chip; + + /* + * Temporary fix. + */ + for (channel = 0; channel < NUM_CHANNELS; channel++) + spin_lock_init(&ip22zilog_port_table[channel].port.lock); + + ip22zilog_irq_chain = up = &ip22zilog_port_table[0]; + for (channel = 0; channel < NUM_CHANNELS - 1; channel++) + up[channel].next = &up[channel + 1]; + up[channel].next = NULL; + + for (chip = 0; chip < NUM_IP22ZILOG; chip++) { + if (!ip22zilog_chip_regs[chip]) { + ip22zilog_chip_regs[chip] = rp = get_zs(chip); + + up[(chip * 2) + 0].port.membase = (char *) &rp->channelA; + up[(chip * 2) + 1].port.membase = (char *) &rp->channelB; + } + + /* Channel A */ + up[(chip * 2) + 0].port.iotype = UPIO_MEM; + up[(chip * 2) + 0].port.irq = zilog_irq; + up[(chip * 2) + 0].port.uartclk = ZS_CLOCK; + up[(chip * 2) + 0].port.fifosize = 1; + up[(chip * 2) + 0].port.ops = &ip22zilog_pops; + up[(chip * 2) + 0].port.type = PORT_IP22ZILOG; + up[(chip * 2) + 0].port.flags = 0; + up[(chip * 2) + 0].port.line = (chip * 2) + 0; + up[(chip * 2) + 0].flags |= IP22ZILOG_FLAG_IS_CHANNEL_A; + + /* Channel B */ + up[(chip * 2) + 1].port.iotype = UPIO_MEM; + up[(chip * 2) + 1].port.irq = zilog_irq; + up[(chip * 2) + 1].port.uartclk = ZS_CLOCK; + up[(chip * 2) + 1].port.fifosize = 1; + up[(chip * 2) + 1].port.ops = &ip22zilog_pops; + up[(chip * 2) + 1].port.type = PORT_IP22ZILOG; + up[(chip * 2) + 1].port.flags = 0; + up[(chip * 2) + 1].port.line = (chip * 2) + 1; + up[(chip * 2) + 1].flags |= 0; + } +} + +static void __init ip22zilog_init_hw(void) +{ + int i; + + for (i = 0; i < NUM_CHANNELS; i++) { + struct uart_ip22zilog_port *up = &ip22zilog_port_table[i]; + struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port); + unsigned long flags; + int baud, brg; + + spin_lock_irqsave(&up->port.lock, flags); + + if (ZS_IS_CHANNEL_A(up)) { + write_zsreg(channel, R9, FHWRES); + ZSDELAY_LONG(); + (void) read_zsreg(channel, R0); + } + + /* Normal serial TTY. */ + up->parity_mask = 0xff; + up->curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB; + up->curregs[R4] = PAR_EVEN | X16CLK | SB1; + up->curregs[R3] = RxENAB | Rx8; + up->curregs[R5] = TxENAB | Tx8; + up->curregs[R9] = NV | MIE; + up->curregs[R10] = NRZ; + up->curregs[R11] = TCBR | RCBR; + baud = 9600; + brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); + up->curregs[R12] = (brg & 0xff); + up->curregs[R13] = (brg >> 8) & 0xff; + up->curregs[R14] = BRSRC | BRENAB; + __load_zsregs(channel, up->curregs); + + spin_unlock_irqrestore(&up->port.lock, flags); + } +} + +static int __init ip22zilog_ports_init(void) +{ + int ret; + + printk(KERN_INFO "Serial: IP22 Zilog driver (%d chips).\n", NUM_IP22ZILOG); + + ip22zilog_prepare(); + + if (request_irq(zilog_irq, ip22zilog_interrupt, 0, + "IP22-Zilog", ip22zilog_irq_chain)) { + panic("IP22-Zilog: Unable to register zs interrupt handler.\n"); + } + + ip22zilog_init_hw(); + + /* We can only init this once we have probed the Zilogs + * in the system. + */ + ip22zilog_reg.nr = NUM_CHANNELS; + ip22zilog_reg.cons = IP22ZILOG_CONSOLE; + + ip22zilog_reg.minor = ip22serial_current_minor; + ip22serial_current_minor += NUM_CHANNELS; + + ret = uart_register_driver(&ip22zilog_reg); + if (ret == 0) { + int i; + + for (i = 0; i < NUM_CHANNELS; i++) { + struct uart_ip22zilog_port *up = &ip22zilog_port_table[i]; + + uart_add_one_port(&ip22zilog_reg, &up->port); + } + } + + return ret; +} + +static int __init ip22zilog_init(void) +{ + /* IP22 Zilog setup is hard coded, no probing to do. */ + + ip22zilog_alloc_tables(); + + ip22zilog_ports_init(); + ip22zilog_console_init(); + + return 0; +} + +static void __exit ip22zilog_exit(void) +{ + int i; + + for (i = 0; i < NUM_CHANNELS; i++) { + struct uart_ip22zilog_port *up = &ip22zilog_port_table[i]; + + uart_remove_one_port(&ip22zilog_reg, &up->port); + } + + uart_unregister_driver(&ip22zilog_reg); +} + +module_init(ip22zilog_init); +module_exit(ip22zilog_exit); + +/* David wrote it but I'm to blame for the bugs ... */ +MODULE_AUTHOR("Ralf Baechle "); +MODULE_DESCRIPTION("SGI Zilog serial port driver"); +MODULE_LICENSE("GPL"); diff -Nru a/drivers/serial/ip22zilog.h b/drivers/serial/ip22zilog.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/drivers/serial/ip22zilog.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,281 @@ +#ifndef _IP22_ZILOG_H +#define _IP22_ZILOG_H + +#include + +struct zilog_channel { +#ifdef __BIG_ENDIAN + volatile unsigned char unused0[3]; + volatile unsigned char control; + volatile unsigned char unused1[3]; + volatile unsigned char data; +#else /* __LITTLE_ENDIAN */ + volatile unsigned char control; + volatile unsigned char unused0[3]; + volatile unsigned char data; + volatile unsigned char unused1[3]; +#endif +}; + +struct zilog_layout { + struct zilog_channel channelB; + struct zilog_channel channelA; +}; + +#define NUM_ZSREGS 16 + +/* Conversion routines to/from brg time constants from/to bits + * per second. + */ +#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2)) +#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2) + +/* The Zilog register set */ + +#define FLAG 0x7e + +/* Write Register 0 */ +#define R0 0 /* Register selects */ +#define R1 1 +#define R2 2 +#define R3 3 +#define R4 4 +#define R5 5 +#define R6 6 +#define R7 7 +#define R8 8 +#define R9 9 +#define R10 10 +#define R11 11 +#define R12 12 +#define R13 13 +#define R14 14 +#define R15 15 + +#define NULLCODE 0 /* Null Code */ +#define POINT_HIGH 0x8 /* Select upper half of registers */ +#define RES_EXT_INT 0x10 /* Reset Ext. Status Interrupts */ +#define SEND_ABORT 0x18 /* HDLC Abort */ +#define RES_RxINT_FC 0x20 /* Reset RxINT on First Character */ +#define RES_Tx_P 0x28 /* Reset TxINT Pending */ +#define ERR_RES 0x30 /* Error Reset */ +#define RES_H_IUS 0x38 /* Reset highest IUS */ + +#define RES_Rx_CRC 0x40 /* Reset Rx CRC Checker */ +#define RES_Tx_CRC 0x80 /* Reset Tx CRC Checker */ +#define RES_EOM_L 0xC0 /* Reset EOM latch */ + +/* Write Register 1 */ + +#define EXT_INT_ENAB 0x1 /* Ext Int Enable */ +#define TxINT_ENAB 0x2 /* Tx Int Enable */ +#define PAR_SPEC 0x4 /* Parity is special condition */ + +#define RxINT_DISAB 0 /* Rx Int Disable */ +#define RxINT_FCERR 0x8 /* Rx Int on First Character Only or Error */ +#define INT_ALL_Rx 0x10 /* Int on all Rx Characters or error */ +#define INT_ERR_Rx 0x18 /* Int on error only */ +#define RxINT_MASK 0x18 + +#define WT_RDY_RT 0x20 /* Wait/Ready on R/T */ +#define WT_FN_RDYFN 0x40 /* Wait/FN/Ready FN */ +#define WT_RDY_ENAB 0x80 /* Wait/Ready Enable */ + +/* Write Register #2 (Interrupt Vector) */ + +/* Write Register 3 */ + +#define RxENAB 0x1 /* Rx Enable */ +#define SYNC_L_INH 0x2 /* Sync Character Load Inhibit */ +#define ADD_SM 0x4 /* Address Search Mode (SDLC) */ +#define RxCRC_ENAB 0x8 /* Rx CRC Enable */ +#define ENT_HM 0x10 /* Enter Hunt Mode */ +#define AUTO_ENAB 0x20 /* Auto Enables */ +#define Rx5 0x0 /* Rx 5 Bits/Character */ +#define Rx7 0x40 /* Rx 7 Bits/Character */ +#define Rx6 0x80 /* Rx 6 Bits/Character */ +#define Rx8 0xc0 /* Rx 8 Bits/Character */ +#define RxN_MASK 0xc0 + +/* Write Register 4 */ + +#define PAR_ENAB 0x1 /* Parity Enable */ +#define PAR_EVEN 0x2 /* Parity Even/Odd* */ + +#define SYNC_ENAB 0 /* Sync Modes Enable */ +#define SB1 0x4 /* 1 stop bit/char */ +#define SB15 0x8 /* 1.5 stop bits/char */ +#define SB2 0xc /* 2 stop bits/char */ + +#define MONSYNC 0 /* 8 Bit Sync character */ +#define BISYNC 0x10 /* 16 bit sync character */ +#define SDLC 0x20 /* SDLC Mode (01111110 Sync Flag) */ +#define EXTSYNC 0x30 /* External Sync Mode */ + +#define X1CLK 0x0 /* x1 clock mode */ +#define X16CLK 0x40 /* x16 clock mode */ +#define X32CLK 0x80 /* x32 clock mode */ +#define X64CLK 0xC0 /* x64 clock mode */ +#define XCLK_MASK 0xC0 + +/* Write Register 5 */ + +#define TxCRC_ENAB 0x1 /* Tx CRC Enable */ +#define RTS 0x2 /* RTS */ +#define SDLC_CRC 0x4 /* SDLC/CRC-16 */ +#define TxENAB 0x8 /* Tx Enable */ +#define SND_BRK 0x10 /* Send Break */ +#define Tx5 0x0 /* Tx 5 bits (or less)/character */ +#define Tx7 0x20 /* Tx 7 bits/character */ +#define Tx6 0x40 /* Tx 6 bits/character */ +#define Tx8 0x60 /* Tx 8 bits/character */ +#define TxN_MASK 0x60 +#define DTR 0x80 /* DTR */ + +/* Write Register 6 (Sync bits 0-7/SDLC Address Field) */ + +/* Write Register 7 (Sync bits 8-15/SDLC 01111110) */ + +/* Write Register 8 (transmit buffer) */ + +/* Write Register 9 (Master interrupt control) */ +#define VIS 1 /* Vector Includes Status */ +#define NV 2 /* No Vector */ +#define DLC 4 /* Disable Lower Chain */ +#define MIE 8 /* Master Interrupt Enable */ +#define STATHI 0x10 /* Status high */ +#define NORESET 0 /* No reset on write to R9 */ +#define CHRB 0x40 /* Reset channel B */ +#define CHRA 0x80 /* Reset channel A */ +#define FHWRES 0xc0 /* Force hardware reset */ + +/* Write Register 10 (misc control bits) */ +#define BIT6 1 /* 6 bit/8bit sync */ +#define LOOPMODE 2 /* SDLC Loop mode */ +#define ABUNDER 4 /* Abort/flag on SDLC xmit underrun */ +#define MARKIDLE 8 /* Mark/flag on idle */ +#define GAOP 0x10 /* Go active on poll */ +#define NRZ 0 /* NRZ mode */ +#define NRZI 0x20 /* NRZI mode */ +#define FM1 0x40 /* FM1 (transition = 1) */ +#define FM0 0x60 /* FM0 (transition = 0) */ +#define CRCPS 0x80 /* CRC Preset I/O */ + +/* Write Register 11 (Clock Mode control) */ +#define TRxCXT 0 /* TRxC = Xtal output */ +#define TRxCTC 1 /* TRxC = Transmit clock */ +#define TRxCBR 2 /* TRxC = BR Generator Output */ +#define TRxCDP 3 /* TRxC = DPLL output */ +#define TRxCOI 4 /* TRxC O/I */ +#define TCRTxCP 0 /* Transmit clock = RTxC pin */ +#define TCTRxCP 8 /* Transmit clock = TRxC pin */ +#define TCBR 0x10 /* Transmit clock = BR Generator output */ +#define TCDPLL 0x18 /* Transmit clock = DPLL output */ +#define RCRTxCP 0 /* Receive clock = RTxC pin */ +#define RCTRxCP 0x20 /* Receive clock = TRxC pin */ +#define RCBR 0x40 /* Receive clock = BR Generator output */ +#define RCDPLL 0x60 /* Receive clock = DPLL output */ +#define RTxCX 0x80 /* RTxC Xtal/No Xtal */ + +/* Write Register 12 (lower byte of baud rate generator time constant) */ + +/* Write Register 13 (upper byte of baud rate generator time constant) */ + +/* Write Register 14 (Misc control bits) */ +#define BRENAB 1 /* Baud rate generator enable */ +#define BRSRC 2 /* Baud rate generator source */ +#define DTRREQ 4 /* DTR/Request function */ +#define AUTOECHO 8 /* Auto Echo */ +#define LOOPBAK 0x10 /* Local loopback */ +#define SEARCH 0x20 /* Enter search mode */ +#define RMC 0x40 /* Reset missing clock */ +#define DISDPLL 0x60 /* Disable DPLL */ +#define SSBR 0x80 /* Set DPLL source = BR generator */ +#define SSRTxC 0xa0 /* Set DPLL source = RTxC */ +#define SFMM 0xc0 /* Set FM mode */ +#define SNRZI 0xe0 /* Set NRZI mode */ + +/* Write Register 15 (external/status interrupt control) */ +#define ZCIE 2 /* Zero count IE */ +#define DCDIE 8 /* DCD IE */ +#define SYNCIE 0x10 /* Sync/hunt IE */ +#define CTSIE 0x20 /* CTS IE */ +#define TxUIE 0x40 /* Tx Underrun/EOM IE */ +#define BRKIE 0x80 /* Break/Abort IE */ + + +/* Read Register 0 */ +#define Rx_CH_AV 0x1 /* Rx Character Available */ +#define ZCOUNT 0x2 /* Zero count */ +#define Tx_BUF_EMP 0x4 /* Tx Buffer empty */ +#define DCD 0x8 /* DCD */ +#define SYNC 0x10 /* Sync/hunt */ +#define CTS 0x20 /* CTS */ +#define TxEOM 0x40 /* Tx underrun */ +#define BRK_ABRT 0x80 /* Break/Abort */ + +/* Read Register 1 */ +#define ALL_SNT 0x1 /* All sent */ +/* Residue Data for 8 Rx bits/char programmed */ +#define RES3 0x8 /* 0/3 */ +#define RES4 0x4 /* 0/4 */ +#define RES5 0xc /* 0/5 */ +#define RES6 0x2 /* 0/6 */ +#define RES7 0xa /* 0/7 */ +#define RES8 0x6 /* 0/8 */ +#define RES18 0xe /* 1/8 */ +#define RES28 0x0 /* 2/8 */ +/* Special Rx Condition Interrupts */ +#define PAR_ERR 0x10 /* Parity error */ +#define Rx_OVR 0x20 /* Rx Overrun Error */ +#define CRC_ERR 0x40 /* CRC/Framing Error */ +#define END_FR 0x80 /* End of Frame (SDLC) */ + +/* Read Register 2 (channel b only) - Interrupt vector */ +#define CHB_Tx_EMPTY 0x00 +#define CHB_EXT_STAT 0x02 +#define CHB_Rx_AVAIL 0x04 +#define CHB_SPECIAL 0x06 +#define CHA_Tx_EMPTY 0x08 +#define CHA_EXT_STAT 0x0a +#define CHA_Rx_AVAIL 0x0c +#define CHA_SPECIAL 0x0e +#define STATUS_MASK 0x0e + +/* Read Register 3 (interrupt pending register) ch a only */ +#define CHBEXT 0x1 /* Channel B Ext/Stat IP */ +#define CHBTxIP 0x2 /* Channel B Tx IP */ +#define CHBRxIP 0x4 /* Channel B Rx IP */ +#define CHAEXT 0x8 /* Channel A Ext/Stat IP */ +#define CHATxIP 0x10 /* Channel A Tx IP */ +#define CHARxIP 0x20 /* Channel A Rx IP */ + +/* Read Register 8 (receive data register) */ + +/* Read Register 10 (misc status bits) */ +#define ONLOOP 2 /* On loop */ +#define LOOPSEND 0x10 /* Loop sending */ +#define CLK2MIS 0x40 /* Two clocks missing */ +#define CLK1MIS 0x80 /* One clock missing */ + +/* Read Register 12 (lower byte of baud rate generator constant) */ + +/* Read Register 13 (upper byte of baud rate generator constant) */ + +/* Read Register 15 (value of WR 15) */ + +/* Misc macros */ +#define ZS_CLEARERR(channel) do { writeb(ERR_RES, &channel->control); \ + udelay(5); } while(0) + +#define ZS_CLEARSTAT(channel) do { writeb(RES_EXT_INT, &channel->control); \ + udelay(5); } while(0) + +#define ZS_CLEARFIFO(channel) do { readb(&channel->data); \ + udelay(2); \ + readb(&channel->data); \ + udelay(2); \ + readb(&channel->data); \ + udelay(2); } while(0) + +#endif /* _IP22_ZILOG_H */ diff -Nru a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c --- a/drivers/usb/class/usblp.c Thu Feb 19 23:44:23 2004 +++ b/drivers/usb/class/usblp.c Thu Feb 19 23:44:23 2004 @@ -603,7 +603,7 @@ { DECLARE_WAITQUEUE(wait, current); struct usblp *usblp = file->private_data; - int timeout, err = 0; + int timeout, err = 0, transfer_length; size_t writecount = 0; while (writecount < count) { @@ -654,19 +654,13 @@ continue; } - writecount += usblp->writeurb->transfer_buffer_length; - usblp->writeurb->transfer_buffer_length = 0; + transfer_length=(count - writecount); + if (transfer_length > USBLP_BUF_SIZE) + transfer_length = USBLP_BUF_SIZE; - if (writecount == count) { - up (&usblp->sem); - break; - } + usblp->writeurb->transfer_buffer_length = transfer_length; - usblp->writeurb->transfer_buffer_length = (count - writecount) < USBLP_BUF_SIZE ? - (count - writecount) : USBLP_BUF_SIZE; - - if (copy_from_user(usblp->writeurb->transfer_buffer, buffer + writecount, - usblp->writeurb->transfer_buffer_length)) { + if (copy_from_user(usblp->writeurb->transfer_buffer, buffer + writecount, transfer_length)) { up(&usblp->sem); return writecount ? writecount : -EFAULT; } @@ -683,6 +677,8 @@ break; } up (&usblp->sem); + + writecount += transfer_length; } return count; diff -Nru a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c --- a/drivers/usb/core/buffer.c Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/core/buffer.c Thu Feb 19 23:44:28 2004 @@ -2,14 +2,19 @@ * DMA memory management for framework level HCD code (hc_driver) * * This implementation plugs in through generic "usb_bus" level methods, - * and works with real PCI, or when "pci device == null" makes sense. + * and should work with all USB controllers, regardles of bus type. */ #include #include #include #include -#include +#include +#include +#include +#include +#include +#include #ifdef CONFIG_USB_DEBUG @@ -62,7 +67,7 @@ if (!(size = pool_max [i])) continue; snprintf (name, sizeof name, "buffer-%d", size); - hcd->pool [i] = pci_pool_create (name, hcd->pdev, + hcd->pool [i] = dma_pool_create (name, hcd->self.controller, size, size, 0); if (!hcd->pool [i]) { hcd_buffer_destroy (hcd); @@ -86,9 +91,9 @@ int i; for (i = 0; i < HCD_BUFFER_POOLS; i++) { - struct pci_pool *pool = hcd->pool [i]; + struct dma_pool *pool = hcd->pool [i]; if (pool) { - pci_pool_destroy (pool); + dma_pool_destroy (pool); hcd->pool [i] = 0; } } @@ -112,9 +117,9 @@ for (i = 0; i < HCD_BUFFER_POOLS; i++) { if (size <= pool_max [i]) - return pci_pool_alloc (hcd->pool [i], mem_flags, dma); + return dma_pool_alloc (hcd->pool [i], mem_flags, dma); } - return pci_alloc_consistent (hcd->pdev, size, dma); + return dma_alloc_coherent (hcd->self.controller, size, dma, 0); } void hcd_buffer_free ( @@ -131,9 +136,9 @@ return; for (i = 0; i < HCD_BUFFER_POOLS; i++) { if (size <= pool_max [i]) { - pci_pool_free (hcd->pool [i], addr, dma); + dma_pool_free (hcd->pool [i], addr, dma); return; } } - pci_free_consistent (hcd->pdev, size, addr, dma); + dma_free_coherent (hcd->self.controller, size, addr, dma); } diff -Nru a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c --- a/drivers/usb/core/hcd-pci.c Thu Feb 19 23:44:25 2004 +++ b/drivers/usb/core/hcd-pci.c Thu Feb 19 23:44:25 2004 @@ -146,12 +146,10 @@ pci_set_drvdata (dev, hcd); hcd->driver = driver; hcd->description = driver->description; - hcd->pdev = dev; hcd->self.bus_name = pci_name(dev); if (hcd->product_desc == NULL) hcd->product_desc = "USB Host Controller"; hcd->self.controller = &dev->dev; - hcd->controller = hcd->self.controller; if ((retval = hcd_buffer_create (hcd)) != 0) { clean_3: @@ -159,11 +157,11 @@ goto clean_2; } - dev_info (hcd->controller, "%s\n", hcd->product_desc); + dev_info (hcd->self.controller, "%s\n", hcd->product_desc); /* till now HC has been in an indeterminate state ... */ if (driver->reset && (retval = driver->reset (hcd)) < 0) { - dev_err (hcd->controller, "can't reset\n"); + dev_err (hcd->self.controller, "can't reset\n"); goto clean_3; } hcd->state = USB_STATE_HALT; @@ -177,13 +175,13 @@ retval = request_irq (dev->irq, usb_hcd_irq, SA_SHIRQ, hcd->description, hcd); if (retval != 0) { - dev_err (hcd->controller, + dev_err (hcd->self.controller, "request interrupt %s failed\n", bufp); goto clean_3; } hcd->irq = dev->irq; - dev_info (hcd->controller, "irq %s, %s %p\n", bufp, + dev_info (hcd->self.controller, "irq %s, %s %p\n", bufp, (driver->flags & HCD_MEMORY) ? "pci mem" : "io base", base); @@ -226,7 +224,7 @@ hcd = pci_get_drvdata(dev); if (!hcd) return; - dev_info (hcd->controller, "remove, state %x\n", hcd->state); + dev_info (hcd->self.controller, "remove, state %x\n", hcd->state); if (in_interrupt ()) BUG (); @@ -235,7 +233,7 @@ if (HCD_IS_RUNNING (hcd->state)) hcd->state = USB_STATE_QUIESCING; - dev_dbg (hcd->controller, "roothub graceful disconnect\n"); + dev_dbg (hcd->self.controller, "roothub graceful disconnect\n"); usb_disconnect (&hub); hcd->driver->stop (hcd); @@ -273,15 +271,15 @@ int retval = 0; hcd = pci_get_drvdata(dev); - dev_dbg (hcd->controller, "suspend D%d --> D%d\n", + dev_dbg (hcd->self.controller, "suspend D%d --> D%d\n", dev->current_state, state); switch (hcd->state) { case USB_STATE_HALT: - dev_dbg (hcd->controller, "halted; hcd not suspended\n"); + dev_dbg (hcd->self.controller, "halted; hcd not suspended\n"); break; case USB_STATE_SUSPENDED: - dev_dbg (hcd->controller, "hcd already suspended\n"); + dev_dbg (hcd->self.controller, "hcd already suspended\n"); break; default: /* remote wakeup needs hub->suspend() cooperation */ @@ -293,7 +291,8 @@ hcd->state = USB_STATE_QUIESCING; retval = hcd->driver->suspend (hcd, state); if (retval) - dev_dbg (hcd->controller, "suspend fail, retval %d\n", + dev_dbg (hcd->self.controller, + "suspend fail, retval %d\n", retval); else hcd->state = USB_STATE_SUSPENDED; @@ -316,11 +315,12 @@ int retval; hcd = pci_get_drvdata(dev); - dev_dbg (hcd->controller, "resume from state D%d\n", + dev_dbg (hcd->self.controller, "resume from state D%d\n", dev->current_state); if (hcd->state != USB_STATE_SUSPENDED) { - dev_dbg (hcd->controller, "can't resume, not suspended!\n"); + dev_dbg (hcd->self.controller, + "can't resume, not suspended!\n"); return -EL3HLT; } hcd->state = USB_STATE_RESUMING; @@ -333,7 +333,8 @@ retval = hcd->driver->resume (hcd); if (!HCD_IS_RUNNING (hcd->state)) { - dev_dbg (hcd->controller, "resume fail, retval %d\n", retval); + dev_dbg (hcd->self.controller, + "resume fail, retval %d\n", retval); usb_hc_died (hcd); } diff -Nru a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c --- a/drivers/usb/core/hcd.c Thu Feb 19 23:44:26 2004 +++ b/drivers/usb/core/hcd.c Thu Feb 19 23:44:26 2004 @@ -351,7 +351,7 @@ /* FALLTHROUGH */ case DeviceOutRequest | USB_REQ_CLEAR_FEATURE: case DeviceOutRequest | USB_REQ_SET_FEATURE: - dev_dbg (hcd->controller, "no device features yet yet\n"); + dev_dbg (hcd->self.controller, "no device features yet yet\n"); break; case DeviceRequest | USB_REQ_GET_CONFIGURATION: ubuf [0] = 1; @@ -394,7 +394,7 @@ break; case DeviceOutRequest | USB_REQ_SET_ADDRESS: // wValue == urb->dev->devaddr - dev_dbg (hcd->controller, "root hub device address %d\n", + dev_dbg (hcd->self.controller, "root hub device address %d\n", wValue); break; @@ -409,7 +409,7 @@ /* FALLTHROUGH */ case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: case EndpointOutRequest | USB_REQ_SET_FEATURE: - dev_dbg (hcd->controller, "no endpoint features yet\n"); + dev_dbg (hcd->self.controller, "no endpoint features yet\n"); break; /* CLASS REQUESTS (and errors) */ @@ -423,12 +423,12 @@ error: /* "protocol stall" on error */ urb->status = -EPIPE; - dev_dbg (hcd->controller, "unsupported hub control message (maxchild %d)\n", + dev_dbg (hcd->self.controller, "unsupported hub control message (maxchild %d)\n", urb->dev->maxchild); } if (urb->status) { urb->actual_length = 0; - dev_dbg (hcd->controller, "CTRL: TypeReq=0x%x val=0x%x idx=0x%x len=%d ==> %d\n", + dev_dbg (hcd->self.controller, "CTRL: TypeReq=0x%x val=0x%x idx=0x%x len=%d ==> %d\n", typeReq, wValue, wIndex, wLength, urb->status); } if (bufp) { @@ -464,7 +464,7 @@ || urb->status != -EINPROGRESS || urb->transfer_buffer_length < len || !HCD_IS_RUNNING (hcd->state)) { - dev_dbg (hcd->controller, + dev_dbg (hcd->self.controller, "not queuing rh status urb, stat %d\n", urb->status); return -EINVAL; @@ -1068,18 +1068,18 @@ /* lower level hcd code should use *_dma exclusively, * unless it uses pio or talks to another transport. */ - if (hcd->controller->dma_mask) { + if (hcd->self.controller->dma_mask) { if (usb_pipecontrol (urb->pipe) && !(urb->transfer_flags & URB_NO_SETUP_DMA_MAP)) urb->setup_dma = dma_map_single ( - hcd->controller, + hcd->self.controller, urb->setup_packet, sizeof (struct usb_ctrlrequest), DMA_TO_DEVICE); if (urb->transfer_buffer_length != 0 && !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) urb->transfer_dma = dma_map_single ( - hcd->controller, + hcd->self.controller, urb->transfer_buffer, urb->transfer_buffer_length, usb_pipein (urb->pipe) @@ -1125,7 +1125,7 @@ /* failures "should" be harmless */ value = hcd->driver->urb_dequeue (hcd, urb); if (value != 0) - dev_dbg (hcd->controller, + dev_dbg (hcd->self.controller, "dequeue %p --> %d\n", urb, value); } @@ -1232,7 +1232,7 @@ * finish unlinking the initial failed usb_set_address(). */ if (!hcd->saw_irq) { - dev_warn (hcd->controller, "Unlink after no-IRQ? " + dev_warn (hcd->self.controller, "Unlink after no-IRQ? " "Different ACPI or APIC settings may help." "\n"); hcd->saw_irq = 1; @@ -1244,7 +1244,8 @@ */ if (!(urb->transfer_flags & URB_ASYNC_UNLINK)) { if (in_interrupt ()) { - dev_dbg (hcd->controller, "non-async unlink in_interrupt"); + dev_dbg (hcd->self.controller, + "non-async unlink in_interrupt"); retval = -EWOULDBLOCK; goto done; } @@ -1363,7 +1364,7 @@ if (tmp == -EINPROGRESS) { tmp = urb->pipe; unlink1 (hcd, urb); - dev_dbg (hcd->controller, + dev_dbg (hcd->self.controller, "shutdown urb %p pipe %08x ep%d%s%s\n", urb, tmp, usb_pipeendpoint (tmp), (tmp & USB_DIR_IN) ? "in" : "out", @@ -1417,7 +1418,7 @@ /* device driver problem with refcounts? */ if (!list_empty (&dev->urb_list)) { - dev_dbg (hcd->controller, "free busy dev, %s devnum %d (bug!)\n", + dev_dbg (hcd->self.controller, "free busy dev, %s devnum %d (bug!)\n", hcd->self.bus_name, udev->devnum); return -EINVAL; } @@ -1474,15 +1475,16 @@ // It would catch exit/unlink paths for all urbs. /* lower level hcd code should use *_dma exclusively */ - if (hcd->controller->dma_mask) { + if (hcd->self.controller->dma_mask) { if (usb_pipecontrol (urb->pipe) && !(urb->transfer_flags & URB_NO_SETUP_DMA_MAP)) - dma_unmap_single (hcd->controller, urb->setup_dma, + dma_unmap_single (hcd->self.controller, urb->setup_dma, sizeof (struct usb_ctrlrequest), DMA_TO_DEVICE); if (urb->transfer_buffer_length != 0 && !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP)) - dma_unmap_single (hcd->controller, urb->transfer_dma, + dma_unmap_single (hcd->self.controller, + urb->transfer_dma, urb->transfer_buffer_length, usb_pipein (urb->pipe) ? DMA_FROM_DEVICE @@ -1551,7 +1553,7 @@ */ void usb_hc_died (struct usb_hcd *hcd) { - dev_err (hcd->controller, "HC died; cleaning up\n"); + dev_err (hcd->self.controller, "HC died; cleaning up\n"); /* clean up old urbs and devices; needs a task context */ INIT_WORK (&hcd->work, hcd_panic, hcd); diff -Nru a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h --- a/drivers/usb/core/hcd.h Thu Feb 19 23:44:24 2004 +++ b/drivers/usb/core/hcd.h Thu Feb 19 23:44:24 2004 @@ -76,17 +76,14 @@ unsigned saw_irq : 1; int irq; /* irq allocated */ void *regs; /* device memory/io */ - struct device *controller; /* handle to hardware */ - /* a few non-PCI controllers exist, mostly for OHCI */ - struct pci_dev *pdev; /* pci is typical */ #ifdef CONFIG_PCI int region; /* pci region for regs */ u32 pci_state [16]; /* for PM state save */ #endif #define HCD_BUFFER_POOLS 4 - struct pci_pool *pool [HCD_BUFFER_POOLS]; + struct dma_pool *pool [HCD_BUFFER_POOLS]; int state; # define __ACTIVE 0x01 @@ -355,7 +352,7 @@ static inline int hcd_register_root (struct usb_hcd *hcd) { return usb_register_root_hub ( - hcd_to_bus (hcd)->root_hub, hcd->controller); + hcd_to_bus (hcd)->root_hub, hcd->self.controller); } /*-------------------------------------------------------------------------*/ diff -Nru a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c Thu Feb 19 23:44:25 2004 +++ b/drivers/usb/core/hub.c Thu Feb 19 23:44:25 2004 @@ -405,9 +405,14 @@ hub->tt.hub = dev; break; case 2: - dev_dbg(hub_dev, "TT per port\n"); + ret = usb_set_interface(dev, 0, 1); + if (ret == 0) { + dev_dbg(hub_dev, "TT per port\n"); + hub->tt.multi = 1; + } else + dev_err(hub_dev, "Using single TT (err %d)\n", + ret); hub->tt.hub = dev; - hub->tt.multi = 1; break; default: dev_dbg(hub_dev, "Unrecognized hub protocol %d\n", diff -Nru a/drivers/usb/core/message.c b/drivers/usb/core/message.c --- a/drivers/usb/core/message.c Thu Feb 19 23:44:23 2004 +++ b/drivers/usb/core/message.c Thu Feb 19 23:44:23 2004 @@ -213,9 +213,8 @@ static void sg_complete (struct urb *urb, struct pt_regs *regs) { struct usb_sg_request *io = (struct usb_sg_request *) urb->context; - unsigned long flags; - spin_lock_irqsave (&io->lock, flags); + spin_lock (&io->lock); /* In 2.5 we require hcds' endpoint queues not to progress after fault * reports, until the completion callback (this!) returns. That lets @@ -269,7 +268,7 @@ if (!io->count) complete (&io->complete); - spin_unlock_irqrestore (&io->lock, flags); + spin_unlock (&io->lock); } @@ -441,12 +440,11 @@ */ void usb_sg_wait (struct usb_sg_request *io) { - int i; - unsigned long flags; + int i, entries = io->entries; /* queue the urbs. */ - spin_lock_irqsave (&io->lock, flags); - for (i = 0; i < io->entries && !io->status; i++) { + spin_lock_irq (&io->lock); + for (i = 0; i < entries && !io->status; i++) { int retval; io->urbs [i]->dev = io->dev; @@ -455,7 +453,7 @@ /* after we submit, let completions or cancelations fire; * we handshake using io->status. */ - spin_unlock_irqrestore (&io->lock, flags); + spin_unlock_irq (&io->lock); switch (retval) { /* maybe we retrying will recover */ case -ENXIO: // hc didn't queue this one @@ -479,17 +477,25 @@ /* fail any uncompleted urbs */ default: + spin_lock_irq (&io->lock); + io->count -= entries - i; + if (io->status == -EINPROGRESS) + io->status = retval; + if (io->count == 0) + complete (&io->complete); + spin_unlock_irq (&io->lock); + io->urbs [i]->dev = 0; io->urbs [i]->status = retval; dev_dbg (&io->dev->dev, "%s, submit --> %d\n", __FUNCTION__, retval); usb_sg_cancel (io); } - spin_lock_irqsave (&io->lock, flags); + spin_lock_irq (&io->lock); if (retval && io->status == -ECONNRESET) io->status = retval; } - spin_unlock_irqrestore (&io->lock, flags); + spin_unlock_irq (&io->lock); /* OK, yes, this could be packaged as non-blocking. * So could the submit loop above ... but it's easier to diff -Nru a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c --- a/drivers/usb/core/usb.c Thu Feb 19 23:44:25 2004 +++ b/drivers/usb/core/usb.c Thu Feb 19 23:44:25 2004 @@ -1152,12 +1152,19 @@ config = dev->config[0].desc.bConfigurationValue; if (dev->descriptor.bNumConfigurations != 1) { for (i = 0; i < dev->descriptor.bNumConfigurations; i++) { + struct usb_interface_descriptor *desc; + /* heuristic: Linux is more likely to have class * drivers, so avoid vendor-specific interfaces. */ - if (dev->config[i].interface[0]->altsetting - ->desc.bInterfaceClass - == USB_CLASS_VENDOR_SPEC) + desc = &dev->config[i].interface[0] + ->altsetting->desc; + if (desc->bInterfaceClass == USB_CLASS_VENDOR_SPEC) + continue; + /* COMM/2/all is CDC ACM, except 0xff is MSFT RNDIS */ + if (desc->bInterfaceClass == USB_CLASS_COMM + && desc->bInterfaceSubClass == 2 + && desc->bInterfaceProtocol == 0xff) continue; config = dev->config[i].desc.bConfigurationValue; break; diff -Nru a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c --- a/drivers/usb/gadget/goku_udc.c Thu Feb 19 23:44:23 2004 +++ b/drivers/usb/gadget/goku_udc.c Thu Feb 19 23:44:23 2004 @@ -1111,7 +1111,7 @@ int t; /* int_status is the same format ... */ - t = snprintf(*next, *size, + t = scnprintf(*next, *size, "%s %05X =" FOURBITS EIGHTBITS EIGHTBITS "\n", label, mask, (mask & INT_PWRDETECT) ? " power" : "", @@ -1164,7 +1164,7 @@ /* basic device status */ tmp = readl(®s->power_detect); is_usb_connected = tmp & PW_DETECT; - t = snprintf(next, size, + t = scnprintf(next, size, "%s - %s\n" "%s version: %s %s\n" "Gadget driver: %s\n" @@ -1198,7 +1198,7 @@ goto done; /* registers for (active) device and ep0 */ - t = snprintf(next, size, "\nirqs %lu\ndataset %02x " + t = scnprintf(next, size, "\nirqs %lu\ndataset %02x " "single.bcs %02x.%02x state %x addr %u\n", dev->irqs, readl(®s->DataSet), readl(®s->EPxSingle), readl(®s->EPxBCS), @@ -1208,7 +1208,7 @@ next += t; tmp = readl(®s->dma_master); - t = snprintf(next, size, + t = scnprintf(next, size, "dma %03X =" EIGHTBITS "%s %s\n", tmp, (tmp & MST_EOPB_DIS) ? " eopb-" : "", (tmp & MST_EOPB_ENA) ? " eopb+" : "", @@ -1237,7 +1237,7 @@ continue; tmp = readl(ep->reg_status); - t = snprintf(next, size, + t = scnprintf(next, size, "%s %s max %u %s, irqs %lu, " "status %02x (%s) " FOURBITS "\n", ep->ep.name, @@ -1277,7 +1277,7 @@ next += t; if (list_empty(&ep->queue)) { - t = snprintf(next, size, "\t(nothing queued)\n"); + t = scnprintf(next, size, "\t(nothing queued)\n"); if (t <= 0 || t > size) goto done; size -= t; @@ -1295,7 +1295,7 @@ } else tmp = req->req.actual; - t = snprintf(next, size, + t = scnprintf(next, size, "\treq %p len %u/%u buf %p\n", &req->req, tmp, req->req.length, req->req.buf); @@ -1913,7 +1913,7 @@ INFO(dev, "%s\n", driver_desc); INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr()); #ifndef __sparc__ - snprintf(buf, sizeof buf, "%d", pdev->irq); + scnprintf(buf, sizeof buf, "%d", pdev->irq); bufp = buf; #else bufp = __irq_itoa(pdev->irq); diff -Nru a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c --- a/drivers/usb/gadget/net2280.c Thu Feb 19 23:44:23 2004 +++ b/drivers/usb/gadget/net2280.c Thu Feb 19 23:44:23 2004 @@ -1439,7 +1439,7 @@ || !dev->driver->function || strlen (dev->driver->function) > PAGE_SIZE) return 0; - return snprintf (buf, PAGE_SIZE, "%s\n", dev->driver->function); + return scnprintf (buf, PAGE_SIZE, "%s\n", dev->driver->function); } static DEVICE_ATTR (function, S_IRUGO, show_function, NULL); @@ -1465,7 +1465,7 @@ s = "(none)"; /* Main Control Registers */ - t = snprintf (next, size, "%s version " DRIVER_VERSION + t = scnprintf (next, size, "%s version " DRIVER_VERSION ", chiprev %04x, dma %s\n\n" "devinit %03x fifoctl %08x gadget '%s'\n" "pci irqenb0 %02x irqenb1 %08x " @@ -1497,7 +1497,7 @@ /* full speed bit (6) not working?? */ } else s = "not attached"; - t = snprintf (next, size, + t = scnprintf (next, size, "stdrsp %08x usbctl %08x usbstat %08x " "addr 0x%02x (%s)\n", readl (&dev->usb->stdrsp), t1, t2, @@ -1519,7 +1519,7 @@ t1 = readl (&ep->regs->ep_cfg); t2 = readl (&ep->regs->ep_rsp) & 0xff; - t = snprintf (next, size, + t = scnprintf (next, size, "\n%s\tcfg %05x rsp (%02x) %s%s%s%s%s%s%s%s" "irqenb %02x\n", ep->ep.name, t1, t2, @@ -1543,7 +1543,7 @@ size -= t; next += t; - t = snprintf (next, size, + t = scnprintf (next, size, "\tstat %08x avail %04x " "(ep%d%s-%s)%s\n", readl (&ep->regs->ep_stat), @@ -1557,7 +1557,7 @@ if (!ep->dma) continue; - t = snprintf (next, size, + t = scnprintf (next, size, " dma\tctl %08x stat %08x count %08x\n" "\taddr %08x desc %08x\n", readl (&ep->dma->dmactl), @@ -1574,7 +1574,7 @@ // none yet /* Statistics */ - t = snprintf (next, size, "\nirqs: "); + t = scnprintf (next, size, "\nirqs: "); size -= t; next += t; for (i = 0; i < 7; i++) { @@ -1583,12 +1583,12 @@ ep = &dev->ep [i]; if (i && !ep->irqs) continue; - t = snprintf (next, size, " %s/%lu", ep->ep.name, ep->irqs); + t = scnprintf (next, size, " %s/%lu", ep->ep.name, ep->irqs); size -= t; next += t; } - t = snprintf (next, size, "\n"); + t = scnprintf (next, size, "\n"); size -= t; next += t; @@ -1624,7 +1624,7 @@ if (!d) continue; t = d->bEndpointAddress; - t = snprintf (next, size, + t = scnprintf (next, size, "\n%s (ep%d%s-%s) max %04x %s fifo %d\n", ep->ep.name, t & USB_ENDPOINT_NUMBER_MASK, (t & USB_DIR_IN) ? "in" : "out", @@ -1641,7 +1641,7 @@ ep->dma ? "dma" : "pio", ep->fifo_size ); } else /* ep0 should only have one transfer queued */ - t = snprintf (next, size, "ep0 max 64 pio %s\n", + t = scnprintf (next, size, "ep0 max 64 pio %s\n", ep->is_in ? "in" : "out"); if (t <= 0 || t > size) goto done; @@ -1649,7 +1649,7 @@ next += t; if (list_empty (&ep->queue)) { - t = snprintf (next, size, "\t(nothing queued)\n"); + t = scnprintf (next, size, "\t(nothing queued)\n"); if (t <= 0 || t > size) goto done; size -= t; @@ -1658,14 +1658,14 @@ } list_for_each_entry (req, &ep->queue, queue) { if (ep->dma && req->td_dma == readl (&ep->dma->dmadesc)) - t = snprintf (next, size, + t = scnprintf (next, size, "\treq %p len %d/%d " "buf %p (dmacount %08x)\n", &req->req, req->req.actual, req->req.length, req->req.buf, readl (&ep->dma->dmacount)); else - t = snprintf (next, size, + t = scnprintf (next, size, "\treq %p len %d/%d buf %p\n", &req->req, req->req.actual, req->req.length, req->req.buf); @@ -1678,7 +1678,7 @@ struct net2280_dma *td; td = req->td; - t = snprintf (next, size, "\t td %08x " + t = scnprintf (next, size, "\t td %08x " " count %08x buf %08x desc %08x\n", req->td_dma, td->dmacount, td->dmaaddr, td->dmadesc); @@ -2788,7 +2788,7 @@ goto done; } #ifndef __sparc__ - snprintf (buf, sizeof buf, "%d", pdev->irq); + scnprintf (buf, sizeof buf, "%d", pdev->irq); bufp = buf; #else bufp = __irq_itoa(pdev->irq); diff -Nru a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c --- a/drivers/usb/gadget/pxa2xx_udc.c Thu Feb 19 23:44:26 2004 +++ b/drivers/usb/gadget/pxa2xx_udc.c Thu Feb 19 23:44:26 2004 @@ -1232,7 +1232,7 @@ local_irq_save(flags); /* basic device status */ - t = snprintf(next, size, DRIVER_DESC "\n" + t = scnprintf(next, size, DRIVER_DESC "\n" "%s version: %s\nGadget driver: %s\nHost %s\n\n", driver_name, DRIVER_VERSION SIZE_STR DMASTR, dev->driver ? dev->driver->driver.name : "(none)", @@ -1241,14 +1241,14 @@ next += t; /* registers for device and ep0 */ - t = snprintf(next, size, + t = scnprintf(next, size, "uicr %02X.%02X, usir %02X.%02x, ufnr %02X.%02X\n", UICR1, UICR0, USIR1, USIR0, UFNRH, UFNRL); size -= t; next += t; tmp = UDCCR; - t = snprintf(next, size, + t = scnprintf(next, size, "udccr %02X =%s%s%s%s%s%s%s%s\n", tmp, (tmp & UDCCR_REM) ? " rem" : "", (tmp & UDCCR_RSTIR) ? " rstir" : "", @@ -1262,7 +1262,7 @@ next += t; tmp = UDCCS0; - t = snprintf(next, size, + t = scnprintf(next, size, "udccs0 %02X =%s%s%s%s%s%s%s%s\n", tmp, (tmp & UDCCS0_SA) ? " sa" : "", (tmp & UDCCS0_RNE) ? " rne" : "", @@ -1277,7 +1277,7 @@ if (dev->has_cfr) { tmp = UDCCFR; - t = snprintf(next, size, + t = scnprintf(next, size, "udccfr %02X =%s%s\n", tmp, (tmp & UDCCFR_AREN) ? " aren" : "", (tmp & UDCCFR_ACM) ? " acm" : ""); @@ -1288,7 +1288,7 @@ if (!is_usb_connected() || !dev->driver) goto done; - t = snprintf(next, size, "ep0 IN %lu/%lu, OUT %lu/%lu\nirqs %lu\n\n", + t = scnprintf(next, size, "ep0 IN %lu/%lu, OUT %lu/%lu\nirqs %lu\n\n", dev->stats.write.bytes, dev->stats.write.ops, dev->stats.read.bytes, dev->stats.read.ops, dev->stats.irqs); @@ -1308,7 +1308,7 @@ if (!d) continue; tmp = *dev->ep [i].reg_udccs; - t = snprintf(next, size, + t = scnprintf(next, size, "%s max %d %s udccs %02x irqs %lu/%lu\n", ep->ep.name, le16_to_cpu (d->wMaxPacketSize), (ep->dma >= 0) ? "dma" : "pio", tmp, @@ -1316,7 +1316,7 @@ /* TODO translate all five groups of udccs bits! */ } else /* ep0 should only have one transfer queued */ - t = snprintf(next, size, "ep0 max 16 pio irqs %lu\n", + t = scnprintf(next, size, "ep0 max 16 pio irqs %lu\n", ep->pio_irqs); if (t <= 0 || t > size) goto done; @@ -1324,7 +1324,7 @@ next += t; if (list_empty(&ep->queue)) { - t = snprintf(next, size, "\t(nothing queued)\n"); + t = scnprintf(next, size, "\t(nothing queued)\n"); if (t <= 0 || t > size) goto done; size -= t; @@ -1334,7 +1334,7 @@ list_for_each_entry(req, &ep->queue, queue) { #ifdef USE_DMA if (ep->dma >= 0 && req->queue.prev == &ep->queue) - t = snprintf(next, size, + t = scnprintf(next, size, "\treq %p len %d/%d " "buf %p (dma%d dcmd %08x)\n", &req->req, req->req.actual, @@ -1344,7 +1344,7 @@ ); else #endif - t = snprintf(next, size, + t = scnprintf(next, size, "\treq %p len %d/%d buf %p\n", &req->req, req->req.actual, req->req.length, req->req.buf); @@ -1382,7 +1382,7 @@ || !dev->driver->function || strlen (dev->driver->function) > PAGE_SIZE) return 0; - return snprintf (buf, PAGE_SIZE, "%s\n", dev->driver->function); + return scnprintf (buf, PAGE_SIZE, "%s\n", dev->driver->function); } static DEVICE_ATTR (function, S_IRUGO, show_function, NULL); diff -Nru a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c --- a/drivers/usb/host/ehci-dbg.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/host/ehci-dbg.c Thu Feb 19 23:44:27 2004 @@ -19,13 +19,13 @@ /* this file is part of ehci-hcd.c */ #define ehci_dbg(ehci, fmt, args...) \ - dev_dbg ((ehci)->hcd.controller , fmt , ## args ) + dev_dbg ((ehci)->hcd.self.controller , fmt , ## args ) #define ehci_err(ehci, fmt, args...) \ - dev_err ((ehci)->hcd.controller , fmt , ## args ) + dev_err ((ehci)->hcd.self.controller , fmt , ## args ) #define ehci_info(ehci, fmt, args...) \ - dev_info ((ehci)->hcd.controller , fmt , ## args ) + dev_info ((ehci)->hcd.self.controller , fmt , ## args ) #define ehci_warn(ehci, fmt, args...) \ - dev_warn ((ehci)->hcd.controller , fmt , ## args ) + dev_warn ((ehci)->hcd.self.controller , fmt , ## args ) #ifdef EHCI_VERBOSE_DEBUG # define vdbg dbg @@ -173,7 +173,7 @@ static int __attribute__((__unused__)) dbg_status_buf (char *buf, unsigned len, char *label, u32 status) { - return snprintf (buf, len, + return scnprintf (buf, len, "%s%sstatus %04x%s%s%s%s%s%s%s%s%s%s", label, label [0] ? " " : "", status, (status & STS_ASS) ? " Async" : "", @@ -192,7 +192,7 @@ static int __attribute__((__unused__)) dbg_intr_buf (char *buf, unsigned len, char *label, u32 enable) { - return snprintf (buf, len, + return scnprintf (buf, len, "%s%sintrenable %02x%s%s%s%s%s%s", label, label [0] ? " " : "", enable, (enable & STS_IAA) ? " IAA" : "", @@ -209,7 +209,7 @@ static int dbg_command_buf (char *buf, unsigned len, char *label, u32 command) { - return snprintf (buf, len, + return scnprintf (buf, len, "%s%scommand %06x %s=%d ithresh=%d%s%s%s%s period=%s%s %s", label, label [0] ? " " : "", command, (command & CMD_PARK) ? "park" : "(park)", @@ -238,7 +238,7 @@ default: sig = "?"; break; } - return snprintf (buf, len, + return scnprintf (buf, len, "%s%sport %d status %06x%s%s sig=%s %s%s%s%s%s%s%s%s%s", label, label [0] ? " " : "", port, status, (status & PORT_POWER) ? " POWER" : "", @@ -359,7 +359,7 @@ } scratch = cpu_to_le32p (&qh->hw_info1); hw_curr = (mark == '*') ? cpu_to_le32p (&qh->hw_current) : 0; - temp = snprintf (next, size, + temp = scnprintf (next, size, "qh/%p dev%d %cs ep%d %08x %08x (%08x%c %s nak%d)", qh, scratch & 0x007f, speed_char (scratch), @@ -367,7 +367,7 @@ scratch, cpu_to_le32p (&qh->hw_info2), cpu_to_le32p (&qh->hw_token), mark, (__constant_cpu_to_le32 (QTD_TOGGLE) & qh->hw_token) - ? "data0" : "data1", + ? "data1" : "data0", (cpu_to_le32p (&qh->hw_alt_next) >> 1) & 0x0f); size -= temp; next += temp; @@ -449,7 +449,7 @@ for (qh = ehci->async->qh_next.qh; size > 0 && qh; qh = qh->qh_next.qh) qh_lines (ehci, qh, &next, &size); if (ehci->reclaim && size > 0) { - temp = snprintf (next, size, "\nreclaim =\n"); + temp = scnprintf (next, size, "\nreclaim =\n"); size -= temp; next += temp; @@ -486,7 +486,7 @@ next = buf; size = PAGE_SIZE; - temp = snprintf (next, size, "size = %d\n", ehci->periodic_size); + temp = scnprintf (next, size, "size = %d\n", ehci->periodic_size); size -= temp; next += temp; @@ -500,14 +500,14 @@ continue; tag = Q_NEXT_TYPE (ehci->periodic [i]); - temp = snprintf (next, size, "%4d: ", i); + temp = scnprintf (next, size, "%4d: ", i); size -= temp; next += temp; do { switch (tag) { case Q_TYPE_QH: - temp = snprintf (next, size, " qh%d-%04x/%p", + temp = scnprintf (next, size, " qh%d-%04x/%p", p.qh->period, le32_to_cpup (&p.qh->hw_info2) /* uframe masks */ @@ -520,7 +520,7 @@ if (seen [temp].ptr != p.ptr) continue; if (p.qh->qh_next.ptr) - temp = snprintf (next, size, + temp = scnprintf (next, size, " ..."); p.ptr = 0; break; @@ -545,7 +545,7 @@ } } - temp = snprintf (next, size, + temp = scnprintf (next, size, " (%c%d ep%d%s " "[%d/%d] q%d p%d)", speed_char (scratch), @@ -565,20 +565,20 @@ } break; case Q_TYPE_FSTN: - temp = snprintf (next, size, + temp = scnprintf (next, size, " fstn-%8x/%p", p.fstn->hw_prev, p.fstn); tag = Q_NEXT_TYPE (p.fstn->hw_next); p = p.fstn->fstn_next; break; case Q_TYPE_ITD: - temp = snprintf (next, size, + temp = scnprintf (next, size, " itd/%p", p.itd); tag = Q_NEXT_TYPE (p.itd->hw_next); p = p.itd->itd_next; break; case Q_TYPE_SITD: - temp = snprintf (next, size, + temp = scnprintf (next, size, " sitd/%p", p.sitd); tag = Q_NEXT_TYPE (p.sitd->hw_next); p = p.sitd->sitd_next; @@ -588,7 +588,7 @@ next += temp; } while (p.ptr); - temp = snprintf (next, size, "\n"); + temp = scnprintf (next, size, "\n"); size -= temp; next += temp; } @@ -623,44 +623,44 @@ /* Capability Registers */ i = HC_VERSION(readl (&ehci->caps->hc_capbase)); - temp = snprintf (next, size, + temp = scnprintf (next, size, "PCI device %s\nEHCI %x.%02x, hcd state %d (driver " DRIVER_VERSION ")\n", - pci_name(hcd->pdev), + pci_name(to_pci_dev(hcd->self.controller)), i >> 8, i & 0x0ff, ehci->hcd.state); size -= temp; next += temp; // FIXME interpret both types of params i = readl (&ehci->caps->hcs_params); - temp = snprintf (next, size, "structural params 0x%08x\n", i); + temp = scnprintf (next, size, "structural params 0x%08x\n", i); size -= temp; next += temp; i = readl (&ehci->caps->hcc_params); - temp = snprintf (next, size, "capability params 0x%08x\n", i); + temp = scnprintf (next, size, "capability params 0x%08x\n", i); size -= temp; next += temp; /* Operational Registers */ temp = dbg_status_buf (scratch, sizeof scratch, label, readl (&ehci->regs->status)); - temp = snprintf (next, size, fmt, temp, scratch); + temp = scnprintf (next, size, fmt, temp, scratch); size -= temp; next += temp; temp = dbg_command_buf (scratch, sizeof scratch, label, readl (&ehci->regs->command)); - temp = snprintf (next, size, fmt, temp, scratch); + temp = scnprintf (next, size, fmt, temp, scratch); size -= temp; next += temp; temp = dbg_intr_buf (scratch, sizeof scratch, label, readl (&ehci->regs->intr_enable)); - temp = snprintf (next, size, fmt, temp, scratch); + temp = scnprintf (next, size, fmt, temp, scratch); size -= temp; next += temp; - temp = snprintf (next, size, "uframe %04x\n", + temp = scnprintf (next, size, "uframe %04x\n", readl (&ehci->regs->frame_index)); size -= temp; next += temp; @@ -668,13 +668,13 @@ for (i = 0; i < HCS_N_PORTS (ehci->hcs_params); i++) { temp = dbg_port_buf (scratch, sizeof scratch, label, i, readl (&ehci->regs->port_status [i])); - temp = snprintf (next, size, fmt, temp, scratch); + temp = scnprintf (next, size, fmt, temp, scratch); size -= temp; next += temp; } if (ehci->reclaim) { - temp = snprintf (next, size, "reclaim qh %p%s\n", + temp = scnprintf (next, size, "reclaim qh %p%s\n", ehci->reclaim, ehci->reclaim_ready ? " ready" : ""); size -= temp; @@ -682,14 +682,14 @@ } #ifdef EHCI_STATS - temp = snprintf (next, size, + temp = scnprintf (next, size, "irq normal %ld err %ld reclaim %ld (lost %ld)\n", ehci->stats.normal, ehci->stats.error, ehci->stats.reclaim, ehci->stats.lost_iaa); size -= temp; next += temp; - temp = snprintf (next, size, "complete %ld unlink %ld\n", + temp = scnprintf (next, size, "complete %ld unlink %ld\n", ehci->stats.complete, ehci->stats.unlink); size -= temp; next += temp; diff -Nru a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c Thu Feb 19 23:44:26 2004 +++ b/drivers/usb/host/ehci-hcd.c Thu Feb 19 23:44:26 2004 @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #include #include #include +#include #include "../core/hcd.h" @@ -67,6 +69,7 @@ * * HISTORY: * + * 2004-02-24 Replace pci_* with generic dma_* API calls (dsaxena@plexity.net) * 2003-12-29 Rewritten high speed iso transfer support (by Michal Sojka, * , updates by DB). * @@ -288,13 +291,13 @@ /* request handoff to OS */ cap &= 1 << 24; - pci_write_config_dword (ehci->hcd.pdev, where, cap); + pci_write_config_dword (to_pci_dev(ehci->hcd.self.controller), where, cap); /* and wait a while for it to happen */ do { wait_ms (10); msec -= 10; - pci_read_config_dword (ehci->hcd.pdev, where, &cap); + pci_read_config_dword (to_pci_dev(ehci->hcd.self.controller), where, &cap); } while ((cap & (1 << 16)) && msec); if (cap & (1 << 16)) { ehci_err (ehci, "BIOS handoff failed (%d, %04x)\n", @@ -339,7 +342,7 @@ while (temp) { u32 cap; - pci_read_config_dword (ehci->hcd.pdev, temp, &cap); + pci_read_config_dword (to_pci_dev(ehci->hcd.self.controller), temp, &cap); ehci_dbg (ehci, "capability %04x at %02x\n", cap, temp); switch (cap & 0xff) { case 1: /* BIOS/SMM/... handoff */ @@ -378,7 +381,7 @@ * periodic_size can shrink by USBCMD update if hcc_params allows. */ ehci->periodic_size = DEFAULT_I_TDPS; - if ((retval = ehci_mem_init (ehci, SLAB_KERNEL)) < 0) + if ((retval = ehci_mem_init (ehci, GFP_KERNEL)) < 0) return retval; /* controllers may cache some of the periodic schedule ... */ @@ -433,13 +436,13 @@ writel (0, &ehci->regs->segment); #if 0 // this is deeply broken on almost all architectures - if (!pci_set_dma_mask (ehci->hcd.pdev, 0xffffffffffffffffULL)) + if (!pci_set_dma_mask (to_pci_dev(ehci->hcd.self.controller), 0xffffffffffffffffULL)) ehci_info (ehci, "enabled 64bit PCI DMA\n"); #endif } /* help hc dma work well with cachelines */ - pci_set_mwi (ehci->hcd.pdev); + pci_set_mwi (to_pci_dev(ehci->hcd.self.controller)); /* clear interrupt enables, set irq latency */ temp = readl (&ehci->regs->command) & 0x0fff; @@ -493,7 +496,7 @@ readl (&ehci->regs->command); /* unblock posted write */ /* PCI Serial Bus Release Number is at 0x60 offset */ - pci_read_config_byte (hcd->pdev, 0x60, &tempbyte); + pci_read_config_byte(to_pci_dev(hcd->self.controller), 0x60, &tempbyte); temp = HC_VERSION(readl (&ehci->caps->hc_capbase)); ehci_info (ehci, "USB %x.%x enabled, EHCI %x.%02x, driver %s\n", @@ -758,7 +761,7 @@ * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it * - * urb + dev is in hcd_dev.urb_list + * urb + dev is in hcd.self.controller.urb_list * we're queueing TDs onto software and hardware lists * * hcd-specific init for hcpriv hasn't been done yet diff -Nru a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c --- a/drivers/usb/host/ehci-hub.c Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/host/ehci-hub.c Thu Feb 19 23:44:28 2004 @@ -113,7 +113,7 @@ u16 temp; desc->bDescriptorType = 0x29; - desc->bPwrOn2PwrGood = 10; /* FIXME: f(system power) */ + desc->bPwrOn2PwrGood = 10; /* ehci 1.0, 2.3.9 says 20ms max */ desc->bHubContrCurrent = 0; desc->bNbrPorts = ports; diff -Nru a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c --- a/drivers/usb/host/ehci-mem.c Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/host/ehci-mem.c Thu Feb 19 23:44:28 2004 @@ -24,7 +24,7 @@ * There's basically three types of memory: * - data used only by the HCD ... kmalloc is fine * - async and periodic schedules, shared by HC and HCD ... these - * need to use pci_pool or pci_alloc_consistent + * need to use dma_pool or dma_alloc_coherent * - driver buffers, read/written by HC ... single shot DMA mapped * * There's also PCI "register" data, which is memory mapped. @@ -74,7 +74,7 @@ struct ehci_qtd *qtd; dma_addr_t dma; - qtd = pci_pool_alloc (ehci->qtd_pool, flags, &dma); + qtd = dma_pool_alloc (ehci->qtd_pool, flags, &dma); if (qtd != 0) { ehci_qtd_init (qtd, dma); } @@ -83,7 +83,7 @@ static inline void ehci_qtd_free (struct ehci_hcd *ehci, struct ehci_qtd *qtd) { - pci_pool_free (ehci->qtd_pool, qtd, qtd->qtd_dma); + dma_pool_free (ehci->qtd_pool, qtd, qtd->qtd_dma); } @@ -93,7 +93,7 @@ dma_addr_t dma; qh = (struct ehci_qh *) - pci_pool_alloc (ehci->qh_pool, flags, &dma); + dma_pool_alloc (ehci->qh_pool, flags, &dma); if (!qh) return qh; @@ -107,7 +107,7 @@ qh->dummy = ehci_qtd_alloc (ehci, flags); if (qh->dummy == 0) { ehci_dbg (ehci, "no dummy td\n"); - pci_pool_free (ehci->qh_pool, qh, qh->qh_dma); + dma_pool_free (ehci->qh_pool, qh, qh->qh_dma); qh = 0; } return qh; @@ -132,7 +132,7 @@ if (qh->dummy) ehci_qtd_free (ehci, qh->dummy); usb_put_dev (qh->dev); - pci_pool_free (ehci->qh_pool, qh, qh->qh_dma); + dma_pool_free (ehci->qh_pool, qh, qh->qh_dma); } /*-------------------------------------------------------------------------*/ @@ -148,26 +148,26 @@ qh_put (ehci, ehci->async); ehci->async = 0; - /* PCI consistent memory and pools */ + /* DMA consistent memory and pools */ if (ehci->qtd_pool) - pci_pool_destroy (ehci->qtd_pool); + dma_pool_destroy (ehci->qtd_pool); ehci->qtd_pool = 0; if (ehci->qh_pool) { - pci_pool_destroy (ehci->qh_pool); + dma_pool_destroy (ehci->qh_pool); ehci->qh_pool = 0; } if (ehci->itd_pool) - pci_pool_destroy (ehci->itd_pool); + dma_pool_destroy (ehci->itd_pool); ehci->itd_pool = 0; if (ehci->sitd_pool) - pci_pool_destroy (ehci->sitd_pool); + dma_pool_destroy (ehci->sitd_pool); ehci->sitd_pool = 0; if (ehci->periodic) - pci_free_consistent (ehci->hcd.pdev, + dma_free_coherent (ehci->hcd.self.controller, ehci->periodic_size * sizeof (u32), ehci->periodic, ehci->periodic_dma); ehci->periodic = 0; @@ -184,7 +184,8 @@ int i; /* QTDs for control/bulk/intr transfers */ - ehci->qtd_pool = pci_pool_create ("ehci_qtd", ehci->hcd.pdev, + ehci->qtd_pool = dma_pool_create ("ehci_qtd", + ehci->hcd.self.controller, sizeof (struct ehci_qtd), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -193,7 +194,8 @@ } /* QHs for control/bulk/intr transfers */ - ehci->qh_pool = pci_pool_create ("ehci_qh", ehci->hcd.pdev, + ehci->qh_pool = dma_pool_create ("ehci_qh", + ehci->hcd.self.controller, sizeof (struct ehci_qh), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -206,7 +208,8 @@ } /* ITD for high speed ISO transfers */ - ehci->itd_pool = pci_pool_create ("ehci_itd", ehci->hcd.pdev, + ehci->itd_pool = dma_pool_create ("ehci_itd", + ehci->hcd.self.controller, sizeof (struct ehci_itd), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -215,7 +218,8 @@ } /* SITD for full/low speed split ISO transfers */ - ehci->sitd_pool = pci_pool_create ("ehci_sitd", ehci->hcd.pdev, + ehci->sitd_pool = dma_pool_create ("ehci_sitd", + ehci->hcd.self.controller, sizeof (struct ehci_sitd), 32 /* byte alignment (for hw parts) */, 4096 /* can't cross 4K */); @@ -225,9 +229,9 @@ /* Hardware periodic table */ ehci->periodic = (u32 *) - pci_alloc_consistent (ehci->hcd.pdev, + dma_alloc_coherent (ehci->hcd.self.controller, ehci->periodic_size * sizeof (u32), - &ehci->periodic_dma); + &ehci->periodic_dma, 0); if (ehci->periodic == 0) { goto fail; } diff -Nru a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c --- a/drivers/usb/host/ehci-q.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/host/ehci-q.c Thu Feb 19 23:44:27 2004 @@ -776,7 +776,7 @@ qh = (struct ehci_qh *) *ptr; if (unlikely (qh == 0)) { /* can't sleep here, we have ehci->lock... */ - qh = qh_make (ehci, urb, SLAB_ATOMIC); + qh = qh_make (ehci, urb, GFP_ATOMIC); *ptr = qh; } if (likely (qh != 0)) { diff -Nru a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c --- a/drivers/usb/host/ehci-sched.c Thu Feb 19 23:44:24 2004 +++ b/drivers/usb/host/ehci-sched.c Thu Feb 19 23:44:24 2004 @@ -115,6 +115,7 @@ /* ... or C-mask? */ if (q->qh->hw_info2 & cpu_to_le32 (1 << (8 + uframe))) usecs += q->qh->c_usecs; + hw_p = &q->qh->hw_next; q = &q->qh->qh_next; break; case Q_TYPE_FSTN: @@ -122,37 +123,35 @@ * bandwidth from the previous frame */ if (q->fstn->hw_prev != EHCI_LIST_END) { - dbg ("not counting FSTN bandwidth yet ..."); + ehci_dbg (ehci, "ignoring FSTN cost ...\n"); } + hw_p = &q->fstn->hw_next; q = &q->fstn->fstn_next; break; case Q_TYPE_ITD: usecs += q->itd->usecs [uframe]; + hw_p = &q->itd->hw_next; q = &q->itd->itd_next; break; #ifdef have_split_iso case Q_TYPE_SITD: - temp = q->sitd->hw_fullspeed_ep & - __constant_cpu_to_le32 (1 << 31); - - // FIXME: this doesn't count data bytes right... - /* is it in the S-mask? (count SPLIT, DATA) */ if (q->sitd->hw_uframe & cpu_to_le32 (1 << uframe)) { - if (temp) - usecs += HS_USECS (188); - else - usecs += HS_USECS (1); + if (q->sitd->hw_fullspeed_ep & + __constant_cpu_to_le32 (1<<31)) + usecs += q->sitd->stream->usecs; + else /* worst case for OUT start-split */ + usecs += HS_USECS_ISO (188); } /* ... C-mask? (count CSPLIT, DATA) */ if (q->sitd->hw_uframe & cpu_to_le32 (1 << (8 + uframe))) { - if (temp) - usecs += HS_USECS (0); - else - usecs += HS_USECS (188); + /* worst case for IN complete-split */ + usecs += q->sitd->stream->c_usecs; } + + hw_p = &q->sitd->hw_next; q = &q->sitd->sitd_next; break; #endif /* have_split_iso */ @@ -170,6 +169,93 @@ /*-------------------------------------------------------------------------*/ +static int same_tt (struct usb_device *dev1, struct usb_device *dev2) +{ + if (!dev1->tt || !dev2->tt) + return 0; + if (dev1->tt != dev2->tt) + return 0; + if (dev1->tt->multi) + return dev1->ttport == dev2->ttport; + else + return 1; +} + +/* return true iff the device's transaction translator is available + * for a periodic transfer starting at the specified frame, using + * all the uframes in the mask. + */ +static int tt_no_collision ( + struct ehci_hcd *ehci, + unsigned period, + struct usb_device *dev, + unsigned frame, + u32 uf_mask +) +{ + if (period == 0) /* error */ + return 0; + + /* note bandwidth wastage: split never follows csplit + * (different dev or endpoint) until the next uframe. + * calling convention doesn't make that distinction. + */ + for (; frame < ehci->periodic_size; frame += period) { + union ehci_shadow here; + u32 type; + + here = ehci->pshadow [frame]; + type = Q_NEXT_TYPE (ehci->periodic [frame]); + while (here.ptr) { + switch (type) { + case Q_TYPE_ITD: + type = Q_NEXT_TYPE (here.itd->hw_next); + here = here.itd->itd_next; + continue; + case Q_TYPE_QH: + if (same_tt (dev, here.qh->dev)) { + u32 mask; + + mask = le32_to_cpu (here.qh->hw_info2); + /* "knows" no gap is needed */ + mask |= mask >> 8; + if (mask & uf_mask) + break; + } + type = Q_NEXT_TYPE (here.qh->hw_next); + here = here.qh->qh_next; + continue; + case Q_TYPE_SITD: + if (same_tt (dev, here.itd->urb->dev)) { + u16 mask; + + mask = le32_to_cpu (here.sitd->hw_uframe); + /* FIXME assumes no gap for IN! */ + mask |= mask >> 8; + if (mask & uf_mask) + break; + } + type = Q_NEXT_TYPE (here.qh->hw_next); + here = here.sitd->sitd_next; + break; + // case Q_TYPE_FSTN: + default: + ehci_dbg (ehci, + "periodic frame %d bogus type %d\n", + frame, type); + } + + /* collision or error */ + return 0; + } + } + + /* no collision */ + return 1; +} + +/*-------------------------------------------------------------------------*/ + static int enable_periodic (struct ehci_hcd *ehci) { u32 cmd; @@ -490,36 +576,11 @@ return status; } -static unsigned -intr_complete ( - struct ehci_hcd *ehci, - unsigned frame, - struct ehci_qh *qh, - struct pt_regs *regs -) { - unsigned count; - - /* nothing to report? */ - if (likely ((qh->hw_token & __constant_cpu_to_le32 (QTD_STS_ACTIVE)) - != 0)) - return 0; - if (unlikely (list_empty (&qh->qtd_list))) { - dbg ("intr qh %p no TDs?", qh); - return 0; - } - - /* handle any completions */ - count = qh_completions (ehci, qh, regs); - - if (unlikely (list_empty (&qh->qtd_list))) - intr_deschedule (ehci, qh, 0); - - return count; -} - /*-------------------------------------------------------------------------*/ -static inline struct ehci_iso_stream * +/* ehci_iso_stream ops work with both ITD and SITD */ + +static struct ehci_iso_stream * iso_stream_alloc (int mem_flags) { struct ehci_iso_stream *stream; @@ -527,15 +588,15 @@ stream = kmalloc(sizeof *stream, mem_flags); if (likely (stream != 0)) { memset (stream, 0, sizeof(*stream)); - INIT_LIST_HEAD(&stream->itd_list); - INIT_LIST_HEAD(&stream->free_itd_list); + INIT_LIST_HEAD(&stream->td_list); + INIT_LIST_HEAD(&stream->free_list); stream->next_uframe = -1; stream->refcount = 1; } return stream; } -static inline void +static void iso_stream_init ( struct ehci_iso_stream *stream, struct usb_device *dev, @@ -543,8 +604,10 @@ unsigned interval ) { + static const u8 smask_out [] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f }; + u32 buf1; - unsigned epnum, maxp, multi; + unsigned epnum, maxp; int is_input; long bandwidth; @@ -562,28 +625,62 @@ buf1 = 0; } - multi = hb_mult(maxp); - maxp = max_packet(maxp); - buf1 |= maxp; - maxp *= multi; + /* knows about ITD vs SITD */ + if (dev->speed == USB_SPEED_HIGH) { + unsigned multi = hb_mult(maxp); + + stream->highspeed = 1; + + maxp = max_packet(maxp); + buf1 |= maxp; + maxp *= multi; + + stream->buf0 = cpu_to_le32 ((epnum << 8) | dev->devnum); + stream->buf1 = cpu_to_le32 (buf1); + stream->buf2 = cpu_to_le32 (multi); - stream->dev = (struct hcd_dev *)dev->hcpriv; + /* usbfs wants to report the average usecs per frame tied up + * when transfers on this endpoint are scheduled ... + */ + stream->usecs = HS_USECS_ISO (maxp); + bandwidth = stream->usecs * 8; + bandwidth /= 1 << (interval - 1); - stream->bEndpointAddress = is_input | epnum; - stream->interval = interval; - stream->maxp = maxp; + } else { + u32 addr; - stream->buf0 = cpu_to_le32 ((epnum << 8) | dev->devnum); - stream->buf1 = cpu_to_le32 (buf1); - stream->buf2 = cpu_to_le32 (multi); + addr = dev->ttport << 24; + addr |= dev->tt->hub->devnum << 16; + addr |= epnum << 8; + addr |= dev->devnum; + stream->usecs = HS_USECS_ISO (maxp); + if (is_input) { + u32 tmp; + + addr |= 1 << 31; + stream->c_usecs = stream->usecs; + stream->usecs = HS_USECS_ISO (1); + stream->raw_mask = 1; + + /* pessimistic c-mask */ + tmp = usb_calc_bus_time (USB_SPEED_FULL, 1, 0, maxp) + / (125 * 1000); + stream->raw_mask |= 3 << (tmp + 9); + } else + stream->raw_mask = smask_out [maxp / 188]; + bandwidth = stream->usecs + stream->c_usecs; + bandwidth /= 1 << (interval + 2); - /* usbfs wants to report the average usecs per frame tied up - * when transfers on this endpoint are scheduled ... - */ - stream->usecs = HS_USECS_ISO (maxp); - bandwidth = stream->usecs * 8; - bandwidth /= 1 << (interval - 1); + /* stream->splits gets created from raw_mask later */ + stream->address = cpu_to_le32 (addr); + } stream->bandwidth = bandwidth; + + stream->udev = dev; + + stream->bEndpointAddress = is_input | epnum; + stream->interval = interval; + stream->maxp = maxp; } static void @@ -595,22 +692,23 @@ * not like a QH -- no persistent state (toggle, halt) */ if (stream->refcount == 1) { - int is_in; + int is_in; + struct hcd_dev *dev = stream->udev->hcpriv; - // BUG_ON (!list_empty(&stream->itd_list)); + // BUG_ON (!list_empty(&stream->td_list)); - while (!list_empty (&stream->free_itd_list)) { + while (!list_empty (&stream->free_list)) { struct ehci_itd *itd; - itd = list_entry (stream->free_itd_list.next, + itd = list_entry (stream->free_list.next, struct ehci_itd, itd_list); list_del (&itd->itd_list); - pci_pool_free (ehci->itd_pool, itd, itd->itd_dma); + dma_pool_free (ehci->itd_pool, itd, itd->itd_dma); } is_in = (stream->bEndpointAddress & USB_DIR_IN) ? 0x10 : 0; stream->bEndpointAddress &= 0x0f; - stream->dev->ep [is_in + stream->bEndpointAddress] = 0; + dev->ep [is_in + stream->bEndpointAddress] = 0; if (stream->rescheduled) { ehci_info (ehci, "ep%d%s-iso rescheduled " @@ -676,24 +774,26 @@ /*-------------------------------------------------------------------------*/ -static inline struct ehci_itd_sched * -itd_sched_alloc (unsigned packets, int mem_flags) +/* ehci_iso_sched ops can be shared, ITD-only, or SITD-only */ + +static struct ehci_iso_sched * +iso_sched_alloc (unsigned packets, int mem_flags) { - struct ehci_itd_sched *itd_sched; - int size = sizeof *itd_sched; + struct ehci_iso_sched *iso_sched; + int size = sizeof *iso_sched; - size += packets * sizeof (struct ehci_iso_uframe); - itd_sched = kmalloc (size, mem_flags); - if (likely (itd_sched != 0)) { - memset(itd_sched, 0, size); - INIT_LIST_HEAD (&itd_sched->itd_list); + size += packets * sizeof (struct ehci_iso_packet); + iso_sched = kmalloc (size, mem_flags); + if (likely (iso_sched != 0)) { + memset(iso_sched, 0, size); + INIT_LIST_HEAD (&iso_sched->td_list); } - return itd_sched; + return iso_sched; } -static int +static inline void itd_sched_init ( - struct ehci_itd_sched *itd_sched, + struct ehci_iso_sched *iso_sched, struct ehci_iso_stream *stream, struct urb *urb ) @@ -702,13 +802,13 @@ dma_addr_t dma = urb->transfer_dma; /* how many uframes are needed for these transfers */ - itd_sched->span = urb->number_of_packets * stream->interval; + iso_sched->span = urb->number_of_packets * stream->interval; /* figure out per-uframe itd fields that we'll need later * when we fit new itds into the schedule. */ for (i = 0; i < urb->number_of_packets; i++) { - struct ehci_iso_uframe *uframe = &itd_sched->packet [i]; + struct ehci_iso_packet *uframe = &iso_sched->packet [i]; unsigned length; dma_addr_t buf; u32 trans; @@ -718,7 +818,8 @@ trans = EHCI_ISOC_ACTIVE; trans |= buf & 0x0fff; - if (unlikely ((i + 1) == urb->number_of_packets)) + if (unlikely (((i + 1) == urb->number_of_packets)) + && !(urb->transfer_flags & URB_NO_INTERRUPT)) trans |= EHCI_ITD_IOC; trans |= length << 16; uframe->transaction = cpu_to_le32 (trans); @@ -729,17 +830,19 @@ if (unlikely ((uframe->bufp != (buf & ~(u64)0x0fff)))) uframe->cross = 1; } - return 0; } static void -itd_sched_free ( +iso_sched_free ( struct ehci_iso_stream *stream, - struct ehci_itd_sched *itd_sched + struct ehci_iso_sched *iso_sched ) { - list_splice (&itd_sched->itd_list, &stream->free_itd_list); - kfree (itd_sched); + if (!iso_sched) + return; + // caller must hold ehci->lock! + list_splice (&iso_sched->td_list, &stream->free_list); + kfree (iso_sched); } static int @@ -751,110 +854,201 @@ ) { struct ehci_itd *itd; - int status; dma_addr_t itd_dma; int i; unsigned num_itds; - struct ehci_itd_sched *itd_sched; + struct ehci_iso_sched *sched; - itd_sched = itd_sched_alloc (urb->number_of_packets, mem_flags); - if (unlikely (itd_sched == 0)) + sched = iso_sched_alloc (urb->number_of_packets, mem_flags); + if (unlikely (sched == 0)) return -ENOMEM; - status = itd_sched_init (itd_sched, stream, urb); - if (unlikely (status != 0)) { - itd_sched_free (stream, itd_sched); - return status; - } + itd_sched_init (sched, stream, urb); if (urb->interval < 8) - num_itds = 1 + (itd_sched->span + 7) / 8; + num_itds = 1 + (sched->span + 7) / 8; else num_itds = urb->number_of_packets; /* allocate/init ITDs */ for (i = 0; i < num_itds; i++) { - /* free_itd_list.next might be cache-hot ... but maybe + /* free_list.next might be cache-hot ... but maybe * the HC caches it too. avoid that issue for now. */ /* prefer previously-allocated itds */ - if (likely (!list_empty(&stream->free_itd_list))) { - itd = list_entry (stream->free_itd_list.prev, + if (likely (!list_empty(&stream->free_list))) { + itd = list_entry (stream->free_list.prev, struct ehci_itd, itd_list); list_del (&itd->itd_list); itd_dma = itd->itd_dma; } else - itd = pci_pool_alloc (ehci->itd_pool, mem_flags, + itd = dma_pool_alloc (ehci->itd_pool, mem_flags, &itd_dma); if (unlikely (0 == itd)) { - itd_sched_free (stream, itd_sched); + iso_sched_free (stream, sched); return -ENOMEM; } memset (itd, 0, sizeof *itd); itd->itd_dma = itd_dma; - list_add (&itd->itd_list, &itd_sched->itd_list); + list_add (&itd->itd_list, &sched->td_list); } /* temporarily store schedule info in hcpriv */ - urb->hcpriv = itd_sched; + urb->hcpriv = sched; urb->error_count = 0; return 0; } +/*-------------------------------------------------------------------------*/ + +static inline int +itd_slot_ok ( + struct ehci_hcd *ehci, + u32 mod, + u32 uframe, + u32 end, + u8 usecs, + u32 period +) +{ + do { + /* can't commit more than 80% periodic == 100 usec */ + if (periodic_usecs (ehci, uframe >> 3, uframe & 0x7) + > (100 - usecs)) + return 0; + + /* we know urb->interval is 2^N uframes */ + uframe += period; + uframe %= mod; + } while (uframe != end); + return 1; +} + +static inline int +sitd_slot_ok ( + struct ehci_hcd *ehci, + u32 mod, + struct ehci_iso_stream *stream, + u32 uframe, + u32 end, + struct ehci_iso_sched *sched, + u32 period_uframes +) +{ + u32 mask, tmp; + u32 frame, uf; + + mask = stream->raw_mask << (uframe & 7); + + /* for IN, don't wrap CSPLIT into the next frame */ + if (mask & ~0xffff) + return 0; + + /* this multi-pass logic is simple, but performance may + * suffer when the schedule data isn't cached. + */ + + /* check bandwidth */ + do { + u32 max_used; + + frame = uframe >> 3; + uf = uframe & 7; + + /* check starts (OUT uses more than one) */ + max_used = 100 - stream->usecs; + for (tmp = stream->raw_mask & 0xff; tmp; tmp >>= 1, uf++) { + if (periodic_usecs (ehci, frame, uf) > max_used) + return 0; + } + + /* for IN, check CSPLIT */ + 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; + } 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; + + stream->splits = stream->raw_mask << (uframe & 7); + cpu_to_le32s (&stream->splits); + return 1; +} + /* * This scheduler plans almost as far into the future as it has actual * periodic schedule slots. (Affected by TUNE_FLS, which defaults to * "as small as possible" to be cache-friendlier.) That limits the size * transfers you can stream reliably; avoid more than 64 msec per urb. - * Also avoid queue depths of less than the system's worst irq latency. + * Also avoid queue depths of less than ehci's worst irq latency (affected + * by the per-urb URB_NO_INTERRUPT hint, the log2_irq_thresh module parameter, + * and other factors); or more than about 230 msec total (for portability, + * given EHCI_TUNE_FLS and the slop). Or, write a smarter scheduler! */ #define SCHEDULE_SLOP 10 /* frames */ static int -itd_stream_schedule ( +iso_stream_schedule ( struct ehci_hcd *ehci, struct urb *urb, struct ehci_iso_stream *stream ) { - u32 now, start, end, max; + u32 now, start, end, max, period; int status; unsigned mod = ehci->periodic_size << 3; - struct ehci_itd_sched *itd_sched = urb->hcpriv; + struct ehci_iso_sched *sched = urb->hcpriv; - if (unlikely (itd_sched->span > (mod - 8 * SCHEDULE_SLOP))) { + if (sched->span > (mod - 8 * SCHEDULE_SLOP)) { ehci_dbg (ehci, "iso request %p too long\n", urb); status = -EFBIG; goto fail; } + if ((stream->depth + sched->span) > mod) { + ehci_dbg (ehci, "request %p would overflow (%d+%d>%d)\n", + urb, stream->depth, sched->span, mod); + status = -EFBIG; + goto fail; + } + now = readl (&ehci->regs->frame_index) % mod; /* when's the last uframe this urb could start? */ max = now + mod; - max -= itd_sched->span; + 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) */ - if (likely (!list_empty (&stream->itd_list))) { - + if (likely (!list_empty (&stream->td_list))) { start = stream->next_uframe; if (start < now) start += mod; if (likely (start < max)) goto ready; - - /* two cases: - * (a) we missed some uframes ... can reschedule - * (b) trying to overcommit the schedule - * FIXME (b) should be a hard failure - */ + /* else fell behind; try to reschedule */ } /* need to schedule; when's the next (u)frame we could start? @@ -864,47 +1058,41 @@ * jump until after the queue is primed. */ start = SCHEDULE_SLOP * 8 + (now & ~0x07); + start %= mod; end = start; - ehci_vdbg (ehci, "%s schedule from %d (%d..%d), was %d\n", - __FUNCTION__, now, start, max, - stream->next_uframe); - /* NOTE: assumes URB_ISO_ASAP, to limit complexity/bugs */ - if (likely (max > (start + urb->interval))) - max = start + urb->interval; + 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 (unlikely (list_empty (&stream->itd_list))) + if (list_empty (&stream->td_list)) end = max; /* within [start..max] find a uframe slot with enough bandwidth */ end %= mod; do { - unsigned uframe; - int enough_space = 1; + int enough_space; /* check schedule: enough space? */ - uframe = start; - do { - uframe %= mod; - - /* can't commit more than 80% periodic == 100 usec */ - if (periodic_usecs (ehci, uframe >> 3, uframe & 0x7) - > (100 - stream->usecs)) { - enough_space = 0; - break; - } - - /* we know urb->interval is 2^N uframes */ - uframe += urb->interval; - } while (uframe != end); + if (stream->highspeed) + enough_space = itd_slot_ok (ehci, mod, start, end, + stream->usecs, period); + else { + if ((start % 8) >= 6) + continue; + enough_space = sitd_slot_ok (ehci, mod, stream, + start, end, sched, period); + } /* (re)schedule it here if there's enough bandwidth */ if (enough_space) { start %= mod; - if (unlikely (!list_empty (&stream->itd_list))) { + if (unlikely (!list_empty (&stream->td_list))) { /* host fell behind ... maybe irq latencies * delayed this request queue for too long. */ @@ -926,12 +1114,12 @@ /* no room in the schedule */ ehci_dbg (ehci, "iso %ssched full %p (now %d end %d max %d)\n", - list_empty (&stream->itd_list) ? "" : "re", + list_empty (&stream->td_list) ? "" : "re", urb, now, end, max); status = -ENOSPC; fail: - itd_sched_free (stream, itd_sched); + iso_sched_free (stream, sched); urb->hcpriv = 0; return status; @@ -961,13 +1149,13 @@ static inline void itd_patch ( struct ehci_itd *itd, - struct ehci_itd_sched *itd_sched, + struct ehci_iso_sched *iso_sched, unsigned index, u16 uframe, int first ) { - struct ehci_iso_uframe *uf = &itd_sched->packet [index]; + struct ehci_iso_packet *uf = &iso_sched->packet [index]; unsigned pg = itd->pg; // BUG_ON (pg == 6 && uf->cross); @@ -1012,12 +1200,12 @@ { int packet, first = 1; unsigned next_uframe, uframe, frame; - struct ehci_itd_sched *itd_sched = urb->hcpriv; + struct ehci_iso_sched *iso_sched = urb->hcpriv; struct ehci_itd *itd; next_uframe = stream->next_uframe % mod; - if (unlikely (list_empty(&stream->itd_list))) { + if (unlikely (list_empty(&stream->td_list))) { hcd_to_bus (&ehci->hcd)->bandwidth_allocated += stream->bandwidth; ehci_vdbg (ehci, @@ -1034,13 +1222,13 @@ for (packet = 0, itd = 0; packet < urb->number_of_packets; ) { if (itd == 0) { /* ASSERT: we have all necessary itds */ - // BUG_ON (list_empty (&itd_sched->itd_list)); + // BUG_ON (list_empty (&iso_sched->td_list)); /* ASSERT: no itds for this endpoint in this uframe */ - itd = list_entry (itd_sched->itd_list.next, + itd = list_entry (iso_sched->td_list.next, struct ehci_itd, itd_list); - list_move_tail (&itd->itd_list, &stream->itd_list); + list_move_tail (&itd->itd_list, &stream->td_list); itd->stream = iso_stream_get (stream); itd->urb = usb_get_urb (urb); first = 1; @@ -1051,10 +1239,11 @@ frame = next_uframe >> 3; itd->usecs [uframe] = stream->usecs; - itd_patch (itd, itd_sched, packet, uframe, first); + itd_patch (itd, iso_sched, packet, uframe, first); first = 0; next_uframe += stream->interval; + stream->depth += stream->interval; next_uframe %= mod; packet++; @@ -1068,7 +1257,7 @@ stream->next_uframe = next_uframe; /* don't need that schedule data any more */ - itd_sched_free (stream, itd_sched); + iso_sched_free (stream, iso_sched); urb->hcpriv = 0; if (unlikely (!ehci->periodic_sched++)) @@ -1101,6 +1290,7 @@ t = le32_to_cpup (&itd->hw_transaction [uframe]); itd->hw_transaction [uframe] = 0; + stream->depth -= stream->interval; /* report transfer status */ if (unlikely (t & ISO_ERRS)) { @@ -1126,7 +1316,7 @@ usb_put_urb (urb); itd->urb = 0; itd->stream = 0; - list_move (&itd->itd_list, &stream->free_itd_list); + list_move (&itd->itd_list, &stream->free_list); iso_stream_put (ehci, stream); /* handle completion now? */ @@ -1134,7 +1324,7 @@ return 0; /* ASSERT: it's really the last itd for this urb - list_for_each_entry (itd, &stream->itd_list, itd_list) + list_for_each_entry (itd, &stream->td_list, itd_list) BUG_ON (itd->urb == urb); */ @@ -1149,7 +1339,7 @@ (void) disable_periodic (ehci); hcd_to_bus (&ehci->hcd)->bandwidth_isoc_reqs--; - if (unlikely (list_empty (&stream->itd_list))) { + if (unlikely (list_empty (&stream->td_list))) { hcd_to_bus (&ehci->hcd)->bandwidth_allocated -= stream->bandwidth; ehci_vdbg (ehci, @@ -1203,7 +1393,7 @@ /* schedule ... need to lock */ spin_lock_irqsave (&ehci->lock, flags); - status = itd_stream_schedule (ehci, urb, stream); + status = iso_stream_schedule (ehci, urb, stream); if (likely (status == 0)) itd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); spin_unlock_irqrestore (&ehci->lock, flags); @@ -1233,7 +1423,7 @@ scan_periodic (struct ehci_hcd *ehci, struct pt_regs *regs) { unsigned frame, clock, now_uframe, mod; - unsigned count = 0; + unsigned modified; mod = ehci->periodic_size << 3; @@ -1244,47 +1434,50 @@ */ now_uframe = ehci->next_uframe; if (HCD_IS_RUNNING (ehci->hcd.state)) - clock = readl (&ehci->regs->frame_index) % mod; + clock = readl (&ehci->regs->frame_index); else clock = now_uframe + mod - 1; + clock %= mod; for (;;) { union ehci_shadow q, *q_p; u32 type, *hw_p; unsigned uframes; + /* don't scan past the live uframe */ frame = now_uframe >> 3; -restart: - /* scan schedule to _before_ current frame index */ - if ((frame == (clock >> 3)) - && HCD_IS_RUNNING (ehci->hcd.state)) + if (frame == (clock >> 3)) uframes = now_uframe & 0x07; - else + else { + /* safe to scan the whole frame at once */ + now_uframe |= 0x07; uframes = 8; + } +restart: + /* scan each element in frame's queue for completions */ q_p = &ehci->pshadow [frame]; hw_p = &ehci->periodic [frame]; q.ptr = q_p->ptr; type = Q_NEXT_TYPE (*hw_p); + modified = 0; - /* scan each element in frame's queue for completions */ while (q.ptr != 0) { - int last; unsigned uf; union ehci_shadow temp; switch (type) { case Q_TYPE_QH: - last = (q.qh->hw_next == EHCI_LIST_END); - temp = q.qh->qh_next; + /* handle any completions */ + temp.qh = qh_get (q.qh); type = Q_NEXT_TYPE (q.qh->hw_next); - count += intr_complete (ehci, frame, - qh_get (q.qh), regs); - qh_put (ehci, q.qh); - q = temp; + q = q.qh->qh_next; + modified = qh_completions (ehci, temp.qh, regs); + if (unlikely (list_empty (&temp.qh->qtd_list))) + intr_deschedule (ehci, temp.qh, 0); + qh_put (ehci, temp.qh); break; case Q_TYPE_FSTN: - last = (q.fstn->hw_next == EHCI_LIST_END); /* for "save place" FSTNs, look at QH entries * in the previous frame for completions. */ @@ -1295,13 +1488,11 @@ q = q.fstn->fstn_next; break; case Q_TYPE_ITD: - last = (q.itd->hw_next == EHCI_LIST_END); - /* skip itds for later in the frame */ rmb (); for (uf = uframes; uf < 8; uf++) { if (0 == (q.itd->hw_transaction [uf] - & ISO_ACTIVE)) + & ITD_ACTIVE)) continue; q_p = &q.itd->itd_next; hw_p = &q.itd->hw_next; @@ -1317,31 +1508,37 @@ */ *q_p = q.itd->itd_next; *hw_p = q.itd->hw_next; + type = Q_NEXT_TYPE (q.itd->hw_next); wmb(); - - /* always rescan here; simpler */ - count += itd_complete (ehci, q.itd, regs); - goto restart; + modified = itd_complete (ehci, q.itd, regs); + q = *q_p; + break; #ifdef have_split_iso case Q_TYPE_SITD: - last = (q.sitd->hw_next == EHCI_LIST_END); - sitd_complete (ehci, q.sitd); + if (q.sitd->hw_results & SITD_ACTIVE) { + q_p = &q.sitd->sitd_next; + hw_p = &q.sitd->hw_next; + type = Q_NEXT_TYPE (q.sitd->hw_next); + q = *q_p; + break; + } + *q_p = q.sitd->sitd_next; + *hw_p = q.sitd->hw_next; type = Q_NEXT_TYPE (q.sitd->hw_next); - - // FIXME unlink SITD after split completes - q = q.sitd->sitd_next; + wmb(); + 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); // BUG (); - last = 1; q.ptr = 0; } - /* did completion remove an interior q entry? */ - if (unlikely (q.ptr == 0 && !last)) + /* assume completion callbacks modify the queue */ + if (unlikely (modified)) goto restart; } @@ -1368,9 +1565,6 @@ /* rescan the rest of this frame, then ... */ clock = now; } else { - /* FIXME sometimes we can scan the next frame - * right away, not always inching up on it ... - */ now_uframe++; now_uframe %= mod; } diff -Nru a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h --- a/drivers/usb/host/ehci.h Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/host/ehci.h Thu Feb 19 23:44:27 2004 @@ -74,11 +74,11 @@ struct ehci_regs *regs; u32 hcs_params; /* cached register copy */ - /* per-HC memory pools (could be per-PCI-bus, but ...) */ - struct pci_pool *qh_pool; /* qh per active urb */ - struct pci_pool *qtd_pool; /* one or more per qh */ - struct pci_pool *itd_pool; /* itd per iso urb */ - struct pci_pool *sitd_pool; /* sitd per split iso urb */ + /* per-HC memory pools (could be per-bus, but ...) */ + struct dma_pool *qh_pool; /* qh per active urb */ + struct dma_pool *qtd_pool; /* one or more per qh */ + struct dma_pool *itd_pool; /* itd per iso urb */ + struct dma_pool *sitd_pool; /* sitd per split iso urb */ struct timer_list watchdog; struct notifier_block reboot_notifier; @@ -386,22 +386,24 @@ /*-------------------------------------------------------------------------*/ -/* description of one iso highspeed transaction (up to 3 KB data) */ -struct ehci_iso_uframe { +/* description of one iso transaction (up to 3 KB data if highspeed) */ +struct ehci_iso_packet { /* These will be copied to iTD when scheduling */ u64 bufp; /* itd->hw_bufp{,_hi}[pg] |= */ u32 transaction; /* itd->hw_transaction[i] |= */ u8 cross; /* buf crosses pages */ + /* for full speed OUT splits */ + u16 buf1; }; -/* temporary schedule data for highspeed packets from iso urbs - * each packet is one uframe's usb transactions, in some itd, +/* temporary schedule data for packets from iso urbs (both speeds) + * each packet is one logical usb transaction to the device (not TT), * beginning at stream->next_uframe */ -struct ehci_itd_sched { - struct list_head itd_list; +struct ehci_iso_sched { + struct list_head td_list; unsigned span; - struct ehci_iso_uframe packet [0]; + struct ehci_iso_packet packet [0]; }; /* @@ -415,22 +417,26 @@ u32 refcount; u8 bEndpointAddress; - struct list_head itd_list; /* queued itds */ - struct list_head free_itd_list; /* list of unused itds */ - struct hcd_dev *dev; + u8 highspeed; + u16 depth; /* depth in uframes */ + struct list_head td_list; /* queued itds/sitds */ + struct list_head free_list; /* list of unused itds/sitds */ + struct usb_device *udev; /* output of (re)scheduling */ unsigned long start; /* jiffies */ unsigned long rescheduled; int next_uframe; + u32 splits; /* the rest is derived from the endpoint descriptor, - * trusting urb->interval == (1 << (epdesc->bInterval - 1)), + * trusting urb->interval == f(epdesc->bInterval) and * including the extra info for hw_bufp[0..2] */ u8 interval; - u8 usecs; + u8 usecs, c_usecs; u16 maxp; + u16 raw_mask; unsigned bandwidth; /* This is used to initialize iTD's hw_bufp fields */ @@ -438,7 +444,8 @@ u32 buf1; u32 buf2; - /* ... sITD won't use buf[012], and needs TT access ... */ + /* this is used to initialize sITD's tt info */ + u32 address; }; /*-------------------------------------------------------------------------*/ @@ -460,7 +467,7 @@ #define EHCI_ITD_LENGTH(tok) (((tok)>>16) & 0x0fff) #define EHCI_ITD_IOC (1 << 15) /* interrupt on complete */ -#define ISO_ACTIVE __constant_cpu_to_le32(EHCI_ISOC_ACTIVE) +#define ITD_ACTIVE __constant_cpu_to_le32(EHCI_ISOC_ACTIVE) u32 hw_bufp [7]; /* see EHCI 3.3.3 */ u32 hw_bufp_hi [7]; /* Appendix B */ @@ -492,22 +499,35 @@ /* 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_tx_results1; /* see EHCI table 3-11 */ - u32 hw_tx_results2; /* see EHCI table 3-12 */ - u32 hw_tx_results3; /* see EHCI table 3-12 */ - u32 hw_backpointer; /* see EHCI table 3-13 */ - u32 hw_buf_hi [2]; /* Appendix B */ + 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 */ +#define SITD_IOC (1 << 31) /* interrupt on completion */ +#define SITD_PAGE (1 << 30) /* buffer 0/1 */ +#define SITD_LENGTH(x) (0x3ff & ((x)>>16)) +#define SITD_STS_ACTIVE (1 << 7) /* HC may execute this */ +#define SITD_STS_ERR (1 << 6) /* error from TT */ +#define SITD_STS_DBE (1 << 5) /* data buffer error (in HC) */ +#define SITD_STS_BABBLE (1 << 4) /* device was babbling */ +#define SITD_STS_XACT (1 << 3) /* illegal IN response */ +#define SITD_STS_MMF (1 << 2) /* incomplete split transaction */ +#define SITD_STS_STS (1 << 1) /* split transaction state */ + +#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_hi [2]; /* Appendix B */ /* the rest is HCD-private */ dma_addr_t sitd_dma; union ehci_shadow sitd_next; /* ptr to periodic q entry */ - struct urb *urb; - dma_addr_t buf_dma; /* buffer address */ - unsigned short usecs; /* start bandwidth */ - unsigned short c_usecs; /* completion bandwidth */ + struct urb *urb; + struct ehci_iso_stream *stream; /* endpoint's queue */ + struct list_head sitd_list; /* list of stream's sitds */ + unsigned frame; + unsigned index; } __attribute__ ((aligned (32))); /*-------------------------------------------------------------------------*/ diff -Nru a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c --- a/drivers/usb/host/ohci-dbg.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/host/ohci-dbg.c Thu Feb 19 23:44:27 2004 @@ -76,7 +76,7 @@ do { \ if (next) { \ unsigned s_len; \ - s_len = snprintf (*next, *size, format, ## arg ); \ + s_len = scnprintf (*next, *size, format, ## arg ); \ *size -= s_len; *next += s_len; \ } else \ ohci_dbg(ohci,format, ## arg ); \ @@ -420,7 +420,7 @@ struct list_head *entry; struct td *td; - temp = snprintf (buf, size, + temp = scnprintf (buf, size, "ed/%p %cs dev%d ep%d%s max %d %08x%s%s %s", ed, (info & ED_LOWSPEED) ? 'l' : 'f', @@ -442,7 +442,7 @@ scratch = cpu_to_le32p (&td->hwINFO); cbp = le32_to_cpup (&td->hwCBP); be = le32_to_cpup (&td->hwBE); - temp = snprintf (buf, size, + temp = scnprintf (buf, size, "\n\ttd %p %s %d cc=%x urb %p (%08x)", td, ({ char *pid; @@ -458,7 +458,7 @@ buf += temp; } - temp = snprintf (buf, size, "\n"); + temp = scnprintf (buf, size, "\n"); size -= temp; buf += temp; @@ -515,7 +515,7 @@ next = buf; size = PAGE_SIZE; - temp = snprintf (next, size, "size = %d\n", NUM_INTS); + temp = scnprintf (next, size, "size = %d\n", NUM_INTS); size -= temp; next += temp; @@ -525,12 +525,12 @@ if (!(ed = ohci->periodic [i])) continue; - temp = snprintf (next, size, "%2d [%3d]:", i, ohci->load [i]); + temp = scnprintf (next, size, "%2d [%3d]:", i, ohci->load [i]); size -= temp; next += temp; do { - temp = snprintf (next, size, " ed%d/%p", + temp = scnprintf (next, size, " ed%d/%p", ed->interval, ed); size -= temp; next += temp; @@ -550,7 +550,7 @@ list_for_each (entry, &ed->td_list) qlen++; - temp = snprintf (next, size, + temp = scnprintf (next, size, " (%cs dev%d ep%d%s-%s qlen %u" " max %d %08x%s%s)", (info & ED_LOWSPEED) ? 'l' : 'f', @@ -579,7 +579,7 @@ } while (ed); - temp = snprintf (next, size, "\n"); + temp = scnprintf (next, size, "\n"); size -= temp; next += temp; } @@ -628,7 +628,7 @@ /* other registers mostly affect frame timings */ rdata = readl (®s->fminterval); - temp = snprintf (next, size, + temp = scnprintf (next, size, "fmintvl 0x%08x %sFSMPS=0x%04x FI=0x%04x\n", rdata, (rdata >> 31) ? " FIT" : "", (rdata >> 16) & 0xefff, rdata & 0xffff); @@ -636,20 +636,20 @@ next += temp; rdata = readl (®s->fmremaining); - temp = snprintf (next, size, "fmremaining 0x%08x %sFR=0x%04x\n", + temp = scnprintf (next, size, "fmremaining 0x%08x %sFR=0x%04x\n", rdata, (rdata >> 31) ? " FRT" : "", rdata & 0x3fff); size -= temp; next += temp; rdata = readl (®s->periodicstart); - temp = snprintf (next, size, "periodicstart 0x%04x\n", + temp = scnprintf (next, size, "periodicstart 0x%04x\n", rdata & 0x3fff); size -= temp; next += temp; rdata = readl (®s->lsthresh); - temp = snprintf (next, size, "lsthresh 0x%04x\n", + temp = scnprintf (next, size, "lsthresh 0x%04x\n", rdata & 0x3fff); size -= temp; next += temp; diff -Nru a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c --- a/drivers/usb/host/ohci-hcd.c Thu Feb 19 23:44:23 2004 +++ b/drivers/usb/host/ohci-hcd.c Thu Feb 19 23:44:23 2004 @@ -17,6 +17,7 @@ * * History: * + * 2004/02/04 use generic dma_* functions instead of pci_* (dsaxena@plexity.net) * 2003/02/24 show registers in sysfs (Kevin Brosius) * * 2002/09/03 get rid of ed hashtables, rework periodic scheduling and @@ -96,6 +97,8 @@ #include /* for in_interrupt () */ #include #include "../core/hcd.h" +#include +#include /* needed by ohci-mem.c when no PCI */ #include #include @@ -642,8 +645,9 @@ remove_debug_files (ohci); ohci_mem_cleanup (ohci); if (ohci->hcca) { - pci_free_consistent (ohci->hcd.pdev, sizeof *ohci->hcca, - ohci->hcca, ohci->hcca_dma); + dma_free_coherent (ohci->hcd.self.controller, + sizeof *ohci->hcca, + ohci->hcca, ohci->hcca_dma); ohci->hcca = NULL; ohci->hcca_dma = 0; } diff -Nru a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c --- a/drivers/usb/host/ohci-mem.c Thu Feb 19 23:44:26 2004 +++ b/drivers/usb/host/ohci-mem.c Thu Feb 19 23:44:26 2004 @@ -13,7 +13,7 @@ * There's basically three types of memory: * - data used only by the HCD ... kmalloc is fine * - async and periodic schedules, shared by HC and HCD ... these - * need to use pci_pool or pci_alloc_consistent + * need to use dma_pool or dma_alloc_coherent * - driver buffers, read/written by HC ... the hcd glue or the * device driver provides us with dma addresses * @@ -45,18 +45,18 @@ static int ohci_mem_init (struct ohci_hcd *ohci) { - ohci->td_cache = pci_pool_create ("ohci_td", ohci->hcd.pdev, + ohci->td_cache = dma_pool_create ("ohci_td", ohci->hcd.self.controller, sizeof (struct td), 32 /* byte alignment */, 0 /* no page-crossing issues */); if (!ohci->td_cache) return -ENOMEM; - ohci->ed_cache = pci_pool_create ("ohci_ed", ohci->hcd.pdev, + ohci->ed_cache = dma_pool_create ("ohci_ed", ohci->hcd.self.controller, sizeof (struct ed), 16 /* byte alignment */, 0 /* no page-crossing issues */); if (!ohci->ed_cache) { - pci_pool_destroy (ohci->td_cache); + dma_pool_destroy (ohci->td_cache); return -ENOMEM; } return 0; @@ -65,11 +65,11 @@ static void ohci_mem_cleanup (struct ohci_hcd *ohci) { if (ohci->td_cache) { - pci_pool_destroy (ohci->td_cache); + dma_pool_destroy (ohci->td_cache); ohci->td_cache = 0; } if (ohci->ed_cache) { - pci_pool_destroy (ohci->ed_cache); + dma_pool_destroy (ohci->ed_cache); ohci->ed_cache = 0; } } @@ -96,7 +96,7 @@ dma_addr_t dma; struct td *td; - td = pci_pool_alloc (hc->td_cache, mem_flags, &dma); + td = dma_pool_alloc (hc->td_cache, mem_flags, &dma); if (td) { /* in case hc fetches it, make it look dead */ memset (td, 0, sizeof *td); @@ -118,7 +118,7 @@ *prev = td->td_hash; else if ((td->hwINFO & TD_DONE) != 0) ohci_dbg (hc, "no hash for td %p\n", td); - pci_pool_free (hc->td_cache, td, td->td_dma); + dma_pool_free (hc->td_cache, td, td->td_dma); } /*-------------------------------------------------------------------------*/ @@ -130,7 +130,7 @@ dma_addr_t dma; struct ed *ed; - ed = pci_pool_alloc (hc->ed_cache, mem_flags, &dma); + ed = dma_pool_alloc (hc->ed_cache, mem_flags, &dma); if (ed) { memset (ed, 0, sizeof (*ed)); INIT_LIST_HEAD (&ed->td_list); @@ -142,6 +142,6 @@ static void ed_free (struct ohci_hcd *hc, struct ed *ed) { - pci_pool_free (hc->ed_cache, ed, ed->dma); + dma_pool_free (hc->ed_cache, ed, ed->dma); } diff -Nru a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c --- a/drivers/usb/host/ohci-omap.c Thu Feb 19 23:44:26 2004 +++ b/drivers/usb/host/ohci-omap.c Thu Feb 19 23:44:26 2004 @@ -388,9 +388,7 @@ hcd->description = driver->description; hcd->irq = dev->irq[0]; hcd->regs = dev->mapbase; - hcd->pdev = OMAP_FAKE_PCIDEV; hcd->self.controller = &dev->dev; - hcd->controller = hcd->self.controller; retval = hcd_buffer_create (hcd); if (retval != 0) { @@ -494,12 +492,10 @@ struct ohci_hcd *ohci = hcd_to_ohci (hcd); int ret; - if (hcd->pdev) { - ohci->hcca = pci_alloc_consistent (hcd->pdev, - sizeof *ohci->hcca, &ohci->hcca_dma); - if (!ohci->hcca) - return -ENOMEM; - } + ohci->hcca = dma_alloc_consistent (hcd->self.controller, + sizeof *ohci->hcca, &ohci->hcca_dma); + if (!ohci->hcca) + return -ENOMEM; memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); if ((ret = ohci_mem_init (ohci)) < 0) { diff -Nru a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c --- a/drivers/usb/host/ohci-pci.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/host/ohci-pci.c Thu Feb 19 23:44:27 2004 @@ -45,17 +45,19 @@ struct ohci_hcd *ohci = hcd_to_ohci (hcd); int ret; - if (hcd->pdev) { - ohci->hcca = pci_alloc_consistent (hcd->pdev, - sizeof *ohci->hcca, &ohci->hcca_dma); - if (!ohci->hcca) - return -ENOMEM; + ohci->hcca = dma_alloc_coherent (hcd->self.controller, + sizeof *ohci->hcca, &ohci->hcca_dma, 0); + if (!ohci->hcca) + return -ENOMEM; + + if(hcd->self.controller && hcd->self.controller->bus == &pci_bus_type) { + struct pci_dev *pdev = to_pci_dev(hcd->self.controller); /* AMD 756, for most chips (early revs), corrupts register * values on read ... so enable the vendor workaround. */ - if (hcd->pdev->vendor == PCI_VENDOR_ID_AMD - && hcd->pdev->device == 0x740c) { + if (pdev->vendor == PCI_VENDOR_ID_AMD + && pdev->device == 0x740c) { ohci->flags = OHCI_QUIRK_AMD756; ohci_info (ohci, "AMD756 erratum 4 workaround\n"); } @@ -68,8 +70,8 @@ * for this chip. Evidently control and bulk lists * can get confused. (B&W G3 models, and ...) */ - else if (hcd->pdev->vendor == PCI_VENDOR_ID_OPTI - && hcd->pdev->device == 0xc861) { + else if (pdev->vendor == PCI_VENDOR_ID_OPTI + && pdev->device == 0xc861) { ohci_info (ohci, "WARNING: OPTi workarounds unavailable\n"); } @@ -78,12 +80,11 @@ * identify the USB (fn2). This quirk might apply to more or * even all NSC stuff. */ - else if (hcd->pdev->vendor == PCI_VENDOR_ID_NS) { - struct pci_dev *b, *hc; + else if (pdev->vendor == PCI_VENDOR_ID_NS) { + struct pci_dev *b; - hc = hcd->pdev; - b = pci_find_slot (hc->bus->number, - PCI_DEVFN (PCI_SLOT (hc->devfn), 1)); + b = pci_find_slot (pdev->bus->number, + PCI_DEVFN (PCI_SLOT (pdev->devfn), 1)); if (b && b->device == PCI_DEVICE_ID_NS_87560_LIO && b->vendor == PCI_VENDOR_ID_NS) { ohci->flags |= OHCI_QUIRK_SUPERIO; @@ -145,7 +146,7 @@ #ifdef CONFIG_PMAC_PBOOK if (_machine == _MACH_Pmac) - disable_irq (hcd->pdev->irq); + disable_irq ((to_pci_dev(hcd->self.controller))->irq); /* else, 2.4 assumes shared irqs -- don't disable */ #endif @@ -179,15 +180,17 @@ * memory during sleep. We disable its bus master bit during * suspend */ - pci_read_config_word (hcd->pdev, PCI_COMMAND, &cmd); + pci_read_config_word (to_pci_dev(hcd->self.controller), PCI_COMMAND, + &cmd); cmd &= ~PCI_COMMAND_MASTER; - pci_write_config_word (hcd->pdev, PCI_COMMAND, cmd); + pci_write_config_word (to_pci_dev(hcd->self.controller), PCI_COMMAND, + cmd); #ifdef CONFIG_PMAC_PBOOK { struct device_node *of_node; /* Disable USB PAD & cell clock */ - of_node = pci_device_to_OF_node (hcd->pdev); + of_node = pci_device_to_OF_node (to_pci_dev(hcd->self.controller)); if (of_node) pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0); } @@ -207,7 +210,7 @@ struct device_node *of_node; /* Re-enable USB PAD & cell clock */ - of_node = pci_device_to_OF_node (hcd->pdev); + of_node = pci_device_to_OF_node (to_pci_dev(hcd->self.controller)); if (of_node) pmac_call_feature (PMAC_FTR_USB_ENABLE, of_node, 0, 1); } @@ -222,7 +225,7 @@ #endif /* Re-enable bus mastering */ - pci_set_master (ohci->hcd.pdev); + pci_set_master (to_pci_dev(ohci->hcd.self.controller)); switch (temp) { @@ -282,7 +285,7 @@ #ifdef CONFIG_PMAC_PBOOK if (_machine == _MACH_Pmac) - enable_irq (hcd->pdev->irq); + enable_irq (to_pci_dev(hcd->self.controller)->irq); #endif /* Check for a pending done list */ diff -Nru a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c --- a/drivers/usb/host/ohci-q.c Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/host/ohci-q.c Thu Feb 19 23:44:28 2004 @@ -375,7 +375,7 @@ if (!(ed = dev->ep [ep])) { struct td *td; - ed = ed_alloc (ohci, SLAB_ATOMIC); + ed = ed_alloc (ohci, GFP_ATOMIC); if (!ed) { /* out of memory */ goto done; @@ -383,7 +383,7 @@ dev->ep [ep] = ed; /* dummy td; end of td list for ed */ - td = td_alloc (ohci, SLAB_ATOMIC); + td = td_alloc (ohci, GFP_ATOMIC); if (!td) { /* out of memory */ ed_free (ohci, ed); diff -Nru a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c --- a/drivers/usb/host/ohci-sa1111.c Thu Feb 19 23:44:25 2004 +++ b/drivers/usb/host/ohci-sa1111.c Thu Feb 19 23:44:25 2004 @@ -167,9 +167,7 @@ hcd->description = driver->description; hcd->irq = dev->irq[1]; hcd->regs = dev->mapbase; - hcd->pdev = SA1111_FAKE_PCIDEV; hcd->self.controller = &dev->dev; - hcd->controller = hcd->self.controller; retval = hcd_buffer_create (hcd); if (retval != 0) { @@ -270,14 +268,12 @@ struct ohci_hcd *ohci = hcd_to_ohci (hcd); int ret; - if (hcd->pdev) { - ohci->hcca = pci_alloc_consistent (hcd->pdev, - sizeof *ohci->hcca, &ohci->hcca_dma); - if (!ohci->hcca) - return -ENOMEM; - } - - memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); + ohci->hcca = dma_alloc_coherent (hcd->self.controller, + sizeof *ohci->hcca, &ohci->hcca_dma, 0); + if (!ohci->hcca) + return -ENOMEM; + + memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); if ((ret = ohci_mem_init (ohci)) < 0) { ohci_stop (hcd); return ret; diff -Nru a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h --- a/drivers/usb/host/ohci.h Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/host/ohci.h Thu Feb 19 23:44:28 2004 @@ -361,8 +361,8 @@ /* * memory management for queue data structures */ - struct pci_pool *td_cache; - struct pci_pool *ed_cache; + struct dma_pool *td_cache; + struct dma_pool *ed_cache; struct td *td_hash [TD_HASH_SIZE]; /* @@ -391,13 +391,13 @@ #endif /* DEBUG */ #define ohci_dbg(ohci, fmt, args...) \ - dev_dbg ((ohci)->hcd.controller , fmt , ## args ) + dev_dbg ((ohci)->hcd.self.controller , fmt , ## args ) #define ohci_err(ohci, fmt, args...) \ - dev_err ((ohci)->hcd.controller , fmt , ## args ) + dev_err ((ohci)->hcd.self.controller , fmt , ## args ) #define ohci_info(ohci, fmt, args...) \ - dev_info ((ohci)->hcd.controller , fmt , ## args ) + dev_info ((ohci)->hcd.self.controller , fmt , ## args ) #define ohci_warn(ohci, fmt, args...) \ - dev_warn ((ohci)->hcd.controller , fmt , ## args ) + dev_warn ((ohci)->hcd.self.controller , fmt , ## args ) #ifdef OHCI_VERBOSE_DEBUG # define ohci_vdbg ohci_dbg diff -Nru a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c --- a/drivers/usb/host/uhci-debug.c Thu Feb 19 23:44:23 2004 +++ b/drivers/usb/host/uhci-debug.c Thu Feb 19 23:44:23 2004 @@ -225,20 +225,22 @@ char *out = buf; /* Try to make sure there's enough memory */ - if (len < 80) + if (len < 160) return 0; - out += sprintf(out, " stat%d = %04x %s%s%s%s%s%s%s%s\n", + out += sprintf(out, " stat%d = %04x %s%s%s%s%s%s%s%s%s%s\n", port, status, - (status & USBPORTSC_SUSP) ? "PortSuspend " : "", - (status & USBPORTSC_PR) ? "PortReset " : "", - (status & USBPORTSC_LSDA) ? "LowSpeed " : "", - (status & USBPORTSC_RD) ? "ResumeDetect " : "", - (status & USBPORTSC_PEC) ? "EnableChange " : "", - (status & USBPORTSC_PE) ? "PortEnabled " : "", - (status & USBPORTSC_CSC) ? "ConnectChange " : "", - (status & USBPORTSC_CCS) ? "PortConnected " : ""); + (status & USBPORTSC_SUSP) ? " Suspend" : "", + (status & USBPORTSC_OCC) ? " OverCurrentChange" : "", + (status & USBPORTSC_OC) ? " OverCurrent" : "", + (status & USBPORTSC_PR) ? " Reset" : "", + (status & USBPORTSC_LSDA) ? " LowSpeed" : "", + (status & USBPORTSC_RD) ? " ResumeDetect" : "", + (status & USBPORTSC_PEC) ? " EnableChange" : "", + (status & USBPORTSC_PE) ? " Enabled" : "", + (status & USBPORTSC_CSC) ? " ConnectChange" : "", + (status & USBPORTSC_CCS) ? " Connected" : ""); return out - buf; } @@ -321,8 +323,8 @@ out += sprintf(out, "%s", (urbp->fsbr ? "FSBR " : "")); out += sprintf(out, "%s", (urbp->fsbr_timeout ? "FSBR_TO " : "")); - if (urbp->status != -EINPROGRESS) - out += sprintf(out, "Status=%d ", urbp->status); + if (urbp->urb->status != -EINPROGRESS) + out += sprintf(out, "Status=%d ", urbp->urb->status); //out += sprintf(out, "Inserttime=%lx ",urbp->inserttime); //out += sprintf(out, "FSBRtime=%lx ",urbp->fsbrtime); @@ -402,7 +404,7 @@ head = &uhci->complete_list; tmp = head->next; while (tmp != head) { - struct urb_priv *urbp = list_entry(tmp, struct urb_priv, complete_list); + struct urb_priv *urbp = list_entry(tmp, struct urb_priv, urb_list); out += sprintf(out, " %d: ", ++count); out += uhci_show_urbp(uhci, urbp, out, len - (out - buf)); @@ -418,7 +420,7 @@ { unsigned long flags; char *out = buf; - int i; + int i, j; struct uhci_qh *qh; struct uhci_td *td; struct list_head *tmp, *head; @@ -473,10 +475,11 @@ continue; } + j = (i < 7) ? 7 : i+1; /* Next skeleton */ if (list_empty(&qh->list)) { if (i < UHCI_NUM_SKELQH - 1) { if (qh->link != - (cpu_to_le32(uhci->skelqh[i + 1]->dma_handle) | UHCI_PTR_QH)) { + (cpu_to_le32(uhci->skelqh[j]->dma_handle) | UHCI_PTR_QH)) { show_qh_name(); out += sprintf(out, " skeleton QH not linked to next skeleton QH!\n"); } @@ -500,7 +503,7 @@ if (i < UHCI_NUM_SKELQH - 1) { if (qh->link != - (cpu_to_le32(uhci->skelqh[i + 1]->dma_handle) | UHCI_PTR_QH)) + (cpu_to_le32(uhci->skelqh[j]->dma_handle) | UHCI_PTR_QH)) out += sprintf(out, " last QH not linked to next skeleton!\n"); } } diff -Nru a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c --- a/drivers/usb/host/uhci-hcd.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/host/uhci-hcd.c Thu Feb 19 23:44:27 2004 @@ -13,6 +13,7 @@ * (C) Copyright 2000 Yggdrasil Computing, Inc. (port of new PCI interface * support from usb-ohci.c by Adam Richter, adam@yggdrasil.com). * (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c) + * (C) Copyright 2004 Alan Stern, stern@rowland.harvard.edu * * Intel documents this fairly well, and as far as I know there * are no royalties or anything like that, but even so there are @@ -27,6 +28,11 @@ */ #include +#ifdef CONFIG_USB_DEBUG +#define DEBUG +#else +#undef DEBUG +#endif #include #include #include @@ -41,13 +47,12 @@ #include #include #include -#ifdef CONFIG_USB_DEBUG -#define DEBUG -#else -#undef DEBUG -#endif +#include +#include +#include #include +#include #include #include #include @@ -56,13 +61,13 @@ #include "../core/hcd.h" #include "uhci-hcd.h" -#include - /* * Version Information */ -#define DRIVER_VERSION "v2.1" -#define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber" +#define DRIVER_VERSION "v2.2" +#define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \ +Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \ +Alan Stern" #define DRIVER_DESC "USB Universal Host Controller Interface driver" /* @@ -80,7 +85,7 @@ MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Debug level"); static char *errbuf; -#define ERRBUF_LEN (PAGE_SIZE * 8) +#define ERRBUF_LEN (32 * 1024) #include "uhci-hub.c" #include "uhci-debug.c" @@ -121,21 +126,17 @@ static inline void uhci_clear_next_interrupt(struct uhci_hcd *uhci) { - unsigned long flags; - - spin_lock_irqsave(&uhci->frame_list_lock, flags); + spin_lock(&uhci->frame_list_lock); uhci->term_td->status &= ~cpu_to_le32(TD_CTRL_IOC); - spin_unlock_irqrestore(&uhci->frame_list_lock, flags); + spin_unlock(&uhci->frame_list_lock); } -static inline void uhci_add_complete(struct uhci_hcd *uhci, struct urb *urb) +static inline void uhci_moveto_complete(struct uhci_hcd *uhci, + struct urb_priv *urbp) { - struct urb_priv *urbp = (struct urb_priv *)urb->hcpriv; - unsigned long flags; - - spin_lock_irqsave(&uhci->complete_list_lock, flags); - list_add_tail(&urbp->complete_list, &uhci->complete_list); - spin_unlock_irqrestore(&uhci->complete_list_lock, flags); + spin_lock(&uhci->complete_list_lock); + list_move_tail(&urbp->urb_list, &uhci->complete_list); + spin_unlock(&uhci->complete_list_lock); } static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci, struct usb_device *dev) @@ -143,7 +144,7 @@ dma_addr_t dma_handle; struct uhci_td *td; - td = pci_pool_alloc(uhci->td_pool, GFP_ATOMIC, &dma_handle); + td = dma_pool_alloc(uhci->td_pool, GFP_ATOMIC, &dma_handle); if (!td) return NULL; @@ -286,16 +287,16 @@ static void uhci_free_td(struct uhci_hcd *uhci, struct uhci_td *td) { if (!list_empty(&td->list)) - dbg("td %p is still in list!", td); + dev_warn(uhci_dev(uhci), "td %p still in list!\n", td); if (!list_empty(&td->remove_list)) - dbg("td %p still in remove_list!", td); + dev_warn(uhci_dev(uhci), "td %p still in remove_list!\n", td); if (!list_empty(&td->fl_list)) - dbg("td %p is still in fl_list!", td); + dev_warn(uhci_dev(uhci), "td %p still in fl_list!\n", td); if (td->dev) usb_put_dev(td->dev); - pci_pool_free(uhci->td_pool, td, td->dma_handle); + dma_pool_free(uhci->td_pool, td, td->dma_handle); } static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci, struct usb_device *dev) @@ -303,7 +304,7 @@ dma_addr_t dma_handle; struct uhci_qh *qh; - qh = pci_pool_alloc(uhci->qh_pool, GFP_ATOMIC, &dma_handle); + qh = dma_pool_alloc(uhci->qh_pool, GFP_ATOMIC, &dma_handle); if (!qh) return NULL; @@ -326,14 +327,14 @@ static void uhci_free_qh(struct uhci_hcd *uhci, struct uhci_qh *qh) { if (!list_empty(&qh->list)) - dbg("qh %p list not empty!", qh); + dev_warn(uhci_dev(uhci), "qh %p list not empty!\n", qh); if (!list_empty(&qh->remove_list)) - dbg("qh %p still in remove_list!", qh); + dev_warn(uhci_dev(uhci), "qh %p still in remove_list!\n", qh); if (qh->dev) usb_put_dev(qh->dev); - pci_pool_free(uhci->qh_pool, qh, qh->dma_handle); + dma_pool_free(uhci->qh_pool, qh, qh->dma_handle); } /* @@ -658,10 +659,8 @@ struct urb_priv *urbp; urbp = kmem_cache_alloc(uhci_up_cachep, SLAB_ATOMIC); - if (!urbp) { - err("uhci_alloc_urb_priv: couldn't allocate memory for urb_priv\n"); + if (!urbp) return NULL; - } memset((void *)urbp, 0, sizeof(*urbp)); @@ -671,7 +670,6 @@ INIT_LIST_HEAD(&urbp->td_list); INIT_LIST_HEAD(&urbp->queue_list); - INIT_LIST_HEAD(&urbp->complete_list); INIT_LIST_HEAD(&urbp->urb_list); list_add_tail(&urbp->urb_list, &uhci->urb_list); @@ -720,10 +718,8 @@ return; if (!list_empty(&urbp->urb_list)) - warn("uhci_destroy_urb_priv: urb %p still on uhci->urb_list or uhci->remove_list", urb); - - if (!list_empty(&urbp->complete_list)) - warn("uhci_destroy_urb_priv: urb %p still on uhci->complete_list", urb); + dev_warn(uhci_dev(uhci), "urb %p still on uhci->urb_list " + "or uhci->remove_list!\n", urb); spin_lock_irqsave(&uhci->td_remove_list_lock, flags); @@ -913,7 +909,7 @@ uhci_insert_tds_in_qh(qh, urb, UHCI_PTR_BREADTH); - /* Low speed transfers get a different queue, and won't hog the bus */ + /* Low-speed transfers get a different queue, and won't hog the bus */ if (urb->dev->speed == USB_SPEED_LOW) skelqh = uhci->skel_ls_control_qh; else { @@ -961,17 +957,15 @@ } urbp->qh = uhci_alloc_qh(uhci, urb->dev); - if (!urbp->qh) { - err("unable to allocate new QH for control retrigger"); + if (!urbp->qh) return -ENOMEM; - } urbp->qh->urbp = urbp; /* One TD, who cares about Breadth first? */ uhci_insert_tds_in_qh(urbp->qh, urb, UHCI_PTR_DEPTH); - /* Low speed transfers get a different queue */ + /* Low-speed transfers get a different queue */ if (urb->dev->speed == USB_SPEED_LOW) uhci_insert_qh(uhci, uhci->skel_ls_control_qh, urb); else @@ -1073,7 +1067,8 @@ err: if ((debug == 1 && ret != -EPIPE) || debug > 1) { /* Some debugging code */ - dbg("uhci_result_control() failed with status %x", status); + dev_dbg(uhci_dev(uhci), "%s: failed with status %x\n", + __FUNCTION__, status); if (errbuf) { /* Print the chain for debugging purposes */ @@ -1238,7 +1233,8 @@ #if 0 if ((debug == 1 && ret != -EPIPE) || debug > 1) { /* Some debugging code */ - dbg("uhci_result_common() failed with status %x", status); + dev_dbg(uhci_dev(uhci), "%s: failed with status %x\n", + __FUNCTION__, status); if (errbuf) { /* Print the chain for debugging purposes */ @@ -1255,7 +1251,7 @@ { int ret; - /* Can't have low speed bulk transfers */ + /* Can't have low-speed bulk transfers */ if (urb->dev->speed == USB_SPEED_LOW) return -EINVAL; @@ -1462,11 +1458,14 @@ spin_lock_irqsave(&uhci->urb_list_lock, flags); + if (urb->status != -EINPROGRESS) /* URB already unlinked! */ + goto out; + eurb = uhci_find_urb_ep(uhci, urb); if (!uhci_alloc_urb_priv(uhci, urb)) { - spin_unlock_irqrestore(&uhci->urb_list_lock, flags); - return -ENOMEM; + ret = -ENOMEM; + goto out; } switch (usb_pipetype(urb->pipe)) { @@ -1514,10 +1513,11 @@ return ret; } + ret = 0; +out: spin_unlock_irqrestore(&uhci->urb_list_lock, flags); - - return 0; + return ret; } /* @@ -1527,18 +1527,15 @@ */ static void uhci_transfer_result(struct uhci_hcd *uhci, struct urb *urb) { - int ret = -EINVAL; - unsigned long flags; + int ret = -EINPROGRESS; struct urb_priv *urbp; - spin_lock_irqsave(&urb->lock, flags); + spin_lock(&urb->lock); urbp = (struct urb_priv *)urb->hcpriv; - if (urb->status != -EINPROGRESS) { - info("uhci_transfer_result: called for URB %p not in flight?", urb); + if (urb->status != -EINPROGRESS) /* URB already dequeued */ goto out; - } switch (usb_pipetype(urb->pipe)) { case PIPE_CONTROL: @@ -1555,10 +1552,9 @@ break; } - urbp->status = ret; - if (ret == -EINPROGRESS) goto out; + urb->status = ret; switch (usb_pipetype(urb->pipe)) { case PIPE_CONTROL: @@ -1585,17 +1581,16 @@ uhci_unlink_generic(uhci, urb); break; default: - info("uhci_transfer_result: unknown pipe type %d for urb %p\n", - usb_pipetype(urb->pipe), urb); + dev_info(uhci_dev(uhci), "%s: unknown pipe type %d " + "for urb %p\n", + __FUNCTION__, usb_pipetype(urb->pipe), urb); } - /* Remove it from uhci->urb_list */ - list_del_init(&urbp->urb_list); - - uhci_add_complete(uhci, urb); + /* Move it from uhci->urb_list to uhci->complete_list */ + uhci_moveto_complete(uhci, urbp); out: - spin_unlock_irqrestore(&urb->lock, flags); + spin_unlock(&urb->lock); } /* @@ -1607,10 +1602,6 @@ struct urb_priv *urbp = (struct urb_priv *)urb->hcpriv; int prevactive = 1; - /* We can get called when urbp allocation fails, so check */ - if (!urbp) - return; - uhci_dec_fsbr(uhci, urb); /* Safe since it checks */ /* @@ -1660,13 +1651,6 @@ unsigned long flags; struct urb_priv *urbp = urb->hcpriv; - /* If this is an interrupt URB that is being killed in urb->complete, */ - /* then just set its status and return */ - if (!urbp) { - urb->status = -ECONNRESET; - return 0; - } - spin_lock_irqsave(&uhci->urb_list_lock, flags); list_del_init(&urbp->urb_list); @@ -1678,7 +1662,7 @@ /* If we're the first, set the next interrupt bit */ if (list_empty(&uhci->urb_remove_list)) uhci_set_next_interrupt(uhci); - list_add(&urbp->urb_list, &uhci->urb_remove_list); + list_add_tail(&urbp->urb_list, &uhci->urb_remove_list); spin_unlock(&uhci->urb_remove_list_lock); spin_unlock_irqrestore(&uhci->urb_list_lock, flags); @@ -1805,9 +1789,8 @@ static void uhci_free_pending_qhs(struct uhci_hcd *uhci) { struct list_head *tmp, *head; - unsigned long flags; - spin_lock_irqsave(&uhci->qh_remove_list_lock, flags); + spin_lock(&uhci->qh_remove_list_lock); head = &uhci->qh_remove_list; tmp = head->next; while (tmp != head) { @@ -1819,15 +1802,14 @@ uhci_free_qh(uhci, qh); } - spin_unlock_irqrestore(&uhci->qh_remove_list_lock, flags); + spin_unlock(&uhci->qh_remove_list_lock); } static void uhci_free_pending_tds(struct uhci_hcd *uhci) { struct list_head *tmp, *head; - unsigned long flags; - spin_lock_irqsave(&uhci->td_remove_list_lock, flags); + spin_lock(&uhci->td_remove_list_lock); head = &uhci->td_remove_list; tmp = head->next; while (tmp != head) { @@ -1839,23 +1821,16 @@ uhci_free_td(uhci, td); } - spin_unlock_irqrestore(&uhci->td_remove_list_lock, flags); + spin_unlock(&uhci->td_remove_list_lock); } static void uhci_finish_urb(struct usb_hcd *hcd, struct urb *urb, struct pt_regs *regs) { - struct urb_priv *urbp = (struct urb_priv *)urb->hcpriv; struct uhci_hcd *uhci = hcd_to_uhci(hcd); - int status; - unsigned long flags; - spin_lock_irqsave(&urb->lock, flags); - status = urbp->status; + spin_lock(&urb->lock); uhci_destroy_urb_priv(uhci, urb); - - if (urb->status != -ENOENT && urb->status != -ECONNRESET) - urb->status = status; - spin_unlock_irqrestore(&urb->lock, flags); + spin_unlock(&urb->lock); usb_hcd_giveback_urb(hcd, urb, regs); } @@ -1864,48 +1839,40 @@ { struct uhci_hcd *uhci = hcd_to_uhci(hcd); struct list_head *tmp, *head; - unsigned long flags; - spin_lock_irqsave(&uhci->complete_list_lock, flags); + spin_lock(&uhci->complete_list_lock); head = &uhci->complete_list; tmp = head->next; while (tmp != head) { - struct urb_priv *urbp = list_entry(tmp, struct urb_priv, complete_list); + struct urb_priv *urbp = list_entry(tmp, struct urb_priv, urb_list); struct urb *urb = urbp->urb; - list_del_init(&urbp->complete_list); - spin_unlock_irqrestore(&uhci->complete_list_lock, flags); + list_del_init(&urbp->urb_list); + spin_unlock(&uhci->complete_list_lock); uhci_finish_urb(hcd, urb, regs); - spin_lock_irqsave(&uhci->complete_list_lock, flags); + spin_lock(&uhci->complete_list_lock); head = &uhci->complete_list; tmp = head->next; } - spin_unlock_irqrestore(&uhci->complete_list_lock, flags); + spin_unlock(&uhci->complete_list_lock); } -static void uhci_remove_pending_qhs(struct uhci_hcd *uhci) +static void uhci_remove_pending_urbps(struct uhci_hcd *uhci) { struct list_head *tmp, *head; - unsigned long flags; - spin_lock_irqsave(&uhci->urb_remove_list_lock, flags); + 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); - struct urb *urb = urbp->urb; tmp = tmp->next; - - list_del_init(&urbp->urb_list); - - urbp->status = urb->status = -ECONNRESET; - - uhci_add_complete(uhci, urb); + uhci_moveto_complete(uhci, urbp); } - spin_unlock_irqrestore(&uhci->urb_remove_list_lock, flags); + spin_unlock(&uhci->urb_remove_list_lock); } static irqreturn_t uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs) @@ -1917,20 +1884,24 @@ /* * Read the interrupt status, and write it back to clear the - * interrupt cause + * interrupt cause. Contrary to the UHCI specification, the + * "HC Halted" status bit is persistent: it is RO, not R/WC. */ status = inw(io_addr + USBSTS); - if (!status) /* shared interrupt, not mine */ + if (!(status & ~USBSTS_HCH)) /* shared interrupt, not mine */ return IRQ_NONE; outw(status, io_addr + USBSTS); /* Clear it */ if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) { if (status & USBSTS_HSE) - err("%x: host system error, PCI problems?", io_addr); + dev_err(uhci_dev(uhci), "host system error, " + "PCI problems?\n"); if (status & USBSTS_HCPE) - err("%x: host controller process error. something bad happened", io_addr); + dev_err(uhci_dev(uhci), "host controller process " + "error, something bad happened!\n"); if ((status & USBSTS_HCH) && uhci->state > 0) { - err("%x: host controller halted. very bad", io_addr); + dev_err(uhci_dev(uhci), "host controller halted, " + "very bad!\n"); /* FIXME: Reset the controller, fix the offending TD */ } } @@ -1942,7 +1913,7 @@ uhci_free_pending_tds(uhci); - uhci_remove_pending_qhs(uhci); + uhci_remove_pending_urbps(uhci); uhci_clear_next_interrupt(uhci); @@ -1986,7 +1957,7 @@ { unsigned int io_addr = uhci->io_addr; - dbg("%x: suspend_hc", io_addr); + dev_dbg(uhci_dev(uhci), "%s\n", __FUNCTION__); uhci->state = UHCI_SUSPENDED; uhci->resume_detect = 0; outw(USBCMD_EGSM, io_addr + USBCMD); @@ -1998,7 +1969,7 @@ switch (uhci->state) { case UHCI_SUSPENDED: /* Start the resume */ - dbg("%x: wakeup_hc", io_addr); + dev_dbg(uhci_dev(uhci), "%s\n", __FUNCTION__); /* Global resume for >= 20ms */ outw(USBCMD_FGR | USBCMD_EGSM, io_addr + USBCMD); @@ -2049,7 +2020,7 @@ unsigned int io_addr = uhci->io_addr; int i; - if (!uhci->hcd.pdev || uhci->hcd.pdev->vendor != PCI_VENDOR_ID_INTEL) + if (to_pci_dev(uhci_dev(uhci))->vendor != PCI_VENDOR_ID_INTEL) return 1; /* Some of Intel's USB controllers have a bug that causes false @@ -2123,7 +2094,7 @@ outw(USBCMD_HCRESET, io_addr + USBCMD); while (inw(io_addr + USBCMD) & USBCMD_HCRESET) { if (!--timeout) { - printk(KERN_ERR "uhci: USBCMD_HCRESET timed out!\n"); + dev_err(uhci_dev(uhci), "USBCMD_HCRESET timed out!\n"); break; } } @@ -2163,17 +2134,18 @@ } if (uhci->qh_pool) { - pci_pool_destroy(uhci->qh_pool); + dma_pool_destroy(uhci->qh_pool); uhci->qh_pool = NULL; } if (uhci->td_pool) { - pci_pool_destroy(uhci->td_pool); + dma_pool_destroy(uhci->td_pool); uhci->td_pool = NULL; } if (uhci->fl) { - pci_free_consistent(uhci->hcd.pdev, sizeof(*uhci->fl), uhci->fl, uhci->fl->dma_handle); + dma_free_coherent(uhci_dev(uhci), sizeof(*uhci->fl), + uhci->fl, uhci->fl->dma_handle); uhci->fl = NULL; } @@ -2198,7 +2170,8 @@ * interrupts from any previous setup. */ reset_hc(uhci); - pci_write_config_word(hcd->pdev, USBLEGSUP, USBLEGSUP_DEFAULT); + pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, + USBLEGSUP_DEFAULT); return 0; } @@ -2213,10 +2186,10 @@ * of the queues. We don't do that here, because * we'll create the actual TD entries on demand. * - The first queue is the interrupt queue. - * - The second queue is the control queue, split into low and high speed + * - The second queue is the control queue, split into low- and full-speed * - The third queue is bulk queue. * - The fourth queue is the bandwidth reclamation queue, which loops back - * to the high speed control queue. + * to the full-speed control queue. */ static int uhci_start(struct usb_hcd *hcd) { @@ -2230,12 +2203,12 @@ struct proc_dir_entry *ent; #endif - io_size = pci_resource_len(hcd->pdev, hcd->region); + io_size = pci_resource_len(to_pci_dev(uhci_dev(uhci)), hcd->region); #ifdef CONFIG_PROC_FS ent = create_proc_entry(hcd->self.bus_name, S_IFREG|S_IRUGO|S_IWUSR, uhci_proc_root); if (!ent) { - err("couldn't create uhci proc entry"); + dev_err(uhci_dev(uhci), "couldn't create uhci proc entry\n"); retval = -ENOMEM; goto err_create_proc_entry; } @@ -2266,9 +2239,11 @@ spin_lock_init(&uhci->frame_list_lock); - uhci->fl = pci_alloc_consistent(hcd->pdev, sizeof(*uhci->fl), &dma_handle); + uhci->fl = dma_alloc_coherent(uhci_dev(uhci), sizeof(*uhci->fl), + &dma_handle, 0); if (!uhci->fl) { - err("unable to allocate consistent memory for frame list"); + dev_err(uhci_dev(uhci), "unable to allocate " + "consistent memory for frame list\n"); goto err_alloc_fl; } @@ -2276,17 +2251,17 @@ uhci->fl->dma_handle = dma_handle; - uhci->td_pool = pci_pool_create("uhci_td", hcd->pdev, - sizeof(struct uhci_td), 16, 0); + uhci->td_pool = dma_pool_create("uhci_td", uhci_dev(uhci), + sizeof(struct uhci_td), 16, 0); if (!uhci->td_pool) { - err("unable to create td pci_pool"); + dev_err(uhci_dev(uhci), "unable to create td dma_pool\n"); goto err_create_td_pool; } - uhci->qh_pool = pci_pool_create("uhci_qh", hcd->pdev, - sizeof(struct uhci_qh), 16, 0); + uhci->qh_pool = dma_pool_create("uhci_qh", uhci_dev(uhci), + sizeof(struct uhci_qh), 16, 0); if (!uhci->qh_pool) { - err("unable to create qh pci_pool"); + dev_err(uhci_dev(uhci), "unable to create qh dma_pool\n"); goto err_create_qh_pool; } @@ -2304,12 +2279,13 @@ break; } if (debug) - info("detected %d ports", port); + dev_info(uhci_dev(uhci), "detected %d ports\n", port); /* This is experimental so anything less than 2 or greater than 8 is */ /* something weird and we'll ignore it */ - if (port < 2 || port > 8) { - info("port count misdetected? forcing to 2 ports"); + if (port < 2 || port > UHCI_RH_MAXCHILD) { + dev_info(uhci_dev(uhci), "port count misdetected? " + "forcing to 2 ports\n"); port = 2; } @@ -2317,35 +2293,36 @@ hcd->self.root_hub = udev = usb_alloc_dev(NULL, &hcd->self, 0); if (!udev) { - err("unable to allocate root hub"); + dev_err(uhci_dev(uhci), "unable to allocate root hub\n"); goto err_alloc_root_hub; } uhci->term_td = uhci_alloc_td(uhci, udev); if (!uhci->term_td) { - err("unable to allocate terminating TD"); + dev_err(uhci_dev(uhci), "unable to allocate terminating TD\n"); goto err_alloc_term_td; } for (i = 0; i < UHCI_NUM_SKELQH; i++) { uhci->skelqh[i] = uhci_alloc_qh(uhci, udev); if (!uhci->skelqh[i]) { - err("unable to allocate QH %d", i); + dev_err(uhci_dev(uhci), "unable to allocate QH\n"); goto err_alloc_skelqh; } } /* - * 8 Interrupt queues; link int2 to int1, int4 to int2, etc + * 8 Interrupt queues; link all higher int queues to int1, * then link int1 to control and control to bulk */ - uhci->skel_int128_qh->link = cpu_to_le32(uhci->skel_int64_qh->dma_handle) | UHCI_PTR_QH; - uhci->skel_int64_qh->link = cpu_to_le32(uhci->skel_int32_qh->dma_handle) | UHCI_PTR_QH; - uhci->skel_int32_qh->link = cpu_to_le32(uhci->skel_int16_qh->dma_handle) | UHCI_PTR_QH; - uhci->skel_int16_qh->link = cpu_to_le32(uhci->skel_int8_qh->dma_handle) | UHCI_PTR_QH; - uhci->skel_int8_qh->link = cpu_to_le32(uhci->skel_int4_qh->dma_handle) | UHCI_PTR_QH; - uhci->skel_int4_qh->link = cpu_to_le32(uhci->skel_int2_qh->dma_handle) | UHCI_PTR_QH; - uhci->skel_int2_qh->link = cpu_to_le32(uhci->skel_int1_qh->dma_handle) | UHCI_PTR_QH; + uhci->skel_int128_qh->link = + uhci->skel_int64_qh->link = + uhci->skel_int32_qh->link = + uhci->skel_int16_qh->link = + uhci->skel_int8_qh->link = + uhci->skel_int4_qh->link = + uhci->skel_int2_qh->link = + cpu_to_le32(uhci->skel_int1_qh->dma_handle) | UHCI_PTR_QH; uhci->skel_int1_qh->link = cpu_to_le32(uhci->skel_ls_control_qh->dma_handle) | UHCI_PTR_QH; uhci->skel_ls_control_qh->link = cpu_to_le32(uhci->skel_hs_control_qh->dma_handle) | UHCI_PTR_QH; @@ -2361,39 +2338,33 @@ uhci->skel_term_qh->element = cpu_to_le32(uhci->term_td->dma_handle); /* - * Fill the frame list: make all entries point to - * the proper interrupt queue. + * Fill the frame list: make all entries point to the proper + * interrupt queue. * - * This is probably silly, but it's a simple way to - * scatter the interrupt queues in a way that gives - * us a reasonable dynamic range for irq latencies. + * The interrupt queues will be interleaved as evenly as possible. + * There's not much to be done about period-1 interrupts; they have + * to occur in every frame. But we can schedule period-2 interrupts + * in odd-numbered frames, period-4 interrupts in frames congruent + * to 2 (mod 4), and so on. This way each frame only has two + * interrupt QHs, which will help spread out bandwidth utilization. */ for (i = 0; i < UHCI_NUMFRAMES; i++) { - int irq = 0; + int irq; - if (i & 1) { - irq++; - if (i & 2) { - irq++; - if (i & 4) { - irq++; - if (i & 8) { - irq++; - if (i & 16) { - irq++; - if (i & 32) { - irq++; - if (i & 64) - irq++; - } - } - } - } - } - } + /* + * ffs (Find First bit Set) does exactly what we need: + * 1,3,5,... => ffs = 0 => use skel_int2_qh = skelqh[6], + * 2,6,10,... => ffs = 1 => use skel_int4_qh = skelqh[5], etc. + * ffs > 6 => not on any high-period queue, so use + * skel_int1_qh = skelqh[7]. + * Add UHCI_NUMFRAMES to insure at least one bit is set. + */ + irq = 6 - (int) __ffs(i + UHCI_NUMFRAMES); + if (irq < 0) + irq = 7; /* Only place we don't use the frame list routines */ - uhci->fl->frame[i] = cpu_to_le32(uhci->skelqh[7 - irq]->dma_handle); + uhci->fl->frame[i] = cpu_to_le32(uhci->skelqh[irq]->dma_handle); } start_hc(uhci); @@ -2402,8 +2373,8 @@ udev->speed = USB_SPEED_FULL; - if (usb_register_root_hub(udev, &hcd->pdev->dev) != 0) { - err("unable to start root hub"); + if (usb_register_root_hub(udev, uhci_dev(uhci)) != 0) { + dev_err(uhci_dev(uhci), "unable to start root hub\n"); retval = -ENOMEM; goto err_start_root_hub; } @@ -2433,15 +2404,16 @@ hcd->self.root_hub = NULL; err_alloc_root_hub: - pci_pool_destroy(uhci->qh_pool); + dma_pool_destroy(uhci->qh_pool); uhci->qh_pool = NULL; err_create_qh_pool: - pci_pool_destroy(uhci->td_pool); + dma_pool_destroy(uhci->td_pool); uhci->td_pool = NULL; err_create_td_pool: - pci_free_consistent(hcd->pdev, sizeof(*uhci->fl), uhci->fl, uhci->fl->dma_handle); + dma_free_coherent(uhci_dev(uhci), sizeof(*uhci->fl), + uhci->fl, uhci->fl->dma_handle); uhci->fl = NULL; err_alloc_fl: @@ -2458,6 +2430,7 @@ static void uhci_stop(struct usb_hcd *hcd) { struct uhci_hcd *uhci = hcd_to_uhci(hcd); + unsigned long flags; del_timer_sync(&uhci->stall_timer); @@ -2465,15 +2438,17 @@ * At this point, we're guaranteed that no new connects can be made * to this bus since there are no more parents */ + local_irq_save(flags); uhci_free_pending_qhs(uhci); uhci_free_pending_tds(uhci); - uhci_remove_pending_qhs(uhci); + uhci_remove_pending_urbps(uhci); reset_hc(uhci); uhci_free_pending_qhs(uhci); uhci_free_pending_tds(uhci); - + local_irq_restore(flags); + release_uhci(uhci); } @@ -2494,7 +2469,7 @@ { struct uhci_hcd *uhci = hcd_to_uhci(hcd); - pci_set_master(uhci->hcd.pdev); + pci_set_master(to_pci_dev(uhci_dev(uhci))); if (uhci->state == UHCI_SUSPENDED) uhci->resume_detect = 1; @@ -2586,7 +2561,7 @@ { int retval = -ENOMEM; - info(DRIVER_DESC " " DRIVER_VERSION); + printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "\n"); if (usb_disabled()) return -ENODEV; @@ -2616,7 +2591,7 @@ init_failed: if (kmem_cache_destroy(uhci_up_cachep)) - printk(KERN_INFO "uhci: not all urb_priv's were freed\n"); + warn("not all urb_priv's were freed!"); up_failed: @@ -2638,7 +2613,7 @@ pci_unregister_driver(&uhci_pci_driver); if (kmem_cache_destroy(uhci_up_cachep)) - printk(KERN_INFO "uhci: not all urb_priv's were freed\n"); + warn("not all urb_priv's were freed!"); #ifdef CONFIG_PROC_FS remove_proc_entry("driver/uhci", 0); @@ -2654,4 +2629,3 @@ MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); - diff -Nru a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h --- a/drivers/usb/host/uhci-hcd.h Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/host/uhci-hcd.h Thu Feb 19 23:44:27 2004 @@ -49,12 +49,19 @@ #define USBPORTSC_CSC 0x0002 /* Connect Status Change */ #define USBPORTSC_PE 0x0004 /* Port Enable */ #define USBPORTSC_PEC 0x0008 /* Port Enable Change */ -#define USBPORTSC_LS 0x0030 /* Line Status */ +#define USBPORTSC_DPLUS 0x0010 /* D+ high (line status) */ +#define USBPORTSC_DMINUS 0x0020 /* D- high (line status) */ #define USBPORTSC_RD 0x0040 /* Resume Detect */ +#define USBPORTSC_RES1 0x0080 /* reserved, always 1 */ #define USBPORTSC_LSDA 0x0100 /* Low Speed Device Attached */ #define USBPORTSC_PR 0x0200 /* Port Reset */ +/* OC and OCC from Intel 430TX and later (not UHCI 1.1d spec) */ #define USBPORTSC_OC 0x0400 /* Over Current condition */ +#define USBPORTSC_OCC 0x0800 /* Over Current Change R/WC */ #define USBPORTSC_SUSP 0x1000 /* Suspend */ +#define USBPORTSC_RES2 0x2000 /* reserved, write zeroes */ +#define USBPORTSC_RES3 0x4000 /* reserved, write zeroes */ +#define USBPORTSC_RES4 0x8000 /* reserved, write zeroes */ /* Legacy support register */ #define USBLEGSUP 0xc0 @@ -200,8 +207,8 @@ * The UHCI driver places Interrupt, Control and Bulk into QH's both * to group together TD's for one transfer, and also to faciliate queuing * of URB's. To make it easy to insert entries into the schedule, we have - * a skeleton of QH's for each predefined Interrupt latency, low speed - * control, high speed control and terminating QH (see explanation for + * a skeleton of QH's for each predefined Interrupt latency, low-speed + * control, full-speed control and terminating QH (see explanation for * the terminating QH below). * * When we want to add a new QH, we add it to the end of the list for the @@ -216,9 +223,9 @@ * skel int32 QH * ... * skel int1 QH - * skel low speed control QH + * skel low-speed control QH * dev 5 control QH - * skel high speed control QH + * skel full-speed control QH * skel bulk QH * dev 1 bulk QH * dev 2 bulk QH @@ -227,7 +234,7 @@ * The terminating QH is used for 2 reasons: * - To place a terminating TD which is used to workaround a PIIX bug * (see Intel errata for explanation) - * - To loop back to the high speed control queue for full speed bandwidth + * - To loop back to the full-speed control queue for full-speed bandwidth * reclamation * * Isochronous transfers are stored before the start of the skeleton @@ -308,6 +315,7 @@ }; #define hcd_to_uhci(hcd_ptr) container_of(hcd_ptr, struct uhci_hcd, hcd) +#define uhci_dev(u) ((u)->hcd.self.controller) /* * This describes the full uhci information. @@ -326,8 +334,8 @@ /* Grabbed from PCI */ unsigned long io_addr; - struct pci_pool *qh_pool; - struct pci_pool *td_pool; + struct dma_pool *qh_pool; + struct dma_pool *td_pool; struct usb_bus *bus; @@ -336,7 +344,7 @@ spinlock_t frame_list_lock; struct uhci_frame_list *fl; /* P: uhci->frame_list_lock */ - int fsbr; /* Full speed bandwidth reclamation */ + int fsbr; /* Full-speed bandwidth reclamation */ unsigned long fsbrtimeout; /* FSBR delay */ enum uhci_state state; /* FIXME: needs a spinlock */ @@ -383,13 +391,10 @@ /* a control transfer, retrigger */ /* the status phase */ - int status; /* Final status */ - unsigned long inserttime; /* In jiffies */ unsigned long fsbrtime; /* In jiffies */ struct list_head queue_list; /* P: uhci->frame_list_lock */ - struct list_head complete_list; /* P: uhci->complete_list_lock */ }; /* @@ -418,4 +423,3 @@ */ #endif - diff -Nru a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c --- a/drivers/usb/host/uhci-hub.c Thu Feb 19 23:44:23 2004 +++ b/drivers/usb/host/uhci-hub.c Thu Feb 19 23:44:23 2004 @@ -1,7 +1,7 @@ /* * Universal Host Controller Interface driver for USB. * - * Maintainer: Johannes Erdfelt + * Maintainer: Alan Stern * * (C) Copyright 1999 Linus Torvalds * (C) Copyright 1999-2002 Johannes Erdfelt, johannes@erdfelt.com @@ -9,6 +9,7 @@ * (C) Copyright 1999 Georg Acher, acher@in.tum.de * (C) Copyright 1999 Deti Fliegl, deti@fliegl.de * (C) Copyright 1999 Thomas Sailer, sailer@ife.ee.ethz.ch + * (C) Copyright 2004 Alan Stern, stern@rowland.harvard.edu */ static __u8 root_hub_hub_des[] = @@ -16,40 +17,50 @@ 0x09, /* __u8 bLength; */ 0x29, /* __u8 bDescriptorType; Hub-descriptor */ 0x02, /* __u8 bNbrPorts; */ - 0x00, /* __u16 wHubCharacteristics; */ - 0x00, + 0x0a, /* __u16 wHubCharacteristics; */ + 0x00, /* (per-port OC, no power switching) */ 0x01, /* __u8 bPwrOn2pwrGood; 2ms */ 0x00, /* __u8 bHubContrCurrent; 0 mA */ 0x00, /* __u8 DeviceRemovable; *** 7 Ports max *** */ 0xff /* __u8 PortPwrCtrlMask; *** 7 ports max *** */ }; +#define UHCI_RH_MAXCHILD 7 + +/* must write as zeroes */ +#define WZ_BITS (USBPORTSC_RES2 | USBPORTSC_RES3 | USBPORTSC_RES4) + +/* status change bits: nonzero writes will clear */ +#define RWC_BITS (USBPORTSC_OCC | USBPORTSC_PEC | USBPORTSC_CSC) + static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf) { struct uhci_hcd *uhci = hcd_to_uhci(hcd); unsigned int io_addr = uhci->io_addr; - int i, len = 1; + int i; *buf = 0; for (i = 0; i < uhci->rh_numports; i++) { - *buf |= ((inw(io_addr + USBPORTSC1 + i * 2) & 0xa) > 0 ? (1 << (i + 1)) : 0); - len = (i + 1) / 8 + 1; + if (inw(io_addr + USBPORTSC1 + i * 2) & RWC_BITS) + *buf |= (1 << (i + 1)); } - return !!*buf; } #define OK(x) len = (x); break #define CLR_RH_PORTSTAT(x) \ - status = inw(io_addr + USBPORTSC1 + 2 * (wIndex-1)); \ - status = (status & 0xfff5) & ~(x); \ - outw(status, io_addr + USBPORTSC1 + 2 * (wIndex-1)) + status = inw(port_addr); \ + status &= ~(RWC_BITS|WZ_BITS); \ + status &= ~(x); \ + status |= RWC_BITS & (x); \ + outw(status, port_addr) #define SET_RH_PORTSTAT(x) \ - status = inw(io_addr + USBPORTSC1 + 2 * (wIndex-1)); \ - status = (status & 0xfff5) | (x); \ - outw(status, io_addr + USBPORTSC1 + 2 * (wIndex-1)) + status = inw(port_addr); \ + status |= (x); \ + status &= ~(RWC_BITS|WZ_BITS); \ + outw(status, port_addr) /* size of returned buffer is part of USB spec */ @@ -57,13 +68,9 @@ u16 wIndex, char *buf, u16 wLength) { struct uhci_hcd *uhci = hcd_to_uhci(hcd); - int i, status, retval = 0, len = 0; - unsigned int io_addr = uhci->io_addr; - __u16 cstatus; - char c_p_r[8]; - - for (i = 0; i < 8; i++) - c_p_r[i] = 0; + int status, retval = 0, len = 0; + unsigned int port_addr = uhci->io_addr + USBPORTSC1 + 2 * (wIndex-1); + __u16 wPortChange, wPortStatus; switch (typeReq) { /* Request Destination: @@ -78,33 +85,56 @@ *(__u32 *)buf = cpu_to_le32(0); OK(4); /* hub power */ case GetPortStatus: - status = inw(io_addr + USBPORTSC1 + 2 * (wIndex - 1)); - cstatus = ((status & USBPORTSC_CSC) >> (1 - 0)) | - ((status & USBPORTSC_PEC) >> (3 - 1)) | - (c_p_r[wIndex - 1] << (0 + 4)); - status = (status & USBPORTSC_CCS) | - ((status & USBPORTSC_PE) >> (2 - 1)) | - ((status & USBPORTSC_SUSP) >> (12 - 2)) | - ((status & USBPORTSC_PR) >> (9 - 4)) | - (1 << 8) | /* power on */ - ((status & USBPORTSC_LSDA) << (-8 + 9)); - - *(__u16 *)buf = cpu_to_le16(status); - *(__u16 *)(buf + 2) = cpu_to_le16(cstatus); - OK(4); - case SetHubFeature: - switch (wValue) { - case C_HUB_OVER_CURRENT: - case C_HUB_LOCAL_POWER: - break; - default: + if (!wIndex || wIndex > uhci->rh_numports) goto err; + status = inw(port_addr); + + /* Intel controllers report the OverCurrent bit active on. + * VIA controllers report it active off, so we'll adjust the + * bit value. (It's not standardized in the UHCI spec.) + */ + if (to_pci_dev(hcd->self.controller)->vendor == + PCI_VENDOR_ID_VIA) + status ^= USBPORTSC_OC; + + /* UHCI doesn't support C_SUSPEND and C_RESET (always false) */ + wPortChange = 0; + if (status & USBPORTSC_CSC) + wPortChange |= 1 << (USB_PORT_FEAT_C_CONNECTION - 16); + if (status & USBPORTSC_PEC) + wPortChange |= 1 << (USB_PORT_FEAT_C_ENABLE - 16); + if (status & USBPORTSC_OCC) + wPortChange |= 1 << (USB_PORT_FEAT_C_OVER_CURRENT - 16); + + /* UHCI has no power switching (always on) */ + wPortStatus = 1 << USB_PORT_FEAT_POWER; + if (status & USBPORTSC_CCS) + wPortStatus |= 1 << USB_PORT_FEAT_CONNECTION; + if (status & USBPORTSC_PE) { + wPortStatus |= 1 << USB_PORT_FEAT_ENABLE; + if (status & (USBPORTSC_SUSP | USBPORTSC_RD)) + wPortStatus |= 1 << USB_PORT_FEAT_SUSPEND; } - break; + if (status & USBPORTSC_OC) + wPortStatus |= 1 << USB_PORT_FEAT_OVER_CURRENT; + if (status & USBPORTSC_PR) + wPortStatus |= 1 << USB_PORT_FEAT_RESET; + if (status & USBPORTSC_LSDA) + wPortStatus |= 1 << USB_PORT_FEAT_LOWSPEED; + + if (wPortChange) + dev_dbg(uhci_dev(uhci), "port %d portsc %04x\n", + wIndex, status); + + *(__u16 *)buf = cpu_to_le16(wPortStatus); + *(__u16 *)(buf + 2) = cpu_to_le16(wPortChange); + OK(4); + case SetHubFeature: /* We don't implement these */ case ClearHubFeature: switch (wValue) { case C_HUB_OVER_CURRENT: - OK(0); /* hub power over current */ + case C_HUB_LOCAL_POWER: + OK(0); default: goto err; } @@ -120,17 +150,14 @@ case USB_PORT_FEAT_RESET: SET_RH_PORTSTAT(USBPORTSC_PR); mdelay(50); /* USB v1.1 7.1.7.3 */ - c_p_r[wIndex - 1] = 1; CLR_RH_PORTSTAT(USBPORTSC_PR); udelay(10); SET_RH_PORTSTAT(USBPORTSC_PE); mdelay(10); - SET_RH_PORTSTAT(0xa); + CLR_RH_PORTSTAT(USBPORTSC_PEC|USBPORTSC_CSC); OK(0); case USB_PORT_FEAT_POWER: - OK(0); /* port power ** */ - case USB_PORT_FEAT_ENABLE: - SET_RH_PORTSTAT(USBPORTSC_PE); + /* UHCI has no power switching */ OK(0); default: goto err; @@ -145,31 +172,32 @@ CLR_RH_PORTSTAT(USBPORTSC_PE); OK(0); case USB_PORT_FEAT_C_ENABLE: - SET_RH_PORTSTAT(USBPORTSC_PEC); + CLR_RH_PORTSTAT(USBPORTSC_PEC); OK(0); case USB_PORT_FEAT_SUSPEND: CLR_RH_PORTSTAT(USBPORTSC_SUSP); OK(0); case USB_PORT_FEAT_C_SUSPEND: - /*** WR_RH_PORTSTAT(RH_PS_PSSC); */ + /* this driver won't report these */ OK(0); case USB_PORT_FEAT_POWER: - OK(0); /* port power */ + /* UHCI has no power switching */ + goto err; case USB_PORT_FEAT_C_CONNECTION: - SET_RH_PORTSTAT(USBPORTSC_CSC); + CLR_RH_PORTSTAT(USBPORTSC_CSC); OK(0); case USB_PORT_FEAT_C_OVER_CURRENT: - OK(0); /* port power over current */ + CLR_RH_PORTSTAT(USBPORTSC_OCC); + OK(0); case USB_PORT_FEAT_C_RESET: - c_p_r[wIndex - 1] = 0; + /* this driver won't report these */ OK(0); default: goto err; } break; case GetHubDescriptor: - len = min_t(unsigned int, wLength, - min_t(unsigned int, sizeof(root_hub_hub_des), wLength)); + len = min_t(unsigned int, sizeof(root_hub_hub_des), wLength); memcpy(buf, root_hub_hub_des, len); if (len > 2) buf[2] = uhci->rh_numports; @@ -181,4 +209,3 @@ return retval; } - diff -Nru a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c --- a/drivers/usb/media/stv680.c Thu Feb 19 23:44:26 2004 +++ b/drivers/usb/media/stv680.c Thu Feb 19 23:44:26 2004 @@ -490,10 +490,9 @@ stv680->hue = 32767; stv680->palette = STV_VIDEO_PALETTE; stv680->depth = 24; /* rgb24 bits */ - swapRGB = 0; if ((swapRGB_on == 0) && (swapRGB == 0)) PDEBUG (1, "STV(i): swapRGB is (auto) OFF"); - else if ((swapRGB_on == 1) && (swapRGB == 1)) + else if ((swapRGB_on == 0) && (swapRGB == 1)) PDEBUG (1, "STV(i): swapRGB is (auto) ON"); else if (swapRGB_on == 1) PDEBUG (1, "STV(i): swapRGB is (forced) ON"); @@ -657,7 +656,7 @@ /* Resubmit urb for new data */ urb->status = 0; urb->dev = stv680->udev; - if (usb_submit_urb (urb, GFP_KERNEL)) + if (usb_submit_urb (urb, GFP_ATOMIC)) PDEBUG (0, "STV(e): urb burned down in video irq"); return; } /* _video_irq */ @@ -1252,13 +1251,10 @@ return -EINVAL; } case VIDIOCSFBUF: - return -EINVAL; case VIDIOCGTUNER: case VIDIOCSTUNER: - return -EINVAL; case VIDIOCGFREQ: case VIDIOCSFREQ: - return -EINVAL; case VIDIOCGAUDIO: case VIDIOCSAUDIO: return -EINVAL; @@ -1434,7 +1430,7 @@ if (video_register_device (stv680->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { PDEBUG (0, "STV(e): video_register_device failed"); retval = -EIO; - goto error; + goto error_vdev; } PDEBUG (0, "STV(i): registered new video device: video%d", stv680->vdev->minor); @@ -1442,6 +1438,8 @@ stv680_create_sysfs_files(stv680->vdev); return 0; +error_vdev: + video_device_release(stv680->vdev); error: kfree(stv680); return retval; @@ -1466,9 +1464,7 @@ kfree (stv680->sbuf[i].data); } for (i = 0; i < STV680_NUMSCRATCH; i++) - if (stv680->scratch[i].data) { - kfree (stv680->scratch[i].data); - } + kfree (stv680->scratch[i].data); PDEBUG (0, "STV(i): %s disconnected", stv680->camera_name); /* Free the memory */ diff -Nru a/drivers/usb/misc/speedtch.c b/drivers/usb/misc/speedtch.c --- a/drivers/usb/misc/speedtch.c Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/misc/speedtch.c Thu Feb 19 23:44:28 2004 @@ -1161,7 +1161,7 @@ buf += i; length -= i; - i = snprintf (buf, length, " ("); + i = scnprintf (buf, length, " ("); buf += i; length -= i; diff -Nru a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c --- a/drivers/usb/misc/usbtest.c Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/misc/usbtest.c Thu Feb 19 23:44:28 2004 @@ -724,7 +724,7 @@ int last; }; -#define NUM_SUBCASES 13 /* how many test subcases here? */ +#define NUM_SUBCASES 15 /* how many test subcases here? */ struct subcase { struct usb_ctrlrequest setup; @@ -952,7 +952,24 @@ req.wValue = cpu_to_le16 (USB_DT_STRING << 8); // string == 0, for language IDs len = sizeof (struct usb_interface_descriptor); + // may succeed when > 4 languages expected = EREMOTEIO; // or EPIPE, if no strings + break; + case 13: // short read, resembling case 10 + req.wValue = cpu_to_le16 ((USB_DT_CONFIG << 8) | 0); + // last data packet "should" be DATA1, not DATA0 + len = 1024 - udev->epmaxpacketin [0]; + expected = -EREMOTEIO; + break; + case 14: // short read; try to fill the last packet + req.wValue = cpu_to_le16 ((USB_DT_DEVICE << 8) | 0); + // device descriptor size == 18 bytes + len = udev->epmaxpacketin [0]; + switch (len) { + case 8: len = 24; break; + case 16: len = 32; break; + } + expected = -EREMOTEIO; break; default: err ("bogus number of ctrl queue testcases!"); diff -Nru a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c --- a/drivers/usb/net/catc.c Thu Feb 19 23:44:25 2004 +++ b/drivers/usb/net/catc.c Thu Feb 19 23:44:25 2004 @@ -838,7 +838,7 @@ usb_free_urb(catc->rx_urb); if (catc->irq_urb) usb_free_urb(catc->irq_urb); - kfree(netdev); + free_netdev(netdev); kfree(catc); return -ENOMEM; } @@ -943,7 +943,7 @@ usb_free_urb(catc->tx_urb); usb_free_urb(catc->rx_urb); usb_free_urb(catc->irq_urb); - kfree(netdev); + free_netdev(netdev); kfree(catc); return -EIO; } diff -Nru a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c --- a/drivers/usb/net/kaweth.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/net/kaweth.c Thu Feb 19 23:44:27 2004 @@ -1150,7 +1150,7 @@ err_only_tx: usb_free_urb(kaweth->tx_urb); err_no_urb: - kfree(netdev); + free_netdev(netdev); err_no_netdev: kfree(kaweth); return -EIO; diff -Nru a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c --- a/drivers/usb/net/pegasus.c Thu Feb 19 23:44:28 2004 +++ b/drivers/usb/net/pegasus.c Thu Feb 19 23:44:28 2004 @@ -1283,7 +1283,7 @@ usb_set_intfdata(intf, NULL); free_skb_pool(pegasus); out3: - kfree(net); + free_netdev(net); out2: free_all_urbs(pegasus); out1: diff -Nru a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c --- a/drivers/usb/net/rtl8150.c Thu Feb 19 23:44:26 2004 +++ b/drivers/usb/net/rtl8150.c Thu Feb 19 23:44:26 2004 @@ -852,7 +852,7 @@ free_all_urbs(dev); out: kfree(dev->intr_buff); - kfree(netdev); + free_netdev(netdev); kfree(dev); return -EIO; } diff -Nru a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c --- a/drivers/usb/net/usbnet.c Thu Feb 19 23:44:25 2004 +++ b/drivers/usb/net/usbnet.c Thu Feb 19 23:44:25 2004 @@ -2981,7 +2981,7 @@ if (dev->driver_info->unbind) dev->driver_info->unbind (dev, intf); - kfree(dev->net); + free_netdev(dev->net); kfree (dev); usb_put_dev (xdev); } @@ -3111,7 +3111,7 @@ if (info->unbind) info->unbind (dev, udev); out2: - kfree(net); + free_netdev(net); out1: kfree(dev); out: diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c --- a/drivers/usb/serial/ftdi_sio.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/serial/ftdi_sio.c Thu Feb 19 23:44:27 2004 @@ -17,6 +17,11 @@ * See http://ftdi-usb-sio.sourceforge.net for upto date testing info * and extra documentation * + * (09/Feb/2004) Ian Abbott + * Changed full name of USB-UIRT device to avoid "/" character. + * Added FTDI's alternate PID (0x6006) for FT232/245 devices. + * Added PID for "ELV USB Module UO100" from Stefan Frings. + * * (21/Oct/2003) Ian Abbott * Renamed some VID/PID macros for Matrix Orbital and Perle Systems * devices. Removed Matrix Orbital and Perle Systems devices from the @@ -282,6 +287,7 @@ static struct usb_device_id id_table_8U232AM [] = { { 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) }, { USB_DEVICE_VER(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID, 0, 0x3ff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_XF_632_PID, 0, 0x3ff) }, @@ -346,12 +352,14 @@ { USB_DEVICE_VER(FTDI_VID, PROTEGO_R2X0, 0, 0x3ff) }, { USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_3, 0, 0x3ff) }, { USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_4, 0, 0x3ff) }, + { USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UO100_PID, 0, 0x3ff) }, { } /* Terminating entry */ }; static struct usb_device_id id_table_FT232BM [] = { { 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) }, { USB_DEVICE_VER(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID, 0x400, 0xffff) }, { USB_DEVICE_VER(FTDI_VID, FTDI_XF_632_PID, 0x400, 0xffff) }, @@ -425,6 +433,7 @@ { USB_DEVICE_VER(FTDI_VID, PROTEGO_R2X0, 0x400, 0xffff) }, { USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_3, 0x400, 0xffff) }, { USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_4, 0x400, 0xffff) }, + { USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UO100_PID, 0x400, 0xffff) }, { } /* Terminating entry */ }; @@ -444,6 +453,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, { USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) }, { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) }, { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) }, @@ -518,6 +528,7 @@ { USB_DEVICE(FTDI_VID, PROTEGO_R2X0) }, { USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_3) }, { USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_4) }, + { USB_DEVICE(FTDI_VID, FTDI_ELV_UO100_PID) }, { } /* Terminating entry */ }; @@ -669,7 +680,7 @@ static struct usb_serial_device_type ftdi_USB_UIRT_device = { .owner = THIS_MODULE, - .name = "USB-UIRT Infrared Receiver/Transmitter", + .name = "USB-UIRT Infrared Tranceiver", .id_table = id_table_USB_UIRT, .num_interrupt_in = 0, .num_bulk_in = 1, diff -Nru a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h --- a/drivers/usb/serial/ftdi_sio.h Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/serial/ftdi_sio.h Thu Feb 19 23:44:27 2004 @@ -25,6 +25,7 @@ #define FTDI_VID 0x0403 /* Vendor Id */ #define FTDI_SIO_PID 0x8372 /* Product Id SIO application of 8U100AX */ #define FTDI_8U232AM_PID 0x6001 /* Similar device to SIO above */ +#define FTDI_8U232AM_ALT_PID 0x6006 /* FTDI's alternate PID for above */ #define FTDI_RELAIS_PID 0xFA10 /* Relais device from Rudolf Gugler */ #define FTDI_NF_RIC_VID 0x0DCD /* Vendor Id */ #define FTDI_NF_RIC_PID 0x0001 /* Product Id */ @@ -131,6 +132,9 @@ /* USB-UIRT - An infrared receiver and transmitter using the 8U232AM chip */ /* http://home.earthlink.net/~jrhees/USBUIRT/index.htm */ #define FTDI_USB_UIRT_PID 0xF850 /* Product Id */ + +/* ELV USB Module UO100 (PID sent by Stefan Frings) */ +#define FTDI_ELV_UO100_PID 0xFB58 /* Product Id */ /* * Definitions for ID TECH (www.idt-net.com) devices diff -Nru a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c --- a/drivers/usb/storage/sddr09.c Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/storage/sddr09.c Thu Feb 19 23:44:27 2004 @@ -27,6 +27,20 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* + * Known vendor commands: 12 bytes, first byte is opcode + * + * E7: read scatter gather + * E8: read + * E9: write + * EA: erase + * EB: reset + * EC: read status + * ED: read ID + * EE: write CIS (?) + * EF: compute checksum (?) + */ + #include "transport.h" #include "protocol.h" #include "usb.h" @@ -461,6 +475,7 @@ * * Always precisely one block is erased; bytes 2-5 and 10-11 are ignored. * The byte address being erased is 2*Eaddress. + * The CIS cannot be erased. */ static int sddr09_erase(struct us_data *us, unsigned long Eaddress) { @@ -487,6 +502,20 @@ } /* + * Write CIS Command: 12 bytes. + * byte 0: opcode: EE + * bytes 2-5: write address in shorts + * bytes 10-11: sector count + * + * This writes at the indicated address. Don't know how it differs + * from E9. Maybe it does not erase? However, it will also write to + * the CIS. + * + * When two such commands on the same page follow each other directly, + * the second one is not done. + */ + +/* * Write Command: 12 bytes. * byte 0: opcode: E9 * bytes 2-5: write address (big-endian, counting shorts, sector aligned). @@ -1478,7 +1507,7 @@ "mode page 0x%x\n", modepage); memcpy(ptr, mode_page_01, sizeof(mode_page_01)); - ((u16*)ptr)[0] = sizeof(mode_page_01) - 2; + ((u16*)ptr)[0] = cpu_to_be16(sizeof(mode_page_01) - 2); ptr[3] = (info->flags & SDDR09_WP) ? 0x80 : 0; usb_stor_set_xfer_buf(ptr, sizeof(mode_page_01), srb); return USB_STOR_TRANSPORT_GOOD; diff -Nru a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c --- a/drivers/usb/storage/transport.c Thu Feb 19 23:44:24 2004 +++ b/drivers/usb/storage/transport.c Thu Feb 19 23:44:24 2004 @@ -552,6 +552,8 @@ return; } + srb->result = SAM_STAT_GOOD; + /* Determine if we need to auto-sense * * I normally don't use a flag like this, but it's almost impossible @@ -561,23 +563,14 @@ /* * If we're running the CB transport, which is incapable - * of determining status on it's own, we need to auto-sense almost - * every time. + * of determining status on its own, we need to auto-sense + * unless the operation involved a data-in transfer. Devices + * can signal data-in errors by stalling the bulk-in pipe. */ - if (us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) { + if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) && + srb->sc_data_direction != SCSI_DATA_READ) { US_DEBUGP("-- CB transport device requiring auto-sense\n"); need_auto_sense = 1; - - /* There are some exceptions to this. Notably, if this is - * a UFI device and the command is REQUEST_SENSE or INQUIRY, - * then it is impossible to truly determine status. - */ - if (us->subclass == US_SC_UFI && - ((srb->cmnd[0] == REQUEST_SENSE) || - (srb->cmnd[0] == INQUIRY))) { - US_DEBUGP("** no auto-sense for a special command\n"); - need_auto_sense = 0; - } } /* @@ -591,8 +584,8 @@ } /* - * Also, if we have a short transfer on a command that can't have - * a short transfer, we're going to do this. + * A short transfer on a command where we don't expect it + * is unusual, but it doesn't mean we need to auto-sense. */ if ((srb->resid > 0) && !((srb->cmnd[0] == REQUEST_SENSE) || @@ -601,7 +594,6 @@ (srb->cmnd[0] == LOG_SENSE) || (srb->cmnd[0] == MODE_SENSE_10))) { US_DEBUGP("-- unexpectedly short transfer\n"); - need_auto_sense = 1; } /* Now, if we need to do the auto-sense, let's do it */ @@ -614,6 +606,7 @@ unsigned char old_cmd_len; unsigned char old_cmnd[MAX_COMMAND_SIZE]; unsigned long old_serial_number; + int old_resid; US_DEBUGP("Issuing auto-REQUEST_SENSE\n"); @@ -654,9 +647,12 @@ srb->serial_number ^= 0x80000000; /* issue the auto-sense command */ + old_resid = srb->resid; + srb->resid = 0; temp_result = us->transport(us->srb, us); /* let's clean up right away */ + srb->resid = old_resid; srb->request_buffer = old_request_buffer; srb->request_bufflen = old_request_bufflen; srb->use_sg = old_sg; @@ -698,26 +694,15 @@ /* set the result so the higher layers expect this data */ srb->result = SAM_STAT_CHECK_CONDITION; - /* If things are really okay, then let's show that */ - if ((srb->sense_buffer[2] & 0xf) == 0x0) + /* If things are really okay, then let's show that. Zero + * 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) { srb->result = SAM_STAT_GOOD; - } else /* if (need_auto_sense) */ - srb->result = SAM_STAT_GOOD; - - /* Regardless of auto-sense, if we _know_ we have an error - * condition, show that in the result code - */ - if (result == USB_STOR_TRANSPORT_FAILED) - srb->result = SAM_STAT_CHECK_CONDITION; - - /* If we think we're good, then make sure the sense data shows it. - * This is necessary because the auto-sense for some devices always - * sets byte 0 == 0x70, even if there is no error - */ - if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) && - (result == USB_STOR_TRANSPORT_GOOD) && - ((srb->sense_buffer[2] & 0xf) == 0x0)) - srb->sense_buffer[0] = 0x0; + srb->sense_buffer[0] = 0x0; + } + } return; /* abort processing: the bulk-only transport requires a reset @@ -792,6 +777,10 @@ srb->request_buffer, transfer_length, srb->use_sg, &srb->resid); US_DEBUGP("CBI data stage result is 0x%x\n", result); + + /* if we stalled the data transfer it means command failed */ + if (result == USB_STOR_XFER_STALLED) + return USB_STOR_TRANSPORT_FAILED; if (result > USB_STOR_XFER_STALLED) return USB_STOR_TRANSPORT_ERROR; } @@ -883,6 +872,10 @@ srb->request_buffer, transfer_length, srb->use_sg, &srb->resid); US_DEBUGP("CB data stage result is 0x%x\n", result); + + /* if we stalled the data transfer it means command failed */ + if (result == USB_STOR_XFER_STALLED) + return USB_STOR_TRANSPORT_FAILED; if (result > USB_STOR_XFER_STALLED) return USB_STOR_TRANSPORT_ERROR; } @@ -929,6 +922,7 @@ unsigned int residue; int result; int fake_sense = 0; + unsigned int cswlen; /* set up the command wrapper */ bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN); @@ -985,7 +979,17 @@ /* get CSW for device status */ US_DEBUGP("Attempting to get CSW...\n"); result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, - bcs, US_BULK_CS_WRAP_LEN, NULL); + bcs, US_BULK_CS_WRAP_LEN, &cswlen); + + /* Some broken devices add unnecessary zero-length packets to the + * end of their data transfers. Such packets show up as 0-length + * CSWs. If we encounter such a thing, try to read the CSW again. + */ + if (result == USB_STOR_XFER_SHORT && cswlen == 0) { + US_DEBUGP("Received 0-length CSW; retrying...\n"); + result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe, + bcs, US_BULK_CS_WRAP_LEN, &cswlen); + } /* did the attempt to read the CSW fail? */ if (result == USB_STOR_XFER_STALLED) { diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h --- a/drivers/usb/storage/unusual_devs.h Thu Feb 19 23:44:27 2004 +++ b/drivers/usb/storage/unusual_devs.h Thu Feb 19 23:44:27 2004 @@ -108,6 +108,15 @@ "Finecam S5", US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), +/* Patch for Kyocera Finecam L3 + * Submitted by Michael Krauth + */ +UNUSUAL_DEV( 0x0482, 0x0105, 0x0100, 0x0100, + "Kyocera", + "Finecam L3", + US_SC_SCSI, US_PR_BULK, NULL, + US_FL_FIX_INQUIRY), + /* Reported by Paul Stewart * This entry is needed because the device reports Sub=ff */ UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001, @@ -132,7 +141,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210, "Fujifilm", "FinePix 1400Zoom", - US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), + US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), /* Reported by Peter Wächtler * The device needs the flags only. @@ -171,7 +180,7 @@ UNUSUAL_DEV( 0x04e6, 0x0002, 0x0100, 0x0100, "Shuttle", "eUSCSI Bridge", - US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, + US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG ), #ifdef CONFIG_USB_STORAGE_SDDR09 @@ -285,6 +294,13 @@ "Memorystick MSC-U01N", US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_SINGLE_LUN ), + +/* Submitted by Michal Mlotek */ +UNUSUAL_DEV( 0x054c, 0x0058, 0x0000, 0x9999, + "Sony", + "PEG N760c Memorystick", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), UNUSUAL_DEV( 0x054c, 0x0069, 0x0000, 0x9999, "Sony", @@ -414,6 +430,28 @@ US_FL_SINGLE_LUN ), #endif +/* Following three Minolta cameras reported by Martin Pool + * . Originally discovered by Kedar Petankar, + * Matthew Geier, Mikael Lofj"ard, Marcel de Boer. + */ +UNUSUAL_DEV( 0x0686, 0x4006, 0x0001, 0x0001, + "Minolta", + "DiMAGE 7", + 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", + US_SC_SCSI, US_PR_DEVICE, NULL, + 0 ), + /* Submitted by Benny Sjostrand */ UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0001, "Minolta", @@ -426,28 +464,6 @@ "DIMAGE E223", US_SC_SCSI, US_PR_DEVICE, NULL, 0 ), -/* Following three Minolta cameras reported by Martin Pool - * . Originally discovered by Kedar Petankar, - * Matthew Geier, Mikael Lofj"ard, Marcel de Boer. - */ -UNUSUAL_DEV( 0x0686, 0x4006, 0x0001, 0x0001, - "Minolta", - "DiMAGE 7", - 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", - US_SC_SCSI, US_PR_DEVICE, NULL, - 0 ), - UNUSUAL_DEV( 0x0693, 0x0002, 0x0100, 0x0100, "Hagiwara", "FlashGate SmartMedia", @@ -607,7 +623,7 @@ UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9009, "Casio", "QV DigitalCamera", - US_SC_8070, US_PR_CB, NULL, + US_SC_DEVICE, US_PR_CB, NULL, US_FL_FIX_INQUIRY ), /* Later Casio cameras apparently tell the truth */ @@ -633,15 +649,6 @@ US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_MODE_XLATE ), -/*Medion 6047 Digital Camera -Davide Andrian <_nessuno_@katamail.com> -*/ -UNUSUAL_DEV( 0x08ca, 0x2011, 0x0001, 0x0001, - "3MegaCam", - "3MegaCam", - 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", @@ -719,6 +726,17 @@ "Jenoptik", "JD 5200 z3", US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), + +/* Reported by Lubomir Blaha + * I _REALLY_ don't know what 3rd, 4th number and all defines mean, but this + * works for me. Can anybody correct these values? (I able to test corrected + * version.) + */ +UNUSUAL_DEV( 0x0dd8, 0x1060, 0x0000, 0xffff, + "Netac", + "USB-CF-Card", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), /* Submitted by Antoine Mairesse */ UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300, diff -Nru a/fs/Kconfig b/fs/Kconfig --- a/fs/Kconfig Thu Feb 19 23:44:25 2004 +++ b/fs/Kconfig Thu Feb 19 23:44:25 2004 @@ -1592,9 +1592,12 @@ For most cases you probably want to say N. +# +# Intermezzo broke when we added the expanded NGROUPS patches +# config INTERMEZZO_FS tristate "InterMezzo file system support (replicating fs) (EXPERIMENTAL)" - depends on INET && EXPERIMENTAL + depends on INET && EXPERIMENTAL && BROKEN 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/Kconfig.binfmt b/fs/Kconfig.binfmt --- a/fs/Kconfig.binfmt Thu Feb 19 23:44:28 2004 +++ b/fs/Kconfig.binfmt Thu Feb 19 23:44:28 2004 @@ -36,6 +36,12 @@ help Support FLAT format compressed binaries +config BINFMT_SHARED_FLAT + bool "Enable shared FLAT support" + depends on BINFMT_FLAT + help + Support FLAT shared libraries + config BINFMT_AOUT tristate "Kernel support for a.out and ECOFF binaries" depends on (X86 && !X86_64) || ALPHA || ARM || M68K || MIPS || SPARC diff -Nru a/fs/adfs/adfs.h b/fs/adfs/adfs.h --- a/fs/adfs/adfs.h Thu Feb 19 23:44:28 2004 +++ b/fs/adfs/adfs.h Thu Feb 19 23:44:28 2004 @@ -68,12 +68,8 @@ /* Inode stuff */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) int adfs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh, int create); -#else -int adfs_bmap(struct inode *inode, int block); -#endif struct inode *adfs_iget(struct super_block *sb, struct object_info *obj); void adfs_read_inode(struct inode *inode); void adfs_write_inode(struct inode *inode,int unused); diff -Nru a/fs/binfmt_flat.c b/fs/binfmt_flat.c --- a/fs/binfmt_flat.c Thu Feb 19 23:44:22 2004 +++ b/fs/binfmt_flat.c Thu Feb 19 23:44:22 2004 @@ -179,7 +179,7 @@ unsigned char *buf; z_stream strm; loff_t fpos; - int ret; + int ret, retval; DBG_FLT("decompress_exec(offset=%x,buf=%x,len=%x)\n",(int)offset, (int)dst, (int)len); @@ -192,7 +192,8 @@ buf = kmalloc(LBUFSIZE, GFP_KERNEL); if (buf == NULL) { DBG_FLT("binfmt_flat: no memory for read buffer\n"); - return -ENOMEM; + retval = -ENOMEM; + goto out_free; } /* Read in first chunk of data and parse gzip header. */ @@ -203,28 +204,30 @@ strm.avail_in = ret; strm.total_in = 0; + retval = -ENOEXEC; + /* Check minimum size -- gzip header */ if (ret < 10) { DBG_FLT("binfmt_flat: file too small?\n"); - return -ENOEXEC; + goto out_free_buf; } /* Check gzip magic number */ if ((buf[0] != 037) || ((buf[1] != 0213) && (buf[1] != 0236))) { DBG_FLT("binfmt_flat: unknown compression magic?\n"); - return -ENOEXEC; + goto out_free_buf; } /* Check gzip method */ if (buf[2] != 8) { DBG_FLT("binfmt_flat: unknown compression method?\n"); - return -ENOEXEC; + goto out_free_buf; } /* Check gzip flags */ if ((buf[3] & ENCRYPTED) || (buf[3] & CONTINUATION) || (buf[3] & RESERVED)) { DBG_FLT("binfmt_flat: unknown flags?\n"); - return -ENOEXEC; + goto out_free_buf; } ret = 10; @@ -232,7 +235,7 @@ ret += 2 + buf[10] + (buf[11] << 8); if (unlikely(LBUFSIZE == ret)) { DBG_FLT("binfmt_flat: buffer overflow (EXTRA)?\n"); - return -ENOEXEC; + goto out_free_buf; } } if (buf[3] & ORIG_NAME) { @@ -240,7 +243,7 @@ ; if (unlikely(LBUFSIZE == ret)) { DBG_FLT("binfmt_flat: buffer overflow (ORIG_NAME)?\n"); - return -ENOEXEC; + goto out_free_buf; } } if (buf[3] & COMMENT) { @@ -248,7 +251,7 @@ ; if (unlikely(LBUFSIZE == ret)) { DBG_FLT("binfmt_flat: buffer overflow (COMMENT)?\n"); - return -ENOEXEC; + goto out_free_buf; } } @@ -261,7 +264,7 @@ if (zlib_inflateInit2(&strm, -MAX_WBITS) != Z_OK) { DBG_FLT("binfmt_flat: zlib init failed?\n"); - return -ENOEXEC; + goto out_free_buf; } while ((ret = zlib_inflate(&strm, Z_NO_FLUSH)) == Z_OK) { @@ -280,13 +283,18 @@ if (ret < 0) { DBG_FLT("binfmt_flat: decompression failed (%d), %s\n", ret, strm.msg); - return -ENOEXEC; + goto out_zlib; } + retval = 0; +out_zlib: zlib_inflateEnd(&strm); +out_free_buf: kfree(buf); +out_free: kfree(strm.workspace); - return 0; +out: + return retval; } #endif /* CONFIG_BINFMT_ZFLAT */ diff -Nru a/fs/block_dev.c b/fs/block_dev.c --- a/fs/block_dev.c Thu Feb 19 23:44:28 2004 +++ b/fs/block_dev.c Thu Feb 19 23:44:28 2004 @@ -479,13 +479,13 @@ * to be used for internal purposes. If you ever need it - reconsider * your API. */ -struct block_device *open_by_devnum(dev_t dev, unsigned mode, int kind) +struct block_device *open_by_devnum(dev_t dev, unsigned mode) { struct block_device *bdev = bdget(dev); int err = -ENOMEM; int flags = mode & FMODE_WRITE ? O_RDWR : O_RDONLY; if (bdev) - err = blkdev_get(bdev, mode, flags, kind); + err = blkdev_get(bdev, mode, flags); return err ? ERR_PTR(err) : bdev; } @@ -525,7 +525,8 @@ static void bd_set_size(struct block_device *bdev, loff_t size) { unsigned bsize = bdev_hardsect_size(bdev); - i_size_write(bdev->bd_inode, size); + + bdev->bd_inode->i_size = size; while (bsize < PAGE_CACHE_SIZE) { if (size & bsize) break; @@ -579,7 +580,7 @@ ret = -ENOMEM; if (!whole) goto out_first; - ret = blkdev_get(whole, file->f_mode, file->f_flags, BDEV_RAW); + ret = blkdev_get(whole, file->f_mode, file->f_flags); if (ret) goto out_first; bdev->bd_contains = whole; @@ -625,7 +626,7 @@ bdev->bd_disk = NULL; bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info; if (bdev != bdev->bd_contains) - blkdev_put(bdev->bd_contains, BDEV_RAW); + blkdev_put(bdev->bd_contains); bdev->bd_contains = NULL; put_disk(disk); module_put(owner); @@ -637,7 +638,7 @@ return ret; } -int blkdev_get(struct block_device *bdev, mode_t mode, unsigned flags, int kind) +int blkdev_get(struct block_device *bdev, mode_t mode, unsigned flags) { /* * This crockload is due to bad choice of ->open() type. @@ -682,13 +683,13 @@ if (!(res = bd_claim(bdev, filp))) return 0; - blkdev_put(bdev, BDEV_FILE); + blkdev_put(bdev); return res; } EXPORT_SYMBOL(blkdev_open); -int blkdev_put(struct block_device *bdev, int kind) +int blkdev_put(struct block_device *bdev) { int ret = 0; struct inode *bd_inode = bdev->bd_inode; @@ -721,7 +722,7 @@ bdev->bd_disk = NULL; bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info; if (bdev != bdev->bd_contains) { - blkdev_put(bdev->bd_contains, BDEV_RAW); + blkdev_put(bdev->bd_contains); } bdev->bd_contains = NULL; } @@ -738,7 +739,7 @@ struct block_device *bdev = I_BDEV(filp->f_mapping->host); if (bdev->bd_holder == filp) bd_release(bdev); - return blkdev_put(bdev, BDEV_FILE); + return blkdev_put(bdev); } static ssize_t blkdev_file_write(struct file *file, const char __user *buf, @@ -850,14 +851,12 @@ * * @path: special file representing the block device * @flags: %MS_RDONLY for opening read-only - * @kind: usage (same as the 4th paramter to blkdev_get) * @holder: owner for exclusion * * Open the blockdevice described by the special file at @path, claim it - * for the @holder and properly set it up for @kind usage. + * for the @holder. */ -struct block_device *open_bdev_excl(const char *path, int flags, - int kind, void *holder) +struct block_device *open_bdev_excl(const char *path, int flags, void *holder) { struct block_device *bdev; mode_t mode = FMODE_READ; @@ -869,7 +868,7 @@ if (!(flags & MS_RDONLY)) mode |= FMODE_WRITE; - error = blkdev_get(bdev, mode, 0, kind); + error = blkdev_get(bdev, mode, 0); if (error) return ERR_PTR(error); error = -EACCES; @@ -882,7 +881,7 @@ return bdev; blkdev_put: - blkdev_put(bdev, BDEV_FS); + blkdev_put(bdev); return ERR_PTR(error); } @@ -892,14 +891,13 @@ * close_bdev_excl - release a blockdevice openen by open_bdev_excl() * * @bdev: blockdevice to close - * @kind: usage (same as the 4th paramter to blkdev_get) * * This is the counterpart to open_bdev_excl(). */ -void close_bdev_excl(struct block_device *bdev, int kind) +void close_bdev_excl(struct block_device *bdev) { bd_release(bdev); - blkdev_put(bdev, kind); + blkdev_put(bdev); } EXPORT_SYMBOL(close_bdev_excl); diff -Nru a/fs/buffer.c b/fs/buffer.c --- a/fs/buffer.c Thu Feb 19 23:44:25 2004 +++ b/fs/buffer.c Thu Feb 19 23:44:25 2004 @@ -2987,33 +2987,6 @@ } } -static void buffer_init_cpu(int cpu) -{ - struct bh_accounting *bha = &per_cpu(bh_accounting, cpu); - struct bh_lru *bhl = &per_cpu(bh_lrus, cpu); - - bha->nr = 0; - bha->ratelimit = 0; - memset(bhl, 0, sizeof(*bhl)); -} - -static int __devinit buffer_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) -{ - long cpu = (long)hcpu; - switch(action) { - case CPU_UP_PREPARE: - buffer_init_cpu(cpu); - break; - default: - break; - } - return NOTIFY_OK; -} - -static struct notifier_block __devinitdata buffer_nb = { - .notifier_call = buffer_cpu_notify, -}; void __init buffer_init(void) { @@ -3031,9 +3004,6 @@ */ nrpages = (nr_free_buffer_pages() * 10) / 100; max_buffer_heads = nrpages * (PAGE_SIZE / sizeof(struct buffer_head)); - buffer_cpu_notify(&buffer_nb, (unsigned long)CPU_UP_PREPARE, - (void *)(long)smp_processor_id()); - register_cpu_notifier(&buffer_nb); } EXPORT_SYMBOL(__bforget); diff -Nru a/fs/dcache.c b/fs/dcache.c --- a/fs/dcache.c Thu Feb 19 23:44:23 2004 +++ b/fs/dcache.c Thu Feb 19 23:44:23 2004 @@ -1531,6 +1531,16 @@ return ino; } +static __initdata unsigned long dhash_entries; +static int __init set_dhash_entries(char *str) +{ + if (!str) + return 0; + dhash_entries = simple_strtoul(str, &str, 0); + return 1; +} +__setup("dhash_entries=", set_dhash_entries); + static void __init dcache_init(unsigned long mempages) { struct hlist_head *d; @@ -1556,11 +1566,13 @@ set_shrinker(DEFAULT_SEEKS, shrink_dcache_memory); -#if PAGE_SHIFT < 13 - mempages >>= (13 - PAGE_SHIFT); -#endif - mempages *= sizeof(struct hlist_head); - for (order = 0; ((1UL << order) << PAGE_SHIFT) < mempages; order++) + if (!dhash_entries) + dhash_entries = PAGE_SHIFT < 13 ? + mempages >> (13 - PAGE_SHIFT) : + mempages << (PAGE_SHIFT - 13); + + dhash_entries *= sizeof(struct hlist_head); + for (order = 0; ((1UL << order) << PAGE_SHIFT) < dhash_entries; order++) ; do { diff -Nru a/fs/devfs/base.c b/fs/devfs/base.c --- a/fs/devfs/base.c Thu Feb 19 23:44:23 2004 +++ b/fs/devfs/base.c Thu Feb 19 23:44:23 2004 @@ -676,6 +676,7 @@ #include #include #include +#include #include #include @@ -685,9 +686,7 @@ #include #include -#include "internal.h" - -#define DEVFS_VERSION "1.22 (20021013)" +#define DEVFS_VERSION "2004-01-31" #define DEVFS_NAME "devfs" @@ -762,18 +761,6 @@ unsigned char no_more_additions:1; }; -struct bdev_type -{ - dev_t dev; -}; - -struct cdev_type -{ - struct file_operations *ops; - dev_t dev; - unsigned char autogen:1; -}; - struct symlink_type { unsigned int length; /* Not including the NULL-termimator */ @@ -801,8 +788,7 @@ union { struct directory_type dir; - struct bdev_type bdev; - struct cdev_type cdev; + dev_t dev; struct symlink_type symlink; const char *name; /* Only used for (mode == 0) */ } @@ -813,7 +799,7 @@ struct devfs_inode inode; umode_t mode; unsigned short namelen; /* I think 64k+ filenames are a way off... */ - unsigned char vfs_deletable:1;/* Whether the VFS may delete the entry */ + unsigned char vfs:1;/* Whether the VFS may delete the entry */ char name[1]; /* This is just a dummy: the allocated array is bigger. This is NULL-terminated */ }; @@ -925,8 +911,6 @@ de->name, de, de->parent, de->parent ? de->parent->name : "no parent"); if ( S_ISLNK (de->mode) ) kfree (de->u.symlink.linkname); - if ( S_ISCHR (de->mode) && de->u.cdev.autogen ) - devfs_dealloc_devnum (de->mode, de->u.cdev.dev); WRITE_ENTRY_MAGIC (de, 0); #ifdef CONFIG_DEVFS_DEBUG spin_lock (&stat_lock); @@ -1063,46 +1047,40 @@ return retval; } /* End Function _devfs_append_entry */ - /** * _devfs_get_root_entry - Get the root devfs entry. * * Returns the root devfs entry on success, else %NULL. + * + * TODO it must be called asynchronously due to the fact + * that devfs is initialized relatively late. Proper way + * is to remove module_init from init_devfs_fs and manually + * call it early enough during system init */ -static struct devfs_entry *_devfs_get_root_entry (void) +static struct devfs_entry *_devfs_get_root_entry(void) { - struct devfs_entry *new; - static spinlock_t root_lock = SPIN_LOCK_UNLOCKED; + struct devfs_entry *new; + static spinlock_t root_lock = SPIN_LOCK_UNLOCKED; - /* Always ensure the root is created */ - if (root_entry) return root_entry; - if ( ( new = _devfs_alloc_entry (NULL, 0,MODE_DIR) ) == NULL ) return NULL; - spin_lock (&root_lock); - if (root_entry) - { - spin_unlock (&root_lock); - devfs_put (new); - return (root_entry); - } - root_entry = new; - spin_unlock (&root_lock); - /* And create the entry for ".devfsd" */ - if ( ( new = _devfs_alloc_entry (".devfsd", 0, S_IFCHR |S_IRUSR |S_IWUSR) ) - == NULL ) return NULL; - new->u.cdev.dev = devfs_alloc_devnum (S_IFCHR |S_IRUSR |S_IWUSR); - new->u.cdev.ops = &devfsd_fops; - _devfs_append_entry (root_entry, new, NULL); -#ifdef CONFIG_DEVFS_DEBUG - if ( ( new = _devfs_alloc_entry (".stat", 0, S_IFCHR | S_IRUGO | S_IWUGO) ) - == NULL ) return NULL; - new->u.cdev.dev = devfs_alloc_devnum (S_IFCHR | S_IRUGO | S_IWUGO); - new->u.cdev.ops = &stat_fops; - _devfs_append_entry (root_entry, new, NULL); -#endif - return root_entry; -} /* End Function _devfs_get_root_entry */ + if (root_entry) + return root_entry; + new = _devfs_alloc_entry(NULL, 0, MODE_DIR); + if (new == NULL ) + return NULL; + + spin_lock(&root_lock); + if (root_entry) { + spin_unlock(&root_lock); + devfs_put(new); + return root_entry; + } + root_entry = new; + spin_unlock(&root_lock); + + return root_entry; +} /* End Function _devfs_get_root_entry */ /** * _devfs_descend - Descend down a tree using the next component name. @@ -1237,6 +1215,7 @@ } if (S_ISLNK (de->mode) && traverse_symlink) { /* Need to follow the link: this is a stack chomper */ + /* FIXME what if it puts outside of mounted tree? */ link = _devfs_walk_path (dir, de->u.symlink.linkname, de->u.symlink.length, TRUE); devfs_put (de); @@ -1444,27 +1423,19 @@ current->egid, &fs_info); } -int devfs_mk_bdev(dev_t dev, umode_t mode, const char *fmt, ...) +static int devfs_mk_dev(dev_t dev, umode_t mode, const char *fmt, va_list args) { struct devfs_entry *dir = NULL, *de; char buf[64]; - va_list args; int error, n; - va_start(args, fmt); - n = vsnprintf(buf, 64, fmt, args); - if (n >= 64 || !buf[0]) { - printk(KERN_WARNING "%s: invalid format string\n", - __FUNCTION__); + n = vsnprintf(buf, sizeof(buf), fmt, args); + if (n >= sizeof(buf) || !buf[0]) { + printk(KERN_WARNING "%s: invalid format string %s\n", + __FUNCTION__, fmt); return -EINVAL; } - if (!S_ISBLK(mode)) { - printk(KERN_WARNING "%s: invalide mode (%u) for %s\n", - __FUNCTION__, mode, buf); - return -EINVAL; - } - de = _devfs_prepare_leaf(&dir, buf, mode); if (!de) { printk(KERN_WARNING "%s: could not prepare leaf for %s\n", @@ -1472,7 +1443,7 @@ return -ENOMEM; /* could be more accurate... */ } - de->u.bdev.dev = dev; + de->u.dev = dev; error = _devfs_append_entry(dir, de, NULL); if (error) { @@ -1487,50 +1458,35 @@ return error; } +int devfs_mk_bdev(dev_t dev, umode_t mode, const char *fmt, ...) +{ + va_list args; + + if (!S_ISBLK(mode)) { + printk(KERN_WARNING "%s: invalide mode (%u) for %s\n", + __FUNCTION__, mode, fmt); + return -EINVAL; + } + + va_start(args, fmt); + return devfs_mk_dev(dev, mode, fmt, args); +} + EXPORT_SYMBOL(devfs_mk_bdev); int devfs_mk_cdev(dev_t dev, umode_t mode, const char *fmt, ...) { - struct devfs_entry *dir = NULL, *de; - char buf[64]; va_list args; - int error, n; - - va_start(args, fmt); - n = vsnprintf(buf, 64, fmt, args); - if (n >= 64 || !buf[0]) { - printk(KERN_WARNING "%s: invalid format string\n", - __FUNCTION__); - return -EINVAL; - } if (!S_ISCHR(mode)) { printk(KERN_WARNING "%s: invalide mode (%u) for %s\n", - __FUNCTION__, mode, buf); + __FUNCTION__, mode, fmt); return -EINVAL; } - de = _devfs_prepare_leaf(&dir, buf, mode); - if (!de) { - printk(KERN_WARNING "%s: could not prepare leaf for %s\n", - __FUNCTION__, buf); - return -ENOMEM; /* could be more accurate... */ - } - - de->u.cdev.dev = dev; - - error = _devfs_append_entry(dir, de, NULL); - if (error) { - printk(KERN_WARNING "%s: could not append to parent for %s\n", - __FUNCTION__, buf); - goto out; - } - - devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED); - out: - devfs_put(dir); - return error; + va_start(args, fmt); + return devfs_mk_dev(dev, mode, fmt, args); } EXPORT_SYMBOL(devfs_mk_cdev); @@ -1663,7 +1619,7 @@ err = devfs_do_symlink(NULL, from, to, &de); if (!err) { - de->vfs_deletable = TRUE; + de->vfs = TRUE; devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED); } @@ -1732,8 +1688,8 @@ int n; va_start(args, fmt); - n = vsnprintf(buf, 64, fmt, args); - if (n < 64 && buf[0]) { + n = vsnprintf(buf, sizeof(buf), fmt, args); + if (n < sizeof(buf) && buf[0]) { devfs_handle_t de = _devfs_find_entry(NULL, buf, 0); if (!de) { @@ -1784,33 +1740,6 @@ return pos; } /* End Function devfs_generate_path */ - -/** - * devfs_get_ops - Get the device operations for a devfs entry. - * @de: The handle to the device entry. - * - * Returns a pointer to the device operations on success, else NULL. - * The use count for the module owning the operations will be incremented. - */ - -static struct file_operations *devfs_get_ops (devfs_handle_t de) -{ - struct file_operations *ops = de->u.cdev.ops; - struct module *owner; - - if (!ops) - return NULL; - owner = ops->owner; - read_lock (&de->parent->u.dir.lock); /* Prevent module from unloading */ - if ( (de->next == de) || !try_module_get (owner) ) - { /* Entry is already unhooked or module is unloading */ - read_unlock (&de->parent->u.dir.lock); - return NULL; - } - read_unlock (&de->parent->u.dir.lock); /* Module can continue unloading*/ - return ops; -} /* End Function devfs_get_ops */ - /** * devfs_setup - Process kernel boot options. * @str: The boot options after the "devfs=". @@ -1876,7 +1805,6 @@ __setup("devfs=", devfs_setup); -EXPORT_SYMBOL(devfs_put); EXPORT_SYMBOL(devfs_mk_symlink); EXPORT_SYMBOL(devfs_mk_dir); EXPORT_SYMBOL(devfs_remove); @@ -1996,6 +1924,7 @@ iput (inode); return NULL; } + /* FIXME where is devfs_put? */ inode->u.generic_ip = devfs_get (de); inode->i_ino = de->inode.ino; DPRINTK (DEBUG_I_GET, "(%d): VFS inode: %p devfs_entry: %p\n", @@ -2003,26 +1932,25 @@ inode->i_blocks = 0; inode->i_blksize = FAKE_BLOCK_SIZE; inode->i_op = &devfs_iops; - inode->i_fop = &devfs_fops; - if ( S_ISCHR (de->mode) ) - { - inode->i_rdev = de->u.cdev.dev; - } - else if ( S_ISBLK (de->mode) ) - init_special_inode(inode, de->mode, de->u.bdev.dev); - else if ( S_ISFIFO (de->mode) ) - inode->i_fop = &def_fifo_fops; - else if ( S_ISDIR (de->mode) ) - { - inode->i_op = &devfs_dir_iops; - inode->i_fop = &devfs_dir_fops; - } - else if ( S_ISLNK (de->mode) ) - { - inode->i_op = &devfs_symlink_iops; - inode->i_size = de->u.symlink.length; - } inode->i_mode = de->mode; + if (S_ISDIR(de->mode)) { + inode->i_op = &devfs_dir_iops; + inode->i_fop = &devfs_dir_fops; + } else if (S_ISLNK(de->mode)) { + inode->i_op = &devfs_symlink_iops; + inode->i_size = de->u.symlink.length; + } else if (S_ISCHR(de->mode) || S_ISBLK(de->mode)) { + init_special_inode(inode, de->mode, de->u.dev); + } else if (S_ISFIFO(de->mode) || S_ISSOCK(de->mode)) { + init_special_inode(inode, de->mode, 0); + } else { + PRINTK("(%s): unknown mode %o de: %p\n", + de->name, de->mode, de); + iput(inode); + devfs_put(de); + return NULL; + } + inode->i_uid = de->inode.uid; inode->i_gid = de->inode.gid; inode->i_atime = de->inode.atime; @@ -2098,29 +2026,37 @@ return stored; } /* End Function devfs_readdir */ +/* Open devfs specific special files */ static int devfs_open (struct inode *inode, struct file *file) { - int err = -ENODEV; - struct devfs_entry *de; - struct file_operations *ops; + int err; + int minor = MINOR(inode->i_rdev); + struct file_operations *old_fops, *new_fops; - de = get_devfs_entry_from_vfs_inode (inode); - if (de == NULL) return -ENODEV; - if ( S_ISDIR (de->mode) ) return 0; - file->private_data = de->info; - if (S_ISCHR(inode->i_mode)) { - ops = devfs_get_ops (de); /* Now have module refcount */ - file->f_op = ops; - if (file->f_op) - { - lock_kernel (); - err = file->f_op->open ? (*file->f_op->open) (inode, file) : 0; - unlock_kernel (); + switch (minor) { + case 0: /* /dev/.devfsd */ + new_fops = fops_get(&devfsd_fops); + break; +#ifdef CONFIG_DEVFS_DEBUG + case 1: /* /dev/.stat */ + new_fops = fops_get(&stat_fops); + break; +#endif + default: + return -ENODEV; } - else - err = chrdev_open (inode, file); - } - return err; + + if (new_fops == NULL) + return -ENODEV; + old_fops = file->f_op; + file->f_op = new_fops; + err = new_fops->open ? new_fops->open(inode, file) : 0; + if (err) { + file->f_op = old_fops; + fops_put(new_fops); + } else + fops_put(old_fops); + return err; } /* End Function devfs_open */ static struct file_operations devfs_fops = @@ -2132,7 +2068,6 @@ { .read = generic_read_dir, .readdir = devfs_readdir, - .open = devfs_open, }; @@ -2223,6 +2158,34 @@ devfs_handle_t parent = get_devfs_entry_from_vfs_inode (dir); struct devfs_lookup_struct *lookup_info = dentry->d_fsdata; DECLARE_WAITQUEUE (wait, current); + int need_lock; + + /* + * FIXME HACK + * + * make sure that + * d_instantiate always runs under lock + * we release i_sem lock before going to sleep + * + * unfortunately sometimes d_revalidate is called with + * and sometimes without i_sem lock held. The following checks + * attempt to deduce when we need to add (and drop resp.) lock + * here. This relies on current (2.6.2) calling coventions: + * + * lookup_hash is always run under i_sem and is passing NULL + * as nd + * + * open(...,O_CREATE,...) calls _lookup_hash under i_sem + * and sets flags to LOOKUP_OPEN|LOOKUP_CREATE + * + * all other invocations of ->d_revalidate seem to happen + * outside of i_sem + */ + need_lock = nd && + (!(nd->flags & LOOKUP_CREATE) || (nd->flags & LOOKUP_PARENT)); + + if (need_lock) + down(&dir->i_sem); if ( is_devfsd_or_child (fs_info) ) { @@ -2233,33 +2196,40 @@ "(%s): dentry: %p inode: %p de: %p by: \"%s\"\n", dentry->d_name.name, dentry, dentry->d_inode, de, current->comm); - if (dentry->d_inode) return 1; + if (dentry->d_inode) + goto out; if (de == NULL) { read_lock (&parent->u.dir.lock); de = _devfs_search_dir (parent, dentry->d_name.name, dentry->d_name.len); read_unlock (&parent->u.dir.lock); - if (de == NULL) return 1; + if (de == NULL) + goto out; lookup_info->de = de; } /* Create an inode, now that the driver information is available */ inode = _devfs_get_vfs_inode (dir->i_sb, de, dentry); - if (!inode) return 1; + if (!inode) + goto out; DPRINTK (DEBUG_I_LOOKUP, "(%s): new VFS inode(%u): %p de: %p by: \"%s\"\n", de->name, de->inode.ino, inode, de, current->comm); d_instantiate (dentry, inode); - return 1; + goto out; } - if (lookup_info == NULL) return 1; /* Early termination */ + if (lookup_info == NULL) + goto out; /* Early termination */ read_lock (&parent->u.dir.lock); if (dentry->d_fsdata) { set_current_state (TASK_UNINTERRUPTIBLE); add_wait_queue (&lookup_info->wait_queue, &wait); read_unlock (&parent->u.dir.lock); + /* at this point it is always (hopefully) locked */ + up(&dir->i_sem); schedule (); + down(&dir->i_sem); /* * This does not need nor should remove wait from wait_queue. * Wait queue head is never reused - nothing is ever added to it @@ -2271,6 +2241,10 @@ } else read_unlock (&parent->u.dir.lock); + +out: + if (need_lock) + up(&dir->i_sem); return 1; } /* End Function devfs_d_revalidate_wait */ @@ -2320,6 +2294,7 @@ revalidation */ up (&dir->i_sem); wait_for_devfsd_finished (fs_info); /* If I'm not devfsd, must wait */ + down (&dir->i_sem); /* Grab it again because them's the rules */ de = lookup_info.de; /* If someone else has been so kind as to make the inode, we go home early */ @@ -2349,7 +2324,6 @@ dentry->d_fsdata = NULL; wake_up (&lookup_info.wait_queue); write_unlock (&parent->u.dir.lock); - down (&dir->i_sem); /* Grab it again because them's the rules */ devfs_put (de); return retval; } /* End Function devfs_lookup */ @@ -2364,7 +2338,7 @@ de = get_devfs_entry_from_vfs_inode (inode); DPRINTK (DEBUG_I_UNLINK, "(%s): de: %p\n", dentry->d_name.name, de); if (de == NULL) return -ENOENT; - if (!de->vfs_deletable) return -EPERM; + if (!de->vfs) return -EPERM; write_lock (&de->parent->u.dir.lock); unhooked = _devfs_unhook (de); write_unlock (&de->parent->u.dir.lock); @@ -2392,7 +2366,7 @@ DPRINTK (DEBUG_DISABLED, "(%s): errcode from : %d\n", dentry->d_name.name, err); if (err < 0) return err; - de->vfs_deletable = TRUE; + de->vfs = TRUE; de->inode.uid = current->euid; de->inode.gid = current->egid; de->inode.atime = CURRENT_TIME; @@ -2421,7 +2395,7 @@ if (parent == NULL) return -ENOENT; de = _devfs_alloc_entry (dentry->d_name.name, dentry->d_name.len, mode); if (!de) return -ENOMEM; - de->vfs_deletable = TRUE; + de->vfs = TRUE; if ( ( err = _devfs_append_entry (parent, de, NULL) ) != 0 ) return err; de->inode.uid = current->euid; @@ -2451,7 +2425,7 @@ de = get_devfs_entry_from_vfs_inode (inode); if (de == NULL) return -ENOENT; if ( !S_ISDIR (de->mode) ) return -ENOTDIR; - if (!de->vfs_deletable) return -EPERM; + if (!de->vfs) return -EPERM; /* First ensure the directory is empty and will stay that way */ write_lock (&de->u.dir.lock); if (de->u.dir.first) err = -ENOTEMPTY; @@ -2485,11 +2459,9 @@ if (parent == NULL) return -ENOENT; de = _devfs_alloc_entry (dentry->d_name.name, dentry->d_name.len, mode); if (!de) return -ENOMEM; - de->vfs_deletable = TRUE; - if (S_ISCHR (mode)) - de->u.cdev.dev = rdev; - else if (S_ISBLK (mode)) - de->u.bdev.dev = rdev; + de->vfs = TRUE; + if (S_ISCHR(mode) || S_ISBLK(mode)) + de->u.dev = rdev; if ( ( err = _devfs_append_entry (parent, de, NULL) ) != 0 ) return err; de->inode.uid = current->euid; @@ -2642,12 +2614,9 @@ info->uid = entry->uid; info->gid = entry->gid; de = entry->de; - if (S_ISCHR(de->mode)) { - info->major = MAJOR(de->u.cdev.dev); - info->minor = MINOR(de->u.cdev.dev); - } else if (S_ISBLK (de->mode)) { - info->major = MAJOR(de->u.bdev.dev); - info->minor = MINOR(de->u.bdev.dev); + if (S_ISCHR(de->mode) || S_ISBLK(de->mode)) { + info->major = MAJOR(de->u.dev); + info->minor = MINOR(de->u.dev); } pos = devfs_generate_path (de, info->devname, DEVFS_PATHLEN); if (pos < 0) return pos; @@ -2809,30 +2778,53 @@ } /* End Function stat_read */ #endif - -static int __init init_devfs_fs (void) +static int __init init_devfs_fs(void) { - int err; + int err; + int major; + struct devfs_entry *devfsd; +#ifdef CONFIG_DEVFS_DEBUG + struct devfs_entry *stat; +#endif - printk (KERN_INFO "%s: v%s Richard Gooch (rgooch@atnf.csiro.au)\n", - DEVFS_NAME, DEVFS_VERSION); - devfsd_buf_cache = kmem_cache_create ("devfsd_event", + if (_devfs_get_root_entry() == NULL) + return -ENOMEM; + + printk(KERN_INFO "%s: %s Richard Gooch (rgooch@atnf.csiro.au)\n", + DEVFS_NAME, DEVFS_VERSION); + devfsd_buf_cache = kmem_cache_create("devfsd_event", sizeof (struct devfsd_buf_entry), 0, 0, NULL, NULL); - if (!devfsd_buf_cache) OOPS ("(): unable to allocate event slab\n"); + if (!devfsd_buf_cache) + OOPS("(): unable to allocate event slab\n"); #ifdef CONFIG_DEVFS_DEBUG - devfs_debug = devfs_debug_init; - printk (KERN_INFO "%s: devfs_debug: 0x%0x\n", DEVFS_NAME, devfs_debug); + devfs_debug = devfs_debug_init; + printk(KERN_INFO "%s: devfs_debug: 0x%0x\n", DEVFS_NAME, devfs_debug); #endif - printk (KERN_INFO "%s: boot_options: 0x%0x\n", DEVFS_NAME, boot_options); - err = register_filesystem (&devfs_fs_type); - if (!err) - { - struct vfsmount *devfs_mnt = kern_mount (&devfs_fs_type); - err = PTR_ERR (devfs_mnt); - if ( !IS_ERR (devfs_mnt) ) err = 0; - } - return err; + printk(KERN_INFO "%s: boot_options: 0x%0x\n", DEVFS_NAME, boot_options); + + /* register special device for devfsd communication */ + major = register_chrdev(0, "devfs", &devfs_fops); + if (major < 0) + return major; + + /* And create the entry for ".devfsd" */ + devfsd = _devfs_alloc_entry(".devfsd", 0, S_IFCHR|S_IRUSR|S_IWUSR); + if (devfsd == NULL ) + return -ENOMEM; + devfsd->u.dev = MKDEV(major, 0); + _devfs_append_entry(root_entry, devfsd, NULL); + +#ifdef CONFIG_DEVFS_DEBUG + stat = _devfs_alloc_entry(".stat", 0, S_IFCHR|S_IRUGO); + if (stat == NULL ) + return -ENOMEM; + stat->u.dev = MKDEV(major, 1); + _devfs_append_entry (root_entry, stat, NULL); +#endif + + err = register_filesystem(&devfs_fs_type); + return err; } /* End Function init_devfs_fs */ void __init mount_devfs_fs (void) diff -Nru a/fs/devfs/internal.h b/fs/devfs/internal.h --- a/fs/devfs/internal.h Thu Feb 19 23:44:27 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,3 +0,0 @@ - -extern dev_t devfs_alloc_devnum(umode_t mode); -extern void devfs_dealloc_devnum(umode_t mode, dev_t devnum); diff -Nru a/fs/devfs/util.c b/fs/devfs/util.c --- a/fs/devfs/util.c Thu Feb 19 23:44:25 2004 +++ b/fs/devfs/util.c Thu Feb 19 23:44:25 2004 @@ -72,7 +72,6 @@ #include #include #include -#include "internal.h" int devfs_register_tape(const char *name) @@ -96,161 +95,3 @@ } EXPORT_SYMBOL(devfs_unregister_tape); - -struct major_list -{ - spinlock_t lock; - unsigned long bits[256 / BITS_PER_LONG]; -}; -#if BITS_PER_LONG == 32 -# define INITIALISER64(low,high) (low), (high) -#else -# define INITIALISER64(low,high) ( (unsigned long) (high) << 32 | (low) ) -#endif - -/* Block majors already assigned: - 0-3, 7-9, 11-63, 65-99, 101-113, 120-127, 199, 201, 240-255 - Total free: 122 -*/ -static struct major_list block_major_list = -{SPIN_LOCK_UNLOCKED, - {INITIALISER64 (0xfffffb8f, 0xffffffff), /* Majors 0-31, 32-63 */ - INITIALISER64 (0xfffffffe, 0xff03ffef), /* Majors 64-95, 96-127 */ - INITIALISER64 (0x00000000, 0x00000000), /* Majors 128-159, 160-191 */ - INITIALISER64 (0x00000280, 0xffff0000), /* Majors 192-223, 224-255 */ - } -}; - -/* Char majors already assigned: - 0-7, 9-151, 154-158, 160-211, 216-221, 224-230, 240-255 - Total free: 19 -*/ -static struct major_list char_major_list = -{SPIN_LOCK_UNLOCKED, - {INITIALISER64 (0xfffffeff, 0xffffffff), /* Majors 0-31, 32-63 */ - INITIALISER64 (0xffffffff, 0xffffffff), /* Majors 64-95, 96-127 */ - INITIALISER64 (0x7cffffff, 0xffffffff), /* Majors 128-159, 160-191 */ - INITIALISER64 (0x3f0fffff, 0xffff007f), /* Majors 192-223, 224-255 */ - } -}; - - -/** - * devfs_alloc_major - Allocate a major number. - * @mode: The file mode (must be block device or character device). - * Returns the allocated major, else -1 if none are available. - * This routine is thread safe and does not block. - */ - - -struct minor_list -{ - int major; - unsigned long bits[256 / BITS_PER_LONG]; - struct minor_list *next; -}; - -static struct device_list { - struct minor_list *first; - struct minor_list *last; - int none_free; -} block_list, char_list; - -static DECLARE_MUTEX(device_list_mutex); - - -/** - * devfs_alloc_devnum - Allocate a device number. - * @mode: The file mode (must be block device or character device). - * - * Returns the allocated device number, else NODEV if none are available. - * This routine is thread safe and may block. - */ - -dev_t devfs_alloc_devnum(umode_t mode) -{ - struct device_list *list; - struct major_list *major_list; - struct minor_list *entry; - int minor; - - if (S_ISCHR(mode)) { - major_list = &char_major_list; - list = &char_list; - } else { - major_list = &block_major_list; - list = &block_list; - } - - down(&device_list_mutex); - if (list->none_free) - goto out_unlock; - - for (entry = list->first; entry; entry = entry->next) { - minor = find_first_zero_bit (entry->bits, 256); - if (minor >= 256) - continue; - goto out_done; - } - - /* Need to allocate a new major */ - entry = kmalloc (sizeof *entry, GFP_KERNEL); - if (!entry) - goto out_full; - memset(entry, 0, sizeof *entry); - - spin_lock(&major_list->lock); - entry->major = find_first_zero_bit(major_list->bits, 256); - if (entry->major >= 256) { - spin_unlock(&major_list->lock); - kfree(entry); - goto out_full; - } - __set_bit(entry->major, major_list->bits); - spin_unlock(&major_list->lock); - - if (!list->first) - list->first = entry; - else - list->last->next = entry; - list->last = entry; - - minor = 0; - out_done: - __set_bit(minor, entry->bits); - up(&device_list_mutex); - return MKDEV(entry->major, minor); - out_full: - list->none_free = 1; - out_unlock: - up(&device_list_mutex); - return 0; -} - - -/** - * devfs_dealloc_devnum - Dellocate a device number. - * @mode: The file mode (must be block device or character device). - * @devnum: The device number. - * - * This routine is thread safe and may block. - */ - -void devfs_dealloc_devnum(umode_t mode, dev_t devnum) -{ - struct device_list *list = S_ISCHR(mode) ? &char_list : &block_list; - struct minor_list *entry; - - if (!devnum) - return; - - down(&device_list_mutex); - for (entry = list->first; entry; entry = entry->next) { - if (entry->major == MAJOR(devnum)) { - if (__test_and_clear_bit(MINOR(devnum), entry->bits)) - list->none_free = 0; - break; - } - } - up(&device_list_mutex); -} diff -Nru a/fs/eventpoll.c b/fs/eventpoll.c --- a/fs/eventpoll.c Thu Feb 19 23:44:24 2004 +++ b/fs/eventpoll.c Thu Feb 19 23:44:24 2004 @@ -1155,8 +1155,7 @@ if (waitqueue_active(&ep->poll_wait)) pwake++; } - } else if (EP_IS_LINKED(&epi->rdllink)) - EP_LIST_DEL(&epi->rdllink); + } } write_unlock_irqrestore(&ep->lock, flags); diff -Nru a/fs/exec.c b/fs/exec.c --- a/fs/exec.c Thu Feb 19 23:44:24 2004 +++ b/fs/exec.c Thu Feb 19 23:44:24 2004 @@ -1386,7 +1386,7 @@ goto fail_unlock; format_corename(corename, core_pattern, signr); - file = filp_open(corename, O_CREAT | 2 | O_NOFOLLOW, 0600); + file = filp_open(corename, O_CREAT | 2 | O_NOFOLLOW | O_LARGEFILE, 0600); if (IS_ERR(file)) goto fail_unlock; inode = file->f_dentry->d_inode; diff -Nru a/fs/ext2/acl.c b/fs/ext2/acl.c --- a/fs/ext2/acl.c Thu Feb 19 23:44:27 2004 +++ b/fs/ext2/acl.c Thu Feb 19 23:44:27 2004 @@ -322,7 +322,8 @@ check_capabilities: /* Allowed to override Discretionary Access Control? */ - if ((mask & (MAY_READ|MAY_WRITE)) || (inode->i_mode & S_IXUGO)) + if (!(mask & MAY_EXEC) || + (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode)) if (capable(CAP_DAC_OVERRIDE)) return 0; /* Read and search granted if capable(CAP_DAC_READ_SEARCH) */ diff -Nru a/fs/ext3/acl.c b/fs/ext3/acl.c --- a/fs/ext3/acl.c Thu Feb 19 23:44:24 2004 +++ b/fs/ext3/acl.c Thu Feb 19 23:44:24 2004 @@ -327,7 +327,8 @@ check_capabilities: /* Allowed to override Discretionary Access Control? */ - if ((mask & (MAY_READ|MAY_WRITE)) || (inode->i_mode & S_IXUGO)) + if (!(mask & MAY_EXEC) || + (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode)) if (capable(CAP_DAC_OVERRIDE)) return 0; /* Read and search granted if capable(CAP_DAC_READ_SEARCH) */ diff -Nru a/fs/ext3/super.c b/fs/ext3/super.c --- a/fs/ext3/super.c Thu Feb 19 23:44:27 2004 +++ b/fs/ext3/super.c Thu Feb 19 23:44:27 2004 @@ -325,7 +325,7 @@ struct block_device *bdev; char b[BDEVNAME_SIZE]; - bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE, BDEV_FS); + bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE); if (IS_ERR(bdev)) goto fail; return bdev; @@ -342,7 +342,7 @@ static int ext3_blkdev_put(struct block_device *bdev) { bd_release(bdev); - return blkdev_put(bdev, BDEV_FS); + return blkdev_put(bdev); } static int ext3_blkdev_remove(struct ext3_sb_info *sbi) @@ -1487,7 +1487,7 @@ if (bd_claim(bdev, sb)) { printk(KERN_ERR "EXT3: failed to claim external journal device.\n"); - blkdev_put(bdev, BDEV_FS); + blkdev_put(bdev); return NULL; } diff -Nru a/fs/inode.c b/fs/inode.c --- a/fs/inode.c Thu Feb 19 23:44:28 2004 +++ b/fs/inode.c Thu Feb 19 23:44:28 2004 @@ -1327,6 +1327,16 @@ wake_up_all(wq); } +static __initdata unsigned long ihash_entries; +static int __init set_ihash_entries(char *str) +{ + if (!str) + return 0; + ihash_entries = simple_strtoul(str, &str, 0); + return 1; +} +__setup("ihash_entries=", set_ihash_entries); + /* * Initialize the waitqueues and inode hash table. */ @@ -1340,9 +1350,13 @@ for (i = 0; i < ARRAY_SIZE(i_wait_queue_heads); i++) init_waitqueue_head(&i_wait_queue_heads[i].wqh); - mempages >>= (14 - PAGE_SHIFT); - mempages *= sizeof(struct hlist_head); - for (order = 0; ((1UL << order) << PAGE_SHIFT) < mempages; order++) + if (!ihash_entries) + ihash_entries = PAGE_SHIFT < 14 ? + mempages >> (14 - PAGE_SHIFT) : + mempages << (PAGE_SHIFT - 14); + + ihash_entries *= sizeof(struct hlist_head); + for (order = 0; ((1UL << order) << PAGE_SHIFT) < ihash_entries; order++) ; do { diff -Nru a/fs/jfs/acl.c b/fs/jfs/acl.c --- a/fs/jfs/acl.c Thu Feb 19 23:44:22 2004 +++ b/fs/jfs/acl.c Thu Feb 19 23:44:22 2004 @@ -191,7 +191,8 @@ * Read/write DACs are always overridable. * Executable DACs are overridable if at least one exec bit is set. */ - if ((mask & (MAY_READ|MAY_WRITE)) || (inode->i_mode & S_IXUGO)) + if (!(mask & MAY_EXEC) || + (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode)) if (capable(CAP_DAC_OVERRIDE)) return 0; diff -Nru a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c --- a/fs/jfs/jfs_logmgr.c Thu Feb 19 23:44:25 2004 +++ b/fs/jfs/jfs_logmgr.c Thu Feb 19 23:44:25 2004 @@ -1105,8 +1105,7 @@ */ externalLog: - bdev = open_by_devnum(JFS_SBI(sb)->logdev, - FMODE_READ|FMODE_WRITE, BDEV_FS); + bdev = open_by_devnum(JFS_SBI(sb)->logdev, FMODE_READ|FMODE_WRITE); if (IS_ERR(bdev)) { rc = -PTR_ERR(bdev); goto free; @@ -1145,7 +1144,7 @@ bd_release(bdev); close: /* close external log device */ - blkdev_put(bdev, BDEV_FS); + blkdev_put(bdev); free: /* free log descriptor */ kfree(log); @@ -1392,7 +1391,7 @@ rc = lmLogShutdown(log); bd_release(bdev); - blkdev_put(bdev, BDEV_FS); + blkdev_put(bdev); out: jfs_info("lmLogClose: exit(%d)", rc); diff -Nru a/fs/jfs/jfs_unicode.c b/fs/jfs/jfs_unicode.c --- a/fs/jfs/jfs_unicode.c Thu Feb 19 23:44:27 2004 +++ b/fs/jfs/jfs_unicode.c Thu Feb 19 23:44:27 2004 @@ -1,5 +1,5 @@ /* - * Copyright (c) International Business Machines Corp., 2000-2002 + * Copyright (C) International Business Machines Corp., 2000-2004 * * 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 @@ -18,7 +18,7 @@ #include #include -#include "jfs_types.h" +#include "jfs_incore.h" #include "jfs_filsys.h" #include "jfs_unicode.h" #include "jfs_debug.h" @@ -35,16 +35,22 @@ int i; int outlen = 0; - for (i = 0; (i < len) && from[i]; i++) { - int charlen; - charlen = - codepage->uni2char(le16_to_cpu(from[i]), &to[outlen], - NLS_MAX_CHARSET_SIZE); - if (charlen > 0) { - outlen += charlen; - } else { - to[outlen++] = '?'; + if (codepage) { + for (i = 0; (i < len) && from[i]; i++) { + int charlen; + charlen = + codepage->uni2char(le16_to_cpu(from[i]), + &to[outlen], + NLS_MAX_CHARSET_SIZE); + if (charlen > 0) + outlen += charlen; + else + to[outlen++] = '?'; } + } else { + for (i = 0; (i < len) && from[i]; i++) + to[i] = (char) (le16_to_cpu(from[i])); + outlen = i; } to[outlen] = 0; return outlen; @@ -62,14 +68,22 @@ int charlen; int i; - for (i = 0; len && *from; i++, from += charlen, len -= charlen) { - charlen = codepage->char2uni(from, len, &to[i]); - if (charlen < 1) { - jfs_err("jfs_strtoUCS: char2uni returned %d.", charlen); - jfs_err("charset = %s, char = 0x%x", - codepage->charset, (unsigned char) *from); - return charlen; + if (codepage) { + for (i = 0; len && *from; i++, from += charlen, len -= charlen) + { + charlen = codepage->char2uni(from, len, &to[i]); + if (charlen < 1) { + jfs_err("jfs_strtoUCS: char2uni returned %d.", + charlen); + jfs_err("charset = %s, char = 0x%x", + codepage->charset, + (unsigned char) *from); + return charlen; + } } + } else { + for (i = 0; (i < len) && from[i]; i++) + to[i] = (wchar_t) from[i]; } to[i] = 0; @@ -82,9 +96,9 @@ * FUNCTION: Allocate and translate to unicode string * */ -int get_UCSname(struct component_name * uniName, struct dentry *dentry, - struct nls_table *nls_tab) +int get_UCSname(struct component_name * uniName, struct dentry *dentry) { + struct nls_table *nls_tab = JFS_SBI(dentry->d_sb)->nls_tab; int length = dentry->d_name.len; if (length > JFS_NAME_MAX) diff -Nru a/fs/jfs/jfs_unicode.h b/fs/jfs/jfs_unicode.h --- a/fs/jfs/jfs_unicode.h Thu Feb 19 23:44:22 2004 +++ b/fs/jfs/jfs_unicode.h Thu Feb 19 23:44:22 2004 @@ -30,8 +30,7 @@ extern signed char UniUpperTable[512]; extern UNICASERANGE UniUpperRange[]; -extern int get_UCSname(struct component_name *, struct dentry *, - struct nls_table *); +extern int get_UCSname(struct component_name *, struct dentry *); extern int jfs_strfromUCS_le(char *, const wchar_t *, int, struct nls_table *); #define free_UCSname(COMP) kfree((COMP)->name) diff -Nru a/fs/jfs/namei.c b/fs/jfs/namei.c --- a/fs/jfs/namei.c Thu Feb 19 23:44:27 2004 +++ b/fs/jfs/namei.c Thu Feb 19 23:44:27 2004 @@ -78,7 +78,7 @@ * search parent directory for entry/freespace * (dtSearch() returns parent directory page pinned) */ - if ((rc = get_UCSname(&dname, dentry, JFS_SBI(dip->i_sb)->nls_tab))) + if ((rc = get_UCSname(&dname, dentry))) goto out1; /* @@ -204,7 +204,7 @@ * search parent directory for entry/freespace * (dtSearch() returns parent directory page pinned) */ - if ((rc = get_UCSname(&dname, dentry, JFS_SBI(dip->i_sb)->nls_tab))) + if ((rc = get_UCSname(&dname, dentry))) goto out1; /* @@ -332,7 +332,7 @@ goto out; } - if ((rc = get_UCSname(&dname, dentry, JFS_SBI(dip->i_sb)->nls_tab))) { + if ((rc = get_UCSname(&dname, dentry))) { goto out; } @@ -451,7 +451,7 @@ jfs_info("jfs_unlink: dip:0x%p name:%s", dip, dentry->d_name.name); - if ((rc = get_UCSname(&dname, dentry, JFS_SBI(dip->i_sb)->nls_tab))) + if ((rc = get_UCSname(&dname, dentry))) goto out; IWRITE_LOCK(ip); @@ -786,7 +786,7 @@ /* * scan parent directory for entry/freespace */ - if ((rc = get_UCSname(&dname, dentry, JFS_SBI(ip->i_sb)->nls_tab))) + if ((rc = get_UCSname(&dname, dentry))) goto out; if ((rc = dtSearch(dir, &dname, &ino, &btstack, JFS_CREATE))) @@ -866,7 +866,7 @@ * (dtSearch() returns parent directory page pinned) */ - if ((rc = get_UCSname(&dname, dentry, JFS_SBI(dip->i_sb)->nls_tab))) + if ((rc = get_UCSname(&dname, dentry))) goto out1; /* @@ -1069,12 +1069,10 @@ old_ip = old_dentry->d_inode; new_ip = new_dentry->d_inode; - if ((rc = get_UCSname(&old_dname, old_dentry, - JFS_SBI(old_dir->i_sb)->nls_tab))) + if ((rc = get_UCSname(&old_dname, old_dentry))) goto out1; - if ((rc = get_UCSname(&new_dname, new_dentry, - JFS_SBI(old_dir->i_sb)->nls_tab))) + if ((rc = get_UCSname(&new_dname, new_dentry))) goto out2; /* @@ -1329,7 +1327,7 @@ jfs_info("jfs_mknod: %s", dentry->d_name.name); - if ((rc = get_UCSname(&dname, dentry, JFS_SBI(dir->i_sb)->nls_tab))) + if ((rc = get_UCSname(&dname, dentry))) goto out; ip = ialloc(dir, mode); @@ -1411,8 +1409,7 @@ else if (strcmp(name, "..") == 0) inum = PARENT(dip); else { - if ((rc = - get_UCSname(&key, dentry, JFS_SBI(dip->i_sb)->nls_tab))) + if ((rc = get_UCSname(&key, dentry))) return ERR_PTR(rc); rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP); free_UCSname(&key); diff -Nru a/fs/jfs/super.c b/fs/jfs/super.c --- a/fs/jfs/super.c Thu Feb 19 23:44:25 2004 +++ b/fs/jfs/super.c Thu Feb 19 23:44:25 2004 @@ -195,7 +195,8 @@ rc = jfs_umount(sb); if (rc) jfs_err("jfs_umount failed with return code %d", rc); - unload_nls(sbi->nls_tab); + if (sbi->nls_tab) + unload_nls(sbi->nls_tab); sbi->nls_tab = NULL; kfree(sbi); @@ -434,9 +435,6 @@ sb->s_root = d_alloc_root(inode); if (!sb->s_root) goto out_no_root; - - if (!sbi->nls_tab) - sbi->nls_tab = load_nls_default(); /* logical blocks are represented by 40 bits in pxd_t, etc. */ sb->s_maxbytes = ((u64) sb->s_blocksize) << 40; diff -Nru a/fs/namei.c b/fs/namei.c --- a/fs/namei.c Thu Feb 19 23:44:24 2004 +++ b/fs/namei.c Thu Feb 19 23:44:24 2004 @@ -190,7 +190,8 @@ * Read/write DACs are always overridable. * Executable DACs are overridable if at least one exec bit is set. */ - if ((mask & (MAY_READ|MAY_WRITE)) || (inode->i_mode & S_IXUGO)) + if (!(mask & MAY_EXEC) || + (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode)) if (capable(CAP_DAC_OVERRIDE)) return 0; diff -Nru a/fs/nfsd/auth.c b/fs/nfsd/auth.c --- a/fs/nfsd/auth.c Thu Feb 19 23:44:27 2004 +++ b/fs/nfsd/auth.c Thu Feb 19 23:44:27 2004 @@ -11,11 +11,26 @@ #include #define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE)) -void -nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) + +int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) { struct svc_cred *cred = &rqstp->rq_cred; - int i; + struct group_info *group_info; + int ngroups; + int i; + int ret; + + ngroups = 0; + if (!(exp->ex_flags & NFSEXP_ALLSQUASH)) { + for (i = 0; i < SVC_CRED_NGROUPS; i++) { + if (cred->cr_groups[i] == (gid_t)NOGROUP) + break; + ngroups++; + } + } + group_info = groups_alloc(ngroups); + if (group_info == NULL) + return -ENOMEM; if (exp->ex_flags & NFSEXP_ALLSQUASH) { cred->cr_uid = exp->ex_anon_uid; @@ -26,7 +41,7 @@ cred->cr_uid = exp->ex_anon_uid; if (!cred->cr_gid) cred->cr_gid = exp->ex_anon_gid; - for (i = 0; i < NGROUPS; i++) + for (i = 0; i < SVC_CRED_NGROUPS; i++) if (!cred->cr_groups[i]) cred->cr_groups[i] = exp->ex_anon_gid; } @@ -39,19 +54,24 @@ current->fsgid = cred->cr_gid; else current->fsgid = exp->ex_anon_gid; - for (i = 0; i < NGROUPS; i++) { + + for (i = 0; i < SVC_CRED_NGROUPS; i++) { gid_t group = cred->cr_groups[i]; if (group == (gid_t) NOGROUP) break; - current->groups[i] = group; + GROUP_AT(group_info, i) = group; } - current->ngroups = i; - if ((cred->cr_uid)) { - cap_t(current->cap_effective) &= ~CAP_NFSD_MASK; - } else { - cap_t(current->cap_effective) |= (CAP_NFSD_MASK & - current->cap_permitted); + ret = set_current_groups(group_info); + if (ret == 0) { + if ((cred->cr_uid)) { + cap_t(current->cap_effective) &= ~CAP_NFSD_MASK; + } else { + cap_t(current->cap_effective) |= (CAP_NFSD_MASK & + current->cap_permitted); + } } + put_group_info(group_info); + return ret; } diff -Nru a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c --- a/fs/nfsd/nfs3proc.c Thu Feb 19 23:44:24 2004 +++ b/fs/nfsd/nfs3proc.c Thu Feb 19 23:44:24 2004 @@ -595,10 +595,10 @@ { int nfserr; - dprintk("nfsd: COMMIT(3) %s %d@%ld\n", + dprintk("nfsd: COMMIT(3) %s %u@%Lu\n", SVCFH_fmt(&argp->fh), argp->count, - (unsigned long) argp->offset); + (unsigned long long) argp->offset); if (argp->offset > NFS_OFFSET_MAX) RETURN_STATUS(nfserr_inval); diff -Nru a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c --- a/fs/nfsd/nfs4state.c Thu Feb 19 23:44:26 2004 +++ b/fs/nfsd/nfs4state.c Thu Feb 19 23:44:27 2004 @@ -244,7 +244,7 @@ target->cr_uid = source->cr_uid; target->cr_gid = source->cr_gid; - for(i = 0; i < NGROUPS; i++) + for(i = 0; i < SVC_CRED_NGROUPS; i++) target->cr_groups[i] = source->cr_groups[i]; } diff -Nru a/fs/nfsd/stats.c b/fs/nfsd/stats.c --- a/fs/nfsd/stats.c Thu Feb 19 23:44:22 2004 +++ b/fs/nfsd/stats.c Thu Feb 19 23:44:22 2004 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -39,14 +40,11 @@ .program = &nfsd_program, }; -static int -nfsd_proc_read(char *buffer, char **start, off_t offset, int count, - int *eof, void *data) +static int nfsd_proc_show(struct seq_file *seq, void *v) { - int len; - int i; + int i; - len = sprintf(buffer, "rc %u %u %u\nfh %u %u %u %u %u\nio %u %u\n", + seq_printf(seq, "rc %u %u %u\nfh %u %u %u %u %u\nio %u %u\n", nfsdstats.rchits, nfsdstats.rcmisses, nfsdstats.rcnocache, @@ -58,57 +56,42 @@ nfsdstats.io_read, nfsdstats.io_write); /* thread usage: */ - len += sprintf(buffer+len, "th %u %u", nfsdstats.th_cnt, nfsdstats.th_fullcnt); + seq_printf(seq, "th %u %u", nfsdstats.th_cnt, nfsdstats.th_fullcnt); for (i=0; i<10; i++) { unsigned int jifs = nfsdstats.th_usage[i]; unsigned int sec = jifs / HZ, msec = (jifs % HZ)*1000/HZ; - len += sprintf(buffer+len, " %u.%03u", sec, msec); + seq_printf(seq, " %u.%03u", sec, msec); } /* newline and ra-cache */ - len += sprintf(buffer+len, "\nra %u", nfsdstats.ra_size); + seq_printf(seq, "\nra %u", nfsdstats.ra_size); for (i=0; i<11; i++) - len += sprintf(buffer+len, " %u", nfsdstats.ra_depth[i]); - len += sprintf(buffer+len, "\n"); + seq_printf(seq, " %u", nfsdstats.ra_depth[i]); + seq_putc(seq, '\n'); + /* show my rpc info */ + svc_seq_show(seq, &nfsd_svcstats); - /* Assume we haven't hit EOF yet. Will be set by svc_proc_read. */ - *eof = 0; - - /* - * Append generic nfsd RPC statistics if there's room for it. - */ - if (len <= offset) { - len = svc_proc_read(buffer, start, offset - len, count, - eof, data); - return len; - } - - if (len < count) { - len += svc_proc_read(buffer + len, start, 0, count - len, - eof, data); - } - - if (offset >= len) { - *start = buffer; - return 0; - } + return 0; +} - *start = buffer + offset; - if ((len -= offset) > count) - return count; - return len; +static int nfsd_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, nfsd_proc_show, NULL); } +static struct file_operations nfsd_proc_fops = { + .owner = THIS_MODULE, + .open = nfsd_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + void nfsd_stat_init(void) { - struct proc_dir_entry *ent; - - if ((ent = svc_proc_register(&nfsd_svcstats)) != 0) { - ent->read_proc = nfsd_proc_read; - ent->owner = THIS_MODULE; - } + svc_proc_register(&nfsd_svcstats, &nfsd_proc_fops); } void diff -Nru a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c --- a/fs/nfsd/vfs.c Thu Feb 19 23:44:24 2004 +++ b/fs/nfsd/vfs.c Thu Feb 19 23:44:24 2004 @@ -823,7 +823,7 @@ */ int nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, - off_t offset, unsigned long count) + loff_t offset, unsigned long count) { struct file file; int err; diff -Nru a/fs/partitions/check.c b/fs/partitions/check.c --- a/fs/partitions/check.c Thu Feb 19 23:44:27 2004 +++ b/fs/partitions/check.c Thu Feb 19 23:44:27 2004 @@ -367,7 +367,7 @@ return; bdev = bdget_disk(disk, 0); - if (blkdev_get(bdev, FMODE_READ, 0, BDEV_RAW) < 0) + if (blkdev_get(bdev, FMODE_READ, 0) < 0) return; state = check_partition(disk, bdev); if (state) { @@ -385,7 +385,7 @@ } kfree(state); } - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); } int rescan_partitions(struct gendisk *disk, struct block_device *bdev) diff -Nru a/fs/proc/array.c b/fs/proc/array.c --- a/fs/proc/array.c Thu Feb 19 23:44:26 2004 +++ b/fs/proc/array.c Thu Feb 19 23:44:26 2004 @@ -176,8 +176,10 @@ p->files ? p->files->max_fds : 0); task_unlock(p); - for (g = 0; g < p->ngroups; g++) - buffer += sprintf(buffer, "%d ", p->groups[g]); + get_group_info(p->group_info); + for (g = 0; g < min(p->group_info->ngroups,NGROUPS_SMALL); g++) + buffer += sprintf(buffer, "%d ", GROUP_AT(p->group_info,g)); + put_group_info(p->group_info); buffer += sprintf(buffer, "\n"); return buffer; diff -Nru a/fs/proc/base.c b/fs/proc/base.c --- a/fs/proc/base.c Thu Feb 19 23:44:26 2004 +++ b/fs/proc/base.c Thu Feb 19 23:44:26 2004 @@ -1582,14 +1582,13 @@ read_unlock(&tasklist_lock); if (!task) goto out; + if (!thread_group_leader(task)) + goto out_drop_task; inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO); - - if (!inode) { - put_task_struct(task); - goto out; - } + if (!inode) + goto out_drop_task; inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO; inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; @@ -1614,6 +1613,8 @@ goto out; } return NULL; +out_drop_task: + put_task_struct(task); out: return ERR_PTR(-ENOENT); } @@ -1622,6 +1623,7 @@ static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) { struct task_struct *task; + struct task_struct *leader = proc_task(dir); struct inode *inode; unsigned tid; @@ -1636,14 +1638,14 @@ read_unlock(&tasklist_lock); if (!task) goto out; + if (leader->tgid != task->tgid) + goto out_drop_task; inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO); - if (!inode) { - put_task_struct(task); - goto out; - } + if (!inode) + goto out_drop_task; inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO; inode->i_op = &proc_tid_base_inode_operations; inode->i_fop = &proc_tid_base_operations; @@ -1656,6 +1658,8 @@ put_task_struct(task); return NULL; +out_drop_task: + put_task_struct(task); out: return ERR_PTR(-ENOENT); } diff -Nru a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c --- a/fs/reiserfs/journal.c Thu Feb 19 23:44:26 2004 +++ b/fs/reiserfs/journal.c Thu Feb 19 23:44:26 2004 @@ -1895,7 +1895,7 @@ journal -> j_dev_file = NULL; journal -> j_dev_bd = NULL; } else if( journal -> j_dev_bd != NULL ) { - result = blkdev_put( journal -> j_dev_bd, BDEV_FS ); + result = blkdev_put( journal -> j_dev_bd ); journal -> j_dev_bd = NULL; } @@ -1926,7 +1926,7 @@ /* there is no "jdev" option and journal is on separate device */ if( ( !jdev_name || !jdev_name[ 0 ] ) ) { - journal->j_dev_bd = open_by_devnum(jdev, blkdev_mode, BDEV_FS); + journal->j_dev_bd = open_by_devnum(jdev, blkdev_mode); if (IS_ERR(journal->j_dev_bd)) { result = PTR_ERR(journal->j_dev_bd); journal->j_dev_bd = NULL; diff -Nru a/fs/smbfs/file.c b/fs/smbfs/file.c --- a/fs/smbfs/file.c Thu Feb 19 23:44:27 2004 +++ b/fs/smbfs/file.c Thu Feb 19 23:44:27 2004 @@ -257,6 +257,27 @@ return status; } +static ssize_t +smb_file_sendfile(struct file *file, loff_t *ppos, + size_t count, read_actor_t actor, void __user *target) +{ + struct dentry *dentry = file->f_dentry; + ssize_t status; + + VERBOSE("file %s/%s, pos=%Ld, count=%d\n", + DENTRY_PATH(dentry), *ppos, count); + + status = smb_revalidate_inode(dentry); + if (status) { + PARANOIA("%s/%s validation failed, error=%d\n", + DENTRY_PATH(dentry), status); + goto out; + } + status = generic_file_sendfile(file, ppos, count, actor, target); +out: + return status; +} + /* * This does the "real" work of the write. The generic routine has * allocated the page, locked it, done all the page alignment stuff @@ -388,6 +409,7 @@ .open = smb_file_open, .release = smb_file_release, .fsync = smb_fsync, + .sendfile = smb_file_sendfile, }; struct inode_operations smb_file_inode_operations = diff -Nru a/fs/smbfs/proc.c b/fs/smbfs/proc.c --- a/fs/smbfs/proc.c Thu Feb 19 23:44:23 2004 +++ b/fs/smbfs/proc.c Thu Feb 19 23:44:23 2004 @@ -1015,12 +1015,6 @@ p += 19; p += 8; - /* FIXME: the request will fail if the 'tid' is changed. This - should perhaps be set just before transmitting ... */ - WSET(req->rq_header, smb_tid, server->opt.tid); - WSET(req->rq_header, smb_pid, 1); - WSET(req->rq_header, smb_uid, server->opt.server_uid); - if (server->opt.protocol > SMB_PROTOCOL_CORE) { int flags = SMB_FLAGS_CASELESS_PATHNAMES; int flags2 = SMB_FLAGS2_LONG_PATH_COMPONENTS | diff -Nru a/fs/smbfs/request.c b/fs/smbfs/request.c --- a/fs/smbfs/request.c Thu Feb 19 23:44:28 2004 +++ b/fs/smbfs/request.c Thu Feb 19 23:44:28 2004 @@ -384,6 +384,12 @@ struct smb_sb_info *server = req->rq_server; int result; + if (req->rq_bytes_sent == 0) { + WSET(req->rq_header, smb_tid, server->opt.tid); + WSET(req->rq_header, smb_pid, 1); + WSET(req->rq_header, smb_uid, server->opt.server_uid); + } + result = smb_send_request(req); if (result < 0 && result != -EAGAIN) goto out; diff -Nru a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c --- a/fs/smbfs/smbiod.c Thu Feb 19 23:44:26 2004 +++ b/fs/smbfs/smbiod.c Thu Feb 19 23:44:26 2004 @@ -161,6 +161,8 @@ while (head != &server->xmitq) { req = list_entry(head, struct smb_request, rq_queue); head = head->next; + + req->rq_bytes_sent = 0; if (req->rq_flags & SMB_REQ_NORETRY) { VERBOSE("aborting request %p on xmitq\n", req); req->rq_errno = -EIO; diff -Nru a/fs/super.c b/fs/super.c --- a/fs/super.c Thu Feb 19 23:44:25 2004 +++ b/fs/super.c Thu Feb 19 23:44:25 2004 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,7 @@ #include #include #include /* for the emergency remount stuff */ +#include #include @@ -535,22 +537,26 @@ * filesystems which don't use real block-devices. -- jrs */ -enum {Max_anon = 256}; -static unsigned long unnamed_dev_in_use[Max_anon/(8*sizeof(unsigned long))]; +static struct idr unnamed_dev_idr; static spinlock_t unnamed_dev_lock = SPIN_LOCK_UNLOCKED;/* protects the above */ int set_anon_super(struct super_block *s, void *data) { int dev; + spin_lock(&unnamed_dev_lock); - dev = find_first_zero_bit(unnamed_dev_in_use, Max_anon); - if (dev == Max_anon) { + if (idr_pre_get(&unnamed_dev_idr, GFP_ATOMIC) == 0) { spin_unlock(&unnamed_dev_lock); - return -EMFILE; + return -ENOMEM; } - set_bit(dev, unnamed_dev_in_use); + dev = idr_get_new(&unnamed_dev_idr, NULL); spin_unlock(&unnamed_dev_lock); - s->s_dev = MKDEV(0, dev); + + if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) { + idr_remove(&unnamed_dev_idr, dev); + return -EMFILE; + } + s->s_dev = MKDEV(0, dev & MINORMASK); return 0; } @@ -559,14 +565,20 @@ void kill_anon_super(struct super_block *sb) { int slot = MINOR(sb->s_dev); + generic_shutdown_super(sb); spin_lock(&unnamed_dev_lock); - clear_bit(slot, unnamed_dev_in_use); + idr_remove(&unnamed_dev_idr, slot); spin_unlock(&unnamed_dev_lock); } EXPORT_SYMBOL(kill_anon_super); +void __init unnamed_dev_init(void) +{ + idr_init(&unnamed_dev_idr); +} + void kill_litter_super(struct super_block *sb) { if (sb->s_root) @@ -596,7 +608,7 @@ struct super_block *s; int error = 0; - bdev = open_bdev_excl(dev_name, flags, BDEV_FS, fs_type); + bdev = open_bdev_excl(dev_name, flags, fs_type); if (IS_ERR(bdev)) return (struct super_block *)bdev; @@ -630,7 +642,7 @@ return s; out: - close_bdev_excl(bdev, BDEV_FS); + close_bdev_excl(bdev); return s; } @@ -641,7 +653,7 @@ struct block_device *bdev = sb->s_bdev; generic_shutdown_super(sb); set_blocksize(bdev, sb->s_old_blocksize); - close_bdev_excl(bdev, BDEV_FS); + close_bdev_excl(bdev); } EXPORT_SYMBOL(kill_block_super); diff -Nru a/fs/xfs/linux/xfs_super.c b/fs/xfs/linux/xfs_super.c --- a/fs/xfs/linux/xfs_super.c Thu Feb 19 23:44:28 2004 +++ b/fs/xfs/linux/xfs_super.c Thu Feb 19 23:44:28 2004 @@ -266,7 +266,7 @@ { int error = 0; - *bdevp = open_bdev_excl(name, 0, BDEV_FS, mp); + *bdevp = open_bdev_excl(name, 0, mp); if (IS_ERR(*bdevp)) { error = PTR_ERR(*bdevp); printk("XFS: Invalid device [%s], error=%d\n", name, error); @@ -280,7 +280,7 @@ struct block_device *bdev) { if (bdev) - close_bdev_excl(bdev, BDEV_FS); + close_bdev_excl(bdev); } void diff -Nru a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c --- a/fs/xfs/xfs_inode.c Thu Feb 19 23:44:28 2004 +++ b/fs/xfs/xfs_inode.c Thu Feb 19 23:44:28 2004 @@ -3707,7 +3707,8 @@ * Read/write DACs are always overridable. * Executable DACs are overridable if at least one exec bit is set. */ - if ((orgmode & (S_IRUSR|S_IWUSR)) || (inode->i_mode & S_IXUGO)) + if (!(orgmode & S_IXUSR) || (inode->i_mode & S_IXUGO) || + (ip->i_d.di_mode & S_IFMT) == S_IFDIR) if (capable_cred(cr, CAP_DAC_OVERRIDE)) return 0; diff -Nru a/include/asm-alpha/param.h b/include/asm-alpha/param.h --- a/include/asm-alpha/param.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-alpha/param.h Thu Feb 19 23:44:24 2004 @@ -19,10 +19,6 @@ #define EXEC_PAGESIZE 8192 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-arm/param.h b/include/asm-arm/param.h --- a/include/asm-arm/param.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-arm/param.h Thu Feb 19 23:44:25 2004 @@ -26,10 +26,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-arm/tlb.h b/include/asm-arm/tlb.h --- a/include/asm-arm/tlb.h Thu Feb 19 23:44:22 2004 +++ b/include/asm-arm/tlb.h Thu Feb 19 23:44:22 2004 @@ -70,6 +70,12 @@ check_pgt_cache(); } +static inline unsigned int +tlb_is_full_mm(struct mmu_gather *tlb) +{ + return tlb->fullmm; +} + #define tlb_remove_tlb_entry(tlb,ptep,address) do { } while (0) #define tlb_start_vma(tlb,vma) \ diff -Nru a/include/asm-arm26/module.h b/include/asm-arm26/module.h --- a/include/asm-arm26/module.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-arm26/module.h Thu Feb 19 23:44:25 2004 @@ -4,9 +4,4 @@ * This file contains the arm architecture specific module code. */ -#define module_map(x) vmalloc(x) -#define module_unmap(x) vfree(x) -#define module_arch_init(x) (0) -#define arch_init_modules(x) do { } while (0) - #endif /* _ASM_ARM_MODULE_H */ diff -Nru a/include/asm-arm26/param.h b/include/asm-arm26/param.h --- a/include/asm-arm26/param.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-arm26/param.h Thu Feb 19 23:44:28 2004 @@ -22,10 +22,6 @@ # define HZ 100 #endif -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-cris/param.h b/include/asm-cris/param.h --- a/include/asm-cris/param.h Thu Feb 19 23:44:26 2004 +++ b/include/asm-cris/param.h Thu Feb 19 23:44:26 2004 @@ -14,10 +14,6 @@ #define EXEC_PAGESIZE 8192 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h --- a/include/asm-generic/tlb.h Thu Feb 19 23:44:22 2004 +++ b/include/asm-generic/tlb.h Thu Feb 19 23:44:22 2004 @@ -98,6 +98,11 @@ check_pgt_cache(); } +static inline unsigned int +tlb_is_full_mm(struct mmu_gather *tlb) +{ + return tlb->fullmm; +} /* tlb_remove_page * Must perform the equivalent to __free_pte(pte_get_and_clear(ptep)), while diff -Nru a/include/asm-h8300/module.h b/include/asm-h8300/module.h --- a/include/asm-h8300/module.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-h8300/module.h Thu Feb 19 23:44:23 2004 @@ -4,9 +4,4 @@ * This file contains the H8/300 architecture specific module code. */ -#define module_map(x) vmalloc(x) -#define module_unmap(x) vfree(x) -#define module_arch_init(x) (0) -#define arch_init_modules(x) do { } while (0) - #endif /* _ASM_H8/300_MODULE_H */ diff -Nru a/include/asm-h8300/param.h b/include/asm-h8300/param.h --- a/include/asm-h8300/param.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-h8300/param.h Thu Feb 19 23:44:24 2004 @@ -14,10 +14,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h --- a/include/asm-i386/mmzone.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-i386/mmzone.h Thu Feb 19 23:44:25 2004 @@ -10,7 +10,49 @@ #ifdef CONFIG_DISCONTIGMEM +#ifdef CONFIG_NUMA + #ifdef CONFIG_X86_NUMAQ + #include + #else /* summit or generic arch */ + #include + #endif +#else /* !CONFIG_NUMA */ + #define get_memcfg_numa get_memcfg_numa_flat + #define get_zholes_size(n) (0) +#endif /* CONFIG_NUMA */ + extern struct pglist_data *node_data[]; +#define NODE_DATA(nid) (node_data[nid]) + +/* + * generic node memory support, the following assumptions apply: + * + * 1) memory comes in 256Mb contigious chunks which are either present or not + * 2) we will not have more than 64Gb in total + * + * for now assume that 64Gb is max amount of RAM for whole system + * 64Gb / 4096bytes/page = 16777216 pages + */ +#define MAX_NR_PAGES 16777216 +#define MAX_ELEMENTS 256 +#define PAGES_PER_ELEMENT (MAX_NR_PAGES/MAX_ELEMENTS) + +extern u8 physnode_map[]; + +static inline int pfn_to_nid(unsigned long pfn) +{ +#ifdef CONFIG_NUMA + return(physnode_map[(pfn) / PAGES_PER_ELEMENT]); +#else + return 0; +#endif +} + +static inline struct pglist_data *pfn_to_pgdat(unsigned long pfn) +{ + return(NODE_DATA(pfn_to_nid(pfn))); +} + /* * Following are macros that are specific to this numa platform. @@ -43,11 +85,6 @@ */ #define kvaddr_to_nid(kaddr) pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT) -/* - * Return a pointer to the node data for node n. - */ -#define NODE_DATA(nid) (node_data[nid]) - #define node_mem_map(nid) (NODE_DATA(nid)->node_mem_map) #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) #define node_end_pfn(nid) \ @@ -80,48 +117,19 @@ + __zone->zone_start_pfn; \ }) #define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)) -/* - * pfn_valid should be made as fast as possible, and the current definition - * is valid for machines that are NUMA, but still contiguous, which is what - * is currently supported. A more generalised, but slower definition would - * be something like this - mbligh: - * ( pfn_to_pgdat(pfn) && ((pfn) < node_end_pfn(pfn_to_nid(pfn))) ) - */ -#define pfn_valid(pfn) ((pfn) < num_physpages) - -/* - * generic node memory support, the following assumptions apply: - * - * 1) memory comes in 256Mb contigious chunks which are either present or not - * 2) we will not have more than 64Gb in total - * - * for now assume that 64Gb is max amount of RAM for whole system - * 64Gb / 4096bytes/page = 16777216 pages - */ -#define MAX_NR_PAGES 16777216 -#define MAX_ELEMENTS 256 -#define PAGES_PER_ELEMENT (MAX_NR_PAGES/MAX_ELEMENTS) - -extern u8 physnode_map[]; -static inline int pfn_to_nid(unsigned long pfn) -{ - return(physnode_map[(pfn) / PAGES_PER_ELEMENT]); -} -static inline struct pglist_data *pfn_to_pgdat(unsigned long pfn) +#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */ +#define pfn_valid(pfn) ((pfn) < num_physpages) +#else +static inline int pfn_valid(int pfn) { - return(NODE_DATA(pfn_to_nid(pfn))); -} + int nid = pfn_to_nid(pfn); -#ifdef CONFIG_X86_NUMAQ -#include -#elif CONFIG_ACPI_SRAT -#include -#elif CONFIG_X86_PC -#define get_zholes_size(n) (0) -#else -#define pfn_to_nid(pfn) (0) -#endif /* CONFIG_X86_NUMAQ */ + if (nid >= 0) + return (pfn < node_end_pfn(nid)); + return 0; +} +#endif extern int get_memcfg_numa_flat(void ); /* diff -Nru a/include/asm-i386/module.h b/include/asm-i386/module.h --- a/include/asm-i386/module.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-i386/module.h Thu Feb 19 23:44:23 2004 @@ -26,6 +26,8 @@ #define MODULE_PROC_FAMILY "PENTIUMII " #elif defined CONFIG_MPENTIUMIII #define MODULE_PROC_FAMILY "PENTIUMIII " +#elif defined CONFIG_MPENTIUMM +#define MODULE_PROC_FAMILY "PENTIUMM " #elif defined CONFIG_MPENTIUM4 #define MODULE_PROC_FAMILY "PENTIUM4 " #elif defined CONFIG_MK6 @@ -46,12 +48,18 @@ #define MODULE_PROC_FAMILY "WINCHIP3D " #elif defined CONFIG_MCYRIXIII #define MODULE_PROC_FAMILY "CYRIXIII " -#elif CONFIG_MVIAC3_2 +#elif defined CONFIG_MVIAC3_2 #define MODULE_PROC_FAMILY "VIAC3-2 " #else #error unknown processor family #endif -#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY +#ifdef CONFIG_REGPARM +#define MODULE_REGPARM "REGPARM " +#else +#define MODULE_REGPARM "" +#endif + +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_REGPARM #endif /* _ASM_I386_MODULE_H */ diff -Nru a/include/asm-i386/param.h b/include/asm-i386/param.h --- a/include/asm-i386/param.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-i386/param.h Thu Feb 19 23:44:23 2004 @@ -13,10 +13,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h --- a/include/asm-i386/thread_info.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-i386/thread_info.h Thu Feb 19 23:44:23 2004 @@ -77,26 +77,42 @@ #define init_thread_info (init_thread_union.thread_info) #define init_stack (init_thread_union.stack) +#define THREAD_SIZE (2*PAGE_SIZE) + /* how to get the thread information struct from C */ static inline struct thread_info *current_thread_info(void) { struct thread_info *ti; - __asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~8191UL)); + __asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~(THREAD_SIZE - 1))); return ti; } /* thread information allocation */ -#define THREAD_SIZE (2*PAGE_SIZE) -#define alloc_thread_info(task) ((struct thread_info *)kmalloc(THREAD_SIZE, GFP_KERNEL)) +#ifdef CONFIG_DEBUG_STACK_USAGE +#define alloc_thread_info(tsk) \ + ({ \ + struct thread_info *ret; \ + \ + ret = kmalloc(THREAD_SIZE, GFP_KERNEL); \ + if (ret) \ + memset(ret, 0, THREAD_SIZE); \ + ret; \ + }) +#else +#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL) +#endif + #define free_thread_info(info) kfree(info) #define get_thread_info(ti) get_task_struct((ti)->task) #define put_thread_info(ti) put_task_struct((ti)->task) #else /* !__ASSEMBLY__ */ +#define THREAD_SIZE 8192 + /* how to get the thread information struct from ASM */ #define GET_THREAD_INFO(reg) \ - movl $-8192, reg; \ + movl $-THREAD_SIZE, reg; \ andl %esp, reg #endif diff -Nru a/include/asm-i386/timer.h b/include/asm-i386/timer.h --- a/include/asm-i386/timer.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-i386/timer.h Thu Feb 19 23:44:24 2004 @@ -40,9 +40,13 @@ #endif extern unsigned long calibrate_tsc(void); +extern void init_cpu_khz(void); #ifdef CONFIG_HPET_TIMER extern struct timer_opts timer_hpet; extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr); #endif +#ifdef CONFIG_X86_PM_TIMER +extern struct timer_opts timer_pmtmr; +#endif #endif diff -Nru a/include/asm-i386/timex.h b/include/asm-i386/timex.h --- a/include/asm-i386/timex.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-i386/timex.h Thu Feb 19 23:44:24 2004 @@ -12,7 +12,7 @@ #ifdef CONFIG_X86_PC9800 extern int CLOCK_TICK_RATE; #else -#ifdef CONFIG_MELAN +#ifdef CONFIG_X86_ELAN # define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */ #else # define CLOCK_TICK_RATE 1193182 /* Underlying HZ */ diff -Nru a/include/asm-ia64/cyclone.h b/include/asm-ia64/cyclone.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/include/asm-ia64/cyclone.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,15 @@ +#ifndef ASM_IA64_CYCLONE_H +#define ASM_IA64_CYCLONE_H + +#ifdef CONFIG_IA64_CYCLONE +extern int use_cyclone; +extern int __init cyclone_setup(char*); +#else /* CONFIG_IA64_CYCLONE */ +#define use_cyclone 0 +static inline void cyclone_setup(char* s) +{ + printk(KERN_ERR "Cyclone Counter: System not configured" + " w/ CONFIG_IA64_CYCLONE.\n"); +} +#endif /* CONFIG_IA64_CYCLONE */ +#endif /* !ASM_IA64_CYCLONE_H */ diff -Nru a/include/asm-ia64/param.h b/include/asm-ia64/param.h --- a/include/asm-ia64/param.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-ia64/param.h Thu Feb 19 23:44:25 2004 @@ -12,10 +12,6 @@ #define EXEC_PAGESIZE 65536 -#ifndef NGROUPS -# define NGROUPS 32 -#endif - #ifndef NOGROUP # define NOGROUP (-1) #endif diff -Nru a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h --- a/include/asm-ia64/pci.h Thu Feb 19 23:44:27 2004 +++ b/include/asm-ia64/pci.h Thu Feb 19 23:44:27 2004 @@ -97,6 +97,8 @@ unsigned int windows; struct pci_window *window; + + void *platform_data; }; #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata) diff -Nru a/include/asm-ia64/sn/clksupport.h b/include/asm-ia64/sn/clksupport.h --- a/include/asm-ia64/sn/clksupport.h Thu Feb 19 23:44:26 2004 +++ b/include/asm-ia64/sn/clksupport.h Thu Feb 19 23:44:26 2004 @@ -24,17 +24,16 @@ #define _ASM_IA64_SN_CLKSUPPORT_H #include +#include +#include +#include +#include typedef long clkreg_t; extern unsigned long sn_rtc_cycles_per_second; extern unsigned long sn_rtc_per_itc; - -#include -#include -#include -#include #define RTC_MASK SH_RTC_MASK #define RTC_COUNTER_ADDR ((clkreg_t*)LOCAL_MMR_ADDR(SH_RTC)) #define RTC_COMPARE_A_ADDR ((clkreg_t*)LOCAL_MMR_ADDR(SH_RTC)) diff -Nru a/include/asm-ia64/sn/dmamap.h b/include/asm-ia64/sn/dmamap.h --- a/include/asm-ia64/sn/dmamap.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-ia64/sn/dmamap.h Thu Feb 19 23:44:28 2004 @@ -8,12 +8,6 @@ #ifndef _ASM_IA64_SN_DMAMAP_H #define _ASM_IA64_SN_DMAMAP_H -#include - -#ifdef __cplusplus -extern "C" { -#endif - /* * Definitions for allocating, freeing, and using DMA maps */ @@ -42,10 +36,6 @@ paddr_t dma_addr; /* Corresponding bus addr for A24/A32 */ unsigned long dma_virtaddr; /* Beginning virtual address that is mapped */ } dmamap_t; - -#ifdef __cplusplus -} -#endif /* standard flags values for pio_map routines, * including {xtalk,pciio}_dmamap calls. diff -Nru a/include/asm-ia64/sn/driver.h b/include/asm-ia64/sn/driver.h --- a/include/asm-ia64/sn/driver.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-ia64/sn/driver.h Thu Feb 19 23:44:24 2004 @@ -23,10 +23,6 @@ /* == Driver thread priority support == */ typedef int ilvl_t; -#ifdef __cplusplus -extern "C" { -#endif - struct eframe_s; struct piomap; struct dmamap; diff -Nru a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h --- a/include/asm-ia64/sn/intr.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-ia64/sn/intr.h Thu Feb 19 23:44:23 2004 @@ -8,7 +8,6 @@ #ifndef _ASM_IA64_SN_INTR_H #define _ASM_IA64_SN_INTR_H -#include #include extern void sn_send_IPI_phys(long, int, int); diff -Nru a/include/asm-ia64/sn/io.h b/include/asm-ia64/sn/io.h --- a/include/asm-ia64/sn/io.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-ia64/sn/io.h Thu Feb 19 23:44:23 2004 @@ -9,8 +9,6 @@ #ifndef _ASM_IA64_SN_IO_H #define _ASM_IA64_SN_IO_H -#include - #include /* Because we only have PCI I/O ports. */ diff -Nru a/include/asm-ia64/sn/ioc4.h b/include/asm-ia64/sn/ioc4.h --- a/include/asm-ia64/sn/ioc4.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-ia64/sn/ioc4.h Thu Feb 19 23:44:24 2004 @@ -9,682 +9,6 @@ #ifndef _ASM_IA64_SN_IOC4_H #define _ASM_IA64_SN_IOC4_H -#if 0 - -/* - * ioc4.h - IOC4 chip header file - */ - -/* Notes: - * The IOC4 chip is a 32-bit PCI device that provides 4 serial ports, - * an IDE bus interface, a PC keyboard/mouse interface, and a real-time - * external interrupt interface. - * - * It includes an optimized DMA buffer management, and a store-and-forward - * buffer RAM. - * - * All IOC4 registers are 32 bits wide. - */ -typedef __uint32_t ioc4reg_t; - -/* - * PCI Configuration Space Register Address Map, use offset from IOC4 PCI - * configuration base such that this can be used for multiple IOC4s - */ -#define IOC4_PCI_ID 0x0 /* ID */ - -#define IOC4_VENDOR_ID_NUM 0x10A9 -#define IOC4_DEVICE_ID_NUM 0x100A -#define IOC4_ADDRSPACE_MASK 0xfff00000ULL - -#define IOC4_PCI_SCR 0x4 /* Status/Command */ -#define IOC4_PCI_REV 0x8 /* Revision */ -#define IOC4_PCI_LAT 0xC /* Latency Timer */ -#define IOC4_PCI_BAR0 0x10 /* IOC4 base address 0 */ -#define IOC4_PCI_SIDV 0x2c /* Subsys ID and vendor */ -#define IOC4_PCI_CAP 0x34 /* Capability pointer */ -#define IOC4_PCI_LATGNTINT 0x3c /* Max_lat, min_gnt, int_pin, int_line */ - -/* - * PCI Memory Space Map - */ -#define IOC4_PCI_ERR_ADDR_L 0x000 /* Low Error Address */ -#define IOC4_PCI_ERR_ADDR_VLD (0x1 << 0) -#define IOC4_PCI_ERR_ADDR_MST_ID_MSK (0xf << 1) -#define IOC4_PCI_ERR_ADDR_MUL_ERR (0x1 << 5) -#define IOC4_PCI_ERR_ADDR_ADDR_MSK (0x3ffffff << 6) - -/* Master IDs contained in PCI_ERR_ADDR_MST_ID_MSK */ -#define IOC4_MST_ID_S0_TX 0 -#define IOC4_MST_ID_S0_RX 1 -#define IOC4_MST_ID_S1_TX 2 -#define IOC4_MST_ID_S1_RX 3 -#define IOC4_MST_ID_S2_TX 4 -#define IOC4_MST_ID_S2_RX 5 -#define IOC4_MST_ID_S3_TX 6 -#define IOC4_MST_ID_S3_RX 7 -#define IOC4_MST_ID_ATA 8 - -#define IOC4_PCI_ERR_ADDR_H 0x004 /* High Error Address */ - -#define IOC4_SIO_IR 0x008 /* SIO Interrupt Register */ -#define IOC4_OTHER_IR 0x00C /* Other Interrupt Register */ - -/* These registers are read-only for general kernel code. To modify - * them use the functions in ioc4.c - */ -#define IOC4_SIO_IES_RO 0x010 /* SIO Interrupt Enable Set Reg */ -#define IOC4_OTHER_IES_RO 0x014 /* Other Interrupt Enable Set Reg */ -#define IOC4_SIO_IEC_RO 0x018 /* SIO Interrupt Enable Clear Reg */ -#define IOC4_OTHER_IEC_RO 0x01C /* Other Interrupt Enable Clear Reg */ - -#define IOC4_SIO_CR 0x020 /* SIO Control Reg */ -#define IOC4_INT_OUT 0x028 /* INT_OUT Reg (realtime interrupt) */ -#define IOC4_GPCR_S 0x030 /* GenericPIO Cntrl Set Register */ -#define IOC4_GPCR_C 0x034 /* GenericPIO Cntrl Clear Register */ -#define IOC4_GPDR 0x038 /* GenericPIO Data Register */ -#define IOC4_GPPR_0 0x040 /* GenericPIO Pin Registers */ -#define IOC4_GPPR_OFF 0x4 -#define IOC4_GPPR(x) (IOC4_GPPR_0+(x)*IOC4_GPPR_OFF) - -/* ATAPI Registers */ -#define IOC4_ATA_0 0x100 /* Data w/timing */ -#define IOC4_ATA_1 0x104 /* Error/Features w/timing */ -#define IOC4_ATA_2 0x108 /* Sector Count w/timing */ -#define IOC4_ATA_3 0x10C /* Sector Number w/timing */ -#define IOC4_ATA_4 0x110 /* Cyliner Low w/timing */ -#define IOC4_ATA_5 0x114 /* Cylinder High w/timing */ -#define IOC4_ATA_6 0x118 /* Device/Head w/timing */ -#define IOC4_ATA_7 0x11C /* Status/Command w/timing */ -#define IOC4_ATA_0_AUX 0x120 /* Aux Status/Device Cntrl w/timing */ -#define IOC4_ATA_TIMING 0x140 /* Timing value register 0 */ -#define IOC4_ATA_DMA_PTR_L 0x144 /* Low Memory Pointer to DMA List */ -#define IOC4_ATA_DMA_PTR_H 0x148 /* High Memory Pointer to DMA List */ -#define IOC4_ATA_DMA_ADDR_L 0x14C /* Low Memory DMA Address */ -#define IOC4_ATA_DMA_ADDR_H 0x150 /* High Memory DMA Addresss */ -#define IOC4_ATA_BC_DEV 0x154 /* DMA Byte Count at Device */ -#define IOC4_ATA_BC_MEM 0x158 /* DMA Byte Count at Memory */ -#define IOC4_ATA_DMA_CTRL 0x15C /* DMA Control/Status */ - -/* Keyboard and Mouse Registers */ -#define IOC4_KM_CSR 0x200 /* Kbd and Mouse Cntrl/Status Reg */ -#define IOC4_K_RD 0x204 /* Kbd Read Data Register */ -#define IOC4_M_RD 0x208 /* Mouse Read Data Register */ -#define IOC4_K_WD 0x20C /* Kbd Write Data Register */ -#define IOC4_M_WD 0x210 /* Mouse Write Data Register */ - -/* Serial Port Registers used for DMA mode serial I/O */ -#define IOC4_SBBR01_H 0x300 /* Serial Port Ring Buffers - Base Reg High for Channels 0 1*/ -#define IOC4_SBBR01_L 0x304 /* Serial Port Ring Buffers - Base Reg Low for Channels 0 1 */ -#define IOC4_SBBR23_H 0x308 /* Serial Port Ring Buffers - Base Reg High for Channels 2 3*/ -#define IOC4_SBBR23_L 0x30C /* Serial Port Ring Buffers - Base Reg Low for Channels 2 3 */ - -#define IOC4_SSCR_0 0x310 /* Serial Port 0 Control */ -#define IOC4_STPIR_0 0x314 /* Serial Port 0 TX Produce */ -#define IOC4_STCIR_0 0x318 /* Serial Port 0 TX Consume */ -#define IOC4_SRPIR_0 0x31C /* Serial Port 0 RX Produce */ -#define IOC4_SRCIR_0 0x320 /* Serial Port 0 RX Consume */ -#define IOC4_SRTR_0 0x324 /* Serial Port 0 Receive Timer Reg */ -#define IOC4_SHADOW_0 0x328 /* Serial Port 0 16550 Shadow Reg */ - -#define IOC4_SSCR_1 0x32C /* Serial Port 1 Control */ -#define IOC4_STPIR_1 0x330 /* Serial Port 1 TX Produce */ -#define IOC4_STCIR_1 0x334 /* Serial Port 1 TX Consume */ -#define IOC4_SRPIR_1 0x338 /* Serial Port 1 RX Produce */ -#define IOC4_SRCIR_1 0x33C /* Serial Port 1 RX Consume */ -#define IOC4_SRTR_1 0x340 /* Serial Port 1 Receive Timer Reg */ -#define IOC4_SHADOW_1 0x344 /* Serial Port 1 16550 Shadow Reg */ - -#define IOC4_SSCR_2 0x348 /* Serial Port 2 Control */ -#define IOC4_STPIR_2 0x34C /* Serial Port 2 TX Produce */ -#define IOC4_STCIR_2 0x350 /* Serial Port 2 TX Consume */ -#define IOC4_SRPIR_2 0x354 /* Serial Port 2 RX Produce */ -#define IOC4_SRCIR_2 0x358 /* Serial Port 2 RX Consume */ -#define IOC4_SRTR_2 0x35C /* Serial Port 2 Receive Timer Reg */ -#define IOC4_SHADOW_2 0x360 /* Serial Port 2 16550 Shadow Reg */ - -#define IOC4_SSCR_3 0x364 /* Serial Port 3 Control */ -#define IOC4_STPIR_3 0x368 /* Serial Port 3 TX Produce */ -#define IOC4_STCIR_3 0x36C /* Serial Port 3 TX Consume */ -#define IOC4_SRPIR_3 0x370 /* Serial Port 3 RX Produce */ -#define IOC4_SRCIR_3 0x374 /* Serial Port 3 RX Consume */ -#define IOC4_SRTR_3 0x378 /* Serial Port 3 Receive Timer Reg */ -#define IOC4_SHADOW_3 0x37C /* Serial Port 3 16550 Shadow Reg */ - -#define IOC4_UART0_BASE 0x380 /* UART 0 */ -#define IOC4_UART1_BASE 0x388 /* UART 1 */ -#define IOC4_UART2_BASE 0x390 /* UART 2 */ -#define IOC4_UART3_BASE 0x398 /* UART 3 */ - -/* Private page address aliases for usermode mapping */ -#define IOC4_INT_OUT_P 0x04000 /* INT_OUT Reg */ - -#define IOC4_SSCR_0_P 0x08000 /* Serial Port 0 */ -#define IOC4_STPIR_0_P 0x08004 -#define IOC4_STCIR_0_P 0x08008 /* (read-only) */ -#define IOC4_SRPIR_0_P 0x0800C /* (read-only) */ -#define IOC4_SRCIR_0_P 0x08010 -#define IOC4_SRTR_0_P 0x08014 -#define IOC4_UART_LSMSMCR_0_P 0x08018 /* (read-only) */ - -#define IOC4_SSCR_1_P 0x0C000 /* Serial Port 1 */ -#define IOC4_STPIR_1_P 0x0C004 -#define IOC4_STCIR_1_P 0x0C008 /* (read-only) */ -#define IOC4_SRPIR_1_P 0x0C00C /* (read-only) */ -#define IOC4_SRCIR_1_P 0x0C010 -#define IOC4_SRTR_1_P 0x0C014 -#define IOC4_UART_LSMSMCR_1_P 0x0C018 /* (read-only) */ - -#define IOC4_SSCR_2_P 0x10000 /* Serial Port 2 */ -#define IOC4_STPIR_2_P 0x10004 -#define IOC4_STCIR_2_P 0x10008 /* (read-only) */ -#define IOC4_SRPIR_2_P 0x1000C /* (read-only) */ -#define IOC4_SRCIR_2_P 0x10010 -#define IOC4_SRTR_2_P 0x10014 -#define IOC4_UART_LSMSMCR_2_P 0x10018 /* (read-only) */ - -#define IOC4_SSCR_3_P 0x14000 /* Serial Port 3 */ -#define IOC4_STPIR_3_P 0x14004 -#define IOC4_STCIR_3_P 0x14008 /* (read-only) */ -#define IOC4_SRPIR_3_P 0x1400C /* (read-only) */ -#define IOC4_SRCIR_3_P 0x14010 -#define IOC4_SRTR_3_P 0x14014 -#define IOC4_UART_LSMSMCR_3_P 0x14018 /* (read-only) */ - -#define IOC4_ALIAS_PAGE_SIZE 0x4000 - -/* Interrupt types */ -typedef enum ioc4_intr_type_e { - ioc4_sio_intr_type, - ioc4_other_intr_type, - ioc4_num_intr_types -} ioc4_intr_type_t; -#define ioc4_first_intr_type ioc4_sio_intr_type - -/* Bitmasks for IOC4_SIO_IR, IOC4_SIO_IEC, and IOC4_SIO_IES */ -#define IOC4_SIO_IR_S0_TX_MT 0x00000001 /* Serial port 0 TX empty */ -#define IOC4_SIO_IR_S0_RX_FULL 0x00000002 /* Port 0 RX buf full */ -#define IOC4_SIO_IR_S0_RX_HIGH 0x00000004 /* Port 0 RX hiwat */ -#define IOC4_SIO_IR_S0_RX_TIMER 0x00000008 /* Port 0 RX timeout */ -#define IOC4_SIO_IR_S0_DELTA_DCD 0x00000010 /* Port 0 delta DCD */ -#define IOC4_SIO_IR_S0_DELTA_CTS 0x00000020 /* Port 0 delta CTS */ -#define IOC4_SIO_IR_S0_INT 0x00000040 /* Port 0 pass-thru intr */ -#define IOC4_SIO_IR_S0_TX_EXPLICIT 0x00000080 /* Port 0 explicit TX thru */ -#define IOC4_SIO_IR_S1_TX_MT 0x00000100 /* Serial port 1 */ -#define IOC4_SIO_IR_S1_RX_FULL 0x00000200 /* */ -#define IOC4_SIO_IR_S1_RX_HIGH 0x00000400 /* */ -#define IOC4_SIO_IR_S1_RX_TIMER 0x00000800 /* */ -#define IOC4_SIO_IR_S1_DELTA_DCD 0x00001000 /* */ -#define IOC4_SIO_IR_S1_DELTA_CTS 0x00002000 /* */ -#define IOC4_SIO_IR_S1_INT 0x00004000 /* */ -#define IOC4_SIO_IR_S1_TX_EXPLICIT 0x00008000 /* */ -#define IOC4_SIO_IR_S2_TX_MT 0x00010000 /* Serial port 2 */ -#define IOC4_SIO_IR_S2_RX_FULL 0x00020000 /* */ -#define IOC4_SIO_IR_S2_RX_HIGH 0x00040000 /* */ -#define IOC4_SIO_IR_S2_RX_TIMER 0x00080000 /* */ -#define IOC4_SIO_IR_S2_DELTA_DCD 0x00100000 /* */ -#define IOC4_SIO_IR_S2_DELTA_CTS 0x00200000 /* */ -#define IOC4_SIO_IR_S2_INT 0x00400000 /* */ -#define IOC4_SIO_IR_S2_TX_EXPLICIT 0x00800000 /* */ -#define IOC4_SIO_IR_S3_TX_MT 0x01000000 /* Serial port 3 */ -#define IOC4_SIO_IR_S3_RX_FULL 0x02000000 /* */ -#define IOC4_SIO_IR_S3_RX_HIGH 0x04000000 /* */ -#define IOC4_SIO_IR_S3_RX_TIMER 0x08000000 /* */ -#define IOC4_SIO_IR_S3_DELTA_DCD 0x10000000 /* */ -#define IOC4_SIO_IR_S3_DELTA_CTS 0x20000000 /* */ -#define IOC4_SIO_IR_S3_INT 0x40000000 /* */ -#define IOC4_SIO_IR_S3_TX_EXPLICIT 0x80000000 /* */ - -/* Per device interrupt masks */ -#define IOC4_SIO_IR_S0 (IOC4_SIO_IR_S0_TX_MT | \ - IOC4_SIO_IR_S0_RX_FULL | \ - IOC4_SIO_IR_S0_RX_HIGH | \ - IOC4_SIO_IR_S0_RX_TIMER | \ - IOC4_SIO_IR_S0_DELTA_DCD | \ - IOC4_SIO_IR_S0_DELTA_CTS | \ - IOC4_SIO_IR_S0_INT | \ - IOC4_SIO_IR_S0_TX_EXPLICIT) -#define IOC4_SIO_IR_S1 (IOC4_SIO_IR_S1_TX_MT | \ - IOC4_SIO_IR_S1_RX_FULL | \ - IOC4_SIO_IR_S1_RX_HIGH | \ - IOC4_SIO_IR_S1_RX_TIMER | \ - IOC4_SIO_IR_S1_DELTA_DCD | \ - IOC4_SIO_IR_S1_DELTA_CTS | \ - IOC4_SIO_IR_S1_INT | \ - IOC4_SIO_IR_S1_TX_EXPLICIT) -#define IOC4_SIO_IR_S2 (IOC4_SIO_IR_S2_TX_MT | \ - IOC4_SIO_IR_S2_RX_FULL | \ - IOC4_SIO_IR_S2_RX_HIGH | \ - IOC4_SIO_IR_S2_RX_TIMER | \ - IOC4_SIO_IR_S2_DELTA_DCD | \ - IOC4_SIO_IR_S2_DELTA_CTS | \ - IOC4_SIO_IR_S2_INT | \ - IOC4_SIO_IR_S2_TX_EXPLICIT) -#define IOC4_SIO_IR_S3 (IOC4_SIO_IR_S3_TX_MT | \ - IOC4_SIO_IR_S3_RX_FULL | \ - IOC4_SIO_IR_S3_RX_HIGH | \ - IOC4_SIO_IR_S3_RX_TIMER | \ - IOC4_SIO_IR_S3_DELTA_DCD | \ - IOC4_SIO_IR_S3_DELTA_CTS | \ - IOC4_SIO_IR_S3_INT | \ - IOC4_SIO_IR_S3_TX_EXPLICIT) - -/* Bitmasks for IOC4_OTHER_IR, IOC4_OTHER_IEC, and IOC4_OTHER_IES */ -#define IOC4_OTHER_IR_ATA_INT 0x00000001 /* ATAPI intr pass-thru */ -#define IOC4_OTHER_IR_ATA_MEMERR 0x00000002 /* ATAPI DMA PCI error */ -#define IOC4_OTHER_IR_S0_MEMERR 0x00000004 /* Port 0 PCI error */ -#define IOC4_OTHER_IR_S1_MEMERR 0x00000008 /* Port 1 PCI error */ -#define IOC4_OTHER_IR_S2_MEMERR 0x00000010 /* Port 2 PCI error */ -#define IOC4_OTHER_IR_S3_MEMERR 0x00000020 /* Port 3 PCI error */ -#define IOC4_OTHER_IR_KBD_INT 0x00000040 /* Kbd/mouse intr */ -#define IOC4_OTHER_IR_ATA_DMAINT 0x00000089 /* ATAPI DMA intr */ -#define IOC4_OTHER_IR_RT_INT 0x00800000 /* RT output pulse */ -#define IOC4_OTHER_IR_GEN_INT1 0x02000000 /* RT input pulse */ -#define IOC4_OTHER_IR_GEN_INT_SHIFT 25 - -/* Per device interrupt masks */ -#define IOC4_OTHER_IR_ATA (IOC4_OTHER_IR_ATA_INT | \ - IOC4_OTHER_IR_ATA_MEMERR | \ - IOC4_OTHER_IR_ATA_DMAINT) -#define IOC4_OTHER_IR_RT (IOC4_OTHER_IR_RT_INT | IOC4_OTHER_IR_GEN_INT1) - -/* Macro to load pending interrupts */ -#define IOC4_PENDING_SIO_INTRS(mem) (PCI_INW(&((mem)->sio_ir)) & \ - PCI_INW(&((mem)->sio_ies_ro))) -#define IOC4_PENDING_OTHER_INTRS(mem) (PCI_INW(&((mem)->other_ir)) & \ - PCI_INW(&((mem)->other_ies_ro))) - -/* Bitmasks for IOC4_SIO_CR */ -#define IOC4_SIO_SR_CMD_PULSE 0x00000004 /* Byte bus strobe length */ -#define IOC4_SIO_CR_CMD_PULSE_SHIFT 0 -#define IOC4_SIO_CR_ARB_DIAG 0x00000070 /* Current non-ATA PCI bus - requester (ro) */ -#define IOC4_SIO_CR_ARB_DIAG_TX0 0x00000000 -#define IOC4_SIO_CR_ARB_DIAG_RX0 0x00000010 -#define IOC4_SIO_CR_ARB_DIAG_TX1 0x00000020 -#define IOC4_SIO_CR_ARB_DIAG_RX1 0x00000030 -#define IOC4_SIO_CR_ARB_DIAG_TX2 0x00000040 -#define IOC4_SIO_CR_ARB_DIAG_RX2 0x00000050 -#define IOC4_SIO_CR_ARB_DIAG_TX3 0x00000060 -#define IOC4_SIO_CR_ARB_DIAG_RX3 0x00000070 -#define IOC4_SIO_CR_SIO_DIAG_IDLE 0x00000080 /* 0 -> active request among - serial ports (ro) */ -#define IOC4_SIO_CR_ATA_DIAG_IDLE 0x00000100 /* 0 -> active request from - ATA port */ -#define IOC4_SIO_CR_ATA_DIAG_ACTIVE 0x00000200 /* 1 -> ATA request is winner */ - -/* Bitmasks for IOC4_INT_OUT */ -#define IOC4_INT_OUT_COUNT 0x0000ffff /* Pulse interval timer */ -#define IOC4_INT_OUT_MODE 0x00070000 /* Mode mask */ -#define IOC4_INT_OUT_MODE_0 0x00000000 /* Set output to 0 */ -#define IOC4_INT_OUT_MODE_1 0x00040000 /* Set output to 1 */ -#define IOC4_INT_OUT_MODE_1PULSE 0x00050000 /* Send 1 pulse */ -#define IOC4_INT_OUT_MODE_PULSES 0x00060000 /* Send 1 pulse every interval */ -#define IOC4_INT_OUT_MODE_SQW 0x00070000 /* Toggle output every interval */ -#define IOC4_INT_OUT_DIAG 0x40000000 /* Diag mode */ -#define IOC4_INT_OUT_INT_OUT 0x80000000 /* Current state of INT_OUT */ - -/* Time constants for IOC4_INT_OUT */ -#define IOC4_INT_OUT_NS_PER_TICK (15 * 520) /* 15 ns PCI clock, multi=520 */ -#define IOC4_INT_OUT_TICKS_PER_PULSE 3 /* Outgoing pulse lasts 3 - ticks */ -#define IOC4_INT_OUT_US_TO_COUNT(x) /* Convert uS to a count value */ \ - (((x) * 10 + IOC4_INT_OUT_NS_PER_TICK / 200) * \ - 100 / IOC4_INT_OUT_NS_PER_TICK - 1) -#define IOC4_INT_OUT_COUNT_TO_US(x) /* Convert count value to uS */ \ - (((x) + 1) * IOC4_INT_OUT_NS_PER_TICK / 1000) -#define IOC4_INT_OUT_MIN_TICKS 3 /* Min period is width of - pulse in "ticks" */ -#define IOC4_INT_OUT_MAX_TICKS IOC4_INT_OUT_COUNT /* Largest possible count */ - -/* Bitmasks for IOC4_GPCR */ -#define IOC4_GPCR_DIR 0x000000ff /* Tristate pin in or out */ -#define IOC4_GPCR_DIR_PIN(x) (1<<(x)) /* Access one of the DIR bits */ -#define IOC4_GPCR_EDGE 0x0000ff00 /* Extint edge or level - sensitive */ -#define IOC4_GPCR_EDGE_PIN(x) (1<<((x)+7 )) /* Access one of the EDGE bits */ - -/* Values for IOC4_GPCR */ -#define IOC4_GPCR_INT_OUT_EN 0x00100000 /* Enable INT_OUT to pin 0 */ -#define IOC4_GPCR_DIR_SER0_XCVR 0x00000010 /* Port 0 Transceiver select - enable */ -#define IOC4_GPCR_DIR_SER1_XCVR 0x00000020 /* Port 1 Transceiver select - enable */ -#define IOC4_GPCR_DIR_SER2_XCVR 0x00000040 /* Port 2 Transceiver select - enable */ -#define IOC4_GPCR_DIR_SER3_XCVR 0x00000080 /* Port 3 Transceiver select - enable */ - -/* Defs for some of the generic I/O pins */ -#define IOC4_GPCR_UART0_MODESEL 0x10 /* Pin is output to port 0 - mode sel */ -#define IOC4_GPCR_UART1_MODESEL 0x20 /* Pin is output to port 1 - mode sel */ -#define IOC4_GPCR_UART2_MODESEL 0x40 /* Pin is output to port 2 - mode sel */ -#define IOC4_GPCR_UART3_MODESEL 0x80 /* Pin is output to port 3 - mode sel */ - -#define IOC4_GPPR_UART0_MODESEL_PIN 4 /* GIO pin controlling - uart 0 mode select */ -#define IOC4_GPPR_UART1_MODESEL_PIN 5 /* GIO pin controlling - uart 1 mode select */ -#define IOC4_GPPR_UART2_MODESEL_PIN 6 /* GIO pin controlling - uart 2 mode select */ -#define IOC4_GPPR_UART3_MODESEL_PIN 7 /* GIO pin controlling - uart 3 mode select */ - -/* Bitmasks for IOC4_ATA_TIMING */ -#define IOC4_ATA_TIMING_ADR_SETUP 0x00000003 /* Clocks of addr set-up */ -#define IOC4_ATA_TIMING_PULSE_WIDTH 0x000001f8 /* Clocks of read or write - pulse width */ -#define IOC4_ATA_TIMING_RECOVERY 0x0000fe00 /* Clocks before next read - or write */ -#define IOC4_ATA_TIMING_USE_IORDY 0x00010000 /* PIO uses IORDY */ - -/* Bitmasks for address list elements pointed to by IOC4_ATA_DMA_PTR_ */ -#define IOC4_ATA_ALE_DMA_ADDRESS 0xfffffffffffffffe - -/* Bitmasks for byte count list elements pointed to by IOC4_ATA_DMA_PTR_ */ -#define IOC4_ATA_BCLE_BYTE_COUNT 0x000000000000fffe -#define IOC4_ATA_BCLE_LIST_END 0x0000000080000000 - -/* Bitmasks for IOC4_ATA_BC_ */ -#define IOC4_ATA_BC_BYTE_CNT 0x0001fffe /* Byte count */ - -/* Bitmasks for IOC4_ATA_DMA_CTRL */ -#define IOC4_ATA_DMA_CTRL_STRAT 0x00000001 /* 1 -> start DMA engine */ -#define IOC4_ATA_DMA_CTRL_STOP 0x00000002 /* 1 -> stop DMA engine */ -#define IOC4_ATA_DMA_CTRL_DIR 0x00000004 /* 1 -> ATA bus data copied - to memory */ -#define IOC4_ATA_DMA_CTRL_ACTIVE 0x00000008 /* DMA channel is active */ -#define IOC4_ATA_DMA_CTRL_MEM_ERROR 0x00000010 /* DMA engine encountered - a PCI error */ -/* Bitmasks for IOC4_KM_CSR */ -#define IOC4_KM_CSR_K_WRT_PEND 0x00000001 /* Kbd port xmitting or resetting */ -#define IOC4_KM_CSR_M_WRT_PEND 0x00000002 /* Mouse port xmitting or resetting */ -#define IOC4_KM_CSR_K_LCB 0x00000004 /* Line Cntrl Bit for last KBD write */ -#define IOC4_KM_CSR_M_LCB 0x00000008 /* Same for mouse */ -#define IOC4_KM_CSR_K_DATA 0x00000010 /* State of kbd data line */ -#define IOC4_KM_CSR_K_CLK 0x00000020 /* State of kbd clock line */ -#define IOC4_KM_CSR_K_PULL_DATA 0x00000040 /* Pull kbd data line low */ -#define IOC4_KM_CSR_K_PULL_CLK 0x00000080 /* Pull kbd clock line low */ -#define IOC4_KM_CSR_M_DATA 0x00000100 /* State of mouse data line */ -#define IOC4_KM_CSR_M_CLK 0x00000200 /* State of mouse clock line */ -#define IOC4_KM_CSR_M_PULL_DATA 0x00000400 /* Pull mouse data line low */ -#define IOC4_KM_CSR_M_PULL_CLK 0x00000800 /* Pull mouse clock line low */ -#define IOC4_KM_CSR_EMM_MODE 0x00001000 /* Emulation mode */ -#define IOC4_KM_CSR_SIM_MODE 0x00002000 /* Clock X8 */ -#define IOC4_KM_CSR_K_SM_IDLE 0x00004000 /* Keyboard is idle */ -#define IOC4_KM_CSR_M_SM_IDLE 0x00008000 /* Mouse is idle */ -#define IOC4_KM_CSR_K_TO 0x00010000 /* Keyboard trying to send/receive */ -#define IOC4_KM_CSR_M_TO 0x00020000 /* Mouse trying to send/receive */ -#define IOC4_KM_CSR_K_TO_EN 0x00040000 /* KM_CSR_K_TO + KM_CSR_K_TO_EN = - cause SIO_IR to assert */ -#define IOC4_KM_CSR_M_TO_EN 0x00080000 /* KM_CSR_M_TO + KM_CSR_M_TO_EN = - cause SIO_IR to assert */ -#define IOC4_KM_CSR_K_CLAMP_ONE 0x00100000 /* Pull K_CLK low after rec. one char */ -#define IOC4_KM_CSR_M_CLAMP_ONE 0x00200000 /* Pull M_CLK low after rec. one char */ -#define IOC4_KM_CSR_K_CLAMP_THREE \ - 0x00400000 /* Pull K_CLK low after rec. three chars */ -#define IOC4_KM_CSR_M_CLAMP_THREE \ - 0x00800000 /* Pull M_CLK low after rec. three char */ - -/* Bitmasks for IOC4_K_RD and IOC4_M_RD */ -#define IOC4_KM_RD_DATA_2 0x000000ff /* 3rd char recvd since last read */ -#define IOC4_KM_RD_DATA_2_SHIFT 0 -#define IOC4_KM_RD_DATA_1 0x0000ff00 /* 2nd char recvd since last read */ -#define IOC4_KM_RD_DATA_1_SHIFT 8 -#define IOC4_KM_RD_DATA_0 0x00ff0000 /* 1st char recvd since last read */ -#define IOC4_KM_RD_DATA_0_SHIFT 16 -#define IOC4_KM_RD_FRAME_ERR_2 0x01000000 /* Framing or parity error in byte 2 */ -#define IOC4_KM_RD_FRAME_ERR_1 0x02000000 /* Same for byte 1 */ -#define IOC4_KM_RD_FRAME_ERR_0 0x04000000 /* Same for byte 0 */ - -#define IOC4_KM_RD_KBD_MSE 0x08000000 /* 0 if from kbd, 1 if from mouse */ -#define IOC4_KM_RD_OFLO 0x10000000 /* 4th char recvd before this read */ -#define IOC4_KM_RD_VALID_2 0x20000000 /* DATA_2 valid */ -#define IOC4_KM_RD_VALID_1 0x40000000 /* DATA_1 valid */ -#define IOC4_KM_RD_VALID_0 0x80000000 /* DATA_0 valid */ -#define IOC4_KM_RD_VALID_ALL (IOC4_KM_RD_VALID_0 | IOC4_KM_RD_VALID_1 | \ - IOC4_KM_RD_VALID_2) - -/* Bitmasks for IOC4_K_WD & IOC4_M_WD */ -#define IOC4_KM_WD_WRT_DATA 0x000000ff /* Write to keyboard/mouse port */ -#define IOC4_KM_WD_WRT_DATA_SHIFT 0 - -/* Bitmasks for serial RX status byte */ -#define IOC4_RXSB_OVERRUN 0x01 /* Char(s) lost */ -#define IOC4_RXSB_PAR_ERR 0x02 /* Parity error */ -#define IOC4_RXSB_FRAME_ERR 0x04 /* Framing error */ -#define IOC4_RXSB_BREAK 0x08 /* Break character */ -#define IOC4_RXSB_CTS 0x10 /* State of CTS */ -#define IOC4_RXSB_DCD 0x20 /* State of DCD */ -#define IOC4_RXSB_MODEM_VALID 0x40 /* DCD, CTS, and OVERRUN are valid */ -#define IOC4_RXSB_DATA_VALID 0x80 /* Data byte, FRAME_ERR PAR_ERR & BREAK valid */ - -/* Bitmasks for serial TX control byte */ -#define IOC4_TXCB_INT_WHEN_DONE 0x20 /* Interrupt after this byte is sent */ -#define IOC4_TXCB_INVALID 0x00 /* Byte is invalid */ -#define IOC4_TXCB_VALID 0x40 /* Byte is valid */ -#define IOC4_TXCB_MCR 0x80 /* Data<7:0> to modem control register */ -#define IOC4_TXCB_DELAY 0xc0 /* Delay data<7:0> mSec */ - -/* Bitmasks for IOC4_SBBR_L */ -#define IOC4_SBBR_L_SIZE 0x00000001 /* 0 == 1KB rings, 1 == 4KB rings */ -#define IOC4_SBBR_L_BASE 0xfffff000 /* Lower serial ring base addr */ - -/* Bitmasks for IOC4_SSCR_<3:0> */ -#define IOC4_SSCR_RX_THRESHOLD 0x000001ff /* Hiwater mark */ -#define IOC4_SSCR_TX_TIMER_BUSY 0x00010000 /* TX timer in progress */ -#define IOC4_SSCR_HFC_EN 0x00020000 /* Hardware flow control enabled */ -#define IOC4_SSCR_RX_RING_DCD 0x00040000 /* Post RX record on delta-DCD */ -#define IOC4_SSCR_RX_RING_CTS 0x00080000 /* Post RX record on delta-CTS */ -#define IOC4_SSCR_DIAG 0x00200000 /* Bypass clock divider for sim */ -#define IOC4_SSCR_RX_DRAIN 0x08000000 /* Drain RX buffer to memory */ -#define IOC4_SSCR_DMA_EN 0x10000000 /* Enable ring buffer DMA */ -#define IOC4_SSCR_DMA_PAUSE 0x20000000 /* Pause DMA */ -#define IOC4_SSCR_PAUSE_STATE 0x40000000 /* Sets when PAUSE takes effect */ -#define IOC4_SSCR_RESET 0x80000000 /* Reset DMA channels */ - -/* All producer/comsumer pointers are the same bitfield */ -#define IOC4_PROD_CONS_PTR_4K 0x00000ff8 /* For 4K buffers */ -#define IOC4_PROD_CONS_PTR_1K 0x000003f8 /* For 1K buffers */ -#define IOC4_PROD_CONS_PTR_OFF 3 - -/* Bitmasks for IOC4_STPIR_<3:0> */ -/* Reserved for future register definitions */ - -/* Bitmasks for IOC4_STCIR_<3:0> */ -#define IOC4_STCIR_BYTE_CNT 0x0f000000 /* Bytes in unpacker */ -#define IOC4_STCIR_BYTE_CNT_SHIFT 24 - -/* Bitmasks for IOC4_SRPIR_<3:0> */ -#define IOC4_SRPIR_BYTE_CNT 0x0f000000 /* Bytes in packer */ -#define IOC4_SRPIR_BYTE_CNT_SHIFT 24 - -/* Bitmasks for IOC4_SRCIR_<3:0> */ -#define IOC4_SRCIR_ARM 0x80000000 /* Arm RX timer */ - -/* Bitmasks for IOC4_SHADOW_<3:0> */ -#define IOC4_SHADOW_DR 0x00000001 /* Data ready */ -#define IOC4_SHADOW_OE 0x00000002 /* Overrun error */ -#define IOC4_SHADOW_PE 0x00000004 /* Parity error */ -#define IOC4_SHADOW_FE 0x00000008 /* Framing error */ -#define IOC4_SHADOW_BI 0x00000010 /* Break interrupt */ -#define IOC4_SHADOW_THRE 0x00000020 /* Xmit holding register empty */ -#define IOC4_SHADOW_TEMT 0x00000040 /* Xmit shift register empty */ -#define IOC4_SHADOW_RFCE 0x00000080 /* Char in RX fifo has an error */ -#define IOC4_SHADOW_DCTS 0x00010000 /* Delta clear to send */ -#define IOC4_SHADOW_DDCD 0x00080000 /* Delta data carrier detect */ -#define IOC4_SHADOW_CTS 0x00100000 /* Clear to send */ -#define IOC4_SHADOW_DCD 0x00800000 /* Data carrier detect */ -#define IOC4_SHADOW_DTR 0x01000000 /* Data terminal ready */ -#define IOC4_SHADOW_RTS 0x02000000 /* Request to send */ -#define IOC4_SHADOW_OUT1 0x04000000 /* 16550 OUT1 bit */ -#define IOC4_SHADOW_OUT2 0x08000000 /* 16550 OUT2 bit */ -#define IOC4_SHADOW_LOOP 0x10000000 /* Loopback enabled */ - -/* Bitmasks for IOC4_SRTR_<3:0> */ -#define IOC4_SRTR_CNT 0x00000fff /* Reload value for RX timer */ -#define IOC4_SRTR_CNT_VAL 0x0fff0000 /* Current value of RX timer */ -#define IOC4_SRTR_CNT_VAL_SHIFT 16 -#define IOC4_SRTR_HZ 16000 /* SRTR clock frequency */ - -/* Serial port register map used for DMA and PIO serial I/O */ -typedef volatile struct ioc4_serialregs { - ioc4reg_t sscr; - ioc4reg_t stpir; - ioc4reg_t stcir; - ioc4reg_t srpir; - ioc4reg_t srcir; - ioc4reg_t srtr; - ioc4reg_t shadow; -} ioc4_sregs_t; - -/* IOC4 UART register map */ -typedef volatile struct ioc4_uartregs { - union { - char rbr; /* read only, DLAB == 0 */ - char thr; /* write only, DLAB == 0 */ - char dll; /* DLAB == 1 */ - } u1; - union { - char ier; /* DLAB == 0 */ - char dlm; /* DLAB == 1 */ - } u2; - union { - char iir; /* read only */ - char fcr; /* write only */ - } u3; - char i4u_lcr; - char i4u_mcr; - char i4u_lsr; - char i4u_msr; - char i4u_scr; -} ioc4_uart_t; - -#define i4u_rbr u1.rbr -#define i4u_thr u1.thr -#define i4u_dll u1.dll -#define i4u_ier u2.ier -#define i4u_dlm u2.dlm -#define i4u_iir u3.iir -#define i4u_fcr u3.fcr - -/* PCI config space register map */ -typedef volatile struct ioc4_configregs { - ioc4reg_t pci_id; - ioc4reg_t pci_scr; - ioc4reg_t pci_rev; - ioc4reg_t pci_lat; - ioc4reg_t pci_bar0; - ioc4reg_t pci_bar1; - ioc4reg_t pci_bar2_not_implemented; - ioc4reg_t pci_cis_ptr_not_implemented; - ioc4reg_t pci_sidv; - ioc4reg_t pci_rom_bar_not_implemented; - ioc4reg_t pci_cap; - ioc4reg_t pci_rsv; - ioc4reg_t pci_latgntint; - - char pci_fill1[0x58 - 0x3c - 4]; - - ioc4reg_t pci_pcix; - ioc4reg_t pci_pcixstatus; -} ioc4_cfg_t; - -/* PCI memory space register map addressed using pci_bar0 */ -typedef volatile struct ioc4_memregs { - - /* Miscellaneous IOC4 registers */ - ioc4reg_t pci_err_addr_l; - ioc4reg_t pci_err_addr_h; - ioc4reg_t sio_ir; - ioc4reg_t other_ir; - - /* These registers are read-only for general kernel code. To - * modify them use the functions in ioc4.c. - */ - ioc4reg_t sio_ies_ro; - ioc4reg_t other_ies_ro; - ioc4reg_t sio_iec_ro; - ioc4reg_t other_iec_ro; - ioc4reg_t sio_cr; - ioc4reg_t misc_fill1; - ioc4reg_t int_out; - ioc4reg_t misc_fill2; - ioc4reg_t gpcr_s; - ioc4reg_t gpcr_c; - ioc4reg_t gpdr; - ioc4reg_t misc_fill3; - ioc4reg_t gppr_0; - ioc4reg_t gppr_1; - ioc4reg_t gppr_2; - ioc4reg_t gppr_3; - ioc4reg_t gppr_4; - ioc4reg_t gppr_5; - ioc4reg_t gppr_6; - ioc4reg_t gppr_7; - - char misc_fill4[0x100 - 0x5C - 4]; - - /* ATA/ATAP registers */ - ioc4reg_t ata_0; - ioc4reg_t ata_1; - ioc4reg_t ata_2; - ioc4reg_t ata_3; - ioc4reg_t ata_4; - ioc4reg_t ata_5; - ioc4reg_t ata_6; - ioc4reg_t ata_7; - ioc4reg_t ata_aux; - - char ata_fill1[0x140 - 0x120 - 4]; - - ioc4reg_t ata_timing; - ioc4reg_t ata_dma_ptr_l; - ioc4reg_t ata_dma_ptr_h; - ioc4reg_t ata_dma_addr_l; - ioc4reg_t ata_dma_addr_h; - ioc4reg_t ata_bc_dev; - ioc4reg_t ata_bc_mem; - ioc4reg_t ata_dma_ctrl; - - char ata_fill2[0x200 - 0x15C - 4]; - - /* Keyboard and mouse registers */ - ioc4reg_t km_csr; - ioc4reg_t k_rd; - ioc4reg_t m_rd; - ioc4reg_t k_wd; - ioc4reg_t m_wd; - - char km_fill1[0x300 - 0x210 - 4]; - - /* Serial port registers used for DMA serial I/O */ - ioc4reg_t sbbr01_l; - ioc4reg_t sbbr01_h; - ioc4reg_t sbbr23_l; - ioc4reg_t sbbr23_h; - - ioc4_sregs_t port_0; - ioc4_sregs_t port_1; - ioc4_sregs_t port_2; - ioc4_sregs_t port_3; - - ioc4_uart_t uart_0; - ioc4_uart_t uart_1; - ioc4_uart_t uart_2; - ioc4_uart_t uart_3; -} ioc4_mem_t; - -#endif /* 0 */ - /* * Bytebus device space */ @@ -693,88 +17,4 @@ #define IOC4_BYTEBUS_DEV2 0xC0000L /* Addressed using pci_bar0 */ #define IOC4_BYTEBUS_DEV3 0xE0000L /* Addressed using pci_bar0 */ -#if 0 -/* UART clock speed */ -#define IOC4_SER_XIN_CLK 66000000 - -typedef enum ioc4_subdevs_e { - ioc4_subdev_generic, - ioc4_subdev_kbms, - ioc4_subdev_tty0, - ioc4_subdev_tty1, - ioc4_subdev_tty2, - ioc4_subdev_tty3, - ioc4_subdev_rt, - ioc4_nsubdevs -} ioc4_subdev_t; - -/* Subdevice disable bits, - * from the standard INFO_LBL_SUBDEVS - */ -#define IOC4_SDB_TTY0 (1 << ioc4_subdev_tty0) -#define IOC4_SDB_TTY1 (1 << ioc4_subdev_tty1) -#define IOC4_SDB_TTY2 (1 << ioc4_subdev_tty2) -#define IOC4_SDB_TTY3 (1 << ioc4_subdev_tty3) -#define IOC4_SDB_KBMS (1 << ioc4_subdev_kbms) -#define IOC4_SDB_RT (1 << ioc4_subdev_rt) -#define IOC4_SDB_GENERIC (1 << ioc4_subdev_generic) - -#define IOC4_ALL_SUBDEVS ((1 << ioc4_nsubdevs) - 1) - -#define IOC4_SDB_SERIAL (IOC4_SDB_TTY0 | IOC4_SDB_TTY1 | IOC4_SDB_TTY2 | IOC4_SDB_TTY3) - -#define IOC4_STD_SUBDEVS IOC4_ALL_SUBDEVS - -#define IOC4_INTA_SUBDEVS (IOC4_SDB_SERIAL | IOC4_SDB_KBMS | IOC4_SDB_RT | IOC4_SDB_GENERIC) - -extern int ioc4_subdev_enabled(vertex_hdl_t, ioc4_subdev_t); -extern void ioc4_subdev_enables(vertex_hdl_t, ulong_t); -extern void ioc4_subdev_enable(vertex_hdl_t, ioc4_subdev_t); -extern void ioc4_subdev_disable(vertex_hdl_t, ioc4_subdev_t); - -/* Macros to read and write the SIO_IEC and SIO_IES registers (see the - * comments in ioc4.c for details on why this is necessary - */ -#define IOC4_W_IES 0 -#define IOC4_W_IEC 1 -extern void ioc4_write_ireg(void *, ioc4reg_t, int, ioc4_intr_type_t); - -#define IOC4_WRITE_IES(ioc4, val, type) ioc4_write_ireg(ioc4, val, IOC4_W_IES, type) -#define IOC4_WRITE_IEC(ioc4, val, type) ioc4_write_ireg(ioc4, val, IOC4_W_IEC, type) - -typedef void -ioc4_intr_func_f (intr_arg_t, ioc4reg_t); - -typedef void -ioc4_intr_connect_f (vertex_hdl_t conn_vhdl, - ioc4_intr_type_t, - ioc4reg_t, - ioc4_intr_func_f *, - intr_arg_t info, - vertex_hdl_t owner_vhdl, - vertex_hdl_t intr_dev_vhdl, - int (*)(intr_arg_t)); - -typedef void -ioc4_intr_disconnect_f (vertex_hdl_t conn_vhdl, - ioc4_intr_type_t, - ioc4reg_t, - ioc4_intr_func_f *, - intr_arg_t info, - vertex_hdl_t owner_vhdl); - -ioc4_intr_disconnect_f ioc4_intr_disconnect; -ioc4_intr_connect_f ioc4_intr_connect; - -extern int ioc4_is_console(vertex_hdl_t conn_vhdl); - -extern void ioc4_mlreset(ioc4_cfg_t *, ioc4_mem_t *); - -extern intr_func_f ioc4_intr; - -extern ioc4_mem_t *ioc4_mem_ptr(void *ioc4_fastinfo); - -typedef ioc4_intr_func_f *ioc4_intr_func_t; - -#endif /* 0 */ -#endif /* _ASM_IA64_SN_IOC4_H */ +#endif /* _ASM_IA64_SN_IOC4_H */ diff -Nru a/include/asm-ia64/sn/ioconfig_bus.h b/include/asm-ia64/sn/ioconfig_bus.h --- a/include/asm-ia64/sn/ioconfig_bus.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-ia64/sn/ioconfig_bus.h Thu Feb 19 23:44:28 2004 @@ -9,19 +9,19 @@ #ifndef _ASM_IA64_SN_IOCONFIG_BUS_H #define _ASM_IA64_SN_IOCONFIG_BUS_H -#define IOCONFIG_PCIBUS "/boot/efi/ioconfig_pcibus" -#define POUND_CHAR '#' +#define IOCONFIG_PCIBUS "/boot/efi/ioconfig_pcibus" +#define POUND_CHAR '#' #define MAX_LINE_LEN 128 #define MAXPATHLEN 128 struct ioconfig_parm { unsigned long ioconfig_activated; - unsigned long number; - void *buffer; + unsigned long number; + void *buffer; }; -struct ascii_moduleid{ - unsigned char io_moduleid[8]; /* pci path name */ +struct ascii_moduleid { + unsigned char io_moduleid[8]; /* pci path name */ }; #endif /* _ASM_IA64_SN_IOCONFIG_BUS_H */ diff -Nru a/include/asm-ia64/sn/ioerror_handling.h b/include/asm-ia64/sn/ioerror_handling.h --- a/include/asm-ia64/sn/ioerror_handling.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-ia64/sn/ioerror_handling.h Thu Feb 19 23:44:25 2004 @@ -11,7 +11,7 @@ #include #include -#if __KERNEL__ +#ifdef __KERNEL__ /* * Basic types required for io error handling interfaces. @@ -154,89 +154,6 @@ /* Illegal response packet */ ERROR_CLASS_BAD_RESP_PKT }; - -typedef uint64_t error_class_t; - - -/* - * Error context which the error action can use. - */ -typedef void *error_context_t; -#define ERROR_CONTEXT_IGNORE ((error_context_t)-1ll) - - -/* - * Error action type. - */ -typedef error_return_code_t (*error_action_f)( error_context_t); -#define ERROR_ACTION_IGNORE ((error_action_f)-1ll) - -/* Typical set of error actions */ -typedef struct error_action_set_s { - error_action_f eas_panic; - error_action_f eas_shutdown; - error_action_f eas_abort; - error_action_f eas_retry; - error_action_f eas_failover; - error_action_f eas_log_n_ignore; - error_action_f eas_reset; -} error_action_set_t; - - -/* Set of priorites for in case mutliple error actions/states - * are trying to be prescribed for a device. - * NOTE : The ordering below encapsulates the priorities. Highest value - * corresponds to highest priority. - */ -enum error_priority_e { - ERROR_PRIORITY_IGNORE, - ERROR_PRIORITY_NONE, - ERROR_PRIORITY_NORMAL, - ERROR_PRIORITY_LOG, - ERROR_PRIORITY_FAILOVER, - ERROR_PRIORITY_RETRY, - ERROR_PRIORITY_ABORT, - ERROR_PRIORITY_SHUTDOWN, - ERROR_PRIORITY_RESTART, - ERROR_PRIORITY_PANIC -}; - -typedef uint64_t error_priority_t; - -/* Error action interfaces */ - -extern error_return_code_t error_action_set(vertex_hdl_t, - error_action_f, - error_context_t, - error_priority_t); -extern error_return_code_t error_action_perform(vertex_hdl_t); - - -#define INFO_LBL_ERROR_SKIP_ENV "error_skip_env" - -#define v_error_skip_env_get(v, l) \ -hwgraph_info_get_LBL(v, INFO_LBL_ERROR_SKIP_ENV, (arbitrary_info_t *)&l) - -#define v_error_skip_env_set(v, l, r) \ -(r ? \ - hwgraph_info_replace_LBL(v, INFO_LBL_ERROR_SKIP_ENV, (arbitrary_info_t)l,0) :\ - hwgraph_info_add_LBL(v, INFO_LBL_ERROR_SKIP_ENV, (arbitrary_info_t)l)) - -#define v_error_skip_env_clear(v) \ -hwgraph_info_remove_LBL(v, INFO_LBL_ERROR_SKIP_ENV, 0) - -typedef uint64_t counter_t; - -extern counter_t error_retry_count_get(vertex_hdl_t); -extern error_return_code_t error_retry_count_set(vertex_hdl_t,counter_t); -extern counter_t error_retry_count_increment(vertex_hdl_t); -extern counter_t error_retry_count_decrement(vertex_hdl_t); - -/* Except for the PIO Read error typically the other errors are handled in - * the context of an asynchronous error interrupt. - */ -#define IS_ERROR_INTR_CONTEXT(_ec) ((_ec & IOECODE_DMA) || \ - (_ec == IOECODE_PIO_WRITE)) #endif /* __KERNEL__ */ #endif /* _ASM_IA64_SN_IOERROR_HANDLING_H */ diff -Nru a/include/asm-ia64/sn/iograph.h b/include/asm-ia64/sn/iograph.h --- a/include/asm-ia64/sn/iograph.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-ia64/sn/iograph.h Thu Feb 19 23:44:23 2004 @@ -8,6 +8,8 @@ #ifndef _ASM_IA64_SN_IOGRAPH_H #define _ASM_IA64_SN_IOGRAPH_H +#include /* For get MAX_PORT_NUM */ + /* * During initialization, platform-dependent kernel code establishes some * basic elements of the hardware graph. This file contains edge and @@ -115,40 +117,13 @@ #define INFO_LBL_XSWITCH_VOL "_xswitch_volunteer" #define INFO_LBL_XFUNCS "_xtalk_ops" /* ops vector for gio providers */ #define INFO_LBL_XWIDGET "_xwidget" -/* Device/Driver Admin directive labels */ -#define ADMIN_LBL_INTR_TARGET "INTR_TARGET" /* Target cpu for device interrupts*/ -#define ADMIN_LBL_INTR_SWLEVEL "INTR_SWLEVEL" /* Priority level of the ithread */ - -#define ADMIN_LBL_DMATRANS_NODE "PCIBUS_DMATRANS_NODE" /* Node used for - * 32-bit Direct - * Mapping I/O - */ -#define ADMIN_LBL_DISABLED "DISABLE" /* Device has been disabled */ -#define ADMIN_LBL_DETACH "DETACH" /* Device has been detached */ - -#define ADMIN_LBL_THREAD_PRI "thread_priority" - /* Driver adminstrator - * hint parameter for - * thread priority - */ -#define ADMIN_LBL_THREAD_CLASS "thread_class" - /* Driver adminstrator - * hint parameter for - * thread priority - * default class - */ -/* Info labels that begin with '_' cannot be overwritten by an attr_set call */ -#define INFO_LBL_RESERVED(name) ((name)[0] == '_') -#if defined(__KERNEL__) + +#ifdef __KERNEL__ void init_all_devices(void); #endif /* __KERNEL__ */ -#include -#include /* For get MAX_PORT_NUM */ - int io_brick_map_widget(int, int); -int io_path_map_widget(vertex_hdl_t); /* * Map a brick's widget number to a meaningful int @@ -158,6 +133,5 @@ int ibm_type; /* brick type */ int ibm_map_wid[MAX_PORT_NUM]; /* wid to int map */ }; - #endif /* _ASM_IA64_SN_IOGRAPH_H */ diff -Nru a/include/asm-ia64/sn/leds.h b/include/asm-ia64/sn/leds.h --- a/include/asm-ia64/sn/leds.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-ia64/sn/leds.h Thu Feb 19 23:44:23 2004 @@ -8,10 +8,7 @@ * Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved. */ -#include -#include #include -#include #include #include @@ -23,7 +20,7 @@ #define LED_ALWAYS_SET 0x00 /* - * Basic macros for flashing the LEDS on an SGI, SN1. + * Basic macros for flashing the LEDS on an SGI SN. */ static __inline__ void diff -Nru a/include/asm-ia64/sn/module.h b/include/asm-ia64/sn/module.h --- a/include/asm-ia64/sn/module.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-ia64/sn/module.h Thu Feb 19 23:44:24 2004 @@ -8,12 +8,6 @@ #ifndef _ASM_IA64_SN_MODULE_H #define _ASM_IA64_SN_MODULE_H -#ifdef __cplusplus -extern "C" { -#endif - - -#include #include #include diff -Nru a/include/asm-ia64/sn/pci/pci_bus_cvlink.h b/include/asm-ia64/sn/pci/pci_bus_cvlink.h --- a/include/asm-ia64/sn/pci/pci_bus_cvlink.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-ia64/sn/pci/pci_bus_cvlink.h Thu Feb 19 23:44:28 2004 @@ -31,22 +31,26 @@ #define MAX_PCI_XWIDGET 256 #define MAX_ATE_MAPS 1024 +#define SN_DEVICE_SYSDATA(dev) \ + ((struct sn_device_sysdata *) \ + (((struct pci_controller *) ((dev)->sysdata))->platform_data)) + #define IS_PCI32G(dev) ((dev)->dma_mask >= 0xffffffff) #define IS_PCI32L(dev) ((dev)->dma_mask < 0xffffffff) #define PCIDEV_VERTEX(pci_dev) \ - (((struct sn_device_sysdata *)((pci_dev)->sysdata))->vhdl) - -#define PCIBUS_VERTEX(pci_bus) \ - (((struct sn_widget_sysdata *)((pci_bus)->sysdata))->vhdl) + ((SN_DEVICE_SYSDATA(pci_dev))->vhdl) struct sn_widget_sysdata { vertex_hdl_t vhdl; }; struct sn_device_sysdata { - vertex_hdl_t vhdl; + vertex_hdl_t vhdl; pciio_provider_t *pci_provider; + pciio_intr_t intr_handle; + struct sn_flush_device_list *dma_flush_list; + pciio_piomap_t pio_map[PCI_ROM_RESOURCE]; }; struct ioports_to_tlbs_s { diff -Nru a/include/asm-ia64/sn/sgi.h b/include/asm-ia64/sn/sgi.h --- a/include/asm-ia64/sn/sgi.h Thu Feb 19 23:44:22 2004 +++ b/include/asm-ia64/sn/sgi.h Thu Feb 19 23:44:22 2004 @@ -13,7 +13,6 @@ #include #include -#include /* for copy_??_user */ #include typedef hwgfs_handle_t vertex_hdl_t; diff -Nru a/include/asm-ia64/sn/sn2/sn_private.h b/include/asm-ia64/sn/sn2/sn_private.h --- a/include/asm-ia64/sn/sn2/sn_private.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-ia64/sn/sn2/sn_private.h Thu Feb 19 23:44:23 2004 @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff -Nru a/include/asm-ia64/tlb.h b/include/asm-ia64/tlb.h --- a/include/asm-ia64/tlb.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-ia64/tlb.h Thu Feb 19 23:44:24 2004 @@ -173,6 +173,12 @@ check_pgt_cache(); } +static inline unsigned int +tlb_is_full_mm(struct mmu_gather *tlb) +{ + return tlb->fullmm; +} + /* * Logically, this routine frees PAGE. On MP machines, the actual freeing of the page * must be delayed until after the TLB has been flushed (see comments at the beginning of diff -Nru a/include/asm-m68k/param.h b/include/asm-m68k/param.h --- a/include/asm-m68k/param.h Thu Feb 19 23:44:26 2004 +++ b/include/asm-m68k/param.h Thu Feb 19 23:44:26 2004 @@ -13,10 +13,6 @@ #define EXEC_PAGESIZE 8192 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-m68knommu/elf.h b/include/asm-m68knommu/elf.h --- a/include/asm-m68knommu/elf.h Thu Feb 19 23:44:27 2004 +++ b/include/asm-m68knommu/elf.h Thu Feb 19 23:44:27 2004 @@ -9,6 +9,33 @@ #include #include +/* + * 68k ELF relocation types + */ +#define R_68K_NONE 0 +#define R_68K_32 1 +#define R_68K_16 2 +#define R_68K_8 3 +#define R_68K_PC32 4 +#define R_68K_PC16 5 +#define R_68K_PC8 6 +#define R_68K_GOT32 7 +#define R_68K_GOT16 8 +#define R_68K_GOT8 9 +#define R_68K_GOT32O 10 +#define R_68K_GOT16O 11 +#define R_68K_GOT8O 12 +#define R_68K_PLT32 13 +#define R_68K_PLT16 14 +#define R_68K_PLT8 15 +#define R_68K_PLT32O 16 +#define R_68K_PLT16O 17 +#define R_68K_PLT8O 18 +#define R_68K_COPY 19 +#define R_68K_GLOB_DAT 20 +#define R_68K_JMP_SLOT 21 +#define R_68K_RELATIVE 22 + typedef unsigned long elf_greg_t; #define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t)) diff -Nru a/include/asm-m68knommu/param.h b/include/asm-m68knommu/param.h --- a/include/asm-m68knommu/param.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-m68knommu/param.h Thu Feb 19 23:44:25 2004 @@ -44,10 +44,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-mips/hardirq.h b/include/asm-mips/hardirq.h --- a/include/asm-mips/hardirq.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-mips/hardirq.h Thu Feb 19 23:44:24 2004 @@ -79,7 +79,7 @@ #define irq_enter() (preempt_count() += HARDIRQ_OFFSET) -#if CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT # define in_atomic() (preempt_count() != kernel_locked()) # define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) #else diff -Nru a/include/asm-mips/param.h b/include/asm-mips/param.h --- a/include/asm-mips/param.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-mips/param.h Thu Feb 19 23:44:23 2004 @@ -33,10 +33,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h --- a/include/asm-mips/pgtable-32.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-mips/pgtable-32.h Thu Feb 19 23:44:25 2004 @@ -80,7 +80,7 @@ #define VMALLOC_START KSEG2 -#if CONFIG_HIGHMEM +#ifdef CONFIG_HIGHMEM # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) #else # define VMALLOC_END (FIXADDR_START-2*PAGE_SIZE) diff -Nru a/include/asm-mips/topology.h b/include/asm-mips/topology.h --- a/include/asm-mips/topology.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-mips/topology.h Thu Feb 19 23:44:28 2004 @@ -1,7 +1,7 @@ #ifndef __ASM_TOPOLOGY_H #define __ASM_TOPOLOGY_H -#if CONFIG_SGI_IP27 +#ifdef CONFIG_SGI_IP27 #include diff -Nru a/include/asm-parisc/module.h b/include/asm-parisc/module.h --- a/include/asm-parisc/module.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-parisc/module.h Thu Feb 19 23:44:23 2004 @@ -17,11 +17,6 @@ #define Elf_Rela Elf32_Rela #endif -#define module_map(x) vmalloc(x) -#define module_unmap(x) vfree(x) -#define module_arch_init(x) (0) -#define arch_init_modules(x) do { } while (0) - struct mod_arch_specific { unsigned long got_offset, got_count, got_max; diff -Nru a/include/asm-parisc/param.h b/include/asm-parisc/param.h --- a/include/asm-parisc/param.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-parisc/param.h Thu Feb 19 23:44:24 2004 @@ -18,10 +18,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h --- a/include/asm-ppc/machdep.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-ppc/machdep.h Thu Feb 19 23:44:24 2004 @@ -104,7 +104,8 @@ }; extern struct machdep_calls ppc_md; -extern char cmd_line[512]; +#define COMMAND_LINE_SIZE 512 +extern char cmd_line[COMMAND_LINE_SIZE]; extern void setup_pci_ptrs(void); diff -Nru a/include/asm-ppc/param.h b/include/asm-ppc/param.h --- a/include/asm-ppc/param.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-ppc/param.h Thu Feb 19 23:44:24 2004 @@ -13,10 +13,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-ppc64/machdep.h b/include/asm-ppc64/machdep.h --- a/include/asm-ppc64/machdep.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-ppc64/machdep.h Thu Feb 19 23:44:24 2004 @@ -109,7 +109,8 @@ }; extern struct machdep_calls ppc_md; -extern char cmd_line[512]; +#define COMMAND_LINE_SIZE 512 +extern char cmd_line[COMMAND_LINE_SIZE]; /* Functions to produce codes on the leds. * The SRC code should be unique for the message category and should diff -Nru a/include/asm-ppc64/param.h b/include/asm-ppc64/param.h --- a/include/asm-ppc64/param.h Thu Feb 19 23:44:27 2004 +++ b/include/asm-ppc64/param.h Thu Feb 19 23:44:27 2004 @@ -20,10 +20,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h --- a/include/asm-ppc64/system.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-ppc64/system.h Thu Feb 19 23:44:28 2004 @@ -82,12 +82,12 @@ #endif #else -#define debugger(regs) 0 -#define debugger_bpt(regs) 0 -#define debugger_sstep(regs) 0 -#define debugger_iabr_match(regs) 0 -#define debugger_dabr_match(regs) 0 -#define debugger_fault_handler(regs) 0 +static inline int debugger(struct pt_regs *regs) { return 0; } +static inline int debugger_bpt(struct pt_regs *regs) { return 0; } +static inline int debugger_sstep(struct pt_regs *regs) { return 0; } +static inline int debugger_iabr_match(struct pt_regs *regs) { return 0; } +static inline int debugger_dabr_match(struct pt_regs *regs) { return 0; } +static inline int debugger_fault_handler(struct pt_regs *regs) { return 0; } #endif extern void show_regs(struct pt_regs * regs); diff -Nru a/include/asm-s390/param.h b/include/asm-s390/param.h --- a/include/asm-s390/param.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-s390/param.h Thu Feb 19 23:44:23 2004 @@ -21,10 +21,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-sh/hardirq.h b/include/asm-sh/hardirq.h --- a/include/asm-sh/hardirq.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-sh/hardirq.h Thu Feb 19 23:44:24 2004 @@ -74,7 +74,7 @@ #define nmi_enter() (irq_enter()) #define nmi_exit() (preempt_count() -= HARDIRQ_OFFSET) -#if CONFIG_PREEMPT +#ifdef CONFIG_PREEMPT # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) # define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) #else diff -Nru a/include/asm-sh/kmap_types.h b/include/asm-sh/kmap_types.h --- a/include/asm-sh/kmap_types.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-sh/kmap_types.h Thu Feb 19 23:44:25 2004 @@ -5,7 +5,7 @@ #include -#if CONFIG_DEBUG_HIGHMEM +#ifdef CONFIG_DEBUG_HIGHMEM # define D(n) __KM_FENCE_##n , #else # define D(n) diff -Nru a/include/asm-sh/param.h b/include/asm-sh/param.h --- a/include/asm-sh/param.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-sh/param.h Thu Feb 19 23:44:28 2004 @@ -17,10 +17,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-sparc/param.h b/include/asm-sparc/param.h --- a/include/asm-sparc/param.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-sparc/param.h Thu Feb 19 23:44:23 2004 @@ -14,10 +14,6 @@ #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h --- a/include/asm-sparc64/param.h Thu Feb 19 23:44:22 2004 +++ b/include/asm-sparc64/param.h Thu Feb 19 23:44:22 2004 @@ -14,10 +14,6 @@ #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-um/param.h b/include/asm-um/param.h --- a/include/asm-um/param.h Thu Feb 19 23:44:23 2004 +++ b/include/asm-um/param.h Thu Feb 19 23:44:23 2004 @@ -3,10 +3,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-v850/param.h b/include/asm-v850/param.h --- a/include/asm-v850/param.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-v850/param.h Thu Feb 19 23:44:28 2004 @@ -18,10 +18,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-x86_64/cpufeature.h b/include/asm-x86_64/cpufeature.h --- a/include/asm-x86_64/cpufeature.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-x86_64/cpufeature.h Thu Feb 19 23:44:25 2004 @@ -7,7 +7,7 @@ #ifndef __ASM_X8664_CPUFEATURE_H #define __ASM_X8664_CPUFEATURE_H -#define NCAPINTS 4 /* Currently we have 4 32-bit words worth of info */ +#define NCAPINTS 5 /* Currently we have 4 32-bit words worth of info */ /* Intel-defined CPU features, CPUID level 0x00000001, word 0 */ #define X86_FEATURE_FPU (0*32+ 0) /* Onboard FPU */ @@ -37,6 +37,7 @@ #define X86_FEATURE_XMM (0*32+25) /* Streaming SIMD Extensions */ #define X86_FEATURE_XMM2 (0*32+26) /* Streaming SIMD Extensions-2 */ #define X86_FEATURE_SELFSNOOP (0*32+27) /* CPU self snoop */ +#define X86_FEATURE_HT (0*32+28) /* Hyper-Threading */ #define X86_FEATURE_ACC (0*32+29) /* Automatic clock control */ #define X86_FEATURE_IA64 (0*32+30) /* IA-64 processor */ @@ -61,6 +62,10 @@ #define X86_FEATURE_CENTAUR_MCR (3*32+ 3) /* Centaur MCRs (= MTRRs) */ #define X86_FEATURE_K8_C (3*32+ 4) /* C stepping K8 */ +/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ +#define X86_FEATURE_EST (4*32+ 7) /* Enhanced SpeedStep */ +#define X86_FEATURE_MWAIT (4*32+ 3) /* Monitor/Mwait support */ + #define cpu_has(c, bit) test_bit(bit, (c)->x86_capability) #define boot_cpu_has(bit) test_bit(bit, boot_cpu_data.x86_capability) @@ -76,7 +81,7 @@ #define cpu_has_mmx 1 #define cpu_has_fxsr 1 #define cpu_has_xmm 1 -#define cpu_has_ht 0 /* you need to report the support from i386. sorry */ +#define cpu_has_ht boot_cpu_has(X86_FEATURE_HT) #define cpu_has_mp 1 /* XXX */ #define cpu_has_k6_mtrr 0 #define cpu_has_cyrix_arr 0 diff -Nru a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h --- a/include/asm-x86_64/msr.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-x86_64/msr.h Thu Feb 19 23:44:28 2004 @@ -121,6 +121,9 @@ return edx; } +#define MSR_IA32_UCODE_WRITE 0x79 +#define MSR_IA32_UCODE_REV 0x8b + #endif @@ -242,5 +245,124 @@ #define MSR_IA32_APICBASE_BSP (1<<8) #define MSR_IA32_APICBASE_ENABLE (1<<11) #define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x180 +#define MSR_IA32_MCG_EBX 0x181 +#define MSR_IA32_MCG_ECX 0x182 +#define MSR_IA32_MCG_EDX 0x183 +#define MSR_IA32_MCG_ESI 0x184 +#define MSR_IA32_MCG_EDI 0x185 +#define MSR_IA32_MCG_EBP 0x186 +#define MSR_IA32_MCG_ESP 0x187 +#define MSR_IA32_MCG_EFLAGS 0x188 +#define MSR_IA32_MCG_EIP 0x189 +#define MSR_IA32_MCG_RESERVED 0x18A + +#define MSR_P6_EVNTSEL0 0x186 +#define MSR_P6_EVNTSEL1 0x187 + +#define MSR_IA32_PERF_STATUS 0x198 +#define MSR_IA32_PERF_CTL 0x199 + +#define MSR_IA32_THERM_CONTROL 0x19a +#define MSR_IA32_THERM_INTERRUPT 0x19b +#define MSR_IA32_THERM_STATUS 0x19c +#define MSR_IA32_MISC_ENABLE 0x1a0 + +#define MSR_IA32_DEBUGCTLMSR 0x1d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x1db +#define MSR_IA32_LASTBRANCHTOIP 0x1dc +#define MSR_IA32_LASTINTFROMIP 0x1dd +#define MSR_IA32_LASTINTTOIP 0x1de + +#define MSR_IA32_MC0_CTL 0x400 +#define MSR_IA32_MC0_STATUS 0x401 +#define MSR_IA32_MC0_ADDR 0x402 +#define MSR_IA32_MC0_MISC 0x403 + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x300 +#define MSR_P4_BPU_PERFCTR1 0x301 +#define MSR_P4_BPU_PERFCTR2 0x302 +#define MSR_P4_BPU_PERFCTR3 0x303 +#define MSR_P4_MS_PERFCTR0 0x304 +#define MSR_P4_MS_PERFCTR1 0x305 +#define MSR_P4_MS_PERFCTR2 0x306 +#define MSR_P4_MS_PERFCTR3 0x307 +#define MSR_P4_FLAME_PERFCTR0 0x308 +#define MSR_P4_FLAME_PERFCTR1 0x309 +#define MSR_P4_FLAME_PERFCTR2 0x30a +#define MSR_P4_FLAME_PERFCTR3 0x30b +#define MSR_P4_IQ_PERFCTR0 0x30c +#define MSR_P4_IQ_PERFCTR1 0x30d +#define MSR_P4_IQ_PERFCTR2 0x30e +#define MSR_P4_IQ_PERFCTR3 0x30f +#define MSR_P4_IQ_PERFCTR4 0x310 +#define MSR_P4_IQ_PERFCTR5 0x311 +#define MSR_P4_BPU_CCCR0 0x360 +#define MSR_P4_BPU_CCCR1 0x361 +#define MSR_P4_BPU_CCCR2 0x362 +#define MSR_P4_BPU_CCCR3 0x363 +#define MSR_P4_MS_CCCR0 0x364 +#define MSR_P4_MS_CCCR1 0x365 +#define MSR_P4_MS_CCCR2 0x366 +#define MSR_P4_MS_CCCR3 0x367 +#define MSR_P4_FLAME_CCCR0 0x368 +#define MSR_P4_FLAME_CCCR1 0x369 +#define MSR_P4_FLAME_CCCR2 0x36a +#define MSR_P4_FLAME_CCCR3 0x36b +#define MSR_P4_IQ_CCCR0 0x36c +#define MSR_P4_IQ_CCCR1 0x36d +#define MSR_P4_IQ_CCCR2 0x36e +#define MSR_P4_IQ_CCCR3 0x36f +#define MSR_P4_IQ_CCCR4 0x370 +#define MSR_P4_IQ_CCCR5 0x371 +#define MSR_P4_ALF_ESCR0 0x3ca +#define MSR_P4_ALF_ESCR1 0x3cb +#define MSR_P4_BPU_ESCR0 0x3b2 +#define MSR_P4_BPU_ESCR1 0x3b3 +#define MSR_P4_BSU_ESCR0 0x3a0 +#define MSR_P4_BSU_ESCR1 0x3a1 +#define MSR_P4_CRU_ESCR0 0x3b8 +#define MSR_P4_CRU_ESCR1 0x3b9 +#define MSR_P4_CRU_ESCR2 0x3cc +#define MSR_P4_CRU_ESCR3 0x3cd +#define MSR_P4_CRU_ESCR4 0x3e0 +#define MSR_P4_CRU_ESCR5 0x3e1 +#define MSR_P4_DAC_ESCR0 0x3a8 +#define MSR_P4_DAC_ESCR1 0x3a9 +#define MSR_P4_FIRM_ESCR0 0x3a4 +#define MSR_P4_FIRM_ESCR1 0x3a5 +#define MSR_P4_FLAME_ESCR0 0x3a6 +#define MSR_P4_FLAME_ESCR1 0x3a7 +#define MSR_P4_FSB_ESCR0 0x3a2 +#define MSR_P4_FSB_ESCR1 0x3a3 +#define MSR_P4_IQ_ESCR0 0x3ba +#define MSR_P4_IQ_ESCR1 0x3bb +#define MSR_P4_IS_ESCR0 0x3b4 +#define MSR_P4_IS_ESCR1 0x3b5 +#define MSR_P4_ITLB_ESCR0 0x3b6 +#define MSR_P4_ITLB_ESCR1 0x3b7 +#define MSR_P4_IX_ESCR0 0x3c8 +#define MSR_P4_IX_ESCR1 0x3c9 +#define MSR_P4_MOB_ESCR0 0x3aa +#define MSR_P4_MOB_ESCR1 0x3ab +#define MSR_P4_MS_ESCR0 0x3c0 +#define MSR_P4_MS_ESCR1 0x3c1 +#define MSR_P4_PMH_ESCR0 0x3ac +#define MSR_P4_PMH_ESCR1 0x3ad +#define MSR_P4_RAT_ESCR0 0x3bc +#define MSR_P4_RAT_ESCR1 0x3bd +#define MSR_P4_SAAT_ESCR0 0x3ae +#define MSR_P4_SAAT_ESCR1 0x3af +#define MSR_P4_SSU_ESCR0 0x3be +#define MSR_P4_SSU_ESCR1 0x3bf /* guess: not defined in manual */ +#define MSR_P4_TBPU_ESCR0 0x3c2 +#define MSR_P4_TBPU_ESCR1 0x3c3 +#define MSR_P4_TC_ESCR0 0x3c4 +#define MSR_P4_TC_ESCR1 0x3c5 +#define MSR_P4_U2L_ESCR0 0x3b0 +#define MSR_P4_U2L_ESCR1 0x3b1 #endif diff -Nru a/include/asm-x86_64/param.h b/include/asm-x86_64/param.h --- a/include/asm-x86_64/param.h Thu Feb 19 23:44:25 2004 +++ b/include/asm-x86_64/param.h Thu Feb 19 23:44:25 2004 @@ -13,10 +13,6 @@ #define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif - #ifndef NOGROUP #define NOGROUP (-1) #endif diff -Nru a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h --- a/include/asm-x86_64/pci.h Thu Feb 19 23:44:24 2004 +++ b/include/asm-x86_64/pci.h Thu Feb 19 23:44:24 2004 @@ -72,6 +72,23 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle); +#ifdef CONFIG_SWIOTLB +extern int swiotlb; +extern dma_addr_t swiotlb_map_single (struct device *hwdev, void *ptr, size_t size, + int dir); +extern void swiotlb_unmap_single (struct device *hwdev, dma_addr_t dev_addr, + size_t size, int dir); +extern void swiotlb_sync_single (struct device *hwdev, dma_addr_t dev_addr, + size_t size, int dir); +extern void swiotlb_sync_sg (struct device *hwdev, struct scatterlist *sg, int nelems, + int dir); +extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, + int nents, int direction); +extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, + int nents, int direction); + +#endif + #ifdef CONFIG_GART_IOMMU /* Map a single buffer of the indicated size for DMA in streaming mode. @@ -113,6 +130,13 @@ size_t size, int direction) { BUG_ON(direction == PCI_DMA_NONE); + +#ifdef CONFIG_SWIOTLB + if (swiotlb) + return swiotlb_sync_single(&hwdev->dev,dma_handle,size,direction); +#endif + + flush_write_buffers(); } static inline void pci_dma_sync_sg(struct pci_dev *hwdev, @@ -120,6 +144,12 @@ int nelems, int direction) { BUG_ON(direction == PCI_DMA_NONE); + +#ifdef CONFIG_SWIOTLB + if (swiotlb) + return swiotlb_sync_sg(&hwdev->dev,sg,nelems,direction); +#endif + flush_write_buffers(); } /* The PCI address space does equal the physical memory @@ -271,5 +301,7 @@ /* generic pci stuff */ #include + +#include #endif /* __x8664_PCI_H */ diff -Nru a/include/asm-x86_64/processor.h b/include/asm-x86_64/processor.h --- a/include/asm-x86_64/processor.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-x86_64/processor.h Thu Feb 19 23:44:28 2004 @@ -303,6 +303,67 @@ (((struct pt_regs *)(tsk->thread.rsp0 - sizeof(struct pt_regs)))->rip) #define KSTK_ESP(tsk) -1 /* sorry. doesn't work for syscall. */ + +struct microcode_header { + unsigned int hdrver; + unsigned int rev; + unsigned int date; + unsigned int sig; + unsigned int cksum; + unsigned int ldrver; + unsigned int pf; + unsigned int datasize; + unsigned int totalsize; + unsigned int reserved[3]; +}; + +struct microcode { + struct microcode_header hdr; + unsigned int bits[0]; +}; + +typedef struct microcode microcode_t; +typedef struct microcode_header microcode_header_t; + +/* microcode format is extended from prescott processors */ +struct extended_signature { + unsigned int sig; + unsigned int pf; + unsigned int cksum; +}; + +struct extended_sigtable { + unsigned int count; + unsigned int cksum; + unsigned int reserved[3]; + struct extended_signature sigs[0]; +}; + +/* '6' because it used to be for P6 only (but now covers Pentium 4 as well) */ +#define MICROCODE_IOCFREE _IO('6',0) + + +#define ASM_NOP1 K8_NOP1 +#define ASM_NOP2 K8_NOP2 +#define ASM_NOP3 K8_NOP3 +#define ASM_NOP4 K8_NOP4 +#define ASM_NOP5 K8_NOP5 +#define ASM_NOP6 K8_NOP6 +#define ASM_NOP7 K8_NOP7 +#define ASM_NOP8 K8_NOP8 + +/* Opteron nops */ +#define K8_NOP1 ".byte 0x90\n" +#define K8_NOP2 ".byte 0x66,0x90\n" +#define K8_NOP3 ".byte 0x66,0x66,0x90\n" +#define K8_NOP4 ".byte 0x66,0x66,0x66,0x90\n" +#define K8_NOP5 K8_NOP3 K8_NOP2 +#define K8_NOP6 K8_NOP3 K8_NOP3 +#define K8_NOP7 K8_NOP4 K8_NOP3 +#define K8_NOP8 K8_NOP4 K8_NOP4 + +#define ASM_NOP_MAX 8 + /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ extern inline void rep_nop(void) { @@ -318,31 +379,25 @@ #define cpu_has_fpu 1 -/* Some early Opteron versions incorrectly fault on prefetch (errata #91). - If this happens just jump back. */ #define ARCH_HAS_PREFETCH static inline void prefetch(void *x) { - asm volatile("2: prefetcht0 %0\n1:\t" - ".section __ex_table,\"a\"\n\t" - " .align 8\n\t" - " .quad 2b,1b\n\t" - ".previous" :: "m" (*(unsigned long *)x)); + asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x)); } -#define ARCH_HAS_PREFETCHW +#define ARCH_HAS_PREFETCHW 1 static inline void prefetchw(void *x) { - asm volatile("2: prefetchw %0\n1:\t" - ".section __ex_table,\"a\"\n\t" - " .align 8\n\t" - " .quad 2b,1b\n\t" - ".previous" :: "m" (*(unsigned long *)x)); + alternative_input(ASM_NOP4, + "prefetchw (%1)", + X86_FEATURE_3DNOW, + "r" (x)); } -#define ARCH_HAS_SPINLOCK_PREFETCH +#define ARCH_HAS_SPINLOCK_PREFETCH 1 #define spin_lock_prefetch(x) prefetchw(x) + #define cpu_relax() rep_nop() /* @@ -372,32 +427,28 @@ outb((data), 0x23); \ } while (0) +static inline void __monitor(const void *eax, unsigned long ecx, + unsigned long edx) +{ + /* "monitor %eax,%ecx,%edx;" */ + asm volatile( + ".byte 0x0f,0x01,0xc8;" + : :"a" (eax), "c" (ecx), "d"(edx)); +} + +static inline void __mwait(unsigned long eax, unsigned long ecx) +{ + /* "mwait %eax,%ecx;" */ + asm volatile( + ".byte 0x0f,0x01,0xc9;" + : :"a" (eax), "c" (ecx)); +} + #define stack_current() \ ({ \ struct thread_info *ti; \ asm("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \ ti->task; \ }) - -#define ASM_NOP1 K8_NOP1 -#define ASM_NOP2 K8_NOP2 -#define ASM_NOP3 K8_NOP3 -#define ASM_NOP4 K8_NOP4 -#define ASM_NOP5 K8_NOP5 -#define ASM_NOP6 K8_NOP6 -#define ASM_NOP7 K8_NOP7 -#define ASM_NOP8 K8_NOP8 - -/* Opteron nops */ -#define K8_NOP1 ".byte 0x90\n" -#define K8_NOP2 ".byte 0x66,0x90\n" -#define K8_NOP3 ".byte 0x66,0x66,0x90\n" -#define K8_NOP4 ".byte 0x66,0x66,0x66,0x90\n" -#define K8_NOP5 K8_NOP3 K8_NOP2 -#define K8_NOP6 K8_NOP3 K8_NOP3 -#define K8_NOP7 K8_NOP4 K8_NOP3 -#define K8_NOP8 K8_NOP4 K8_NOP4 - -#define ASM_NOP_MAX 8 #endif /* __ASM_X86_64_PROCESSOR_H */ diff -Nru a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h --- a/include/asm-x86_64/proto.h Thu Feb 19 23:44:27 2004 +++ b/include/asm-x86_64/proto.h Thu Feb 19 23:44:27 2004 @@ -76,6 +76,10 @@ extern int unhandled_signal(struct task_struct *tsk, int sig); +extern void select_idle_routine(const struct cpuinfo_x86 *c); +extern void swiotlb_init(void); +extern int swiotlb; + extern unsigned long max_mapnr; extern unsigned long end_pfn; extern unsigned long table_start, table_end; @@ -92,6 +96,7 @@ extern int fallback_aper_order; extern int fallback_aper_force; +extern int iommu_aperture; extern void smp_local_timer_interrupt(struct pt_regs * regs); diff -Nru a/include/asm-x86_64/segment.h b/include/asm-x86_64/segment.h --- a/include/asm-x86_64/segment.h Thu Feb 19 23:44:28 2004 +++ b/include/asm-x86_64/segment.h Thu Feb 19 23:44:28 2004 @@ -1,6 +1,8 @@ #ifndef _ASM_SEGMENT_H #define _ASM_SEGMENT_H +#include + #define __KERNEL_CS 0x10 #define __KERNEL_DS 0x18 @@ -38,7 +40,7 @@ #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3) #define IDT_ENTRIES 256 -#define GDT_ENTRIES 16 +#define GDT_ENTRIES (L1_CACHE_BYTES / 8) #define GDT_SIZE (GDT_ENTRIES * 8) #define TLS_SIZE (GDT_ENTRY_TLS_ENTRIES * 8) diff -Nru a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h --- a/include/asm-x86_64/smp.h Thu Feb 19 23:44:22 2004 +++ b/include/asm-x86_64/smp.h Thu Feb 19 23:44:22 2004 @@ -39,6 +39,7 @@ extern cpumask_t cpu_online_map; extern volatile unsigned long smp_invalidate_needed; extern int pic_mode; +extern int smp_num_siblings; extern void smp_flush_tlb(void); extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs); extern void smp_send_reschedule(int cpu); @@ -46,7 +47,7 @@ extern void (*mtrr_hook) (void); extern void zap_low_mappings(void); void smp_stop_cpu(void); - +extern int cpu_sibling_map[]; #define SMP_TRAMPOLINE_BASE 0x6000 diff -Nru a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h --- a/include/asm-x86_64/system.h Thu Feb 19 23:44:27 2004 +++ b/include/asm-x86_64/system.h Thu Feb 19 23:44:27 2004 @@ -88,6 +88,56 @@ #endif /* + * Alternative instructions for different CPU types or capabilities. + * + * This allows to use optimized instructions even on generic binary + * kernels. + * + * length of oldinstr must be longer or equal the length of newinstr + * It can be padded with nops as needed. + * + * For non barrier like inlines please define new variants + * without volatile and memory clobber. + */ +#define alternative(oldinstr, newinstr, feature) \ + asm volatile ("661:\n\t" oldinstr "\n662:\n" \ + ".section .altinstructions,\"a\"\n" \ + " .align 8\n" \ + " .quad 661b\n" /* label */ \ + " .quad 663f\n" /* new instruction */ \ + " .byte %c0\n" /* feature bit */ \ + " .byte 662b-661b\n" /* sourcelen */ \ + " .byte 664f-663f\n" /* replacementlen */ \ + ".previous\n" \ + ".section .altinstr_replacement,\"ax\"\n" \ + "663:\n\t" newinstr "\n664:\n" /* replacement */ \ + ".previous" :: "i" (feature) : "memory") + +/* + * Alternative inline assembly with input. + * + * Pecularities: + * No memory clobber here. + * Argument numbers start with 1. + * Best is to use constraints that are fixed size (like (%1) ... "r") + * If you use variable sized constraints like "m" or "g" in the + * replacement maake sure to pad to the worst case length. + */ +#define alternative_input(oldinstr, newinstr, feature, input) \ + asm volatile ("661:\n\t" oldinstr "\n662:\n" \ + ".section .altinstructions,\"a\"\n" \ + " .align 8\n" \ + " .quad 661b\n" /* label */ \ + " .quad 663f\n" /* new instruction */ \ + " .byte %c0\n" /* feature bit */ \ + " .byte 662b-661b\n" /* sourcelen */ \ + " .byte 664f-663f\n" /* replacementlen */ \ + ".previous\n" \ + ".section .altinstr_replacement,\"ax\"\n" \ + "663:\n\t" newinstr "\n664:\n" /* replacement */ \ + ".previous" :: "i" (feature), input) + +/* * Clear and set 'TS' bit respectively */ #define clts() __asm__ __volatile__ ("clts") diff -Nru a/include/linux/aio.h b/include/linux/aio.h --- a/include/linux/aio.h Thu Feb 19 23:44:22 2004 +++ b/include/linux/aio.h Thu Feb 19 23:44:22 2004 @@ -167,6 +167,7 @@ } /* for sysctl: */ -extern unsigned aio_max_nr, aio_max_size, aio_max_pinned; +extern atomic_t aio_nr; +extern unsigned aio_max_nr; #endif /* __LINUX__AIO_H */ diff -Nru a/include/linux/bitmap.h b/include/linux/bitmap.h --- a/include/linux/bitmap.h Thu Feb 19 23:44:28 2004 +++ b/include/linux/bitmap.h Thu Feb 19 23:44:28 2004 @@ -41,7 +41,7 @@ void bitmap_or(unsigned long *dst, const unsigned long *bitmap1, const unsigned long *bitmap2, int bits); int bitmap_weight(const unsigned long *bitmap, int bits); -int bitmap_snprintf(char *buf, unsigned int buflen, +int bitmap_scnprintf(char *buf, unsigned int buflen, const unsigned long *maskp, int bits); int bitmap_parse(const char __user *ubuf, unsigned int ubuflen, unsigned long *maskp, int bits); diff -Nru a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h --- a/include/linux/compiler-gcc3.h Thu Feb 19 23:44:22 2004 +++ b/include/linux/compiler-gcc3.h Thu Feb 19 23:44:22 2004 @@ -21,3 +21,7 @@ #define __attribute_pure__ __attribute__((pure)) #define __attribute_const__ __attribute__((__const__)) + +#if __GNUC_MINOR__ >= 1 +#define noinline __attribute__((noinline)) +#endif diff -Nru a/include/linux/compiler.h b/include/linux/compiler.h --- a/include/linux/compiler.h Thu Feb 19 23:44:26 2004 +++ b/include/linux/compiler.h Thu Feb 19 23:44:26 2004 @@ -96,6 +96,10 @@ # define __attribute_const__ /* unimplemented */ #endif +#ifndef noinline +#define noinline +#endif + /* Optimization barrier */ #ifndef barrier # define barrier() __memory_barrier() diff -Nru a/include/linux/concap.h b/include/linux/concap.h --- a/include/linux/concap.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/concap.h Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: concap.h,v 1.2.8.1 2001/09/23 22:25:05 kai Exp $ +/* $Id: concap.h,v 1.3.2.2 2004/01/12 23:08:35 keil Exp $ * * Copyright 1997 by Henner Eisen * @@ -31,6 +31,7 @@ struct net_device *net_dev; /* net device using our service */ struct concap_device_ops *dops; /* callbacks provided by device */ struct concap_proto_ops *pops; /* callbacks provided by us */ + spinlock_t lock; int flags; void *proto_data; /* protocol specific private data, to be accessed via *pops methods only*/ diff -Nru a/include/linux/cpufreq.h b/include/linux/cpufreq.h --- a/include/linux/cpufreq.h Thu Feb 19 23:44:26 2004 +++ b/include/linux/cpufreq.h Thu Feb 19 23:44:26 2004 @@ -110,24 +110,24 @@ * @div: divisor * @mult: multiplier * - * Needed for loops_per_jiffy and similar calculations. We do it - * this way to avoid math overflow on 32-bit machines. This will - * become architecture dependent once high-resolution-timer is - * merged (or any other thing that introduces sc_math.h). * * new = old * mult / div */ static inline unsigned long cpufreq_scale(unsigned long old, u_int div, u_int mult) { - unsigned long val, carry; +#if BITS_PER_LONG == 32 - mult /= 100; - div /= 100; - val = (old / div) * mult; - carry = old % div; - carry = carry * mult / div; + u64 result = ((u64) old) * ((u64) mult); + do_div(result, div); + return (unsigned long) result; - return carry + val; +#elif BITS_PER_LONG == 64 + + unsigned long result = old * ((u64) mult); + result /= div; + return result; + +#endif }; /********************************************************************* diff -Nru a/include/linux/cpumask.h b/include/linux/cpumask.h --- a/include/linux/cpumask.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/cpumask.h Thu Feb 19 23:44:24 2004 @@ -32,8 +32,8 @@ #define for_each_online_cpu(cpu) for (cpu = 0; cpu < 1; cpu++) #endif -#define cpumask_snprintf(buf, buflen, map) \ - bitmap_snprintf(buf, buflen, cpus_addr(map), NR_CPUS) +#define cpumask_scnprintf(buf, buflen, map) \ + bitmap_scnprintf(buf, buflen, cpus_addr(map), NR_CPUS) #define cpumask_parse(buf, buflen, map) \ bitmap_parse(buf, buflen, cpus_addr(map), NR_CPUS) diff -Nru a/include/linux/fs.h b/include/linux/fs.h --- a/include/linux/fs.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/fs.h Thu Feb 19 23:44:24 2004 @@ -1045,6 +1045,7 @@ void *data); struct super_block *get_sb_pseudo(struct file_system_type *, char *, struct super_operations *ops, unsigned long); +void unnamed_dev_init(void); /* Alas, no aliases. Too much hassle with bringing module.h everywhere */ #define fops_get(fops) \ @@ -1132,14 +1133,13 @@ #define __getname() kmem_cache_alloc(names_cachep, SLAB_KERNEL) #define putname(name) kmem_cache_free(names_cachep, (void *)(name)) -enum {BDEV_FILE, BDEV_SWAP, BDEV_FS, BDEV_RAW}; extern int register_blkdev(unsigned int, const char *); extern int unregister_blkdev(unsigned int, const char *); extern struct block_device *bdget(dev_t); extern void bd_forget(struct inode *inode); extern void bdput(struct block_device *); extern int blkdev_open(struct inode *, struct file *); -extern struct block_device *open_by_devnum(dev_t, unsigned, int); +extern struct block_device *open_by_devnum(dev_t, unsigned); extern struct file_operations def_blk_fops; extern struct address_space_operations def_blk_aops; extern struct file_operations def_chr_fops; @@ -1147,8 +1147,8 @@ extern struct file_operations def_fifo_fops; extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long); extern int blkdev_ioctl(struct inode *, struct file *, unsigned, unsigned long); -extern int blkdev_get(struct block_device *, mode_t, unsigned, int); -extern int blkdev_put(struct block_device *, int); +extern int blkdev_get(struct block_device *, mode_t, unsigned); +extern int blkdev_put(struct block_device *); extern int bd_claim(struct block_device *, void *); extern void bd_release(struct block_device *); extern void blk_run_queues(void); @@ -1167,8 +1167,8 @@ extern const char *__bdevname(dev_t, char *buffer); extern const char *bdevname(struct block_device *bdev, char *buffer); extern struct block_device *lookup_bdev(const char *); -extern struct block_device *open_bdev_excl(const char *, int, int, void *); -extern void close_bdev_excl(struct block_device *, int); +extern struct block_device *open_bdev_excl(const char *, int, void *); +extern void close_bdev_excl(struct block_device *); extern void init_special_inode(struct inode *, umode_t, dev_t); diff -Nru a/include/linux/genhd.h b/include/linux/genhd.h --- a/include/linux/genhd.h Thu Feb 19 23:44:23 2004 +++ b/include/linux/genhd.h Thu Feb 19 23:44:23 2004 @@ -64,10 +64,11 @@ int policy, partno; }; -#define GENHD_FL_REMOVABLE 1 -#define GENHD_FL_DRIVERFS 2 -#define GENHD_FL_CD 8 -#define GENHD_FL_UP 16 +#define GENHD_FL_REMOVABLE 1 +#define GENHD_FL_DRIVERFS 2 +#define GENHD_FL_CD 8 +#define GENHD_FL_UP 16 +#define GENHD_FL_SUPPRESS_PARTITION_INFO 32 struct disk_stats { unsigned read_sectors, write_sectors; diff -Nru a/include/linux/hdlc.h b/include/linux/hdlc.h --- a/include/linux/hdlc.h Thu Feb 19 23:44:28 2004 +++ b/include/linux/hdlc.h Thu Feb 19 23:44:28 2004 @@ -75,7 +75,7 @@ typedef struct pvc_device_struct { - struct hdlc_device_struct *master; + struct net_device *master; struct net_device *main; struct net_device *ether; /* bridged Ethernet interface */ struct pvc_device_struct *next; /* Sorted in ascending DLCI order */ @@ -96,11 +96,10 @@ typedef struct hdlc_device_struct { /* To be initialized by hardware driver */ - struct net_device netdev; /* master net device - must be first */ struct net_device_stats stats; /* used by HDLC layer to take control over HDLC device from hw driver*/ - int (*attach)(struct hdlc_device_struct *hdlc, + int (*attach)(struct net_device *dev, unsigned short encoding, unsigned short parity); /* hardware driver must handle this instead of dev->hard_start_xmit */ @@ -109,13 +108,13 @@ /* Things below are for HDLC layer internal use only */ struct { - int (*open)(struct hdlc_device_struct *hdlc); - void (*close)(struct hdlc_device_struct *hdlc); + int (*open)(struct net_device *dev); + void (*close)(struct net_device *dev); /* if open & DCD */ - void (*start)(struct hdlc_device_struct *hdlc); + void (*start)(struct net_device *dev); /* if open & !DCD */ - void (*stop)(struct hdlc_device_struct *hdlc); + void (*stop)(struct net_device *dev); void (*detach)(struct hdlc_device_struct *hdlc); int (*netif_rx)(struct sk_buff *skb); @@ -167,16 +166,17 @@ int new_mtu); }ppp; }state; + void *priv; }hdlc_device; -int hdlc_raw_ioctl(hdlc_device *hdlc, struct ifreq *ifr); -int hdlc_raw_eth_ioctl(hdlc_device *hdlc, struct ifreq *ifr); -int hdlc_cisco_ioctl(hdlc_device *hdlc, struct ifreq *ifr); -int hdlc_ppp_ioctl(hdlc_device *hdlc, struct ifreq *ifr); -int hdlc_fr_ioctl(hdlc_device *hdlc, struct ifreq *ifr); -int hdlc_x25_ioctl(hdlc_device *hdlc, struct ifreq *ifr); +int hdlc_raw_ioctl(struct net_device *dev, struct ifreq *ifr); +int hdlc_raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr); +int hdlc_cisco_ioctl(struct net_device *dev, struct ifreq *ifr); +int hdlc_ppp_ioctl(struct net_device *dev, struct ifreq *ifr); +int hdlc_fr_ioctl(struct net_device *dev, struct ifreq *ifr); +int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr); /* Exported from hdlc.o */ @@ -185,19 +185,14 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); /* Must be used by hardware driver on module startup/exit */ -int register_hdlc_device(hdlc_device *hdlc); -void unregister_hdlc_device(hdlc_device *hdlc); - - -static __inline__ struct net_device* hdlc_to_dev(hdlc_device *hdlc) -{ - return &hdlc->netdev; -} +int register_hdlc_device(struct net_device *dev); +void unregister_hdlc_device(struct net_device *dev); +struct net_device *alloc_hdlcdev(void *priv); static __inline__ hdlc_device* dev_to_hdlc(struct net_device *dev) { - return (hdlc_device*)dev; + return netdev_priv(dev); } @@ -207,12 +202,6 @@ } -static __inline__ const char *hdlc_to_name(hdlc_device *hdlc) -{ - return hdlc_to_dev(hdlc)->name; -} - - static __inline__ void debug_frame(const struct sk_buff *skb) { int i; @@ -229,11 +218,11 @@ /* Must be called by hardware driver when HDLC device is being opened */ -int hdlc_open(hdlc_device *hdlc); +int hdlc_open(struct net_device *dev); /* Must be called by hardware driver when HDLC device is being closed */ -void hdlc_close(hdlc_device *hdlc); +void hdlc_close(struct net_device *dev); /* Called by hardware driver when DCD line level changes */ -void hdlc_set_carrier(int on, hdlc_device *hdlc); +void hdlc_set_carrier(int on, struct net_device *dev); /* May be used by hardware driver to gain control over HDLC device */ static __inline__ void hdlc_proto_detach(hdlc_device *hdlc) @@ -241,6 +230,12 @@ if (hdlc->proto.detach) hdlc->proto.detach(hdlc); hdlc->proto.detach = NULL; +} + + +static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev) +{ + return &dev_to_hdlc(dev)->stats; } diff -Nru a/include/linux/ide.h b/include/linux/ide.h --- a/include/linux/ide.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/ide.h Thu Feb 19 23:44:24 2004 @@ -698,7 +698,6 @@ u8 state; /* retry state */ u8 waiting_for_dma; /* dma currently in progress */ u8 unmask; /* okay to unmask other irqs */ - u8 slow; /* slow data port */ u8 bswap; /* byte swap data */ u8 dsc_overlap; /* DSC overlap */ u8 nice1; /* give potential excess bandwidth */ @@ -713,14 +712,12 @@ unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */ unsigned no_unmask : 1; /* disallow setting unmask bit */ unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ - unsigned nobios : 1; /* do not probe bios for drive */ unsigned atapi_overlap : 1; /* ATAPI overlap (not supported) */ unsigned nice0 : 1; /* give obvious excess bandwidth */ unsigned nice2 : 1; /* give a share in our own bandwidth */ unsigned doorlocking : 1; /* for removable only: door lock/unlock works */ unsigned autotune : 2; /* 0=default, 1=autotune, 2=noautotune */ unsigned remap_0_to_1 : 1; /* 0=noremap, 1=remap 0->1 (for EZDrive) */ - unsigned ata_flash : 1; /* 1=present, 0=default */ unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */ unsigned vdma : 1; /* 1=doing PIO over DMA 0=doing normal DMA */ unsigned addressing; /* : 3; @@ -1090,6 +1087,8 @@ } ide_proc_entry_t; #ifdef CONFIG_PROC_FS +extern struct proc_dir_entry *proc_ide_root; + extern void proc_ide_create(void); extern void proc_ide_destroy(void); extern void destroy_proc_ide_device(ide_hwif_t *, ide_drive_t *); @@ -1100,6 +1099,10 @@ read_proc_t proc_ide_read_capacity; read_proc_t proc_ide_read_geometry; +#ifdef CONFIG_BLK_DEV_IDEPCI +void ide_pci_create_host_proc(const char *, get_info_t *); +#endif + /* * Standard exit stuff: */ @@ -1155,8 +1158,6 @@ /* * Subdrivers support. */ -#define IDE_SUBDRIVER_VERSION 1 - typedef struct ide_driver_s { struct module *owner; const char *name; @@ -1165,8 +1166,6 @@ unsigned busy : 1; unsigned supports_dsc_overlap : 1; int (*cleanup)(ide_drive_t *); - int (*shutdown)(ide_drive_t *); - int (*flushcache)(ide_drive_t *); ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t); int (*end_request)(ide_drive_t *, int, int); u8 (*sense)(ide_drive_t *, const char *, u8); @@ -1440,9 +1439,6 @@ */ extern ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *); -/* (ide_drive_t *drive, u8 stat, u8 err) */ -extern void ide_end_taskfile(ide_drive_t *, u8, u8); - /* * Special Flagged Register Validation Caller */ @@ -1528,21 +1524,9 @@ int ide_register_driver(ide_driver_t *driver); void ide_unregister_driver(ide_driver_t *driver); -int ide_register_subdriver (ide_drive_t *drive, ide_driver_t *driver, int version); +int ide_register_subdriver(ide_drive_t *, ide_driver_t *); int ide_unregister_subdriver (ide_drive_t *drive); int ide_replace_subdriver(ide_drive_t *drive, const char *driver); - -#ifdef CONFIG_PROC_FS -typedef struct ide_pci_host_proc_s { - char *name; - u8 set; - get_info_t *get_info; - struct proc_dir_entry *parent; - struct ide_pci_host_proc_s *next; -} ide_pci_host_proc_t; - -void ide_pci_register_host_proc(ide_pci_host_proc_t *); -#endif /* CONFIG_PROC_FS */ #define ON_BOARD 1 #define NEVER_BOARD 0 diff -Nru a/include/linux/idr.h b/include/linux/idr.h --- a/include/linux/idr.h Thu Feb 19 23:44:23 2004 +++ b/include/linux/idr.h Thu Feb 19 23:44:23 2004 @@ -58,7 +58,7 @@ */ void *idr_find(struct idr *idp, int id); -int idr_pre_get(struct idr *idp); +int idr_pre_get(struct idr *idp, unsigned gfp_mask); int idr_get_new(struct idr *idp, void *ptr); void idr_remove(struct idr *idp, int id); void idr_init(struct idr *idp); diff -Nru a/include/linux/if_bonding.h b/include/linux/if_bonding.h --- a/include/linux/if_bonding.h Thu Feb 19 23:44:27 2004 +++ b/include/linux/if_bonding.h Thu Feb 19 23:44:27 2004 @@ -32,6 +32,9 @@ * 2003/05/01 - Amir Noam * - Added ABI version control to restore compatibility between * new/old ifenslave and new/old bonding. + * + * 2003/12/01 - Shmulik Hen + * - Code cleanup and style changes */ #ifndef _LINUX_IF_BONDING_H @@ -86,7 +89,7 @@ typedef struct ifslave { __s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */ - __s8 slave_name[IFNAMSIZ]; + char slave_name[IFNAMSIZ]; __s8 link; __s8 state; __u32 link_failure_count; diff -Nru a/include/linux/if_pppvar.h b/include/linux/if_pppvar.h --- a/include/linux/if_pppvar.h Thu Feb 19 23:44:28 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,138 +0,0 @@ -/* From: if_pppvar.h,v 1.2 1995/06/12 11:36:51 paulus Exp */ -/* - * if_pppvar.h - private structures and declarations for PPP. - * - * Copyright (c) 1994 The Australian National University. - * All rights reserved. - * - * Permission to use, copy, modify, and distribute this software and its - * documentation is hereby granted, provided that the above copyright - * notice appears in all copies. This software is provided without any - * warranty, express or implied. The Australian National University - * makes no representations about the suitability of this software for - * any purpose. - * - * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY - * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF - * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO - * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, - * OR MODIFICATIONS. - * - * Copyright (c) 1989 Carnegie Mellon University. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by Carnegie Mellon University. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -/* - * ==FILEVERSION 990806== - * - * NOTE TO MAINTAINERS: - * If you modify this file at all, please set the above date. - * if_pppvar.h is shipped with a PPP distribution as well as with the kernel; - * if everyone increases the FILEVERSION number above, then scripts - * can do the right thing when deciding whether to install a new if_pppvar.h - * file. Don't change the format of that line otherwise, so the - * installation script can recognize it. - */ - -/* - * Supported network protocols. These values are used for - * indexing sc_npmode. - */ - -#define NP_IP 0 /* Internet Protocol */ -#define NP_IPX 1 /* IPX protocol */ -#define NP_AT 2 /* Appletalk protocol */ -#define NP_IPV6 3 /* Internet Protocol */ -#define NUM_NP 4 /* Number of NPs. */ - -#define OBUFSIZE 256 /* # chars of output buffering */ - -/* - * Structure describing each ppp unit. - */ - -struct ppp { - int magic; /* magic value for structure */ - struct ppp *next; /* unit with next index */ - unsigned long inuse; /* are we allocated? */ - int line; /* network interface unit # */ - __u32 flags; /* miscellaneous control flags */ - int mtu; /* maximum xmit frame size */ - int mru; /* maximum receive frame size */ - struct slcompress *slcomp; /* for TCP header compression */ - struct sk_buff_head xmt_q; /* frames to send from pppd */ - struct sk_buff_head rcv_q; /* frames for pppd to read */ - unsigned long xmit_busy; /* bit 0 set when xmitter busy */ - - /* Information specific to using ppp on async serial lines. */ - struct tty_struct *tty; /* ptr to TTY structure */ - struct tty_struct *backup_tty; /* TTY to use if tty gets closed */ - __u8 escape; /* 0x20 if prev char was PPP_ESC */ - __u8 toss; /* toss this frame */ - volatile __u8 tty_pushing; /* internal state flag */ - volatile __u8 woke_up; /* internal state flag */ - __u32 xmit_async_map[8]; /* 1 bit means that given control - character is quoted on output*/ - __u32 recv_async_map; /* 1 bit means that given control - character is ignored on input*/ - __u32 bytes_sent; /* Bytes sent on frame */ - __u32 bytes_rcvd; /* Bytes recvd on frame */ - - /* Async transmission information */ - struct sk_buff *tpkt; /* frame currently being sent */ - int tpkt_pos; /* how much of it we've done */ - __u16 tfcs; /* FCS so far for it */ - unsigned char *optr; /* where we're up to in sending */ - unsigned char *olim; /* points past last valid char */ - - /* Async reception information */ - struct sk_buff *rpkt; /* frame currently being rcvd */ - __u16 rfcs; /* FCS so far of rpkt */ - - /* Queues for select() functionality */ - wait_queue_head_t read_wait; /* queue for reading processes */ - - /* info for detecting idle channels */ - unsigned long last_xmit; /* time of last transmission */ - unsigned long last_recv; /* time last packet received */ - - /* Statistic information */ - struct pppstat stats; /* statistic information */ - - /* PPP compression protocol information */ - struct compressor *sc_xcomp; /* transmit compressor */ - void *sc_xc_state; /* transmit compressor state */ - struct compressor *sc_rcomp; /* receive decompressor */ - void *sc_rc_state; /* receive decompressor state */ - - enum NPmode sc_npmode[NUM_NP]; /* what to do with each NP */ - int sc_xfer; /* PID of reserved PPP table */ - char name[16]; /* space for unit name */ - struct net_device dev; /* net device structure */ - struct net_device_stats estats; /* more detailed stats */ - - /* tty output buffer */ - unsigned char obuf[OBUFSIZE]; /* buffer for characters to send */ -}; - -#define PPP_MAGIC 0x5002 -#define PPP_VERSION "2.3.7" diff -Nru a/include/linux/inetdevice.h b/include/linux/inetdevice.h --- a/include/linux/inetdevice.h Thu Feb 19 23:44:26 2004 +++ b/include/linux/inetdevice.h Thu Feb 19 23:44:26 2004 @@ -18,6 +18,8 @@ int mc_forwarding; int tag; int arp_filter; + int arp_announce; + int arp_ignore; int medium_id; int no_xfrm; int no_policy; @@ -71,6 +73,8 @@ (ipv4_devconf.accept_redirects || (in_dev)->cnf.accept_redirects))) #define IN_DEV_ARPFILTER(in_dev) (ipv4_devconf.arp_filter || (in_dev)->cnf.arp_filter) +#define IN_DEV_ARP_ANNOUNCE(in_dev) (max(ipv4_devconf.arp_announce, (in_dev)->cnf.arp_announce)) +#define IN_DEV_ARP_IGNORE(in_dev) (max(ipv4_devconf.arp_ignore, (in_dev)->cnf.arp_ignore)) struct in_ifaddr { @@ -97,6 +101,7 @@ extern struct in_device *inetdev_init(struct net_device *dev); extern struct in_device *inetdev_by_index(int); extern u32 inet_select_addr(const struct net_device *dev, u32 dst, int scope); +extern u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scope); extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, u32 prefix, u32 mask); extern void inet_forward_change(void); diff -Nru a/include/linux/init_task.h b/include/linux/init_task.h --- a/include/linux/init_task.h Thu Feb 19 23:44:23 2004 +++ b/include/linux/init_task.h Thu Feb 19 23:44:23 2004 @@ -57,6 +57,8 @@ .siglock = SPIN_LOCK_UNLOCKED, \ } +extern struct group_info init_groups; + /* * INIT_TASK is used to set up the first task table, touch at * your own risk!. Base=0, limit=0x1fffff (=2MB) @@ -88,6 +90,7 @@ .real_timer = { \ .function = it_real_fn \ }, \ + .group_info = &init_groups, \ .cap_effective = CAP_INIT_EFF_SET, \ .cap_inheritable = CAP_INIT_INH_SET, \ .cap_permitted = CAP_FULL_SET, \ diff -Nru a/include/linux/ipv6.h b/include/linux/ipv6.h --- a/include/linux/ipv6.h Thu Feb 19 23:44:26 2004 +++ b/include/linux/ipv6.h Thu Feb 19 23:44:26 2004 @@ -136,6 +136,7 @@ __s32 rtr_solicits; __s32 rtr_solicit_interval; __s32 rtr_solicit_delay; + __s32 force_mld_version; #ifdef CONFIG_IPV6_PRIVACY __s32 use_tempaddr; __s32 temp_valid_lft; @@ -165,6 +166,7 @@ DEVCONF_REGEN_MAX_RETRY, DEVCONF_MAX_DESYNC_FACTOR, DEVCONF_MAX_ADDRESSES, + DEVCONF_FORCE_MLD_VERSION, DEVCONF_MAX }; diff -Nru a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h --- a/include/linux/ipv6_route.h Thu Feb 19 23:44:23 2004 +++ b/include/linux/ipv6_route.h Thu Feb 19 23:44:23 2004 @@ -24,7 +24,6 @@ #define RTF_CACHE 0x01000000 /* cache entry */ #define RTF_FLOW 0x02000000 /* flow significant route */ #define RTF_POLICY 0x04000000 /* policy route */ -#define RTF_NDISC 0x08000000 /* ndisc route */ #define RTF_LOCAL 0x80000000 diff -Nru a/include/linux/isdn/capilli.h b/include/linux/isdn/capilli.h --- a/include/linux/isdn/capilli.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/isdn/capilli.h Thu Feb 19 23:44:24 2004 @@ -1,4 +1,4 @@ -/* $Id: capilli.h,v 1.4.8.1 2001/09/23 22:24:33 kai Exp $ +/* $Id: capilli.h,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $ * * Kernel CAPI 2.0 Driver Interface for Linux * @@ -83,6 +83,22 @@ void capi_ctr_suspend_output(struct capi_ctr * card); void capi_ctr_resume_output(struct capi_ctr * card); void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb); + +// --------------------------------------------------------------------------- +// needed for AVM capi drivers + +struct capi_driver { + char name[32]; /* driver name */ + char revision[32]; + + int (*add_card)(struct capi_driver *driver, capicardparams *data); + + /* management information for kcapi */ + struct list_head list; +}; + +void register_capi_driver(struct capi_driver *driver); +void unregister_capi_driver(struct capi_driver *driver); // --------------------------------------------------------------------------- // library functions for use by hardware controller drivers diff -Nru a/include/linux/isdn/fsm.h b/include/linux/isdn/fsm.h --- a/include/linux/isdn/fsm.h Thu Feb 19 23:44:29 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,58 +0,0 @@ -/* Linux ISDN subsystem, finite state machine - * - * Author Karsten Keil - * Copyright by Karsten Keil - * 2001-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. - */ - -#ifndef __ISDN_FSM_H__ -#define __ISDN_FSM_H__ - -#include -#include - -struct fsm_inst; - -typedef int (*fsm_fn)(struct fsm_inst *, int, void *); - -struct fsm { - fsm_fn *jumpmatrix; - int st_cnt, ev_cnt, fn_cnt; - char **st_str, **ev_str; - struct fsm_node *fn_tbl; -}; - -struct fsm_inst { - struct fsm *fsm; - int state; - int debug; - void *userdata; - int userint; - void (*printdebug) (struct fsm_inst *, char *, ...); -}; - -struct fsm_node { - int st, ev; - fsm_fn fn; -}; - -struct fsm_timer { - struct fsm_inst *fi; - struct timer_list tl; - int ev; - void *arg; -}; - -int fsm_new(struct fsm *fsm); -void fsm_free(struct fsm *fsm); -int fsm_event(struct fsm_inst *fi, int event, void *arg); -void fsm_change_state(struct fsm_inst *fi, int newstate); -void fsm_init_timer(struct fsm_inst *fi, struct fsm_timer *ft); -int fsm_add_timer(struct fsm_timer *ft, int timeout, int event); -void fsm_mod_timer(struct fsm_timer *ft, int timeout, int event); -void fsm_del_timer(struct fsm_timer *ft); - -#endif diff -Nru a/include/linux/isdn.h b/include/linux/isdn.h --- a/include/linux/isdn.h Thu Feb 19 23:44:28 2004 +++ b/include/linux/isdn.h Thu Feb 19 23:44:28 2004 @@ -1,9 +1,10 @@ -/* Linux ISDN subsystem, main header +/* $Id: isdn.h,v 1.125.2.3 2004/02/10 01:07:14 keil Exp $ + * + * Main header for the Linux ISDN subsystem (linklevel). * * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de) * Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg * Copyright 1995,96 by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de) - * Copyright 2000-2002 by Kai Germaschewski (kai@germaschewski.name) * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. @@ -14,7 +15,6 @@ #define __ISDN_H__ #include -#include #ifdef CONFIG_COBALT_MICRO_SERVER /* Save memory */ @@ -75,7 +75,7 @@ #define ISDN_NET_ENCAP_UIHDLC 5 #define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive */ #define ISDN_NET_ENCAP_X25IFACE 7 /* Documentation/networking/x25-iface.txt*/ -#define ISDN_NET_ENCAP_NR 8 +#define ISDN_NET_ENCAP_MAX_ENCAP ISDN_NET_ENCAP_X25IFACE /* Facility which currently uses an ISDN-channel */ #define ISDN_USAGE_NONE 0 @@ -94,48 +94,48 @@ #define ISDN_CMSGLEN 50 /* Length of CONNECT-Message to add for Modem */ #define ISDN_MSNLEN 32 -#define NET_DV 0x06 /* Data version for isdn_net_ioctl_cfg */ -#define TTY_DV 0x06 /* Data version for iprofd etc. */ +#define NET_DV 0x06 /* Data version for isdn_net_ioctl_cfg */ +#define TTY_DV 0x06 /* Data version for iprofd etc. */ -#define INF_DV 0x01 /* Data version for /dev/isdninfo */ +#define INF_DV 0x01 /* Data version for /dev/isdninfo */ typedef struct { - char drvid[25]; - unsigned long arg; + char drvid[25]; + unsigned long arg; } isdn_ioctl_struct; typedef struct { - char name[10]; - char phone[ISDN_MSNLEN]; - int outgoing; + char name[10]; + char phone[ISDN_MSNLEN]; + int outgoing; } isdn_net_ioctl_phone; typedef struct { - char name[10]; /* Name of interface */ - char master[10]; /* Name of Master for Bundling */ - char slave[10]; /* Name of Slave for Bundling */ - char eaz[256]; /* EAZ/MSN */ - char drvid[25]; /* DriverId for Bindings */ - int onhtime; /* Hangup-Timeout */ - int charge; /* Charge-Units */ - int l2_proto; /* Layer-2 protocol */ - int l3_proto; /* Layer-3 protocol */ - int p_encap; /* Encapsulation */ - int exclusive; /* Channel, if bound exclusive */ - int dialmax; /* Dial Retry-Counter */ - int slavedelay; /* Delay until slave starts up */ - int cbdelay; /* Delay before Callback */ - int chargehup; /* Flag: Charge-Hangup */ - int ihup; /* Flag: Hangup-Timeout on incoming line */ - int secure; /* Flag: Secure */ - int callback; /* Flag: Callback */ - int cbhup; /* Flag: Reject Call before Callback */ - int pppbind; /* ippp device for bindings */ - int chargeint; /* Use fixed charge interval length */ - int triggercps; /* BogoCPS needed for triggering slave */ - int dialtimeout; /* Dial-Timeout */ - int dialwait; /* Time to wait after failed dial */ - int dialmode; /* Flag: off / on / auto */ + char name[10]; /* Name of interface */ + char master[10]; /* Name of Master for Bundling */ + char slave[10]; /* Name of Slave for Bundling */ + char eaz[256]; /* EAZ/MSN */ + char drvid[25]; /* DriverId for Bindings */ + int onhtime; /* Hangup-Timeout */ + int charge; /* Charge-Units */ + int l2_proto; /* Layer-2 protocol */ + int l3_proto; /* Layer-3 protocol */ + int p_encap; /* Encapsulation */ + int exclusive; /* Channel, if bound exclusive */ + int dialmax; /* Dial Retry-Counter */ + int slavedelay; /* Delay until slave starts up */ + int cbdelay; /* Delay before Callback */ + int chargehup; /* Flag: Charge-Hangup */ + int ihup; /* Flag: Hangup-Timeout on incoming line */ + int secure; /* Flag: Secure */ + int callback; /* Flag: Callback */ + int cbhup; /* Flag: Reject Call before Callback */ + int pppbind; /* ippp device for bindings */ + int chargeint; /* Use fixed charge interval length */ + int triggercps; /* BogoCPS needed for triggering slave */ + int dialtimeout; /* Dial-Timeout */ + int dialwait; /* Time to wait after failed dial */ + int dialmode; /* Flag: off / on / auto */ } isdn_net_ioctl_cfg; #define ISDN_NET_DIALMODE_MASK 0xC0 /* bits for status */ @@ -150,6 +150,7 @@ #include #include #include +#include #include #include #include @@ -178,6 +179,8 @@ * the correspondent code in isdn.c */ +#define ISDN_MINOR_B 0 +#define ISDN_MINOR_BMAX (ISDN_MAX_CHANNELS-1) #define ISDN_MINOR_CTRL 64 #define ISDN_MINOR_CTRLMAX (64 + (ISDN_MAX_CHANNELS-1)) #define ISDN_MINOR_PPP 128 @@ -192,7 +195,6 @@ #include #include -#include #include #endif @@ -231,9 +233,177 @@ #define USG_MODEMORVOICE(x) (((x & ISDN_USAGE_MASK)==ISDN_USAGE_MODEM) || \ ((x & ISDN_USAGE_MASK)==ISDN_USAGE_VOICE) ) +/* Timer-delays and scheduling-flags */ +#define ISDN_TIMER_RES 4 /* Main Timer-Resolution */ +#define ISDN_TIMER_02SEC (HZ/ISDN_TIMER_RES/5) /* Slow-Timer1 .2 sec */ +#define ISDN_TIMER_1SEC (HZ/ISDN_TIMER_RES) /* Slow-Timer2 1 sec */ +#define ISDN_TIMER_RINGING 5 /* tty RINGs = ISDN_TIMER_1SEC * this factor */ +#define ISDN_TIMER_KEEPINT 10 /* Cisco-Keepalive = ISDN_TIMER_1SEC * this factor */ +#define ISDN_TIMER_MODEMREAD 1 +#define ISDN_TIMER_MODEMPLUS 2 +#define ISDN_TIMER_MODEMRING 4 +#define ISDN_TIMER_MODEMXMIT 8 +#define ISDN_TIMER_NETDIAL 16 +#define ISDN_TIMER_NETHANGUP 32 +#define ISDN_TIMER_CARRIER 256 /* Wait for Carrier */ +#define ISDN_TIMER_FAST (ISDN_TIMER_MODEMREAD | ISDN_TIMER_MODEMPLUS | \ + ISDN_TIMER_MODEMXMIT) +#define ISDN_TIMER_SLOW (ISDN_TIMER_MODEMRING | ISDN_TIMER_NETHANGUP | \ + ISDN_TIMER_NETDIAL | ISDN_TIMER_CARRIER) + +/* Timeout-Values for isdn_net_dial() */ +#define ISDN_TIMER_DTIMEOUT10 (10*HZ/(ISDN_TIMER_02SEC*(ISDN_TIMER_RES+1))) +#define ISDN_TIMER_DTIMEOUT15 (15*HZ/(ISDN_TIMER_02SEC*(ISDN_TIMER_RES+1))) +#define ISDN_TIMER_DTIMEOUT60 (60*HZ/(ISDN_TIMER_02SEC*(ISDN_TIMER_RES+1))) + /* GLOBAL_FLAGS */ #define ISDN_GLOBAL_STOPPED 1 +/*=================== Start of ip-over-ISDN stuff =========================*/ + +/* Feature- and status-flags for a net-interface */ +#define ISDN_NET_CONNECTED 0x01 /* Bound to ISDN-Channel */ +#define ISDN_NET_SECURE 0x02 /* Accept calls from phonelist only */ +#define ISDN_NET_CALLBACK 0x04 /* activate callback */ +#define ISDN_NET_CBHUP 0x08 /* hangup before callback */ +#define ISDN_NET_CBOUT 0x10 /* remote machine does callback */ + +#define ISDN_NET_MAGIC 0x49344C02 /* for paranoia-checking */ + +/* Phone-list-element */ +typedef struct { + void *next; + char num[ISDN_MSNLEN]; +} isdn_net_phone; + +/* + Principles when extending structures for generic encapsulation protocol + ("concap") support: + - Stuff which is hardware specific (here i4l-specific) goes in + the netdev -> local structure (here: isdn_net_local) + - Stuff which is encapsulation protocol specific goes in the structure + which holds the linux device structure (here: isdn_net_device) +*/ + +/* Local interface-data */ +typedef struct isdn_net_local_s { + ulong magic; + char name[10]; /* Name of device */ + struct net_device_stats stats; /* Ethernet Statistics */ + int isdn_device; /* Index to isdn-device */ + int isdn_channel; /* Index to isdn-channel */ + int ppp_slot; /* PPPD device slot number */ + int pre_device; /* Preselected isdn-device */ + int pre_channel; /* Preselected isdn-channel */ + int exclusive; /* If non-zero idx to reserved chan.*/ + int flags; /* Connection-flags */ + int dialretry; /* Counter for Dialout-retries */ + int dialmax; /* Max. Number of Dial-retries */ + int cbdelay; /* Delay before Callback starts */ + int dtimer; /* Timeout-counter for dialing */ + char msn[ISDN_MSNLEN]; /* MSNs/EAZs for this interface */ + u_char cbhup; /* Flag: Reject Call before Callback*/ + u_char dialstate; /* State for dialing */ + u_char p_encap; /* Packet encapsulation */ + /* 0 = Ethernet over ISDN */ + /* 1 = RAW-IP */ + /* 2 = IP with type field */ + u_char l2_proto; /* Layer-2-protocol */ + /* See ISDN_PROTO_L2..-constants in */ + /* isdnif.h */ + /* 0 = X75/LAPB with I-Frames */ + /* 1 = X75/LAPB with UI-Frames */ + /* 2 = X75/LAPB with BUI-Frames */ + /* 3 = HDLC */ + u_char l3_proto; /* Layer-3-protocol */ + /* See ISDN_PROTO_L3..-constants in */ + /* isdnif.h */ + /* 0 = Transparent */ + int huptimer; /* Timeout-counter for auto-hangup */ + int charge; /* Counter for charging units */ + ulong chargetime; /* Timer for Charging info */ + int hupflags; /* Flags for charge-unit-hangup: */ + /* bit0: chargeint is invalid */ + /* bit1: Getting charge-interval */ + /* bit2: Do charge-unit-hangup */ + /* bit3: Do hangup even on incoming */ + int outgoing; /* Flag: outgoing call */ + int onhtime; /* Time to keep link up */ + int chargeint; /* Interval between charge-infos */ + int onum; /* Flag: at least 1 outgoing number */ + int cps; /* current speed of this interface */ + int transcount; /* byte-counter for cps-calculation */ + int sqfull; /* Flag: netdev-queue overloaded */ + ulong sqfull_stamp; /* Start-Time of overload */ + ulong slavedelay; /* Dynamic bundling delaytime */ + int triggercps; /* BogoCPS needed for trigger slave */ + isdn_net_phone *phone[2]; /* List of remote-phonenumbers */ + /* phone[0] = Incoming Numbers */ + /* phone[1] = Outgoing Numbers */ + isdn_net_phone *dial; /* Pointer to dialed number */ + struct net_device *master; /* Ptr to Master device for slaves */ + struct net_device *slave; /* Ptr to Slave device for masters */ + struct isdn_net_local_s *next; /* Ptr to next link in bundle */ + struct isdn_net_local_s *last; /* Ptr to last link in bundle */ + struct isdn_net_dev_s *netdev; /* Ptr to netdev */ + struct sk_buff_head super_tx_queue; /* List of supervisory frames to */ + /* be transmitted asap */ + atomic_t frame_cnt; /* number of frames currently */ + /* queued in HL driver */ + /* Ptr to orig. hard_header_cache */ + spinlock_t xmit_lock; /* used to protect the xmit path of */ + /* a particular channel (including */ + /* the frame_cnt */ + + int (*org_hhc)( + struct neighbour *neigh, + struct hh_cache *hh); + /* Ptr to orig. header_cache_update */ + void (*org_hcu)(struct hh_cache *, + struct net_device *, + unsigned char *); + int pppbind; /* ippp device for bindings */ + int dialtimeout; /* How long shall we try on dialing? (jiffies) */ + int dialwait; /* How long shall we wait after failed attempt? (jiffies) */ + ulong dialstarted; /* jiffies of first dialing-attempt */ + ulong dialwait_timer; /* jiffies of earliest next dialing-attempt */ + int huptimeout; /* How long will the connection be up? (seconds) */ +#ifdef CONFIG_ISDN_X25 + struct concap_device_ops *dops; /* callbacks used by encapsulator */ +#endif + /* use an own struct for that in later versions */ + ulong cisco_myseq; /* Local keepalive seq. for Cisco */ + ulong cisco_mineseen; /* returned keepalive seq. from remote */ + ulong cisco_yourseq; /* Remote keepalive seq. for Cisco */ + int cisco_keepalive_period; /* keepalive period */ + ulong cisco_last_slarp_in; /* jiffie of last keepalive packet we received */ + char cisco_line_state; /* state of line according to keepalive packets */ + char cisco_debserint; /* debugging flag of cisco hdlc with slarp */ + struct timer_list cisco_timer; + struct work_struct tqueue; +} isdn_net_local; + +/* the interface itself */ +typedef struct isdn_net_dev_s { + isdn_net_local *local; + isdn_net_local *queue; /* circular list of all bundled + channels, which are currently + online */ + spinlock_t queue_lock; /* lock to protect queue */ + void *next; /* Pointer to next isdn-interface */ + struct net_device dev; /* interface to upper levels */ +#ifdef CONFIG_ISDN_PPP + ippp_bundle * pb; /* pointer to the common bundle structure + * with the per-bundle data */ +#endif +#ifdef CONFIG_ISDN_X25 + struct concap_proto *cprot; /* connection oriented encapsulation protocol */ +#endif + +} isdn_net_dev; + +/*===================== End of ip-over-ISDN stuff ===========================*/ + /*======================= Start of ISDN-tty stuff ===========================*/ #define ISDN_ASYNC_MAGIC 0x49344C01 /* for paranoia-checking */ @@ -250,21 +420,22 @@ #define ISDN_ASYNC_SPLIT_TERMIOS 0x0008 /* Sep. termios for dialin/out */ #define ISDN_SERIAL_XMIT_SIZE 1024 /* Default bufsize for write */ #define ISDN_SERIAL_XMIT_MAX 4000 /* Maximum bufsize for write */ +#define ISDN_SERIAL_TYPE_NORMAL 1 +#define ISDN_SERIAL_TYPE_CALLOUT 2 #ifdef CONFIG_ISDN_AUDIO /* For using sk_buffs with audio we need some private variables * within each sk_buff. For this purpose, we declare a struct here, - * and put it always at skb->head. A few macros help accessing the - * variables. Of course, we need to check skb_headroom prior to - * any access. + * and put it always at the private skb->cb data array. A few macros help + * accessing the variables. */ -typedef struct _isdnaudio_header { +typedef struct _isdn_audio_data { unsigned short dle_count; unsigned char lock; -} isdnaudio_header; +} isdn_audio_data_t; -#define ISDN_AUDIO_SKB_DLECOUNT(skb) (((isdnaudio_header*)skb->head)->dle_count) -#define ISDN_AUDIO_SKB_LOCK(skb) (((isdnaudio_header*)skb->head)->lock) +#define ISDN_AUDIO_SKB_DLECOUNT(skb) (((isdn_audio_data_t *)&skb->cb[0])->dle_count) +#define ISDN_AUDIO_SKB_LOCK(skb) (((isdn_audio_data_t *)&skb->cb[0])->lock) #endif /* Private data of AT-command-interpreter */ @@ -283,7 +454,8 @@ #endif int mdmcmdl; /* Length of Modem-Commandbuffer */ int pluscount; /* Counter for +++ sequence */ - unsigned long lastplus; /* Timestamp of last + */ + u_long lastplus; /* Timestamp of last + */ + int carrierwait; /* Seconds of carrier waiting */ char mdmcmd[255]; /* Modem-Commandbuffer */ unsigned int charge; /* Charge units of current connection */ } atemu; @@ -300,13 +472,15 @@ int line; int count; /* # of fd on device */ int blocked_open; /* # of blocked opens */ + long session; /* Session of opening process */ + long pgrp; /* pgrp of opening process */ int online; /* 1 = B-Channel is up, drop data */ /* 2 = B-Channel is up, deliver d.*/ int dialing; /* Dial in progress or ATA */ int rcvsched; /* Receive needs schedule */ - struct isdn_slot *isdn_slot; /* Ptr to isdn-driver/channel */ - struct sk_buff_head rpqueue; /* Queue of recv'd packets */ - int rcvcount; /* Byte-counters for B rx */ + int isdn_driver; /* Index to isdn-driver */ + int isdn_channel; /* Index to isdn-channel */ + int drv_index; /* Index to dev->usage */ int ncarrier; /* Flag: schedule NO CARRIER */ unsigned char last_cause[8]; /* Last cause message */ unsigned char last_num[ISDN_MSNLEN]; @@ -323,7 +497,6 @@ struct sk_buff_head xmit_queue; /* transmit queue */ atomic_t xmit_lock; /* Semaphore for isdn_tty_write */ #ifdef CONFIG_ISDN_AUDIO - unsigned long DLEflag; /* Insert DLE at next read */ int vonline; /* Voice-channel status */ /* Bit 0 = recording */ /* Bit 1 = playback */ @@ -340,16 +513,25 @@ #endif struct tty_struct *tty; /* Pointer to corresponding tty */ atemu emu; /* AT-emulator data */ - struct timer_list escape_timer; /* to recognize +++ escape */ - struct timer_list ring_timer; /* for writing 'RING' responses */ - struct timer_list connect_timer; /* waiting for CONNECT */ - struct timer_list read_timer; /* read incoming data */ + struct termios normal_termios; /* For saving termios structs */ + struct termios callout_termios; wait_queue_head_t open_wait, close_wait; struct semaphore write_sem; + spinlock_t readlock; } modem_info; #define ISDN_MODEM_WINSIZE 8 +/* Description of one ISDN-tty */ +typedef struct _isdn_modem { + int refcount; /* Number of opens */ + struct tty_driver *tty_modem; /* tty-device */ + struct tty_struct *modem_table[ISDN_MAX_CHANNELS]; /* ?? copied from Orig */ + struct termios *modem_termios[ISDN_MAX_CHANNELS]; + struct termios *modem_termios_locked[ISDN_MAX_CHANNELS]; + modem_info info[ISDN_MAX_CHANNELS]; /* Private data */ +} isdn_modem_t; + /*======================= End of ISDN-tty stuff ============================*/ /*======================== Start of V.110 stuff ============================*/ @@ -384,23 +566,72 @@ char *private; } infostruct; +#define DRV_FLAG_RUNNING 1 +#define DRV_FLAG_REJBUS 2 +#define DRV_FLAG_LOADED 4 + +/* Description of hardware-level-driver */ +typedef struct _isdn_driver { + ulong online; /* Channel-Online flags */ + ulong flags; /* Misc driver Flags */ + int locks; /* Number of locks for this driver */ + int channels; /* Number of channels */ + wait_queue_head_t st_waitq; /* Wait-Queue for status-read's */ + int maxbufsize; /* Maximum Buffersize supported */ + unsigned long pktcount; /* Until now: unused */ + int stavail; /* Chars avail on Status-device */ + isdn_if *interface; /* Interface to driver */ + int *rcverr; /* Error-counters for B-Ch.-receive */ + int *rcvcount; /* Byte-counters for B-Ch.-receive */ +#ifdef CONFIG_ISDN_AUDIO + unsigned long DLEflag; /* Flags: Insert DLE at next read */ +#endif + struct sk_buff_head *rpqueue; /* Pointers to start of Rcv-Queue */ + wait_queue_head_t *rcv_waitq; /* Wait-Queues for B-Channel-Reads */ + wait_queue_head_t *snd_waitq; /* Wait-Queue for B-Channel-Send's */ + char msn2eaz[10][ISDN_MSNLEN]; /* Mapping-Table MSN->EAZ */ +} isdn_driver_t; + /* Main driver-data */ -typedef struct _isdn_dev_t { - unsigned short flags; /* Bitmapped Flags: */ - int channels; /* Current number of channels */ - int net_verbose; /* Verbose-Flag */ - int modempoll; /* Flag: tty-read active */ - int tflags; /* Timer-Flags: */ - /* see ISDN_TIMER_..defines */ - int global_flags; - infostruct *infochain; /* List of open info-devs. */ - wait_queue_head_t info_waitq; /* Wait-Queue for isdninfo */ - struct task_struct *profd; /* For iprofd */ - struct semaphore sem; /* serialize list access*/ - unsigned long global_features; -} isdn_dev_t; +typedef struct isdn_devt { + struct module *owner; + spinlock_t lock; + unsigned short flags; /* Bitmapped Flags: */ + int drivers; /* Current number of drivers */ + int channels; /* Current number of channels */ + int net_verbose; /* Verbose-Flag */ + int modempoll; /* Flag: tty-read active */ + spinlock_t timerlock; + int tflags; /* Timer-Flags: */ + /* see ISDN_TIMER_..defines */ + int global_flags; + infostruct *infochain; /* List of open info-devs. */ + wait_queue_head_t info_waitq; /* Wait-Queue for isdninfo */ + struct timer_list timer; /* Misc.-function Timer */ + int chanmap[ISDN_MAX_CHANNELS]; /* Map minor->device-channel */ + int drvmap[ISDN_MAX_CHANNELS]; /* Map minor->driver-index */ + int usage[ISDN_MAX_CHANNELS]; /* Used by tty/ip/voice */ + char num[ISDN_MAX_CHANNELS][ISDN_MSNLEN]; + /* Remote number of active ch.*/ + int m_idx[ISDN_MAX_CHANNELS]; /* Index for mdm.... */ + isdn_driver_t *drv[ISDN_MAX_DRIVERS]; /* Array of drivers */ + isdn_net_dev *netdev; /* Linked list of net-if's */ + char drvid[ISDN_MAX_DRIVERS][20];/* Driver-ID */ + struct task_struct *profd; /* For iprofd */ + isdn_modem_t mdm; /* tty-driver-data */ + isdn_net_dev *rx_netdev[ISDN_MAX_CHANNELS]; /* rx netdev-pointers */ + isdn_net_dev *st_netdev[ISDN_MAX_CHANNELS]; /* stat netdev-pointers */ + ulong ibytes[ISDN_MAX_CHANNELS]; /* Statistics incoming bytes */ + ulong obytes[ISDN_MAX_CHANNELS]; /* Statistics outgoing bytes */ + int v110emu[ISDN_MAX_CHANNELS]; /* V.110 emulator-mode 0=none */ + atomic_t v110use[ISDN_MAX_CHANNELS]; /* Usage-Semaphore for stream */ + isdn_v110_stream *v110[ISDN_MAX_CHANNELS]; /* V.110 private data */ + struct semaphore sem; /* serialize list access*/ + unsigned long global_features; +} isdn_dev; + +extern isdn_dev *dev; -extern isdn_dev_t *get_isdn_dev(void); #endif /* __KERNEL__ */ diff -Nru a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h --- a/include/linux/isdn_ppp.h Thu Feb 19 23:44:23 2004 +++ b/include/linux/isdn_ppp.h Thu Feb 19 23:44:23 2004 @@ -21,46 +21,65 @@ struct pppcallinfo { - int calltype; - unsigned char local_num[64]; - unsigned char remote_num[64]; - int charge_units; + int calltype; + unsigned char local_num[64]; + unsigned char remote_num[64]; + int charge_units; }; -#define PPPIOCGCALLINFO _IOWR('t',128,struct pppcallinfo) -#define PPPIOCBUNDLE _IOW('t',129,int) -#define PPPIOCGMPFLAGS _IOR('t',130,int) -#define PPPIOCSMPFLAGS _IOW('t',131,int) -#define PPPIOCSMPMTU _IOW('t',132,int) -#define PPPIOCSMPMRU _IOW('t',133,int) -#define PPPIOCGCOMPRESSORS _IOR('t',134,unsigned long[8]) -#define PPPIOCSCOMPRESSOR _IOW('t',135,int) -#define PPPIOCGIFNAME _IOR('t',136,char[IFNAMSIZ]) +#define PPPIOCGCALLINFO _IOWR('t',128,struct pppcallinfo) +#define PPPIOCBUNDLE _IOW('t',129,int) +#define PPPIOCGMPFLAGS _IOR('t',130,int) +#define PPPIOCSMPFLAGS _IOW('t',131,int) +#define PPPIOCSMPMTU _IOW('t',132,int) +#define PPPIOCSMPMRU _IOW('t',133,int) +#define PPPIOCGCOMPRESSORS _IOR('t',134,unsigned long [8]) +#define PPPIOCSCOMPRESSOR _IOW('t',135,int) +#define PPPIOCGIFNAME _IOR('t',136, char [IFNAMSIZ] ) + #define SC_MP_PROT 0x00000200 #define SC_REJ_MP_PROT 0x00000400 #define SC_OUT_SHORT_SEQ 0x00000800 #define SC_IN_SHORT_SEQ 0x00004000 +#define SC_DECOMP_ON 0x01 +#define SC_COMP_ON 0x02 +#define SC_DECOMP_DISCARD 0x04 +#define SC_COMP_DISCARD 0x08 +#define SC_LINK_DECOMP_ON 0x10 +#define SC_LINK_COMP_ON 0x20 +#define SC_LINK_DECOMP_DISCARD 0x40 +#define SC_LINK_COMP_DISCARD 0x80 + #define ISDN_PPP_COMP_MAX_OPTIONS 16 #define IPPP_COMP_FLAG_XMIT 0x1 #define IPPP_COMP_FLAG_LINK 0x2 struct isdn_ppp_comp_data { - int num; - unsigned char options[ISDN_PPP_COMP_MAX_OPTIONS]; - int optlen; - int flags; + int num; + unsigned char options[ISDN_PPP_COMP_MAX_OPTIONS]; + int optlen; + int flags; }; #ifdef __KERNEL__ -#include -#include + +#include + +#ifdef CONFIG_IPPP_FILTER +#include +#endif #define DECOMP_ERR_NOMEM (-10) +#define MP_END_FRAG 0x40 +#define MP_BEGIN_FRAG 0x80 + +#define MP_MAX_QUEUE_LEN 16 + /* * We need a way for the decompressor to influence the generation of CCP * Reset-Requests in a variety of ways. The decompressor is already returning @@ -79,15 +98,15 @@ #define IPPP_RESET_MAXDATABYTES 32 struct isdn_ppp_resetparams { - unsigned char valid:1; /* rw Is this structure filled at all ? */ - unsigned char rsend:1; /* rw Should we send one at all ? */ - unsigned char idval:1; /* rw Is the id field valid ? */ - unsigned char dtval:1; /* rw Is the data field valid ? */ - unsigned char expra:1; /* rw Is an Ack expected for this Req ? */ - unsigned char id; /* wo Send CCP ResetReq with this id */ - unsigned short maxdlen; /* ro Max bytes to be stored in data field */ - unsigned short dlen; /* rw Bytes stored in data field */ - unsigned char *data; /* wo Data for ResetReq info field */ + unsigned char valid:1; /* rw Is this structure filled at all ? */ + unsigned char rsend:1; /* rw Should we send one at all ? */ + unsigned char idval:1; /* rw Is the id field valid ? */ + unsigned char dtval:1; /* rw Is the data field valid ? */ + unsigned char expra:1; /* rw Is an Ack expected for this Req ? */ + unsigned char id; /* wo Send CCP ResetReq with this id */ + unsigned short maxdlen; /* ro Max bytes to be stored in data field */ + unsigned short dlen; /* rw Bytes stored in data field */ + unsigned char *data; /* wo Data for ResetReq info field */ }; /* @@ -95,38 +114,135 @@ * check the original include for more information */ struct isdn_ppp_compressor { - struct module *owner; - struct list_head list; - int num; /* CCP compression protocol number */ - - void *(*alloc) (struct isdn_ppp_comp_data *); - void (*free) (void *state); - int (*init) (void *state, struct isdn_ppp_comp_data *, - int unit,int debug); - - /* The reset entry needs to get more exact information about the - ResetReq or ResetAck it was called with. The parameters are - obvious. If reset is called without a Req or Ack frame which - could be handed into it, code MUST be set to 0. Using rsparm, - the reset entry can control if and how a ResetAck is returned. */ - - void (*reset) (void *state, unsigned char code, unsigned char id, - unsigned char *data, unsigned len, - struct isdn_ppp_resetparams *rsparm); + struct isdn_ppp_compressor *next, *prev; + struct module *owner; + int num; /* CCP compression protocol number */ + + void *(*alloc) (struct isdn_ppp_comp_data *); + void (*free) (void *state); + int (*init) (void *state, struct isdn_ppp_comp_data *, + int unit,int debug); + + /* The reset entry needs to get more exact information about the + ResetReq or ResetAck it was called with. The parameters are + obvious. If reset is called without a Req or Ack frame which + could be handed into it, code MUST be set to 0. Using rsparm, + the reset entry can control if and how a ResetAck is returned. */ + + void (*reset) (void *state, unsigned char code, unsigned char id, + unsigned char *data, unsigned len, + struct isdn_ppp_resetparams *rsparm); - int (*compress) (void *state, struct sk_buff *in, - struct sk_buff *skb_out, int proto); + int (*compress) (void *state, struct sk_buff *in, + struct sk_buff *skb_out, int proto); int (*decompress) (void *state,struct sk_buff *in, struct sk_buff *skb_out, struct isdn_ppp_resetparams *rsparm); - void (*incomp) (void *state, struct sk_buff *in,int proto); - void (*stat) (void *state, struct compstat *stats); + void (*incomp) (void *state, struct sk_buff *in,int proto); + void (*stat) (void *state, struct compstat *stats); }; extern int isdn_ppp_register_compressor(struct isdn_ppp_compressor *); extern int isdn_ppp_unregister_compressor(struct isdn_ppp_compressor *); +extern int isdn_ppp_dial_slave(char *); +extern int isdn_ppp_hangup_slave(char *); + +typedef struct { + unsigned long seqerrs; + unsigned long frame_drops; + unsigned long overflows; + unsigned long max_queue_len; +} isdn_mppp_stats; + +typedef struct { + int mp_mrru; /* unused */ + struct sk_buff * frags; /* fragments sl list -- use skb->next */ + long frames; /* number of frames in the frame list */ + unsigned int seq; /* last processed packet seq #: any packets + * with smaller seq # will be dropped + * unconditionally */ + spinlock_t lock; + int ref_ct; + /* statistics */ + isdn_mppp_stats stats; +} ippp_bundle; + +#define NUM_RCV_BUFFS 64 + +struct ippp_buf_queue { + struct ippp_buf_queue *next; + struct ippp_buf_queue *last; + char *buf; /* NULL here indicates end of queue */ + int len; +}; + +/* The data structure for one CCP reset transaction */ +enum ippp_ccp_reset_states { + CCPResetIdle, + CCPResetSentReq, + CCPResetRcvdReq, + CCPResetSentAck, + CCPResetRcvdAck +}; + +struct ippp_ccp_reset_state { + enum ippp_ccp_reset_states state; /* State of this transaction */ + struct ippp_struct *is; /* Backlink to device stuff */ + unsigned char id; /* Backlink id index */ + unsigned char ta:1; /* The timer is active (flag) */ + unsigned char expra:1; /* We expect a ResetAck at all */ + int dlen; /* Databytes stored in data */ + struct timer_list timer; /* For timeouts/retries */ + /* This is a hack but seems sufficient for the moment. We do not want + to have this be yet another allocation for some bytes, it is more + memory management overhead than the whole mess is worth. */ + unsigned char data[IPPP_RESET_MAXDATABYTES]; +}; + +/* The data structure keeping track of the currently outstanding CCP Reset + transactions. */ +struct ippp_ccp_reset { + struct ippp_ccp_reset_state *rs[256]; /* One per possible id */ + unsigned char lastid; /* Last id allocated by the engine */ +}; + +struct ippp_struct { + struct ippp_struct *next_link; + int state; + spinlock_t buflock; + struct ippp_buf_queue rq[NUM_RCV_BUFFS]; /* packet queue for isdn_ppp_read() */ + struct ippp_buf_queue *first; /* pointer to (current) first packet */ + struct ippp_buf_queue *last; /* pointer to (current) last used packet in queue */ + wait_queue_head_t wq; + struct task_struct *tk; + unsigned int mpppcfg; + unsigned int pppcfg; + unsigned int mru; + unsigned int mpmru; + unsigned int mpmtu; + unsigned int maxcid; + struct isdn_net_local_s *lp; + int unit; + int minor; + unsigned int last_link_seqno; + long mp_seqno; +#ifdef CONFIG_ISDN_PPP_VJ + unsigned char *cbuf; + struct slcompress *slcomp; +#endif +#ifdef CONFIG_IPPP_FILTER + struct sock_fprog pass_filter; /* filter for packets to pass */ + struct sock_fprog active_filter; /* filter for pkts to reset idle */ +#endif + unsigned long debug; + struct isdn_ppp_compressor *compressor,*decompressor; + struct isdn_ppp_compressor *link_compressor,*link_decompressor; + void *decomp_stat,*comp_stat,*link_decomp_stat,*link_comp_stat; + struct ippp_ccp_reset *reset; /* Allocated on demand, may never be needed */ + unsigned long compflags; +}; #endif /* __KERNEL__ */ #endif /* _LINUX_ISDN_PPP_H */ diff -Nru a/include/linux/isdnif.h b/include/linux/isdnif.h --- a/include/linux/isdnif.h Thu Feb 19 23:44:22 2004 +++ b/include/linux/isdnif.h Thu Feb 19 23:44:22 2004 @@ -1,4 +1,4 @@ -/* $Id: isdnif.h,v 1.37.6.6 2001/09/23 22:25:05 kai Exp $ +/* $Id: isdnif.h,v 1.43.2.2 2004/01/12 23:08:35 keil Exp $ * * Linux ISDN subsystem * Definition of the interface between the subsystem and its low-level drivers. @@ -166,8 +166,17 @@ #define ISDN_CMD_HANGUP 4 /* Hangup */ #define ISDN_CMD_CLREAZ 5 /* Clear EAZ(s) of channel */ #define ISDN_CMD_SETEAZ 6 /* Set EAZ(s) of channel */ +#define ISDN_CMD_GETEAZ 7 /* Get EAZ(s) of channel */ +#define ISDN_CMD_SETSIL 8 /* Set Service-Indicator-List of channel */ +#define ISDN_CMD_GETSIL 9 /* Get Service-Indicator-List of channel */ #define ISDN_CMD_SETL2 10 /* Set B-Chan. Layer2-Parameter */ +#define ISDN_CMD_GETL2 11 /* Get B-Chan. Layer2-Parameter */ #define ISDN_CMD_SETL3 12 /* Set B-Chan. Layer3-Parameter */ +#define ISDN_CMD_GETL3 13 /* Get B-Chan. Layer3-Parameter */ +// #define ISDN_CMD_LOCK 14 /* Signal usage by upper levels */ +// #define ISDN_CMD_UNLOCK 15 /* Release usage-lock */ +#define ISDN_CMD_SUSPEND 16 /* Suspend connection */ +#define ISDN_CMD_RESUME 17 /* Resume connection */ #define ISDN_CMD_PROCEED 18 /* Proceed with call establishment */ #define ISDN_CMD_ALERT 19 /* Alert after Proceeding */ #define ISDN_CMD_REDIR 20 /* Redir a incoming call */ @@ -193,12 +202,14 @@ #define ISDN_STAT_LOAD 265 /* Signal new lowlevel-driver is loaded */ #define ISDN_STAT_UNLOAD 266 /* Signal unload of lowlevel-driver */ #define ISDN_STAT_BSENT 267 /* Signal packet sent */ +#define ISDN_STAT_NODCH 268 /* Signal no D-Channel */ #define ISDN_STAT_ADDCH 269 /* Add more Channels */ #define ISDN_STAT_CAUSE 270 /* Cause-Message */ #define ISDN_STAT_ICALLW 271 /* Incoming call without B-chan waiting */ #define ISDN_STAT_REDIR 272 /* Redir result */ #define ISDN_STAT_PROT 273 /* protocol IO specific callback */ #define ISDN_STAT_DISPLAY 274 /* deliver a received display message */ +#define ISDN_STAT_L1ERR 275 /* Signal Layer-1 Error */ #define ISDN_STAT_FAXIND 276 /* FAX indications from HL-driver */ #define ISDN_STAT_AUDIO 277 /* DTMF, DSP indications */ #define ISDN_STAT_DISCH 278 /* Disable/Enable channel usage */ @@ -210,6 +221,12 @@ #define ISDN_AUDIO_DTMF 1 /* Rx/Tx DTMF */ /* + * Values for errcode field + */ +#define ISDN_STAT_L1ERR_SEND 1 +#define ISDN_STAT_L1ERR_RECV 2 + +/* * Values for feature-field of interface-struct. */ /* Layer 2 */ @@ -258,6 +275,7 @@ } setup_parm; +#ifdef CONFIG_ISDN_TTY_FAX /* T.30 Fax G3 */ #define FAXIDLEN 21 @@ -332,6 +350,8 @@ #define ISDN_FAX_PHASE_D 4 #define ISDN_FAX_PHASE_E 5 +#endif /* TTY_FAX */ + #define ISDN_FAX_CLASS1_FAE 0 #define ISDN_FAX_CLASS1_FTS 1 #define ISDN_FAX_CLASS1_FRS 2 @@ -398,7 +418,9 @@ char display[85];/* display message data */ isdn_cmd_stat isdn_io; /* ISDN IO-parameter/result */ aux_s aux; /* for modem commands/indications */ +#ifdef CONFIG_ISDN_TTY_FAX T30_s *fax; /* Pointer to ttys fax struct */ +#endif ulong userdata; /* User Data */ } parm; } isdn_ctrl; diff -Nru a/include/linux/istallion.h b/include/linux/istallion.h --- a/include/linux/istallion.h Thu Feb 19 23:44:23 2004 +++ b/include/linux/istallion.h Thu Feb 19 23:44:23 2004 @@ -70,15 +70,9 @@ void *argp; unsigned int rxmarkmsk; struct tty_struct *tty; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)) - struct wait_queue *open_wait; - struct wait_queue *close_wait; - struct wait_queue *raw_wait; -#else wait_queue_head_t open_wait; wait_queue_head_t close_wait; wait_queue_head_t raw_wait; -#endif struct work_struct tqhangup; asysigs_t asig; unsigned long addr; diff -Nru a/include/linux/kernel.h b/include/linux/kernel.h --- a/include/linux/kernel.h Thu Feb 19 23:44:22 2004 +++ b/include/linux/kernel.h Thu Feb 19 23:44:22 2004 @@ -72,6 +72,9 @@ extern int snprintf(char * buf, size_t size, const char * fmt, ...) __attribute__ ((format (printf, 3, 4))); extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); +extern int scnprintf(char * buf, size_t size, const char * fmt, ...) + __attribute__ ((format (printf, 3, 4))); +extern int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); extern int sscanf(const char *, const char *, ...) __attribute__ ((format (scanf,2,3))); diff -Nru a/include/linux/kthread.h b/include/linux/kthread.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/include/linux/kthread.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,81 @@ +#ifndef _LINUX_KTHREAD_H +#define _LINUX_KTHREAD_H +/* Simple interface for creating and stopping kernel threads without mess. */ +#include +#include + +/** + * kthread_create: create a kthread. + * @threadfn: the function to run until signal_pending(current). + * @data: data ptr for @threadfn. + * @namefmt: printf-style name for the thread. + * + * Description: This helper function creates and names a kernel + * thread. The thread will be stopped: use wake_up_process() to start + * it. See also kthread_run(), kthread_create_on_cpu(). + * + * When woken, the thread will run @threadfn() with @data as its + * argument. @threadfn can either call do_exit() directly if it is a + * standalone thread for which noone will call kthread_stop(), or + * return when 'kthread_should_stop()' is true (which means + * kthread_stop() has been called). The return value should be zero + * or a negative error number: it will be passed to kthread_stop(). + * + * Returns a task_struct or ERR_PTR(-ENOMEM). + */ +struct task_struct *kthread_create(int (*threadfn)(void *data), + void *data, + const char namefmt[], ...); + +/** + * kthread_run: create and wake a thread. + * @threadfn: the function to run until signal_pending(current). + * @data: data ptr for @threadfn. + * @namefmt: printf-style name for the thread. + * + * Description: Convenient wrapper for kthread_create() followed by + * wake_up_process(). Returns the kthread, or ERR_PTR(-ENOMEM). */ +#define kthread_run(threadfn, data, namefmt, ...) \ +({ \ + struct task_struct *__k \ + = kthread_create(threadfn, data, namefmt, ## __VA_ARGS__); \ + if (!IS_ERR(__k)) \ + wake_up_process(__k); \ + __k; \ +}) + +/** + * kthread_bind: bind a just-created kthread to a cpu. + * @k: thread created by kthread_create(). + * @cpu: cpu (might not be online, must be possible) for @k to run on. + * + * Description: This function is equivalent to set_cpus_allowed(), + * except that @cpu doesn't need to be online, and the thread must be + * stopped (ie. just returned from kthread_create(). + */ +void kthread_bind(struct task_struct *k, unsigned int cpu); + +/** + * kthread_stop: stop a thread created by kthread_create(). + * @k: thread created by kthread_create(). + * + * Sets kthread_should_stop() for @k to return true, wakes it, and + * waits for it to exit. Your threadfn() must not call do_exit() + * itself if you use this function! This can also be called after + * kthread_create() instead of calling wake_up_process(): the thread + * will exit without calling threadfn(). + * + * Returns the result of threadfn(), or -EINTR if wake_up_process() + * was never called. */ +int kthread_stop(struct task_struct *k); + +/** + * kthread_should_stop: should this kthread return now? + * + * When someone calls kthread_stop on your kthread, it will be woken + * and this will return true. You should then return, and your return + * value will be passed through to kthread_stop(). + */ +int kthread_should_stop(void); + +#endif /* _LINUX_KTHREAD_H */ diff -Nru a/include/linux/lapb.h b/include/linux/lapb.h --- a/include/linux/lapb.h Thu Feb 19 23:44:27 2004 +++ b/include/linux/lapb.h Thu Feb 19 23:44:27 2004 @@ -24,12 +24,12 @@ #define LAPB_DCE 0x04 struct lapb_register_struct { - void (*connect_confirmation)(void *token, int reason); - void (*connect_indication)(void *token, int reason); - void (*disconnect_confirmation)(void *token, int reason); - void (*disconnect_indication)(void *token, int reason); - int (*data_indication)(void *token, struct sk_buff *skb); - void (*data_transmit)(void *token, struct sk_buff *skb); + void (*connect_confirmation)(struct net_device *dev, int reason); + void (*connect_indication)(struct net_device *dev, int reason); + void (*disconnect_confirmation)(struct net_device *dev, int reason); + void (*disconnect_indication)(struct net_device *dev, int reason); + int (*data_indication)(struct net_device *dev, struct sk_buff *skb); + void (*data_transmit)(struct net_device *dev, struct sk_buff *skb); }; struct lapb_parms_struct { @@ -44,13 +44,13 @@ unsigned int mode; }; -extern int lapb_register(void *token, struct lapb_register_struct *callbacks); -extern int lapb_unregister(void *token); -extern int lapb_getparms(void *token, struct lapb_parms_struct *parms); -extern int lapb_setparms(void *token, struct lapb_parms_struct *parms); -extern int lapb_connect_request(void *token); -extern int lapb_disconnect_request(void *token); -extern int lapb_data_request(void *token, struct sk_buff *skb); -extern int lapb_data_received(void *token, struct sk_buff *skb); +extern int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks); +extern int lapb_unregister(struct net_device *dev); +extern int lapb_getparms(struct net_device *dev, struct lapb_parms_struct *parms); +extern int lapb_setparms(struct net_device *dev, struct lapb_parms_struct *parms); +extern int lapb_connect_request(struct net_device *dev); +extern int lapb_disconnect_request(struct net_device *dev); +extern int lapb_data_request(struct net_device *dev, struct sk_buff *skb); +extern int lapb_data_received(struct net_device *dev, struct sk_buff *skb); #endif diff -Nru a/include/linux/limits.h b/include/linux/limits.h --- a/include/linux/limits.h Thu Feb 19 23:44:27 2004 +++ b/include/linux/limits.h Thu Feb 19 23:44:27 2004 @@ -3,7 +3,7 @@ #define NR_OPEN 1024 -#define NGROUPS_MAX 32 /* supplemental group IDs are available */ +#define NGROUPS_MAX 65536 /* supplemental group IDs are available */ #define ARG_MAX 131072 /* # bytes of args + environ for exec() */ #define CHILD_MAX 999 /* no limit :-) */ #define OPEN_MAX 256 /* # open files a process may have */ diff -Nru a/include/linux/loop.h b/include/linux/loop.h --- a/include/linux/loop.h Thu Feb 19 23:44:28 2004 +++ b/include/linux/loop.h Thu Feb 19 23:44:28 2004 @@ -34,8 +34,9 @@ loff_t lo_sizelimit; int lo_flags; int (*transfer)(struct loop_device *, int cmd, - char *raw_buf, char *loop_buf, int size, - sector_t real_block); + struct page *raw_page, unsigned raw_off, + struct page *loop_page, unsigned loop_off, + int size, sector_t real_block); char lo_file_name[LO_NAME_SIZE]; char lo_crypt_name[LO_NAME_SIZE]; char lo_encrypt_key[LO_KEY_SIZE]; @@ -70,8 +71,7 @@ /* * Loop flags */ -#define LO_FLAGS_DO_BMAP 1 -#define LO_FLAGS_READ_ONLY 2 +#define LO_FLAGS_READ_ONLY 1 #include /* for __kernel_old_dev_t */ #include /* for __u64 */ @@ -128,8 +128,10 @@ /* Support for loadable transfer modules */ struct loop_func_table { int number; /* filter type */ - int (*transfer)(struct loop_device *lo, int cmd, char *raw_buf, - char *loop_buf, int size, sector_t real_block); + int (*transfer)(struct loop_device *lo, int cmd, + struct page *raw_page, unsigned raw_off, + struct page *loop_page, unsigned loop_off, + int size, sector_t real_block); int (*init)(struct loop_device *, const struct loop_info64 *); /* release is called from loop_unregister_transfer or clr_fd */ int (*release)(struct loop_device *); diff -Nru a/include/linux/mmzone.h b/include/linux/mmzone.h --- a/include/linux/mmzone.h Thu Feb 19 23:44:25 2004 +++ b/include/linux/mmzone.h Thu Feb 19 23:44:25 2004 @@ -304,6 +304,7 @@ #define NODE_DATA(nid) (&contig_page_data) #define NODE_MEM_MAP(nid) mem_map #define MAX_NODES_SHIFT 1 +#define pfn_to_nid(pfn) (0) #else /* CONFIG_DISCONTIGMEM */ diff -Nru a/include/linux/modsetver.h b/include/linux/modsetver.h --- a/include/linux/modsetver.h Thu Feb 19 23:44:25 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,10 +0,0 @@ -/* Symbol versioning nastiness. */ - -#define __SYMBOL_VERSION(x) __ver_ ## x -#define __VERSIONED_SYMBOL2(x,v) x ## _R ## v -#define __VERSIONED_SYMBOL1(x,v) __VERSIONED_SYMBOL2(x,v) -#define __VERSIONED_SYMBOL(x) __VERSIONED_SYMBOL1(x,__SYMBOL_VERSION(x)) - -#ifndef _set_ver -#define _set_ver(x) __VERSIONED_SYMBOL(x) -#endif diff -Nru a/include/linux/msg.h b/include/linux/msg.h --- a/include/linux/msg.h Thu Feb 19 23:44:25 2004 +++ b/include/linux/msg.h Thu Feb 19 23:44:25 2004 @@ -2,6 +2,7 @@ #define _LINUX_MSG_H #include +#include /* ipcs ctl commands */ #define MSG_STAT 11 diff -Nru a/include/linux/netlink.h b/include/linux/netlink.h --- a/include/linux/netlink.h Thu Feb 19 23:44:27 2004 +++ b/include/linux/netlink.h Thu Feb 19 23:44:27 2004 @@ -11,6 +11,7 @@ #define NETLINK_TCPDIAG 4 /* TCP socket monitoring */ #define NETLINK_NFLOG 5 /* netfilter/iptables ULOG */ #define NETLINK_XFRM 6 /* ipsec */ +#define NETLINK_SELINUX 7 /* SELinux event notifications */ #define NETLINK_ARPD 8 #define NETLINK_ROUTE6 11 /* af_inet6 route comm channel */ #define NETLINK_IP6_FW 13 diff -Nru a/include/linux/nfsd/auth.h b/include/linux/nfsd/auth.h --- a/include/linux/nfsd/auth.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/nfsd/auth.h Thu Feb 19 23:44:24 2004 @@ -21,7 +21,7 @@ * Set the current process's fsuid/fsgid etc to those of the NFS * client user */ -void nfsd_setuser(struct svc_rqst *, struct svc_export *); +int nfsd_setuser(struct svc_rqst *, struct svc_export *); #endif /* __KERNEL__ */ #endif /* LINUX_NFSD_AUTH_H */ diff -Nru a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h --- a/include/linux/nfsd/nfsd.h Thu Feb 19 23:44:28 2004 +++ b/include/linux/nfsd/nfsd.h Thu Feb 19 23:44:28 2004 @@ -86,7 +86,7 @@ struct svc_fh *res, int createmode, u32 *verifier, int *truncp); int nfsd_commit(struct svc_rqst *, struct svc_fh *, - off_t, unsigned long); + loff_t, unsigned long); #endif /* CONFIG_NFSD_V3 */ int nfsd_open(struct svc_rqst *, struct svc_fh *, int, int, struct file *); diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/pci_ids.h Thu Feb 19 23:44:24 2004 @@ -1577,6 +1577,9 @@ #define PCI_DEVICE_ID_ENSONIQ_ES1370 0x5000 #define PCI_DEVICE_ID_ENSONIQ_ES1371 0x1371 +#define PCI_VENDOR_ID_TRANSMETA 0x1279 +#define PCI_DEVICE_ID_EFFICEON 0x0060 + #define PCI_VENDOR_ID_ROCKWELL 0x127A #define PCI_VENDOR_ID_ITE 0x1283 diff -Nru a/include/linux/ppp.h b/include/linux/ppp.h --- a/include/linux/ppp.h Thu Feb 19 23:44:22 2004 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,4 +0,0 @@ -/* - * Back compatibility for a while. - */ -#include diff -Nru a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h --- a/include/linux/raid/md_k.h Thu Feb 19 23:44:22 2004 +++ b/include/linux/raid/md_k.h Thu Feb 19 23:44:22 2004 @@ -186,7 +186,8 @@ { void *private; mdk_personality_t *pers; - int __minor; + dev_t unit; + int md_minor; struct list_head disks; int sb_dirty; int ro; @@ -235,6 +236,7 @@ struct semaphore reconfig_sem; atomic_t active; + int changed; /* true if we might need to reread partition info */ int degraded; /* whether md should consider * adding a spare */ @@ -272,15 +274,6 @@ }; -/* - * Currently we index md_array directly, based on the minor - * number. This will have to change to dynamic allocation - * once we start supporting partitioning of md devices. - */ -static inline int mdidx (mddev_t * mddev) -{ - return mddev->__minor; -} static inline char * mdname (mddev_t * mddev) { return mddev->gendisk ? mddev->gendisk->disk_name : "mdX"; diff -Nru a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h --- a/include/linux/raid/raid1.h Thu Feb 19 23:44:26 2004 +++ b/include/linux/raid/raid1.h Thu Feb 19 23:44:26 2004 @@ -54,8 +54,8 @@ atomic_t remaining; /* 'have we finished' count, * used from IRQ handlers */ - int cmd; sector_t sector; + int sectors; unsigned long state; mddev_t *mddev; /* @@ -63,21 +63,19 @@ */ struct bio *master_bio; /* - * if the IO is in READ direction, then this bio is used: + * if the IO is in READ direction, then this is where we read */ - struct bio *read_bio; int read_disk; - r1bio_t *next_r1; /* next for retry or in free list */ struct list_head retry_list; /* * if the IO is in WRITE direction, then multiple bios are used. * We choose the number when they are allocated. */ - struct bio *write_bios[0]; + struct bio *bios[0]; }; /* bits for r1bio.state */ -#define R1BIO_Uptodate 1 - +#define R1BIO_Uptodate 0 +#define R1BIO_IsSync 1 #endif diff -Nru a/include/linux/sched.h b/include/linux/sched.h --- a/include/linux/sched.h Thu Feb 19 23:44:23 2004 +++ b/include/linux/sched.h Thu Feb 19 23:44:23 2004 @@ -151,6 +151,7 @@ extern void show_state(void); extern void show_regs(struct pt_regs *); +extern void show_trace_task(task_t *tsk); /* * TASK is a pointer to the task whose backtrace we want to see (or NULL for current @@ -330,6 +331,33 @@ struct io_context; /* See blkdev.h */ void exit_io_context(void); +#define NGROUPS_SMALL 32 +#define NGROUPS_PER_BLOCK ((int)(EXEC_PAGESIZE / sizeof(gid_t))) +struct group_info { + int ngroups; + atomic_t usage; + gid_t small_block[NGROUPS_SMALL]; + int nblocks; + gid_t *blocks[0]; +}; + +#define get_group_info(group_info) do { \ + atomic_inc(&(group_info)->usage); \ +} while (0) + +#define put_group_info(group_info) do { \ + if (atomic_dec_and_test(&(group_info)->usage)) \ + groups_free(group_info); \ +} while (0) + +struct group_info *groups_alloc(int gidsetsize); +void groups_free(struct group_info *group_info); +int set_current_groups(struct group_info *group_info); +/* access the groups "array" with this macro */ +#define GROUP_AT(gi, i) \ + ((gi)->blocks[(i)/NGROUPS_PER_BLOCK][(i)%NGROUPS_PER_BLOCK]) + + struct task_struct { volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info; @@ -404,8 +432,7 @@ /* process credentials */ uid_t uid,euid,suid,fsuid; gid_t gid,egid,sgid,fsgid; - int ngroups; - gid_t groups[NGROUPS]; + struct group_info *group_info; kernel_cap_t cap_effective, cap_inheritable, cap_permitted; int keep_capabilities:1; struct user_struct *user; @@ -708,6 +735,8 @@ extern int do_execve(char *, char __user * __user *, char __user * __user *, struct pt_regs *); extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *); extern struct task_struct * copy_process(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *); +extern asmlinkage long sys_sched_setscheduler(pid_t pid, int policy, + struct sched_param __user *parm); #ifdef CONFIG_SMP extern void wait_task_inactive(task_t * p); diff -Nru a/include/linux/security.h b/include/linux/security.h --- a/include/linux/security.h Thu Feb 19 23:44:27 2004 +++ b/include/linux/security.h Thu Feb 19 23:44:27 2004 @@ -564,9 +564,8 @@ * Return 0 if permission is granted. * @task_setgroups: * Check permission before setting the supplementary group set of the - * current process to @grouplist. - * @gidsetsize contains the number of elements in @grouplist. - * @grouplist contains the array of gids. + * current process. + * @group_info contains the new group information. * Return 0 if permission is granted. * @task_setnice: * Check permission before setting the nice value of @p to @nice. @@ -1127,7 +1126,7 @@ int (*task_setpgid) (struct task_struct * p, pid_t pgid); int (*task_getpgid) (struct task_struct * p); int (*task_getsid) (struct task_struct * p); - int (*task_setgroups) (int gidsetsize, gid_t * grouplist); + int (*task_setgroups) (struct group_info *group_info); int (*task_setnice) (struct task_struct * p, int nice); int (*task_setrlimit) (unsigned int resource, struct rlimit * new_rlim); int (*task_setscheduler) (struct task_struct * p, int policy, @@ -1686,9 +1685,9 @@ return security_ops->task_getsid (p); } -static inline int security_task_setgroups (int gidsetsize, gid_t *grouplist) +static inline int security_task_setgroups (struct group_info *group_info) { - return security_ops->task_setgroups (gidsetsize, grouplist); + return security_ops->task_setgroups (group_info); } static inline int security_task_setnice (struct task_struct *p, int nice) @@ -2320,7 +2319,7 @@ return 0; } -static inline int security_task_setgroups (int gidsetsize, gid_t *grouplist) +static inline int security_task_setgroups (struct group_info *group_info) { return 0; } diff -Nru a/include/linux/selinux_netlink.h b/include/linux/selinux_netlink.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/include/linux/selinux_netlink.h Thu Feb 19 23:44:29 2004 @@ -0,0 +1,37 @@ +/* + * Netlink event notifications for SELinux. + * + * Author: James Morris + * + * Copyright (C) 2004 Red Hat, Inc., James Morris + * + * 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. + */ +#ifndef _LINUX_SELINUX_NETLINK_H +#define _LINUX_SELINUX_NETLINK_H + +/* Message types. */ +#define SELNL_MSG_BASE 0x10 +enum { + SELNL_MSG_SETENFORCE = SELNL_MSG_BASE, + SELNL_MSG_POLICYLOAD, + SELNL_MSG_MAX +}; + +/* Multicast groups */ +#define SELNL_GRP_NONE 0x00000000 +#define SELNL_GRP_AVC 0x00000001 /* AVC notifications */ +#define SELNL_GRP_ALL 0xffffffff + +/* Message structures */ +struct selnl_msg_setenforce { + int32_t val; +}; + +struct selnl_msg_policyload { + u_int32_t seqno; +}; + +#endif /* _LINUX_SELINUX_NETLINK_H */ diff -Nru a/include/linux/skbuff.h b/include/linux/skbuff.h --- a/include/linux/skbuff.h Thu Feb 19 23:44:26 2004 +++ b/include/linux/skbuff.h Thu Feb 19 23:44:26 2004 @@ -163,6 +163,7 @@ * @cb: Control buffer. Free for use by every layer. Put private vars here * @len: Length of actual data * @data_len: Data length + * @mac_len: Length of link layer header * @csum: Checksum * @__unused: Dead field, may be reused * @cloned: Head may be cloned (check refcnt to be sure) @@ -204,6 +205,7 @@ struct icmphdr *icmph; struct igmphdr *igmph; struct iphdr *ipiph; + struct ipv6hdr *ipv6h; unsigned char *raw; } h; @@ -232,6 +234,7 @@ unsigned int len, data_len, + mac_len, csum; unsigned char local_df, cloned, diff -Nru a/include/linux/stallion.h b/include/linux/stallion.h --- a/include/linux/stallion.h Thu Feb 19 23:44:27 2004 +++ b/include/linux/stallion.h Thu Feb 19 23:44:27 2004 @@ -95,13 +95,8 @@ unsigned long hwid; void *uartp; struct tty_struct *tty; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)) - struct wait_queue *open_wait; - struct wait_queue *close_wait; -#else wait_queue_head_t open_wait; wait_queue_head_t close_wait; -#endif struct work_struct tqueue; comstats_t stats; stlrq_t tx; diff -Nru a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h --- a/include/linux/sunrpc/auth.h Thu Feb 19 23:44:25 2004 +++ b/include/linux/sunrpc/auth.h Thu Feb 19 23:44:25 2004 @@ -28,8 +28,7 @@ struct auth_cred { uid_t uid; gid_t gid; - int ngroups; - gid_t *groups; + struct group_info *group_info; }; /* diff -Nru a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h --- a/include/linux/sunrpc/cache.h Thu Feb 19 23:44:25 2004 +++ b/include/linux/sunrpc/cache.h Thu Feb 19 23:44:25 2004 @@ -132,12 +132,14 @@ * If "set" == 0 : * If an entry is found, it is returned * If no entry is found, a new non-VALID entry is created. - * If "set" == 1 : + * If "set" == 1 and INPLACE == 0 : * If no entry is found a new one is inserted with data from "template" * If a non-CACHE_VALID entry is found, it is updated from template using UPDATE * If a CACHE_VALID entry is found, a new entry is swapped in with data * from "template" - * If set == 2, we UPDATE, but don't swap. i.e. update in place + * If set == 1, and INPLACE == 1 : + * As above, except that if a CACHE_VALID entry is found, we UPDATE in place + * instead of swapping in a new entry. * * If the passed handle has the CACHE_NEGATIVE flag set, then UPDATE is not * run but insteead CACHE_NEGATIVE is set in any new item. @@ -164,8 +166,8 @@ RTN *tmp, *new=NULL; \ struct cache_head **hp, **head; \ SETUP; \ - retry: \ head = &(DETAIL)->hash_table[HASHFN]; \ + retry: \ if (set||new) write_lock(&(DETAIL)->hash_lock); \ else read_lock(&(DETAIL)->hash_lock); \ for(hp=head; *hp != NULL; hp = &tmp->MEMBER.next) { \ @@ -175,6 +177,8 @@ if (set && !INPLACE && test_bit(CACHE_VALID, &tmp->MEMBER.flags) && !new) \ break; \ \ + if (new) \ + {INIT;} \ cache_get(&tmp->MEMBER); \ if (set) { \ if (!INPLACE && test_bit(CACHE_VALID, &tmp->MEMBER.flags))\ @@ -203,6 +207,7 @@ } \ /* Didn't find anything */ \ if (new) { \ + INIT; \ new->MEMBER.next = *head; \ *head = &new->MEMBER; \ (DETAIL)->entries ++; \ @@ -224,8 +229,6 @@ if (new) { \ cache_init(&new->MEMBER); \ cache_get(&new->MEMBER); \ - INIT; \ - tmp = new; \ goto retry; \ } \ return NULL; \ diff -Nru a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h --- a/include/linux/sunrpc/stats.h Thu Feb 19 23:44:25 2004 +++ b/include/linux/sunrpc/stats.h Thu Feb 19 23:44:25 2004 @@ -48,14 +48,13 @@ #ifdef CONFIG_PROC_FS struct proc_dir_entry * rpc_proc_register(struct rpc_stat *); void rpc_proc_unregister(const char *); -int rpc_proc_read(char *, char **, off_t, int, - int *, void *); void rpc_proc_zero(struct rpc_program *); -struct proc_dir_entry * svc_proc_register(struct svc_stat *); +struct proc_dir_entry * svc_proc_register(struct svc_stat *, + struct file_operations *); void svc_proc_unregister(const char *); -int svc_proc_read(char *, char **, off_t, int, - int *, void *); -void svc_proc_zero(struct svc_program *); + +void svc_seq_show(struct seq_file *, + const struct svc_stat *); extern struct proc_dir_entry *proc_net_rpc; @@ -63,13 +62,14 @@ static inline struct proc_dir_entry *rpc_proc_register(struct rpc_stat *s) { return NULL; } static inline void rpc_proc_unregister(const char *p) {} -static inline int rpc_proc_read(char *a, char **b, off_t c, int d, int *e, void *f) { return 0; } static inline void rpc_proc_zero(struct rpc_program *p) {} -static inline struct proc_dir_entry *svc_proc_register(struct svc_stat *s) { return NULL; } +static inline struct proc_dir_entry *svc_proc_register(struct svc_stat *s, + struct file_operations *f) { return NULL; } static inline void svc_proc_unregister(const char *p) {} -static inline int svc_proc_read(char *a, char **b, off_t c, int d, int *e, void *f) { return 0; } -static inline void svc_proc_zero(struct svc_program *p) {} + +static inline void svc_seq_show(struct seq_file *seq, + const struct svc_stat *st) {} #define proc_net_rpc NULL diff -Nru a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h --- a/include/linux/sunrpc/svcauth.h Thu Feb 19 23:44:24 2004 +++ b/include/linux/sunrpc/svcauth.h Thu Feb 19 23:44:24 2004 @@ -16,10 +16,11 @@ #include #include +#define SVC_CRED_NGROUPS 32 struct svc_cred { uid_t cr_uid; gid_t cr_gid; - gid_t cr_groups[NGROUPS]; + gid_t cr_groups[SVC_CRED_NGROUPS]; }; struct svc_rqst; /* forward decl */ diff -Nru a/include/linux/sysctl.h b/include/linux/sysctl.h --- a/include/linux/sysctl.h Thu Feb 19 23:44:25 2004 +++ b/include/linux/sysctl.h Thu Feb 19 23:44:25 2004 @@ -362,6 +362,8 @@ NET_IPV4_CONF_NOXFRM=15, NET_IPV4_CONF_NOPOLICY=16, NET_IPV4_CONF_FORCE_IGMP_VERSION=17, + NET_IPV4_CONF_ARP_ANNOUNCE=18, + NET_IPV4_CONF_ARP_IGNORE=19, }; /* /proc/sys/net/ipv4/netfilter */ @@ -423,7 +425,8 @@ NET_IPV6_TEMP_PREFERED_LFT=13, NET_IPV6_REGEN_MAX_RETRY=14, NET_IPV6_MAX_DESYNC_FACTOR=15, - NET_IPV6_MAX_ADDRESSES=16 + NET_IPV6_MAX_ADDRESSES=16, + NET_IPV6_FORCE_MLD_VERSION=17 }; /* /proc/sys/net/ipv6/icmp */ @@ -617,6 +620,8 @@ FS_LEASE_TIME=15, /* int: maximum time to wait for a lease break */ FS_DQSTATS=16, /* disc quota usage statistics */ FS_XFS=17, /* struct: control xfs parameters */ + FS_AIO_NR=18, /* current system-wide number of aio requests */ + FS_AIO_MAX_NR=19, /* system-wide maximum number of aio requests */ }; /* /proc/sys/fs/quota/ */ diff -Nru a/include/linux/workqueue.h b/include/linux/workqueue.h --- a/include/linux/workqueue.h Thu Feb 19 23:44:27 2004 +++ b/include/linux/workqueue.h Thu Feb 19 23:44:27 2004 @@ -60,6 +60,7 @@ extern int FASTCALL(schedule_delayed_work(struct work_struct *work, unsigned long delay)); extern void flush_scheduled_work(void); extern int current_is_keventd(void); +extern int keventd_up(void); extern void init_workqueues(void); diff -Nru a/include/media/tuner.h b/include/media/tuner.h --- a/include/media/tuner.h Thu Feb 19 23:44:26 2004 +++ b/include/media/tuner.h Thu Feb 19 23:44:26 2004 @@ -67,7 +67,9 @@ #define TUNER_HITACHI_NTSC 40 #define TUNER_PHILIPS_PAL_MK 41 #define TUNER_PHILIPS_ATSC 42 -#define TUNER_PHILIPS_FM1236_MK3 43 +#define TUNER_PHILIPS_FM1236_MK3 43 +#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */ +#define TUNER_MICROTUNE_4049FM5 45 #define NOTUNER 0 #define PAL 1 /* PAL_BG */ diff -Nru a/include/net/addrconf.h b/include/net/addrconf.h --- a/include/net/addrconf.h Thu Feb 19 23:44:27 2004 +++ b/include/net/addrconf.h Thu Feb 19 23:44:27 2004 @@ -98,6 +98,7 @@ extern int ipv6_chk_mcast_addr(struct net_device *dev, struct in6_addr *group, struct in6_addr *src_addr); +extern int ipv6_is_mld(struct sk_buff *skb, int nexthdr); extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len); diff -Nru a/include/net/dn_nsp.h b/include/net/dn_nsp.h --- a/include/net/dn_nsp.h Thu Feb 19 23:44:27 2004 +++ b/include/net/dn_nsp.h Thu Feb 19 23:44:27 2004 @@ -37,7 +37,7 @@ extern int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb); extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri); -extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, int *size, int noblock, int *err); +extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, int *err); #define NSP_REASON_OK 0 /* No error */ #define NSP_REASON_NR 1 /* No resources */ diff -Nru a/include/net/ip6_route.h b/include/net/ip6_route.h --- a/include/net/ip6_route.h Thu Feb 19 23:44:23 2004 +++ b/include/net/ip6_route.h Thu Feb 19 23:44:23 2004 @@ -64,6 +64,7 @@ extern struct dst_entry *ndisc_dst_alloc(struct net_device *dev, struct neighbour *neigh, + struct in6_addr *addr, int (*output)(struct sk_buff *)); extern int ndisc_dst_gc(int *more); extern void fib6_force_start_gc(void); diff -Nru a/include/net/ip_vs.h b/include/net/ip_vs.h --- a/include/net/ip_vs.h Thu Feb 19 23:44:22 2004 +++ b/include/net/ip_vs.h Thu Feb 19 23:44:22 2004 @@ -8,7 +8,7 @@ #include /* For __uXX types */ -#define IP_VS_VERSION_CODE 0x010108 +#define IP_VS_VERSION_CODE 0x010200 #define NVERSION(version) \ (version >> 16) & 0xFF, \ (version >> 8) & 0xFF, \ diff -Nru a/include/net/ipv6.h b/include/net/ipv6.h --- a/include/net/ipv6.h Thu Feb 19 23:44:27 2004 +++ b/include/net/ipv6.h Thu Feb 19 23:44:27 2004 @@ -355,6 +355,7 @@ */ extern int ip6_output(struct sk_buff *skb); +extern int ip6_output2(struct sk_buff *skb); extern int ip6_forward(struct sk_buff *skb); extern int ip6_input(struct sk_buff *skb); extern int ip6_mc_input(struct sk_buff *skb); diff -Nru a/include/net/lapb.h b/include/net/lapb.h --- a/include/net/lapb.h Thu Feb 19 23:44:28 2004 +++ b/include/net/lapb.h Thu Feb 19 23:44:28 2004 @@ -80,7 +80,7 @@ */ struct lapb_cb { struct list_head node; - void *token; + struct net_device *dev; /* Link status fields */ unsigned int mode; diff -Nru a/init/Makefile b/init/Makefile --- a/init/Makefile Thu Feb 19 23:44:24 2004 +++ b/init/Makefile Thu Feb 19 23:44:24 2004 @@ -23,4 +23,4 @@ include/linux/compile.h: FORCE @echo ' CHK $@' - @sh $(srctree)/scripts/mkcompile_h $@ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)" + @$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)" diff -Nru a/init/main.c b/init/main.c --- a/init/main.c Thu Feb 19 23:44:23 2004 +++ b/init/main.c Thu Feb 19 23:44:23 2004 @@ -141,6 +141,7 @@ static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; +static const char *panic_later, *panic_param; __setup("profile=", profile_setup); @@ -253,20 +254,27 @@ return 0; } + if (panic_later) + return 0; + if (val) { /* Environment option */ unsigned int i; for (i = 0; envp_init[i]; i++) { - if (i == MAX_INIT_ENVS) - panic("Too many boot env vars at `%s'", param); + if (i == MAX_INIT_ENVS) { + panic_later = "Too many boot env vars at `%s'"; + panic_param = param; + } } envp_init[i] = param; } else { /* Command line option */ unsigned int i; for (i = 0; argv_init[i]; i++) { - if (i == MAX_INIT_ARGS) - panic("Too many boot init vars at `%s'",param); + if (i == MAX_INIT_ARGS) { + panic_later = "Too many boot init vars at `%s'"; + panic_param = param; + } } argv_init[i] = param; } @@ -370,9 +378,11 @@ * between the root thread and the init thread may cause start_kernel to * be reaped by free_initmem before the root thread has proceeded to * cpu_idle. + * + * gcc-3.4 accidentally inlines this function, so use noinline. */ -static void rest_init(void) +static void noinline rest_init(void) { kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND); unlock_kernel(); @@ -424,6 +434,8 @@ * this. But we do want output early, in case something goes wrong. */ console_init(); + if (panic_later) + panic(panic_later, panic_param); profile_init(); local_irq_enable(); #ifdef CONFIG_BLK_DEV_INITRD @@ -450,6 +462,7 @@ fork_init(num_physpages); proc_caches_init(); buffer_init(); + unnamed_dev_init(); security_scaffolding_startup(); vfs_caches_init(num_physpages); radix_tree_init(); diff -Nru a/kernel/Makefile b/kernel/Makefile --- a/kernel/Makefile Thu Feb 19 23:44:23 2004 +++ b/kernel/Makefile Thu Feb 19 23:44:23 2004 @@ -6,7 +6,8 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o pid.o \ - rcupdate.o intermodule.o extable.o params.o posix-timers.o + rcupdate.o intermodule.o extable.o params.o posix-timers.o \ + kthread.o obj-$(CONFIG_FUTEX) += futex.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o diff -Nru a/kernel/fork.c b/kernel/fork.c --- a/kernel/fork.c Thu Feb 19 23:44:23 2004 +++ b/kernel/fork.c Thu Feb 19 23:44:23 2004 @@ -86,6 +86,7 @@ security_task_free(tsk); free_uid(tsk->user); + put_group_info(tsk->group_info); free_task(tsk); } @@ -878,6 +879,7 @@ atomic_inc(&p->user->__count); atomic_inc(&p->user->processes); + get_group_info(p->group_info); /* * If multiple threads are within copy_process(), then this check @@ -1084,6 +1086,7 @@ bad_fork_cleanup_put_domain: module_put(p->thread_info->exec_domain->module); bad_fork_cleanup_count: + put_group_info(p->group_info); atomic_dec(&p->user->processes); free_uid(p->user); bad_fork_free: diff -Nru a/kernel/kmod.c b/kernel/kmod.c --- a/kernel/kmod.c Thu Feb 19 23:44:24 2004 +++ b/kernel/kmod.c Thu Feb 19 23:44:24 2004 @@ -149,6 +149,7 @@ { struct subprocess_info *sub_info = data; int retval; + cpumask_t mask = CPU_MASK_ALL; /* Unblock all signals. */ flush_signals(current); @@ -157,6 +158,9 @@ sigemptyset(¤t->blocked); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); + + /* We can run anywhere, unlike our parent keventd(). */ + set_cpus_allowed(current, mask); retval = -EPERM; if (current->fs->root) diff -Nru a/kernel/kthread.c b/kernel/kthread.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/kernel/kthread.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,163 @@ +/* Kernel thread helper functions. + * Copyright (C) 2004 IBM Corporation, Rusty Russell. + * + * Creation is done via keventd, so that we get a clean environment + * even if we're invoked from userspace (think modprobe, hotplug cpu, + * etc.). + */ +#include +#include +#include +#include +#include +#include + +struct kthread_create_info +{ + /* Information passed to kthread() from keventd. */ + int (*threadfn)(void *data); + void *data; + struct completion started; + + /* Result passed back to kthread_create() from keventd. */ + struct task_struct *result; + struct completion done; +}; + +struct kthread_stop_info +{ + struct task_struct *k; + int err; + struct completion done; +}; + +/* Thread stopping is done by setthing this var: lock serializes + * multiple kthread_stop calls. */ +static DECLARE_MUTEX(kthread_stop_lock); +static struct kthread_stop_info kthread_stop_info; + +int kthread_should_stop(void) +{ + return (kthread_stop_info.k == current); +} + +static int kthread(void *_create) +{ + struct kthread_create_info *create = _create; + int (*threadfn)(void *data); + void *data; + sigset_t blocked; + int ret = -EINTR; + cpumask_t mask = CPU_MASK_ALL; + + /* Copy data: it's on keventd's stack */ + threadfn = create->threadfn; + data = create->data; + + /* Block and flush all signals (in case we're not from keventd). */ + sigfillset(&blocked); + sigprocmask(SIG_BLOCK, &blocked, NULL); + flush_signals(current); + + /* By default we can run anywhere, unlike keventd. */ + set_cpus_allowed(current, mask); + + /* OK, tell user we're spawned, wait for stop or wakeup */ + __set_current_state(TASK_INTERRUPTIBLE); + complete(&create->started); + schedule(); + + if (!kthread_should_stop()) + ret = threadfn(data); + + /* It might have exited on its own, w/o kthread_stop. Check. */ + if (kthread_should_stop()) { + kthread_stop_info.err = ret; + complete(&kthread_stop_info.done); + } + return 0; +} + +/* We are keventd: create a thread. */ +static void keventd_create_kthread(void *_create) +{ + struct kthread_create_info *create = _create; + int pid; + + /* We want our own signal handler (we take no signals by default). */ + pid = kernel_thread(kthread, create, CLONE_FS | CLONE_FILES | SIGCHLD); + if (pid < 0) { + create->result = ERR_PTR(pid); + } else { + wait_for_completion(&create->started); + create->result = find_task_by_pid(pid); + wait_task_inactive(create->result); + } + complete(&create->done); +} + +struct task_struct *kthread_create(int (*threadfn)(void *data), + void *data, + const char namefmt[], + ...) +{ + struct kthread_create_info create; + DECLARE_WORK(work, keventd_create_kthread, &create); + + create.threadfn = threadfn; + create.data = data; + init_completion(&create.started); + init_completion(&create.done); + + /* If we're being called to start the first workqueue, we + * can't use keventd. */ + if (!keventd_up()) + work.func(work.data); + else { + schedule_work(&work); + wait_for_completion(&create.done); + } + if (!IS_ERR(create.result)) { + va_list args; + va_start(args, namefmt); + vsnprintf(create.result->comm, sizeof(create.result->comm), + namefmt, args); + va_end(args); + } + + return create.result; +} + +void kthread_bind(struct task_struct *k, unsigned int cpu) +{ + BUG_ON(k->state != TASK_INTERRUPTIBLE); + k->thread_info->cpu = cpu; + k->cpus_allowed = cpumask_of_cpu(cpu); +} + +int kthread_stop(struct task_struct *k) +{ + int ret; + + down(&kthread_stop_lock); + + /* It could exit after stop_info.k set, but before wake_up_process. */ + get_task_struct(k); + + /* Must init completion *before* thread sees kthread_stop_info.k */ + init_completion(&kthread_stop_info.done); + wmb(); + + /* Now set kthread_should_stop() to true, and wake it up. */ + kthread_stop_info.k = k; + wake_up_process(k); + put_task_struct(k); + + /* Once it dies, reset stop ptr, gather result and we're done. */ + wait_for_completion(&kthread_stop_info.done); + kthread_stop_info.k = NULL; + ret = kthread_stop_info.err; + up(&kthread_stop_lock); + + return ret; +} diff -Nru a/kernel/module.c b/kernel/module.c --- a/kernel/module.c Thu Feb 19 23:44:27 2004 +++ b/kernel/module.c Thu Feb 19 23:44:27 2004 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -457,6 +458,40 @@ } } +#ifdef CONFIG_MODULE_FORCE_UNLOAD +static inline int try_force(unsigned int flags) +{ + int ret = (flags & O_TRUNC); + if (ret) + tainted |= TAINT_FORCED_MODULE; + return ret; +} +#else +static inline int try_force(unsigned int flags) +{ + return 0; +} +#endif /* CONFIG_MODULE_FORCE_UNLOAD */ + +static int try_stop_module_local(struct module *mod, int flags, int *forced) +{ + local_irq_disable(); + + /* If it's not unused, quit unless we are told to block. */ + if ((flags & O_NONBLOCK) && module_refcount(mod) != 0) { + if (!(*forced = try_force(flags))) { + local_irq_enable(); + return -EWOULDBLOCK; + } + } + + /* Mark it as dying. */ + mod->waiter = current; + mod->state = MODULE_STATE_GOING; + local_irq_enable(); + return 0; +} + #ifdef CONFIG_SMP /* Thread to stop each CPU in user context. */ enum stopref_state { @@ -475,13 +510,6 @@ int irqs_disabled = 0; int prepared = 0; - sprintf(current->comm, "kmodule%lu\n", (unsigned long)cpu); - - /* Highest priority we can manage, and move to right CPU. */ -#if 0 /* FIXME */ - struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; - setscheduler(current->pid, SCHED_FIFO, ¶m); -#endif set_cpus_allowed(current, cpumask_of_cpu((int)(long)cpu)); /* Ack: we are alive */ @@ -535,29 +563,33 @@ } } -/* Stop the machine. Disables irqs. */ -static int stop_refcounts(void) +struct stopref { - unsigned int i, cpu; - cpumask_t old_allowed; + struct module *mod; + int flags; + int *forced; + struct completion started; +}; + +static int spawn_stopref(void *data) +{ + struct stopref *sref = data; + struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; + unsigned int i, cpu = smp_processor_id(); int ret = 0; - /* One thread per cpu. We'll do our own. */ - cpu = smp_processor_id(); + complete(&sref->started); - /* FIXME: racy with set_cpus_allowed. */ - old_allowed = current->cpus_allowed; + /* One high-prio thread per cpu. We'll do one (any one). */ set_cpus_allowed(current, cpumask_of_cpu(cpu)); + sys_sched_setscheduler(current->pid, SCHED_FIFO, ¶m); atomic_set(&stopref_thread_ack, 0); stopref_num_threads = 0; stopref_state = STOPREF_WAIT; - /* No CPUs can come up or down during this. */ - lock_cpu_hotplug(); - - for (i = 0; i < NR_CPUS; i++) { - if (i == cpu || !cpu_online(i)) + for_each_online_cpu(i) { + if (i == cpu) continue; ret = kernel_thread(stopref, (void *)(long)i, CLONE_KERNEL); if (ret < 0) @@ -572,40 +604,57 @@ /* If some failed, kill them all. */ if (ret < 0) { stopref_set_state(STOPREF_EXIT, 1); - unlock_cpu_hotplug(); - return ret; + goto out; } /* Don't schedule us away at this point, please. */ preempt_disable(); - /* Now they are all scheduled, make them hold the CPUs, ready. */ + /* Now they are all started, make them hold the CPUs, ready. */ stopref_set_state(STOPREF_PREPARE, 0); /* Make them disable irqs. */ stopref_set_state(STOPREF_DISABLE_IRQ, 0); - local_irq_disable(); - return 0; -} + /* Atomically disable module if possible */ + ret = try_stop_module_local(sref->mod, sref->flags, sref->forced); -/* Restart the machine. Re-enables irqs. */ -static void restart_refcounts(void) -{ stopref_set_state(STOPREF_EXIT, 0); - local_irq_enable(); preempt_enable(); - unlock_cpu_hotplug(); + +out: + /* Wait for kthread_stop */ + while (!kthread_should_stop()) { + __set_current_state(TASK_INTERRUPTIBLE); + schedule(); + } + return ret; } -#else /* ...!SMP */ -static inline int stop_refcounts(void) + +static int try_stop_module(struct module *mod, int flags, int *forced) { - local_irq_disable(); - return 0; + struct task_struct *p; + struct stopref sref = { mod, flags, forced }; + int ret; + + init_completion(&sref.started); + + /* No CPUs can come up or down during this. */ + lock_cpu_hotplug(); + p = kthread_run(spawn_stopref, &sref, "krmmod"); + if (IS_ERR(p)) + ret = PTR_ERR(p); + else { + wait_for_completion(&sref.started); + ret = kthread_stop(p); + } + unlock_cpu_hotplug(); + return ret; } -static inline void restart_refcounts(void) +#else /* ...!SMP */ +static inline int try_stop_module(struct module *mod, int flags, int *forced) { - local_irq_enable(); + return try_stop_module_local(mod, flags, forced); } #endif @@ -622,21 +671,6 @@ /* This exists whether we can unload or not */ static void free_module(struct module *mod); -#ifdef CONFIG_MODULE_FORCE_UNLOAD -static inline int try_force(unsigned int flags) -{ - int ret = (flags & O_TRUNC); - if (ret) - tainted |= TAINT_FORCED_MODULE; - return ret; -} -#else -static inline int try_force(unsigned int flags) -{ - return 0; -} -#endif /* CONFIG_MODULE_FORCE_UNLOAD */ - /* Stub function for modules which don't have an exitfn */ void cleanup_module(void) { @@ -706,26 +740,9 @@ goto out; } } - /* Stop the machine so refcounts can't move: irqs disabled. */ - DEBUGP("Stopping refcounts...\n"); - ret = stop_refcounts(); - if (ret != 0) - goto out; - /* If it's not unused, quit unless we are told to block. */ - if ((flags & O_NONBLOCK) && module_refcount(mod) != 0) { - forced = try_force(flags); - if (!forced) { - ret = -EWOULDBLOCK; - restart_refcounts(); - goto out; - } - } - - /* Mark it as dying. */ - mod->waiter = current; - mod->state = MODULE_STATE_GOING; - restart_refcounts(); + /* Stop the machine so refcounts can't move and disable module. */ + ret = try_stop_module(mod, flags, &forced); /* Never wait if forced. */ if (!forced && module_refcount(mod) != 0) diff -Nru a/kernel/posix-timers.c b/kernel/posix-timers.c --- a/kernel/posix-timers.c Thu Feb 19 23:44:25 2004 +++ b/kernel/posix-timers.c Thu Feb 19 23:44:25 2004 @@ -426,7 +426,7 @@ spin_lock_init(&new_timer->it_lock); do { - if (unlikely(!idr_pre_get(&posix_timers_id))) { + if (unlikely(!idr_pre_get(&posix_timers_id, GFP_KERNEL))) { error = -EAGAIN; new_timer->it_id = (timer_t)-1; goto out; diff -Nru a/kernel/power/pmdisk.c b/kernel/power/pmdisk.c --- a/kernel/power/pmdisk.c Thu Feb 19 23:44:25 2004 +++ b/kernel/power/pmdisk.c Thu Feb 19 23:44:25 2004 @@ -1121,11 +1121,11 @@ resume_device = name_to_dev_t(resume_file); pr_debug("pmdisk: Resume From Partition: %s\n", resume_file); - resume_bdev = open_by_devnum(resume_device, FMODE_READ, BDEV_RAW); + resume_bdev = open_by_devnum(resume_device, FMODE_READ); if (!IS_ERR(resume_bdev)) { set_blocksize(resume_bdev, PAGE_SIZE); error = read_suspend_image(); - blkdev_put(resume_bdev, BDEV_RAW); + blkdev_put(resume_bdev); } else error = PTR_ERR(resume_bdev); diff -Nru a/kernel/power/swsusp.c b/kernel/power/swsusp.c --- a/kernel/power/swsusp.c Thu Feb 19 23:44:24 2004 +++ b/kernel/power/swsusp.c Thu Feb 19 23:44:24 2004 @@ -997,13 +997,13 @@ struct block_device *bdev; printk("Resuming from device %s\n", __bdevname(resume_device, b)); - bdev = open_by_devnum(resume_device, FMODE_READ, BDEV_RAW); + bdev = open_by_devnum(resume_device, FMODE_READ); if (IS_ERR(bdev)) { error = PTR_ERR(bdev); } else { set_blocksize(bdev, PAGE_SIZE); error = __read_suspend_image(bdev, cur, noresume); - blkdev_put(bdev, BDEV_RAW); + blkdev_put(bdev); } } else error = -ENOMEM; diff -Nru a/kernel/printk.c b/kernel/printk.c --- a/kernel/printk.c Thu Feb 19 23:44:28 2004 +++ b/kernel/printk.c Thu Feb 19 23:44:28 2004 @@ -501,7 +501,7 @@ /* Emit the output into the temporary buffer */ va_start(args, fmt); - printed_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args); + printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args); va_end(args); /* diff -Nru a/kernel/resource.c b/kernel/resource.c --- a/kernel/resource.c Thu Feb 19 23:44:26 2004 +++ b/kernel/resource.c Thu Feb 19 23:44:26 2004 @@ -475,6 +475,8 @@ p = &parent->child; end = start + n - 1; + write_lock(&resource_lock); + for (;;) { struct resource *res = *p; @@ -488,11 +490,15 @@ if (res->start != start || res->end != end) break; *p = res->sibling; + write_unlock(&resource_lock); kfree(res); return; } p = &res->sibling; } + + write_unlock(&resource_lock); + printk(KERN_WARNING "Trying to free nonexistent resource <%08lx-%08lx>\n", start, end); } diff -Nru a/kernel/sched.c b/kernel/sched.c --- a/kernel/sched.c Thu Feb 19 23:44:27 2004 +++ b/kernel/sched.c Thu Feb 19 23:44:27 2004 @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef CONFIG_NUMA #define cpu_to_node_mask(cpu) node_to_cpumask(cpu_to_node(cpu)) @@ -2568,34 +2569,36 @@ static void show_task(task_t * p) { - unsigned long free = 0; task_t *relative; - int state; - static const char * stat_nam[] = { "R", "S", "D", "T", "Z", "W" }; + unsigned state; + unsigned long free = 0; + static const char *stat_nam[] = { "R", "S", "D", "T", "Z", "W" }; printk("%-13.13s ", p->comm); state = p->state ? __ffs(p->state) + 1 : 0; - if (((unsigned) state) < sizeof(stat_nam)/sizeof(char *)) + if (state < ARRAY_SIZE(stat_nam)) printk(stat_nam[state]); else - printk(" "); + printk("?"); #if (BITS_PER_LONG == 32) - if (p == current) - printk(" current "); + if (state == TASK_RUNNING) + printk(" running "); else printk(" %08lX ", thread_saved_pc(p)); #else - if (p == current) - printk(" current task "); + if (state == TASK_RUNNING) + printk(" running task "); else printk(" %016lx ", thread_saved_pc(p)); #endif +#ifdef CONFIG_DEBUG_STACK_USAGE { unsigned long * n = (unsigned long *) (p->thread_info+1); while (!*n) n++; free = (unsigned long) n - (unsigned long)(p->thread_info+1); } +#endif printk("%5lu %5d %6d ", free, p->pid, p->parent->pid); if ((relative = eldest_child(p))) printk("%5d ", relative->pid); @@ -2614,7 +2617,8 @@ else printk(" (NOTLB)\n"); - show_stack(p, NULL); + if (state != TASK_RUNNING) + show_stack(p, NULL); } void show_state(void) @@ -2623,12 +2627,12 @@ #if (BITS_PER_LONG == 32) printk("\n" - " free sibling\n"); - printk(" task PC stack pid father child younger older\n"); + " sibling\n"); + printk(" task PC pid father child younger older\n"); #else printk("\n" - " free sibling\n"); - printk(" task PC stack pid father child younger older\n"); + " sibling\n"); + printk(" task PC pid father child younger older\n"); #endif read_lock(&tasklist_lock); do_each_thread(g, p) { @@ -2749,12 +2753,6 @@ local_irq_restore(flags); } -typedef struct { - int cpu; - struct completion startup_done; - task_t *task; -} migration_startup_t; - /* * migration_thread - this is a highprio system thread that performs * thread migration by bumping thread off CPU then 'pushing' onto @@ -2764,27 +2762,17 @@ { /* Marking "param" __user is ok, since we do a set_fs(KERNEL_DS); */ struct sched_param __user param = { .sched_priority = MAX_RT_PRIO-1 }; - migration_startup_t *startup = data; - int cpu = startup->cpu; runqueue_t *rq; + int cpu = (long)data; int ret; - startup->task = current; - complete(&startup->startup_done); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule(); - BUG_ON(smp_processor_id() != cpu); - - daemonize("migration/%d", cpu); - set_fs(KERNEL_DS); - ret = setscheduler(0, SCHED_FIFO, ¶m); rq = this_rq(); - rq->migration_thread = current; + BUG_ON(rq->migration_thread != current); - for (;;) { + while (!kthread_should_stop()) { struct list_head *head; migration_req_t *req; @@ -2807,6 +2795,7 @@ any_online_cpu(req->task->cpus_allowed)); complete(&req->done); } + return 0; } /* @@ -2816,47 +2805,43 @@ static int migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) { - long cpu = (long)hcpu; - migration_startup_t startup; + int cpu = (long)hcpu; + struct task_struct *p; switch (action) { + case CPU_UP_PREPARE: + p = kthread_create(migration_thread, hcpu, "migration/%d",cpu); + if (IS_ERR(p)) + return NOTIFY_BAD; + kthread_bind(p, cpu); + cpu_rq(cpu)->migration_thread = p; + break; case CPU_ONLINE: - - printk("Starting migration thread for cpu %li\n", cpu); - - startup.cpu = cpu; - startup.task = NULL; - init_completion(&startup.startup_done); - - kernel_thread(migration_thread, &startup, CLONE_KERNEL); - wait_for_completion(&startup.startup_done); - wait_task_inactive(startup.task); - - startup.task->thread_info->cpu = cpu; - startup.task->cpus_allowed = cpumask_of_cpu(cpu); - - wake_up_process(startup.task); - - while (!cpu_rq(cpu)->migration_thread) - yield(); - + /* Strictly unneccessary, as first user will wake it. */ + wake_up_process(cpu_rq(cpu)->migration_thread); break; } return NOTIFY_OK; } -static struct notifier_block migration_notifier - = { .notifier_call = &migration_call }; +/* + * We want this after the other threads, so they can use set_cpus_allowed + * from their CPU_OFFLINE callback + */ +static struct notifier_block __devinitdata migration_notifier = { + .notifier_call = migration_call, + .priority = -10, +}; -__init int migration_init(void) +int __init migration_init(void) { + void *cpu = (void *)(long)smp_processor_id(); /* Start one for boot CPU. */ - migration_call(&migration_notifier, CPU_ONLINE, - (void *)(long)smp_processor_id()); + migration_call(&migration_notifier, CPU_UP_PREPARE, cpu); + migration_call(&migration_notifier, CPU_ONLINE, cpu); register_cpu_notifier(&migration_notifier); return 0; } - #endif /* @@ -2874,45 +2859,11 @@ spinlock_t kernel_flag __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED; EXPORT_SYMBOL(kernel_flag); -static void kstat_init_cpu(int cpu) -{ - /* Add any initialisation to kstat here */ - /* Useful when cpu offlining logic is added.. */ -} - -static int __devinit kstat_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) -{ - int cpu = (unsigned long)hcpu; - switch(action) { - case CPU_UP_PREPARE: - kstat_init_cpu(cpu); - break; - default: - break; - } - return NOTIFY_OK; -} - -static struct notifier_block __devinitdata kstat_nb = { - .notifier_call = kstat_cpu_notify, - .next = NULL, -}; - -__init static void init_kstat(void) -{ - kstat_cpu_notify(&kstat_nb, (unsigned long)CPU_UP_PREPARE, - (void *)(long)smp_processor_id()); - register_cpu_notifier(&kstat_nb); -} - void __init sched_init(void) { runqueue_t *rq; int i, j, k; - /* Init the kstat counters */ - init_kstat(); for (i = 0; i < NR_CPUS; i++) { prio_array_t *array; diff -Nru a/kernel/softirq.c b/kernel/softirq.c --- a/kernel/softirq.c Thu Feb 19 23:44:23 2004 +++ b/kernel/softirq.c Thu Feb 19 23:44:23 2004 @@ -14,6 +14,7 @@ #include #include #include +#include /* - No shared variables, all the data are CPU local. @@ -299,58 +300,24 @@ EXPORT_SYMBOL(tasklet_kill); -static void tasklet_init_cpu(int cpu) -{ - per_cpu(tasklet_vec, cpu).list = NULL; - per_cpu(tasklet_hi_vec, cpu).list = NULL; -} - -static int tasklet_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) -{ - long cpu = (long)hcpu; - switch(action) { - case CPU_UP_PREPARE: - tasklet_init_cpu(cpu); - break; - default: - break; - } - return 0; -} - -static struct notifier_block tasklet_nb = { - .notifier_call = tasklet_cpu_notify, - .next = NULL, -}; - void __init softirq_init(void) { open_softirq(TASKLET_SOFTIRQ, tasklet_action, NULL); open_softirq(HI_SOFTIRQ, tasklet_hi_action, NULL); - tasklet_cpu_notify(&tasklet_nb, (unsigned long)CPU_UP_PREPARE, - (void *)(long)smp_processor_id()); - register_cpu_notifier(&tasklet_nb); } static int ksoftirqd(void * __bind_cpu) { int cpu = (int) (long) __bind_cpu; - daemonize("ksoftirqd/%d", cpu); set_user_nice(current, 19); current->flags |= PF_IOTHREAD; - /* Migrate to the right CPU */ - set_cpus_allowed(current, cpumask_of_cpu(cpu)); BUG_ON(smp_processor_id() != cpu); - __set_current_state(TASK_INTERRUPTIBLE); - mb(); + set_current_state(TASK_INTERRUPTIBLE); - __get_cpu_var(ksoftirqd) = current; - - for (;;) { + while (!kthread_should_stop()) { if (!local_softirq_pending()) schedule(); @@ -363,6 +330,7 @@ __set_current_state(TASK_INTERRUPTIBLE); } + return 0; } static int __devinit cpu_callback(struct notifier_block *nfb, @@ -370,15 +338,24 @@ void *hcpu) { int hotcpu = (unsigned long)hcpu; + struct task_struct *p; - if (action == CPU_ONLINE) { - if (kernel_thread(ksoftirqd, hcpu, CLONE_KERNEL) < 0) { + switch (action) { + case CPU_UP_PREPARE: + BUG_ON(per_cpu(tasklet_vec, hotcpu).list); + BUG_ON(per_cpu(tasklet_hi_vec, hotcpu).list); + p = kthread_create(ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu); + if (IS_ERR(p)) { printk("ksoftirqd for %i failed\n", hotcpu); return NOTIFY_BAD; } - - while (!per_cpu(ksoftirqd, hotcpu)) - yield(); + per_cpu(ksoftirqd, hotcpu) = p; + kthread_bind(p, hotcpu); + per_cpu(ksoftirqd, hotcpu) = p; + break; + case CPU_ONLINE: + wake_up_process(per_cpu(ksoftirqd, hotcpu)); + break; } return NOTIFY_OK; } @@ -389,7 +366,9 @@ __init int spawn_ksoftirqd(void) { - cpu_callback(&cpu_nfb, CPU_ONLINE, (void *)(long)smp_processor_id()); + void *cpu = (void *)(long)smp_processor_id(); + cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu); + cpu_callback(&cpu_nfb, CPU_ONLINE, cpu); register_cpu_notifier(&cpu_nfb); return 0; } diff -Nru a/kernel/sys.c b/kernel/sys.c --- a/kernel/sys.c Thu Feb 19 23:44:23 2004 +++ b/kernel/sys.c Thu Feb 19 23:44:23 2004 @@ -1089,10 +1089,178 @@ /* * Supplementary group IDs */ -asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist) + +/* init to 2 - one for init_task, one to ensure it is never freed */ +struct group_info init_groups = { .usage = ATOMIC_INIT(2) }; + +struct group_info *groups_alloc(int gidsetsize) { + struct group_info *group_info; + int nblocks; int i; - + + nblocks = (gidsetsize/NGROUPS_PER_BLOCK) + + (gidsetsize%NGROUPS_PER_BLOCK?1:0); + group_info = kmalloc(sizeof(*group_info) + nblocks*sizeof(gid_t *), + GFP_USER); + if (!group_info) + return NULL; + group_info->ngroups = gidsetsize; + group_info->nblocks = nblocks; + atomic_set(&group_info->usage, 1); + + if (gidsetsize <= NGROUPS_SMALL) { + group_info->blocks[0] = group_info->small_block; + } else { + for (i = 0; i < nblocks; i++) { + gid_t *b; + b = (void *)__get_free_page(GFP_USER); + if (!b) + goto out_undo_partial_alloc; + group_info->blocks[i] = b; + } + } + return group_info; + +out_undo_partial_alloc: + while (--i >= 0) { + free_page((unsigned long)group_info->blocks[i]); + } + kfree(group_info); + return NULL; +} + +EXPORT_SYMBOL(groups_alloc); + +void groups_free(struct group_info *group_info) +{ + if (group_info->blocks[0] != group_info->small_block) { + int i; + for (i = 0; i < group_info->nblocks; i++) + free_page((unsigned long)group_info->blocks[i]); + } + kfree(group_info); +} + +EXPORT_SYMBOL(groups_free); + +/* export the group_info to a user-space array */ +static int groups_to_user(gid_t __user *grouplist, + struct group_info *group_info) +{ + int i; + int count = group_info->ngroups; + + for (i = 0; i < group_info->nblocks; i++) { + int cp_count = min(NGROUPS_PER_BLOCK, count); + int off = i * NGROUPS_PER_BLOCK; + int len = cp_count * sizeof(*grouplist); + + if (copy_to_user(grouplist+off, group_info->blocks[i], len)) + return -EFAULT; + + count -= cp_count; + } + return 0; +} + +/* fill a group_info from a user-space array - it must be allocated already */ +static int groups_from_user(struct group_info *group_info, + gid_t __user *grouplist) + { + int i; + int count = group_info->ngroups; + + for (i = 0; i < group_info->nblocks; i++) { + int cp_count = min(NGROUPS_PER_BLOCK, count); + int off = i * NGROUPS_PER_BLOCK; + int len = cp_count * sizeof(*grouplist); + + if (copy_from_user(group_info->blocks[i], grouplist+off, len)) + return -EFAULT; + + count -= cp_count; + } + return 0; +} + +/* a simple shell-metzner sort */ +static void groups_sort(struct group_info *group_info) +{ + int base, max, stride; + int gidsetsize = group_info->ngroups; + + for (stride = 1; stride < gidsetsize; stride = 3 * stride + 1) + ; /* nothing */ + stride /= 3; + + while (stride) { + max = gidsetsize - stride; + for (base = 0; base < max; base++) { + int left = base; + int right = left + stride; + gid_t tmp = GROUP_AT(group_info, right); + + while (left >= 0 && GROUP_AT(group_info, left) > tmp) { + GROUP_AT(group_info, right) = + GROUP_AT(group_info, left); + right = left; + left -= stride; + } + GROUP_AT(group_info, right) = tmp; + } + stride /= 3; + } +} + +/* a simple bsearch */ +static int groups_search(struct group_info *group_info, gid_t grp) +{ + int left, right; + + if (!group_info) + return 0; + + left = 0; + right = group_info->ngroups; + while (left < right) { + int mid = (left+right)/2; + int cmp = grp - GROUP_AT(group_info, mid); + if (cmp > 0) + left = mid + 1; + else if (cmp < 0) + right = mid; + else + return 1; + } + return 0; +} + +/* validate and set current->group_info */ +int set_current_groups(struct group_info *group_info) +{ + int retval; + struct group_info *old_info; + + retval = security_task_setgroups(group_info); + if (retval) + return retval; + + groups_sort(group_info); + get_group_info(group_info); + old_info = current->group_info; + current->group_info = group_info; + put_group_info(old_info); + + return 0; +} + +EXPORT_SYMBOL(set_current_groups); + +asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist) +{ + int i = 0; + /* * SMP: Nobody else can change our grouplist. Thus we are * safe. @@ -1100,54 +1268,52 @@ if (gidsetsize < 0) return -EINVAL; - i = current->ngroups; + + get_group_info(current->group_info); + i = current->group_info->ngroups; if (gidsetsize) { - if (i > gidsetsize) - return -EINVAL; - if (copy_to_user(grouplist, current->groups, sizeof(gid_t)*i)) - return -EFAULT; + if (i > gidsetsize) { + i = -EINVAL; + goto out; + } + if (groups_to_user(grouplist, current->group_info)) { + i = -EFAULT; + goto out; + } } +out: + put_group_info(current->group_info); return i; } /* - * SMP: Our groups are not shared. We can copy to/from them safely + * SMP: Our groups are copy-on-write. We can set them safely * without another task interfering. */ asmlinkage long sys_setgroups(int gidsetsize, gid_t __user *grouplist) { - gid_t groups[NGROUPS]; + struct group_info *group_info; int retval; if (!capable(CAP_SETGID)) return -EPERM; - if ((unsigned) gidsetsize > NGROUPS) + if ((unsigned)gidsetsize > NGROUPS_MAX) return -EINVAL; - if (copy_from_user(groups, grouplist, gidsetsize * sizeof(gid_t))) - return -EFAULT; - retval = security_task_setgroups(gidsetsize, groups); - if (retval) + + group_info = groups_alloc(gidsetsize); + if (!group_info) + return -ENOMEM; + retval = groups_from_user(group_info, grouplist); + if (retval) { + put_group_info(group_info); return retval; - memcpy(current->groups, groups, gidsetsize * sizeof(gid_t)); - current->ngroups = gidsetsize; - return 0; -} + } -static int supplemental_group_member(gid_t grp) -{ - int i = current->ngroups; + retval = set_current_groups(group_info); + put_group_info(group_info); - if (i) { - gid_t *groups = current->groups; - do { - if (*groups == grp) - return 1; - groups++; - i--; - } while (i); - } - return 0; + return retval; } /* @@ -1156,8 +1322,11 @@ int in_group_p(gid_t grp) { int retval = 1; - if (grp != current->fsgid) - retval = supplemental_group_member(grp); + if (grp != current->fsgid) { + get_group_info(current->group_info); + retval = groups_search(current->group_info, grp); + put_group_info(current->group_info); + } return retval; } @@ -1166,8 +1335,11 @@ int in_egroup_p(gid_t grp) { int retval = 1; - if (grp != current->egid) - retval = supplemental_group_member(grp); + if (grp != current->egid) { + get_group_info(current->group_info); + retval = groups_search(current->group_info, grp); + put_group_info(current->group_info); + } return retval; } diff -Nru a/kernel/sysctl.c b/kernel/sysctl.c --- a/kernel/sysctl.c Thu Feb 19 23:44:23 2004 +++ b/kernel/sysctl.c Thu Feb 19 23:44:23 2004 @@ -808,6 +808,22 @@ .mode = 0644, .proc_handler = &proc_dointvec, }, + { + .ctl_name = FS_AIO_NR, + .procname = "aio-nr", + .data = &aio_nr, + .maxlen = sizeof(aio_nr), + .mode = 0444, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = FS_AIO_MAX_NR, + .procname = "aio-max-nr", + .data = &aio_max_nr, + .maxlen = sizeof(aio_max_nr), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, { .ctl_name = 0 } }; diff -Nru a/kernel/uid16.c b/kernel/uid16.c --- a/kernel/uid16.c Thu Feb 19 23:44:25 2004 +++ b/kernel/uid16.c Thu Feb 19 23:44:25 2004 @@ -107,45 +107,83 @@ return sys_setfsgid((gid_t)gid); } +static int groups16_to_user(old_gid_t __user *grouplist, + struct group_info *group_info) +{ + int i; + old_gid_t group; + + for (i = 0; i < group_info->ngroups; i++) { + group = (old_gid_t)GROUP_AT(group_info, i); + if (put_user(group, grouplist+i)) + return -EFAULT; + } + + return 0; +} + +static int groups16_from_user(struct group_info *group_info, + old_gid_t __user *grouplist) +{ + int i; + old_gid_t group; + + for (i = 0; i < group_info->ngroups; i++) { + if (get_user(group, grouplist+i)) + return -EFAULT; + GROUP_AT(group_info, i) = (gid_t)group; + } + + return 0; +} + asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist) { - old_gid_t groups[NGROUPS]; - int i,j; + int i = 0; if (gidsetsize < 0) return -EINVAL; - i = current->ngroups; + + get_group_info(current->group_info); + i = current->group_info->ngroups; if (gidsetsize) { - if (i > gidsetsize) - return -EINVAL; - for(j=0;jgroups[j]; - if (copy_to_user(grouplist, groups, sizeof(old_gid_t)*i)) - return -EFAULT; + if (i > gidsetsize) { + i = -EINVAL; + goto out; + } + if (groups16_to_user(grouplist, current->group_info)) { + i = -EFAULT; + goto out; + } } +out: + put_group_info(current->group_info); return i; } asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *grouplist) { - old_gid_t groups[NGROUPS]; - gid_t new_groups[NGROUPS]; - int i; + struct group_info *group_info; + int retval; if (!capable(CAP_SETGID)) return -EPERM; - if ((unsigned) gidsetsize > NGROUPS) + if ((unsigned)gidsetsize > NGROUPS_MAX) return -EINVAL; - if (copy_from_user(groups, grouplist, gidsetsize * sizeof(old_gid_t))) - return -EFAULT; - for (i = 0 ; i < gidsetsize ; i++) - new_groups[i] = (gid_t)groups[i]; - i = security_task_setgroups(gidsetsize, new_groups); - if (i) - return i; - memcpy(current->groups, new_groups, gidsetsize * sizeof(gid_t)); - current->ngroups = gidsetsize; - return 0; + + group_info = groups_alloc(gidsetsize); + if (!group_info) + return -ENOMEM; + retval = groups16_from_user(group_info, grouplist); + if (retval) { + put_group_info(group_info); + return retval; + } + + retval = set_current_groups(group_info); + put_group_info(group_info); + + return retval; } asmlinkage long sys_getuid16(void) diff -Nru a/kernel/workqueue.c b/kernel/workqueue.c --- a/kernel/workqueue.c Thu Feb 19 23:44:28 2004 +++ b/kernel/workqueue.c Thu Feb 19 23:44:28 2004 @@ -22,6 +22,7 @@ #include #include #include +#include /* * The per-CPU workqueue. @@ -45,7 +46,6 @@ struct workqueue_struct *wq; task_t *thread; - struct completion exit; } ____cacheline_aligned; @@ -57,6 +57,20 @@ struct cpu_workqueue_struct cpu_wq[NR_CPUS]; }; +/* Preempt must be disabled. */ +static void __queue_work(struct cpu_workqueue_struct *cwq, + struct work_struct *work) +{ + unsigned long flags; + + spin_lock_irqsave(&cwq->lock, flags); + work->wq_data = cwq; + list_add_tail(&work->entry, &cwq->worklist); + cwq->insert_sequence++; + wake_up(&cwq->more_work); + spin_unlock_irqrestore(&cwq->lock, flags); +} + /* * Queue work on a workqueue. Return non-zero if it was successfully * added. @@ -66,19 +80,11 @@ */ int queue_work(struct workqueue_struct *wq, struct work_struct *work) { - unsigned long flags; int ret = 0, cpu = get_cpu(); - struct cpu_workqueue_struct *cwq = wq->cpu_wq + cpu; if (!test_and_set_bit(0, &work->pending)) { BUG_ON(!list_empty(&work->entry)); - work->wq_data = cwq; - - spin_lock_irqsave(&cwq->lock, flags); - list_add_tail(&work->entry, &cwq->worklist); - cwq->insert_sequence++; - wake_up(&cwq->more_work); - spin_unlock_irqrestore(&cwq->lock, flags); + __queue_work(wq->cpu_wq + cpu, work); ret = 1; } put_cpu(); @@ -88,39 +94,29 @@ static void delayed_work_timer_fn(unsigned long __data) { struct work_struct *work = (struct work_struct *)__data; - struct cpu_workqueue_struct *cwq = work->wq_data; - unsigned long flags; + struct workqueue_struct *wq = work->wq_data; - /* - * Do the wakeup within the spinlock, so that flushing - * can be done in a guaranteed way. - */ - spin_lock_irqsave(&cwq->lock, flags); - list_add_tail(&work->entry, &cwq->worklist); - cwq->insert_sequence++; - wake_up(&cwq->more_work); - spin_unlock_irqrestore(&cwq->lock, flags); + __queue_work(wq->cpu_wq + smp_processor_id(), work); } int queue_delayed_work(struct workqueue_struct *wq, struct work_struct *work, unsigned long delay) { - int ret = 0, cpu = get_cpu(); + int ret = 0; struct timer_list *timer = &work->timer; - struct cpu_workqueue_struct *cwq = wq->cpu_wq + cpu; if (!test_and_set_bit(0, &work->pending)) { BUG_ON(timer_pending(timer)); BUG_ON(!list_empty(&work->entry)); - work->wq_data = cwq; + /* This stores wq for the moment, for the timer_fn */ + work->wq_data = wq; timer->expires = jiffies + delay; timer->data = (unsigned long)work; timer->function = delayed_work_timer_fn; add_timer(timer); ret = 1; } - put_cpu(); return ret; } @@ -153,28 +149,23 @@ spin_unlock_irqrestore(&cwq->lock, flags); } -typedef struct startup_s { - struct cpu_workqueue_struct *cwq; - struct completion done; - const char *name; -} startup_t; - -static int worker_thread(void *__startup) +static int worker_thread(void *__cwq) { - startup_t *startup = __startup; - struct cpu_workqueue_struct *cwq = startup->cwq; + struct cpu_workqueue_struct *cwq = __cwq; int cpu = cwq - cwq->wq->cpu_wq; DECLARE_WAITQUEUE(wait, current); struct k_sigaction sa; + sigset_t blocked; - daemonize("%s/%d", startup->name, cpu); current->flags |= PF_IOTHREAD; - cwq->thread = current; set_user_nice(current, -10); - set_cpus_allowed(current, cpumask_of_cpu(cpu)); + BUG_ON(smp_processor_id() != cpu); - complete(&startup->done); + /* Block and flush all signals */ + sigfillset(&blocked); + sigprocmask(SIG_BLOCK, &blocked, NULL); + flush_signals(current); /* SIG_IGN makes children autoreap: see do_notify_parent(). */ sa.sa.sa_handler = SIG_IGN; @@ -182,12 +173,10 @@ siginitset(&sa.sa.sa_mask, sigmask(SIGCHLD)); do_sigaction(SIGCHLD, &sa, (struct k_sigaction *)0); - for (;;) { + while (!kthread_should_stop()) { set_task_state(current, TASK_INTERRUPTIBLE); add_wait_queue(&cwq->more_work, &wait); - if (!cwq->thread) - break; if (list_empty(&cwq->worklist)) schedule(); else @@ -197,9 +186,6 @@ if (!list_empty(&cwq->worklist)) run_workqueue(cwq); } - remove_wait_queue(&cwq->more_work, &wait); - complete(&cwq->exit); - return 0; } @@ -251,9 +237,8 @@ const char *name, int cpu) { - startup_t startup; struct cpu_workqueue_struct *cwq = wq->cpu_wq + cpu; - int ret; + struct task_struct *p; spin_lock_init(&cwq->lock); cwq->wq = wq; @@ -263,17 +248,13 @@ INIT_LIST_HEAD(&cwq->worklist); init_waitqueue_head(&cwq->more_work); init_waitqueue_head(&cwq->work_done); - init_completion(&cwq->exit); - init_completion(&startup.done); - startup.cwq = cwq; - startup.name = name; - ret = kernel_thread(worker_thread, &startup, CLONE_FS | CLONE_FILES); - if (ret >= 0) { - wait_for_completion(&startup.done); - BUG_ON(!cwq->thread); - } - return ret; + p = kthread_create(worker_thread, cwq, "%s/%d", name, cpu); + if (IS_ERR(p)) + return PTR_ERR(p); + cwq->thread = p; + kthread_bind(p, cpu); + return 0; } struct workqueue_struct *create_workqueue(const char *name) @@ -292,6 +273,8 @@ continue; if (create_workqueue_thread(wq, name, cpu) < 0) destroy = 1; + else + wake_up_process(wq->cpu_wq[cpu].thread); } /* * Was there any error during startup? If yes then clean up: @@ -308,13 +291,8 @@ struct cpu_workqueue_struct *cwq; cwq = wq->cpu_wq + cpu; - if (cwq->thread) { - /* Tell thread to exit and wait for it. */ - cwq->thread = NULL; - wake_up(&cwq->more_work); - - wait_for_completion(&cwq->exit); - } + if (cwq->thread) + kthread_stop(cwq->thread); } void destroy_workqueue(struct workqueue_struct *wq) @@ -345,6 +323,11 @@ void flush_scheduled_work(void) { flush_workqueue(keventd_wq); +} + +int keventd_up(void) +{ + return keventd_wq != NULL; } int current_is_keventd(void) diff -Nru a/lib/bitmap.c b/lib/bitmap.c --- a/lib/bitmap.c Thu Feb 19 23:44:27 2004 +++ b/lib/bitmap.c Thu Feb 19 23:44:27 2004 @@ -165,7 +165,7 @@ #define unhex(c) (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10)) /** - * bitmap_snprintf - convert bitmap to an ASCII hex string. + * bitmap_scnprintf - convert bitmap to an ASCII hex string. * @buf: byte buffer into which string is placed * @buflen: reserved size of @buf, in bytes * @maskp: pointer to bitmap to convert @@ -174,7 +174,7 @@ * Exactly @nmaskbits bits are displayed. Hex digits are grouped into * comma-separated sets of eight digits per set. */ -int bitmap_snprintf(char *buf, unsigned int buflen, +int bitmap_scnprintf(char *buf, unsigned int buflen, const unsigned long *maskp, int nmaskbits) { int i, word, bit, len = 0; @@ -193,14 +193,14 @@ word = i / BITS_PER_LONG; bit = i % BITS_PER_LONG; val = (maskp[word] >> bit) & chunkmask; - len += snprintf(buf+len, buflen-len, "%s%0*lx", sep, + len += scnprintf(buf+len, buflen-len, "%s%0*lx", sep, (chunksz+3)/4, val); chunksz = CHUNKSZ; sep = ","; } return len; } -EXPORT_SYMBOL(bitmap_snprintf); +EXPORT_SYMBOL(bitmap_scnprintf); /** * bitmap_parse - convert an ASCII hex string into a bitmap. diff -Nru a/lib/crc32.c b/lib/crc32.c --- a/lib/crc32.c Thu Feb 19 23:44:22 2004 +++ b/lib/crc32.c Thu Feb 19 23:44:22 2004 @@ -1,6 +1,9 @@ -/* +/* * Oct 15, 2000 Matt Domsch * Nicer crc32 functions/docs submitted by linux@horizon.com. Thanks! + * Code was from the public domain, copyright abandoned. Code was + * subsequently included in the kernel, thus was re-licensed under the + * GNU GPL v2. * * Oct 12, 2000 Matt Domsch * Same crc32 function was used in 5 other places in the kernel. @@ -12,7 +15,9 @@ * drivers/net/smc9194.c uses seed ~0, doesn't xor with ~0. * fs/jffs2 uses seed 0, doesn't xor with ~0. * fs/partitions/efi.c uses seed ~0, xor's with ~0. - * + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. */ #include @@ -38,16 +43,10 @@ #define attribute(x) #endif -/* - * This code is in the public domain; copyright abandoned. - * Liability for non-performance of this code is limited to the amount - * you paid for it. Since it is distributed for free, your refund will - * be very very small. If it breaks, you get to keep both pieces. - */ MODULE_AUTHOR("Matt Domsch "); MODULE_DESCRIPTION("Ethernet CRC32 calculations"); -MODULE_LICENSE("GPL and additional rights"); +MODULE_LICENSE("GPL"); #if CRC_LE_BITS == 1 /* @@ -397,7 +396,7 @@ * the same way on decoding, it doesn't make a difference. */ -#if UNITTEST +#ifdef UNITTEST #include #include diff -Nru a/lib/idr.c b/lib/idr.c --- a/lib/idr.c Thu Feb 19 23:44:24 2004 +++ b/lib/idr.c Thu Feb 19 23:44:24 2004 @@ -62,13 +62,13 @@ * to the rest of the functions. The structure is defined in the * header. - * int idr_pre_get(struct idr *idp) + * int idr_pre_get(struct idr *idp, unsigned gfp_mask) * This function should be called prior to locking and calling the * following function. It pre allocates enough memory to satisfy the - * worst possible allocation. It can sleep, so must not be called - * with any spinlocks held. If the system is REALLY out of memory - * this function returns 0, other wise 1. + * worst possible allocation. Unless gfp_mask is GFP_ATOMIC, it can + * sleep, so must not be called with any spinlocks held. If the system is + * REALLY out of memory this function returns 0, other wise 1. * int idr_get_new(struct idr *idp, void *ptr); @@ -135,11 +135,11 @@ spin_unlock(&idp->lock); } -int idr_pre_get(struct idr *idp) +int idr_pre_get(struct idr *idp, unsigned gfp_mask) { while (idp->id_free_cnt < idp->layers + 1) { struct idr_layer *new; - new = kmem_cache_alloc(idr_layer_cache, GFP_KERNEL); + new = kmem_cache_alloc(idr_layer_cache, gfp_mask); if(new == NULL) return (0); free_layer(idp, new); diff -Nru a/lib/vsprintf.c b/lib/vsprintf.c --- a/lib/vsprintf.c Thu Feb 19 23:44:27 2004 +++ b/lib/vsprintf.c Thu Feb 19 23:44:27 2004 @@ -12,6 +12,8 @@ /* * Fri Jul 13 2001 Crutcher Dunnavant * - changed to provide snprintf and vsnprintf functions + * So Feb 1 16:51:32 CET 2004 Juergen Quade + * - scnprintf and vscnprintf */ #include @@ -228,19 +230,22 @@ } /** -* vsnprintf - Format a string and place it in a buffer -* @buf: The buffer to place the result into -* @size: The size of the buffer, including the trailing null space -* @fmt: The format string to use -* @args: Arguments for the format string -* -* The return value is the number of characters which would be -* generated for the given input, excluding the trailing null, -* as per ISO C99. If the return is greater than or equal to -* @size, the resulting string is truncated. -* -* Call this function if you are already dealing with a va_list. -* You probably want snprintf instead. + * vsnprintf - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @args: Arguments for the format string + * + * The return value is the number of characters which would + * be generated for the given input, excluding the trailing + * '\0', as per ISO C99. If you want to have the exact + * number of characters written into @buf as return value + * (not including the trailing '\0'), use vscnprintf. If the + * return is greater than or equal to @size, the resulting + * string is truncated. + * + * Call this function if you are already dealing with a va_list. + * You probably want snprintf instead. */ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) { @@ -482,6 +487,30 @@ EXPORT_SYMBOL(vsnprintf); /** + * vscnprintf - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @args: Arguments for the format string + * + * The return value is the number of characters which have been written into + * the @buf not including the trailing '\0'. If @size is <= 0 the function + * returns 0. + * + * Call this function if you are already dealing with a va_list. + * You probably want scnprintf instead. + */ +int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) +{ + int i; + + i=vsnprintf(buf,size,fmt,args); + return (i >= size) ? (size - 1) : i; +} + +EXPORT_SYMBOL(vscnprintf); + +/** * snprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into * @size: The size of the buffer, including the trailing null space @@ -507,11 +536,39 @@ EXPORT_SYMBOL(snprintf); /** + * scnprintf - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @...: Arguments for the format string + * + * The return value is the number of characters written into @buf not including + * the trailing '\0'. If @size is <= 0 the function returns 0. If the return is + * greater than or equal to @size, the resulting string is truncated. + */ + +int scnprintf(char * buf, size_t size, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i = vsnprintf(buf, size, fmt, args); + va_end(args); + return (i >= size) ? (size - 1) : i; +} +EXPORT_SYMBOL(scnprintf); + +/** * vsprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into * @fmt: The format string to use * @args: Arguments for the format string * + * The function returns the number of characters written + * into @buf. Use vsnprintf or vscnprintf in order to avoid + * buffer overflows. + * * Call this function if you are already dealing with a va_list. * You probably want sprintf instead. */ @@ -527,6 +584,10 @@ * @buf: The buffer to place the result into * @fmt: The format string to use * @...: Arguments for the format string + * + * The function returns the number of characters written + * into @buf. Use snprintf or scnprintf in order to avoid + * buffer overflows. */ int sprintf(char * buf, const char *fmt, ...) { diff -Nru a/mm/bootmem.c b/mm/bootmem.c --- a/mm/bootmem.c Thu Feb 19 23:44:24 2004 +++ b/mm/bootmem.c Thu Feb 19 23:44:24 2004 @@ -91,8 +91,11 @@ if (end > bdata->node_low_pfn) BUG(); for (i = sidx; i < eidx; i++) - if (test_and_set_bit(i, bdata->node_bootmem_map)) + if (test_and_set_bit(i, bdata->node_bootmem_map)) { +#ifdef CONFIG_DEBUG_BOOTMEM printk("hm, page %08lx reserved twice.\n", i*PAGE_SIZE); +#endif + } } static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr, unsigned long size) diff -Nru a/mm/memory.c b/mm/memory.c --- a/mm/memory.c Thu Feb 19 23:44:25 2004 +++ b/mm/memory.c Thu Feb 19 23:44:25 2004 @@ -574,9 +574,10 @@ if ((long)zap_bytes > 0) continue; if (need_resched()) { + int fullmm = tlb_is_full_mm(*tlbp); tlb_finish_mmu(*tlbp, tlb_start, start); cond_resched_lock(&mm->page_table_lock); - *tlbp = tlb_gather_mmu(mm, 0); + *tlbp = tlb_gather_mmu(mm, fullmm); tlb_start_valid = 0; } zap_bytes = ZAP_BLOCK_SIZE; @@ -747,7 +748,8 @@ spin_lock(&mm->page_table_lock); do { struct page *map; - while (!(map = follow_page(mm, start, write))) { + int lookup_write = write; + while (!(map = follow_page(mm, start, lookup_write))) { spin_unlock(&mm->page_table_lock); switch (handle_mm_fault(mm,vma,start,write)) { case VM_FAULT_MINOR: @@ -763,6 +765,14 @@ default: BUG(); } + /* + * Now that we have performed a write fault + * and surely no longer have a shared page we + * shouldn't write, we shouldn't ignore an + * unwritable page in the page table if + * we are forcing write access. + */ + lookup_write = write && !force; spin_lock(&mm->page_table_lock); } if (pages) { @@ -952,6 +962,19 @@ EXPORT_SYMBOL(remap_page_range); /* + * Do pte_mkwrite, but only if the vma says VM_WRITE. We do this when + * servicing faults for write access. In the normal case, do always want + * pte_mkwrite. But get_user_pages can cause write faults for mappings + * that do not have writing enabled, when used by access_process_vm. + */ +static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) +{ + if (likely(vma->vm_flags & VM_WRITE)) + pte = pte_mkwrite(pte); + return pte; +} + +/* * We hold the mm semaphore for reading and vma->vm_mm->page_table_lock */ static inline void break_cow(struct vm_area_struct * vma, struct page * new_page, unsigned long address, @@ -960,7 +983,8 @@ pte_t entry; flush_cache_page(vma, address); - entry = pte_mkwrite(pte_mkdirty(mk_pte(new_page, vma->vm_page_prot))); + entry = maybe_mkwrite(pte_mkdirty(mk_pte(new_page, vma->vm_page_prot)), + vma); ptep_establish(vma, address, page_table, entry); update_mmu_cache(vma, address, entry); } @@ -1012,7 +1036,8 @@ unlock_page(old_page); if (reuse) { flush_cache_page(vma, address); - entry = pte_mkyoung(pte_mkdirty(pte_mkwrite(pte))); + entry = maybe_mkwrite(pte_mkyoung(pte_mkdirty(pte)), + vma); ptep_establish(vma, address, page_table, entry); update_mmu_cache(vma, address, entry); pte_unmap(page_table); @@ -1251,7 +1276,7 @@ mark_page_accessed(page); pte_chain = pte_chain_alloc(GFP_KERNEL); if (!pte_chain) { - ret = -ENOMEM; + ret = VM_FAULT_OOM; goto out; } lock_page(page); @@ -1280,7 +1305,7 @@ mm->rss++; pte = mk_pte(page, vma->vm_page_prot); if (write_access && can_share_swap_page(page)) - pte = pte_mkdirty(pte_mkwrite(pte)); + pte = maybe_mkwrite(pte_mkdirty(pte), vma); unlock_page(page); flush_icache_page(vma, page); @@ -1347,7 +1372,9 @@ goto out; } mm->rss++; - entry = pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot))); + entry = maybe_mkwrite(pte_mkdirty(mk_pte(page, + vma->vm_page_prot)), + vma); lru_cache_add_active(page); mark_page_accessed(page); } @@ -1463,7 +1490,7 @@ flush_icache_page(vma, new_page); entry = mk_pte(new_page, vma->vm_page_prot); if (write_access) - entry = pte_mkwrite(pte_mkdirty(entry)); + entry = maybe_mkwrite(pte_mkdirty(entry), vma); set_pte(page_table, entry); pte_chain = page_add_rmap(new_page, page_table, pte_chain); pte_unmap(page_table); diff -Nru a/mm/page_alloc.c b/mm/page_alloc.c --- a/mm/page_alloc.c Thu Feb 19 23:44:23 2004 +++ b/mm/page_alloc.c Thu Feb 19 23:44:23 2004 @@ -971,7 +971,13 @@ printk("\n"); for (cpu = 0; cpu < NR_CPUS; ++cpu) { - struct per_cpu_pageset *pageset = zone->pageset + cpu; + struct per_cpu_pageset *pageset; + + if (!cpu_possible(cpu)) + continue; + + pageset = zone->pageset + cpu; + for (temperature = 0; temperature < 2; temperature++) printk("cpu %d %s: low %d, high %d, batch %d\n", cpu, @@ -1536,34 +1542,9 @@ #endif /* CONFIG_PROC_FS */ -static void __devinit init_page_alloc_cpu(int cpu) -{ - struct page_state *ps = &per_cpu(page_states, cpu); - memset(ps, 0, sizeof(*ps)); -} - -static int __devinit page_alloc_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) -{ - int cpu = (unsigned long)hcpu; - switch(action) { - case CPU_UP_PREPARE: - init_page_alloc_cpu(cpu); - break; - default: - break; - } - return NOTIFY_OK; -} - -static struct notifier_block __devinitdata page_alloc_nb = { - .notifier_call = page_alloc_cpu_notify, -}; void __init page_alloc_init(void) { - init_page_alloc_cpu(smp_processor_id()); - register_cpu_notifier(&page_alloc_nb); } /* diff -Nru a/mm/rmap.c b/mm/rmap.c --- a/mm/rmap.c Thu Feb 19 23:44:28 2004 +++ b/mm/rmap.c Thu Feb 19 23:44:28 2004 @@ -171,7 +171,7 @@ pte_addr_t pte_paddr = ptep_to_paddr(ptep); struct pte_chain *cur_pte_chain; - if (!pfn_valid(page_to_pfn(page)) || PageReserved(page)) + if (PageReserved(page)) return pte_chain; pte_chain_lock(page); diff -Nru a/mm/slab.c b/mm/slab.c --- a/mm/slab.c Thu Feb 19 23:44:27 2004 +++ b/mm/slab.c Thu Feb 19 23:44:27 2004 @@ -357,8 +357,8 @@ #define RED_ACTIVE 0x170FC2A5UL /* when obj is active */ /* ...and for poisoning */ -#define POISON_BEFORE 0x5a /* for use-uninitialised poisoning */ -#define POISON_AFTER 0x6b /* for use-after-free poisoning */ +#define POISON_INUSE 0x5a /* for use-uninitialised poisoning */ +#define POISON_FREE 0x6b /* for use-after-free poisoning */ #define POISON_END 0xa5 /* end-byte of poisoning */ /* memory layout of objects: @@ -887,60 +887,105 @@ *(unsigned char *)(addr+size-1) = POISON_END; } -static void *scan_poisoned_obj(unsigned char* addr, unsigned int size) +static void dump_line(char *data, int offset, int limit) { - unsigned char *end; - - end = addr + size - 1; - - for (; addr < end; addr++) { - if (*addr != POISON_BEFORE && *addr != POISON_AFTER) - return addr; + int i; + printk(KERN_ERR "%03x:", offset); + for (i=0;iflags & SLAB_RED_ZONE) { + printk(KERN_ERR "Redzone: 0x%lx/0x%lx.\n", + *dbg_redzone1(cachep, objp), + *dbg_redzone2(cachep, objp)); + } - end = scan_poisoned_obj(realobj, size); - if (end) { - int s; - printk(KERN_ERR "Slab corruption: start=%p, expend=%p, " - "problemat=%p\n", realobj, realobj+size-1, end); - if (cachep->flags & SLAB_STORE_USER) { - printk(KERN_ERR "Last user: [<%p>]", *dbg_userword(cachep, objp)); - print_symbol("(%s)", (unsigned long)*dbg_userword(cachep, objp)); - printk("\n"); - } - printk(KERN_ERR "Data: "); - for (s = 0; s < size; s++) { - if (((char*)realobj)[s] == POISON_BEFORE) - printk("."); - else if (((char*)realobj)[s] == POISON_AFTER) - printk("*"); - else - printk("%02X ", ((unsigned char*)realobj)[s]); - } + if (cachep->flags & SLAB_STORE_USER) { + printk(KERN_ERR "Last user: [<%p>]", *dbg_userword(cachep, objp)); + print_symbol("(%s)", (unsigned long)*dbg_userword(cachep, objp)); printk("\n"); - printk(KERN_ERR "Next: "); - for (; s < size + 32; s++) { - if (((char*)realobj)[s] == POISON_BEFORE) - printk("."); - else if (((char*)realobj)[s] == POISON_AFTER) - printk("*"); - else - printk("%02X ", ((unsigned char*)realobj)[s]); + } + realobj = (char*)objp+obj_dbghead(cachep); + size = cachep->objsize; + for (i=0; i size) + limit = size-i; + dump_line(realobj, i, limit); + } +#endif +} + +#if DEBUG + +static void check_poison_obj(kmem_cache_t *cachep, void *objp) +{ + char *realobj; + int size, i; + int lines = 0; + + realobj = (char*)objp+obj_dbghead(cachep); + size = obj_reallen(cachep); + + for (i=0;i size) + limit = size-i; + dump_line(realobj, i, limit); + i += 16; + lines++; + /* Limit to 5 lines */ + if (lines > 5) + break; + } + } + if (lines != 0) { + /* Print some data about the neighboring objects, if they + * exist: + */ + struct slab *slabp = GET_PAGE_SLAB(virt_to_page(objp)); + int objnr; + + objnr = (objp-slabp->s_mem)/cachep->objsize; + if (objnr) { + objp = slabp->s_mem+(objnr-1)*cachep->objsize; + realobj = (char*)objp+obj_dbghead(cachep); + printk(KERN_ERR "Prev obj: start=%p, len=%d\n", + realobj, size); + print_objinfo(cachep, objp, 2); + } + if (objnr+1 < cachep->num) { + objp = slabp->s_mem+(objnr+1)*cachep->objsize; + realobj = (char*)objp+obj_dbghead(cachep); + printk(KERN_ERR "Next obj: start=%p, len=%d\n", + realobj, size); + print_objinfo(cachep, objp, 2); } - printk("\n"); - slab_error(cachep, "object was modified after freeing"); } } #endif @@ -1030,7 +1075,6 @@ unsigned long flags, void (*ctor)(void*, kmem_cache_t *, unsigned long), void (*dtor)(void*, kmem_cache_t *, unsigned long)) { - const char *func_nm = KERN_ERR "kmem_create: "; size_t left_over, align, slab_size; kmem_cache_t *cachep = NULL; @@ -1042,14 +1086,18 @@ (size < BYTES_PER_WORD) || (size > (1< size)) + (offset < 0 || offset > size)) { + printk(KERN_ERR "%s: Early error in slab %s\n", + __FUNCTION__, name); BUG(); + } #if DEBUG WARN_ON(strchr(name, ' ')); /* It confuses parsers */ if ((flags & SLAB_DEBUG_INITIAL) && !ctor) { /* No constructor, but inital state check requested */ - printk("%sNo con, but init state check requested - %s\n", func_nm, name); + printk(KERN_ERR "%s: No con, but init state check " + "requested - %s\n", __FUNCTION__, name); flags &= ~SLAB_DEBUG_INITIAL; } @@ -1094,7 +1142,6 @@ if (size & (BYTES_PER_WORD-1)) { size += (BYTES_PER_WORD-1); size &= ~(BYTES_PER_WORD-1); - printk("%sForcing size word alignment - %s\n", func_nm, name); } #if DEBUG @@ -1493,7 +1540,7 @@ #if DEBUG /* need to poison the objs? */ if (cachep->flags & SLAB_POISON) - poison_obj(cachep, objp, POISON_BEFORE); + poison_obj(cachep, objp, POISON_FREE); if (cachep->flags & SLAB_STORE_USER) *dbg_userword(cachep, objp) = NULL; @@ -1712,13 +1759,13 @@ if (cachep->flags & SLAB_POISON) { #ifdef CONFIG_DEBUG_PAGEALLOC if ((cachep->objsize % PAGE_SIZE) == 0 && OFF_SLAB(cachep)) { - store_stackinfo(cachep, objp, POISON_AFTER); + store_stackinfo(cachep, objp, (unsigned long)caller); kernel_map_pages(virt_to_page(objp), cachep->objsize/PAGE_SIZE, 0); } else { - poison_obj(cachep, objp, POISON_AFTER); + poison_obj(cachep, objp, POISON_FREE); } #else - poison_obj(cachep, objp, POISON_AFTER); + poison_obj(cachep, objp, POISON_FREE); #endif } #endif @@ -1875,7 +1922,7 @@ #else check_poison_obj(cachep, objp); #endif - poison_obj(cachep, objp, POISON_BEFORE); + poison_obj(cachep, objp, POISON_INUSE); } if (cachep->flags & SLAB_STORE_USER) *dbg_userword(cachep, objp) = caller; @@ -2866,14 +2913,7 @@ kernel_map_pages(virt_to_page(objp), c->objsize/PAGE_SIZE, 1); - if (c->flags & SLAB_RED_ZONE) - printk("redzone: 0x%lx/0x%lx.\n", - *dbg_redzone1(c, objp), - *dbg_redzone2(c, objp)); - - if (c->flags & SLAB_STORE_USER) - printk("Last user: %p.\n", - *dbg_userword(c, objp)); + print_objinfo(c, objp, 2); } spin_unlock_irqrestore(&c->spinlock, flags); diff -Nru a/net/8021q/vlan.c b/net/8021q/vlan.c --- a/net/8021q/vlan.c Thu Feb 19 23:44:27 2004 +++ b/net/8021q/vlan.c Thu Feb 19 23:44:27 2004 @@ -566,7 +566,7 @@ goto out_put_dev; out_free_newdev: - kfree(new_dev); + free_netdev(new_dev); out_unlock: rtnl_unlock(); diff -Nru a/net/Kconfig b/net/Kconfig --- a/net/Kconfig Thu Feb 19 23:44:22 2004 +++ b/net/Kconfig Thu Feb 19 23:44:22 2004 @@ -32,8 +32,7 @@ to work, choose Y. To compile this driver as a module, choose M here: the module will - be called af_packet. If you use modprobe or kmod, you may also - want to add "alias net-pf-17 af_packet" to /etc/modules.conf. + be called af_packet. If unsure, say Y. @@ -67,11 +66,8 @@ want to say Y here. To compile this driver as a module, choose M here: the module will be - called unix. If you try building this as a module and you have - said Y to "Kernel module loader support" above, be sure to add - 'alias net-pf-1 unix' to your /etc/modules.conf file. Note that - several important services won't work correctly if you say M here - and then neglect to load the module. + called unix. Note that several important services won't work + correctly if you say M here and then neglect to load the module. Say Y unless you know what you are doing. @@ -127,9 +123,7 @@ in the kernel source. To compile this protocol support as a module, choose M here: the - module will be called ipv6. If you try building this as a module - and you have said Y to "Kernel module loader support" above, - be sure to add 'alias net-pf-10 ipv6' to your /etc/modules.conf file. + module will be called ipv6. It is safe to say N here for now. diff -Nru a/net/appletalk/ddp.c b/net/appletalk/ddp.c --- a/net/appletalk/ddp.c Thu Feb 19 23:44:28 2004 +++ b/net/appletalk/ddp.c Thu Feb 19 23:44:28 2004 @@ -1659,7 +1659,7 @@ ddp->deh_dport = usat->sat_port; ddp->deh_sport = at->src_port; - SOCK_DEBUG(sk, "SK %p: Copy user data (%d bytes).\n", sk, len); + SOCK_DEBUG(sk, "SK %p: Copy user data (%Zd bytes).\n", sk, len); err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len); if (err) { @@ -1706,7 +1706,7 @@ kfree_skb(skb); /* else queued/sent above in the aarp queue */ } - SOCK_DEBUG(sk, "SK %p: Done write (%d).\n", sk, len); + SOCK_DEBUG(sk, "SK %p: Done write (%Zd).\n", sk, len); return len; } diff -Nru a/net/atm/clip.c b/net/atm/clip.c --- a/net/atm/clip.c Thu Feb 19 23:44:28 2004 +++ b/net/atm/clip.c Thu Feb 19 23:44:28 2004 @@ -829,7 +829,7 @@ !clip_vcc || clip_vcc->encap ? "LLC" : "NULL", (jiffies-(clip_vcc ? clip_vcc->last_use : entry->neigh->used))/HZ); - off = snprintf(buf, sizeof(buf) - 1, "%d.%d.%d.%d", NIPQUAD(entry->ip)); + off = scnprintf(buf, sizeof(buf) - 1, "%d.%d.%d.%d", NIPQUAD(entry->ip)); while (off < 16) buf[off++] = ' '; buf[off] = '\0'; diff -Nru a/net/atm/lec.c b/net/atm/lec.c --- a/net/atm/lec.c Thu Feb 19 23:44:26 2004 +++ b/net/atm/lec.c Thu Feb 19 23:44:26 2004 @@ -798,7 +798,7 @@ return -ENOMEM; snprintf(dev_lec[i]->name, IFNAMSIZ, "lec%d", i); if (register_netdev(dev_lec[i])) { - kfree(dev_lec[i]); + free_netdev(dev_lec[i]); return -EINVAL; } diff -Nru a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c --- a/net/bluetooth/bnep/core.c Thu Feb 19 23:44:26 2004 +++ b/net/bluetooth/bnep/core.c Thu Feb 19 23:44:26 2004 @@ -501,7 +501,7 @@ __bnep_unlink_session(s); up_write(&bnep_session_sem); - kfree(dev); + free_netdev(dev); return 0; } @@ -588,7 +588,7 @@ failed: up_write(&bnep_session_sem); - kfree(dev); + free_netdev(dev); return err; } diff -Nru a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c --- a/net/bluetooth/rfcomm/sock.c Thu Feb 19 23:44:26 2004 +++ b/net/bluetooth/rfcomm/sock.c Thu Feb 19 23:44:26 2004 @@ -501,7 +501,7 @@ lock_sock(sk); while (len) { - size_t size = min(len, d->mtu); + size_t size = min_t(size_t, len, d->mtu); skb = sock_alloc_send_skb(sk, size + RFCOMM_SKB_RESERVE, msg->msg_flags & MSG_DONTWAIT, &err); diff -Nru a/net/core/dev.c b/net/core/dev.c --- a/net/core/dev.c Thu Feb 19 23:44:25 2004 +++ b/net/core/dev.c Thu Feb 19 23:44:25 2004 @@ -1742,6 +1742,7 @@ #endif skb->h.raw = skb->nh.raw = skb->data; + skb->mac_len = skb->nh.raw - skb->mac.raw; pt_prev = NULL; rcu_read_lock(); diff -Nru a/net/core/ethtool.c b/net/core/ethtool.c --- a/net/core/ethtool.c Thu Feb 19 23:44:23 2004 +++ b/net/core/ethtool.c Thu Feb 19 23:44:23 2004 @@ -374,7 +374,7 @@ { struct ethtool_ringparam ringparam; - if (!dev->ethtool_ops->get_ringparam) + if (!dev->ethtool_ops->set_ringparam) return -EOPNOTSUPP; if (copy_from_user(&ringparam, useraddr, sizeof(ringparam))) diff -Nru a/net/core/filter.c b/net/core/filter.c --- a/net/core/filter.c Thu Feb 19 23:44:24 2004 +++ b/net/core/filter.c Thu Feb 19 23:44:24 2004 @@ -332,7 +332,7 @@ struct sock_filter *ftest; int pc; - if ((unsigned int)flen >= (~0U / sizeof(struct sock_filter))) + if (((unsigned int)flen >= (~0U / sizeof(struct sock_filter))) || flen == 0) return -EINVAL; /* check the filter code now */ diff -Nru a/net/core/neighbour.c b/net/core/neighbour.c --- a/net/core/neighbour.c Thu Feb 19 23:44:22 2004 +++ b/net/core/neighbour.c Thu Feb 19 23:44:22 2004 @@ -1164,8 +1164,7 @@ if (!tbl->kmem_cachep) tbl->kmem_cachep = kmem_cache_create(tbl->id, - (tbl->entry_size + - 15) & ~15, + tbl->entry_size, 0, SLAB_HWCACHE_ALIGN, NULL, NULL); tbl->lock = RW_LOCK_UNLOCKED; diff -Nru a/net/core/pktgen.c b/net/core/pktgen.c --- a/net/core/pktgen.c Thu Feb 19 23:44:26 2004 +++ b/net/core/pktgen.c Thu Feb 19 23:44:26 2004 @@ -50,6 +50,8 @@ * Fix refcount off by one if first packet fails, potential null deref, * memleak 030710- KJP * + * Fixed unaligned access on IA-64 Grant Grundler + * * See Documentation/networking/pktgen.txt for how to use this. */ @@ -88,7 +90,7 @@ #define cycles() ((u32)get_cycles()) -#define VERSION "pktgen version 1.31" +#define VERSION "pktgen version 1.32" static char version[] __initdata = "pktgen.c: v1.3: Packet Generator for packet performance testing.\n"; @@ -193,7 +195,8 @@ struct pktgen_hdr { __u32 pgh_magic; __u32 seq_num; - struct timeval timestamp; + __u32 tv_sec; + __u32 tv_usec; }; static int cpu_speed; @@ -563,11 +566,14 @@ /* Stamp the time, and sequence number, convert them to network byte order */ if (pgh) { + struct timeval timestamp; + pgh->pgh_magic = htonl(PKTGEN_MAGIC); - do_gettimeofday(&(pgh->timestamp)); - pgh->timestamp.tv_usec = htonl(pgh->timestamp.tv_usec); - pgh->timestamp.tv_sec = htonl(pgh->timestamp.tv_sec); - pgh->seq_num = htonl(info->seq_num); + pgh->seq_num = htonl(info->seq_num); + + do_gettimeofday(×tamp); + pgh->tv_sec = htonl(timestamp.tv_sec); + pgh->tv_usec = htonl(timestamp.tv_usec); } return skb; diff -Nru a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c --- a/net/decnet/dn_nsp_out.c Thu Feb 19 23:44:28 2004 +++ b/net/decnet/dn_nsp_out.c Thu Feb 19 23:44:28 2004 @@ -141,7 +141,7 @@ * whole size thats been asked for (plus 11 bytes of header). If this * fails, then we try for any size over 16 bytes for SOCK_STREAMS. */ -struct sk_buff *dn_alloc_send_skb(struct sock *sk, int *size, int noblock, int *err) +struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, int *err) { int space; int len; diff -Nru a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c --- a/net/decnet/dn_rules.c Thu Feb 19 23:44:27 2004 +++ b/net/decnet/dn_rules.c Thu Feb 19 23:44:27 2004 @@ -381,7 +381,7 @@ nlmsg_failure: rtattr_failure: - skb_put(skb, b - skb->tail); + skb_trim(skb, b - skb->data); return -1; } diff -Nru a/net/ipv4/arp.c b/net/ipv4/arp.c --- a/net/ipv4/arp.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/arp.c Thu Feb 19 23:44:27 2004 @@ -325,15 +325,40 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) { - u32 saddr; + u32 saddr = 0; u8 *dst_ha = NULL; struct net_device *dev = neigh->dev; u32 target = *(u32*)neigh->primary_key; int probes = atomic_read(&neigh->probes); + struct in_device *in_dev = in_dev_get(dev); + + if (!in_dev) + return; - if (skb && inet_addr_type(skb->nh.iph->saddr) == RTN_LOCAL) + switch (IN_DEV_ARP_ANNOUNCE(in_dev)) { + default: + case 0: /* By default announce any local IP */ + if (skb && inet_addr_type(skb->nh.iph->saddr) == RTN_LOCAL) + saddr = skb->nh.iph->saddr; + break; + case 1: /* Restrict announcements of saddr in same subnet */ + if (!skb) + break; saddr = skb->nh.iph->saddr; - else + if (inet_addr_type(saddr) == RTN_LOCAL) { + /* saddr should be known to target */ + if (inet_addr_onlink(in_dev, target, saddr)) + break; + } + saddr = 0; + break; + case 2: /* Avoid secondary IPs, get a primary/preferred one */ + break; + } + + if (in_dev) + in_dev_put(in_dev); + if (!saddr) saddr = inet_select_addr(dev, target, RT_SCOPE_LINK); if ((probes -= neigh->parms->ucast_probes) < 0) { @@ -354,6 +379,42 @@ read_unlock_bh(&neigh->lock); } +static int arp_ignore(struct in_device *in_dev, struct net_device *dev, + u32 sip, u32 tip) +{ + int scope; + + switch (IN_DEV_ARP_IGNORE(in_dev)) { + case 0: /* Reply, the tip is already validated */ + return 0; + case 1: /* Reply only if tip is configured on the incoming interface */ + sip = 0; + scope = RT_SCOPE_HOST; + break; + case 2: /* + * Reply only if tip is configured on the incoming interface + * and is in same subnet as sip + */ + scope = RT_SCOPE_HOST; + break; + case 3: /* Do not reply for scope host addresses */ + sip = 0; + scope = RT_SCOPE_LINK; + dev = NULL; + break; + case 4: /* Reserved */ + case 5: + case 6: + case 7: + return 0; + case 8: /* Do not reply */ + return 1; + default: + return 0; + } + return !inet_confirm_addr(dev, sip, tip, scope); +} + static int arp_filter(__u32 sip, __u32 tip, struct net_device *dev) { struct flowi fl = { .nl_u = { .ip4_u = { .daddr = sip, @@ -764,7 +825,8 @@ /* Special case: IPv4 duplicate address detection packet (RFC2131) */ if (sip == 0) { if (arp->ar_op == htons(ARPOP_REQUEST) && - inet_addr_type(tip) == RTN_LOCAL) + inet_addr_type(tip) == RTN_LOCAL && + !arp_ignore(in_dev,dev,sip,tip)) arp_send(ARPOP_REPLY,ETH_P_ARP,tip,dev,tip,sha,dev->dev_addr,dev->dev_addr); goto out; } @@ -779,7 +841,10 @@ n = neigh_event_ns(&arp_tbl, sha, &sip, dev); if (n) { int dont_send = 0; - if (IN_DEV_ARPFILTER(in_dev)) + + if (!dont_send) + dont_send |= arp_ignore(in_dev,dev,sip,tip); + if (!dont_send && IN_DEV_ARPFILTER(in_dev)) dont_send |= arp_filter(sip,tip,dev); if (!dont_send) arp_send(ARPOP_REPLY,ETH_P_ARP,sip,dev,tip,sha,dev->dev_addr,sha); diff -Nru a/net/ipv4/devinet.c b/net/ipv4/devinet.c --- a/net/ipv4/devinet.c Thu Feb 19 23:44:23 2004 +++ b/net/ipv4/devinet.c Thu Feb 19 23:44:23 2004 @@ -809,6 +809,84 @@ goto out; } +static u32 confirm_addr_indev(struct in_device *in_dev, u32 dst, + u32 local, int scope) +{ + int same = 0; + u32 addr = 0; + + for_ifa(in_dev) { + if (!addr && + (local == ifa->ifa_local || !local) && + ifa->ifa_scope <= scope) { + addr = ifa->ifa_local; + if (same) + break; + } + if (!same) { + same = (!local || inet_ifa_match(local, ifa)) && + (!dst || inet_ifa_match(dst, ifa)); + if (same && addr) { + if (local || !dst) + break; + /* Is the selected addr into dst subnet? */ + if (inet_ifa_match(addr, ifa)) + break; + /* No, then can we use new local src? */ + if (ifa->ifa_scope <= scope) { + addr = ifa->ifa_local; + break; + } + /* search for large dst subnet for addr */ + same = 0; + } + } + } endfor_ifa(in_dev); + + return same? addr : 0; +} + +/* + * Confirm that local IP address exists using wildcards: + * - dev: only on this interface, 0=any interface + * - dst: only in the same subnet as dst, 0=any dst + * - local: address, 0=autoselect the local address + * - scope: maximum allowed scope value for the local address + */ +u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scope) +{ + u32 addr = 0; + struct in_device *in_dev; + + if (dev) { + read_lock(&inetdev_lock); + if ((in_dev = __in_dev_get(dev))) { + read_lock(&in_dev->lock); + addr = confirm_addr_indev(in_dev, dst, local, scope); + read_unlock(&in_dev->lock); + } + read_unlock(&inetdev_lock); + + return addr; + } + + read_lock(&dev_base_lock); + read_lock(&inetdev_lock); + for (dev = dev_base; dev; dev = dev->next) { + if ((in_dev = __in_dev_get(dev))) { + read_lock(&in_dev->lock); + addr = confirm_addr_indev(in_dev, dst, local, scope); + read_unlock(&in_dev->lock); + if (addr) + break; + } + } + read_unlock(&inetdev_lock); + read_unlock(&dev_base_lock); + + return addr; +} + /* * Device notifier */ @@ -1132,7 +1210,7 @@ static struct devinet_sysctl_table { struct ctl_table_header *sysctl_header; - ctl_table devinet_vars[18]; + ctl_table devinet_vars[20]; ctl_table devinet_dev[2]; ctl_table devinet_conf_dir[2]; ctl_table devinet_proto_dir[2]; @@ -1247,6 +1325,22 @@ .ctl_name = NET_IPV4_CONF_ARPFILTER, .procname = "arp_filter", .data = &ipv4_devconf.arp_filter, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV4_CONF_ARP_ANNOUNCE, + .procname = "arp_announce", + .data = &ipv4_devconf.arp_announce, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = NET_IPV4_CONF_ARP_IGNORE, + .procname = "arp_ignore", + .data = &ipv4_devconf.arp_ignore, .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec, diff -Nru a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c --- a/net/ipv4/fib_rules.c Thu Feb 19 23:44:25 2004 +++ b/net/ipv4/fib_rules.c Thu Feb 19 23:44:25 2004 @@ -438,7 +438,7 @@ nlmsg_failure: rtattr_failure: - skb_put(skb, b - skb->tail); + skb_trim(skb, b - skb->data); return -1; } diff -Nru a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c --- a/net/ipv4/ip_gre.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ip_gre.c Thu Feb 19 23:44:27 2004 @@ -280,7 +280,7 @@ nt->parms = *parms; if (register_netdevice(dev) < 0) { - kfree(dev); + free_netdev(dev); goto failed; } @@ -1276,7 +1276,7 @@ return err; fail: inet_del_protocol(&ipgre_protocol, IPPROTO_GRE); - kfree(ipgre_fb_tunnel_dev); + free_netdev(ipgre_fb_tunnel_dev); goto out; } diff -Nru a/net/ipv4/ipip.c b/net/ipv4/ipip.c --- a/net/ipv4/ipip.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv4/ipip.c Thu Feb 19 23:44:28 2004 @@ -250,7 +250,7 @@ nt->parms = *parms; if (register_netdevice(dev) < 0) { - kfree(dev); + free_netdev(dev); goto failed; } @@ -899,7 +899,7 @@ return err; fail: xfrm4_tunnel_deregister(&ipip_handler); - kfree(ipip_fb_tunnel_dev); + free_netdev(ipip_fb_tunnel_dev); goto out; } diff -Nru a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c --- a/net/ipv4/ipmr.c Thu Feb 19 23:44:25 2004 +++ b/net/ipv4/ipmr.c Thu Feb 19 23:44:25 2004 @@ -209,7 +209,7 @@ return NULL; if (register_netdevice(dev)) { - kfree(dev); + free_netdev(dev); return NULL; } dev->iflink = 0; diff -Nru a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c --- a/net/ipv4/ipvs/ip_vs_app.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv4/ipvs/ip_vs_app.c Thu Feb 19 23:44:22 2004 @@ -20,18 +20,12 @@ * */ -#include #include -#include #include -#include #include #include #include -#include #include -#include -#include #include #include #include diff -Nru a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c --- a/net/ipv4/ipvs/ip_vs_conn.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_conn.c Thu Feb 19 23:44:27 2004 @@ -24,10 +24,7 @@ * */ -#include -#include #include -#include #include #include /* for proc_net_* */ #include diff -Nru a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c --- a/net/ipv4/ipvs/ip_vs_core.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv4/ipvs/ip_vs_core.c Thu Feb 19 23:44:22 2004 @@ -25,12 +25,8 @@ * */ -#include #include -#include #include -#include -#include #include #include #include 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 Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_ctl.c Thu Feb 19 23:44:27 2004 @@ -20,12 +20,9 @@ * */ -#include -#include #include #include #include -#include #include #include #include diff -Nru a/net/ipv4/ipvs/ip_vs_dh.c b/net/ipv4/ipvs/ip_vs_dh.c --- a/net/ipv4/ipvs/ip_vs_dh.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_dh.c Thu Feb 19 23:44:27 2004 @@ -37,12 +37,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_ftp.c b/net/ipv4/ipvs/ip_vs_ftp.c --- a/net/ipv4/ipvs/ip_vs_ftp.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv4/ipvs/ip_vs_ftp.c Thu Feb 19 23:44:28 2004 @@ -24,15 +24,11 @@ * */ -#include #include -#include -#include #include #include #include #include -#include #include #include 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 Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_lblc.c Thu Feb 19 23:44:27 2004 @@ -41,14 +41,10 @@ * me to write this module. */ -#include #include -#include -#include #include -#include -/* for systcl */ +/* for sysctl */ #include #include @@ -69,7 +65,7 @@ * entries that haven't been touched for a day. */ #define COUNT_FOR_FULL_EXPIRATION 30 -int sysctl_ip_vs_lblc_expiration = 24*60*60*HZ; +static int sysctl_ip_vs_lblc_expiration = 24*60*60*HZ; /* 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 Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_lblcr.c Thu Feb 19 23:44:27 2004 @@ -39,14 +39,10 @@ * */ -#include #include -#include -#include #include -#include -/* for systcl */ +/* for sysctl */ #include #include /* for proc_net_create/proc_net_remove */ @@ -69,7 +65,7 @@ * entries that haven't been touched for a day. */ #define COUNT_FOR_FULL_EXPIRATION 30 -int sysctl_ip_vs_lblcr_expiration = 24*60*60*HZ; +static int sysctl_ip_vs_lblcr_expiration = 24*60*60*HZ; /* diff -Nru a/net/ipv4/ipvs/ip_vs_lc.c b/net/ipv4/ipvs/ip_vs_lc.c --- a/net/ipv4/ipvs/ip_vs_lc.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv4/ipvs/ip_vs_lc.c Thu Feb 19 23:44:28 2004 @@ -16,12 +16,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_nq.c b/net/ipv4/ipvs/ip_vs_nq.c --- a/net/ipv4/ipvs/ip_vs_nq.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv4/ipvs/ip_vs_nq.c Thu Feb 19 23:44:28 2004 @@ -33,12 +33,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_proto.c b/net/ipv4/ipvs/ip_vs_proto.c --- a/net/ipv4/ipvs/ip_vs_proto.c Thu Feb 19 23:44:24 2004 +++ b/net/ipv4/ipvs/ip_vs_proto.c Thu Feb 19 23:44:24 2004 @@ -15,15 +15,11 @@ * */ -#include #include -#include #include -#include #include #include #include -#include #include #include #include diff -Nru a/net/ipv4/ipvs/ip_vs_proto_ah.c b/net/ipv4/ipvs/ip_vs_proto_ah.c --- a/net/ipv4/ipvs/ip_vs_proto_ah.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_proto_ah.c Thu Feb 19 23:44:27 2004 @@ -12,13 +12,8 @@ * */ -#include #include -#include #include -#include -#include -#include #include #include diff -Nru a/net/ipv4/ipvs/ip_vs_proto_esp.c b/net/ipv4/ipvs/ip_vs_proto_esp.c --- a/net/ipv4/ipvs/ip_vs_proto_esp.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_proto_esp.c Thu Feb 19 23:44:27 2004 @@ -12,13 +12,8 @@ * */ -#include #include -#include #include -#include -#include -#include #include #include diff -Nru a/net/ipv4/ipvs/ip_vs_proto_icmp.c b/net/ipv4/ipvs/ip_vs_proto_icmp.c --- a/net/ipv4/ipvs/ip_vs_proto_icmp.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv4/ipvs/ip_vs_proto_icmp.c Thu Feb 19 23:44:22 2004 @@ -9,13 +9,8 @@ * */ -#include #include -#include #include -#include -#include -#include #include #include #include diff -Nru a/net/ipv4/ipvs/ip_vs_proto_tcp.c b/net/ipv4/ipvs/ip_vs_proto_tcp.c --- a/net/ipv4/ipvs/ip_vs_proto_tcp.c Thu Feb 19 23:44:24 2004 +++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c Thu Feb 19 23:44:24 2004 @@ -15,8 +15,7 @@ * */ -#include -#include +#include #include #include /* for tcphdr */ #include diff -Nru a/net/ipv4/ipvs/ip_vs_rr.c b/net/ipv4/ipvs/ip_vs_rr.c --- a/net/ipv4/ipvs/ip_vs_rr.c Thu Feb 19 23:44:25 2004 +++ b/net/ipv4/ipvs/ip_vs_rr.c Thu Feb 19 23:44:25 2004 @@ -21,12 +21,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_sched.c b/net/ipv4/ipvs/ip_vs_sched.c --- a/net/ipv4/ipvs/ip_vs_sched.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv4/ipvs/ip_vs_sched.c Thu Feb 19 23:44:22 2004 @@ -19,10 +19,7 @@ * */ -#include #include -#include -#include #include #include #include diff -Nru a/net/ipv4/ipvs/ip_vs_sed.c b/net/ipv4/ipvs/ip_vs_sed.c --- a/net/ipv4/ipvs/ip_vs_sed.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv4/ipvs/ip_vs_sed.c Thu Feb 19 23:44:28 2004 @@ -37,12 +37,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_sh.c b/net/ipv4/ipvs/ip_vs_sh.c --- a/net/ipv4/ipvs/ip_vs_sh.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv4/ipvs/ip_vs_sh.c Thu Feb 19 23:44:27 2004 @@ -34,12 +34,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c --- a/net/ipv4/ipvs/ip_vs_sync.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv4/ipvs/ip_vs_sync.c Thu Feb 19 23:44:22 2004 @@ -18,17 +18,9 @@ * messages filtering. */ -#define __KERNEL_SYSCALLS__ /* for waitpid */ - -#include #include -#include -#include #include #include -#include -#include -#include #include #include @@ -621,8 +613,6 @@ } -static int errno; - static DECLARE_WAIT_QUEUE_HEAD(sync_wait); static pid_t sync_master_pid = 0; static pid_t sync_backup_pid = 0; @@ -769,10 +759,10 @@ if (ip_vs_sync_state & IP_VS_STATE_MASTER && !sync_master_pid) { state = IP_VS_STATE_MASTER; - name = "ipvs syncmaster"; + name = "ipvs_syncmaster"; } else if (ip_vs_sync_state & IP_VS_STATE_BACKUP && !sync_backup_pid) { state = IP_VS_STATE_BACKUP; - name = "ipvs syncbackup"; + name = "ipvs_syncbackup"; } else { IP_VS_BUG(); ip_vs_use_count_dec(); @@ -830,10 +820,19 @@ static int fork_sync_thread(void *startup) { + pid_t pid; + /* fork the sync thread here, then the parent process of the sync thread is the init process after this thread exits. */ - if (kernel_thread(sync_thread, startup, 0) < 0) - IP_VS_BUG(); + repeat: + if ((pid = kernel_thread(sync_thread, startup, 0)) < 0) { + IP_VS_ERR("could not create sync_thread due to %d... " + "retrying.\n", pid); + current->state = TASK_UNINTERRUPTIBLE; + schedule_timeout(HZ); + goto repeat; + } + return 0; } @@ -842,7 +841,6 @@ { DECLARE_COMPLETION(startup); pid_t pid; - int waitpid_result; if ((state == IP_VS_STATE_MASTER && sync_master_pid) || (state == IP_VS_STATE_BACKUP && sync_backup_pid)) @@ -861,12 +859,13 @@ ip_vs_backup_syncid = syncid; } - if ((pid = kernel_thread(fork_sync_thread, &startup, 0)) < 0) - IP_VS_BUG(); - - if ((waitpid_result = waitpid(pid, NULL, __WCLONE)) != pid) { - IP_VS_ERR("%s: waitpid(%d,...) failed, errno %d\n", - __FUNCTION__, pid, -waitpid_result); + repeat: + if ((pid = kernel_thread(fork_sync_thread, &startup, 0)) < 0) { + IP_VS_ERR("could not create fork_sync_thread due to %d... " + "retrying.\n", pid); + current->state = TASK_UNINTERRUPTIBLE; + schedule_timeout(HZ); + goto repeat; } wait_for_completion(&startup); diff -Nru a/net/ipv4/ipvs/ip_vs_wlc.c b/net/ipv4/ipvs/ip_vs_wlc.c --- a/net/ipv4/ipvs/ip_vs_wlc.c Thu Feb 19 23:44:26 2004 +++ b/net/ipv4/ipvs/ip_vs_wlc.c Thu Feb 19 23:44:26 2004 @@ -21,12 +21,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_wrr.c b/net/ipv4/ipvs/ip_vs_wrr.c --- a/net/ipv4/ipvs/ip_vs_wrr.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv4/ipvs/ip_vs_wrr.c Thu Feb 19 23:44:22 2004 @@ -20,12 +20,8 @@ * */ -#include #include -#include -#include #include -#include #include diff -Nru a/net/ipv4/ipvs/ip_vs_xmit.c b/net/ipv4/ipvs/ip_vs_xmit.c --- a/net/ipv4/ipvs/ip_vs_xmit.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv4/ipvs/ip_vs_xmit.c Thu Feb 19 23:44:28 2004 @@ -15,10 +15,7 @@ * */ -#include -#include #include -#include #include #include /* for tcphdr */ #include /* for csum_tcpudp_magic */ diff -Nru a/net/ipv4/route.c b/net/ipv4/route.c --- a/net/ipv4/route.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv4/route.c Thu Feb 19 23:44:28 2004 @@ -2717,6 +2717,16 @@ #endif /* CONFIG_PROC_FS */ #endif /* CONFIG_NET_CLS_ROUTE */ +static __initdata unsigned long rhash_entries; +static int __init set_rhash_entries(char *str) +{ + if (!str) + return 0; + rhash_entries = simple_strtoul(str, &str, 0); + return 1; +} +__setup("rhash_entries=", set_rhash_entries); + int __init ip_rt_init(void) { int i, order, goal, rc = 0; @@ -2743,7 +2753,10 @@ panic("IP: failed to allocate ip_dst_cache\n"); goal = num_physpages >> (26 - PAGE_SHIFT); - + if (!rhash_entries) + goal = min(10, goal); + else + goal = (rhash_entries * sizeof(struct rt_hash_bucket)) >> PAGE_SHIFT; for (order = 0; (1UL << order) < goal; order++) /* NOTHING */; diff -Nru a/net/ipv4/tcp.c b/net/ipv4/tcp.c --- a/net/ipv4/tcp.c Thu Feb 19 23:44:24 2004 +++ b/net/ipv4/tcp.c Thu Feb 19 23:44:24 2004 @@ -2570,6 +2570,16 @@ extern void __skb_cb_too_small_for_tcp(int, int); extern void tcpdiag_init(void); +static __initdata unsigned long thash_entries; +static int __init set_thash_entries(char *str) +{ + if (!str) + return 0; + thash_entries = simple_strtoul(str, &str, 0); + return 1; +} +__setup("thash_entries=", set_thash_entries); + void __init tcp_init(void) { struct sk_buff *skb = NULL; @@ -2611,6 +2621,10 @@ else goal = num_physpages >> (23 - PAGE_SHIFT); + if (!thash_entries) + goal = min(10UL, goal); + else + goal = (thash_entries * sizeof(struct tcp_ehash_bucket)) >> PAGE_SHIFT; for (order = 0; (1UL << order) < goal; order++) ; do { diff -Nru a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c --- a/net/ipv4/xfrm4_input.c Thu Feb 19 23:44:23 2004 +++ b/net/ipv4/xfrm4_input.c Thu Feb 19 23:44:23 2004 @@ -9,6 +9,7 @@ * */ +#include #include #include #include @@ -18,9 +19,10 @@ return xfrm4_rcv_encap(skb, 0); } -static inline void ipip_ecn_decapsulate(struct iphdr *outer_iph, struct sk_buff *skb) +static inline void ipip_ecn_decapsulate(struct sk_buff *skb) { - struct iphdr *inner_iph = skb->nh.iph; + struct iphdr *outer_iph = skb->nh.iph; + struct iphdr *inner_iph = skb->h.ipiph; if (INET_ECN_is_ce(outer_iph->tos) && INET_ECN_is_not_ce(inner_iph->tos)) @@ -95,10 +97,16 @@ if (x->props.mode) { if (iph->protocol != IPPROTO_IPIP) goto drop; - skb->nh.raw = skb->data; + if (!pskb_may_pull(skb, sizeof(struct iphdr))) + goto drop; + if (skb_cloned(skb) && + pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) + goto drop; if (!(x->props.flags & XFRM_STATE_NOECN)) - ipip_ecn_decapsulate(iph, skb); - iph = skb->nh.iph; + ipip_ecn_decapsulate(skb); + skb->mac.raw = memmove(skb->data - skb->mac_len, + skb->mac.raw, skb->mac_len); + skb->nh.raw = skb->data; memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); decaps = 1; break; diff -Nru a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c --- a/net/ipv6/addrconf.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv6/addrconf.c Thu Feb 19 23:44:28 2004 @@ -149,6 +149,7 @@ .accept_ra = 1, .accept_redirects = 1, .autoconf = 1, + .force_mld_version = 0, .dad_transmits = 1, .rtr_solicits = MAX_RTR_SOLICITATIONS, .rtr_solicit_interval = RTR_SOLICITATION_INTERVAL, @@ -231,7 +232,7 @@ if ((addr->s6_addr32[0] | addr->s6_addr32[1]) == 0) { if (addr->s6_addr32[2] == 0) { - if (addr->in6_u.u6_addr32[3] == 0) + if (addr->s6_addr32[3] == 0) return IPV6_ADDR_ANY; if (addr->s6_addr32[3] == htonl(0x00000001)) @@ -1071,7 +1072,7 @@ eui[0] ^= 2; return 0; case ARPHRD_ARCNET: - /* XXX: inherit EUI-64 fro mother interface -- yoshfuji */ + /* XXX: inherit EUI-64 from other interface -- yoshfuji */ if (dev->addr_len != ARCNET_ALEN) return -1; memset(eui, 0, 7); @@ -2739,6 +2740,7 @@ array[DEVCONF_RTR_SOLICITS] = cnf->rtr_solicits; array[DEVCONF_RTR_SOLICIT_INTERVAL] = cnf->rtr_solicit_interval; array[DEVCONF_RTR_SOLICIT_DELAY] = cnf->rtr_solicit_delay; + array[DEVCONF_FORCE_MLD_VERSION] = cnf->force_mld_version; #ifdef CONFIG_IPV6_PRIVACY array[DEVCONF_USE_TEMPADDR] = cnf->use_tempaddr; array[DEVCONF_TEMP_VALID_LFT] = cnf->temp_valid_lft; @@ -3042,7 +3044,7 @@ static struct addrconf_sysctl_table { struct ctl_table_header *sysctl_header; - ctl_table addrconf_vars[17]; + ctl_table addrconf_vars[18]; ctl_table addrconf_dev[2]; ctl_table addrconf_conf_dir[2]; ctl_table addrconf_proto_dir[2]; @@ -3132,6 +3134,14 @@ .mode = 0644, .proc_handler = &proc_dointvec_jiffies, .strategy = &sysctl_jiffies, + }, + { + .ctl_name = NET_IPV6_FORCE_MLD_VERSION, + .procname = "force_mld_version", + .data = &ipv6_devconf.force_mld_version, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, }, #ifdef CONFIG_IPV6_PRIVACY { diff -Nru a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c --- a/net/ipv6/af_inet6.c Thu Feb 19 23:44:25 2004 +++ b/net/ipv6/af_inet6.c Thu Feb 19 23:44:25 2004 @@ -56,7 +56,7 @@ #include #include #include -#if CONFIG_IPV6_TUNNEL +#ifdef CONFIG_IPV6_TUNNEL #include #endif diff -Nru a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c --- a/net/ipv6/exthdrs.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv6/exthdrs.c Thu Feb 19 23:44:22 2004 @@ -120,7 +120,7 @@ for (curr=procs; curr->type >= 0; curr++) { if (curr->type == skb->nh.raw[off]) { /* type specific length/alignment - checks will be perfomed in the + checks will be performed in the func(). */ if (curr->func(skb, off) == 0) return 0; diff -Nru a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c --- a/net/ipv6/ip6_fib.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv6/ip6_fib.c Thu Feb 19 23:44:27 2004 @@ -85,7 +85,7 @@ /* * A routing update causes an increase of the serial number on the - * afected subtree. This allows for cached routes to be asynchronously + * affected subtree. This allows for cached routes to be asynchronously * tested when modifications are made to the destination cache as a * result of redirects, path MTU changes, etc. */ diff -Nru a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c --- a/net/ipv6/ip6_input.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv6/ip6_input.c Thu Feb 19 23:44:27 2004 @@ -168,11 +168,19 @@ smp_read_barrier_depends(); if (ipprot->flags & INET6_PROTO_FINAL) { + struct ipv6hdr *hdr; + if (!cksum_sub && skb->ip_summed == CHECKSUM_HW) { skb->csum = csum_sub(skb->csum, csum_partial(skb->nh.raw, skb->h.raw-skb->nh.raw, 0)); cksum_sub++; } + hdr = skb->nh.ipv6h; + if (ipv6_addr_is_multicast(&hdr->daddr) && + !ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, + &hdr->saddr) && + !ipv6_is_mld(skb, nexthdr)) + goto discard; } if (!(ipprot->flags & INET6_PROTO_NOPOLICY) && !xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) @@ -211,15 +219,14 @@ int ip6_mc_input(struct sk_buff *skb) { - struct ipv6hdr *hdr; - int deliver = 0; - int discard = 1; + struct ipv6hdr *hdr; + int deliver; IP6_INC_STATS_BH(Ip6InMcastPkts); hdr = skb->nh.ipv6h; - if (ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, &hdr->saddr)) - deliver = 1; + deliver = likely(!(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI))) || + ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL); /* * IPv6 multicast router mode isnt currently supported. @@ -238,23 +245,21 @@ if (deliver) { skb2 = skb_clone(skb, GFP_ATOMIC); + dst_output(skb2); } else { - discard = 0; - skb2 = skb; + dst_output(skb); + return 0; } - - dst_output(skb2); } } #endif - if (deliver) { - discard = 0; + if (likely(deliver)) { ip6_input(skb); + return 0; } - - if (discard) - kfree_skb(skb); + /* discard */ + kfree_skb(skb); return 0; } diff -Nru a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c --- a/net/ipv6/ip6_tunnel.c Thu Feb 19 23:44:23 2004 +++ b/net/ipv6/ip6_tunnel.c Thu Feb 19 23:44:23 2004 @@ -245,7 +245,7 @@ t->parms = *p; if ((err = register_netdevice(dev)) < 0) { - kfree(dev); + free_netdev(dev); return err; } dev_hold(dev); @@ -399,7 +399,7 @@ __u16 len; /* If the packet doesn't contain the original IPv6 header we are - in trouble since we might need the source address for furter + in trouble since we might need the source address for further processing of the error. */ read_lock(&ip6ip6_lock); @@ -1118,7 +1118,7 @@ ip6ip6_fb_tnl_dev->init = ip6ip6_fb_tnl_dev_init; if ((err = register_netdev(ip6ip6_fb_tnl_dev))) { - kfree(ip6ip6_fb_tnl_dev); + free_netdev(ip6ip6_fb_tnl_dev); goto fail; } return 0; diff -Nru a/net/ipv6/mcast.c b/net/ipv6/mcast.c --- a/net/ipv6/mcast.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv6/mcast.c Thu Feb 19 23:44:27 2004 @@ -152,8 +152,10 @@ #define IGMP6_UNSOLICITED_IVAL (10*HZ) #define MLD_QRV_DEFAULT 2 -#define MLD_V1_SEEN(idev) ((idev)->mc_v1_seen && \ - time_before(jiffies, (idev)->mc_v1_seen)) +#define MLD_V1_SEEN(idev) (ipv6_devconf.force_mld_version == 1 || \ + (idev)->cnf.force_mld_version == 1 || \ + ((idev)->mc_v1_seen && \ + time_before(jiffies, (idev)->mc_v1_seen))) #define MLDV2_MASK(value, nb) ((nb)>=32 ? (value) : ((1<<(nb))-1) & (value)) #define MLDV2_EXP(thresh, nbmant, nbexp, value) \ @@ -901,6 +903,33 @@ } /* + * identify MLD packets for MLD filter exceptions + */ +int ipv6_is_mld(struct sk_buff *skb, int nexthdr) +{ + struct icmp6hdr *pic; + + if (nexthdr != IPPROTO_ICMPV6) + return 0; + + if (!pskb_may_pull(skb, sizeof(struct icmp6hdr))) + return 0; + + pic = (struct icmp6hdr *)skb->h.raw; + + switch (pic->icmp6_type) { + case ICMPV6_MGM_QUERY: + case ICMPV6_MGM_REPORT: + case ICMPV6_MGM_REDUCTION: + case ICMPV6_MLD2_REPORT: + return 1; + default: + break; + } + return 0; +} + +/* * check if the interface/address pair is valid */ int ipv6_chk_mcast_addr(struct net_device *dev, struct in6_addr *group, @@ -918,7 +947,7 @@ break; } if (mc) { - if (!ipv6_addr_any(src_addr)) { + if (src_addr && !ipv6_addr_any(src_addr)) { struct ip6_sf_list *psf; spin_lock_bh(&mc->mca_lock); diff -Nru a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c --- a/net/ipv6/ndisc.c Thu Feb 19 23:44:26 2004 +++ b/net/ipv6/ndisc.c Thu Feb 19 23:44:26 2004 @@ -28,11 +28,12 @@ /* Set to 3 to get tracing... */ #define ND_DEBUG 1 -#define ND_PRINTK(x...) printk(KERN_DEBUG x) +#define ND_PRINTK(fmt, args...) do { if (net_ratelimit()) { printk(fmt, ## args); } } while(0) #define ND_NOPRINTK(x...) do { ; } while(0) #define ND_PRINTK0 ND_PRINTK #define ND_PRINTK1 ND_NOPRINTK #define ND_PRINTK2 ND_NOPRINTK +#define ND_PRINTK3 ND_NOPRINTK #if ND_DEBUG >= 1 #undef ND_PRINTK1 #define ND_PRINTK1 ND_PRINTK @@ -41,6 +42,10 @@ #undef ND_PRINTK2 #define ND_PRINTK2 ND_PRINTK #endif +#if ND_DEBUG >= 3 +#undef ND_PRINTK3 +#define ND_PRINTK3 ND_PRINTK +#endif #include #include @@ -210,8 +215,10 @@ case ND_OPT_MTU: case ND_OPT_REDIRECT_HDR: if (ndopts->nd_opt_array[nd_opt->nd_opt_type]) { - ND_PRINTK2("ndisc_parse_options(): duplicated ND6 option found: type=%d\n", - nd_opt->nd_opt_type); + ND_PRINTK2(KERN_WARNING + "%s(): duplicated ND6 option found: type=%d\n", + __FUNCTION__, + nd_opt->nd_opt_type); } else { ndopts->nd_opt_array[nd_opt->nd_opt_type] = nd_opt; } @@ -226,8 +233,9 @@ * Unknown options must be silently ignored, * to accommodate future extension to the protocol. */ - ND_PRINTK2(KERN_WARNING - "ndisc_parse_options(): ignored unsupported option; type=%d, len=%d\n", + ND_PRINTK2(KERN_NOTICE + "%s(): ignored unsupported option; type=%d, len=%d\n", + __FUNCTION__, nd_opt->nd_opt_type, nd_opt->nd_opt_len); } opt_len -= l; @@ -341,65 +349,10 @@ ipv6_dev_mc_dec(dev, &maddr); } - - -static int -ndisc_build_ll_hdr(struct sk_buff *skb, struct net_device *dev, - struct in6_addr *daddr, struct neighbour *neigh, int len) -{ - unsigned char ha[MAX_ADDR_LEN]; - unsigned char *h_dest = NULL; - - if (dev->hard_header) { - if (ipv6_addr_is_multicast(daddr)) { - ndisc_mc_map(daddr, ha, dev, 1); - h_dest = ha; - } else if (neigh) { - read_lock_bh(&neigh->lock); - if (neigh->nud_state&NUD_VALID) { - memcpy(ha, neigh->ha, dev->addr_len); - h_dest = ha; - } - read_unlock_bh(&neigh->lock); - } else { - neigh = neigh_lookup(&nd_tbl, daddr, dev); - if (neigh) { - read_lock_bh(&neigh->lock); - if (neigh->nud_state&NUD_VALID) { - memcpy(ha, neigh->ha, dev->addr_len); - h_dest = ha; - } - read_unlock_bh(&neigh->lock); - neigh_release(neigh); - } - } - - if (dev->hard_header(skb, dev, ETH_P_IPV6, h_dest, NULL, len) < 0) - return 0; - } - - return 1; -} - - /* * Send a Neighbour Advertisement */ -static int ndisc_output(struct sk_buff *skb) -{ - if (skb) { - struct neighbour *neigh = (skb->dst ? skb->dst->neighbour : NULL); - if (ndisc_build_ll_hdr(skb, skb->dev, &skb->nh.ipv6h->daddr, neigh, skb->len) == 0) { - kfree_skb(skb); - return -EINVAL; - } - dev_queue_xmit(skb); - return 0; - } - return -EINVAL; -} - static inline void ndisc_flow_init(struct flowi *fl, u8 type, struct in6_addr *saddr, struct in6_addr *daddr) { @@ -442,7 +395,7 @@ ndisc_flow_init(&fl, NDISC_NEIGHBOUR_ADVERTISEMENT, src_addr, daddr); - dst = ndisc_dst_alloc(dev, neigh, ndisc_output); + dst = ndisc_dst_alloc(dev, neigh, daddr, ip6_output2); if (!dst) return; @@ -463,7 +416,9 @@ 1, &err); if (skb == NULL) { - ND_PRINTK1("send_na: alloc skb failed\n"); + ND_PRINTK0(KERN_ERR + "ICMPv6 NA: %s() failed to allocate an skb.\n", + __FUNCTION__); dst_release(dst); return; } @@ -530,7 +485,7 @@ ndisc_flow_init(&fl, NDISC_NEIGHBOUR_SOLICITATION, saddr, daddr); - dst = ndisc_dst_alloc(dev, neigh, ndisc_output); + dst = ndisc_dst_alloc(dev, neigh, daddr, ip6_output2); if (!dst) return; @@ -548,7 +503,9 @@ skb = sock_alloc_send_skb(sk, MAX_HEADER + len + LL_RESERVED_SPACE(dev), 1, &err); if (skb == NULL) { - ND_PRINTK1("send_ns: alloc skb failed\n"); + ND_PRINTK0(KERN_ERR + "ICMPv6 NA: %s() failed to allocate an skb.\n", + __FUNCTION__); dst_release(dst); return; } @@ -603,7 +560,7 @@ ndisc_flow_init(&fl, NDISC_ROUTER_SOLICITATION, saddr, daddr); - dst = ndisc_dst_alloc(dev, NULL, ndisc_output); + dst = ndisc_dst_alloc(dev, NULL, daddr, ip6_output2); if (!dst) return; @@ -620,7 +577,9 @@ skb = sock_alloc_send_skb(sk, MAX_HEADER + len + LL_RESERVED_SPACE(dev), 1, &err); if (skb == NULL) { - ND_PRINTK1("send_ns: alloc skb failed\n"); + ND_PRINTK0(KERN_ERR + "ICMPv6 RS: %s() failed to allocate an skb.\n", + __FUNCTION__); dst_release(dst); return; } @@ -683,8 +642,13 @@ saddr = &skb->nh.ipv6h->saddr; if ((probes -= neigh->parms->ucast_probes) < 0) { - if (!(neigh->nud_state&NUD_VALID)) - ND_PRINTK1("trying to ucast probe in NUD_INVALID\n"); + if (!(neigh->nud_state & NUD_VALID)) { + ND_PRINTK1(KERN_DEBUG + "%s(): trying to ucast probe in NUD_INVALID: " + "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + __FUNCTION__, + NIP6(*target)); + } ndisc_send_ns(dev, neigh, target, target, saddr); } else if ((probes -= neigh->parms->app_probes) < 0) { #ifdef CONFIG_ARPD @@ -713,8 +677,8 @@ int inc; if (ipv6_addr_is_multicast(&msg->target)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP NS: target address is multicast\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NS: multicast target address"); return; } @@ -727,14 +691,14 @@ daddr->s6_addr32[1] == htonl(0x00000000) && daddr->s6_addr32[2] == htonl(0x00000001) && daddr->s6_addr [12] == 0xff )) { - if (net_ratelimit()) - printk(KERN_DEBUG "ICMP6 NS: bad DAD packet (wrong destination)\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NS: bad DAD packet (wrong destination)\n"); return; } if (!ndisc_parse_options(msg->opt, ndoptlen, &ndopts)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP NS: invalid ND option, ignored.\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NS: invalid ND options\n"); return; } @@ -742,19 +706,19 @@ lladdr = (u8*)(ndopts.nd_opts_src_lladdr + 1); lladdrlen = ndopts.nd_opts_src_lladdr->nd_opt_len << 3; if (lladdrlen != NDISC_OPT_SPACE(dev->addr_len)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP NS: bad lladdr length.\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NS: invalid link-layer address length\n"); return; } - /* XXX: RFC2461 7.1.1: + /* RFC2461 7.1.1: * If the IP source address is the unspecified address, * there MUST NOT be source link-layer address option * in the message. */ if (dad) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP6 NS: bad DAD packet (link-layer address option)\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NS: bad DAD packet (link-layer address option)\n"); return; } } @@ -868,34 +832,35 @@ struct neighbour *neigh; if (skb->len < sizeof(struct nd_msg)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP NA: packet too short\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NA: packet too short\n"); return; } if (ipv6_addr_is_multicast(&msg->target)) { - if (net_ratelimit()) - printk(KERN_WARNING "NDISC NA: target address is multicast\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NA: target address is multicast.\n"); return; } if (ipv6_addr_is_multicast(daddr) && msg->icmph.icmp6_solicited) { - ND_PRINTK0("NDISC: solicited NA is multicasted\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NA: solicited NA is multicasted.\n"); return; } if (!ndisc_parse_options(msg->opt, ndoptlen, &ndopts)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP NS: invalid ND option, ignored.\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NS: invalid ND option\n"); return; } if (ndopts.nd_opts_tgt_lladdr) { lladdr = (u8*)(ndopts.nd_opts_tgt_lladdr + 1); lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3; if (lladdrlen != NDISC_OPT_SPACE(dev->addr_len)) { - if (net_ratelimit()) - printk(KERN_WARNING "NDISC NA: invalid lladdr length.\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NA: invalid link-layer address length\n"); return; } } @@ -909,7 +874,8 @@ about it. It could be misconfiguration, or an smart proxy agent tries to help us :-) */ - ND_PRINTK0("%s: someone advertises our address!\n", + ND_PRINTK1(KERN_WARNING + "ICMPv6 NA: someone advertises our address on %s!\n", ifp->idev->dev->name); in6_ifa_put(ifp); return; @@ -954,13 +920,13 @@ optlen = (skb->tail - skb->h.raw) - sizeof(struct ra_msg); if (!(ipv6_addr_type(&skb->nh.ipv6h->saddr) & IPV6_ADDR_LINKLOCAL)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP RA: source address is not linklocal\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 RA: source address is not link-local.\n"); return; } if (optlen < 0) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP RA: packet too short\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 RA: packet too short\n"); return; } @@ -970,7 +936,9 @@ in6_dev = in6_dev_get(skb->dev); if (in6_dev == NULL) { - ND_PRINTK1("RA: can't find in6 device\n"); + ND_PRINTK0(KERN_ERR + "ICMPv6 RA: can't find inet6 device for %s.\n", + skb->dev->name); return; } if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) { @@ -980,9 +948,8 @@ if (!ndisc_parse_options(opt, optlen, &ndopts)) { in6_dev_put(in6_dev); - if (net_ratelimit()) - ND_PRINTK2(KERN_WARNING - "ICMP6 RA: invalid ND option, ignored.\n"); + ND_PRINTK2(KERN_WARNING + "ICMP6 RA: invalid ND options\n"); return; } @@ -1015,18 +982,23 @@ } if (rt == NULL && lifetime) { - ND_PRINTK2("ndisc_rdisc: adding default router\n"); + ND_PRINTK3(KERN_DEBUG + "ICMPv6 RA: adding default router.\n"); rt = rt6_add_dflt_router(&skb->nh.ipv6h->saddr, skb->dev); if (rt == NULL) { - ND_PRINTK1("route_add failed\n"); + ND_PRINTK0(KERN_ERR + "ICMPv6 RA: %s() failed to add default route.\n", + __FUNCTION__); in6_dev_put(in6_dev); return; } neigh = rt->rt6i_nexthop; if (neigh == NULL) { - ND_PRINTK1("nd: add default router: null neighbour\n"); + ND_PRINTK0(KERN_ERR + "ICMPv6 RA: %s() got default router without neighbour.\n", + __FUNCTION__); dst_release(&rt->u.dst); in6_dev_put(in6_dev); return; @@ -1052,7 +1024,7 @@ */ if (in6_dev->nd_parms) { - __u32 rtime = ntohl(ra_msg->retrans_timer); + unsigned long rtime = ntohl(ra_msg->retrans_timer); if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/HZ) { rtime = (rtime*HZ)/1000; @@ -1091,9 +1063,8 @@ lladdr = (u8*)((ndopts.nd_opts_src_lladdr)+1); lladdrlen = ndopts.nd_opts_src_lladdr->nd_opt_len << 3; if (lladdrlen != NDISC_OPT_SPACE(skb->dev->addr_len)) { - if (net_ratelimit()) - ND_PRINTK2(KERN_WARNING - "ICMP6 RA: Invalid lladdr length.\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 RA: invalid link-layer address length\n"); goto out; } } @@ -1116,10 +1087,9 @@ mtu = ntohl(mtu); if (mtu < IPV6_MIN_MTU || mtu > skb->dev->mtu) { - if (net_ratelimit()) { - ND_PRINTK0("NDISC: router announcement with mtu = %d\n", - mtu); - } + ND_PRINTK2(KERN_WARNING + "ICMPv6 RA: invalid mtu: %d\n", + mtu); } else if (in6_dev->cnf.mtu6 != mtu) { in6_dev->cnf.mtu6 = mtu; @@ -1131,9 +1101,8 @@ } if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh) { - if (net_ratelimit()) - ND_PRINTK0(KERN_WARNING - "ICMP6 RA: got invalid option with RA"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 RA: invalid RA options"); } out: if (rt) @@ -1155,8 +1124,8 @@ int lladdrlen; if (!(ipv6_addr_type(&skb->nh.ipv6h->saddr) & IPV6_ADDR_LINKLOCAL)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP redirect: source address is not linklocal\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: source address is not link-local.\n"); return; } @@ -1164,8 +1133,8 @@ optlen -= sizeof(struct icmp6hdr) + 2 * sizeof(struct in6_addr); if (optlen < 0) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP redirect: packet too small\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: packet too short\n"); return; } @@ -1174,16 +1143,16 @@ dest = target + 1; if (ipv6_addr_is_multicast(dest)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP redirect for multicast addr\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: destination address is multicast.\n"); return; } if (ipv6_addr_cmp(dest, target) == 0) { on_link = 1; } else if (!(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP redirect: target address is not linklocal\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: target address is not link-local.\n"); return; } @@ -1195,15 +1164,14 @@ return; } - /* XXX: RFC2461 8.1: + /* RFC2461 8.1: * The IP source address of the Redirect MUST be the same as the current * first-hop router for the specified ICMP Destination Address. */ if (!ndisc_parse_options((u8*)(dest + 1), optlen, &ndopts)) { - if (net_ratelimit()) - ND_PRINTK2(KERN_WARNING - "ICMP6 Redirect: invalid ND options, rejected.\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: invalid ND options\n"); in6_dev_put(in6_dev); return; } @@ -1211,9 +1179,8 @@ lladdr = (u8*)(ndopts.nd_opts_tgt_lladdr + 1); lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3; if (lladdrlen != NDISC_OPT_SPACE(skb->dev->addr_len)) { - if (net_ratelimit()) - ND_PRINTK2(KERN_WARNING - "ICMP6 Redirect: invalid lladdr length.\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: invalid link-layer address length\n"); in6_dev_put(in6_dev); return; } @@ -1258,7 +1225,9 @@ dev = skb->dev; if (ipv6_get_lladdr(dev, &saddr_buf)) { - ND_PRINTK1("redirect: no link_local addr for dev\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: no link-local address on %s\n", + dev->name); return; } @@ -1278,7 +1247,8 @@ rt = (struct rt6_info *) dst; if (rt->rt6i_flags & RTF_GATEWAY) { - ND_PRINTK1("ndisc_send_redirect: not a neighbour\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 Redirect: destination is not a neighbour.\n"); dst_release(dst); return; } @@ -1308,7 +1278,9 @@ buff = sock_alloc_send_skb(sk, MAX_HEADER + len + LL_RESERVED_SPACE(dev), 1, &err); if (buff == NULL) { - ND_PRINTK1("ndisc_send_redirect: alloc_skb failed\n"); + ND_PRINTK0(KERN_ERR + "ICMPv6 Redirect: %s() failed to allocate an skb.\n", + __FUNCTION__); dst_release(dst); return; } @@ -1388,16 +1360,16 @@ __skb_push(skb, skb->data-skb->h.raw); if (skb->nh.ipv6h->hop_limit != 255) { - if (net_ratelimit()) - printk(KERN_WARNING - "ICMP NDISC: fake message with non-255 Hop Limit received: %d\n", - skb->nh.ipv6h->hop_limit); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NDISC: invalid hop-limit: %d\n", + skb->nh.ipv6h->hop_limit); return 0; } if (msg->icmph.icmp6_code != 0) { - if (net_ratelimit()) - printk(KERN_WARNING "ICMP NDISC: code is not zero\n"); + ND_PRINTK2(KERN_WARNING + "ICMPv6 NDISC: invalid ICMPv6 code: %d\n", + msg->icmph.icmp6_code); return 0; } @@ -1465,9 +1437,9 @@ err = sock_create(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6, &ndisc_socket); if (err < 0) { - printk(KERN_ERR - "Failed to initialize the NDISC control socket (err %d).\n", - err); + ND_PRINTK0(KERN_ERR + "ICMPv6 NDISC: Failed to initialize the control socket (err %d).\n", + err); ndisc_socket = NULL; /* For safety. */ return err; } diff -Nru a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c --- a/net/ipv6/netfilter/ip6t_eui64.c Thu Feb 19 23:44:22 2004 +++ b/net/ipv6/netfilter/ip6t_eui64.c Thu Feb 19 23:44:22 2004 @@ -50,7 +50,7 @@ eui64[0] |= 0x02; i=0; - while ((skb->nh.ipv6h->saddr.in6_u.u6_addr8[8+i] == + while ((skb->nh.ipv6h->saddr.s6_addr[8+i] == eui64[i]) && (i<8)) i++; if ( i == 8 ) diff -Nru a/net/ipv6/raw.c b/net/ipv6/raw.c --- a/net/ipv6/raw.c Thu Feb 19 23:44:24 2004 +++ b/net/ipv6/raw.c Thu Feb 19 23:44:24 2004 @@ -222,7 +222,7 @@ } /* ipv4 addr of the socket is invalid. Only the - * unpecified and mapped address have a v4 equivalent. + * unspecified and mapped address have a v4 equivalent. */ v4addr = LOOPBACK4_IPV6; if (!(addr_type & IPV6_ADDR_MULTICAST)) { @@ -306,7 +306,7 @@ * This is next to useless... * if we demultiplex in network layer we don't need the extra call * just to queue the skb... - * maybe we could have the network decide uppon a hint if it + * maybe we could have the network decide upon a hint if it * should call raw_rcv for demultiplexing */ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) @@ -627,7 +627,7 @@ if (ipv6_addr_any(daddr)) { /* - * unspecfied destination address + * unspecified destination address * treated as error... is this correct ? */ fl6_sock_release(flowlabel); diff -Nru a/net/ipv6/route.c b/net/ipv6/route.c --- a/net/ipv6/route.c Thu Feb 19 23:44:27 2004 +++ b/net/ipv6/route.c Thu Feb 19 23:44:27 2004 @@ -223,7 +223,7 @@ match = sprt; mpri = m; if (m >= 12) { - /* we choose the lastest default router if it + /* we choose the last default router if it * is in (probably) reachable state. * If route changed, we should do pmtu * discovery. --yoshfuji @@ -563,6 +563,7 @@ struct dst_entry *ndisc_dst_alloc(struct net_device *dev, struct neighbour *neigh, + struct in6_addr *addr, int (*output)(struct sk_buff *)) { struct rt6_info *rt = ip6_dst_alloc(); @@ -574,11 +575,13 @@ dev_hold(dev); if (neigh) neigh_hold(neigh); + else + neigh = ndisc_get_neigh(dev, addr); rt->rt6i_dev = dev; rt->rt6i_nexthop = neigh; rt->rt6i_expires = 0; - rt->rt6i_flags = RTF_LOCAL | RTF_NDISC; + rt->rt6i_flags = RTF_LOCAL; rt->rt6i_metric = 0; atomic_set(&rt->u.dst.__refcnt, 1); rt->u.dst.metrics[RTAX_HOPLIMIT-1] = 255; @@ -832,7 +835,7 @@ } } - rt->rt6i_flags = rtmsg->rtmsg_flags & ~RTF_NDISC; + rt->rt6i_flags = rtmsg->rtmsg_flags; install_route: if (rta && rta[RTA_METRICS-1]) { @@ -1124,8 +1127,6 @@ static struct rt6_info * ip6_rt_copy(struct rt6_info *ort) { struct rt6_info *rt = ip6_dst_alloc(); - - BUG_ON(ort->rt6i_flags & RTF_NDISC); if (rt) { rt->u.dst.input = ort->u.dst.input; diff -Nru a/net/ipv6/sit.c b/net/ipv6/sit.c --- a/net/ipv6/sit.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv6/sit.c Thu Feb 19 23:44:28 2004 @@ -187,7 +187,7 @@ nt->parms = *parms; if (register_netdevice(dev) < 0) { - kfree(dev); + free_netdev(dev); goto failed; } @@ -840,6 +840,6 @@ return err; fail: inet_del_protocol(&sit_protocol, IPPROTO_IPV6); - kfree(ipip6_fb_tunnel_dev); + free_netdev(ipip6_fb_tunnel_dev); goto out; } diff -Nru a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c --- a/net/ipv6/xfrm6_input.c Thu Feb 19 23:44:28 2004 +++ b/net/ipv6/xfrm6_input.c Thu Feb 19 23:44:28 2004 @@ -9,17 +9,20 @@ * IPv6 support */ +#include #include #include #include #include -static inline void ipip6_ecn_decapsulate(struct ipv6hdr *iph, - struct sk_buff *skb) +static inline void ipip6_ecn_decapsulate(struct sk_buff *skb) { - if (INET_ECN_is_ce(ip6_get_dsfield(iph)) && - INET_ECN_is_not_ce(ip6_get_dsfield(skb->nh.ipv6h))) - IP6_ECN_set_ce(skb->nh.ipv6h); + struct ipv6hdr *outer_iph = skb->nh.ipv6h; + struct ipv6hdr *inner_iph = skb->h.ipv6h; + + if (INET_ECN_is_ce(ip6_get_dsfield(outer_iph)) && + INET_ECN_is_not_ce(ip6_get_dsfield(inner_iph))) + IP6_ECN_set_ce(inner_iph); } int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp) @@ -77,10 +80,16 @@ if (x->props.mode) { /* XXX */ if (nexthdr != IPPROTO_IPV6) goto drop; - skb->nh.raw = skb->data; + if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) + goto drop; + if (skb_cloned(skb) && + pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) + goto drop; if (!(x->props.flags & XFRM_STATE_NOECN)) - ipip6_ecn_decapsulate(iph, skb); - iph = skb->nh.ipv6h; + ipip6_ecn_decapsulate(skb); + skb->mac.raw = memmove(skb->data - skb->mac_len, + skb->mac.raw, skb->mac_len); + skb->nh.raw = skb->data; decaps = 1; break; } diff -Nru a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c --- a/net/ipv6/xfrm6_policy.c Thu Feb 19 23:44:23 2004 +++ b/net/ipv6/xfrm6_policy.c Thu Feb 19 23:44:23 2004 @@ -55,13 +55,6 @@ __xfrm6_find_bundle(struct flowi *fl, struct rtable *rt, struct xfrm_policy *policy) { struct dst_entry *dst; - u32 ndisc_bit = 0; - - if (fl->proto == IPPROTO_ICMPV6 && - (fl->fl_icmp_type == NDISC_NEIGHBOUR_ADVERTISEMENT || - fl->fl_icmp_type == NDISC_NEIGHBOUR_SOLICITATION || - fl->fl_icmp_type == NDISC_ROUTER_SOLICITATION)) - ndisc_bit = RTF_NDISC; /* Still not clear if we should set fl->fl6_{src,dst}... */ read_lock_bh(&policy->lock); @@ -69,9 +62,6 @@ struct xfrm_dst *xdst = (struct xfrm_dst*)dst; struct in6_addr fl_dst_prefix, fl_src_prefix; - if ((xdst->u.rt6.rt6i_flags & RTF_NDISC) != ndisc_bit) - continue; - ipv6_addr_prefix(&fl_dst_prefix, &fl->fl6_dst, xdst->u.rt6.rt6i_dst.plen); @@ -169,7 +159,7 @@ dst_prev->output = dst_prev->xfrm->type->output; /* Sheit... I remember I did this right. Apparently, * it was magically lost, so this code needs audit */ - x->u.rt6.rt6i_flags = rt0->rt6i_flags&(RTCF_BROADCAST|RTCF_MULTICAST|RTCF_LOCAL|RTF_NDISC); + x->u.rt6.rt6i_flags = rt0->rt6i_flags&(RTCF_BROADCAST|RTCF_MULTICAST|RTCF_LOCAL); x->u.rt6.rt6i_metric = rt0->rt6i_metric; x->u.rt6.rt6i_node = rt0->rt6i_node; x->u.rt6.rt6i_gateway = rt0->rt6i_gateway; diff -Nru a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c --- a/net/irda/irlan/irlan_common.c Thu Feb 19 23:44:25 2004 +++ b/net/irda/irlan/irlan_common.c Thu Feb 19 23:44:25 2004 @@ -224,7 +224,7 @@ IRDA_DEBUG(2, "%s(), register_netdev() failed!\n", __FUNCTION__ ); self = NULL; - kfree(dev); + free_netdev(dev); } else { rtnl_lock(); list_add_rcu(&self->dev_list, &irlans); diff -Nru a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c --- a/net/irda/irlan/irlan_eth.c Thu Feb 19 23:44:24 2004 +++ b/net/irda/irlan/irlan_eth.c Thu Feb 19 23:44:24 2004 @@ -60,7 +60,7 @@ dev->hard_start_xmit = irlan_eth_xmit; dev->get_stats = irlan_eth_get_stats; dev->set_multicast_list = irlan_eth_set_multicast_list; - dev->destructor = (void (*)(struct net_device *)) kfree; + dev->destructor = free_netdev; SET_MODULE_OWNER(dev); diff -Nru a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c --- a/net/lapb/lapb_iface.c Thu Feb 19 23:44:24 2004 +++ b/net/lapb/lapb_iface.c Thu Feb 19 23:44:24 2004 @@ -81,18 +81,14 @@ lapb_hold(lapb); } -/* - * Convert the integer token used by the device driver into a pointer - * to a LAPB control structure. - */ -static struct lapb_cb *__lapb_tokentostruct(void *token) +static struct lapb_cb *__lapb_devtostruct(struct net_device *dev) { struct list_head *entry; struct lapb_cb *lapb, *use = NULL; list_for_each(entry, &lapb_list) { lapb = list_entry(entry, struct lapb_cb, node); - if (lapb->token == token) { + if (lapb->dev == dev) { use = lapb; break; } @@ -104,12 +100,12 @@ return use; } -static struct lapb_cb *lapb_tokentostruct(void *token) +static struct lapb_cb *lapb_devtostruct(struct net_device *dev) { struct lapb_cb *rc; read_lock_bh(&lapb_list_lock); - rc = __lapb_tokentostruct(token); + rc = __lapb_devtostruct(dev); read_unlock_bh(&lapb_list_lock); return rc; @@ -144,14 +140,14 @@ return lapb; } -int lapb_register(void *token, struct lapb_register_struct *callbacks) +int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks) { struct lapb_cb *lapb; int rc = LAPB_BADTOKEN; write_lock_bh(&lapb_list_lock); - lapb = __lapb_tokentostruct(token); + lapb = __lapb_devtostruct(dev); if (lapb) { lapb_put(lapb); goto out; @@ -162,7 +158,7 @@ if (!lapb) goto out; - lapb->token = token; + lapb->dev = dev; lapb->callbacks = *callbacks; __lapb_insert_cb(lapb); @@ -175,13 +171,13 @@ return rc; } -int lapb_unregister(void *token) +int lapb_unregister(struct net_device *dev) { struct lapb_cb *lapb; int rc = LAPB_BADTOKEN; write_unlock_bh(&lapb_list_lock); - lapb = __lapb_tokentostruct(token); + lapb = __lapb_devtostruct(dev); if (!lapb) goto out; @@ -199,10 +195,10 @@ return rc; } -int lapb_getparms(void *token, struct lapb_parms_struct *parms) +int lapb_getparms(struct net_device *dev, struct lapb_parms_struct *parms) { int rc = LAPB_BADTOKEN; - struct lapb_cb *lapb = lapb_tokentostruct(token); + struct lapb_cb *lapb = lapb_devtostruct(dev); if (!lapb) goto out; @@ -231,10 +227,10 @@ return rc; } -int lapb_setparms(void *token, struct lapb_parms_struct *parms) +int lapb_setparms(struct net_device *dev, struct lapb_parms_struct *parms) { int rc = LAPB_BADTOKEN; - struct lapb_cb *lapb = lapb_tokentostruct(token); + struct lapb_cb *lapb = lapb_devtostruct(dev); if (!lapb) goto out; @@ -264,9 +260,9 @@ return rc; } -int lapb_connect_request(void *token) +int lapb_connect_request(struct net_device *dev) { - struct lapb_cb *lapb = lapb_tokentostruct(token); + struct lapb_cb *lapb = lapb_devtostruct(dev); int rc = LAPB_BADTOKEN; if (!lapb) @@ -283,7 +279,7 @@ lapb_establish_data_link(lapb); #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S0 -> S1\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S0 -> S1\n", lapb->dev); #endif lapb->state = LAPB_STATE_1; @@ -294,9 +290,9 @@ return rc; } -int lapb_disconnect_request(void *token) +int lapb_disconnect_request(struct net_device *dev) { - struct lapb_cb *lapb = lapb_tokentostruct(token); + struct lapb_cb *lapb = lapb_devtostruct(dev); int rc = LAPB_BADTOKEN; if (!lapb) @@ -309,10 +305,10 @@ case LAPB_STATE_1: #if LAPB_DEBUG > 1 - printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev); #endif #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev); #endif lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); lapb->state = LAPB_STATE_0; @@ -333,10 +329,10 @@ lapb->state = LAPB_STATE_2; #if LAPB_DEBUG > 1 - printk(KERN_DEBUG "lapb: (%p) S3 DISC(1)\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S3 DISC(1)\n", lapb->dev); #endif #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S3 -> S2\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S3 -> S2\n", lapb->dev); #endif rc = LAPB_OK; @@ -346,9 +342,9 @@ return rc; } -int lapb_data_request(void *token, struct sk_buff *skb) +int lapb_data_request(struct net_device *dev, struct sk_buff *skb) { - struct lapb_cb *lapb = lapb_tokentostruct(token); + struct lapb_cb *lapb = lapb_devtostruct(dev); int rc = LAPB_BADTOKEN; if (!lapb) @@ -367,9 +363,9 @@ return rc; } -int lapb_data_received(void *token, struct sk_buff *skb) +int lapb_data_received(struct net_device *dev, struct sk_buff *skb) { - struct lapb_cb *lapb = lapb_tokentostruct(token); + struct lapb_cb *lapb = lapb_devtostruct(dev); int rc = LAPB_BADTOKEN; if (lapb) { @@ -384,31 +380,31 @@ void lapb_connect_confirmation(struct lapb_cb *lapb, int reason) { if (lapb->callbacks.connect_confirmation) - lapb->callbacks.connect_confirmation(lapb->token, reason); + lapb->callbacks.connect_confirmation(lapb->dev, reason); } void lapb_connect_indication(struct lapb_cb *lapb, int reason) { if (lapb->callbacks.connect_indication) - lapb->callbacks.connect_indication(lapb->token, reason); + lapb->callbacks.connect_indication(lapb->dev, reason); } void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason) { if (lapb->callbacks.disconnect_confirmation) - lapb->callbacks.disconnect_confirmation(lapb->token, reason); + lapb->callbacks.disconnect_confirmation(lapb->dev, reason); } void lapb_disconnect_indication(struct lapb_cb *lapb, int reason) { if (lapb->callbacks.disconnect_indication) - lapb->callbacks.disconnect_indication(lapb->token, reason); + lapb->callbacks.disconnect_indication(lapb->dev, reason); } int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb) { if (lapb->callbacks.data_indication) - return lapb->callbacks.data_indication(lapb->token, skb); + return lapb->callbacks.data_indication(lapb->dev, skb); kfree_skb(skb); return NET_RX_CN_HIGH; /* For now; must be != NET_RX_DROP */ @@ -419,7 +415,7 @@ int used = 0; if (lapb->callbacks.data_transmit) { - lapb->callbacks.data_transmit(lapb->token, skb); + lapb->callbacks.data_transmit(lapb->dev, skb); used = 1; } diff -Nru a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c --- a/net/lapb/lapb_in.c Thu Feb 19 23:44:26 2004 +++ b/net/lapb/lapb_in.c Thu Feb 19 23:44:26 2004 @@ -47,23 +47,23 @@ case LAPB_SABM: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S0 RX SABM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", - lapb->token); + lapb->dev); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -82,16 +82,16 @@ case LAPB_SABME: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S0 RX SABME(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", - lapb->token); + lapb->dev); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -107,7 +107,7 @@ } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); @@ -117,9 +117,9 @@ case LAPB_DISC: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S0 RX DISC(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -143,19 +143,19 @@ case LAPB_SABM: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 RX SABM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -165,19 +165,19 @@ case LAPB_SABME: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 RX SABME(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); @@ -187,9 +187,9 @@ case LAPB_DISC: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 RX DISC(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); @@ -198,12 +198,12 @@ case LAPB_UA: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 RX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (frame->pf) { #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S1 -> S3\n", - lapb->token); + lapb->dev); #endif lapb_stop_t1timer(lapb); lapb_stop_t2timer(lapb); @@ -220,12 +220,12 @@ case LAPB_DM: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S1 RX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (frame->pf) { #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", - lapb->token); + lapb->dev); #endif lapb_clear_queues(lapb); lapb->state = LAPB_STATE_0; @@ -251,9 +251,9 @@ case LAPB_SABME: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S2 RX {SABM,SABME}(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); printk(KERN_DEBUG "lapb: (%p) S2 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); @@ -262,9 +262,9 @@ case LAPB_DISC: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -273,12 +273,12 @@ case LAPB_UA: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S2 RX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (frame->pf) { #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", - lapb->token); + lapb->dev); #endif lapb->state = LAPB_STATE_0; lapb_start_t1timer(lapb); @@ -290,12 +290,12 @@ case LAPB_DM: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (frame->pf) { #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", - lapb->token); + lapb->dev); #endif lapb->state = LAPB_STATE_0; lapb_start_t1timer(lapb); @@ -311,9 +311,9 @@ case LAPB_RR: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S2 RX {I,REJ,RNR,RR}" - "(%d)\n", lapb->token, frame->pf); + "(%d)\n", lapb->dev, frame->pf); printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (frame->pf) lapb_send_control(lapb, LAPB_DM, frame->pf, @@ -339,19 +339,19 @@ case LAPB_SABM: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX SABM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -369,12 +369,12 @@ case LAPB_SABME: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX SABME(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -389,7 +389,7 @@ } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); @@ -399,11 +399,11 @@ case LAPB_DISC: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX DISC(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", - lapb->token); + lapb->dev); #endif lapb_clear_queues(lapb); lapb_send_control(lapb, LAPB_UA, frame->pf, @@ -417,11 +417,11 @@ case LAPB_DM: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", - lapb->token); + lapb->dev); #endif lapb_clear_queues(lapb); lapb->state = LAPB_STATE_0; @@ -433,7 +433,7 @@ case LAPB_RNR: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX RNR(%d) R%d\n", - lapb->token, frame->pf, frame->nr); + lapb->dev, frame->pf, frame->nr); #endif lapb->condition |= LAPB_PEER_RX_BUSY_CONDITION; lapb_check_need_response(lapb, frame->cr, frame->pf); @@ -445,7 +445,7 @@ lapb_transmit_frmr(lapb); #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", - lapb->token); + lapb->dev); #endif lapb_start_t1timer(lapb); lapb_stop_t2timer(lapb); @@ -457,7 +457,7 @@ case LAPB_RR: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n", - lapb->token, frame->pf, frame->nr); + lapb->dev, frame->pf, frame->nr); #endif lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; lapb_check_need_response(lapb, frame->cr, frame->pf); @@ -469,7 +469,7 @@ lapb_transmit_frmr(lapb); #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", - lapb->token); + lapb->dev); #endif lapb_start_t1timer(lapb); lapb_stop_t2timer(lapb); @@ -481,7 +481,7 @@ case LAPB_REJ: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n", - lapb->token, frame->pf, frame->nr); + lapb->dev, frame->pf, frame->nr); #endif lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; lapb_check_need_response(lapb, frame->cr, frame->pf); @@ -496,7 +496,7 @@ lapb_transmit_frmr(lapb); #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", - lapb->token); + lapb->dev); #endif lapb_start_t1timer(lapb); lapb_stop_t2timer(lapb); @@ -508,7 +508,7 @@ case LAPB_I: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n", - lapb->token, frame->pf, frame->ns, frame->nr); + lapb->dev, frame->pf, frame->ns, frame->nr); #endif if (!lapb_validate_nr(lapb, frame->nr)) { lapb->frmr_data = *frame; @@ -516,7 +516,7 @@ lapb_transmit_frmr(lapb); #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", - lapb->token); + lapb->dev); #endif lapb_start_t1timer(lapb); lapb_stop_t2timer(lapb); @@ -564,7 +564,7 @@ #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 TX REJ(%d) R%d\n", - lapb->token, frame->pf, lapb->vr); + lapb->dev, frame->pf, lapb->vr); #endif lapb->condition |= LAPB_REJECT_CONDITION; lapb_send_control(lapb, LAPB_REJ, @@ -578,14 +578,14 @@ case LAPB_FRMR: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX FRMR(%d) %02X " - "%02X %02X %02X %02X\n", lapb->token, frame->pf, + "%02X %02X %02X %02X\n", lapb->dev, frame->pf, skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4]); #endif lapb_establish_data_link(lapb); #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", - lapb->token); + lapb->dev); #endif lapb_requeue_frames(lapb); lapb->state = LAPB_STATE_1; @@ -594,13 +594,13 @@ case LAPB_ILLEGAL: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S3 RX ILLEGAL(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb->frmr_data = *frame; lapb->frmr_type = LAPB_FRMR_W; lapb_transmit_frmr(lapb); #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev); #endif lapb_start_t1timer(lapb); lapb_stop_t2timer(lapb); @@ -624,23 +624,23 @@ case LAPB_SABM: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S4 RX SABM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", - lapb->token); + lapb->dev); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -659,16 +659,16 @@ case LAPB_SABME: #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S4 RX SABME(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif #if LAPB_DEBUG > 0 printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", - lapb->token); + lapb->dev); #endif lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); @@ -684,7 +684,7 @@ } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", - lapb->token, frame->pf); + lapb->dev, frame->pf); #endif lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); diff -Nru a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c --- a/net/lapb/lapb_out.c Thu Feb 19 23:44:26 2004 +++ b/net/lapb/lapb_out.c Thu Feb 19 23:44:26 2004 @@ -63,7 +63,7 @@ #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S%d TX I(%d) S%d R%d\n", - lapb->token, lapb->state, poll_bit, lapb->vs, lapb->vr); + lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr); #endif lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); @@ -151,7 +151,7 @@ #if LAPB_DEBUG > 2 printk(KERN_DEBUG "lapb: (%p) S%d TX %02X %02X %02X\n", - lapb->token, lapb->state, + lapb->dev, lapb->state, skb->data[0], skb->data[1], skb->data[2]); #endif @@ -167,13 +167,13 @@ if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S%d TX SABME(1)\n", - lapb->token, lapb->state); + lapb->dev, lapb->state); #endif lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND); } else { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S%d TX SABM(1)\n", - lapb->token, lapb->state); + lapb->dev, lapb->state); #endif lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND); } @@ -186,7 +186,7 @@ { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S%d TX RR(1) R%d\n", - lapb->token, lapb->state, lapb->vr); + lapb->dev, lapb->state, lapb->vr); #endif lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE); @@ -198,7 +198,7 @@ { #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S%d TX RR(0) R%d\n", - lapb->token, lapb->state, lapb->vr); + lapb->dev, lapb->state, lapb->vr); #endif lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE); diff -Nru a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c --- a/net/lapb/lapb_subr.c Thu Feb 19 23:44:24 2004 +++ b/net/lapb/lapb_subr.c Thu Feb 19 23:44:24 2004 @@ -114,7 +114,7 @@ #if LAPB_DEBUG > 2 printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n", - lapb->token, lapb->state, + lapb->dev, lapb->state, skb->data[0], skb->data[1], skb->data[2]); #endif @@ -287,7 +287,7 @@ #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", - lapb->token, lapb->state, + lapb->dev, lapb->state, skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5]); #endif @@ -304,7 +304,7 @@ #if LAPB_DEBUG > 1 printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n", - lapb->token, lapb->state, skb->data[1], + lapb->dev, lapb->state, skb->data[1], skb->data[2], skb->data[3]); #endif } diff -Nru a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c --- a/net/lapb/lapb_timer.c Thu Feb 19 23:44:23 2004 +++ b/net/lapb/lapb_timer.c Thu Feb 19 23:44:23 2004 @@ -107,19 +107,19 @@ lapb->state = LAPB_STATE_0; lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev); #endif return; } else { lapb->n2count++; if (lapb->mode & LAPB_EXTENDED) { #if LAPB_DEBUG > 1 - printk(KERN_DEBUG "lapb: (%p) S1 TX SABME(1)\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S1 TX SABME(1)\n", lapb->dev); #endif lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND); } else { #if LAPB_DEBUG > 1 - printk(KERN_DEBUG "lapb: (%p) S1 TX SABM(1)\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S1 TX SABM(1)\n", lapb->dev); #endif lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND); } @@ -135,13 +135,13 @@ lapb->state = LAPB_STATE_0; lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT); #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev); #endif return; } else { lapb->n2count++; #if LAPB_DEBUG > 1 - printk(KERN_DEBUG "lapb: (%p) S2 TX DISC(1)\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S2 TX DISC(1)\n", lapb->dev); #endif lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); } @@ -157,7 +157,7 @@ lapb_stop_t2timer(lapb); lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev); #endif return; } else { @@ -175,7 +175,7 @@ lapb->state = LAPB_STATE_0; lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); #if LAPB_DEBUG > 0 - printk(KERN_DEBUG "lapb: (%p) S4 -> S0\n", lapb->token); + printk(KERN_DEBUG "lapb: (%p) S4 -> S0\n", lapb->dev); #endif return; } else { diff -Nru a/net/sched/sch_fifo.c b/net/sched/sch_fifo.c --- a/net/sched/sch_fifo.c Thu Feb 19 23:44:23 2004 +++ b/net/sched/sch_fifo.c Thu Feb 19 23:44:23 2004 @@ -141,10 +141,12 @@ struct fifo_sched_data *q = (void*)sch->data; if (opt == NULL) { + unsigned int limit = sch->dev->tx_queue_len ? : 1; + if (sch->ops == &bfifo_qdisc_ops) - q->limit = sch->dev->tx_queue_len*sch->dev->mtu; + q->limit = limit*sch->dev->mtu; else - q->limit = sch->dev->tx_queue_len; + q->limit = limit; } else { struct tc_fifo_qopt *ctl = RTA_DATA(opt); if (opt->rta_len < RTA_LENGTH(sizeof(*ctl))) diff -Nru a/net/sched/sch_gred.c b/net/sched/sch_gred.c --- a/net/sched/sch_gred.c Thu Feb 19 23:44:27 2004 +++ b/net/sched/sch_gred.c Thu Feb 19 23:44:27 2004 @@ -110,7 +110,7 @@ unsigned long qave=0; int i=0; - if (!t->initd && skb_queue_len(&sch->q) < sch->dev->tx_queue_len) { + if (!t->initd && skb_queue_len(&sch->q) < (sch->dev->tx_queue_len ? : 1)) { D2PRINTK("NO GRED Queues setup yet! Enqueued anyway\n"); goto do_enqueue; } diff -Nru a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c --- a/net/sched/sch_sfq.c Thu Feb 19 23:44:28 2004 +++ b/net/sched/sch_sfq.c Thu Feb 19 23:44:28 2004 @@ -341,6 +341,7 @@ /* Is the slot empty? */ if (q->qs[a].qlen == 0) { + q->ht[q->hash[a]] = SFQ_DEPTH; a = q->next[a]; if (a == old_a) { q->tail = SFQ_DEPTH; diff -Nru a/net/sctp/Kconfig b/net/sctp/Kconfig --- a/net/sctp/Kconfig Thu Feb 19 23:44:23 2004 +++ b/net/sctp/Kconfig Thu Feb 19 23:44:23 2004 @@ -74,13 +74,19 @@ establishment. It is advised to use either HMAC-MD5 or HMAC-SHA1. config SCTP_HMAC_SHA1 - bool "HMAC-SHA1" if CRYPTO_HMAC=y && CRYPTO_SHA1=y || CRYPTO_SHA1=m + bool "HMAC-SHA1" + select CRYPTO + select CRYPTO_HMAC + select CRYPTO_SHA1 help Enable the use of HMAC-SHA1 during association establishment. It is advised to use either HMAC-MD5 or HMAC-SHA1. config SCTP_HMAC_MD5 - bool "HMAC-MD5" if CRYPTO_HMAC=y && CRYPTO_MD5=y || CRYPTO_MD5=m + bool "HMAC-MD5" + select CRYPTO + select CRYPTO_HMAC + select CRYPTO_MD5 help Enable the use of HMAC-MD5 during association establishment. It is advised to use either HMAC-MD5 or HMAC-SHA1. diff -Nru a/net/sctp/ssnmap.c b/net/sctp/ssnmap.c --- a/net/sctp/ssnmap.c Thu Feb 19 23:44:27 2004 +++ b/net/sctp/ssnmap.c Thu Feb 19 23:44:27 2004 @@ -40,6 +40,7 @@ #include #include +#define MAX_KMALLOC_SIZE 131072 /* Storage size needed for map includes 2 headers and then the * specific needs of in or out streams. @@ -56,11 +57,14 @@ struct sctp_ssnmap *sctp_ssnmap_new(__u16 in, __u16 out, int gfp) { struct sctp_ssnmap *retval; - int order; - - order = get_order(sctp_ssnmap_size(in,out)); - retval = (struct sctp_ssnmap *)__get_free_pages(gfp, order); + int size; + size = sctp_ssnmap_size(in, out); + if (size <= MAX_KMALLOC_SIZE) + retval = kmalloc(size, gfp); + else + retval = (struct sctp_ssnmap *) + __get_free_pages(gfp, get_order(size)); if (!retval) goto fail; @@ -73,7 +77,10 @@ return retval; fail_map: - free_pages((unsigned long)retval, order); + if (size <= MAX_KMALLOC_SIZE) + kfree(retval); + else + free_pages((unsigned long)retval, get_order(size)); fail: return NULL; } @@ -109,9 +116,13 @@ void sctp_ssnmap_free(struct sctp_ssnmap *map) { if (map && map->malloced) { - free_pages((unsigned long)map, - get_order(sctp_ssnmap_size(map->in.len, - map->out.len))); + int size; + + size = sctp_ssnmap_size(map->in.len, map->out.len); + if (size <= MAX_KMALLOC_SIZE) + kfree(map); + else + free_pages((unsigned long)map, get_order(size)); SCTP_DBG_OBJCNT_DEC(ssnmap); } } diff -Nru a/net/sunrpc/auth.c b/net/sunrpc/auth.c --- a/net/sunrpc/auth.c Thu Feb 19 23:44:25 2004 +++ b/net/sunrpc/auth.c Thu Feb 19 23:44:25 2004 @@ -255,34 +255,41 @@ struct rpc_cred * rpcauth_lookupcred(struct rpc_auth *auth, int taskflags) { - struct auth_cred acred = { - .uid = current->fsuid, - .gid = current->fsgid, - .ngroups = current->ngroups, - .groups = current->groups, - }; + struct auth_cred acred; + struct rpc_cred *ret; + + get_group_info(current->group_info); + acred.uid = current->fsuid; + acred.gid = current->fsgid; + acred.group_info = current->group_info; + dprintk("RPC: looking up %s cred\n", auth->au_ops->au_name); - return rpcauth_lookup_credcache(auth, &acred, taskflags); + ret = rpcauth_lookup_credcache(auth, &acred, taskflags); + put_group_info(current->group_info); + return ret; } struct rpc_cred * rpcauth_bindcred(struct rpc_task *task) { struct rpc_auth *auth = task->tk_auth; - struct auth_cred acred = { - .uid = current->fsuid, - .gid = current->fsgid, - .ngroups = current->ngroups, - .groups = current->groups, - }; + struct auth_cred acred; + struct rpc_cred *ret; + + get_group_info(current->group_info); + acred.uid = current->fsuid; + acred.gid = current->fsgid; + acred.group_info = current->group_info; dprintk("RPC: %4d looking up %s cred\n", task->tk_pid, task->tk_auth->au_ops->au_name); task->tk_msg.rpc_cred = rpcauth_lookup_credcache(auth, &acred, task->tk_flags); if (task->tk_msg.rpc_cred == 0) task->tk_status = -ENOMEM; - return task->tk_msg.rpc_cred; + ret = task->tk_msg.rpc_cred; + put_group_info(current->group_info); + return ret; } void diff -Nru a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c --- a/net/sunrpc/auth_unix.c Thu Feb 19 23:44:26 2004 +++ b/net/sunrpc/auth_unix.c Thu Feb 19 23:44:26 2004 @@ -82,7 +82,7 @@ cred->uc_gid = cred->uc_pgid = 0; cred->uc_gids[0] = NOGROUP; } else { - int groups = acred->ngroups; + int groups = acred->group_info->ngroups; if (groups > NFS_NGROUPS) groups = NFS_NGROUPS; @@ -91,7 +91,7 @@ cred->uc_puid = current->uid; cred->uc_pgid = current->gid; for (i = 0; i < groups; i++) - cred->uc_gids[i] = (gid_t) acred->groups[i]; + cred->uc_gids[i] = GROUP_AT(acred->group_info, i); if (i < NFS_NGROUPS) cred->uc_gids[i] = NOGROUP; } @@ -126,11 +126,11 @@ || cred->uc_pgid != current->gid) return 0; - groups = acred->ngroups; + groups = acred->group_info->ngroups; if (groups > NFS_NGROUPS) groups = NFS_NGROUPS; for (i = 0; i < groups ; i++) - if (cred->uc_gids[i] != (gid_t) acred->groups[i]) + if (cred->uc_gids[i] != GROUP_AT(acred->group_info, i)) return 0; return 1; } diff -Nru a/net/sunrpc/cache.c b/net/sunrpc/cache.c --- a/net/sunrpc/cache.c Thu Feb 19 23:44:25 2004 +++ b/net/sunrpc/cache.c Thu Feb 19 23:44:25 2004 @@ -325,6 +325,7 @@ if (current_detail && current_index < current_detail->hash_size) { struct cache_head *ch, **cp; + struct cache_detail *d; write_lock(¤t_detail->hash_lock); @@ -354,12 +355,14 @@ rv = 1; } write_unlock(¤t_detail->hash_lock); - if (ch) - current_detail->cache_put(ch, current_detail); - else + d = current_detail; + if (!ch) current_index ++; - } - spin_unlock(&cache_list_lock); + spin_unlock(&cache_list_lock); + if (ch) + d->cache_put(ch, d); + } else + spin_unlock(&cache_list_lock); return rv; } diff -Nru a/net/sunrpc/stats.c b/net/sunrpc/stats.c --- a/net/sunrpc/stats.c Thu Feb 19 23:44:28 2004 +++ b/net/sunrpc/stats.c Thu Feb 19 23:44:28 2004 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -28,70 +29,66 @@ /* * Get RPC client stats */ -int -rpc_proc_read(char *buffer, char **start, off_t offset, int count, - int *eof, void *data) -{ - struct rpc_stat *statp = (struct rpc_stat *) data; - struct rpc_program *prog = statp->program; - struct rpc_version *vers; - int len, i, j; +static int rpc_proc_show(struct seq_file *seq, void *v) { + const struct rpc_stat *statp = seq->private; + const struct rpc_program *prog = statp->program; + int i, j; - len = sprintf(buffer, + seq_printf(seq, "net %d %d %d %d\n", statp->netcnt, statp->netudpcnt, statp->nettcpcnt, statp->nettcpconn); - len += sprintf(buffer + len, + seq_printf(seq, "rpc %d %d %d\n", statp->rpccnt, statp->rpcretrans, statp->rpcauthrefresh); for (i = 0; i < prog->nrvers; i++) { - if (!(vers = prog->version[i])) + const struct rpc_version *vers = prog->version[i]; + if (!vers) continue; - len += sprintf(buffer + len, "proc%d %d", + seq_printf(seq, "proc%d %d", vers->number, vers->nrprocs); for (j = 0; j < vers->nrprocs; j++) - len += sprintf(buffer + len, " %d", + seq_printf(seq, " %d", vers->procs[j].p_count); - buffer[len++] = '\n'; + seq_putc(seq, '\n'); } + return 0; +} - if (offset >= len) { - *start = buffer; - *eof = 1; - return 0; - } - *start = buffer + offset; - if ((len -= offset) > count) - return count; - *eof = 1; - return len; +static int rpc_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, rpc_proc_show, PDE(inode)->data); } +static struct file_operations rpc_proc_fops = { + .owner = THIS_MODULE, + .open = rpc_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + /* * Get RPC server stats */ -int -svc_proc_read(char *buffer, char **start, off_t offset, int count, - int *eof, void *data) -{ - struct svc_stat *statp = (struct svc_stat *) data; - struct svc_program *prog = statp->program; - struct svc_procedure *proc; - struct svc_version *vers; - int len, i, j; +void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) { + const struct svc_program *prog = statp->program; + const struct svc_procedure *proc; + const struct svc_version *vers; + int i, j; - len = sprintf(buffer, + seq_printf(seq, "net %d %d %d %d\n", statp->netcnt, statp->netudpcnt, statp->nettcpcnt, statp->nettcpconn); - len += sprintf(buffer + len, + seq_printf(seq, "rpc %d %d %d %d %d\n", statp->rpccnt, statp->rpcbadfmt+statp->rpcbadauth+statp->rpcbadclnt, @@ -102,41 +99,36 @@ for (i = 0; i < prog->pg_nvers; i++) { if (!(vers = prog->pg_vers[i]) || !(proc = vers->vs_proc)) continue; - len += sprintf(buffer + len, "proc%d %d", i, vers->vs_nproc); + seq_printf(seq, "proc%d %d", i, vers->vs_nproc); for (j = 0; j < vers->vs_nproc; j++, proc++) - len += sprintf(buffer + len, " %d", proc->pc_count); - buffer[len++] = '\n'; + seq_printf(seq, " %d", proc->pc_count); + seq_putc(seq, '\n'); } - - if (offset >= len) { - *start = buffer; - *eof = 1; - return 0; - } - *start = buffer + offset; - if ((len -= offset) > count) - return count; - *eof = 1; - return len; } /* * Register/unregister RPC proc files */ static inline struct proc_dir_entry * -do_register(const char *name, void *data, int issvc) +do_register(const char *name, void *data, struct file_operations *fops) { + struct proc_dir_entry *ent; + rpc_proc_init(); dprintk("RPC: registering /proc/net/rpc/%s\n", name); - return create_proc_read_entry(name, 0, proc_net_rpc, - issvc? svc_proc_read : rpc_proc_read, - data); + + ent = create_proc_entry(name, 0, proc_net_rpc); + if (ent) { + ent->proc_fops = fops; + ent->data = data; + } + return ent; } struct proc_dir_entry * rpc_proc_register(struct rpc_stat *statp) { - return do_register(statp->program->name, statp, 0); + return do_register(statp->program->name, statp, &rpc_proc_fops); } void @@ -146,9 +138,9 @@ } struct proc_dir_entry * -svc_proc_register(struct svc_stat *statp) +svc_proc_register(struct svc_stat *statp, struct file_operations *fops) { - return do_register(statp->program->pg_name, statp, 1); + return do_register(statp->program->pg_name, statp, fops); } void @@ -163,7 +155,7 @@ dprintk("RPC: registering /proc/net/rpc\n"); if (!proc_net_rpc) { struct proc_dir_entry *ent; - ent = proc_mkdir("net/rpc", 0); + ent = proc_mkdir("rpc", proc_net); if (ent) { ent->owner = THIS_MODULE; proc_net_rpc = ent; diff -Nru a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c --- a/net/sunrpc/sunrpc_syms.c Thu Feb 19 23:44:27 2004 +++ b/net/sunrpc/sunrpc_syms.c Thu Feb 19 23:44:27 2004 @@ -90,10 +90,9 @@ #ifdef CONFIG_PROC_FS EXPORT_SYMBOL(rpc_proc_register); EXPORT_SYMBOL(rpc_proc_unregister); -EXPORT_SYMBOL(rpc_proc_read); EXPORT_SYMBOL(svc_proc_register); EXPORT_SYMBOL(svc_proc_unregister); -EXPORT_SYMBOL(svc_proc_read); +EXPORT_SYMBOL(svc_seq_show); #endif /* caching... */ diff -Nru a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c --- a/net/sunrpc/svcauth.c Thu Feb 19 23:44:27 2004 +++ b/net/sunrpc/svcauth.c Thu Feb 19 23:44:27 2004 @@ -150,7 +150,13 @@ &auth_domain_cache, auth_domain_hash(item), auth_domain_match(tmp, item), - kfree(new); if(!set) return NULL; + kfree(new); if(!set) { + if (new) + write_unlock(&auth_domain_cache.hash_lock); + else + read_unlock(&auth_domain_cache.hash_lock); + return NULL; + } new=item; atomic_inc(&new->h.refcnt), /* no update */, 0 /* no inplace updates */ diff -Nru a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c --- a/net/sunrpc/svcauth_unix.c Thu Feb 19 23:44:26 2004 +++ b/net/sunrpc/svcauth_unix.c Thu Feb 19 23:44:26 2004 @@ -119,7 +119,8 @@ } static inline void ip_map_init(struct ip_map *new, struct ip_map *item) { - new->m_class = strdup(item->m_class); + new->m_class = item->m_class; + item->m_class = NULL; new->m_addr.s_addr = item->m_addr.s_addr; } static inline void ip_map_update(struct ip_map *new, struct ip_map *item) @@ -191,7 +192,9 @@ } else dom = NULL; - ipm.m_class = class; + ipm.m_class = strdup(class); + if (ipm.m_class == NULL) + return -ENOMEM; ipm.m_addr.s_addr = htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4); ipm.h.flags = 0; @@ -207,6 +210,7 @@ ip_map_put(&ipmp->h, &ip_map_cache); if (dom) auth_domain_put(dom); + if (ipm.m_class) kfree(ipm.m_class); if (!ipmp) return -ENOMEM; cache_flush(); @@ -266,7 +270,9 @@ if (dom->flavour != RPC_AUTH_UNIX) return -EINVAL; udom = container_of(dom, struct unix_domain, h); - ip.m_class = "nfsd"; + ip.m_class = strdup("nfsd"); + if (!ip.m_class) + return -ENOMEM; ip.m_addr = addr; ip.m_client = udom; ip.m_add_change = udom->addr_changes+1; @@ -274,6 +280,7 @@ ip.h.expiry_time = NEVER; ipmp = ip_map_lookup(&ip, 1); + if (ip.m_class) kfree(ip.m_class); if (ipmp) { ip_map_put(&ipmp->h, &ip_map_cache); return 0; @@ -434,11 +441,11 @@ if (slen > 16 || (len -= (slen + 2)*4) < 0) goto badcred; for (i = 0; i < slen; i++) - if (i < NGROUPS) + if (i < SVC_CRED_NGROUPS) cred->cr_groups[i] = ntohl(svc_getu32(argv)); else svc_getu32(argv); - if (i < NGROUPS) + if (i < SVC_CRED_NGROUPS) cred->cr_groups[i] = NOGROUP; if (svc_getu32(argv) != RPC_AUTH_NULL || svc_getu32(argv) != 0) { diff -Nru a/scripts/gcc-version.sh b/scripts/gcc-version.sh --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/scripts/gcc-version.sh Thu Feb 19 23:44:29 2004 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# gcc-version gcc-command +# +# Prints the gcc version of `gcc-command' in a canonical 4-digit form +# such as `0295' for gcc-2.95, `0303' for gcc-3.3, etc. +# + +compiler="$*" + +MAJOR=$(echo __GNUC__ | $compiler -E -xc - | tail -n 1) +MINOR=$(echo __GNUC_MINOR__ | $compiler -E -xc - | tail -n 1) +printf "%02d%02d\\n" $MAJOR $MINOR + diff -Nru a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile --- a/scripts/lxdialog/Makefile Thu Feb 19 23:44:27 2004 +++ b/scripts/lxdialog/Makefile Thu Feb 19 23:44:27 2004 @@ -16,15 +16,13 @@ endif host-progs := lxdialog -always := $(host-progs) +always := ncurses $(host-progs) lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \ util.o lxdialog.o msgbox.o -first_rule: ncurses - -.PHONY: ncurses -ncurses: +.PHONY: $(obj)/ncurses +$(obj)/ncurses: @echo "main() {}" > lxtemp.c @if $(HOSTCC) lxtemp.c $(HOST_LOADLIBES); then \ rm -f lxtemp.c a.out; \ @@ -33,7 +31,7 @@ echo -e "\007" ;\ echo ">> Unable to find the Ncurses libraries." ;\ echo ">>" ;\ - echo ">> You must have Ncurses installed in order" ;\ + echo ">> You must install ncurses-devel in order" ;\ echo ">> to use 'make menuconfig'" ;\ echo ;\ exit 1 ;\ diff -Nru a/scripts/mkspec b/scripts/mkspec --- a/scripts/mkspec Thu Feb 19 23:44:22 2004 +++ b/scripts/mkspec Thu Feb 19 23:44:22 2004 @@ -37,6 +37,7 @@ echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root" echo "Provides: $PROVIDES" echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :" +echo "%define debug_package %{nil}" echo "" echo "%description" echo "The Linux Kernel, the operating system core itself" diff -Nru a/security/dummy.c b/security/dummy.c --- a/security/dummy.c Thu Feb 19 23:44:23 2004 +++ b/security/dummy.c Thu Feb 19 23:44:23 2004 @@ -544,7 +544,7 @@ return 0; } -static int dummy_task_setgroups (int gidsetsize, gid_t * grouplist) +static int dummy_task_setgroups (struct group_info *group_info) { return 0; } diff -Nru a/security/selinux/Makefile b/security/selinux/Makefile --- a/security/selinux/Makefile Thu Feb 19 23:44:22 2004 +++ b/security/selinux/Makefile Thu Feb 19 23:44:22 2004 @@ -4,7 +4,7 @@ obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/ -selinux-y := avc.o hooks.o selinuxfs.o +selinux-y := avc.o hooks.o selinuxfs.o netlink.o selinux-$(CONFIG_SECURITY_NETWORK) += netif.o diff -Nru a/security/selinux/hooks.c b/security/selinux/hooks.c --- a/security/selinux/hooks.c Thu Feb 19 23:44:28 2004 +++ b/security/selinux/hooks.c Thu Feb 19 23:44:28 2004 @@ -2539,7 +2539,7 @@ return task_has_perm(current, p, PROCESS__GETSESSION); } -static int selinux_task_setgroups(int gidsetsize, gid_t *grouplist) +static int selinux_task_setgroups(struct group_info *group_info) { /* See the comment for setuid above. */ return 0; diff -Nru a/security/selinux/netlink.c b/security/selinux/netlink.c --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/security/selinux/netlink.c Thu Feb 19 23:44:29 2004 @@ -0,0 +1,113 @@ +/* + * Netlink event notifications for SELinux. + * + * Author: James Morris + * + * Copyright (C) 2004 Red Hat, Inc., James Morris + * + * 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. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +static struct sock *selnl; + +static int selnl_msglen(int msgtype) +{ + int ret = 0; + + switch (msgtype) { + case SELNL_MSG_SETENFORCE: + ret = sizeof(struct selnl_msg_setenforce); + break; + + case SELNL_MSG_POLICYLOAD: + ret = sizeof(struct selnl_msg_policyload); + break; + + default: + BUG(); + } + return ret; +} + +static void selnl_add_payload(struct nlmsghdr *nlh, int len, int msgtype, void *data) +{ + switch (msgtype) { + case SELNL_MSG_SETENFORCE: { + struct selnl_msg_setenforce *msg = NLMSG_DATA(nlh); + + memset(msg, 0, len); + msg->val = *((int *)data); + break; + } + + case SELNL_MSG_POLICYLOAD: { + struct selnl_msg_policyload *msg = NLMSG_DATA(nlh); + + memset(msg, 0, len); + msg->seqno = *((u32 *)data); + break; + } + + default: + BUG(); + } +} + +static void selnl_notify(int msgtype, void *data) +{ + int len; + unsigned char *tmp; + struct sk_buff *skb; + struct nlmsghdr *nlh; + + len = selnl_msglen(msgtype); + + skb = alloc_skb(NLMSG_SPACE(len), GFP_USER); + if (!skb) + goto oom; + + tmp = skb->tail; + nlh = NLMSG_PUT(skb, 0, 0, msgtype, len); + selnl_add_payload(nlh, len, msgtype, data); + nlh->nlmsg_len = skb->tail - tmp; + netlink_broadcast(selnl, skb, 0, SELNL_GRP_AVC, GFP_USER); +out: + return; + +nlmsg_failure: + kfree_skb(skb); +oom: + printk(KERN_ERR "SELinux: OOM in %s\n", __FUNCTION__); + goto out; +} + +void selnl_notify_setenforce(int val) +{ + selnl_notify(SELNL_MSG_SETENFORCE, &val); +} + +void selnl_notify_policyload(u32 seqno) +{ + selnl_notify(SELNL_MSG_POLICYLOAD, &seqno); +} + +static int __init selnl_init(void) +{ + selnl = netlink_kernel_create(NETLINK_SELINUX, NULL); + if (selnl == NULL) + panic("SELinux: Cannot create netlink socket."); + netlink_set_nonroot(NETLINK_SELINUX, NL_NONROOT_RECV); + return 0; +} + +__initcall(selnl_init); diff -Nru a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c --- a/security/selinux/selinuxfs.c Thu Feb 19 23:44:28 2004 +++ b/security/selinux/selinuxfs.c Thu Feb 19 23:44:28 2004 @@ -17,6 +17,8 @@ #include "security.h" #include "objsec.h" +extern void selnl_notify_setenforce(int val); + /* Check whether a task is allowed to use a security operation. */ int task_has_security(struct task_struct *tsk, u32 perms) @@ -54,7 +56,7 @@ return -ENOMEM; memset(page, 0, PAGE_SIZE); - length = snprintf(page, PAGE_SIZE, "%d", selinux_enforcing); + length = scnprintf(page, PAGE_SIZE, "%d", selinux_enforcing); if (length < 0) { free_page((unsigned long)page); return length; @@ -111,6 +113,7 @@ selinux_enforcing = new_value; if (selinux_enforcing) avc_ss_reset(0); + selnl_notify_setenforce(selinux_enforcing); } length = count; out: @@ -139,7 +142,7 @@ return -ENOMEM; memset(page, 0, PAGE_SIZE); - length = snprintf(page, PAGE_SIZE, "%u", POLICYDB_VERSION); + length = scnprintf(page, PAGE_SIZE, "%u", POLICYDB_VERSION); if (length < 0) { free_page((unsigned long)page); return length; @@ -404,7 +407,7 @@ if (length < 0) goto out2; - length = snprintf(buf, PAYLOAD_SIZE, "%x %x %x %x %u", + length = scnprintf(buf, PAYLOAD_SIZE, "%x %x %x %x %u", avd.allowed, avd.decided, avd.auditallow, avd.auditdeny, avd.seqno); diff -Nru a/security/selinux/ss/services.c b/security/selinux/ss/services.c --- a/security/selinux/ss/services.c Thu Feb 19 23:44:27 2004 +++ b/security/selinux/ss/services.c Thu Feb 19 23:44:27 2004 @@ -28,6 +28,8 @@ #include "services.h" #include "mls.h" +extern void selnl_notify_policyload(u32 seqno); + static rwlock_t policy_rwlock = RW_LOCK_UNLOCKED; #define POLICY_RDLOCK read_lock(&policy_rwlock) #define POLICY_WRLOCK write_lock_irq(&policy_rwlock) @@ -1052,6 +1054,7 @@ sidtab_destroy(&oldsidtab); avc_ss_reset(seqno); + selnl_notify_policyload(seqno); return 0; diff -Nru a/sound/core/info.c b/sound/core/info.c --- a/sound/core/info.c Thu Feb 19 23:44:28 2004 +++ b/sound/core/info.c Thu Feb 19 23:44:28 2004 @@ -99,7 +99,7 @@ if (buffer->stop || buffer->error) return 0; va_start(args, fmt); - res = vsnprintf(sbuffer, sizeof(sbuffer), fmt, args); + res = vscnprintf(sbuffer, sizeof(sbuffer), fmt, args); va_end(args); if (buffer->size + res >= buffer->len) { buffer->stop = 1; diff -Nru a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c --- a/sound/core/seq/seq_dummy.c Thu Feb 19 23:44:25 2004 +++ b/sound/core/seq/seq_dummy.c Thu Feb 19 23:44:25 2004 @@ -46,7 +46,7 @@ The number of ports to be created can be specified via the module parameter "ports". For example, to create four ports, add the - following option in /etc/modules.conf: + following option in /etc/modprobe.conf: option snd-seq-dummy ports=4 diff -Nru a/sound/oss/msnd.c b/sound/oss/msnd.c --- a/sound/oss/msnd.c Thu Feb 19 23:44:24 2004 +++ b/sound/oss/msnd.c Thu Feb 19 23:44:24 2004 @@ -25,9 +25,6 @@ ********************************************************************/ #include -#if LINUX_VERSION_CODE < 0x020101 -# define LINUX20 -#endif #include #include #include @@ -35,18 +32,10 @@ #include #include #include -#ifdef LINUX20 -# include -# include -# include -# include -# include "sound_config.h" -#else -# include -# include -# include -# include -#endif +#include +#include +#include +#include #include #include "msnd.h" diff -Nru a/sound/oss/os.h b/sound/oss/os.h --- a/sound/oss/os.h Thu Feb 19 23:44:28 2004 +++ b/sound/oss/os.h Thu Feb 19 23:44:28 2004 @@ -7,10 +7,6 @@ #include #include -#if LINUX_VERSION_CODE > 131328 -#define LINUX21X -#endif - #ifdef __KERNEL__ #include #include diff -Nru a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c --- a/usr/gen_init_cpio.c Thu Feb 19 23:44:26 2004 +++ b/usr/gen_init_cpio.c Thu Feb 19 23:44:26 2004 @@ -56,7 +56,7 @@ const char name[] = "TRAILER!!!"; sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08ZX%08X", + "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ 0, /* ino */ 0, /* mode */ @@ -69,7 +69,7 @@ 0, /* minor */ 0, /* rmajor */ 0, /* rminor */ - strlen(name) + 1, /* namesize */ + (unsigned)strlen(name) + 1, /* namesize */ 0); /* chksum */ push_hdr(s); push_rest(name); @@ -87,7 +87,7 @@ time_t mtime = time(NULL); sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08ZX%08X", + "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino++, /* ino */ S_IFDIR | mode, /* mode */ @@ -100,7 +100,7 @@ 1, /* minor */ 0, /* rmajor */ 0, /* rminor */ - strlen(name) + 1, /* namesize */ + (unsigned)strlen(name) + 1,/* namesize */ 0); /* chksum */ push_hdr(s); push_rest(name); @@ -119,7 +119,7 @@ mode |= S_IFCHR; sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08ZX%08X", + "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino++, /* ino */ mode, /* mode */ @@ -132,7 +132,7 @@ 1, /* minor */ maj, /* rmajor */ min, /* rminor */ - strlen(name) + 1, /* namesize */ + (unsigned)strlen(name) + 1,/* namesize */ 0); /* chksum */ push_hdr(s); push_rest(name); @@ -176,7 +176,7 @@ } sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08ZX%08X", + "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino++, /* ino */ mode, /* mode */ @@ -189,7 +189,7 @@ 1, /* minor */ 0, /* rmajor */ 0, /* rminor */ - strlen(location) + 1, /* namesize */ + (unsigned)strlen(location) + 1,/* namesize */ 0); /* chksum */ push_hdr(s); push_string(location);