]> rtime.felk.cvut.cz Git - lincan.git/blobdiff - lincan/src/i82527.c
Committed updated support for MPL AG PIP5, PIP6, PIP7, PIP8
[lincan.git] / lincan / src / i82527.c
index ec99430e58ba7222c45e4d739de93551fa1d6c3b..4ffad1766310500512a0739b581fd56c2db0c56d 100644 (file)
@@ -4,21 +4,15 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
-#define __NO_VERSION__
-#include <linux/module.h>
-
-#include <linux/autoconf.h>
-
-#include <linux/sched.h>
-#include <linux/fs.h>
-
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/i82527.h"
 
-void i82527_irq_rtr_handler(struct chip_t *chip, struct msgobj_t *obj, 
+void i82527_irq_rtr_handler(struct canchip_t *chip, struct msgobj_t *obj, 
                            struct rtr_id *rtr_search, unsigned long message_id);
 
 
@@ -29,7 +23,7 @@ extern int mo15mask;
 /* helper functions for segmented cards read and write configuration and status registers
    above 0xf offset */
 
-void i82527_seg_write_reg(const struct chip_t *chip, unsigned char data, unsigned address)
+void i82527_seg_write_reg(const struct canchip_t *chip, unsigned char data, unsigned address)
 {
        if((address > 0xf) && (chip->flags & CHIP_SEGMENTED))
                canobj_write_reg(chip, chip->msgobj[(address>>4)-1],data, address & 0xf);
@@ -37,7 +31,7 @@ void i82527_seg_write_reg(const struct chip_t *chip, unsigned char data, unsigne
                can_write_reg(chip, data, address);
 }
 
-unsigned i82527_seg_read_reg(const struct chip_t *chip, unsigned address)
+unsigned i82527_seg_read_reg(const struct canchip_t *chip, unsigned address)
 {
        if((address > 0xf) && (chip->flags & CHIP_SEGMENTED))
                return canobj_read_reg(chip, chip->msgobj[(address>>4)-1], address & 0xf);
@@ -45,7 +39,7 @@ unsigned i82527_seg_read_reg(const struct chip_t *chip, unsigned address)
                return can_read_reg(chip, address);
 }
 
-int i82527_enable_configuration(struct chip_t *chip)
+int i82527_enable_configuration(struct canchip_t *chip)
 {
        unsigned short flags=0;
 
@@ -55,7 +49,7 @@ int i82527_enable_configuration(struct chip_t *chip)
        return 0;
 }
 
-int i82527_disable_configuration(struct chip_t *chip)
+int i82527_disable_configuration(struct canchip_t *chip)
 {
        unsigned short flags=0;
 
@@ -65,7 +59,7 @@ int i82527_disable_configuration(struct chip_t *chip)
        return 0;
 }
 
-int i82527_chip_config(struct chip_t *chip)
+int i82527_chip_config(struct canchip_t *chip)
 {
        can_write_reg(chip,chip->int_cpu_reg,iCPU); // Configure cpu interface
        can_write_reg(chip,(iCTL_CCE|iCTL_INI),iCTL); // Enable configuration
@@ -89,10 +83,10 @@ int i82527_chip_config(struct chip_t *chip)
        else
                DEBUGMSG("Could read back, hardware is probably configured correctly\n");
 
-       if (baudrate == 0)
-               baudrate=1000;
+       if (chip->baudrate == 0)
+               chip->baudrate=1000000;
 
-       if (i82527_baud_rate(chip,baudrate*1000,chip->clock,0,75,0)) {
+       if (i82527_baud_rate(chip,chip->baudrate,chip->clock,0,75,0)) {
                CANMSG("Error configuring baud rate\n");
                return -ENODEV;
        }
@@ -112,7 +106,7 @@ int i82527_chip_config(struct chip_t *chip)
                CANMSG("Error clearing message objects\n");
                return -ENODEV;
        }
-       if (i82527_config_irqs(chip,0x0a)) {
+       if (i82527_config_irqs(chip,iCTL_IE|iCTL_EIE)) { /* has been 0x0a */
                CANMSG("Error configuring interrupts\n");
                return -ENODEV;
        }
@@ -127,7 +121,7 @@ int i82527_chip_config(struct chip_t *chip)
  * param sampl_pt sample point in % (0-100) sets (TSEG1+2)/(TSEG1+TSEG2+3) ratio
  * param flags fields BTR1_SAM, OCMODE, OCPOL, OCTP, OCTN, CLK_OFF, CBP
  */
-int i82527_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
+int i82527_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
                                                        int sampl_pt, int flags)
 {
        int best_error = 1000000000, error;
@@ -191,7 +185,7 @@ int i82527_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
        return 0;
 }
 
-int i82527_standard_mask(struct chip_t *chip, unsigned short code, unsigned short mask)
+int i82527_standard_mask(struct canchip_t *chip, unsigned short code, unsigned short mask)
 {
        unsigned char mask0, mask1;
 
@@ -206,7 +200,7 @@ int i82527_standard_mask(struct chip_t *chip, unsigned short code, unsigned shor
        return 0;
 }
 
-int i82527_extended_mask(struct chip_t *chip, unsigned long code, unsigned long mask)
+int i82527_extended_mask(struct canchip_t *chip, unsigned long code, unsigned long mask)
 {
        unsigned char mask0, mask1, mask2, mask3;
 
@@ -225,7 +219,7 @@ int i82527_extended_mask(struct chip_t *chip, unsigned long code, unsigned long
        return 0;
 }
 
-int i82527_message15_mask(struct chip_t *chip, unsigned long code, unsigned long mask)
+int i82527_message15_mask(struct canchip_t *chip, unsigned long code, unsigned long mask)
 {
        unsigned char mask0, mask1, mask2, mask3;
 
@@ -246,7 +240,7 @@ int i82527_message15_mask(struct chip_t *chip, unsigned long code, unsigned long
 
 }
 
-int i82527_clear_objects(struct chip_t *chip)
+int i82527_clear_objects(struct canchip_t *chip)
 {
        int i=0,id=0,data=0;
        struct msgobj_t *obj;
@@ -277,28 +271,42 @@ int i82527_clear_objects(struct chip_t *chip)
        return 0;
 }
 
-int i82527_config_irqs(struct chip_t *chip, short irqs)
+int i82527_config_irqs(struct canchip_t *chip, short irqs)
 {
        can_write_reg(chip,irqs,iCTL);
        DEBUGMSG("Configured hardware interrupt delivery\n");
        return 0;
 }
 
-int i82527_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
+int i82527_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)
 {
-       if (extended) {
+       unsigned long id=obj->rx_preconfig_id;
+
+       can_msgobj_set_fl(obj,RX_MODE);
+
+       if (extended || can_msgobj_test_fl(obj,RX_MODE_EXT)) {
+               id<<=3;
+               canobj_write_reg(chip,obj,id,iMSGID3);
+               canobj_write_reg(chip,obj,id>>8,iMSGID2);
+               canobj_write_reg(chip,obj,id>>16,iMSGID1);
+               canobj_write_reg(chip,obj,id>>24,iMSGID0);
                canobj_write_reg(chip,obj,MCFG_XTD,iMSGCFG);
-       }
-       else {
+       } else {
+               id<<=5;
+               canobj_write_reg(chip,obj,id,iMSGID1);
+               canobj_write_reg(chip,obj,id>>8,iMSGID0);
                canobj_write_reg(chip,obj,0x00,iMSGCFG);
        }
+
        canobj_write_reg(chip,obj,(NEWD_RES|MLST_RES|TXRQ_RES|RMPD_RES), iMSGCTL1);
        canobj_write_reg(chip,obj,(MVAL_SET|TXIE_RES|RXIE_SET|INTPD_RES),iMSGCTL0);
-       
+
+       DEBUGMSG("i82527_pre_read_config: configured obj at 0x%08lx\n",obj->obj_base_addr);
+
        return 0;
 }
 
-int i82527_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
+int i82527_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj,
                                                        struct canmsg_t *msg)
 {
        int i=0,id0=0,id1=0,id2=0,id3=0;
@@ -307,8 +315,10 @@ int i82527_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
        len = msg->length;
        if(len > CAN_MSG_LENGTH) len = CAN_MSG_LENGTH;
 
-       canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_RES|CPUU_SET|NEWD_RES),iMSGCTL1);
+       can_msgobj_clear_fl(obj,RX_MODE);
+
        canobj_write_reg(chip,obj,(MVAL_SET|TXIE_SET|RXIE_RES|INTPD_RES),iMSGCTL0);
+       canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_RES|CPUU_SET|NEWD_RES),iMSGCTL1);
 
        if (extended || (msg->flags&MSG_EXT)) {
                canobj_write_reg(chip,obj,(len<<4)|(MCFG_DIR|MCFG_XTD),iMSGCFG);
@@ -328,7 +338,7 @@ int i82527_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
                canobj_write_reg(chip,obj,id1,iMSGID1);
                canobj_write_reg(chip,obj,id0,iMSGID0);
        }
-       canobj_write_reg(chip,obj,0xfa,iMSGCTL1);
+       canobj_write_reg(chip,obj,RMPD_UNC|TXRQ_UNC|CPUU_SET|NEWD_SET,iMSGCTL1);
        for (i=0; i<len; i++) {
                canobj_write_reg(chip,obj,msg->data[i],iMSGDAT0+i);
        }
@@ -336,9 +346,11 @@ int i82527_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
        return 0;
 }
 
-int i82527_send_msg(struct chip_t *chip, struct msgobj_t *obj,
+int i82527_send_msg(struct canchip_t *chip, struct msgobj_t *obj,
                                                        struct canmsg_t *msg)
 {
+       canobj_write_reg(chip,obj,(MVAL_SET|TXIE_SET|RXIE_RES|INTPD_RES),iMSGCTL0);
+
        if (msg->flags & MSG_RTR) {
                canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_RES|CPUU_RES|NEWD_SET),iMSGCTL1);
        }
@@ -349,7 +361,7 @@ int i82527_send_msg(struct chip_t *chip, struct msgobj_t *obj,
        return 0;
 }
 
-int i82527_check_tx_stat(struct chip_t *chip)
+int i82527_check_tx_stat(struct canchip_t *chip)
 {
        if (can_read_reg(chip,iSTAT) & iSTAT_TXOK) {
                can_write_reg(chip,0x0,iSTAT);
@@ -361,7 +373,7 @@ int i82527_check_tx_stat(struct chip_t *chip)
        }
 }
 
-int i82527_remote_request(struct chip_t *chip, struct msgobj_t *obj)
+int i82527_remote_request(struct canchip_t *chip, struct msgobj_t *obj)
 {
        canobj_write_reg(chip,obj,(MVAL_SET|TXIE_RES|RXIE_SET|INTPD_RES),iMSGCTL0);
        canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_SET|MLST_RES|NEWD_RES),iMSGCTL1);
