linux-toradex.git/drivers/net/ethernet/3com, branch v4.1.10

drivers/net: Use setup_timer and mod_timer

2015-02-12T03:40:12+00:00

This patch introduces the use of functions setup_timer
and mod_timer.

This is done using Coccinelle and semantic patch used
for this as follows:

// 
@@
expression x,y,z,a,b;
@@

-init_timer (&x);
+setup_timer (&x, y, z);
+mod_timer (&a, b);
-x.function = y;
-x.data = z;
-x.expires = b;
-add_timer(&a);

// 

Signed-off-by: Vaishali Thakkar 
Signed-off-by: David S. Miller

net: rename vlan_tx_* helpers since "tx" is misleading there

2015-01-13T22:51:08+00:00

The same macros are used for rx as well. So rename it.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

net: typhoon: Remove redundant casts

2014-10-24T04:41:31+00:00

Both image_data and typhoon_fw->data are const u8*, so the cast to u8*
is unnecessary and confusing.

Signed-off-by: Rasmus Villemoes 
Acked-by: David Dillow 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-10-08T20:22:22+00:00

3c59x: fix bad split of cpu_to_le32(pci_map_single())

2014-10-07T17:16:06+00:00

In commit 6f2b6a3005b2c34c39f207a87667564f64f2f91a,
  # 3c59x: Add dma error checking and recovery
the intent is to split out the mapping from the byte-swapping in order to
insert a dma_mapping_error() check.

Kinda this semantic patch:

    // See http://coccinelle.lip6.fr/
    //
    // Beware, grouik-and-dirty!
    @@
    expression DEV, X, Y, Z;
    @@
    -   cpu_to_le32(pci_map_single(DEV, X, Y, Z))
    +   dma_addr_t addr = pci_map_single(DEV, X, Y, Z);
    +   if (dma_mapping_error(&DEV->dev, addr))
    +       /* snip */;
    +   cpu_to_le32(addr)

However, the #else part (of the #if DO_ZEROCOPY test) is changed this way:

    -   cpu_to_le32(pci_map_single(DEV, X, Y, Z))
    +   dma_addr_t addr = cpu_to_le32(pci_map_single(DEV, X, Y, Z));
    //                    ^^^^^^^^^^^
    //                    That mismatches the 3 other changes!
    +   if (dma_mapping_error(&DEV->dev, addr))
    +       /* snip */;
    +   cpu_to_le32(addr)

Let's remove the leftover cpu_to_le32() for coherency.

v2: Better changelog.
v3: Add Acked-by

Fixes: 6f2b6a3005b2c34c39f207a87667564f64f2f91a
  # 3c59x: Add dma error checking and recovery
Acked-by: Neil Horman 
Signed-off-by: Sylvain "ythier" Hitier 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-09-23T16:09:27+00:00

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller

3c59x: Fix bad offset spec in skb_frag_dma_map

2014-09-19T20:28:57+00:00

Recently aded the use of skb_frag_dma_map to 3c59x, but didn't realize it
automatically included the frag_offset internally, as well as provided an option
to specify an extra offset in the parameter list.  We need to specify an offset
of 0 in the parameter list to avoid skb corruption that results in lost
connections.

Signed-off-by: Neil Horman 
CC: Linux Kernel list 
CC: "David S. Miller" 
CC: Meelis Roos 
Tested-by: Meelis Roos

3c59x: Add dma error checking and recovery

2014-09-19T20:28:57+00:00

Noted that 3c59x has no checks on transmit for failed DMA mappings, and no
ability to unmap fragments when a single map fails in the middle of a transmit.
This patch provides error checking to ensure that dma mappings work properly,
and unrolls an skb mapping if a fragmented skb transmission has a mapping
failure to prevent leaks.

Signed-off-by: Neil Horman 
CC: Linux Kernel list 
CC: "David S. Miller" 
CC: Meelis Roos 
Tested-by: Meelis Roos

drivers/net: Convert remaining uses of pr_warning to pr_warn

2014-09-10T03:37:08+00:00

Use the much more common pr_warn instead of pr_warning.

Other miscellanea:

o Typo fixes submiting/submitting
o Coalesce formats
o Realign arguments
o Add missing terminating '\n' to formats

Signed-off-by: Joe Perches 
Signed-off-by: David S. Miller

3c59x: avoid panic in boomerang_start_xmit when finding page address:

2014-09-06T00:24:02+00:00

This bug was reported on a very old kernel (RHEL6, 2.6.32-491.el6):

