memstick: add support for JMicron jmb38x MemoryStick host controller

Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

5 files changed, 960 insertions, 4 deletions

diff --git a/drivers/memstick/Kconfig b/drivers/memstick/Kconfig
index 1093fdb07297..f0ca41c20323 100644
--- a/drivers/memstick/Kconfig
+++ b/drivers/memstick/Kconfig
@@ -8,7 +8,7 @@ menuconfig MEMSTICK
           Sony MemoryStick is a proprietary storage/extension card protocol.
 
           If you want MemoryStick support, you should say Y here and also
-          to the specific driver for your MMC interface.
+          to the specific driver for your MemoryStick interface.
 
 if MEMSTICK
 
diff --git a/drivers/memstick/host/Kconfig b/drivers/memstick/host/Kconfig
index c002fcc3c879..4ce5c8dffb68 100644
--- a/drivers/memstick/host/Kconfig
+++ b/drivers/memstick/host/Kconfig
@@ -20,3 +20,13 @@ config MEMSTICK_TIFM_MS
           To compile this driver as a module, choose M here: the
           module will be called tifm_ms.
 
+config MEMSTICK_JMICRON_38X
+        tristate "JMicron JMB38X MemoryStick interface support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && PCI
+
+        help
+          Say Y here if you want to be able to access MemoryStick cards with
+          the JMicron(R) JMB38X MemoryStick card reader.
+
+          To compile this driver as a module, choose M here: the
+          module will be called jmb38x_ms.
diff --git a/drivers/memstick/host/Makefile b/drivers/memstick/host/Makefile
index ee666380efa1..12530e4311d3 100644
--- a/drivers/memstick/host/Makefile
+++ b/drivers/memstick/host/Makefile
@@ -3,8 +3,8 @@
 #
 
 ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
-        EXTRA_CFLAGS            += -DDEBUG
+        EXTRA_CFLAGS                    += -DDEBUG
 endif
 
-obj-$(CONFIG_MEMSTICK_TIFM_MS)  += tifm_ms.o
-
+obj-$(CONFIG_MEMSTICK_TIFM_MS)          += tifm_ms.o
+obj-$(CONFIG_MEMSTICK_JMICRON_38X)      += jmb38x_ms.o
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
new file mode 100644
index 000000000000..03fe8783b1ee
--- /dev/null
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -0,0 +1,945 @@
+/*
+ *  jmb38x_ms.c - JMicron jmb38x MemoryStick card reader
+ *
+ *  Copyright (C) 2008 Alex Dubov <oakad@yahoo.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.
+ *
+ */
+
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/highmem.h>
+#include <linux/memstick.h>
+
+#define DRIVER_NAME "jmb38x_ms"
+
+static int no_dma;
+module_param(no_dma, bool, 0644);
+
+enum {
+        DMA_ADDRESS       = 0x00,
+        BLOCK             = 0x04,
+        DMA_CONTROL       = 0x08,
+        TPC_P0            = 0x0c,
+        TPC_P1            = 0x10,
+        TPC               = 0x14,
+        HOST_CONTROL      = 0x18,
+        DATA              = 0x1c,
+        STATUS            = 0x20,
+        INT_STATUS        = 0x24,
+        INT_STATUS_ENABLE = 0x28,
+        INT_SIGNAL_ENABLE = 0x2c,
+        TIMER             = 0x30,
+        TIMER_CONTROL     = 0x34,
+        PAD_OUTPUT_ENABLE = 0x38,
+        PAD_PU_PD         = 0x3c,
+        CLOCK_DELAY       = 0x40,
+        ADMA_ADDRESS      = 0x44,
+        CLOCK_CONTROL     = 0x48,
+        LED_CONTROL       = 0x4c,
+        VERSION           = 0x50
+};
+
+struct jmb38x_ms_host {
+        struct jmb38x_ms        *chip;
+        void __iomem            *addr;
+        spinlock_t              lock;
+        int                     id;
+        char                    host_id[DEVICE_ID_SIZE];
+        int                     irq;
+        unsigned int            block_pos;
+        unsigned long           timeout_jiffies;
+        struct timer_list       timer;
+        struct memstick_request *req;
+        unsigned char           eject:1,
+                                use_dma:1;
+        unsigned char           cmd_flags;
+        unsigned char           io_pos;
+        unsigned int            io_word[2];
+};
+
+struct jmb38x_ms {
+        struct pci_dev        *pdev;
+        int                   host_cnt;
+        struct memstick_host  *hosts[];
+};
+
+#define BLOCK_COUNT_MASK       0xffff0000
+#define BLOCK_SIZE_MASK        0x00000fff
+
+#define DMA_CONTROL_ENABLE     0x00000001
+
+#define TPC_DATA_SEL           0x00008000
+#define TPC_DIR                0x00004000
+#define TPC_WAIT_INT           0x00002000
+#define TPC_GET_INT            0x00000800
+#define TPC_CODE_SZ_MASK       0x00000700
+#define TPC_DATA_SZ_MASK       0x00000007
+
+#define HOST_CONTROL_RESET_REQ 0x00008000
+#define HOST_CONTROL_REI       0x00004000
+#define HOST_CONTROL_LED       0x00000400
+#define HOST_CONTROL_FAST_CLK  0x00000200
+#define HOST_CONTROL_RESET     0x00000100
+#define HOST_CONTROL_POWER_EN  0x00000080
+#define HOST_CONTROL_CLOCK_EN  0x00000040
+#define HOST_CONTROL_IF_SHIFT  4
+
+#define HOST_CONTROL_IF_SERIAL 0x0
+#define HOST_CONTROL_IF_PAR4   0x1
+#define HOST_CONTROL_IF_PAR8   0x3
+
+#define STATUS_HAS_MEDIA        0x00000400
+#define STATUS_FIFO_EMPTY       0x00000200
+#define STATUS_FIFO_FULL        0x00000100
+
+#define INT_STATUS_TPC_ERR      0x00080000
+#define INT_STATUS_CRC_ERR      0x00040000
+#define INT_STATUS_TIMER_TO     0x00020000
+#define INT_STATUS_HSK_TO       0x00010000
+#define INT_STATUS_ANY_ERR      0x00008000
+#define INT_STATUS_FIFO_WRDY    0x00000080
+#define INT_STATUS_FIFO_RRDY    0x00000040
+#define INT_STATUS_MEDIA_OUT    0x00000010
+#define INT_STATUS_MEDIA_IN     0x00000008
+#define INT_STATUS_DMA_BOUNDARY 0x00000004
+#define INT_STATUS_EOTRAN       0x00000002
+#define INT_STATUS_EOTPC        0x00000001
+
+#define INT_STATUS_ALL          0x000f801f
+
+#define PAD_OUTPUT_ENABLE_MS  0x0F3F
+
+#define PAD_PU_PD_OFF         0x7FFF0000
+#define PAD_PU_PD_ON_MS_SOCK0 0x5f8f0000
+#define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000
+
+enum {
+        CMD_READY    = 0x01,
+        FIFO_READY   = 0x02,
+        REG_DATA     = 0x04,
+        AUTO_GET_INT = 0x08
+};
+
+static unsigned int jmb38x_ms_read_data(struct jmb38x_ms_host *host,
+                                        unsigned char *buf, unsigned int length)
+{
+        unsigned int off = 0;
+
+        while (host->io_pos && length) {
+                buf[off++] = host->io_word[0] & 0xff;
+                host->io_word[0] >>= 8;
+                length--;
+                host->io_pos--;
+        }
+
+        if (!length)
+                return off;
+
+        while (!(STATUS_FIFO_EMPTY & readl(host->addr + STATU