linux-stable.git/drivers/net, branch v3.18.7

can: c_can: end pending transmission on network stop (ifdown)

2015-02-06T06:36:09+00:00

commit 7ffd7b4e169d619e66928fe5d997723f2c6f1056 upstream.

Put controller into init mode in network stop to end pending transmissions. The
issue is observed in cases when transmitted frame is not acked.

Signed-off-by: Viktor Babrian 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

drivers: net: cpsw: discard dual emac default vlan configuration

2015-02-06T06:36:07+00:00

commit 02a54164c52ed6eca3089a0d402170fbf34d6cf5 upstream.

In Dual EMAC, the default VLANs are used to segregate Rx packets between
the ports, so adding the same default VLAN to the switch will affect the
normal packet transfers. So returning error on addition of dual EMAC
default VLANs.

Even if EMAC 0 default port VLAN is added to EMAC 1, it will lead to
break dual EMAC port separations.

Fixes: d9ba8f9e6298 (driver: net: ethernet: cpsw: dual emac interface implementation)
Reported-by: Felipe Balbi 
Signed-off-by: Mugunthan V N 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

can: kvaser_usb: Fix state handling upon BUS_ERROR events

2015-02-06T06:36:03+00:00

commit e638642b08c170d2021b706f0b1c4f4ae93d8cbd upstream.

While being in an ERROR_WARNING state, and receiving further
bus error events with error counters still in the ERROR_WARNING
range of 97-127 inclusive, the state handling code erroneously
reverts back to ERROR_ACTIVE.

Per the CAN standard, only revert to ERROR_ACTIVE when the
error counters are less than 96.

Moreover, in certain Kvaser models, the BUS_ERROR flag is
always set along with undefined bits in the M16C status
register. Thus use bitwise operators instead of full equality
for checking that register against bus errors.

Signed-off-by: Ahmed S. Darwish 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT

2015-02-06T06:36:03+00:00

commit 14c10c2a1dd8eb8e00b750b521753260befa2789 upstream.

On some x86 laptops, plugging a Kvaser device again after an
unplug makes the firmware always ignore the very first command.
For such a case, provide some room for retries instead of
completely exiting the driver init code.

Signed-off-by: Ahmed S. Darwish 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

can: kvaser_usb: Send correct context to URB completion

2015-02-06T06:36:03+00:00

commit 3803fa6977f1de15fda4e8646c8fec97c8045cae upstream.

Send expected argument to the URB completion hander: a CAN
netdevice instead of the network interface private context
`kvaser_usb_net_priv'.

This was discovered by having some garbage in the kernel
log in place of the netdevice names: can0 and can1.

Signed-off-by: Ahmed S. Darwish 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

can: kvaser_usb: Do not sleep in atomic context

2015-02-06T06:36:03+00:00

commit ded5006667318c06df875609535176bd33f243a1 upstream.

Upon receiving a hardware event with the BUS_RESET flag set,
the driver kills all of its anchored URBs and resets all of
its transmit URB contexts.

Unfortunately it does so under the context of URB completion
handler `kvaser_usb_read_bulk_callback()', which is often
called in an atomic context.

While the device is flooded with many received error packets,
usb_kill_urb() typically sleeps/reschedules till the transfer
request of each killed URB in question completes, leading to
the sleep in atomic bug. [3]

In v2 submission of the original driver patch [1], it was
stated that the URBs kill and tx contexts reset was needed
since we don't receive any tx acknowledgments later and thus
such resources will be locked down forever. Fortunately this
is no longer needed since an earlier bugfix in this patch
series is now applied: all tx URB contexts are reset upon CAN
channel close. [2]

Moreover, a BUS_RESET is now treated _exactly_ like a BUS_OFF
event, which is the recommended handling method advised by
the device manufacturer.

[1] http://article.gmane.org/gmane.linux.network/239442
    http://www.webcitation.org/6Vr2yagAQ

[2] can: kvaser_usb: Reset all URB tx contexts upon channel close
    889b77f7fd2bcc922493d73a4c51d8a851505815