@@ -369,7 +381,7 @@ int i82527_remote_request(struct chip_t *chip, struct msgobj_t *obj)
        return 0;
 }
 
-int i82527_set_btregs(struct chip_t *chip, unsigned short btr0,
+int i82527_set_btregs(struct canchip_t *chip, unsigned short btr0,
                                                        unsigned short btr1)
 {
        if (i82527_enable_configuration(chip))
@@ -383,7 +395,7 @@ int i82527_set_btregs(struct chip_t *chip, unsigned short btr0,
        return 0;
 }
 
-int i82527_start_chip(struct chip_t *chip)
+int i82527_start_chip(struct canchip_t *chip)
 {
        unsigned short flags = 0;
 
@@ -393,7 +405,7 @@ int i82527_start_chip(struct chip_t *chip)
        return 0;
 }
 
-int i82527_stop_chip(struct chip_t *chip)
+int i82527_stop_chip(struct canchip_t *chip)
 {
        unsigned short flags = 0;
 
@@ -403,15 +415,19 @@ int i82527_stop_chip(struct chip_t *chip)
        return 0;
 }
 
-inline void i82527_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
+static inline 
+void i82527_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)
 {
        int cmd;
 
-       canobj_write_reg(chip,obj,(MVAL_RES|TXIE_RES|RXIE_RES|INTPD_RES),+iMSGCTL0);
+       canobj_write_reg(chip,obj,(MVAL_RES|TXIE_RES|RXIE_RES|INTPD_RES),iMSGCTL0);
 
        if(obj->tx_slot){
                /* Do local transmitted message distribution if enabled */
                if (processlocal){
+                       /* fill CAN message timestamp */
+                       can_filltimestamp(&obj->tx_slot->msg.timestamp);
+
                        obj->tx_slot->msg.flags |= MSG_LOCAL;
                        canque_filter_msg2edges(obj->qends, &obj->tx_slot->msg);
                }
@@ -437,115 +453,229 @@ inline void i82527_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
                canque_free_outslot(obj->qends, obj->tx_qedge, obj->tx_slot);
                obj->tx_slot=NULL;
                return;
-       } 
+       }
+       return;
 }
 
