hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: tulip: 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.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Philippe Reynes <tremyfr@gmail.com>
Cc: "yuval.shaia@oracle.com" <yuval.shaia@oracle.com>
Cc: netdev@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook 2017-10-16 17:29:05 -07:00 committed by David S. Miller
parent 3d2ceaa63b
commit a8c22a2bbc
10 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/dec/tulip/de4x5.c
View File

@ -912,7 +912,7 @@ static int de4x5_init(struct net_device *dev);
static int de4x5_sw_reset(struct net_device *dev); static int de4x5_sw_reset(struct net_device *dev);
static int de4x5_rx(struct net_device *dev); static int de4x5_rx(struct net_device *dev);
static int de4x5_tx(struct net_device *dev); static int de4x5_tx(struct net_device *dev);
static void de4x5_ast(struct net_device *dev); static void de4x5_ast(struct timer_list *t);
static int de4x5_txur(struct net_device *dev); static int de4x5_txur(struct net_device *dev);
static int de4x5_rx_ovfc(struct net_device *dev); static int de4x5_rx_ovfc(struct net_device *dev);
@ -1147,8 +1147,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
lp->timeout = -1; lp->timeout = -1;
lp->gendev = gendev; lp->gendev = gendev;
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
setup_timer(&lp->timer, (void (*)(unsigned long))de4x5_ast, timer_setup(&lp->timer, de4x5_ast, 0);
(unsigned long)dev);
de4x5_parse_params(dev); de4x5_parse_params(dev);
/* /*
@ -1741,9 +1740,10 @@ de4x5_tx(struct net_device *dev)
} }
static void static void
de4x5_ast(struct net_device *dev) de4x5_ast(struct timer_list *t)
{ {
struct de4x5_private *lp = netdev_priv(dev); struct de4x5_private *lp = from_timer(lp, t, timer);
struct net_device *dev = dev_get_drvdata(lp->gendev);
int next_tick = DE4X5_AUTOSENSE_MS; int next_tick = DE4X5_AUTOSENSE_MS;
int dt; int dt;
@ -2369,7 +2369,7 @@ autoconf_media(struct net_device *dev)
lp->media = INIT; lp->media = INIT;
lp->tcount = 0; lp->tcount = 0;
de4x5_ast(dev); de4x5_ast(&lp->timer);
return lp->media; return lp->media;
} }

10
drivers/net/ethernet/dec/tulip/dmfe.c
View File

@ -331,7 +331,7 @@ static void dmfe_phy_write_1bit(void __iomem *, u32);
static u16 dmfe_phy_read_1bit(void __iomem *); static u16 dmfe_phy_read_1bit(void __iomem *);
static u8 dmfe_sense_speed(struct dmfe_board_info *); static u8 dmfe_sense_speed(struct dmfe_board_info *);
static void dmfe_process_mode(struct dmfe_board_info *); static void dmfe_process_mode(struct dmfe_board_info *);
static void dmfe_timer(unsigned long); static void dmfe_timer(struct timer_list *);
static inline u32 cal_CRC(unsigned char *, unsigned int, u8); static inline u32 cal_CRC(unsigned char *, unsigned int, u8);
static void dmfe_rx_packet(struct net_device *, struct dmfe_board_info *); static void dmfe_rx_packet(struct net_device *, struct dmfe_board_info *);
static void dmfe_free_tx_pkt(struct net_device *, struct dmfe_board_info *); static void dmfe_free_tx_pkt(struct net_device *, struct dmfe_board_info *);
@ -596,7 +596,7 @@ static int dmfe_open(struct net_device *dev)
netif_wake_queue(dev); netif_wake_queue(dev);
/* set and active a timer process */ /* set and active a timer process */
setup_timer(&db->timer, dmfe_timer, (unsigned long)dev); timer_setup(&db->timer, dmfe_timer, 0);
db->timer.expires = DMFE_TIMER_WUT + HZ * 2; db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
add_timer(&db->timer); add_timer(&db->timer);
@ -1128,10 +1128,10 @@ static const struct ethtool_ops netdev_ethtool_ops = {
* Dynamic media sense, allocate Rx buffer... * Dynamic media sense, allocate Rx buffer...
*/ */
static void dmfe_timer(unsigned long data) static void dmfe_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct dmfe_board_info *db = from_timer(db, t, timer);
struct dmfe_board_info *db = netdev_priv(dev); struct net_device *dev = pci_get_drvdata(db->pdev);
void __iomem *ioaddr = db->ioaddr; void __iomem *ioaddr = db->ioaddr;
u32 tmp_cr8; u32 tmp_cr8;
unsigned char tmp_cr12; unsigned char tmp_cr12;

6
drivers/net/ethernet/dec/tulip/interrupt.c
View File

@ -102,10 +102,10 @@ int tulip_refill_rx(struct net_device *dev)
#ifdef CONFIG_TULIP_NAPI #ifdef CONFIG_TULIP_NAPI
void oom_timer(unsigned long data) void oom_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct tulip_private *tp = from_timer(tp, t, oom_timer);
struct tulip_private *tp = netdev_priv(dev);
napi_schedule(&tp->napi); napi_schedule(&tp->napi);
} }

