linux-toradex.git/drivers/net, branch v3.11.9

iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC series

2013-11-20T20:31:39+00:00

commit b49926629fb5c324bb1ed3960fb0d7905a4a8562 upstream.

Add some new PCI IDs to the table for 7000 & 3160 series

Cc: stable@vger.kernel.org
Signed-off-by: Matti Gottlieb 
Reviewed-by: Emmanuel Grumbach 
Signed-off-by: Johannes Berg 
Signed-off-by: Emmanuel Grumbach 
Signed-off-by: Greg Kroah-Hartman

xen-netback: transition to CLOSED when removing a VIF

2013-11-20T20:31:38+00:00

[ Upstream commit dc62ccaccfb139d9b04bbc5a2688a4402adbfab3 ]

If a guest is destroyed without transitioning its frontend to CLOSED,
the domain becomes a zombie as netback was not grant unmapping the
shared rings.

When removing a VIF, transition the backend to CLOSED so the VIF is
disconnected if necessary (which will unmap the shared rings etc).

This fixes a regression introduced by
279f438e36c0a70b23b86d2090aeec50155034a9 (xen-netback: Don't destroy
the netdev until the vif is shut down).

Signed-off-by: David Vrabel 
Cc: Ian Campbell 
Cc: Wei Liu 
Cc: Paul Durrant 
Acked-by: Wei Liu 
Reviewed-by:  Paul Durrant 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

xen-netback: Handle backend state transitions in a more robust way

2013-11-20T20:31:38+00:00

[ Upstream commit ea732dff5cfa10789007bf4a5b935388a0bb2a8f ]

When the frontend state changes netback now specifies its desired state to
a new function, set_backend_state(), which transitions through any
necessary intermediate states.
This fixes an issue observed with some old Windows frontend drivers where
they failed to transition through the Closing state and netback would not
behave correctly.

Signed-off-by: Paul Durrant 
Cc: Ian Campbell 
Cc: Wei Liu 
Cc: David Vrabel 
Acked-by: Ian Campbell 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

cxgb3: Fix length calculation in write_ofld_wr() on 32-bit architectures

2013-11-20T20:31:37+00:00

[ Upstream commit 262e827fe745642589450ae241b7afd3912c3f25 ]

The length calculation here is now invalid on 32-bit architectures,
since sk_buff::tail is a pointer and sk_buff::transport_header is
an integer offset:

drivers/net/ethernet/chelsio/cxgb3/sge.c: In function 'write_ofld_wr':
drivers/net/ethernet/chelsio/cxgb3/sge.c:1603:9: warning: passing argument 4 of 'make_sgl' makes integer from pointer without a cast [enabled by default]
         adap->pdev);
         ^
