meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux/hibernation/0005-Add-rcar-dma-hibernation-code.patch

   1 From c094e905cb0f542acdeb5d7009ab9edc812897f7 Mon Sep 17 00:00:00 2001
   2 From: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com>
   3 Date: Thu, 18 May 2017 17:32:30 +0900
   4 Subject: [PATCH 05/15] Add rcar-dma hibernation code
   5
   6 Signed-off-by: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com>
   7 ---
   8  drivers/dma/sh/rcar-dmac.c | 27 +++++++++++++++++++++++++++
   9  1 file changed, 27 insertions(+)
  10
  11 diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
  12 index e5e60ee..3b4a684 100644
  13 --- a/drivers/dma/sh/rcar-dmac.c
  14 +++ b/drivers/dma/sh/rcar-dmac.c
  15 @@ -121,6 +121,7 @@ struct rcar_dmac_desc_page {
  16   * struct rcar_dmac_chan - R-Car Gen2 DMA Controller Channel
  17   * @chan: base DMA channel object
  18   * @iomem: channel I/O memory base
  19 + * @backup: channel I/O memory backup base
  20   * @index: index of this channel in the controller
  21   * @src_xfer_size: size (in bytes) of hardware transfers on the source side
  22   * @dst_xfer_size: size (in bytes) of hardware transfers on the destination side
  23 @@ -140,6 +141,7 @@ struct rcar_dmac_desc_page {
  24  struct rcar_dmac_chan {
  25         struct dma_chan chan;
  26         void __iomem *iomem;
  27 +       void *backup;
  28         unsigned int index;
  29
  30         unsigned int src_xfer_size;
  31 @@ -171,6 +173,7 @@ struct rcar_dmac_chan {
  32   * @engine: base DMA engine object
  33   * @dev: the hardware device
  34   * @iomem: remapped I/O memory base
  35 + * @backup: remapped I/O memory backup base
  36   * @n_channels: number of available channels
  37   * @channels: array of DMAC channels
  38   * @modules: bitmask of client modules in use
  39 @@ -179,6 +182,7 @@ struct rcar_dmac {
  40         struct dma_device engine;
  41         struct device *dev;
  42         void __iomem *iomem;
  43 +       void *backup;
  44
  45         unsigned int n_channels;
  46         struct rcar_dmac_chan *channels;
  47 @@ -277,6 +281,7 @@ static void rcar_dmac_write(struct rcar_dmac *dmac, u32 reg, u32 data)
  48                 writew(data, dmac->iomem + reg);
  49         else
  50                 writel(data, dmac->iomem + reg);
  51 +       writel(data, dmac->backup + reg);
  52  }
  53
  54  static u32 rcar_dmac_read(struct rcar_dmac *dmac, u32 reg)
  55 @@ -301,6 +306,7 @@ static void rcar_dmac_chan_write(struct rcar_dmac_chan *chan, u32 reg, u32 data)
  56                 writew(data, chan->iomem + reg);
  57         else
  58                 writel(data, chan->iomem + reg);
  59 +       writel(data, chan->backup + reg);
  60  }
  61
  62  /* -----------------------------------------------------------------------------
  63 @@ -1548,10 +1554,25 @@ static int rcar_dmac_runtime_resume(struct device *dev)
  64  }
  65  #endif
  66
  67 +static int rcar_dmac_freeze(struct device *dev)
  68 +{
  69 +       return 0;
  70 +}
  71 +
  72 +static int rcar_dmac_restore(struct device *dev)
  73 +{
  74 +       int ret;
  75 +       struct rcar_dmac *dmac = dev_get_drvdata(dev);
  76 +       ret = rcar_dmac_init(dmac);
  77 +       return ret;
  78 +}
  79 +
  80  static const struct dev_pm_ops rcar_dmac_pm = {
  81         SET_SYSTEM_SLEEP_PM_OPS(rcar_dmac_sleep_suspend, rcar_dmac_sleep_resume)
  82         SET_RUNTIME_PM_OPS(rcar_dmac_runtime_suspend, rcar_dmac_runtime_resume,
  83                            NULL)
  84 +       .freeze = rcar_dmac_freeze,
  85 +       .restore = rcar_dmac_restore,
  86  };
  87
  88  /* -----------------------------------------------------------------------------
  89 @@ -1571,6 +1592,7 @@ static int rcar_dmac_chan_probe(struct rcar_dmac *dmac,
  90
  91         rchan->index = index;
  92         rchan->iomem = dmac->iomem + RCAR_DMAC_CHAN_OFFSET(index);
  93 +       rchan->backup = dmac->backup + RCAR_DMAC_CHAN_OFFSET(index);
  94         rchan->mid_rid = -EINVAL;
  95
  96         spin_lock_init(&rchan->lock);
  97 @@ -1657,8 +1679,13 @@ static int rcar_dmac_probe(struct platform_device *pdev)
  98         /* Request resources. */
  99         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 100         dmac->iomem = devm_ioremap_resource(&pdev->dev, mem);
 101 +       dmac->backup = devm_kzalloc(&pdev->dev, resource_size(mem), GFP_KERNEL);
 102         if (IS_ERR(dmac->iomem))
 103                 return PTR_ERR(dmac->iomem);
 104 +       dmac->backup = devm_kzalloc(&pdev->dev, resource_size(mem), GFP_KERNEL);
 105 +       if (IS_ERR(dmac->backup)) {
 106 +               return PTR_ERR(dmac->backup);
 107 +       }
 108
 109         irq = platform_get_irq_byname(pdev, "error");
 110         if (irq < 0) {
 111 --
 112 1.8.3.1
 113