Skip to content

L
linux
Commit d0dd4250 authored by Peter Wächtler's avatar Peter Wächtler Committed by Linus Torvalds
Browse files
Options

[PATCH] oss/ad1816.c - convert cli to spinlocks

parent 6ab988b9
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 41 deletions
sound/oss/ad1816.c
View file @ d0dd4250
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/isapnp.h> #include <linux/isapnp.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/spinlock.h>
#include "sound_config.h" #include "sound_config.h"
#define DEBUGNOISE(x) #define DEBUGNOISE(x)
...@@ -77,7 +77,7 @@ typedef struct ...@@ -77,7 +77,7 @@ typedef struct
in ad1816_info */ in ad1816_info */
int irq_ok; int irq_ok;
int *osp; int *osp;
spinlock_t lock;
} ad1816_info; } ad1816_info;
static int nr_ad1816_devs; static int nr_ad1816_devs;
...@@ -109,12 +109,11 @@ static int ad_read (ad1816_info * devc, int reg) ...@@ -109,12 +109,11 @@ static int ad_read (ad1816_info * devc, int reg)
CHECK_FOR_POWER; CHECK_FOR_POWER;
save_flags (flags); /* make register access atomic */ spin_lock_irqsave(&devc->lock,flags); /* make register access atomic */
cli ();
outb ((unsigned char) (reg & 0x3f), devc->base+0); outb ((unsigned char) (reg & 0x3f), devc->base+0);
result = inb(devc->base+2); result = inb(devc->base+2);
result+= inb(devc->base+3)<<8; result+= inb(devc->base+3)<<8;
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
return (result); return (result);
} }
...@@ -126,12 +125,11 @@ static void ad_write (ad1816_info * devc, int reg, int data) ...@@ -126,12 +125,11 @@ static void ad_write (ad1816_info * devc, int reg, int data)
CHECK_FOR_POWER; CHECK_FOR_POWER;
save_flags (flags); /* make register access atomic */ spin_lock_irqsave(&devc->lock,flags); /* make register access atomic */
cli ();
outb ((unsigned char) (reg & 0xff), devc->base+0); outb ((unsigned char) (reg & 0xff), devc->base+0);
outb ((unsigned char) (data & 0xff),devc->base+2); outb ((unsigned char) (data & 0xff),devc->base+2);
outb ((unsigned char) ((data>>8)&0xff),devc->base+3); outb ((unsigned char) ((data>>8)&0xff),devc->base+3);
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
} }
...@@ -147,8 +145,7 @@ static void ad1816_halt_input (int dev) ...@@ -147,8 +145,7 @@ static void ad1816_halt_input (int dev)
DEBUGINFO (printk("ad1816: halt_input called\n")); DEBUGINFO (printk("ad1816: halt_input called\n"));
save_flags (flags); spin_lock_irqsave(&devc->lock,flags);
cli ();
if(!isa_dma_bridge_buggy) { if(!isa_dma_bridge_buggy) {
disable_dma(audio_devs[dev]->dmap_in->dma); disable_dma(audio_devs[dev]->dmap_in->dma);
...@@ -168,7 +165,7 @@ static void ad1816_halt_input (int dev) ...@@ -168,7 +165,7 @@ static void ad1816_halt_input (int dev)
outb (~0x40, devc->base+1); outb (~0x40, devc->base+1);
devc->audio_mode &= ~PCM_ENABLE_INPUT; devc->audio_mode &= ~PCM_ENABLE_INPUT;
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
} }
static void ad1816_halt_output (int dev) static void ad1816_halt_output (int dev)
...@@ -180,8 +177,7 @@ static void ad1816_halt_output (int dev) ...@@ -180,8 +177,7 @@ static void ad1816_halt_output (int dev)
DEBUGINFO (printk("ad1816: halt_output called!\n")); DEBUGINFO (printk("ad1816: halt_output called!\n"));
save_flags (flags); spin_lock_irqsave(&devc->lock,flags);
cli ();
/* Mute pcm output */ /* Mute pcm output */
ad_write(devc, 4, ad_read(devc,4)|0x8080); ad_write(devc, 4, ad_read(devc,4)|0x8080);
...@@ -203,7 +199,7 @@ static void ad1816_halt_output (int dev) ...@@ -203,7 +199,7 @@ static void ad1816_halt_output (int dev)
outb ((unsigned char)~0x80, devc->base+1); outb ((unsigned char)~0x80, devc->base+1);
devc->audio_mode &= ~PCM_ENABLE_OUTPUT; devc->audio_mode &= ~PCM_ENABLE_OUTPUT;
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
} }
static void ad1816_output_block (int dev, unsigned long buf, static void ad1816_output_block (int dev, unsigned long buf,
...@@ -217,14 +213,13 @@ static void ad1816_output_block (int dev, unsigned long buf, ...@@ -217,14 +213,13 @@ static void ad1816_output_block (int dev, unsigned long buf,
cnt = count/4 - 1; cnt = count/4 - 1;
save_flags (flags); spin_lock_irqsave(&devc->lock,flags);
cli ();
/* set transfer count */ /* set transfer count */
ad_write (devc, 8, cnt & 0xffff); ad_write (devc, 8, cnt & 0xffff);
devc->audio_mode |= PCM_ENABLE_OUTPUT; devc->audio_mode |= PCM_ENABLE_OUTPUT;
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
} }
...@@ -239,14 +234,13 @@ static void ad1816_start_input (int dev, unsigned long buf, int count, ...@@ -239,14 +234,13 @@ static void ad1816_start_input (int dev, unsigned long buf, int count,
cnt = count/4 - 1; cnt = count/4 - 1;
save_flags (flags); /* make register access atomic */ spin_lock_irqsave(&devc->lock,flags);
cli ();
/* set transfer count */ /* set transfer count */
ad_write (devc, 10, cnt & 0xffff); ad_write (devc, 10, cnt & 0xffff);
devc->audio_mode |= PCM_ENABLE_INPUT; devc->audio_mode |= PCM_ENABLE_INPUT;
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
} }
static int ad1816_prepare_for_input (int dev, int bsize, int bcount) static int ad1816_prepare_for_input (int dev, int bsize, int bcount)
...@@ -258,8 +252,7 @@ static int ad1816_prepare_for_input (int dev, int bsize, int bcount) ...@@ -258,8 +252,7 @@ static int ad1816_prepare_for_input (int dev, int bsize, int bcount)
DEBUGINFO (printk ("ad1816: prepare_for_input called: bsize=%d bcount=%d\n",bsize,bcount)); DEBUGINFO (printk ("ad1816: prepare_for_input called: bsize=%d bcount=%d\n",bsize,bcount));
save_flags (flags); spin_lock_irqsave(&devc->lock,flags);
cli ();
fmt_bits= (devc->format_bits&0x7)<<3; fmt_bits= (devc->format_bits&0x7)<<3;
...@@ -290,7 +283,7 @@ static int ad1816_prepare_for_input (int dev, int bsize, int bcount) ...@@ -290,7 +283,7 @@ static int ad1816_prepare_for_input (int dev, int bsize, int bcount)
ad_write (devc, 2, freq & 0xffff); ad_write (devc, 2, freq & 0xffff);
ad_write (devc, 3, freq & 0xffff); ad_write (devc, 3, freq & 0xffff);
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
ad1816_halt_input(dev); ad1816_halt_input(dev);
return 0; return 0;
...@@ -305,8 +298,7 @@ static int ad1816_prepare_for_output (int dev, int bsize, int bcount) ...@@ -305,8 +298,7 @@ static int ad1816_prepare_for_output (int dev, int bsize, int bcount)
DEBUGINFO (printk ("ad1816: prepare_for_output called: bsize=%d bcount=%d\n",bsize,bcount)); DEBUGINFO (printk ("ad1816: prepare_for_output called: bsize=%d bcount=%d\n",bsize,bcount));
save_flags (flags); /* make register access atomic */ spin_lock_irqsave(&devc->lock,flags);
cli ();
fmt_bits= (devc->format_bits&0x7)<<3; fmt_bits= (devc->format_bits&0x7)<<3;
/* set mono/stereo mode */ /* set mono/stereo mode */
...@@ -335,7 +327,7 @@ static int ad1816_prepare_for_output (int dev, int bsize, int bcount) ...@@ -335,7 +327,7 @@ static int ad1816_prepare_for_output (int dev, int bsize, int bcount)
ad_write (devc, 2, freq & 0xffff); ad_write (devc, 2, freq & 0xffff);
ad_write (devc, 3, freq & 0xffff); ad_write (devc, 3, freq & 0xffff);
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
ad1816_halt_output(dev); ad1816_halt_output(dev);
return 0; return 0;
...@@ -351,8 +343,7 @@ static void ad1816_trigger (int dev, int state) ...@@ -351,8 +343,7 @@ static void ad1816_trigger (int dev, int state)
/* mode may have changed */ /* mode may have changed */
save_flags (flags); /* make register access atomic */ spin_lock_irqsave(&devc->lock,flags);
cli ();
/* mask out modes not specified on open call */ /* mask out modes not specified on open call */
state &= devc->audio_mode; state &= devc->audio_mode;
...@@ -377,7 +368,7 @@ static void ad1816_trigger (int dev, int state) ...@@ -377,7 +368,7 @@ static void ad1816_trigger (int dev, int state)
/* disable capture */ /* disable capture */
outb(inb(devc->base+8)&~0x01, devc->base+8); outb(inb(devc->base+8)&~0x01, devc->base+8);
} }
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
} }
...@@ -480,11 +471,10 @@ static int ad1816_open (int dev, int mode) ...@@ -480,11 +471,10 @@ static int ad1816_open (int dev, int mode)
devc = (ad1816_info *) audio_devs[dev]->devc; devc = (ad1816_info *) audio_devs[dev]->devc;
/* make check if device already open atomic */ /* make check if device already open atomic */
save_flags (flags); spin_lock_irqsave(&devc->lock,flags);
cli ();
if (devc->opened) { if (devc->opened) {
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
return -(EBUSY); return -(EBUSY);
} }
...@@ -497,7 +487,7 @@ static int ad1816_open (int dev, int mode) ...@@ -497,7 +487,7 @@ static int ad1816_open (int dev, int mode)
devc->channels=1; devc->channels=1;
ad1816_reset(devc->dev_no); /* halt all pending output */ ad1816_reset(devc->dev_no); /* halt all pending output */
restore_flags (flags); spin_unlock_irqrestore(&devc->lock,flags);
return 0; return 0;
} }
...@@ -506,8 +496,7 @@ static void ad1816_close (int dev) /* close device */ ...@@ -506,8 +496,7 @@ static void ad1816_close (int dev) /* close device */
unsigned long flags; unsigned long flags;
ad1816_info *devc = (ad1816_info *) audio_devs[dev]->devc; ad1816_info *devc = (ad1816_info *) audio_devs[dev]->devc;
save_flags (flags); spin_lock_irqsave(&devc->lock,flags);
cli ();
/* halt all pending output */ /* halt all pending output */
ad1816_reset(devc->dev_no); ad1816_reset(devc->dev_no);
...@@ -518,8 +507,7 @@ static void ad1816_close (int dev) /* close device */ ...@@ -518,8 +507,7 @@ static void ad1816_close (int dev) /* close device */
devc->audio_format=AFMT_U8; devc->audio_format=AFMT_U8;
devc->format_bits = 0; devc->format_bits = 0;
spin_unlock_irqrestore(&devc->lock,flags);
restore_flags (flags);
} }
...@@ -556,7 +544,6 @@ static void ad1816_interrupt (int irq, void *dev_id, struct pt_regs *dummy) ...@@ -556,7 +544,6 @@ static void ad1816_interrupt (int irq, void *dev_id, struct pt_regs *dummy)
unsigned char status; unsigned char status;
ad1816_info *devc; ad1816_info *devc;
int dev; int dev;
unsigned long flags;
if (irq < 0 || irq > 15) { if (irq < 0 || irq > 15) {
...@@ -574,8 +561,7 @@ static void ad1816_interrupt (int irq, void *dev_id, struct pt_regs *dummy) ...@@ -574,8 +561,7 @@ static void ad1816_interrupt (int irq, void *dev_id, struct pt_regs *dummy)
devc = (ad1816_info *) audio_devs[dev]->devc; devc = (ad1816_info *) audio_devs[dev]->devc;
save_flags(flags); spin_lock(&devc->lock);
cli();
/* read interrupt register */ /* read interrupt register */
status = inb (devc->base+1); status = inb (devc->base+1);
...@@ -595,7 +581,7 @@ static void ad1816_interrupt (int irq, void *dev_id, struct pt_regs *dummy) ...@@ -595,7 +581,7 @@ static void ad1816_interrupt (int irq, void *dev_id, struct pt_regs *dummy)
if (devc->opened && (devc->audio_mode & PCM_ENABLE_OUTPUT) && (status & 128)) if (devc->opened && (devc->audio_mode & PCM_ENABLE_OUTPUT) && (status & 128))
DMAbuf_outputintr (dev, 1); DMAbuf_outputintr (dev, 1);
restore_flags(flags); spin_unlock(&devc->lock);
} }
/* ------------------------------------------------------------------- */ /* ------------------------------------------------------------------- */
...@@ -1033,6 +1019,7 @@ static int __init probe_ad1816 ( struct address_info *hw_config ) ...@@ -1033,6 +1019,7 @@ static int __init probe_ad1816 ( struct address_info *hw_config )
devc->irq = 0; devc->irq = 0;
devc->opened = 0; devc->opened = 0;
devc->osp = osp; devc->osp = osp;
spin_lock_init(&devc->lock);
/* base+0: bit 1 must be set but not 255 */ /* base+0: bit 1 must be set but not 255 */
tmp=inb(devc->base); tmp=inb(devc->base);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7