Re: [PATCH 09/16] c_can: expicit 32bit access on D_CAN to message buffer data register
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2013-09-09 11:20:47
Also in:
linux-can
On 09/09/2013 09:25 AM, Benedikt Spranger wrote:
quoted hunk ↗ jump to hunk
change the 16bit access of ARB1_REG and DATA1/2_REG to a 32bit access. Signed-off-by: Benedikt Spranger <redacted> --- drivers/net/can/c_can/c_can.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 4b94f2d..c573399 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c@@ -360,7 +360,6 @@ static inline void c_can_object_put(struct net_device *dev, static void c_can_write_msg_object(struct net_device *dev, int iface, struct can_frame *frame, int objno) { - int i; u32 flags = IF_ARB_MSGVAL; unsigned int id; struct c_can_priv *priv = netdev_priv(dev);@@ -376,15 +375,17 @@ static void c_can_write_msg_object(struct net_device *dev, id |= flags; - priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface), - IFX_WRITE_LOW_16BIT(id)); - priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), - IFX_WRITE_HIGH_16BIT(id)); + c_can_writereg32(priv, C_CAN_IFACE(ARB1_REG, iface), + IFX_WRITE_HIGH_16BIT(id), + IFX_WRITE_LOW_16BIT(id)); + + c_can_writereg32(priv, C_CAN_IFACE(DATA1_REG, iface), + frame->data[2] | frame->data[3] << 8, + frame->data[0] | frame->data[1] << 8);
You can use something like beXX_to_cpup((__be32 *)&cf->data[0]) here.
- for (i = 0; i < frame->can_dlc; i += 2) {
- priv->write_reg(priv, C_CAN_IFACE(DATA1_REG, iface) + i / 2,
- frame->data[i] | (frame->data[i + 1] << 8));
- }
+ c_can_writereg32(priv, C_CAN_IFACE(DATA3_REG, iface),
+ frame->data[6] | frame->data[7] << 8,
+ frame->data[4] | frame->data[5] << 8);You write here the upper 32 bit unconditionally, the original code doesn't. 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