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

e1000e: fix numeric overflow in phc settime method

2013-05-08T03:33:14+00:00

commit 73e3dd6b45c4c870fc2641eb04c24e3f12dab1e0 upstream.

The PTP Hardware Clock settime function in the e1000e driver
computes nanoseconds from a struct timespec. The code converts the
seconds field .tv_sec by multiplying it with NSEC_PER_SEC. However,
both operands are of type long, resulting in an unintended overflow.
The patch fixes the issue by using the helper function from time.h.

Signed-off-by: Richard Cochran 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher 
Signed-off-by: Greg Kroah-Hartman

ixgbe: fix EICR write in ixgbe_msix_other

2013-05-08T03:33:14+00:00

commit d87d830720a1446403ed38bfc2da268be0d356d1 upstream.

Previously, the ixgbe_msix_other was writing the full 32bits of the set
interrupts, instead of only the ones which the ixgbe_msix_other is
handling. This resulted in a loss of performance when the X540's PPS feature is
enabled due to sometimes clearing queue interrupts which resulted in the driver
not getting the interrupt for cleaning the q_vector rings often enough. The fix
is to simply mask the lower 16bits off so that this handler does not write them
in the EICR, which causes them to remain high and be properly handled by the
clean_rings interrupt routine as normal.

Signed-off-by: Jacob Keller 
Tested-by: Phil Schmitt 
Signed-off-by: Jeff Kirsher 
Signed-off-by: Greg Kroah-Hartman

ixgbe: Fix a bug in setting VF VLAN via PF

2013-04-18T18:52:18+00:00

The PF driver does not check if the administrator has already set a VF
VLAN via the PF driver before setting the new VLAN.  This results in
the following scenario:

A) Administrator sets VF  to VLAN 100
B) Administrator sets VF  to VLAN 100
C) Administrator sets VF  to VLAN 200
D) The VF  driver continues to be able to receive traffic on VLAN
   100 because the VLVFB pool enable bit for that VF was left set
   instead of being cleared as it should be.

This fix ensures that the old VLAN filter for VF  is first removed
and the pool bit enable for VF  is cleared so that it no longer
receives traffic on VLAN 100.

Signed-off-by: Greg Rose 
Tested-by: Sibai Li 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

igb: Revert support for build_skb in igb

2013-04-18T18:52:18+00:00

This patch actually reverts:
igb: Support using build_skb in the case that jumbo frames are disabled

The reason for reverting this patch is that it can lead to data corruption.
The following flow was pointed out by Ben Hutchings:

1. skb is forwarded to another device
2. Packet headers are modified and it's put into a queue
3. Second packet is received into the other half of this page
4. Page cannot be reused, so is DMA-unmapped
5. The DMA mapping was non-coherent, so unmap copies or invalidates
cache

The headers added in step 2 get trashed in step 5.

Reported-by: Ben Hutchings 
Signed-off-by: Alexander Duyck 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

e100: Add dma mapping error check

2013-04-10T19:25:15+00:00

e100 uses pci_map_single, but fails to check for a dma mapping error after its
use, resulting in a stack trace:

