ipq806x: Add ADM support
These are cherry-picked & backported from LKML: *https://lkml.org/lkml/2015/3/17/19 They are enabled on both 3.18 and 4.1 kernel. Patches 150 to 154 are applying changes merged since 3.18; they enable mechanisms used by the ADM driver. ADM engine is used by the NAND controller, so it is necessary to bring-up NAND flash support. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 46567
This commit is contained in:
Felix Fietkau
parent
de19f06d12
commit
c7bf2accc9
18 changed files with 2448 additions and 8 deletions
|
|
@ -327,6 +327,7 @@ CONFIG_PREEMPT_RCU=y
|
||||||
CONFIG_PRINTK_TIME=y
|
CONFIG_PRINTK_TIME=y
|
||||||
CONFIG_PROC_PAGE_MONITOR=y
|
CONFIG_PROC_PAGE_MONITOR=y
|
||||||
CONFIG_PTP_1588_CLOCK=y
|
CONFIG_PTP_1588_CLOCK=y
|
||||||
|
# CONFIG_QCOM_ADM is not set
|
||||||
CONFIG_QCOM_BAM_DMA=y
|
CONFIG_QCOM_BAM_DMA=y
|
||||||
CONFIG_QCOM_GSBI=y
|
CONFIG_QCOM_GSBI=y
|
||||||
CONFIG_QCOM_HFPLL=y
|
CONFIG_QCOM_HFPLL=y
|
||||||
|
|
|
||||||
|
|
@ -341,6 +341,7 @@ CONFIG_PREEMPT_RCU=y
|
||||||
CONFIG_PRINTK_TIME=y
|
CONFIG_PRINTK_TIME=y
|
||||||
CONFIG_PROC_PAGE_MONITOR=y
|
CONFIG_PROC_PAGE_MONITOR=y
|
||||||
CONFIG_PTP_1588_CLOCK=y
|
CONFIG_PTP_1588_CLOCK=y
|
||||||
|
# CONFIG_QCOM_ADM is not set
|
||||||
CONFIG_QCOM_BAM_DMA=y
|
CONFIG_QCOM_BAM_DMA=y
|
||||||
CONFIG_QCOM_GSBI=y
|
CONFIG_QCOM_GSBI=y
|
||||||
CONFIG_QCOM_HFPLL=y
|
CONFIG_QCOM_HFPLL=y
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||||
@@ -109,5 +109,29 @@
|
@@ -114,5 +114,29 @@
|
||||||
sata@29000000 {
|
sata@29000000 {
|
||||||
status = "ok";
|
status = "ok";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,70 @@
|
||||||
|
From d2f4f99db3e9ec8b063cf2e45704e2bb95428317 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Mon, 17 Nov 2014 14:41:58 +0100
|
||||||
|
Subject: [PATCH] dmaengine: Rework dma_chan_get
|
||||||
|
|
||||||
|
dma_chan_get uses a rather interesting error handling and code path.
|
||||||
|
|
||||||
|
Change it to something more usual in the kernel.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||||
|
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
---
|
||||||
|
drivers/dma/dmaengine.c | 36 +++++++++++++++++++-----------------
|
||||||
|
1 file changed, 19 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
|
--- a/drivers/dma/dmaengine.c
|
||||||
|
+++ b/drivers/dma/dmaengine.c
|
||||||
|
@@ -222,31 +222,33 @@ static void balance_ref_count(struct dma
|
||||||
|
*/
|
||||||
|
static int dma_chan_get(struct dma_chan *chan)
|
||||||
|
{
|
||||||
|
- int err = -ENODEV;
|
||||||
|
struct module *owner = dma_chan_to_owner(chan);
|
||||||
|
+ int ret;
|
||||||
|
|
||||||
|
+ /* The channel is already in use, update client count */
|
||||||
|
if (chan->client_count) {
|
||||||
|
__module_get(owner);
|
||||||
|
- err = 0;
|
||||||
|
- } else if (try_module_get(owner))
|
||||||
|
- err = 0;
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- if (err == 0)
|
||||||
|
- chan->client_count++;
|
||||||
|
+ if (!try_module_get(owner))
|
||||||
|
+ return -ENODEV;
|
||||||
|
|
||||||
|
/* allocate upon first client reference */
|
||||||
|
- if (chan->client_count == 1 && err == 0) {
|
||||||
|
- int desc_cnt = chan->device->device_alloc_chan_resources(chan);
|
||||||
|
-
|
||||||
|
- if (desc_cnt < 0) {
|
||||||
|
- err = desc_cnt;
|
||||||
|
- chan->client_count = 0;
|
||||||
|
- module_put(owner);
|
||||||
|
- } else if (!dma_has_cap(DMA_PRIVATE, chan->device->cap_mask))
|
||||||
|
- balance_ref_count(chan);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- return err;
|
||||||
|
+ ret = chan->device->device_alloc_chan_resources(chan);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ goto err_out;
|
||||||
|
+
|
||||||
|
+ if (!dma_has_cap(DMA_PRIVATE, chan->device->cap_mask))
|
||||||
|
+ balance_ref_count(chan);
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ chan->client_count++;
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+err_out:
|
||||||
|
+ module_put(owner);
|
||||||
|
+ return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
From 4f8ef9f4140cc286d7d1cf9237da7a7439e4fc0b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Mon, 17 Nov 2014 14:42:03 +0100
|
||||||
|
Subject: [PATCH] dmaengine: Remove the need to declare device_control
|
||||||
|
|
||||||
|
In order to migrate the drivers without triggering a BUG_ON for the converted
|
||||||
|
drivers, which would cause bisectability issues, we need to remove that check
|
||||||
|
before removing the device_control function entirely.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||||
|
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
---
|
||||||
|
drivers/dma/dmaengine.c | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
--- a/drivers/dma/dmaengine.c
|
||||||
|
+++ b/drivers/dma/dmaengine.c
|
||||||
|
@@ -814,8 +814,6 @@ int dma_async_device_register(struct dma
|
||||||
|
!device->device_prep_dma_sg);
|
||||||
|
BUG_ON(dma_has_cap(DMA_CYCLIC, device->cap_mask) &&
|
||||||
|
!device->device_prep_dma_cyclic);
|
||||||
|
- BUG_ON(dma_has_cap(DMA_SLAVE, device->cap_mask) &&
|
||||||
|
- !device->device_control);
|
||||||
|
BUG_ON(dma_has_cap(DMA_INTERLEAVE, device->cap_mask) &&
|
||||||
|
!device->device_prep_interleaved_dma);
|
||||||
|
|
||||||
|
|
@ -0,0 +1,62 @@
|
||||||
|
From c4b54a648e682f678c338619df848233a6babc46 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Mon, 17 Nov 2014 14:41:59 +0100
|
||||||
|
Subject: [PATCH] dmaengine: Make channel allocation callbacks optional
|
||||||
|
|
||||||
|
Nowadays, some drivers don't have anything in there channel allocation
|
||||||
|
callbacks anymore.
|
||||||
|
|
||||||
|
Remove the BUG_ON if those callbacks aren't implemented, in order to allow
|
||||||
|
drivers to not implement them.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||||
|
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
---
|
||||||
|
drivers/dma/dmaengine.c | 18 +++++++++++-------
|
||||||
|
1 file changed, 11 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
--- a/drivers/dma/dmaengine.c
|
||||||
|
+++ b/drivers/dma/dmaengine.c
|
||||||
|
@@ -235,9 +235,11 @@ static int dma_chan_get(struct dma_chan
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
|
/* allocate upon first client reference */
|
||||||
|
- ret = chan->device->device_alloc_chan_resources(chan);
|
||||||
|
- if (ret < 0)
|
||||||
|
- goto err_out;
|
||||||
|
+ if (chan->device->device_alloc_chan_resources) {
|
||||||
|
+ ret = chan->device->device_alloc_chan_resources(chan);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ goto err_out;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (!dma_has_cap(DMA_PRIVATE, chan->device->cap_mask))
|
||||||
|
balance_ref_count(chan);
|
||||||
|
@@ -259,11 +261,15 @@ err_out:
|
||||||
|
*/
|
||||||
|
static void dma_chan_put(struct dma_chan *chan)
|
||||||
|
{
|
||||||
|
+ /* This channel is not in use, bail out */
|
||||||
|
if (!chan->client_count)
|
||||||
|
- return; /* this channel failed alloc_chan_resources */
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
chan->client_count--;
|
||||||
|
module_put(dma_chan_to_owner(chan));
|
||||||
|
- if (chan->client_count == 0)
|
||||||
|
+
|
||||||
|
+ /* This channel is not in use anymore, free it */
|
||||||
|
+ if (!chan->client_count && chan->device->device_free_chan_resources)
|
||||||
|
chan->device->device_free_chan_resources(chan);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -817,8 +823,6 @@ int dma_async_device_register(struct dma
|
||||||
|
BUG_ON(dma_has_cap(DMA_INTERLEAVE, device->cap_mask) &&
|
||||||
|
!device->device_prep_interleaved_dma);
|
||||||
|
|
||||||
|
- BUG_ON(!device->device_alloc_chan_resources);
|
||||||
|
- BUG_ON(!device->device_free_chan_resources);
|
||||||
|
BUG_ON(!device->device_tx_status);
|
||||||
|
BUG_ON(!device->device_issue_pending);
|
||||||
|
BUG_ON(!device->dev);
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
From 94a73e30dfe6722e9f4ef19f7892901d7d00eab1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Mon, 17 Nov 2014 14:42:00 +0100
|
||||||
|
Subject: [PATCH] dmaengine: Introduce a device_config callback
|
||||||
|
|
||||||
|
The fact that the channel configuration is done in device_control is rather
|
||||||
|
misleading, since it's not really advertised as such, plus, the fact that the
|
||||||
|
framework exposes a function of its own makes it not really intuitive, while
|
||||||
|
we're losing the type checking whenever we pass that unsigned long argument.
|
||||||
|
|
||||||
|
Add a device_config callback to dma_device, with a fallback on the old
|
||||||
|
behaviour for now for existing drivers to opt in.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||||
|
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
---
|
||||||
|
include/linux/dmaengine.h | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
--- a/include/linux/dmaengine.h
|
||||||
|
+++ b/include/linux/dmaengine.h
|
||||||
|
@@ -607,6 +607,8 @@ struct dma_tx_state {
|
||||||
|
* The function takes a buffer of size buf_len. The callback function will
|
||||||
|
* be called after period_len bytes have been transferred.
|
||||||
|
* @device_prep_interleaved_dma: Transfer expression in a generic way.
|
||||||
|
+ * @device_config: Pushes a new configuration to a channel, return 0 or an error
|
||||||
|
+ * code
|
||||||
|
* @device_control: manipulate all pending operations on a channel, returns
|
||||||
|
* zero or error code
|
||||||
|
* @device_tx_status: poll for transaction completion, the optional
|
||||||
|
@@ -673,6 +675,9 @@ struct dma_device {
|
||||||
|
struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
|
||||||
|
struct dma_chan *chan, struct dma_interleaved_template *xt,
|
||||||
|
unsigned long flags);
|
||||||
|
+
|
||||||
|
+ int (*device_config)(struct dma_chan *chan,
|
||||||
|
+ struct dma_slave_config *config);
|
||||||
|
int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
|
||||||
|
unsigned long arg);
|
||||||
|
|
||||||
|
@@ -696,6 +701,9 @@ static inline int dmaengine_device_contr
|
||||||
|
static inline int dmaengine_slave_config(struct dma_chan *chan,
|
||||||
|
struct dma_slave_config *config)
|
||||||
|
{
|
||||||
|
+ if (chan->device->device_config)
|
||||||
|
+ return chan->device->device_config(chan, config);
|
||||||
|
+
|
||||||
|
return dmaengine_device_control(chan, DMA_SLAVE_CONFIG,
|
||||||
|
(unsigned long)config);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
From 7fa0cf462daa6f6121b332b87833d7f5bdb515c0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Date: Mon, 17 Nov 2014 14:42:02 +0100
|
||||||
|
Subject: [PATCH] dmaengine: Add device_terminate_all callback
|
||||||
|
|
||||||
|
Split out the terminate_all command from device_control to a dma_device
|
||||||
|
callback. In order to preserve backward capability, still rely on
|
||||||
|
device_control if no such callback has been implemented.
|
||||||
|
|
||||||
|
Eventually, this will allow to create a generic dma_slave_caps callback.
|
||||||
|
|
||||||
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||||
|
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||||
|
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
---
|
||||||
|
include/linux/dmaengine.h | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
--- a/include/linux/dmaengine.h
|
||||||
|
+++ b/include/linux/dmaengine.h
|
||||||
|
@@ -611,6 +611,8 @@ struct dma_tx_state {
|
||||||
|
* code
|
||||||
|
* @device_control: manipulate all pending operations on a channel, returns
|
||||||
|
* zero or error code
|
||||||
|
+ * @device_terminate_all: Aborts all transfers on a channel. Returns 0
|
||||||
|
+ * or an error code
|
||||||
|
* @device_tx_status: poll for transaction completion, the optional
|
||||||
|
* txstate parameter can be supplied with a pointer to get a
|
||||||
|
* struct with auxiliary transfer status information, otherwise the call
|
||||||
|
@@ -680,6 +682,7 @@ struct dma_device {
|
||||||
|
struct dma_slave_config *config);
|
||||||
|
int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
|
||||||
|
unsigned long arg);
|
||||||
|
+ int (*device_terminate_all)(struct dma_chan *chan);
|
||||||
|
|
||||||
|
enum dma_status (*device_tx_status)(struct dma_chan *chan,
|
||||||
|
dma_cookie_t cookie,
|
||||||
|
@@ -789,6 +792,9 @@ static inline int dma_get_slave_caps(str
|
||||||
|
|
||||||
|
static inline int dmaengine_terminate_all(struct dma_chan *chan)
|
||||||
|
{
|
||||||
|
+ if (chan->device->device_terminate_all)
|
||||||
|
+ return chan->device->device_terminate_all(chan);
|
||||||
|
+
|
||||||
|
return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,76 @@
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [v6,1/2] dt/bindings: qcom_adm: Fix channel specifiers
|
||||||
|
From: Andy Gross <agross@codeaurora.org>
|
||||||
|
X-Patchwork-Id: 6027361
|
||||||
|
Message-Id: <1426571172-9711-2-git-send-email-agross@codeaurora.org>
|
||||||
|
To: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
|
||||||
|
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||||
|
linux-arm-kernel@lists.infradead.org, Kumar Gala <galak@codeaurora.org>,
|
||||||
|
Bjorn Andersson <bjorn.andersson@sonymobile.com>,
|
||||||
|
Andy Gross <agross@codeaurora.org>
|
||||||
|
Date: Tue, 17 Mar 2015 00:46:11 -0500
|
||||||
|
|
||||||
|
This patch removes the crci information from the dma channel property. At least
|
||||||
|
one client device requires using more than one CRCI value for a channel. This
|
||||||
|
does not match the current binding and the crci information needs to be removed.
|
||||||
|
|
||||||
|
Instead, the client device will provide this information via other means.
|
||||||
|
|
||||||
|
Signed-off-by: Andy Gross <agross@codeaurora.org>
|
||||||
|
|
||||||
|
---
|
||||||
|
Documentation/devicetree/bindings/dma/qcom_adm.txt | 16 ++++++----------
|
||||||
|
1 file changed, 6 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
--- a/Documentation/devicetree/bindings/dma/qcom_adm.txt
|
||||||
|
+++ b/Documentation/devicetree/bindings/dma/qcom_adm.txt
|
||||||
|
@@ -4,8 +4,7 @@ Required properties:
|
||||||
|
- compatible: must contain "qcom,adm" for IPQ/APQ8064 and MSM8960
|
||||||
|
- reg: Address range for DMA registers
|
||||||
|
- interrupts: Should contain one interrupt shared by all channels
|
||||||
|
-- #dma-cells: must be <2>. First cell denotes the channel number. Second cell
|
||||||
|
- denotes CRCI (client rate control interface) flow control assignment.
|
||||||
|
+- #dma-cells: must be <1>. First cell denotes the channel number.
|
||||||
|
- clocks: Should contain the core clock and interface clock.
|
||||||
|
- clock-names: Must contain "core" for the core clock and "iface" for the
|
||||||
|
interface clock.
|
||||||
|
@@ -22,7 +21,7 @@ Example:
|
||||||
|
compatible = "qcom,adm";
|
||||||
|
reg = <0x18300000 0x100000>;
|
||||||
|
interrupts = <0 170 0>;
|
||||||
|
- #dma-cells = <2>;
|
||||||
|
+ #dma-cells = <1>;
|
||||||
|
|
||||||
|
clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
|
||||||
|
clock-names = "core", "iface";
|
||||||
|
@@ -35,15 +34,12 @@ Example:
|
||||||
|
qcom,ee = <0>;
|
||||||
|
};
|
||||||
|
|
||||||
|
-DMA clients must use the format descripted in the dma.txt file, using a three
|
||||||
|
+DMA clients must use the format descripted in the dma.txt file, using a two
|
||||||
|
cell specifier for each channel.
|
||||||
|
|
||||||
|
-Each dmas request consists of 3 cells:
|
||||||
|
+Each dmas request consists of two cells:
|
||||||
|
1. phandle pointing to the DMA controller
|
||||||
|
2. channel number
|
||||||
|
- 3. CRCI assignment, if applicable. If no CRCI flow control is required, use 0.
|
||||||
|
- The CRCI is used for flow control. It identifies the peripheral device that
|
||||||
|
- is the source/destination for the transferred data.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
@@ -56,7 +52,7 @@ Example:
|
||||||
|
|
||||||
|
cs-gpios = <&qcom_pinmux 20 0>;
|
||||||
|
|
||||||
|
- dmas = <&adm_dma 6 9>,
|
||||||
|
- <&adm_dma 5 10>;
|
||||||
|
+ dmas = <&adm_dma 6>,
|
||||||
|
+ <&adm_dma 5>;
|
||||||
|
dma-names = "rx", "tx";
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,958 @@
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [v6,2/2] dmaengine: Add ADM driver
|
||||||
|
From: Andy Gross <agross@codeaurora.org>
|
||||||
|
X-Patchwork-Id: 6027351
|
||||||
|
Message-Id: <1426571172-9711-3-git-send-email-agross@codeaurora.org>
|
||||||
|
To: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
|
||||||
|
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||||
|
linux-arm-kernel@lists.infradead.org, Kumar Gala <galak@codeaurora.org>,
|
||||||
|
Bjorn Andersson <bjorn.andersson@sonymobile.com>,
|
||||||
|
Andy Gross <agross@codeaurora.org>
|
||||||
|
Date: Tue, 17 Mar 2015 00:46:12 -0500
|
||||||
|
|
||||||
|
Add the DMA engine driver for the QCOM Application Data Mover (ADM) DMA
|
||||||
|
controller found in the MSM8x60 and IPQ/APQ8064 platforms.
|
||||||
|
|
||||||
|
The ADM supports both memory to memory transactions and memory
|
||||||
|
to/from peripheral device transactions. The controller also provides flow
|
||||||
|
control capabilities for transactions to/from peripheral devices.
|
||||||
|
|
||||||
|
The initial release of this driver supports slave transfers to/from peripherals
|
||||||
|
and also incorporates CRCI (client rate control interface) flow control.
|
||||||
|
|
||||||
|
Signed-off-by: Andy Gross <agross@codeaurora.org>
|
||||||
|
Reviewed-by: sricharan <sricharan@codeaurora.org>
|
||||||
|
|
||||||
|
---
|
||||||
|
drivers/dma/Kconfig | 10 +
|
||||||
|
drivers/dma/Makefile | 1 +
|
||||||
|
drivers/dma/qcom_adm.c | 900 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
3 files changed, 911 insertions(+)
|
||||||
|
create mode 100644 drivers/dma/qcom_adm.c
|
||||||
|
|
||||||
|
--- a/drivers/dma/Kconfig
|
||||||
|
+++ b/drivers/dma/Kconfig
|
||||||
|
@@ -457,4 +457,14 @@ config QCOM_BAM_DMA
|
||||||
|
Enable support for the QCOM BAM DMA controller. This controller
|
||||||
|
provides DMA capabilities for a variety of on-chip devices.
|
||||||
|
|
||||||
|
+config QCOM_ADM
|
||||||
|
+ tristate "Qualcomm ADM support"
|
||||||
|
+ depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM)
|
||||||
|
+ select DMA_ENGINE
|
||||||
|
+ select DMA_VIRTUAL_CHANNELS
|
||||||
|
+ ---help---
|
||||||
|
+ Enable support for the Qualcomm ADM DMA controller. This controller
|
||||||
|
+ provides DMA capabilities for both general purpose and on-chip
|
||||||
|
+ peripheral devices.
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/drivers/dma/qcom_adm.c
|
||||||
|
@@ -0,0 +1,896 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
|
||||||
|
+ *
|
||||||
|
+ * This program is free software; you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License version 2 and
|
||||||
|
+ * only version 2 as published by the Free Software Foundation.
|
||||||
|
+ *
|
||||||
|
+ * This program is distributed in the hope that it will be useful,
|
||||||
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
+ * GNU General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <linux/kernel.h>
|
||||||
|
+#include <linux/io.h>
|
||||||
|
+#include <linux/init.h>
|
||||||
|
+#include <linux/slab.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/interrupt.h>
|
||||||
|
+#include <linux/dma-mapping.h>
|
||||||
|
+#include <linux/scatterlist.h>
|
||||||
|
+#include <linux/device.h>
|
||||||
|
+#include <linux/platform_device.h>
|
||||||
|
+#include <linux/of.h>
|
||||||
|
+#include <linux/of_address.h>
|
||||||
|
+#include <linux/of_irq.h>
|
||||||
|
+#include <linux/of_dma.h>
|
||||||
|
+#include <linux/reset.h>
|
||||||
|
+#include <linux/clk.h>
|
||||||
|
+#include <linux/dmaengine.h>
|
||||||
|
+
|
||||||
|
+#include "dmaengine.h"
|
||||||
|
+#include "virt-dma.h"
|
||||||
|
+
|
||||||
|
+/* ADM registers - calculated from channel number and security domain */
|
||||||
|
+#define ADM_CHAN_MULTI 0x4
|
||||||
|
+#define ADM_CI_MULTI 0x4
|
||||||
|
+#define ADM_CRCI_MULTI 0x4
|
||||||
|
+#define ADM_EE_MULTI 0x800
|
||||||
|
+#define ADM_CHAN_OFFS(chan) (ADM_CHAN_MULTI * chan)
|
||||||
|
+#define ADM_EE_OFFS(ee) (ADM_EE_MULTI * ee)
|
||||||
|
+#define ADM_CHAN_EE_OFFS(chan, ee) (ADM_CHAN_OFFS(chan) + ADM_EE_OFFS(ee))
|
||||||
|
+#define ADM_CHAN_OFFS(chan) (ADM_CHAN_MULTI * chan)
|
||||||
|
+#define ADM_CI_OFFS(ci) (ADM_CHAN_OFF(ci))
|
||||||
|
+#define ADM_CH_CMD_PTR(chan, ee) (ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_RSLT(chan, ee) (0x40 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_FLUSH_STATE0(chan, ee) (0x80 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_STATUS_SD(chan, ee) (0x200 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_CONF(chan) (0x240 + ADM_CHAN_OFFS(chan))
|
||||||
|
+#define ADM_CH_RSLT_CONF(chan, ee) (0x300 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_SEC_DOMAIN_IRQ_STATUS(ee) (0x380 + ADM_EE_OFFS(ee))
|
||||||
|
+#define ADM_CI_CONF(ci) (0x390 + ci * ADM_CI_MULTI)
|
||||||
|
+#define ADM_GP_CTL 0x3d8
|
||||||
|
+#define ADM_CRCI_CTL(crci, ee) (0x400 + crci * ADM_CRCI_MULTI + \
|
||||||
|
+ ADM_EE_OFFS(ee))
|
||||||
|
+
|
||||||
|
+/* channel status */
|
||||||
|
+#define ADM_CH_STATUS_VALID BIT(1)
|
||||||
|
+
|
||||||
|
+/* channel result */
|
||||||
|
+#define ADM_CH_RSLT_VALID BIT(31)
|
||||||
|
+#define ADM_CH_RSLT_ERR BIT(3)
|
||||||
|
+#define ADM_CH_RSLT_FLUSH BIT(2)
|
||||||
|
+#define ADM_CH_RSLT_TPD BIT(1)
|
||||||
|
+
|
||||||
|
+/* channel conf */
|
||||||
|
+#define ADM_CH_CONF_SHADOW_EN BIT(12)
|
||||||
|
+#define ADM_CH_CONF_MPU_DISABLE BIT(11)
|
||||||
|
+#define ADM_CH_CONF_PERM_MPU_CONF BIT(9)
|
||||||
|
+#define ADM_CH_CONF_FORCE_RSLT_EN BIT(7)
|
||||||
|
+#define ADM_CH_CONF_SEC_DOMAIN(ee) (((ee & 0x3) << 4) | ((ee & 0x4) << 11))
|
||||||
|
+
|
||||||
|
+/* channel result conf */
|
||||||
|
+#define ADM_CH_RSLT_CONF_FLUSH_EN BIT(1)
|
||||||
|
+#define ADM_CH_RSLT_CONF_IRQ_EN BIT(0)
|
||||||
|
+
|
||||||
|
+/* CRCI CTL */
|
||||||
|
+#define ADM_CRCI_CTL_MUX_SEL BIT(18)
|
||||||
|
+#define ADM_CRCI_CTL_RST BIT(17)
|
||||||
|
+
|
||||||
|
+/* CI configuration */
|
||||||
|
+#define ADM_CI_RANGE_END(x) (x << 24)
|
||||||
|
+#define ADM_CI_RANGE_START(x) (x << 16)
|
||||||
|
+#define ADM_CI_BURST_4_WORDS BIT(2)
|
||||||
|
+#define ADM_CI_BURST_8_WORDS BIT(3)
|
||||||
|
+
|
||||||
|
+/* GP CTL */
|
||||||
|
+#define ADM_GP_CTL_LP_EN BIT(12)
|
||||||
|
+#define ADM_GP_CTL_LP_CNT(x) (x << 8)
|
||||||
|
+
|
||||||
|
+/* Command pointer list entry */
|
||||||
|
+#define ADM_CPLE_LP BIT(31)
|
||||||
|
+#define ADM_CPLE_CMD_PTR_LIST BIT(29)
|
||||||
|
+
|
||||||
|
+/* Command list entry */
|
||||||
|
+#define ADM_CMD_LC BIT(31)
|
||||||
|
+#define ADM_CMD_DST_CRCI(n) (((n) & 0xf) << 7)
|
||||||
|
+#define ADM_CMD_SRC_CRCI(n) (((n) & 0xf) << 3)
|
||||||
|
+
|
||||||
|
+#define ADM_CMD_TYPE_SINGLE 0x0
|
||||||
|
+#define ADM_CMD_TYPE_BOX 0x3
|
||||||
|
+
|
||||||
|
+#define ADM_CRCI_MUX_SEL BIT(4)
|
||||||
|
+#define ADM_DESC_ALIGN 8
|
||||||
|
+#define ADM_MAX_XFER (SZ_64K-1)
|
||||||
|
+#define ADM_MAX_ROWS (SZ_64K-1)
|
||||||
|
+#define ADM_MAX_CHANNELS 16
|
||||||
|
+
|
||||||
|
+struct adm_desc_hw_box {
|
||||||
|
+ u32 cmd;
|
||||||
|
+ u32 src_addr;
|
||||||
|
+ u32 dst_addr;
|
||||||
|
+ u32 row_len;
|
||||||
|
+ u32 num_rows;
|
||||||
|
+ u32 row_offset;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct adm_desc_hw_single {
|
||||||
|
+ u32 cmd;
|
||||||
|
+ u32 src_addr;
|
||||||
|
+ u32 dst_addr;
|
||||||
|
+ u32 len;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct adm_async_desc {
|
||||||
|
+ struct virt_dma_desc vd;
|
||||||
|
+ struct adm_device *adev;
|
||||||
|
+
|
||||||
|
+ size_t length;
|
||||||
|
+ enum dma_transfer_direction dir;
|
||||||
|
+ dma_addr_t dma_addr;
|
||||||
|
+ size_t dma_len;
|
||||||
|
+
|
||||||
|
+ void *cpl;
|
||||||
|
+ dma_addr_t cp_addr;
|
||||||
|
+ u32 crci;
|
||||||
|
+ u32 mux;
|
||||||
|
+ u32 blk_size;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct adm_chan {
|
||||||
|
+ struct virt_dma_chan vc;
|
||||||
|
+ struct adm_device *adev;
|
||||||
|
+
|
||||||
|
+ /* parsed from DT */
|
||||||
|
+ u32 id; /* channel id */
|
||||||
|
+
|
||||||
|
+ struct adm_async_desc *curr_txd;
|
||||||
|
+ struct dma_slave_config slave;
|
||||||
|
+ struct list_head node;
|
||||||
|
+
|
||||||
|
+ int error;
|
||||||
|
+ int initialized;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static inline struct adm_chan *to_adm_chan(struct dma_chan *common)
|
||||||
|
+{
|
||||||
|
+ return container_of(common, struct adm_chan, vc.chan);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+struct adm_device {
|
||||||
|
+ void __iomem *regs;
|
||||||
|
+ struct device *dev;
|
||||||
|
+ struct dma_device common;
|
||||||
|
+ struct device_dma_parameters dma_parms;
|
||||||
|
+ struct adm_chan *channels;
|
||||||
|
+
|
||||||
|
+ u32 ee;
|
||||||
|
+
|
||||||
|
+ struct clk *core_clk;
|
||||||
|
+ struct clk *iface_clk;
|
||||||
|
+
|
||||||
|
+ struct reset_control *clk_reset;
|
||||||
|
+ struct reset_control *c0_reset;
|
||||||
|
+ struct reset_control *c1_reset;
|
||||||
|
+ struct reset_control *c2_reset;
|
||||||
|
+ int irq;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_free_chan - Frees dma resources associated with the specific channel
|
||||||
|
+ *
|
||||||
|
+ * Free all allocated descriptors associated with this channel
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static void adm_free_chan(struct dma_chan *chan)
|
||||||
|
+{
|
||||||
|
+ /* free all queued descriptors */
|
||||||
|
+ vchan_free_chan_resources(to_virt_chan(chan));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_get_blksize - Get block size from burst value
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static int adm_get_blksize(unsigned int burst)
|
||||||
|
+{
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ switch (burst) {
|
||||||
|
+ case 16:
|
||||||
|
+ case 32:
|
||||||
|
+ case 64:
|
||||||
|
+ case 128:
|
||||||
|
+ ret = ffs(burst>>4) - 1;
|
||||||
|
+ break;
|
||||||
|
+ case 192:
|
||||||
|
+ ret = 4;
|
||||||
|
+ break;
|
||||||
|
+ case 256:
|
||||||
|
+ ret = 5;
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ ret = -EINVAL;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_process_fc_descriptors - Process descriptors for flow controlled xfers
|
||||||
|
+ *
|
||||||
|
+ * @achan: ADM channel
|
||||||
|
+ * @desc: Descriptor memory pointer
|
||||||
|
+ * @sg: Scatterlist entry
|
||||||
|
+ * @crci: CRCI value
|
||||||
|
+ * @burst: Burst size of transaction
|
||||||
|
+ * @direction: DMA transfer direction
|
||||||
|
+ */
|
||||||
|
+static void *adm_process_fc_descriptors(struct adm_chan *achan,
|
||||||
|
+ void *desc, struct scatterlist *sg, u32 crci, u32 burst,
|
||||||
|
+ enum dma_transfer_direction direction)
|
||||||
|
+{
|
||||||
|
+ struct adm_desc_hw_box *box_desc = NULL;
|
||||||
|
+ struct adm_desc_hw_single *single_desc;
|
||||||
|
+ u32 remainder = sg_dma_len(sg);
|
||||||
|
+ u32 rows, row_offset, crci_cmd;
|
||||||
|
+ u32 mem_addr = sg_dma_address(sg);
|
||||||
|
+ u32 *incr_addr = &mem_addr;
|
||||||
|
+ u32 *src, *dst;
|
||||||
|
+
|
||||||
|
+ if (direction == DMA_DEV_TO_MEM) {
|
||||||
|
+ crci_cmd = ADM_CMD_SRC_CRCI(crci);
|
||||||
|
+ row_offset = burst;
|
||||||
|
+ src = &achan->slave.src_addr;
|
||||||
|
+ dst = &mem_addr;
|
||||||
|
+ } else {
|
||||||
|
+ crci_cmd = ADM_CMD_DST_CRCI(crci);
|
||||||
|
+ row_offset = burst << 16;
|
||||||
|
+ src = &mem_addr;
|
||||||
|
+ dst = &achan->slave.dst_addr;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ while (remainder >= burst) {
|
||||||
|
+ box_desc = desc;
|
||||||
|
+ box_desc->cmd = ADM_CMD_TYPE_BOX | crci_cmd;
|
||||||
|
+ box_desc->row_offset = row_offset;
|
||||||
|
+ box_desc->src_addr = *src;
|
||||||
|
+ box_desc->dst_addr = *dst;
|
||||||
|
+
|
||||||
|
+ rows = remainder / burst;
|
||||||
|
+ rows = min_t(u32, rows, ADM_MAX_ROWS);
|
||||||
|
+ box_desc->num_rows = rows << 16 | rows;
|
||||||
|
+ box_desc->row_len = burst << 16 | burst;
|
||||||
|
+
|
||||||
|
+ *incr_addr += burst * rows;
|
||||||
|
+ remainder -= burst * rows;
|
||||||
|
+ desc += sizeof(*box_desc);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* if leftover bytes, do one single descriptor */
|
||||||
|
+ if (remainder) {
|
||||||
|
+ single_desc = desc;
|
||||||
|
+ single_desc->cmd = ADM_CMD_TYPE_SINGLE | crci_cmd;
|
||||||
|
+ single_desc->len = remainder;
|
||||||
|
+ single_desc->src_addr = *src;
|
||||||
|
+ single_desc->dst_addr = *dst;
|
||||||
|
+ desc += sizeof(*single_desc);
|
||||||
|
+
|
||||||
|
+ if (sg_is_last(sg))
|
||||||
|
+ single_desc->cmd |= ADM_CMD_LC;
|
||||||
|
+ } else {
|
||||||
|
+ if (box_desc && sg_is_last(sg))
|
||||||
|
+ box_desc->cmd |= ADM_CMD_LC;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return desc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_process_non_fc_descriptors - Process descriptors for non-fc xfers
|
||||||
|
+ *
|
||||||
|
+ * @achan: ADM channel
|
||||||
|
+ * @desc: Descriptor memory pointer
|
||||||
|
+ * @sg: Scatterlist entry
|
||||||
|
+ * @direction: DMA transfer direction
|
||||||
|
+ */
|
||||||
|
+static void *adm_process_non_fc_descriptors(struct adm_chan *achan,
|
||||||
|
+ void *desc, struct scatterlist *sg,
|
||||||
|
+ enum dma_transfer_direction direction)
|
||||||
|
+{
|
||||||
|
+ struct adm_desc_hw_single *single_desc;
|
||||||
|
+ u32 remainder = sg_dma_len(sg);
|
||||||
|
+ u32 mem_addr = sg_dma_address(sg);
|
||||||
|
+ u32 *incr_addr = &mem_addr;
|
||||||
|
+ u32 *src, *dst;
|
||||||
|
+
|
||||||
|
+ if (direction == DMA_DEV_TO_MEM) {
|
||||||
|
+ src = &achan->slave.src_addr;
|
||||||
|
+ dst = &mem_addr;
|
||||||
|
+ } else {
|
||||||
|
+ src = &mem_addr;
|
||||||
|
+ dst = &achan->slave.dst_addr;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ do {
|
||||||
|
+ single_desc = desc;
|
||||||
|
+ single_desc->cmd = ADM_CMD_TYPE_SINGLE;
|
||||||
|
+ single_desc->src_addr = *src;
|
||||||
|
+ single_desc->dst_addr = *dst;
|
||||||
|
+ single_desc->len = (remainder > ADM_MAX_XFER) ?
|
||||||
|
+ ADM_MAX_XFER : remainder;
|
||||||
|
+
|
||||||
|
+ remainder -= single_desc->len;
|
||||||
|
+ *incr_addr += single_desc->len;
|
||||||
|
+ desc += sizeof(*single_desc);
|
||||||
|
+ } while (remainder);
|
||||||
|
+
|
||||||
|
+ /* set last command if this is the end of the whole transaction */
|
||||||
|
+ if (sg_is_last(sg))
|
||||||
|
+ single_desc->cmd |= ADM_CMD_LC;
|
||||||
|
+
|
||||||
|
+ return desc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_prep_slave_sg - Prep slave sg transaction
|
||||||
|
+ *
|
||||||
|
+ * @chan: dma channel
|
||||||
|
+ * @sgl: scatter gather list
|
||||||
|
+ * @sg_len: length of sg
|
||||||
|
+ * @direction: DMA transfer direction
|
||||||
|
+ * @flags: DMA flags
|
||||||
|
+ * @context: transfer context (unused)
|
||||||
|
+ */
|
||||||
|
+static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan,
|
||||||
|
+ struct scatterlist *sgl, unsigned int sg_len,
|
||||||
|
+ enum dma_transfer_direction direction, unsigned long flags,
|
||||||
|
+ void *context)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ struct adm_device *adev = achan->adev;
|
||||||
|
+ struct adm_async_desc *async_desc;
|
||||||
|
+ struct scatterlist *sg;
|
||||||
|
+ u32 i, burst;
|
||||||
|
+ u32 single_count = 0, box_count = 0, crci = 0;
|
||||||
|
+ void *desc;
|
||||||
|
+ u32 *cple;
|
||||||
|
+ int blk_size = 0;
|
||||||
|
+
|
||||||
|
+ if (!is_slave_direction(direction)) {
|
||||||
|
+ dev_err(adev->dev, "invalid dma direction\n");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * get burst value from slave configuration
|
||||||
|
+ */
|
||||||
|
+ burst = (direction == DMA_MEM_TO_DEV) ?
|
||||||
|
+ achan->slave.dst_maxburst :
|
||||||
|
+ achan->slave.src_maxburst;
|
||||||
|
+
|
||||||
|
+ /* if using flow control, validate burst and crci values */
|
||||||
|
+ if (achan->slave.device_fc) {
|
||||||
|
+
|
||||||
|
+ blk_size = adm_get_blksize(burst);
|
||||||
|
+ if (blk_size < 0) {
|
||||||
|
+ dev_err(adev->dev, "invalid burst value: %d\n",
|
||||||
|
+ burst);
|
||||||
|
+ return ERR_PTR(-EINVAL);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ crci = achan->slave.slave_id & 0xf;
|
||||||
|
+ if (!crci || achan->slave.slave_id > 0x1f) {
|
||||||
|
+ dev_err(adev->dev, "invalid crci value\n");
|
||||||
|
+ return ERR_PTR(-EINVAL);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* iterate through sgs and compute allocation size of structures */
|
||||||
|
+ for_each_sg(sgl, sg, sg_len, i) {
|
||||||
|
+ if (achan->slave.device_fc) {
|
||||||
|
+ box_count += DIV_ROUND_UP(sg_dma_len(sg) / burst,
|
||||||
|
+ ADM_MAX_ROWS);
|
||||||
|
+ if (sg_dma_len(sg) % burst)
|
||||||
|
+ single_count++;
|
||||||
|
+ } else {
|
||||||
|
+ single_count += DIV_ROUND_UP(sg_dma_len(sg),
|
||||||
|
+ ADM_MAX_XFER);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ async_desc = kzalloc(sizeof(*async_desc), GFP_NOWAIT);
|
||||||
|
+ if (!async_desc)
|
||||||
|
+ return ERR_PTR(-ENOMEM);
|
||||||
|
+
|
||||||
|
+ if (crci)
|
||||||
|
+ async_desc->mux = achan->slave.slave_id & ADM_CRCI_MUX_SEL ?
|
||||||
|
+ ADM_CRCI_CTL_MUX_SEL : 0;
|
||||||
|
+ async_desc->crci = crci;
|
||||||
|
+ async_desc->blk_size = blk_size;
|
||||||
|
+ async_desc->dma_len = single_count * sizeof(struct adm_desc_hw_single) +
|
||||||
|
+ box_count * sizeof(struct adm_desc_hw_box) +
|
||||||
|
+ sizeof(*cple) + 2 * ADM_DESC_ALIGN;
|
||||||
|
+
|
||||||
|
+ async_desc->cpl = dma_alloc_writecombine(adev->dev, async_desc->dma_len,
|
||||||
|
+ &async_desc->dma_addr, GFP_NOWAIT);
|
||||||
|
+
|
||||||
|
+ if (!async_desc->cpl) {
|
||||||
|
+ kfree(async_desc);
|
||||||
|
+ return ERR_PTR(-ENOMEM);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ async_desc->adev = adev;
|
||||||
|
+
|
||||||
|
+ /* both command list entry and descriptors must be 8 byte aligned */
|
||||||
|
+ cple = PTR_ALIGN(async_desc->cpl, ADM_DESC_ALIGN);
|
||||||
|
+ desc = PTR_ALIGN(cple + 1, ADM_DESC_ALIGN);
|
||||||
|
+
|
||||||
|
+ /* init cmd list */
|
||||||
|
+ *cple = ADM_CPLE_LP;
|
||||||
|
+ *cple |= (desc - async_desc->cpl + async_desc->dma_addr) >> 3;
|
||||||
|
+
|
||||||
|
+ for_each_sg(sgl, sg, sg_len, i) {
|
||||||
|
+ async_desc->length += sg_dma_len(sg);
|
||||||
|
+
|
||||||
|
+ if (achan->slave.device_fc)
|
||||||
|
+ desc = adm_process_fc_descriptors(achan, desc, sg, crci,
|
||||||
|
+ burst, direction);
|
||||||
|
+ else
|
||||||
|
+ desc = adm_process_non_fc_descriptors(achan, desc, sg,
|
||||||
|
+ direction);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return vchan_tx_prep(&achan->vc, &async_desc->vd, flags);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_terminate_all - terminate all transactions on a channel
|
||||||
|
+ * @achan: adm dma channel
|
||||||
|
+ *
|
||||||
|
+ * Dequeues and frees all transactions, aborts current transaction
|
||||||
|
+ * No callbacks are done
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static int adm_terminate_all(struct dma_chan *chan)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ struct adm_device *adev = achan->adev;
|
||||||
|
+ unsigned long flags;
|
||||||
|
+ LIST_HEAD(head);
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+ vchan_get_all_descriptors(&achan->vc, &head);
|
||||||
|
+
|
||||||
|
+ /* send flush command to terminate current transaction */
|
||||||
|
+ writel_relaxed(0x0,
|
||||||
|
+ adev->regs + ADM_CH_FLUSH_STATE0(achan->id, adev->ee));
|
||||||
|
+
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ vchan_dma_desc_free_list(&achan->vc, &head);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int adm_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ unsigned long flag;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flag);
|
||||||
|
+ memcpy(&achan->slave, cfg, sizeof(struct dma_slave_config));
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flag);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_start_dma - start next transaction
|
||||||
|
+ * @achan - ADM dma channel
|
||||||
|
+ */
|
||||||
|
+static void adm_start_dma(struct adm_chan *achan)
|
||||||
|
+{
|
||||||
|
+ struct virt_dma_desc *vd = vchan_next_desc(&achan->vc);
|
||||||
|
+ struct adm_device *adev = achan->adev;
|
||||||
|
+ struct adm_async_desc *async_desc;
|
||||||
|
+
|
||||||
|
+ lockdep_assert_held(&achan->vc.lock);
|
||||||
|
+
|
||||||
|
+ if (!vd)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ list_del(&vd->node);
|
||||||
|
+
|
||||||
|
+ /* write next command list out to the CMD FIFO */
|
||||||
|
+ async_desc = container_of(vd, struct adm_async_desc, vd);
|
||||||
|
+ achan->curr_txd = async_desc;
|
||||||
|
+
|
||||||
|
+ /* reset channel error */
|
||||||
|
+ achan->error = 0;
|
||||||
|
+
|
||||||
|
+ if (!achan->initialized) {
|
||||||
|
+ /* enable interrupts */
|
||||||
|
+ writel(ADM_CH_CONF_SHADOW_EN |
|
||||||
|
+ ADM_CH_CONF_PERM_MPU_CONF |
|
||||||
|
+ ADM_CH_CONF_MPU_DISABLE |
|
||||||
|
+ ADM_CH_CONF_SEC_DOMAIN(adev->ee),
|
||||||
|
+ adev->regs + ADM_CH_CONF(achan->id));
|
||||||
|
+
|
||||||
|
+ writel(ADM_CH_RSLT_CONF_IRQ_EN | ADM_CH_RSLT_CONF_FLUSH_EN,
|
||||||
|
+ adev->regs + ADM_CH_RSLT_CONF(achan->id, adev->ee));
|
||||||
|
+
|
||||||
|
+ achan->initialized = 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* set the crci block size if this transaction requires CRCI */
|
||||||
|
+ if (async_desc->crci) {
|
||||||
|
+ writel(async_desc->mux | async_desc->blk_size,
|
||||||
|
+ adev->regs + ADM_CRCI_CTL(async_desc->crci, adev->ee));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* make sure IRQ enable doesn't get reordered */
|
||||||
|
+ wmb();
|
||||||
|
+
|
||||||
|
+ /* write next command list out to the CMD FIFO */
|
||||||
|
+ writel(ALIGN(async_desc->dma_addr, ADM_DESC_ALIGN) >> 3,
|
||||||
|
+ adev->regs + ADM_CH_CMD_PTR(achan->id, adev->ee));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_dma_irq - irq handler for ADM controller
|
||||||
|
+ * @irq: IRQ of interrupt
|
||||||
|
+ * @data: callback data
|
||||||
|
+ *
|
||||||
|
+ * IRQ handler for the bam controller
|
||||||
|
+ */
|
||||||
|
+static irqreturn_t adm_dma_irq(int irq, void *data)
|
||||||
|
+{
|
||||||
|
+ struct adm_device *adev = data;
|
||||||
|
+ u32 srcs, i;
|
||||||
|
+ struct adm_async_desc *async_desc;
|
||||||
|
+ unsigned long flags;
|
||||||
|
+
|
||||||
|
+ srcs = readl_relaxed(adev->regs +
|
||||||
|
+ ADM_SEC_DOMAIN_IRQ_STATUS(adev->ee));
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < ADM_MAX_CHANNELS; i++) {
|
||||||
|
+ struct adm_chan *achan = &adev->channels[i];
|
||||||
|
+ u32 status, result;
|
||||||
|
+
|
||||||
|
+ if (srcs & BIT(i)) {
|
||||||
|
+ status = readl_relaxed(adev->regs +
|
||||||
|
+ ADM_CH_STATUS_SD(i, adev->ee));
|
||||||
|
+
|
||||||
|
+ /* if no result present, skip */
|
||||||
|
+ if (!(status & ADM_CH_STATUS_VALID))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ result = readl_relaxed(adev->regs +
|
||||||
|
+ ADM_CH_RSLT(i, adev->ee));
|
||||||
|
+
|
||||||
|
+ /* no valid results, skip */
|
||||||
|
+ if (!(result & ADM_CH_RSLT_VALID))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ /* flag error if transaction was flushed or failed */
|
||||||
|
+ if (result & (ADM_CH_RSLT_ERR | ADM_CH_RSLT_FLUSH))
|
||||||
|
+ achan->error = 1;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+ async_desc = achan->curr_txd;
|
||||||
|
+
|
||||||
|
+ achan->curr_txd = NULL;
|
||||||
|
+
|
||||||
|
+ if (async_desc) {
|
||||||
|
+ vchan_cookie_complete(&async_desc->vd);
|
||||||
|
+
|
||||||
|
+ /* kick off next DMA */
|
||||||
|
+ adm_start_dma(achan);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return IRQ_HANDLED;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_tx_status - returns status of transaction
|
||||||
|
+ * @chan: dma channel
|
||||||
|
+ * @cookie: transaction cookie
|
||||||
|
+ * @txstate: DMA transaction state
|
||||||
|
+ *
|
||||||
|
+ * Return status of dma transaction
|
||||||
|
+ */
|
||||||
|
+static enum dma_status adm_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
|
||||||
|
+ struct dma_tx_state *txstate)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ struct virt_dma_desc *vd;
|
||||||
|
+ enum dma_status ret;
|
||||||
|
+ unsigned long flags;
|
||||||
|
+ size_t residue = 0;
|
||||||
|
+
|
||||||
|
+ ret = dma_cookie_status(chan, cookie, txstate);
|
||||||
|
+ if (ret == DMA_COMPLETE || !txstate)
|
||||||
|
+ return ret;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ vd = vchan_find_desc(&achan->vc, cookie);
|
||||||
|
+ if (vd)
|
||||||
|
+ residue = container_of(vd, struct adm_async_desc, vd)->length;
|
||||||
|
+
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * residue is either the full length if it is in the issued list, or 0
|
||||||
|
+ * if it is in progress. We have no reliable way of determining
|
||||||
|
+ * anything inbetween
|
||||||
|
+ */
|
||||||
|
+ dma_set_residue(txstate, residue);
|
||||||
|
+
|
||||||
|
+ if (achan->error)
|
||||||
|
+ return DMA_ERROR;
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_issue_pending - starts pending transactions
|
||||||
|
+ * @chan: dma channel
|
||||||
|
+ *
|
||||||
|
+ * Issues all pending transactions and starts DMA
|
||||||
|
+ */
|
||||||
|
+static void adm_issue_pending(struct dma_chan *chan)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ unsigned long flags;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ if (vchan_issue_pending(&achan->vc) && !achan->curr_txd)
|
||||||
|
+ adm_start_dma(achan);
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_dma_free_desc - free descriptor memory
|
||||||
|
+ * @vd: virtual descriptor
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static void adm_dma_free_desc(struct virt_dma_desc *vd)
|
||||||
|
+{
|
||||||
|
+ struct adm_async_desc *async_desc = container_of(vd,
|
||||||
|
+ struct adm_async_desc, vd);
|
||||||
|
+
|
||||||
|
+ dma_free_writecombine(async_desc->adev->dev, async_desc->dma_len,
|
||||||
|
+ async_desc->cpl, async_desc->dma_addr);
|
||||||
|
+ kfree(async_desc);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void adm_channel_init(struct adm_device *adev, struct adm_chan *achan,
|
||||||
|
+ u32 index)
|
||||||
|
+{
|
||||||
|
+ achan->id = index;
|
||||||
|
+ achan->adev = adev;
|
||||||
|
+
|
||||||
|
+ vchan_init(&achan->vc, &adev->common);
|
||||||
|
+ achan->vc.desc_free = adm_dma_free_desc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int adm_dma_probe(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct adm_device *adev;
|
||||||
|
+ struct resource *iores;
|
||||||
|
+ int ret;
|
||||||
|
+ u32 i;
|
||||||
|
+
|
||||||
|
+ adev = devm_kzalloc(&pdev->dev, sizeof(*adev), GFP_KERNEL);
|
||||||
|
+ if (!adev)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+
|
||||||
|
+ adev->dev = &pdev->dev;
|
||||||
|
+
|
||||||
|
+ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
|
+ adev->regs = devm_ioremap_resource(&pdev->dev, iores);
|
||||||
|
+ if (IS_ERR(adev->regs))
|
||||||
|
+ return PTR_ERR(adev->regs);
|
||||||
|
+
|
||||||
|
+ adev->irq = platform_get_irq(pdev, 0);
|
||||||
|
+ if (adev->irq < 0)
|
||||||
|
+ return adev->irq;
|
||||||
|
+
|
||||||
|
+ ret = of_property_read_u32(pdev->dev.of_node, "qcom,ee", &adev->ee);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "Execution environment unspecified\n");
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->core_clk = devm_clk_get(adev->dev, "core");
|
||||||
|
+ if (IS_ERR(adev->core_clk))
|
||||||
|
+ return PTR_ERR(adev->core_clk);
|
||||||
|
+
|
||||||
|
+ ret = clk_prepare_enable(adev->core_clk);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "failed to prepare/enable core clock\n");
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->iface_clk = devm_clk_get(adev->dev, "iface");
|
||||||
|
+ if (IS_ERR(adev->iface_clk)) {
|
||||||
|
+ ret = PTR_ERR(adev->iface_clk);
|
||||||
|
+ goto err_disable_core_clk;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = clk_prepare_enable(adev->iface_clk);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "failed to prepare/enable iface clock\n");
|
||||||
|
+ goto err_disable_core_clk;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->clk_reset = devm_reset_control_get(&pdev->dev, "clk");
|
||||||
|
+ if (IS_ERR(adev->clk_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->clk_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->c0_reset = devm_reset_control_get(&pdev->dev, "c0");
|
||||||
|
+ if (IS_ERR(adev->c0_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 C0 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->c0_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->c1_reset = devm_reset_control_get(&pdev->dev, "c1");
|
||||||
|
+ if (IS_ERR(adev->c1_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 C1 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->c1_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->c2_reset = devm_reset_control_get(&pdev->dev, "c2");
|
||||||
|
+ if (IS_ERR(adev->c2_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 C2 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->c2_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ reset_control_assert(adev->clk_reset);
|
||||||
|
+ reset_control_assert(adev->c0_reset);
|
||||||
|
+ reset_control_assert(adev->c1_reset);
|
||||||
|
+ reset_control_assert(adev->c2_reset);
|
||||||
|
+
|
||||||
|
+ reset_control_deassert(adev->clk_reset);
|
||||||
|
+ reset_control_deassert(adev->c0_reset);
|
||||||
|
+ reset_control_deassert(adev->c1_reset);
|
||||||
|
+ reset_control_deassert(adev->c2_reset);
|
||||||
|
+
|
||||||
|
+ adev->channels = devm_kcalloc(adev->dev, ADM_MAX_CHANNELS,
|
||||||
|
+ sizeof(*adev->channels), GFP_KERNEL);
|
||||||
|
+
|
||||||
|
+ if (!adev->channels) {
|
||||||
|
+ ret = -ENOMEM;
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* allocate and initialize channels */
|
||||||
|
+ INIT_LIST_HEAD(&adev->common.channels);
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < ADM_MAX_CHANNELS; i++)
|
||||||
|
+ adm_channel_init(adev, &adev->channels[i], i);
|
||||||
|
+
|
||||||
|
+ /* reset CRCIs */
|
||||||
|
+ for (i = 0; i < 16; i++)
|
||||||
|
+ writel(ADM_CRCI_CTL_RST, adev->regs +
|
||||||
|
+ ADM_CRCI_CTL(i, adev->ee));
|
||||||
|
+
|
||||||
|
+ /* configure client interfaces */
|
||||||
|
+ writel(ADM_CI_RANGE_START(0x40) | ADM_CI_RANGE_END(0xb0) |
|
||||||
|
+ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(0));
|
||||||
|
+ writel(ADM_CI_RANGE_START(0x2a) | ADM_CI_RANGE_END(0x2c) |
|
||||||
|
+ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(1));
|
||||||
|
+ writel(ADM_CI_RANGE_START(0x12) | ADM_CI_RANGE_END(0x28) |
|
||||||
|
+ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(2));
|
||||||
|
+ writel(ADM_GP_CTL_LP_EN | ADM_GP_CTL_LP_CNT(0xf),
|
||||||
|
+ adev->regs + ADM_GP_CTL);
|
||||||
|
+
|
||||||
|
+ ret = devm_request_irq(adev->dev, adev->irq, adm_dma_irq,
|
||||||
|
+ 0, "adm_dma", adev);
|
||||||
|
+ if (ret)
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+
|
||||||
|
+ platform_set_drvdata(pdev, adev);
|
||||||
|
+
|
||||||
|
+ adev->common.dev = adev->dev;
|
||||||
|
+ adev->common.dev->dma_parms = &adev->dma_parms;
|
||||||
|
+
|
||||||
|
+ /* set capabilities */
|
||||||
|
+ dma_cap_zero(adev->common.cap_mask);
|
||||||
|
+ dma_cap_set(DMA_SLAVE, adev->common.cap_mask);
|
||||||
|
+ dma_cap_set(DMA_PRIVATE, adev->common.cap_mask);
|
||||||
|
+
|
||||||
|
+ /* initialize dmaengine apis */
|
||||||
|
+ adev->common.device_free_chan_resources = adm_free_chan;
|
||||||
|
+ adev->common.device_prep_slave_sg = adm_prep_slave_sg;
|
||||||
|
+ adev->common.device_issue_pending = adm_issue_pending;
|
||||||
|
+ adev->common.device_tx_status = adm_tx_status;
|
||||||
|
+ adev->common.device_terminate_all = adm_terminate_all;
|
||||||
|
+ adev->common.device_config = adm_slave_config;
|
||||||
|
+
|
||||||
|
+ ret = dma_async_device_register(&adev->common);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "failed to register dma async device\n");
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = of_dma_controller_register(pdev->dev.of_node,
|
||||||
|
+ of_dma_xlate_by_chan_id,
|
||||||
|
+ &adev->common);
|
||||||
|
+ if (ret)
|
||||||
|
+ goto err_unregister_dma;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+err_unregister_dma:
|
||||||
|
+ dma_async_device_unregister(&adev->common);
|
||||||
|
+err_disable_clks:
|
||||||
|
+ clk_disable_unprepare(adev->iface_clk);
|
||||||
|
+err_disable_core_clk:
|
||||||
|
+ clk_disable_unprepare(adev->core_clk);
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int adm_dma_remove(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct adm_device *adev = platform_get_drvdata(pdev);
|
||||||
|
+ struct adm_chan *achan;
|
||||||
|
+ u32 i;
|
||||||
|
+
|
||||||
|
+ of_dma_controller_free(pdev->dev.of_node);
|
||||||
|
+ dma_async_device_unregister(&adev->common);
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < ADM_MAX_CHANNELS; i++) {
|
||||||
|
+ achan = &adev->channels[i];
|
||||||
|
+
|
||||||
|
+ /* mask IRQs for this channel/EE pair */
|
||||||
|
+ writel(0, adev->regs + ADM_CH_RSLT_CONF(achan->id, adev->ee));
|
||||||
|
+
|
||||||
|
+ adm_terminate_all(&adev->channels[i].vc.chan);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ devm_free_irq(adev->dev, adev->irq, adev);
|
||||||
|
+
|
||||||
|
+ clk_disable_unprepare(adev->core_clk);
|
||||||
|
+ clk_disable_unprepare(adev->iface_clk);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const struct of_device_id adm_of_match[] = {
|
||||||
|
+ { .compatible = "qcom,adm", },
|
||||||
|
+ {}
|
||||||
|
+};
|
||||||
|
+MODULE_DEVICE_TABLE(of, adm_of_match);
|
||||||
|
+
|
||||||
|
+static struct platform_driver adm_dma_driver = {
|
||||||
|
+ .probe = adm_dma_probe,
|
||||||
|
+ .remove = adm_dma_remove,
|
||||||
|
+ .driver = {
|
||||||
|
+ .name = "adm-dma-engine",
|
||||||
|
+ .of_match_table = adm_of_match,
|
||||||
|
+ },
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+module_platform_driver(adm_dma_driver);
|
||||||
|
+
|
||||||
|
+MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
|
||||||
|
+MODULE_DESCRIPTION("QCOM ADM DMA engine driver");
|
||||||
|
+MODULE_LICENSE("GPL v2");
|
||||||
|
--- a/drivers/dma/Makefile
|
||||||
|
+++ b/drivers/dma/Makefile
|
||||||
|
@@ -49,3 +49,4 @@ obj-y += xilinx/
|
||||||
|
obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
|
||||||
|
obj-$(CONFIG_NBPFAXI_DMA) += nbpfaxi.o
|
||||||
|
obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
|
||||||
|
+obj-$(CONFIG_QCOM_ADM) += qcom_adm.o
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
From 1fb18acab2d71e7e4efd9c10492edb1baf84dcc0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andy Gross <agross@codeaurora.org>
|
||||||
|
Date: Wed, 20 May 2015 15:41:07 +0530
|
||||||
|
Subject: [PATCH] ARM: DT: ipq8064: Add ADM device node
|
||||||
|
|
||||||
|
This patch adds support for the ADM DMA on the IPQ8064 SOC
|
||||||
|
|
||||||
|
Signed-off-by: Andy Gross <agross@codeaurora.org>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 4 ++++
|
||||||
|
arch/arm/boot/dts/qcom-ipq8064.dtsi | 21 +++++++++++++++++++++
|
||||||
|
2 files changed, 25 insertions(+)
|
||||||
|
|
||||||
|
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||||
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||||
|
@@ -90,6 +90,10 @@
|
||||||
|
|
||||||
|
cs-gpios = <&qcom_pinmux 20 0>;
|
||||||
|
|
||||||
|
+ dmas = <&adm_dma 6>,
|
||||||
|
+ <&adm_dma 5>;
|
||||||
|
+ dma-names = "rx", "tx";
|
||||||
|
+
|
||||||
|
flash: m25p80@0 {
|
||||||
|
compatible = "s25fl256s1";
|
||||||
|
#address-cells = <1>;
|
||||||
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
|
@@ -657,5 +657,25 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+ adm_dma: dma@18300000 {
|
||||||
|
+ compatible = "qcom,adm";
|
||||||
|
+ reg = <0x18300000 0x100000>;
|
||||||
|
+ interrupts = <0 170 0>;
|
||||||
|
+ #dma-cells = <1>;
|
||||||
|
+
|
||||||
|
+ clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
|
||||||
|
+ clock-names = "core", "iface";
|
||||||
|
+
|
||||||
|
+ resets = <&gcc ADM0_RESET>,
|
||||||
|
+ <&gcc ADM0_PBUS_RESET>,
|
||||||
|
+ <&gcc ADM0_C0_RESET>,
|
||||||
|
+ <&gcc ADM0_C1_RESET>,
|
||||||
|
+ <&gcc ADM0_C2_RESET>;
|
||||||
|
+ reset-names = "clk", "pbus", "c0", "c1", "c2";
|
||||||
|
+ qcom,ee = <0>;
|
||||||
|
+
|
||||||
|
+ status = "disabled";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
@ -38,7 +38,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
|
|
||||||
gsbi@16300000 {
|
gsbi@16300000 {
|
||||||
@@ -170,5 +180,33 @@
|
@@ -174,5 +184,33 @@
|
||||||
pinctrl-0 = <&pcie1_pins>;
|
pinctrl-0 = <&pcie1_pins>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
|
|
||||||
gsbi@16300000 {
|
gsbi@16300000 {
|
||||||
@@ -208,5 +218,26 @@
|
@@ -212,5 +222,26 @@
|
||||||
reg = <4>;
|
reg = <4>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -116,8 +116,8 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
@@ -657,5 +657,90 @@
|
@@ -677,5 +677,91 @@
|
||||||
};
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
+ nss_common: syscon@03000000 {
|
+ nss_common: syscon@03000000 {
|
||||||
|
|
@ -205,5 +205,6 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
+
|
+
|
||||||
+ status = "disabled";
|
+ status = "disabled";
|
||||||
+ };
|
+ };
|
||||||
|
+
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,76 @@
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [v6,1/2] dt/bindings: qcom_adm: Fix channel specifiers
|
||||||
|
From: Andy Gross <agross@codeaurora.org>
|
||||||
|
X-Patchwork-Id: 6027361
|
||||||
|
Message-Id: <1426571172-9711-2-git-send-email-agross@codeaurora.org>
|
||||||
|
To: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
|
||||||
|
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||||
|
linux-arm-kernel@lists.infradead.org, Kumar Gala <galak@codeaurora.org>,
|
||||||
|
Bjorn Andersson <bjorn.andersson@sonymobile.com>,
|
||||||
|
Andy Gross <agross@codeaurora.org>
|
||||||
|
Date: Tue, 17 Mar 2015 00:46:11 -0500
|
||||||
|
|
||||||
|
This patch removes the crci information from the dma channel property. At least
|
||||||
|
one client device requires using more than one CRCI value for a channel. This
|
||||||
|
does not match the current binding and the crci information needs to be removed.
|
||||||
|
|
||||||
|
Instead, the client device will provide this information via other means.
|
||||||
|
|
||||||
|
Signed-off-by: Andy Gross <agross@codeaurora.org>
|
||||||
|
|
||||||
|
---
|
||||||
|
Documentation/devicetree/bindings/dma/qcom_adm.txt | 16 ++++++----------
|
||||||
|
1 file changed, 6 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
--- a/Documentation/devicetree/bindings/dma/qcom_adm.txt
|
||||||
|
+++ b/Documentation/devicetree/bindings/dma/qcom_adm.txt
|
||||||
|
@@ -4,8 +4,7 @@ Required properties:
|
||||||
|
- compatible: must contain "qcom,adm" for IPQ/APQ8064 and MSM8960
|
||||||
|
- reg: Address range for DMA registers
|
||||||
|
- interrupts: Should contain one interrupt shared by all channels
|
||||||
|
-- #dma-cells: must be <2>. First cell denotes the channel number. Second cell
|
||||||
|
- denotes CRCI (client rate control interface) flow control assignment.
|
||||||
|
+- #dma-cells: must be <1>. First cell denotes the channel number.
|
||||||
|
- clocks: Should contain the core clock and interface clock.
|
||||||
|
- clock-names: Must contain "core" for the core clock and "iface" for the
|
||||||
|
interface clock.
|
||||||
|
@@ -22,7 +21,7 @@ Example:
|
||||||
|
compatible = "qcom,adm";
|
||||||
|
reg = <0x18300000 0x100000>;
|
||||||
|
interrupts = <0 170 0>;
|
||||||
|
- #dma-cells = <2>;
|
||||||
|
+ #dma-cells = <1>;
|
||||||
|
|
||||||
|
clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
|
||||||
|
clock-names = "core", "iface";
|
||||||
|
@@ -35,15 +34,12 @@ Example:
|
||||||
|
qcom,ee = <0>;
|
||||||
|
};
|
||||||
|
|
||||||
|
-DMA clients must use the format descripted in the dma.txt file, using a three
|
||||||
|
+DMA clients must use the format descripted in the dma.txt file, using a two
|
||||||
|
cell specifier for each channel.
|
||||||
|
|
||||||
|
-Each dmas request consists of 3 cells:
|
||||||
|
+Each dmas request consists of two cells:
|
||||||
|
1. phandle pointing to the DMA controller
|
||||||
|
2. channel number
|
||||||
|
- 3. CRCI assignment, if applicable. If no CRCI flow control is required, use 0.
|
||||||
|
- The CRCI is used for flow control. It identifies the peripheral device that
|
||||||
|
- is the source/destination for the transferred data.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
@@ -56,7 +52,7 @@ Example:
|
||||||
|
|
||||||
|
cs-gpios = <&qcom_pinmux 20 0>;
|
||||||
|
|
||||||
|
- dmas = <&adm_dma 6 9>,
|
||||||
|
- <&adm_dma 5 10>;
|
||||||
|
+ dmas = <&adm_dma 6>,
|
||||||
|
+ <&adm_dma 5>;
|
||||||
|
dma-names = "rx", "tx";
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,962 @@
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [v6,2/2] dmaengine: Add ADM driver
|
||||||
|
From: Andy Gross <agross@codeaurora.org>
|
||||||
|
X-Patchwork-Id: 6027351
|
||||||
|
Message-Id: <1426571172-9711-3-git-send-email-agross@codeaurora.org>
|
||||||
|
To: Vinod Koul <vinod.koul@intel.com>
|
||||||
|
Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
|
||||||
|
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||||
|
linux-arm-kernel@lists.infradead.org, Kumar Gala <galak@codeaurora.org>,
|
||||||
|
Bjorn Andersson <bjorn.andersson@sonymobile.com>,
|
||||||
|
Andy Gross <agross@codeaurora.org>
|
||||||
|
Date: Tue, 17 Mar 2015 00:46:12 -0500
|
||||||
|
|
||||||
|
Add the DMA engine driver for the QCOM Application Data Mover (ADM) DMA
|
||||||
|
controller found in the MSM8x60 and IPQ/APQ8064 platforms.
|
||||||
|
|
||||||
|
The ADM supports both memory to memory transactions and memory
|
||||||
|
to/from peripheral device transactions. The controller also provides flow
|
||||||
|
control capabilities for transactions to/from peripheral devices.
|
||||||
|
|
||||||
|
The initial release of this driver supports slave transfers to/from peripherals
|
||||||
|
and also incorporates CRCI (client rate control interface) flow control.
|
||||||
|
|
||||||
|
Signed-off-by: Andy Gross <agross@codeaurora.org>
|
||||||
|
Reviewed-by: sricharan <sricharan@codeaurora.org>
|
||||||
|
|
||||||
|
---
|
||||||
|
drivers/dma/Kconfig | 10 +
|
||||||
|
drivers/dma/Makefile | 1 +
|
||||||
|
drivers/dma/qcom_adm.c | 900 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
3 files changed, 911 insertions(+)
|
||||||
|
create mode 100644 drivers/dma/qcom_adm.c
|
||||||
|
|
||||||
|
--- a/drivers/dma/Kconfig
|
||||||
|
+++ b/drivers/dma/Kconfig
|
||||||
|
@@ -492,4 +492,14 @@ config QCOM_BAM_DMA
|
||||||
|
Enable support for the QCOM BAM DMA controller. This controller
|
||||||
|
provides DMA capabilities for a variety of on-chip devices.
|
||||||
|
|
||||||
|
+config QCOM_ADM
|
||||||
|
+ tristate "Qualcomm ADM support"
|
||||||
|
+ depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM)
|
||||||
|
+ select DMA_ENGINE
|
||||||
|
+ select DMA_VIRTUAL_CHANNELS
|
||||||
|
+ ---help---
|
||||||
|
+ Enable support for the Qualcomm ADM DMA controller. This controller
|
||||||
|
+ provides DMA capabilities for both general purpose and on-chip
|
||||||
|
+ peripheral devices.
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/drivers/dma/qcom_adm.c
|
||||||
|
@@ -0,0 +1,900 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
|
||||||
|
+ *
|
||||||
|
+ * This program is free software; you can redistribute it and/or modify
|
||||||
|
+ * it under the terms of the GNU General Public License version 2 and
|
||||||
|
+ * only version 2 as published by the Free Software Foundation.
|
||||||
|
+ *
|
||||||
|
+ * This program is distributed in the hope that it will be useful,
|
||||||
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
+ * GNU General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <linux/kernel.h>
|
||||||
|
+#include <linux/io.h>
|
||||||
|
+#include <linux/init.h>
|
||||||
|
+#include <linux/slab.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/interrupt.h>
|
||||||
|
+#include <linux/dma-mapping.h>
|
||||||
|
+#include <linux/scatterlist.h>
|
||||||
|
+#include <linux/device.h>
|
||||||
|
+#include <linux/platform_device.h>
|
||||||
|
+#include <linux/of.h>
|
||||||
|
+#include <linux/of_address.h>
|
||||||
|
+#include <linux/of_irq.h>
|
||||||
|
+#include <linux/of_dma.h>
|
||||||
|
+#include <linux/reset.h>
|
||||||
|
+#include <linux/clk.h>
|
||||||
|
+#include <linux/dmaengine.h>
|
||||||
|
+
|
||||||
|
+#include "dmaengine.h"
|
||||||
|
+#include "virt-dma.h"
|
||||||
|
+
|
||||||
|
+/* ADM registers - calculated from channel number and security domain */
|
||||||
|
+#define ADM_CHAN_MULTI 0x4
|
||||||
|
+#define ADM_CI_MULTI 0x4
|
||||||
|
+#define ADM_CRCI_MULTI 0x4
|
||||||
|
+#define ADM_EE_MULTI 0x800
|
||||||
|
+#define ADM_CHAN_OFFS(chan) (ADM_CHAN_MULTI * chan)
|
||||||
|
+#define ADM_EE_OFFS(ee) (ADM_EE_MULTI * ee)
|
||||||
|
+#define ADM_CHAN_EE_OFFS(chan, ee) (ADM_CHAN_OFFS(chan) + ADM_EE_OFFS(ee))
|
||||||
|
+#define ADM_CHAN_OFFS(chan) (ADM_CHAN_MULTI * chan)
|
||||||
|
+#define ADM_CI_OFFS(ci) (ADM_CHAN_OFF(ci))
|
||||||
|
+#define ADM_CH_CMD_PTR(chan, ee) (ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_RSLT(chan, ee) (0x40 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_FLUSH_STATE0(chan, ee) (0x80 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_STATUS_SD(chan, ee) (0x200 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_CH_CONF(chan) (0x240 + ADM_CHAN_OFFS(chan))
|
||||||
|
+#define ADM_CH_RSLT_CONF(chan, ee) (0x300 + ADM_CHAN_EE_OFFS(chan, ee))
|
||||||
|
+#define ADM_SEC_DOMAIN_IRQ_STATUS(ee) (0x380 + ADM_EE_OFFS(ee))
|
||||||
|
+#define ADM_CI_CONF(ci) (0x390 + ci * ADM_CI_MULTI)
|
||||||
|
+#define ADM_GP_CTL 0x3d8
|
||||||
|
+#define ADM_CRCI_CTL(crci, ee) (0x400 + crci * ADM_CRCI_MULTI + \
|
||||||
|
+ ADM_EE_OFFS(ee))
|
||||||
|
+
|
||||||
|
+/* channel status */
|
||||||
|
+#define ADM_CH_STATUS_VALID BIT(1)
|
||||||
|
+
|
||||||
|
+/* channel result */
|
||||||
|
+#define ADM_CH_RSLT_VALID BIT(31)
|
||||||
|
+#define ADM_CH_RSLT_ERR BIT(3)
|
||||||
|
+#define ADM_CH_RSLT_FLUSH BIT(2)
|
||||||
|
+#define ADM_CH_RSLT_TPD BIT(1)
|
||||||
|
+
|
||||||
|
+/* channel conf */
|
||||||
|
+#define ADM_CH_CONF_SHADOW_EN BIT(12)
|
||||||
|
+#define ADM_CH_CONF_MPU_DISABLE BIT(11)
|
||||||
|
+#define ADM_CH_CONF_PERM_MPU_CONF BIT(9)
|
||||||
|
+#define ADM_CH_CONF_FORCE_RSLT_EN BIT(7)
|
||||||
|
+#define ADM_CH_CONF_SEC_DOMAIN(ee) (((ee & 0x3) << 4) | ((ee & 0x4) << 11))
|
||||||
|
+
|
||||||
|
+/* channel result conf */
|
||||||
|
+#define ADM_CH_RSLT_CONF_FLUSH_EN BIT(1)
|
||||||
|
+#define ADM_CH_RSLT_CONF_IRQ_EN BIT(0)
|
||||||
|
+
|
||||||
|
+/* CRCI CTL */
|
||||||
|
+#define ADM_CRCI_CTL_MUX_SEL BIT(18)
|
||||||
|
+#define ADM_CRCI_CTL_RST BIT(17)
|
||||||
|
+
|
||||||
|
+/* CI configuration */
|
||||||
|
+#define ADM_CI_RANGE_END(x) (x << 24)
|
||||||
|
+#define ADM_CI_RANGE_START(x) (x << 16)
|
||||||
|
+#define ADM_CI_BURST_4_WORDS BIT(2)
|
||||||
|
+#define ADM_CI_BURST_8_WORDS BIT(3)
|
||||||
|
+
|
||||||
|
+/* GP CTL */
|
||||||
|
+#define ADM_GP_CTL_LP_EN BIT(12)
|
||||||
|
+#define ADM_GP_CTL_LP_CNT(x) (x << 8)
|
||||||
|
+
|
||||||
|
+/* Command pointer list entry */
|
||||||
|
+#define ADM_CPLE_LP BIT(31)
|
||||||
|
+#define ADM_CPLE_CMD_PTR_LIST BIT(29)
|
||||||
|
+
|
||||||
|
+/* Command list entry */
|
||||||
|
+#define ADM_CMD_LC BIT(31)
|
||||||
|
+#define ADM_CMD_DST_CRCI(n) (((n) & 0xf) << 7)
|
||||||
|
+#define ADM_CMD_SRC_CRCI(n) (((n) & 0xf) << 3)
|
||||||
|
+
|
||||||
|
+#define ADM_CMD_TYPE_SINGLE 0x0
|
||||||
|
+#define ADM_CMD_TYPE_BOX 0x3
|
||||||
|
+
|
||||||
|
+#define ADM_CRCI_MUX_SEL BIT(4)
|
||||||
|
+#define ADM_DESC_ALIGN 8
|
||||||
|
+#define ADM_MAX_XFER (SZ_64K-1)
|
||||||
|
+#define ADM_MAX_ROWS (SZ_64K-1)
|
||||||
|
+#define ADM_MAX_CHANNELS 16
|
||||||
|
+
|
||||||
|
+struct adm_desc_hw_box {
|
||||||
|
+ u32 cmd;
|
||||||
|
+ u32 src_addr;
|
||||||
|
+ u32 dst_addr;
|
||||||
|
+ u32 row_len;
|
||||||
|
+ u32 num_rows;
|
||||||
|
+ u32 row_offset;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct adm_desc_hw_single {
|
||||||
|
+ u32 cmd;
|
||||||
|
+ u32 src_addr;
|
||||||
|
+ u32 dst_addr;
|
||||||
|
+ u32 len;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct adm_async_desc {
|
||||||
|
+ struct virt_dma_desc vd;
|
||||||
|
+ struct adm_device *adev;
|
||||||
|
+
|
||||||
|
+ size_t length;
|
||||||
|
+ enum dma_transfer_direction dir;
|
||||||
|
+ dma_addr_t dma_addr;
|
||||||
|
+ size_t dma_len;
|
||||||
|
+
|
||||||
|
+ void *cpl;
|
||||||
|
+ dma_addr_t cp_addr;
|
||||||
|
+ u32 crci;
|
||||||
|
+ u32 mux;
|
||||||
|
+ u32 blk_size;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+struct adm_chan {
|
||||||
|
+ struct virt_dma_chan vc;
|
||||||
|
+ struct adm_device *adev;
|
||||||
|
+
|
||||||
|
+ /* parsed from DT */
|
||||||
|
+ u32 id; /* channel id */
|
||||||
|
+
|
||||||
|
+ struct adm_async_desc *curr_txd;
|
||||||
|
+ struct dma_slave_config slave;
|
||||||
|
+ struct list_head node;
|
||||||
|
+
|
||||||
|
+ int error;
|
||||||
|
+ int initialized;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static inline struct adm_chan *to_adm_chan(struct dma_chan *common)
|
||||||
|
+{
|
||||||
|
+ return container_of(common, struct adm_chan, vc.chan);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+struct adm_device {
|
||||||
|
+ void __iomem *regs;
|
||||||
|
+ struct device *dev;
|
||||||
|
+ struct dma_device common;
|
||||||
|
+ struct device_dma_parameters dma_parms;
|
||||||
|
+ struct adm_chan *channels;
|
||||||
|
+
|
||||||
|
+ u32 ee;
|
||||||
|
+
|
||||||
|
+ struct clk *core_clk;
|
||||||
|
+ struct clk *iface_clk;
|
||||||
|
+
|
||||||
|
+ struct reset_control *clk_reset;
|
||||||
|
+ struct reset_control *c0_reset;
|
||||||
|
+ struct reset_control *c1_reset;
|
||||||
|
+ struct reset_control *c2_reset;
|
||||||
|
+ int irq;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_free_chan - Frees dma resources associated with the specific channel
|
||||||
|
+ *
|
||||||
|
+ * Free all allocated descriptors associated with this channel
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static void adm_free_chan(struct dma_chan *chan)
|
||||||
|
+{
|
||||||
|
+ /* free all queued descriptors */
|
||||||
|
+ vchan_free_chan_resources(to_virt_chan(chan));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_get_blksize - Get block size from burst value
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static int adm_get_blksize(unsigned int burst)
|
||||||
|
+{
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ switch (burst) {
|
||||||
|
+ case 16:
|
||||||
|
+ case 32:
|
||||||
|
+ case 64:
|
||||||
|
+ case 128:
|
||||||
|
+ ret = ffs(burst>>4) - 1;
|
||||||
|
+ break;
|
||||||
|
+ case 192:
|
||||||
|
+ ret = 4;
|
||||||
|
+ break;
|
||||||
|
+ case 256:
|
||||||
|
+ ret = 5;
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ ret = -EINVAL;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_process_fc_descriptors - Process descriptors for flow controlled xfers
|
||||||
|
+ *
|
||||||
|
+ * @achan: ADM channel
|
||||||
|
+ * @desc: Descriptor memory pointer
|
||||||
|
+ * @sg: Scatterlist entry
|
||||||
|
+ * @crci: CRCI value
|
||||||
|
+ * @burst: Burst size of transaction
|
||||||
|
+ * @direction: DMA transfer direction
|
||||||
|
+ */
|
||||||
|
+static void *adm_process_fc_descriptors(struct adm_chan *achan,
|
||||||
|
+ void *desc, struct scatterlist *sg, u32 crci, u32 burst,
|
||||||
|
+ enum dma_transfer_direction direction)
|
||||||
|
+{
|
||||||
|
+ struct adm_desc_hw_box *box_desc = NULL;
|
||||||
|
+ struct adm_desc_hw_single *single_desc;
|
||||||
|
+ u32 remainder = sg_dma_len(sg);
|
||||||
|
+ u32 rows, row_offset, crci_cmd;
|
||||||
|
+ u32 mem_addr = sg_dma_address(sg);
|
||||||
|
+ u32 *incr_addr = &mem_addr;
|
||||||
|
+ u32 *src, *dst;
|
||||||
|
+
|
||||||
|
+ if (direction == DMA_DEV_TO_MEM) {
|
||||||
|
+ crci_cmd = ADM_CMD_SRC_CRCI(crci);
|
||||||
|
+ row_offset = burst;
|
||||||
|
+ src = &achan->slave.src_addr;
|
||||||
|
+ dst = &mem_addr;
|
||||||
|
+ } else {
|
||||||
|
+ crci_cmd = ADM_CMD_DST_CRCI(crci);
|
||||||
|
+ row_offset = burst << 16;
|
||||||
|
+ src = &mem_addr;
|
||||||
|
+ dst = &achan->slave.dst_addr;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ while (remainder >= burst) {
|
||||||
|
+ box_desc = desc;
|
||||||
|
+ box_desc->cmd = ADM_CMD_TYPE_BOX | crci_cmd;
|
||||||
|
+ box_desc->row_offset = row_offset;
|
||||||
|
+ box_desc->src_addr = *src;
|
||||||
|
+ box_desc->dst_addr = *dst;
|
||||||
|
+
|
||||||
|
+ rows = remainder / burst;
|
||||||
|
+ rows = min_t(u32, rows, ADM_MAX_ROWS);
|
||||||
|
+ box_desc->num_rows = rows << 16 | rows;
|
||||||
|
+ box_desc->row_len = burst << 16 | burst;
|
||||||
|
+
|
||||||
|
+ *incr_addr += burst * rows;
|
||||||
|
+ remainder -= burst * rows;
|
||||||
|
+ desc += sizeof(*box_desc);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* if leftover bytes, do one single descriptor */
|
||||||
|
+ if (remainder) {
|
||||||
|
+ single_desc = desc;
|
||||||
|
+ single_desc->cmd = ADM_CMD_TYPE_SINGLE | crci_cmd;
|
||||||
|
+ single_desc->len = remainder;
|
||||||
|
+ single_desc->src_addr = *src;
|
||||||
|
+ single_desc->dst_addr = *dst;
|
||||||
|
+ desc += sizeof(*single_desc);
|
||||||
|
+
|
||||||
|
+ if (sg_is_last(sg))
|
||||||
|
+ single_desc->cmd |= ADM_CMD_LC;
|
||||||
|
+ } else {
|
||||||
|
+ if (box_desc && sg_is_last(sg))
|
||||||
|
+ box_desc->cmd |= ADM_CMD_LC;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return desc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_process_non_fc_descriptors - Process descriptors for non-fc xfers
|
||||||
|
+ *
|
||||||
|
+ * @achan: ADM channel
|
||||||
|
+ * @desc: Descriptor memory pointer
|
||||||
|
+ * @sg: Scatterlist entry
|
||||||
|
+ * @direction: DMA transfer direction
|
||||||
|
+ */
|
||||||
|
+static void *adm_process_non_fc_descriptors(struct adm_chan *achan,
|
||||||
|
+ void *desc, struct scatterlist *sg,
|
||||||
|
+ enum dma_transfer_direction direction)
|
||||||
|
+{
|
||||||
|
+ struct adm_desc_hw_single *single_desc;
|
||||||
|
+ u32 remainder = sg_dma_len(sg);
|
||||||
|
+ u32 mem_addr = sg_dma_address(sg);
|
||||||
|
+ u32 *incr_addr = &mem_addr;
|
||||||
|
+ u32 *src, *dst;
|
||||||
|
+
|
||||||
|
+ if (direction == DMA_DEV_TO_MEM) {
|
||||||
|
+ src = &achan->slave.src_addr;
|
||||||
|
+ dst = &mem_addr;
|
||||||
|
+ } else {
|
||||||
|
+ src = &mem_addr;
|
||||||
|
+ dst = &achan->slave.dst_addr;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ do {
|
||||||
|
+ single_desc = desc;
|
||||||
|
+ single_desc->cmd = ADM_CMD_TYPE_SINGLE;
|
||||||
|
+ single_desc->src_addr = *src;
|
||||||
|
+ single_desc->dst_addr = *dst;
|
||||||
|
+ single_desc->len = (remainder > ADM_MAX_XFER) ?
|
||||||
|
+ ADM_MAX_XFER : remainder;
|
||||||
|
+
|
||||||
|
+ remainder -= single_desc->len;
|
||||||
|
+ *incr_addr += single_desc->len;
|
||||||
|
+ desc += sizeof(*single_desc);
|
||||||
|
+ } while (remainder);
|
||||||
|
+
|
||||||
|
+ /* set last command if this is the end of the whole transaction */
|
||||||
|
+ if (sg_is_last(sg))
|
||||||
|
+ single_desc->cmd |= ADM_CMD_LC;
|
||||||
|
+
|
||||||
|
+ return desc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_prep_slave_sg - Prep slave sg transaction
|
||||||
|
+ *
|
||||||
|
+ * @chan: dma channel
|
||||||
|
+ * @sgl: scatter gather list
|
||||||
|
+ * @sg_len: length of sg
|
||||||
|
+ * @direction: DMA transfer direction
|
||||||
|
+ * @flags: DMA flags
|
||||||
|
+ * @context: transfer context (unused)
|
||||||
|
+ */
|
||||||
|
+static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan,
|
||||||
|
+ struct scatterlist *sgl, unsigned int sg_len,
|
||||||
|
+ enum dma_transfer_direction direction, unsigned long flags,
|
||||||
|
+ void *context)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ struct adm_device *adev = achan->adev;
|
||||||
|
+ struct adm_async_desc *async_desc;
|
||||||
|
+ struct scatterlist *sg;
|
||||||
|
+ u32 i, burst;
|
||||||
|
+ u32 single_count = 0, box_count = 0, crci = 0;
|
||||||
|
+ void *desc;
|
||||||
|
+ u32 *cple;
|
||||||
|
+ int blk_size = 0;
|
||||||
|
+
|
||||||
|
+ if (!is_slave_direction(direction)) {
|
||||||
|
+ dev_err(adev->dev, "invalid dma direction\n");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * get burst value from slave configuration
|
||||||
|
+ */
|
||||||
|
+ burst = (direction == DMA_MEM_TO_DEV) ?
|
||||||
|
+ achan->slave.dst_maxburst :
|
||||||
|
+ achan->slave.src_maxburst;
|
||||||
|
+
|
||||||
|
+ /* if using flow control, validate burst and crci values */
|
||||||
|
+ if (achan->slave.device_fc) {
|
||||||
|
+
|
||||||
|
+ blk_size = adm_get_blksize(burst);
|
||||||
|
+ if (blk_size < 0) {
|
||||||
|
+ dev_err(adev->dev, "invalid burst value: %d\n",
|
||||||
|
+ burst);
|
||||||
|
+ return ERR_PTR(-EINVAL);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ crci = achan->slave.slave_id & 0xf;
|
||||||
|
+ if (!crci || achan->slave.slave_id > 0x1f) {
|
||||||
|
+ dev_err(adev->dev, "invalid crci value\n");
|
||||||
|
+ return ERR_PTR(-EINVAL);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* iterate through sgs and compute allocation size of structures */
|
||||||
|
+ for_each_sg(sgl, sg, sg_len, i) {
|
||||||
|
+ if (achan->slave.device_fc) {
|
||||||
|
+ box_count += DIV_ROUND_UP(sg_dma_len(sg) / burst,
|
||||||
|
+ ADM_MAX_ROWS);
|
||||||
|
+ if (sg_dma_len(sg) % burst)
|
||||||
|
+ single_count++;
|
||||||
|
+ } else {
|
||||||
|
+ single_count += DIV_ROUND_UP(sg_dma_len(sg),
|
||||||
|
+ ADM_MAX_XFER);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ async_desc = kzalloc(sizeof(*async_desc), GFP_NOWAIT);
|
||||||
|
+ if (!async_desc)
|
||||||
|
+ return ERR_PTR(-ENOMEM);
|
||||||
|
+
|
||||||
|
+ if (crci)
|
||||||
|
+ async_desc->mux = achan->slave.slave_id & ADM_CRCI_MUX_SEL ?
|
||||||
|
+ ADM_CRCI_CTL_MUX_SEL : 0;
|
||||||
|
+ async_desc->crci = crci;
|
||||||
|
+ async_desc->blk_size = blk_size;
|
||||||
|
+ async_desc->dma_len = single_count * sizeof(struct adm_desc_hw_single) +
|
||||||
|
+ box_count * sizeof(struct adm_desc_hw_box) +
|
||||||
|
+ sizeof(*cple) + 2 * ADM_DESC_ALIGN;
|
||||||
|
+
|
||||||
|
+ async_desc->cpl = dma_alloc_writecombine(adev->dev, async_desc->dma_len,
|
||||||
|
+ &async_desc->dma_addr, GFP_NOWAIT);
|
||||||
|
+
|
||||||
|
+ if (!async_desc->cpl) {
|
||||||
|
+ kfree(async_desc);
|
||||||
|
+ return ERR_PTR(-ENOMEM);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ async_desc->adev = adev;
|
||||||
|
+
|
||||||
|
+ /* both command list entry and descriptors must be 8 byte aligned */
|
||||||
|
+ cple = PTR_ALIGN(async_desc->cpl, ADM_DESC_ALIGN);
|
||||||
|
+ desc = PTR_ALIGN(cple + 1, ADM_DESC_ALIGN);
|
||||||
|
+
|
||||||
|
+ /* init cmd list */
|
||||||
|
+ *cple = ADM_CPLE_LP;
|
||||||
|
+ *cple |= (desc - async_desc->cpl + async_desc->dma_addr) >> 3;
|
||||||
|
+
|
||||||
|
+ for_each_sg(sgl, sg, sg_len, i) {
|
||||||
|
+ async_desc->length += sg_dma_len(sg);
|
||||||
|
+
|
||||||
|
+ if (achan->slave.device_fc)
|
||||||
|
+ desc = adm_process_fc_descriptors(achan, desc, sg, crci,
|
||||||
|
+ burst, direction);
|
||||||
|
+ else
|
||||||
|
+ desc = adm_process_non_fc_descriptors(achan, desc, sg,
|
||||||
|
+ direction);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return vchan_tx_prep(&achan->vc, &async_desc->vd, flags);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_terminate_all - terminate all transactions on a channel
|
||||||
|
+ * @achan: adm dma channel
|
||||||
|
+ *
|
||||||
|
+ * Dequeues and frees all transactions, aborts current transaction
|
||||||
|
+ * No callbacks are done
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static int adm_terminate_all(struct dma_chan *chan)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ struct adm_device *adev = achan->adev;
|
||||||
|
+ unsigned long flags;
|
||||||
|
+ LIST_HEAD(head);
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+ vchan_get_all_descriptors(&achan->vc, &head);
|
||||||
|
+
|
||||||
|
+ /* send flush command to terminate current transaction */
|
||||||
|
+ writel_relaxed(0x0,
|
||||||
|
+ adev->regs + ADM_CH_FLUSH_STATE0(achan->id, adev->ee));
|
||||||
|
+
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ vchan_dma_desc_free_list(&achan->vc, &head);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int adm_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ unsigned long flag;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flag);
|
||||||
|
+ memcpy(&achan->slave, cfg, sizeof(struct dma_slave_config));
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flag);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_start_dma - start next transaction
|
||||||
|
+ * @achan - ADM dma channel
|
||||||
|
+ */
|
||||||
|
+static void adm_start_dma(struct adm_chan *achan)
|
||||||
|
+{
|
||||||
|
+ struct virt_dma_desc *vd = vchan_next_desc(&achan->vc);
|
||||||
|
+ struct adm_device *adev = achan->adev;
|
||||||
|
+ struct adm_async_desc *async_desc;
|
||||||
|
+
|
||||||
|
+ lockdep_assert_held(&achan->vc.lock);
|
||||||
|
+
|
||||||
|
+ if (!vd)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ list_del(&vd->node);
|
||||||
|
+
|
||||||
|
+ /* write next command list out to the CMD FIFO */
|
||||||
|
+ async_desc = container_of(vd, struct adm_async_desc, vd);
|
||||||
|
+ achan->curr_txd = async_desc;
|
||||||
|
+
|
||||||
|
+ /* reset channel error */
|
||||||
|
+ achan->error = 0;
|
||||||
|
+
|
||||||
|
+ if (!achan->initialized) {
|
||||||
|
+ /* enable interrupts */
|
||||||
|
+ writel(ADM_CH_CONF_SHADOW_EN |
|
||||||
|
+ ADM_CH_CONF_PERM_MPU_CONF |
|
||||||
|
+ ADM_CH_CONF_MPU_DISABLE |
|
||||||
|
+ ADM_CH_CONF_SEC_DOMAIN(adev->ee),
|
||||||
|
+ adev->regs + ADM_CH_CONF(achan->id));
|
||||||
|
+
|
||||||
|
+ writel(ADM_CH_RSLT_CONF_IRQ_EN | ADM_CH_RSLT_CONF_FLUSH_EN,
|
||||||
|
+ adev->regs + ADM_CH_RSLT_CONF(achan->id, adev->ee));
|
||||||
|
+
|
||||||
|
+ achan->initialized = 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* set the crci block size if this transaction requires CRCI */
|
||||||
|
+ if (async_desc->crci) {
|
||||||
|
+ writel(async_desc->mux | async_desc->blk_size,
|
||||||
|
+ adev->regs + ADM_CRCI_CTL(async_desc->crci, adev->ee));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* make sure IRQ enable doesn't get reordered */
|
||||||
|
+ wmb();
|
||||||
|
+
|
||||||
|
+ /* write next command list out to the CMD FIFO */
|
||||||
|
+ writel(ALIGN(async_desc->dma_addr, ADM_DESC_ALIGN) >> 3,
|
||||||
|
+ adev->regs + ADM_CH_CMD_PTR(achan->id, adev->ee));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_dma_irq - irq handler for ADM controller
|
||||||
|
+ * @irq: IRQ of interrupt
|
||||||
|
+ * @data: callback data
|
||||||
|
+ *
|
||||||
|
+ * IRQ handler for the bam controller
|
||||||
|
+ */
|
||||||
|
+static irqreturn_t adm_dma_irq(int irq, void *data)
|
||||||
|
+{
|
||||||
|
+ struct adm_device *adev = data;
|
||||||
|
+ u32 srcs, i;
|
||||||
|
+ struct adm_async_desc *async_desc;
|
||||||
|
+ unsigned long flags;
|
||||||
|
+
|
||||||
|
+ srcs = readl_relaxed(adev->regs +
|
||||||
|
+ ADM_SEC_DOMAIN_IRQ_STATUS(adev->ee));
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < ADM_MAX_CHANNELS; i++) {
|
||||||
|
+ struct adm_chan *achan = &adev->channels[i];
|
||||||
|
+ u32 status, result;
|
||||||
|
+
|
||||||
|
+ if (srcs & BIT(i)) {
|
||||||
|
+ status = readl_relaxed(adev->regs +
|
||||||
|
+ ADM_CH_STATUS_SD(i, adev->ee));
|
||||||
|
+
|
||||||
|
+ /* if no result present, skip */
|
||||||
|
+ if (!(status & ADM_CH_STATUS_VALID))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ result = readl_relaxed(adev->regs +
|
||||||
|
+ ADM_CH_RSLT(i, adev->ee));
|
||||||
|
+
|
||||||
|
+ /* no valid results, skip */
|
||||||
|
+ if (!(result & ADM_CH_RSLT_VALID))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ /* flag error if transaction was flushed or failed */
|
||||||
|
+ if (result & (ADM_CH_RSLT_ERR | ADM_CH_RSLT_FLUSH))
|
||||||
|
+ achan->error = 1;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+ async_desc = achan->curr_txd;
|
||||||
|
+
|
||||||
|
+ achan->curr_txd = NULL;
|
||||||
|
+
|
||||||
|
+ if (async_desc) {
|
||||||
|
+ vchan_cookie_complete(&async_desc->vd);
|
||||||
|
+
|
||||||
|
+ /* kick off next DMA */
|
||||||
|
+ adm_start_dma(achan);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return IRQ_HANDLED;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_tx_status - returns status of transaction
|
||||||
|
+ * @chan: dma channel
|
||||||
|
+ * @cookie: transaction cookie
|
||||||
|
+ * @txstate: DMA transaction state
|
||||||
|
+ *
|
||||||
|
+ * Return status of dma transaction
|
||||||
|
+ */
|
||||||
|
+static enum dma_status adm_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
|
||||||
|
+ struct dma_tx_state *txstate)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ struct virt_dma_desc *vd;
|
||||||
|
+ enum dma_status ret;
|
||||||
|
+ unsigned long flags;
|
||||||
|
+ size_t residue = 0;
|
||||||
|
+
|
||||||
|
+ ret = dma_cookie_status(chan, cookie, txstate);
|
||||||
|
+ if (ret == DMA_COMPLETE || !txstate)
|
||||||
|
+ return ret;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ vd = vchan_find_desc(&achan->vc, cookie);
|
||||||
|
+ if (vd)
|
||||||
|
+ residue = container_of(vd, struct adm_async_desc, vd)->length;
|
||||||
|
+
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * residue is either the full length if it is in the issued list, or 0
|
||||||
|
+ * if it is in progress. We have no reliable way of determining
|
||||||
|
+ * anything inbetween
|
||||||
|
+ */
|
||||||
|
+ dma_set_residue(txstate, residue);
|
||||||
|
+
|
||||||
|
+ if (achan->error)
|
||||||
|
+ return DMA_ERROR;
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_issue_pending - starts pending transactions
|
||||||
|
+ * @chan: dma channel
|
||||||
|
+ *
|
||||||
|
+ * Issues all pending transactions and starts DMA
|
||||||
|
+ */
|
||||||
|
+static void adm_issue_pending(struct dma_chan *chan)
|
||||||
|
+{
|
||||||
|
+ struct adm_chan *achan = to_adm_chan(chan);
|
||||||
|
+ unsigned long flags;
|
||||||
|
+
|
||||||
|
+ spin_lock_irqsave(&achan->vc.lock, flags);
|
||||||
|
+
|
||||||
|
+ if (vchan_issue_pending(&achan->vc) && !achan->curr_txd)
|
||||||
|
+ adm_start_dma(achan);
|
||||||
|
+ spin_unlock_irqrestore(&achan->vc.lock, flags);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * adm_dma_free_desc - free descriptor memory
|
||||||
|
+ * @vd: virtual descriptor
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+static void adm_dma_free_desc(struct virt_dma_desc *vd)
|
||||||
|
+{
|
||||||
|
+ struct adm_async_desc *async_desc = container_of(vd,
|
||||||
|
+ struct adm_async_desc, vd);
|
||||||
|
+
|
||||||
|
+ dma_free_writecombine(async_desc->adev->dev, async_desc->dma_len,
|
||||||
|
+ async_desc->cpl, async_desc->dma_addr);
|
||||||
|
+ kfree(async_desc);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void adm_channel_init(struct adm_device *adev, struct adm_chan *achan,
|
||||||
|
+ u32 index)
|
||||||
|
+{
|
||||||
|
+ achan->id = index;
|
||||||
|
+ achan->adev = adev;
|
||||||
|
+
|
||||||
|
+ vchan_init(&achan->vc, &adev->common);
|
||||||
|
+ achan->vc.desc_free = adm_dma_free_desc;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int adm_dma_probe(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct adm_device *adev;
|
||||||
|
+ struct resource *iores;
|
||||||
|
+ int ret;
|
||||||
|
+ u32 i;
|
||||||
|
+
|
||||||
|
+ adev = devm_kzalloc(&pdev->dev, sizeof(*adev), GFP_KERNEL);
|
||||||
|
+ if (!adev)
|
||||||
|
+ return -ENOMEM;
|
||||||
|
+
|
||||||
|
+ adev->dev = &pdev->dev;
|
||||||
|
+
|
||||||
|
+ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
|
+ adev->regs = devm_ioremap_resource(&pdev->dev, iores);
|
||||||
|
+ if (IS_ERR(adev->regs))
|
||||||
|
+ return PTR_ERR(adev->regs);
|
||||||
|
+
|
||||||
|
+ adev->irq = platform_get_irq(pdev, 0);
|
||||||
|
+ if (adev->irq < 0)
|
||||||
|
+ return adev->irq;
|
||||||
|
+
|
||||||
|
+ ret = of_property_read_u32(pdev->dev.of_node, "qcom,ee", &adev->ee);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "Execution environment unspecified\n");
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->core_clk = devm_clk_get(adev->dev, "core");
|
||||||
|
+ if (IS_ERR(adev->core_clk))
|
||||||
|
+ return PTR_ERR(adev->core_clk);
|
||||||
|
+
|
||||||
|
+ ret = clk_prepare_enable(adev->core_clk);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "failed to prepare/enable core clock\n");
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->iface_clk = devm_clk_get(adev->dev, "iface");
|
||||||
|
+ if (IS_ERR(adev->iface_clk)) {
|
||||||
|
+ ret = PTR_ERR(adev->iface_clk);
|
||||||
|
+ goto err_disable_core_clk;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = clk_prepare_enable(adev->iface_clk);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "failed to prepare/enable iface clock\n");
|
||||||
|
+ goto err_disable_core_clk;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->clk_reset = devm_reset_control_get(&pdev->dev, "clk");
|
||||||
|
+ if (IS_ERR(adev->clk_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->clk_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->c0_reset = devm_reset_control_get(&pdev->dev, "c0");
|
||||||
|
+ if (IS_ERR(adev->c0_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 C0 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->c0_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->c1_reset = devm_reset_control_get(&pdev->dev, "c1");
|
||||||
|
+ if (IS_ERR(adev->c1_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 C1 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->c1_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ adev->c2_reset = devm_reset_control_get(&pdev->dev, "c2");
|
||||||
|
+ if (IS_ERR(adev->c2_reset)) {
|
||||||
|
+ dev_err(adev->dev, "failed to get ADM0 C2 reset\n");
|
||||||
|
+ ret = PTR_ERR(adev->c2_reset);
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ reset_control_assert(adev->clk_reset);
|
||||||
|
+ reset_control_assert(adev->c0_reset);
|
||||||
|
+ reset_control_assert(adev->c1_reset);
|
||||||
|
+ reset_control_assert(adev->c2_reset);
|
||||||
|
+
|
||||||
|
+ reset_control_deassert(adev->clk_reset);
|
||||||
|
+ reset_control_deassert(adev->c0_reset);
|
||||||
|
+ reset_control_deassert(adev->c1_reset);
|
||||||
|
+ reset_control_deassert(adev->c2_reset);
|
||||||
|
+
|
||||||
|
+ adev->channels = devm_kcalloc(adev->dev, ADM_MAX_CHANNELS,
|
||||||
|
+ sizeof(*adev->channels), GFP_KERNEL);
|
||||||
|
+
|
||||||
|
+ if (!adev->channels) {
|
||||||
|
+ ret = -ENOMEM;
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* allocate and initialize channels */
|
||||||
|
+ INIT_LIST_HEAD(&adev->common.channels);
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < ADM_MAX_CHANNELS; i++)
|
||||||
|
+ adm_channel_init(adev, &adev->channels[i], i);
|
||||||
|
+
|
||||||
|
+ /* reset CRCIs */
|
||||||
|
+ for (i = 0; i < 16; i++)
|
||||||
|
+ writel(ADM_CRCI_CTL_RST, adev->regs +
|
||||||
|
+ ADM_CRCI_CTL(i, adev->ee));
|
||||||
|
+
|
||||||
|
+ /* configure client interfaces */
|
||||||
|
+ writel(ADM_CI_RANGE_START(0x40) | ADM_CI_RANGE_END(0xb0) |
|
||||||
|
+ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(0));
|
||||||
|
+ writel(ADM_CI_RANGE_START(0x2a) | ADM_CI_RANGE_END(0x2c) |
|
||||||
|
+ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(1));
|
||||||
|
+ writel(ADM_CI_RANGE_START(0x12) | ADM_CI_RANGE_END(0x28) |
|
||||||
|
+ ADM_CI_BURST_8_WORDS, adev->regs + ADM_CI_CONF(2));
|
||||||
|
+ writel(ADM_GP_CTL_LP_EN | ADM_GP_CTL_LP_CNT(0xf),
|
||||||
|
+ adev->regs + ADM_GP_CTL);
|
||||||
|
+
|
||||||
|
+ ret = devm_request_irq(adev->dev, adev->irq, adm_dma_irq,
|
||||||
|
+ 0, "adm_dma", adev);
|
||||||
|
+ if (ret)
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+
|
||||||
|
+ platform_set_drvdata(pdev, adev);
|
||||||
|
+
|
||||||
|
+ adev->common.dev = adev->dev;
|
||||||
|
+ adev->common.dev->dma_parms = &adev->dma_parms;
|
||||||
|
+
|
||||||
|
+ /* set capabilities */
|
||||||
|
+ dma_cap_zero(adev->common.cap_mask);
|
||||||
|
+ dma_cap_set(DMA_SLAVE, adev->common.cap_mask);
|
||||||
|
+ dma_cap_set(DMA_PRIVATE, adev->common.cap_mask);
|
||||||
|
+
|
||||||
|
+ /* initialize dmaengine apis */
|
||||||
|
+ adev->common.directions = BIT(DMA_DEV_TO_MEM | DMA_MEM_TO_DEV);
|
||||||
|
+ adev->common.residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
|
||||||
|
+ adev->common.src_addr_widths = DMA_SLAVE_BUSWIDTH_4_BYTES;
|
||||||
|
+ adev->common.dst_addr_widths = DMA_SLAVE_BUSWIDTH_4_BYTES;
|
||||||
|
+ adev->common.device_free_chan_resources = adm_free_chan;
|
||||||
|
+ adev->common.device_prep_slave_sg = adm_prep_slave_sg;
|
||||||
|
+ adev->common.device_issue_pending = adm_issue_pending;
|
||||||
|
+ adev->common.device_tx_status = adm_tx_status;
|
||||||
|
+ adev->common.device_terminate_all = adm_terminate_all;
|
||||||
|
+ adev->common.device_config = adm_slave_config;
|
||||||
|
+
|
||||||
|
+ ret = dma_async_device_register(&adev->common);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(adev->dev, "failed to register dma async device\n");
|
||||||
|
+ goto err_disable_clks;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = of_dma_controller_register(pdev->dev.of_node,
|
||||||
|
+ of_dma_xlate_by_chan_id,
|
||||||
|
+ &adev->common);
|
||||||
|
+ if (ret)
|
||||||
|
+ goto err_unregister_dma;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+err_unregister_dma:
|
||||||
|
+ dma_async_device_unregister(&adev->common);
|
||||||
|
+err_disable_clks:
|
||||||
|
+ clk_disable_unprepare(adev->iface_clk);
|
||||||
|
+err_disable_core_clk:
|
||||||
|
+ clk_disable_unprepare(adev->core_clk);
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int adm_dma_remove(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct adm_device *adev = platform_get_drvdata(pdev);
|
||||||
|
+ struct adm_chan *achan;
|
||||||
|
+ u32 i;
|
||||||
|
+
|
||||||
|
+ of_dma_controller_free(pdev->dev.of_node);
|
||||||
|
+ dma_async_device_unregister(&adev->common);
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < ADM_MAX_CHANNELS; i++) {
|
||||||
|
+ achan = &adev->channels[i];
|
||||||
|
+
|
||||||
|
+ /* mask IRQs for this channel/EE pair */
|
||||||
|
+ writel(0, adev->regs + ADM_CH_RSLT_CONF(achan->id, adev->ee));
|
||||||
|
+
|
||||||
|
+ adm_terminate_all(&adev->channels[i].vc.chan);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ devm_free_irq(adev->dev, adev->irq, adev);
|
||||||
|
+
|
||||||
|
+ clk_disable_unprepare(adev->core_clk);
|
||||||
|
+ clk_disable_unprepare(adev->iface_clk);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static const struct of_device_id adm_of_match[] = {
|
||||||
|
+ { .compatible = "qcom,adm", },
|
||||||
|
+ {}
|
||||||
|
+};
|
||||||
|
+MODULE_DEVICE_TABLE(of, adm_of_match);
|
||||||
|
+
|
||||||
|
+static struct platform_driver adm_dma_driver = {
|
||||||
|
+ .probe = adm_dma_probe,
|
||||||
|
+ .remove = adm_dma_remove,
|
||||||
|
+ .driver = {
|
||||||
|
+ .name = "adm-dma-engine",
|
||||||
|
+ .of_match_table = adm_of_match,
|
||||||
|
+ },
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+module_platform_driver(adm_dma_driver);
|
||||||
|
+
|
||||||
|
+MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
|
||||||
|
+MODULE_DESCRIPTION("QCOM ADM DMA engine driver");
|
||||||
|
+MODULE_LICENSE("GPL v2");
|
||||||
|
--- a/drivers/dma/Makefile
|
||||||
|
+++ b/drivers/dma/Makefile
|
||||||
|
@@ -54,3 +54,4 @@ obj-$(CONFIG_NBPFAXI_DMA) += nbpfaxi.o
|
||||||
|
obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
|
||||||
|
obj-$(CONFIG_IMG_MDC_DMA) += img-mdc-dma.o
|
||||||
|
obj-$(CONFIG_XGENE_DMA) += xgene-dma.o
|
||||||
|
+obj-$(CONFIG_QCOM_ADM) += qcom_adm.o
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
From 1fb18acab2d71e7e4efd9c10492edb1baf84dcc0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andy Gross <agross@codeaurora.org>
|
||||||
|
Date: Wed, 20 May 2015 15:41:07 +0530
|
||||||
|
Subject: [PATCH] ARM: DT: ipq8064: Add ADM device node
|
||||||
|
|
||||||
|
This patch adds support for the ADM DMA on the IPQ8064 SOC
|
||||||
|
|
||||||
|
Signed-off-by: Andy Gross <agross@codeaurora.org>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 4 ++++
|
||||||
|
arch/arm/boot/dts/qcom-ipq8064.dtsi | 21 +++++++++++++++++++++
|
||||||
|
2 files changed, 25 insertions(+)
|
||||||
|
|
||||||
|
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||||
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
||||||
|
@@ -90,6 +90,10 @@
|
||||||
|
|
||||||
|
cs-gpios = <&qcom_pinmux 20 0>;
|
||||||
|
|
||||||
|
+ dmas = <&adm_dma 6>,
|
||||||
|
+ <&adm_dma 5>;
|
||||||
|
+ dma-names = "rx", "tx";
|
||||||
|
+
|
||||||
|
flash: m25p80@0 {
|
||||||
|
compatible = "s25fl256s1";
|
||||||
|
#address-cells = <1>;
|
||||||
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
|
@@ -595,5 +595,25 @@
|
||||||
|
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ adm_dma: dma@18300000 {
|
||||||
|
+ compatible = "qcom,adm";
|
||||||
|
+ reg = <0x18300000 0x100000>;
|
||||||
|
+ interrupts = <0 170 0>;
|
||||||
|
+ #dma-cells = <1>;
|
||||||
|
+
|
||||||
|
+ clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
|
||||||
|
+ clock-names = "core", "iface";
|
||||||
|
+
|
||||||
|
+ resets = <&gcc ADM0_RESET>,
|
||||||
|
+ <&gcc ADM0_PBUS_RESET>,
|
||||||
|
+ <&gcc ADM0_C0_RESET>,
|
||||||
|
+ <&gcc ADM0_C1_RESET>,
|
||||||
|
+ <&gcc ADM0_C2_RESET>;
|
||||||
|
+ reset-names = "clk", "pbus", "c0", "c1", "c2";
|
||||||
|
+ qcom,ee = <0>;
|
||||||
|
+
|
||||||
|
+ status = "disabled";
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
@ -38,7 +38,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
|
|
||||||
gsbi@16300000 {
|
gsbi@16300000 {
|
||||||
@@ -146,5 +156,33 @@
|
@@ -150,5 +160,33 @@
|
||||||
pinctrl-0 = <&pcie1_pins>;
|
pinctrl-0 = <&pcie1_pins>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
|
|
||||||
gsbi@16300000 {
|
gsbi@16300000 {
|
||||||
@@ -184,5 +194,26 @@
|
@@ -188,5 +198,26 @@
|
||||||
reg = <4>;
|
reg = <4>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -116,7 +116,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
@@ -595,5 +595,91 @@
|
@@ -615,5 +615,91 @@
|
||||||
|
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue