es1370 fix
PATCH 1/1 es1370 fix
Hi,
This patch fixes the es1370 driver (the virt_to_bus thing).
Gerd
----------------------------- cut here --------------------------
sound/oss/es1370.c +7 -8
@@ -374,6 +374,10 @@unsigned subdivision; } dma_dac1, dma_dac2, dma_adc; +/* The following buffer is used to point the phantom write channel to. */ +unsigned char *bugbuf_cpu; +dma_addr_t bugbuf_dma; +/* midi stuff */ struct {unsigned ird, iwr, icnt;
@@ -392,13 +396,6 @@static LIST_HEAD (devs); -/* -* The following buffer is used to point the phantom write channel to, -* so that it cannot wreak havoc. The attribute makes sure it doesn't -* cross a page boundary and ensures dword alignment for the DMA engine -*/ -static unsigned char bugbuf[16] __attribute__ ((aligned (16))); -/* --------------------------------------------------------------------- */ static inline unsigned ld2 (unsigned int x)
@@ -2653,8 +2650,9 @@outl (s->ctrl, s->io+ES1370_REG_CONTROL );outl (s->sctrl, s->io+ES1370_REG_SERIAL_CONTROL );/* point phantom write channel to "bugbuf" */ + s->bugbuf_cpu =pci_alloc_consistent (pcidev,16 ,&s->bugbuf_dma);outl ((ES1370_REG_PHANTOM_FRAMEADR >>8 ) &15 , s->io+ES1370_REG_MEMPAGE ); -outl (virt_to_bus (bugbuf), s->io+(ES1370_REG_PHANTOM_FRAMEADR &0xff )); +outl (s->bugbuf_dma, s->io+(ES1370_REG_PHANTOM_FRAMEADR &0xff ));outl (0 , s->io+(ES1370_REG_PHANTOM_FRAMECNT &0xff ));pci_set_master (pcidev);/* enable bus mastering */ wrcodec (s,0x16 ,3 );/* no RST, PD */
@@ -2721,6 +2719,7 @@unregister_sound_mixer (s->dev_mixer);unregister_sound_dsp (s->dev_dac);unregister_sound_midi (s->dev_midi); +pci_free_consistent (dev,16 , s->bugbuf_cpu, s->bugbuf_dma);kfree (s);pci_set_drvdata (dev,NULL ); }
Quoted 4 lines · Gerd Knorr
Hi,
This patch fixes the es1370 driver (the
virt_to_busthing).
Bugbuf could be shared among all cards in the system... Otherwise looks correct
Tom
Re: [PATCH] 2.4.18-rc1 es1370 fix
In reply to Gerd KnorrQuoted 3 lines · Gerd Knorr
Hi,
This patch (against 2.5.5-pre1) fixes the es1370 driver (the
virt_to_busthing).
The same applies to 2.4.18-rc1
----------------------------- cut here --------------------------
drivers/sound/es1370.c +4 -8
@@ -374,6 +374,10 @@unsigned subdivision; } dma_dac1, dma_dac2, dma_adc; +/* The following buffer is used to point the phantom write channel to. */ +unsigned char *bugbuf_cpu; +dma_addr_t bugbuf_dma; +/* midi stuff */ struct {unsigned ird, iwr, icnt;
@@ -392,13 +396,6 @@static LIST_HEAD (devs); -/* -* The following buffer is used to point the phantom write channel to, -* so that it cannot wreak havoc. The attribute makes sure it doesn't -* cross a page boundary and ensures dword alignment for the DMA engine -*/ -static unsigned char bugbuf[16] __attribute__ ((aligned (16))); -/* --------------------------------------------------------------------- */
static inline unsigned ld2(unsigned int x)
@@ -2649,8 +2646,9 @@
outl(s->ctrl, s->io+ES1370_REG_CONTROL);
outl(s->sctrl, s->io+ES1370_REG_SERIAL_CONTROL);
/* point phantom write channel to "bugbuf" */
+ s->bugbuf_cpu = pci_alloc_consistent(pcidev,16,&s->bugbuf_dma); outl((ES1370_REG_PHANTOM_FRAMEADR >> 8) & 15, s->io+ES1370_REG_MEMPAGE);
- outl(virt_to_bus(bugbuf), s->io+(ES1370_REG_PHANTOM_FRAMEADR & 0xff));
+ outl(s->bugbuf_dma, s->io+(ES1370_REG_PHANTOM_FRAMEADR & 0xff)); outl(0, s->io+(ES1370_REG_PHANTOM_FRAMECNT & 0xff)); pci_set_master(pcidev); /* enable bus mastering */ wrcodec(s, 0x16, 3); /* no RST, PD */
@@ -2717,6 +2715,7 @@
unregister_sound_mixer(s->dev_mixer); unregister_sound_dsp(s->dev_dac); unregister_sound_midi(s->dev_midi);
+ pci_free_consistent(dev, 16, s->bugbuf_cpu, s->bugbuf_dma); kfree(s);
pci_set_drvdata(dev, NULL);
}
Signature · 3 lines
------------------------------------------------ Pierre Rousselet <[email protected]> ------------------------------------------------