linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
To: axboe@kernel.dk, James.Bottomley@HansenPartnership.com
Cc: akpm@linux-foundation.org, thenzl@redhat.com, mike.miller@hp.com,
	linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 05/13] hpsa: do not reset unknown boards on reset_devices
Date: Fri, 08 Oct 2010 15:06:27 -0500	[thread overview]
Message-ID: <20101008200627.24279.64398.stgit@beardog.cce.hp.com> (raw)
In-Reply-To: <20101008200453.24279.6638.stgit@beardog.cce.hp.com>

From: Stephen M. Cameron <scameron@beardog.cce.hp.com>

This is to prevent hpsa from resetting older boards
which the cciss driver may be controlling.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
---
 drivers/scsi/hpsa.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index ba2becc..d618432 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3163,7 +3163,11 @@ static __devinit int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
 	 * likely not be happy.  Just forbid resetting this conjoined mess.
 	 * The 640x isn't really supported by hpsa anyway.
 	 */
-	hpsa_lookup_board_id(pdev, &board_id);
+	rc = hpsa_lookup_board_id(pdev, &board_id);
+	if (rc < 0) {
+		dev_warn(&pdev->dev, "Not resetting device.\n");
+		return -ENODEV;
+	}
 	if (board_id == 0x409C0E11 || board_id == 0x409D0E11)
 		return -ENOTSUPP;
 

  parent reply	other threads:[~2010-10-08 20:06 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-08 20:06 [PATCH 00/13] Patches for cciss and hpsa Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 01/13] cciss: remove controllers supported by hpsa Stephen M. Cameron
2010-10-25 20:09   ` James Bottomley
2010-10-25 20:26     ` Miller, Mike (OS Dev)
2010-10-25 22:04       ` scameron
2010-10-08 20:06 ` [PATCH 02/13] hpsa: fix board status waiting code Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 03/13] hpsa: Use kernel provided PCI state save and restore functions Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 04/13] hpsa: limit commands allocated on reset_devices Stephen M. Cameron
2010-10-08 20:06 ` Stephen M. Cameron [this message]
2010-10-08 20:06 ` [PATCH 06/13] cciss: fix board status waiting code Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 07/13] cciss: Use kernel provided PCI state save and restore functions Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 08/13] cciss: limit commands allocated on reset_devices Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 09/13] cciss: use usleep_range not msleep for small sleeps Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 10/13] hpsa: take the adapter lock in hpsa_wait_for_mode_change_ack Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 11/13] hpsa: allow driver to put controller in either simple or performant mode Stephen M. Cameron
2010-10-08 20:07 ` [PATCH 12/13] hpsa: use usleep_range not msleep for small sleeps Stephen M. Cameron
2010-10-08 20:07 ` [PATCH 13/13] hpsa: defend against zero sized buffers in passthru ioctls Stephen M. Cameron

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=20101008200627.24279.64398.stgit@beardog.cce.hp.com \
    --to=scameron@beardog.cce.hp.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=akpm@linux-foundation.org \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mike.miller@hp.com \
    --cc=thenzl@redhat.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).