linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brian King <brking@linux.vnet.ibm.com>
To: Wayne Boyer <wayneb@linux.vnet.ibm.com>
Cc: linux-scsi@vger.kernel.org
Subject: Re: [PATCH 1/2] ipr: add MSI support
Date: Fri, 23 Jan 2009 12:39:19 -0600	[thread overview]
Message-ID: <497A0ED7.3000009@linux.vnet.ibm.com> (raw)
In-Reply-To: <4979FBAF.9050008@linux.vnet.ibm.com>

Acked by: Brian King <brking@linux.vnet.ibm.com>

Wayne Boyer wrote:
> Enable MSI if available/supported.
> 
> Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
> ---
>  drivers/scsi/ipr.c |    7 +++++++
>  drivers/scsi/ipr.h |    4 ++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6/drivers/scsi/ipr.c
> ===================================================================
> --- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-21 10:19:59.000000000 -0800
> +++ linux-2.6/drivers/scsi/ipr.c	2009-01-22 15:50:59.000000000 -0800
> @@ -7147,6 +7147,7 @@
> 
>  	ENTER;
>  	free_irq(pdev->irq, ioa_cfg);
> +	pci_disable_msi(pdev);
>  	iounmap(ioa_cfg->hdw_dma_regs);
>  	pci_release_regions(pdev);
>  	ipr_free_mem(ioa_cfg);
> @@ -7432,6 +7433,11 @@
>  		goto out;
>  	}
> 
> +	if (!(rc = pci_enable_msi(pdev)))
> +		dev_info(&pdev->dev, "MSI enabled\n");
> +	else if (ipr_debug)
> +		dev_info(&pdev->dev, "Cannot enable MSI\n");
> +
>  	dev_info(&pdev->dev, "Found IOA with IRQ: %d\n", pdev->irq);
> 
>  	host = scsi_host_alloc(&driver_template, sizeof(*ioa_cfg));
> @@ -7574,6 +7580,7 @@
>  out_scsi_host_put:
>  	scsi_host_put(host);
>  out_disable:
> +	pci_disable_msi(pdev);
>  	pci_disable_device(pdev);
>  	goto out;
>  }
> Index: linux-2.6/drivers/scsi/ipr.h
> ===================================================================
> --- linux-2.6.orig/drivers/scsi/ipr.h	2009-01-21 10:19:57.000000000 -0800
> +++ linux-2.6/drivers/scsi/ipr.h	2009-01-21 15:23:02.000000000 -0800
> @@ -37,8 +37,8 @@
>  /*
>   * Literals
>   */
> -#define IPR_DRIVER_VERSION "2.4.1"
> -#define IPR_DRIVER_DATE "(April 24, 2007)"
> +#define IPR_DRIVER_VERSION "2.4.2"
> +#define IPR_DRIVER_DATE "(January 21, 2009)"
> 
>  /*
>   * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
> 
> --
> 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


-- 
Brian King
Linux on Power Virtualization
IBM Linux Technology Center



  reply	other threads:[~2009-01-23 18:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20090123165823.748742817@linux.vnet.ibm.com>
2009-01-23 17:17 ` [PATCH 1/2] ipr: add MSI support Wayne Boyer
2009-01-23 18:39   ` Brian King [this message]
2009-01-23 17:17 ` [PATCH 2/2] ipr: add message to error table Wayne Boyer
2009-01-23 18:39   ` Brian King
2009-01-25 14:18   ` James Bottomley
2009-01-28 16:24     ` Wayne Boyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=497A0ED7.3000009@linux.vnet.ibm.com \
    --to=brking@linux.vnet.ibm.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=wayneb@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).