-inline void i82527_irq_read_handler(struct chip_t *chip, struct msgobj_t *obj,
-                                   unsigned long message_id)
+static inline
+void i82527_irq_read_handler(struct canchip_t *chip, struct msgobj_t *obj, int objnum)
 {
-       int i=0, tmp=1, len;
+       int i;
+       unsigned long message_id;
+       int msgcfg, msgctl1;
        
-       while (tmp) {
-               canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_RES|MLST_RES|NEWD_RES),iMSGCTL1);
-               canobj_write_reg(chip,obj,(MVAL_SET|TXIE_RES|RXIE_SET|INTPD_RES),iMSGCTL0);
+       msgctl1=canobj_read_reg(chip,obj,iMSGCTL1);
+       if(msgctl1 & NEWD_RES)
+               return;
+       
+       do {
+               if(objnum != 14) {
+                       canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_RES|MLST_UNC|NEWD_RES),iMSGCTL1);
+                       canobj_write_reg(chip,obj,(MVAL_SET|TXIE_RES|RXIE_SET|INTPD_RES),iMSGCTL0);
+               }
+
+               msgcfg = canobj_read_reg(chip,obj,iMSGCFG);
+
+               if (msgcfg&MCFG_XTD) {
+                       message_id =canobj_read_reg(chip,obj,iMSGID3);
+                       message_id|=canobj_read_reg(chip,obj,iMSGID2)<<8;
+                       message_id|=canobj_read_reg(chip,obj,iMSGID1)<<16;
+                       message_id|=canobj_read_reg(chip,obj,iMSGID0)<<24;
+                       message_id>>=3;
+                       obj->rx_msg.flags = MSG_EXT;
+
+               }
+               else {
+                       message_id =canobj_read_reg(chip,obj,iMSGID1);
+                       message_id|=canobj_read_reg(chip,obj,iMSGID0)<<8;
+                       message_id>>=5;
+                       obj->rx_msg.flags = 0;
+               }
+
+               obj->rx_msg.length = (msgcfg >> 4) & 0xf;
+               if(obj->rx_msg.length > CAN_MSG_LENGTH) obj->rx_msg.length = CAN_MSG_LENGTH;
 
