Merge tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver patches from Greg KH:
 "Here's the big char/misc driver patches for 3.14-rc1.

  Lots of little things, and a new "big" driver, genwqe.  Full details
  are in the shortlog"

* tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  mei: limit the number of consecutive resets
  mei: revamp mei reset state machine
  drivers/char: don't use module_init in non-modular ttyprintk.c
  VMCI: fix error handling path when registering guest driver
  extcon: gpio: Add power resume support
  Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) in ko_KR
  Documentation: HOWTO: update for 2.6.x -> 3.x versioning in ko_KR
  Documentation: HOWTO: update stable address in ko_KR
  Documentation: HOWTO: update LXR web link in ko_KR
  char: nwbutton: open-code interruptible_sleep_on
  mei: fix syntax in comments and debug output
  mei: nfc: mei_nfc_free has to be called under lock
  mei: use hbm idle state to prevent spurious resets
  mei: do not run reset flow from the interrupt thread
  misc: genwqe: fix return value check in genwqe_device_create()
  GenWQE: Fix warnings for sparc
  GenWQE: Fix compile problems for Alpha
  Documentation/misc-devices/mei/mei-amt-version.c: remove unneeded call of mei_deinit()
  GenWQE: Rework return code for flash-update ioctl
  sgi-xp: open-code interruptible_sleep_on_timeout
  ...

1 files changed, 500 insertions, 0 deletions

