linux-stable.git/drivers/net/ethernet/intel, branch linux-3.13.y

e100: Fix "disabling already-disabled device" warning

2014-03-31T17:05:16+00:00

commit 2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 upstream.

In https://bugzilla.redhat.com/show_bug.cgi?id=994438 and
https://bugzilla.redhat.com/show_bug.cgi?id=970480  we
received different reports of e100 throwing the following
warning:

 [] ? pci_disable_device+0x85/0x90
 [] warn_slowpath_fmt+0x33/0x40
 [] pci_disable_device+0x85/0x90
 [] __e100_shutdown+0x80/0x120 [e100]
 [] ? check_preempt_curr+0x65/0x90
 [] e100_suspend+0x16/0x30 [e100]
 [] pci_legacy_suspend+0x2b/0xb0
 [] ? wait_for_completion+0x1f/0xd0
 [] ? pci_pm_poweroff+0xb0/0xb0
 [] pci_pm_freeze+0x94/0xa0
 [] dpm_run_callback+0x37/0x80
 [] ? pm_wakeup_pending+0xc4/0x140
 [] __device_suspend+0xb2/0x1f0
 [] async_suspend+0x1f/0x90
 [] async_run_entry_fn+0x35/0x140
 [] ? wake_up_process+0x1f/0x40
 [] process_one_work+0x115/0x370
 [] ? start_worker+0x25/0x30
 [] ? manage_workers.isra.27+0x1a5/0x250
 [] worker_thread+0xfe/0x330
 [] ? manage_workers.isra.27+0x250/0x250
 [] kthread+0x94/0xa0
 [] ret_from_kernel_thread+0x1b/0x28
 [] ? insert_kthread_work+0x30/0x30

This patch removes pci_disable_device() from __e100_shutdown().
pci_clear_master() is enough.

Signed-off-by: Michele Baldessari 
Tested-by: Mark Harig 
Signed-off-by: Aaron Brown 
Signed-off-by: David S. Miller 
Cc: Josh Boyer 
Signed-off-by: Greg Kroah-Hartman

e1000e: Fix compilation warning when !CONFIG_PM_SLEEP

2014-01-16T23:36:26+00:00

Commit 7509963c703b (e1000e: Fix a compile flag mis-match for
suspend/resume) moved suspend and resume hooks to be available when
CONFIG_PM is set. However, it can be set even if CONFIG_PM_SLEEP is not set
causing following warnings to be emitted:

drivers/net/ethernet/intel/e1000e/netdev.c:6178:12: warning:
  	‘e1000_suspend’ defined but not used [-Wunused-function]

drivers/net/ethernet/intel/e1000e/netdev.c:6185:12: warning:
	‘e1000_resume’ defined but not used [-Wunused-function]

To fix this make the hooks to be available only when CONFIG_PM_SLEEP is set
and remove CONFIG_PM wrapping from driver ops because this is already
handled by SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS().

Signed-off-by: Mika Westerberg 
Cc: Dave Ertman 
Cc: Aaron Brown 
Cc: Jeff Kirsher 
Signed-off-by: David S. Miller

net: core: explicitly select a txq before doing l2 forwarding

2014-01-10T18:23:08+00:00

Currently, the tx queue were selected implicitly in ndo_dfwd_start_xmit(). The
will cause several issues:

- NETIF_F_LLTX were removed for macvlan, so txq lock were done for macvlan
  instead of lower device which misses the necessary txq synchronization for
  lower device such as txq stopping or frozen required by dev watchdog or
  control path.
- dev_hard_start_xmit() was called with NULL txq which bypasses the net device
  watchdog.
- dev_hard_start_xmit() does not check txq everywhere which will lead a crash
  when tso is disabled for lower device.

Fix this by explicitly introducing a new param for .ndo_select_queue() for just
selecting queues in the case of l2 forwarding offload. netdev_pick_tx() was also
extended to accept this parameter and dev_queue_xmit_accel() was used to do l2
forwarding transmission.

With this fixes, NETIF_F_LLTX could be preserved for macvlan and there's no need
to check txq against NULL in dev_hard_start_xmit(). Also there's no need to keep
a dedicated ndo_dfwd_start_xmit() and we can just reuse the code of
dev_queue_xmit() to do the transmission.

In the future, it was also required for macvtap l2 forwarding support since it
provides a necessary synchronization method.

Cc: John Fastabend 
Cc: Neil Horman 
Cc: e1000-devel@lists.sourceforge.net
Signed-off-by: Jason Wang 
Acked-by: Neil Horman 
Acked-by: John Fastabend 
Signed-off-by: David S. Miller

ixgbe: fix for unused variable warning with certain config

2013-12-18T06:52:40+00:00

If CONFIG_PCI_IOV isn't defined we get an "unused variable" warining so
now wrap the variable declaration like it's usage already was.

Signed-off-by: Don Skidmore 
Acked-by: John Fastabend 
Tested-by: Phil Schmitt 
Signed-off-by: Jeff Kirsher

e1000e: Fix a compile flag mis-match for suspend/resume

2013-12-18T06:45:03+00:00

This patch addresses a mis-match between the declaration and usage of
the e1000_suspend and e1000_resume functions.  Previously, these
functions were declared in a CONFIG_PM_SLEEP wrapper, and then utilized
within a CONFIG_PM wrapper.  Both the declaration and usage will now be
contained within CONFIG_PM wrappers.

Signed-off-by: Dave Ertman 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher

e1000e: fix compiler warning (maybe-unitialized variable)

2013-12-18T06:20:49+00:00

This patch is to fix a compiler warning of maybe-uininitialized-variable
that is generated from gcc when the -O3 flag is used.  In the function
e1000_reset_hw_80003es2lan(), the variable krmn_reg_data is first given
a value by being passed to a register read function as a
pass-by-reference parameter.  But, the return value of that read
function was never checked to see if the read failed and the variable
not given an initial value.  The compiler was smart enough to spot
this.  This patch is to check the return value for that read function
and return it, if an error occurs, without trying to utilize the value
in kmrn_reg_data.

Signed-off-by: David Ertman 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher

e1000e: fix compiler warnings

2013-12-18T05:52:39+00:00

This patch is to fix a compiler warning of __bad_udelay due to a value
of >999 being passed as a parameter to udelay() in the function
e1000e_phy_has_link_generic().  This affects the gcc compiler when
it is given a flag of -O3 and the icc compiler.

This patch is also making the change from mdelay() to msleep() in the
same function, since it was determined though code inspection that this
function is never called in atomic context.

Signed-off-by: David Ertman 
Acked-by: Bruce Allan 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher

igb: Fix for issue where values could be too high for udelay function.

2013-12-15T03:59:42+00:00

This patch changes the igb_phy_has_link function to check the value of the
parameter before deciding to use udelay or mdelay in order to be sure that
the value is not too high for udelay function.

CC: stable kernel  # 3.9+
Signed-off-by: Sunil K Pandey 
Signed-off-by: Kevin B Smith 
Signed-off-by: Carolyn Wyborny 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

i40e: fix null dereference

2013-12-15T03:59:41+00:00

If the vsi->tx_rings structure is NULL we don't want to panic.

Change-Id: Ic694f043701738c434e8ebe0caf0673f4410dc10
Signed-off-by: Jesse Brandeburg 
Tested-by: Kavindya Deegala 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

ixgbe: Make ixgbe_identify_qsfp_module_generic static

2013-11-30T08:21:47+00:00

Correct a namespace complaint by making the function static
and moving the prototype into the .c file.

Signed-off-by: Mark Rustad 
Tested-by: Phil Schmitt 
Signed-off-by: Jeff Kirsher