Menu
▾
▴
[openadsl-commits] src/linux l, 1.5, 1.6 p, 1.5, 1.6 pulsar.c, 1.17, 1.18 pulsar.h, 1.7, 1.8
|
From: Nathan W. <ng...@us...> - 2007-06-15 05:50:32
|
Update of /cvsroot/openadsl/src/linux In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26575 Modified Files: l p pulsar.c pulsar.h Log Message: Checked in release pulsar-4.0.23 Support for OA&M F4 and F5 ATM cell loopback Index: l =================================================================== RCS file: /cvsroot/openadsl/src/linux/l,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** l 1 Dec 2006 16:28:23 -0000 1.5 --- l 15 Jun 2007 05:50:20 -0000 1.6 *************** *** 1,9 **** modprobe atm ! modprobe pppoatm ! #modprobe br2684 ! insmod pulsar_atm.ko #insmod pulsar_atm.o ! #br2684ctl -b -s 4096 -c 0 -a 0.8.35 ! #ifconfig nas0 192.168.1.2 up --- 1,9 ---- modprobe atm ! #modprobe pppoatm ! modprobe br2684 #insmod pulsar_atm.o ! insmod pulsar_atm.ko ! br2684ctl -b -s 4096 -c 0 -a 0.8.35 ! ifconfig nas0 192.168.1.2 up Index: p =================================================================== RCS file: /cvsroot/openadsl/src/linux/p,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** p 1 Dec 2006 16:28:23 -0000 1.5 --- p 15 Jun 2007 05:50:21 -0000 1.6 *************** *** 2,5 **** pppd plugin pppoatm.so 8.35 user test lcp-echo-interval 20 lcp-echo-failure 3 \ nodefaultroute - - --- 2,3 ---- Index: pulsar.c =================================================================== RCS file: /cvsroot/openadsl/src/linux/pulsar.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pulsar.c 1 Dec 2006 16:28:23 -0000 1.17 --- pulsar.c 15 Jun 2007 05:50:21 -0000 1.18 *************** *** 1,7 **** // Pulsar PCI ADSL Linux Driver - ATM API // ! // Author - Guy Ellis (gu...@tr...) // // History Summary - for details see release notes // v4.0.22 - Library update to 4.0.11 // - Link speed, SNR & Attenuation now logged when sync is achieved --- 1,9 ---- // Pulsar PCI ADSL Linux Driver - ATM API // ! // Authors - Guy Ellis (gu...@tr...) ! // Nathan Williams (na...@tr...) // // History Summary - for details see release notes + // v4.0.23 - Support for OA&M F4 and F5 ATM cell loopback // v4.0.22 - Library update to 4.0.11 // - Link speed, SNR & Attenuation now logged when sync is achieved *************** *** 18,21 **** --- 20,24 ---- // Johan Verrept - SAR Library // Wayne Peart - Our Globespan FAE + // Charles Michael Heard - CRC-10 routine *************** *** 50,53 **** --- 53,66 ---- //#define SAR_LOOP + #undef DEBUG + //#define DEBUG 1 + + #ifdef DEBUG + #define PDEBUG(arg...) printk(KERN_ALERT "pulsar: " arg) + #else + #define PDEBUG(arg...) + #endif + + // Globals todo - clean these up - move to pmodem structure static char name[16]; *************** *** 75,81 **** #endif ! static int retrain_timer; spinlock_t rx_lock = SPIN_LOCK_UNLOCKED; spinlock_t timer_lock = SPIN_LOCK_UNLOCKED; --- 88,95 ---- #endif ! static unsigned char *oam_cell = NULL; static int retrain_timer; + spinlock_t oam_lock = SPIN_LOCK_UNLOCKED; spinlock_t rx_lock = SPIN_LOCK_UNLOCKED; spinlock_t timer_lock = SPIN_LOCK_UNLOCKED; *************** *** 96,99 **** --- 110,156 ---- //*************************************************************** + // CRC-10 table generated using code from: + // http://cell.onecall.net/cell-relay/publications/software/CRC/crc10.html + // + // Charles Michael Heard + // + //*************************************************************** + + static unsigned short byte_crc10_table[256] = { + 0x000, 0x233, 0x255, 0x066, 0x299, 0x0aa, 0x0cc, 0x2ff, + 0x301, 0x132, 0x154, 0x367, 0x198, 0x3ab, 0x3cd, 0x1fe, + 0x031, 0x202, 0x264, 0x057, 0x2a8, 0x09b, 0x0fd, 0x2ce, + 0x330, 0x103, 0x165, 0x356, 0x1a9, 0x39a, 0x3fc, 0x1cf, + 0x062, 0x251, 0x237, 0x004, 0x2fb, 0x0c8, 0x0ae, 0x29d, + 0x363, 0x150, 0x136, 0x305, 0x1fa, 0x3c9, 0x3af, 0x19c, + 0x053, 0x260, 0x206, 0x035, 0x2ca, 0x0f9, 0x09f, 0x2ac, + 0x352, 0x161, 0x107, 0x334, 0x1cb, 0x3f8, 0x39e, 0x1ad, + 0x0c4, 0x2f7, 0x291, 0x0a2, 0x25d, 0x06e, 0x008, 0x23b, + 0x3c5, 0x1f6, 0x190, 0x3a3, 0x15c, 0x36f, 0x309, 0x13a, + 0x0f5, 0x2c6, 0x2a0, 0x093, 0x26c, 0x05f, 0x039, 0x20a, + 0x3f4, 0x1c7, 0x1a1, 0x392, 0x16d, 0x35e, 0x338, 0x10b, + 0x0a6, 0x295, 0x2f3, 0x0c0, 0x23f, 0x00c, 0x06a, 0x259, + 0x3a7, 0x194, 0x1f2, 0x3c1, 0x13e, 0x30d, 0x36b, 0x158, + 0x097, 0x2a4, 0x2c2, 0x0f1, 0x20e, 0x03d, 0x05b, 0x268, + 0x396, 0x1a5, 0x1c3, 0x3f0, 0x10f, 0x33c, 0x35a, 0x169, + 0x188, 0x3bb, 0x3dd, 0x1ee, 0x311, 0x122, 0x144, 0x377, + 0x289, 0x0ba, 0x0dc, 0x2ef, 0x010, 0x223, 0x245, 0x076, + 0x1b9, 0x38a, 0x3ec, 0x1df, 0x320, 0x113, 0x175, 0x346, + 0x2b8, 0x08b, 0x0ed, 0x2de, 0x021, 0x212, 0x274, 0x047, + 0x1ea, 0x3d9, 0x3bf, 0x18c, 0x373, 0x140, 0x126, 0x315, + 0x2eb, 0x0d8, 0x0be, 0x28d, 0x072, 0x241, 0x227, 0x014, + 0x1db, 0x3e8, 0x38e, 0x1bd, 0x342, 0x171, 0x117, 0x324, + 0x2da, 0x0e9, 0x08f, 0x2bc, 0x043, 0x270, 0x216, 0x025, + 0x14c, 0x37f, 0x319, 0x12a, 0x3d5, 0x1e6, 0x180, 0x3b3, + 0x24d, 0x07e, 0x018, 0x22b, 0x0d4, 0x2e7, 0x281, 0x0b2, + 0x17d, 0x34e, 0x328, 0x11b, 0x3e4, 0x1d7, 0x1b1, 0x382, + 0x27c, 0x04f, 0x029, 0x21a, 0x0e5, 0x2d6, 0x2b0, 0x083, + 0x12e, 0x31d, 0x37b, 0x148, 0x3b7, 0x184, 0x1e2, 0x3d1, + 0x22f, 0x01c, 0x07a, 0x249, 0x0b6, 0x285, 0x2e3, 0x0d0, + 0x11f, 0x32c, 0x34a, 0x179, 0x386, 0x1b5, 0x1d3, 0x3e0, + 0x21e, 0x02d, 0x04b, 0x278, 0x087, 0x2b4, 0x2d2, 0x0e1}; + + + //*************************************************************** //// Retrain Routine ////*************************************************************** *************** *** 259,263 **** // TX Routines //*************************************************************** - void tx_cells(MODEM_PTR pmodem) { --- 316,319 ---- *************** *** 266,272 **** u32 tx_start, tx_end; struct sk_buff *skb; ! spin_lock_irqsave(&tx_lock, flags); ! if ((tx_running == FALSE) && (sarlib_vcc_list))// there is no dma pending { // try and get someting from the tx_queue --- 322,366 ---- u32 tx_start, tx_end; struct sk_buff *skb; ! #ifdef DEBUG ! int i; ! #endif spin_lock_irqsave(&tx_lock, flags); ! if ((tx_running == FALSE) && (oam_cell != NULL)){ ! //#ifdef DEBUG ! // for (i=0;i<(ATM_CELL_SIZE-1);i++){ ! // PDEBUG("%X ",(unsigned int)oam_cell[i]); ! // } ! //#endif ! PDEBUG("oam_cell at address: %X\n", (unsigned int)oam_cell); ! ! size = ATM_CELL_SIZE-1; //52 bytes ! if (size > MAX_TX_DMA) ! { ! size = MAX_TX_DMA; ! printk(KERN_WARNING "%s: Tx DMA truncated\n", name); ! } ! #ifdef DEBUG ! PDEBUG("oam_cell at address: %x\n", (unsigned int)oam_cell); ! #endif ! spin_lock(oam_lock); ! memcpy(txb, oam_cell, size); ! kfree(oam_cell); ! oam_cell = NULL; ! spin_unlock(oam_lock); ! #ifdef DEBUG ! PDEBUG("oam_cell at address: %X\n", (unsigned int)oam_cell); ! #endif ! // todo check for left overs ! cell_ptr = (u32)txb; ! tx_dma_count = 0; ! tx_start = (u32)virt_to_bus((void *)cell_ptr); ! tx_end = tx_start + size; ! tx_running = TRUE; ! last_start = tx_start; ! last_end = tx_end; ! adsl_tx(pmodem, tx_start, tx_end); ! spin_unlock_irqrestore(&tx_lock, flags); ! } ! else if ((tx_running == FALSE) && (sarlib_vcc_list))// there is no dma pending { // try and get someting from the tx_queue *************** *** 303,306 **** --- 397,401 ---- } + void tx_done(MODEM_PTR pmodem) { *************** *** 368,371 **** --- 463,489 ---- } + + + //*************************************************************** + // CRC-10 routine from: + // http://cell.onecall.net/cell-relay/publications/software/CRC/crc10.html + // + // Charles Michael Heard + // + //*************************************************************** + + unsigned short update_crc10_by_bytes(unsigned short crc10_accum, unsigned char *data_blk_ptr, int data_blk_size){ + /* update the data block's CRC-10 remainder one byte at a time */ + + register int i; + for ( i = 0; i < data_blk_size; i++ ) + { + crc10_accum = ((crc10_accum << 8) & 0x3ff) + ^ byte_crc10_table[( crc10_accum >> 2) & 0xff] + ^ *data_blk_ptr++; + } + return crc10_accum; + } + //*************************************************************** // RX Routines *************** *** 377,384 **** // if end of aal5 call decode_aal5 // then pass on to protocol layer ! u16 pos = 0, skb_len; ! struct sk_buff *skb1,*skb2,*kskb; struct sarlib_vcc_data *ctx; ! //printk(" < "); if(sarlib_vcc_list) { --- 495,563 ---- // if end of aal5 call decode_aal5 // then pass on to protocol layer ! u16 pos = 0; ! struct sk_buff *skb1,*skb2; struct sarlib_vcc_data *ctx; ! unsigned char *cell = skb->data; ! unsigned long atmHeader; ! unsigned int vpi, vci, pti; ! unsigned short int crc10_accum = 0; ! #ifdef DEBUG ! int j = 0; ! #endif ! ! #ifdef DEBUG ! PDEBUG("START of WHILE\n"); ! #endif ! while((cell - skb->data) < size){ ! #ifdef DEBUG ! j++; ! #endif ! atmHeader = ((unsigned long)(cell[0]) << 24) | ((unsigned long)(cell[1]) << 16) | ((unsigned long)(cell[2]) << 8) | (cell[3] & 0xff); ! vpi = (unsigned int)((atmHeader & ATM_HDR_VPI_MASK) >> ATM_HDR_VPI_SHIFT); ! vci = (unsigned int)((atmHeader & ATM_HDR_VCI_MASK) >> ATM_HDR_VCI_SHIFT); ! pti = (unsigned int)((atmHeader & ATM_HDR_PTI_MASK) >> ATM_HDR_PTI_SHIFT); ! if ((pti == 5) || (pti == 4) || (vci == 3) || (vci == 4)){ ! spin_lock(oam_lock); ! if (oam_cell == NULL){ ! oam_cell = kmalloc((ATM_CELL_SIZE-1), GFP_KERNEL); //allocate 52 bytes ! if(oam_cell != NULL){ ! memcpy(oam_cell,cell,(ATM_CELL_SIZE-1)); ! oam_cell[5]=0; //set loopback indication ! oam_cell[50]=0; ! oam_cell[51]=0; ! crc10_accum = update_crc10_by_bytes(0,(oam_cell+4) , 48); ! oam_cell[50]= (crc10_accum >> 8); ! oam_cell[51]= (crc10_accum & 0x00ff); ! #ifdef DEBUG ! PDEBUG("Allocated OAM cell space\n"); ! #endif ! } else { ! #ifdef DEBUG ! PDEBUG("Kmalloc Failed!\n"); ! #endif ! } ! ! } ! else { ! #ifdef DEBUG ! PDEBUG("oam_cell not NULL!\n"); ! PDEBUG("Skipped memcpy\n"); ! #endif ! } ! #ifdef DEBUG ! PDEBUG("OAM VPI:%d VCI:%d PTI:%d\n", vpi,vci,pti); ! #endif ! spin_unlock(oam_lock); ! ! } else { ! // printk(KERN_DEBUG "non-oam %d %d %d\n", vpi,vci,pti); ! ! } ! cell = cell + (ATM_CELL_SIZE - 1); //add 52 bytes ! } ! #ifdef DEBUG ! PDEBUG("%d cells\n",j); ! PDEBUG("END of WHILE\n"); ! #endif if(sarlib_vcc_list) { *************** *** 398,421 **** rx_pdu_cnt++; // printk("RX PDU count = %d\n",rx_pdu_cnt); - #ifndef SAR_LOOP //printk("rx_process()\n"); if ((ctx) && (ctx->vcc) && (ctx->vcc->push)) { ctx->vcc->push(ctx->vcc,skb2); - //skb_len = skb2->len; - //kskb = atm_alloc_charge(ctx->vcc, skb_len, GFP_ATOMIC); - //printk("atm_alloc @ %x, size = %d\n",kskb,skb_len); - //if (kskb) - if (1 == 2) - { - memcpy(skb_put(kskb, skb_len), (void *)skb2->data, skb_len); - ATM_SKB(kskb)->vcc = ctx->vcc; - ctx->vcc->push(ctx->vcc,kskb); - }; } - //dev_kfree_skb(skb2); - #else //sar loop - tx_process(pmodem, ctx, skbo); - #endif } } --- 577,585 ---- *************** *** 699,703 **** .phy_put = NULL, .phy_get = NULL, - .phy_put = NULL, .change_qos = NULL, .proc_read = NULL, --- 863,866 ---- *************** *** 724,728 **** --- 887,893 ---- goto pulsar_init_exit; } + memset(pmodem, 0, sizeof(MODEM_PTR)); + PDEBUG("oam_cell points to %p\n", oam_cell); sprintf(name, "%s%d", PTAG, index); *************** *** 743,747 **** goto pulsar_init_exit_free; } ! //pmodem->rx_lock = SPIN_LOCK_UNLOCKED; //pmodem->tx_lock = SPIN_LOCK_UNLOCKED; --- 908,912 ---- goto pulsar_init_exit_free; } ! //pmodem->rx_lock = SPIN_LOCK_UNLOCKED; //pmodem->tx_lock = SPIN_LOCK_UNLOCKED; *************** *** 761,764 **** --- 926,931 ---- pci_set_master(pci_dev); + + //The code between here and next comment may be overwriting the end of the pmodem structure. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) err = pci_request_region(pci_dev, 0, name); *************** *** 772,775 **** --- 939,945 ---- } + //Somehow elements in pmodem structure can be overwritten with PCI address + + pmodem->pci_base = ioremap(membase, memlen); if (!pmodem->pci_base) { *************** *** 882,885 **** --- 1052,1056 ---- pci_set_drvdata(pci_dev, NULL); kfree(txb); + kfree(oam_cell); kfree(pmodem->handle); kfree(pmodem); *************** *** 929,934 **** --- 1100,1110 ---- kfree(txb); + kfree(oam_cell); + PDEBUG("Freed oam_cell\n"); + PDEBUG("oam_cell = %p\n",oam_cell); + kfree(pmodem->handle); kfree(pmodem); + } Index: pulsar.h =================================================================== RCS file: /cvsroot/openadsl/src/linux/pulsar.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pulsar.h 1 Dec 2006 16:28:23 -0000 1.7 --- pulsar.h 15 Jun 2007 05:50:21 -0000 1.8 *************** *** 72,75 **** --- 72,76 ---- u8 line_atten; char snr_margin; + // unsigned char *oam_cell; // void *rx_lock; // CBUF_STRUCT rx_cbuf[RX_CBUF_SIZE]; |