[SCSI] bfa: replace bfa_assert with WARN_ON (d4b671c5) · Commits · e / devices / android_kernel_teracube_2e

drivers/scsi/bfa/bfa.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -120,8 +120,8 @@ bfa_reqq_winit(struct bfa_reqq_wait_s wqe, void (qresume) (void *cbarg),
	\		\
	struct list_head *waitq = bfa_reqq(__bfa, __reqq); \		struct list_head *waitq = bfa_reqq(__bfa, __reqq); \
	\		\
	bfa_assert(((__reqq) < BFI_IOC_MAX_CQS)); \		WARN_ON(((__reqq) >= BFI_IOC_MAX_CQS)); \
	bfa_assert((__wqe)->qresume && (__wqe)->cbarg); \		WARN_ON(!((__wqe)->qresume && (__wqe)->cbarg)); \
	\		\
	list_add_tail(&(__wqe)->qe, waitq); \		list_add_tail(&(__wqe)->qe, waitq); \
	} while (0)		} while (0)

drivers/scsi/bfa/bfa_core.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -285,7 +285,7 @@ bfa_isr_unhandled(struct bfa_s bfa, struct bfi_msg_s m)
	bfa_trc(bfa, m->mhdr.msg_class);		bfa_trc(bfa, m->mhdr.msg_class);
	bfa_trc(bfa, m->mhdr.msg_id);		bfa_trc(bfa, m->mhdr.msg_id);
	bfa_trc(bfa, m->mhdr.mtag.i2htok);		bfa_trc(bfa, m->mhdr.mtag.i2htok);
	bfa_assert(0);		WARN_ON(1);
	bfa_trc_stop(bfa->trcmod);		bfa_trc_stop(bfa->trcmod);
	}		}

	@@ -433,7 +433,7 @@ bfa_iocfc_send_cfg(void *bfa_arg)
	struct bfa_iocfc_cfg_s *cfg = &iocfc->cfg;		struct bfa_iocfc_cfg_s *cfg = &iocfc->cfg;
	int i;		int i;

	bfa_assert(cfg->fwcfg.num_cqs <= BFI_IOC_MAX_CQS);		WARN_ON(cfg->fwcfg.num_cqs > BFI_IOC_MAX_CQS);
	bfa_trc(bfa, cfg->fwcfg.num_cqs);		bfa_trc(bfa, cfg->fwcfg.num_cqs);

	bfa_iocfc_reset_queues(bfa);		bfa_iocfc_reset_queues(bfa);
	@@ -753,7 +753,7 @@ bfa_iocfc_disable_cbfn(void *bfa_arg)
	bfa_cb_queue(bfa, &bfa->iocfc.stop_hcb_qe, bfa_iocfc_stop_cb,		bfa_cb_queue(bfa, &bfa->iocfc.stop_hcb_qe, bfa_iocfc_stop_cb,
	bfa);		bfa);
	else {		else {
	bfa_assert(bfa->iocfc.action == BFA_IOCFC_ACT_DISABLE);		WARN_ON(bfa->iocfc.action != BFA_IOCFC_ACT_DISABLE);
	bfa_cb_queue(bfa, &bfa->iocfc.dis_hcb_qe, bfa_iocfc_disable_cb,		bfa_cb_queue(bfa, &bfa->iocfc.dis_hcb_qe, bfa_iocfc_disable_cb,
	bfa);		bfa);
	}		}
	@@ -894,7 +894,7 @@ bfa_iocfc_isr(void bfaarg, struct bfi_mbmsg_s m)
	iocfc->updateq_cbfn(iocfc->updateq_cbarg, BFA_STATUS_OK);		iocfc->updateq_cbfn(iocfc->updateq_cbarg, BFA_STATUS_OK);
	break;		break;
	default:		default:
	bfa_assert(0);		WARN_ON(1);
	}		}
	}		}

	@@ -1063,7 +1063,7 @@ bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s cfg, struct bfa_meminfo_s meminfo)
	int i;		int i;
	u32 km_len = 0, dm_len = 0;		u32 km_len = 0, dm_len = 0;

	bfa_assert((cfg != NULL) && (meminfo != NULL));		WARN_ON((cfg == NULL) \|\| (meminfo == NULL));

	memset((void *)meminfo, 0, sizeof(struct bfa_meminfo_s));		memset((void *)meminfo, 0, sizeof(struct bfa_meminfo_s));
	meminfo->meminfo[BFA_MEM_TYPE_KVA - 1].mem_type =		meminfo->meminfo[BFA_MEM_TYPE_KVA - 1].mem_type =
	@@ -1117,7 +1117,7 @@ bfa_attach(struct bfa_s bfa, void bfad, struct bfa_iocfc_cfg_s *cfg,

	bfa->fcs = BFA_FALSE;		bfa->fcs = BFA_FALSE;

	bfa_assert((cfg != NULL) && (meminfo != NULL));		WARN_ON((cfg == NULL) \|\| (meminfo == NULL));

	/*		/*
	* initialize all memory pointers for iterative allocation		* initialize all memory pointers for iterative allocation

drivers/scsi/bfa/bfa_cs.h

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -163,16 +163,6 @@ __bfa_trc32(struct bfa_trc_mod_s *trcm, int fileno, int line, u32 data)
	#define bfa_trc_fp(_trcp, _data)		#define bfa_trc_fp(_trcp, _data)
	#endif		#endif

	/*
	* @ BFA LOG interfaces
	*/
	#define bfa_assert(__cond) do { \
	if (!(__cond)) { \
	printk(KERN_ERR "assert(%s) failed at %s:%d\\n", \
	#__cond, __FILE__, __LINE__); \
	} \
	} while (0)

	#define bfa_sm_fault(__mod, __event) do { \		#define bfa_sm_fault(__mod, __event) do { \
	bfa_trc(__mod, (((u32)0xDEAD << 16) \| __event)); \		bfa_trc(__mod, (((u32)0xDEAD << 16) \| __event)); \
	printk(KERN_ERR "Assertion failure: %s:%d: %d", \		printk(KERN_ERR "Assertion failure: %s:%d: %d", \

drivers/scsi/bfa/bfa_fcpim.c

+21 −21

Original line number	Original line	Diff line number	Diff line
	@@ -32,12 +32,12 @@ static void bfa_itnim_update_del_itn_stats(struct bfa_itnim_s *itnim);
	#define bfa_fcpim_additn(__itnim) \		#define bfa_fcpim_additn(__itnim) \
	list_add_tail(&(__itnim)->qe, &(__itnim)->fcpim->itnim_q)		list_add_tail(&(__itnim)->qe, &(__itnim)->fcpim->itnim_q)
	#define bfa_fcpim_delitn(__itnim) do { \		#define bfa_fcpim_delitn(__itnim) do { \
	bfa_assert(bfa_q_is_on_q(&(__itnim)->fcpim->itnim_q, __itnim)); \		WARN_ON(!bfa_q_is_on_q(&(__itnim)->fcpim->itnim_q, __itnim)); \
	bfa_itnim_update_del_itn_stats(__itnim); \		bfa_itnim_update_del_itn_stats(__itnim); \
	list_del(&(__itnim)->qe); \		list_del(&(__itnim)->qe); \
	bfa_assert(list_empty(&(__itnim)->io_q)); \		WARN_ON(!list_empty(&(__itnim)->io_q)); \
	bfa_assert(list_empty(&(__itnim)->io_cleanup_q)); \		WARN_ON(!list_empty(&(__itnim)->io_cleanup_q)); \
	bfa_assert(list_empty(&(__itnim)->pending_q)); \		WARN_ON(!list_empty(&(__itnim)->pending_q)); \
	} while (0)		} while (0)

	#define bfa_itnim_online_cb(__itnim) do { \		#define bfa_itnim_online_cb(__itnim) do { \
	@@ -1184,7 +1184,7 @@ bfa_itnim_iotov_start(struct bfa_itnim_s *itnim)
	if (itnim->fcpim->path_tov > 0) {		if (itnim->fcpim->path_tov > 0) {

	itnim->iotov_active = BFA_TRUE;		itnim->iotov_active = BFA_TRUE;
	bfa_assert(bfa_itnim_hold_io(itnim));		WARN_ON(!bfa_itnim_hold_io(itnim));
	bfa_timer_start(itnim->bfa, &itnim->timer,		bfa_timer_start(itnim->bfa, &itnim->timer,
	bfa_itnim_iotov, itnim, itnim->fcpim->path_tov);		bfa_itnim_iotov, itnim, itnim->fcpim->path_tov);
	}		}
	@@ -1262,7 +1262,7 @@ bfa_itnim_isr(struct bfa_s bfa, struct bfi_msg_s m)
	case BFI_ITNIM_I2H_CREATE_RSP:		case BFI_ITNIM_I2H_CREATE_RSP:
	itnim = BFA_ITNIM_FROM_TAG(fcpim,		itnim = BFA_ITNIM_FROM_TAG(fcpim,
	msg.create_rsp->bfa_handle);		msg.create_rsp->bfa_handle);
	bfa_assert(msg.create_rsp->status == BFA_STATUS_OK);		WARN_ON(msg.create_rsp->status != BFA_STATUS_OK);
	bfa_stats(itnim, create_comps);		bfa_stats(itnim, create_comps);
	bfa_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);		bfa_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);
	break;		break;
	@@ -1270,7 +1270,7 @@ bfa_itnim_isr(struct bfa_s bfa, struct bfi_msg_s m)
	case BFI_ITNIM_I2H_DELETE_RSP:		case BFI_ITNIM_I2H_DELETE_RSP:
	itnim = BFA_ITNIM_FROM_TAG(fcpim,		itnim = BFA_ITNIM_FROM_TAG(fcpim,
	msg.delete_rsp->bfa_handle);		msg.delete_rsp->bfa_handle);
	bfa_assert(msg.delete_rsp->status == BFA_STATUS_OK);		WARN_ON(msg.delete_rsp->status != BFA_STATUS_OK);
	bfa_stats(itnim, delete_comps);		bfa_stats(itnim, delete_comps);
	bfa_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);		bfa_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);
	break;		break;
	@@ -1284,7 +1284,7 @@ bfa_itnim_isr(struct bfa_s bfa, struct bfi_msg_s m)

	default:		default:
	bfa_trc(bfa, m->mhdr.msg_id);		bfa_trc(bfa, m->mhdr.msg_id);
	bfa_assert(0);		WARN_ON(1);
	}		}
	}		}

	@@ -1299,7 +1299,7 @@ bfa_itnim_create(struct bfa_s bfa, struct bfa_rport_s rport, void *ditn)
	struct bfa_itnim_s *itnim;		struct bfa_itnim_s *itnim;

	itnim = BFA_ITNIM_FROM_TAG(fcpim, rport->rport_tag);		itnim = BFA_ITNIM_FROM_TAG(fcpim, rport->rport_tag);
	bfa_assert(itnim->rport == rport);		WARN_ON(itnim->rport != rport);

	itnim->ditn = ditn;		itnim->ditn = ditn;

	@@ -1416,7 +1416,7 @@ bfa_ioim_sm_uninit(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
	* requests immediately.		* requests immediately.
	*/		*/
	bfa_sm_set_state(ioim, bfa_ioim_sm_hcb);		bfa_sm_set_state(ioim, bfa_ioim_sm_hcb);
	bfa_assert(bfa_q_is_on_q(&ioim->itnim->pending_q, ioim));		WARN_ON(!bfa_q_is_on_q(&ioim->itnim->pending_q, ioim));
	bfa_cb_queue(ioim->bfa, &ioim->hcb_qe,		bfa_cb_queue(ioim->bfa, &ioim->hcb_qe,
	__bfa_cb_ioim_abort, ioim);		__bfa_cb_ioim_abort, ioim);
	break;		break;
	@@ -1649,7 +1649,7 @@ bfa_ioim_sm_abort(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
	break;		break;

	case BFA_IOIM_SM_CLEANUP:		case BFA_IOIM_SM_CLEANUP:
	bfa_assert(ioim->iosp->abort_explicit == BFA_TRUE);		WARN_ON(ioim->iosp->abort_explicit != BFA_TRUE);
	ioim->iosp->abort_explicit = BFA_FALSE;		ioim->iosp->abort_explicit = BFA_FALSE;

	if (bfa_ioim_send_abort(ioim))		if (bfa_ioim_send_abort(ioim))
	@@ -1795,7 +1795,7 @@ bfa_ioim_sm_abort_qfull(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
	break;		break;

	case BFA_IOIM_SM_CLEANUP:		case BFA_IOIM_SM_CLEANUP:
	bfa_assert(ioim->iosp->abort_explicit == BFA_TRUE);		WARN_ON(ioim->iosp->abort_explicit != BFA_TRUE);
	ioim->iosp->abort_explicit = BFA_FALSE;		ioim->iosp->abort_explicit = BFA_FALSE;
	bfa_sm_set_state(ioim, bfa_ioim_sm_cleanup_qfull);		bfa_sm_set_state(ioim, bfa_ioim_sm_cleanup_qfull);
	break;		break;
	@@ -2236,7 +2236,7 @@ bfa_ioim_sgpg_alloc(struct bfa_ioim_s *ioim)
	{		{
	u16 nsgpgs;		u16 nsgpgs;

	bfa_assert(ioim->nsges > BFI_SGE_INLINE);		WARN_ON(ioim->nsges <= BFI_SGE_INLINE);

	/*		/*
	* allocate SG pages needed		* allocate SG pages needed
	@@ -2444,7 +2444,7 @@ bfa_ioim_isr(struct bfa_s bfa, struct bfi_msg_s m)
	iotag = be16_to_cpu(rsp->io_tag);		iotag = be16_to_cpu(rsp->io_tag);

	ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);		ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);
	bfa_assert(ioim->iotag == iotag);		WARN_ON(ioim->iotag != iotag);

	bfa_trc(ioim->bfa, ioim->iotag);		bfa_trc(ioim->bfa, ioim->iotag);
	bfa_trc(ioim->bfa, rsp->io_status);		bfa_trc(ioim->bfa, rsp->io_status);
	@@ -2475,13 +2475,13 @@ bfa_ioim_isr(struct bfa_s bfa, struct bfi_msg_s m)

	case BFI_IOIM_STS_PROTO_ERR:		case BFI_IOIM_STS_PROTO_ERR:
	bfa_stats(ioim->itnim, iocom_proto_err);		bfa_stats(ioim->itnim, iocom_proto_err);
	bfa_assert(rsp->reuse_io_tag);		WARN_ON(!rsp->reuse_io_tag);
	evt = BFA_IOIM_SM_COMP;		evt = BFA_IOIM_SM_COMP;
	break;		break;

	case BFI_IOIM_STS_SQER_NEEDED:		case BFI_IOIM_STS_SQER_NEEDED:
	bfa_stats(ioim->itnim, iocom_sqer_needed);		bfa_stats(ioim->itnim, iocom_sqer_needed);
	bfa_assert(rsp->reuse_io_tag == 0);		WARN_ON(rsp->reuse_io_tag != 0);
	evt = BFA_IOIM_SM_SQRETRY;		evt = BFA_IOIM_SM_SQRETRY;
	break;		break;

	@@ -2510,7 +2510,7 @@ bfa_ioim_isr(struct bfa_s bfa, struct bfi_msg_s m)
	break;		break;

	default:		default:
	bfa_assert(0);		WARN_ON(1);
	}		}

	bfa_sm_send_event(ioim, evt);		bfa_sm_send_event(ioim, evt);
	@@ -2527,7 +2527,7 @@ bfa_ioim_good_comp_isr(struct bfa_s bfa, struct bfi_msg_s m)
	iotag = be16_to_cpu(rsp->io_tag);		iotag = be16_to_cpu(rsp->io_tag);

	ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);		ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);
	bfa_assert(BFA_IOIM_TAG_2_ID(ioim->iotag) == iotag);		WARN_ON(BFA_IOIM_TAG_2_ID(ioim->iotag) != iotag);

	bfa_trc_fp(ioim->bfa, ioim->iotag);		bfa_trc_fp(ioim->bfa, ioim->iotag);
	bfa_ioim_cb_profile_comp(fcpim, ioim);		bfa_ioim_cb_profile_comp(fcpim, ioim);
	@@ -2944,7 +2944,7 @@ bfa_tskim_match_scope(struct bfa_tskim_s *tskim, struct scsi_lun lun)
	return !memcmp(&tskim->lun, &lun, sizeof(lun));		return !memcmp(&tskim->lun, &lun, sizeof(lun));

	default:		default:
	bfa_assert(0);		WARN_ON(1);
	}		}

	return BFA_FALSE;		return BFA_FALSE;
	@@ -3190,7 +3190,7 @@ bfa_tskim_isr(struct bfa_s bfa, struct bfi_msg_s m)
	u16 tsk_tag = be16_to_cpu(rsp->tsk_tag);		u16 tsk_tag = be16_to_cpu(rsp->tsk_tag);

	tskim = BFA_TSKIM_FROM_TAG(fcpim, tsk_tag);		tskim = BFA_TSKIM_FROM_TAG(fcpim, tsk_tag);
	bfa_assert(tskim->tsk_tag == tsk_tag);		WARN_ON(tskim->tsk_tag != tsk_tag);

	tskim->tsk_status = rsp->tsk_status;		tskim->tsk_status = rsp->tsk_status;

	@@ -3225,7 +3225,7 @@ bfa_tskim_alloc(struct bfa_s bfa, struct bfad_tskim_s dtsk)
	void		void
	bfa_tskim_free(struct bfa_tskim_s *tskim)		bfa_tskim_free(struct bfa_tskim_s *tskim)
	{		{
	bfa_assert(bfa_q_is_on_q_func(&tskim->itnim->tsk_q, &tskim->qe));		WARN_ON(!bfa_q_is_on_q_func(&tskim->itnim->tsk_q, &tskim->qe));
	list_del(&tskim->qe);		list_del(&tskim->qe);
	list_add_tail(&tskim->qe, &tskim->fcpim->tskim_free_q);		list_add_tail(&tskim->qe, &tskim->fcpim->tskim_free_q);
	}		}

drivers/scsi/bfa/bfa_fcs.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -920,7 +920,7 @@ bfa_fcs_fabric_attach(struct bfa_fcs_s *fcs)
	INIT_LIST_HEAD(&fabric->vport_q);		INIT_LIST_HEAD(&fabric->vport_q);
	INIT_LIST_HEAD(&fabric->vf_q);		INIT_LIST_HEAD(&fabric->vf_q);
	fabric->lps = bfa_lps_alloc(fcs->bfa);		fabric->lps = bfa_lps_alloc(fcs->bfa);
	bfa_assert(fabric->lps);		WARN_ON(!fabric->lps);

	/*		/*
	* Initialize fabric delete completion handler. Fabric deletion is		* Initialize fabric delete completion handler. Fabric deletion is
	@@ -1317,7 +1317,7 @@ bfa_fcs_port_event_handler(void *cbarg, enum bfa_port_linkstate event)
	break;		break;

	default:		default:
	bfa_assert(0);		WARN_ON(1);
	}		}
	}		}

	@@ -1364,7 +1364,7 @@ bfa_fcs_uf_recv(void cbarg, struct bfa_uf_s uf)
	* drop frame if vfid is unknown		* drop frame if vfid is unknown
	*/		*/
	if (!fabric) {		if (!fabric) {
	bfa_assert(0);		WARN_ON(1);
	bfa_stats(fcs, uf.vfid_unknown);		bfa_stats(fcs, uf.vfid_unknown);
	bfa_uf_free(uf);		bfa_uf_free(uf);
	return;		return;