drivers/net/ethernet/chelsio/cxgb3/sge.c:964:28: note: expected 'unsigned int' but argument is of type 'sk_buff_data_t'
 static inline unsigned int make_sgl(const struct sk_buff *skb,
                            ^

Use the appropriate skb accessor functions.

Compile-tested only.

Signed-off-by: Ben Hutchings 
Fixes: 1a37e412a022 ('net: Use 16bits for *_headers fields of struct skbuff')
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

xen-netback: use jiffies_64 value to calculate credit timeout

2013-11-20T20:31:37+00:00

[ Upstream commit 059dfa6a93b779516321e5112db9d7621b1367ba ]

time_after_eq() only works if the delta is < MAX_ULONG/2.

For a 32bit Dom0, if netfront sends packets at a very low rate, the time
between subsequent calls to tx_credit_exceeded() may exceed MAX_ULONG/2
and the test for timer_after_eq() will be incorrect. Credit will not be
replenished and the guest may become unable to send packets (e.g., if
prior to the long gap, all credit was exhausted).

Use jiffies_64 variant to mitigate this problem for 32bit Dom0.

Suggested-by: Jan Beulich 
Signed-off-by: Wei Liu 
Reviewed-by: David Vrabel 
Cc: Ian Campbell 
Cc: Jason Luan 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

virtio-net: correctly handle cpu hotplug notifier during resuming

2013-11-20T20:31:37+00:00

[ Upstream commit ec9debbd9a88d8ea86c488d6ffcac419ee7d46d9 ]

commit 3ab098df35f8b98b6553edc2e40234af512ba877 (virtio-net: don't respond to
cpu hotplug notifier if we're not ready) tries to bypass the cpu hotplug
notifier by checking the config_enable and does nothing is it was false. So it
need to try to hold the config_lock mutex which may happen in atomic
environment which leads the following warnings:

[  622.944441] CPU0 attaching NULL sched-domain.
[  622.944446] CPU1 attaching NULL sched-domain.
[  622.944485] CPU0 attaching NULL sched-domain.
[  622.950795] BUG: sleeping function called from invalid context at kernel/mutex.c:616
[  622.950796] in_atomic(): 1, irqs_disabled(): 1, pid: 10, name: migration/1
[  622.950796] no locks held by migration/1/10.
[  622.950798] CPU: 1 PID: 10 Comm: migration/1 Not tainted 3.12.0-rc5-wl-01249-gb91e82d #317
[  622.950799] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
[  622.950802]  0000000000000000 ffff88001d42dba0 ffffffff81a32f22 ffff88001bfb9c70
[  622.950803]  ffff88001d42dbb0 ffffffff810edb02 ffff88001d42dc38 ffffffff81a396ed
[  622.950805]  0000000000000046 ffff88001d42dbe8 ffffffff810e861d 0000000000000000
[  622.950805] Call Trace:
[  622.950810]  [] dump_stack+0x54/0x74
[  622.950815]  [] __might_sleep+0x112/0x114
[  622.950817]  [] mutex_lock_nested+0x3c/0x3c6
[  622.950818]  [] ? up+0x39/0x3e
[  622.950821]  [] ? acpi_os_signal_semaphore+0x21/0x2d
[  622.950824]  [] ? acpi_ut_release_mutex+0x5e/0x62
[  622.950828]  [] virtnet_cpu_callback+0x33/0x87
[  622.950830]  [] notifier_call_chain+0x3c/0x5e
[  622.950832]  [] __raw_notifier_call_chain+0xe/0x10
[  622.950835]  [] __cpu_notify+0x20/0x37
[  622.950836]  [] cpu_notify+0x13/0x15
[  622.950838]  [] take_cpu_down+0x27/0x3a
[  622.950841]  [] stop_machine_cpu_stop+0x93/0xf1
[  622.950842]  [] cpu_stopper_thread+0xa0/0x12f
[  622.950844]  [] ? cpu_stopper_thread+0x12f/0x12f
[  622.950847]  [] ? lock_release_holdtime.part.7+0xa3/0xa8
[  622.950848]  [] ? cpu_stop_should_run+0x3f/0x47
[  622.950850]  [] smpboot_thread_fn+0x1c5/0x1e3
[  622.950852]  [] ? lg_global_unlock+0x67/0x67
[  622.950854]  [] kthread+0xd8/0xe0
[  622.950857]  [] ? wait_for_common+0x12f/0x164
[  622.950859]  [] ? kthread_create_on_node+0x124/0x124
[  622.950861]  [] ret_from_fork+0x7c/0xb0
[  622.950862]  [] ? kthread_create_on_node+0x124/0x124
[  622.950876] smpboot: CPU 1 is now offline
[  623.194556] SMP alternatives: lockdep: fixing up alternatives
[  623.194559] smpboot: Booting Node 0 Processor 1 APIC 0x1
...

A correct fix is to unregister the hotcpu notifier during restore and register a
new one in resume.

Reported-by: Fengguang Wu 
Tested-by: Fengguang Wu 
Cc: Wanlong Gao 
Cc: Rusty Russell 
Cc: Michael S. Tsirkin 
Signed-off-by: Jason Wang 
Acked-by: Michael S. Tsirkin 
Reviewed-by: Wanlong Gao 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

net/mlx4_core: Fix call to __mlx4_unregister_mac

2013-11-20T20:31:37+00:00

[ Upstream commit c32b7dfbb1dfb3f0a68f250deff65103c8bb704a ]

In function mlx4_master_deactivate_admin_state() __mlx4_unregister_mac was
called using the MAC index. It should be called with the value of the MAC itself.

Signed-off-by: Jack Morgenstein 
Signed-off-by: Or Gerlitz 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

Revert "rt2x00pci: Use PCI MSIs whenever possible"

2013-11-13T03:08:08+00:00

commit dfb6b7c109a7f98d324a759599d1b4616f02c79f upstream.

This reverts commit 9483f40d8d01918b399b4e24d0c1111db0afffeb.

Some devices stop to connect with above commit, see:
https://bugzilla.kernel.org/show_bug.cgi?id=61621

Since there is no clear benefit of having MSI enabled, just revert
change to fix the problem.

Signed-off-by: Stanislaw Gruszka 
Acked-by: Jakub Kicinski 
Acked-by: Gertjan van Wingerde 
Signed-off-by: John W. Linville 
Signed-off-by: Greg Kroah-Hartman

can: flexcan: flexcan_chip_start: fix regression, mark one MB for TX and abort pending TX

2013-11-13T03:08:08+00:00

commit d5a7b406c529e4595ce03dc8f6dcf7fa36f106fa upstream.

In patch

    0d1862e can: flexcan: fix flexcan_chip_start() on imx6

the loop in flexcan_chip_start() that iterates over all mailboxes after the
soft reset of the CAN core was removed. This loop put all mailboxes (even the
ones marked as reserved 1...7) into EMPTY/INACTIVE mode. On mailboxes 8...63,
this aborts any pending TX messages.

After a cold boot there is random garbage in the mailboxes, which leads to
spontaneous transmit of CAN frames during first activation. Further if the
interface was disabled with a pending message (usually due to an error
condition on the CAN bus), this message is retransmitted after enabling the
interface again.

This patch fixes the regression by:
1) Limiting the maximum number of used mailboxes to 8, 0...7 are used by the RX
FIFO, 8 is used by TX.
2) Marking the TX mailbox as EMPTY/INACTIVE, so that any pending TX of that
mailbox is aborted.

Cc: Lothar Waßmann 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

can: flexcan: fix mx28 detection by rearanging OF match table

2013-11-13T03:08:08+00:00

commit e358784297992b012e8071764d996191dd2b1a54 upstream.

The current implemetation of of_match_device() relies that the of_device_id
table in the driver is sorted from most specific to least specific compatible.

Without this patch the mx28 is detected as the less specific p1010. This leads
to a p1010 specific workaround is activated on the mx28, which is not needed.

Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman