Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcdc103d authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-4.11-20170206' of... 

Merge tag 'linux-can-next-for-4.11-20170206' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
pull-request: can-next 2017-02-06

this is a pull request of 16 patches for net-next/master.

The first two patches by David Jander and me add the rx-offload
framework for CAN devices to the kernel. The remaining 14 patches
convert the flexcan driver to make use of it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e158e5ef 096de07f

drivers/net/can/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o 
obj-$(CONFIG_CAN_SLCAN)		+= slcan.o



obj-$(CONFIG_CAN_DEV)		+= can-dev.o

can-dev-y			:= dev.o

can-dev-y			+= dev.o

can-dev-y			+= rx-offload.o



can-dev-$(CONFIG_CAN_LEDS)	+= led.o

drivers/net/can/flexcan.c

+243 −176

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/can/rx-offload.c

0 → 100644
+289 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/can/rx-offload.h

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * linux/can/rx-offload.h

 *

 * Copyright (c) 2014 David Jander, Protonic Holland

 * Copyright (c) 2014-2017 Pengutronix, Marc Kleine-Budde <kernel@pengutronix.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the version 2 of the GNU General Public License

 * as published by the Free Software Foundation

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 */



#ifndef _CAN_RX_OFFLOAD_H

#define _CAN_RX_OFFLOAD_H



#include <linux/netdevice.h>

#include <linux/can.h>



struct can_rx_offload {

	struct net_device *dev;



	unsigned int (*mailbox_read)(struct can_rx_offload *offload, struct can_frame *cf,

				     u32 *timestamp, unsigned int mb);



	struct sk_buff_head skb_queue;

	u32 skb_queue_len_max;



	unsigned int mb_first;

	unsigned int mb_last;



	struct napi_struct napi;



	bool inc;

};



int can_rx_offload_add_timestamp(struct net_device *dev, struct can_rx_offload *offload);

int can_rx_offload_add_fifo(struct net_device *dev, struct can_rx_offload *offload, unsigned int weight);

int can_rx_offload_irq_offload_timestamp(struct can_rx_offload *offload, u64 reg);

int can_rx_offload_irq_offload_fifo(struct can_rx_offload *offload);

int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_buff *skb);

void can_rx_offload_reset(struct can_rx_offload *offload);

void can_rx_offload_del(struct can_rx_offload *offload);

void can_rx_offload_enable(struct can_rx_offload *offload);



static inline void can_rx_offload_schedule(struct can_rx_offload *offload)

{

	napi_schedule(&offload->napi);

}



static inline void can_rx_offload_disable(struct can_rx_offload *offload)

{

	napi_disable(&offload->napi);

}



#endif /* !_CAN_RX_OFFLOAD_H */