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

Commit 01e03365 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branch 'nes' into for-next

parents fb57e1db 7d9c199a

drivers/infiniband/hw/nes/nes.h

+1 −0
Original line number Diff line number Diff line
@@ -532,6 +532,7 @@ void nes_iwarp_ce_handler(struct nes_device *, struct nes_hw_cq *); 
int nes_destroy_cqp(struct nes_device *);

int nes_nic_cm_xmit(struct sk_buff *, struct net_device *);

void nes_recheck_link_status(struct work_struct *work);

void nes_terminate_timeout(unsigned long context);



/* nes_nic.c */

struct net_device *nes_netdev_init(struct nes_device *, void __iomem *);

drivers/infiniband/hw/nes/nes_cm.c

+6 −18
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ int schedule_nes_timer(struct nes_cm_node *cm_node, struct sk_buff *skb, 
	struct nes_cm_core *cm_core = cm_node->cm_core;

	struct nes_timer_entry *new_send;

	int ret = 0;

	u32 was_timer_set;



	new_send = kzalloc(sizeof(*new_send), GFP_ATOMIC);

	if (!new_send)
@@ -721,12 +720,8 @@ int schedule_nes_timer(struct nes_cm_node *cm_node, struct sk_buff *skb, 
		}

	}



	was_timer_set = timer_pending(&cm_core->tcp_timer);



	if (!was_timer_set) {

		cm_core->tcp_timer.expires = new_send->timetosend;

		add_timer(&cm_core->tcp_timer);

	}

	if (!timer_pending(&cm_core->tcp_timer))

		mod_timer(&cm_core->tcp_timer, new_send->timetosend);



	return ret;

}
@@ -944,10 +939,8 @@ static void nes_cm_timer_tick(unsigned long pass) 
	}



	if (settimer) {

		if (!timer_pending(&cm_core->tcp_timer)) {

			cm_core->tcp_timer.expires = nexttimeout;

			add_timer(&cm_core->tcp_timer);

		}

		if (!timer_pending(&cm_core->tcp_timer))

			mod_timer(&cm_core->tcp_timer, nexttimeout);

	}

}
@@ -1312,8 +1305,6 @@ static int mini_cm_del_listen(struct nes_cm_core *cm_core, 
static inline int mini_cm_accelerated(struct nes_cm_core *cm_core,

				      struct nes_cm_node *cm_node)

{

	u32 was_timer_set;



	cm_node->accelerated = 1;



	if (cm_node->accept_pend) {
@@ -1323,11 +1314,8 @@ static inline int mini_cm_accelerated(struct nes_cm_core *cm_core, 
		BUG_ON(atomic_read(&cm_node->listener->pend_accepts_cnt) < 0);

	}



	was_timer_set = timer_pending(&cm_core->tcp_timer);

	if (!was_timer_set) {

		cm_core->tcp_timer.expires = jiffies + NES_SHORT_TIME;

		add_timer(&cm_core->tcp_timer);

	}

	if (!timer_pending(&cm_core->tcp_timer))

		mod_timer(&cm_core->tcp_timer, (jiffies + NES_SHORT_TIME));



	return 0;

}

drivers/infiniband/hw/nes/nes_hw.c

+2 −7
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev, 
static void process_critical_error(struct nes_device *nesdev);

static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number);

static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_Mode);

static void nes_terminate_timeout(unsigned long context);

static void nes_terminate_start_timer(struct nes_qp *nesqp);



#ifdef CONFIG_INFINIBAND_NES_DEBUG
@@ -3520,7 +3519,7 @@ static void nes_terminate_received(struct nes_device *nesdev, 
}



/* Timeout routine in case terminate fails to complete */

static void nes_terminate_timeout(unsigned long context)

void nes_terminate_timeout(unsigned long context)

{

	struct nes_qp *nesqp = (struct nes_qp *)(unsigned long)context;
@@ -3530,11 +3529,7 @@ static void nes_terminate_timeout(unsigned long context) 
/* Set a timer in case hw cannot complete the terminate sequence */

static void nes_terminate_start_timer(struct nes_qp *nesqp)

{

	init_timer(&nesqp->terminate_timer);

	nesqp->terminate_timer.function = nes_terminate_timeout;

	nesqp->terminate_timer.expires = jiffies + HZ;

	nesqp->terminate_timer.data = (unsigned long)nesqp;

	add_timer(&nesqp->terminate_timer);

	mod_timer(&nesqp->terminate_timer, (jiffies + HZ));

}



/**

drivers/infiniband/hw/nes/nes_verbs.c

+8 −1
Original line number Diff line number Diff line
@@ -1404,6 +1404,9 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, 
	}



	nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR);

	init_timer(&nesqp->terminate_timer);

	nesqp->terminate_timer.function = nes_terminate_timeout;

	nesqp->terminate_timer.data = (unsigned long)nesqp;



	/* update the QP table */

	nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp;
@@ -1413,7 +1416,6 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, 
	return &nesqp->ibqp;

}





/**

 * nes_clean_cq

 */
@@ -2559,6 +2561,11 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
			return ibmr;

		case IWNES_MEMREG_TYPE_QP:

		case IWNES_MEMREG_TYPE_CQ:

			if (!region->length) {

				nes_debug(NES_DBG_MR, "Unable to register zero length region for CQ\n");

				ib_umem_release(region);

				return ERR_PTR(-EINVAL);

			}

			nespbl = kzalloc(sizeof(*nespbl), GFP_KERNEL);

			if (!nespbl) {

				nes_debug(NES_DBG_MR, "Unable to allocate PBL\n");