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

Commit 9aeb6802 authored by Jing Huang's avatar Jing Huang Committed by James Bottomley
Browse files

[SCSI] bfa: update to support firmware configuation 



Update related data structures to support firmeare configuration.
Add AEN events related to firmware configuation.

Signed-off-by: default avatarJing Huang <huangj@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 3e98cc01

drivers/scsi/bfa/bfa_ioc.c

+2 −4
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ bfa_boolean_t bfa_auto_recover = BFA_TRUE; 
/*

 * forward declarations

 */

static void     bfa_ioc_aen_post(struct bfa_ioc_s *bfa,

				 enum bfa_ioc_aen_event event);

static void     bfa_ioc_hw_sem_get(struct bfa_ioc_s *ioc);

static void     bfa_ioc_hw_sem_get_cancel(struct bfa_ioc_s *ioc);

static void     bfa_ioc_hwinit(struct bfa_ioc_s *ioc, bfa_boolean_t force);
@@ -1902,7 +1900,7 @@ bfa_ioc_get_fcmode(struct bfa_ioc_s *ioc) 
/**

 * Send AEN notification

 */

static void

void

bfa_ioc_aen_post(struct bfa_ioc_s *ioc, enum bfa_ioc_aen_event event)

{

	union bfa_aen_data_u aen_data;
@@ -2052,7 +2050,7 @@ bfa_ioc_recover(struct bfa_ioc_s *ioc) 


#else



static void

void

bfa_ioc_aen_post(struct bfa_ioc_s *ioc, enum bfa_ioc_aen_event event)

{

}

drivers/scsi/bfa/bfa_ioc.h

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ void bfa_ioc_fwver_get(struct bfa_ioc_s *ioc, 
			struct bfi_ioc_image_hdr_s *fwhdr);

bfa_boolean_t bfa_ioc_fwver_cmp(struct bfa_ioc_s *ioc,

			struct bfi_ioc_image_hdr_s *fwhdr);

void bfa_ioc_aen_post(struct bfa_ioc_s *ioc, enum bfa_ioc_aen_event event);



/*

 * bfa mfg wwn API functions

drivers/scsi/bfa/bfa_log_module.c

+86 −0
Original line number Diff line number Diff line
@@ -110,6 +110,27 @@ struct bfa_log_msgdef_s bfa_log_msg_array[] = { 
 "Running firmware version is incompatible with the driver version.",

 (0), 0},



{BFA_AEN_IOC_FWCFG_ERROR, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_CRITICAL, "BFA_AEN_IOC_FWCFG_ERROR",

 "Link initialization failed due to firmware configuration read error:"

 " WWN = %s.",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_AEN_IOC_INVALID_VENDOR, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_ERROR, "BFA_AEN_IOC_INVALID_VENDOR",

 "Unsupported switch vendor. Link initialization failed: WWN = %s.",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_AEN_IOC_INVALID_NWWN, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_ERROR, "BFA_AEN_IOC_INVALID_NWWN",

 "Invalid NWWN. Link initialization failed: NWWN = 00:00:00:00:00:00:00:00.",

 (0), 0},



{BFA_AEN_IOC_INVALID_PWWN, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_ERROR, "BFA_AEN_IOC_INVALID_PWWN",

 "Invalid PWWN. Link initialization failed: PWWN = 00:00:00:00:00:00:00:00.",

 (0), 0},
@@ -347,6 +368,22 @@ struct bfa_log_msgdef_s bfa_log_msg_array[] = { 
 ((BFA_LOG_S << BFA_LOG_ARG0) | (BFA_LOG_D << BFA_LOG_ARG1) |

  (BFA_LOG_D << BFA_LOG_ARG2) | 0), 3},



{BFA_LOG_HAL_DRIVER_ERROR, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_INFO, "HAL_DRIVER_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_HAL_DRIVER_CONFIG_ERROR,

 BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG, BFA_LOG_INFO,

 "HAL_DRIVER_CONFIG_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_HAL_MBOX_ERROR, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_INFO, "HAL_MBOX_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},
@@ -412,6 +449,55 @@ struct bfa_log_msgdef_s bfa_log_msg_array[] = { 
 ((BFA_LOG_D << BFA_LOG_ARG0) | (BFA_LOG_P << BFA_LOG_ARG1) |

  (BFA_LOG_X << BFA_LOG_ARG2) | 0), 3},



{BFA_LOG_LINUX_DRIVER_CONFIG_ERROR,

 BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG, BFA_LOG_INFO,

 "LINUX_DRIVER_CONFIG_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_BNA_STATE_MACHINE,

 BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG, BFA_LOG_INFO,

 "LINUX_BNA_STATE_MACHINE",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_IOC_ERROR, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_INFO, "LINUX_IOC_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_RESOURCE_ALLOC_ERROR,

 BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG, BFA_LOG_INFO,

 "LINUX_RESOURCE_ALLOC_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_RING_BUFFER_ERROR,

 BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG, BFA_LOG_INFO,

 "LINUX_RING_BUFFER_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_DRIVER_ERROR, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_ERROR, "LINUX_DRIVER_ERROR",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_DRIVER_INFO, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_INFO, "LINUX_DRIVER_INFO",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_DRIVER_DIAG, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_INFO, "LINUX_DRIVER_DIAG",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},



{BFA_LOG_LINUX_DRIVER_AEN, BFA_LOG_ATTR_NONE | BFA_LOG_ATTR_LOG,

 BFA_LOG_INFO, "LINUX_DRIVER_AEN",

 "%s",

 ((BFA_LOG_S << BFA_LOG_ARG0) | 0), 1},

drivers/scsi/bfa/include/aen/bfa_aen_ioc.h

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ 
	BFA_LOG_CREATE_ID(BFA_AEN_CAT_IOC, BFA_IOC_AEN_DISABLE)

#define BFA_AEN_IOC_FWMISMATCH \

	BFA_LOG_CREATE_ID(BFA_AEN_CAT_IOC, BFA_IOC_AEN_FWMISMATCH)

#define BFA_AEN_IOC_FWCFG_ERROR \

	BFA_LOG_CREATE_ID(BFA_AEN_CAT_IOC, BFA_IOC_AEN_FWCFG_ERROR)

#define BFA_AEN_IOC_INVALID_VENDOR      \

	BFA_LOG_CREATE_ID(BFA_AEN_CAT_IOC, BFA_IOC_AEN_INVALID_VENDOR)

#define BFA_AEN_IOC_INVALID_NWWN        \

	BFA_LOG_CREATE_ID(BFA_AEN_CAT_IOC, BFA_IOC_AEN_INVALID_NWWN)

#define BFA_AEN_IOC_INVALID_PWWN        \

	BFA_LOG_CREATE_ID(BFA_AEN_CAT_IOC, BFA_IOC_AEN_INVALID_PWWN)



#endif

drivers/scsi/bfa/include/cs/bfa_debug.h

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
} while (0)



#define bfa_sm_fault(__mod, __event)	do {				\

	bfa_trc(__mod, (((uint32_t)0xDEAD << 16) | __event));		\

	bfa_sm_panic((__mod)->logm, __LINE__, __FILE__, __event); 	\

} while (0)