X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/3129fcd8094edcb910b708463fdf1a234f11fb55..91dfab84182937b62ef64cb12d8e4f89e6d5c3ec:/lincan/include/can_queue.h diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h index 51f1d9b..2fc422f 100644 --- a/lincan/include/can_queue.h +++ b/lincan/include/can_queue.h @@ -1,30 +1,9 @@ #ifndef _CAN_QUEUE_H #define _CAN_QUEUE_H -#include -#include -#include -#include -#include #include "./can.h" #include "./constants.h" - -/* Next is not sctrictly correct, because of 2.3.0, 2.3.1, 2.3.2 - kernels need next definitions too */ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,19)) /* may need correction */ - #define wait_queue_head_t struct wait_queue * - #define wait_queue_t struct wait_queue - #define init_waitqueue_head(queue_head) (*queue_head=NULL) - #define init_waitqueue_entry(qentry,qtask) \ - (qentry->next=NULL,qentry->task=qtask) - #define DECLARE_WAIT_QUEUE_HEAD(name) \ - struct wait_queue * name=NULL - #define DECLARE_WAITQUEUE(wait, current) \ - struct wait_queue wait = { current, NULL } - #define init_MUTEX(sem) (*sem=MUTEX) - #define DECLARE_MUTEX(name) struct semaphore name=MUTEX -#endif /* 2.2.19 */ - +#include "./can_sysdep.h" /** * struct canque_slot_t - one CAN message slot in the CAN FIFO queue @@ -72,7 +51,7 @@ struct canque_fifo_t { struct canque_slot_t **tail; /* points to NULL pointer for chaining */ struct canque_slot_t *flist; /* points the first entry in the free list */ struct canque_slot_t *entry; /* points to first allocated entry */ - spinlock_t fifo_lock; /* spin_lock_irqsave / spin_lock_irqrestore */ + can_spinlock_t fifo_lock; /* can_spin_lock_irqsave / can_spin_unlock_irqrestore */ }; #define CAN_FIFOF_DESTROY_b 15 @@ -83,6 +62,9 @@ struct canque_fifo_t { #define CAN_FIFOF_FULL_b 10 #define CAN_FIFOF_EMPTY_b 9 #define CAN_FIFOF_DEAD_b 8 +#define CAN_FIFOF_INACTIVE_b 7 +#define CAN_FIFOF_FREEONEMPTY_b 6 +#define CAN_FIFOF_READY_b 5 #define CAN_FIFOF_DESTROY (1<fifo_flags) @@ -117,21 +102,21 @@ struct canque_fifo_t { static inline int canque_fifo_get_inslot(struct canque_fifo_t *fifo, struct canque_slot_t **slotp, int cmd) { - unsigned long flags; + can_spin_irqflags_t flags; struct canque_slot_t *slot; - spin_lock_irqsave(&fifo->fifo_lock, flags); + can_spin_lock_irqsave(&fifo->fifo_lock, flags); /* get the first free slot slot from flist */ if(!(slot=fifo->flist)) { canque_fifo_set_fl(fifo,OVERRUN); canque_fifo_set_fl(fifo,FULL); - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); *slotp=NULL; return -1; } /* adjust free slot list */ if(!(fifo->flist=slot->next)) canque_fifo_set_fl(fifo,FULL); - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); *slotp=slot; slot->slot_flags=cmd&CAN_SLOTF_CMD; return 1; @@ -149,17 +134,18 @@ static inline int canque_fifo_put_inslot(struct canque_fifo_t *fifo, struct canque_slot_t *slot) { int ret; - unsigned long flags; + can_spin_irqflags_t flags; slot->next=NULL; - spin_lock_irqsave(&fifo->fifo_lock, flags); + can_spin_lock_irqsave(&fifo->fifo_lock, flags); if(*fifo->tail) printk(KERN_CRIT "canque_fifo_put_inslot: fifo->tail != NULL\n"); *fifo->tail=slot; fifo->tail=&slot->next; + ret=0; if(canque_fifo_test_and_clear_fl(fifo,EMPTY)) ret=CAN_FIFOF_EMPTY; /* Fifo has been empty before put */ - else - ret=0; - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + if(canque_fifo_test_and_clear_fl(fifo,INACTIVE)) + ret=CAN_FIFOF_INACTIVE; /* Fifo has been empty before put */ + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); return ret; } @@ -174,13 +160,13 @@ static inline int canque_fifo_abort_inslot(struct canque_fifo_t *fifo, struct canque_slot_t *slot) { int ret=0; - unsigned long flags; - spin_lock_irqsave(&fifo->fifo_lock, flags); + can_spin_irqflags_t flags; + can_spin_lock_irqsave(&fifo->fifo_lock, flags); slot->next=fifo->flist; fifo->flist=slot; if(canque_fifo_test_and_clear_fl(fifo,FULL)) ret=CAN_FIFOF_FULL; - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); return ret; } @@ -198,19 +184,19 @@ int canque_fifo_abort_inslot(struct canque_fifo_t *fifo, struct canque_slot_t *s static inline int canque_fifo_test_outslot(struct canque_fifo_t *fifo, struct canque_slot_t **slotp) { - unsigned long flags; + can_spin_irqflags_t flags; int cmd; struct canque_slot_t *slot; - spin_lock_irqsave(&fifo->fifo_lock, flags); + can_spin_lock_irqsave(&fifo->fifo_lock, flags); if(!(slot=fifo->head)){; canque_fifo_set_fl(fifo,EMPTY); - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); *slotp=NULL; return -1; } if(!(fifo->head=slot->next)) fifo->tail=&fifo->head; - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); *slotp=slot; cmd=slot->slot_flags; @@ -232,8 +218,8 @@ static inline int canque_fifo_free_outslot(struct canque_fifo_t *fifo, struct canque_slot_t *slot) { int ret=0; - unsigned long flags; - spin_lock_irqsave(&fifo->fifo_lock, flags); + can_spin_irqflags_t flags; + can_spin_lock_irqsave(&fifo->fifo_lock, flags); slot->next=fifo->flist; fifo->flist=slot; if(canque_fifo_test_and_clear_fl(fifo,FULL)) @@ -242,7 +228,7 @@ int canque_fifo_free_outslot(struct canque_fifo_t *fifo, struct canque_slot_t *s canque_fifo_set_fl(fifo,EMPTY); ret|=CAN_FIFOF_EMPTY; } - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); return ret; } @@ -256,12 +242,12 @@ int canque_fifo_free_outslot(struct canque_fifo_t *fifo, struct canque_slot_t *s static inline int canque_fifo_again_outslot(struct canque_fifo_t *fifo, struct canque_slot_t *slot) { - unsigned long flags; - spin_lock_irqsave(&fifo->fifo_lock, flags); + can_spin_irqflags_t flags; + can_spin_lock_irqsave(&fifo->fifo_lock, flags); if(!(slot->next=fifo->head)) fifo->tail=&slot->next; fifo->head=slot; - spin_unlock_irqrestore(&fifo->fifo_lock, flags); + can_spin_unlock_irqrestore(&fifo->fifo_lock, flags); return 1; } @@ -283,10 +269,13 @@ struct chip_t; * @filtid: the possible CAN message identifiers filter. * @filtmask: the filter mask, the comparison considers only * @filtid bits corresponding to set bits in the @filtmask field. - * @inpeers: the lists of all peer FIFOs connected by their + * @inpeers: the lists of all peers FIFOs connected by their * input side (@inends) to the same terminal (@struct canque_ends_t). - * @outpeers: the lists of all peer FIFOs connected by their + * @outpeers: the lists of all peers FIFOs connected by their * output side (@outends) to the same terminal (@struct canque_ends_t). + * @activepeers: the lists of peers FIFOs connected by their + * output side (@outends) to the same terminal (@struct canque_ends_t) + * with same priority and active state. * @inends: the pointer to the FIFO input side terminal (@struct canque_ends_t). * @outends: the pointer to the FIFO output side terminal (@struct canque_ends_t). * @edge_used: the atomic usage counter, mainly used for safe destruction of the edge. @@ -303,6 +292,7 @@ struct canque_edge_t { unsigned long filtmask; struct list_head inpeers; struct list_head outpeers; + struct list_head activepeers; struct canque_ends_t *inends; struct canque_ends_t *outends; atomic_t edge_used; @@ -312,6 +302,7 @@ struct canque_edge_t { /** * struct canque_ends_t - CAN message delivery subsystem graph vertex (FIFO ends) + * @ends_flags: this field holds flags describing state of the ENDS structure. * @active: the array of the lists of active edges directed to the ends structure * with ready messages. The array is indexed by the edges priorities. * @idle: the list of the edges directed to the ends structure with empty FIFOs. @@ -337,10 +328,12 @@ struct canque_edge_t { * this structure. */ struct canque_ends_t { + unsigned long ends_flags; struct list_head active[CANQUEUE_PRIO_NR]; struct list_head idle; struct list_head inlist; - spinlock_t ends_lock; /* spin_lock_irqsave / spin_lock_irqrestore */ + struct list_head outlist; + can_spinlock_t ends_lock; /* can_spin_lock_irqsave / can_spin_unlock_irqrestore */ void (*notify)(struct canque_ends_t *qends, struct canque_edge_t *qedge, int what); void *context; union { @@ -348,6 +341,9 @@ struct canque_ends_t { wait_queue_head_t readq; wait_queue_head_t writeq; wait_queue_head_t emptyq; + #ifdef CAN_ENABLE_KERN_FASYNC + struct fasync_struct *fasync; + #endif /*CAN_ENABLE_KERN_FASYNC*/ } fileinfo; struct { wait_queue_head_t daemonq; @@ -355,20 +351,24 @@ struct canque_ends_t { struct chip_t *chip; } chipinfo; } endinfo; + struct list_head dead_peers; }; -#define CANQUEUE_NOTIFY_EMPTY 1 /* out -> in - all slots are processed by FIFO out side */ -#define CANQUEUE_NOTIFY_SPACE 2 /* out -> in - full state negated => there is space for new message */ -#define CANQUEUE_NOTIFY_PROC 3 /* in -> out - empty state negated => out side is requested to process slots */ -#define CANQUEUE_NOTIFY_NOUSR 4 /* called with some lock to prevent edge disappear */ -#define CANQUEUE_NOTIFY_DEAD 5 /* */ -#define CANQUEUE_NOTIFY_ATACH 6 /* */ -#define CANQUEUE_NOTIFY_FILTCH 7 /* filter changed */ +#define CANQUEUE_NOTIFY_EMPTY 1 /* out -> in - all slots are processed by FIFO out side */ +#define CANQUEUE_NOTIFY_SPACE 2 /* out -> in - full state negated => there is space for new message */ +#define CANQUEUE_NOTIFY_PROC 3 /* in -> out - empty state negated => out side is requested to process slots */ +#define CANQUEUE_NOTIFY_NOUSR 4 /* called with some lock to prevent edge disappear */ +#define CANQUEUE_NOTIFY_DEAD 5 /* */ +#define CANQUEUE_NOTIFY_DEAD_WANTED 6 /* */ +#define CANQUEUE_NOTIFY_ATTACH 7 /* */ +#define CANQUEUE_NOTIFY_FILTCH 8 /* filter changed */ #define CANQUEUE_NOTIFY_ERROR 0x10000 /* error notifiers */ #define CANQUEUE_NOTIFY_ERRTX_PREP 0x11001 /* tx preparation error */ #define CANQUEUE_NOTIFY_ERRTX_SEND 0x11002 /* tx send error */ #define CANQUEUE_NOTIFY_ERRTX_BUS 0x11003 /* tx bus error */ +#define CAN_ENDSF_DEAD (1<<0) + /** * canque_notify_inends - request to send notification to the input ends * @qedge: pointer to the edge structure @@ -418,23 +418,38 @@ void canque_notify_bothends(struct canque_edge_t *qedge, int what) static inline void canque_activate_edge(struct canque_ends_t *inends, struct canque_edge_t *qedge) { - unsigned long flags; + can_spin_irqflags_t flags; struct canque_ends_t *outends; if(qedge->edge_prio>=CANQUEUE_PRIO_NR) qedge->edge_prio=CANQUEUE_PRIO_NR-1; - spin_lock_irqsave(&inends->ends_lock, flags); + can_spin_lock_irqsave(&inends->ends_lock, flags); if((outends=qedge->outends)){ - spin_lock(&outends->ends_lock); - spin_lock(&qedge->fifo.fifo_lock); + can_spin_lock(&outends->ends_lock); + can_spin_lock(&qedge->fifo.fifo_lock); if(!canque_fifo_test_fl(&qedge->fifo,EMPTY)){ - list_del(&qedge->outpeers); - list_add_tail(&qedge->outpeers,&outends->active[qedge->edge_prio]); + list_del(&qedge->activepeers); + list_add_tail(&qedge->activepeers,&outends->active[qedge->edge_prio]); } - spin_unlock(&qedge->fifo.fifo_lock); - spin_unlock(&outends->ends_lock); + can_spin_unlock(&qedge->fifo.fifo_lock); + can_spin_unlock(&outends->ends_lock); } - spin_unlock_irqrestore(&inends->ends_lock, flags); + can_spin_unlock_irqrestore(&inends->ends_lock, flags); +} + +/** + * canque_filtid2internal - converts message ID and filter flags into internal format + * @id: CAN message 11 or 29 bit identifier + * @filtflags: CAN message flags + * + * This function maps message ID and %MSG_RTR, %MSG_EXT and %MSG_LOCAL into one 32 bit number + */ +static inline +unsigned int canque_filtid2internal(unsigned long id, int filtflags) +{ + filtflags &= MSG_RTR|MSG_EXT|MSG_LOCAL; + filtflags += filtflags&MSG_RTR; + return (id&MSG_ID_MASK) | (filtflags<<28); } int canque_get_inslot(struct canque_ends_t *qends, @@ -462,10 +477,165 @@ int canque_again_outslot(struct canque_ends_t *qends, struct canque_edge_t *qedge, struct canque_slot_t *slot); int canque_set_filt(struct canque_edge_t *qedge, - unsigned long filtid, unsigned long filtmask); - + unsigned long filtid, unsigned long filtmask, int flags); + int canque_flush(struct canque_edge_t *qedge); +int canqueue_disconnect_edge(struct canque_edge_t *qedge); + +int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *inends, struct canque_ends_t *outends); + +int canqueue_ends_init_gen(struct canque_ends_t *qends); + +void canqueue_block_inlist(struct canque_ends_t *qends); + +void canqueue_block_outlist(struct canque_ends_t *qends); + +int canqueue_ends_kill_inlist(struct canque_ends_t *qends, int send_rest); + +int canqueue_ends_kill_outlist(struct canque_ends_t *qends); + +/* edge reference and traversal functions */ + +void canque_edge_do_dead(struct canque_edge_t *edge, int dead_fl); + +static inline +void canque_edge_incref(struct canque_edge_t *edge) +{ + atomic_inc(&edge->edge_used); +} + +static inline +void canque_edge_decref(struct canque_edge_t *edge) +{ + can_spin_irqflags_t flags; + struct canque_ends_t *inends=edge->inends; + struct canque_ends_t *outends=edge->outends; + int dead_fl; + + can_spin_lock_irqsave(&inends->ends_lock, flags); + can_spin_lock(&outends->ends_lock); + if(atomic_dec_and_test(&edge->edge_used)) { + dead_fl=canque_fifo_test_and_set_fl(&edge->fifo,DEAD); + /*This should not be there, but it cannot be outside of the lock :-(*/ + canque_notify_bothends(edge,CANQUEUE_NOTIFY_NOUSR); + can_spin_unlock(&outends->ends_lock); + can_spin_unlock_irqrestore(&inends->ends_lock, flags); + canque_edge_do_dead(edge, dead_fl); + } else { + can_spin_unlock(&outends->ends_lock); + can_spin_unlock_irqrestore(&inends->ends_lock, flags); + } +} + +static inline +struct canque_edge_t *canque_first_inedge(struct canque_ends_t *qends) +{ + can_spin_irqflags_t flags; + struct list_head *entry; + struct canque_edge_t *edge; + + can_spin_lock_irqsave(&qends->ends_lock, flags); + entry=qends->inlist.next; + skip_dead: + if(entry != &qends->inlist) { + edge=list_entry(entry,struct canque_edge_t,inpeers); + if(canque_fifo_test_fl(&edge->fifo,DEAD)) { + entry=entry->next; + goto skip_dead; + } + canque_edge_incref(edge); + } else { + edge=NULL; + } + can_spin_unlock_irqrestore(&qends->ends_lock, flags); + return edge; +} + + +static inline +struct canque_edge_t *canque_next_inedge(struct canque_ends_t *qends, struct canque_edge_t *edge) +{ + can_spin_irqflags_t flags; + struct list_head *entry; + struct canque_edge_t *next; + + can_spin_lock_irqsave(&qends->ends_lock, flags); + entry=edge->inpeers.next; + skip_dead: + if(entry != &qends->inlist) { + next=list_entry(entry,struct canque_edge_t,inpeers); + if(canque_fifo_test_fl(&edge->fifo,DEAD)) { + entry=entry->next; + goto skip_dead; + } + canque_edge_incref(next); + } else { + next=NULL; + } + can_spin_unlock_irqrestore(&qends->ends_lock, flags); + canque_edge_decref(edge); + return next; +} + +#define canque_for_each_inedge(qends, edge) \ + for(edge=canque_first_inedge(qends);edge;edge=canque_next_inedge(qends, edge)) + +static inline +struct canque_edge_t *canque_first_outedge(struct canque_ends_t *qends) +{ + can_spin_irqflags_t flags; + struct list_head *entry; + struct canque_edge_t *edge; + + can_spin_lock_irqsave(&qends->ends_lock, flags); + entry=qends->outlist.next; + skip_dead: + if(entry != &qends->outlist) { + edge=list_entry(entry,struct canque_edge_t,outpeers); + if(canque_fifo_test_fl(&edge->fifo,DEAD)) { + entry=entry->next; + goto skip_dead; + } + canque_edge_incref(edge); + } else { + edge=NULL; + } + can_spin_unlock_irqrestore(&qends->ends_lock, flags); + return edge; +} + + +static inline +struct canque_edge_t *canque_next_outedge(struct canque_ends_t *qends, struct canque_edge_t *edge) +{ + can_spin_irqflags_t flags; + struct list_head *entry; + struct canque_edge_t *next; + + can_spin_lock_irqsave(&qends->ends_lock, flags); + entry=edge->outpeers.next; + skip_dead: + if(entry != &qends->outlist) { + next=list_entry(entry,struct canque_edge_t,outpeers); + if(canque_fifo_test_fl(&edge->fifo,DEAD)) { + entry=entry->next; + goto skip_dead; + } + canque_edge_incref(next); + } else { + next=NULL; + } + can_spin_unlock_irqrestore(&qends->ends_lock, flags); + canque_edge_decref(edge); + return next; +} + +#define canque_for_each_outedge(qends, edge) \ + for(edge=canque_first_outedge(qends);edge;edge=canque_next_outedge(qends, edge)) + +/* Linux kernel specific functions */ + struct canque_edge_t *canque_new_edge_kern(int slotsnr); int canque_get_inslot4id_wait_kern(struct canque_ends_t *qends, @@ -477,12 +647,11 @@ int canque_get_outslot_wait_kern(struct canque_ends_t *qends, int canque_sync_wait_kern(struct canque_ends_t *qends, struct canque_edge_t *qedge); -int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *inends, struct canque_ends_t *outends); +int canqueue_ends_init_kern(struct canque_ends_t *qends); -int canqueue_ends_init_gen(struct canque_ends_t *qends); +int canqueue_ends_dispose_kern(struct canque_ends_t *qends, int sync); -int canqueue_ends_init_kern(struct canque_ends_t *qends); +void canqueue_kern_initialize(void); -int canqueue_ends_done_kern(struct canque_ends_t *qends, int sync); #endif /*_CAN_QUEUE_H*/