Commit 719b6399 authored by Ben Collins's avatar Ben Collins Committed by Linus Torvalds

[PATCH] 1394 updates

- New irq handler prototypes.
- Lots of un-enumurated locking fixes/cleanups (thanks in large part to
  spinlock debug compile options in the kernel).
- Other various trivial fixes.
parent 4f4b8e8c
...@@ -455,6 +455,10 @@ struct video_card { ...@@ -455,6 +455,10 @@ struct video_card {
*/ */
spinlock_t spinlock; spinlock_t spinlock;
/* flag to prevent spurious interrupts (which OHCI seems to
generate a lot :) from accessing the struct */
int dma_running;
/* /*
3) the sleeping semaphore 'sem' - this is used from process context only, 3) the sleeping semaphore 'sem' - this is used from process context only,
to serialize various operations on the video_card. Even though only one to serialize various operations on the video_card. Even though only one
...@@ -568,7 +572,7 @@ static inline int video_card_initialized(struct video_card *v) ...@@ -568,7 +572,7 @@ static inline int video_card_initialized(struct video_card *v)
static int do_dv1394_init(struct video_card *video, struct dv1394_init *init); static int do_dv1394_init(struct video_card *video, struct dv1394_init *init);
static int do_dv1394_init_default(struct video_card *video); static int do_dv1394_init_default(struct video_card *video);
static int do_dv1394_shutdown(struct video_card *video, int free_user_buf); static void do_dv1394_shutdown(struct video_card *video, int free_user_buf);
/* NTSC empty packet rate accurate to within 0.01%, /* NTSC empty packet rate accurate to within 0.01%,
......
...@@ -689,7 +689,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame) ...@@ -689,7 +689,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
wmb(); wmb();
#endif #endif
video->dma_running = 1;
/* set the 'run' bit */ /* set the 'run' bit */
reg_write(video->ohci, video->ohci_IsoXmitContextControlSet, 0x8000); reg_write(video->ohci, video->ohci_IsoXmitContextControlSet, 0x8000);
...@@ -812,6 +812,8 @@ static void start_dma_receive(struct video_card *video) ...@@ -812,6 +812,8 @@ static void start_dma_receive(struct video_card *video)
video->frames[0]->descriptor_pool_dma | 1); /* Z=1 */ video->frames[0]->descriptor_pool_dma | 1); /* Z=1 */
wmb(); wmb();
video->dma_running = 1;
/* run */ /* run */
reg_write(video->ohci, video->ohci_IsoRcvContextControlSet, 0x8000); reg_write(video->ohci, video->ohci_IsoRcvContextControlSet, 0x8000);
flush_pci_write(video->ohci); flush_pci_write(video->ohci);
...@@ -912,16 +914,16 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -912,16 +914,16 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
u64 chan_mask; u64 chan_mask;
int retval = -EINVAL; int retval = -EINVAL;
debug_printk( "dv1394: initialising %d\n", video->id ); debug_printk("dv1394: initialising %d\n", video->id);
if(init->api_version != DV1394_API_VERSION) if(init->api_version != DV1394_API_VERSION)
goto err; return -EINVAL;
/* first sanitize all the parameters */ /* first sanitize all the parameters */
if( (init->n_frames < 2) || (init->n_frames > DV1394_MAX_FRAMES) ) if( (init->n_frames < 2) || (init->n_frames > DV1394_MAX_FRAMES) )
goto err; return -EINVAL;
if( (init->format != DV1394_NTSC) && (init->format != DV1394_PAL) ) if( (init->format != DV1394_NTSC) && (init->format != DV1394_PAL) )
goto err; return -EINVAL;
if( (init->syt_offset == 0) || (init->syt_offset > 50) ) if( (init->syt_offset == 0) || (init->syt_offset > 50) )
/* default SYT offset is 3 cycles */ /* default SYT offset is 3 cycles */
...@@ -942,15 +944,15 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -942,15 +944,15 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
if(new_buf_size % PAGE_SIZE) new_buf_size += PAGE_SIZE - (new_buf_size % PAGE_SIZE); if(new_buf_size % PAGE_SIZE) new_buf_size += PAGE_SIZE - (new_buf_size % PAGE_SIZE);
/* don't allow the user to allocate the DMA buffer more than once */ /* don't allow the user to allocate the DMA buffer more than once */
if(video->dv_buf.kvirt && video->dv_buf_size != new_buf_size) if(video->dv_buf.kvirt && video->dv_buf_size != new_buf_size) {
goto err; printk("dv1394: re-sizing the DMA buffer is not allowed\n");
return -EINVAL;
}
/* shutdown the card if it's currently active */ /* shutdown the card if it's currently active */
/* (the card should not be reset if the parameters are screwy) */ /* (the card should not be reset if the parameters are screwy) */
if( video_card_initialized(video) )
do_dv1394_shutdown(video, 0);
do_dv1394_shutdown(video, 0);
/* try to claim the ISO channel */ /* try to claim the ISO channel */
spin_lock_irqsave(&video->ohci->IR_channel_lock, flags); spin_lock_irqsave(&video->ohci->IR_channel_lock, flags);
...@@ -968,7 +970,6 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -968,7 +970,6 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
video->n_frames = init->n_frames; video->n_frames = init->n_frames;
video->pal_or_ntsc = init->format; video->pal_or_ntsc = init->format;
video->cip_accum = 0; video->cip_accum = 0;
video->continuity_counter = 0; video->continuity_counter = 0;
...@@ -983,7 +984,6 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -983,7 +984,6 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
video->current_packet = -1; video->current_packet = -1;
video->first_frame = 0; video->first_frame = 0;
if(video->pal_or_ntsc == DV1394_NTSC) { if(video->pal_or_ntsc == DV1394_NTSC) {
video->cip_n = init->cip_n != 0 ? init->cip_n : CIP_N_NTSC; video->cip_n = init->cip_n != 0 ? init->cip_n : CIP_N_NTSC;
video->cip_d = init->cip_d != 0 ? init->cip_d : CIP_D_NTSC; video->cip_d = init->cip_d != 0 ? init->cip_d : CIP_D_NTSC;
...@@ -996,14 +996,8 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -996,14 +996,8 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
video->syt_offset = init->syt_offset; video->syt_offset = init->syt_offset;
/* find and claim DMA contexts on the OHCI card */ /* find and claim DMA contexts on the OHCI card */
/* XXX this should be the last step of initialization, since the interrupt
handler uses ohci_i*_ctx to indicate whether or not it is safe to touch
frames. I'm not making this change quite yet, since it would be better
to clean up the init/shutdown process first.*/
if(video->ohci_it_ctx == -1) { if(video->ohci_it_ctx == -1) {
ohci1394_init_iso_tasklet(&video->it_tasklet, OHCI_ISO_TRANSMIT, ohci1394_init_iso_tasklet(&video->it_tasklet, OHCI_ISO_TRANSMIT,
it_tasklet_func, (unsigned long) video); it_tasklet_func, (unsigned long) video);
...@@ -1011,14 +1005,12 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -1011,14 +1005,12 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
if (ohci1394_register_iso_tasklet(video->ohci, &video->it_tasklet) < 0) { if (ohci1394_register_iso_tasklet(video->ohci, &video->it_tasklet) < 0) {
printk(KERN_ERR "dv1394: could not find an available IT DMA context\n"); printk(KERN_ERR "dv1394: could not find an available IT DMA context\n");
retval = -EBUSY; retval = -EBUSY;
goto err_ctx; goto err;
} }
else {
video->ohci_it_ctx = video->it_tasklet.context; video->ohci_it_ctx = video->it_tasklet.context;
debug_printk("dv1394: claimed IT DMA context %d\n", video->ohci_it_ctx); debug_printk("dv1394: claimed IT DMA context %d\n", video->ohci_it_ctx);
} }
}
if(video->ohci_ir_ctx == -1) { if(video->ohci_ir_ctx == -1) {
ohci1394_init_iso_tasklet(&video->ir_tasklet, OHCI_ISO_RECEIVE, ohci1394_init_iso_tasklet(&video->ir_tasklet, OHCI_ISO_RECEIVE,
...@@ -1027,14 +1019,11 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -1027,14 +1019,11 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
if (ohci1394_register_iso_tasklet(video->ohci, &video->ir_tasklet) < 0) { if (ohci1394_register_iso_tasklet(video->ohci, &video->ir_tasklet) < 0) {
printk(KERN_ERR "dv1394: could not find an available IR DMA context\n"); printk(KERN_ERR "dv1394: could not find an available IR DMA context\n");
retval = -EBUSY; retval = -EBUSY;
goto err_ctx; goto err;
} }
else {
video->ohci_ir_ctx = video->ir_tasklet.context; video->ohci_ir_ctx = video->ir_tasklet.context;
debug_printk("dv1394: claimed IR DMA context %d\n", video->ohci_ir_ctx); debug_printk("dv1394: claimed IR DMA context %d\n", video->ohci_ir_ctx);
} }
}
/* allocate struct frames */ /* allocate struct frames */
for(i = 0; i < init->n_frames; i++) { for(i = 0; i < init->n_frames; i++) {
...@@ -1043,7 +1032,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -1043,7 +1032,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
if(!video->frames[i]) { if(!video->frames[i]) {
printk(KERN_ERR "dv1394: Cannot allocate frame structs\n"); printk(KERN_ERR "dv1394: Cannot allocate frame structs\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_frames; goto err;
} }
} }
...@@ -1051,7 +1040,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -1051,7 +1040,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
/* allocate the ringbuffer */ /* allocate the ringbuffer */
retval = dma_region_alloc(&video->dv_buf, new_buf_size, video->ohci->dev, PCI_DMA_TODEVICE); retval = dma_region_alloc(&video->dv_buf, new_buf_size, video->ohci->dev, PCI_DMA_TODEVICE);
if(retval) if(retval)
goto err_frames; goto err;
video->dv_buf_size = new_buf_size; video->dv_buf_size = new_buf_size;
...@@ -1073,7 +1062,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -1073,7 +1062,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
retval = dma_region_alloc(&video->packet_buf, video->packet_buf_size, retval = dma_region_alloc(&video->packet_buf, video->packet_buf_size,
video->ohci->dev, PCI_DMA_FROMDEVICE); video->ohci->dev, PCI_DMA_FROMDEVICE);
if(retval) if(retval)
goto err_dv_buf; goto err;
debug_printk("dv1394: Allocated %d packets in buffer, total %u pages (%u DMA pages), %lu bytes\n", debug_printk("dv1394: Allocated %d packets in buffer, total %u pages (%u DMA pages), %lu bytes\n",
video->n_frames*MAX_PACKETS, video->packet_buf.n_pages, video->n_frames*MAX_PACKETS, video->packet_buf.n_pages,
...@@ -1103,30 +1092,8 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init) ...@@ -1103,30 +1092,8 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
return 0; return 0;
err_dv_buf: err:
dma_region_free(&video->dv_buf); do_dv1394_shutdown(video, 1);
err_frames:
for(i = 0; i < DV1394_MAX_FRAMES; i++) {
if(video->frames[i])
frame_delete(video->frames[i]);
}
video->n_frames = 0;
err_ctx:
if(video->ohci_it_ctx != -1) {
ohci1394_unregister_iso_tasklet(video->ohci, &video->it_tasklet);
video->ohci_it_ctx = -1;
}
if(video->ohci_ir_ctx != -1) {
ohci1394_unregister_iso_tasklet(video->ohci, &video->ir_tasklet);
video->ohci_ir_ctx = -1;
}
spin_lock_irqsave(&video->ohci->IR_channel_lock, flags);
video->ohci->ISO_channel_usage &= ~chan_mask;
spin_unlock_irqrestore(&video->ohci->IR_channel_lock, flags);
err:
return retval; return retval;
} }
...@@ -1158,6 +1125,11 @@ static void stop_dma(struct video_card *video) ...@@ -1158,6 +1125,11 @@ static void stop_dma(struct video_card *video)
/* no interrupts */ /* no interrupts */
spin_lock_irqsave(&video->spinlock, flags); spin_lock_irqsave(&video->spinlock, flags);
video->dma_running = 0;
if( (video->ohci_it_ctx == -1) && (video->ohci_ir_ctx == -1) )
goto out;
/* stop DMA if in progress */ /* stop DMA if in progress */
if( (video->active_frame != -1) || if( (video->active_frame != -1) ||
(reg_read(video->ohci, video->ohci_IsoXmitContextControlClear) & (1 << 10)) || (reg_read(video->ohci, video->ohci_IsoXmitContextControlClear) & (1 << 10)) ||
...@@ -1198,23 +1170,21 @@ static void stop_dma(struct video_card *video) ...@@ -1198,23 +1170,21 @@ static void stop_dma(struct video_card *video)
else else
debug_printk("dv1394: stop_dma: already stopped.\n"); debug_printk("dv1394: stop_dma: already stopped.\n");
out:
spin_unlock_irqrestore(&video->spinlock, flags); spin_unlock_irqrestore(&video->spinlock, flags);
} }
static int do_dv1394_shutdown(struct video_card *video, int free_dv_buf) static void do_dv1394_shutdown(struct video_card *video, int free_dv_buf)
{ {
int i; int i;
unsigned long flags;
debug_printk("dv1394: shutdown...\n"); debug_printk("dv1394: shutdown...\n");
/* stop DMA if in progress */ /* stop DMA if in progress */
stop_dma(video); stop_dma(video);
spin_lock_irqsave(&video->spinlock, flags);
/* release the DMA contexts */ /* release the DMA contexts */
if(video->ohci_it_ctx != -1) { if(video->ohci_it_ctx != -1) {
video->ohci_IsoXmitContextControlSet = 0; video->ohci_IsoXmitContextControlSet = 0;
...@@ -1245,8 +1215,6 @@ static int do_dv1394_shutdown(struct video_card *video, int free_dv_buf) ...@@ -1245,8 +1215,6 @@ static int do_dv1394_shutdown(struct video_card *video, int free_dv_buf)
video->ohci_ir_ctx = -1; video->ohci_ir_ctx = -1;
} }
spin_unlock_irqrestore(&video->spinlock, flags);
/* release the ISO channel */ /* release the ISO channel */
if(video->channel != -1) { if(video->channel != -1) {
u64 chan_mask; u64 chan_mask;
...@@ -1282,9 +1250,7 @@ static int do_dv1394_shutdown(struct video_card *video, int free_dv_buf) ...@@ -1282,9 +1250,7 @@ static int do_dv1394_shutdown(struct video_card *video, int free_dv_buf)
dma_region_free(&video->packet_buf); dma_region_free(&video->packet_buf);
video->packet_buf_size = 0; video->packet_buf_size = 0;
debug_printk("dv1394: shutdown complete\n"); debug_printk("dv1394: shutdown OK\n");
return 0;
} }
/* /*
...@@ -1770,7 +1736,8 @@ static int dv1394_ioctl(struct inode *inode, struct file *file, ...@@ -1770,7 +1736,8 @@ static int dv1394_ioctl(struct inode *inode, struct file *file,
} }
case DV1394_IOC_SHUTDOWN: case DV1394_IOC_SHUTDOWN:
ret = do_dv1394_shutdown(video, 0); do_dv1394_shutdown(video, 0);
ret = 0;
break; break;
...@@ -2140,6 +2107,9 @@ static void it_tasklet_func(unsigned long data) ...@@ -2140,6 +2107,9 @@ static void it_tasklet_func(unsigned long data)
spin_lock(&video->spinlock); spin_lock(&video->spinlock);
if(!video->dma_running)
goto out;
irq_printk("ContextControl = %08x, CommandPtr = %08x\n", irq_printk("ContextControl = %08x, CommandPtr = %08x\n",
reg_read(video->ohci, video->ohci_IsoXmitContextControlSet), reg_read(video->ohci, video->ohci_IsoXmitContextControlSet),
reg_read(video->ohci, video->ohci_IsoXmitCommandPtr) reg_read(video->ohci, video->ohci_IsoXmitCommandPtr)
...@@ -2266,14 +2236,15 @@ static void it_tasklet_func(unsigned long data) ...@@ -2266,14 +2236,15 @@ static void it_tasklet_func(unsigned long data)
} /* for(each frame) */ } /* for(each frame) */
} }
spin_unlock(&video->spinlock);
if(wake) { if(wake) {
kill_fasync(&video->fasync, SIGIO, POLL_OUT); kill_fasync(&video->fasync, SIGIO, POLL_OUT);
/* wake readers/writers/ioctl'ers */ /* wake readers/writers/ioctl'ers */
wake_up_interruptible(&video->waitq); wake_up_interruptible(&video->waitq);
} }
out:
spin_unlock(&video->spinlock);
} }
static void ir_tasklet_func(unsigned long data) static void ir_tasklet_func(unsigned long data)
...@@ -2283,8 +2254,11 @@ static void ir_tasklet_func(unsigned long data) ...@@ -2283,8 +2254,11 @@ static void ir_tasklet_func(unsigned long data)
spin_lock(&video->spinlock); spin_lock(&video->spinlock);
if( (video->ohci_ir_ctx != -1) if(!video->dma_running)
&& (reg_read(video->ohci, video->ohci_IsoRcvContextControlSet) & (1 << 10)) ) goto out;
if( (video->ohci_ir_ctx != -1) &&
(reg_read(video->ohci, video->ohci_IsoRcvContextControlSet) & (1 << 10)) )
{ {
int sof=0; /* start-of-frame flag */ int sof=0; /* start-of-frame flag */
...@@ -2424,14 +2398,15 @@ static void ir_tasklet_func(unsigned long data) ...@@ -2424,14 +2398,15 @@ static void ir_tasklet_func(unsigned long data)
} /* receive interrupt */ } /* receive interrupt */
spin_unlock(&video->spinlock);
if(wake) { if(wake) {
kill_fasync(&video->fasync, SIGIO, POLL_IN); kill_fasync(&video->fasync, SIGIO, POLL_IN);
/* wake readers/writers/ioctl'ers */ /* wake readers/writers/ioctl'ers */
wake_up_interruptible(&video->waitq); wake_up_interruptible(&video->waitq);
} }
out:
spin_unlock(&video->spinlock);
} }
static struct file_operations dv1394_fops= static struct file_operations dv1394_fops=
...@@ -2554,6 +2529,7 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes ...@@ -2554,6 +2529,7 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes
clear_bit(0, &video->open); clear_bit(0, &video->open);
spin_lock_init(&video->spinlock); spin_lock_init(&video->spinlock);
video->dma_running = 0;
init_MUTEX(&video->sem); init_MUTEX(&video->sem);
init_waitqueue_head(&video->waitq); init_waitqueue_head(&video->waitq);
video->fasync = NULL; video->fasync = NULL;
...@@ -2718,6 +2694,9 @@ static void dv1394_host_reset(struct hpsb_host *host) ...@@ -2718,6 +2694,9 @@ static void dv1394_host_reset(struct hpsb_host *host)
spin_lock_irqsave(&video->spinlock, flags); spin_lock_irqsave(&video->spinlock, flags);
if(!video->dma_running)
goto out;
/* check IT context */ /* check IT context */
if(video->ohci_it_ctx != -1) { if(video->ohci_it_ctx != -1) {
u32 ctx; u32 ctx;
...@@ -2791,6 +2770,7 @@ static void dv1394_host_reset(struct hpsb_host *host) ...@@ -2791,6 +2770,7 @@ static void dv1394_host_reset(struct hpsb_host *host)
} }
} }
out:
spin_unlock_irqrestore(&video->spinlock, flags); spin_unlock_irqrestore(&video->spinlock, flags);
/* wake readers/writers/ioctl'ers */ /* wake readers/writers/ioctl'ers */
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
printk(KERN_ERR fmt, ## args) printk(KERN_ERR fmt, ## args)
static char version[] __devinitdata = static char version[] __devinitdata =
"$Rev: 886 $ Ben Collins <bcollins@debian.org>"; "$Rev: 895 $ Ben Collins <bcollins@debian.org>";
/* Our ieee1394 highlevel driver */ /* Our ieee1394 highlevel driver */
#define ETHER1394_DRIVER_NAME "ether1394" #define ETHER1394_DRIVER_NAME "ether1394"
...@@ -340,6 +340,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h ...@@ -340,6 +340,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h
priv = (struct eth1394_priv *)dev->priv; priv = (struct eth1394_priv *)dev->priv;
priv->host = host; priv->host = host;
spin_lock_init(&priv->lock);
hi = hpsb_create_hostinfo(hl, host, sizeof(*hi)); hi = hpsb_create_hostinfo(hl, host, sizeof(*hi));
......
...@@ -38,7 +38,7 @@ struct hl_host_info { ...@@ -38,7 +38,7 @@ struct hl_host_info {
static LIST_HEAD(hl_drivers); static LIST_HEAD(hl_drivers);
static DECLARE_MUTEX(hl_drivers_lock); static rwlock_t hl_drivers_lock = RW_LOCK_UNLOCKED;
static LIST_HEAD(addr_space); static LIST_HEAD(addr_space);
static rwlock_t addr_space_lock = RW_LOCK_UNLOCKED; static rwlock_t addr_space_lock = RW_LOCK_UNLOCKED;
...@@ -48,20 +48,22 @@ static struct hpsb_address_ops dummy_ops = { NULL, NULL, NULL, NULL }; ...@@ -48,20 +48,22 @@ static struct hpsb_address_ops dummy_ops = { NULL, NULL, NULL, NULL };
static struct hpsb_address_serve dummy_zero_addr, dummy_max_addr; static struct hpsb_address_serve dummy_zero_addr, dummy_max_addr;
/* Internal usage. Must be called with hl_drivers_lock held */
static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl, static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl,
struct hpsb_host *host) struct hpsb_host *host)
{ {
struct hl_host_info *hi; struct hl_host_info *hi = NULL;
struct list_head *lh; struct list_head *lh;
read_lock(&hl->host_info_lock);
list_for_each (lh, &hl->host_info_list) { list_for_each (lh, &hl->host_info_list) {
hi = list_entry(lh, struct hl_host_info, list); hi = list_entry(lh, struct hl_host_info, list);
if (hi->host == host) if (hi->host == host)
return hi; break;
hi = NULL;
} }
read_unlock(&hl->host_info_lock);
return NULL; return hi;
} }
...@@ -69,16 +71,12 @@ static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl, ...@@ -69,16 +71,12 @@ static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl,
* hpsb_create_hostinfo. */ * hpsb_create_hostinfo. */
void *hpsb_get_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host) void *hpsb_get_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host)
{ {
struct hl_host_info *hi; struct hl_host_info *hi = hl_get_hostinfo(hl, host);
void *data = NULL;
read_lock(&hl_drivers_lock);
hi = hl_get_hostinfo(hl, host);
if (hi) if (hi)
data = hi->data; return hi->data;
read_unlock(&hl_drivers_lock);
return data; return NULL;
} }
...@@ -88,10 +86,9 @@ void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, ...@@ -88,10 +86,9 @@ void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,
{ {
struct hl_host_info *hi; struct hl_host_info *hi;
void *data; void *data;
unsigned long flags;
read_lock(&hl_drivers_lock);
hi = hl_get_hostinfo(hl, host); hi = hl_get_hostinfo(hl, host);
read_unlock(&hl_drivers_lock);
if (hi) { if (hi) {
HPSB_ERR("%s called hpsb_create_hostinfo when hostinfo already exists", HPSB_ERR("%s called hpsb_create_hostinfo when hostinfo already exists",
hl->name); hl->name);
...@@ -112,9 +109,9 @@ void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, ...@@ -112,9 +109,9 @@ void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,
hi->host = host; hi->host = host;
write_lock_irq(&hl_drivers_lock); write_lock_irqsave(&hl->host_info_lock, flags);
list_add_tail(&hi->list, &hl->host_info_list); list_add_tail(&hi->list, &hl->host_info_list);
write_unlock_irq(&hl_drivers_lock); write_unlock_irqrestore(&hl->host_info_lock, flags);
return data; return data;
} }
...@@ -124,23 +121,20 @@ int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, ...@@ -124,23 +121,20 @@ int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,
void *data) void *data)
{ {
struct hl_host_info *hi; struct hl_host_info *hi;
int ret = -EINVAL;
write_lock_irq(&hl_drivers_lock);
hi = hl_get_hostinfo(hl, host); hi = hl_get_hostinfo(hl, host);
if (hi) { if (hi) {
if (!hi->size && !hi->data) { if (!hi->size && !hi->data) {
hi->data = data; hi->data = data;
ret = 0; return 0;
} else } else
HPSB_ERR("%s called hpsb_set_hostinfo when hostinfo already has data", HPSB_ERR("%s called hpsb_set_hostinfo when hostinfo already has data",
hl->name); hl->name);
} else } else
HPSB_ERR("%s called hpsb_set_hostinfo when no hostinfo exists", HPSB_ERR("%s called hpsb_set_hostinfo when no hostinfo exists",
hl->name); hl->name);
write_unlock_irq(&hl_drivers_lock);
return ret; return -EINVAL;
} }
...@@ -148,13 +142,14 @@ void hpsb_destroy_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host) ...@@ -148,13 +142,14 @@ void hpsb_destroy_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host)
{ {
struct hl_host_info *hi; struct hl_host_info *hi;
write_lock_irq(&hl_drivers_lock);
hi = hl_get_hostinfo(hl, host); hi = hl_get_hostinfo(hl, host);
if (hi) { if (hi) {
unsigned long flags;
write_lock_irqsave(&hl->host_info_lock, flags);
list_del(&hi->list); list_del(&hi->list);
write_unlock_irqrestore(&hl->host_info_lock, flags);
kfree(hi); kfree(hi);
} }
write_unlock_irq(&hl_drivers_lock);
return; return;
} }
...@@ -164,11 +159,9 @@ void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, un ...@@ -164,11 +159,9 @@ void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, un
{ {
struct hl_host_info *hi; struct hl_host_info *hi;
write_lock(&hl_drivers_lock);
hi = hl_get_hostinfo(hl, host); hi = hl_get_hostinfo(hl, host);
if (hi) if (hi)
hi->key = key; hi->key = key;
write_unlock(&hl_drivers_lock);
return; return;
} }
...@@ -177,15 +170,12 @@ void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, un ...@@ -177,15 +170,12 @@ void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, un
unsigned long hpsb_get_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host) unsigned long hpsb_get_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host)
{ {
struct hl_host_info *hi; struct hl_host_info *hi;
unsigned long key = 0;
read_lock(&hl_drivers_lock);
hi = hl_get_hostinfo(hl, host); hi = hl_get_hostinfo(hl, host);
if (hi) if (hi)
key = hi->key; return hi->key;
read_unlock(&hl_drivers_lock);
return key; return 0;
} }
...@@ -195,7 +185,7 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key) ...@@ -195,7 +185,7 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key)
struct hl_host_info *hi; struct hl_host_info *hi;
void *data = NULL; void *data = NULL;
read_lock(&hl_drivers_lock); read_lock(&hl->host_info_lock);
list_for_each (lh, &hl->host_info_list) { list_for_each (lh, &hl->host_info_list) {
hi = list_entry(lh, struct hl_host_info, list); hi = list_entry(lh, struct hl_host_info, list);
if (hi->key == key) { if (hi->key == key) {
...@@ -203,7 +193,7 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key) ...@@ -203,7 +193,7 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key)
break; break;
} }
} }
read_unlock(&hl_drivers_lock); read_unlock(&hl->host_info_lock);
return data; return data;
} }
...@@ -214,6 +204,7 @@ struct hpsb_highlevel *hpsb_register_highlevel(const char *name, ...@@ -214,6 +204,7 @@ struct hpsb_highlevel *hpsb_register_highlevel(const char *name,
{ {
struct hpsb_highlevel *hl; struct hpsb_highlevel *hl;
struct list_head *lh; struct list_head *lh;
unsigned long flags;
hl = (struct hpsb_highlevel *)kmalloc(sizeof(struct hpsb_highlevel), hl = (struct hpsb_highlevel *)kmalloc(sizeof(struct hpsb_highlevel),
GFP_KERNEL); GFP_KERNEL);
...@@ -225,12 +216,14 @@ struct hpsb_highlevel *hpsb_register_highlevel(const char *name, ...@@ -225,12 +216,14 @@ struct hpsb_highlevel *hpsb_register_highlevel(const char *name,
INIT_LIST_HEAD(&hl->addr_list); INIT_LIST_HEAD(&hl->addr_list);
INIT_LIST_HEAD(&hl->host_info_list); INIT_LIST_HEAD(&hl->host_info_list);
rwlock_init(&hl->host_info_lock);
hl->name = name; hl->name = name;
hl->op = ops; hl->op = ops;
down(&hl_drivers_lock); write_lock_irqsave(&hl_drivers_lock, flags);
list_add_tail(&hl->hl_list, &hl_drivers); list_add_tail(&hl->hl_list, &hl_drivers);
up(&hl_drivers_lock); write_unlock_irqrestore(&hl_drivers_lock, flags);
if (hl->op->add_host) { if (hl->op->add_host) {
down(&hpsb_hosts_lock); down(&hpsb_hosts_lock);
...@@ -248,22 +241,23 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl) ...@@ -248,22 +241,23 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl)
{ {
struct list_head *lh, *next; struct list_head *lh, *next;
struct hpsb_address_serve *as; struct hpsb_address_serve *as;
unsigned long flags;
if (hl == NULL) { if (hl == NULL) {
return; return;
} }
write_lock_irq(&addr_space_lock); write_lock_irqsave(&addr_space_lock, flags);
list_for_each_safe (lh, next, &hl->addr_list) { list_for_each_safe (lh, next, &hl->addr_list) {
as = list_entry(lh, struct hpsb_address_serve, addr_list); as = list_entry(lh, struct hpsb_address_serve, addr_list);
list_del(&as->as_list); list_del(&as->as_list);
kfree(as); kfree(as);
} }
write_unlock_irq(&addr_space_lock); write_unlock_irqrestore(&addr_space_lock, flags);
down(&hl_drivers_lock); write_lock_irqsave(&hl_drivers_lock, flags);
list_del(&hl->hl_list); list_del(&hl->hl_list);
up(&hl_drivers_lock); write_unlock_irqrestore(&hl_drivers_lock, flags);
if (hl->op->remove_host) { if (hl->op->remove_host) {
down(&hpsb_hosts_lock); down(&hpsb_hosts_lock);
...@@ -307,8 +301,10 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, ...@@ -307,8 +301,10 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl,
write_lock_irqsave(&addr_space_lock, flags); write_lock_irqsave(&addr_space_lock, flags);
entry = addr_space.next; entry = addr_space.next;
while (list_entry(entry, struct hpsb_address_serve, as_list)->end <= start) { while (list_entry(entry, struct hpsb_address_serve, as_list)->end
if (list_entry(entry->next, struct hpsb_address_serve, as_list)->start >= end) { <= start) {
if (list_entry(entry->next, struct hpsb_address_serve, as_list)
->start >= end) {
list_add(&as->as_list, entry); list_add(&as->as_list, entry);
list_add_tail(&as->addr_list, &hl->addr_list); list_add_tail(&as->addr_list, &hl->addr_list);
retval = 1; retval = 1;
...@@ -387,14 +383,13 @@ void highlevel_add_host(struct hpsb_host *host) ...@@ -387,14 +383,13 @@ void highlevel_add_host(struct hpsb_host *host)
struct list_head *entry; struct list_head *entry;
struct hpsb_highlevel *hl; struct hpsb_highlevel *hl;
down(&hl_drivers_lock); read_lock(&hl_drivers_lock);
list_for_each(entry, &hl_drivers) { list_for_each(entry, &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->add_host) if (hl->op->add_host)
hl->op->add_host(host, hl); hl->op->add_host(host, hl);
} }
up(&hl_drivers_lock); read_unlock(&hl_drivers_lock);
} }
void highlevel_remove_host(struct hpsb_host *host) void highlevel_remove_host(struct hpsb_host *host)
...@@ -402,7 +397,7 @@ void highlevel_remove_host(struct hpsb_host *host) ...@@ -402,7 +397,7 @@ void highlevel_remove_host(struct hpsb_host *host)
struct list_head *entry; struct list_head *entry;
struct hpsb_highlevel *hl; struct hpsb_highlevel *hl;
down(&hl_drivers_lock); read_lock(&hl_drivers_lock);
list_for_each(entry, &hl_drivers) { list_for_each(entry, &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
...@@ -411,7 +406,7 @@ void highlevel_remove_host(struct hpsb_host *host) ...@@ -411,7 +406,7 @@ void highlevel_remove_host(struct hpsb_host *host)
hpsb_destroy_hostinfo(hl, host); hpsb_destroy_hostinfo(hl, host);
} }
} }
up(&hl_drivers_lock); read_unlock(&hl_drivers_lock);
} }
void highlevel_host_reset(struct hpsb_host *host) void highlevel_host_reset(struct hpsb_host *host)
...@@ -419,14 +414,14 @@ void highlevel_host_reset(struct hpsb_host *host) ...@@ -419,14 +414,14 @@ void highlevel_host_reset(struct hpsb_host *host)
struct list_head *entry; struct list_head *entry;
struct hpsb_highlevel *hl; struct hpsb_highlevel *hl;
down(&hl_drivers_lock); read_lock(&hl_drivers_lock);
list_for_each(entry, &hl_drivers) { list_for_each(entry, &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->host_reset) if (hl->op->host_reset)
hl->op->host_reset(host); hl->op->host_reset(host);
} }
up(&hl_drivers_lock); read_unlock(&hl_drivers_lock);
} }
void highlevel_iso_receive(struct hpsb_host *host, void *data, void highlevel_iso_receive(struct hpsb_host *host, void *data,
...@@ -436,14 +431,17 @@ void highlevel_iso_receive(struct hpsb_host *host, void *data, ...@@ -436,14 +431,17 @@ void highlevel_iso_receive(struct hpsb_host *host, void *data,
struct hpsb_highlevel *hl; struct hpsb_highlevel *hl;
int channel = (((quadlet_t *)data)[0] >> 8) & 0x3f; int channel = (((quadlet_t *)data)[0] >> 8) & 0x3f;
down(&hl_drivers_lock); read_lock(&hl_drivers_lock);
list_for_each(entry, &hl_drivers) { entry = hl_drivers.next;
hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->iso_receive) while (entry != &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->iso_receive) {
hl->op->iso_receive(host, channel, data, length); hl->op->iso_receive(host, channel, data, length);
} }
up(&hl_drivers_lock); entry = entry->next;
}
read_unlock(&hl_drivers_lock);
} }
void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction, void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction,
...@@ -453,13 +451,18 @@ void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction, ...@@ -453,13 +451,18 @@ void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction,
struct hpsb_highlevel *hl; struct hpsb_highlevel *hl;
int cts = ((quadlet_t *)data)[0] >> 4; int cts = ((quadlet_t *)data)[0] >> 4;
down(&hl_drivers_lock); read_lock(&hl_drivers_lock);
list_for_each(entry, &hl_drivers) { entry = hl_drivers.next;
while (entry != &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->fcp_request) if (hl->op->fcp_request) {
hl->op->fcp_request(host, nodeid, direction, cts, data, length); hl->op->fcp_request(host, nodeid, direction, cts, data,
length);
} }
up(&hl_drivers_lock); entry = entry->next;
}
read_unlock(&hl_drivers_lock);
} }
int highlevel_read(struct hpsb_host *host, int nodeid, void *data, int highlevel_read(struct hpsb_host *host, int nodeid, void *data,
......
...@@ -14,6 +14,7 @@ struct hpsb_highlevel { ...@@ -14,6 +14,7 @@ struct hpsb_highlevel {
/* Used by the highlevel drivers to store data per host */ /* Used by the highlevel drivers to store data per host */
struct list_head host_info_list; struct list_head host_info_list;
rwlock_t host_info_lock;
}; };
...@@ -176,5 +177,4 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key); ...@@ -176,5 +177,4 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key);
* hpsb_create_hostinfo, where the size is 0. */ * hpsb_create_hostinfo, where the size is 0. */
int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, void *data); int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, void *data);
#endif /* IEEE1394_HIGHLEVEL_H */ #endif /* IEEE1394_HIGHLEVEL_H */
...@@ -1295,7 +1295,6 @@ EXPORT_SYMBOL(highlevel_host_reset); ...@@ -1295,7 +1295,6 @@ EXPORT_SYMBOL(highlevel_host_reset);
/** nodemgr.c **/ /** nodemgr.c **/
EXPORT_SYMBOL(hpsb_guid_get_entry); EXPORT_SYMBOL(hpsb_guid_get_entry);
EXPORT_SYMBOL(hpsb_nodeid_get_entry); EXPORT_SYMBOL(hpsb_nodeid_get_entry);
EXPORT_SYMBOL(hpsb_check_nodeid);
EXPORT_SYMBOL(hpsb_node_fill_packet); EXPORT_SYMBOL(hpsb_node_fill_packet);
EXPORT_SYMBOL(hpsb_node_read); EXPORT_SYMBOL(hpsb_node_read);
EXPORT_SYMBOL(hpsb_node_write); EXPORT_SYMBOL(hpsb_node_write);
......
...@@ -47,8 +47,11 @@ static struct hpsb_iso* hpsb_iso_common_init(struct hpsb_host *host, enum hpsb_i ...@@ -47,8 +47,11 @@ static struct hpsb_iso* hpsb_iso_common_init(struct hpsb_host *host, enum hpsb_i
int dma_direction; int dma_direction;
/* make sure driver supports the ISO API */ /* make sure driver supports the ISO API */
if(!host->driver->isoctl) if(!host->driver->isoctl) {
printk(KERN_INFO "ieee1394: host driver '%s' does not support the rawiso API\n",
host->driver->name);
return NULL; return NULL;
}
/* sanitize parameters */ /* sanitize parameters */
......
...@@ -1616,18 +1616,6 @@ struct node_entry *hpsb_nodeid_get_entry(struct hpsb_host *host, nodeid_t nodeid ...@@ -1616,18 +1616,6 @@ struct node_entry *hpsb_nodeid_get_entry(struct hpsb_host *host, nodeid_t nodeid
return ne; return ne;
} }
struct node_entry *hpsb_check_nodeid(struct hpsb_host *host, nodeid_t nodeid)
{
struct node_entry *ne;
if (down_trylock(&nodemgr_serialize))
return NULL;
ne = find_entry_by_nodeid(host, nodeid);
up(&nodemgr_serialize);
return ne;
}
/* The following four convenience functions use a struct node_entry /* The following four convenience functions use a struct node_entry
* for addressing a node on the bus. They are intended for use by any * for addressing a node on the bus. They are intended for use by any
* process context, not just the nodemgr thread, so we need to be a * process context, not just the nodemgr thread, so we need to be a
......
...@@ -163,10 +163,6 @@ struct node_entry *hpsb_guid_get_entry(u64 guid); ...@@ -163,10 +163,6 @@ struct node_entry *hpsb_guid_get_entry(u64 guid);
* fool-proof by itself, since the nodeid can change. */ * fool-proof by itself, since the nodeid can change. */
struct node_entry *hpsb_nodeid_get_entry(struct hpsb_host *host, nodeid_t nodeid); struct node_entry *hpsb_nodeid_get_entry(struct hpsb_host *host, nodeid_t nodeid);
/* Same as above except that it will not block waiting for the nodemgr
* serialize semaphore. */
struct node_entry *hpsb_check_nodeid(struct hpsb_host *host, nodeid_t nodeid);
/* /*
* If the entry refers to a local host, this function will return the pointer * If the entry refers to a local host, this function will return the pointer
* to the hpsb_host structure. It will return NULL otherwise. Once you have * to the hpsb_host structure. It will return NULL otherwise. Once you have
......
...@@ -165,7 +165,7 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args) ...@@ -165,7 +165,7 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args)
printk(level "%s_%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args) printk(level "%s_%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args)
static char version[] __devinitdata = static char version[] __devinitdata =
"$Rev: 866 $ Ben Collins <bcollins@debian.org>"; "$Rev: 897 $ Ben Collins <bcollins@debian.org>";
/* Module Parameters */ /* Module Parameters */
static int phys_dma = 1; static int phys_dma = 1;
......
...@@ -1163,7 +1163,7 @@ static ssize_t mem_write(struct file *file, const char *buffer, size_t count, ...@@ -1163,7 +1163,7 @@ static ssize_t mem_write(struct file *file, const char *buffer, size_t count,
********************************************************/ ********************************************************/
static void lynx_irq_handler(int irq, void *dev_id, static irqreturn_t lynx_irq_handler(int irq, void *dev_id,
struct pt_regs *regs_are_unused) struct pt_regs *regs_are_unused)
{ {
struct ti_lynx *lynx = (struct ti_lynx *)dev_id; struct ti_lynx *lynx = (struct ti_lynx *)dev_id;
...@@ -1174,7 +1174,8 @@ static void lynx_irq_handler(int irq, void *dev_id, ...@@ -1174,7 +1174,8 @@ static void lynx_irq_handler(int irq, void *dev_id,
linkint = reg_read(lynx, LINK_INT_STATUS); linkint = reg_read(lynx, LINK_INT_STATUS);
intmask = reg_read(lynx, PCI_INT_STATUS); intmask = reg_read(lynx, PCI_INT_STATUS);
if (!(intmask & PCI_INT_INT_PEND)) return; if (!(intmask & PCI_INT_INT_PEND))
return IRQ_HANDLED;
PRINTD(KERN_DEBUG, lynx->id, "interrupt: 0x%08x / 0x%08x", intmask, PRINTD(KERN_DEBUG, lynx->id, "interrupt: 0x%08x / 0x%08x", intmask,
linkint); linkint);
...@@ -1390,6 +1391,8 @@ static void lynx_irq_handler(int irq, void *dev_id, ...@@ -1390,6 +1391,8 @@ static void lynx_irq_handler(int irq, void *dev_id,
run_pcl(lynx, lynx->rcv_pcl_start, CHANNEL_ASYNC_RCV); run_pcl(lynx, lynx->rcv_pcl_start, CHANNEL_ASYNC_RCV);
} }
return IRQ_HANDLED;
} }
...@@ -1893,7 +1896,7 @@ static struct pci_driver lynx_pci_driver = { ...@@ -1893,7 +1896,7 @@ static struct pci_driver lynx_pci_driver = {
.name = PCILYNX_DRIVER_NAME, .name = PCILYNX_DRIVER_NAME,
.id_table = pci_table, .id_table = pci_table,
.probe = add_card, .probe = add_card,
.remove = __devexit_p(remove_card), .remove = remove_card,
}; };
static struct hpsb_host_driver lynx_driver = { static struct hpsb_host_driver lynx_driver = {
......
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
#include "sbp2.h" #include "sbp2.h"
static char version[] __devinitdata = static char version[] __devinitdata =
"$Rev: 884 $ James Goodwin <jamesg@filanet.com>"; "$Rev: 896 $ James Goodwin <jamesg@filanet.com>";
/* /*
* Module load parameter definitions * Module load parameter definitions
......
...@@ -67,14 +67,6 @@ ...@@ -67,14 +67,6 @@
#define vmalloc_32(x) vmalloc(x) #define vmalloc_32(x) vmalloc(x)
#endif #endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,3))
#define remap_page_range_1394(vma, start, addr, size, prot) \
remap_page_range(start, addr, size, prot)
#else
#define remap_page_range_1394(vma, start, addr, size, prot) \
remap_page_range(vma, start, addr, size, prot)
#endif
struct it_dma_prg { struct it_dma_prg {
struct dma_cmd begin; struct dma_cmd begin;
quadlet_t data[4]; quadlet_t data[4];
...@@ -496,11 +488,7 @@ void wakeup_dma_ir_ctx(unsigned long l) ...@@ -496,11 +488,7 @@ void wakeup_dma_ir_ctx(unsigned long l)
if (d->ir_prg[i][d->nb_cmd-1].status & cpu_to_le32(0xFFFF0000)) { if (d->ir_prg[i][d->nb_cmd-1].status & cpu_to_le32(0xFFFF0000)) {
reset_ir_status(d, i); reset_ir_status(d, i);
d->buffer_status[i] = VIDEO1394_BUFFER_READY; d->buffer_status[i] = VIDEO1394_BUFFER_READY;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
get_fast_time(&d->buffer_time[i]);
#else
do_gettimeofday(&d->buffer_time[i]); do_gettimeofday(&d->buffer_time[i]);
#endif
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment