Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb73db0 authored by Goldwyn Rodrigues's avatar Goldwyn Rodrigues Committed by Roland Dreier
Browse files

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: default avatarGoldwyn Rodrigues <rgoldwyn@suse.de>
parent 620917de

drivers/infiniband/hw/mthca/mthca_cmd.c

+152 −124
Original line number Diff line number Diff line
@@ -301,6 +301,38 @@ static int mthca_cmd_post(struct mthca_dev *dev, 
	return err;

}





static int mthca_status_to_errno(u8 status)

{

	static const int trans_table[] = {

		[MTHCA_CMD_STAT_INTERNAL_ERR]   = -EIO,

		[MTHCA_CMD_STAT_BAD_OP]         = -EPERM,

		[MTHCA_CMD_STAT_BAD_PARAM]      = -EINVAL,

		[MTHCA_CMD_STAT_BAD_SYS_STATE]  = -ENXIO,

		[MTHCA_CMD_STAT_BAD_RESOURCE]   = -EBADF,

		[MTHCA_CMD_STAT_RESOURCE_BUSY]  = -EBUSY,

		[MTHCA_CMD_STAT_DDR_MEM_ERR]    = -ENOMEM,

		[MTHCA_CMD_STAT_EXCEED_LIM]     = -ENOMEM,

		[MTHCA_CMD_STAT_BAD_RES_STATE]  = -EBADF,

		[MTHCA_CMD_STAT_BAD_INDEX]      = -EBADF,

		[MTHCA_CMD_STAT_BAD_NVMEM]      = -EFAULT,

		[MTHCA_CMD_STAT_BAD_QPEE_STATE] = -EINVAL,

		[MTHCA_CMD_STAT_BAD_SEG_PARAM]  = -EFAULT,

		[MTHCA_CMD_STAT_REG_BOUND]      = -EBUSY,

		[MTHCA_CMD_STAT_LAM_NOT_PRE]    = -EAGAIN,

		[MTHCA_CMD_STAT_BAD_PKT]        = -EBADMSG,

		[MTHCA_CMD_STAT_BAD_SIZE]       = -ENOMEM,

	};



	if (status >= ARRAY_SIZE(trans_table) ||

			(status != MTHCA_CMD_STAT_OK

			 && trans_table[status] == 0))

		return -EINVAL;



	return trans_table[status];

}





static int mthca_cmd_poll(struct mthca_dev *dev,

			  u64 in_param,

			  u64 *out_param,
@@ -308,11 +340,11 @@ static int mthca_cmd_poll(struct mthca_dev *dev, 
			  u32 in_modifier,

			  u8 op_modifier,

			  u16 op,

			  unsigned long timeout,

			  u8 *status)

			  unsigned long timeout)

{

	int err = 0;

	unsigned long end;

	u8 status;



	down(&dev->cmd.poll_sem);
@@ -341,7 +373,12 @@ static int mthca_cmd_poll(struct mthca_dev *dev, 
			(u64) be32_to_cpu((__force __be32)

					  __raw_readl(dev->hcr + HCR_OUT_PARAM_OFFSET + 4));



	*status = be32_to_cpu((__force __be32) __raw_readl(dev->hcr + HCR_STATUS_OFFSET)) >> 24;

	status = be32_to_cpu((__force __be32) __raw_readl(dev->hcr + HCR_STATUS_OFFSET)) >> 24;

	if (status) {

		mthca_dbg(dev, "Command %02x completed with status %02x\n",

			  op, status);

		err = mthca_status_to_errno(status);

	}



out:

	up(&dev->cmd.poll_sem);
@@ -374,8 +411,7 @@ static int mthca_cmd_wait(struct mthca_dev *dev, 
			  u32 in_modifier,

			  u8 op_modifier,

			  u16 op,

			  unsigned long timeout,

			  u8 *status)

			  unsigned long timeout)

{

	int err = 0;

	struct mthca_cmd_context *context;
@@ -407,10 +443,11 @@ static int mthca_cmd_wait(struct mthca_dev *dev, 
	if (err)

		goto out;



	*status = context->status;

	if (*status)

	if (context->status) {

		mthca_dbg(dev, "Command %02x completed with status %02x\n",

			  op, *status);

			  op, context->status);

		err = mthca_status_to_errno(context->status);

	}



	if (out_is_imm)

		*out_param = context->out_param;
@@ -432,17 +469,16 @@ static int mthca_cmd_box(struct mthca_dev *dev, 
			 u32 in_modifier,

			 u8 op_modifier,

			 u16 op,

			 unsigned long timeout,

			 u8 *status)

			 unsigned long timeout)

{

	if (dev->cmd.flags & MTHCA_CMD_USE_EVENTS)

		return mthca_cmd_wait(dev, in_param, &out_param, 0,

				      in_modifier, op_modifier, op,

				      timeout, status);

				      timeout);

	else

		return mthca_cmd_poll(dev, in_param, &out_param, 0,

				      in_modifier, op_modifier, op,

				      timeout, status);

				      timeout);

}



/* Invoke a command with no output parameter */
@@ -451,11 +487,10 @@ static int mthca_cmd(struct mthca_dev *dev, 
		     u32 in_modifier,

		     u8 op_modifier,

		     u16 op,

		     unsigned long timeout,

		     u8 *status)

		     unsigned long timeout)

{

	return mthca_cmd_box(dev, in_param, 0, in_modifier,

			     op_modifier, op, timeout, status);

			     op_modifier, op, timeout);

}



/*
@@ -469,17 +504,16 @@ static int mthca_cmd_imm(struct mthca_dev *dev, 
			 u32 in_modifier,

			 u8 op_modifier,

			 u16 op,

			 unsigned long timeout,

			 u8 *status)

			 unsigned long timeout)

{

	if (dev->cmd.flags & MTHCA_CMD_USE_EVENTS)

		return mthca_cmd_wait(dev, in_param, out_param, 1,

				      in_modifier, op_modifier, op,

				      timeout, status);

				      timeout);

	else

		return mthca_cmd_poll(dev, in_param, out_param, 1,

				      in_modifier, op_modifier, op,

				      timeout, status);

				      timeout);

}



int mthca_cmd_init(struct mthca_dev *dev)
@@ -596,14 +630,14 @@ void mthca_free_mailbox(struct mthca_dev *dev, struct mthca_mailbox *mailbox) 
	kfree(mailbox);

}



int mthca_SYS_EN(struct mthca_dev *dev, u8 *status)

int mthca_SYS_EN(struct mthca_dev *dev)

{

	u64 out;

	int ret;



	ret = mthca_cmd_imm(dev, 0, &out, 0, 0, CMD_SYS_EN, CMD_TIME_CLASS_D, status);

	ret = mthca_cmd_imm(dev, 0, &out, 0, 0, CMD_SYS_EN, CMD_TIME_CLASS_D);



	if (*status == MTHCA_CMD_STAT_DDR_MEM_ERR)

	if (ret == -ENOMEM)

		mthca_warn(dev, "SYS_EN DDR error: syn=%x, sock=%d, "

			   "sladdr=%d, SPD source=%s\n",

			   (int) (out >> 6) & 0xf, (int) (out >> 4) & 3,
@@ -612,13 +646,13 @@ int mthca_SYS_EN(struct mthca_dev *dev, u8 *status) 
	return ret;

}



int mthca_SYS_DIS(struct mthca_dev *dev, u8 *status)

int mthca_SYS_DIS(struct mthca_dev *dev)

{

	return mthca_cmd(dev, 0, 0, 0, CMD_SYS_DIS, CMD_TIME_CLASS_C, status);

	return mthca_cmd(dev, 0, 0, 0, CMD_SYS_DIS, CMD_TIME_CLASS_C);

}



static int mthca_map_cmd(struct mthca_dev *dev, u16 op, struct mthca_icm *icm,

			 u64 virt, u8 *status)

			 u64 virt)

{

	struct mthca_mailbox *mailbox;

	struct mthca_icm_iter iter;
@@ -666,8 +700,8 @@ static int mthca_map_cmd(struct mthca_dev *dev, u16 op, struct mthca_icm *icm, 


			if (++nent == MTHCA_MAILBOX_SIZE / 16) {

				err = mthca_cmd(dev, mailbox->dma, nent, 0, op,

						CMD_TIME_CLASS_B, status);

				if (err || *status)

						CMD_TIME_CLASS_B);

				if (err)

					goto out;

				nent = 0;

			}
@@ -676,7 +710,7 @@ static int mthca_map_cmd(struct mthca_dev *dev, u16 op, struct mthca_icm *icm, 


	if (nent)

		err = mthca_cmd(dev, mailbox->dma, nent, 0, op,

				CMD_TIME_CLASS_B, status);

				CMD_TIME_CLASS_B);



	switch (op) {

	case CMD_MAP_FA:
@@ -696,19 +730,19 @@ out: 
	return err;

}



int mthca_MAP_FA(struct mthca_dev *dev, struct mthca_icm *icm, u8 *status)

int mthca_MAP_FA(struct mthca_dev *dev, struct mthca_icm *icm)

{

	return mthca_map_cmd(dev, CMD_MAP_FA, icm, -1, status);

	return mthca_map_cmd(dev, CMD_MAP_FA, icm, -1);

}



int mthca_UNMAP_FA(struct mthca_dev *dev, u8 *status)

int mthca_UNMAP_FA(struct mthca_dev *dev)

{

	return mthca_cmd(dev, 0, 0, 0, CMD_UNMAP_FA, CMD_TIME_CLASS_B, status);

	return mthca_cmd(dev, 0, 0, 0, CMD_UNMAP_FA, CMD_TIME_CLASS_B);

}



int mthca_RUN_FW(struct mthca_dev *dev, u8 *status)

int mthca_RUN_FW(struct mthca_dev *dev)

{

	return mthca_cmd(dev, 0, 0, 0, CMD_RUN_FW, CMD_TIME_CLASS_A, status);

	return mthca_cmd(dev, 0, 0, 0, CMD_RUN_FW, CMD_TIME_CLASS_A);

}



static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
@@ -737,7 +771,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base) 
	mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");

}



int mthca_QUERY_FW(struct mthca_dev *dev, u8 *status)

int mthca_QUERY_FW(struct mthca_dev *dev)

{

	struct mthca_mailbox *mailbox;

	u32 *outbox;
@@ -771,7 +805,7 @@ int mthca_QUERY_FW(struct mthca_dev *dev, u8 *status) 
	outbox = mailbox->buf;



	err = mthca_cmd_box(dev, 0, mailbox->dma, 0, 0, CMD_QUERY_FW,

			    CMD_TIME_CLASS_A, status);

			    CMD_TIME_CLASS_A);



	if (err)

		goto out;
@@ -843,7 +877,7 @@ out: 
	return err;

}



int mthca_ENABLE_LAM(struct mthca_dev *dev, u8 *status)

int mthca_ENABLE_LAM(struct mthca_dev *dev)

{

	struct mthca_mailbox *mailbox;

	u8 info;
@@ -864,14 +898,11 @@ int mthca_ENABLE_LAM(struct mthca_dev *dev, u8 *status) 
	outbox = mailbox->buf;



	err = mthca_cmd_box(dev, 0, mailbox->dma, 0, 0, CMD_ENABLE_LAM,

			    CMD_TIME_CLASS_C, status);

			    CMD_TIME_CLASS_C);



	if (err)

		goto out;



	if (*status == MTHCA_CMD_STAT_LAM_NOT_PRE)

		goto out;



	MTHCA_GET(dev->ddr_start, outbox, ENABLE_LAM_START_OFFSET);

	MTHCA_GET(dev->ddr_end,   outbox, ENABLE_LAM_END_OFFSET);

	MTHCA_GET(info,           outbox, ENABLE_LAM_INFO_OFFSET);
@@ -896,12 +927,12 @@ out: 
	return err;

}



int mthca_DISABLE_LAM(struct mthca_dev *dev, u8 *status)

int mthca_DISABLE_LAM(struct mthca_dev *dev)

{

	return mthca_cmd(dev, 0, 0, 0, CMD_SYS_DIS, CMD_TIME_CLASS_C, status);

	return mthca_cmd(dev, 0, 0, 0, CMD_SYS_DIS, CMD_TIME_CLASS_C);

}



int mthca_QUERY_DDR(struct mthca_dev *dev, u8 *status)

int mthca_QUERY_DDR(struct mthca_dev *dev)

{

	struct mthca_mailbox *mailbox;

	u8 info;
@@ -922,7 +953,7 @@ int mthca_QUERY_DDR(struct mthca_dev *dev, u8 *status) 
	outbox = mailbox->buf;



	err = mthca_cmd_box(dev, 0, mailbox->dma, 0, 0, CMD_QUERY_DDR,

			    CMD_TIME_CLASS_A, status);

			    CMD_TIME_CLASS_A);



	if (err)

		goto out;
@@ -952,7 +983,7 @@ out: 
}



int mthca_QUERY_DEV_LIM(struct mthca_dev *dev,

			struct mthca_dev_lim *dev_lim, u8 *status)

			struct mthca_dev_lim *dev_lim)

{

	struct mthca_mailbox *mailbox;

	u32 *outbox;
@@ -1028,7 +1059,7 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev *dev, 
	outbox = mailbox->buf;



	err = mthca_cmd_box(dev, 0, mailbox->dma, 0, 0, CMD_QUERY_DEV_LIM,

			    CMD_TIME_CLASS_A, status);

			    CMD_TIME_CLASS_A);



	if (err)

		goto out;
@@ -1232,7 +1263,7 @@ static void get_board_id(void *vsd, char *board_id) 
}



int mthca_QUERY_ADAPTER(struct mthca_dev *dev,

			struct mthca_adapter *adapter, u8 *status)

			struct mthca_adapter *adapter)

{

	struct mthca_mailbox *mailbox;

	u32 *outbox;
@@ -1251,7 +1282,7 @@ int mthca_QUERY_ADAPTER(struct mthca_dev *dev, 
	outbox = mailbox->buf;



	err = mthca_cmd_box(dev, 0, mailbox->dma, 0, 0, CMD_QUERY_ADAPTER,

			    CMD_TIME_CLASS_A, status);

			    CMD_TIME_CLASS_A);



	if (err)

		goto out;
@@ -1275,8 +1306,7 @@ out: 
}



int mthca_INIT_HCA(struct mthca_dev *dev,

		   struct mthca_init_hca_param *param,

		   u8 *status)

		   struct mthca_init_hca_param *param)

{

	struct mthca_mailbox *mailbox;

	__be32 *inbox;
@@ -1393,7 +1423,8 @@ int mthca_INIT_HCA(struct mthca_dev *dev, 
		MTHCA_PUT(inbox, param->uarc_base,   INIT_HCA_UAR_CTX_BASE_OFFSET);

	}



	err = mthca_cmd(dev, mailbox->dma, 0, 0, CMD_INIT_HCA, CMD_TIME_CLASS_D, status);

	err = mthca_cmd(dev, mailbox->dma, 0, 0,

			CMD_INIT_HCA, CMD_TIME_CLASS_D);



	mthca_free_mailbox(dev, mailbox);

	return err;
@@ -1401,7 +1432,7 @@ int mthca_INIT_HCA(struct mthca_dev *dev, 


int mthca_INIT_IB(struct mthca_dev *dev,

		  struct mthca_init_ib_param *param,

		  int port, u8 *status)

		  int port)

{

	struct mthca_mailbox *mailbox;

	u32 *inbox;
@@ -1445,24 +1476,24 @@ int mthca_INIT_IB(struct mthca_dev *dev, 
	MTHCA_PUT(inbox, param->si_guid,   INIT_IB_SI_GUID_OFFSET);



	err = mthca_cmd(dev, mailbox->dma, port, 0, CMD_INIT_IB,

			CMD_TIME_CLASS_A, status);

			CMD_TIME_CLASS_A);



	mthca_free_mailbox(dev, mailbox);

	return err;

}



int mthca_CLOSE_IB(struct mthca_dev *dev, int port, u8 *status)

int mthca_CLOSE_IB(struct mthca_dev *dev, int port)

{

	return mthca_cmd(dev, 0, port, 0, CMD_CLOSE_IB, CMD_TIME_CLASS_A, status);

	return mthca_cmd(dev, 0, port, 0, CMD_CLOSE_IB, CMD_TIME_CLASS_A);

}



int mthca_CLOSE_HCA(struct mthca_dev *dev, int panic, u8 *status)

int mthca_CLOSE_HCA(struct mthca_dev *dev, int panic)

{

	return mthca_cmd(dev, 0, 0, panic, CMD_CLOSE_HCA, CMD_TIME_CLASS_C, status);

	return mthca_cmd(dev, 0, 0, panic, CMD_CLOSE_HCA, CMD_TIME_CLASS_C);

}



int mthca_SET_IB(struct mthca_dev *dev, struct mthca_set_ib_param *param,

		 int port, u8 *status)

		 int port)

{

	struct mthca_mailbox *mailbox;

	u32 *inbox;
@@ -1491,18 +1522,18 @@ int mthca_SET_IB(struct mthca_dev *dev, struct mthca_set_ib_param *param, 
	MTHCA_PUT(inbox, param->si_guid,  SET_IB_SI_GUID_OFFSET);



	err = mthca_cmd(dev, mailbox->dma, port, 0, CMD_SET_IB,

			CMD_TIME_CLASS_B, status);

			CMD_TIME_CLASS_B);



	mthca_free_mailbox(dev, mailbox);

	return err;

}



int mthca_MAP_ICM(struct mthca_dev *dev, struct mthca_icm *icm, u64 virt, u8 *status)

int mthca_MAP_ICM(struct mthca_dev *dev, struct mthca_icm *icm, u64 virt)

{

	return mthca_map_cmd(dev, CMD_MAP_ICM, icm, virt, status);

	return mthca_map_cmd(dev, CMD_MAP_ICM, icm, virt);

}



int mthca_MAP_ICM_page(struct mthca_dev *dev, u64 dma_addr, u64 virt, u8 *status)

int mthca_MAP_ICM_page(struct mthca_dev *dev, u64 dma_addr, u64 virt)

{

	struct mthca_mailbox *mailbox;

	__be64 *inbox;
@@ -1517,7 +1548,7 @@ int mthca_MAP_ICM_page(struct mthca_dev *dev, u64 dma_addr, u64 virt, u8 *status 
	inbox[1] = cpu_to_be64(dma_addr);



	err = mthca_cmd(dev, mailbox->dma, 1, 0, CMD_MAP_ICM,

			CMD_TIME_CLASS_B, status);

			CMD_TIME_CLASS_B);



	mthca_free_mailbox(dev, mailbox);
@@ -1528,31 +1559,31 @@ int mthca_MAP_ICM_page(struct mthca_dev *dev, u64 dma_addr, u64 virt, u8 *status 
	return err;

}



int mthca_UNMAP_ICM(struct mthca_dev *dev, u64 virt, u32 page_count, u8 *status)

int mthca_UNMAP_ICM(struct mthca_dev *dev, u64 virt, u32 page_count)

{

	mthca_dbg(dev, "Unmapping %d pages at %llx from ICM.\n",

		  page_count, (unsigned long long) virt);



	return mthca_cmd(dev, virt, page_count, 0, CMD_UNMAP_ICM, CMD_TIME_CLASS_B, status);

	return mthca_cmd(dev, virt, page_count, 0,

			CMD_UNMAP_ICM, CMD_TIME_CLASS_B);

}



int mthca_MAP_ICM_AUX(struct mthca_dev *dev, struct mthca_icm *icm, u8 *status)

int mthca_MAP_ICM_AUX(struct mthca_dev *dev, struct mthca_icm *icm)

{

	return mthca_map_cmd(dev, CMD_MAP_ICM_AUX, icm, -1, status);

	return mthca_map_cmd(dev, CMD_MAP_ICM_AUX, icm, -1);

}



int mthca_UNMAP_ICM_AUX(struct mthca_dev *dev, u8 *status)

int mthca_UNMAP_ICM_AUX(struct mthca_dev *dev)

{

	return mthca_cmd(dev, 0, 0, 0, CMD_UNMAP_ICM_AUX, CMD_TIME_CLASS_B, status);

	return mthca_cmd(dev, 0, 0, 0, CMD_UNMAP_ICM_AUX, CMD_TIME_CLASS_B);

}



int mthca_SET_ICM_SIZE(struct mthca_dev *dev, u64 icm_size, u64 *aux_pages,

		       u8 *status)

int mthca_SET_ICM_SIZE(struct mthca_dev *dev, u64 icm_size, u64 *aux_pages)

{

	int ret = mthca_cmd_imm(dev, icm_size, aux_pages, 0, 0, CMD_SET_ICM_SIZE,

				CMD_TIME_CLASS_A, status);

	int ret = mthca_cmd_imm(dev, icm_size, aux_pages, 0,

			0, CMD_SET_ICM_SIZE, CMD_TIME_CLASS_A);



	if (ret || status)

	if (ret)

		return ret;



	/*
@@ -1566,74 +1597,73 @@ int mthca_SET_ICM_SIZE(struct mthca_dev *dev, u64 icm_size, u64 *aux_pages, 
}



int mthca_SW2HW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int mpt_index, u8 *status)

		    int mpt_index)

{

	return mthca_cmd(dev, mailbox->dma, mpt_index, 0, CMD_SW2HW_MPT,

			 CMD_TIME_CLASS_B, status);

			 CMD_TIME_CLASS_B);

}



int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int mpt_index, u8 *status)

		    int mpt_index)

{

	return mthca_cmd_box(dev, 0, mailbox ? mailbox->dma : 0, mpt_index,

			     !mailbox, CMD_HW2SW_MPT,

			     CMD_TIME_CLASS_B, status);

			     CMD_TIME_CLASS_B);

}



int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int num_mtt, u8 *status)

		    int num_mtt)

{

	return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,

			 CMD_TIME_CLASS_B, status);

			 CMD_TIME_CLASS_B);

}



int mthca_SYNC_TPT(struct mthca_dev *dev, u8 *status)

int mthca_SYNC_TPT(struct mthca_dev *dev)

{

	return mthca_cmd(dev, 0, 0, 0, CMD_SYNC_TPT, CMD_TIME_CLASS_B, status);

	return mthca_cmd(dev, 0, 0, 0, CMD_SYNC_TPT, CMD_TIME_CLASS_B);

}



int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,

		 int eq_num, u8 *status)

		 int eq_num)

{

	mthca_dbg(dev, "%s mask %016llx for eqn %d\n",

		  unmap ? "Clearing" : "Setting",

		  (unsigned long long) event_mask, eq_num);

	return mthca_cmd(dev, event_mask, (unmap << 31) | eq_num,

			 0, CMD_MAP_EQ, CMD_TIME_CLASS_B, status);

			 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);

}



int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int eq_num, u8 *status)

		   int eq_num)

{

	return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,

			 CMD_TIME_CLASS_A, status);

			 CMD_TIME_CLASS_A);

}



int mthca_HW2SW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int eq_num, u8 *status)

		   int eq_num)

{

	return mthca_cmd_box(dev, 0, mailbox->dma, eq_num, 0,

			     CMD_HW2SW_EQ,

			     CMD_TIME_CLASS_A, status);

			     CMD_TIME_CLASS_A);

}



int mthca_SW2HW_CQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int cq_num, u8 *status)

		   int cq_num)

{

	return mthca_cmd(dev, mailbox->dma, cq_num, 0, CMD_SW2HW_CQ,

			CMD_TIME_CLASS_A, status);

			CMD_TIME_CLASS_A);

}



int mthca_HW2SW_CQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int cq_num, u8 *status)

		   int cq_num)

{

	return mthca_cmd_box(dev, 0, mailbox->dma, cq_num, 0,

			     CMD_HW2SW_CQ,

			     CMD_TIME_CLASS_A, status);

			     CMD_TIME_CLASS_A);

}



int mthca_RESIZE_CQ(struct mthca_dev *dev, int cq_num, u32 lkey, u8 log_size,

		    u8 *status)

int mthca_RESIZE_CQ(struct mthca_dev *dev, int cq_num, u32 lkey, u8 log_size)

{

	struct mthca_mailbox *mailbox;

	__be32 *inbox;
@@ -1657,44 +1687,43 @@ int mthca_RESIZE_CQ(struct mthca_dev *dev, int cq_num, u32 lkey, u8 log_size, 
	MTHCA_PUT(inbox, lkey,     RESIZE_CQ_LKEY_OFFSET);



	err = mthca_cmd(dev, mailbox->dma, cq_num, 1, CMD_RESIZE_CQ,

			CMD_TIME_CLASS_B, status);

			CMD_TIME_CLASS_B);



	mthca_free_mailbox(dev, mailbox);

	return err;

}



int mthca_SW2HW_SRQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int srq_num, u8 *status)

		    int srq_num)

{

	return mthca_cmd(dev, mailbox->dma, srq_num, 0, CMD_SW2HW_SRQ,

			CMD_TIME_CLASS_A, status);

			CMD_TIME_CLASS_A);

}



int mthca_HW2SW_SRQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int srq_num, u8 *status)

		    int srq_num)

{

	return mthca_cmd_box(dev, 0, mailbox->dma, srq_num, 0,

			     CMD_HW2SW_SRQ,

			     CMD_TIME_CLASS_A, status);

			     CMD_TIME_CLASS_A);

}



int mthca_QUERY_SRQ(struct mthca_dev *dev, u32 num,

		    struct mthca_mailbox *mailbox, u8 *status)

		    struct mthca_mailbox *mailbox)

{

	return mthca_cmd_box(dev, 0, mailbox->dma, num, 0,

			     CMD_QUERY_SRQ, CMD_TIME_CLASS_A, status);

			     CMD_QUERY_SRQ, CMD_TIME_CLASS_A);

}



int mthca_ARM_SRQ(struct mthca_dev *dev, int srq_num, int limit, u8 *status)

int mthca_ARM_SRQ(struct mthca_dev *dev, int srq_num, int limit)

{

	return mthca_cmd(dev, limit, srq_num, 0, CMD_ARM_SRQ,

			 CMD_TIME_CLASS_B, status);

			 CMD_TIME_CLASS_B);

}



int mthca_MODIFY_QP(struct mthca_dev *dev, enum ib_qp_state cur,

		    enum ib_qp_state next, u32 num, int is_ee,

		    struct mthca_mailbox *mailbox, u32 optmask,

		    u8 *status)

		    struct mthca_mailbox *mailbox, u32 optmask)

{

	static const u16 op[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {

		[IB_QPS_RESET] = {
@@ -1755,7 +1784,7 @@ int mthca_MODIFY_QP(struct mthca_dev *dev, enum ib_qp_state cur, 


		err = mthca_cmd_box(dev, 0, mailbox ? mailbox->dma : 0,

				    (!!is_ee << 24) | num, op_mod,

				    op[cur][next], CMD_TIME_CLASS_C, status);

				    op[cur][next], CMD_TIME_CLASS_C);



		if (0 && mailbox) {

			int i;
@@ -1789,21 +1818,20 @@ int mthca_MODIFY_QP(struct mthca_dev *dev, enum ib_qp_state cur, 
		}



		err = mthca_cmd(dev, mailbox->dma, optmask | (!!is_ee << 24) | num,

				op_mod, op[cur][next], CMD_TIME_CLASS_C, status);

				op_mod, op[cur][next], CMD_TIME_CLASS_C);

	}



	return err;

}



int mthca_QUERY_QP(struct mthca_dev *dev, u32 num, int is_ee,

		   struct mthca_mailbox *mailbox, u8 *status)

		   struct mthca_mailbox *mailbox)

{

	return mthca_cmd_box(dev, 0, mailbox->dma, (!!is_ee << 24) | num, 0,

			     CMD_QUERY_QPEE, CMD_TIME_CLASS_A, status);

			     CMD_QUERY_QPEE, CMD_TIME_CLASS_A);

}



int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn,

			  u8 *status)

int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)

{

	u8 op_mod;
@@ -1825,12 +1853,12 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn, 
	}



	return mthca_cmd(dev, 0, qpn, op_mod, CMD_CONF_SPECIAL_QP,

			 CMD_TIME_CLASS_B, status);

			 CMD_TIME_CLASS_B);

}



int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,

		  int port, struct ib_wc *in_wc, struct ib_grh *in_grh,

		  void *in_mad, void *response_mad, u8 *status)

		  void *in_mad, void *response_mad)

{

	struct mthca_mailbox *inmailbox, *outmailbox;

	void *inbox;
@@ -1897,9 +1925,9 @@ int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey, 


	err = mthca_cmd_box(dev, inmailbox->dma, outmailbox->dma,

			    in_modifier, op_modifier,

			    CMD_MAD_IFC, CMD_TIME_CLASS_C, status);

			    CMD_MAD_IFC, CMD_TIME_CLASS_C);



	if (!err && !*status)

	if (!err)

		memcpy(response_mad, outmailbox->buf, 256);



	mthca_free_mailbox(dev, inmailbox);
@@ -1908,33 +1936,33 @@ int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey, 
}



int mthca_READ_MGM(struct mthca_dev *dev, int index,

		   struct mthca_mailbox *mailbox, u8 *status)

		   struct mthca_mailbox *mailbox)

{

	return mthca_cmd_box(dev, 0, mailbox->dma, index, 0,

			     CMD_READ_MGM, CMD_TIME_CLASS_A, status);

			     CMD_READ_MGM, CMD_TIME_CLASS_A);

}



int mthca_WRITE_MGM(struct mthca_dev *dev, int index,

		    struct mthca_mailbox *mailbox, u8 *status)

		    struct mthca_mailbox *mailbox)

{

	return mthca_cmd(dev, mailbox->dma, index, 0, CMD_WRITE_MGM,

			 CMD_TIME_CLASS_A, status);

			 CMD_TIME_CLASS_A);

}



int mthca_MGID_HASH(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    u16 *hash, u8 *status)

		    u16 *hash)

{

	u64 imm;

	int err;



	err = mthca_cmd_imm(dev, mailbox->dma, &imm, 0, 0, CMD_MGID_HASH,

			    CMD_TIME_CLASS_A, status);

			    CMD_TIME_CLASS_A);



	*hash = imm;

	return err;

}



int mthca_NOP(struct mthca_dev *dev, u8 *status)

int mthca_NOP(struct mthca_dev *dev)

{

	return mthca_cmd(dev, 0, 0x1f, 0, CMD_NOP, msecs_to_jiffies(100), status);

	return mthca_cmd(dev, 0, 0x1f, 0, CMD_NOP, msecs_to_jiffies(100));

}

drivers/infiniband/hw/mthca/mthca_cmd.h

+44 −49
Original line number Diff line number Diff line
@@ -252,79 +252,74 @@ struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev, 
					  gfp_t gfp_mask);

void mthca_free_mailbox(struct mthca_dev *dev, struct mthca_mailbox *mailbox);



int mthca_SYS_EN(struct mthca_dev *dev, u8 *status);

int mthca_SYS_DIS(struct mthca_dev *dev, u8 *status);

int mthca_MAP_FA(struct mthca_dev *dev, struct mthca_icm *icm, u8 *status);

int mthca_UNMAP_FA(struct mthca_dev *dev, u8 *status);

int mthca_RUN_FW(struct mthca_dev *dev, u8 *status);

int mthca_QUERY_FW(struct mthca_dev *dev, u8 *status);

int mthca_ENABLE_LAM(struct mthca_dev *dev, u8 *status);

int mthca_DISABLE_LAM(struct mthca_dev *dev, u8 *status);

int mthca_QUERY_DDR(struct mthca_dev *dev, u8 *status);

int mthca_SYS_EN(struct mthca_dev *dev);

int mthca_SYS_DIS(struct mthca_dev *dev);

int mthca_MAP_FA(struct mthca_dev *dev, struct mthca_icm *icm);

int mthca_UNMAP_FA(struct mthca_dev *dev);

int mthca_RUN_FW(struct mthca_dev *dev);

int mthca_QUERY_FW(struct mthca_dev *dev);

int mthca_ENABLE_LAM(struct mthca_dev *dev);

int mthca_DISABLE_LAM(struct mthca_dev *dev);

int mthca_QUERY_DDR(struct mthca_dev *dev);

int mthca_QUERY_DEV_LIM(struct mthca_dev *dev,

			struct mthca_dev_lim *dev_lim, u8 *status);

			struct mthca_dev_lim *dev_lim);

int mthca_QUERY_ADAPTER(struct mthca_dev *dev,

			struct mthca_adapter *adapter, u8 *status);

			struct mthca_adapter *adapter);

int mthca_INIT_HCA(struct mthca_dev *dev,

		   struct mthca_init_hca_param *param,

		   u8 *status);

		   struct mthca_init_hca_param *param);

int mthca_INIT_IB(struct mthca_dev *dev,

		  struct mthca_init_ib_param *param,

		  int port, u8 *status);

int mthca_CLOSE_IB(struct mthca_dev *dev, int port, u8 *status);

int mthca_CLOSE_HCA(struct mthca_dev *dev, int panic, u8 *status);

		  int port);

int mthca_CLOSE_IB(struct mthca_dev *dev, int port);

int mthca_CLOSE_HCA(struct mthca_dev *dev, int panic);

int mthca_SET_IB(struct mthca_dev *dev, struct mthca_set_ib_param *param,

		 int port, u8 *status);

int mthca_MAP_ICM(struct mthca_dev *dev, struct mthca_icm *icm, u64 virt, u8 *status);

int mthca_MAP_ICM_page(struct mthca_dev *dev, u64 dma_addr, u64 virt, u8 *status);

int mthca_UNMAP_ICM(struct mthca_dev *dev, u64 virt, u32 page_count, u8 *status);

int mthca_MAP_ICM_AUX(struct mthca_dev *dev, struct mthca_icm *icm, u8 *status);

int mthca_UNMAP_ICM_AUX(struct mthca_dev *dev, u8 *status);

int mthca_SET_ICM_SIZE(struct mthca_dev *dev, u64 icm_size, u64 *aux_pages,

		       u8 *status);

		 int port);

int mthca_MAP_ICM(struct mthca_dev *dev, struct mthca_icm *icm, u64 virt);

int mthca_MAP_ICM_page(struct mthca_dev *dev, u64 dma_addr, u64 virt);

int mthca_UNMAP_ICM(struct mthca_dev *dev, u64 virt, u32 page_count);

int mthca_MAP_ICM_AUX(struct mthca_dev *dev, struct mthca_icm *icm);

int mthca_UNMAP_ICM_AUX(struct mthca_dev *dev);

int mthca_SET_ICM_SIZE(struct mthca_dev *dev, u64 icm_size, u64 *aux_pages);

int mthca_SW2HW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int mpt_index, u8 *status);

		    int mpt_index);

int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int mpt_index, u8 *status);

		    int mpt_index);

int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int num_mtt, u8 *status);

int mthca_SYNC_TPT(struct mthca_dev *dev, u8 *status);

		    int num_mtt);

int mthca_SYNC_TPT(struct mthca_dev *dev);

int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,

		 int eq_num, u8 *status);

		 int eq_num);

int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int eq_num, u8 *status);

		   int eq_num);

int mthca_HW2SW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int eq_num, u8 *status);

		   int eq_num);

int mthca_SW2HW_CQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int cq_num, u8 *status);

		   int cq_num);

int mthca_HW2SW_CQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		   int cq_num, u8 *status);

int mthca_RESIZE_CQ(struct mthca_dev *dev, int cq_num, u32 lkey, u8 log_size,

		    u8 *status);

		   int cq_num);

int mthca_RESIZE_CQ(struct mthca_dev *dev, int cq_num, u32 lkey, u8 log_size);

int mthca_SW2HW_SRQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int srq_num, u8 *status);

		    int srq_num);

int mthca_HW2SW_SRQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    int srq_num, u8 *status);

		    int srq_num);

int mthca_QUERY_SRQ(struct mthca_dev *dev, u32 num,

		    struct mthca_mailbox *mailbox, u8 *status);

int mthca_ARM_SRQ(struct mthca_dev *dev, int srq_num, int limit, u8 *status);

		    struct mthca_mailbox *mailbox);

int mthca_ARM_SRQ(struct mthca_dev *dev, int srq_num, int limit);

int mthca_MODIFY_QP(struct mthca_dev *dev, enum ib_qp_state cur,

		    enum ib_qp_state next, u32 num, int is_ee,

		    struct mthca_mailbox *mailbox, u32 optmask,

		    u8 *status);

		    struct mthca_mailbox *mailbox, u32 optmask);

int mthca_QUERY_QP(struct mthca_dev *dev, u32 num, int is_ee,

		   struct mthca_mailbox *mailbox, u8 *status);

int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn,

			  u8 *status);

		   struct mthca_mailbox *mailbox);

int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn);

int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,

		  int port, struct ib_wc *in_wc, struct ib_grh *in_grh,

		  void *in_mad, void *response_mad, u8 *status);

		  void *in_mad, void *response_mad);

int mthca_READ_MGM(struct mthca_dev *dev, int index,

		   struct mthca_mailbox *mailbox, u8 *status);

		   struct mthca_mailbox *mailbox);

int mthca_WRITE_MGM(struct mthca_dev *dev, int index,

		    struct mthca_mailbox *mailbox, u8 *status);

		    struct mthca_mailbox *mailbox);

int mthca_MGID_HASH(struct mthca_dev *dev, struct mthca_mailbox *mailbox,

		    u16 *hash, u8 *status);

int mthca_NOP(struct mthca_dev *dev, u8 *status);

		    u16 *hash);

int mthca_NOP(struct mthca_dev *dev);



#endif /* MTHCA_CMD_H */

