diff options
Diffstat (limited to 'packages/linux/linux-mtx-1-2.4.27')
11 files changed, 5405 insertions, 35 deletions
diff --git a/packages/linux/linux-mtx-1-2.4.27/15-au1000-pci-fixup-non-coherent-pre-ac.diff b/packages/linux/linux-mtx-1-2.4.27/15-au1000-pci-fixup-non-coherent-pre-ac.diff deleted file mode 100644 index 0a3896433a..0000000000 --- a/packages/linux/linux-mtx-1-2.4.27/15-au1000-pci-fixup-non-coherent-pre-ac.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- linux/arch/mips/au1000/common/pci_fixup.c.orig 2004-11-25 20:14:24.907902616 +0100 -+++ linux/arch/mips/au1000/common/pci_fixup.c 2004-11-25 20:27:08.842766864 +0100 -@@ -75,10 +75,13 @@ - - #ifdef CONFIG_NONCOHERENT_IO - /* -- * Set the NC bit in controller for pre-AC silicon -+ * Set the NC bit in controller for Au1500 pre-AC silicon - */ -- au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG); -- printk("Non-coherent PCI accesses enabled\n"); -+ u32 prid = read_c0_prid(); -+ if ( (prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) { -+ au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG); -+ printk("Non-coherent PCI accesses enabled\n"); -+ } - #endif - - set_io_port_base(virt_io_addr); diff --git a/packages/linux/linux-mtx-1-2.4.27/22-umts.diff b/packages/linux/linux-mtx-1-2.4.27/22-umts.diff new file mode 100644 index 0000000000..8bf2f80236 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/22-umts.diff @@ -0,0 +1,28 @@ +diff -Nurb linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c linux-2.4.27-mtx1-umts/drivers/usb/serial/usbserial.c +--- linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2004-08-14 20:38:57.000000000 +0200 ++++ linux-2.4.27-mtx1-umts/drivers/usb/serial/usbserial.c 2005-06-07 10:53:03.000000000 +0200 +@@ -332,7 +332,7 @@ + static __u16 vendor = 0x05f9; + static __u16 product = 0xffff; + +-static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ ++static struct usb_device_id generic_device_ids[5]; /* Initially all zeroes. */ + + /* All of the device info needed for the Generic Serial Converter */ + static struct usb_serial_device_type generic_device = { +@@ -1773,6 +1773,15 @@ + generic_device_ids[0].idVendor = vendor; + generic_device_ids[0].idProduct = product; + generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ generic_device_ids[1].idVendor = 0xaf0; ++ generic_device_ids[1].idProduct = 0x5000; ++ generic_device_ids[1].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ generic_device_ids[2].idVendor = 0xaf0; ++ generic_device_ids[2].idProduct = 0x6000; ++ generic_device_ids[2].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ generic_device_ids[3].idVendor = 0xaf0; ++ generic_device_ids[3].idProduct = 0x6300; ++ generic_device_ids[3].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; + /* register our generic driver with ourselves */ + usb_serial_register (&generic_device); + #endif diff --git a/packages/linux/linux-mtx-1-2.4.27/28-idsel-cardbus.diff b/packages/linux/linux-mtx-1-2.4.27/28-idsel-cardbus.diff new file mode 100644 index 0000000000..aff210bb54 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/28-idsel-cardbus.diff @@ -0,0 +1,67 @@ +diff -Nurb linux/arch/mips/au1000/mtx-1/board_setup.c /home/br1/linux-idsel/arch/mips/au1000/mtx-1/board_setup.c +--- linux/arch/mips/au1000/mtx-1/board_setup.c 2005-08-18 18:23:59.000000000 +0200 ++++ /home/br1/linux-idsel/arch/mips/au1000/mtx-1/board_setup.c 2005-08-18 18:19:48.000000000 +0200 +@@ -48,6 +48,10 @@ + + extern struct rtc_ops no_rtc_ops; + ++extern int (*board_pci_idsel)(unsigned int devsel, int assert); ++int mtx1_pci_idsel(unsigned int devsel, int assert); ++ ++ + void board_reset (void) + { + /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ +@@ -85,11 +89,39 @@ + au_writel( 0xFFFFFFFF, SYS_TRIOUTCLR ); + au_writel( 0x00000001, SYS_OUTPUTCLR ); // set M66EN (PCI 66MHz) to OFF + au_writel( 0x00000008, SYS_OUTPUTSET ); // set PCI CLKRUN# to OFF ++ au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON + au_writel( 0x00000020, SYS_OUTPUTCLR ); // set eth PHY TX_ER to OFF + + // enable LED and set it to green + au_writel( au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR ); + au_writel( 0x18000800, GPIO2_OUTPUT ); + ++ board_pci_idsel = mtx1_pci_idsel; ++ + printk("4G Systems MTX-1 Board\n"); + } ++ ++ ++/* ++ */ ++int ++mtx1_pci_idsel(unsigned int devsel, int assert) ++{ ++#define MTX_IDSEL_ONLY_0_AND_3 0 ++#if MTX_IDSEL_ONLY_0_AND_3 ++ if (devsel != 0 && devsel != 3) { ++ printk("*** not 0 or 3\n"); ++ return 0; ++ } ++#endif ++ ++ if (assert && devsel != 0) { ++ // supress signal to cardbus ++ au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF ++ } ++ else { ++ au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON ++ } ++ au_sync_udelay(1); ++ return 1; ++} +diff -Nurb linux/arch/mips/au1000/mtx-1/irqmap.c /home/br1/linux-idsel/arch/mips/au1000/mtx-1/irqmap.c +--- linux/arch/mips/au1000/mtx-1/irqmap.c 2005-08-18 18:24:05.000000000 +0200 ++++ /home/br1/linux-idsel/arch/mips/au1000/mtx-1/irqmap.c 2005-08-16 16:37:39.000000000 +0200 +@@ -73,7 +73,7 @@ + * A B C D + */ + { +- {INTA, INTB, INTX, INTX}, /* IDSEL 0 */ ++ {INTA, INTA, INTX, INTX}, /* IDSEL 0 */ + {INTB, INTA, INTX, INTX}, /* IDSEL 1 */ + {INTC, INTD, INTX, INTX}, /* IDSEL 2 */ + {INTD, INTC, INTX, INTX}, /* IDSEL 3 */ + diff --git a/packages/linux/linux-mtx-1-2.4.27/30-mtx-1-sysled.diff b/packages/linux/linux-mtx-1-2.4.27/30-mtx-1-sysled.diff new file mode 100644 index 0000000000..283b7af451 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/30-mtx-1-sysled.diff @@ -0,0 +1,446 @@ +--- /dev/null 1970-01-01 01:00:00.000000000 +0100 ++++ linux/arch/mips/au1000/mtx-1/mtx-1_sysled.c 2005-08-27 15:30:51.000000000 +0200 +@@ -0,0 +1,398 @@ ++/* ++ * Driver for the MTX-1 System LEDs. ++ * ++ * (c) Copyright 2005 4G Systems <info@4g-systems.biz>, All Rights Reserved. ++ * http://www.4g-systems.biz ++ * ++ * 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. ++ * ++ * Neither Alan Cox nor CymruNet Ltd. admit liability nor provide ++ * warranty for any of this software. This material is provided ++ * "AS-IS" and at no charge. ++ * ++ * (c) Copyright 2005 4G Systems <info@4g-systems.biz> ++ * ++ * Release 0.01. ++ * ++ * Author: Michael Stickel michael.stickel@4g-systems.biz ++ * ++ * ++ * After the module is loaded there will be a device /dev/misc/leds ++ * that can be written to. There are two bits, each represents one LED ++ * ++ * ++ */ ++ ++static int errno; ++#define __KERNEL_SYSCALLS__ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/version.h> ++#include <linux/types.h> ++#include <linux/errno.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/miscdevice.h> ++#include <linux/slab.h> ++#include <linux/init.h> ++#include <linux/smp_lock.h> ++#include <asm/unistd.h> ++ ++#include <asm/uaccess.h> ++ ++#include <asm/au1000.h> ++ ++#include <asm/io.h> ++ ++ ++#include "mtx-1_sysled.h" ++ ++ ++#ifndef FALSE ++# define FALSE (0) ++#endif ++ ++#ifndef TRUE ++# define TRUE (!FALSE) ++#endif ++ ++ ++/* handle up_and_exit confusion */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9) ++typedef struct semaphore THREAD_SEM; ++#define THREAD_SEM_EXIT(c,l) up_and_exit(c,l) ++#define THREAD_SEM_DECLARE(c) DECLARE_MUTEX_LOCKED(c) ++#define THREAD_SEM_INIT(c) init_MUTEX_LOCKED(c) ++#define THREAD_SEM_WAIT_COMPLETE(c) {down(c);up(c);} ++ ++#else ++#include <linux/completion.h> ++typedef struct completion THREAD_SEM; ++#define THREAD_SEM_EXIT(c,l) complete_and_exit(c,l) ++#define THREAD_SEM_DECLARE(c) DECLARE_COMPLETION(c) ++#define THREAD_SEM_INIT(c) init_completion(c) ++#define THREAD_SEM_WAIT_COMPLETE(c) wait_for_completion(c) ++#endif ++ ++ ++//---------[ Hardware Functions ]----------------- ++ ++ ++ ++static unsigned char sysled_gpios[10] = ++{ ++ 211, // Power = GPIO211 ++ 212, // Status = GPIO212 ++ ++#if 1 ++ 12, // LEDBar1 Blue = GPIO12 0 ++ 13, // LEDBar1 Red = GPIO13 ++ ++ 26, // LEDBar3 Blue = GPIO27 1 ++ 27, // LEDBar3 Red = GPIO26 ++ ++ 10, // LEDBar0 Blue = GPIO10 2 ++ 11, // LEDBar0 Red = GPIO11 ++ ++ 14, // LEDBar2 Blue = GPIO14 3 ++ 25, // LEDBar2 Red = GPIO28 ++#else ++ 7, // IOCTRL0 ++ 8, // IOCTRL1 ++ ++ 15, // IOCTRL2 ++ 205, // IOCTRL3 ++ ++ 206, // IOCTRL4 ++ 208, // LEDBar2 Blue = GPIO14 ++ ++ 255, ++ 255 ++#endif ++}; ++static int num_sysled_gpios = sizeof(sysled_gpios) / sizeof(sysled_gpios[0]); ++ ++ ++static void mtx1_setled (int ledno, char on) ++{ ++ if (ledno >= 0 && ledno < num_sysled_gpios) ++ { ++ if (sysled_gpios[ledno] >= 200 && sysled_gpios[ledno] < 231) ++ { ++ unsigned long pinmask = 1 << (sysled_gpios[ledno] - 200); ++ au_writel((pinmask<<16) | (on ? pinmask : 0), GPIO2_OUTPUT); ++ } ++ else if (sysled_gpios[ledno] < 32) ++ { ++ unsigned long pinmask = 1 << sysled_gpios[ledno]; ++ if (on) ++ au_writel(pinmask, SYS_OUTPUTSET); ++ else ++ au_writel(pinmask, SYS_OUTPUTCLR); ++ } ++ } ++} ++ ++ ++//---------[ LED Precalculation ]----------------- ++ ++typedef struct current_led_config_s ++{ ++ unsigned char period; ++ unsigned long pattern[8]; /* bit-pattern: up to 3.2*8 seconds. 25.6 seconds at 10 Hz */ ++ short current_value; ++ unsigned char led_state; /* 0 = off, 1 = on */ ++} current_led_config_t; ++ ++static current_led_config_t current_led_config[10]; ++static THREAD_SEM mtx1_ledthread_exited; ++static int mtx1_ledthread_pid; ++ ++static int mtx1_led_thread (void *user_data) ++{ ++ int last_jiffies = jiffies - HZ/10; /* initialize with meaningfull value */ ++ ++ lock_kernel(); ++ ++ daemonize (); ++ spin_lock_irq (¤t->sigmask_lock); ++ sigemptyset (¤t->blocked); ++ recalc_sigpending (current); ++ spin_unlock_irq (¤t->sigmask_lock); ++ ++ strncpy (current->comm, "mtx1led", sizeof(current->comm) - 1); ++ current->comm[sizeof(current->comm) - 1] = '\0'; ++ ++ do { ++ int i; ++ ++ // missed_values = (jiffies - last_jiffies) / (HZ/10); ++ last_jiffies = jiffies; ++ ++ // 1/10 second later. ++ for (i=0; i < num_sysled_gpios; i++) ++ { ++ int index = current_led_config[i].current_value; ++ if (current_led_config[i].period > 0 && index < 256) ++ { ++ char led_on = (current_led_config[i].pattern[(index>>5)&7] >> (index&0x1f)) & 1; ++ ++ if (led_on != current_led_config[i].led_state) ++ mtx1_setled (i, led_on); ++ current_led_config[i].led_state = led_on; ++ ++ current_led_config[i].current_value++; ++ if (current_led_config[i].current_value > current_led_config[i].period) ++ current_led_config[i].current_value = 0; ++ } ++ } ++ ++ current->state = TASK_INTERRUPTIBLE; ++ /* long timeout = */ schedule_timeout(HZ / 10); ++ } while (!signal_pending(current)); ++ ++ THREAD_SEM_EXIT (&mtx1_ledthread_exited, 0); ++ return 0; ++} ++ ++ ++static int mtx1_start_ledthread (void) ++{ ++ THREAD_SEM_INIT (&mtx1_ledthread_exited); ++ ++ printk ("starting mtx1 ledthread\n"); ++ mtx1_ledthread_pid = kernel_thread(mtx1_led_thread, ++ NULL, ++ CLONE_FS | CLONE_FILES | CLONE_SIGHAND); ++ if (mtx1_ledthread_pid >= 0) ++ return 0; ++ return -1; ++} ++ ++ ++static void mtx1_stop_ledthread (void) ++{ ++ int waitpid_result = 0; ++ if (mtx1_ledthread_pid > 0) { ++ int ret = kill_proc(mtx1_ledthread_pid, SIGTERM, 1); ++ if (ret==0) ++ { ++ THREAD_SEM_WAIT_COMPLETE(&mtx1_ledthread_exited); ++ waitpid_result = waitpid (mtx1_ledthread_pid, NULL, __WCLONE|WNOHANG); ++ mtx1_ledthread_pid = 0; ++ } ++ } ++// return waitpid_result; ++} ++ ++//---------[ File Functions ]----------------- ++ ++static int mtx1sysled_minor = -1; ++ ++static int mtx1sysled_open (struct inode *inode, struct file *file) ++{ ++ if (MINOR(inode->i_rdev)!=mtx1sysled_minor) return -ENODEV; ++ MOD_INC_USE_COUNT; ++ ++ return 0; ++} ++ ++ ++static int mtx1sysled_release (struct inode *inode, struct file *file) { ++ if (MINOR(inode->i_rdev)==mtx1sysled_minor) { ++ } ++ MOD_DEC_USE_COUNT; ++ return 0; ++} ++ ++ ++static ssize_t mtx1sysled_write (struct file *file, const char *buf, size_t count, loff_t *ppos) { ++ led_control_t ctrl_entry; ++ size_t buflen; ++ ++ if (ppos != &file->f_pos) ++ return -ESPIPE; ++ ++ if (count < 1) ++ return -EINVAL; ++ ++ if (copy_from_user (&ctrl_entry, buf, sizeof(unsigned char))) ++ return -EFAULT; ++ ++ if ((ctrl_entry.flags & 0x1f) <= 0) ++ return -EINVAL; ++ ++ buflen = (count < sizeof(led_control_t)) ? count : sizeof(led_control_t); ++ if (copy_from_user (&ctrl_entry, buf, buflen)) ++ return -EFAULT; ++ ++ int numentries = (buflen-1) / sizeof(led_control_entry_t); ++ ++ if ((ctrl_entry.flags & 0x1f) < numentries) ++ numentries = ctrl_entry.flags & 0x1f; ++ ++ int i; ++ for (i=0; i < numentries; i++) { ++ unsigned short led_id = ctrl_entry.led[i].led_id; ++ if (led_id < num_sysled_gpios) { ++ current_led_config[led_id].period = ctrl_entry.led[i].period; ++ memcpy (current_led_config[led_id].pattern, ctrl_entry.led[i].pattern, sizeof(unsigned long)*8); ++ current_led_config[led_id].current_value = 0; ++ ++ // may update the led output (if the led should be set to 1 or 0). ++ } ++ } ++ return count; ++} ++ ++ ++ ++static struct file_operations mtx1sysled_fops = { ++ .owner = THIS_MODULE, ++ .llseek = NULL, ++ .read = NULL, ++ .write = mtx1sysled_write, ++ .readdir = NULL, ++ .poll = NULL, ++ .ioctl = NULL, ++ .mmap = NULL, ++ .open = mtx1sysled_open, ++ .flush = NULL, ++ .release = mtx1sysled_release ++}; ++ ++ ++static struct miscdevice mtx1sysled_miscdev = { ++ MISC_DYNAMIC_MINOR /* SYSLED_MINOR */ , ++ "leds", ++ &mtx1sysled_fops ++}; ++ ++ ++ ++//---------[ Module Functions ]----------------- ++ ++ ++void __exit cleanup_mtx1_sysled (void) ++{ ++ mtx1_stop_ledthread (); ++ misc_deregister(&mtx1sysled_miscdev); ++} ++ ++ ++int __init init_mtx1_sysled (void) ++{ ++ printk("MTX-1 System LED driver\n"); ++ ++ ++ unsigned long gpio_mask = 0L; ++ unsigned long gpio2_mask = 0L; ++ int i; ++ for (i=0; i < num_sysled_gpios; i++) ++ { ++ if (sysled_gpios[i] < 32) /* GPIO00..xx */ ++ gpio2_mask |= 1<<sysled_gpios[i]; ++ ++ else if (sysled_gpios[i] >= 200 && sysled_gpios[i] < 216) /* GPIO200..231 */ ++ gpio2_mask |= 1 << (sysled_gpios[i] - 200); ++ } ++ ++ if (gpio2_mask) { ++ au_writel(au_readl(GPIO2_DIR) | gpio2_mask, GPIO2_DIR); ++ au_writel(gpio2_mask<<16, GPIO2_OUTPUT); ++ } ++ ++ if (gpio_mask) { ++ au_writel(gpio_mask, SYS_OUTPUTCLR); ++ } ++ ++ // Clear SYS_LED#10 = U910-OE# ++ au_writel(1<<28, SYS_OUTPUTCLR); ++ ++ ++ if (misc_register (&mtx1sysled_miscdev) < 0) ++ { ++ return 1; ++ } ++ mtx1sysled_minor = mtx1sysled_miscdev.minor; ++ ++ for (i=0; i < num_sysled_gpios; i++) { ++ current_led_config[i].period = 32; ++ current_led_config[i].pattern[0] = 0x0; ++ current_led_config[i].current_value = 0; ++ current_led_config[i].led_state = 0; ++ mtx1_setled (i, 0); ++ } ++ current_led_config[2].period = 31; ++ current_led_config[2].pattern[0] = 0xFFFFFFFF; ++ current_led_config[3].period = 31; ++ current_led_config[3].pattern[0] = 0xFFFFFFFF; ++ current_led_config[4].period = 31; ++ current_led_config[4].pattern[0] = 0xFFFFFFFF; ++ current_led_config[5].period = 31; ++ current_led_config[5].pattern[0] = 0xFFFFFFFF; ++ current_led_config[6].period = 31; ++ current_led_config[6].pattern[0] = 0xFFFFFFFF; ++ current_led_config[7].period = 31; ++ current_led_config[7].pattern[0] = 0xFFFFFFFF; ++ ++ ++ if (mtx1_start_ledthread ()) ++ { ++ // Error ++ } ++ ++ return 0; ++} ++ ++__initcall(init_mtx1_sysled); ++__exitcall(cleanup_mtx1_sysled); ++ ++MODULE_AUTHOR("Michael Stickel"); ++MODULE_DESCRIPTION("Driver for the MTX-1 system LEDs"); ++MODULE_LICENSE("GPL"); ++EXPORT_NO_SYMBOLS; +--- /dev/null 1970-01-01 01:00:00.000000000 +0100 ++++ linux/arch/mips/au1000/mtx-1/mtx-1_sysled.h 2005-08-27 15:00:41.000000000 +0200 +@@ -0,0 +1,32 @@ ++#ifndef __MTX1_SYSLED_H__ ++#define __MTX1_SYSLED_H__ ++ /* ++ * flags: ++ * Bit Function ++ * 7 set to 0 ++ * 6 set to 0 ++ * 5 set to 0 ++ * 4..0 The number of led-control records. 1 means one record, 15 means records. ++ * ++ */ ++ ++ ++typedef struct led_control_entry_s ++{ ++ unsigned short led_id; ++ unsigned char period; /* 0..0xff unit is 1/10 of a second */ ++ unsigned long pattern[8]; /* bit-pattern: up to 3.2*8 seconds. 25.6 seconds at 10 Hz */ ++} led_control_entry_t; ++ ++ ++typedef struct led_control_s ++{ ++ unsigned char flags; ++ led_control_entry_t led[31]; ++} led_control_t; ++ ++#define MTX1SYSLED_CONTROL_SIZE(x) (sizeof(unsigned char)+(x)*sizeof(led_control_entry_t)) ++ ++#define MTX1SYSLED_FLAGS_NUMENTRIES(n) ((n)&0x1f) ++ ++#endif +--- linux/arch/mips/au1000/mtx-1/Makefile.orig 2005-08-27 15:59:31.000000000 +0200 ++++ linux/arch/mips/au1000/mtx-1/Makefile 2005-08-27 15:59:45.000000000 +0200 +@@ -15,6 +15,6 @@ + + O_TARGET := mtx-1.o + +-obj-y := init.o board_setup.o irqmap.o mtx-1_watchdog.o mtx-1_sysbtn.o ++obj-y := init.o board_setup.o irqmap.o mtx-1_watchdog.o mtx-1_sysbtn.o mtx-1_sysled.o + + include $(TOPDIR)/Rules.make diff --git a/packages/linux/linux-mtx-1-2.4.27/31-mtx-1u-led-init.diff b/packages/linux/linux-mtx-1-2.4.27/31-mtx-1u-led-init.diff new file mode 100644 index 0000000000..53e17e48bb --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/31-mtx-1u-led-init.diff @@ -0,0 +1,16 @@ +--- linux/arch/mips/au1000/mtx-1/board_setup.c.pre 2005-08-27 17:09:39.000000000 +0200 ++++ linux/arch/mips/au1000/mtx-1/board_setup.c 2005-08-27 17:38:56.000000000 +0200 +@@ -91,9 +91,12 @@ + au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON + au_writel( 0x00000020, SYS_OUTPUTCLR ); // set eth PHY TX_ER to OFF + ++ au_writel( 0x0c003000, SYS_OUTPUTSET ); ++ au_writel( 0x12004c00, SYS_OUTPUTCLR ); ++ + // enable LED and set it to green + au_writel( au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR ); +- au_writel( 0x18000800, GPIO2_OUTPUT ); ++ au_writel( 0x18000000, GPIO2_OUTPUT ); + + board_pci_idsel = mtx1_pci_idsel; + diff --git a/packages/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff b/packages/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff new file mode 100644 index 0000000000..bfc1af9db9 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff @@ -0,0 +1,22 @@ +--- linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:40.000000000 +0200 ++++ linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:12.000000000 +0200 +@@ -499,6 +499,19 @@ + /* get_usb_serial checks port->tty, so cannot be used */ + serial = port->serial; + if (port->write_busy) { ++ ++ /*-- how is the status of the outgoing urb? --*/ ++ /*-- did we miss a callback? --*/ ++ /*-- problem with the hack below is that we may */ ++ /* corrup structures we currently walk thru */ ++ if (port->write_urb && port->write_urb->status != -EINPROGRESS) { ++ if (port->write_urb->complete) ++ port->write_urb->complete(port->write_urb); ++ else ++ dbg("%s: URB %p has no complete function\n", __FUNCTION__, port->write_urb); ++ } ++ ++ + dbg("%s - port %d busy", __FUNCTION__, port->number); + pos = pos->next; + continue; diff --git a/packages/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff b/packages/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff new file mode 100644 index 0000000000..e615a92fa4 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff @@ -0,0 +1,140 @@ +--- linux/drivers/usb/serial/usbserial.c~33-usbserial-bulk_in_size-4096.diff 2006-03-31 15:05:46.674445000 +0200 ++++ linux/drivers/usb/serial/usbserial.c 2006-04-07 12:23:56.970400500 +0200 +@@ -332,6 +332,9 @@ + static __u16 vendor = 0x05f9; + static __u16 product = 0xffff; + ++static int count_smaller64 = 0; ++static int count_bigger64 = 0; ++ + static struct usb_device_id generic_device_ids[5]; /* Initially all zeroes. */ + + /* All of the device info needed for the Generic Serial Converter */ +@@ -396,6 +399,10 @@ + drivers depend on it. + */ + ++/* global params controlling max sizes for read, write, control */ ++static int maxszr = 0; ++static int maxszw = 0; ++static int maxszc = 0; + + static int serial_refcount; + static struct tty_driver serial_tty_driver; +@@ -1272,6 +1279,14 @@ + tty_flip_buffer_push(tty); + } + ++ if (urb->actual_length>64) { ++ count_bigger64++; ++ } else { ++ count_smaller64++; ++ } ++ ++ /*printk("*** %d\n", urb->actual_length);*/ ++ + /* Continue trying to always read */ + usb_fill_bulk_urb (port->read_urb, serial->dev, + usb_rcvbulkpipe (serial->dev, +@@ -1505,7 +1520,8 @@ + err("No free urbs available"); + goto probe_error; + } +- buffer_size = endpoint->wMaxPacketSize; ++ buffer_size = (endpoint->wMaxPacketSize > maxszr)? ++ endpoint->wMaxPacketSize: maxszr; + port->bulk_in_endpointAddress = endpoint->bEndpointAddress; + port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL); + if (!port->bulk_in_buffer) { +@@ -1530,7 +1546,8 @@ + err("No free urbs available"); + goto probe_error; + } +- buffer_size = endpoint->wMaxPacketSize; ++ buffer_size = (endpoint->wMaxPacketSize > maxszw)? ++ endpoint->wMaxPacketSize: maxszw; + port->bulk_out_size = buffer_size; + port->bulk_out_endpointAddress = endpoint->bEndpointAddress; + port->bulk_out_buffer = kmalloc (buffer_size, GFP_KERNEL); +@@ -1556,7 +1573,8 @@ + err("No free urbs available"); + goto probe_error; + } +- buffer_size = endpoint->wMaxPacketSize; ++ buffer_size = (endpoint->wMaxPacketSize > maxszc)? ++ endpoint->wMaxPacketSize: maxszc; + port->interrupt_in_endpointAddress = endpoint->bEndpointAddress; + port->interrupt_in_buffer = kmalloc (buffer_size, GFP_KERNEL); + if (!port->interrupt_in_buffer) { +@@ -1807,6 +1825,7 @@ + + static void __exit usb_serial_exit(void) + { ++ printk("*** received packets\n< 64: %d\n> 64: %d\n", count_smaller64, count_bigger64); + + #ifdef CONFIG_USB_SERIAL_GENERIC + /* remove our generic driver */ +@@ -1874,6 +1893,15 @@ + MODULE_PARM(debug, "i"); + MODULE_PARM_DESC(debug, "Debug enabled or not"); + ++MODULE_PARM(maxszr, "i"); ++MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); ++ ++MODULE_PARM(maxszw, "i"); ++MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); ++ ++MODULE_PARM(maxszc, "i"); ++MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); ++ + #ifdef CONFIG_USB_SERIAL_GENERIC + MODULE_PARM(vendor, "h"); + MODULE_PARM_DESC(vendor, "User specified USB idVendor"); +--- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200 ++++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200 +@@ -155,6 +155,11 @@ + unsigned char clocal; /* termios CLOCAL */ + }; + ++/* global params controlling max sizes for read, write, control */ ++static int maxszr = 0; ++static int maxszw = 0; ++static int maxszc = 0; ++ + static struct usb_driver acm_driver; + static struct tty_driver acm_tty_driver; + static struct acm *acm_table[ACM_TTY_MINORS]; +@@ -573,9 +578,13 @@ + } + memset(acm, 0, sizeof(struct acm)); + +- ctrlsize = epctrl->wMaxPacketSize; +- readsize = epread->wMaxPacketSize; +- acm->writesize = epwrite->wMaxPacketSize; ++ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? ++ epctrl->wMaxPacketSize: maxszc; ++ readsize = (epread->wMaxPacketSize > maxszr)? ++ epread->wMaxPacketSize: maxszr; ++ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? ++ epwrite->wMaxPacketSize: maxszw; ++ + acm->iface = cfacm->interface + j; + acm->minor = minor; + acm->dev = dev; +@@ -740,6 +749,16 @@ + module_init(acm_init); + module_exit(acm_exit); + ++ ++MODULE_PARM(maxszr, "i"); ++MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); ++ ++MODULE_PARM(maxszw, "i"); ++MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); ++ ++MODULE_PARM(maxszc, "i"); ++MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); ++ + MODULE_AUTHOR( DRIVER_AUTHOR ); + MODULE_DESCRIPTION( DRIVER_DESC ); + MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-mtx-1-2.4.27/39-mppe-mpc.patch b/packages/linux/linux-mtx-1-2.4.27/39-mppe-mpc.patch new file mode 100644 index 0000000000..28ce19d467 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/39-mppe-mpc.patch @@ -0,0 +1,1665 @@ +diff -ruN linux.orig/Documentation/Configure.help linux/Documentation/Configure.help +--- linux.orig/Documentation/Configure.help 2004-08-08 12:14:49.000000000 +0200 ++++ linux/Documentation/Configure.help 2004-08-15 09:22:18.000000000 +0200 +@@ -9905,6 +9905,28 @@ + module; it is called bsd_comp.o and will show up in the directory + modules once you have said "make modules". If unsure, say N. + ++Microsoft PPP compression/encryption (MPPC/MPPE) ++CONFIG_PPP_MPPE_MPPC ++ Support for the Microsoft Point-To-Point Compression (RFC2118) and ++ Microsoft Point-To-Point Encryption (RFC3078). These protocols are ++ supported by Microsoft Windows and wide range of "hardware" access ++ servers. MPPE is common protocol in Virtual Private Networks. According ++ to RFC3078, MPPE supports 40, 56 and 128-bit key lengths. Depending on ++ PPP daemon configuration on both ends of the link, following scenarios ++ are possible: ++ - only compression (MPPC) is used, ++ - only encryption (MPPE) is used, ++ - compression and encryption (MPPC+MPPE) are used. ++ ++ Please note that Hi/Fn (http://www.hifn.com) holds patent on MPPC so ++ you should check if this patent is valid in your country in order to ++ avoid legal problems. ++ ++ For more information please visit http://free.polbox.pl/h/hs001 ++ ++ To compile this driver as a module, choose M here. The module will ++ be called ppp_mppe_mppc.o. ++ + PPP over Ethernet + CONFIG_PPPOE + Support for PPP over Ethernet. +diff -ruN linux.orig/crypto/Config.in linux/crypto/Config.in +--- linux.orig/crypto/Config.in 2004-08-08 12:14:50.000000000 +0200 ++++ linux/crypto/Config.in 2004-08-15 11:36:18.000000000 +0200 +@@ -11,7 +11,9 @@ + "$CONFIG_INET6_AH" = "y" -o \ + "$CONFIG_INET6_AH" = "m" -o \ + "$CONFIG_INET6_ESP" = "y" -o \ +- "$CONFIG_INET6_ESP" = "m" ]; then ++ "$CONFIG_INET6_ESP" = "m" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "m" ]; then + define_bool CONFIG_CRYPTO y + else + bool 'Cryptographic API' CONFIG_CRYPTO +@@ -44,6 +46,7 @@ + else + tristate ' MD5 digest algorithm' CONFIG_CRYPTO_MD5 + fi ++ + if [ "$CONFIG_INET_AH" = "y" -o \ + "$CONFIG_INET_AH" = "m" -o \ + "$CONFIG_INET_ESP" = "y" -o \ +@@ -51,11 +54,24 @@ + "$CONFIG_INET6_AH" = "y" -o \ + "$CONFIG_INET6_AH" = "m" -o \ + "$CONFIG_INET6_ESP" = "y" -o \ +- "$CONFIG_INET6_ESP" = "m" ]; then +- define_bool CONFIG_CRYPTO_SHA1 y +- else +- tristate ' SHA1 digest algorithm' CONFIG_CRYPTO_SHA1 ++ "$CONFIG_INET6_ESP" = "m" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "m" ]; then ++ if [ "$CONFIG_INET_AH" = "y" -o \ ++ "$CONFIG_INET_ESP" = "y" -o \ ++ "$CONFIG_INET6_AH" = "y" -o \ ++ "$CONFIG_INET6_ESP" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "y" ]; then ++ define_tristate CONFIG_CRYPTO_SHA1 y ++ else ++ if [ "$CONFIG_CRYPTO_SHA1" != "y" -a \ ++ "$CONFIG_CRYPTO_SHA1" != "m" ]; then ++ define_tristate CONFIG_CRYPTO_SHA1 m ++ fi ++ fi + fi ++ tristate ' SHA1 digest algorithm' CONFIG_CRYPTO_SHA1 ++ + tristate ' SHA256 digest algorithm' CONFIG_CRYPTO_SHA256 + tristate ' SHA384 and SHA512 digest algorithms' CONFIG_CRYPTO_SHA512 + if [ "$CONFIG_INET_ESP" = "y" -o \ +@@ -73,7 +89,20 @@ + tristate ' CAST5 (CAST-128) cipher algorithm' CONFIG_CRYPTO_CAST5 + tristate ' CAST6 (CAST-256) cipher algorithm' CONFIG_CRYPTO_CAST6 + tristate ' TEA and XTEA cipher algorithms' CONFIG_CRYPTO_TEA ++ ++ if [ "$CONFIG_PPP_MPPE_MPPC" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "m" ]; then ++ if [ "$CONFIG_PPP_MPPE_MPPC" = "y" ]; then ++ define_tristate CONFIG_CRYPTO_ARC4 y ++ else ++ if [ "$CONFIG_CRYPTO_ARC4" != "y" -a \ ++ "$CONFIG_CRYPTO_ARC4" != "m" ]; then ++ define_tristate CONFIG_CRYPTO_ARC4 m ++ fi ++ fi ++ fi + tristate ' ARC4 cipher algorithm' CONFIG_CRYPTO_ARC4 ++ + if [ "$CONFIG_INET_IPCOMP" = "y" -o \ + "$CONFIG_INET_IPCOMP" = "m" -o \ + "$CONFIG_INET6_IPCOMP" = "y" -o \ +diff -ruN linux.orig/drivers/net/Config.in linux/drivers/net/Config.in +--- linux.orig/drivers/net/Config.in 2004-08-08 12:14:52.000000000 +0200 ++++ linux/drivers/net/Config.in 2004-08-08 12:17:43.000000000 +0200 +@@ -325,6 +325,7 @@ + dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP + dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP + dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP ++ dep_tristate ' Microsoft PPP compression/encryption (MPPC/MPPE)' CONFIG_PPP_MPPE_MPPC $CONFIG_PPP + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP + fi +diff -ruN linux.orig/drivers/net/Makefile linux/drivers/net/Makefile +--- linux.orig/drivers/net/Makefile 2004-08-08 12:14:52.000000000 +0200 ++++ linux/drivers/net/Makefile 2004-08-08 12:17:43.000000000 +0200 +@@ -161,6 +161,7 @@ + obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o + obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o + obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o ++obj-$(CONFIG_PPP_MPPE_MPPC) += ppp_mppe_mppc.o + obj-$(CONFIG_PPPOE) += pppox.o pppoe.o + + obj-$(CONFIG_SLIP) += slip.o +diff -ruN linux.orig/drivers/net/ppp_generic.c linux/drivers/net/ppp_generic.c +--- linux.orig/drivers/net/ppp_generic.c 2003-08-25 13:44:42.000000000 +0200 ++++ linux/drivers/net/ppp_generic.c 2004-08-08 12:17:43.000000000 +0200 +@@ -19,7 +19,7 @@ + * PPP driver, written by Michael Callahan and Al Longyear, and + * subsequently hacked by Paul Mackerras. + * +- * ==FILEVERSION 20020217== ++ * ==FILEVERSION 20040509== + */ + + #include <linux/config.h> +@@ -102,6 +102,7 @@ + spinlock_t rlock; /* lock for receive side 58 */ + spinlock_t wlock; /* lock for transmit side 5c */ + int mru; /* max receive unit 60 */ ++ int mru_alloc; /* MAX(1500,MRU) for dev_alloc_skb() */ + unsigned int flags; /* control bits 64 */ + unsigned int xstate; /* transmit state bits 68 */ + unsigned int rstate; /* receive state bits 6c */ +@@ -552,7 +553,9 @@ + case PPPIOCSMRU: + if (get_user(val, (int *) arg)) + break; +- ppp->mru = val; ++ ppp->mru_alloc = ppp->mru = val; ++ if (ppp->mru_alloc < PPP_MRU) ++ ppp->mru_alloc = PPP_MRU; /* increase for broken peers */ + err = 0; + break; + +@@ -1025,14 +1028,37 @@ + case PPP_CCP: + /* peek at outbound CCP frames */ + ppp_ccp_peek(ppp, skb, 0); ++ /* ++ * When LZS or MPPE/MPPC has been negotiated we don't send ++ * CCP_RESETACK after receiving CCP_RESETREQ; in fact pppd ++ * sends such a packet but we silently discard it here ++ */ ++ if (CCP_CODE(skb->data+2) == CCP_RESETACK ++ && (ppp->xcomp->compress_proto == CI_MPPE ++ || ppp->xcomp->compress_proto == CI_LZS)) { ++ --ppp->stats.tx_packets; ++ ppp->stats.tx_bytes -= skb->len - 2; ++ kfree_skb(skb); ++ return; ++ } + break; + } + + /* try to do packet compression */ + if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state != 0 + && proto != PPP_LCP && proto != PPP_CCP) { +- new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len, +- GFP_ATOMIC); ++ int comp_ovhd = 0; ++ /* ++ * because of possible data expansion when MPPC or LZS ++ * is used, allocate compressor's buffer 12.5% bigger ++ * than MTU ++ */ ++ if (ppp->xcomp->compress_proto == CI_MPPE) ++ comp_ovhd = ((ppp->dev->mtu * 9) / 8) + 1 + MPPE_OVHD; ++ else if (ppp->xcomp->compress_proto == CI_LZS) ++ comp_ovhd = ((ppp->dev->mtu * 9) / 8) + 1 + LZS_OVHD; ++ new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len ++ + comp_ovhd, GFP_ATOMIC); + if (new_skb == 0) { + printk(KERN_ERR "PPP: no memory (comp pkt)\n"); + goto drop; +@@ -1050,9 +1076,21 @@ + skb = new_skb; + skb_put(skb, len); + skb_pull(skb, 2); /* pull off A/C bytes */ +- } else { ++ } else if (len == 0) { + /* didn't compress, or CCP not up yet */ + kfree_skb(new_skb); ++ } else { ++ /* ++ * (len < 0) ++ * MPPE requires that we do not send unencrypted ++ * frames. The compressor will return -1 if we ++ * should drop the frame. We cannot simply test ++ * the compress_proto because MPPE and MPPC share ++ * the same number. ++ */ ++ printk(KERN_ERR "ppp: compressor dropped pkt\n"); ++ kfree_skb(new_skb); ++ goto drop; + } + } + +@@ -1540,14 +1578,15 @@ + int len; + + if (proto == PPP_COMP) { +- ns = dev_alloc_skb(ppp->mru + PPP_HDRLEN); ++ ns = dev_alloc_skb(ppp->mru_alloc + PPP_HDRLEN); + if (ns == 0) { + printk(KERN_ERR "ppp_decompress_frame: no memory\n"); + goto err; + } + /* the decompressor still expects the A/C bytes in the hdr */ + len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2, +- skb->len + 2, ns->data, ppp->mru + PPP_HDRLEN); ++ skb->len + 2, ns->data, ++ ppp->mru_alloc + PPP_HDRLEN); + if (len < 0) { + /* Pass the compressed frame to pppd as an + error indication. */ +@@ -1573,7 +1612,14 @@ + return skb; + + err: +- ppp->rstate |= SC_DC_ERROR; ++ if (ppp->rcomp->compress_proto != CI_MPPE ++ && ppp->rcomp->compress_proto != CI_LZS) { ++ /* ++ * If decompression protocol isn't MPPE/MPPC or LZS, we set ++ * SC_DC_ERROR flag and wait for CCP_RESETACK ++ */ ++ ppp->rstate |= SC_DC_ERROR; ++ } + ppp_receive_error(ppp); + return skb; + } +@@ -2253,6 +2299,7 @@ + /* Initialize the new ppp unit */ + ppp->file.index = unit; + ppp->mru = PPP_MRU; ++ ppp->mru_alloc = PPP_MRU; + init_ppp_file(&ppp->file, INTERFACE); + ppp->file.hdrlen = PPP_HDRLEN - 2; /* don't count proto bytes */ + for (i = 0; i < NUM_NP; ++i) +diff -ruN linux.orig/drivers/net/ppp_mppe_mppc.c linux/drivers/net/ppp_mppe_mppc.c +--- linux.orig/drivers/net/ppp_mppe_mppc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/net/ppp_mppe_mppc.c 2004-08-15 10:12:23.000000000 +0200 +@@ -0,0 +1,1269 @@ ++/* ++ * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module. ++ * ++ * Copyright (c) 1994 Árpád Magosányi <mag@bunuel.tii.matav.hu> ++ * Copyright (c) 1999 Tim Hockin, Cobalt Networks Inc. <thockin@cobaltnet.com> ++ * Copyright (c) 2002-2004 Jan Dubiec <jdx@slackware.pl> ++ * ++ * 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 code is based on MPPE kernel module written by Árpád Magosányi and ++ * Tim Hockin which can be found on http://planetmirror.com/pub/mppe/. ++ * I have added MPPC and 56 bit session keys support in MPPE. ++ * ++ * WARNING! Although this is open source code, its usage in some countries ++ * (in particular in the USA) may violate Stac Inc. patent for MPPC. ++ * ++ * ==FILEVERSION 20040815== ++ * ++ */ ++ ++#include <linux/init.h> ++#include <linux/module.h> ++#include <linux/mm.h> ++#include <linux/slab.h> ++#include <asm/scatterlist.h> ++#include <linux/vmalloc.h> ++#include <linux/crypto.h> ++ ++#include <linux/ppp_defs.h> ++#include <linux/ppp-comp.h> ++ ++/* ++ * In 2.4.x kernels macro offset_in_page() is not defined in linux/mm.h so ++ * we define it here; PAGE_MASK is defined in asm/page.h which is included ++ * by linux/mm.h. ++ */ ++#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) ++ ++/* ++ * State for a mppc/mppe "(de)compressor". ++ */ ++struct ppp_mppe_state { ++ struct crypto_tfm *arc4_tfm; ++ struct crypto_tfm *sha1_tfm; ++ u8 master_key[MPPE_MAX_KEY_LEN]; ++ u8 session_key[MPPE_MAX_KEY_LEN]; ++ u8 mppc; /* do we use compression (MPPC)? */ ++ u8 mppe; /* do we use encryption (MPPE)? */ ++ u8 keylen; /* key length in bytes */ ++ u8 bitkeylen; /* key length in bits */ ++ u16 ccount; /* coherency counter */ ++ u16 bits; /* MPPC/MPPE control bits */ ++ u8 stateless; /* do we use stateless mode? */ ++ u8 nextflushed; /* set A bit in the next outgoing packet; ++ used only by compressor*/ ++ u8 flushexpected; /* drop packets until A bit is received; ++ used only by decompressor*/ ++ u8 *hist; /* MPPC history */ ++ u16 *hash; /* Hash table; used only by compressor */ ++ u16 histptr; /* history "cursor" */ ++ int unit; ++ int debug; ++ int mru; ++ struct compstat stats; ++}; ++ ++#define MPPE_HIST_LEN 8192 /* MPPC history size */ ++#define MPPE_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define MPPE_BIT_FLUSHED 0x80 /* bit A */ ++#define MPPE_BIT_RESET 0x40 /* bit B */ ++#define MPPE_BIT_COMP 0x20 /* bit C */ ++#define MPPE_BIT_ENCRYPTED 0x10 /* bit D */ ++ ++#define MPPE_SALT0 0xD1 /* values used in MPPE key derivation */ ++#define MPPE_SALT1 0x26 /* according to RFC3079 */ ++#define MPPE_SALT2 0x9E ++ ++#define MPPE_CCOUNT(x) ((((x)[4] & 0x0f) << 8) + (x)[5]) ++#define MPPE_BITS(x) ((x)[4] & 0xf0) ++#define MPPE_CTRLHI(x) ((((x)->ccount & 0xf00)>>8)|((x)->bits)) ++#define MPPE_CTRLLO(x) ((x)->ccount & 0xff) ++ ++static inline void ++setup_sg(struct scatterlist *sg, const void *address, unsigned int length) ++{ ++ sg[0].page = virt_to_page(address); ++ sg[0].offset = offset_in_page(address); ++ sg[0].length = length; ++} ++ ++static inline void ++arc4_setkey(struct ppp_mppe_state *state, const unsigned char *key, ++ const unsigned int keylen) ++{ ++ crypto_cipher_setkey(state->arc4_tfm, key, keylen); ++} ++ ++static inline void ++arc4_encrypt(struct ppp_mppe_state *state, const unsigned char *in, ++ const unsigned int len, unsigned char *out) ++{ ++ struct scatterlist sgin[4], sgout[4]; ++ ++ setup_sg(sgin, in, len); ++ setup_sg(sgout, out, len); ++ crypto_cipher_encrypt(state->arc4_tfm, sgout, sgin, len); ++} ++ ++#define arc4_decrypt arc4_encrypt ++ ++/* ++ * Key Derivation, from RFC 3078, RFC 3079. ++ * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079. ++ */ ++static void ++GetNewKeyFromSHA(struct ppp_mppe_state *state, unsigned char *MasterKey, ++ unsigned char *SessionKey, unsigned long SessionKeyLength, ++ unsigned char *InterimKey) ++{ ++ /*Pads used in key derivation */ ++ static const unsigned char SHAPad1[40] = { ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++ }; ++ ++ static const unsigned char SHAPad2[40] = { ++ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, ++ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, ++ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, ++ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2 ++ }; ++ ++ unsigned char Digest[20]; /* SHA1_DIGEST_SIZE = 20 */ ++ struct scatterlist sg[2]; ++ ++ crypto_digest_init(state->sha1_tfm); ++ ++ setup_sg(sg, MasterKey, SessionKeyLength); ++ crypto_digest_update(state->sha1_tfm, sg, 1); ++ ++ setup_sg(sg, SHAPad1, sizeof(SHAPad1)); ++ crypto_digest_update(state->sha1_tfm, sg, 1); ++ ++ setup_sg(sg, SessionKey, SessionKeyLength); ++ crypto_digest_update(state->sha1_tfm, sg, 1); ++ ++ setup_sg(sg, SHAPad2, sizeof(SHAPad2)); ++ crypto_digest_update(state->sha1_tfm, sg, 1); ++ ++ crypto_digest_final(state->sha1_tfm, Digest); ++ ++ memcpy(InterimKey, Digest, SessionKeyLength); ++} ++ ++static void ++mppe_change_key(struct ppp_mppe_state *state, int initialize) ++{ ++ unsigned char InterimKey[MPPE_MAX_KEY_LEN]; ++ ++ GetNewKeyFromSHA(state, state->master_key, state->session_key, ++ state->keylen, InterimKey); ++ if (initialize) { ++ memcpy(state->session_key, InterimKey, state->keylen); ++ } else { ++ arc4_setkey(state, InterimKey, state->keylen); ++ arc4_encrypt(state, InterimKey, state->keylen, state->session_key); ++ } ++ if (state->keylen == 8) { ++ if (state->bitkeylen == 40) { ++ state->session_key[0] = MPPE_SALT0; ++ state->session_key[1] = MPPE_SALT1; ++ state->session_key[2] = MPPE_SALT2; ++ } else { ++ state->session_key[0] = MPPE_SALT0; ++ } ++ } ++ arc4_setkey(state, state->session_key, state->keylen); ++} ++ ++/* increase 12-bit coherency counter */ ++static inline void ++mppe_increase_ccount(struct ppp_mppe_state *state) ++{ ++ state->ccount = (state->ccount + 1) & MPPE_MAX_CCOUNT; ++ if (state->mppe) { ++ if (state->stateless) { ++ mppe_change_key(state, 0); ++ state->nextflushed = 1; ++ } else { ++ if ((state->ccount & 0xff) == 0xff) { ++ mppe_change_key(state, 0); ++ } ++ } ++ } ++} ++ ++/* allocate space for a MPPE/MPPC (de)compressor. */ ++/* comp != 0 -> init compressor */ ++/* comp = 0 -> init decompressor */ ++static void * ++mppe_alloc(unsigned char *options, int opt_len, int comp) ++{ ++ struct ppp_mppe_state *state; ++ u8* fname; ++ ++ fname = comp ? "mppe_comp_alloc" : "mppe_decomp_alloc"; ++ ++ /* ++ * Hack warning - additionally to the standard MPPC/MPPE configuration ++ * options, pppd passes to the (de)copressor 8 or 16 byte session key. ++ * Therefore options[1] contains MPPC/MPPE configuration option length ++ * (CILEN_MPPE = 6), but the real options length, depending on the key ++ * length, is 6+8 or 6+16. ++ */ ++ if (opt_len < CILEN_MPPE) { ++ printk(KERN_WARNING "%s: wrong options length: %u\n", fname, opt_len); ++ return NULL; ++ } ++ ++ if (options[0] != CI_MPPE || options[1] != CILEN_MPPE || ++ (options[2] & ~MPPE_STATELESS) != 0 || ++ options[3] != 0 || options[4] != 0 || ++ (options[5] & ~(MPPE_128BIT|MPPE_56BIT|MPPE_40BIT|MPPE_MPPC)) != 0 || ++ (options[5] & (MPPE_128BIT|MPPE_56BIT|MPPE_40BIT|MPPE_MPPC)) == 0) { ++ printk(KERN_WARNING "%s: options rejected: o[0]=%02x, o[1]=%02x, " ++ "o[2]=%02x, o[3]=%02x, o[4]=%02x, o[5]=%02x\n", fname, options[0], ++ options[1], options[2], options[3], options[4], options[5]); ++ return NULL; ++ } ++ ++ state = (struct ppp_mppe_state *)kmalloc(sizeof(*state), GFP_KERNEL); ++ if (state == NULL) { ++ printk(KERN_ERR "%s: cannot allocate space for %scompressor\n", fname, ++ comp ? "" : "de"); ++ return NULL; ++ } ++ memset(state, 0, sizeof(struct ppp_mppe_state)); ++ ++ state->mppc = options[5] & MPPE_MPPC; /* Do we use MPPC? */ ++ state->mppe = options[5] & (MPPE_128BIT | MPPE_56BIT | ++ MPPE_40BIT); /* Do we use MPPE? */ ++ ++ if (state->mppc) { ++ /* allocate MPPC history */ ++ state->hist = (u8*)vmalloc(2*MPPE_HIST_LEN*sizeof(u8)); ++ if (state->hist == NULL) { ++ kfree(state); ++ printk(KERN_ERR "%s: cannot allocate space for MPPC history\n", ++ fname); ++ return NULL; ++ } ++ ++ /* allocate hashtable for MPPC compressor */ ++ if (comp) { ++ state->hash = (u16*)vmalloc(MPPE_HIST_LEN*sizeof(u16)); ++ if (state->hash == NULL) { ++ vfree(state->hist); ++ kfree(state); ++ printk(KERN_ERR "%s: cannot allocate space for MPPC history\n", ++ fname); ++ return NULL; ++ } ++ } ++ } ++ ++ if (state->mppe) { /* specific for MPPE */ ++ /* Load SHA1 algorithm */ ++ state->sha1_tfm = crypto_alloc_tfm("sha1", 0); ++ if (state->sha1_tfm == NULL) { ++ vfree(state->hash); ++ vfree(state->hist); ++ kfree(state); ++ printk(KERN_ERR "%s: cannot load SHA1 module\n", fname); ++ return NULL; ++ } ++ ++ /* Load ARC4 algorithm */ ++ state->arc4_tfm = crypto_alloc_tfm("arc4", 0); ++ if (state->arc4_tfm == NULL) { ++ crypto_free_tfm(state->sha1_tfm); ++ vfree(state->hash); ++ vfree(state->hist); ++ kfree(state); ++ printk(KERN_ERR "%s: cannot load ARC4 module\n", fname); ++ return NULL; ++ } ++ ++ memcpy(state->master_key, options+CILEN_MPPE, MPPE_MAX_KEY_LEN); ++ memcpy(state->session_key, state->master_key, MPPE_MAX_KEY_LEN); ++ /* initial key generation is done in mppe_init() */ ++ } ++ ++ MOD_INC_USE_COUNT; ++ ++ return (void *) state; ++} ++ ++static void * ++mppe_comp_alloc(unsigned char *options, int opt_len) ++{ ++ return mppe_alloc(options, opt_len, 1); ++} ++ ++static void * ++mppe_decomp_alloc(unsigned char *options, int opt_len) ++{ ++ return mppe_alloc(options, opt_len, 0); ++} ++ ++/* cleanup the (de)compressor */ ++static void ++mppe_comp_free(void *arg) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; ++ ++ if (state != NULL) { ++ if (state->mppe) { ++ if (state->sha1_tfm != NULL) ++ crypto_free_tfm(state->sha1_tfm); ++ if (state->arc4_tfm != NULL) ++ crypto_free_tfm(state->arc4_tfm); ++ } ++ if (state->hist != NULL) ++ vfree(state->hist); ++ if (state->hash != NULL) ++ vfree(state->hash); ++ kfree(state); ++ } ++ ++ MOD_DEC_USE_COUNT; ++} ++ ++/* init MPPC/MPPE (de)compresor */ ++/* comp != 0 -> init compressor */ ++/* comp = 0 -> init decompressor */ ++static int ++mppe_init(void *arg, unsigned char *options, int opt_len, int unit, ++ int hdrlen, int mru, int debug, int comp) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; ++ u8* fname; ++ ++ fname = comp ? "mppe_comp_init" : "mppe_decomp_init"; ++ ++ if (opt_len < CILEN_MPPE) { ++ if (debug) ++ printk(KERN_WARNING "%s: wrong options length: %u\n", ++ fname, opt_len); ++ return 0; ++ } ++ ++ if (options[0] != CI_MPPE || options[1] != CILEN_MPPE || ++ (options[2] & ~MPPE_STATELESS) != 0 || ++ options[3] != 0 || options[4] != 0 || ++ (options[5] & ~(MPPE_56BIT|MPPE_128BIT|MPPE_40BIT|MPPE_MPPC)) != 0 || ++ (options[5] & (MPPE_56BIT|MPPE_128BIT|MPPE_40BIT|MPPE_MPPC)) == 0) { ++ if (debug) ++ printk(KERN_WARNING "%s: options rejected: o[0]=%02x, o[1]=%02x, " ++ "o[2]=%02x, o[3]=%02x, o[4]=%02x, o[5]=%02x\n", fname, ++ options[0], options[1], options[2], options[3], options[4], ++ options[5]); ++ return 0; ++ } ++ ++ if ((options[5] & ~MPPE_MPPC) != MPPE_128BIT && ++ (options[5] & ~MPPE_MPPC) != MPPE_56BIT && ++ (options[5] & ~MPPE_MPPC) != MPPE_40BIT && ++ (options[5] & MPPE_MPPC) != MPPE_MPPC) { ++ if (debug) ++ printk(KERN_WARNING "%s: don't know what to do: o[5]=%02x\n", ++ fname, options[5]); ++ return 0; ++ } ++ ++ state->mppc = options[5] & MPPE_MPPC; /* Do we use MPPC? */ ++ state->mppe = options[5] & (MPPE_128BIT | MPPE_56BIT | ++ MPPE_40BIT); /* Do we use MPPE? */ ++ state->stateless = options[2] & MPPE_STATELESS; /* Do we use stateless mode? */ ++ ++ switch (state->mppe) { ++ case MPPE_40BIT: /* 40 bit key */ ++ state->keylen = 8; ++ state->bitkeylen = 40; ++ break; ++ case MPPE_56BIT: /* 56 bit key */ ++ state->keylen = 8; ++ state->bitkeylen = 56; ++ break; ++ case MPPE_128BIT: /* 128 bit key */ ++ state->keylen = 16; ++ state->bitkeylen = 128; ++ break; ++ default: ++ state->keylen = 0; ++ state->bitkeylen = 0; ++ } ++ ++ state->ccount = MPPE_MAX_CCOUNT; ++ state->bits = 0; ++ state->unit = unit; ++ state->debug = debug; ++ state->histptr = MPPE_HIST_LEN; ++ if (state->mppc) { /* reset history if MPPC was negotiated */ ++ memset(state->hist, 0, 2*MPPE_HIST_LEN*sizeof(u8)); ++ } ++ ++ if (state->mppe) { /* generate initial session keys */ ++ mppe_change_key(state, 1); ++ } ++ ++ if (comp) { /* specific for compressor */ ++ state->nextflushed = 1; ++ } else { /* specific for decompressor */ ++ state->mru = mru; ++ state->flushexpected = 1; ++ } ++ ++ return 1; ++} ++ ++static int ++mppe_comp_init(void *arg, unsigned char *options, int opt_len, int unit, ++ int hdrlen, int debug) ++{ ++ return mppe_init(arg, options, opt_len, unit, hdrlen, 0, debug, 1); ++} ++ ++ ++static int ++mppe_decomp_init(void *arg, unsigned char *options, int opt_len, int unit, ++ int hdrlen, int mru, int debug) ++{ ++ return mppe_init(arg, options, opt_len, unit, hdrlen, mru, debug, 0); ++} ++ ++static void ++mppe_comp_reset(void *arg) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *)arg; ++ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: resetting MPPC/MPPE compressor\n", ++ __FUNCTION__, state->unit); ++ ++ state->nextflushed = 1; ++ if (state->mppe) ++ arc4_setkey(state, state->session_key, state->keylen); ++} ++ ++static void ++mppe_decomp_reset(void *arg) ++{ ++ /* When MPPC/MPPE is in use, we shouldn't receive any CCP Reset-Ack. ++ But when we receive such a packet, we just ignore it. */ ++ return; ++} ++ ++static void ++mppe_stats(void *arg, struct compstat *stats) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *)arg; ++ ++ *stats = state->stats; ++} ++ ++/***************************/ ++/**** Compression stuff ****/ ++/***************************/ ++/* inserts 1 to 8 bits into the output buffer */ ++static inline void putbits8(u8 *buf, u32 val, const u32 n, u32 *i, u32 *l) ++{ ++ buf += *i; ++ if (*l >= n) { ++ *l = (*l) - n; ++ val <<= *l; ++ *buf = *buf | (val & 0xff); ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ *(++buf) = 0; ++ } ++ } else { ++ (*i)++; ++ *l = 8 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 8) & 0xff); ++ *(++buf) = val & 0xff; ++ } ++} ++ ++/* inserts 9 to 16 bits into the output buffer */ ++static inline void putbits16(u8 *buf, u32 val, const u32 n, u32 *i, u32 *l) ++{ ++ buf += *i; ++ if (*l >= n - 8) { ++ (*i)++; ++ *l = 8 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 8) & 0xff); ++ *(++buf) = val & 0xff; ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ *(++buf) = 0; ++ } ++ } else { ++ (*i)++; (*i)++; ++ *l = 16 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 16) & 0xff); ++ *(++buf) = (val >> 8) & 0xff; ++ *(++buf) = val & 0xff; ++ } ++} ++ ++/* inserts 17 to 24 bits into the output buffer */ ++static inline void putbits24(u8 *buf, u32 val, const u32 n, u32 *i, u32 *l) ++{ ++ buf += *i; ++ if (*l >= n - 16) { ++ (*i)++; (*i)++; ++ *l = 16 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 16) & 0xff); ++ *(++buf) = (val >> 8) & 0xff; ++ *(++buf) = val & 0xff; ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ *(++buf) = 0; ++ } ++ } else { ++ (*i)++; (*i)++; (*i)++; ++ *l = 24 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 24) & 0xff); ++ *(++buf) = (val >> 16) & 0xff; ++ *(++buf) = (val >> 8) & 0xff; ++ *(++buf) = val & 0xff; ++ } ++} ++ ++static int ++mppc_compress(struct ppp_mppe_state *state, unsigned char *ibuf, ++ unsigned char *obuf, int isize, int osize) ++{ ++ u32 olen, off, len, idx, i, l; ++ u8 *hist, *sbuf, *p, *q, *r, *s; ++ ++ /* ++ At this point, to avoid possible buffer overflow caused by packet ++ expansion during/after compression, we should make sure that ++ osize >= (((isize*9)/8)+1)+2, but we don't do that because in ++ ppp_generic.c we simply allocate bigger obuf. ++ ++ Maximum MPPC packet expansion is 12.5%. This is the worst case when ++ all octets in the input buffer are >= 0x80 and we cannot find any ++ repeated tokens. Additionally we have to reserve 2 bytes for MPPE/MPPC ++ status bits and coherency counter. ++ */ ++ ++ hist = state->hist + MPPE_HIST_LEN; ++ /* check if there is enough room at the end of the history */ ++ if (state->histptr + isize >= 2*MPPE_HIST_LEN) { ++ state->bits |= MPPE_BIT_RESET; ++ state->histptr = MPPE_HIST_LEN; ++ memcpy(state->hist, hist, MPPE_HIST_LEN); ++ } ++ /* add packet to the history; isize must be <= MPPE_HIST_LEN */ ++ sbuf = state->hist + state->histptr; ++ memcpy(sbuf, ibuf, isize); ++ state->histptr += isize; ++ ++ /* compress data */ ++ r = sbuf + isize; ++ *obuf = olen = i = 0; ++ l = 8; ++ while (i < isize - 2) { ++ s = q = sbuf + i; ++ idx = ((40543*((((s[0]<<4)^s[1])<<4)^s[2]))>>4) & 0x1fff; ++ p = hist + state->hash[idx]; ++ state->hash[idx] = (u16) (s - hist); ++ off = s - p; ++ if (off > MPPE_HIST_LEN - 1 || off < 1 || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++) { ++ /* no match found; encode literal byte */ ++ if (ibuf[i] < 0x80) { /* literal byte < 0x80 */ ++ putbits8(obuf, (u32) ibuf[i], 8, &olen, &l); ++ } else { /* literal byte >= 0x80 */ ++ putbits16(obuf, (u32) (0x100|(ibuf[i]&0x7f)), 9, &olen, &l); ++ } ++ ++i; ++ continue; ++ } ++ if (r - q >= 64) { ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++; ++ if (s - q == 64) { ++ p--; s--; ++ while((*p++ == *s++) && (s < r) && (p < q)); ++ } ++ } else { ++ while((*p++ == *s++) && (s < r) && (p < q)); ++ } ++ len = s - q - 1; ++ i += len; ++ ++ /* at least 3 character match found; code data */ ++ /* encode offset */ ++ if (off < 64) { /* 10-bit offset; 0 <= offset < 64 */ ++ putbits16(obuf, 0x3c0|off, 10, &olen, &l); ++ } else if (off < 320) { /* 12-bit offset; 64 <= offset < 320 */ ++ putbits16(obuf, 0xe00|(off-64), 12, &olen, &l); ++ } else if (off < 8192) { /* 16-bit offset; 320 <= offset < 8192 */ ++ putbits16(obuf, 0xc000|(off-320), 16, &olen, &l); ++ } else { ++ /* This shouldn't happen; we return 0 what means "packet expands", ++ and we send packet uncompressed. */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: wrong offset value: %d\n", ++ __FUNCTION__, state->unit, off); ++ return 0; ++ } ++ /* encode length of match */ ++ if (len < 4) { /* length = 3 */ ++ putbits8(obuf, 0, 1, &olen, &l); ++ } else if (len < 8) { /* 4 <= length < 8 */ ++ putbits8(obuf, 0x08|(len&0x03), 4, &olen, &l); ++ } else if (len < 16) { /* 8 <= length < 16 */ ++ putbits8(obuf, 0x30|(len&0x07), 6, &olen, &l); ++ } else if (len < 32) { /* 16 <= length < 32 */ ++ putbits8(obuf, 0xe0|(len&0x0f), 8, &olen, &l); ++ } else if (len < 64) { /* 32 <= length < 64 */ ++ putbits16(obuf, 0x3c0|(len&0x1f), 10, &olen, &l); ++ } else if (len < 128) { /* 64 <= length < 128 */ ++ putbits16(obuf, 0xf80|(len&0x3f), 12, &olen, &l); ++ } else if (len < 256) { /* 128 <= length < 256 */ ++ putbits16(obuf, 0x3f00|(len&0x7f), 14, &olen, &l); ++ } else if (len < 512) { /* 256 <= length < 512 */ ++ putbits16(obuf, 0xfe00|(len&0xff), 16, &olen, &l); ++ } else if (len < 1024) { /* 512 <= length < 1024 */ ++ putbits24(obuf, 0x3fc00|(len&0x1ff), 18, &olen, &l); ++ } else if (len < 2048) { /* 1024 <= length < 2048 */ ++ putbits24(obuf, 0xff800|(len&0x3ff), 20, &olen, &l); ++ } else if (len < 4096) { /* 2048 <= length < 4096 */ ++ putbits24(obuf, 0x3ff000|(len&0x7ff), 22, &olen, &l); ++ } else if (len < 8192) { /* 4096 <= length < 8192 */ ++ putbits24(obuf, 0xffe000|(len&0xfff), 24, &olen, &l); ++ } else { ++ /* This shouldn't happen; we return 0 what means "packet expands", ++ and send packet uncompressed. */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: wrong length of match value: %d\n", ++ __FUNCTION__, state->unit, len); ++ return 0; ++ } ++ } ++ ++ /* Add remaining octets to the output */ ++ while(isize - i > 0) { ++ if (ibuf[i] < 0x80) { /* literal byte < 0x80 */ ++ putbits8(obuf, (u32) ibuf[i++], 8, &olen, &l); ++ } else { /* literal byte >= 0x80 */ ++ putbits16(obuf, (u32) (0x100|(ibuf[i++]&0x7f)), 9, &olen, &l); ++ } ++ } ++ /* Reset unused bits of the last output octet */ ++ if ((l != 0) && (l != 8)) { ++ putbits8(obuf, 0, l, &olen, &l); ++ } ++ ++ return (int) olen; ++} ++ ++int ++mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf, ++ int isize, int osize) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; ++ int proto, olen, complen, off; ++ unsigned char *wptr; ++ ++ /* Check that the protocol is in the range we handle. */ ++ proto = PPP_PROTOCOL(ibuf); ++ if (proto < 0x0021 || proto > 0x00fa) ++ return 0; ++ ++ wptr = obuf; ++ /* Copy over the PPP header */ ++ wptr[0] = PPP_ADDRESS(ibuf); ++ wptr[1] = PPP_CONTROL(ibuf); ++ wptr[2] = PPP_COMP >> 8; ++ wptr[3] = PPP_COMP; ++ wptr += PPP_HDRLEN + (MPPE_OVHD / 2); /* Leave two octets for MPPE/MPPC bits */ ++ ++ /* ++ * In ver. 0.99 protocol field was compressed. Deflate and BSD compress ++ * do PFC before actual compression, RCF2118 and RFC3078 are not precise ++ * on this topic so I decided to do PFC. Unfortunately this change caused ++ * incompatibility with older/other MPPE/MPPC modules. I have received ++ * a lot of complaints from unexperienced users so I have decided to revert ++ * to previous state, i.e. the protocol field is sent uncompressed now. ++ * Although this may be changed in the future. ++ * ++ * Receiving side (mppe_decompress()) still accepts packets with compressed ++ * and uncompressed protocol field so you shouldn't get "Unsupported protocol ++ * 0x2145 received" messages anymore. ++ */ ++ //off = (proto > 0xff) ? 2 : 3; /* PFC - skip first protocol byte if 0 */ ++ off = 2; ++ ++ ibuf += off; ++ ++ mppe_increase_ccount(state); ++ ++ if (state->nextflushed) { ++ state->bits |= MPPE_BIT_FLUSHED; ++ state->nextflushed = 0; ++ if (state->mppe && !state->stateless) { ++ /* ++ * If this is the flag packet, the key has been already changed in ++ * mppe_increase_ccount() so we dont't do it once again. ++ */ ++ if ((state->ccount & 0xff) != 0xff) { ++ arc4_setkey(state, state->session_key, state->keylen); ++ } ++ } ++ if (state->mppc) { /* reset history */ ++ state->bits |= MPPE_BIT_RESET; ++ state->histptr = MPPE_HIST_LEN; ++ memset(state->hist + MPPE_HIST_LEN, 0, MPPE_HIST_LEN*sizeof(u8)); ++ } ++ } ++ ++ if (state->mppc && !state->mppe) { /* Do only compression */ ++ complen = mppc_compress(state, ibuf, wptr, isize - off, ++ osize - PPP_HDRLEN - (MPPE_OVHD / 2)); ++ /* ++ * TODO: Implement an heuristics to handle packet expansion in a smart ++ * way. Now, when a packet expands, we send it as uncompressed and ++ * when next packet is sent we have to reset compressor's history. ++ * Maybe it would be better to send such packet as compressed in order ++ * to keep history's continuity. ++ */ ++ if ((complen > isize) || (complen > osize - PPP_HDRLEN) || ++ (complen == 0)) { ++ /* packet expands */ ++ state->nextflushed = 1; ++ memcpy(wptr, ibuf, isize - off); ++ olen = isize - (off - 2) + MPPE_OVHD; ++ (state->stats).inc_bytes += olen; ++ (state->stats).inc_packets++; ++ } else { ++ state->bits |= MPPE_BIT_COMP; ++ olen = complen + PPP_HDRLEN + (MPPE_OVHD / 2); ++ (state->stats).comp_bytes += olen; ++ (state->stats).comp_packets++; ++ } ++ } else { /* Do encryption with or without compression */ ++ state->bits |= MPPE_BIT_ENCRYPTED; ++ if (!state->mppc && state->mppe) { /* Do only encryption */ ++ /* read from ibuf, write to wptr, adjust for PPP_HDRLEN */ ++ arc4_encrypt(state, ibuf, isize - off, wptr); ++ olen = isize - (off - 2) + MPPE_OVHD; ++ (state->stats).inc_bytes += olen; ++ (state->stats).inc_packets++; ++ } else { /* Do compression and then encryption - RFC3078 */ ++ complen = mppc_compress(state, ibuf, wptr, isize - off, ++ osize - PPP_HDRLEN - (MPPE_OVHD / 2)); ++ /* ++ * TODO: Implement an heuristics to handle packet expansion in a smart ++ * way. Now, when a packet expands, we send it as uncompressed and ++ * when next packet is sent we have to reset compressor's history. ++ * Maybe it would be good to send such packet as compressed in order ++ * to keep history's continuity. ++ */ ++ if ((complen > isize) || (complen > osize - PPP_HDRLEN) || ++ (complen == 0)) { ++ /* packet expands */ ++ state->nextflushed = 1; ++ arc4_encrypt(state, ibuf, isize - off, wptr); ++ olen = isize - (off - 2) + MPPE_OVHD; ++ (state->stats).inc_bytes += olen; ++ (state->stats).inc_packets++; ++ } else { ++ state->bits |= MPPE_BIT_COMP; ++ /* Hack warning !!! RC4 implementation which we use does ++ encryption "in place" - it means that input and output ++ buffers can be *the same* memory area. Therefore we don't ++ need to use a temporary buffer. But be careful - other ++ implementations don't have to be so nice. ++ I used to use ibuf as temporary buffer here, but it led ++ packet sniffers into error. Thanks to Wilfried Weissmann ++ for pointing that. */ ++ arc4_encrypt(state, wptr, complen, wptr); ++ olen = complen + PPP_HDRLEN + (MPPE_OVHD / 2); ++ (state->stats).comp_bytes += olen; ++ (state->stats).comp_packets++; ++ } ++ } ++ } ++ ++ /* write status bits and coherency counter into the output buffer */ ++ wptr = obuf + PPP_HDRLEN; ++ wptr[0] = MPPE_CTRLHI(state); ++ wptr[1] = MPPE_CTRLLO(state); ++ ++ state->bits = 0; ++ ++ (state->stats).unc_bytes += isize; ++ (state->stats).unc_packets++; ++ ++ return olen; ++} ++ ++/***************************/ ++/*** Decompression stuff ***/ ++/***************************/ ++static inline u32 getbits(const u8 *buf, const u32 n, u32 *i, u32 *l) ++{ ++ static const u32 m[] = {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff}; ++ u32 res, ol; ++ ++ ol = *l; ++ if (*l >= n) { ++ *l = (*l) - n; ++ res = (buf[*i] & m[ol]) >> (*l); ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ } ++ } else { ++ *l = 8 - n + (*l); ++ res = (buf[(*i)++] & m[ol]) << 8; ++ res = (res | buf[*i]) >> (*l); ++ } ++ ++ return res; ++} ++ ++static inline u32 getbyte(const u8 *buf, const u32 i, const u32 l) ++{ ++ if (l == 8) { ++ return buf[i]; ++ } else { ++ return (((buf[i] << 8) | buf[i+1]) >> l) & 0xff; ++ } ++} ++ ++static inline void lamecopy(u8 *dst, u8 *src, u32 len) ++{ ++ while (len--) ++ *dst++ = *src++; ++} ++ ++static int ++mppc_decompress(struct ppp_mppe_state *state, unsigned char *ibuf, ++ unsigned char *obuf, int isize, int osize) ++{ ++ u32 olen, off, len, bits, val, sig, i, l; ++ u8 *history, *s; ++ ++ history = state->hist + state->histptr; ++ olen = len = i = 0; ++ l = 8; ++ bits = isize * 8; ++ while (bits >= 8) { ++ val = getbyte(ibuf, i++, l); ++ if (val < 0x80) { /* literal byte < 0x80 */ ++ if (state->histptr < 2*MPPE_HIST_LEN) { ++ /* copy uncompressed byte to the history */ ++ (state->hist)[(state->histptr)++] = (u8) val; ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: trying to write outside history " ++ "buffer\n", __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ olen++; ++ bits -= 8; ++ continue; ++ } ++ ++ sig = val & 0xc0; ++ if (sig == 0x80) { /* literal byte >= 0x80 */ ++ if (state->histptr < 2*MPPE_HIST_LEN) { ++ /* copy uncompressed byte to the history */ ++ (state->hist)[(state->histptr)++] = ++ (u8) (0x80|((val&0x3f)<<1)|getbits(ibuf, 1 , &i ,&l)); ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: trying to write outside history " ++ "buffer\n", __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ olen++; ++ bits -= 9; ++ continue; ++ } ++ ++ /* Not a literal byte so it must be an (offset,length) pair */ ++ /* decode offset */ ++ sig = val & 0xf0; ++ if (sig == 0xf0) { /* 10-bit offset; 0 <= offset < 64 */ ++ off = (((val&0x0f)<<2)|getbits(ibuf, 2 , &i ,&l)); ++ bits -= 10; ++ } else { ++ if (sig == 0xe0) { /* 12-bit offset; 64 <= offset < 320 */ ++ off = ((((val&0x0f)<<4)|getbits(ibuf, 4 , &i ,&l))+64); ++ bits -= 12; ++ } else { ++ if ((sig&0xe0) == 0xc0) {/* 16-bit offset; 320 <= offset < 8192 */ ++ off = ((((val&0x1f)<<8)|getbyte(ibuf, i++, l))+320); ++ bits -= 16; ++ if (off > MPPE_HIST_LEN - 1) { ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: too big offset value: %d\n", ++ __FUNCTION__, state->unit, off); ++ return DECOMP_ERROR; ++ } ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: cannot decode offset value\n", ++ __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ } ++ } ++ /* decode length of match */ ++ val = getbyte(ibuf, i, l); ++ if ((val & 0x80) == 0x00) { /* len = 3 */ ++ len = 3; ++ bits--; ++ getbits(ibuf, 1 , &i ,&l); ++ } else if ((val & 0xc0) == 0x80) { /* 4 <= len < 8 */ ++ len = 0x04 | ((val>>4) & 0x03); ++ bits -= 4; ++ getbits(ibuf, 4 , &i ,&l); ++ } else if ((val & 0xe0) == 0xc0) { /* 8 <= len < 16 */ ++ len = 0x08 | ((val>>2) & 0x07); ++ bits -= 6; ++ getbits(ibuf, 6 , &i ,&l); ++ } else if ((val & 0xf0) == 0xe0) { /* 16 <= len < 32 */ ++ len = 0x10 | (val & 0x0f); ++ bits -= 8; ++ i++; ++ } else { ++ bits -= 8; ++ val = (val << 8) | getbyte(ibuf, ++i, l); ++ if ((val & 0xf800) == 0xf000) { /* 32 <= len < 64 */ ++ len = 0x0020 | ((val >> 6) & 0x001f); ++ bits -= 2; ++ getbits(ibuf, 2 , &i ,&l); ++ } else if ((val & 0xfc00) == 0xf800) { /* 64 <= len < 128 */ ++ len = 0x0040 | ((val >> 4) & 0x003f); ++ bits -= 4; ++ getbits(ibuf, 4 , &i ,&l); ++ } else if ((val & 0xfe00) == 0xfc00) { /* 128 <= len < 256 */ ++ len = 0x0080 | ((val >> 2) & 0x007f); ++ bits -= 6; ++ getbits(ibuf, 6 , &i ,&l); ++ } else if ((val & 0xff00) == 0xfe00) { /* 256 <= len < 512 */ ++ len = 0x0100 | (val & 0x00ff); ++ bits -= 8; ++ i++; ++ } else { ++ bits -= 8; ++ val = (val << 8) | getbyte(ibuf, ++i, l); ++ if ((val & 0xff8000) == 0xff0000) { /* 512 <= len < 1024 */ ++ len = 0x000200 | ((val >> 6) & 0x0001ff); ++ bits -= 2; ++ getbits(ibuf, 2 , &i ,&l); ++ } else if ((val & 0xffc000) == 0xff8000) {/* 1024 <= len < 2048 */ ++ len = 0x000400 | ((val >> 4) & 0x0003ff); ++ bits -= 4; ++ getbits(ibuf, 4 , &i ,&l); ++ } else if ((val & 0xffe000) == 0xffc000) {/* 2048 <= len < 4096 */ ++ len = 0x000800 | ((val >> 2) & 0x0007ff); ++ bits -= 6; ++ getbits(ibuf, 6 , &i ,&l); ++ } else if ((val & 0xfff000) == 0xffe000) {/* 4096 <= len < 8192 */ ++ len = 0x001000 | (val & 0x000fff); ++ bits -= 8; ++ i++; ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: wrong length code: 0x%X\n", ++ __FUNCTION__, state->unit, val); ++ return DECOMP_ERROR; ++ } ++ } ++ } ++ s = state->hist + state->histptr; ++ state->histptr += len; ++ olen += len; ++ if (state->histptr < 2*MPPE_HIST_LEN) { ++ /* copy uncompressed bytes to the history */ ++ ++ /* In some cases len may be greater than off. It means that memory ++ * areas pointed by s and s-off overlap. I had used memmove() here ++ * because I thought that it acts as libc's version. Unfortunately, ++ * I was wrong. :-) I got strange errors sometimes. Wilfried suggested ++ * using of byte by byte copying here and strange errors disappeared. ++ */ ++ lamecopy(s, s - off, len); ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: trying to write outside history " ++ "buffer\n", __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ } ++ ++ /* Do PFC decompression */ ++ len = olen; ++ if ((history[0] & 0x01) != 0) { ++ obuf[0] = 0; ++ obuf++; ++ len++; ++ } ++ ++ if (len <= osize) { ++ /* copy uncompressed packet to the output buffer */ ++ memcpy(obuf, history, olen); ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: too big uncompressed packet: %d\n", ++ __FUNCTION__, state->unit, len + (PPP_HDRLEN / 2)); ++ return DECOMP_ERROR; ++ } ++ ++ return (int) len; ++} ++ ++int ++mppe_decompress(void *arg, unsigned char *ibuf, int isize, ++ unsigned char *obuf, int osize) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *)arg; ++ int seq, bits, uncomplen; ++ ++ if (isize <= PPP_HDRLEN + MPPE_OVHD) { ++ if (state->debug) { ++ printk(KERN_DEBUG "%s%d: short packet (len=%d)\n", __FUNCTION__, ++ state->unit, isize); ++ } ++ return DECOMP_ERROR; ++ } ++ ++ /* Get coherency counter and control bits from input buffer */ ++ seq = MPPE_CCOUNT(ibuf); ++ bits = MPPE_BITS(ibuf); ++ ++ if (state->stateless) { ++ /* RFC 3078, sec 8.1. */ ++ mppe_increase_ccount(state); ++ if ((seq != state->ccount) && state->debug) ++ printk(KERN_DEBUG "%s%d: bad sequence number: %d, expected: %d\n", ++ __FUNCTION__, state->unit, seq, state->ccount); ++ while (seq != state->ccount) ++ mppe_increase_ccount(state); ++ } else { ++ /* RFC 3078, sec 8.2. */ ++ if (state->flushexpected) { /* discard state */ ++ if ((bits & MPPE_BIT_FLUSHED)) { /* we received expected FLUSH bit */ ++ while (seq != state->ccount) ++ mppe_increase_ccount(state); ++ state->flushexpected = 0; ++ } else /* drop packet*/ ++ return DECOMP_ERROR; ++ } else { /* normal state */ ++ mppe_increase_ccount(state); ++ if (seq != state->ccount) { ++ /* Packet loss detected, enter the discard state. */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: bad sequence number: %d, expected: %d\n", ++ __FUNCTION__, state->unit, seq, state->ccount); ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ } ++ if (state->mppe && (bits & MPPE_BIT_FLUSHED)) { ++ arc4_setkey(state, state->session_key, state->keylen); ++ } ++ } ++ ++ if (state->mppc && (bits & (MPPE_BIT_FLUSHED | MPPE_BIT_RESET))) { ++ state->histptr = MPPE_HIST_LEN; ++ if ((bits & MPPE_BIT_FLUSHED)) { ++ memset(state->hist + MPPE_HIST_LEN, 0, MPPE_HIST_LEN*sizeof(u8)); ++ } else ++ if ((bits & MPPE_BIT_RESET)) { ++ memcpy(state->hist, state->hist + MPPE_HIST_LEN, MPPE_HIST_LEN); ++ } ++ } ++ ++ /* Fill in the first part of the PPP header. The protocol field ++ comes from the decompressed data. */ ++ obuf[0] = PPP_ADDRESS(ibuf); ++ obuf[1] = PPP_CONTROL(ibuf); ++ obuf += PPP_HDRLEN / 2; ++ ++ if (state->mppe) { /* process encrypted packet */ ++ if ((bits & MPPE_BIT_ENCRYPTED)) { ++ /* OK, packet encrypted, so decrypt it */ ++ if (state->mppc && (bits & MPPE_BIT_COMP)) { ++ /* Hack warning !!! RC4 implementation which we use does ++ decryption "in place" - it means that input and output ++ buffers can be *the same* memory area. Therefore we don't ++ need to use a temporary buffer. But be careful - other ++ implementations don't have to be so nice. */ ++ arc4_decrypt(state, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2), isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2), ibuf + PPP_HDRLEN + ++ (MPPE_OVHD / 2)); ++ uncomplen = mppc_decompress(state, ibuf + PPP_HDRLEN + ++ (MPPE_OVHD / 2), obuf, isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2), ++ osize - (PPP_HDRLEN / 2)); ++ if (uncomplen == DECOMP_ERROR) { ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ uncomplen += PPP_HDRLEN / 2; ++ (state->stats).comp_bytes += isize; ++ (state->stats).comp_packets++; ++ } else { ++ uncomplen = isize - MPPE_OVHD; ++ /* Decrypt the first byte in order to check if it is ++ compressed or uncompressed protocol field */ ++ arc4_decrypt(state, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2), 1, obuf); ++ /* Do PFC decompression */ ++ if ((obuf[0] & 0x01) != 0) { ++ obuf[1] = obuf[0]; ++ obuf[0] = 0; ++ obuf++; ++ uncomplen++; ++ } ++ /* And finally, decrypt the rest of the frame. */ ++ arc4_decrypt(state, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2) + 1, ++ isize - PPP_HDRLEN - (MPPE_OVHD / 2) - 1, obuf + 1); ++ (state->stats).inc_bytes += isize; ++ (state->stats).inc_packets++; ++ } ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: encryption negotiated but not an " ++ "encrypted packet received\n", __FUNCTION__, state->unit); ++ mppe_change_key(state, 0); ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ } else { ++ if (state->mppc) { /* no MPPE, only MPPC */ ++ if ((bits & MPPE_BIT_COMP)) { ++ uncomplen = mppc_decompress(state, ibuf + PPP_HDRLEN + ++ (MPPE_OVHD / 2), obuf, isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2), ++ osize - (PPP_HDRLEN / 2)); ++ if (uncomplen == DECOMP_ERROR) { ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ uncomplen += PPP_HDRLEN / 2; ++ (state->stats).comp_bytes += isize; ++ (state->stats).comp_packets++; ++ } else { ++ memcpy(obuf, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2), isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2)); ++ uncomplen = isize - MPPE_OVHD; ++ (state->stats).inc_bytes += isize; ++ (state->stats).inc_packets++; ++ } ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: error - not an MPPC or MPPE frame " ++ "received\n", __FUNCTION__, state->unit); ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ } ++ ++ (state->stats).unc_bytes += uncomplen; ++ (state->stats).unc_packets++; ++ ++ return uncomplen; ++} ++ ++ ++/************************************************************ ++ * Module interface table ++ ************************************************************/ ++ ++/* These are in ppp_generic.c */ ++extern int ppp_register_compressor (struct compressor *cp); ++extern void ppp_unregister_compressor (struct compressor *cp); ++ ++/* ++ * Functions exported to ppp_generic.c. ++ * ++ * In case of MPPC/MPPE there is no need to process incompressible data ++ * because such a data is sent in MPPC/MPPE frame. Therefore the (*incomp) ++ * callback function isn't needed. ++ */ ++struct compressor ppp_mppe = { ++ CI_MPPE, /* compress_proto */ ++ mppe_comp_alloc, /* comp_alloc */ ++ mppe_comp_free, /* comp_free */ ++ mppe_comp_init, /* comp_init */ ++ mppe_comp_reset, /* comp_reset */ ++ mppe_compress, /* compress */ ++ mppe_stats, /* comp_stat */ ++ mppe_decomp_alloc, /* decomp_alloc */ ++ mppe_comp_free, /* decomp_free */ ++ mppe_decomp_init, /* decomp_init */ ++ mppe_decomp_reset, /* decomp_reset */ ++ mppe_decompress, /* decompress */ ++ NULL, /* incomp */ ++ mppe_stats, /* decomp_stat */ ++}; ++ ++/************************************************************ ++ * Module support routines ++ ************************************************************/ ++ ++int __init mppe_module_init(void) ++{ ++ int answer = ppp_register_compressor(&ppp_mppe); ++ if (answer == 0) { ++ printk(KERN_INFO "MPPE/MPPC encryption/compression module registered\n"); ++ } ++ return answer; ++} ++ ++void __exit mppe_module_cleanup(void) ++{ ++ ppp_unregister_compressor(&ppp_mppe); ++ printk(KERN_INFO "MPPE/MPPC encryption/compression module unregistered\n"); ++} ++ ++module_init(mppe_module_init); ++module_exit(mppe_module_cleanup); ++ ++MODULE_AUTHOR("Jan Dubiec <jdx@slackware.pl>"); ++MODULE_DESCRIPTION("MPPE/MPPC encryption/compression module for Linux"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff -ruN linux.orig/include/linux/ppp-comp.h linux/include/linux/ppp-comp.h +--- linux.orig/include/linux/ppp-comp.h 1999-08-06 19:44:11.000000000 +0200 ++++ linux/include/linux/ppp-comp.h 2004-08-08 12:17:43.000000000 +0200 +@@ -1,34 +1,42 @@ + /* + * ppp-comp.h - Definitions for doing PPP packet compression. + * +- * Copyright (c) 1994 The Australian National University. +- * All rights reserved. ++ * Copyright (c) 1984 Paul Mackerras. 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. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: + * +- * $Id: ppp-comp.h,v 1.6 1997/11/27 06:04:44 paulus Exp $ ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. The name(s) of the authors of this software must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. ++ * ++ * 4. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by Paul Mackerras ++ * <paulus@samba.org>". ++ * ++ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO ++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY ++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * $Id: ppp-comp.h,v 1.10 2002/12/06 09:49:15 paulus Exp $ + */ + + /* +- * ==FILEVERSION 980319== ++ * ==FILEVERSION 20040509== + * + * NOTE TO MAINTAINERS: + * If you modify this file at all, please set the above date. +@@ -78,7 +86,7 @@ + + /* Compress a packet */ + int (*compress) (void *state, unsigned char *rptr, +- unsigned char *obuf, int isize, int osize); ++ unsigned char *obuf, int isize, int osize); + + /* Return compression statistics */ + void (*comp_stat) (void *state, struct compstat *stats); +@@ -99,7 +107,7 @@ + + /* Decompress a packet. */ + int (*decompress) (void *state, unsigned char *ibuf, int isize, +- unsigned char *obuf, int osize); ++ unsigned char *obuf, int osize); + + /* Update state for an incompressible packet received */ + void (*incomp) (void *state, unsigned char *ibuf, int icnt); +@@ -187,6 +195,42 @@ + #define DEFLATE_CHK_SEQUENCE 0 + + /* ++ * Definitions for MPPE/MPPC. ++ */ ++ ++#define CI_MPPE 18 /* config option for MPPE */ ++#define CILEN_MPPE 6 /* length of config option */ ++ ++#define MPPE_OVHD 4 /* MPPE overhead */ ++#define MPPE_MAX_KEY_LEN 16 /* largest key length (128-bit) */ ++ ++#define MPPE_STATELESS 0x01 /* configuration bit H */ ++#define MPPE_40BIT 0x20 /* configuration bit L */ ++#define MPPE_56BIT 0x80 /* configuration bit M */ ++#define MPPE_128BIT 0x40 /* configuration bit S */ ++#define MPPE_MPPC 0x01 /* configuration bit C */ ++ ++/* ++ * Definitions for Stac LZS. ++ */ ++ ++#define CI_LZS 17 /* config option for Stac LZS */ ++#define CILEN_LZS 5 /* length of config option */ ++ ++#define LZS_OVHD 4 /* max. LZS overhead */ ++#define LZS_HIST_LEN 2048 /* LZS history size */ ++#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define LZS_MODE_NONE 0 ++#define LZS_MODE_LCB 1 ++#define LZS_MODE_CRC 2 ++#define LZS_MODE_SEQ 3 ++#define LZS_MODE_EXT 4 ++ ++#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ ++#define LZS_EXT_BIT_COMP 0x20 /* bit C */ ++ ++/* + * Definitions for other, as yet unsupported, compression methods. + */ + diff --git a/packages/linux/linux-mtx-1-2.4.27/40-option-hsdpa.patch b/packages/linux/linux-mtx-1-2.4.27/40-option-hsdpa.patch new file mode 100644 index 0000000000..2055f72312 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/40-option-hsdpa.patch @@ -0,0 +1,2961 @@ +diff -uNr linux-org/Documentation/Configure.help linux/Documentation/Configure.help +--- linux-org/Documentation/Configure.help 2006-02-06 14:01:32.375955928 +0100 ++++ linux/Documentation/Configure.help 2006-02-06 15:51:13.332498464 +0100 +@@ -4057,6 +4057,9 @@ + The module will be called synclinkmp.o. If you want to do that, say M + here. + ++Option HSDPA card support ++CONFIG_NOZOMI ++ + ACP Modem (Mwave) support + CONFIG_MWAVE + The ACP modem (Mwave) for Linux is a WinModem. It is composed of a +diff -uNr linux-org/drivers/char/Config.in linux/drivers/char/Config.in +--- linux-org/drivers/char/Config.in 2006-02-06 14:01:55.767399888 +0100 ++++ linux/drivers/char/Config.in 2006-02-06 15:51:07.574373832 +0100 +@@ -388,6 +388,8 @@ + + endmenu + ++tristate ' Option HSDPA card support' CONFIG_NOZOMI ++ + if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then + source drivers/char/pcmcia/Config.in + fi +diff -uNr linux-org/drivers/char/Makefile linux/drivers/char/Makefile +--- linux-org/drivers/char/Makefile 2006-02-06 14:01:55.782397608 +0100 ++++ linux/drivers/char/Makefile 2006-02-06 15:30:37.949305256 +0100 +@@ -331,6 +331,11 @@ + obj-$(CONFIG_INDYDOG) += indydog.o + obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o + ++subdir-$(CONFIG_NOZOMI) += nozomi ++ifeq ($(CONFIG_NOZOMI),y) ++ obj-y += nozomi/noz.o ++endif ++ + subdir-$(CONFIG_MWAVE) += mwave + ifeq ($(CONFIG_MWAVE),y) + obj-y += mwave/mwave.o +diff -uNr linux-org/drivers/char/nozomi/CHANGELOG linux/drivers/char/nozomi/CHANGELOG +--- linux-org/drivers/char/nozomi/CHANGELOG 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/CHANGELOG 2006-02-06 15:30:07.370953872 +0100 +@@ -0,0 +1,7 @@ ++/* ++ * Version 1.0 ++ * ++ * First version of driver, only tested with card of type F32_2. ++ * Works fine with 2.4 and 2.6 kernels. ++ * Driver also support big endian architecture. ++ */ +diff -uNr linux-org/drivers/char/nozomi/COPYING linux/drivers/char/nozomi/COPYING +--- linux-org/drivers/char/nozomi/COPYING 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/COPYING 2006-02-06 15:30:07.371953720 +0100 +@@ -0,0 +1,340 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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. ++ ++ GNU GENERAL PUBLIC LICENSE ++ 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 a brief idea of what it does.> ++ Copyright (C) <year> <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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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 -uNr linux-org/drivers/char/nozomi/Makefile linux/drivers/char/nozomi/Makefile +--- linux-org/drivers/char/nozomi/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/Makefile 2006-02-06 15:30:07.379952504 +0100 +@@ -0,0 +1,25 @@ ++# ++# Makefile for ACP Modem (Mwave). ++# ++# See the README file in this directory for more info. <paulsch@us.ibm.com> ++# ++# Note! Dependencies are done automagically by 'make dep', which also ++# removes any old dependencies. DON'T put your own dependencies here ++# unless it's something special (ie not a .c file). ++# ++# Note 2! The CFLAGS definitions are now inherited from the ++# parent makes.. ++# ++ ++# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging: ++#EXTRA_CFLAGS += -DMW_TRACE ++ ++# To have the mwave driver disable other uarts if necessary ++# EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES ++ ++O_TARGET := noz.o ++ ++obj-y := nozomi.o kfifo.o ++obj-m := $(O_TARGET) ++ ++include $(TOPDIR)/Rules.make +diff -uNr linux-org/drivers/char/nozomi/README linux/drivers/char/nozomi/README +--- linux-org/drivers/char/nozomi/README 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/README 2006-02-06 15:30:07.380952352 +0100 +@@ -0,0 +1,17 @@ ++To build this driver for your kernel, please check: ++ ++For kernel 2.6 ++--------------- ++Check the Makefile and run 'make'. ++ ++For kernel 2.4 ++---------- ++make HW=PC_24 ++ ++If you have troubles: ++1) Have proper kernel headers/source as your running kernel. ++2) Make sure this variable in Makefile is correct KERNELDIR = -I/path/to/kernel ++3) If the /dev/noz[0-3] will not be created automatically, do: ++mknod /dev/noz0 c 241 0; mknod /dev/noz1 c 241 1; ++mknod /dev/noz2 c 241 2; mknod /dev/noz3 c 241 3 ++ +diff -uNr linux-org/drivers/char/nozomi/TODO linux/drivers/char/nozomi/TODO +--- linux-org/drivers/char/nozomi/TODO 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/TODO 2006-02-06 15:30:07.361955240 +0100 +@@ -0,0 +1,6 @@ ++* When having a noz* open and rmmod module or removing card, ++ the driver core dumps. ++ ++* Does not yet support multiple cards. ++ ++* Add a helpful description. +diff -uNr linux-org/drivers/char/nozomi/kfifo.c linux/drivers/char/nozomi/kfifo.c +--- linux-org/drivers/char/nozomi/kfifo.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/kfifo.c 2006-02-06 15:30:07.361955240 +0100 +@@ -0,0 +1,189 @@ ++/* ++ * A simple kernel FIFO implementation. ++ * ++ * Copyright (C) 2004 Stelian Pop <stelian@popies.net> ++ * ++ * 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 <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/slab.h> ++#include <asm/uaccess.h> ++#include "kfifo.h" ++ ++ ++/** ++ * kfifo_init - allocates a new FIFO using a preallocated buffer ++ * @buffer: the preallocated buffer to be used. ++ * @size: the size of the internal buffer, this have to be a power of 2. ++ * @gfp_mask: get_free_pages mask, passed to kmalloc() ++ * @lock: the lock to be used to protect the fifo buffer ++ * ++ * Do NOT pass the kfifo to kfifo_free() after use ! Simply free the ++ * struct kfifo with kfree(). ++ */ ++struct kfifo *kfifo_init(unsigned char *buffer, unsigned int size, ++ unsigned int gfp_mask, void *lock) ++{ ++ struct kfifo *fifo; ++ ++ /* size must be a power of 2 */ ++ BUG_ON(size & (size - 1)); ++ ++ fifo = kmalloc(sizeof(struct kfifo), gfp_mask); ++ if (!fifo) ++ return ERR_PTR(-ENOMEM); ++ ++ fifo->buffer = buffer; ++ fifo->size = size; ++ fifo->in = fifo->out = 0; ++ ++ return fifo; ++} ++ ++/** ++ * kfifo_alloc - allocates a new FIFO and its internal buffer ++ * @size: the size of the internal buffer to be allocated. ++ * @gfp_mask: get_free_pages mask, passed to kmalloc() ++ * @lock: the lock to be used to protect the fifo buffer ++ * ++ * The size will be rounded-up to a power of 2. ++ */ ++struct kfifo *kfifo_alloc(unsigned int size, unsigned int gfp_mask, void *lock) ++{ ++ unsigned char *buffer; ++ struct kfifo *ret; ++ ++ /* ++ * round up to the next power of 2, since our 'let the indices ++ * wrap' tachnique works only in this case. ++ */ ++ if (size & (size - 1)) { ++ BUG_ON(size > 0x80000000); ++ printk("Do not support no power of two!\n"); ++ //size = roundup_pow_of_two(size); ++ } ++ ++ buffer = kmalloc(size, gfp_mask); ++ if (!buffer) ++ return ERR_PTR(-ENOMEM); ++ ++ ret = kfifo_init(buffer, size, gfp_mask, lock); ++ ++ if (IS_ERR(ret)) ++ kfree(buffer); ++ ++ return ret; ++} ++ ++/** ++ * kfifo_free - frees the FIFO ++ * @fifo: the fifo to be freed. ++ */ ++void kfifo_free(struct kfifo *fifo) ++{ ++ kfree(fifo->buffer); ++ kfree(fifo); ++} ++ ++/** ++ * __kfifo_put - puts some data into the FIFO, no locking version ++ * @fifo: the fifo to be used. ++ * @buffer: the data to be added. ++ * @len: the length of the data to be added. ++ * ++ * This function copies at most 'len' bytes from the 'buffer' into ++ * the FIFO depending on the free space, and returns the number of ++ * bytes copied. ++ * ++ * Note that with only one concurrent reader and one concurrent ++ * writer, you don't need extra locking to use these functions. ++ */ ++unsigned int __kfifo_put(struct kfifo *fifo, ++ unsigned char *buffer, unsigned int len) ++{ ++ unsigned int l; ++ ++ len = min(len, fifo->size - fifo->in + fifo->out); ++ ++ /* first put the data starting from fifo->in to buffer end */ ++ l = min(len, fifo->size - (fifo->in & (fifo->size - 1))); ++ memcpy(fifo->buffer + (fifo->in & (fifo->size - 1)), buffer, l); ++ ++ /* then put the rest (if any) at the beginning of the buffer */ ++ memcpy(fifo->buffer, buffer + l, len - l); ++ ++ fifo->in += len; ++ ++ return len; ++} ++ ++/** __kfifio_put_user works like __kfifo_put, but copies data from ++ * user space. ++ */ ++ ++unsigned int __kfifo_put_user(struct kfifo *fifo, ++ unsigned char *buffer, unsigned int len) ++{ ++ unsigned int l; ++ ++ len = min(len, fifo->size - fifo->in + fifo->out); ++ ++ /* first put the data starting from fifo->in to buffer end */ ++ l = min(len, fifo->size - (fifo->in & (fifo->size - 1))); ++ copy_from_user(fifo->buffer + (fifo->in & (fifo->size - 1)), buffer, l); ++ ++ /* then put the rest (if any) at the beginning of the buffer */ ++ copy_from_user(fifo->buffer, buffer + l, len - l); ++ ++ fifo->in += len; ++ ++ return len; ++} ++ ++ ++ ++/** ++ * __kfifo_get - gets some data from the FIFO, no locking version ++ * @fifo: the fifo to be used. ++ * @buffer: where the data must be copied. ++ * @len: the size of the destination buffer. ++ * ++ * This function copies at most 'len' bytes from the FIFO into the ++ * 'buffer' and returns the number of copied bytes. ++ * ++ * Note that with only one concurrent reader and one concurrent ++ * writer, you don't need extra locking to use these functions. ++ */ ++unsigned int __kfifo_get(struct kfifo *fifo, ++ unsigned char *buffer, unsigned int len) ++{ ++ unsigned int l; ++ ++ len = min(len, fifo->in - fifo->out); ++ ++ /* first get the data from fifo->out until the end of the buffer */ ++ l = min(len, fifo->size - (fifo->out & (fifo->size - 1))); ++ memcpy(buffer, fifo->buffer + (fifo->out & (fifo->size - 1)), l); ++ ++ /* then get the rest (if any) from the beginning of the buffer */ ++ memcpy(buffer + l, fifo->buffer, len - l); ++ ++ fifo->out += len; ++ ++ return len; ++} +diff -uNr linux-org/drivers/char/nozomi/kfifo.h linux/drivers/char/nozomi/kfifo.h +--- linux-org/drivers/char/nozomi/kfifo.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/kfifo.h 2006-02-06 15:30:07.361955240 +0100 +@@ -0,0 +1,67 @@ ++/* ++ * A simple kernel FIFO implementation. ++ * ++ * Copyright (C) 2004 Stelian Pop <stelian@popies.net> ++ * ++ * 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 _LINUX_KFIFO_H ++#define _LINUX_KFIFO_H ++ ++#ifdef __KERNEL__ ++ ++#include <linux/version.h> ++ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) ++#warning "Don't include this header in 2.6, use header supplied with kernel" ++#endif ++ ++struct kfifo { ++ unsigned char *buffer; /* the buffer holding the data */ ++ unsigned int size; /* the size of the allocated buffer */ ++ unsigned int in; /* data is added at offset (in % size) */ ++ unsigned int out; /* data is extracted from off. (out % size) */ ++}; ++ ++extern struct kfifo *kfifo_init(unsigned char *buffer, unsigned int size, unsigned int gfp_mask, void *lock); ++extern struct kfifo *kfifo_alloc(unsigned int size, unsigned int gfp_mask, void *lock); ++extern void kfifo_free(struct kfifo *fifo); ++extern unsigned int __kfifo_put(struct kfifo *fifo, unsigned char *buffer, unsigned int len); ++extern unsigned int __kfifo_put_user(struct kfifo *fifo, unsigned char *buffer, unsigned int len); ++extern unsigned int __kfifo_get(struct kfifo *fifo, unsigned char *buffer, unsigned int len); ++ ++/** ++ * __kfifo_reset - removes the entire FIFO contents, no locking version ++ * @fifo: the fifo to be emptied. ++ */ ++static inline void __kfifo_reset(struct kfifo *fifo) ++{ ++ fifo->in = fifo->out = 0; ++} ++ ++/** ++ * __kfifo_len - returns the number of bytes available in the FIFO, no locking version ++ * @fifo: the fifo to be used. ++ */ ++static inline unsigned int __kfifo_len(struct kfifo *fifo) ++{ ++ return fifo->in - fifo->out; ++} ++ ++#else ++#warning "don't include kernel headers in userspace" ++#endif /* __KERNEL__ */ ++#endif +diff -uNr linux-org/drivers/char/nozomi/nozomi.c linux/drivers/char/nozomi/nozomi.c +--- linux-org/drivers/char/nozomi/nozomi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux/drivers/char/nozomi/nozomi.c 2006-02-06 15:30:07.379952504 +0100 +@@ -0,0 +1,2238 @@ ++ ++/* nozomi.c -- HSDPA driver Broadband Wireless Data Card - Globe Trotter ++ * ++ * Written by: Ulf Jakobsson, ++ * Jan Åkerfeldt, ++ * Stefan Thomasson, ++ * ++ * Maintained by: Paul Hardwick, p.hardwick@option.com ++ * ++ * Source has been ported from an implementation made by Filip Aben, f.aben@option.com ++ * ++ * -------------------------------------------------------------------------- ++ ++ Copyright (c) 2005 Option Wireless Sweden AB ++ 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++ * -------------------------------------------------------------------------- ++ */ ++ ++/* CHANGELOG ++ * ++ * See CHANGELOG in this package ++ */ ++ ++/* TODO ++ * ++ * See TODO file in this package ++ */ ++ ++ ++/* ++ * TODO2 fix the send_reset_token() routine not to use the fixed start address ++ */ ++ ++ ++ ++#include <linux/version.h> ++ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) ++#define KERNEL_2_6 ++#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,4,0) ++#define KERNEL_2_4 ++#endif ++ ++#include <linux/module.h> ++#include <linux/pci.h> ++#include <linux/ioport.h> ++#include <linux/tty.h> ++#include <linux/tty_driver.h> ++#include <linux/tty_flip.h> ++#include <linux/serial.h> ++#include <linux/interrupt.h> ++#include <linux/kmod.h> ++#include <linux/proc_fs.h> ++#include <asm/uaccess.h> ++ ++#include <linux/init.h> ++ ++#define VERSION_STRING DRIVER_DESC " (build date: " __DATE__ " " __TIME__ ")" ++ ++#ifdef KERNEL_2_6 ++#include <linux/kfifo.h> ++#else ++#include "kfifo.h" ++#endif ++ ++#ifdef KERNEL_2_4 ++#ifndef IRQ_NONE ++#define IRQ_NONE ++#endif ++#ifndef IRQ_HANDLED ++#define IRQ_HANDLED ++typedef void irqreturn_t; ++#endif ++#endif ++ ++#ifndef CONFIG_PCI ++#error "This driver needs PCI support to be available" ++#endif ++ ++/* Macros definitions */ ++ ++/* Enable this to have a lot of debug printouts */ ++/*#define NOZOMI_DEBUG */ ++ ++/* Default debug printout level */ ++#define NOZOMI_DEBUG_LEVEL 0xffff ++ ++#define P_BUF_SIZE 128 ++#define NFO( _err_flag_, args...) \ ++ do{ \ ++ char t_m_p_[P_BUF_SIZE]; \ ++ snprintf(t_m_p_, sizeof(t_m_p_), ##args); \ ++ printk( _err_flag_ "[%d] %s(): %s\n", __LINE__, __FUNCTION__, t_m_p_); \ ++} while(0) ++ ++#define INFO(args...) NFO(KERN_INFO, ##args) ++#define ERR(args...) NFO( KERN_ERR, ##args) ++ ++#define D1(args...) D_(0x01, ##args) ++#define D2(args...) D_(0x02, ##args) ++#define D3(args...) D_(0x04, ##args) ++#define D4(args...) D_(0x08, ##args) ++#define D5(args...) D_(0x10, ##args) ++#define D6(args...) D_(0x20, ##args) ++#define D7(args...) D_(0x40, ##args) ++#define D8(args...) D_(0x80, ##args) ++ ++ ++#ifdef NOZOMI_DEBUG ++#define D_(lvl, args...) D(lvl, ##args) ++ /* Do we need this settable at runtime? */ ++static int nzdebug = NOZOMI_DEBUG_LEVEL; ++ ++#define D(lvl, args...) do{if(lvl & nzdebug) NFO(KERN_INFO, ##args );}while(0) ++#define D_(lvl, args...) D(lvl, ##args) ++ ++/* These printouts are always printed */ ++ ++#else ++ static const int nzdebug = 0; ++#define D_(lvl, args...) ++#endif ++ ++/* TODO: rewrite to optimize macros... */ ++#define SET_FCR(value__) \ ++ do { \ ++ writew((value__), (void*) (dc->REG_FCR )); \ ++} while(0) ++ ++#define SET_IER(value__, mask__) \ ++ do { \ ++ dc->ier_last_written = (dc->ier_last_written & ~mask__) | (value__ & mask__ );\ ++ writew( dc->ier_last_written, (void*) (dc->REG_IER));\ ++} while(0) ++ ++#define GET_IER(read_val__) \ ++ do { \ ++ (read_val__) = readw((void*) (dc->REG_IER));\ ++} while(0) ++ ++#define GET_IIR(read_val__) \ ++ do { \ ++ (read_val__) = readw((void*) (dc->REG_IIR));\ ++} while(0) ++ ++#define GET_MEM(value__, addr__, length__) \ ++ do { \ ++ read_mem32( (u32*) (value__), (u32) (addr__), (length__));\ ++} while(0) ++ ++#define GET_MEM_BUF(value__, addr__, length__) \ ++ do { \ ++ read_mem32_buf( (u32*) (value__), (u32) (addr__), (length__));\ ++} while(0) ++ ++#define SET_MEM(addr__, value__, length__) \ ++ do { \ ++ write_mem32( (addr__), (u32*) (value__), (length__));\ ++} while(0) ++ ++#define SET_MEM_BUF(addr__, value__, length__) \ ++ do { \ ++ write_mem32_buf( (addr__), (u32*) (value__), (length__));\ ++} while(0) ++ ++ ++#define TMP_BUF_MAX 256 ++ ++#define DUMP(buf__,len__) \ ++ do { \ ++ char tbuf[TMP_BUF_MAX]={0};\ ++ if (len__>1) {\ ++ snprintf(tbuf, len__ > TMP_BUF_MAX ? TMP_BUF_MAX : len__, "%s",buf__);\ ++ if(tbuf[len__-2] == '\r') {\ ++ tbuf[len__-2] = 'r';\ ++ }\ ++ D1( "SENDING: '%s' (%d+n)", tbuf, len__);\ ++ } else {\ ++ D1( "SENDING: '%s' (%d)", tbuf, len__);\ ++ }\ ++} while(0) ++ ++#define RELEVANT_IFLAG(iflag) ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) ++ ++ ++/* Defines */ ++#define NOZOMI_NAME "nozomi" ++#define NOZOMI_NAME_TTY "nozomi_tty" ++#define DRIVER_DESC "Nozomi driver" ++ ++#define NTTY_TTY_MAJOR 241 ++#define NTTY_TTY_MINORS MAX_PORT ++#define NTTY_FIFO_BUFFER_SIZE 8192 ++ ++/* Must be power of 2 */ ++#define FIFO_BUFFER_SIZE_UL 8192 ++ ++/* Size of tmp send buffer to card */ ++#define SEND_BUF_MAX 1024 ++#define RECEIVE_BUF_MAX 4 ++ ++/* Our fake UART values */ ++#define MCR_DTR 0x01 ++#define MCR_RTS 0x02 ++#define MCR_LOOP 0x04 ++#define MSR_CTS 0x08 ++#define MSR_CD 0x10 ++#define MSR_RI 0x20 ++#define MSR_DSR 0x40 ++ ++/* Define all types of vendors and devices to support */ ++#define VENDOR1 0x1931 /* Vendor Option */ ++#define DEVICE1 0x000c /* HSDPA card */ ++ ++#define R_IIR 0x0000 /* Interrupt Identity Register */ ++#define R_FCR 0x0000 /* Flow Control Register */ ++#define R_IER 0x0004 /* Interrupt Enable Register */ ++ ++#define CONFIG_MAGIC 0xEFEFFEFE ++#define TOGGLE_VALID 0x0000 ++ ++/* Definition of interrupt tokens */ ++#define MDM_DL1 0x0001 ++#define MDM_UL1 0x0002 ++#define MDM_DL2 0x0004 ++#define MDM_UL2 0x0008 ++#define DIAG_DL1 0x0010 ++#define DIAG_DL2 0x0020 ++#define DIAG_UL 0x0040 ++#define APP1_DL 0x0080 ++#define APP1_UL 0x0100 ++#define APP2_DL 0x0200 ++#define APP2_UL 0x0400 ++#define CTRL_DL 0x0800 ++#define CTRL_UL 0x1000 ++#define RESET 0x8000 ++ ++#define MDM_DL (MDM_DL1 | MDM_DL2) ++#define MDM_UL (MDM_UL1 | MDM_UL2) ++#define DIAG_DL (DIAG_DL1 | DIAG_DL2) ++ ++/* modem signal definition */ ++#define CTRL_DSR 0x0001 ++#define CTRL_DCD 0x0002 ++#define CTRL_RI 0x0004 ++#define CTRL_CTS 0x0008 ++ ++#define CTRL_DTR 0x0001 ++#define CTRL_RTS 0x0002 ++ ++#define MAX_PORT 4 ++#define NOZOMI_MAX_PORTS 5 ++ ++/* Type definitions */ ++ ++/* There are two types of nozomi cards, one with 2048 memory and with 8192 memory */ ++typedef enum { ++ F32_2 = 2048, /* Has 512 bytes downlink and uplink * 2 -> 2048 */ ++ F32_8 = 9192, /* Has 3072 bytes downlink and 1024 bytes uplink * 2 -> 8192 */ ++} card_type_t; ++ ++/* Two different toggle channels exist */ ++typedef enum { ++ CH_A=0, ++ CH_B=1, ++} channel_t; ++ ++/* Port definition for the card regarding flow control */ ++typedef enum { ++ CTRL_CMD = 0x00, ++ CTRL_MDM = 0x01, ++ CTRL_DIAG = 0x02, ++ CTRL_APP1 = 0x03, ++ CTRL_APP2 = 0x04, ++ CTRL_ERROR = -1, ++} ctrl_port_t; ++ ++/* Ports that the nozomi has */ ++typedef enum { ++ PORT_MDM = 0, ++ PORT_DIAG= 1, ++ PORT_APP1= 2, ++ PORT_APP2= 3, ++ PORT_CTRL= 4, ++ PORT_ERROR=-1, ++} port_type_t; ++ ++#ifdef __ARMEB__ ++/* Big endian */ ++ ++typedef struct { ++ unsigned enabled : 5; /* Toggle fields are valid if enabled is 0, else A-channels ++ must always be used. */ ++ unsigned diag_dl : 1; ++ unsigned mdm_dl : 1; ++ unsigned mdm_ul : 1; ++} __attribute__ ((packed)) toggles_t; ++ ++/* Configuration table to read at startup of card */ ++/* Is for now only needed during initialization phase */ ++typedef struct { ++ u32 signature; ++ u16 product_information; ++ u16 version; ++ u8 pad3[3]; ++ toggles_t toggle; ++ u8 pad1[4]; ++ u16 dl_mdm_len1; /* If this is 64, it can hold 60 bytes + 4 that is length field */ ++ u16 dl_start; ++ ++ u16 dl_diag_len1; ++ u16 dl_mdm_len2; /* If this is 64, it can hold 60 bytes + 4 that is length field */ ++ u16 dl_app1_len; ++ ++ u16 dl_diag_len2; ++ u16 dl_ctrl_len; ++ u16 dl_app2_len; ++ u8 pad2[16]; ++ u16 ul_mdm_len1; ++ u16 ul_start; ++ u16 ul_diag_len; ++ u16 ul_mdm_len2; ++ u16 ul_app1_len; ++ u16 ul_app2_len; ++ u16 ul_ctrl_len; ++} __attribute__((packed)) config_table_t; ++ ++/* This stores all control downlink flags */ ++typedef struct { ++ u8 port; ++ unsigned reserved : 4; ++ unsigned CTS : 1; ++ unsigned RI : 1; ++ unsigned DCD : 1; ++ unsigned DSR : 1; ++} __attribute__ ((packed)) ctrl_dl_t; ++ ++/* This stores all control uplink flags */ ++typedef struct { ++ u8 port; ++ unsigned reserved : 6; ++ unsigned RTS : 1; ++ unsigned DTR : 1; ++} __attribute__ ((packed)) ctrl_ul_t; ++ ++#else ++/* Little endian */ ++ ++/* This represents the toggle information */ ++typedef struct { ++ unsigned mdm_ul : 1; ++ unsigned mdm_dl : 1; ++ unsigned diag_dl : 1; ++ unsigned enabled : 5; /* Toggle fields are valid if enabled is 0, else A-channels ++ must always be used. */ ++} __attribute__ ((packed)) toggles_t; ++ ++/* Configuration table to read at startup of card */ ++typedef struct { ++ u32 signature; ++ u16 version; ++ u16 product_information; ++ toggles_t toggle; ++ u8 pad1[7]; ++ u16 dl_start; ++ u16 dl_mdm_len1; /* If this is 64, it can hold 60 bytes + 4 that is length field */ ++ u16 dl_mdm_len2; ++ u16 dl_diag_len1; ++ u16 dl_diag_len2; ++ u16 dl_app1_len; ++ u16 dl_app2_len; ++ u16 dl_ctrl_len; ++ u8 pad2[16]; ++ u16 ul_start; ++ u16 ul_mdm_len2; ++ u16 ul_mdm_len1; ++ u16 ul_diag_len; ++ u16 ul_app1_len; ++ u16 ul_app2_len; ++ u16 ul_ctrl_len; ++} __attribute__((packed)) config_table_t; ++ ++/* This stores all control downlink flags */ ++typedef struct { ++ unsigned DSR : 1; ++ unsigned DCD : 1; ++ unsigned RI : 1; ++ unsigned CTS : 1; ++ unsigned reserverd : 4; ++ u8 port; ++} __attribute__ ((packed)) ctrl_dl_t; ++ ++/* This stores all control uplink flags */ ++typedef struct { ++ unsigned DTR : 1; ++ unsigned RTS : 1; ++ unsigned reserved : 6; ++ u8 port; ++} __attribute__ ((packed)) ctrl_ul_t; ++#endif ++ ++/* This holds all information that is needed regarding a port */ ++typedef struct { ++ u8 update_flow_control; ++ ctrl_ul_t ctrl_ul; ++ ctrl_dl_t ctrl_dl; ++ struct kfifo *fifo_ul; ++ u32 dl_addr[2]; ++ u32 dl_size[2]; ++ u8 toggle_dl; ++ u32 ul_addr[2]; ++ u32 ul_size[2]; ++ u8 toggle_ul; ++ u16 token_dl; ++ ++ struct tty_struct *tty; ++ int tty_open_count; ++ struct semaphore tty_sem; ++ wait_queue_head_t tty_wait; ++ struct async_icount tty_icount; ++ int tty_index; ++ u32 rx_data, tx_data; ++ u8 tty_dont_flip; ++ ++} port_t; ++ ++/* Private data one for each card in the system */ ++typedef struct { ++ u32 base_addr; ++ u8 closing; ++ ++ /* Register addresses */ ++ u32 REG_IIR; ++ u32 REG_FCR; ++ u32 REG_IER; ++ ++ volatile u16 ier_last_written; ++ card_type_t card_type; ++ config_table_t config_table; /* Configuration table */ ++ struct pci_dev *pdev; ++ port_t port[NOZOMI_MAX_PORTS]; ++ u8 *send_buf; ++ ++ struct tty_driver tty_driver; ++ ++#ifdef KERNEL_2_4 ++ struct tty_struct *tty_table[NTTY_TTY_MINORS]; ++ struct tq_struct tty_flip_queue; ++ s32 tty_refcount; ++#endif ++#ifdef KERNEL_2_6 ++ struct workqueue_struct *tty_flip_wq; ++ struct work_struct tty_flip_wq_struct; ++#endif ++ ++ struct termios *tty_termios[NTTY_TTY_MINORS]; ++ struct termios *tty_termios_locked[NTTY_TTY_MINORS]; ++ spinlock_t spin_mutex; ++ ++ u32 open_ttys; ++ struct proc_dir_entry *proc_entry; ++ ++} dc_t; ++ ++/* This is a data packet that is read or written to/from card */ ++typedef struct { ++ u32 size; /* size is the length of the data buffer */ ++ u8 *data; ++} __attribute__ ((packed)) buf_t; ++ ++/* Function declarations */ ++static int ntty_tty_init(dc_t *dc); ++ ++static void tty_flip_queue_function(void *tmp_dc); ++ ++/* Global variables */ ++static struct pci_device_id nozomi_pci_tbl[] __devinitdata = { ++ {VENDOR1, DEVICE1}, ++ {0, } ++}; ++ ++/* Used to store interrupt variables */ ++typedef struct { ++ volatile u16 read_iir; /* Holds current interrupt tokens */ ++} irq_t; ++ ++MODULE_DEVICE_TABLE(pci, nozomi_pci_tbl); ++ ++/* Representing the pci device of interest */ ++static int cards_found = 0; ++static int cards_initialized = 0; ++dc_t* my_dev = NULL; ++struct pci_dev *my_pdev = NULL; ++irq_t my_irq; ++ ++#define CARD_CHECK(rval) { \ ++ if (cards_found == 0 || cards_found != cards_initialized) { \ ++ ERR("Operation requested on uninitialized nozomi card."); \ ++ return rval; \ ++ } } ++ ++ ++static inline dc_t* get_dc_by_pdev(struct pci_dev* pdev) { ++ return my_dev; ++} ++ ++static inline dc_t* get_dc_by_index(s32 index ) { ++ return my_dev; ++} ++ ++static inline s32 get_index(struct tty_struct *tty) { ++#ifdef KERNEL_2_6 ++ return tty->index; ++#else ++ return MINOR(tty->device) - tty->driver.minor_start; ++#endif ++} ++ ++static inline port_t* get_port_by_tty(struct tty_struct *tty) { ++ return &my_dev->port[ get_index(tty) ]; ++} ++ ++static inline dc_t* get_dc_by_tty(struct tty_struct *tty ) { ++ return my_dev; ++} ++ ++ ++/* TODO: */ ++/* -Optimize */ ++/* -Rewrite cleaner */ ++static void read_mem32(u32 *buf, u32 mem_addr_start, u32 size_bytes) { ++ u32 i = 0; ++ u32* ptr = (u32*) mem_addr_start; ++ u16* buf16; ++ ++ /* 2 bytes */ ++ if (size_bytes == 2) { ++ buf16 = (u16*) buf; ++ *buf16 = readw( ptr ); ++ return; ++ } ++ ++ while (i < size_bytes) { ++ if ( size_bytes - i == 2) { ++ /* Handle 2 bytes in the end */ ++ buf16 = (u16*) buf; ++ *(buf16) = readw( ptr ); ++ i+=2; ++ } else { ++ /* Read 4 bytes */ ++ *(buf) = readl( ptr ); ++ i+=4; ++ } ++ buf++; ptr++; ++ } ++} ++ ++/* TODO: */ ++/* - Rewrite cleaner */ ++/* - merge with read_mem32() */ ++static void read_mem32_buf(u32 *buf, u32 mem_addr_start, u32 size_bytes) { ++#ifdef __ARMEB__ ++ u32 i = 0; ++ u32* ptr = (u32*) mem_addr_start; ++ u16* buf16; ++ ++ /* 2 bytes */ ++ if (size_bytes == 2) { ++ buf16 = (u16*) buf; ++ *buf16 = __le16_to_cpu( readw( ptr )); ++ return; ++ } ++ ++ while (i < size_bytes) { ++ if ( size_bytes - i == 2) { ++ /* Handle 2 bytes in the end */ ++ buf16 = (u16*) buf; ++ *(buf16) = __le16_to_cpu( readw( ptr )); ++ i+=2; ++ } else { ++ /* Read 4 bytes */ ++ *(buf) = __le32_to_cpu( readl( ptr )); ++ i+=4; ++ } ++ buf++; ptr++; ++ } ++#else ++ read_mem32(buf, mem_addr_start, size_bytes); ++#endif ++} ++ ++/* TODO: */ ++/* -Optimize */ ++/* -Rewrite cleaner */ ++static u32 write_mem32(u32 mem_addr_start, u32 *buf, u32 size_bytes) { ++ u32 i = 0; ++ u32* ptr = (u32*) mem_addr_start; ++ u16* buf16; ++ ++ /* 2 bytes */ ++ if (size_bytes == 2) { ++ buf16 = (u16*) buf; ++ writew( *buf16, ptr); ++ return 2; ++ } ++ ++ while (i < size_bytes) { ++ if ( size_bytes - i == 2) { ++ /* 2 bytes */ ++ buf16 = (u16*) buf; ++ writew( *buf16, ptr); ++ i+=2; ++ } else { ++ /* 4 bytes */ ++ writel( *buf, ptr ); ++ i += 4; ++ } ++ buf++; ptr++; ++ } ++ return size_bytes; ++} ++ ++/* Todo: */ ++/* - Merge with write_mem32() */ ++static u32 write_mem32_buf(u32 mem_addr_start, u32 *buf, u32 size_bytes) { ++#ifdef __ARMEB__ ++ u32 i = 0; ++ u32* ptr = (u32*) mem_addr_start; ++ u16* buf16; ++ ++ /* 2 bytes */ ++ if (size_bytes == 2) { ++ buf16 = (u16*) buf; ++ writew( __le16_to_cpu(*buf16), ptr); ++ return 2; ++ } ++ ++ while (i < size_bytes) { ++ if ( size_bytes - i == 2) { ++ /* 2 bytes */ ++ buf16 = (u16*) buf; ++ writew( __le16_to_cpu(*buf16), ptr); ++ i+=2; ++ } else { ++ /* 4 bytes */ ++ writel( __cpu_to_le32( *buf ), ptr ); ++ i += 4; ++ } ++ buf++; ptr++; ++ } ++ return size_bytes; ++#else ++ return write_mem32(mem_addr_start, buf, size_bytes); ++#endif ++} ++ ++/* Setup pointers to different channels and also setup buffer sizes. */ ++static void setup_memory(dc_t *dc) { ++ ++ u32 offset = dc->base_addr + dc->config_table.dl_start; ++ /* The length reported is including the length field of 4 bytes, hence subtract with 4. */ ++ u16 buff_offset = 4; ++ ++ /* Modem port dl configuration */ ++ dc->port[PORT_MDM].dl_addr[CH_A] = offset; ++ dc->port[PORT_MDM].dl_addr[CH_B] = (offset += dc->config_table.dl_mdm_len1); ++ dc->port[PORT_MDM].dl_size[CH_A] = dc->config_table.dl_mdm_len1 - buff_offset; ++ dc->port[PORT_MDM].dl_size[CH_B] = dc->config_table.dl_mdm_len2 - buff_offset; ++ ++ /* Diag port dl configuration */ ++ dc->port[PORT_DIAG].dl_addr[CH_A] = (offset += dc->config_table.dl_mdm_len2); ++ dc->port[PORT_DIAG].dl_size[CH_A] = dc->config_table.dl_diag_len1 - buff_offset; ++ dc->port[PORT_DIAG].dl_addr[CH_B] = (offset += dc->config_table.dl_diag_len1); ++ dc->port[PORT_DIAG].dl_size[CH_B] = dc->config_table.dl_diag_len2 - buff_offset; ++ ++ /* App1 port dl configuration */ ++ dc->port[PORT_APP1].dl_addr[CH_A] = (offset += dc->config_table.dl_diag_len2); ++ dc->port[PORT_APP1].dl_size[CH_A] = dc->config_table.dl_app1_len - buff_offset; ++ ++ /* App2 port dl configuration */ ++ dc->port[PORT_APP2].dl_addr[CH_A] = (offset += dc->config_table.dl_app1_len); ++ dc->port[PORT_APP2].dl_size[CH_A] = dc->config_table.dl_app2_len - buff_offset; ++ ++ /* Ctrl dl configuration */ ++ dc->port[PORT_CTRL].dl_addr[CH_A] = (offset += dc->config_table.dl_app2_len); ++ dc->port[PORT_CTRL].dl_size[CH_A] = dc->config_table.dl_ctrl_len - buff_offset; ++ ++ ++ /* Modem Port ul configuration */ ++ dc->port[PORT_MDM].ul_addr[CH_A] = (offset = dc->base_addr + dc->config_table.ul_start); ++ dc->port[PORT_MDM].ul_size[CH_A] = dc->config_table.ul_mdm_len1 - buff_offset; ++ dc->port[PORT_MDM].ul_addr[CH_B] = (offset += dc->config_table.ul_mdm_len1); ++ dc->port[PORT_MDM].ul_size[CH_B] = dc->config_table.ul_mdm_len2 - buff_offset; ++ ++ /* Diag port ul configuration */ ++ dc->port[PORT_DIAG].ul_addr[CH_A] = (offset += dc->config_table.ul_mdm_len2); ++ dc->port[PORT_DIAG].ul_size[CH_A] = dc->config_table.ul_diag_len - buff_offset; ++ ++ /* App1 port ul configuration */ ++ dc->port[PORT_APP1].ul_addr[CH_A] = (offset += dc->config_table.ul_diag_len); ++ dc->port[PORT_APP1].ul_size[CH_A] = dc->config_table.ul_app1_len - buff_offset; ++ ++ /* App2 port ul configuration */ ++ dc->port[PORT_APP2].ul_addr[CH_A] = (offset += dc->config_table.ul_app1_len); ++ dc->port[PORT_APP2].ul_size[CH_A] = dc->config_table.ul_app2_len - buff_offset; ++ ++ /* Ctrl ul configuration */ ++ dc->port[PORT_CTRL].ul_addr[CH_A] = (offset += dc->config_table.ul_app2_len); ++ dc->port[PORT_CTRL].ul_size[CH_A] = dc->config_table.ul_ctrl_len - buff_offset; ++ offset = dc->config_table.ul_start; ++} ++ ++/* Dump config table under initalization phase */ ++#ifdef NOZOMI_DEBUG ++static void dump_table(dc_t *dc) { ++ D3("signature: 0x%08X", dc->config_table.signature); ++ D3("version: 0x%04X", dc->config_table.version); ++ D3("product_information: 0x%04X", dc->config_table.product_information); ++ D3("toggle enabled: %d", dc->config_table.toggle.enabled); ++ D3("toggle up_mdm: %d", dc->config_table.toggle.mdm_ul); ++ D3("toggle dl_mdm: %d", dc->config_table.toggle.mdm_dl); ++ D3("toggle dl_dbg: %d", dc->config_table.toggle.diag_dl); ++ ++ D3("dl_start: 0x%04X", dc->config_table.dl_start); ++ D3("dl_mdm_len0: 0x%04X, %d", dc->config_table.dl_mdm_len1, dc->config_table.dl_mdm_len1); ++ D3("dl_mdm_len1: 0x%04X, %d", dc->config_table.dl_mdm_len2, dc->config_table.dl_mdm_len2); ++ D3("dl_diag_len0: 0x%04X, %d", dc->config_table.dl_diag_len1, dc->config_table.dl_diag_len1); ++ D3("dl_diag_len1: 0x%04X, %d", dc->config_table.dl_diag_len2, dc->config_table.dl_diag_len2); ++ D3("dl_app1_len: 0x%04X, %d", dc->config_table.dl_app1_len, dc->config_table.dl_app1_len); ++ D3("dl_app2_len: 0x%04X, %d", dc->config_table.dl_app2_len, dc->config_table.dl_app2_len); ++ D3("dl_ctrl_len: 0x%04X, %d", dc->config_table.dl_ctrl_len, dc->config_table.dl_ctrl_len); ++ D3("ul_start: 0x%04X, %d", dc->config_table.ul_start, dc->config_table.ul_start); ++ D3("ul_mdm_len[0]: 0x%04X, %d", dc->config_table.ul_mdm_len1, dc->config_table.ul_mdm_len1); ++ D3("ul_mdm_len[1]: 0x%04X, %d", dc->config_table.ul_mdm_len2, dc->config_table.ul_mdm_len2); ++ D3("ul_diag_len: 0x%04X, %d", dc->config_table.ul_diag_len, dc->config_table.ul_diag_len); ++ D3("ul_app1_len: 0x%04X, %d", dc->config_table.ul_app1_len, dc->config_table.ul_app1_len); ++ D3("ul_app2_len: 0x%04X, %d", dc->config_table.ul_app2_len, dc->config_table.ul_app2_len); ++ D3("ul_ctrl_len: 0x%04X, %d", dc->config_table.ul_ctrl_len, dc->config_table.ul_ctrl_len); ++} ++#endif ++ ++/* Read configuration table from card under intalization phase */ ++/* Returns 1 if ok, else 0 */ ++static int nozomi_read_config_table(dc_t *dc) { ++ ++ if (cards_found > 0 && cards_found == cards_initialized) { ++ return 1; ++ } ++ ++ GET_MEM( &dc->config_table, dc->base_addr + 0, sizeof(config_table_t)); ++ ++ /* D1( "0x%08X == 0x%08X ", dc->config_table.signature, CONFIG_MAGIC); */ ++ ++ if( dc->config_table.signature != CONFIG_MAGIC ) { ++ ERR("ConfigTable Bad! 0x%08X != 0x%08X", dc->config_table.signature, CONFIG_MAGIC); ++ return 0; ++ } ++ ++ if( (dc->config_table.version == 0) || (dc->config_table.toggle.enabled == TOGGLE_VALID) ) { ++ int i; ++ INFO( "Second phase, configuring card"); ++ ++ setup_memory(dc); ++ ++ dc->port[PORT_MDM].toggle_ul = dc->config_table.toggle.mdm_ul; ++ dc->port[PORT_MDM].toggle_dl = dc->config_table.toggle.mdm_dl; ++ dc->port[PORT_DIAG].toggle_dl = dc->config_table.toggle.diag_dl; ++ D1( "toggle ports: MDM UL:%d MDM DL:%d, DIAG DL:%d", ++ dc->port[PORT_MDM].toggle_ul, ++ dc->port[PORT_MDM].toggle_dl, ++ dc->port[PORT_DIAG].toggle_dl); ++ ++#ifdef NOZOMI_DEBUG ++ dump_table(dc); ++#endif ++ for (i=PORT_MDM; i< MAX_PORT;i++) { ++ dc->port[i].fifo_ul = kfifo_alloc( FIFO_BUFFER_SIZE_UL, GFP_ATOMIC , NULL); ++ memset( &dc->port[i].ctrl_dl, 0, sizeof (ctrl_dl_t)); ++ memset( &dc->port[i].ctrl_ul, 0, sizeof (ctrl_ul_t)); ++ } ++ ++ /* Enable control channel */ ++ SET_IER( CTRL_DL, CTRL_DL ); ++ ++ INFO("Initialization OK!"); ++ cards_initialized++; ++ return 1; ++ } ++ ++ if( (dc->config_table.version > 0) && (dc->config_table.toggle.enabled != TOGGLE_VALID ) ) { ++ u32 offset = 0; ++ INFO( "First phase: pushing upload buffers, clearing download"); ++ ++ INFO("Version of card: %d", dc->config_table.version); ++ ++ /* Here we should disable all I/O over F32. */ ++ setup_memory(dc); ++ ++ /* We should send ALL channel pair tokens back along with reset token */ ++ ++ /* push upload modem buffers */ ++ SET_MEM( dc->port[PORT_MDM].ul_addr[CH_A], &offset, 4); ++ SET_MEM( dc->port[PORT_MDM].ul_addr[CH_B], &offset, 4); ++ ++ SET_FCR( MDM_UL | DIAG_DL | MDM_DL ); ++ ++ D1( "First phase done"); ++ } ++ ++ return 1; ++} ++ ++/* Enable uplink interrupts */ ++static void enable_transmit_ul( port_type_t port , dc_t *dc ) { ++ ++ switch( port ) { ++ case PORT_MDM: SET_IER( MDM_UL , MDM_UL ); break; ++ case PORT_DIAG: SET_IER( DIAG_UL, DIAG_UL ); break; ++ case PORT_APP1: SET_IER( APP1_UL, APP1_UL ); break; ++ case PORT_APP2: SET_IER( APP2_UL, APP2_UL ); break; ++ case PORT_CTRL: SET_IER( CTRL_UL, CTRL_UL ); break; ++ default: ++ ERR("Called with wrong port?"); ++ break; ++ }; ++} ++ ++/* Disable uplink interrupts */ ++static void disable_transmit_ul( port_type_t port , dc_t *dc ) { ++ ++ switch( port ) { ++ case PORT_MDM: SET_IER( 0 ,MDM_UL ); break; ++ case PORT_DIAG: SET_IER( 0, DIAG_UL ); break; ++ case PORT_APP1: SET_IER( 0, APP1_UL ); break; ++ case PORT_APP2: SET_IER( 0, APP2_UL ); break; ++ case PORT_CTRL: SET_IER( 0, CTRL_UL ); break; ++ default: ++ ERR("Called with wrong port?"); ++ break; ++ }; ++} ++ ++/* Enable downlink interrupts */ ++static void enable_transmit_dl( port_type_t port , dc_t *dc ) { ++ ++ switch( port ) { ++ case PORT_MDM: SET_IER( MDM_DL , MDM_DL ); break; ++ case PORT_DIAG: SET_IER( DIAG_DL, DIAG_DL ); break; ++ case PORT_APP1: SET_IER( APP1_DL, APP1_DL ); break; ++ case PORT_APP2: SET_IER( APP2_DL, APP2_DL ); break; ++ case PORT_CTRL: SET_IER( CTRL_DL, CTRL_DL ); break; ++ default: ++ ERR("Called with wrong port?"); ++ break; ++ }; ++} ++ ++/* Disable downlink interrupts */ ++static void disable_transmit_dl( port_type_t port , dc_t *dc ) { ++ ++ switch( port ) { ++ case PORT_MDM: SET_IER( 0 ,MDM_DL ); break; ++ case PORT_DIAG: SET_IER( 0, DIAG_DL ); break; ++ case PORT_APP1: SET_IER( 0, APP1_DL ); break; ++ case PORT_APP2: SET_IER( 0, APP2_DL ); break; ++ case PORT_CTRL: SET_IER( 0, CTRL_DL ); break; ++ default: ++ ERR("Called with wrong port?"); ++ break; ++ }; ++} ++ ++/* Return 1 - send buffer to card and ack. */ ++/* Return 0 - don't ack, don't send buffer to card. */ ++int send_data( port_type_t index, dc_t *dc ) { ++ u32 size = 0; ++ port_t *port = &dc->port[index]; ++ u8 toggle = port->toggle_ul; ++ u32 addr = port->ul_addr[toggle]; ++ u32 ul_size = port->ul_size[toggle]; ++ struct tty_struct *tty = port->tty; ++ ++ if (index >= NTTY_TTY_MINORS) { ++ ERR("Called with wrong index?"); ++ return 0; ++ } ++ ++ /* Get data from tty and place in buf for now */ ++ size = __kfifo_get( port->fifo_ul, dc->send_buf, ul_size < SEND_BUF_MAX ? ul_size : SEND_BUF_MAX ); ++ ++ if (size == 0) { ++ D4("No more data to send, disable link:"); ++ return 0; ++ } ++ ++ port->tx_data += size; ++ ++ /* DUMP(buf, size); */ ++ ++ /* Write length + data */ ++ SET_MEM( addr, &size, 4 ); ++ SET_MEM_BUF( addr + 4, dc->send_buf, size); ++ ++ if (port->tty) { ++ if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup) { ++ tty->ldisc.write_wakeup(tty); ++ } ++ wake_up_interruptible(&tty->write_wait); ++ } ++ ++ return 1; ++} ++ ++/* If all data has been read, return 1, else 0 */ ++static int receive_data( port_type_t index, dc_t* dc ) { ++ u8 buf[RECEIVE_BUF_MAX] = {0}; ++ int size; ++ u32 offset = 4; ++ port_t *port = &dc->port[index]; ++ u8 toggle = port->toggle_dl; ++ u32 addr = port->dl_addr[toggle]; ++ struct tty_struct *tty = port->tty; ++ int i; ++ ++ if ( !tty ) { ++ D1("tty not open for port: %d?", index); ++ return 1; ++ } ++ ++ if (test_bit(TTY_DONT_FLIP, &tty->flags)) { ++ D6("TTY_DONT_FLIP set!! %d", index); ++ /* Here we disable interrupt for that port and schedule */ ++/* task. Task wakes up a little bit later and enables interrupt.. */ ++ port->tty_dont_flip = 1; ++ disable_transmit_dl(index, dc); ++#ifdef KERNEL_2_4 ++ schedule_task(&dc->tty_flip_queue); ++#endif ++#ifdef KERNEL_2_6 ++ if (!queue_work(dc->tty_flip_wq, &dc->tty_flip_wq_struct)) { ++ ERR("Call to queue_work() failed."); ++ } ++#endif ++ return 0; ++ } ++ ++ GET_MEM( &size, addr, 4 ); ++ /* D1( "%d bytes port: %d", size, index); */ ++ ++ if ( test_bit( TTY_THROTTLED, & tty->flags) ) { ++ D1("No room in tty, don't read data, don't ack interrupt, disable interrupt"); ++ ++ /* disable interrupt in downlink... */ ++ disable_transmit_dl(index, dc); ++ return 0; ++ } ++ ++ if (size == 0) { ++ ERR("size == 0?"); ++ return 1; ++ } ++ ++ while( size > 0 ) { ++ GET_MEM_BUF(buf, addr + offset, 4); ++ ++ i = 0; ++ while (i < 4 && size > 0) { ++ if (tty->flip.count >= TTY_FLIPBUF_SIZE) { ++ tty_flip_buffer_push(tty); ++ } ++ tty_insert_flip_char(tty, buf[i], TTY_NORMAL); ++ port->rx_data++; ++ i++; ++ size--; ++ } ++ ++ offset += 4; ++ } ++ ++ tty_flip_buffer_push(tty); ++ ++ return 1; ++} ++ ++/* Debug for interrupts */ ++#ifdef NOZOMI_DEBUG ++static char* interrupt2str( u16 interrupt) { ++ static char buf[TMP_BUF_MAX]; ++ char *p = buf; ++ ++ interrupt & MDM_DL1 ? p += snprintf(p, TMP_BUF_MAX, "MDM_DL1 "):0; ++ interrupt & MDM_DL2 ? p += snprintf(p, TMP_BUF_MAX, "MDM_DL2 "):0; ++ ++ interrupt & MDM_UL1 ? p += snprintf(p, TMP_BUF_MAX, "MDM_UL1 "):0; ++ interrupt & MDM_UL2 ? p += snprintf(p, TMP_BUF_MAX, "MDM_UL2 "):0; ++ ++ interrupt & DIAG_DL1 ? p += snprintf(p, TMP_BUF_MAX, "DIAG_DL1 "):0; ++ interrupt & DIAG_DL2 ? p += snprintf(p, TMP_BUF_MAX, "DIAG_DL2 "):0; ++ ++ interrupt & DIAG_UL ? p += snprintf(p, TMP_BUF_MAX, "DIAG_UL "):0; ++ ++ interrupt & APP1_DL ? p += snprintf(p, TMP_BUF_MAX, "APP1_DL "):0; ++ interrupt & APP2_DL ? p += snprintf(p, TMP_BUF_MAX, "APP2_DL "):0; ++ ++ interrupt & APP1_UL ? p += snprintf(p, TMP_BUF_MAX, "APP1_UL "):0; ++ interrupt & APP2_UL ? p += snprintf(p, TMP_BUF_MAX, "APP2_UL "):0; ++ ++ interrupt & CTRL_DL ? p += snprintf(p, TMP_BUF_MAX, "CTRL_DL "):0; ++ interrupt & CTRL_UL ? p += snprintf(p, TMP_BUF_MAX, "CTRL_UL "):0; ++ ++ interrupt & RESET ? p += snprintf(p, TMP_BUF_MAX, "RESET "):0; ++ ++ return buf; ++} ++#endif ++ ++/* Receive flow control */ ++/* Return 1 - If ok, else 0 */ ++static int receive_flow_control( dc_t *dc, irq_t *m) { ++ port_type_t port = PORT_MDM; ++ ctrl_dl_t ctrl_dl; ++ ctrl_dl_t old_ctrl; ++ u16 enable_ier = 0; ++ ++ GET_MEM( &ctrl_dl, dc->port[PORT_CTRL].dl_addr[CH_A], 2); ++ ++ switch( ctrl_dl.port ) { ++ case CTRL_CMD: ++ D1( "The Base Band sends this value as a response to a request for IMSI detach sent" ++ " over the control channel uplink (see section 7.6.1)."); ++ break; ++ case CTRL_MDM: port = PORT_MDM; enable_ier = MDM_DL; break; ++ case CTRL_DIAG: port = PORT_DIAG; enable_ier = DIAG_DL; break; ++ case CTRL_APP1: port = PORT_APP1; enable_ier = APP1_DL; break; ++ case CTRL_APP2: port = PORT_APP2; enable_ier = APP2_DL; break; ++ default: ++ ERR("ERROR: flow control received for non-existing port"); ++ return 0; ++ }; ++ ++ D1( "0x%04X->0x%04X", *((u16*) &dc->port[port].ctrl_dl), *((u16*)&ctrl_dl)); ++ ++ old_ctrl = dc->port[port].ctrl_dl; ++ dc->port[port].ctrl_dl = ctrl_dl; ++ ++ if ( old_ctrl.CTS == 1 && ctrl_dl.CTS == 0 ) { ++ D1( "Disable interrupt (0x%04X) on port: %d", enable_ier, port); ++ disable_transmit_ul(port, dc); ++ ++ } else if ( old_ctrl.CTS == 0 && ctrl_dl.CTS == 1 ) { ++ ++ if ( __kfifo_len(dc->port[port].fifo_ul) ) { ++ D1( "Enable interrupt (0x%04X) on port: %d", enable_ier, port); ++ D1( "Data in buffer [%d], enable transmit! ", __kfifo_len(dc->port[port].fifo_ul) ); ++ enable_transmit_ul( port, dc ); ++ } else { ++ D1( "No data in buffer..."); ++ } ++ } ++ ++ if(*(u16*)&old_ctrl == *(u16*)&ctrl_dl) ++ { ++ D1( " No change in mctrl"); ++ return 1; ++ } ++ /* Update statistics */ ++ if(old_ctrl.CTS != ctrl_dl.CTS) { ++ dc->port[port].tty_icount.cts++; ++ } ++ if(old_ctrl.DSR != ctrl_dl.DSR) { ++ dc->port[port].tty_icount.dsr++; ++ } ++ if(old_ctrl.RI != ctrl_dl.RI) { ++ dc->port[port].tty_icount.rng++; ++ } ++ if(old_ctrl.DCD != ctrl_dl.DCD) { ++ dc->port[port].tty_icount.dcd++; ++ } ++ D1("port: %d DCD(%d), CTS(%d), RI(%d), DSR(%d)", ++ port, ++ dc->port[port].tty_icount.dcd, dc->port[port].tty_icount.cts, ++ dc->port[port].tty_icount.rng, dc->port[port].tty_icount.dsr); ++ ++ return 1; ++} ++ ++/* TODO: */ ++/* - return ctrl_port_t */ ++static u8 port2ctrl(port_type_t port) { ++ switch( port ) { ++ case PORT_MDM: ++ return CTRL_MDM; ++ case PORT_DIAG: ++ return CTRL_DIAG; ++ case PORT_APP1: ++ return CTRL_APP1; ++ case PORT_APP2: ++ return CTRL_APP2; ++ default: ++ ERR("ERROR: send flow control received for non-existing port"); ++ return -1; ++ }; ++ return -1; ++} ++ ++/* Send flow control, can only update one channel at a time */ ++/* Return 0 - If we have updated all flow control */ ++/* Return 1 - If we need to update more flow control, ack current enable more */ ++static int send_flow_control( dc_t *dc ) { ++ u32 i, more_flow_control_to_be_updated = 0; ++ u16* ctrl; ++ ++ for( i=PORT_MDM; i<MAX_PORT ; i++ ) { ++ if( dc->port[i].update_flow_control ) { ++ if ( more_flow_control_to_be_updated ) { ++ /* We have more flow control to be updated */ ++ return 1; ++ } ++ dc->port[i].ctrl_ul.port = port2ctrl(i); ++ ctrl = (u16*) &dc->port[i].ctrl_ul; ++ /* D1( "sending flow control 0x%04X for port %d, %d", (u16) *ctrl, i, dc->port[i].ctrl_ul.port ); */ ++ SET_MEM( dc->port[PORT_CTRL].ul_addr[0], (u32*) ctrl, 2 ); ++ dc->port[i].update_flow_control = 0; ++ more_flow_control_to_be_updated = 1; ++ } ++ } ++ return 0; ++} ++ ++/* Handle donlink data, ports that are handled are modem and diagnostics */ ++/* Return 1 - ok */ ++/* Return 0 - toggle fields are out of sync */ ++static int handle_data_dl(dc_t *dc, irq_t *m, port_type_t port, u8 *toggle, u16 mask1, u16 mask2) { ++ ++ if ( *toggle == 0 && m->read_iir & mask1 ) { ++ if (receive_data( port, dc )) { ++ SET_FCR( mask1 ); ++ *toggle = !(*toggle); ++ } ++ ++ if ( m->read_iir & mask2 ) { ++ if (receive_data( port, dc )) { ++ SET_FCR( mask2 ); ++ *toggle = !(*toggle); ++ } ++ } ++ } else if ( *toggle == 1 && m->read_iir & mask2 ) { ++ if (receive_data( port, dc )) { ++ SET_FCR( mask2 ); ++ *toggle = !(*toggle); ++ } ++ ++ if ( m->read_iir & mask1 ) { ++ if (receive_data( port, dc )) { ++ SET_FCR( mask1 ); ++ *toggle = !(*toggle); ++ } ++ } ++ } else { ++ ERR("port out of sync!, toggle:%d", *toggle); ++ return 0; ++ } ++ return 1; ++} ++ ++/* Handle uplink data, this is currently for the modem port */ ++/* Return 1 - ok */ ++/* Return 0 - toggle field are out of sync */ ++static int handle_data_ul(dc_t *dc, irq_t *m, port_type_t port) { ++ ++ u8 *toggle = &(dc->port[port].toggle_ul); ++ ++ if ( *toggle==0 && m->read_iir & MDM_UL1 ) { ++ SET_IER( 0, MDM_UL ); ++ if (send_data(port, dc)) { ++ SET_FCR( MDM_UL1 ); ++ SET_IER( MDM_UL, MDM_UL); ++ *toggle = !*toggle; ++ } ++ ++ if ( m->read_iir & MDM_UL2 ) { ++ SET_IER( 0, MDM_UL ); ++ if (send_data(port, dc)) { ++ SET_FCR( MDM_UL2 ); ++ SET_IER( MDM_UL, MDM_UL); ++ *toggle = !*toggle; ++ } ++ } ++ ++ } else if ( *toggle==1 && m->read_iir & MDM_UL2 ) { ++ SET_IER( 0, MDM_UL ); ++ if (send_data(port, dc)) { ++ SET_FCR( MDM_UL2 ); ++ SET_IER( MDM_UL, MDM_UL); ++ *toggle = !*toggle; ++ } ++ ++ if ( m->read_iir & MDM_UL1 ) { ++ SET_IER( 0, MDM_UL ); ++ if (send_data(port, dc)) { ++ SET_FCR( MDM_UL1 ); ++ SET_IER( MDM_UL, MDM_UL); ++ *toggle = !*toggle; ++ } ++ } ++ } else { ++ SET_FCR( m->read_iir & MDM_UL ); ++ ERR("port out of sync!"); ++ return 0; ++ } ++ return 1; ++} ++ ++static irqreturn_t interrupt_handler(int irq, void *dev_id, struct pt_regs *regs) { ++ dc_t *dc = NULL; ++ irq_t* m = &my_irq; ++ ++ if (my_dev && my_dev->pdev != dev_id) { ++ return IRQ_NONE; ++ } ++ ++ if ( !(dc = get_dc_by_pdev(dev_id)) ) { ++ ERR("Could not find device context from pci_dev: %d", (u32) dev_id); ++ return IRQ_NONE; ++ } ++ ++ GET_IIR( m->read_iir ); ++ ++ /* Just handle interrupt enabled in IER (by masking with dc->ier_last_written) */ ++ m->read_iir &= dc->ier_last_written; ++ ++ if (m->read_iir == 0) { ++ return IRQ_NONE; ++ } ++ ++ if (dc == NULL ) { ++ ERR("ERROR!!"); ++ return IRQ_NONE; ++ } ++ ++ spin_lock(&dc->spin_mutex); ++ ++ D4( "%s irq:0x%04X, prev:0x%04X", interrupt2str(m->read_iir), m->read_iir, dc->ier_last_written); ++ ++ if ( m->read_iir & RESET) { ++ if( !nozomi_read_config_table(dc) ) { ++ SET_IER( 0, 0xFFFF); ++ ERR("ERR: Could not read status from card, we should disable interface"); ++ } else { ++ SET_FCR( RESET ); ++ } ++ goto exit_handler; /* No more useful info if this was the reset interrupt. */ ++ } ++ if ( m->read_iir & CTRL_UL ) { ++ D1( "CTRL_UL"); ++ SET_IER( 0, CTRL_UL ); ++ if ( send_flow_control(dc) ) { ++ SET_FCR( CTRL_UL ); ++ SET_IER( CTRL_UL, CTRL_UL ); ++ } ++ } ++ if ( m->read_iir & CTRL_DL ) { ++ receive_flow_control(dc, m); ++ SET_FCR( CTRL_DL ); ++ } ++ if ( m->read_iir & MDM_DL ) { ++ if ( !(handle_data_dl(dc, m, PORT_MDM, &(dc->port[PORT_MDM].toggle_dl), MDM_DL1, MDM_DL2)) ) { ++ ERR("MDM_DL out of sync!"); ++ goto exit_handler; ++ } ++ } ++ if ( m->read_iir & MDM_UL ) { ++ if ( !handle_data_ul(dc, m, PORT_MDM ) ) { ++ ERR("MDM_UL out of sync!"); ++ goto exit_handler; ++ } ++ } ++ if ( m->read_iir & DIAG_DL ) { ++ if ( !(handle_data_dl(dc, m, PORT_DIAG, &(dc->port[PORT_DIAG].toggle_dl), DIAG_DL1, DIAG_DL2)) ) { ++ ERR("DIAG_DL out of sync!"); ++ goto exit_handler; ++ } ++ } ++ if ( m->read_iir & DIAG_UL ) { ++ SET_IER( 0, DIAG_UL ); ++ if( send_data( PORT_DIAG, dc ) ) { ++ SET_FCR( DIAG_UL ); ++ SET_IER( DIAG_UL, DIAG_UL ); ++ } ++ } ++ if ( m->read_iir & APP1_DL ) { ++ if (receive_data( PORT_APP1, dc ) ) { ++ SET_FCR( APP1_DL ); ++ } ++ } ++ if ( m->read_iir & APP1_UL ) { ++ SET_IER( 0, APP1_UL ); ++ if(send_data( PORT_APP1, dc )) { ++ SET_FCR( APP1_UL ); ++ SET_IER( APP1_UL, APP1_UL ); ++ } ++ } ++ if ( m->read_iir & APP2_DL ) { ++ if (receive_data( PORT_APP2, dc )) { ++ SET_FCR( APP2_DL ); ++ } ++ } ++ if ( m->read_iir & APP2_UL ) { ++ SET_IER( 0, APP2_UL ); ++ if(send_data( PORT_APP2, dc )) { ++ SET_FCR( APP2_UL ); ++ SET_IER( APP2_UL, APP2_UL ); ++ } ++ } ++ ++ exit_handler: ++ spin_unlock(&dc->spin_mutex); ++ return IRQ_HANDLED; ++} ++ ++/* Request a shared IRQ from system */ ++static int nozomi_setup_interrupt(struct pci_dev *pdev) { ++ ++ int rval = 0; ++ ++ if ( (rval = request_irq( pdev->irq, &interrupt_handler, SA_SHIRQ, NOZOMI_NAME, pdev )) ) { ++ ERR("Cannot open because IRQ %d is already in use.", pdev->irq ); ++ return rval; ++ } ++ ++ return rval; ++} ++ ++static void nozomi_get_card_type(dc_t *dc) { ++ u32 i, size=0; ++ for(i=0;i<6;i++) { ++ size += pci_resource_len(dc->pdev, i); ++ } ++ ++ /* Assume card type F32_8 if no match */ ++ dc->card_type = size == 2048 ? F32_2 : F32_8; ++ ++ INFO("Card type is: %d", dc->card_type ); ++} ++ ++void nozomi_setup_private_data(dc_t *dc) { ++ u32 offset = dc->base_addr + dc->card_type/2; ++ int i; ++ ++ dc->REG_FCR = offset + R_FCR; ++ dc->REG_IIR = offset + R_IIR; ++ dc->REG_IER = offset + R_IER; ++ dc->ier_last_written = 0; ++ dc->closing = 0; ++ ++ dc->port[PORT_MDM ].token_dl = MDM_DL; ++ dc->port[PORT_DIAG].token_dl = DIAG_DL; ++ dc->port[PORT_APP1].token_dl = APP1_DL; ++ dc->port[PORT_APP2].token_dl = APP2_DL; ++ ++ for(i=PORT_MDM;i<MAX_PORT;i++) { ++ dc->port[i].rx_data = dc->port[i].tx_data = 0; ++ dc->port[i].tty_dont_flip = 0; ++ } ++} ++ ++ ++static void tty_flip_queue_function(void *tmp_dc) { ++ dc_t *dc = (dc_t*) tmp_dc; ++ int i; ++ ++ /* Enable interrupt for that port */ ++ for(i=0;i<MAX_PORT;i++) { ++ if (dc->port[i].tty_dont_flip) { ++ D6("Enable for port: %d", i); ++ dc->port[i].tty_dont_flip = 0; ++ enable_transmit_dl(dc->port[i].tty_index, dc); ++ } ++ } ++} ++ ++static int read_proc_card_type(char *buf, char **start, off_t offset, int len) { ++ dc_t *dc = get_dc_by_index(0); ++ len = 0; ++ ++ len += sprintf(buf+len,"%d\n", dc->card_type); ++ return len; ++} ++ ++static int read_proc_open_ttys(char *buf, char **start, off_t offset, int len) { ++ dc_t *dc = get_dc_by_index(0); ++ len = 0; ++ ++ len += sprintf(buf+len,"%d\n", dc->open_ttys); ++ return len; ++} ++ ++static int read_proc_version(char *buf, char **start, off_t offset, int len) { ++ len = 0; ++ ++ len += sprintf(buf+len, "%s\n", VERSION_STRING); ++ return len; ++} ++ ++static int read_proc_rtx(char *buf, char **start, off_t offset, int len) { ++ dc_t *dc = get_dc_by_index(0); ++ int i; ++ ++ len = 0; ++ ++ ++ for(i=PORT_MDM;i<MAX_PORT;i++) { ++ len += sprintf(buf+len,"noz%d rx: %d, tx: %d\n", i, dc->port[i].rx_data, dc->port[i].tx_data); ++ } ++ return len; ++} ++ ++static void make_proc_dirs(void) { ++ dc_t *dc = get_dc_by_index(0); ++ ++ dc->proc_entry = proc_mkdir("nozomi", &proc_root); ++ ++ /* Register the read_proc */ ++ if ( !create_proc_info_entry("card_type",0,dc->proc_entry,read_proc_card_type) ) { ++ ERR("ERROR: failed to register read_procmem"); ++ } ++ if ( !create_proc_info_entry("open_ttys",0,dc->proc_entry,read_proc_open_ttys) ) { ++ ERR("ERROR: failed to register read_procmem"); ++ } ++ if ( !create_proc_info_entry("rtx",0,dc->proc_entry,read_proc_rtx) ) { ++ ERR("ERROR: failed to register read_procmem"); ++ } ++ if ( !create_proc_info_entry("version",0,dc->proc_entry,read_proc_version) ) { ++ ERR("ERROR: failed to register read_procmem"); ++ } ++} ++ ++static void remove_proc_dirs(void) { ++ dc_t *dc = get_dc_by_index(0); ++ ++ remove_proc_entry("card_type", dc->proc_entry); ++ remove_proc_entry("open_ttys", dc->proc_entry); ++ remove_proc_entry("rtx", dc->proc_entry); ++ remove_proc_entry("version", dc->proc_entry); ++ remove_proc_entry("nozomi", &proc_root); ++} ++ ++static void send_reset_token(dc_t *dc) { ++ ++ ctrl_ul_t ctrl; ++ ++ /* Send 0x0001, command card to resend the reset token. */ ++ /* This is to get the reset when the module is reloaded. */ ++ ctrl.port = 0x00; ctrl.reserved = 0; ctrl.RTS=0; ctrl.DTR=1; ++ D1( "sending flow control 0x%04X", * ((u16*) &ctrl) ); ++ ++ ++ /*SET_MEM( dc->port[PORT_CTRL].ul_addr[0], (u32*) &ctrl, 2 );*/ ++ /* hack alert :D (fixed address determined experimentally) */ ++ SET_MEM( dc->base_addr + 0x000002FC, (u32*) &ctrl, 2 ); ++ SET_FCR( CTRL_UL ); /* push the token to the card. */ ++ D1( "sent flow control 0x%04X", * ((u16*) &ctrl) ); ++} ++ ++/* Allocate memory for one device */ ++static int __devinit nozomi_card_init(struct pci_dev *pdev, const struct pci_device_id *ent) { ++ int ret = -EIO; ++ dc_t *dc=NULL; ++ ++ cards_found++; ++ INFO("Init, cards_found: %d", cards_found); ++ ++ if (!(my_dev = kmalloc(sizeof(dc_t), GFP_KERNEL))) { ++ D1( "Could not allocate memory"); ++ return -EIO; ++ } ++ ++ memset(my_dev, 0, sizeof( dc_t )); ++ ++ if (cards_found > 1) { ++ ERR("This driver only supports 1 device"); ++ return -ENODEV; ++ } ++ ++ my_dev->pdev = pdev; ++ dc = my_dev; ++ ++ /* Find out what card type it is */ ++ nozomi_get_card_type(dc); ++ ++ if (pci_enable_device(dc->pdev)) { ++ ERR("Not possible to enable PCI Device"); ++ return -ENODEV; ++ } ++ ++ if ( (dc->base_addr = pci_resource_start(dc->pdev, 0)) == 0x0000) { ++ ERR("No I/O-Address for card detected"); ++ ret = -ENODEV; ++ goto err_disable_device; ++ } ++ ++ if (!(dc->base_addr = (u32) ioremap(dc->base_addr, dc->card_type))) { ++ ERR("No I/O-Address for card detected"); ++ ret = -ENODEV; ++ goto err_disable_device; ++ } ++ ++ dc->open_ttys=0; ++ ++ nozomi_setup_private_data(dc); ++ ++ if (pci_request_regions(dc->pdev, NOZOMI_NAME)) { ++ ERR("I/O address 0x%04x already in use", ++ (int) /* nozomi_private.io_addr */ 0); ++ ret = -EIO; ++ goto err_disable_regions; ++ } ++ ++ if ( !(dc->send_buf = kmalloc(SEND_BUF_MAX, GFP_KERNEL))) { ++ ERR("Could not allocate send buffer?"); ++ goto err_disable_regions; ++ } ++ ++ /* Disable all interrupts */ ++ SET_IER( 0 , 0xFFFF ); ++ ++ /* Setup interrupt handler */ ++ if (nozomi_setup_interrupt(dc->pdev)) { ++ ret = -EIO; ++ goto err_disable_regions; ++ } ++ ++ D1( "base_addr: 0x%08X", dc->base_addr); ++ ++#ifdef KERNEL_2_4 ++ dc->tty_flip_queue.list.next = NULL; ++ dc->tty_flip_queue.list.prev = NULL; ++ dc->tty_flip_queue.sync = 0; ++ dc->tty_flip_queue.data = dc; ++ dc->tty_flip_queue.routine = tty_flip_queue_function; ++#endif ++#ifdef KERNEL_2_6 ++ if ( !(dc->tty_flip_wq = create_singlethread_workqueue(NOZOMI_NAME )) ) { ++ ERR("Could not create workqueue?"); ++ BUG_ON(!dc->tty_flip_wq); ++ return -ENOMEM; ++ } ++ INIT_WORK( &dc->tty_flip_wq_struct, tty_flip_queue_function, (void*) dc); ++#endif ++ ++ spin_lock_init(&dc->spin_mutex); ++ ++ make_proc_dirs(); ++ ++ ntty_tty_init(dc); ++#if 0 ++ if (!nozomi_read_config_table(dc)) { ++ ERR("Could not read config table (pass 1)"); ++ return -ENODEV; ++ } ++ if (!nozomi_read_config_table(dc)) { ++ ERR("Could not read config table (pass 2)"); ++ return -ENODEV; ++ } ++#endif ++ send_reset_token(dc); ++ ++ /* Enable RESET interrupt. */ ++ SET_IER( RESET, 0xFFFF ); ++ ++ return 0; ++ ++err_disable_regions: ++ pci_release_regions(pdev); ++ iounmap((void *)dc->base_addr ); ++ dc->base_addr = 0; ++ ++err_disable_device: ++ pci_disable_device(pdev); ++ if(my_dev) { ++ kfree( my_dev ); ++ } ++ return ret; ++} ++ ++static void tty_do_close(dc_t *dc, port_t *port) { ++ ++ down(&port->tty_sem); ++ ++ if ( !port->tty_open_count ) { ++ goto exit; ++ } ++ ++ dc->open_ttys--; ++ port->tty_open_count--; ++#ifdef KERNEL_2_4 ++ MOD_DEC_USE_COUNT; ++#endif ++ ++ if ( port->tty_open_count == 0) { ++ D1("close: %d", port->token_dl ); ++ SET_IER( 0, port->token_dl ); ++ } ++ ++exit: ++ up(&port->tty_sem); ++} ++ ++static void __exit tty_exit(void) { ++ int i; ++ dc_t *dc = my_dev; ++ ++ D1( " "); ++ ++#ifdef KERNEL_2_6 ++ for (i = 0; i < NTTY_TTY_MINORS; ++i) ++ tty_unregister_device(&dc->tty_driver, i); ++#endif ++ ++ tty_unregister_driver(&dc->tty_driver); ++ ++ for (i = 0; i < NTTY_TTY_MINORS; i++) { ++ while (dc->port[i].tty_open_count) { ++ tty_do_close(dc, &dc->port[i]); ++ } ++ ++ dc->port[i].tty = NULL; ++ } ++} ++ ++/* Deallocate memory for one device */ ++static void __devexit nozomi_card_exit(struct pci_dev *pdev) { ++ int i; ++ dc_t *dc = get_dc_by_pdev(pdev); ++ ++ /* Disable all interrupts */ ++ SET_IER( 0, 0xFFFF); ++ ++ /* Setup dc->reg addresses to we can use defines here */ ++ nozomi_setup_private_data(dc); ++ send_reset_token(dc); ++ ++ D1( "pci_release_regions"); ++ pci_release_regions(pdev); ++ ++ if(dc->base_addr) ++ iounmap((void *)dc->base_addr); ++ ++ D1( "pci_disable_device"); ++ pci_disable_device(pdev); ++ ++ free_irq( pdev->irq, pdev ); ++ ++ for (i=PORT_MDM; i< MAX_PORT;i++) { ++ kfree ( dc->port[i].fifo_ul ); ++ } ++ ++ kfree( dc->send_buf ); ++ ++ tty_exit(); ++ ++ remove_proc_dirs(); ++ ++#ifdef KERNEL_2_6 ++ destroy_workqueue(dc->tty_flip_wq); ++#endif ++ ++ if (my_dev) { ++ kfree( my_dev ); ++ } ++ ++ cards_found--; ++ cards_initialized--; ++} ++ ++static void set_rts(int index, int rts) { ++ dc_t *dc = get_dc_by_index(index); ++ ++ dc->port[index].ctrl_ul.RTS = rts; ++ dc->port[index].update_flow_control = 1; ++ enable_transmit_ul(PORT_CTRL, dc); ++} ++ ++static void set_dtr(int index, int dtr) { ++ dc_t *dc = get_dc_by_index(index); ++ ++ D1("SETTING DTR index: %d, dtr: %d", index, dtr); ++ ++ dc->port[index].ctrl_ul.DTR = dtr; ++ dc->port[index].update_flow_control = 1; ++ enable_transmit_ul(PORT_CTRL, dc); ++} ++ ++ ++/* --------------------------------------------------------------------------------------------------- ++ TTY code ++ ---------------------------------------------------------------------------------------------------*/ ++ ++ ++/* Called when the userspace process opens the tty, /dev/noz*. */ ++static int ntty_open(struct tty_struct *tty, struct file *file) { ++ ++ s32 index = get_index(tty); ++ port_t *port = get_port_by_tty(tty); ++ dc_t *dc = get_dc_by_tty(tty); ++ ++ CARD_CHECK(-ENODEV); ++ ++ down(&port->tty_sem); ++ ++ tty->low_latency = 1; ++ tty->driver_data = port; ++ port->tty = tty; ++ port->tty_index = index; ++ ++ port->tty_open_count++; ++ dc->open_ttys++; ++ ++#ifdef KERNEL_2_4 ++ MOD_INC_USE_COUNT; ++#endif ++ ++ /* Enable interrupt downlink for channel */ ++ if ( port->tty_open_count == 1) { ++ port->rx_data = port->tx_data = 0; ++ D1("open: %d", port->token_dl ); ++ SET_IER( port->token_dl, port->token_dl ); ++ } ++ ++ up(&port->tty_sem); ++ ++ return 0; ++} ++ ++/* Called when the userspace process close the tty, /dev/noz*. */ ++static void ntty_close(struct tty_struct *tty, struct file *file) { ++ dc_t *dc; ++ CARD_CHECK(); ++ dc = get_dc_by_tty(tty); ++ tty_do_close(dc, (port_t *) tty->driver_data); ++} ++ ++/* called when the userspace process writes to the tty (/dev/noz*). */ ++/* Data is inserted into a fifo, which is then read and transfered to the modem. */ ++#ifdef KERNEL_2_6 ++static int ntty_write(struct tty_struct *tty, const unsigned char *buffer, int count) { ++#else ++static s32 ntty_write(struct tty_struct *tty, s32 from_user, const u8 *buffer, s32 count) { ++#endif ++ int rval = -EINVAL; ++ dc_t *dc = get_dc_by_tty(tty); ++ port_t *port = (port_t *) tty->driver_data; ++ ++ CARD_CHECK(rval); ++ ++ /* D1( "WRITEx: %d, index = %d", count, index); */ ++ ++ if (! port) { ++ return -ENODEV; ++ } ++ ++ down(&port->tty_sem); ++ ++ if (! port->tty_open_count) { ++ D1( " "); ++ goto exit; ++ } ++ ++#ifdef KERNEL_2_4 ++ if (from_user) { ++ rval = __kfifo_put_user(port->fifo_ul, (unsigned char *) buffer, count); ++ } else { ++ rval = __kfifo_put(port->fifo_ul, (unsigned char *) buffer, count); ++ } ++#else ++ rval = __kfifo_put(port->fifo_ul, (unsigned char *) buffer, count); ++#endif ++ ++ /* notify card */ ++ if ( dc == NULL) { ++ D1( "No device context?"); ++ goto exit; ++ } ++ ++ // CTS is only valid on the modem channel ++ if ( port == &(dc->port[PORT_MDM]) ) { ++ if ( port->ctrl_dl.CTS ) { ++ D4( "Enable interrupt"); ++ enable_transmit_ul(port->tty_index, dc ); ++ } else { ++ ERR("CTS not active on modem port?"); ++ } ++ } else { ++ enable_transmit_ul(port->tty_index, dc ); ++ } ++ ++exit: ++ up(&port->tty_sem); ++ return rval; ++} ++ ++/* Calculate how much is left in device */ ++/* This method is called by the upper tty layer. */ ++/* #according to sources N_TTY.c it expects a value >= 0 and does not check for negative values. */ ++static int ntty_write_room(struct tty_struct *tty) { ++ port_t *port = (port_t *) tty->driver_data; ++ int room = 0; ++/* u32 flags = 0; */ ++/* dc_t *dc = get_dc_by_tty(tty); */ ++ ++ CARD_CHECK(-ENODEV); ++ ++ if (! port) { ++ return 0; ++ } ++ ++ down(&port->tty_sem); ++ ++ if (! port->tty_open_count) { ++ goto exit; ++ } ++ ++ room = port->fifo_ul->size - __kfifo_len(port->fifo_ul); ++ ++exit: ++ up(&port->tty_sem); ++ return room; ++} ++ ++/* Sets termios flags, called by the tty layer. */ ++static void ntty_set_termios(struct tty_struct *tty, struct termios *old_termios) { ++ unsigned int cflag; ++ ++ CARD_CHECK(); ++ ++ cflag = tty->termios->c_cflag; ++ ++ if (old_termios) { ++ if ((cflag == old_termios->c_cflag) && ++ (RELEVANT_IFLAG(tty->termios->c_iflag) == RELEVANT_IFLAG(old_termios->c_iflag))) { ++ D1( " - nothing to change..."); ++ goto exit_termios; ++ } ++ } ++ ++ /* get the byte size */ ++ switch (cflag & CSIZE) { ++ case CS5: ++ D1( " - data bits = 5"); ++ break; ++ case CS6: ++ D1( " - data bits = 6"); ++ break; ++ case CS7: ++ D1( " - data bits = 7"); ++ break; ++ default: ++ case CS8: ++ D1( " - data bits = 8"); ++ break; ++ } ++ ++ /* determine the parity */ ++ if (cflag & PARENB) { ++ if (cflag & PARODD) { ++ D1( " - parity = odd"); ++ } else { ++ D1( " - parity = even"); ++ } ++ } else { ++ D1( " - parity = none"); ++ } ++ ++ /* figure out the stop bits requested */ ++ if (cflag & CSTOPB) { ++ D1( " - stop bits = 2"); ++ } else { ++ D1( " - stop bits = 1"); ++ } ++ ++ /* figure out the hardware flow control settings */ ++ if (cflag & CRTSCTS) { ++ D1( " - RTS/CTS is enabled"); ++ } else { ++ D1( " - RTS/CTS is disabled"); ++ } ++ ++ /* determine software flow control */ ++ /* if we are implementing XON/XOFF, set the start and ++ * stop character in the device */ ++ if (I_IXOFF(tty) || I_IXON(tty)) { ++#ifdef NOZOMI_DEBUG ++ unsigned char stop_char = STOP_CHAR(tty); ++ unsigned char start_char = START_CHAR(tty); ++#endif ++ /* if we are implementing INBOUND XON/XOFF */ ++ if (I_IXOFF(tty)) { ++ D1( " - INBOUND XON/XOFF is enabled, " ++ "XON = %2x, XOFF = %2x", start_char, stop_char); ++ } else { ++ D1( " - INBOUND XON/XOFF is disabled"); ++ } ++ ++ /* if we are implementing OUTBOUND XON/XOFF */ ++ if (I_IXON(tty)) { ++ D1( " - OUTBOUND XON/XOFF is enabled, " ++ "XON = %2x, XOFF = %2x", start_char, stop_char); ++ } else { ++ D1( " - OUTBOUND XON/XOFF is disabled"); ++ } ++ } ++ ++ exit_termios: ++ return; ++} ++ ++/* Gets io control parameters */ ++static int ntty_tiocmget(struct tty_struct *tty, struct file *file) { ++ port_t *port = (port_t *) tty->driver_data; ++ ctrl_dl_t *ctrl_dl = &port->ctrl_dl; ++ ctrl_ul_t *ctrl_ul = &port->ctrl_ul; ++ ++ return 0 ++ | (ctrl_ul->RTS ? TIOCM_RTS : 0) ++ | (ctrl_ul->DTR ? TIOCM_DTR : 0) ++ | (ctrl_dl->DCD ? TIOCM_CAR : 0) ++ | (ctrl_dl->RI ? TIOCM_RNG : 0) ++ | (ctrl_dl->DSR ? TIOCM_DSR : 0) ++ | (ctrl_dl->CTS ? TIOCM_CTS : 0); ++} ++ ++/* Sets io controls parameters */ ++static int ntty_tiocmset(struct tty_struct *tty, struct file *file, u32 arg) { ++ port_t *port = (port_t *) tty->driver_data; ++ ++ set_rts(port->tty_index, (arg & TIOCM_RTS) ? 1 : 0); ++ set_dtr(port->tty_index, (arg & TIOCM_DTR) ? 1 : 0); ++ ++ return 0; ++} ++ ++static int ntty_ioctl_tiocmiwait(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { ++ port_t *port = (port_t *) tty->driver_data; ++ ++ if (cmd == TIOCMIWAIT) { ++ DECLARE_WAITQUEUE(wait, current); ++ struct async_icount cnow; ++ struct async_icount cprev; ++ ++ cprev = port->tty_icount; ++ while (1) { ++ add_wait_queue(&port->tty_wait, &wait); ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule(); ++ remove_wait_queue(&port->tty_wait, &wait); ++ ++ /* see if a signal woke us up */ ++ if (signal_pending(current)) ++ return -ERESTARTSYS; ++ ++ cnow = port->tty_icount; ++ if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && ++ cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) ++ return -EIO; /* no change => error */ ++ if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) || ++ ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) || ++ ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd)) || ++ ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts)) ) { ++ return 0; ++ } ++ cprev = cnow; ++ } ++ ++ } ++ return -ENOIOCTLCMD; ++} ++ ++static int ntty_ioctl_tiocgicount(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { ++ port_t *port = (port_t *) tty->driver_data; ++ ++ if (cmd == TIOCGICOUNT) { ++ struct async_icount cnow = port->tty_icount; ++ struct serial_icounter_struct icount; ++ ++ icount.cts = cnow.cts; ++ icount.dsr = cnow.dsr; ++ icount.rng = cnow.rng; ++ icount.dcd = cnow.dcd; ++ icount.rx = cnow.rx; ++ icount.tx = cnow.tx; ++ icount.frame = cnow.frame; ++ icount.overrun = cnow.overrun; ++ icount.parity = cnow.parity; ++ icount.brk = cnow.brk; ++ icount.buf_overrun = cnow.buf_overrun; ++ ++ if (copy_to_user((void *)arg, &icount, sizeof(icount))) ++ return -EFAULT; ++ return 0; ++ } ++ return -ENOIOCTLCMD; ++} ++ ++static int ntty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { ++ port_t *port = (port_t *) tty->driver_data; ++ int mask; ++ int rval = -ENOIOCTLCMD; ++ ++ CARD_CHECK(rval); ++ ++ D1("******** IOCTL, cmd: %d", cmd); ++ ++ ++ switch (cmd) { ++ case TCGETS: ++ D1( "IOCTL TCGETS ..."); ++ rval = -ENOIOCTLCMD; ++ break; ++ case TCSETS: ++ D1( "IOCTL TCSETS ..."); ++ rval = -ENOIOCTLCMD; ++ break; ++ case TIOCMIWAIT: ++ rval = ntty_ioctl_tiocmiwait(tty, file, cmd, arg); ++ break; ++ case TIOCGICOUNT: ++ rval = ntty_ioctl_tiocgicount(tty, file, cmd, arg); ++ break; ++ case TIOCMGET: ++ rval = ntty_tiocmget(tty, file); ++ break; ++ case TIOCMSET: ++ rval = ntty_tiocmset(tty, file, arg); ++ break; ++ case TIOCMBIC: ++ if (get_user(mask, (unsigned long *) arg)) ++ return -EFAULT; ++ ++ if (mask & TIOCM_RTS) ++ set_rts(port->tty_index, 0); ++ if (mask & TIOCM_DTR) ++ set_dtr(port->tty_index, 0); ++ rval = 0; ++ break; ++ case TIOCMBIS: ++ if (get_user(mask, (unsigned long *) arg)) ++ return -EFAULT; ++ ++ if (mask & TIOCM_RTS) ++ set_rts(port->tty_index, 1); ++ if (mask & TIOCM_DTR) ++ set_dtr(port->tty_index, 1); ++ rval = 0; ++ break; ++ case TCFLSH: ++ D1( "IOCTL TCFLSH ..."); ++ rval = -ENOIOCTLCMD; ++ break; ++ ++ default: ++ D1( "ERR: 0x%08X, %d", cmd, cmd); ++ break; ++ }; ++ ++ return rval; ++} ++ ++/* Called by the upper tty layer when tty buffers are ready */ ++/* to receive data again after a call to throttle. */ ++static void ntty_unthrottle(struct tty_struct *tty) { ++ port_t *port = (port_t *) tty->driver_data; ++ dc_t *dc = get_dc_by_tty(tty); ++ u32 flags; ++ ++ CARD_CHECK(); ++ ++ D1( "UNTHROTTLE"); ++ spin_lock_irqsave(&dc->spin_mutex, flags); ++ enable_transmit_dl(port->tty_index, dc); ++ set_rts(port->tty_index, 1); ++ ++ spin_unlock_irqrestore(&dc->spin_mutex, flags); ++} ++ ++/* Called by the upper tty layer when the tty buffers are almost full. */ ++/* The driver should stop send more data. */ ++static void ntty_throttle(struct tty_struct *tty) { ++ port_t *port = (port_t *) tty->driver_data; ++ dc_t *dc = get_dc_by_tty(tty); ++ u32 flags; ++ ++ CARD_CHECK(); ++ ++ D1( "THROTTLE"); ++ spin_lock_irqsave(&dc->spin_mutex, flags); ++ set_rts(port->tty_index, 0); ++ spin_unlock_irqrestore(&dc->spin_mutex, flags); ++} ++ ++static void ntty_put_char(struct tty_struct *tty, unsigned char c) { ++ CARD_CHECK(); ++ D2("PUT CHAR Function: %c", c); ++} ++ ++/* Returns number of chars in buffer, called by tty layer */ ++static s32 ntty_chars_in_buffer(struct tty_struct *tty) { ++ port_t *port = (port_t *) tty->driver_data; ++ s32 rval; ++ ++ CARD_CHECK(-ENODEV); ++ ++ if (! port) { ++ rval = -ENODEV; ++ goto exit_in_buffer; ++ } ++ ++ if (! port->tty_open_count) { ++ ERR("No tty open?"); ++ rval = -ENODEV; ++ goto exit_in_buffer; ++ } ++ ++ rval = __kfifo_len(port->fifo_ul); ++ ++ exit_in_buffer: ++ return rval; ++} ++ ++/* Initializes the tty */ ++static int ntty_tty_init(dc_t *dc) { ++ struct tty_driver *td = &dc->tty_driver; ++ int rval; ++ int i; ++ ++ memset(td, 0, sizeof(struct tty_driver)); ++ ++ td->magic = TTY_DRIVER_MAGIC; ++ td->driver_name = NOZOMI_NAME_TTY; ++ td->name = "noz"; ++ td->major = NTTY_TTY_MAJOR, ++ td->type = TTY_DRIVER_TYPE_SERIAL, ++ td->subtype = SERIAL_TYPE_NORMAL, ++ td->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS, ++ td->init_termios = tty_std_termios; ++ td->init_termios.c_cflag = B115200 | CS8 | CREAD | HUPCL | CLOCAL; ++ ++ td->num = MAX_PORT; ++ td->name_base = 0; ++ td->minor_start = 0; ++ ++#ifdef KERNEL_2_4 ++ td->table = dc->tty_table; ++ td->refcount = &dc->tty_refcount; ++#endif ++ ++ td->termios = dc->tty_termios; ++ td->termios_locked = dc->tty_termios_locked; ++ ++ td->ioctl = ntty_ioctl; ++ td->open = ntty_open; ++ td->close = ntty_close; ++ td->write = ntty_write; ++ td->write_room = ntty_write_room; ++ td->unthrottle = ntty_unthrottle; ++ td->throttle = ntty_throttle; ++ td->set_termios = ntty_set_termios; ++ td->chars_in_buffer = ntty_chars_in_buffer; ++ td->put_char = ntty_put_char; ++ ++ rval = tty_register_driver(td); ++ ++ if (rval) { ++ printk(KERN_ERR "failed to register ntty tty driver"); ++ D1( "failed to register ntty tty driver"); ++ return rval; ++ } ++ ++ for (i = 0; i < NTTY_TTY_MINORS; i++) { ++ init_MUTEX(&dc->port[i].tty_sem); ++ dc->port[i].tty_open_count = 0; ++ dc->port[i].tty = NULL; ++ ++#ifdef KERNEL_2_6 ++ tty_register_device(td, i, NULL); ++#endif ++ } ++ ++ printk(KERN_INFO DRIVER_DESC " " NOZOMI_NAME_TTY); ++ D1( " "); ++ return rval; ++} ++ ++/* Module initialization */ ++static struct pci_driver nozomi_driver = { ++ .name = NOZOMI_NAME, ++ .id_table = nozomi_pci_tbl, ++ .probe = nozomi_card_init, ++ .remove = __devexit_p(nozomi_card_exit), ++}; ++ ++static int __init nozomi_init(void) { ++ int rval = 0; ++ ++ rval = pci_module_init(&nozomi_driver); ++ printk(KERN_INFO "Initializing %s\n", VERSION_STRING); ++ return rval; ++} ++ ++static void nozomi_exit(void) { ++ printk(KERN_INFO "Unloading %s", DRIVER_DESC); ++ ++ pci_unregister_driver(&nozomi_driver); ++} ++ ++module_init(nozomi_init); ++module_exit(nozomi_exit); ++ ++#ifdef NOZOMI_DEBUG ++ MODULE_PARM(nzdebug, "i"); ++#endif ++ ++MODULE_LICENSE("Dual BSD/GPL"); ++MODULE_DESCRIPTION( DRIVER_DESC ); diff --git a/packages/linux/linux-mtx-1-2.4.27/42-usb-ohci-fixes.patch b/packages/linux/linux-mtx-1-2.4.27/42-usb-ohci-fixes.patch new file mode 100644 index 0000000000..4c3058ce00 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/42-usb-ohci-fixes.patch @@ -0,0 +1,42 @@ +--- linux/drivers/usb/host/usb-ohci.c.orig 2006-03-30 11:38:08.972225500 +0200 ++++ linux/drivers/usb/host/usb-ohci.c 2006-03-30 11:39:46.858343000 +0200 +@@ -104,6 +104,10 @@ + + #define OHCI_UNLINK_TIMEOUT (HZ / 10) + ++static int ohci_delay = 3000; ++MODULE_PARM(ohci_delay, "i"); ++MODULE_PARM_DESC(ohci_delay, "Wait time [ms] for OHCI to come up"); ++ + /*-------------------------------------------------------------------------*/ + + /* AMD-756 (D2 rev) reports corrupt register contents in some cases. +@@ -2587,12 +2591,12 @@ + hc_release_ohci (ohci); + return -ENODEV; + } +- ++#if 0 + /* FIXME this is a second HC reset; why?? */ + writel (ohci->hc_control = OHCI_USB_RESET, &ohci->regs->control); + (void)readl (&ohci->regs->intrdisable); /* PCI posting flush */ + wait_ms (10); +- ++#endif + usb_register_bus (ohci->bus); + + if (request_irq (irq, hc_interrupt, SA_SHIRQ, +@@ -2668,6 +2672,13 @@ + void *mem_base; + int status; + ++ printk ("waiting for ohci to come up\n"); ++ mdelay(ohci_delay); ++ /* We have to wait for about four seconds for some devices to be available. ++ * This may only be a matter of the Option Globetrotter Fusion, ++ * that may need to much time to start up correctly. */ ++ printk ("ohci should be up\n"); ++ + if (pci_enable_device(dev) < 0) + return -ENODEV; + diff --git a/packages/linux/linux-mtx-1-2.4.27/defconfig-mtx-1 b/packages/linux/linux-mtx-1-2.4.27/defconfig-mtx-1 index d31e979829..5c189749fd 100644 --- a/packages/linux/linux-mtx-1-2.4.27/defconfig-mtx-1 +++ b/packages/linux/linux-mtx-1-2.4.27/defconfig-mtx-1 @@ -311,13 +311,13 @@ CONFIG_SYN_COOKIES=y # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CONNTRACK=y CONFIG_IP_NF_FTP=m CONFIG_IP_NF_AMANDA=m CONFIG_IP_NF_TFTP=m CONFIG_IP_NF_IRC=m CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_LIMIT=m CONFIG_IP_NF_MATCH_MAC=m CONFIG_IP_NF_MATCH_PKTTYPE=m @@ -332,29 +332,29 @@ CONFIG_IP_NF_MATCH_LENGTH=m CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_MATCH_TCPMSS=m CONFIG_IP_NF_MATCH_HELPER=m -CONFIG_IP_NF_MATCH_STATE=m -CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_MATCH_STATE=y +CONFIG_IP_NF_MATCH_CONNTRACK=y CONFIG_IP_NF_MATCH_UNCLEAN=m CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y CONFIG_IP_NF_TARGET_MIRROR=m -CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT=y CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_NAT_AMANDA=m # CONFIG_IP_NF_NAT_LOCAL is not set CONFIG_IP_NF_NAT_SNMP_BASIC=m CONFIG_IP_NF_NAT_IRC=m CONFIG_IP_NF_NAT_FTP=m CONFIG_IP_NF_NAT_TFTP=m -CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_MANGLE=y CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_DSCP=m -CONFIG_IP_NF_TARGET_MARK=m -CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_MARK=y +CONFIG_IP_NF_TARGET_LOG=y CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_TCPMSS=m CONFIG_IP_NF_ARPTABLES=m @@ -636,13 +636,14 @@ CONFIG_MIPS_AU1X00_ENET=y # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -CONFIG_PPP=m +CONFIG_PPP=y CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m +CONFIG_PPP_ASYNC=y CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE_MPPC=y CONFIG_PPPOE=m # CONFIG_SLIP is not set @@ -749,6 +750,7 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_MIPS_HYDROGEN3_BUTTONS is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 +CONFIG_NOZOMI=m # # I2C support @@ -1059,7 +1061,7 @@ CONFIG_SOUND=m # CONFIG_SOUND_ICH is not set # CONFIG_SOUND_RME96XX is not set # CONFIG_SOUND_SONICVIBES is not set -# CONFIG_SOUND_AU1X00 is not set +CONFIG_SOUND_AU1X00=m # CONFIG_SOUND_AU1550_PSC is not set # CONFIG_SOUND_AU1550_I2S is not set # CONFIG_SOUND_TRIDENT is not set @@ -1113,7 +1115,7 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_EHCI_HCD is not set # CONFIG_USB_UHCI is not set # CONFIG_USB_UHCI_ALT is not set -CONFIG_USB_OHCI=y +CONFIG_USB_OHCI=m CONFIG_USB_AUDIO=m CONFIG_USB_EMI26=m CONFIG_USB_MIDI=m |