diff options
author | Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com> | 2017-05-22 00:15:23 +0900 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-05-25 13:47:13 +0000 |
commit | a14e289caaae4c342c2bc686bd5d327ed612b0fc (patch) | |
tree | 87cc82526cadd31c77f72a208421e44ee97e7a3a /meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux/hibernation/0005-Add-rcar-dma-hibernation-code.patch | |
parent | 5b5a54b60f45e67d647cf6cc0fe2b879b2bb8229 (diff) |
Add kernel Hibernation code for porter board.
This patch set is a support to Hibernation for a porter board.
I've commit with Hibernation Off patch, because it depends strongly on user land.
If you can use Hibernation, Please add local.conf agl-porter-hibernate.
OVERRIDES .= ":agl-porter-hibernate"
DISTRO_FEATURES_append = " agl-porter-hibernate"
Change-Id: Ic64c9494a4bbd2518ef1aa334325b96eb7a9479e
Signed-off-by: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9451
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux/hibernation/0005-Add-rcar-dma-hibernation-code.patch')
-rwxr-xr-x | meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux/hibernation/0005-Add-rcar-dma-hibernation-code.patch | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux/hibernation/0005-Add-rcar-dma-hibernation-code.patch b/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux/hibernation/0005-Add-rcar-dma-hibernation-code.patch new file mode 100755 index 000000000..b446fa301 --- /dev/null +++ b/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux/hibernation/0005-Add-rcar-dma-hibernation-code.patch @@ -0,0 +1,113 @@ +From c094e905cb0f542acdeb5d7009ab9edc812897f7 Mon Sep 17 00:00:00 2001 +From: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com> +Date: Thu, 18 May 2017 17:32:30 +0900 +Subject: [PATCH 05/15] Add rcar-dma hibernation code + +Signed-off-by: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com> +--- + drivers/dma/sh/rcar-dmac.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c +index e5e60ee..3b4a684 100644 +--- a/drivers/dma/sh/rcar-dmac.c ++++ b/drivers/dma/sh/rcar-dmac.c +@@ -121,6 +121,7 @@ struct rcar_dmac_desc_page { + * struct rcar_dmac_chan - R-Car Gen2 DMA Controller Channel + * @chan: base DMA channel object + * @iomem: channel I/O memory base ++ * @backup: channel I/O memory backup base + * @index: index of this channel in the controller + * @src_xfer_size: size (in bytes) of hardware transfers on the source side + * @dst_xfer_size: size (in bytes) of hardware transfers on the destination side +@@ -140,6 +141,7 @@ struct rcar_dmac_desc_page { + struct rcar_dmac_chan { + struct dma_chan chan; + void __iomem *iomem; ++ void *backup; + unsigned int index; + + unsigned int src_xfer_size; +@@ -171,6 +173,7 @@ struct rcar_dmac_chan { + * @engine: base DMA engine object + * @dev: the hardware device + * @iomem: remapped I/O memory base ++ * @backup: remapped I/O memory backup base + * @n_channels: number of available channels + * @channels: array of DMAC channels + * @modules: bitmask of client modules in use +@@ -179,6 +182,7 @@ struct rcar_dmac { + struct dma_device engine; + struct device *dev; + void __iomem *iomem; ++ void *backup; + + unsigned int n_channels; + struct rcar_dmac_chan *channels; +@@ -277,6 +281,7 @@ static void rcar_dmac_write(struct rcar_dmac *dmac, u32 reg, u32 data) + writew(data, dmac->iomem + reg); + else + writel(data, dmac->iomem + reg); ++ writel(data, dmac->backup + reg); + } + + static u32 rcar_dmac_read(struct rcar_dmac *dmac, u32 reg) +@@ -301,6 +306,7 @@ static void rcar_dmac_chan_write(struct rcar_dmac_chan *chan, u32 reg, u32 data) + writew(data, chan->iomem + reg); + else + writel(data, chan->iomem + reg); ++ writel(data, chan->backup + reg); + } + + /* ----------------------------------------------------------------------------- +@@ -1548,10 +1554,25 @@ static int rcar_dmac_runtime_resume(struct device *dev) + } + #endif + ++static int rcar_dmac_freeze(struct device *dev) ++{ ++ return 0; ++} ++ ++static int rcar_dmac_restore(struct device *dev) ++{ ++ int ret; ++ struct rcar_dmac *dmac = dev_get_drvdata(dev); ++ ret = rcar_dmac_init(dmac); ++ return ret; ++} ++ + static const struct dev_pm_ops rcar_dmac_pm = { + SET_SYSTEM_SLEEP_PM_OPS(rcar_dmac_sleep_suspend, rcar_dmac_sleep_resume) + SET_RUNTIME_PM_OPS(rcar_dmac_runtime_suspend, rcar_dmac_runtime_resume, + NULL) ++ .freeze = rcar_dmac_freeze, ++ .restore = rcar_dmac_restore, + }; + + /* ----------------------------------------------------------------------------- +@@ -1571,6 +1592,7 @@ static int rcar_dmac_chan_probe(struct rcar_dmac *dmac, + + rchan->index = index; + rchan->iomem = dmac->iomem + RCAR_DMAC_CHAN_OFFSET(index); ++ rchan->backup = dmac->backup + RCAR_DMAC_CHAN_OFFSET(index); + rchan->mid_rid = -EINVAL; + + spin_lock_init(&rchan->lock); +@@ -1657,8 +1679,13 @@ static int rcar_dmac_probe(struct platform_device *pdev) + /* Request resources. */ + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + dmac->iomem = devm_ioremap_resource(&pdev->dev, mem); ++ dmac->backup = devm_kzalloc(&pdev->dev, resource_size(mem), GFP_KERNEL); + if (IS_ERR(dmac->iomem)) + return PTR_ERR(dmac->iomem); ++ dmac->backup = devm_kzalloc(&pdev->dev, resource_size(mem), GFP_KERNEL); ++ if (IS_ERR(dmac->backup)) { ++ return PTR_ERR(dmac->backup); ++ } + + irq = platform_get_irq_byname(pdev, "error"); + if (irq < 0) { +-- +1.8.3.1 + |