diff --git a/include/uapi/linux/genwqe/genwqe_card.h b/include/uapi/linux/genwqe/genwqe_card.h
new file mode 100644
index 000000000000..795e957bb840
--- /dev/null
+++ b/include/uapi/linux/genwqe/genwqe_card.h
@@ -0,0 +1,500 @@
+#ifndef __GENWQE_CARD_H__
+#define __GENWQE_CARD_H__
+
+/**
+ * IBM Accelerator Family 'GenWQE'
+ *
+ * (C) Copyright IBM Corp. 2013
+ *
+ * Author: Frank Haverkamp <haver@linux.vnet.ibm.com>
+ * Author: Joerg-Stephan Vogt <jsvogt@de.ibm.com>
+ * Author: Michael Jung <mijung@de.ibm.com>
+ * Author: Michael Ruettger <michael@ibmra.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License (version 2 only)
+ * 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.
+ */
+
+/*
+ * User-space API for the GenWQE card. For debugging and test purposes
+ * the register addresses are included here too.
+ */
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+/* Basename of sysfs, debugfs and /dev interfaces */
+#define GENWQE_DEVNAME                  "genwqe"
+
+#define GENWQE_TYPE_ALTERA_230          0x00 /* GenWQE4 Stratix-IV-230 */
+#define GENWQE_TYPE_ALTERA_530          0x01 /* GenWQE4 Stratix-IV-530 */
+#define GENWQE_TYPE_ALTERA_A4           0x02 /* GenWQE5 A4 Stratix-V-A4 */
+#define GENWQE_TYPE_ALTERA_A7           0x03 /* GenWQE5 A7 Stratix-V-A7 */
+
+/* MMIO Unit offsets: Each UnitID occupies a defined address range */
+#define GENWQE_UID_OFFS(uid)            ((uid) << 24)
+#define GENWQE_SLU_OFFS                 GENWQE_UID_OFFS(0)
+#define GENWQE_HSU_OFFS                 GENWQE_UID_OFFS(1)
+#define GENWQE_APP_OFFS                 GENWQE_UID_OFFS(2)
+#define GENWQE_MAX_UNITS                3
+
+/* Common offsets per UnitID */
+#define IO_EXTENDED_ERROR_POINTER       0x00000048
+#define IO_ERROR_INJECT_SELECTOR        0x00000060
+#define IO_EXTENDED_DIAG_SELECTOR       0x00000070
+#define IO_EXTENDED_DIAG_READ_MBX       0x00000078
+#define IO_EXTENDED_DIAG_MAP(ring)      (0x00000500 | ((ring) << 3))
+
+#define GENWQE_EXTENDED_DIAG_SELECTOR(ring, trace) (((ring) << 8) | (trace))
+
+/* UnitID 0: Service Layer Unit (SLU) */
+
+/* SLU: Unit Configuration Register */
+#define IO_SLU_UNITCFG                  0x00000000
+#define IO_SLU_UNITCFG_TYPE_MASK        0x000000000ff00000 /* 27:20 */
+
+/* SLU: Fault Isolation Register (FIR) (ac_slu_fir) */
+#define IO_SLU_FIR                      0x00000008 /* read only, wr direct */
+#define IO_SLU_FIR_CLR                  0x00000010 /* read and clear */
+
+/* SLU: First Error Capture Register (FEC/WOF) */
+#define IO_SLU_FEC                      0x00000018
+
+#define IO_SLU_ERR_ACT_MASK             0x00000020
+#define IO_SLU_ERR_ATTN_MASK            0x00000028
+#define IO_SLU_FIRX1_ACT_MASK           0x00000030
+#define IO_SLU_FIRX0_ACT_MASK           0x00000038
+#define IO_SLU_SEC_LEM_DEBUG_OVR        0x00000040
+#define IO_SLU_EXTENDED_ERR_PTR         0x00000048
+#define IO_SLU_COMMON_CONFIG            0x00000060
+
+#define IO_SLU_FLASH_FIR                0x00000108
+#define IO_SLU_SLC_FIR                  0x00000110
+#define IO_SLU_RIU_TRAP                 0x00000280
+#define IO_SLU_FLASH_FEC                0x00000308
+#define IO_SLU_SLC_FEC                  0x00000310
+
+/*
+ * The  Virtual Function's Access is from offset 0x00010000
+ * The Physical Function's Access is from offset 0x00050000
+ * Single Shared Registers exists only at offset 0x00060000
+ *
+ * SLC: Queue Virtual Window Window for accessing into a specific VF
+ * queue. When accessing the 0x10000 space using the 0x50000 address
+ * segment, the value indicated here is used to specify which VF
+ * register is decoded. This register, and the 0x50000 register space
+ * can only be accessed by the PF. Example, if this register is set to
+ * 0x2, then a read from 0x50000 is the same as a read from 0x10000
+ * from VF=2.
+ */
+
+/* SLC: Queue Segment */
+#define IO_SLC_QUEUE_SEGMENT            0x00010000
+#define IO_SLC_VF_QUEUE_SEGMENT         0x00050000
+
+/* SLC: Queue Offset */
+#define IO_SLC_QUEUE_OFFSET             0x00010008
+#define IO_SLC_VF_QUEUE_OFFSET          0x00050008
+
+/* SLC: Queue Configuration */
+#define IO_SLC_QUEUE_CONFIG             0x00010010
+#define IO_SLC_VF_QUEUE_CONFIG          0x00050010
+
+/* SLC: Job Timout/Only accessible for the PF */
+#define IO_SLC_APPJOB_TIMEOUT           0x00010018
+#define IO_SLC_VF_APPJOB_TIMEOUT        0x00050018
+#define TIMEOUT_250MS                   0x0000000f
+#define HEARTBEAT_DISABLE               0x0000ff00
+
+/* SLC: Queue InitSequence Register */
+#define IO_SLC_QUEUE_INITSQN            0x00010020
+#define IO_SLC_VF_QUEUE_INITSQN         0x00050020
+
+/* SLC: Queue Wrap */
+#define IO_SLC_QUEUE_WRAP               0x00010028
+#define IO_SLC_VF_QUEUE_WRAP            0x00050028
+
+/* SLC: Queue Status */
+#define IO_SLC_QUEUE_STATUS             0x00010100
+#define IO_SLC_VF_QUEUE_STATUS          0x00050100
+
+/* SLC: Queue Working Time */
+#define IO_SLC_QUEUE_WTIME              0x00010030
+#define IO_SLC_VF_QUEUE_WTIME           0x00050030
+
+/* SLC: Queue Error Counts */
+#define IO_SLC_QUEUE_ERRCNTS            0x00010038
+#define IO_SLC_VF_QUEUE_ERRCNTS         0x00050038
+
+/* SLC: Queue Loast Response Word */
+#define IO_SLC_QUEUE_LRW                0x00010040
+#define IO_SLC_VF_QUEUE_LRW             0x00050040
+
+/* SLC: Freerunning Timer */
+#define IO_SLC_FREE_RUNNING_TIMER       0x00010108
+#define IO_SLC_VF_FREE_RUNNING_TIMER    0x00050108
+
+/* SLC: Queue Virtual Access Region */
+#define IO_PF_SLC_VIRTUAL_REGION        0x00050000
+
+/* SLC: Queue Virtual Window */
+#define IO_PF_SLC_VIRTUAL_WINDOW        0x00060000
+
+/* SLC: DDCB Application Job Pending [n] (n=0:63) */
+#define IO_PF_SLC_JOBPEND(n)            (0x00061000 + 8*(n))
+#define IO_SLC_JOBPEND(n)               IO_PF_SLC_JOBPEND(n)
+
+/* SLC: Parser Trap RAM [n] (n=0:31) */
+#define IO_SLU_SLC_PARSE_TRAP(n)        (0x00011000 + 8*(n))
+
+/* SLC: Dispatcher Trap RAM [n] (n=0:31) */
+#define IO_SLU_SLC_DISP_TRAP(n) (0x00011200 + 8*(n))
+
+/* Global Fault Isolation Register (GFIR) */
+#define IO_SLC_CFGREG_GFIR              0x00020000
+#define GFIR_ERR_TRIGGER                0x0000ffff
+
+/* SLU: Soft Reset Register */
+#define IO_SLC_CFGREG_SOFTRESET         0x00020018
+
+/* SLU: Misc Debug Register */
+#define IO_SLC_MISC_DEBUG               0x00020060
+#define IO_SLC_MISC_DEBUG_CLR           0x00020068
+#define IO_SLC_MISC_DEBUG_SET           0x00020070
+
+/* Temperature Sensor Reading */
+#define IO_SLU_TEMPERATURE_SENSOR       0x00030000
+#define IO_SLU_TEMPERATURE_CONFIG       0x00030008
+
+/* Voltage Margining Control */
+#define IO_SLU_VOLTAGE_CONTROL          0x00030080
+#define IO_SLU_VOLTAGE_NOMINAL          0x00000000
+#define IO_SLU_VOLTAGE_DOWN5            0x00000006