Skip to contentSkip to conversation

Char: isicom, enable/disable pci device

PATCH In review Jiri Slaby 2 participants 3 messages Jul 10, 2008 – Jul 11, 2008 Char and misc drivers

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 Char: isicom, enable/disable pci device

Don't forget to enable and disable PCI devices. The device might be unusable without that.

---
 drivers/char/isicom.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/char/isicom.c +8 -0
index 4f3cefa..a1a67e3 100644
@@ -1736,6 +1736,12 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
 	if (card_count >= BOARD_COUNT)
 		goto err;
 
+	retval = pci_enable_device(pdev);
+	if (retval) {
+		dev_err(&pdev->dev, "failed to enable\n");
+		goto err;
+	}
+
 	dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);
 
 	/* allot the first empty slot in the array */
@@ -1790,6 +1796,7 @@ errunrr:
 errdec:
 	board->base = 0;
 	card_count--;
+	pci_disable_device(pdev);
 err:
 	return retval;
 }
@@ -1806,6 +1813,7 @@ static void __devexit isicom_remove(struct pci_dev *pdev)
 	pci_release_region(pdev, 3);
 	board->base = 0;
 	card_count--;
+	pci_disable_device(pdev);
 }
 
 static int __init isicom_init(void)
Signature · 1 line
1.5.6.1
#1 lore raw
Quoted 34 lines · On Thu, 10 Jul 2008 16:20:12 +0200 Jiri Slaby <[email protected]> wrote:

Don't forget to enable and disable PCI devices. The device might be unusable without that.

---
 drivers/char/isicom.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/char/isicom.c +7 -0
index 4f3cefa..a1a67e3 100644
@@ -1736,6 +1736,12 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
 	if (card_count >= BOARD_COUNT)
 		goto err;
 
+	retval = pci_enable_device(pdev);
+	if (retval) {
+		dev_err(&pdev->dev, "failed to enable\n");
+		goto err;
+	}
+
 	dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);
 
 	/* allot the first empty slot in the array */
@@ -1790,6 +1796,7 @@ errunrr:
 errdec:
 	board->base = 0;
 	card_count--;
+	pci_disable_device(pdev);
 err:
 	return retval;
 }

drivers/char/isicom.c static void __devexit isicom_remove(struct pci_dev *pdev) · line 1819

Quoted 7 lines
drivers/char/isicom.c +1 -0
@@ -1806,6 +1813,7 @@ static void __devexit isicom_remove(struct pci_dev *pdev)
 	pci_release_region(pdev, 3);
 	board->base = 0;
 	card_count--;
+	pci_disable_device(pdev);
 }
 
 static int __init isicom_init(void)

hm. Is this a recently-added problem?

I wonder what the chance is that this will fix something. Or break something.

author
#2 lore raw
Quoted 13 lines · Andrew Morton
Quoted 12 lines · On Thu, 10 Jul 2008 16:20:12 +0200 Jiri Slaby <[email protected]> wrote:
drivers/char/isicom.c +6 -0
@@ -1736,6 +1736,12 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
 	if (card_count >= BOARD_COUNT)
 		goto err;
 
+	retval = pci_enable_device(pdev);
+	if (retval) {
+		dev_err(&pdev->dev, "failed to enable\n");
+		goto err;
+	}
+

[...]

Quoted 1 line

hm. Is this a recently-added problem?

It disappeared in 2.6.16 (9ac0948): char/isicom: Pci probing added (by me).

Quoted 2 lines

I wonder what the chance is that this will fix something. Or break something.

This is what pci documentation says:
<cite>
3.1 Enable the PCI device
~~~~~~~~~~~~~~~~~~~~~~~~~
Before touching any device registers, the driver needs to enable the PCI device by calling pci_enable_device(). This will:
o wake up the device if it was in suspended state,
o allocate I/O and memory regions of the device (if BIOS did not),
o allocate an IRQ (if BIOS did not).
</cite>
Maybe Jesse can tell us more on what effect might have device enable omitting?