-               len = (canobj_read_reg(chip,obj,iMSGCFG) >> 4) & 0xf;
-               obj->rx_msg.length = len;
                obj->rx_msg.id = message_id;
 
-               if(len > CAN_MSG_LENGTH) len = CAN_MSG_LENGTH;
                for (i=0; i < obj->rx_msg.length; i++)
                        obj->rx_msg.data[i] = canobj_read_reg(chip,obj,iMSGDAT0+i);
 
+               
+               if(objnum != 14) {
+                       /* if NEWD is set after data read, then read data are likely inconsistent */
+                       msgctl1=canobj_read_reg(chip,obj,iMSGCTL1);
+                       if(msgctl1 & NEWD_SET) {
+                               CANMSG("i82527_irq_read_handler: object %d data overwritten\n",objnum);
+                               continue;
+                       }
+               }
+               else {
+                       /* this object is special and data are queued in the shadow register */
+                       canobj_write_reg(chip,obj,(MVAL_SET|TXIE_RES|RXIE_SET|INTPD_RES),iMSGCTL0);
+                       canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_RES|MLST_UNC|NEWD_RES),iMSGCTL1);
+                       msgctl1=canobj_read_reg(chip,obj,iMSGCTL1);
+               }
+               
+
+               /* fill CAN message timestamp */
+               can_filltimestamp(&obj->rx_msg.timestamp);
+
                canque_filter_msg2edges(obj->qends, &obj->rx_msg);
+               
+               if (msgctl1 & NEWD_SET)
+                       continue;
+               
+               if (msgctl1 & MLST_SET) {
+                       canobj_write_reg(chip,obj,(RMPD_UNC|TXRQ_UNC|MLST_RES|NEWD_UNC),iMSGCTL1);
+                       CANMSG("i82527_irq_read_handler: object %d message lost\n",objnum);
+               }
+               
+               return;
 
-               if (!((tmp=canobj_read_reg(chip,obj,iMSGCTL1)) & NEWD_SET)) {
-                       break;
+       } while(1);
+}
+
+/*
+                       if (msgcfg&MCFG_XTD) {
+                               message_id =canobj_read_reg(chip,obj,iMSGID3);
+                               message_id|=canobj_read_reg(chip,obj,iMSGID2)<<8;
+                               message_id|=canobj_read_reg(chip,obj,iMSGID1)<<16;
+                               message_id|=canobj_read_reg(chip,obj,iMSGID0)<<24;
+                               message_id>>=3;
+                       }
+                       else {
+                               message_id =canobj_read_reg(chip,obj,iMSGID1);
+                               message_id|=canobj_read_reg(chip,obj,iMSGID0)<<8;
+                               message_id>>=5;
+                       }
+
+                       can_spin_lock(&hardware_p->rtr_lock);
+                       rtr_search=hardware_p->rtr_queue;
+                       while (rtr_search != NULL) {
+                               if (rtr_search->id == message_id)
+                                       break;
+                               rtr_search=rtr_search->next;
+                       }
+                       can_spin_unlock(&hardware_p->rtr_lock);
+                       if ((rtr_search!=NULL) && (rtr_search->id==message_id))
+                               i82527_irq_rtr_handler(chip, obj, rtr_search, message_id);
+                       else
+                               i82527_irq_read_handler(chip, obj, message_id); 
+*/
+
+
+static inline 
+void i82527_irq_update_filter(struct canchip_t *chip, struct msgobj_t *obj)
+{
+       struct canfilt_t filt;
+
+       if(canqueue_ends_filt_conjuction(obj->qends, &filt)) {
+               obj->rx_preconfig_id=filt.id;
+               canobj_write_reg(chip,obj,(MVAL_RES|TXIE_RES|RXIE_RES|INTPD_RES),iMSGCTL0);
+               if(obj->object == 15) {
+                       i82527_message15_mask(chip,filt.id,filt.mask);
+               }
+               if (filt.flags&MSG_EXT)
+                       can_msgobj_set_fl(obj,RX_MODE_EXT);
+               else
+                       can_msgobj_clear_fl(obj,RX_MODE_EXT);
+
+               i82527_pre_read_config(chip, obj);
+
+               CANMSG("i82527_irq_update_filter: obj at 0x%08lx\n",obj->obj_base_addr);
+       }
+}
+
+
+void i82527_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
+{
+       while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)) {
+
+               if(can_msgobj_test_and_clear_fl(obj,TX_REQUEST)) {
+                       if(canobj_read_reg(chip,obj,iMSGCTL1)&TXRQ_RES)
+                               i82527_irq_write_handler(chip, obj);
                }
 
-               if (tmp & MLST_SET)
-                       CANMSG("Message lost!\n");
+               if(!obj->tx_slot) {
+                       if(can_msgobj_test_and_clear_fl(obj,FILTCH_REQUEST)) {
+                               i82527_irq_update_filter(chip, obj);
+                       }
+               }
 
+               can_msgobj_clear_fl(obj,TX_LOCK);
+               if(can_msgobj_test_fl(obj,TX_REQUEST))
+                       continue;
+               if(can_msgobj_test_fl(obj,FILTCH_REQUEST) && !obj->tx_slot)
+                       continue;
+               break;
        }
 }
 
