Eric Dumazet d53c66a5b8 bnx2x: fix lockdep splat ... Michel reported following lockdep splat [ 44.718117] INFO: trying to register non-static key. [ 44.723081] the code is fine but needs lockdep annotation. [ 44.728559] turning off the locking correctness validator. [ 44.734036] CPU: 8 PID: 5483 Comm: ethtool Not tainted 4.1.0 [ 44.770289] Call Trace: [ 44.772741] [<ffffffff816eb1cd>] dump_stack+0x4c/0x65 [ 44.777879] [<ffffffff8111d921>] ? console_unlock+0x1f1/0x510 [ 44.783708] [<ffffffff811121f5>] __lock_acquire+0x1d05/0x1f10 [ 44.789538] [<ffffffff8111370a>] ? mark_held_locks+0x6a/0x90 [ 44.795276] [<ffffffff81113835>] ? trace_hardirqs_on_caller+0x105/0x1d0 [ 44.801967] [<ffffffff8111390d>] ? trace_hardirqs_on+0xd/0x10 [ 44.807793] [<ffffffff811330fa>] ? hrtimer_try_to_cancel+0x4a/0x250 [ 44.814142] [<ffffffff81112ba6>] lock_acquire+0xb6/0x290 [ 44.819537] [<ffffffff810d6675>] ? flush_work+0x5/0x280 [ 44.824844] [<ffffffff810d66ad>] flush_work+0x3d/0x280 [ 44.830061] [<ffffffff810d6675>] ? flush_work+0x5/0x280 [ 44.835366] [<ffffffff816f3c43>] ? schedule_hrtimeout_range+0x13/0x20 [ 44.841889] [<ffffffff8112ec9b>] ? usleep_range+0x4b/0x50 [ 44.847365] [<ffffffff8111370a>] ? mark_held_locks+0x6a/0x90 [ 44.853102] [<ffffffff810d8585>] ? __cancel_work_timer+0x105/0x1c0 [ 44.859359] [<ffffffff81113835>] ? trace_hardirqs_on_caller+0x105/0x1d0 [ 44.866045] [<ffffffff810d851f>] __cancel_work_timer+0x9f/0x1c0 [ 44.872048] [<ffffffffa0010982>] ? bnx2x_func_stop+0x42/0x90 [bnx2x] [ 44.878481] [<ffffffff810d8670>] cancel_work_sync+0x10/0x20 [ 44.884134] [<ffffffffa00259e5>] bnx2x_chip_cleanup+0x245/0x730 [bnx2x] [ 44.890829] [<ffffffff8110ce02>] ? up+0x32/0x50 [ 44.895439] [<ffffffff811306b5>] ? del_timer_sync+0x5/0xd0 [ 44.901005] [<ffffffffa005596d>] bnx2x_nic_unload+0x20d/0x8e0 [bnx2x] [ 44.907527] [<ffffffff811f1aef>] ? might_fault+0x5f/0xb0 [ 44.912921] [<ffffffffa005851c>] bnx2x_reload_if_running+0x2c/0x50 [bnx2x] [ 44.919879] [<ffffffffa005a3c5>] bnx2x_set_ringparam+0x2b5/0x460 [bnx2x] [ 44.926664] [<ffffffff815d498b>] dev_ethtool+0x55b/0x1c40 [ 44.932148] [<ffffffff815dfdc7>] ? rtnl_lock+0x17/0x20 [ 44.937364] [<ffffffff815e7f8b>] dev_ioctl+0x17b/0x630 [ 44.942582] [<ffffffff815abf8d>] sock_do_ioctl+0x5d/0x70 [ 44.947972] [<ffffffff815ac013>] sock_ioctl+0x73/0x280 [ 44.953192] [<ffffffff8124c1c8>] do_vfs_ioctl+0x88/0x5b0 [ 44.958587] [<ffffffff8110d0b3>] ? up_read+0x23/0x40 [ 44.963631] [<ffffffff812584cc>] ? __fget_light+0x6c/0xa0 [ 44.969105] [<ffffffff8124c781>] SyS_ioctl+0x91/0xb0 [ 44.974149] [<ffffffff816f4dd7>] system_call_fastpath+0x12/0x6f As bnx2x_init_ptp() is only called if bp->flags contains PTP_SUPPORTED, we also need to guard bnx2x_stop_ptp() with same condition, otherwise ptp_task workqueue is not initialized and kernel barfs on cancel_work_sync() Fixes: eeed018cbf ("bnx2x: Add timestamping and PTP hardware clock support") Reported-by: Michel Lespinasse <walken@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Michal Kalderon <Michal.Kalderon@qlogic.com> Cc: Ariel Elior <Ariel.Elior@qlogic.com> Cc: Yuval Mintz <Yuval.Mintz@qlogic.com> Cc: David Decotigny <decot@google.com> Acked-by: Sony Chacko <sony.chacko@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-28 17:03:27 -07:00
..
bnx2x_cmn.c	bnx2x: Fix linearization for encapsulated packets	2015-06-25 06:30:38 -07:00
bnx2x_cmn.h	bnx2x: Alloc 4k fragment for each rx ring buffer element	2015-06-01 15:56:42 -07:00
bnx2x_dcb.c	bnx2x: Code cleanup	2014-08-22 12:31:15 -07:00
bnx2x_dcb.h	bnx2x: update MAINTAINERS for bnx2x and e-mail addresses	2014-05-30 17:04:26 -07:00
bnx2x_dump.h	bnx2x: ethtool -d might cause timeout in log	2014-08-25 17:30:21 -07:00
bnx2x_ethtool.c	bnx2x: Release nvram lock on error flow	2015-06-25 06:30:38 -07:00
bnx2x_fw_defs.h	bnx2x: Utilize FW 7.10.51	2014-08-22 12:31:15 -07:00
bnx2x_fw_file_hdr.h	bnx2x: update MAINTAINERS for bnx2x and e-mail addresses	2014-05-30 17:04:26 -07:00
bnx2x_hsi.h	bnx2x: Count number of link changes	2015-03-31 13:34:10 -04:00
bnx2x_init_ops.h	bnx2x: update MAINTAINERS for bnx2x and e-mail addresses	2014-05-30 17:04:26 -07:00
bnx2x_init.h	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
bnx2x_link.c	bnx2x: Correct speed from baseT into KR.	2015-06-25 06:30:33 -07:00
bnx2x_link.h	bnx2x: Fix link problems for 1G SFP RJ45 module	2014-09-05 17:28:37 -07:00
bnx2x_main.c	bnx2x: fix lockdep splat	2015-06-28 17:03:27 -07:00
bnx2x_mfw_req.h	bnx2x: Introduce 2013 and advance version to 1.78.02	2013-01-15 15:07:59 -05:00
bnx2x_reg.h	bnx2x: Configure IFir et al. according to nvram	2015-03-31 13:34:10 -04:00
bnx2x_sp.c	bnx2x: Prevent false warning when accessing MACs	2015-06-25 06:30:34 -07:00
bnx2x_sp.h	bnx2x: Use correct fastpath version for VFs.	2014-12-09 14:29:10 -05:00
bnx2x_sriov.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-04-15 09:00:47 -07:00
bnx2x_sriov.h	bnx2x: Use correct fastpath version for VFs.	2014-12-09 14:29:10 -05:00
bnx2x_stats.c	bnx2x: Move statistics implementation into semaphores	2015-06-01 12:04:31 -07:00
bnx2x_stats.h	bnx2x: Fix statistics locking scheme	2015-03-23 22:38:24 -04:00
bnx2x_vfpf.c	bnx2x: merge fp->disable_tpa with fp->mode	2015-04-29 14:48:35 -04:00
bnx2x_vfpf.h	bnx2x: Use correct fastpath version for VFs.	2014-12-09 14:29:10 -05:00
bnx2x.h	bnx2x: Don't notify about scratchpad parities	2015-06-25 06:30:34 -07:00
Makefile	bnx2x: Segregate SR-IOV code	2013-01-07 19:49:14 -08:00