Changed SJA1000 chip IRQ handling to loop until all requests are served

[lincan.git] / lincan / src / sja1000p.c

diff --git a/lincan/src/sja1000p.c b/lincan/src/sja1000p.c
index dd9d696ae14f059384dbd8cb4f5d7dbe5a3f96f0..5deedc617d048edea6fa4edf754464ff908397c3 100644 (file)
--- a/lincan/src/sja1000p.c
+++ b/lincan/src/sja1000p.c
@@ -615,6 +615,7 @@ int sja1000p_irq_handler(int irq, struct canchip_t *chip)
 {
        int irq_register, status, error_code;
        struct msgobj_t *obj=chip->msgobj[0];
+       int loop_cnt=CHIP_MAX_IRQLOOP;
 
        irq_register=can_read_reg(chip,SJAIR);
 //     DEBUGMSG("sja1000_irq_handler: SJAIR:%02x\n",irq_register);
@@ -629,58 +630,69 @@ int sja1000p_irq_handler(int irq, struct canchip_t *chip)
                return CANCHIP_IRQ_NONE;
        }
 
-       if ((irq_register & sjaIR_RI) != 0) {
-               DEBUGMSG("sja1000_irq_handler: RI\n");
-               sja1000p_read(chip,obj);
-               obj->ret = 0;
-       }
-       if ((irq_register & sjaIR_TI) != 0) {
-               DEBUGMSG("sja1000_irq_handler: TI\n");
-               obj->ret = 0;
-               can_msgobj_set_fl(obj,TX_REQUEST);
-               while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)){
-                       can_msgobj_clear_fl(obj,TX_REQUEST);
-
-                       if (can_read_reg(chip, SJASR) & sjaSR_TBS)
-                               sja1000p_irq_write_handler(chip, obj);
-
-                       can_msgobj_clear_fl(obj,TX_LOCK);
-                       if(!can_msgobj_test_fl(obj,TX_REQUEST)) break;
-                       DEBUGMSG("TX looping in sja1000_irq_handler\n");
+       do {
+
+               if(!loop_cnt--) {
+                       CANMSG("sja1000p_irq_handler IRQ %d stuck\n",irq);
+                       return CANCHIP_IRQ_STUCK;
                }
-       }
-       if ((irq_register & (sjaIR_EI|sjaIR_BEI|sjaIR_EPI|sjaIR_DOI)) != 0) { 
-               // Some error happened
-               status=can_read_reg(chip,SJASR);
-               error_code=can_read_reg(chip,SJAECC);
-               CANMSG("Error: status register: 0x%x irq_register: 0x%02x error: 0x%02x\n",
-                       status, irq_register, error_code);
+
+               if ((irq_register & sjaIR_RI) != 0) {
+                       DEBUGMSG("sja1000_irq_handler: RI\n");
+                       sja1000p_read(chip,obj);
+                       obj->ret = 0;
+               }
+               if ((irq_register & sjaIR_TI) != 0) {
+                       DEBUGMSG("sja1000_irq_handler: TI\n");
+                       obj->ret = 0;
+                       can_msgobj_set_fl(obj,TX_REQUEST);
+                       while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)){
+                               can_msgobj_clear_fl(obj,TX_REQUEST);
+
+                               if (can_read_reg(chip, SJASR) & sjaSR_TBS)
+                                       sja1000p_irq_write_handler(chip, obj);
+
+                               can_msgobj_clear_fl(obj,TX_LOCK);
+                               if(!can_msgobj_test_fl(obj,TX_REQUEST)) break;
+                               DEBUGMSG("TX looping in sja1000_irq_handler\n");
+                       }
+               }
+               if ((irq_register & (sjaIR_EI|sjaIR_BEI|sjaIR_EPI|sjaIR_DOI)) != 0) { 
+                       // Some error happened
+                       status=can_read_reg(chip,SJASR);
+                       error_code=can_read_reg(chip,SJAECC);
+                       CANMSG("Error: status register: 0x%x irq_register: 0x%02x error: 0x%02x\n",
+                               status, irq_register, error_code);
 // FIXME: chip should be brought to usable state. Transmission cancelled if in progress.
 // Reset flag set to 0 if chip is already off the bus. Full state report
                obj->ret=-1;
                
-               if(error_code == 0xd9) {
-                       obj->ret= -ENXIO;
-                       /* no such device or address - no ACK received */
-               }
-               if(obj->tx_retry_cnt++>MAX_RETR) {
-                       can_write_reg(chip, sjaCMR_AT, SJACMR); // cancel any transmition
-                       obj->tx_retry_cnt = 0;
-               }
-               if(status&sjaSR_BS) {
-                       CANMSG("bus-off, resetting sja1000p\n");
-                       can_write_reg(chip, 0, SJAMOD);
-               }
-               
-               if(obj->tx_slot){
-                       canque_notify_inends(obj->tx_qedge, CANQUEUE_NOTIFY_ERRTX_BUS);
-                       /*canque_free_outslot(obj->qends, obj->tx_qedge, obj->tx_slot);
-                       obj->tx_slot=NULL;*/
+                       if(error_code == 0xd9) {
+                               obj->ret= -ENXIO;
+                               /* no such device or address - no ACK received */
+                       }
+                       if(obj->tx_retry_cnt++>MAX_RETR) {
+                               can_write_reg(chip, sjaCMR_AT, SJACMR); // cancel any transmition
+                               obj->tx_retry_cnt = 0;
+                       }
+                       if(status&sjaSR_BS) {
+                               CANMSG("bus-off, resetting sja1000p\n");
+                               can_write_reg(chip, 0, SJAMOD);
+                       }
+
+                       if(obj->tx_slot){
+                               canque_notify_inends(obj->tx_qedge, CANQUEUE_NOTIFY_ERRTX_BUS);
+                               /*canque_free_outslot(obj->qends, obj->tx_qedge, obj->tx_slot);
+                               obj->tx_slot=NULL;*/
+                       }
+
+               } else {
+                       obj->tx_retry_cnt=0;
                }
 
-       } else {
-               obj->tx_retry_cnt=0;
-       }
+               irq_register=can_read_reg(chip,SJAIR);
+       
+       } while(irq_register & (sjaIR_BEI|sjaIR_EPI|sjaIR_DOI|sjaIR_EI|sjaIR_TI|sjaIR_RI));
 
        return CANCHIP_IRQ_HANDLED;
 }