IB/mthca: Stop returning separate error and status from FW commands
Instead of having firmware command functions return an error and also
a status, leading to code like:
err = mthca_FW_COMMAND(..., &status);
if (err)
goto out;
if (status) {
err = -E...;
goto out;
}
all over the place, just handle the FW status inside the FW command
handling code (the way mlx4 does it), so we can simply write:
err = mthca_FW_COMMAND(...);
if (err)
goto out;
In addition to simplifying the source code, this also saves a healthy
chunk of text:
add/remove: 0/0 grow/shrink: 10/88 up/down: 510/-3357 (-2847)
function old new delta
static.trans_table 324 584 +260
mthca_cmd_poll 352 477 +125
mthca_cmd_wait 511 567 +56
mthca_table_put 213 240 +27
mthca_cleanup_db_tab 372 387 +15
__mthca_remove_one 314 323 +9
mthca_cleanup_user_db_tab 275 283 +8
__mthca_init_one 1738 1746 +8
mthca_cleanup 20 21 +1
mthca_MAD_IFC 1081 1082 +1
mthca_MGID_HASH 43 40 -3
mthca_MAP_ICM_AUX 23 20 -3
mthca_MAP_ICM 19 16 -3
mthca_MAP_FA 23 20 -3
mthca_READ_MGM 43 38 -5
mthca_QUERY_SRQ 43 38 -5
mthca_QUERY_QP 59 54 -5
mthca_HW2SW_SRQ 43 38 -5
mthca_HW2SW_MPT 60 55 -5
mthca_HW2SW_EQ 43 38 -5
mthca_HW2SW_CQ 43 38 -5
mthca_free_icm_table 120 114 -6
mthca_query_srq 214 206 -8
mthca_free_qp 662 654 -8
mthca_cmd 38 28 -10
mthca_alloc_db 1321 1311 -10
mthca_setup_hca 1067 1055 -12
mthca_WRITE_MTT 35 22 -13
mthca_WRITE_MGM 40 27 -13
mthca_UNMAP_ICM_AUX 36 23 -13
mthca_UNMAP_FA 36 23 -13
mthca_SYS_DIS 36 23 -13
mthca_SYNC_TPT 36 23 -13
mthca_SW2HW_SRQ 35 22 -13
mthca_SW2HW_MPT 35 22 -13
mthca_SW2HW_EQ 35 22 -13
mthca_SW2HW_CQ 35 22 -13
mthca_RUN_FW 36 23 -13
mthca_DISABLE_LAM 36 23 -13
mthca_CLOSE_IB 36 23 -13
mthca_CLOSE_HCA 38 25 -13
mthca_ARM_SRQ 39 26 -13
mthca_free_icms 178 164 -14
mthca_QUERY_DDR 389 375 -14
mthca_resize_cq 1063 1048 -15
mthca_unmap_eq_icm 123 107 -16
mthca_map_eq_icm 396 380 -16
mthca_cmd_box 90 74 -16
mthca_SET_IB 433 417 -16
mthca_RESIZE_CQ 369 353 -16
mthca_MAP_ICM_page 240 224 -16
mthca_MAP_EQ 183 167 -16
mthca_INIT_IB 473 457 -16
mthca_INIT_HCA 745 729 -16
mthca_map_user_db 816 798 -18
mthca_SYS_EN 157 139 -18
mthca_cleanup_qp_table 78 59 -19
mthca_cleanup_eq_table 168 149 -19
mthca_UNMAP_ICM 143 121 -22
mthca_modify_srq 172 149 -23
mthca_unmap_fmr 198 174 -24
mthca_query_qp 814 790 -24
mthca_query_pkey 343 319 -24
mthca_SET_ICM_SIZE 34 10 -24
mthca_QUERY_DEV_LIM 1870 1846 -24
mthca_map_cmd 1130 1105 -25
mthca_ENABLE_LAM 401 375 -26
mthca_modify_port 247 220 -27
mthca_query_device 884 850 -34
mthca_NOP 75 41 -34
mthca_table_get 287 249 -38
mthca_init_qp_table 333 293 -40
mthca_MODIFY_QP 348 308 -40
mthca_close_hca 131 89 -42
mthca_free_eq 435 390 -45
mthca_query_port 755 705 -50
mthca_free_cq 581 528 -53
mthca_alloc_icm_table 578 524 -54
mthca_multicast_attach 1041 986 -55
mthca_init_hca 326 271 -55
mthca_query_gid 487 431 -56
mthca_free_srq 524 468 -56
mthca_free_mr 168 111 -57
mthca_create_eq 1560 1501 -59
mthca_multicast_detach 790 728 -62
mthca_write_mtt 918 854 -64
mthca_register_device 1406 1342 -64
mthca_fmr_alloc 947 883 -64
mthca_mr_alloc 652 582 -70
mthca_process_mad 1242 1164 -78
mthca_dev_lim 910 830 -80
find_mgm 482 400 -82
mthca_modify_qp 3852 3753 -99
mthca_init_cq 1281 1181 -100
mthca_alloc_srq 1719 1610 -109
mthca_init_eq_table 1807 1679 -128
mthca_init_tavor 761 491 -270
mthca_init_arbel 2617 2098 -519
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.de>
This commit is contained in:
Goldwyn Rodrigues
committed by
Roland Dreier
Roland Dreier
parent
620917de59
commit
cdb73db0b6
@@ -308,7 +308,6 @@ static void store_attrs(struct mthca_sqp *sqp, const struct ib_qp_attr *attr,
|
||||
static void init_port(struct mthca_dev *dev, int port)
|
||||
{
|
||||
int err;
|
||||
u8 status;
|
||||
struct mthca_init_ib_param param;
|
||||
|
||||
memset(¶m, 0, sizeof param);
|
||||
@@ -319,11 +318,9 @@ static void init_port(struct mthca_dev *dev, int port)
|
||||
param.gid_cap = dev->limits.gid_table_len;
|
||||
param.pkey_cap = dev->limits.pkey_table_len;
|
||||
|
||||
err = mthca_INIT_IB(dev, ¶m, port, &status);
|
||||
err = mthca_INIT_IB(dev, ¶m, port);
|
||||
if (err)
|
||||
mthca_warn(dev, "INIT_IB failed, return code %d.\n", err);
|
||||
if (status)
|
||||
mthca_warn(dev, "INIT_IB returned status %02x.\n", status);
|
||||
}
|
||||
|
||||
static __be32 get_hw_access_flags(struct mthca_qp *qp, const struct ib_qp_attr *attr,
|
||||
@@ -433,7 +430,6 @@ int mthca_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_m
|
||||
struct mthca_qp_param *qp_param;
|
||||
struct mthca_qp_context *context;
|
||||
int mthca_state;
|
||||
u8 status;
|
||||
|
||||
mutex_lock(&qp->mutex);
|
||||
|
||||
@@ -448,12 +444,9 @@ int mthca_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_m
|
||||
goto out;
|
||||
}
|
||||
|
||||
err = mthca_QUERY_QP(dev, qp->qpn, 0, mailbox, &status);
|
||||
if (err)
|
||||
goto out_mailbox;
|
||||
if (status) {
|
||||
mthca_warn(dev, "QUERY_QP returned status %02x\n", status);
|
||||
err = -EINVAL;
|
||||
err = mthca_QUERY_QP(dev, qp->qpn, 0, mailbox);
|
||||
if (err) {
|
||||
mthca_warn(dev, "QUERY_QP failed (%d)\n", err);
|
||||
goto out_mailbox;
|
||||
}
|
||||
|
||||
@@ -555,7 +548,6 @@ static int __mthca_modify_qp(struct ib_qp *ibqp,
|
||||
struct mthca_qp_param *qp_param;
|
||||
struct mthca_qp_context *qp_context;
|
||||
u32 sqd_event = 0;
|
||||
u8 status;
|
||||
int err = -EINVAL;
|
||||
|
||||
mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
|
||||
@@ -781,13 +773,10 @@ static int __mthca_modify_qp(struct ib_qp *ibqp,
|
||||
sqd_event = 1 << 31;
|
||||
|
||||
err = mthca_MODIFY_QP(dev, cur_state, new_state, qp->qpn, 0,
|
||||
mailbox, sqd_event, &status);
|
||||
if (err)
|
||||
goto out_mailbox;
|
||||
if (status) {
|
||||
mthca_warn(dev, "modify QP %d->%d returned status %02x.\n",
|
||||
cur_state, new_state, status);
|
||||
err = -EINVAL;
|
||||
mailbox, sqd_event);
|
||||
if (err) {
|
||||
mthca_warn(dev, "modify QP %d->%d returned %d.\n",
|
||||
cur_state, new_state, err);
|
||||
goto out_mailbox;
|
||||
}
|
||||
|
||||
@@ -817,7 +806,7 @@ static int __mthca_modify_qp(struct ib_qp *ibqp,
|
||||
cur_state != IB_QPS_ERR &&
|
||||
(new_state == IB_QPS_RESET ||
|
||||
new_state == IB_QPS_ERR))
|
||||
mthca_CLOSE_IB(dev, qp->port, &status);
|
||||
mthca_CLOSE_IB(dev, qp->port);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1429,7 +1418,6 @@ static inline int get_qp_refcount(struct mthca_dev *dev, struct mthca_qp *qp)
|
||||
void mthca_free_qp(struct mthca_dev *dev,
|
||||
struct mthca_qp *qp)
|
||||
{
|
||||
u8 status;
|
||||
struct mthca_cq *send_cq;
|
||||
struct mthca_cq *recv_cq;
|
||||
|
||||
@@ -1454,7 +1442,7 @@ void mthca_free_qp(struct mthca_dev *dev,
|
||||
|
||||
if (qp->state != IB_QPS_RESET)
|
||||
mthca_MODIFY_QP(dev, qp->state, IB_QPS_RESET, qp->qpn, 0,
|
||||
NULL, 0, &status);
|
||||
NULL, 0);
|
||||
|
||||
/*
|
||||
* If this is a userspace QP, the buffers, MR, CQs and so on
|
||||
@@ -2263,7 +2251,6 @@ void mthca_free_err_wqe(struct mthca_dev *dev, struct mthca_qp *qp, int is_send,
|
||||
int mthca_init_qp_table(struct mthca_dev *dev)
|
||||
{
|
||||
int err;
|
||||
u8 status;
|
||||
int i;
|
||||
|
||||
spin_lock_init(&dev->qp_table.lock);
|
||||
@@ -2290,15 +2277,10 @@ int mthca_init_qp_table(struct mthca_dev *dev)
|
||||
|
||||
for (i = 0; i < 2; ++i) {
|
||||
err = mthca_CONF_SPECIAL_QP(dev, i ? IB_QPT_GSI : IB_QPT_SMI,
|
||||
dev->qp_table.sqp_start + i * 2,
|
||||
&status);
|
||||
if (err)
|
||||
goto err_out;
|
||||
if (status) {
|
||||
dev->qp_table.sqp_start + i * 2);
|
||||
if (err) {
|
||||
mthca_warn(dev, "CONF_SPECIAL_QP returned "
|
||||
"status %02x, aborting.\n",
|
||||
status);
|
||||
err = -EINVAL;
|
||||
"%d, aborting.\n", err);
|
||||
goto err_out;
|
||||
}
|
||||
}
|
||||
@@ -2306,7 +2288,7 @@ int mthca_init_qp_table(struct mthca_dev *dev)
|
||||
|
||||
err_out:
|
||||
for (i = 0; i < 2; ++i)
|
||||
mthca_CONF_SPECIAL_QP(dev, i, 0, &status);
|
||||
mthca_CONF_SPECIAL_QP(dev, i, 0);
|
||||
|
||||
mthca_array_cleanup(&dev->qp_table.qp, dev->limits.num_qps);
|
||||
mthca_alloc_cleanup(&dev->qp_table.alloc);
|
||||
@@ -2317,10 +2299,9 @@ int mthca_init_qp_table(struct mthca_dev *dev)
|
||||
void mthca_cleanup_qp_table(struct mthca_dev *dev)
|
||||
{
|
||||
int i;
|
||||
u8 status;
|
||||
|
||||
for (i = 0; i < 2; ++i)
|
||||
mthca_CONF_SPECIAL_QP(dev, i, 0, &status);
|
||||
mthca_CONF_SPECIAL_QP(dev, i, 0);
|
||||
|
||||
mthca_array_cleanup(&dev->qp_table.qp, dev->limits.num_qps);
|
||||
mthca_alloc_cleanup(&dev->qp_table.alloc);
|
||||
|
||||
Reference in New Issue
Block a user