Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7af074dc authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: PCI VPD, FIP and include file changes. 



Changed PCI VPD to incorporate specific OEM vendors.

Added FCoE specific interrupt latency and delay params.

Added some variables needed by FIP 2.0.

Added some new logging and tracing definitions.

Added reserved members to make the structures (IOC, IOCFC) 64bit aligned.

Changed the module identifiers, as some files were moved.

Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 86e32dab

drivers/scsi/bfa/bfa_ioc.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <bfa.h>

#include <bfa_ioc.h>

#include <bfa_fwimg_priv.h>

#include <bfa_trcmod_priv.h>

#include <cna/bfa_cna_trcmod.h>

#include <cs/bfa_debug.h>

#include <bfi/bfi_ioc.h>

#include <bfi/bfi_ctreg.h>
@@ -27,7 +27,7 @@ 
#include <log/bfa_log_hal.h>

#include <defs/bfa_defs_pci.h>



BFA_TRC_FILE(HAL, IOC);

BFA_TRC_FILE(CNA, IOC);



/**

 * IOC local definitions

drivers/scsi/bfa/bfa_trcmod_priv.h

+30 −32
Original line number Diff line number Diff line
@@ -29,38 +29,36 @@ 
 * !!! needed between trace utility and driver version

 */

enum {

	BFA_TRC_HAL_IOC		= 1,

	BFA_TRC_HAL_INTR	= 2,

	BFA_TRC_HAL_FCXP	= 3,

	BFA_TRC_HAL_UF		= 4,

	BFA_TRC_HAL_DIAG	= 5,

	BFA_TRC_HAL_RPORT	= 6,

	BFA_TRC_HAL_FCPIM	= 7,

	BFA_TRC_HAL_IOIM	= 8,

	BFA_TRC_HAL_TSKIM	= 9,

	BFA_TRC_HAL_ITNIM	= 10,

	BFA_TRC_HAL_PPORT	= 11,

	BFA_TRC_HAL_SGPG	= 12,

	BFA_TRC_HAL_FLASH	= 13,

	BFA_TRC_HAL_DEBUG	= 14,

	BFA_TRC_HAL_WWN		= 15,

	BFA_TRC_HAL_FLASH_RAW	= 16,

	BFA_TRC_HAL_SBOOT	= 17,

	BFA_TRC_HAL_SBOOT_IO	= 18,

	BFA_TRC_HAL_SBOOT_INTR	= 19,

	BFA_TRC_HAL_SBTEST	= 20,

	BFA_TRC_HAL_IPFC	= 21,

	BFA_TRC_HAL_IOCFC	= 22,

	BFA_TRC_HAL_FCPTM	= 23,

	BFA_TRC_HAL_IOTM	= 24,

	BFA_TRC_HAL_TSKTM	= 25,

	BFA_TRC_HAL_TIN		= 26,

	BFA_TRC_HAL_LPS		= 27,

	BFA_TRC_HAL_FCDIAG	= 28,

	BFA_TRC_HAL_PBIND	= 29,

	BFA_TRC_HAL_IOCFC_CT	= 30,

	BFA_TRC_HAL_IOCFC_CB	= 31,

	BFA_TRC_HAL_IOCFC_Q	= 32,

	BFA_TRC_HAL_INTR	= 1,

	BFA_TRC_HAL_FCXP	= 2,

	BFA_TRC_HAL_UF		= 3,

	BFA_TRC_HAL_RPORT	= 4,

	BFA_TRC_HAL_FCPIM	= 5,

	BFA_TRC_HAL_IOIM	= 6,

	BFA_TRC_HAL_TSKIM	= 7,

	BFA_TRC_HAL_ITNIM	= 8,

	BFA_TRC_HAL_PPORT	= 9,

	BFA_TRC_HAL_SGPG	= 10,

	BFA_TRC_HAL_FLASH	= 11,

	BFA_TRC_HAL_DEBUG	= 12,

	BFA_TRC_HAL_WWN		= 13,

	BFA_TRC_HAL_FLASH_RAW	= 14,

	BFA_TRC_HAL_SBOOT	= 15,

	BFA_TRC_HAL_SBOOT_IO	= 16,

	BFA_TRC_HAL_SBOOT_INTR	= 17,

	BFA_TRC_HAL_SBTEST	= 18,

	BFA_TRC_HAL_IPFC	= 19,

	BFA_TRC_HAL_IOCFC	= 20,

	BFA_TRC_HAL_FCPTM	= 21,

	BFA_TRC_HAL_IOTM	= 22,

	BFA_TRC_HAL_TSKTM	= 23,

	BFA_TRC_HAL_TIN		= 24,

	BFA_TRC_HAL_LPS		= 25,

	BFA_TRC_HAL_FCDIAG	= 26,

	BFA_TRC_HAL_PBIND	= 27,

	BFA_TRC_HAL_IOCFC_CT	= 28,

	BFA_TRC_HAL_IOCFC_CB	= 29,

	BFA_TRC_HAL_IOCFC_Q	= 30,

};



#endif /* __BFA_TRCMOD_PRIV_H__ */

drivers/scsi/bfa/include/defs/bfa_defs_cee.h

+6 −8
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ 


#define BFA_CEE_LLDP_MAX_STRING_LEN (128)





/* FIXME: this is coming from the protocol spec. Can the host & apps share the

   protocol .h files ?

 */

#define BFA_CEE_LLDP_SYS_CAP_OTHER       0x0001

#define BFA_CEE_LLDP_SYS_CAP_REPEATER    0x0002

#define BFA_CEE_LLDP_SYS_CAP_MAC_BRIDGE  0x0004
@@ -94,9 +90,10 @@ struct bfa_cee_dcbx_cfg_s { 
/* CEE status */

/* Making this to tri-state for the benefit of port list command */

enum bfa_cee_status_e {

    CEE_PHY_DOWN = 0,

	CEE_UP = 0,

	CEE_PHY_UP = 1,

    CEE_UP = 2,

	CEE_LOOPBACK = 2,

	CEE_PHY_DOWN = 3,

};



/* CEE Query */
@@ -107,7 +104,8 @@ struct bfa_cee_attr_s { 
	struct bfa_cee_dcbx_cfg_s dcbx_remote;

	mac_t src_mac;

	u8 link_speed;

	u8 filler[3];

	u8 nw_priority;

	u8 filler[2];

};

drivers/scsi/bfa/include/defs/bfa_defs_ioc.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ struct bfa_ioc_attr_s { 
	struct bfa_ioc_driver_attr_s 	driver_attr;	/*  driver attr    */

	struct bfa_ioc_pci_attr_s	pci_attr;

	u8				port_id;	/*  port number    */

	u8				rsvd[7];	/*!< 64bit align    */

};



/**

drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h

+9 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 


#define BFA_IOCFC_INTR_DELAY	1125

#define BFA_IOCFC_INTR_LATENCY	225

#define BFA_IOCFCOE_INTR_DELAY  25

#define BFA_IOCFCOE_INTR_LATENCY 5



/**

 * Interrupt coalescing configuration.
@@ -50,7 +52,7 @@ struct bfa_iocfc_fwcfg_s { 
	u16        num_fcxp_reqs;	/*  unassisted FC exchanges	*/

	u16        num_uf_bufs;	/*  unsolicited recv buffers	*/

	u8		num_cqs;

	u8		rsvd;

	u8		rsvd[5];

};



struct bfa_iocfc_drvcfg_s {
@@ -224,6 +226,11 @@ struct bfa_fw_port_physm_stats_s { 




struct bfa_fw_fip_stats_s {

    u32    vlan_req;           /*  vlan discovery requests             */

    u32    vlan_notify;        /*  vlan notifications                  */

    u32    vlan_err;           /*  vlan response error                 */

    u32    vlan_timeouts;      /*  vlan disvoery timeouts              */

    u32    vlan_invalids;      /*  invalid vlan in discovery advert.   */

    u32    disc_req;           /*  Discovery solicit requests          */

    u32    disc_rsp;           /*  Discovery solicit response          */

    u32    disc_err;           /*  Discovery advt. parse errors        */
@@ -235,7 +242,7 @@ struct bfa_fw_fip_stats_s { 
    u32    clrvlink_req;       /*  Clear virtual link req              */

    u32    op_unsupp;          /*  Unsupported FIP operation           */

    u32    untagged;           /*  Untagged frames (ignored)           */

    u32    rsvd;

    u32	   invalid_version;    /*!< Invalid FIP version           */

};