main changes for v3:
* proper __iomem annotation
* correct return values in case of error
main changes for v2:
* dev_* instead of pr_*
* ioread32/iowrite32 instead of inl/outl
* use module_platform_driver macro
* disabling interrupt twice was unnecessary
New patch has been tested on our own architecture (ARC) and
builds cleanly on x86-64.
Mischa Jonker (1):
Input: serio - Add ARC PS/2 driver
drivers/input/serio/Kconfig | 9 ++
drivers/input/serio/Makefile | 1 +
drivers/input/serio/arc_ps2.c | 275 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 285 insertions(+), 0 deletions(-)
create mode 100644 drivers/input/serio/arc_ps2.c
This adds support for the PS/2 block that is used in various ARC FPGA
platforms.
Signed-off-by: Mischa Jonker <[email protected]>
---
drivers/input/serio/Kconfig | 9 ++
drivers/input/serio/Makefile | 1 +
drivers/input/serio/arc_ps2.c | 276 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 286 insertions(+), 0 deletions(-)
create mode 100644 drivers/input/serio/arc_ps2.c
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 55f2c22..4a4e182 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -234,4 +234,13 @@ config SERIO_PS2MULT
To compile this driver as a module, choose M here: the
module will be called ps2mult.
+config SERIO_ARC_PS2
+ tristate "ARC PS/2 support"
+ help
+ Say Y here if you have an ARC FPGA platform with a PS/2
+ controller in it.
+
+ To compile this driver as a module, choose M here; the module
+ will be called arc_ps2.
+
endif
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile
index dbbe376..4b0c8f8 100644
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
@@ -25,3 +25,4 @@ obj-$(CONFIG_SERIO_RAW) += serio_raw.o
obj-$(CONFIG_SERIO_AMS_DELTA) += ams_delta_serio.o
obj-$(CONFIG_SERIO_XILINX_XPS_PS2) += xilinx_ps2.o
obj-$(CONFIG_SERIO_ALTERA_PS2) += altera_ps2.o
+obj-$(CONFIG_SERIO_ARC_PS2) += arc_ps2.o
diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c
new file mode 100644
index 0000000..1263151
--- /dev/null
+++ b/drivers/input/serio/arc_ps2.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (http://www.synopsys.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Driver is originally developed by Pavel Sokolov <[email protected]>
+ */
+
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/serio.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#define ARC_PS2_PORTS (2)
+
+#define ARC_ARC_PS2_ID (0x0001f609)
+
+#define STAT_TIMEOUT (128)
+
+#define PS2_STAT_RX_FRM_ERR (1)
+#define PS2_STAT_RX_BUF_OVER (1 << 1)
+#define PS2_STAT_RX_INT_EN (1 << 2)
+#define PS2_STAT_RX_VAL (1 << 3)
+#define PS2_STAT_TX_ISNOT_FUL (1 << 4)
+#define PS2_STAT_TX_INT_EN (1 << 5)
+
+struct arc_ps2_port {
+ void __iomem *data_addr, *status_addr;
+ struct serio *io;
+};
+
+struct arc_ps2_data {
+ struct arc_ps2_port port[ARC_PS2_PORTS];
+ struct resource *iomem_res;
+ int irq;
+ void __iomem *addr;
+ unsigned int frame_error;
+ unsigned int buf_overflow;
+ unsigned int total_int;
+};
+
+static void arc_ps2_check_rx(struct arc_ps2_data *arc_ps2,
+ struct arc_ps2_port *port)
+{
+ unsigned flag, status;
+ unsigned char data;
+
+ while (1) {
+ status = ioread32(port->status_addr);
+ if (!(status & PS2_STAT_RX_VAL))
+ break;
+ flag = 0;
+
+ arc_ps2->total_int++;
+ if (status & PS2_STAT_RX_FRM_ERR) {
+ arc_ps2->frame_error++;
+ flag |= SERIO_PARITY;
+ } else if (status & PS2_STAT_RX_BUF_OVER) {
+ arc_ps2->buf_overflow++;
+ flag |= SERIO_FRAME;
+ }
+ data = ioread32(port->data_addr) & 0xff;
+
+ serio_interrupt(port->io, data, flag);
+ }
+}
+
+static irqreturn_t arc_ps2_interrupt(int irq, void *dev)
+{
+ struct arc_ps2_data *arc_ps2 = dev;
+ int i;
+
+ for (i = 0; i < ARC_PS2_PORTS; i++)
+ arc_ps2_check_rx(arc_ps2, &arc_ps2->port[i]);
+
+ return IRQ_HANDLED;
+}
+
+static int arc_ps2_write(struct serio *io, unsigned char val)
+{
+ unsigned status;
+ struct arc_ps2_port *port = io->port_data;
+ int timeout = STAT_TIMEOUT;
+
+ do {
+ status = ioread32(port->status_addr);
+ cpu_relax();
+ timeout--;
+ } while (!(status & PS2_STAT_TX_ISNOT_FUL) && timeout);
+
+ if (timeout) {
+ iowrite32(val & 0xff, port->data_addr);
+ } else {
+ dev_err(&io->dev, "write timeout\n");
+ return -ETIMEDOUT;
+ }
+
+ return 0;
+}
+
+static int arc_ps2_open(struct serio *io)
+{
+ struct arc_ps2_port *port = io->port_data;
+ iowrite32(PS2_STAT_RX_INT_EN, port->status_addr);
+ return 0;
+}
+
+static void arc_ps2_close(struct serio *io)
+{
+ struct arc_ps2_port *port = io->port_data;
+
+ iowrite32(ioread32(port->status_addr) & ~PS2_STAT_RX_INT_EN,
+ port->status_addr);
+}
+
+static int __devinit arc_ps2_allocate_port(struct platform_device *pdev,
+ struct arc_ps2_port *port,
+ int index, void *base)
+{
+ struct serio *io;
+
+ io = kzalloc(sizeof(struct serio), GFP_KERNEL);
+ if (!io)
+ return -ENOMEM;
+
+ io->id.type = SERIO_8042;
+ io->write = arc_ps2_write;
+ io->open = arc_ps2_open;
+ io->close = arc_ps2_close;
+ snprintf(io->name, sizeof(io->name), "ARC PS/2 port%d", index);
+ snprintf(io->phys, sizeof(io->phys), "arc/serio%d", index);
+ io->port_data = port;
+
+ port->io = io;
+
+ port->data_addr = base + 4 + index * 4;
+ port->status_addr = base + 4 + ARC_PS2_PORTS * 4 + index * 4;
+
+ dev_dbg(&pdev->dev, "port%d is allocated (data = 0x%p, status = 0x%p)\n",
+ index, port->data_addr, port->status_addr);
+
+ return 0;
+}
+
+static int __devinit arc_ps2_probe(struct platform_device *pdev)
+{
+ struct arc_ps2_data *arc_ps2;
+ int error, id, i;
+
+ arc_ps2 = kzalloc(sizeof(struct arc_ps2_data), GFP_KERNEL);
+ if (!arc_ps2) {
+ dev_err(&pdev->dev, "out of memory\n");
+ error = -ENOMEM;
+ goto out;
+ }
+
+ arc_ps2->iomem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!arc_ps2->iomem_res) {
+ dev_err(&pdev->dev, "no IO memory defined\n");
+ error = -EINVAL;
+ goto out_free;
+ }
+
+ arc_ps2->irq = platform_get_irq_byname(pdev, "arc_ps2_irq");
+ if (arc_ps2->irq < 0) {
+ dev_err(&pdev->dev, "no IRQ defined\n");
+ error = -EINVAL;
+ goto out_free;
+ }
+
+ if (!request_mem_region(arc_ps2->iomem_res->start,
+ resource_size(arc_ps2->iomem_res), pdev->name)) {
+ dev_err(&pdev->dev, "memory region allocation failed for %pR\n",
+ arc_ps2->iomem_res);
+
+ error = -EBUSY;
+ goto out_free;
+ }
+
+ arc_ps2->addr = ioremap_nocache(arc_ps2->iomem_res->start,
+ resource_size(arc_ps2->iomem_res));
+ if (!arc_ps2->addr) {
+ dev_err(&pdev->dev, "memory mapping failed\n");
+ error = -ENOMEM;
+ goto out_release_region;
+ }
+
+ dev_info(&pdev->dev, "irq = %d, address = 0x%p, ports = %i\n",
+ arc_ps2->irq, arc_ps2->addr, ARC_PS2_PORTS);
+
+ id = ioread32(arc_ps2->addr);
+ if (id != ARC_ARC_PS2_ID) {
+ dev_err(&pdev->dev, "device id does not match\n");
+ error = -ENXIO;
+ goto out_unmap;
+ }
+
+ platform_set_drvdata(pdev, arc_ps2);
+
+ for (i = 0; i < ARC_PS2_PORTS; i++) {
+ error = arc_ps2_allocate_port(pdev, &arc_ps2->port[i], i,
+ arc_ps2->addr);
+ if (error)
+ goto release;
+ serio_register_port(arc_ps2->port[i].io);
+ }
+
+ error = request_irq(arc_ps2->irq, arc_ps2_interrupt, 0,
+ "arc_ps2", arc_ps2);
+ if (error) {
+ dev_err(&pdev->dev, "Could not allocate IRQ\n");
+ goto release;
+ }
+
+ return 0;
+
+release:
+ for (i = 0; i < ARC_PS2_PORTS; i++) {
+ if (arc_ps2->port[i].io)
+ serio_unregister_port(arc_ps2->port[i].io);
+ }
+out_unmap:
+ iounmap(arc_ps2->addr);
+out_release_region:
+ release_mem_region(arc_ps2->iomem_res->start,
+ resource_size(arc_ps2->iomem_res));
+out_free:
+ kfree(arc_ps2);
+out:
+ return error;
+}
+
+static int __devexit arc_ps2_remove(struct platform_device *pdev)
+{
+ struct arc_ps2_data *arc_ps2;
+ int i;
+
+ arc_ps2 = platform_get_drvdata(pdev);
+ for (i = 0; i < ARC_PS2_PORTS; i++)
+ serio_unregister_port(arc_ps2->port[i].io);
+
+ free_irq(arc_ps2->irq, arc_ps2);
+ iounmap(arc_ps2->addr);
+ release_mem_region(arc_ps2->iomem_res->start,
+ resource_size(arc_ps2->iomem_res));
+
+ dev_dbg(&pdev->dev, "interrupt count = %i\n", arc_ps2->total_int);
+ dev_dbg(&pdev->dev, "frame error count = %i\n", arc_ps2->frame_error);
+ dev_dbg(&pdev->dev, "buffer overflow count = %i\n",
+ arc_ps2->buf_overflow);
+
+ kfree(arc_ps2);
+
+ return 0;
+}
+
+static struct platform_driver arc_ps2_driver = {
+ .driver = {
+ .name = "arc_ps2",
+ .owner = THIS_MODULE,
+ },
+ .probe = arc_ps2_probe,
+ .remove = __devexit_p(arc_ps2_remove),
+};
+
+module_platform_driver(arc_ps2_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Pavel Sokolov <[email protected]>");
+MODULE_DESCRIPTION("ARC PS/2 Driver");
--
1.7.0.4
On Thu, 2012-10-18 at 10:36 +0200, Mischa Jonker wrote:
> This adds support for the PS/2 block that is used in various ARC FPGA
> platforms.
[]
> diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c
[]
> +static void arc_ps2_check_rx(struct arc_ps2_data *arc_ps2,
> + struct arc_ps2_port *port)
> +{
> + unsigned flag, status;
> + unsigned char data;
> +
> + while (1) {
infinite loop with bad hardware?
Perhaps a jiffies timeout?
Hi Joe,
>> + while (1) {
>infinite loop with bad hardware?
>Perhaps a jiffies timeout?
What do you suggest? Add a counter and limit the maximum number of iterations to an arbitrary number (say 1000)?
Mischa
On Thu, 2012-10-18 at 09:05 +0000, Mischa Jonker wrote:
> Hi Joe,
>
> >> + while (1) {
> >infinite loop with bad hardware?
> >Perhaps a jiffies timeout?
>
> What do you suggest? Add a counter and limit the maximum number of iterations to an arbitrary number (say 1000)?
Yes, something like that.
Or something like:
unsigned long timeout = jiffies + somevalue;
while (time_before(jiffies, timeout) {
etc...
}
cheers, Joe