Commit 28d358d0 authored by Vijaya Mohan Guvva's avatar Vijaya Mohan Guvva Committed by James Bottomley
Browse files

[SCSI] bfa: Firmware patch simplification 



This patch includes change to enable firmware patch simplication
feature. This feature is targeted to address the requirement to have
independent patch release for firmware. Prior to 3.2.3, releasing a
patch fix for firmware requires changes to bfa, to use new firmware
images. But with these changes, if the new firmware is flashed on to the
HBA with brocade adapter management utilites, driver uses the new
firmware after checking the patch release byte in the firmware version.

Signed-off-by: default avatarVijaya Mohan Guvva <vmohan@brocade.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 0e7c60cb

drivers/scsi/bfa/bfa_defs.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ enum bfa_status { 
	BFA_STATUS_ETIMER	= 5,	/*  Timer expired - Retry, if persists,

					 *  contact support */

	BFA_STATUS_EPROTOCOL	= 6,	/*  Protocol error */

	BFA_STATUS_BADFLASH	= 9,	/*  Flash is bad */

	BFA_STATUS_SFP_UNSUPP	= 10,	/*  Unsupported SFP - Replace SFP */

	BFA_STATUS_UNKNOWN_VFID = 11,	/*  VF_ID not found */

	BFA_STATUS_DATACORRUPTED = 12,  /*  Diag returned data corrupted */

drivers/scsi/bfa/bfa_ioc.c

+683 −44

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/bfa/bfa_ioc.h

+6 −1
Original line number Diff line number Diff line
@@ -515,6 +515,8 @@ void bfa_flash_attach(struct bfa_flash_s *flash, struct bfa_ioc_s *ioc, 
		void *dev, struct bfa_trc_mod_s *trcmod, bfa_boolean_t mincfg);

void bfa_flash_memclaim(struct bfa_flash_s *flash,

		u8 *dm_kva, u64 dm_pa, bfa_boolean_t mincfg);

bfa_status_t    bfa_flash_raw_read(void __iomem *pci_bar_kva,

				u32 offset, char *buf, u32 len);



/*

 *	DIAG module specific
@@ -888,7 +890,7 @@ void bfa_ioc_enable(struct bfa_ioc_s *ioc); 
void bfa_ioc_disable(struct bfa_ioc_s *ioc);

bfa_boolean_t bfa_ioc_intx_claim(struct bfa_ioc_s *ioc);



void bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type,

bfa_status_t bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type,

		u32 boot_env);

void bfa_ioc_isr(struct bfa_ioc_s *ioc, struct bfi_mbmsg_s *msg);

void bfa_ioc_error_isr(struct bfa_ioc_s *ioc);
@@ -919,6 +921,7 @@ bfa_status_t bfa_ioc_debug_fwtrc(struct bfa_ioc_s *ioc, void *trcdata, 
				 int *trclen);

bfa_status_t bfa_ioc_debug_fwcore(struct bfa_ioc_s *ioc, void *buf,

	u32 *offset, int *buflen);

bfa_status_t bfa_ioc_fwsig_invalidate(struct bfa_ioc_s *ioc);

bfa_boolean_t bfa_ioc_sem_get(void __iomem *sem_reg);

void bfa_ioc_fwver_get(struct bfa_ioc_s *ioc,

			struct bfi_ioc_image_hdr_s *fwhdr);
@@ -956,6 +959,8 @@ bfa_status_t bfa_ablk_optrom_en(struct bfa_ablk_s *ablk, 
bfa_status_t bfa_ablk_optrom_dis(struct bfa_ablk_s *ablk,

		bfa_ablk_cbfn_t cbfn, void *cbarg);



bfa_status_t bfa_ioc_flash_img_get_chnk(struct bfa_ioc_s *ioc, u32 off,

				u32 *fwimg);

/*

 * bfa mfg wwn API functions

 */

drivers/scsi/bfa/bfa_ioc_cb.c

+23 −0
Original line number Diff line number Diff line
@@ -81,6 +81,29 @@ bfa_ioc_set_cb_hwif(struct bfa_ioc_s *ioc) 
static bfa_boolean_t

bfa_ioc_cb_firmware_lock(struct bfa_ioc_s *ioc)

{

	enum bfi_ioc_state alt_fwstate, cur_fwstate;

	struct bfi_ioc_image_hdr_s fwhdr;



	cur_fwstate = bfa_ioc_cb_get_cur_ioc_fwstate(ioc);

	bfa_trc(ioc, cur_fwstate);

	alt_fwstate = bfa_ioc_cb_get_alt_ioc_fwstate(ioc);

	bfa_trc(ioc, alt_fwstate);



	/*

	 * Uninit implies this is the only driver as of now.

	 */

	if (cur_fwstate == BFI_IOC_UNINIT)

		return BFA_TRUE;

	/*

	 * Check if another driver with a different firmware is active

	 */

	bfa_ioc_fwver_get(ioc, &fwhdr);

	if (!bfa_ioc_fwver_cmp(ioc, &fwhdr) &&

		alt_fwstate != BFI_IOC_DISABLED) {

		bfa_trc(ioc, alt_fwstate);

		return BFA_FALSE;

	}



	return BFA_TRUE;

}

drivers/scsi/bfa/bfad_bsg.c

+15 −0
Original line number Diff line number Diff line
@@ -228,6 +228,18 @@ bfad_iocmd_iocfc_get_attr(struct bfad_s *bfad, void *cmd) 
	return 0;

}



int

bfad_iocmd_ioc_fw_sig_inv(struct bfad_s *bfad, void *cmd)

{

	struct bfa_bsg_gen_s *iocmd = (struct bfa_bsg_gen_s *)cmd;

	unsigned long flags;



	spin_lock_irqsave(&bfad->bfad_lock, flags);

	iocmd->status = bfa_ioc_fwsig_invalidate(&bfad->bfa.ioc);

	spin_unlock_irqrestore(&bfad->bfad_lock, flags);

	return 0;

}



int

bfad_iocmd_iocfc_set_intr(struct bfad_s *bfad, void *cmd)

{
@@ -2893,6 +2905,9 @@ bfad_iocmd_handler(struct bfad_s *bfad, unsigned int cmd, void *iocmd, 
	case IOCMD_IOC_PCIFN_CFG:

		rc = bfad_iocmd_ioc_get_pcifn_cfg(bfad, iocmd);

		break;

	case IOCMD_IOC_FW_SIG_INV:

		rc = bfad_iocmd_ioc_fw_sig_inv(bfad, iocmd);

		break;

	case IOCMD_PCIFN_CREATE:

		rc = bfad_iocmd_pcifn_create(bfad, iocmd);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE