From: Eddie James <eajames@linux.ibm.com>
To: linux-aspeed@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
mark.rutland@arm.com, jason@lakedaemon.net, maz@kernel.org,
robh+dt@kernel.org, tglx@linutronix.de, joel@jms.id.au,
andrew@aj.id.au, eajames@linux.ibm.com
Subject: [PATCH v4 08/12] soc: aspeed: xdma: Add reset ioctl
Date: Thu, 2 Jan 2020 13:27:52 -0600 [thread overview]
Message-ID: <1577993276-2184-9-git-send-email-eajames@linux.ibm.com> (raw)
In-Reply-To: <1577993276-2184-1-git-send-email-eajames@linux.ibm.com>
Users of the XDMA engine need a way to reset it if something goes wrong.
Problems on the host side, or user error, such as incorrect host
address, may result in the DMA operation never completing and no way to
determine what went wrong. Therefore, add an ioctl to reset the engine
so that users can recover in this situation.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/soc/aspeed/aspeed-xdma.c | 36 ++++++++++++++++++++++++++++++++
include/uapi/linux/aspeed-xdma.h | 4 ++++
2 files changed, 40 insertions(+)
diff --git a/drivers/soc/aspeed/aspeed-xdma.c b/drivers/soc/aspeed/aspeed-xdma.c
index 5ad0efaf6e05..f11615ef8013 100644
--- a/drivers/soc/aspeed/aspeed-xdma.c
+++ b/drivers/soc/aspeed/aspeed-xdma.c
@@ -616,6 +616,41 @@ static __poll_t aspeed_xdma_poll(struct file *file,
return mask;
}
+static long aspeed_xdma_ioctl(struct file *file, unsigned int cmd,
+ unsigned long param)
+{
+ unsigned long flags;
+ struct aspeed_xdma_client *client = file->private_data;
+ struct aspeed_xdma *ctx = client->ctx;
+
+ switch (cmd) {
+ case ASPEED_XDMA_IOCTL_RESET:
+ spin_lock_irqsave(&ctx->reset_lock, flags);
+ if (ctx->in_reset) {
+ spin_unlock_irqrestore(&ctx->reset_lock, flags);
+ return 0;
+ }
+
+ ctx->in_reset = true;
+ spin_unlock_irqrestore(&ctx->reset_lock, flags);
+
+ if (ctx->current_client)
+ dev_warn(ctx->dev,
+ "User reset with transfer in progress.\n");
+
+ mutex_lock(&ctx->start_lock);
+
+ aspeed_xdma_reset(ctx);
+
+ mutex_unlock(&ctx->start_lock);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static void aspeed_xdma_vma_close(struct vm_area_struct *vma)
{
int rc;
@@ -709,6 +744,7 @@ static const struct file_operations aspeed_xdma_fops = {
.owner = THIS_MODULE,
.write = aspeed_xdma_write,
.poll = aspeed_xdma_poll,
+ .unlocked_ioctl = aspeed_xdma_ioctl,
.mmap = aspeed_xdma_mmap,
.open = aspeed_xdma_open,
.release = aspeed_xdma_release,
diff --git a/include/uapi/linux/aspeed-xdma.h b/include/uapi/linux/aspeed-xdma.h
index 2efaa6067c39..3a3646fd1e9e 100644
--- a/include/uapi/linux/aspeed-xdma.h
+++ b/include/uapi/linux/aspeed-xdma.h
@@ -4,8 +4,12 @@
#ifndef _UAPI_LINUX_ASPEED_XDMA_H_
#define _UAPI_LINUX_ASPEED_XDMA_H_
+#include <linux/ioctl.h>
#include <linux/types.h>
+#define __ASPEED_XDMA_IOCTL_MAGIC 0xb7
+#define ASPEED_XDMA_IOCTL_RESET _IO(__ASPEED_XDMA_IOCTL_MAGIC, 0)
+
/*
* aspeed_xdma_direction
*
--
2.24.0
next prev parent reply other threads:[~2020-01-02 19:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 19:27 [PATCH v4 00/12] aspeed: Add SCU interrupt controller and XDMA engine drivers Eddie James
2020-01-02 19:27 ` [PATCH v4 01/12] dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller Eddie James
2020-01-02 19:27 ` [PATCH v4 02/12] irqchip: " Eddie James
2020-01-02 19:27 ` [PATCH v4 03/12] ARM: dts: aspeed: ast2500: Add " Eddie James
2020-01-02 19:27 ` [PATCH v4 04/12] ARM: dts: aspeed: ast2600: Add SCU interrupt controllers Eddie James
2020-01-02 19:27 ` [PATCH v4 05/12] dt-bindings: soc: Add Aspeed XDMA Engine Eddie James
2020-01-09 4:45 ` Andrew Jeffery
2020-01-02 19:27 ` [PATCH v4 06/12] soc: aspeed: Add XDMA Engine Driver Eddie James
2020-01-09 5:08 ` Andrew Jeffery
2020-01-02 19:27 ` [PATCH v4 07/12] soc: aspeed: xdma: Add user interface Eddie James
2020-01-09 5:53 ` Andrew Jeffery
2020-01-02 19:27 ` Eddie James [this message]
2020-01-09 5:59 ` [PATCH v4 08/12] soc: aspeed: xdma: Add reset ioctl Andrew Jeffery
2020-01-02 19:27 ` [PATCH v4 09/12] ARM: dts: aspeed: ast2500: Add XDMA Engine Eddie James
2020-01-09 6:02 ` Andrew Jeffery
2020-01-02 19:27 ` [PATCH v4 10/12] ARM: dts: aspeed: ast2600: " Eddie James
2020-01-09 6:02 ` Andrew Jeffery
2020-01-02 19:27 ` [PATCH v4 11/12] ARM: dts: aspeed: witherspoon: Enable " Eddie James
2020-01-09 6:04 ` Andrew Jeffery
2020-01-02 19:27 ` [PATCH v4 12/12] ARM: dts: aspeed: tacoma: Enable XDMA engine Eddie James
2020-01-09 6:04 ` Andrew Jeffery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1577993276-2184-9-git-send-email-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=andrew@aj.id.au \
--cc=devicetree@vger.kernel.org \
--cc=jason@lakedaemon.net \
--cc=joel@jms.id.au \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).