drivers/infiniband/hw/mthca/mthca_cq.c

+2 −13

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/mthca/mthca_eq.c

+10 −33

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/mthca/mthca_mad.c

+4 −11
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ int mthca_process_mad(struct ib_device *ibdev, 
		      struct ib_mad *out_mad)

{

	int err;

	u8 status;

	u16 slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);

	u16 prev_lid = 0;

	struct ib_port_attr pattr;
@@ -252,17 +251,11 @@ int mthca_process_mad(struct ib_device *ibdev, 
	err = mthca_MAD_IFC(to_mdev(ibdev),

			    mad_flags & IB_MAD_IGNORE_MKEY,

			    mad_flags & IB_MAD_IGNORE_BKEY,

			    port_num, in_wc, in_grh, in_mad, out_mad,

			    &status);

	if (err) {

		mthca_err(to_mdev(ibdev), "MAD_IFC failed\n");

		return IB_MAD_RESULT_FAILURE;

	}

	if (status == MTHCA_CMD_STAT_BAD_PKT)

			    port_num, in_wc, in_grh, in_mad, out_mad);

	if (err == -EBADMSG)

		return IB_MAD_RESULT_SUCCESS;

	if (status) {

		mthca_err(to_mdev(ibdev), "MAD_IFC returned status %02x\n",

			  status);

	else if (err) {

		mthca_err(to_mdev(ibdev), "MAD_IFC returned %d\n", err);

		return IB_MAD_RESULT_FAILURE;

	}