[   46.656594] ------------[ cut here ]------------
[   46.657004] WARNING: at lib/dma-debug.c:933 check_unmap+0x47b/0x950()
[   46.657004] Hardware name: To Be Filled By O.E.M.
[   46.657004] e100 0000:00:0e.0: DMA-API: device driver failed to check map
error[device address=0x000000007a4540fa] [size=90 bytes] [mapped as single]
[   46.657004] Modules linked in:
[   46.657004]  w83627hf hwmon_vid snd_via82xx ppdev snd_ac97_codec ac97_bus
snd_seq snd_pcm snd_mpu401 snd_mpu401_uart ns558 snd_rawmidi gameport parport_pc
e100 snd_seq_device parport snd_page_alloc snd_timer snd soundcore skge shpchp
k8temp mii edac_core i2c_viapro edac_mce_amd nfsd auth_rpcgss nfs_acl lockd
sunrpc binfmt_misc uinput ata_generic pata_acpi radeon i2c_algo_bit
drm_kms_helper ttm firewire_ohci drm firewire_core pata_via sata_via i2c_core
sata_promise crc_itu_t
[   46.657004] Pid: 792, comm: ip Not tainted 3.8.0-0.rc6.git0.1.fc19.x86_64 #1
[   46.657004] Call Trace:
[   46.657004]    [] warn_slowpath_common+0x70/0xa0
[   46.657004]  [] warn_slowpath_fmt+0x4c/0x50
[   46.657004]  [] check_unmap+0x47b/0x950
[   46.657004]  [] debug_dma_unmap_page+0x5f/0x70
[   46.657004]  [] ? e100_tx_clean+0x30/0x210 [e100]
[   46.657004]  [] e100_tx_clean+0xe8/0x210 [e100]
[   46.657004]  [] e100_poll+0x56f/0x6c0 [e100]
[   46.657004]  [] ? net_rx_action+0xa1/0x370
[   46.657004]  [] net_rx_action+0x172/0x370
[   46.657004]  [] __do_softirq+0xef/0x3d0
[   46.657004]  [] call_softirq+0x1c/0x30
[   46.657004]  [] do_softirq+0x85/0xc0
[   46.657004]  [] irq_exit+0xd5/0xe0
[   46.657004]  [] do_IRQ+0x56/0xc0
[   46.657004]  [] common_interrupt+0x72/0x72
[   46.657004]    [] ?
_raw_spin_unlock_irqrestore+0x3b/0x70
[   46.657004]  [] __slab_free+0x58/0x38b
[   46.657004]  [] ? fsnotify_clear_marks_by_inode+0x34/0x120
[   46.657004]  [] ? kmem_cache_free+0x97/0x320
[   46.657004]  [] ? sock_destroy_inode+0x34/0x40
[   46.657004]  [] ? sock_destroy_inode+0x34/0x40
[   46.657004]  [] kmem_cache_free+0x312/0x320
[   46.657004]  [] sock_destroy_inode+0x34/0x40
[   46.657004]  [] destroy_inode+0x38/0x60
[   46.657004]  [] evict+0x10e/0x1a0
[   46.657004]  [] iput+0xf5/0x180
[   46.657004]  [] dput+0x248/0x310
[   46.657004]  [] __fput+0x171/0x240
[   46.657004]  [] ____fput+0xe/0x10
[   46.657004]  [] task_work_run+0xac/0xe0
[   46.657004]  [] do_exit+0x26d/0xc30
[   46.657004]  [] ? finish_task_switch+0x7c/0x120
[   46.657004]  [] ? retint_swapgs+0x13/0x1b
[   46.657004]  [] do_group_exit+0x49/0xc0
[   46.657004]  [] sys_exit_group+0x14/0x20
[   46.657004]  [] system_call_fastpath+0x16/0x1b
[   46.657004] ---[ end trace 4468c44e2156e7d1 ]---
[   46.657004] Mapped at:
[   46.657004]  [] debug_dma_map_page+0x91/0x140
[   46.657004]  [] e100_xmit_prepare+0x12b/0x1c0 [e100]
[   46.657004]  [] e100_exec_cb+0x84/0x140 [e100]
[   46.657004]  [] e100_xmit_frame+0x3a/0x190 [e100]
[   46.657004]  [] dev_hard_start_xmit+0x259/0x6c0

Easy fix, modify the cb paramter to e100_exec_cb to return an error, and do the
dma_mapping_error check in the obvious place

This was reported previously here:
http://article.gmane.org/gmane.linux.network/257893

But nobody stepped up and fixed it.

CC: Josh Boyer 
CC: e1000-devel@lists.sourceforge.net
Signed-off-by: Neil Horman 
Reported-by: Michal Jaegermann 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

ixgbe: fix registration order of driver and DCA nofitication

2013-04-05T04:49:13+00:00

ixgbe_notify_dca cannot be called before driver registration
because it expects driver's klist_devices to be allocated and
initialized. While on it make sure debugfs files are removed
when registration fails.

Cc: stable 
Signed-off-by: Jakub Kicinski 
Tested-by: Phil Schmitt 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

e1000e: Add missing dma_mapping_error-call in e1000_alloc_jumbo_rx_buffers

2013-03-27T10:26:27+00:00

After dma_map_page, dma_mapping_error must be called. It seems safe to
not free the skb/page allocated in this function, as the skb/page can be
reused later.

Signed-off-by: Christoph Paasch 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher

ixgb: Add missing dma_mapping_error-call in ixgb_alloc_rx_buffers

2013-03-27T10:13:27+00:00

After dma_map_single, dma_mapping_error must be called. It seems safe to
not free the skb allocated in this function, as the skb can be reused
later.

Additionally this patch fixes one coding-style error.

Signed-off-by: Christoph Paasch 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher

e1000: ethtool: Add missing dma_mapping_error-call in e1000_setup_desc_rings

2013-03-27T09:32:27+00:00

After dma_map_single, dma_mapping_error must be called.

Signed-off-by: Christoph Paasch 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher

igb: fix PHC stopping on max freq

2013-03-26T10:21:34+00:00

For 82576 MAC type, max_adj is reported as 1000000000 ppb. However, if
this value is passed to igb_ptp_adjfreq_82576, incvalue overflows out of
INCVALUE_82576_MASK, resulting in setting of zero TIMINCA.incvalue, stopping
the PHC (instead of going at twice the nominal speed).

Fix the advertised max_adj value to the largest value hardware can handle.
As there is no min_adj value available (-max_adj is used instead), this will
also prevent stopping the clock intentionally. It's probably not a big deal,
other igb MAC types don't support stopping the clock, either.

Signed-off-by: Jiri Benc 
Acked-by: Matthew Vick 
Tested-by: Aaron Brown 
Signed-off-by: Jeff Kirsher