public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
To: linux-scsi@vger.kernel.org
Cc: andriusb@redhat.com, James.Bottomley@HansenPartnership.com,
	dab@hp.com, thenzl@redhat.com, mikem@beardog.cce.hp.com
Subject: [PATCH 2/9] hpsa: Make "hpsa_allow_any=1" boot param enable Compaq Smart Arrays.
Date: Wed, 16 Jun 2010 13:51:20 -0500	[thread overview]
Message-ID: <20100616185120.22798.84581.stgit@beardog.cce.hp.com> (raw)
In-Reply-To: <20100616184510.22798.26206.stgit@beardog.cce.hp.com>

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

hpsa: Make "hpsa_allow_any=1" boot param enable Compaq Smart Arrays.
We were previously only accepting HP boards.

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 00b5397..661a320 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -95,6 +95,8 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x333F},
 	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,             PCI_ANY_ID, PCI_ANY_ID,
 		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
+	{PCI_VENDOR_ID_COMPAQ,     PCI_ANY_ID,             PCI_ANY_ID, PCI_ANY_ID,
+		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
 	{0,}
 };
 
@@ -3293,7 +3295,9 @@ static int __devinit hpsa_lookup_board_id(struct pci_dev *pdev, u32 *board_id)
 		if (*board_id == products[i].board_id)
 			return i;
 
-	if (subsystem_vendor_id != PCI_VENDOR_ID_HP || !hpsa_allow_any) {
+	if ((subsystem_vendor_id != PCI_VENDOR_ID_HP &&
+		subsystem_vendor_id != PCI_VENDOR_ID_COMPAQ) ||
+		!hpsa_allow_any) {
 		dev_warn(&pdev->dev, "unrecognized board ID: "
 			"0x%08x, ignoring.\n", *board_id);
 			return -ENODEV;


  parent reply	other threads:[~2010-06-16 18:46 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-16 18:51 [PATCH 0/9] hpsa driver updates June 16, 2010 Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 1/9] hpsa: add new controllers Stephen M. Cameron
2010-06-16 18:51 ` Stephen M. Cameron [this message]
2010-06-16 18:51 ` [PATCH 3/9] hpsa: make hpsa_find_memory_BAR not require the per HBA structure Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 4/9] hpsa: factor out hpsa_find_cfg_addrs Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 5/9] hpsa: factor out the code to reset controllers on driver load Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 6/9] hpsa: Fix hard reset code Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 7/9] hpsa: forbid hard reset of 640x boards Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 8/9] hpsa: separate intx and msi/msix interrupt handlers Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 9/9] hpsa: sanitize max commands 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=20100616185120.22798.84581.stgit@beardog.cce.hp.com \
    --to=scameron@beardog.cce.hp.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=andriusb@redhat.com \
    --cc=dab@hp.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mikem@beardog.cce.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