Re: [PATCH 04/16] c_can: fix receive buffer configuration
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2013-09-09 10:51:15
Also in:
linux-can
On 09/09/2013 09:25 AM, Benedikt Spranger wrote:
quoted hunk ↗ jump to hunk
The former implementation lacks some initialization of receive buffer. First the maximal buffer length was 0. The Buffer direction was not set and the mask register a reserverd flag was cleared. Signed-off-by: Benedikt Spranger <redacted> --- drivers/net/can/c_can/c_can.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index bdb7bcd..886163f 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c@@ -116,6 +116,11 @@ IF_COMM_CONTROL | IF_COMM_TXRQST | \ IF_COMM_DATAA | IF_COMM_DATAB) +/* IFx mask */ +#define IF_MASK_MXTD BIT(31) +#define IF_MASK_MDIR BIT(30) +#define IF_MASK_RES BIT(29) + /* IFx arbitration */ #define IF_ARB_MSGVAL BIT(31) #define IF_ARB_MSGXTD BIT(30)@@ -653,11 +658,15 @@ static void c_can_configure_msg_objects(struct net_device *dev) /* setup receive message objects */ for (i = C_CAN_MSG_OBJ_RX_FIRST; i < C_CAN_MSG_OBJ_RX_LAST; i++) - c_can_setup_receive_object(dev, 0, i, 0, 0, - (IF_MCONT_RXIE | IF_MCONT_UMASK) & ~IF_MCONT_EOB); - - c_can_setup_receive_object(dev, 0, C_CAN_MSG_OBJ_RX_LAST, 0, 0, - IF_MCONT_EOB | IF_MCONT_RXIE | IF_MCONT_UMASK); + c_can_setup_receive_object(dev, 0, i, + IF_MASK_MDIR | IF_MASK_RES, 0, + IF_MCONT_UMASK | IF_MCONT_RXIE | + IF_MCONT_DLC_MAX);
DLC_MAX should be added in this patch. not in 3.
+ + c_can_setup_receive_object(dev, 0, C_CAN_MSG_OBJ_RX_LAST, + IF_MASK_MDIR | IF_MASK_RES, 0, + IF_MCONT_UMASK | IF_MCONT_EOB | + IF_MCONT_RXIE | IF_MCONT_DLC_MAX); } /*
Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachments
- signature.asc [application/pgp-signature] 259 bytes