UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] pm80xx: Read saved WWN from NVMD for ATTO pm8001 based HBAs. 

Signed-off-by: Bradley Grove <bgrove@attotech.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Bradley Grove 2013-12-19 10:50:56 -05:00 committed by James Bottomley
parent b9c2446695
commit f49d2132ab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/pm8001/pm8001_init.c
View File

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