BUG: unable to handle kernel paging request at 00800000
IP: [] nommu_map_page+0x15/0x110
*pdpt = 000000003454f001 *pde = 000000003f03d067
Oops: 0000 [#1] SMP
last sysfs file: /sys/devices/system/cpu/online
Modules linked in: nfsd lockd nfs_acl auth_rpcgss sunrpc exportfs p4_clockmod
ipv6 ppdev parport_pc parport microcode iTCO_wdt iTCO_vendor_support 3c59x mii
dcdbas serio_raw snd_intel8x0 snd_ac97_codec ac97_bus snd_seq snd_seq_device
snd_pcm snd_timer snd soundcore snd_page_alloc i2c_i801 sg lpc_ich mfd_core ext4
jbd2 mbcache sr_mod cdrom sd_mod crc_t10dif pata_acpi ata_generic ata_piix
radeon ttm drm_kms_helper drm i2c_algo_bit i2c_core dm_mirror dm_region_hash
dm_log dm_mod [last unloaded: mperf]

Pid: 4219, comm: nfsd Not tainted 2.6.32-491.el6.i686 #1 Dell Computer
Corporation OptiPlex GX240               /OptiPlex GX240
EIP: 0060:[] EFLAGS: 00010246 CPU: 0
EIP is at nommu_map_page+0x15/0x110
EAX: 00000000 EBX: c0a83480 ECX: 00000000 EDX: 00800000
ESI: 00000000 EDI: f70e7860 EBP: e2d09b54 ESP: e2d09b24
 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
Process nfsd (pid: 4219, ti=e2d08000 task=e2ceaaa0 task.ti=e2d08000)
Stack:
 00000056 00000000 0000000e c65efd38 00000020 00000296 00000206 00000206
<0> c050c850 c0a83480 e2cef154 00000001 e2d09ba8 f8fcd585 00000510 00000001
<0> 00000000 00000000 f5172200 f8fdac00 0039ef8c f5277020 f70e7860 00000510
Call Trace:
 [] ? page_address+0xd0/0xe0
 [] ? boomerang_start_xmit+0x3b5/0x520 [3c59x]
 [] ? dev_hard_start_xmit+0xe5/0x400
 [] ? ip6_output_finish+0x0/0xf0 [ipv6]
 [] ? sch_direct_xmit+0x113/0x180
 [] ? nf_hook_slow+0x68/0x120
 [] ? dev_queue_xmit+0x1b5/0x290
 [] ? ip6_output_finish+0x6d/0xf0 [ipv6]
 [] ? ip6_xmit+0x3e8/0x490 [ipv6]
 [] ? inet6_csk_xmit+0x289/0x2f0 [ipv6]
 [] ? tcp_transmit_skb+0x431/0x7f0
 [] ? __alloc_skb+0x4f/0x140
 [] ? tcp_write_xmit+0x1c2/0xa50
 [] ? __tcp_push_pending_frames+0x31/0xe0
 [] ? tcp_sendpage+0x44a/0x4b0
 [] ? tcp_sendpage+0x0/0x4b0
 [] ? kernel_sendpage+0x4e/0x90
 [] ? svc_send_common+0xc9/0x120 [sunrpc]
 [] ? svc_sendto+0x75/0x1f0 [sunrpc]
 [] ? _atomic_dec_and_lock+0x59/0x90
 [] ? nfs3svc_encode_readres+0x0/0xc0 [nfsd]
 [] ? svc_authorise+0x2d/0x40 [sunrpc]
 [] ? nfs3svc_release_fhandle+0x0/0x10 [nfsd]
 [] ? svc_process_common+0xf1/0x5a0 [sunrpc]
 [] ? svc_tcp_sendto+0x36/0xa0 [sunrpc]
 [] ? svc_send+0x98/0xd0 [sunrpc]
 [] ? nfsd+0xac/0x140 [nfsd]
 [] ? complete+0x40/0x60
 [] ? nfsd+0x0/0x140 [nfsd]
 [] ? kthread+0x7c/0xa0
 [] ? kthread+0x0/0xa0
 [] ? kernel_thread_helper+0x7/0x10
Code: 8d b6 00 00 00 00 eb f8 8d b4 26 00 00 00 00 8d bc 27 00 00 00 00 55 89 e5
83 ec 30 89 75 f8 31 f6 89 7d fc 89 c7 89 c8 89 5d f4 <8b> 1a 8b 4d 08 c1 eb 19
c1 e3 04 8b 9b c0 29 c7 c0 83 e3 fc 29

But the problem seems to still exist upstream.  It seems on 32 bit kernels
page_address() can reutrn a NULL value in some circumstances, and the
pci_map_single api isn't prepared to handle that (on this system it results in a
bogus pointer deference in nommu_map_page.

The fix is pretty easy, if we convert the 3c59x driver to use the more
convieient skb_frag_dma_map api we don't need to find the virtual address of the
page at all, and page gets mapped to the hardware properly.  Verified to fix the
problem as described by the reporter.

Applies to the net tree

Change Notes:

v2) Converted PCI_DMA_TODEVICE to DMA_TO_DEVICE.  Thanks Dave!

v3) Actually Run git commit after making changes to v2 :)

Signed-off-by: Neil Horman 
CC: klassert@mathematik.tu-chemnitz.de
CC: "David S. Miller" 
Signed-off-by: David S. Miller