redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

atm: idt77252: 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. This required adding a pointer back
to vc_map, and adjusting the locking around removal a bit.

Cc: Chas Williams <3chas3@gmail.com>
Cc: linux-atm-general@lists.sourceforge.net
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Kees Cook 2017-10-16 17:29:04 -07:00 committed by David S. Miller
parent 847f03ee16
commit 3d2ceaa63b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/atm/idt77252.c
View File

@ -2073,21 +2073,19 @@ idt77252_rate_logindex(struct idt77252_dev *card, int pcr)
} }
static void static void
idt77252_est_timer(unsigned long data) idt77252_est_timer(struct timer_list *t)
{ {
struct vc_map *vc = (struct vc_map *)data; struct rate_estimator *est = from_timer(est, t, timer);
struct vc_map *vc = est->vc;
struct idt77252_dev *card = vc->card; struct idt77252_dev *card = vc->card;
struct rate_estimator *est;
unsigned long flags; unsigned long flags;
u32 rate, cps; u32 rate, cps;
u64 ncells; u64 ncells;
u8 lacr; u8 lacr;
spin_lock_irqsave(&vc->lock, flags); spin_lock_irqsave(&vc->lock, flags);
est = vc->estimator; if (!vc->estimator)
if (!est)
goto out; goto out;
ncells = est->cells; ncells = est->cells;
rate = ((u32)(ncells - est->last_cells)) << (7 - est->interval); rate = ((u32)(ncells - est->last_cells)) << (7 - est->interval);
@ -2126,10 +2124,11 @@ idt77252_init_est(struct vc_map *vc, int pcr)
est->maxcps = pcr < 0 ? -pcr : pcr; est->maxcps = pcr < 0 ? -pcr : pcr;
est->cps = est->maxcps; est->cps = est->maxcps;
est->avcps = est->cps << 5; est->avcps = est->cps << 5;
est->vc = vc;
est->interval = 2; /* XXX: make this configurable */ est->interval = 2; /* XXX: make this configurable */
est->ewma_log = 2; /* XXX: make this configurable */ est->ewma_log = 2; /* XXX: make this configurable */
setup_timer(&est->timer, idt77252_est_timer, (unsigned long)vc); timer_setup(&est->timer, idt77252_est_timer, 0);
mod_timer(&est->timer, jiffies + ((HZ / 4) << est->interval)); mod_timer(&est->timer, jiffies + ((HZ / 4) << est->interval));
return est; return est;
@ -2209,16 +2208,20 @@ static int
idt77252_init_ubr(struct idt77252_dev *card, struct vc_map *vc, idt77252_init_ubr(struct idt77252_dev *card, struct vc_map *vc,
struct atm_vcc *vcc, struct atm_qos *qos) struct atm_vcc *vcc, struct atm_qos *qos)
{ {
struct rate_estimator *est = NULL;
unsigned long flags; unsigned long flags;
int tcr; int tcr;
spin_lock_irqsave(&vc->lock, flags); spin_lock_irqsave(&vc->lock, flags);
if (vc->estimator) { if (vc->estimator) {
del_timer(&vc->estimator->timer); est = vc->estimator;
kfree(vc->estimator);
vc->estimator = NULL; vc->estimator = NULL;
} }
spin_unlock_irqrestore(&vc->lock, flags); spin_unlock_irqrestore(&vc->lock, flags);
if (est) {
del_timer_sync(&est->timer);
kfree(est);
}
tcr = atm_pcr_goal(&qos->txtp); tcr = atm_pcr_goal(&qos->txtp);
if (tcr == 0) if (tcr == 0)

3
drivers/atm/idt77252.h
View File

@ -184,6 +184,8 @@ struct aal1 {
unsigned char sequence; unsigned char sequence;
}; };
struct vc_map;
struct rate_estimator { struct rate_estimator {
struct timer_list timer; struct timer_list timer;
unsigned int interval; unsigned int interval;
@ -193,6 +195,7 @@ struct rate_estimator {
long avcps; long avcps;
u32 cps; u32 cps;
u32 maxcps; u32 maxcps;
struct vc_map *vc;
}; };
struct vc_map { struct vc_map {