[PATCH 5/5] lpfc : Make Emulex lpfc driver legacy I/O port free

[PATCH 5/5] lpfc : Make Emulex lpfc driver legacy I/O port free

[Hidetoshi Seto]

This patch makes Emulex lpfc driver legacy I/O port free.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>

---
 drivers/scsi/lpfc/lpfc_init.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6.19-rc6/drivers/scsi/lpfc/lpfc_init.c
===================================================================
--- linux-2.6.19-rc6.orig/drivers/scsi/lpfc/lpfc_init.c
+++ linux-2.6.19-rc6/drivers/scsi/lpfc/lpfc_init.c
@@ -1453,10 +1453,11 @@
 	int error = -ENODEV, retval;
 	int i;
 	uint16_t iotag;
+	int bars = pci_select_bars(pdev, IORESOURCE_MEM);

-	if (pci_enable_device(pdev))
+	if (pci_enable_device_bars(pdev, bars))
 		goto out;
-	if (pci_request_regions(pdev, LPFC_DRIVER_NAME))
+	if (pci_request_selected_regions(pdev, bars, LPFC_DRIVER_NAME))
 		goto out_disable_device;

 	host = scsi_host_alloc(&lpfc_template, sizeof (struct lpfc_hba));
@@ -1759,7 +1760,7 @@
 	phba->host = NULL;
 	scsi_host_put(host);
 out_release_regions:
-	pci_release_regions(pdev);
+	pci_release_selected_regions(pdev, bars);
 out_disable_device:
 	pci_disable_device(pdev);
 out:
@@ -1773,6 +1774,7 @@
 	struct Scsi_Host   *host = pci_get_drvdata(pdev);
 	struct lpfc_hba    *phba = (struct lpfc_hba *)host->hostdata;
 	unsigned long iflag;
+	int bars = pci_select_bars(pdev, IORESOURCE_MEM);

 	lpfc_free_sysfs_attr(phba);

@@ -1816,7 +1818,7 @@
 	iounmap(phba->ctrl_regs_memmap_p);
 	iounmap(phba->slim_memmap_p);

-	pci_release_regions(phba->pcidev);
+	pci_release_selected_regions(phba->pcidev, bars);
 	pci_disable_device(phba->pcidev);

 	idr_remove(&lpfc_hba_index, phba->brd_no);


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [PATCH 5/5] lpfc : Make Emulex lpfc driver legacy I/O port free

[James Smart]

ACK  :)

(I thought this had already gone in a while ago)

-- james s

Hidetoshi Seto wrote:
> This patch makes Emulex lpfc driver legacy I/O port free.
> 
> Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
> 
> ---
>  drivers/scsi/lpfc/lpfc_init.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> Index: linux-2.6.19-rc6/drivers/scsi/lpfc/lpfc_init.c
> ===================================================================
> --- linux-2.6.19-rc6.orig/drivers/scsi/lpfc/lpfc_init.c
> +++ linux-2.6.19-rc6/drivers/scsi/lpfc/lpfc_init.c
> @@ -1453,10 +1453,11 @@
>  	int error = -ENODEV, retval;
>  	int i;
>  	uint16_t iotag;
> +	int bars = pci_select_bars(pdev, IORESOURCE_MEM);
> 
> -	if (pci_enable_device(pdev))
> +	if (pci_enable_device_bars(pdev, bars))
>  		goto out;
> -	if (pci_request_regions(pdev, LPFC_DRIVER_NAME))
> +	if (pci_request_selected_regions(pdev, bars, LPFC_DRIVER_NAME))
>  		goto out_disable_device;
> 
>  	host = scsi_host_alloc(&lpfc_template, sizeof (struct lpfc_hba));
> @@ -1759,7 +1760,7 @@
>  	phba->host = NULL;
>  	scsi_host_put(host);
>  out_release_regions:
> -	pci_release_regions(pdev);
> +	pci_release_selected_regions(pdev, bars);
>  out_disable_device:
>  	pci_disable_device(pdev);
>  out:
> @@ -1773,6 +1774,7 @@
>  	struct Scsi_Host   *host = pci_get_drvdata(pdev);
>  	struct lpfc_hba    *phba = (struct lpfc_hba *)host->hostdata;
>  	unsigned long iflag;
> +	int bars = pci_select_bars(pdev, IORESOURCE_MEM);
> 
>  	lpfc_free_sysfs_attr(phba);
> 
> @@ -1816,7 +1818,7 @@
>  	iounmap(phba->ctrl_regs_memmap_p);
>  	iounmap(phba->slim_memmap_p);
> 
> -	pci_release_regions(phba->pcidev);
> +	pci_release_selected_regions(phba->pcidev, bars);
>  	pci_disable_device(phba->pcidev);
> 
>  	idr_remove(&lpfc_hba_index, phba->brd_no);
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [PATCH 5/5] lpfc : Make Emulex lpfc driver legacy I/O port free

