linux-toradex.git/drivers/net/ethernet, branch v3.4.55

atl1e: unmap partially mapped skb on dma error and free skb

2013-07-28T23:26:08+00:00

[ Upstream commit 584ec4355355ffac43571b02a314d43eb2f7fcbf ]

Ben Hutchings pointed out that my recent update to atl1e
in commit 352900b583b2852152a1e05ea0e8b579292e731e
("atl1e: fix dma mapping warnings") was missing a bit of code.

Specifically it reset the hardware tx ring to its origional state when
we hit a dma error, but didn't unmap any exiting mappings from the
operation.  This patch fixes that up.  It also remembers to free the
skb in the event that an error occurs, so we don't leak.  Untested, as
I don't have hardware.  I think its pretty straightforward, but please
review closely.

Signed-off-by: Neil Horman 
CC: Ben Hutchings 
CC: Jay Cliburn 
CC: Chris Snook 
CC: "David S. Miller" 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

atl1e: fix dma mapping warnings

2013-07-28T23:26:08+00:00

[ Upstream commit 352900b583b2852152a1e05ea0e8b579292e731e ]

Recently had this backtrace reported:
WARNING: at lib/dma-debug.c:937 check_unmap+0x47d/0x930()
Hardware name: System Product Name
ATL1E 0000:02:00.0: DMA-API: device driver failed to check map error[device
address=0x00000000cbfd1000] [size=90 bytes] [mapped as single]
Modules linked in: xt_conntrack nf_conntrack ebtable_filter ebtables
ip6table_filter ip6_tables snd_hda_codec_hdmi snd_hda_codec_realtek iTCO_wdt
iTCO_vendor_support snd_hda_intel acpi_cpufreq mperf coretemp btrfs zlib_deflate
snd_hda_codec snd_hwdep microcode raid6_pq libcrc32c snd_seq usblp serio_raw xor
snd_seq_device joydev snd_pcm snd_page_alloc snd_timer snd lpc_ich i2c_i801
soundcore mfd_core atl1e asus_atk0110 ata_generic pata_acpi radeon i2c_algo_bit
drm_kms_helper ttm drm i2c_core pata_marvell uinput
Pid: 314, comm: systemd-journal Not tainted 3.9.0-0.rc6.git2.3.fc19.x86_64 #1
Call Trace:
   [] warn_slowpath_common+0x66/0x80
 [] warn_slowpath_fmt+0x4c/0x50
 [] check_unmap+0x47d/0x930
 [] ? sched_clock_cpu+0xa8/0x100
 [] debug_dma_unmap_page+0x5f/0x70
 [] ? unmap_single+0x20/0x30
 [] atl1e_intr+0x3a1/0x5b0 [atl1e]
 [] ? trace_hardirqs_off+0xd/0x10
 [] handle_irq_event_percpu+0x56/0x390
 [] handle_irq_event+0x3d/0x60
 [] handle_fasteoi_irq+0x5a/0x100
 [] handle_irq+0xbf/0x150
 [] ? file_sb_list_del+0x3f/0x50
 [] ? irq_enter+0x50/0xa0
 [] do_IRQ+0x4d/0xc0
 [] ? file_sb_list_del+0x3f/0x50
 [] common_interrupt+0x72/0x72
   [] ? lock_release+0xc2/0x310
 [] lg_local_unlock_cpu+0x24/0x50
 [] file_sb_list_del+0x3f/0x50
 [] fput+0x2d/0xc0
 [] filp_close+0x61/0x90
 [] __close_fd+0x8d/0x150
 [] sys_close+0x20/0x50
 [] system_call_fastpath+0x16/0x1b

The usual straighforward failure to check for dma_mapping_error after a map
operation is completed.

This patch should fix it, the reporter wandered off after filing this bz:
https://bugzilla.redhat.com/show_bug.cgi?id=954170

and I don't have hardware to test, but the fix is pretty straightforward, so I
figured I'd post it for review.

Signed-off-by: Neil Horman 
CC: Jay Cliburn 
CC: Chris Snook 
CC: "David S. Miller" 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

sunvnet: vnet_port_remove must call unregister_netdev