6
drivers/net/ethernet/dec/tulip/pnic.c
View File

@ -84,10 +84,10 @@ void pnic_lnk_change(struct net_device *dev, int csr5)
} }
} }
void pnic_timer(unsigned long data) void pnic_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct tulip_private *tp = from_timer(tp, t, timer);
struct tulip_private *tp = netdev_priv(dev); struct net_device *dev = tp->dev;
void __iomem *ioaddr = tp->base_addr; void __iomem *ioaddr = tp->base_addr;
int next_tick = 60*HZ; int next_tick = 60*HZ;

6
drivers/net/ethernet/dec/tulip/pnic2.c
View File

@ -76,10 +76,10 @@
#include <linux/delay.h> #include <linux/delay.h>
void pnic2_timer(unsigned long data) void pnic2_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct tulip_private *tp = from_timer(tp, t, timer);
struct tulip_private *tp = netdev_priv(dev); struct net_device *dev = tp->dev;
void __iomem *ioaddr = tp->base_addr; void __iomem *ioaddr = tp->base_addr;
int next_tick = 60*HZ; int next_tick = 60*HZ;

12
drivers/net/ethernet/dec/tulip/timer.c
View File

@ -137,10 +137,10 @@ void tulip_media_task(struct work_struct *work)
} }
void mxic_timer(unsigned long data) void mxic_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct tulip_private *tp = from_timer(tp, t, timer);
struct tulip_private *tp = netdev_priv(dev); struct net_device *dev = tp->dev;
void __iomem *ioaddr = tp->base_addr; void __iomem *ioaddr = tp->base_addr;
int next_tick = 60*HZ; int next_tick = 60*HZ;
@ -154,10 +154,10 @@ void mxic_timer(unsigned long data)
} }
void comet_timer(unsigned long data) void comet_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct tulip_private *tp = from_timer(tp, t, timer);
struct tulip_private *tp = netdev_priv(dev); struct net_device *dev = tp->dev;
int next_tick = 2*HZ; int next_tick = 2*HZ;
if (tulip_debug > 1) if (tulip_debug > 1)

12
drivers/net/ethernet/dec/tulip/tulip.h
View File

@ -43,7 +43,7 @@ struct tulip_chip_table {
int io_size; int io_size;
int valid_intrs; /* CSR7 interrupt enable settings */ int valid_intrs; /* CSR7 interrupt enable settings */
int flags; int flags;
void (*media_timer) (unsigned long); void (*media_timer) (struct timer_list *);
work_func_t media_task; work_func_t media_task;
}; };
@ -476,7 +476,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5);
/* PNIC2.c */ /* PNIC2.c */
void pnic2_lnk_change(struct net_device *dev, int csr5); void pnic2_lnk_change(struct net_device *dev, int csr5);
void pnic2_timer(unsigned long data); void pnic2_timer(struct timer_list *t);
void pnic2_start_nway(struct net_device *dev); void pnic2_start_nway(struct net_device *dev);
void pnic2_lnk_change(struct net_device *dev, int csr5); void pnic2_lnk_change(struct net_device *dev, int csr5);
@ -504,19 +504,19 @@ void tulip_find_mii (struct net_device *dev, int board_idx);
/* pnic.c */ /* pnic.c */
void pnic_do_nway(struct net_device *dev); void pnic_do_nway(struct net_device *dev);
void pnic_lnk_change(struct net_device *dev, int csr5); void pnic_lnk_change(struct net_device *dev, int csr5);
void pnic_timer(unsigned long data); void pnic_timer(struct timer_list *t);
/* timer.c */ /* timer.c */
void tulip_media_task(struct work_struct *work); void tulip_media_task(struct work_struct *work);
void mxic_timer(unsigned long data); void mxic_timer(struct timer_list *t);
void comet_timer(unsigned long data); void comet_timer(struct timer_list *t);
/* tulip_core.c */ /* tulip_core.c */
extern int tulip_debug; extern int tulip_debug;
extern const char * const medianame[]; extern const char * const medianame[];
extern const char tulip_media_cap[]; extern const char tulip_media_cap[];
extern const struct tulip_chip_table tulip_tbl[]; extern const struct tulip_chip_table tulip_tbl[];
void oom_timer(unsigned long data); void oom_timer(struct timer_list *t);
extern u8 t21040_csr13[]; extern u8 t21040_csr13[];
static inline void tulip_start_rxtx(struct tulip_private *tp) static inline void tulip_start_rxtx(struct tulip_private *tp)

14
drivers/net/ethernet/dec/tulip/tulip_core.c
View File

@ -123,10 +123,10 @@ int tulip_debug = TULIP_DEBUG;
int tulip_debug = 1; int tulip_debug = 1;
#endif #endif
static void tulip_timer(unsigned long data) static void tulip_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct tulip_private *tp = from_timer(tp, t, timer);
struct tulip_private *tp = netdev_priv(dev); struct net_device *dev = tp->dev;
if (netif_running(dev)) if (netif_running(dev))
schedule_work(&tp->media_work); schedule_work(&tp->media_work);
@ -505,7 +505,7 @@ media_picked:
tp->timer.expires = RUN_AT(next_tick); tp->timer.expires = RUN_AT(next_tick);
add_timer(&tp->timer); add_timer(&tp->timer);
#ifdef CONFIG_TULIP_NAPI #ifdef CONFIG_TULIP_NAPI
setup_timer(&tp->oom_timer, oom_timer, (unsigned long)dev); timer_setup(&tp->oom_timer, oom_timer, 0);
#endif #endif
} }
@ -780,8 +780,7 @@ static void tulip_down (struct net_device *dev)
spin_unlock_irqrestore (&tp->lock, flags); spin_unlock_irqrestore (&tp->lock, flags);
setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer, timer_setup(&tp->timer, tulip_tbl[tp->chip_id].media_timer, 0);
(unsigned long)dev);
dev->if_port = tp->saved_if_port; dev->if_port = tp->saved_if_port;
@ -1470,8 +1469,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
tp->csr0 = csr0; tp->csr0 = csr0;
spin_lock_init(&tp->lock); spin_lock_init(&tp->lock);
spin_lock_init(&tp->mii_lock); spin_lock_init(&tp->mii_lock);
setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer, timer_setup(&tp->timer, tulip_tbl[tp->chip_id].media_timer, 0);
(unsigned long)dev);
INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task); INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task);

10
drivers/net/ethernet/dec/tulip/uli526x.c
View File

