* pull-request: can 2013-02-01
@ 2013-02-01 9:25 Marc Kleine-Budde
2013-02-01 9:25 ` [PATCH] can: c_can: Set reserved bit in IFx_MASK2 to 1 on write Marc Kleine-Budde
2013-02-03 4:10 ` pull-request: can 2013-02-01 David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2013-02-01 9:25 UTC (permalink / raw)
To: netdev; +Cc: linux-can
Hello David,
here's a patch for net for the v3.8 release cycle. Alexander Stein noticed that
the c_can hardware has a fixed bit in the IFx_MASK2 register. His patch fixes
writing of this register by always setting this bit.
regards,
Marc
---
The following changes since commit 66555e92fb7a619188c02cceae4bbc414f15f96d:
tcp: detect SYN/data drop when F-RTO is disabled (2013-01-31 14:20:07 -0500)
are available in the git repository at:
git://gitorious.org/linux-can/linux-can.git fixes-for-3.8
for you to fetch changes up to 2bd3bc4e8472424f1a6009825397639a8968920a:
can: c_can: Set reserved bit in IFx_MASK2 to 1 on write (2013-02-01 10:20:22 +0100)
----------------------------------------------------------------
Alexander Stein (1):
can: c_can: Set reserved bit in IFx_MASK2 to 1 on write
drivers/net/can/c_can/c_can.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] can: c_can: Set reserved bit in IFx_MASK2 to 1 on write 2013-02-01 9:25 pull-request: can 2013-02-01 Marc Kleine-Budde @ 2013-02-01 9:25 ` Marc Kleine-Budde 2013-02-03 4:10 ` pull-request: can 2013-02-01 David Miller 1 sibling, 0 replies; 3+ messages in thread From: Marc Kleine-Budde @ 2013-02-01 9:25 UTC (permalink / raw) To: netdev; +Cc: linux-can, Alexander Stein, linux-stable, Marc Kleine-Budde From: Alexander Stein <alexander.stein@systec-electronic.com> According to C_CAN documentation, the reserved bit in IFx_MASK2 register is fixed 1. Cc: linux-stable <stable@vger.kernel.org> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/c_can/c_can.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 58607f1..2282b1a 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -488,8 +488,12 @@ static void c_can_setup_receive_object(struct net_device *dev, int iface, priv->write_reg(priv, C_CAN_IFACE(MASK1_REG, iface), IFX_WRITE_LOW_16BIT(mask)); + + /* According to C_CAN documentation, the reserved bit + * in IFx_MASK2 register is fixed 1 + */ priv->write_reg(priv, C_CAN_IFACE(MASK2_REG, iface), - IFX_WRITE_HIGH_16BIT(mask)); + IFX_WRITE_HIGH_16BIT(mask) | BIT(13)); priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface), IFX_WRITE_LOW_16BIT(id)); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: pull-request: can 2013-02-01 2013-02-01 9:25 pull-request: can 2013-02-01 Marc Kleine-Budde 2013-02-01 9:25 ` [PATCH] can: c_can: Set reserved bit in IFx_MASK2 to 1 on write Marc Kleine-Budde @ 2013-02-03 4:10 ` David Miller 1 sibling, 0 replies; 3+ messages in thread From: David Miller @ 2013-02-03 4:10 UTC (permalink / raw) To: mkl; +Cc: netdev, linux-can From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Fri, 1 Feb 2013 10:25:13 +0100 > here's a patch for net for the v3.8 release cycle. Alexander Stein > noticed that the c_can hardware has a fixed bit in the IFx_MASK2 > register. His patch fixes writing of this register by always setting > this bit. Pulled, thanks Marc. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-03 4:10 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-02-01 9:25 pull-request: can 2013-02-01 Marc Kleine-Budde 2013-02-01 9:25 ` [PATCH] can: c_can: Set reserved bit in IFx_MASK2 to 1 on write Marc Kleine-Budde 2013-02-03 4:10 ` pull-request: can 2013-02-01 David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).