csiostor:Remove T4 FCoE support
Subsystems (3)
v2 cover csiostor:Remove T4 FCoE support
We found a subtle issue with FCoE on T4 very late in the game and decided not to productize FCoE on T4 and therefore there are no customers that will be impacted by this change. FCoE is supported on T5 cards.
Please apply on net-next since depends on previous commits.
Changes in v2:
- Make the commit message more clearer.
Praveen Madhavan (2):
csiostor:Remove T4 FCoE Support.
csiostor:Removed file csio_hw_t4.c
drivers/scsi/csiostor/Makefile | 2 +- drivers/scsi/csiostor/csio_hw.c | 61 ++---- drivers/scsi/csiostor/csio_hw_chip.h | 43 ---- drivers/scsi/csiostor/csio_hw_t4.c | 404 ----------------------------------- drivers/scsi/csiostor/csio_init.c | 6 +- drivers/scsi/csiostor/csio_wr.c | 15 +- 6 files changed, 25 insertions(+), 506 deletions(-) delete mode 100644 drivers/scsi/csiostor/csio_hw_t4.c
Signature · 1 line
2.0.2
PATCH v2 1/2 csiostor:Remove T4 FCoE Support.
We found a subtle issue with FCoE on T4 very late in the game and decided not to productize FCoE on T4 and therefore there are no customers that will be impacted by this change. Hence T4 FCoE support is removed. FCoE supported only on T5 cards.
changes in v2:
- Make the commit message more clearer.
Signed-off-by Praveen Madhavan <[email protected]>
--- drivers/scsi/csiostor/csio_hw.c | 61 +++++++++--------------------------- drivers/scsi/csiostor/csio_hw_chip.h | 43 ------------------------- drivers/scsi/csiostor/csio_init.c | 6 ++-- drivers/scsi/csiostor/csio_wr.c | 15 +++++---- 4 files changed, 24 insertions(+), 101 deletions(-)
drivers/scsi/csiostor/csio_hw.c +15 -46
@@ -60,37 +60,10 @@ int csio_msi = 2;static int dev_num;/* FCoE Adapter types & its description */ -static const struct csio_adap_desc csio_t4_fcoe_adapters[] = { - {"T440-Dbg 10G" ,"Chelsio T440-Dbg 10G [FCoE]" }, - {"T420-CR 10G" ,"Chelsio T420-CR 10G [FCoE]" }, - {"T422-CR 10G/1G" ,"Chelsio T422-CR 10G/1G [FCoE]" }, - {"T440-CR 10G" ,"Chelsio T440-CR 10G [FCoE]" }, - {"T420-BCH 10G" ,"Chelsio T420-BCH 10G [FCoE]" }, - {"T440-BCH 10G" ,"Chelsio T440-BCH 10G [FCoE]" }, - {"T440-CH 10G" ,"Chelsio T440-CH 10G [FCoE]" }, - {"T420-SO 10G" ,"Chelsio T420-SO 10G [FCoE]" }, - {"T420-CX4 10G" ,"Chelsio T420-CX4 10G [FCoE]" }, - {"T420-BT 10G" ,"Chelsio T420-BT 10G [FCoE]" }, - {"T404-BT 1G" ,"Chelsio T404-BT 1G [FCoE]" }, - {"B420-SR 10G" ,"Chelsio B420-SR 10G [FCoE]" }, - {"B404-BT 1G" ,"Chelsio B404-BT 1G [FCoE]" }, - {"T480-CR 10G" ,"Chelsio T480-CR 10G [FCoE]" }, - {"T440-LP-CR 10G" ,"Chelsio T440-LP-CR 10G [FCoE]" }, - {"AMSTERDAM 10G" ,"Chelsio AMSTERDAM 10G [FCoE]" }, - {"HUAWEI T480 10G" ,"Chelsio HUAWEI T480 10G [FCoE]" }, - {"HUAWEI T440 10G" ,"Chelsio HUAWEI T440 10G [FCoE]" }, - {"HUAWEI STG 10G" ,"Chelsio HUAWEI STG 10G [FCoE]" }, - {"ACROMAG XAUI 10G" ,"Chelsio ACROMAG XAUI 10G [FCoE]" }, - {"ACROMAG SFP+ 10G" ,"Chelsio ACROMAG SFP+ 10G [FCoE]" }, - {"QUANTA SFP+ 10G" ,"Chelsio QUANTA SFP+ 10G [FCoE]" }, - {"HUAWEI 10Gbase-T" ,"Chelsio HUAWEI 10Gbase-T [FCoE]" }, - {"HUAWEI T4TOE 10G" ,"Chelsio HUAWEI T4TOE 10G [FCoE]" } -}; -static const struct csio_adap_desc csio_t5_fcoe_adapters[] = { {"T580-Dbg 10G" ,"Chelsio T580-Dbg 10G [FCoE]" }, {"T520-CR 10G" ,"Chelsio T520-CR 10G [FCoE]" }, - {"T522-CR 10G/1G" ,"Chelsio T452-CR 10G/1G [FCoE]" }, + {"T522-CR 10G/1G" ,"Chelsio T522-CR 10G/1G [FCoE]" }, {"T540-CR 10G" ,"Chelsio T540-CR 10G [FCoE]" }, {"T520-BCH 10G" ,"Chelsio T520-BCH 10G [FCoE]" }, {"T540-BCH 10G" ,"Chelsio T540-BCH 10G [FCoE]" },
@@ -107,7 +80,9 @@ static const struct csio_adap_desc csio_t5_fcoe_adapters[] = { {"T580-LP-CR 40G", "Chelsio T580-LP-CR 40G [FCoE]"}, {"T520-LL-CR 10G", "Chelsio T520-LL-CR 10G [FCoE]"}, {"T560-CR 40G", "Chelsio T560-CR 40G [FCoE]"}, - {"T580-CR 40G", "Chelsio T580-CR 40G [FCoE]"} + {"T580-CR 40G", "Chelsio T580-CR 40G [FCoE]"}, + {"T580-SO 40G", "Chelsio T580-SO 40G [FCoE]"}, + {"T502-BT 1G", "Chelsio T502-BT 1G [FCoE]"} };static void csio_mgmtm_cleanup (struct csio_mgmtm *);
@@ -1716,9 +1691,9 @@ csio_hw_flash_config(struct csio_hw *hw, u32 *fw_cfg_param, char *path)uint32_t *cfg_data;int value_to_add =0 ; -if (request_firmware (&cf,CSIO_CF_FNAME (hw), dev) <0 ) { +if (request_firmware (&cf,FW_CFG_NAME_T5 , dev) <0 ) {csio_err (hw,"could not find config file %s, err: %d\n" , -CSIO_CF_FNAME (hw), ret); +FW_CFG_NAME_T5 , ret);return -ENOENT ; }
@@ -1758,8 +1733,8 @@ csio_hw_flash_config(struct csio_hw *hw, u32 *fw_cfg_param, char *path) }if (ret ==0 ) {csio_info (hw,"config file upgraded to %s\n" , -CSIO_CF_FNAME (hw)); -snprintf (path,64 ,"%s%s" ,"/lib/firmware/" ,CSIO_CF_FNAME (hw)); +FW_CFG_NAME_T5 ); +snprintf (path,64 ,"%s%s" ,"/lib/firmware/" ,FW_CFG_NAME_T5 ); } leave:
@@ -2123,9 +2098,9 @@ csio_hw_flash_fw(struct csio_hw *hw, int *reset)return -EINVAL ; } -if (request_firmware (&fw,CSIO_FW_FNAME (hw), dev) <0 ) { +if (request_firmware (&fw,FW_FNAME_T5 , dev) <0 ) {csio_err (hw,"could not find firmware image %s, err: %d\n" , -CSIO_FW_FNAME (hw), ret); +FW_FNAME_T5 , ret);return -EINVAL ; }
@@ -3207,7 +3182,7 @@ static void csio_ncsi_intr_handler(struct csio_hw *hw)*/ static void csio_xgmac_intr_handler (struct csio_hw *hw,int port) { -uint32_t v =csio_rd_reg32 (hw,CSIO_MAC_INT_CAUSE_REG (hw, port)); +uint32_t v =csio_rd_reg32 (hw,T5_PORT_REG (port,MAC_PORT_INT_CAUSE_A )); v &=TXFIFO_PRTY_ERR_F |RXFIFO_PRTY_ERR_F ;if (!v)
@@ -3217,7 +3192,7 @@ static void csio_xgmac_intr_handler(struct csio_hw *hw, int port)csio_fatal (hw,"XGMAC %d Tx FIFO parity error\n" , port);if (v &RXFIFO_PRTY_ERR_F )csio_fatal (hw,"XGMAC %d Rx FIFO parity error\n" , port); -csio_wr_reg32 (hw, v,CSIO_MAC_INT_CAUSE_REG (hw, port)); +csio_wr_reg32 (hw, v,T5_PORT_REG (port,MAC_PORT_INT_CAUSE_A ));csio_hw_fatal_err (hw); }
@@ -3966,13 +3941,7 @@ csio_hw_set_description(struct csio_hw *hw, uint16_t ven_id, uint16_t dev_id) prot_type = (dev_id &CSIO_ASIC_DEVID_PROTO_MASK ); adap_type = (dev_id &CSIO_ASIC_DEVID_TYPE_MASK ); -if (prot_type ==CSIO_T4_FCOE_ASIC ) { -memcpy (hw->hw_ver, - csio_t4_fcoe_adapters[adap_type].model_no,16 ); -memcpy (hw->model_desc, - csio_t4_fcoe_adapters[adap_type].description, -32 ); - }else if (prot_type ==CSIO_T5_FCOE_ASIC ) { +if (prot_type ==CSIO_T5_FCOE_ASIC ) {memcpy (hw->hw_ver, csio_t5_fcoe_adapters[adap_type].model_no,16 ); memcpy(hw->model_desc,
@@ -4009,8 +3978,8 @@ csio_hw_init(struct csio_hw *hw)strcpy (hw->name,CSIO_HW_NAME ); -/* Initialize the HW chip ops with T4/T5 specific ops */ - hw->chip_ops =csio_is_t4 (hw->chip_id) ? &t4_ops : &t5_ops; +/* Initialize the HW chip ops T5 specific ops */ + hw->chip_ops = &t5_ops;/* Set the model & its description */
drivers/scsi/csiostor/csio_hw_chip.h +0 -43
90 lines not on this page · raw message
drivers/scsi/csiostor/csio_init.c +2 -4
@@ -1176,9 +1176,8 @@ static struct pci_error_handlers csio_err_handler = {*/ #define CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN \ static struct pci_device_id csio_pci_tbl[] = { -/* Define for iSCSI uses PF5, FCoE uses PF6 */ -#define CH_PCI_DEVICE_ID_FUNCTION 0x5 -#define CH_PCI_DEVICE_ID_FUNCTION2 0x6 +/* Define for FCoE uses PF6 */ +#define CH_PCI_DEVICE_ID_FUNCTION 0x6#define CH_PCI_ID_TABLE_ENTRY (devid) \ { PCI_VDEVICE(CHELSIO, (devid)), 0 }
@@ -1256,5 +1255,4 @@ MODULE_DESCRIPTION(CSIO_DRV_DESC);MODULE_LICENSE (CSIO_DRV_LICENSE );MODULE_DEVICE_TABLE (pci, csio_pci_tbl);MODULE_VERSION (CSIO_DRV_VERSION ); -MODULE_FIRMWARE (FW_FNAME_T4 );MODULE_FIRMWARE (FW_FNAME_T5 );
drivers/scsi/csiostor/csio_wr.c +7 -8
@@ -85,7 +85,7 @@ csio_wr_ring_fldb(struct csio_hw *hw, struct csio_q *flq)*/ if (flq->inc_idx >=8 ) {csio_wr_reg32 (hw,DBPRIO_F |QID_V (flq->un.fl.flid) | -CSIO_HW_PIDX (hw, flq->inc_idx /8 ), +PIDX_T5_V (flq->inc_idx /8 ) |DBTYPE_F ,MYPF_REG (SGE_PF_KDOORBELL_A )); flq->inc_idx &=7 ; }
@@ -983,7 +983,7 @@ csio_wr_issue(struct csio_hw *hw, int qidx, bool prio)wmb ();/* Ring SGE Doorbell writing q->pidx into it */ csio_wr_reg32 (hw,DBPRIO_V (prio) |QID_V (q->un.eq.physeqid) | -CSIO_HW_PIDX (hw, q->inc_idx), +PIDX_T5_V (q->inc_idx) |DBTYPE_F ,MYPF_REG (SGE_PF_KDOORBELL_A )); q->inc_idx =0 ;
@@ -1467,12 +1467,11 @@ csio_wr_set_sge(struct csio_hw *hw)* and generate an interrupt when this occurs so we can recover. */ csio_set_reg_field (hw,SGE_DBFIFO_STATUS_A , -HP_INT_THRESH_V (HP_INT_THRESH_M ) | -CSIO_HW_LP_INT_THRESH (hw, -CSIO_HW_M_LP_INT_THRESH (hw)), -HP_INT_THRESH_V (CSIO_SGE_DBFIFO_INT_THRESH ) | -CSIO_HW_LP_INT_THRESH (hw, -CSIO_SGE_DBFIFO_INT_THRESH )); +LP_INT_THRESH_T5_V (LP_INT_THRESH_T5_M ), +LP_INT_THRESH_T5_V (CSIO_SGE_DBFIFO_INT_THRESH )); +csio_set_reg_field (hw,SGE_DBFIFO_STATUS2_A , +HP_INT_THRESH_T5_V (LP_INT_THRESH_T5_M ), +HP_INT_THRESH_T5_V (CSIO_SGE_DBFIFO_INT_THRESH ));csio_set_reg_field (hw,SGE_DOORBELL_CONTROL_A ,ENABLE_DROP_F ,ENABLE_DROP_F );
Signature · 1 line
2.0.2
PATCH v2 2/2 csiostor:Removed file csio_hw_t4.c
In reply to Praveen MadhavanWe have decided not to productize FCoE on T4.
Hence file is removed.
Signed-off-by Praveen Madhavan <[email protected]>
--- drivers/scsi/csiostor/Makefile | 2 +- drivers/scsi/csiostor/csio_hw_t4.c | 404 ------------------------------------- 2 files changed, 1 insertion(+), 405 deletions(-) delete mode 100644 drivers/scsi/csiostor/csio_hw_t4.c
drivers/scsi/csiostor/Makefile +1 -1
@@ -8,5 +8,5 @@ ccflags-y += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4 obj-$(CONFIG_SCSI_CHELSIO_FCOE) += csiostor.o csiostor-objs := csio_attr.o csio_init.o csio_lnode.o csio_scsi.o \ - csio_hw.o csio_hw_t4.o csio_hw_t5.o csio_isr.o \ + csio_hw.o csio_hw_t5.o csio_isr.o \ csio_mb.o csio_rnode.o csio_wr.o
drivers/scsi/csiostor/csio_hw_t4.c deleted +0 -404
404 lines not on this page · raw message
Signature · 1 line
2.0.2
David Miller
maintainerFrom: Praveen Madhavan <[email protected]>
Date: Fri, 16 Jan 2015 21:30:18 +0530
Quoted 9 lines
We found a subtle issue with FCoE on T4 very late in the game and decided not to productize FCoE on T4 and therefore there are no customers that will be impacted by this change. FCoE is supported on T5 cards.
Please apply on net-next since depends on previous commits.
Changes in v2:
- Make the commit message more clearer.
Series applied, thanks.