@ -241,7 +241,7 @@ static void phy_write_1bit(struct uli526x_board_info *db, u32);
static u16 phy_read_1bit(struct uli526x_board_info *db); static u16 phy_read_1bit(struct uli526x_board_info *db);
static u8 uli526x_sense_speed(struct uli526x_board_info *); static u8 uli526x_sense_speed(struct uli526x_board_info *);
static void uli526x_process_mode(struct uli526x_board_info *); static void uli526x_process_mode(struct uli526x_board_info *);
static void uli526x_timer(unsigned long); static void uli526x_timer(struct timer_list *t);
static void uli526x_rx_packet(struct net_device *, struct uli526x_board_info *); static void uli526x_rx_packet(struct net_device *, struct uli526x_board_info *);
static void uli526x_free_tx_pkt(struct net_device *, struct uli526x_board_info *); static void uli526x_free_tx_pkt(struct net_device *, struct uli526x_board_info *);
static void uli526x_reuse_skb(struct uli526x_board_info *, struct sk_buff *); static void uli526x_reuse_skb(struct uli526x_board_info *, struct sk_buff *);
@ -491,7 +491,7 @@ static int uli526x_open(struct net_device *dev)
netif_wake_queue(dev); netif_wake_queue(dev);
/* set and active a timer process */ /* set and active a timer process */
setup_timer(&db->timer, uli526x_timer, (unsigned long)dev); timer_setup(&db->timer, uli526x_timer, 0);
db->timer.expires = ULI526X_TIMER_WUT + HZ * 2; db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
add_timer(&db->timer); add_timer(&db->timer);
@ -1021,10 +1021,10 @@ static const struct ethtool_ops netdev_ethtool_ops = {
* Dynamic media sense, allocate Rx buffer... * Dynamic media sense, allocate Rx buffer...
*/ */
static void uli526x_timer(unsigned long data) static void uli526x_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *) data; struct uli526x_board_info *db = from_timer(db, t, timer);
struct uli526x_board_info *db = netdev_priv(dev); struct net_device *dev = pci_get_drvdata(db->pdev);
struct uli_phy_ops *phy = &db->phy; struct uli_phy_ops *phy = &db->phy;
void __iomem *ioaddr = db->ioaddr; void __iomem *ioaddr = db->ioaddr;
unsigned long flags; unsigned long flags;

10
drivers/net/ethernet/dec/tulip/winbond-840.c
View File

@ -327,7 +327,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);
static void mdio_write(struct net_device *dev, int phy_id, int location, int value); static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
static int netdev_open(struct net_device *dev); static int netdev_open(struct net_device *dev);
static int update_link(struct net_device *dev); static int update_link(struct net_device *dev);
static void netdev_timer(unsigned long data); static void netdev_timer(struct timer_list *t);
static void init_rxtx_rings(struct net_device *dev); static void init_rxtx_rings(struct net_device *dev);
static void free_rxtx_rings(struct netdev_private *np); static void free_rxtx_rings(struct netdev_private *np);
static void init_registers(struct net_device *dev); static void init_registers(struct net_device *dev);
@ -655,7 +655,7 @@ static int netdev_open(struct net_device *dev)
netdev_dbg(dev, "Done netdev_open()\n"); netdev_dbg(dev, "Done netdev_open()\n");
/* Set the timer to check for link beat. */ /* Set the timer to check for link beat. */
setup_timer(&np->timer, netdev_timer, (unsigned long)dev); timer_setup(&np->timer, netdev_timer, 0);
np->timer.expires = jiffies + 1*HZ; np->timer.expires = jiffies + 1*HZ;
add_timer(&np->timer); add_timer(&np->timer);
return 0; return 0;
@ -772,10 +772,10 @@ static inline void update_csr6(struct net_device *dev, int new)
np->mii_if.full_duplex = 1; np->mii_if.full_duplex = 1;
} }
static void netdev_timer(unsigned long data) static void netdev_timer(struct timer_list *t)
{ {
struct net_device *dev = (struct net_device *)data; struct netdev_private *np = from_timer(np, t, timer);
struct netdev_private *np = netdev_priv(dev); struct net_device *dev = pci_get_drvdata(np->pci_dev);
void __iomem *ioaddr = np->base_addr; void __iomem *ioaddr = np->base_addr;
if (debug > 2) if (debug > 2)