[PATCH 0/2] pm80xx: Fix ATTO pm8001 based HBA support

[PATCH 0/2] pm80xx: Fix ATTO pm8001 based HBA support

[Bradley Grove]

Addresses issues that we uncovered during testing with our HBAs.
For the most part, we just enabled code that was already being used 
for other vendor's HBAs.

Bradley Grove (2):
  pm80xx: Read saved WWN from NVMD for ATTO pm8001 based HBAs.
  pm80xx: Enable BAR shift to avoid BIOS conflict with MPI space for    
    ATTO pm8001 based HBAs.

 drivers/scsi/pm8001/pm8001_hwi.c  |  6 +++---
 drivers/scsi/pm8001/pm8001_init.c | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

-- 
1.8.3.1

[PATCH 1/2] pm80xx: Read saved WWN from NVMD for ATTO pm8001 based HBAs.

[Bradley Grove]

Signed-off-by: Bradley Grove <bgrove@attotech.com>
---
 drivers/scsi/pm8001/pm8001_init.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 73a120d..cb89d15 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -625,7 +625,7 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)
 	pm8001_ha->nvmd_completion = &completion;
 
 	if (pm8001_ha->chip_id == chip_8001) {
-		if (deviceid == 0x8081) {
+		if (deviceid == 0x8081 || deviceid == 0x0042) {
 			payload.minor_function = 4;
 			payload.length = 4096;
 		} else {
@@ -646,6 +646,9 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)
 			if (deviceid == 0x8081)
 				pm8001_ha->sas_addr[j] =
 					payload.func_specific[0x704 + i];
+			else if (deviceid == 0x0042)
+				pm8001_ha->sas_addr[j] =
+					payload.func_specific[0x010 + i];
 		} else
 			pm8001_ha->sas_addr[j] =
 					payload.func_specific[0x804 + i];
@@ -1072,10 +1075,7 @@ err_out_enable:
  */
 static struct pci_device_id pm8001_pci_table[] = {
 	{ PCI_VDEVICE(PMC_Sierra, 0x8001), chip_8001 },
-	{
-		PCI_DEVICE(0x117c, 0x0042),
-		.driver_data = chip_8001
-	},
+	{ PCI_VDEVICE(ATTO, 0x0042), chip_8001 },
 	/* Support for SPC/SPCv/SPCve controllers */
 	{ PCI_VDEVICE(ADAPTEC2, 0x8001), chip_8001 },
 	{ PCI_VDEVICE(PMC_Sierra, 0x8008), chip_8008 },
-- 
1.8.3.1

[PATCH 2/2] pm80xx: Enable BAR shift to avoid BIOS conflict with MPI space for ATTO pm8001 based HBAs.

[Bradley Grove]

Signed-off-by: Bradley Grove <bgrove@attotech.com>
---
 drivers/scsi/pm8001/pm8001_hwi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 46ace52..561ca2c 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -644,7 +644,7 @@ static int pm8001_chip_init(struct pm8001_hba_info *pm8001_ha)
 	pci_read_config_word(pm8001_ha->pdev, PCI_DEVICE_ID, &deviceid);
 	/* 8081 controllers need BAR shift to access MPI space
 	* as this is shared with BIOS data */
-	if (deviceid == 0x8081) {
+	if (deviceid == 0x8081 || deviceid == 0x0042) {
 		if (-1 == pm8001_bar4_shift(pm8001_ha, GSM_SM_BASE)) {
 			PM8001_FAIL_DBG(pm8001_ha,
 				pm8001_printk("Shift Bar4 to 0x%x failed\n",
@@ -673,7 +673,7 @@ static int pm8001_chip_init(struct pm8001_hba_info *pm8001_ha)
 	for (i = 0; i < PM8001_MAX_OUTB_NUM; i++)
 		update_outbnd_queue_table(pm8001_ha, i);
 	/* 8081 controller donot require these operations */
-	if (deviceid != 0x8081) {
+	if (deviceid != 0x8081 && deviceid != 0x0042) {
 		mpi_set_phys_g3_with_ssc(pm8001_ha, 0);
 		/* 7->130ms, 34->500ms, 119->1.5s */
 		mpi_set_open_retry_interval_reg(pm8001_ha, 119);
@@ -701,7 +701,7 @@ static int mpi_uninit_check(struct pm8001_hba_info *pm8001_ha)
 	u32 gst_len_mpistate;
 	u16 deviceid;
 	pci_read_config_word(pm8001_ha->pdev, PCI_DEVICE_ID, &deviceid);
-	if (deviceid == 0x8081) {
+	if (deviceid == 0x8081 || deviceid == 0x0042) {
 		if (-1 == pm8001_bar4_shift(pm8001_ha, GSM_SM_BASE)) {
 			PM8001_FAIL_DBG(pm8001_ha,
 				pm8001_printk("Shift Bar4 to 0x%x failed\n",
-- 
1.8.3.1

Re: [PATCH 0/2] pm80xx: Fix ATTO pm8001 based HBA support

[Jack Wang]

On 12/19/2013 04:50 PM, Bradley Grove wrote:
> Addresses issues that we uncovered during testing with our HBAs.
> For the most part, we just enabled code that was already being used 
> for other vendor's HBAs.
> 
> Bradley Grove (2):
>   pm80xx: Read saved WWN from NVMD for ATTO pm8001 based HBAs.
>   pm80xx: Enable BAR shift to avoid BIOS conflict with MPI space for    
>     ATTO pm8001 based HBAs.
> 
>  drivers/scsi/pm8001/pm8001_hwi.c  |  6 +++---
>  drivers/scsi/pm8001/pm8001_init.c | 10 +++++-----
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
Looks fine, thanks
 Acked-by: Jack Wang <xjtuwjp@gmail.com>

Re: [PATCH 0/2] pm80xx: Fix ATTO pm8001 based HBA support

[Bradley Grove]

James,

There were a couple of patches that I expected to be added during the 
3.14-rc1 merge window that weren't.   Specifically:

http://marc.info/?l=linux-scsi&m=138753665607127&w=2
http://marc.info/?l=linux-scsi&m=138738970431549&w=2

Can you explain why they weren't included?

Brad

On 12/20/2013 05:50 AM, Jack Wang wrote:
> On 12/19/2013 04:50 PM, Bradley Grove wrote:
>> Addresses issues that we uncovered during testing with our HBAs.
>> For the most part, we just enabled code that was already being used
>> for other vendor's HBAs.
>>
>> Bradley Grove (2):
>>    pm80xx: Read saved WWN from NVMD for ATTO pm8001 based HBAs.
>>    pm80xx: Enable BAR shift to avoid BIOS conflict with MPI space for
>>      ATTO pm8001 based HBAs.
>>
>>   drivers/scsi/pm8001/pm8001_hwi.c  |  6 +++---
>>   drivers/scsi/pm8001/pm8001_init.c | 10 +++++-----
>>   2 files changed, 8 insertions(+), 8 deletions(-)
>>
> Looks fine, thanks
>   Acked-by: Jack Wang <xjtuwjp@gmail.com>
> --
> 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
>