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

Commit 8064135e authored by Kees Cook's avatar Kees Cook Committed by Doug Ledford
Browse files

IB/hfi1: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. Switches test of .data field to
.function, since .data will be going away.

Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
Cc: Dennis Dalessandro <dennis.dalessandro@intel.com>
Cc: Doug Ledford <dledford@redhat.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: linux-rdma@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a2930e5c

drivers/infiniband/hw/hfi1/aspm.h

+3 −4
Original line number Diff line number Diff line
@@ -218,9 +218,9 @@ static inline void aspm_ctx_disable(struct hfi1_ctxtdata *rcd) 
}



/* Timer function for re-enabling ASPM in the absence of interrupt activity */

static inline void aspm_ctx_timer_function(unsigned long data)

static inline void aspm_ctx_timer_function(struct timer_list *t)

{

	struct hfi1_ctxtdata *rcd = (struct hfi1_ctxtdata *)data;

	struct hfi1_ctxtdata *rcd = from_timer(rcd, t, aspm_timer);

	unsigned long flags;



	spin_lock_irqsave(&rcd->aspm_lock, flags);
@@ -281,8 +281,7 @@ static inline void aspm_enable_all(struct hfi1_devdata *dd) 
static inline void aspm_ctx_init(struct hfi1_ctxtdata *rcd)

{

	spin_lock_init(&rcd->aspm_lock);

	setup_timer(&rcd->aspm_timer, aspm_ctx_timer_function,

		    (unsigned long)rcd);

	timer_setup(&rcd->aspm_timer, aspm_ctx_timer_function, 0);

	rcd->aspm_intr_supported = rcd->dd->aspm_supported &&

		aspm_mode == ASPM_MODE_DYNAMIC &&

		rcd->ctxt < rcd->dd->first_dyn_alloc_ctxt;

drivers/infiniband/hw/hfi1/chip.c

+8 −11
Original line number Diff line number Diff line
@@ -5538,9 +5538,9 @@ static void handle_cce_err(struct hfi1_devdata *dd, u32 unused, u64 reg) 
 * associated with them.

 */

#define RCVERR_CHECK_TIME 10

static void update_rcverr_timer(unsigned long opaque)

static void update_rcverr_timer(struct timer_list *t)

{

	struct hfi1_devdata *dd = (struct hfi1_devdata *)opaque;

	struct hfi1_devdata *dd = from_timer(dd, t, rcverr_timer);

	struct hfi1_pportdata *ppd = dd->pport;

	u32 cur_ovfl_cnt = read_dev_cntr(dd, C_RCV_OVF, CNTR_INVALID_VL);
@@ -5559,7 +5559,7 @@ static void update_rcverr_timer(unsigned long opaque) 


static int init_rcverr(struct hfi1_devdata *dd)

{

	setup_timer(&dd->rcverr_timer, update_rcverr_timer, (unsigned long)dd);

	timer_setup(&dd->rcverr_timer, update_rcverr_timer, 0);

	/* Assume the hardware counter has been reset */

	dd->rcv_ovfl_cnt = 0;

	return mod_timer(&dd->rcverr_timer, jiffies + HZ * RCVERR_CHECK_TIME);
@@ -5567,9 +5567,8 @@ static int init_rcverr(struct hfi1_devdata *dd) 


static void free_rcverr(struct hfi1_devdata *dd)

{

	if (dd->rcverr_timer.data)

	if (dd->rcverr_timer.function)

		del_timer_sync(&dd->rcverr_timer);

	dd->rcverr_timer.data = 0;

}



static void handle_rxe_err(struct hfi1_devdata *dd, u32 unused, u64 reg)
@@ -12089,9 +12088,8 @@ static void free_cntrs(struct hfi1_devdata *dd) 
	struct hfi1_pportdata *ppd;

	int i;



	if (dd->synth_stats_timer.data)

	if (dd->synth_stats_timer.function)

		del_timer_sync(&dd->synth_stats_timer);

	dd->synth_stats_timer.data = 0;

	ppd = (struct hfi1_pportdata *)(dd + 1);

	for (i = 0; i < dd->num_pports; i++, ppd++) {

		kfree(ppd->cntrs);
@@ -12367,9 +12365,9 @@ static void do_update_synth_timer(struct work_struct *work) 
	}

}



static void update_synth_timer(unsigned long opaque)

static void update_synth_timer(struct timer_list *t)

{

	struct hfi1_devdata *dd = (struct hfi1_devdata *)opaque;

	struct hfi1_devdata *dd = from_timer(dd, t, synth_stats_timer);



	queue_work(dd->update_cntr_wq, &dd->update_cntr_work);

	mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
@@ -12387,8 +12385,7 @@ static int init_cntrs(struct hfi1_devdata *dd) 
	const int bit_type_32_sz = strlen(bit_type_32);



	/* set up the stats timer; the add_timer is done at the end */

	setup_timer(&dd->synth_stats_timer, update_synth_timer,

		    (unsigned long)dd);

	timer_setup(&dd->synth_stats_timer, update_synth_timer, 0);



	/***********************/

	/* per device counters */

drivers/infiniband/hw/hfi1/driver.c

+3 −4
Original line number Diff line number Diff line
@@ -1252,9 +1252,9 @@ void shutdown_led_override(struct hfi1_pportdata *ppd) 
	write_csr(dd, DCC_CFG_LED_CNTRL, 0);

}



static void run_led_override(unsigned long opaque)

static void run_led_override(struct timer_list *t)

{

	struct hfi1_pportdata *ppd = (struct hfi1_pportdata *)opaque;

	struct hfi1_pportdata *ppd = from_timer(ppd, t, led_override_timer);

	struct hfi1_devdata *dd = ppd->dd;

	unsigned long timeout;

	int phase_idx;
@@ -1298,8 +1298,7 @@ void hfi1_start_led_override(struct hfi1_pportdata *ppd, unsigned int timeon, 
	 * timeout so the handler will be called soon to look at our request.

	 */

	if (!timer_pending(&ppd->led_override_timer)) {

		setup_timer(&ppd->led_override_timer, run_led_override,

			    (unsigned long)ppd);

		timer_setup(&ppd->led_override_timer, run_led_override, 0);

		ppd->led_override_timer.expires = jiffies + 1;

		add_timer(&ppd->led_override_timer);

		atomic_set(&ppd->led_override_timer_active, 1);

drivers/infiniband/hw/hfi1/init.c

+1 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static void stop_timers(struct hfi1_devdata *dd) 


	for (pidx = 0; pidx < dd->num_pports; ++pidx) {

		ppd = dd->pport + pidx;

		if (ppd->led_override_timer.data) {

		if (ppd->led_override_timer.function) {

			del_timer_sync(&ppd->led_override_timer);

			atomic_set(&ppd->led_override_timer_active, 0);

		}

drivers/infiniband/hw/hfi1/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -399,9 +399,9 @@ static void send_trap(struct hfi1_ibport *ibp, struct trap_node *trap) 
		ib_free_send_mad(send_buf);

}



void hfi1_handle_trap_timer(unsigned long data)

void hfi1_handle_trap_timer(struct timer_list *t)

{

	struct hfi1_ibport *ibp = (struct hfi1_ibport *)data;

	struct hfi1_ibport *ibp = from_timer(ibp, t, rvp.trap_timer);

	struct trap_node *trap = NULL;

	unsigned long flags;

	int i;