2013-07-28T23:26:03+00:00

[ Upstream commit aabb9875d02559ab9b928cd6f259a5cc4c21a589 ]

The missing call to unregister_netdev() leaves the interface active
after the driver is unloaded by rmmod.

Signed-off-by: Dave Kleikamp 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

sh_eth: fix unhandled RFE interrupt

2013-07-28T23:25:58+00:00

[ Upstream commit ca8c35852138ee0585eaffe6b9f10a5261ea7771 ]

EESR.RFE (receive FIFO overflow) interrupt is enabled by the driver on all SoCs
and sh_eth_error() handles it but it's not present in any initializer/assignment
of the 'eesr_err_check' field of 'struct sh_eth_cpu_data'. This leads to that
interrupt not being handled and cleared, and finally to disabling IRQ and the
driver being non-functional.

Modify DEFAULT_EESR_ERR_CHECK macro and all explicit initializers of the above
mentioned field to contain the EESR.RFE bit. Remove useless backslashes from the
initializers, while at it.

Signed-off-by: Sergei Shtylyov 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

8139cp: reset BQL when ring tx ring cleared

2013-06-27T18:27:31+00:00

[ Upstream commit 98962baad72fd6d393bf39dbb7c2076532c363c6 ]

This patch cures transmit timeout's with DHCP observed
while running under KVM. When the transmit ring is cleaned out,
the Byte Queue Limit values need to be reset.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

r8169: fix offloaded tx checksum for small packets.

2013-06-27T18:27:31+00:00

[ Upstream commit b423e9ae49d78ea3f53b131c8d5a6087aed16fd6 ]

8168evl offloaded checksums are wrong since commit
e5195c1f31f399289347e043d6abf3ffa80f0005 ("r8169: fix 8168evl frame padding.")
pads small packets to 60 bytes (without ethernet checksum). Typical symptoms
appear as UDP checksums which are wrong by the count of added bytes.

It isn't worth compensating. Let the driver checksum.

Due to the skb length changes, TSO code is moved before the Tx descriptor gets
written.

Signed-off-by: Francois Romieu 
Tested-by: Holger Hoffstätte 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

gianfar: add missing iounmap() on error in gianfar_ptp_probe()

2013-06-27T18:27:31+00:00

[ Upstream commit e5f5e380e0f3bb11f04ca5bc66a551e58e0ad26e ]

Add the missing iounmap() before return from gianfar_ptp_probe()
in the error handling case.

Signed-off-by: Wei Yongjun 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

r8169: fix vlan tag read ordering.

2013-05-19T17:54:48+00:00

commit ce11ff5e5963e441feb591e76278528f876c332d upstream.

Control of receive descriptor must not be returned to ethernet chipset
before vlan tag processing is done.

VLAN tag receive word is now reset both in normal and error path.

Signed-off-by: Francois Romieu 
Spotted-by: Timo Teras 
Cc: Hayes Wang 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

3c59x: fix PCI resource management

2013-05-19T17:54:46+00:00

[ Upstream commit 4b264a1676e70dc656ba53a8cac690f2d4b65f4e ]

The driver wrongly claimed I/O ports at an address returned by pci_iomap() --
even if it was passed an MMIO address.  Fix this by claiming/releasing all PCI
resources in the PCI driver's probe()/remove() methods instead and get rid of
'must_free_region' flag weirdness (why would Cardbus claim anything for us?).

Signed-off-by: Sergei Shtylyov 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

3c59x: fix freeing nonexistent resource on driver unload

2013-05-19T17:54:46+00:00

[ Upstream commit c81400be716aa4c76f6ebf339ba94358dbbf6da6 ]

When unloading the driver that drives an EISA board, a message similar to the
following one is displayed:

Trying to free nonexistent resource <0000000000013000-000000000001301f>

Then an user is unable to reload the driver because the resource it requested in
the previous load hasn't been freed. This happens most probably due to a typo in
vortex_eisa_remove() which calls release_region() with 'dev->base_addr'  instead
of 'edev->base_addr'...

Reported-by: Matthew Whitehead 
Tested-by: Matthew Whitehead 
Signed-off-by: Sergei Shtylyov 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman