git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From eba5c632e77d47a792a00a8fc29b2525d909148c Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 21 Oct 2020 02:45:27 +0800
   4 Subject: can: flexcan: flexcan_remove(): disable wakeup completely
   5
   6 From: Joakim Zhang <qiangqing.zhang@nxp.com>
   7
   8 [ Upstream commit ab07ff1c92fa60f29438e655a1b4abab860ed0b6 ]
   9
  10 With below sequence, we can see wakeup default is enabled after re-load module,
  11 if it was enabled before, so we need disable wakeup in flexcan_remove().
  12
  13 | # cat /sys/bus/platform/drivers/flexcan/5a8e0000.can/power/wakeup
  14 | disabled
  15 | # echo enabled > /sys/bus/platform/drivers/flexcan/5a8e0000.can/power/wakeup
  16 | # cat /sys/bus/platform/drivers/flexcan/5a8e0000.can/power/wakeup
  17 | enabled
  18 | # rmmod flexcan
  19 | # modprobe flexcan
  20 | # cat /sys/bus/platform/drivers/flexcan/5a8e0000.can/power/wakeup
  21 | enabled
  22
  23 Fixes: de3578c198c6 ("can: flexcan: add self wakeup support")
  24 Fixes: 915f9666421c ("can: flexcan: add support for DT property 'wakeup-source'")
  25 Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  26 Link: https://lore.kernel.org/r/20201020184527.8190-1-qiangqing.zhang@nxp.com
  27 [mkl: streamlined commit message]
  28 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  29 Signed-off-by: Sasha Levin <sashal@kernel.org>
  30 ---
  31  drivers/net/can/flexcan.c | 2 ++
  32  1 file changed, 2 insertions(+)
  33
  34 diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
  35 index fbf812cf4f5da..130f3022d3396 100644
  36 --- a/drivers/net/can/flexcan.c
  37 +++ b/drivers/net/can/flexcan.c
  38 @@ -1676,6 +1676,8 @@ static int flexcan_remove(struct platform_device *pdev)
  39  {
  40         struct net_device *dev = platform_get_drvdata(pdev);
  41
  42 +       device_set_wakeup_enable(&pdev->dev, false);
  43 +       device_set_wakeup_capable(&pdev->dev, false);
  44         unregister_flexcandev(dev);
  45         pm_runtime_disable(&pdev->dev);
  46         free_candev(dev);
  47 --
  48 2.27.0
  49