[James Bottomley]

On Wed, 2006-11-22 at 10:44 -0500, James Smart wrote:
> ACK  :)
> 
> (I thought this had already gone in a while ago)

Actually, there seems to be missing infrastructure for this:

  CC [M]  drivers/scsi/lpfc/lpfc_init.o
drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_pci_probe_one':
drivers/scsi/lpfc/lpfc_init.c:1418: warning: implicit declaration of function 'pci_select_bars'
drivers/scsi/lpfc/lpfc_init.c:1422: warning: implicit declaration of function 'pci_request_selected_regions'
drivers/scsi/lpfc/lpfc_init.c:1734: warning: implicit declaration of function 'pci_release_selected_regions'

Is there any ETA on the rest of the infrastructure?

James

Re: [PATCH 5/5] lpfc : Make Emulex lpfc driver legacy I/O port free

[Andrew Morton]

On Wed, 03 Jan 2007 16:06:48 -0600
James Bottomley <James.Bottomley@SteelEye.com> wrote:

> On Wed, 2006-11-22 at 10:44 -0500, James Smart wrote:
> > ACK  :)
> > 
> > (I thought this had already gone in a while ago)
> 
> Actually, there seems to be missing infrastructure for this:
> 
>   CC [M]  drivers/scsi/lpfc/lpfc_init.o
> drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_pci_probe_one':
> drivers/scsi/lpfc/lpfc_init.c:1418: warning: implicit declaration of function 'pci_select_bars'
> drivers/scsi/lpfc/lpfc_init.c:1422: warning: implicit declaration of function 'pci_request_selected_regions'
> drivers/scsi/lpfc/lpfc_init.c:1734: warning: implicit declaration of function 'pci_release_selected_regions'

That's here, in Greg's PCI tree:

http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/pci-add-selected_regions-funcs.patch

> Is there any ETA on the rest of the infrastructure?
> 

It doesn't look like a bugfix :(

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [PATCH 5/5] lpfc : Make Emulex lpfc driver legacy I/O port free

[James Bottomley]

On Wed, 2007-01-03 at 14:23 -0800, Andrew Morton wrote:
> > drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_pci_probe_one':
> > drivers/scsi/lpfc/lpfc_init.c:1418: warning: implicit declaration of function 'pci_select_bars'
> > drivers/scsi/lpfc/lpfc_init.c:1422: warning: implicit declaration of function 'pci_request_selected_regions'
> > drivers/scsi/lpfc/lpfc_init.c:1734: warning: implicit declaration of function 'pci_release_selected_regions'
> 
> That's here, in Greg's PCI tree:

Ah, OK, thanks!

> http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/pci-add-selected_regions-funcs.patch
> 
> > Is there any ETA on the rest of the infrastructure?
> > 
> 
> It doesn't look like a bugfix :(

OK, I'll defer this then ... someone remind me when 2.6.20 rolls around.

James