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
@@ -165,19 +165,14 @@ static int mthca_tune_pci(struct mthca_dev *mdev)
|
||||
static int mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim *dev_lim)
|
||||
{
|
||||
int err;
|
||||
u8 status;
|
||||
|
||||
mdev->limits.mtt_seg_size = (1 << log_mtts_per_seg) * 8;
|
||||
err = mthca_QUERY_DEV_LIM(mdev, dev_lim, &status);
|
||||
err = mthca_QUERY_DEV_LIM(mdev, dev_lim);
|
||||
if (err) {
|
||||
mthca_err(mdev, "QUERY_DEV_LIM command failed, aborting.\n");
|
||||
mthca_err(mdev, "QUERY_DEV_LIM command returned %d"
|
||||
", aborting.\n", err);
|
||||
return err;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "QUERY_DEV_LIM returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (dev_lim->min_page_sz > PAGE_SIZE) {
|
||||
mthca_err(mdev, "HCA minimum page size of %d bigger than "
|
||||
"kernel PAGE_SIZE of %ld, aborting.\n",
|
||||
@@ -293,49 +288,32 @@ static int mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim *dev_lim)
|
||||
static int mthca_init_tavor(struct mthca_dev *mdev)
|
||||
{
|
||||
s64 size;
|
||||
u8 status;
|
||||
int err;
|
||||
struct mthca_dev_lim dev_lim;
|
||||
struct mthca_profile profile;
|
||||
struct mthca_init_hca_param init_hca;
|
||||
|
||||
err = mthca_SYS_EN(mdev, &status);
|
||||
err = mthca_SYS_EN(mdev);
|
||||
if (err) {
|
||||
mthca_err(mdev, "SYS_EN command failed, aborting.\n");
|
||||
mthca_err(mdev, "SYS_EN command returned %d, aborting.\n", err);
|
||||
return err;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "SYS_EN returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = mthca_QUERY_FW(mdev, &status);
|
||||
err = mthca_QUERY_FW(mdev);
|
||||
if (err) {
|
||||
mthca_err(mdev, "QUERY_FW command failed, aborting.\n");
|
||||
mthca_err(mdev, "QUERY_FW command returned %d,"
|
||||
" aborting.\n", err);
|
||||
goto err_disable;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "QUERY_FW returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
goto err_disable;
|
||||
}
|
||||
err = mthca_QUERY_DDR(mdev, &status);
|
||||
err = mthca_QUERY_DDR(mdev);
|
||||
if (err) {
|
||||
mthca_err(mdev, "QUERY_DDR command failed, aborting.\n");
|
||||
goto err_disable;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "QUERY_DDR returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
mthca_err(mdev, "QUERY_DDR command returned %d, aborting.\n", err);
|
||||
goto err_disable;
|
||||
}
|
||||
|
||||
err = mthca_dev_lim(mdev, &dev_lim);
|
||||
if (err) {
|
||||
mthca_err(mdev, "QUERY_DEV_LIM command failed, aborting.\n");
|
||||
mthca_err(mdev, "QUERY_DEV_LIM command returned %d, aborting.\n", err);
|
||||
goto err_disable;
|
||||
}
|
||||
|
||||
@@ -351,29 +329,22 @@ static int mthca_init_tavor(struct mthca_dev *mdev)
|
||||
goto err_disable;
|
||||
}
|
||||
|
||||
err = mthca_INIT_HCA(mdev, &init_hca, &status);
|
||||
err = mthca_INIT_HCA(mdev, &init_hca);
|
||||
if (err) {
|
||||
mthca_err(mdev, "INIT_HCA command failed, aborting.\n");
|
||||
goto err_disable;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "INIT_HCA returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
mthca_err(mdev, "INIT_HCA command returned %d, aborting.\n", err);
|
||||
goto err_disable;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_disable:
|
||||
mthca_SYS_DIS(mdev, &status);
|
||||
mthca_SYS_DIS(mdev);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mthca_load_fw(struct mthca_dev *mdev)
|
||||
{
|
||||
u8 status;
|
||||
int err;
|
||||
|
||||
/* FIXME: use HCA-attached memory for FW if present */
|
||||
@@ -386,31 +357,21 @@ static int mthca_load_fw(struct mthca_dev *mdev)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
err = mthca_MAP_FA(mdev, mdev->fw.arbel.fw_icm, &status);
|
||||
err = mthca_MAP_FA(mdev, mdev->fw.arbel.fw_icm);
|
||||
if (err) {
|
||||
mthca_err(mdev, "MAP_FA command failed, aborting.\n");
|
||||
mthca_err(mdev, "MAP_FA command returned %d, aborting.\n", err);
|
||||
goto err_free;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "MAP_FA returned status 0x%02x, aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
goto err_free;
|
||||
}
|
||||
err = mthca_RUN_FW(mdev, &status);
|
||||
err = mthca_RUN_FW(mdev);
|
||||
if (err) {
|
||||
mthca_err(mdev, "RUN_FW command failed, aborting.\n");
|
||||
goto err_unmap_fa;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "RUN_FW returned status 0x%02x, aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
mthca_err(mdev, "RUN_FW command returned %d, aborting.\n", err);
|
||||
goto err_unmap_fa;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_unmap_fa:
|
||||
mthca_UNMAP_FA(mdev, &status);
|
||||
mthca_UNMAP_FA(mdev);
|
||||
|
||||
err_free:
|
||||
mthca_free_icm(mdev, mdev->fw.arbel.fw_icm, 0);
|
||||
@@ -423,19 +384,13 @@ static int mthca_init_icm(struct mthca_dev *mdev,
|
||||
u64 icm_size)
|
||||
{
|
||||
u64 aux_pages;
|
||||
u8 status;
|
||||
int err;
|
||||
|
||||
err = mthca_SET_ICM_SIZE(mdev, icm_size, &aux_pages, &status);
|
||||
err = mthca_SET_ICM_SIZE(mdev, icm_size, &aux_pages);
|
||||
if (err) {
|
||||
mthca_err(mdev, "SET_ICM_SIZE command failed, aborting.\n");
|
||||
mthca_err(mdev, "SET_ICM_SIZE command returned %d, aborting.\n", err);
|
||||
return err;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "SET_ICM_SIZE returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
mthca_dbg(mdev, "%lld KB of HCA context requires %lld KB aux memory.\n",
|
||||
(unsigned long long) icm_size >> 10,
|
||||
@@ -448,14 +403,9 @@ static int mthca_init_icm(struct mthca_dev *mdev,
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
err = mthca_MAP_ICM_AUX(mdev, mdev->fw.arbel.aux_icm, &status);
|
||||
err = mthca_MAP_ICM_AUX(mdev, mdev->fw.arbel.aux_icm);
|
||||
if (err) {
|
||||
mthca_err(mdev, "MAP_ICM_AUX command failed, aborting.\n");
|
||||
goto err_free_aux;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "MAP_ICM_AUX returned status 0x%02x, aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
mthca_err(mdev, "MAP_ICM_AUX returned %d, aborting.\n", err);
|
||||
goto err_free_aux;
|
||||
}
|
||||
|
||||
@@ -596,7 +546,7 @@ err_unmap_eq:
|
||||
mthca_unmap_eq_icm(mdev);
|
||||
|
||||
err_unmap_aux:
|
||||
mthca_UNMAP_ICM_AUX(mdev, &status);
|
||||
mthca_UNMAP_ICM_AUX(mdev);
|
||||
|
||||
err_free_aux:
|
||||
mthca_free_icm(mdev, mdev->fw.arbel.aux_icm, 0);
|
||||
@@ -606,7 +556,6 @@ err_free_aux:
|
||||
|
||||
static void mthca_free_icms(struct mthca_dev *mdev)
|
||||
{
|
||||
u8 status;
|
||||
|
||||
mthca_free_icm_table(mdev, mdev->mcg_table.table);
|
||||
if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
|
||||
@@ -619,7 +568,7 @@ static void mthca_free_icms(struct mthca_dev *mdev)
|
||||
mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
|
||||
mthca_unmap_eq_icm(mdev);
|
||||
|
||||
mthca_UNMAP_ICM_AUX(mdev, &status);
|
||||
mthca_UNMAP_ICM_AUX(mdev);
|
||||
mthca_free_icm(mdev, mdev->fw.arbel.aux_icm, 0);
|
||||
}
|
||||
|
||||
@@ -629,43 +578,32 @@ static int mthca_init_arbel(struct mthca_dev *mdev)
|
||||
struct mthca_profile profile;
|
||||
struct mthca_init_hca_param init_hca;
|
||||
s64 icm_size;
|
||||
u8 status;
|
||||
int err;
|
||||
|
||||
err = mthca_QUERY_FW(mdev, &status);
|
||||
err = mthca_QUERY_FW(mdev);
|
||||
if (err) {
|
||||
mthca_err(mdev, "QUERY_FW command failed, aborting.\n");
|
||||
mthca_err(mdev, "QUERY_FW command failed %d, aborting.\n", err);
|
||||
return err;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "QUERY_FW returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = mthca_ENABLE_LAM(mdev, &status);
|
||||
if (err) {
|
||||
mthca_err(mdev, "ENABLE_LAM command failed, aborting.\n");
|
||||
return err;
|
||||
}
|
||||
if (status == MTHCA_CMD_STAT_LAM_NOT_PRE) {
|
||||
err = mthca_ENABLE_LAM(mdev);
|
||||
if (err == -EAGAIN) {
|
||||
mthca_dbg(mdev, "No HCA-attached memory (running in MemFree mode)\n");
|
||||
mdev->mthca_flags |= MTHCA_FLAG_NO_LAM;
|
||||
} else if (status) {
|
||||
mthca_err(mdev, "ENABLE_LAM returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
return -EINVAL;
|
||||
} else if (err) {
|
||||
mthca_err(mdev, "ENABLE_LAM returned %d, aborting.\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = mthca_load_fw(mdev);
|
||||
if (err) {
|
||||
mthca_err(mdev, "Failed to start FW, aborting.\n");
|
||||
mthca_err(mdev, "Loading FW returned %d, aborting.\n", err);
|
||||
goto err_disable;
|
||||
}
|
||||
|
||||
err = mthca_dev_lim(mdev, &dev_lim);
|
||||
if (err) {
|
||||
mthca_err(mdev, "QUERY_DEV_LIM command failed, aborting.\n");
|
||||
mthca_err(mdev, "QUERY_DEV_LIM returned %d, aborting.\n", err);
|
||||
goto err_stop_fw;
|
||||
}
|
||||
|
||||
@@ -685,15 +623,9 @@ static int mthca_init_arbel(struct mthca_dev *mdev)
|
||||
if (err)
|
||||
goto err_stop_fw;
|
||||
|
||||
err = mthca_INIT_HCA(mdev, &init_hca, &status);
|
||||
err = mthca_INIT_HCA(mdev, &init_hca);
|
||||
if (err) {
|
||||
mthca_err(mdev, "INIT_HCA command failed, aborting.\n");
|
||||
goto err_free_icm;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "INIT_HCA returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
mthca_err(mdev, "INIT_HCA command returned %d, aborting.\n", err);
|
||||
goto err_free_icm;
|
||||
}
|
||||
|
||||
@@ -703,37 +635,34 @@ err_free_icm:
|
||||
mthca_free_icms(mdev);
|
||||
|
||||
err_stop_fw:
|
||||
mthca_UNMAP_FA(mdev, &status);
|
||||
mthca_UNMAP_FA(mdev);
|
||||
mthca_free_icm(mdev, mdev->fw.arbel.fw_icm, 0);
|
||||
|
||||
err_disable:
|
||||
if (!(mdev->mthca_flags & MTHCA_FLAG_NO_LAM))
|
||||
mthca_DISABLE_LAM(mdev, &status);
|
||||
mthca_DISABLE_LAM(mdev);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void mthca_close_hca(struct mthca_dev *mdev)
|
||||
{
|
||||
u8 status;
|
||||
|
||||
mthca_CLOSE_HCA(mdev, 0, &status);
|
||||
mthca_CLOSE_HCA(mdev, 0);
|
||||
|
||||
if (mthca_is_memfree(mdev)) {
|
||||
mthca_free_icms(mdev);
|
||||
|
||||
mthca_UNMAP_FA(mdev, &status);
|
||||
mthca_UNMAP_FA(mdev);
|
||||
mthca_free_icm(mdev, mdev->fw.arbel.fw_icm, 0);
|
||||
|
||||
if (!(mdev->mthca_flags & MTHCA_FLAG_NO_LAM))
|
||||
mthca_DISABLE_LAM(mdev, &status);
|
||||
mthca_DISABLE_LAM(mdev);
|
||||
} else
|
||||
mthca_SYS_DIS(mdev, &status);
|
||||
mthca_SYS_DIS(mdev);
|
||||
}
|
||||
|
||||
static int mthca_init_hca(struct mthca_dev *mdev)
|
||||
{
|
||||
u8 status;
|
||||
int err;
|
||||
struct mthca_adapter adapter;
|
||||
|
||||
@@ -745,15 +674,9 @@ static int mthca_init_hca(struct mthca_dev *mdev)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = mthca_QUERY_ADAPTER(mdev, &adapter, &status);
|
||||
err = mthca_QUERY_ADAPTER(mdev, &adapter);
|
||||
if (err) {
|
||||
mthca_err(mdev, "QUERY_ADAPTER command failed, aborting.\n");
|
||||
goto err_close;
|
||||
}
|
||||
if (status) {
|
||||
mthca_err(mdev, "QUERY_ADAPTER returned status 0x%02x, "
|
||||
"aborting.\n", status);
|
||||
err = -EINVAL;
|
||||
mthca_err(mdev, "QUERY_ADAPTER command returned %d, aborting.\n", err);
|
||||
goto err_close;
|
||||
}
|
||||
|
||||
@@ -772,7 +695,6 @@ err_close:
|
||||
static int mthca_setup_hca(struct mthca_dev *dev)
|
||||
{
|
||||
int err;
|
||||
u8 status;
|
||||
|
||||
MTHCA_INIT_DOORBELL_LOCK(&dev->doorbell_lock);
|
||||
|
||||
@@ -833,8 +755,8 @@ static int mthca_setup_hca(struct mthca_dev *dev)
|
||||
goto err_eq_table_free;
|
||||
}
|
||||
|
||||
err = mthca_NOP(dev, &status);
|
||||
if (err || status) {
|
||||
err = mthca_NOP(dev);
|
||||
if (err) {
|
||||
if (dev->mthca_flags & MTHCA_FLAG_MSI_X) {
|
||||
mthca_warn(dev, "NOP command failed to generate interrupt "
|
||||
"(IRQ %d).\n",
|
||||
@@ -1166,7 +1088,6 @@ err_disable_pdev:
|
||||
static void __mthca_remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct mthca_dev *mdev = pci_get_drvdata(pdev);
|
||||
u8 status;
|
||||
int p;
|
||||
|
||||
if (mdev) {
|
||||
@@ -1174,7 +1095,7 @@ static void __mthca_remove_one(struct pci_dev *pdev)
|
||||
mthca_unregister_device(mdev);
|
||||
|
||||
for (p = 1; p <= mdev->limits.num_ports; ++p)
|
||||
mthca_CLOSE_IB(mdev, p, &status);
|
||||
mthca_CLOSE_IB(mdev, p);
|
||||
|
||||
mthca_cleanup_mcg_table(mdev);
|
||||
mthca_cleanup_av_table(mdev);
|
||||
|
||||
Reference in New Issue
Block a user