pm80xx: Device id changes to support series 8 controllers.
Subsystems (2)
PATCH v2 1/10 pm80xx: Device id changes to support series 8 controllers.
Quoted 1 line
From
d44a46f8ff571b5c9de9ee07df61c0a4719a289aMon Sep 17 00:00:00 2001
From: Anand Kumar Santhanam <[email protected]>
Date: Tue, 3 Sep 2013 15:09:42 +0530
Subject: [PATCH V2 01/10] pm80xx: Device id changes to support series 8 controllers.
Updated pci id table with device, vendor, subdevice and subvendor ids for 8074, 8076, 8077 SAS/SATA 12G controllers. Added 12G related macros.
--- drivers/scsi/pm8001/pm8001_defs.h | 5 ++++- drivers/scsi/pm8001/pm8001_init.c | 32 +++++++++++++++++++++++++++++++- drivers/scsi/pm8001/pm8001_sas.h | 3 +++ drivers/scsi/pm8001/pm80xx_hwi.c | 14 +++++++++++--- drivers/scsi/pm8001/pm80xx_hwi.h | 9 +++++---- 5 files changed, 54 insertions(+), 9 deletions(-)
drivers/scsi/pm8001/pm8001_defs.h +4 -1
@@ -46,7 +46,10 @@ enum chip_flavors { chip_8008, chip_8009, chip_8018, - chip_8019 + chip_8019, + chip_8074, + chip_8076, + chip_8077 }; enum phy_speed {
drivers/scsi/pm8001/pm8001_init.c +31 -1
@@ -54,6 +54,9 @@ static const struct pm8001_chip_info pm8001_chips[] = { [chip_8009] = {1, 8, &pm8001_80xx_dispatch,}, [chip_8018] = {0, 16, &pm8001_80xx_dispatch,}, [chip_8019] = {1, 16, &pm8001_80xx_dispatch,}, + [chip_8074] = {0, 8, &pm8001_80xx_dispatch,}, + [chip_8076] = {0, 16, &pm8001_80xx_dispatch,}, + [chip_8077] = {0, 16, &pm8001_80xx_dispatch,}, };static int pm8001_id;
@@ -1037,6 +1040,12 @@ static struct pci_device_id pm8001_pci_table[] = { { PCI_VDEVICE(ADAPTEC2, 0x8009), chip_8009 }, { PCI_VDEVICE(PMC_Sierra, 0x8019), chip_8019 }, { PCI_VDEVICE(ADAPTEC2, 0x8019), chip_8019 }, + { PCI_VDEVICE(PMC_Sierra, 0x8074), chip_8074 }, + { PCI_VDEVICE(ADAPTEC2, 0x8074), chip_8074 }, + { PCI_VDEVICE(PMC_Sierra, 0x8076), chip_8076 }, + { PCI_VDEVICE(ADAPTEC2, 0x8076), chip_8076 }, + { PCI_VDEVICE(PMC_Sierra, 0x8077), chip_8077 }, + { PCI_VDEVICE(ADAPTEC2, 0x8077), chip_8077 }, { PCI_VENDOR_ID_ADAPTEC2, 0x8081, PCI_VENDOR_ID_ADAPTEC2, 0x0400, 0, 0, chip_8001 }, { PCI_VENDOR_ID_ADAPTEC2, 0x8081,
@@ -1057,6 +1066,24 @@ static struct pci_device_id pm8001_pci_table[] = { PCI_VENDOR_ID_ADAPTEC2, 0x0016, 0, 0, chip_8019 }, {PCI_VENDOR_ID_ADAPTEC2 ,0x8089 , PCI_VENDOR_ID_ADAPTEC2, 0x1600, 0, 0, chip_8019 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8074, + PCI_VENDOR_ID_ADAPTEC2, 0x0800, 0, 0, chip_8074 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8076, + PCI_VENDOR_ID_ADAPTEC2, 0x1600, 0, 0, chip_8076 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8077, + PCI_VENDOR_ID_ADAPTEC2, 0x1600, 0, 0, chip_8077 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8074, + PCI_VENDOR_ID_ADAPTEC2, 0x0008, 0, 0, chip_8074 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8076, + PCI_VENDOR_ID_ADAPTEC2, 0x0016, 0, 0, chip_8076 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8077, + PCI_VENDOR_ID_ADAPTEC2, 0x0016, 0, 0, chip_8077 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8076, + PCI_VENDOR_ID_ADAPTEC2, 0x0808, 0, 0, chip_8076 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8077, + PCI_VENDOR_ID_ADAPTEC2, 0x0808, 0, 0, chip_8077 }, + { PCI_VENDOR_ID_ADAPTEC2, 0x8074, + PCI_VENDOR_ID_ADAPTEC2, 0x0404, 0, 0, chip_8074 }, {} /* terminate list */ };
@@ -1108,8 +1135,11 @@ module_init(pm8001_init);module_exit (pm8001_exit);MODULE_AUTHOR ("Jack Wang <[email protected]>" ); +MODULE_AUTHOR ("Anand Kumar Santhanam <[email protected]>" ); +MODULE_AUTHOR ("Sangeetha Gnanasekaran <[email protected]>" );MODULE_DESCRIPTION ( -"PMC-Sierra PM8001/8081/8088/8089 SAS/SATA controller driver" ); +"PMC-Sierra PM8001/8081/8088/8089/8074/8076/8077 " +"SAS/SATA controller driver" );MODULE_VERSION (DRV_VERSION );MODULE_LICENSE ("GPL" );MODULE_DEVICE_TABLE (pci, pm8001_pci_table);
drivers/scsi/pm8001/pm8001_sas.h +3 -0
@@ -104,6 +104,9 @@ do { \#define DEV_IS_EXPANDER (type) ((type == SAS_EDGE_EXPANDER_DEVICE) || (type == SAS_FANOUT_EXPANDER_DEVICE)) +#define IS_SPCV_12G (dev) ((dev->device == 0X8074) \ + || (dev->device == 0X8076) \ + || (dev->device == 0X8077))#define PM8001_NAME_LENGTH 32/* generic length of strings */ extern struct list_head hba_list;
drivers/scsi/pm8001/pm80xx_hwi.c +11 -3
@@ -430,7 +430,11 @@ static int mpi_init_check(struct pm8001_hba_info *pm8001_ha)table is updated */ pm8001_cw32 (pm8001_ha,0 ,MSGU_IBDB_SET , SPCv_MSGU_CFG_TABLE_UPDATE);/* wait until Inbound DoorBell Clear Register toggled */ - max_wait_count =2 *1000 *1000 ;/* 2 sec for spcv/ve */ +if (IS_SPCV_12G (pm8001_ha->pdev)) { + max_wait_count =4 *1000 *1000 ;/* 4 sec */ + }else { + max_wait_count =2 *1000 *1000 ;/* 2 sec */ + } do { udelay(1); value = pm8001_cr32(pm8001_ha, 0, MSGU_IBDB_SET);
@@ -913,7 +917,11 @@ static int mpi_uninit_check(struct pm8001_hba_info *pm8001_ha)pm8001_cw32 (pm8001_ha,0 ,MSGU_IBDB_SET , SPCv_MSGU_CFG_TABLE_RESET);/* wait until Inbound DoorBell Clear Register toggled */ - max_wait_count =2 *1000 *1000 ;/* 2 sec for spcv/ve */ +if (IS_SPCV_12G (pm8001_ha->pdev)) { + max_wait_count =4 *1000 *1000 ;/* 4 sec */ + }else { + max_wait_count =2 *1000 *1000 ;/* 2 sec */ + } do { udelay(1); value = pm8001_cr32(pm8001_ha, 0, MSGU_IBDB_SET);
@@ -3943,7 +3951,7 @@ pm80xx_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id)*/ payload.ase_sh_lm_slr_phyid =cpu_to_le32 (SPINHOLD_DISABLE |LINKMODE_AUTO |LINKRATE_15 | -LINKRATE_30 |LINKRATE_60 | phy_id); +LINKRATE_30 |LINKRATE_60 |LINKRATE_120 | phy_id);/* SSC Disable and SAS Analog ST configuration */ /** payload.ase_sh_lm_slr_phyid =
drivers/scsi/pm8001/pm80xx_hwi.h +5 -4
@@ -168,6 +168,7 @@#define LINKRATE_15 (0x01 << 8)#define LINKRATE_30 (0x02 << 8)#define LINKRATE_60 (0x06 << 8) +#define LINKRATE_120 (0x08 << 8)/* Thermal related */ #define THERMAL_ENABLE 0x1
@@ -1223,10 +1224,10 @@ typedef struct SASProtocolTimerConfig SASProtocolTimerConfig_t;/* MSGU CONFIGURATION TABLE*/ -#define SPCv_MSGU_CFG_TABLE_UPDATE 0x01 -#define SPCv_MSGU_CFG_TABLE_RESET 0x02 -#define SPCv_MSGU_CFG_TABLE_FREEZE 0x04 -#define SPCv_MSGU_CFG_TABLE_UNFREEZE 0x08 +#define SPCv_MSGU_CFG_TABLE_UPDATE 0x001 +#define SPCv_MSGU_CFG_TABLE_RESET 0x002 +#define SPCv_MSGU_CFG_TABLE_FREEZE 0x004 +#define SPCv_MSGU_CFG_TABLE_UNFREEZE 0x008#define MSGU_IBDB_SET 0x00#define MSGU_HOST_INT_STATUS 0x08#define MSGU_HOST_INT_MASK 0x0C
Signature · 1 line
1.7.1
snip
drivers/scsi/pm8001/pm80xx_hwi.c pm80xx_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id) · line 3954
Quoted 5 lines
drivers/scsi/pm8001/pm80xx_hwi.c +1
-1*/ payload.ase_sh_lm_slr_phyid =cpu_to_le32 (SPINHOLD_DISABLE |LINKMODE_AUTO |LINKRATE_15 | -LINKRATE_30 |LINKRATE_60 | phy_id); +LINKRATE_30 |LINKRATE_60 |LINKRATE_120 | phy_id);
Is it safe to set 12g linkrate support also on 6g, if so, then :
Quoted 31 lines
drivers/scsi/pm8001/pm80xx_hwi.c +0
-0/* SSC Disable and SAS Analog ST configuration */ /** payload.ase_sh_lm_slr_phyid = drivers/scsi/pm8001/pm80xx_hwi.h +5
-4@@ -168,6 +168,7 @@#define LINKRATE_15 (0x01 << 8)#define LINKRATE_30 (0x02 << 8)#define LINKRATE_60 (0x06 << 8) +#define LINKRATE_120 (0x08 << 8)/* Thermal related */ #define THERMAL_ENABLE 0x1@@ -1223,10 +1224,10 @@ typedef struct SASProtocolTimerConfig SASProtocolTimerConfig_t;/* MSGU CONFIGURATION TABLE*/ -#define SPCv_MSGU_CFG_TABLE_UPDATE 0x01 -#define SPCv_MSGU_CFG_TABLE_RESET 0x02 -#define SPCv_MSGU_CFG_TABLE_FREEZE 0x04 -#define SPCv_MSGU_CFG_TABLE_UNFREEZE 0x08 +#define SPCv_MSGU_CFG_TABLE_UPDATE 0x001 +#define SPCv_MSGU_CFG_TABLE_RESET 0x002 +#define SPCv_MSGU_CFG_TABLE_FREEZE 0x004 +#define SPCv_MSGU_CFG_TABLE_UNFREEZE 0x008#define MSGU_IBDB_SET 0x00#define MSGU_HOST_INT_STATUS 0x08#define MSGU_HOST_INT_MASK 0x0C
Sangeetha Gnanasekaran
Reviewed-by Jack WangWe will modify and send updated patch.
-----Original Message-----
From: Jack Wang [mailto:[email protected]]
Sent: Thursday, September 26, 2013 12:10 PM
To: Anand Kumar Santhanam
Cc: [email protected]; Sangeetha Gnanasekaran; Nikith Ganigarakoppal; Viswas G
Subject: Re: [PATCH V2 01/10] pm80xx: Device id changes to support series 8 controllers.
snip
drivers/scsi/pm8001/pm80xx_hwi.c pm80xx_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id)
Quoted 5 lines
drivers/scsi/pm8001/pm80xx_hwi.c +1
-1*/ payload.ase_sh_lm_slr_phyid = cpu_to_le32(SPINHOLD_DISABLE | LINKMODE_AUTO | LINKRATE_15 | -LINKRATE_30 |LINKRATE_60 | phy_id); + LINKRATE_30 | LINKRATE_60 | LINKRATE_120 |
phy_id);
Is it safe to set 12g linkrate support also on 6g, if so, then :
Review
Quoted 4 lines
drivers/scsi/pm8001/pm80xx_hwi.c +0
-0/* SSC Disable and SAS Analog ST configuration */ /** payload.ase_sh_lm_slr_phyid = (quoted diff) +0
-0
b/drivers/scsi/pm8001/pm80xx_hwi.h
drivers/scsi/pm8001/pm80xx_hwi.h typedef struct SASProtocolTimerConfig
Quoted 12 lines
index 2b760ba..9a9116d 100644
drivers/scsi/pm8001/pm80xx_hwi.h +1
-0@@ -168,6 +168,7 @@#define LINKRATE_15 (0x01 << 8)#define LINKRATE_30 (0x02 << 8)#define LINKRATE_60 (0x06 << 8) +#define LINKRATE_120 (0x08 << 8)/* Thermal related */ #define THERMAL_ENABLE 0x1@@ -1223,10 +1224,10 @@ typedef struct SASProtocolTimerConfig
SASProtocolTimerConfig_t;
Quoted 15 lines
drivers/scsi/pm8001/pm80xx_hwi.h +4
-4/* MSGU CONFIGURATION TABLE*/ -#define SPCv_MSGU_CFG_TABLE_UPDATE 0x01 -#define SPCv_MSGU_CFG_TABLE_RESET 0x02 -#define SPCv_MSGU_CFG_TABLE_FREEZE 0x04 -#define SPCv_MSGU_CFG_TABLE_UNFREEZE 0x08 +#define SPCv_MSGU_CFG_TABLE_UPDATE 0x001 +#define SPCv_MSGU_CFG_TABLE_RESET 0x002 +#define SPCv_MSGU_CFG_TABLE_FREEZE 0x004 +#define SPCv_MSGU_CFG_TABLE_UNFREEZE 0x008#define MSGU_IBDB_SET 0x00#define MSGU_HOST_INT_STATUS 0x08#define MSGU_HOST_INT_MASK 0x0C