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

Commit d10ddbf6 authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds
Browse files

[PATCH] IB/mthca: encapsulate mem-free check into mthca_is_memfree() 



Clean up mem-free mode support by introducing mthca_is_memfree() function,
which encapsulates the logic of deciding if a device is mem-free.

Signed-off-by: default avatarRoland Dreier <roland@topspin.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6bd6228e

drivers/infiniband/hw/mthca/mthca_av.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int mthca_create_ah(struct mthca_dev *dev, 


	ah->type = MTHCA_AH_PCI_POOL;



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		ah->av   = kmalloc(sizeof *ah->av, GFP_ATOMIC);

		if (!ah->av)

			return -ENOMEM;
@@ -192,7 +192,7 @@ int __devinit mthca_init_av_table(struct mthca_dev *dev) 
{

	int err;



	if (dev->hca_type == ARBEL_NATIVE)

	if (mthca_is_memfree(dev))

		return 0;



	err = mthca_alloc_init(&dev->av_table.alloc,
@@ -231,7 +231,7 @@ int __devinit mthca_init_av_table(struct mthca_dev *dev) 


void __devexit mthca_cleanup_av_table(struct mthca_dev *dev)

{

	if (dev->hca_type == ARBEL_NATIVE)

	if (mthca_is_memfree(dev))

		return;



	if (dev->av_table.av_map)

drivers/infiniband/hw/mthca/mthca_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ int mthca_QUERY_FW(struct mthca_dev *dev, u8 *status) 
	mthca_dbg(dev, "FW version %012llx, max commands %d\n",

		  (unsigned long long) dev->fw_ver, dev->cmd.max_cmds);



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		MTHCA_GET(dev->fw.arbel.fw_pages,       outbox, QUERY_FW_SIZE_OFFSET);

		MTHCA_GET(dev->fw.arbel.clr_int_base,   outbox, QUERY_FW_CLR_INT_BASE_OFFSET);

		MTHCA_GET(dev->fw.arbel.eq_arm_base,    outbox, QUERY_FW_EQ_ARM_BASE_OFFSET);
@@ -984,7 +984,7 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev *dev, 


	mthca_dbg(dev, "Flags: %08x\n", dev_lim->flags);



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		MTHCA_GET(field, outbox, QUERY_DEV_LIM_RSZ_SRQ_OFFSET);

		dev_lim->hca.arbel.resize_srq = field & 1;

		MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SG_RQ_OFFSET);
@@ -1148,7 +1148,7 @@ int mthca_INIT_HCA(struct mthca_dev *dev, 
	/* TPT attributes */



	MTHCA_PUT(inbox, param->mpt_base,   INIT_HCA_MPT_BASE_OFFSET);

	if (dev->hca_type != ARBEL_NATIVE)

	if (!mthca_is_memfree(dev))

		MTHCA_PUT(inbox, param->mtt_seg_sz, INIT_HCA_MTT_SEG_SZ_OFFSET);

	MTHCA_PUT(inbox, param->log_mpt_sz, INIT_HCA_LOG_MPT_SZ_OFFSET);

	MTHCA_PUT(inbox, param->mtt_base,   INIT_HCA_MTT_BASE_OFFSET);
@@ -1161,7 +1161,7 @@ int mthca_INIT_HCA(struct mthca_dev *dev, 


	MTHCA_PUT(inbox, param->uar_scratch_base, INIT_HCA_UAR_SCATCH_BASE_OFFSET);



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		MTHCA_PUT(inbox, param->log_uarc_sz, INIT_HCA_UARC_SZ_OFFSET);

		MTHCA_PUT(inbox, param->log_uar_sz,  INIT_HCA_LOG_UAR_SZ_OFFSET);

		MTHCA_PUT(inbox, param->uarc_base,   INIT_HCA_UAR_CTX_BASE_OFFSET);

drivers/infiniband/hw/mthca/mthca_cq.c

+6 −6
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static inline void update_cons_index(struct mthca_dev *dev, struct mthca_cq *cq, 
{

	u32 doorbell[2];



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		*cq->set_ci_db = cpu_to_be32(cq->cons_index);

		wmb();

	} else {
@@ -760,7 +760,7 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, 
	if (cq->cqn == -1)

		return -ENOMEM;



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		cq->arm_sn = 1;



		err = mthca_table_get(dev, dev->cq_table.table, cq->cqn);
@@ -811,7 +811,7 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, 
	cq_context->lkey            = cpu_to_be32(cq->mr.ibmr.lkey);

	cq_context->cqn             = cpu_to_be32(cq->cqn);



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		cq_context->ci_db    = cpu_to_be32(cq->set_ci_db_index);

		cq_context->state_db = cpu_to_be32(cq->arm_db_index);

	}
@@ -851,11 +851,11 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, 
err_out_mailbox:

	kfree(mailbox);



	if (dev->hca_type == ARBEL_NATIVE)

	if (mthca_is_memfree(dev))

		mthca_free_db(dev, MTHCA_DB_TYPE_CQ_ARM, cq->arm_db_index);



err_out_ci:

	if (dev->hca_type == ARBEL_NATIVE)

	if (mthca_is_memfree(dev))

		mthca_free_db(dev, MTHCA_DB_TYPE_CQ_SET_CI, cq->set_ci_db_index);



err_out_icm:
@@ -916,7 +916,7 @@ void mthca_free_cq(struct mthca_dev *dev, 
	mthca_free_mr(dev, &cq->mr);

	mthca_free_cq_buf(dev, cq);



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		mthca_free_db(dev, MTHCA_DB_TYPE_CQ_ARM,    cq->arm_db_index);

		mthca_free_db(dev, MTHCA_DB_TYPE_CQ_SET_CI, cq->set_ci_db_index);

		mthca_table_put(dev, dev->cq_table.table, cq->cqn);

drivers/infiniband/hw/mthca/mthca_dev.h

+5 −0
Original line number Diff line number Diff line
@@ -470,4 +470,9 @@ static inline struct mthca_dev *to_mdev(struct ib_device *ibdev) 
	return container_of(ibdev, struct mthca_dev, ib_dev);

}



static inline int mthca_is_memfree(struct mthca_dev *dev)

{

	return dev->hca_type == ARBEL_NATIVE;

}



#endif /* MTHCA_DEV_H */

drivers/infiniband/hw/mthca/mthca_eq.c

+9 −9
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static inline void arbel_set_eq_ci(struct mthca_dev *dev, struct mthca_eq *eq, u 


static inline void set_eq_ci(struct mthca_dev *dev, struct mthca_eq *eq, u32 ci)

{

	if (dev->hca_type == ARBEL_NATIVE)

	if (mthca_is_memfree(dev))

		arbel_set_eq_ci(dev, eq, ci);

	else

		tavor_set_eq_ci(dev, eq, ci);
@@ -223,7 +223,7 @@ static inline void arbel_eq_req_not(struct mthca_dev *dev, u32 eqn_mask) 


static inline void disarm_cq(struct mthca_dev *dev, int eqn, int cqn)

{

	if (dev->hca_type != ARBEL_NATIVE) {

	if (!mthca_is_memfree(dev)) {

		u32 doorbell[2];



		doorbell[0] = cpu_to_be32(MTHCA_EQ_DB_DISARM_CQ | eqn);
@@ -535,11 +535,11 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, 
						  MTHCA_EQ_OWNER_HW    |

						  MTHCA_EQ_STATE_ARMED |

						  MTHCA_EQ_FLAG_TR);

	if (dev->hca_type == ARBEL_NATIVE)

	if (mthca_is_memfree(dev))

		eq_context->flags  |= cpu_to_be32(MTHCA_EQ_STATE_ARBEL);



	eq_context->logsize_usrpage = cpu_to_be32((ffs(nent) - 1) << 24);

	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		eq_context->arbel_pd = cpu_to_be32(dev->driver_pd.pd_num);

	} else {

		eq_context->logsize_usrpage |= cpu_to_be32(dev->driver_uar.index);
@@ -686,7 +686,7 @@ static int __devinit mthca_map_eq_regs(struct mthca_dev *dev) 


	mthca_base = pci_resource_start(dev->pdev, 0);



	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		/*

		 * We assume that the EQ arm and EQ set CI registers

		 * fall within the first BAR.  We can't trust the
@@ -756,7 +756,7 @@ static int __devinit mthca_map_eq_regs(struct mthca_dev *dev) 


static void __devexit mthca_unmap_eq_regs(struct mthca_dev *dev)

{

	if (dev->hca_type == ARBEL_NATIVE) {

	if (mthca_is_memfree(dev)) {

		mthca_unmap_reg(dev, (pci_resource_len(dev->pdev, 0) - 1) &

				dev->fw.arbel.eq_set_ci_base,

				MTHCA_EQ_SET_CI_SIZE,
@@ -880,7 +880,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev) 


		for (i = 0; i < MTHCA_NUM_EQ; ++i) {

			err = request_irq(dev->eq_table.eq[i].msi_x_vector,

					  dev->hca_type == ARBEL_NATIVE ?

					  mthca_is_memfree(dev) ?

					  mthca_arbel_msi_x_interrupt :

					  mthca_tavor_msi_x_interrupt,

					  0, eq_name[i], dev->eq_table.eq + i);
@@ -890,7 +890,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev) 
		}

	} else {

		err = request_irq(dev->pdev->irq,

				  dev->hca_type == ARBEL_NATIVE ?

				  mthca_is_memfree(dev) ?

				  mthca_arbel_interrupt :

				  mthca_tavor_interrupt,

				  SA_SHIRQ, DRV_NAME, dev);
@@ -918,7 +918,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev) 
			   dev->eq_table.eq[MTHCA_EQ_CMD].eqn, status);



	for (i = 0; i < MTHCA_EQ_CMD; ++i)

		if (dev->hca_type == ARBEL_NATIVE)

		if (mthca_is_memfree(dev))

			arbel_eq_req_not(dev, dev->eq_table.eq[i].eqn_mask);

		else

			tavor_eq_req_not(dev, dev->eq_table.eq[i].eqn);