netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* pull-request: can 2014-09-11
@ 2014-09-11  7:53 Marc Kleine-Budde
  2014-09-11  7:53 ` [PATCH] can: flexcan: avoid calling usleep_range from interrupt context Marc Kleine-Budde
  2014-09-12 22:05 ` pull-request: can 2014-09-11 David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2014-09-11  7:53 UTC (permalink / raw)
  To: netdev; +Cc: davem, linux-can, kernel

Hello David,

this is a pull request for the current release cycle of a single patch.

The patch by David Jander fixes a scheduling while atomic problem in the
flexcan driver, that was introduced by me in v3.14-rc6.

Marc

The following changes since commit 1d7efe9dfaa6025acd29a726315f6f7d30a9f1ca:

  Documentation: filter: Add MIPS to architectures with BPF JIT (2014-09-10 15:24:27 -0700)

are available in the git repository at:

  git://gitorious.org/linux-can/linux-can.git tags/linux-can-fixes-for-3.17-20140911

for you to fetch changes up to 8badd65e48c90d66587359d5329c2813088c0f50:

  can: flexcan: avoid calling usleep_range from interrupt context (2014-09-11 09:29:51 +0200)

----------------------------------------------------------------
linux-can-fixes-for-3.17-20140911

----------------------------------------------------------------
David Jander (1):
      can: flexcan: avoid calling usleep_range from interrupt context

 drivers/net/can/flexcan.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH] can: flexcan: avoid calling usleep_range from interrupt context
  2014-09-11  7:53 pull-request: can 2014-09-11 Marc Kleine-Budde
@ 2014-09-11  7:53 ` Marc Kleine-Budde
  2014-09-12 22:05 ` pull-request: can 2014-09-11 David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2014-09-11  7:53 UTC (permalink / raw)
  To: netdev
  Cc: davem, linux-can, kernel, David Jander, linux-stable,
	Marc Kleine-Budde

From: David Jander <david@protonic.nl>

Apparently can_restart() runs from a (timer-) interrupt and can call
flexcan_chip_[en|dis]able(), so avoid using usleep_range()

Signed-off-by: David Jander <david@protonic.nl>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/flexcan.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 944aa5d..630c7bf 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -298,7 +298,7 @@ static int flexcan_chip_enable(struct flexcan_priv *priv)
 	flexcan_write(reg, &regs->mcr);
 
 	while (timeout-- && (flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK))
-		usleep_range(10, 20);
+		udelay(10);
 
 	if (flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK)
 		return -ETIMEDOUT;
@@ -317,7 +317,7 @@ static int flexcan_chip_disable(struct flexcan_priv *priv)
 	flexcan_write(reg, &regs->mcr);
 
 	while (timeout-- && !(flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK))
-		usleep_range(10, 20);
+		udelay(10);
 
 	if (!(flexcan_read(&regs->mcr) & FLEXCAN_MCR_LPM_ACK))
 		return -ETIMEDOUT;
@@ -336,7 +336,7 @@ static int flexcan_chip_freeze(struct flexcan_priv *priv)
 	flexcan_write(reg, &regs->mcr);
 
 	while (timeout-- && !(flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK))
-		usleep_range(100, 200);
+		udelay(100);
 
 	if (!(flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK))
 		return -ETIMEDOUT;
@@ -355,7 +355,7 @@ static int flexcan_chip_unfreeze(struct flexcan_priv *priv)
 	flexcan_write(reg, &regs->mcr);
 
 	while (timeout-- && (flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK))
-		usleep_range(10, 20);
+		udelay(10);
 
 	if (flexcan_read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK)
 		return -ETIMEDOUT;
@@ -370,7 +370,7 @@ static int flexcan_chip_softreset(struct flexcan_priv *priv)
 
 	flexcan_write(FLEXCAN_MCR_SOFTRST, &regs->mcr);
 	while (timeout-- && (flexcan_read(&regs->mcr) & FLEXCAN_MCR_SOFTRST))
-		usleep_range(10, 20);
+		udelay(10);
 
 	if (flexcan_read(&regs->mcr) & FLEXCAN_MCR_SOFTRST)
 		return -ETIMEDOUT;
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: pull-request: can 2014-09-11
  2014-09-11  7:53 pull-request: can 2014-09-11 Marc Kleine-Budde
  2014-09-11  7:53 ` [PATCH] can: flexcan: avoid calling usleep_range from interrupt context Marc Kleine-Budde
@ 2014-09-12 22:05 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-09-12 22:05 UTC (permalink / raw)
  To: mkl; +Cc: netdev, linux-can, kernel

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 11 Sep 2014 09:53:03 +0200

> this is a pull request for the current release cycle of a single patch.
> 
> The patch by David Jander fixes a scheduling while atomic problem in the
> flexcan driver, that was introduced by me in v3.14-rc6.
 ...
>   git://gitorious.org/linux-can/linux-can.git tags/linux-can-fixes-for-3.17-20140911

Pulled, thanks Marc.

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-12 22:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-11  7:53 pull-request: can 2014-09-11 Marc Kleine-Budde
2014-09-11  7:53 ` [PATCH] can: flexcan: avoid calling usleep_range from interrupt context Marc Kleine-Budde
2014-09-12 22:05 ` pull-request: can 2014-09-11 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).