adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

atm nicstar: Removal of debug code containing deprecated calls to cli()/sti()

Browse source 
Code within NS_DEBUG_SPINLOCKS contained deprecated cli()/sti()
function calls.  NS_DEBUG_SPINLOCKS and the associated code seems to
be of little use these days so the strategy of removing this code
rather then updating it to use spinlocks has been taken.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mark Asselstine 2008-04-19 18:10:46 -07:00 committed by David S. Miller
parent 344234de54
commit 36ef408061
2 changed files with 19 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
drivers/atm/nicstar.c
View file

@ -125,85 +125,6 @@
#define ATM_SKB(s) (&(s)->atm) #define ATM_SKB(s) (&(s)->atm)
#endif #endif
/* Spinlock debugging stuff */
#ifdef NS_DEBUG_SPINLOCKS /* See nicstar.h */
#define ns_grab_int_lock(card,flags) \
do { \
unsigned long nsdsf, nsdsf2; \
local_irq_save(flags); \
save_flags(nsdsf); cli();\
if (nsdsf & (1<<9)) printk ("nicstar.c: ints %sabled -> enabled.\n", \
(flags)&(1<<9)?"en":"dis"); \
if (spin_is_locked(&(card)->int_lock) && \
(card)->cpu_int == smp_processor_id()) { \
printk("nicstar.c: line %d (cpu %d) int_lock already locked at line %d (cpu %d)\n", \
__LINE__, smp_processor_id(), (card)->has_int_lock, \
(card)->cpu_int); \
printk("nicstar.c: ints were %sabled.\n", ((flags)&(1<<9)?"en":"dis")); \
} \
if (spin_is_locked(&(card)->res_lock) && \
(card)->cpu_res == smp_processor_id()) { \
printk("nicstar.c: line %d (cpu %d) res_lock locked at line %d (cpu %d)(trying int)\n", \
__LINE__, smp_processor_id(), (card)->has_res_lock, \
(card)->cpu_res); \
printk("nicstar.c: ints were %sabled.\n", ((flags)&(1<<9)?"en":"dis")); \
} \
spin_lock_irq(&(card)->int_lock); \
(card)->has_int_lock = __LINE__; \
(card)->cpu_int = smp_processor_id(); \
restore_flags(nsdsf); } while (0)
#define ns_grab_res_lock(card,flags) \
do { \
unsigned long nsdsf, nsdsf2; \
local_irq_save(flags); \
save_flags(nsdsf); cli();\
if (nsdsf & (1<<9)) printk ("nicstar.c: ints %sabled -> enabled.\n", \
(flags)&(1<<9)?"en":"dis"); \
if (spin_is_locked(&(card)->res_lock) && \
(card)->cpu_res == smp_processor_id()) { \
printk("nicstar.c: line %d (cpu %d) res_lock already locked at line %d (cpu %d)\n", \
__LINE__, smp_processor_id(), (card)->has_res_lock, \
(card)->cpu_res); \
printk("nicstar.c: ints were %sabled.\n", ((flags)&(1<<9)?"en":"dis")); \
} \
spin_lock_irq(&(card)->res_lock); \
(card)->has_res_lock = __LINE__; \
(card)->cpu_res = smp_processor_id(); \
restore_flags(nsdsf); } while (0)
#define ns_grab_scq_lock(card,scq,flags) \
do { \
unsigned long nsdsf, nsdsf2; \
local_irq_save(flags); \
save_flags(nsdsf); cli();\
if (nsdsf & (1<<9)) printk ("nicstar.c: ints %sabled -> enabled.\n", \
(flags)&(1<<9)?"en":"dis"); \
if (spin_is_locked(&(scq)->lock) && \
(scq)->cpu_lock == smp_processor_id()) { \
printk("nicstar.c: line %d (cpu %d) this scq_lock already locked at line %d (cpu %d)\n", \
__LINE__, smp_processor_id(), (scq)->has_lock, \
(scq)->cpu_lock); \
printk("nicstar.c: ints were %sabled.\n", ((flags)&(1<<9)?"en":"dis")); \
} \
if (spin_is_locked(&(card)->res_lock) && \
(card)->cpu_res == smp_processor_id()) { \
printk("nicstar.c: line %d (cpu %d) res_lock locked at line %d (cpu %d)(trying scq)\n", \
__LINE__, smp_processor_id(), (card)->has_res_lock, \
(card)->cpu_res); \
printk("nicstar.c: ints were %sabled.\n", ((flags)&(1<<9)?"en":"dis")); \
} \
spin_lock_irq(&(scq)->lock); \
(scq)->has_lock = __LINE__; \
(scq)->cpu_lock = smp_processor_id(); \
restore_flags(nsdsf); } while (0)
#else /* !NS_DEBUG_SPINLOCKS */
#define ns_grab_int_lock(card,flags) \
spin_lock_irqsave(&(card)->int_lock,(flags))
#define ns_grab_res_lock(card,flags) \
spin_lock_irqsave(&(card)->res_lock,(flags))
#define ns_grab_scq_lock(card,scq,flags) \
spin_lock_irqsave(&(scq)->lock,flags)
#endif /* NS_DEBUG_SPINLOCKS */
/* Function declarations ******************************************************/ /* Function declarations ******************************************************/
@ -422,7 +343,7 @@ static u32 ns_read_sram(ns_dev *card, u32 sram_address)
sram_address <<= 2; sram_address <<= 2;
sram_address &= 0x0007FFFC; /* address must be dword aligned */ sram_address &= 0x0007FFFC; /* address must be dword aligned */
sram_address |= 0x50000000; /* SRAM read command */ sram_address |= 0x50000000; /* SRAM read command */
ns_grab_res_lock(card, flags); spin_lock_irqsave(&card->res_lock, flags);
while (CMD_BUSY(card)); while (CMD_BUSY(card));
writel(sram_address, card->membase + CMD); writel(sram_address, card->membase + CMD);
while (CMD_BUSY(card)); while (CMD_BUSY(card));
@ -440,7 +361,7 @@ static void ns_write_sram(ns_dev *card, u32 sram_address, u32 *value, int count)
count--; /* count range now is 0..3 instead of 1..4 */ count--; /* count range now is 0..3 instead of 1..4 */
c = count; c = count;
c <<= 2; /* to use increments of 4 */ c <<= 2; /* to use increments of 4 */
ns_grab_res_lock(card, flags); spin_lock_irqsave(&card->res_lock, flags);
while (CMD_BUSY(card)); while (CMD_BUSY(card));
for (i = 0; i <= c; i += 4) for (i = 0; i <= c; i += 4)
writel(*(value++), card->membase + i); writel(*(value++), card->membase + i);
@ -1166,7 +1087,7 @@ static void push_rxbufs(ns_dev *card, struct sk_buff *skb)
card->lbfqc += 2; card->lbfqc += 2;
} }
ns_grab_res_lock(card, flags); spin_lock_irqsave(&card->res_lock, flags);
while (CMD_BUSY(card)); while (CMD_BUSY(card));
writel(addr2, card->membase + DR3); writel(addr2, card->membase + DR3);
@ -1206,7 +1127,7 @@ static irqreturn_t ns_irq_handler(int irq, void *dev_id)
PRINTK("nicstar%d: NICStAR generated an interrupt\n", card->index); PRINTK("nicstar%d: NICStAR generated an interrupt\n", card->index);
ns_grab_int_lock(card, flags); spin_lock_irqsave(&card->int_lock, flags);
stat_r = readl(card->membase + STAT); stat_r = readl(card->membase + STAT);
@ -1585,7 +1506,7 @@ static void ns_close(struct atm_vcc *vcc)
unsigned long flags; unsigned long flags;
addr = NS_RCT + (vcc->vpi << card->vcibits | vcc->vci) * NS_RCT_ENTRY_SIZE; addr = NS_RCT + (vcc->vpi << card->vcibits | vcc->vci) * NS_RCT_ENTRY_SIZE;
ns_grab_res_lock(card, flags); spin_lock_irqsave(&card->res_lock, flags);
while(CMD_BUSY(card)); while(CMD_BUSY(card));
writel(NS_CMD_CLOSE_CONNECTION | addr << 2, card->membase + CMD); writel(NS_CMD_CLOSE_CONNECTION | addr << 2, card->membase + CMD);
spin_unlock_irqrestore(&card->res_lock, flags); spin_unlock_irqrestore(&card->res_lock, flags);
@ -1607,7 +1528,7 @@ static void ns_close(struct atm_vcc *vcc)
NS_SKB(iovb)->iovcnt); NS_SKB(iovb)->iovcnt);
NS_SKB(iovb)->iovcnt = 0; NS_SKB(iovb)->iovcnt = 0;
NS_SKB(iovb)->vcc = NULL; NS_SKB(iovb)->vcc = NULL;
ns_grab_int_lock(card, flags); spin_lock_irqsave(&card->int_lock, flags);
recycle_iov_buf(card, iovb); recycle_iov_buf(card, iovb);
spin_unlock_irqrestore(&card->int_lock, flags); spin_unlock_irqrestore(&card->int_lock, flags);
vc->rx_iov = NULL; vc->rx_iov = NULL;
@ -1629,7 +1550,7 @@ static void ns_close(struct atm_vcc *vcc)
for (;;) for (;;)
{ {
ns_grab_scq_lock(card, scq, flags); spin_lock_irqsave(&scq->lock, flags);
scqep = scq->next; scqep = scq->next;
if (scqep == scq->base) if (scqep == scq->base)
scqep = scq->last; scqep = scq->last;
@ -1691,7 +1612,7 @@ static void ns_close(struct atm_vcc *vcc)
unsigned long flags; unsigned long flags;
scq_info *scq = card->scq0; scq_info *scq = card->scq0;
ns_grab_scq_lock(card, scq, flags); spin_lock_irqsave(&scq->lock, flags);
for(i = 0; i < scq->num_entries; i++) { for(i = 0; i < scq->num_entries; i++) {
if(scq->skb[i] && ATM_SKB(scq->skb[i])->vcc == vcc) { if(scq->skb[i] && ATM_SKB(scq->skb[i])->vcc == vcc) {
@ -1892,7 +1813,7 @@ static int push_scqe(ns_dev *card, vc_map *vc, scq_info *scq, ns_scqe *tbd,
u32 data; u32 data;
int index; int index;
ns_grab_scq_lock(card, scq, flags); spin_lock_irqsave(&scq->lock, flags);
while (scq->tail == scq->next) while (scq->tail == scq->next)
{ {
if (in_interrupt()) { if (in_interrupt()) {
@ -1904,7 +1825,7 @@ static int push_scqe(ns_dev *card, vc_map *vc, scq_info *scq, ns_scqe *tbd,
scq->full = 1; scq->full = 1;
spin_unlock_irqrestore(&scq->lock, flags); spin_unlock_irqrestore(&scq->lock, flags);
interruptible_sleep_on_timeout(&scq->scqfull_waitq, SCQFULL_TIMEOUT); interruptible_sleep_on_timeout(&scq->scqfull_waitq, SCQFULL_TIMEOUT);
ns_grab_scq_lock(card, scq, flags); spin_lock_irqsave(&scq->lock, flags);
if (scq->full) { if (scq->full) {
spin_unlock_irqrestore(&scq->lock, flags); spin_unlock_irqrestore(&scq->lock, flags);
@ -1953,7 +1874,7 @@ static int push_scqe(ns_dev *card, vc_map *vc, scq_info *scq, ns_scqe *tbd,
if (has_run++) break; if (has_run++) break;
spin_unlock_irqrestore(&scq->lock, flags); spin_unlock_irqrestore(&scq->lock, flags);
interruptible_sleep_on_timeout(&scq->scqfull_waitq, SCQFULL_TIMEOUT); interruptible_sleep_on_timeout(&scq->scqfull_waitq, SCQFULL_TIMEOUT);
ns_grab_scq_lock(card, scq, flags); spin_lock_irqsave(&scq->lock, flags);
} }
if (!scq->full) if (!scq->full)
@ -2090,7 +2011,7 @@ static void drain_scq(ns_dev *card, scq_info *scq, int pos)
return; return;
} }
ns_grab_scq_lock(card, scq, flags); spin_lock_irqsave(&scq->lock, flags);
i = (int) (scq->tail - scq->base); i = (int) (scq->tail - scq->base);
if (++i == scq->num_entries) if (++i == scq->num_entries)
i = 0; i = 0;
@ -2898,7 +2819,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
{ {
struct sk_buff *hb; struct sk_buff *hb;
ns_grab_int_lock(card, flags); spin_lock_irqsave(&card->int_lock, flags);
hb = skb_dequeue(&card->hbpool.queue); hb = skb_dequeue(&card->hbpool.queue);
card->hbpool.count--; card->hbpool.count--;
spin_unlock_irqrestore(&card->int_lock, flags); spin_unlock_irqrestore(&card->int_lock, flags);
@ -2917,7 +2838,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
if (hb == NULL) if (hb == NULL)
return -ENOMEM; return -ENOMEM;
NS_SKB_CB(hb)->buf_type = BUF_NONE; NS_SKB_CB(hb)->buf_type = BUF_NONE;
ns_grab_int_lock(card, flags); spin_lock_irqsave(&card->int_lock, flags);
skb_queue_tail(&card->hbpool.queue, hb); skb_queue_tail(&card->hbpool.queue, hb);
card->hbpool.count++; card->hbpool.count++;
spin_unlock_irqrestore(&card->int_lock, flags); spin_unlock_irqrestore(&card->int_lock, flags);
@ -2929,7 +2850,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
{ {
struct sk_buff *iovb; struct sk_buff *iovb;
ns_grab_int_lock(card, flags); spin_lock_irqsave(&card->int_lock, flags);
iovb = skb_dequeue(&card->iovpool.queue); iovb = skb_dequeue(&card->iovpool.queue);
card->iovpool.count--; card->iovpool.count--;
spin_unlock_irqrestore(&card->int_lock, flags); spin_unlock_irqrestore(&card->int_lock, flags);
@ -2948,7 +2869,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
if (iovb == NULL) if (iovb == NULL)
return -ENOMEM; return -ENOMEM;
NS_SKB_CB(iovb)->buf_type = BUF_NONE; NS_SKB_CB(iovb)->buf_type = BUF_NONE;
ns_grab_int_lock(card, flags); spin_lock_irqsave(&card->int_lock, flags);
skb_queue_tail(&card->iovpool.queue, iovb); skb_queue_tail(&card->iovpool.queue, iovb);
card->iovpool.count++; card->iovpool.count++;
spin_unlock_irqrestore(&card->int_lock, flags); spin_unlock_irqrestore(&card->int_lock, flags);
@ -2995,7 +2916,7 @@ static void ns_poll(unsigned long arg)
/* Probably it isn't worth spinning */ /* Probably it isn't worth spinning */
continue; continue;
} }
ns_grab_int_lock(card, flags); spin_lock_irqsave(&card->int_lock, flags);
stat_w = 0; stat_w = 0;
stat_r = readl(card->membase + STAT); stat_r = readl(card->membase + STAT);
@ -3062,7 +2983,7 @@ static void ns_phy_put(struct atm_dev *dev, unsigned char value,
unsigned long flags; unsigned long flags;
card = dev->dev_data; card = dev->dev_data;
ns_grab_res_lock(card, flags); spin_lock_irqsave(&card->res_lock, flags);
while(CMD_BUSY(card)); while(CMD_BUSY(card));
writel((unsigned long) value, card->membase + DR0); writel((unsigned long) value, card->membase + DR0);
writel(NS_CMD_WRITE_UTILITY | 0x00000200 | (addr & 0x000000FF), writel(NS_CMD_WRITE_UTILITY | 0x00000200 | (addr & 0x000000FF),
@ -3079,7 +3000,7 @@ static unsigned char ns_phy_get(struct atm_dev *dev, unsigned long addr)
unsigned long data; unsigned long data;
card = dev->dev_data; card = dev->dev_data;
ns_grab_res_lock(card, flags); spin_lock_irqsave(&card->res_lock, flags);
while(CMD_BUSY(card)); while(CMD_BUSY(card));
writel(NS_CMD_READ_UTILITY | 0x00000200 | (addr & 0x000000FF), writel(NS_CMD_READ_UTILITY | 0x00000200 | (addr & 0x000000FF),
card->membase + CMD); card->membase + CMD);

12
drivers/atm/nicstar.h
View file

@ -28,8 +28,6 @@
/* Options ********************************************************************/ /* Options ********************************************************************/
#undef NS_DEBUG_SPINLOCKS
#define NS_MAX_CARDS 4 /* Maximum number of NICStAR based cards #define NS_MAX_CARDS 4 /* Maximum number of NICStAR based cards
controlled by the device driver. Must controlled by the device driver. Must
be <= 5 */ be <= 5 */
@ -721,10 +719,6 @@ typedef struct scq_info
wait_queue_head_t scqfull_waitq; wait_queue_head_t scqfull_waitq;
volatile char full; /* SCQ full indicator */ volatile char full; /* SCQ full indicator */
spinlock_t lock; /* SCQ spinlock */ spinlock_t lock; /* SCQ spinlock */
#ifdef NS_DEBUG_SPINLOCKS
volatile long has_lock;
volatile int cpu_lock;
#endif /* NS_DEBUG_SPINLOCKS */
} scq_info; } scq_info;
@ -810,12 +804,6 @@ typedef struct ns_dev
unsigned intcnt; /* Interrupt counter */ unsigned intcnt; /* Interrupt counter */
spinlock_t int_lock; /* Interrupt lock */ spinlock_t int_lock; /* Interrupt lock */
spinlock_t res_lock; /* Card resource lock */ spinlock_t res_lock; /* Card resource lock */
#ifdef NS_DEBUG_SPINLOCKS
volatile long has_int_lock;
volatile int cpu_int;
volatile long has_res_lock;
volatile int cpu_res;
#endif /* NS_DEBUG_SPINLOCKS */
} ns_dev; } ns_dev;