[PATCH] Char: isicom, enable/disable pci device

[PATCH] Char: isicom, enable/disable pci device

[Jiri Slaby]

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

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 drivers/char/isicom.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 4f3cefa..a1a67e3 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -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)
-- 
1.5.6.1

Re: [PATCH] Char: isicom, enable/disable pci device

[Andrew Morton]

On Thu, 10 Jul 2008 16:20:12 +0200 Jiri Slaby <jirislaby@gmail.com> wrote:

> Don't forget to enable and disable PCI devices. The device
> might be unusable without that.
> 
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> ---
>  drivers/char/isicom.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
> index 4f3cefa..a1a67e3 100644
> --- a/drivers/char/isicom.c
> +++ b/drivers/char/isicom.c
> @@ -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)

hm.  Is this a recently-added problem?

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

Re: [PATCH] Char: isicom, enable/disable pci device

[Jiri Slaby]

On 07/11/2008 01:35 AM, Andrew Morton wrote:
> On Thu, 10 Jul 2008 16:20:12 +0200 Jiri Slaby <jirislaby@gmail.com> wrote:
>> --- a/drivers/char/isicom.c
>> +++ b/drivers/char/isicom.c
>> @@ -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;
>> +	}
>> +
[...]
> hm.  Is this a recently-added problem?

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

> 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?