diff options
Diffstat (limited to 'c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c')
| -rw-r--r-- | c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c | 75 |
1 files changed, 54 insertions, 21 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c index d56d8d7652..ec51ec312d 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c @@ -23,6 +23,7 @@ #include <bsp.h> #include <rtems/bspIo.h> +#include <rtems/score/isrlock.h> /* spin-lock */ #include <pci.h> #include <pci/access.h> @@ -36,6 +37,15 @@ #include <bsp/gr_tmtc_1553.h> +/* map via rtems_interrupt_lock_* API: */ +#define SPIN_DECLARE(lock) RTEMS_INTERRUPT_LOCK_MEMBER(lock) +#define SPIN_INIT(lock, name) rtems_interrupt_lock_initialize(lock, name) +#define SPIN_LOCK(lock, level) rtems_interrupt_lock_acquire_isr(lock, &level) +#define SPIN_LOCK_IRQ(lock, level) rtems_interrupt_lock_acquire(lock, &level) +#define SPIN_UNLOCK(lock, level) rtems_interrupt_lock_release_isr(lock, &level) +#define SPIN_UNLOCK_IRQ(lock, level) rtems_interrupt_lock_release(lock, &level) +#define SPIN_IRQFLAGS(k) rtems_interrupt_lock_context k +#define SPIN_ISR_IRQFLAGS(k) SPIN_IRQFLAGS(k) /*#define DEBUG 1 */ @@ -60,8 +70,9 @@ struct gr_tmtc_1553_ver { /* Private data structure for driver */ struct gr_tmtc_1553_priv { /* Driver management */ - struct drvmgr_dev *dev; + struct drvmgr_dev *dev; char prefix[32]; + SPIN_DECLARE(devlock); /* PCI */ pci_dev_t pcidev; @@ -174,10 +185,13 @@ void gr_tmtc_1553_isr (void *arg) struct gr_tmtc_1553_priv *priv = arg; unsigned int status, tmp; int irq; + SPIN_ISR_IRQFLAGS(irqflags); + tmp = status = priv->irq->ipend; /* DBG("GR-RASTA-IO: IRQ 0x%x\n",status); */ + SPIN_LOCK(&priv->devlock, irqflags); for(irq=0; irq<16; irq++) { if ( status & (1<<irq) ) { genirq_doirq(priv->genirq, irq); @@ -187,6 +201,7 @@ void gr_tmtc_1553_isr (void *arg) break; } } + SPIN_UNLOCK(&priv->devlock, irqflags); /* ACK interrupt, this is because PCI is Level, so the IRQ Controller still drives the IRQ. */ if ( tmp ) @@ -306,11 +321,11 @@ int gr_tmtc_1553_init1(struct drvmgr_dev *dev) /* Generate Device prefix */ - strcpy(priv->prefix, "/dev/tmtc1553_0/"); - priv->prefix[19] += dev->minor_drv; + strcpy(priv->prefix, "/dev/tmtc1553_0"); + priv->prefix[14] += dev->minor_drv; mkdir(priv->prefix, S_IRWXU | S_IRWXG | S_IRWXO); - priv->prefix[20] = '/'; - priv->prefix[21] = '\0'; + priv->prefix[15] = '/'; + priv->prefix[16] = '\0'; priv->devinfo = devinfo = (struct pci_dev_info *)dev->businfo; priv->pcidev = devinfo->pcidev; @@ -328,6 +343,12 @@ int gr_tmtc_1553_init1(struct drvmgr_dev *dev) if (bar0_size == 0) return DRVMGR_ENORES; + /* Initialize spin-lock for this PCI peripheral device. This is to + * protect the Interrupt Controller Registers. The genirq layer is + * protecting its own internals and ISR dispatching. + */ + SPIN_INIT(&priv->devlock, priv->prefix); + priv->genirq = genirq_init(16); if ( priv->genirq == NULL ) { free(priv); @@ -394,12 +415,17 @@ int ambapp_tmtc_1553_int_register( void *arg) { struct gr_tmtc_1553_priv *priv = dev->parent->dev->priv; - rtems_interrupt_level level; + SPIN_IRQFLAGS(irqflags); int status; + void *h; - rtems_interrupt_disable(level); + h = genirq_alloc_handler(handler, arg); + if ( h == NULL ) + return DRVMGR_FAIL; - status = genirq_register(priv->genirq, irq, handler, arg); + SPIN_LOCK_IRQ(&priv->devlock, irqflags); + + status = genirq_register(priv->genirq, irq, h); if ( status == 0 ) { /* Disable and clear IRQ for first registered handler */ priv->irq->iclear = (1<<irq); @@ -408,7 +434,8 @@ int ambapp_tmtc_1553_int_register( status = 0; if (status != 0) { - rtems_interrupt_enable(level); + SPIN_UNLOCK_IRQ(&priv->devlock, irqflags); + genirq_free_handler(h); return DRVMGR_FAIL; } @@ -419,7 +446,7 @@ int ambapp_tmtc_1553_int_register( } else if ( status == 1 ) status = 0; - rtems_interrupt_enable(level); + SPIN_UNLOCK_IRQ(&priv->devlock, irqflags); return status; } @@ -431,10 +458,11 @@ int ambapp_tmtc_1553_int_unregister( void *arg) { struct gr_tmtc_1553_priv *priv = dev->parent->dev->priv; - rtems_interrupt_level level; + SPIN_IRQFLAGS(irqflags); int status; + void *handler; - rtems_interrupt_disable(level); + SPIN_LOCK_IRQ(&priv->devlock, irqflags); status = genirq_disable(priv->genirq, irq, isr, arg); if ( status == 0 ) { @@ -443,11 +471,16 @@ int ambapp_tmtc_1553_int_unregister( } else if ( status == 1 ) status = 0; - status = genirq_unregister(priv->genirq, irq, isr, arg); - if ( status != 0 ) + handler = genirq_unregister(priv->genirq, irq, isr, arg); + if ( handler == NULL ) status = DRVMGR_FAIL; + else + status = DRVMGR_OK; + + SPIN_UNLOCK_IRQ(&priv->devlock, irqflags); - rtems_interrupt_enable(level); + if (handler) + genirq_free_handler(handler); return status; } @@ -457,19 +490,19 @@ int ambapp_tmtc_1553_int_unmask( int irq) { struct gr_tmtc_1553_priv *priv = dev->parent->dev->priv; - rtems_interrupt_level level; + SPIN_IRQFLAGS(irqflags); DBG("TMTC-1553 IRQ %d: enable\n", irq); if ( genirq_check(priv->genirq, irq) ) return DRVMGR_FAIL; - rtems_interrupt_disable(level); + SPIN_LOCK_IRQ(&priv->devlock, irqflags); /* Enable IRQ */ priv->irq->mask[0] |= (1<<irq); /* unmask interrupt source */ - rtems_interrupt_enable(level); + SPIN_UNLOCK_IRQ(&priv->devlock, irqflags); return DRVMGR_OK; } @@ -479,19 +512,19 @@ int ambapp_tmtc_1553_int_mask( int irq) { struct gr_tmtc_1553_priv *priv = dev->parent->dev->priv; - rtems_interrupt_level level; + SPIN_IRQFLAGS(irqflags); DBG("TMTC-1553 IRQ %d: disable\n", irq); if ( genirq_check(priv->genirq, irq) ) return DRVMGR_FAIL; - rtems_interrupt_disable(level); + SPIN_LOCK_IRQ(&priv->devlock, irqflags); /* Disable IRQ */ priv->irq->mask[0] &= ~(1<<irq); /* mask interrupt source */ - rtems_interrupt_enable(level); + SPIN_UNLOCK_IRQ(&priv->devlock, irqflags); return DRVMGR_OK; } |