From: Benjamin Rood <benjaminjrood@gmail.com>
To: linux-scsi@vger.kernel.org, xjtuwjp@gmail.com,
James.Bottomley@HansenPartnership.com, hare@suse.de
Cc: Benjamin Rood <brood@attotech.com>
Subject: [PATCH v2 4/9] pm80xx: add support for ATTO devices during SAS address initiailization
Date: Mon, 2 Nov 2015 15:39:23 -0500 [thread overview]
Message-ID: <1446496763-1930-1-git-send-email-brood@attotech.com> (raw)
In-Reply-To: <CAD+HZHWhNFDq4z_MLaSNyY9jV-9Ub2ywtuT7wraRGo=FiNFRqA@mail.gmail.com>
ATTO SAS controllers retrieve the SAS address from the NVRAM in a location
different from non-ATTO PMC Sierra SAS controllers. This patch makes the
necessary adjustments in order to retrieve the SAS address on these types
of adapters.
Signed-off-by: Benjamin Rood <brood@attotech.com>
---
Changes from v1 -> v2:
-Fixed indentation issues noted by Hannes and Jack
drivers/scsi/pm8001/pm8001_init.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index feaf504..861416f 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -636,6 +636,11 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)
payload.minor_function = 0;
payload.length = 128;
}
+ } else if ((pm8001_ha->chip_id == chip_8070 ||
+ pm8001_ha->chip_id == chip_8072) &&
+ pm8001_ha->pdev->subsystem_vendor == PCI_VENDOR_ID_ATTO) {
+ payload.minor_function = 4;
+ payload.length = 4096;
} else {
payload.minor_function = 1;
payload.length = 4096;
@@ -662,6 +667,11 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)
else if (deviceid == 0x0042)
pm8001_ha->sas_addr[j] =
payload.func_specific[0x010 + i];
+ } else if ((pm8001_ha->chip_id == chip_8070 ||
+ pm8001_ha->chip_id == chip_8072) &&
+ pm8001_ha->pdev->subsystem_vendor == PCI_VENDOR_ID_ATTO) {
+ pm8001_ha->sas_addr[j] =
+ payload.func_specific[0x010 + i];
} else
pm8001_ha->sas_addr[j] =
payload.func_specific[0x804 + i];
--
2.4.3
next prev parent reply other threads:[~2015-11-02 20:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-30 14:53 [PATCH 0/8] pm80xx: Add ATTO 12Gb HBA support and fix various issues Benjamin Rood
2015-10-30 14:53 ` [PATCH 1/8] pm80xx: configure PHY settings based on subsystem vendor ID Benjamin Rood
2015-11-02 7:51 ` Hannes Reinecke
2015-11-02 8:00 ` Jack Wang
2015-10-30 14:53 ` [PATCH 2/8] pm80xx: add support for PMC Sierra 8070 and PMC Sierra 8072 SAS controllers Benjamin Rood
2015-11-02 7:51 ` Hannes Reinecke
2015-11-02 8:01 ` Jack Wang
2015-10-30 14:53 ` [PATCH 3/8] pm80xx: add ATTO PCI IDs to pm8001_pci_table Benjamin Rood
2015-11-02 7:52 ` Hannes Reinecke
2015-11-02 8:02 ` Jack Wang
2015-10-30 14:53 ` [PATCH 4/8] pm80xx: add support for ATTO devices during SAS address initiailization Benjamin Rood
2015-11-02 7:53 ` Hannes Reinecke
2015-11-02 8:06 ` Jack Wang
2015-11-02 20:39 ` Benjamin Rood [this message]
2015-10-30 14:53 ` [PATCH 5/8] pm80xx: set PHY profiles for ATTO 12Gb SAS controllers Benjamin Rood
2015-11-02 7:57 ` Hannes Reinecke
2015-11-02 8:08 ` Jack Wang
2015-10-30 14:53 ` [PATCH 6/8] pm80xx: do not examine registers for iButton feature if ATTO adapter Benjamin Rood
2015-11-02 7:58 ` Hannes Reinecke
2015-11-02 8:08 ` Jack Wang
2015-10-30 14:53 ` [PATCH 7/8] pm80xx: wait a minimum of 500ms before issuing commands to SPCv Benjamin Rood
2015-11-02 8:00 ` Hannes Reinecke
2015-11-02 8:12 ` Jack Wang
2015-11-02 20:42 ` [PATCH v2 7/9] " Benjamin Rood
2015-10-30 14:53 ` [PATCH 8/8] pm80xx: avoid a panic if MSI(X) interrupts are disabled Benjamin Rood
2015-11-02 8:01 ` Hannes Reinecke
2015-11-02 8:12 ` Jack Wang
2015-11-03 4:44 ` [PATCH 0/8] pm80xx: Add ATTO 12Gb HBA support and fix various issues Martin K. Petersen
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=1446496763-1930-1-git-send-email-brood@attotech.com \
--to=benjaminjrood@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=brood@attotech.com \
--cc=hare@suse.de \
--cc=linux-scsi@vger.kernel.org \
--cc=xjtuwjp@gmail.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