-irqreturn_t i82527_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+int i82527_irq_handler(int irq, struct canchip_t *chip)
 {
-       int id0=0, id1=0, id2=0, id3=0;
+       unsigned char msgcfg;
 
        unsigned irq_register;
        unsigned object;
-       struct chip_t *chip=(struct chip_t *)dev_id;
        struct msgobj_t *obj;
-       unsigned long message_id;
-       struct rtr_id *rtr_search;
+       int loop_cnt=CHIP_MAX_IRQLOOP;
 
        /*put_reg=device->hwspecops->write_register;*/
        /*get_reg=device->hwspecops->read_register;*/
 
        irq_register = i82527_seg_read_reg(chip, iIRQ);
 
-       while (irq_register) {
+       if(!irq_register) {
+               DEBUGMSG("i82527: spurious IRQ\n");
+               return CANCHIP_IRQ_NONE;
+       }
+
 
+       do {
+
+               if(!loop_cnt--) {
+                       CANMSG("i82527_irq_handler IRQ %d stuck\n",irq);
+                       CANMSG("i82527_irq_register 0x%x\n",irq_register);
+                       return CANCHIP_IRQ_STUCK;
+               }
+               
+               DEBUGMSG("i82527: iIRQ 0x%02x\n",irq_register);
+               
                if (irq_register == 0x01) {
                        DEBUGMSG("Status register: 0x%x\n",can_read_reg(chip, iSTAT));
-                       return IRQ_NONE;
+                       continue;
+                       /*return CANCHIP_IRQ_NONE;*/
                }
                
                if (irq_register == 0x02)
                        object = 14;
-               else
+               else if(irq_register < 14)
                        object = irq_register-3;
+               else
+                       return CANCHIP_IRQ_NONE;
 
                obj=chip->msgobj[object];
-
-               if (canobj_read_reg(chip,obj,iMSGCFG) & MCFG_DIR) {
-                       set_bit(OBJ_TX_REQUEST,&obj->flags);
-                       while(!test_and_set_bit(OBJ_TX_LOCK,&obj->flags)){
-                               clear_bit(OBJ_TX_REQUEST,&obj->flags);
-
-                               if(canobj_read_reg(chip,obj,iMSGCTL1)&TXRQ_RES)
-                                       i82527_irq_write_handler(chip, obj); 
-
-                               clear_bit(OBJ_TX_LOCK,&obj->flags);
-                               if(!test_bit(OBJ_TX_REQUEST,&obj->flags)) break;
-                       }
+               
+               msgcfg = canobj_read_reg(chip,obj,iMSGCFG);
+               if (msgcfg & MCFG_DIR) {
+                       can_msgobj_set_fl(obj,TX_REQUEST);
+                       
+                       /* calls i82527_irq_write_handler synchronized with other invocations */
+                       i82527_irq_sync_activities(chip, obj);
                }
                else { 
 
-                       if (extended) {
-                               id0=canobj_read_reg(chip,obj,iMSGID3);
-                               id1=canobj_read_reg(chip,obj,iMSGID2)<<8;
-                               id2=canobj_read_reg(chip,obj,iMSGID1)<<16;
-                               id3=canobj_read_reg(chip,obj,iMSGID0)<<24;
-                               message_id=(id0|id1|id2|id3)>>3;
-                       }
-                       else {
-                               id0=canobj_read_reg(chip,obj,iMSGID1);
-                               id1=canobj_read_reg(chip,obj,iMSGID0)<<8;
-                               message_id=(id0|id1)>>5;
-                       }
-
-                       spin_lock(&hardware_p->rtr_lock);
-                       rtr_search=hardware_p->rtr_queue;
-                       while (rtr_search != NULL) {
-                               if (rtr_search->id == message_id)
-                                       break;
-                               rtr_search=rtr_search->next;
-                       }
-                       spin_unlock(&hardware_p->rtr_lock);
-                       if ((rtr_search!=NULL) && (rtr_search->id==message_id))
-                               i82527_irq_rtr_handler(chip, obj, rtr_search, message_id);
-                       else
-                               i82527_irq_read_handler(chip, obj, message_id); 
+                       i82527_irq_read_handler(chip, obj, object); 
                }
-
+               
                irq_register=i82527_seg_read_reg(chip, iIRQ);
-       }
-       return IRQ_HANDLED;
+
+       } while(irq_register != 0);
+
+       return CANCHIP_IRQ_HANDLED;
 }
 
-void i82527_irq_rtr_handler(struct chip_t *chip, struct msgobj_t *obj,
+void i82527_irq_rtr_handler(struct canchip_t *chip, struct msgobj_t *obj,
                            struct rtr_id *rtr_search, unsigned long message_id)
 {
        short int i=0;
@@ -553,41 +683,54 @@ void i82527_irq_rtr_handler(struct chip_t *chip, struct msgobj_t *obj,
        canobj_write_reg(chip,obj,(MVAL_RES|TXIE_RES|RXIE_RES|INTPD_RES),iMSGCTL0);
        canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_RES|MLST_RES|NEWD_RES),iMSGCTL1);
        
-       spin_lock(&hardware_p->rtr_lock);
+       can_spin_lock(&hardware_p->rtr_lock);
 
        rtr_search->rtr_message->id=message_id;
        rtr_search->rtr_message->length=(canobj_read_reg(chip,obj,iMSGCFG) & 0xf0)>>4;
        for (i=0; i<rtr_search->rtr_message->length; i++)
                rtr_search->rtr_message->data[i]=canobj_read_reg(chip,obj,iMSGDAT0+i);
        
-       spin_unlock(&hardware_p->rtr_lock);
+       can_spin_unlock(&hardware_p->rtr_lock);
 
        if (waitqueue_active(&rtr_search->rtr_wq))
-               wake_up_interruptible(&rtr_search->rtr_wq);
+               wake_up(&rtr_search->rtr_wq);
 }
 
-int i82527_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
+/**
+ * i82527_wakeup_tx: - wakeups TX processing
+ * @chip: pointer to chip state structure
+ * @obj: pointer to message object structure
+ *
+ * Function is responsible for initiating message transmition.
+ * It is responsible for clearing of object TX_REQUEST flag
+ *
+ * Return Value: negative value reports error.
+ * File: src/i82527.c
+ */
+int i82527_wakeup_tx(struct canchip_t *chip, struct msgobj_t *obj)
 {
-        /* dummy lock to prevent preemption fully portable way */
-       spinlock_t dummy_lock;
-       
-       /*  preempt_disable() */
-       spin_lock_init(&dummy_lock);
-       spin_lock(&dummy_lock);
+       can_preempt_disable();
        
-       set_bit(OBJ_TX_REQUEST,&obj->flags);
-       while(!test_and_set_bit(OBJ_TX_LOCK,&obj->flags)){
-               clear_bit(OBJ_TX_REQUEST,&obj->flags);
+       can_msgobj_set_fl(obj,TX_REQUEST);
+
+       /* calls i82527_irq_write_handler synchronized with other invocations
+         from kernel and IRQ context */
+       i82527_irq_sync_activities(chip, obj);
+
+       can_preempt_enable();
+       return 0;
+}
 
-               if(canobj_read_reg(chip,obj,iMSGCTL1)&TXRQ_RES)
-                       i82527_irq_write_handler(chip, obj);
+int i82527_filtch_rq(struct canchip_t *chip, struct msgobj_t *obj)
+{
+       can_preempt_disable();
        
-               clear_bit(OBJ_TX_LOCK,&obj->flags);
-               if(!test_bit(OBJ_TX_REQUEST,&obj->flags)) break;
-       }
+       can_msgobj_set_fl(obj,FILTCH_REQUEST);
 
-       /* preempt_enable(); */
-       spin_unlock(&dummy_lock);
+       /* setups filter synchronized with other invocations from kernel and IRQ context */
+       i82527_irq_sync_activities(chip, obj);
+
+       can_preempt_enable();
        return 0;
 }
 
@@ -605,6 +748,7 @@ int i82527_register(struct chipspecops_t *chipspecops)
        chipspecops->send_msg = i82527_send_msg;
        chipspecops->check_tx_stat = i82527_check_tx_stat;
        chipspecops->wakeup_tx = i82527_wakeup_tx;
+       chipspecops->filtch_rq = i82527_filtch_rq;
        chipspecops->remote_request = i82527_remote_request;
        chipspecops->enable_configuration = i82527_enable_configuration;
        chipspecops->disable_configuration = i82527_disable_configuration;
@@ -614,3 +758,11 @@ int i82527_register(struct chipspecops_t *chipspecops)
        chipspecops->irq_handler = i82527_irq_handler;
        return 0;
 }
+
+int i82527_fill_chipspecops(struct canchip_t *chip)
+{
+       chip->chip_type="i82527";
+       chip->max_objects=15;
+       i82527_register(chip->chipspecops);
+       return 0;
+}