mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2026-04-30 07:30:10 +02:00
1f53d4c983
commit 9abefcb1aa upstream.
A timer was used to restart after the bus-off state, leading to a
relatively large can_restart() executed in an interrupt context,
which in turn sets up pinctrl. When this happens during system boot,
there is a high probability of grabbing the pinctrl_list_mutex,
which is locked already by the probe() of other device, making the
kernel suspect a deadlock condition [1].
To resolve this issue, the restart_timer is replaced by a delayed
work.
[1] https://github.com/victronenergy/venus/issues/24
Signed-off-by: Sergei Miroshnichenko <sergeimir@emcraft.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
104 lines
2.6 KiB
C
104 lines
2.6 KiB
C
/*
|
|
* linux/can/dev.h
|
|
*
|
|
* Definitions for the CAN network device driver interface
|
|
*
|
|
* Copyright (C) 2006 Andrey Volkov <avolkov@varma-el.com>
|
|
* Varma Electronics Oy
|
|
*
|
|
* Copyright (C) 2008 Wolfgang Grandegger <wg@grandegger.com>
|
|
*
|
|
*/
|
|
|
|
#ifndef CAN_DEV_H
|
|
#define CAN_DEV_H
|
|
|
|
#include <linux/can.h>
|
|
#include <linux/can/netlink.h>
|
|
#include <linux/can/error.h>
|
|
|
|
/*
|
|
* CAN mode
|
|
*/
|
|
enum can_mode {
|
|
CAN_MODE_STOP = 0,
|
|
CAN_MODE_START,
|
|
CAN_MODE_SLEEP
|
|
};
|
|
|
|
/*
|
|
* CAN common private data
|
|
*/
|
|
struct can_priv {
|
|
struct net_device *dev;
|
|
struct can_device_stats can_stats;
|
|
|
|
struct can_bittiming bittiming;
|
|
struct can_bittiming_const *bittiming_const;
|
|
struct can_clock clock;
|
|
|
|
enum can_state state;
|
|
u32 ctrlmode;
|
|
u32 ctrlmode_supported;
|
|
|
|
int restart_ms;
|
|
struct delayed_work restart_work;
|
|
|
|
int (*do_set_bittiming)(struct net_device *dev);
|
|
int (*do_set_mode)(struct net_device *dev, enum can_mode mode);
|
|
int (*do_get_state)(const struct net_device *dev,
|
|
enum can_state *state);
|
|
int (*do_get_berr_counter)(const struct net_device *dev,
|
|
struct can_berr_counter *bec);
|
|
|
|
unsigned int echo_skb_max;
|
|
struct sk_buff **echo_skb;
|
|
};
|
|
|
|
/*
|
|
* get_can_dlc(value) - helper macro to cast a given data length code (dlc)
|
|
* to __u8 and ensure the dlc value to be max. 8 bytes.
|
|
*
|
|
* To be used in the CAN netdriver receive path to ensure conformance with
|
|
* ISO 11898-1 Chapter 8.4.2.3 (DLC field)
|
|
*/
|
|
#define get_can_dlc(i) (min_t(__u8, (i), 8))
|
|
|
|
/* Drop a given socketbuffer if it does not contain a valid CAN frame. */
|
|
static inline int can_dropped_invalid_skb(struct net_device *dev,
|
|
struct sk_buff *skb)
|
|
{
|
|
const struct can_frame *cf = (struct can_frame *)skb->data;
|
|
|
|
if (unlikely(skb->len != sizeof(*cf) || cf->can_dlc > 8)) {
|
|
kfree_skb(skb);
|
|
dev->stats.tx_dropped++;
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
|
|
void free_candev(struct net_device *dev);
|
|
|
|
int open_candev(struct net_device *dev);
|
|
void close_candev(struct net_device *dev);
|
|
|
|
int register_candev(struct net_device *dev);
|
|
void unregister_candev(struct net_device *dev);
|
|
|
|
int can_restart_now(struct net_device *dev);
|
|
void can_bus_off(struct net_device *dev);
|
|
|
|
void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
|
|
unsigned int idx);
|
|
void can_get_echo_skb(struct net_device *dev, unsigned int idx);
|
|
void can_free_echo_skb(struct net_device *dev, unsigned int idx);
|
|
|
|
struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
|
|
struct sk_buff *alloc_can_err_skb(struct net_device *dev,
|
|
struct can_frame **cf);
|
|
|
|
#endif /* CAN_DEV_H */
|