Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 226881
b: refs/heads/master
c: d4b671c
h: refs/heads/master
i:
  226879: d9ed187
v: v3
  • Loading branch information
Jing Huang authored and James Bottomley committed Dec 31, 2010
1 parent 46b1045 commit 723da4b
Show file tree
Hide file tree
Showing 17 changed files with 126 additions and 136 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aa5cbf8a70f57c5360ce1bfef692b357c866ae7f
refs/heads/master: d4b671c58ebeb56dfc8fe8bcca25e0a06bc9359a
4 changes: 2 additions & 2 deletions trunk/drivers/scsi/bfa/bfa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
\
bfa_assert(((__reqq) < BFI_IOC_MAX_CQS)); \
bfa_assert((__wqe)->qresume && (__wqe)->cbarg); \
WARN_ON(((__reqq) >= BFI_IOC_MAX_CQS)); \
WARN_ON(!((__wqe)->qresume && (__wqe)->cbarg)); \
\
list_add_tail(&(__wqe)->qe, waitq); \
} while (0)
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/scsi/bfa/bfa_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_id);
bfa_trc(bfa, m->mhdr.mtag.i2htok);
bfa_assert(0);
WARN_ON(1);
bfa_trc_stop(bfa->trcmod);
}

Expand Down Expand Up @@ -433,7 +433,7 @@ bfa_iocfc_send_cfg(void *bfa_arg)
struct bfa_iocfc_cfg_s *cfg = &iocfc->cfg;
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_iocfc_reset_queues(bfa);
Expand Down Expand Up @@ -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);
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);
}
Expand Down Expand Up @@ -894,7 +894,7 @@ bfa_iocfc_isr(void *bfaarg, struct bfi_mbmsg_s *m)
iocfc->updateq_cbfn(iocfc->updateq_cbarg, BFA_STATUS_OK);
break;
default:
bfa_assert(0);
WARN_ON(1);
}
}

Expand Down Expand Up @@ -1063,7 +1063,7 @@ bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo)
int i;
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));
meminfo->meminfo[BFA_MEM_TYPE_KVA - 1].mem_type =
Expand Down Expand Up @@ -1117,7 +1117,7 @@ bfa_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,

bfa->fcs = BFA_FALSE;

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

/*
* initialize all memory pointers for iterative allocation
Expand Down
10 changes: 0 additions & 10 deletions trunk/drivers/scsi/bfa/bfa_cs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,16 +163,6 @@ __bfa_trc32(struct bfa_trc_mod_s *trcm, int fileno, int line, u32 data)
#define bfa_trc_fp(_trcp, _data)
#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 { \
bfa_trc(__mod, (((u32)0xDEAD << 16) | __event)); \
printk(KERN_ERR "Assertion failure: %s:%d: %d", \
Expand Down
42 changes: 21 additions & 21 deletions trunk/drivers/scsi/bfa/bfa_fcpim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ static void bfa_itnim_update_del_itn_stats(struct bfa_itnim_s *itnim);
#define bfa_fcpim_additn(__itnim) \
list_add_tail(&(__itnim)->qe, &(__itnim)->fcpim->itnim_q)
#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); \
list_del(&(__itnim)->qe); \
bfa_assert(list_empty(&(__itnim)->io_q)); \
bfa_assert(list_empty(&(__itnim)->io_cleanup_q)); \
bfa_assert(list_empty(&(__itnim)->pending_q)); \
WARN_ON(!list_empty(&(__itnim)->io_q)); \
WARN_ON(!list_empty(&(__itnim)->io_cleanup_q)); \
WARN_ON(!list_empty(&(__itnim)->pending_q)); \
} while (0)

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

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_itnim_iotov, itnim, itnim->fcpim->path_tov);
}
Expand Down Expand Up @@ -1262,15 +1262,15 @@ bfa_itnim_isr(struct bfa_s *bfa, struct bfi_msg_s *m)
case BFI_ITNIM_I2H_CREATE_RSP:
itnim = BFA_ITNIM_FROM_TAG(fcpim,
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_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);
break;

case BFI_ITNIM_I2H_DELETE_RSP:
itnim = BFA_ITNIM_FROM_TAG(fcpim,
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_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);
break;
Expand All @@ -1284,7 +1284,7 @@ bfa_itnim_isr(struct bfa_s *bfa, struct bfi_msg_s *m)

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

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

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

itnim->ditn = ditn;

Expand Down Expand Up @@ -1416,7 +1416,7 @@ bfa_ioim_sm_uninit(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
* requests immediately.
*/
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_ioim_abort, ioim);
break;
Expand Down Expand Up @@ -1649,7 +1649,7 @@ bfa_ioim_sm_abort(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
break;

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;

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

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;
bfa_sm_set_state(ioim, bfa_ioim_sm_cleanup_qfull);
break;
Expand Down Expand Up @@ -2236,7 +2236,7 @@ bfa_ioim_sgpg_alloc(struct bfa_ioim_s *ioim)
{
u16 nsgpgs;

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

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

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, rsp->io_status);
Expand Down Expand Up @@ -2475,13 +2475,13 @@ bfa_ioim_isr(struct bfa_s *bfa, struct bfi_msg_s *m)

case BFI_IOIM_STS_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;
break;

case BFI_IOIM_STS_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;
break;

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

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

bfa_sm_send_event(ioim, evt);
Expand All @@ -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);

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_ioim_cb_profile_comp(fcpim, ioim);
Expand Down Expand Up @@ -2944,7 +2944,7 @@ bfa_tskim_match_scope(struct bfa_tskim_s *tskim, struct scsi_lun lun)
return !memcmp(&tskim->lun, &lun, sizeof(lun));

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

return BFA_FALSE;
Expand Down Expand Up @@ -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);

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;

Expand Down Expand Up @@ -3225,7 +3225,7 @@ bfa_tskim_alloc(struct bfa_s *bfa, struct bfad_tskim_s *dtsk)
void
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_add_tail(&tskim->qe, &tskim->fcpim->tskim_free_q);
}
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/scsi/bfa/bfa_fcs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ bfa_fcs_fabric_attach(struct bfa_fcs_s *fcs)
INIT_LIST_HEAD(&fabric->vport_q);
INIT_LIST_HEAD(&fabric->vf_q);
fabric->lps = bfa_lps_alloc(fcs->bfa);
bfa_assert(fabric->lps);
WARN_ON(!fabric->lps);

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

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

Expand Down Expand Up @@ -1364,7 +1364,7 @@ bfa_fcs_uf_recv(void *cbarg, struct bfa_uf_s *uf)
* drop frame if vfid is unknown
*/
if (!fabric) {
bfa_assert(0);
WARN_ON(1);
bfa_stats(fcs, uf.vfid_unknown);
bfa_uf_free(uf);
return;
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/scsi/bfa/bfa_fcs_fcpim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ bfa_fcs_itnim_create(struct bfa_fcs_rport_s *rport)
if (bfa_itnim == NULL) {
bfa_trc(port->fcs, rport->pwwn);
bfa_fcb_itnim_free(port->fcs->bfad, itnim_drv);
bfa_assert(0);
WARN_ON(1);
return NULL;
}

Expand Down Expand Up @@ -700,7 +700,7 @@ bfa_fcs_itnim_lookup(struct bfa_fcs_lport_s *port, wwn_t rpwwn)
if (!rport)
return NULL;

bfa_assert(rport->itnim != NULL);
WARN_ON(rport->itnim == NULL);
return rport->itnim;
}

Expand Down Expand Up @@ -729,7 +729,7 @@ bfa_fcs_itnim_stats_get(struct bfa_fcs_lport_s *port, wwn_t rpwwn,
{
struct bfa_fcs_itnim_s *itnim = NULL;

bfa_assert(port != NULL);
WARN_ON(port == NULL);

itnim = bfa_fcs_itnim_lookup(port, rpwwn);

Expand All @@ -746,7 +746,7 @@ bfa_fcs_itnim_stats_clear(struct bfa_fcs_lport_s *port, wwn_t rpwwn)
{
struct bfa_fcs_itnim_s *itnim = NULL;

bfa_assert(port != NULL);
WARN_ON(port == NULL);

itnim = bfa_fcs_itnim_lookup(port, rpwwn);

Expand Down Expand Up @@ -778,6 +778,6 @@ bfa_fcs_fcpim_uf_recv(struct bfa_fcs_itnim_s *itnim,
break;

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

0 comments on commit 723da4b

Please sign in to comment.