[3] Stacktrace:

   [] dump_stack+0x45/0x57
 [] __schedule_bug+0x41/0x4f
 [] __schedule+0x5f1/0x700
 [] ? _raw_spin_unlock_irqrestore+0xa/0x10
 [] schedule+0x24/0x70
 [] usb_kill_urb+0x65/0xa0
 [] ? prepare_to_wait_event+0x110/0x110
 [] usb_kill_anchored_urbs+0x48/0x80
 [] kvaser_usb_unlink_tx_urbs+0x18/0x50 [kvaser_usb]
 [] kvaser_usb_rx_error+0xc0/0x400 [kvaser_usb]
 [] ? vprintk_default+0x1a/0x20
 [] kvaser_usb_read_bulk_callback+0x4c1/0x5f0 [kvaser_usb]
 [] __usb_hcd_giveback_urb+0x5e/0xc0
 [] usb_hcd_giveback_urb+0x41/0x110
 [] finish_urb+0x98/0x180 [ohci_hcd]
 [] ? acct_account_cputime+0x17/0x20
 [] ? local_clock+0x15/0x30
 [] ohci_work+0x1fb/0x5a0 [ohci_hcd]
 [] ? process_backlog+0xb1/0x130
 [] ohci_irq+0xeb/0x270 [ohci_hcd]
 [] usb_hcd_irq+0x21/0x30
 [] handle_irq_event_percpu+0x43/0x120
 [] handle_irq_event+0x3d/0x60
 [] handle_fasteoi_irq+0x74/0x110
 [] handle_irq+0x1d/0x30
 [] do_IRQ+0x57/0x100
 [] common_interrupt+0x6a/0x6a

Signed-off-by: Ahmed S. Darwish 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

iwlwifi: mvm: add a flag to enable match found notification

2015-01-30T01:40:46+00:00

commit 7e2a38831db4cf082aa8b4997f3cbfe8cb03b669 upstream.

Add a flag that enables match found notification to align with
FW API change.

Signed-off-by: David Spinadel 
Signed-off-by: Emmanuel Grumbach 
Signed-off-by: Greg Kroah-Hartman

can: m_can: tag current CAN FD controllers as non-ISO

2015-01-30T01:40:42+00:00

commit 6cfda7fbebe8a4fd33ea5722fa0212f98f643c35 upstream.

During the CAN FD standardization process within the ISO it turned out that
the failure detection capability has to be improved.

The CAN in Automation organization (CiA) defined the already implemented CAN
FD controllers as 'non-ISO' and the upcoming improved CAN FD controllers as
'ISO' compliant. See at http://www.can-cia.com/index.php?id=1937

Finally there will be three types of CAN FD controllers in the future:

1. ISO compliant (fixed)
2. non-ISO compliant (fixed, like the M_CAN IP v3.0.1 in m_can.c)
3. ISO/non-ISO CAN FD controllers (switchable, like the PEAK USB FD)

So the current M_CAN driver for the M_CAN IP v3.0.1 has to expose its non-ISO
implementation by setting the CAN_CTRLMODE_FD_NON_ISO ctrlmode at startup.
As this bit cannot be switched at configuration time CAN_CTRLMODE_FD_NON_ISO
must not be set in ctrlmode_supported of the current M_CAN driver.

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

can: dev: fix crtlmode_supported check

2015-01-30T01:40:42+00:00

commit 9b1087aa5e86448fe6ad40a58964e35f3ba423d5 upstream.

When changing flags in the CAN drivers ctrlmode the provided new content has to
be checked whether the bits are allowed to be changed. The bits that are to be
changed are given as a bitfield in cm->mask. Therefore checking against
cm->flags is wrong as the content can hold any kind of values.

The iproute2 tool sets the bits in cm->mask and cm->flags depending on the
detected command line options. To be robust against bogus user space
applications additionally sanitize the provided flags with the provided mask.

Cc: Wolfgang Grandegger 
Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

can: kvaser_usb: Don't send a RESET_CHIP for non-existing channels

2015-01-27T16:29:43+00:00

commit 5e7e6e0c9b47a45576c38b4a72d67927a5e049f7 upstream.

Recent Leaf firmware versions (>= 3.1.557) do not allow to send
commands for non-existing channels.  If a command is sent for a
non-existing channel, the firmware crashes.

Reported-by: Christopher Storah 
Signed-off-by: Olivier Sobrie 
Signed-off-by: Ahmed S. Darwish 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman