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

Commit d0504f4d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bna-next' 



Ivan Vecera says:

====================
bna: clean-up

The patches clean the bna driver.

v2: changes & comments requested by Joe
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d205ce5c ecc46789

drivers/net/ethernet/brocade/bna/bfa_cee.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -282,7 +282,6 @@ bfa_nw_cee_attach(struct bfa_cee *cee, struct bfa_ioc *ioc, 
	cee->ioc = ioc;

	cee->ioc = ioc;





	bfa_nw_ioc_mbox_regisr(cee->ioc, BFI_MC_CEE, bfa_cee_isr, cee);

	bfa_nw_ioc_mbox_regisr(cee->ioc, BFI_MC_CEE, bfa_cee_isr, cee);

	bfa_q_qe_init(&cee->ioc_notify);

	bfa_ioc_notify_init(&cee->ioc_notify, bfa_cee_notify, cee);

	bfa_ioc_notify_init(&cee->ioc_notify, bfa_cee_notify, cee);

	bfa_nw_ioc_notify_register(cee->ioc, &cee->ioc_notify);

	bfa_nw_ioc_notify_register(cee->ioc, &cee->ioc_notify);

}
 
}

drivers/net/ethernet/brocade/bna/bfa_cs.h

+0 −14
Original line number Original line Diff line number Diff line
@@ -28,19 +28,6 @@ 




typedef void (*bfa_sm_t)(void *sm, int event);

typedef void (*bfa_sm_t)(void *sm, int event);





/* oc - object class eg. bfa_ioc

 * st - state, eg. reset

 * otype - object type, eg. struct bfa_ioc

 * etype - object type, eg. enum ioc_event

 */

#define bfa_sm_state_decl(oc, st, otype, etype)			\

	static void oc ## _sm_ ## st(otype * fsm, etype event)



#define bfa_sm_set_state(_sm, _state)	((_sm)->sm = (bfa_sm_t)(_state))

#define bfa_sm_send_event(_sm, _event)	((_sm)->sm((_sm), (_event)))

#define bfa_sm_get_state(_sm)		((_sm)->sm)

#define bfa_sm_cmp_state(_sm, _state)	((_sm)->sm == (bfa_sm_t)(_state))



/* For converting from state machine function to state encoding. */

/* For converting from state machine function to state encoding. */

struct bfa_sm_table {

struct bfa_sm_table {

	bfa_sm_t	sm;	/*!< state machine function	*/

	bfa_sm_t	sm;	/*!< state machine function	*/
@@ -67,7 +54,6 @@ typedef void (*bfa_fsm_t)(void *fsm, int event); 
} while (0)

} while (0)





#define bfa_fsm_send_event(_fsm, _event)	((_fsm)->fsm((_fsm), (_event)))

#define bfa_fsm_send_event(_fsm, _event)	((_fsm)->fsm((_fsm), (_event)))

#define bfa_fsm_get_state(_fsm)			((_fsm)->fsm)

#define bfa_fsm_cmp_state(_fsm, _state)					\

#define bfa_fsm_cmp_state(_fsm, _state)					\

	((_fsm)->fsm == (bfa_fsm_t)(_state))

	((_fsm)->fsm == (bfa_fsm_t)(_state))

drivers/net/ethernet/brocade/bna/bfa_defs.h

+3 −8
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "bfa_defs_status.h"

#include "bfa_defs_status.h"

#include "bfa_defs_mfg_comm.h"

#include "bfa_defs_mfg_comm.h"





#define BFA_STRING_32	32

#define BFA_VERSION_LEN 64

#define BFA_VERSION_LEN 64





/* ---------------------- adapter definitions ------------ */

