summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/probe_roms.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-07-01 11:41:21 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:52 -0700
commitdc00c8b6940aa10ab1ce6a4d10b1bfe7b848781b (patch)
tree2f62620a348a5f6635413db4f5a0725c248a222b /drivers/scsi/isci/probe_roms.c
parent4e4dca3de9658f364d34924e072f2b64e5c3d267 (diff)
downloadlinux-dc00c8b6940aa10ab1ce6a4d10b1bfe7b848781b.tar.gz
linux-dc00c8b6940aa10ab1ce6a4d10b1bfe7b848781b.tar.bz2
linux-dc00c8b6940aa10ab1ce6a4d10b1bfe7b848781b.zip
isci: cleanup silicon revision detection
Perform checking per-pci device (even though all systems will only have 1 pci device in this generation), and delete support for silicon that does not report a proper revision (i.e. A0). Reported-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/probe_roms.c')
-rw-r--r--drivers/scsi/isci/probe_roms.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/isci/probe_roms.c b/drivers/scsi/isci/probe_roms.c
index c7732fb28889..4b9d813c63b1 100644
--- a/drivers/scsi/isci/probe_roms.c
+++ b/drivers/scsi/isci/probe_roms.c
@@ -146,13 +146,13 @@ struct isci_orom *isci_request_firmware(struct pci_dev *pdev, const struct firmw
memcpy(orom, fw->data, fw->size);
+ if (is_c0(pdev))
+ goto out;
+
/*
* deprecated: override default amp_control for pre-preproduction
* silicon revisions
*/
- if (isci_si_rev <= ISCI_SI_REVB0)
- goto out;
-
for (i = 0; i < ARRAY_SIZE(orom->ctrl); i++)
for (j = 0; j < ARRAY_SIZE(orom->ctrl[i].phys); j++) {
orom->ctrl[i].phys[j].afe_tx_amp_control0 = 0xe7c03;