Re: [PATCH] misplaced pci_enable_device()s in drivers/sound/
On Wed, Apr 18, 2001 at 12:55:50PM -0400, Jeff Garzik wrote: > Marcus Meissner wrote: > > Several pci_enable_device()s in drivers/sound happen _after_ accessing > > PCI resources. I have moved them before the relevant first accesses. > > cool > > > if (!RSRCISIOREGION(pcidev, 0)) > > return -1; > > can you replace this mess while you are cleaning stuff up. this, for > example, should be > if (!(pci_resource_flags(pcidev,) & IORESOURCE_IO)) > > There is also pci_resource_start and pci_resource_len. > > > iobase = SILLY_PCI_BASE_ADDRESS(pcidev); > > pci_resource_start THere is also some pci dma stuff which probably got changed. > patch looks ok to me, but those would be nice additions... I am a bit afraid to break stuff doing this without testing, but I will do it for the cards I have access to. Is there a 'HOW TO DO IT' PCI driver? drivers/net/pci-skeleton.c looks up to date, is it? Ciao, Marcus - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] misplaced pci_enable_device()s in drivers/sound/
Marcus Meissner wrote: > Several pci_enable_device()s in drivers/sound happen _after_ accessing > PCI resources. I have moved them before the relevant first accesses. cool > if (!RSRCISIOREGION(pcidev, 0)) > return -1; can you replace this mess while you are cleaning stuff up. this, for example, should be if (!(pci_resource_flags(pcidev,) & IORESOURCE_IO)) There is also pci_resource_start and pci_resource_len. > iobase = SILLY_PCI_BASE_ADDRESS(pcidev); pci_resource_start patch looks ok to me, but those would be nice additions... -- Jeff Garzik | "The universe is like a safe to which there is a Building 1024 | combination -- but the combination is locked up MandrakeSoft | in the safe."-- Peter DeVries - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] misplaced pci_enable_device()s in drivers/sound/
Hi,
Several pci_enable_device()s in drivers/sound happen _after_ accessing
PCI resources. I have moved them before the relevant first accesses.
(Untested, but should work.)
Against 2.4.3-ac9.
Ciao, Marcus
Index: es1370.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/es1370.c,v
retrieving revision 1.13
diff -u -r1.13 es1370.c
--- es1370.c2001/04/17 17:26:05 1.13
+++ es1370.c2001/04/18 16:24:05
@@ -2569,6 +2569,9 @@
mm_segment_t fs;
int i, val;
+ if (pci_enable_device(pcidev))
+ return -1;
+
if (!RSRCISIOREGION(pcidev, 0))
return -1;
if (pcidev->irq == 0)
@@ -2599,8 +2602,6 @@
printk(KERN_ERR "es1370: io ports %#lx-%#lx in use\n", s->io,
s->io+ES1370_EXTENT-1);
goto err_region;
}
- if (pci_enable_device(pcidev))
- goto err_irq;
if (request_irq(s->irq, es1370_interrupt, SA_SHIRQ, "es1370", s)) {
printk(KERN_ERR "es1370: irq %u in use\n", s->irq);
goto err_irq;
Index: es1371.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/es1371.c,v
retrieving revision 1.7
diff -u -r1.7 es1371.c
--- es1371.c2001/04/17 17:26:05 1.7
+++ es1371.c2001/04/18 16:24:20
@@ -2783,6 +2783,9 @@
signed long tmo2;
unsigned int cssr;
+ if (pci_enable_device(pcidev))
+ return -1;
+
if (!RSRCISIOREGION(pcidev, 0))
return -1;
if (pcidev->irq == 0)
@@ -2822,8 +2825,6 @@
printk(KERN_ERR PFX "io ports %#lx-%#lx in use\n", s->io,
s->io+ES1371_EXTENT-1);
goto err_region;
}
- if (pci_enable_device(pcidev))
- goto err_irq;
if (request_irq(s->irq, es1371_interrupt, SA_SHIRQ, "es1371", s)) {
printk(KERN_ERR PFX "irq %u in use\n", s->irq);
goto err_irq;
Index: esssolo1.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/esssolo1.c,v
retrieving revision 1.7
diff -u -r1.7 esssolo1.c
--- esssolo1.c 2001/04/17 17:26:05 1.7
+++ esssolo1.c 2001/04/18 16:24:35
@@ -2297,6 +2297,8 @@
struct solo1_state *s;
struct pm_dev *pmdev;
+ if (pci_enable_device(pcidev))
+ return -1;
if (!RSRCISIOREGION(pcidev, 0) ||
!RSRCISIOREGION(pcidev, 1) ||
!RSRCISIOREGION(pcidev, 2) ||
@@ -2362,8 +2364,6 @@
printk(KERN_ERR "solo1: irq %u in use\n", s->irq);
goto err_irq;
}
- if (pci_enable_device(pcidev))
- goto err_irq;
printk(KERN_INFO "solo1: joystick port at %#x\n", s->gameport.io+1);
/* register devices */
if ((s->dev_audio = register_sound_dsp(_audio_fops, -1)) < 0)
Index: maestro.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/maestro.c,v
retrieving revision 1.4
diff -u -r1.4 maestro.c
--- maestro.c 2001/04/17 15:49:10 1.4
+++ maestro.c 2001/04/18 16:25:21
@@ -3321,6 +3321,9 @@
/* don't pick up weird modem maestros */
if(((pcidev->class >> 8) & 0x) != PCI_CLASS_MULTIMEDIA_AUDIO)
return 0;
+
+ if (pci_enable_device(pcidev))
+ return 0;
iobase = SILLY_PCI_BASE_ADDRESS(pcidev);
@@ -3406,19 +3409,6 @@
}
ess = >channels[0];
-
- if (pci_enable_device(pcidev)) {
- printk (KERN_ERR "maestro: pci_enable_device() failed\n");
- for (i = 0; i < NR_DSPS; i++) {
- struct ess_state *s = >channels[i];
- if (s->dev_audio != -1)
- unregister_sound_dsp(s->dev_audio);
- }
- release_region(card->iobase, 256);
- unregister_reboot_notifier(_nb);
- kfree(card);
- return 0;
- }
/*
* Ok card ready. Begin setup proper
Index: sonicvibes.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/sonicvibes.c,v
retrieving revision 1.7
diff -u -r1.7 sonicvibes.c
--- sonicvibes.c2001/04/17 17:26:05 1.7
+++ sonicvibes.c2001/04/18 16:26:01
@@ -2508,6 +2508,8 @@
char *ddmaname;
unsigned ddmanamelen;
+ if (pci_enable_device(pcidev))
+ return -1;
if (!RSRCISIOREGION(pcidev, RESOURCE_SB) ||
!RSRCISIOREGION(pcidev, RESOURCE_ENH) ||
!RSRCISIOREGION(pcidev, RESOURCE_SYNTH) ||
@@ -2594,8 +2596,6 @@
printk(KERN_ERR "sv: gameport io ports in use\n");
s->gameport.io
[PATCH] misplaced pci_enable_device()s in drivers/sound/
Hi,
Several pci_enable_device()s in drivers/sound happen _after_ accessing
PCI resources. I have moved them before the relevant first accesses.
(Untested, but should work.)
Against 2.4.3-ac9.
Ciao, Marcus
Index: es1370.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/es1370.c,v
retrieving revision 1.13
diff -u -r1.13 es1370.c
--- es1370.c2001/04/17 17:26:05 1.13
+++ es1370.c2001/04/18 16:24:05
@@ -2569,6 +2569,9 @@
mm_segment_t fs;
int i, val;
+ if (pci_enable_device(pcidev))
+ return -1;
+
if (!RSRCISIOREGION(pcidev, 0))
return -1;
if (pcidev-irq == 0)
@@ -2599,8 +2602,6 @@
printk(KERN_ERR "es1370: io ports %#lx-%#lx in use\n", s-io,
s-io+ES1370_EXTENT-1);
goto err_region;
}
- if (pci_enable_device(pcidev))
- goto err_irq;
if (request_irq(s-irq, es1370_interrupt, SA_SHIRQ, "es1370", s)) {
printk(KERN_ERR "es1370: irq %u in use\n", s-irq);
goto err_irq;
Index: es1371.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/es1371.c,v
retrieving revision 1.7
diff -u -r1.7 es1371.c
--- es1371.c2001/04/17 17:26:05 1.7
+++ es1371.c2001/04/18 16:24:20
@@ -2783,6 +2783,9 @@
signed long tmo2;
unsigned int cssr;
+ if (pci_enable_device(pcidev))
+ return -1;
+
if (!RSRCISIOREGION(pcidev, 0))
return -1;
if (pcidev-irq == 0)
@@ -2822,8 +2825,6 @@
printk(KERN_ERR PFX "io ports %#lx-%#lx in use\n", s-io,
s-io+ES1371_EXTENT-1);
goto err_region;
}
- if (pci_enable_device(pcidev))
- goto err_irq;
if (request_irq(s-irq, es1371_interrupt, SA_SHIRQ, "es1371", s)) {
printk(KERN_ERR PFX "irq %u in use\n", s-irq);
goto err_irq;
Index: esssolo1.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/esssolo1.c,v
retrieving revision 1.7
diff -u -r1.7 esssolo1.c
--- esssolo1.c 2001/04/17 17:26:05 1.7
+++ esssolo1.c 2001/04/18 16:24:35
@@ -2297,6 +2297,8 @@
struct solo1_state *s;
struct pm_dev *pmdev;
+ if (pci_enable_device(pcidev))
+ return -1;
if (!RSRCISIOREGION(pcidev, 0) ||
!RSRCISIOREGION(pcidev, 1) ||
!RSRCISIOREGION(pcidev, 2) ||
@@ -2362,8 +2364,6 @@
printk(KERN_ERR "solo1: irq %u in use\n", s-irq);
goto err_irq;
}
- if (pci_enable_device(pcidev))
- goto err_irq;
printk(KERN_INFO "solo1: joystick port at %#x\n", s-gameport.io+1);
/* register devices */
if ((s-dev_audio = register_sound_dsp(solo1_audio_fops, -1)) 0)
Index: maestro.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/maestro.c,v
retrieving revision 1.4
diff -u -r1.4 maestro.c
--- maestro.c 2001/04/17 15:49:10 1.4
+++ maestro.c 2001/04/18 16:25:21
@@ -3321,6 +3321,9 @@
/* don't pick up weird modem maestros */
if(((pcidev-class 8) 0x) != PCI_CLASS_MULTIMEDIA_AUDIO)
return 0;
+
+ if (pci_enable_device(pcidev))
+ return 0;
iobase = SILLY_PCI_BASE_ADDRESS(pcidev);
@@ -3406,19 +3409,6 @@
}
ess = card-channels[0];
-
- if (pci_enable_device(pcidev)) {
- printk (KERN_ERR "maestro: pci_enable_device() failed\n");
- for (i = 0; i NR_DSPS; i++) {
- struct ess_state *s = card-channels[i];
- if (s-dev_audio != -1)
- unregister_sound_dsp(s-dev_audio);
- }
- release_region(card-iobase, 256);
- unregister_reboot_notifier(maestro_nb);
- kfree(card);
- return 0;
- }
/*
* Ok card ready. Begin setup proper
Index: sonicvibes.c
===
RCS file: /build/mm/work/repository/linux-mm/drivers/sound/sonicvibes.c,v
retrieving revision 1.7
diff -u -r1.7 sonicvibes.c
--- sonicvibes.c2001/04/17 17:26:05 1.7
+++ sonicvibes.c2001/04/18 16:26:01
@@ -2508,6 +2508,8 @@
char *ddmaname;
unsigned ddmanamelen;
+ if (pci_enable_device(pcidev))
+ return -1;
if (!RSRCISIOREGION(pcidev, RESOURCE_SB) ||
!RSRCISIOREGION(pcidev, RESOURCE_ENH) ||
!RSRCISIOREGION(pcidev, RESOURCE_SYNTH) ||
@@ -2594,8 +2596,6 @@
printk(KERN_ERR "sv: gameport io ports in use\n");
s-gameport.io =
Re: [PATCH] misplaced pci_enable_device()s in drivers/sound/
Marcus Meissner wrote: Several pci_enable_device()s in drivers/sound happen _after_ accessing PCI resources. I have moved them before the relevant first accesses. cool if (!RSRCISIOREGION(pcidev, 0)) return -1; can you replace this mess while you are cleaning stuff up. this, for example, should be if (!(pci_resource_flags(pcidev,) IORESOURCE_IO)) There is also pci_resource_start and pci_resource_len. iobase = SILLY_PCI_BASE_ADDRESS(pcidev); pci_resource_start patch looks ok to me, but those would be nice additions... -- Jeff Garzik | "The universe is like a safe to which there is a Building 1024 | combination -- but the combination is locked up MandrakeSoft | in the safe."-- Peter DeVries - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] misplaced pci_enable_device()s in drivers/sound/
On Wed, Apr 18, 2001 at 12:55:50PM -0400, Jeff Garzik wrote: Marcus Meissner wrote: Several pci_enable_device()s in drivers/sound happen _after_ accessing PCI resources. I have moved them before the relevant first accesses. cool if (!RSRCISIOREGION(pcidev, 0)) return -1; can you replace this mess while you are cleaning stuff up. this, for example, should be if (!(pci_resource_flags(pcidev,) IORESOURCE_IO)) There is also pci_resource_start and pci_resource_len. iobase = SILLY_PCI_BASE_ADDRESS(pcidev); pci_resource_start THere is also some pci dma stuff which probably got changed. patch looks ok to me, but those would be nice additions... I am a bit afraid to break stuff doing this without testing, but I will do it for the cards I have access to. Is there a 'HOW TO DO IT' PCI driver? drivers/net/pci-skeleton.c looks up to date, is it? Ciao, Marcus - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