/* ---------------------- adapter definitions ------------ */
@@ -55,7 +54,7 @@ struct bfa_adapter_attr { 
	char		optrom_ver[BFA_VERSION_LEN];

	char		optrom_ver[BFA_VERSION_LEN];

	char		os_type[BFA_ADAPTER_OS_TYPE_LEN];

	char		os_type[BFA_ADAPTER_OS_TYPE_LEN];

	struct bfa_mfg_vpd vpd;

	struct bfa_mfg_vpd vpd;

	struct mac mac;

	u8		mac[ETH_ALEN];





	u8		nports;

	u8		nports;

	u8		max_speed;

	u8		max_speed;
@@ -187,8 +186,6 @@ enum { 
#define BFA_MFG_SUPPLIER_SERIALNUM_SIZE		20

#define BFA_MFG_SUPPLIER_SERIALNUM_SIZE		20

#define BFA_MFG_SUPPLIER_REVISION_SIZE		4

#define BFA_MFG_SUPPLIER_REVISION_SIZE		4





#pragma pack(1)



/* BFA adapter manufacturing block definition.

/* BFA adapter manufacturing block definition.

 *

 *

 * All numerical fields are in big-endian format.

 * All numerical fields are in big-endian format.
@@ -211,7 +208,7 @@ struct bfa_mfg_block { 
	char	supplier_partnum[STRSZ(BFA_MFG_SUPPLIER_PARTNUM_SIZE)];

	char	supplier_partnum[STRSZ(BFA_MFG_SUPPLIER_PARTNUM_SIZE)];

	char	supplier_serialnum[STRSZ(BFA_MFG_SUPPLIER_SERIALNUM_SIZE)];

	char	supplier_serialnum[STRSZ(BFA_MFG_SUPPLIER_SERIALNUM_SIZE)];

	char	supplier_revision[STRSZ(BFA_MFG_SUPPLIER_REVISION_SIZE)];

	char	supplier_revision[STRSZ(BFA_MFG_SUPPLIER_REVISION_SIZE)];

	mac_t	mfg_mac;	/* base mac address */

	u8	mfg_mac[ETH_ALEN]; /* base mac address */

	u8	num_mac;	/* number of mac addresses */

	u8	num_mac;	/* number of mac addresses */

	u8	rsv2;

	u8	rsv2;

	u32	card_type;	/* card type          */

	u32	card_type;	/* card type          */
@@ -227,9 +224,7 @@ struct bfa_mfg_block { 
	char	initial_mode[8]; /* initial mode: hba/cna/nic */

	char	initial_mode[8]; /* initial mode: hba/cna/nic */

	u8	rsv4[84];

	u8	rsv4[84];

	u8	md5_chksum[BFA_MFG_CHKSUM_SIZE]; /* md5 checksum */

	u8	md5_chksum[BFA_MFG_CHKSUM_SIZE]; /* md5 checksum */

};

} __packed;



#pragma pack()





/* ---------------------- pci definitions ------------ */

/* ---------------------- pci definitions ------------ */

drivers/net/ethernet/brocade/bna/bfa_defs_cna.h

+6 −10
Original line number Original line Diff line number Diff line
@@ -109,8 +109,6 @@ union bfa_port_stats_u { 
	struct bfa_port_eth_stats eth;

	struct bfa_port_eth_stats eth;

};

};





#pragma pack(1)



#define BFA_CEE_LLDP_MAX_STRING_LEN (128)

#define BFA_CEE_LLDP_MAX_STRING_LEN (128)

#define BFA_CEE_DCBX_MAX_PRIORITY	(8)

#define BFA_CEE_DCBX_MAX_PRIORITY	(8)

#define BFA_CEE_DCBX_MAX_PGID		(8)

#define BFA_CEE_DCBX_MAX_PGID		(8)
@@ -133,7 +131,7 @@ struct bfa_cee_lldp_str { 
	u8 len;

	u8 len;

	u8 rsvd[2];

	u8 rsvd[2];

	u8 value[BFA_CEE_LLDP_MAX_STRING_LEN];

	u8 value[BFA_CEE_LLDP_MAX_STRING_LEN];

};

} __packed;





/* LLDP parameters */

/* LLDP parameters */

struct bfa_cee_lldp_cfg {

struct bfa_cee_lldp_cfg {
@@ -145,7 +143,7 @@ struct bfa_cee_lldp_cfg { 
	struct bfa_cee_lldp_str mgmt_addr;

	struct bfa_cee_lldp_str mgmt_addr;

	u16 time_to_live;

	u16 time_to_live;

	u16 enabled_system_cap;

	u16 enabled_system_cap;

};

} __packed;





enum bfa_cee_dcbx_version {

enum bfa_cee_dcbx_version {

	DCBX_PROTOCOL_PRECEE	= 1,

	DCBX_PROTOCOL_PRECEE	= 1,
@@ -171,7 +169,7 @@ struct bfa_cee_dcbx_cfg { 
	u8 lls_fcoe; /* FCoE Logical Link Status */

	u8 lls_fcoe; /* FCoE Logical Link Status */

	u8 lls_lan; /* LAN Logical Link Status */

	u8 lls_lan; /* LAN Logical Link Status */

	u8 rsvd[2];

	u8 rsvd[2];

};

} __packed;





/* CEE status */

/* CEE status */

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

/* Making this to tri-state for the benefit of port list command */
@@ -188,11 +186,11 @@ struct bfa_cee_attr { 
	u8 error_reason;

	u8 error_reason;

	struct bfa_cee_lldp_cfg lldp_remote;

	struct bfa_cee_lldp_cfg lldp_remote;

	struct bfa_cee_dcbx_cfg dcbx_remote;

	struct bfa_cee_dcbx_cfg dcbx_remote;

	mac_t src_mac;

	u8 src_mac[ETH_ALEN];

	u8 link_speed;

	u8 link_speed;

	u8 nw_priority;

	u8 nw_priority;

	u8 filler[2];

	u8 filler[2];

};

} __packed;





/* LLDP/DCBX/CEE Statistics */

/* LLDP/DCBX/CEE Statistics */

struct bfa_cee_stats {

struct bfa_cee_stats {
@@ -214,8 +212,6 @@ struct bfa_cee_stats { 
	u32	cee_status_up;		/*!< CEE status up */

	u32	cee_status_up;		/*!< CEE status up */

	u32	cee_hw_cfg_changed;	/*!< CEE hw cfg changed */

	u32	cee_hw_cfg_changed;	/*!< CEE hw cfg changed */

	u32	cee_rx_invalid_cfg;	/*!< CEE invalid cfg */

	u32	cee_rx_invalid_cfg;	/*!< CEE invalid cfg */

};

} __packed;



#pragma pack()





#endif	/* __BFA_DEFS_CNA_H__ */
 
#endif	/* __BFA_DEFS_CNA_H__ */

drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h

+2 −6
Original line number Original line Diff line number Diff line
@@ -59,8 +59,6 @@ enum { 
	BFA_MFG_TYPE_INVALID = 0,	 /*!< Invalid card type		*/

	BFA_MFG_TYPE_INVALID = 0,	 /*!< Invalid card type		*/

};

};





#pragma pack(1)



/* Check if Mezz card */

/* Check if Mezz card */

#define bfa_mfg_is_mezz(type) (( \

#define bfa_mfg_is_mezz(type) (( \

	(type) == BFA_MFG_TYPE_JAYHAWK || \

	(type) == BFA_MFG_TYPE_JAYHAWK || \
@@ -77,7 +75,7 @@ enum { 
	CB_GPIO_FC4P2   = (4),		/*!< 4G 2port FC card		*/

	CB_GPIO_FC4P2   = (4),		/*!< 4G 2port FC card		*/

	CB_GPIO_FC4P1   = (5),		/*!< 4G 1port FC card		*/

	CB_GPIO_FC4P1   = (5),		/*!< 4G 1port FC card		*/

	CB_GPIO_DFLY    = (6),		/*!< 8G 2port FC mezzanine card	*/

	CB_GPIO_DFLY    = (6),		/*!< 8G 2port FC mezzanine card	*/

	CB_GPIO_PROTO   = (1 << 7)	/*!< 8G 2port FC prototypes	*/

	CB_GPIO_PROTO   = BIT(7)	/*!< 8G 2port FC prototypes	*/

};

};





#define bfa_mfg_adapter_prop_init_gpio(gpio, card_type, prop)	\

#define bfa_mfg_adapter_prop_init_gpio(gpio, card_type, prop)	\
@@ -148,8 +146,6 @@ struct bfa_mfg_vpd { 
	u8	len;		/*!< vpd data length excluding header */

	u8	len;		/*!< vpd data length excluding header */

	u8	rsv;

	u8	rsv;

	u8		data[BFA_MFG_VPD_LEN];	/*!< vpd data */

	u8		data[BFA_MFG_VPD_LEN];	/*!< vpd data */

};

} __packed;



#pragma pack()





#endif /* __BFA_DEFS_MFG_H__ */
 
#endif /* __BFA_DEFS_MFG_H__ */