Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig

447 files changed, 14542 insertions, 12627 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index f65deda72d61..fda44679dffc 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_PCI)		+= pci/
 obj-$(CONFIG_PARISC)            += parisc/
 obj-$(CONFIG_RAPIDIO)           += rapidio/
 obj-y                           += video/
+obj-y                           += gpu/
 obj-$(CONFIG_ACPI)              += acpi/
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so
diff --git a/drivers/acorn/char/Makefile b/drivers/acorn/char/Makefile
deleted file mode 100644
index d006c9f168d2..000000000000
--- a/drivers/acorn/char/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the acorn character device drivers.
-#
-
-obj-$(CONFIG_L7200_KEYB)        += defkeymap-l7200.o keyb_l7200.o
diff --git a/drivers/acorn/char/defkeymap-l7200.c b/drivers/acorn/char/defkeymap-l7200.c
deleted file mode 100644
index 93d80a1c36f9..000000000000
--- a/drivers/acorn/char/defkeymap-l7200.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * linux/drivers/acorn/char/defkeymap-l7200.c
- *
- * Default keyboard maps for LinkUp Systems L7200 board
- *
- * Copyright (C) 2000 Steve Hill (sjhill@cotw.com)
- *
- * Changelog:
- *   08-04-2000 SJH     Created file
- */
-
-#include <linux/types.h>
-#include <linux/keyboard.h>
-#include <linux/kd.h>
-
-/* Normal (maps 1:1 with no processing) */
-#define KTn     0xF0
-/* Function keys */
-#define KTf     0xF1
-/* Special (Performs special house-keeping funcs) */
-#define KTs     0xF2
-#define KIGNORE         K(KTs, 0)       /* Ignore */
-#define KENTER          K(KTs, 1)       /* Enter */
-#define KREGS           K(KTs, 2)       /* Regs */
-#define KMEM            K(KTs, 3)       /* Mem */
-#define KSTAT           K(KTs, 4)       /* State */
-#define KINTR           K(KTs, 5)       /* Intr */
-#define Ksl     6       /* Last console */
-#define KCAPSLK         K(KTs, 7)       /* Caps lock */
-#define KNUMLK          K(KTs, 8)       /* Num-lock */
-#define KSCRLLK         K(KTs, 9)       /* Scroll-lock */
-#define KSCRLFOR        K(KTs,10)       /* Scroll forward */
-#define KSCRLBAK        K(KTs,11)       /* Scroll back */
-#define KREBOOT         K(KTs,12)       /* Reboot */
-#define KCAPSON         K(KTs,13)       /* Caps on */
-#define KCOMPOSE        K(KTs,14)       /* Compose */
-#define KSAK            K(KTs,15)       /* SAK */
-#define CONS_DEC        K(KTs,16)       /* Dec console */
-#define CONS_INC        K(KTs,17)       /* Incr console */
-#define KFLOPPY         K(KTs,18)       /* Floppy */
-/* Key pad (0-9 = digits, 10=+, 11=-, 12=*, 13=/, 14=enter, 16=., 17=# */
-#define KTp     0xF3
-#define KPAD_0          K(KTp, 0 )
-#define KPAD_1          K(KTp, 1 )
-#define KPAD_2          K(KTp, 2 )
-#define KPAD_3          K(KTp, 3 )
-#define KPAD_4          K(KTp, 4 )
-#define KPAD_5          K(KTp, 5 )
-#define KPAD_6          K(KTp, 6 )
-#define KPAD_7          K(KTp, 7 )
-#define KPAD_8          K(KTp, 8 )
-#define KPAD_9          K(KTp, 9 )
-#define KPAD_PL         K(KTp,10 )
-#define KPAD_MI         K(KTp,11 )
-#define KPAD_ML         K(KTp,12 )
-#define KPAD_DV         K(KTp,13 )
-#define KPAD_EN         K(KTp,14 )
-#define KPAD_DT         K(KTp,16 )
-#define KPAD_HS         K(KTp,20 )
-/* Console switching */
-#define KCn     0xF5
-/* Cursor */
-#define KTc     0xF6
-#define Kcd     0       /* Cursor down */
-#define Kcl     1       /* Cursor left */
-#define Kcr     2       /* Cursor right */
-#define Kcu     3       /* Cursor up */
-/* Shift/alt modifiers etc */
-#define KMd     0xF7
-#define KSHIFT          K(KMd, 0 )
-#define KALTGR          K(KMd, 1 )
-#define KCTRL           K(KMd, 2 )
-#define KALT            K(KMd, 3 )
-/* Meta */
-#define KMt     0xF8
-#define KAs     0xF9
-#define KPADA_0         K(KAs, 0 )
-#define KPADA_1         K(KAs, 1 )
-#define KPADA_2         K(KAs, 2 )
-#define KPADA_3         K(KAs, 3 )
-#define KPADA_4         K(KAs, 4 )
-#define KPADA_5         K(KAs, 5 )
-#define KPADA_6         K(KAs, 6 )
-#define KPADA_7         K(KAs, 7 )
-#define KPADA_8         K(KAs, 8 )
-#define KPADA_9         K(KAs, 9 )
-#define KPADB_0         K(KAs,10 )
-#define KPADB_1         K(KAs,11 )
-#define KPADB_2         K(KAs,12 )
-#define KPADB_3         K(KAs,13 )
-#define KPADB_4         K(KAs,14 )
-#define KPADB_5         K(KAs,15 )
-#define KPADB_6         K(KAs,16 )
-#define KPADB_7         K(KAs,17 )
-#define KPADB_8         K(KAs,18 )
-#define KPADB_9         K(KAs,19 )
-/* Locking keys */
-#define KLk     0xFA
-/* Letters */
-#define KTl     0xFB
-
-/*
- * Here is the layout of the keys for the Fujitsu QWERTY
- * style keyboard:
- *
- *      static char Fujitsu_Key_Table[] =
- *      {
- *        KALT, '`' , KNUL, KCTL, KFUN, KESC, '1' , '2' ,
- *        '9' , '0' , '-' , '=' , KNUL, KBSP, KNUL, KNUL,
- *        KNUL, KBSL, KSHF, KNUL, KNUL, KDEL, KNUL, 't' ,
- *        'y' , 'u' , 'i' , KRET, KSHF, KPGD, KNUL, KNUL,
- *        KNUL, KTAB, KNUL, KNUL, KNUL, 'q' , 'w' , 'e' ,
- *        'r' , 'o' , 'p' , '[' , KNUL, ']' , KNUL, KNUL,
- *        KNUL, 'z' , KNUL, KNUL, KNUL, KSHL, KNUL, KNUL,
- *        'k' , 'l' , ';' , KSQT, KNUL, KPGU, KNUL, KNUL,
- *        KNUL, 'a' , KNUL, KNUL, KNUL, 's' , 'd' , 'f' ,
- *        'g' , 'h' , 'j' , '/' , KNUL, KHME, KNUL, KNUL,
- *        KNUL, 'x' , KNUL, KNUL, KNUL, 'c' , 'v' , 'b' ,
- *        'n' , 'm' , ',' , '.' , KNUL, ' ' , KNUL, KNUL,
- *        KNUL, KNUL, KNUL, KNUL, KNUL, '3' , '4' , '5' ,
- *        '6' , '7' , '8' , KNUL, KPRG, KNUL, KEND, KNUL,
- *      };
- */
-
-u_short plain_map[NR_KEYS]=
-{
-        0xf703, 0xf060, 0xf200, 0xf702, 0xf200, 0xf01b, 0xf031, 0xf032,
-        0xf039, 0xf030, 0xf02d, 0xf03d, 0xf200, 0xf07f, 0xf200, 0xf200,
-        0xf200, 0xf05c, 0xf700, 0xf200, 0xf200, 0xf116, 0xf000, 0xfb74,
-        0xfb79, 0xfb75, 0xfb69, 0xf201, 0xf700, 0xf600, 0xf200, 0xf200,
-        0xf200, 0xf009, 0xf200, 0xf200, 0xf200, 0xfb71, 0xfb77, 0xfb65,
-        0xfb72, 0xfb6f, 0xfb70, 0xf05b, 0xf200, 0xf05d, 0xf200, 0xf200,
-        0xf200, 0xfb7a, 0xf200, 0xf200, 0xf200, 0xf207, 0xf200, 0xf200,
-        0xfb6b, 0xfb6c, 0xf03b, 0xf027, 0xf200, 0xf603, 0xf200, 0xf200,
-        0xf200, 0xfb61, 0xf200, 0xf200, 0xf200, 0xfb73, 0xfb64, 0xfb66,
-        0xfb67, 0xfb68, 0xfb6a, 0xf02f, 0xf200, 0xf601, 0xf200, 0xf200,
-        0xf200, 0xfb78, 0xf200, 0xf200, 0xf200, 0xfb63, 0xfb76, 0xfb62,
-        0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf200, 0xf020, 0xf200, 0xf200,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf033, 0xf034, 0xf035, 
-        0xf036, 0xf037, 0xf038, 0xf200, 0xf200, 0xf200, 0xf602, 0xf200, 
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 
-};
-
-u_short shift_map[NR_KEYS]=
-{
-        0xf703, 0xf07e, 0xf200, 0xf702, 0xf200, 0xf01b, 0xf021, 0xf040,
-        0xf028, 0xf029, 0xf05f, 0xf02b, 0xf200, 0xf07f, 0xf200, 0xf200,
-        0xf200, 0xf07c, 0xf700, 0xf200, 0xf200, 0xf116, 0xf000, 0xfb54,
-        0xfb59, 0xfb55, 0xfb49, 0xf201, 0xf700, 0xf600, 0xf200, 0xf200,
-        0xf200, 0xf009, 0xf200, 0xf200, 0xf200, 0xfb51, 0xfb57, 0xfb45,
-        0xfb52, 0xfb4f, 0xfb50, 0xf07b, 0xf200, 0xf07d, 0xf200, 0xf200,
-        0xf200, 0xfb5a, 0xf200, 0xf200, 0xf200, 0xf207, 0xf200, 0xf200,
-        0xfb4b, 0xfb4c, 0xf03a, 0xf022, 0xf200, 0xf603, 0xf200, 0xf200,
-        0xf200, 0xfb41, 0xf200, 0xf200, 0xf200, 0xfb53, 0xfb44, 0xfb46,
-        0xfb47, 0xfb48, 0xfb4a, 0xf03f, 0xf200, 0xf601, 0xf200, 0xf200,
-        0xf200, 0xfb58, 0xf200, 0xf200, 0xf200, 0xfb43, 0xfb56, 0xfb42,
-        0xfb4e, 0xfb4d, 0xf03c, 0xf03e, 0xf200, 0xf020, 0xf200, 0xf200,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf023, 0xf024, 0xf025, 
-        0xf05e, 0xf026, 0xf02a, 0xf200, 0xf200, 0xf200, 0xf602, 0xf200, 
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 
-};
-
-u_short altgr_map[NR_KEYS]=
-{
-  KIGNORE   ,K(KCn,12 ),K(KCn,13 ),K(KCn,14  ),K(KCn,15 ),K(KCn,16 ),K(KCn,17  ),K(KCn, 18),
-  K(KCn, 19),K(KCn,20 ),K(KCn,21 ),K(KCn,22  ),K(KCn,23 ),KIGNORE   ,KREGS      ,KINTR     ,
-  KIGNORE   ,KIGNORE   ,K(KTn,'@'),KIGNORE    ,K(KTn,'$'),KIGNORE   ,KIGNORE    ,K(KTn,'{'),
-  K(KTn,'['),K(KTn,']'),K(KTn,'}'),K(KTn,'\\'),KIGNORE   ,KIGNORE   ,KIGNORE    ,K(KTf,21 ),
-  K(KTf,20 ),K(KTf,24 ),KNUMLK    ,KPAD_DV    ,KPAD_ML   ,KPAD_HS   ,KIGNORE    ,K(KTl,'q'),
-  K(KTl,'w'),K(KTl,'e'),K(KTl,'r'),K(KTl,'t' ),K(KTl,'y'),K(KTl,'u'),K(KTl,'i' ),K(KTl,'o'),
-  K(KTl,'p'),KIGNORE   ,K(KTn,'~'),KIGNORE    ,K(KTf,22 ),K(KTf,23 ),K(KTf,25  ),KPADB_7   ,
-  KPADB_8   ,KPADB_9   ,KPAD_MI   ,KCTRL      ,K(KAs,20 ),K(KTl,'s'),K(KAs,23  ),K(KAs,25 ),
-  K(KTl,'g'),K(KTl,'h'),K(KTl,'j'),K(KTl,'k' ),K(KTl,'l'),KIGNORE   ,KIGNORE    ,KENTER    ,
-  KPADB_4   ,KPADB_5   ,KPADB_6   ,KPAD_PL    ,KSHIFT    ,KIGNORE   ,K(KTl,'z' ),K(KTl,'x'),
-  K(KAs,22 ),K(KTl,'v'),K(KTl,21 ),K(KTl,'n' ),K(KTl,'m'),KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KSHIFT    ,K(KTc,Kcu),KPADB_1   ,KPADB_2    ,KPADB_3   ,KCAPSLK   ,KALT       ,KIGNORE   ,
-  KALTGR    ,KCTRL     ,K(KTc,Kcl),K(KTc,Kcd ),K(KTc,Kcr),KPADB_0   ,KPAD_DT    ,KPAD_EN   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-};
-
-u_short ctrl_map[NR_KEYS]=
-{
-        0xf703, 0xf200, 0xf200, 0xf702, 0xf200, 0xf200, 0xf001, 0xf002,
-        0xf009, 0xf000, 0xf031, 0xf200, 0xf200, 0xf07f, 0xf200, 0xf200,
-        0xf200, 0xf01c, 0xf700, 0xf200, 0xf200, 0xf116, 0xf000, 0xf020,
-        0xf019, 0xf015, 0xf009, 0xf201, 0xf700, 0xf600, 0xf200, 0xf200,
-        0xf200, 0xf009, 0xf200, 0xf200, 0xf200, 0xf011, 0xf017, 0xf005,
-        0xf012, 0xf00f, 0xf010, 0xf01b, 0xf200, 0xf01d, 0xf200, 0xf200,
-        0xf200, 0xf01a, 0xf200, 0xf200, 0xf200, 0xf207, 0xf200, 0xf200,
-        0xf00b, 0xf00c, 0xf200, 0xf007, 0xf200, 0xf603, 0xf200, 0xf200,
-        0xf200, 0xf001, 0xf200, 0xf200, 0xf200, 0xf001, 0xf013, 0xf006,
-        0xf007, 0xf008, 0xf00a, 0xf07f, 0xf200, 0xf601, 0xf200, 0xf200,
-        0xf200, 0xf018, 0xf200, 0xf200, 0xf200, 0xf003, 0xf016, 0xf002,
-        0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf000, 0xf200, 0xf200,
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf01b, 0xf01c, 0xf01d, 
-        0xf036, 0xf037, 0xf038, 0xf200, 0xf200, 0xf200, 0xf602, 0xf200, 
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 
-        0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf602, 0xf200, 
-};
-
-u_short shift_ctrl_map[NR_KEYS]=
-{
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KFLOPPY    ,KINTR     ,
-  KIGNORE   ,KIGNORE   ,K(KTn, 0 ),KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,K(KTn,31  ),KIGNORE   ,KIGNORE   ,KIGNORE    ,K(KTf,21 ),
-  K(KTf,20 ),K(KTf,24 ),KNUMLK    ,KPAD_DV    ,KPAD_ML   ,KPAD_HS   ,KIGNORE    ,K(KTn,17 ),
-  K(KTn,23 ),K(KTn, 5 ),K(KTn,18 ),K(KTn,20  ),K(KTn,25 ),K(KTn,21 ),K(KTn, 9  ),K(KTn,15 ),
-  K(KTn,16 ),KIGNORE   ,KIGNORE   ,KIGNORE    ,K(KTf,22 ),K(KTf,23 ),K(KTf,25  ),KPAD_7    ,
-  KPAD_8    ,KPAD_9    ,KPAD_MI   ,KCTRL      ,K(KTn, 1 ),K(KTn,19 ),K(KTn, 4  ),K(KTn, 6 ),
-  K(KTn, 7 ),K(KTn, 8 ),K(KTn,10 ),K(KTn,11  ),K(KTn,12 ),KIGNORE   ,K(KTn, 7  ),KENTER    ,
-  KPAD_4    ,KPAD_5    ,KPAD_6    ,KPAD_PL    ,KSHIFT    ,KIGNORE   ,K(KTn,26  ),K(KTn,24 ),
-  K(KTn, 3 ),K(KTn,22 ),K(KTn, 2 ),K(KTn,14  ),K(KTn,13 ),KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KSHIFT    ,K(KTc,Kcu),KPAD_1    ,KPAD_2     ,KPAD_3    ,KCAPSLK   ,KALT       ,K(KTn, 0 ),
-  KALTGR    ,KCTRL     ,K(KTc,Kcl),K(KTc,Kcd ),K(KTc,Kcr),KPAD_0    ,KPAD_DT    ,KPAD_EN   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-};
-
-u_short alt_map[NR_KEYS]=
-{
-  K(KMt,27 ),K(KCn, 0 ),K(KCn, 1 ),K(KCn, 2  ),K(KCn, 3 ),K(KCn, 4 ),K(KCn, 5  ),K(KCn, 6 ),
-  K(KCn, 7 ),K(KCn, 8 ),K(KCn, 9 ),K(KCn,10  ),K(KCn,11 ),KIGNORE   ,KSCRLLK    ,KINTR     ,
-  K(KMt,'`'),K(KMt,'1'),K(KMt,'2'),K(KMt,'3' ),K(KMt,'4'),K(KMt,'5'),K(KMt,'6' ),K(KMt,'7'),
-  K(KMt,'8'),K(KMt,'9'),K(KMt,'0'),K(KMt,'-' ),K(KMt,'='),K(KMt,'£'),K(KMt,127 ),K(KTf,21 ),
-  K(KTf,20 ),K(KTf,24 ),KNUMLK    ,KPAD_DV    ,KPAD_ML   ,KPAD_HS   ,K(KMt, 9  ),K(KMt,'q'),
-  K(KMt,'w'),K(KMt,'e'),K(KMt,'r'),K(KMt,'t' ),K(KMt,'y'),K(KMt,'u'),K(KMt,'i' ),K(KMt,'o'),
-  K(KMt,'p'),K(KMt,'['),K(KMt,']'),K(KMt,'\\'),K(KTf,22 ),K(KTf,23 ),K(KTf,25  ),KPADA_7   ,
-  KPADA_8   ,KPADA_9   ,KPAD_MI   ,KCTRL      ,K(KMt,'a'),K(KMt,'s'),K(KMt,'d' ),K(KMt,'f'),
-  K(KMt,'g'),K(KMt,'h'),K(KMt,'j'),K(KMt,'k' ),K(KMt,'l'),K(KMt,';'),K(KMt,'\''),K(KMt,13 ),
-  KPADA_4   ,KPADA_5   ,KPADA_6   ,KPAD_PL    ,KSHIFT    ,KIGNORE   ,K(KMt,'z' ),K(KMt,'x'),
-  K(KMt,'c'),K(KMt,'v'),K(KMt,'b'),K(KMt,'n' ),K(KMt,'m'),K(KMt,','),K(KMt,'.' ),KIGNORE   ,
-  KSHIFT    ,K(KTc,Kcu),KPADA_1   ,KPADA_2    ,KPADA_3   ,KCAPSLK   ,KALT       ,K(KMt,' '),
-  KALTGR    ,KCTRL     ,CONS_DEC  ,K(KTc,Kcd ),CONS_INC  ,KPADA_0   ,KPAD_DT    ,KPAD_EN   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-};
-
-u_short ctrl_alt_map[NR_KEYS]=
-{
-  KIGNORE   ,K(KCn, 0 ),K(KCn, 1 ),K(KCn, 2  ),K(KCn, 3 ),K(KCn, 4 ),K(KCn, 5  ),K(KCn, 6 ),
-  K(KCn, 7 ),K(KCn, 8 ),K(KCn, 9 ),K(KCn,10  ),K(KCn,11 ),KIGNORE   ,KIGNORE    ,KINTR     ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,K(KTf,21 ),
-  K(KTf,20 ),K(KTf,24 ),KNUMLK    ,KPAD_DV    ,KPAD_ML   ,KPAD_HS   ,KIGNORE    ,K(KMt,17 ),
-  K(KMt,23 ),K(KMt, 5 ),K(KMt,18 ),K(KMt,20  ),K(KMt,25 ),K(KMt,21 ),K(KMt, 9  ),K(KMt,15 ),
-  K(KMt,16 ),KIGNORE   ,KIGNORE   ,KIGNORE    ,KREBOOT   ,K(KTf,23 ),K(KTf,25  ),KPAD_7    ,
-  KPAD_8    ,KPAD_9    ,KPAD_MI   ,KCTRL      ,K(KMt, 1 ),K(KMt,19 ),K(KMt, 4  ),K(KMt, 6 ),
-  K(KMt, 7 ),K(KMt, 8 ),K(KMt,10 ),K(KMt,11  ),K(KMt,12 ),KIGNORE   ,KIGNORE    ,KENTER    ,
-  KPAD_4    ,KPAD_5    ,KPAD_6    ,KPAD_PL    ,KSHIFT    ,KIGNORE   ,K(KMt,26  ),K(KMt,24 ),
-  K(KMt, 3 ),K(KMt,22 ),K(KMt, 2 ),K(KMt,14  ),K(KMt,13 ),KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KSHIFT    ,K(KTc,Kcu),KPAD_1    ,KPAD_2     ,KPAD_3    ,KCAPSLK   ,KALT       ,KIGNORE   ,
-  KALTGR    ,KCTRL     ,K(KTc,Kcl),K(KTc,Kcd ),K(KTc,Kcr),KPAD_0    ,KREBOOT    ,KPAD_EN   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-  KIGNORE   ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,KIGNORE   ,KIGNORE    ,KIGNORE   ,
-};
-
-ushort *key_maps[MAX_NR_KEYMAPS] = {
-        plain_map, shift_map, altgr_map, 0,
-        ctrl_map, shift_ctrl_map, 0, 0,
-        alt_map, 0, 0, 0,
-        ctrl_alt_map,   0
-};
-
-unsigned int keymap_count = 7;
-
-/*
- * Philosophy: most people do not define more strings, but they who do
- * often want quite a lot of string space. So, we statically allocate
- * the default and allocate dynamically in chunks of 512 bytes.
- */
-
-char func_buf[] = {
-        '\033', '[', '[', 'A', 0,
-        '\033', '[', '[', 'B', 0,
-        '\033', '[', '[', 'C', 0,
-        '\033', '[', '[', 'D', 0,
-        '\033', '[', '[', 'E', 0,
-        '\033', '[', '1', '7', '~', 0,
-        '\033', '[', '1', '8', '~', 0,
-        '\033', '[', '1', '9', '~', 0,
-        '\033', '[', '2', '0', '~', 0,
-        '\033', '[', '2', '1', '~', 0,
-        '\033', '[', '2', '3', '~', 0,
-        '\033', '[', '2', '4', '~', 0,
-        '\033', '[', '2', '5', '~', 0,
-        '\033', '[', '2', '6', '~', 0,
-        '\033', '[', '2', '8', '~', 0,
-        '\033', '[', '2', '9', '~', 0,
-        '\033', '[', '3', '1', '~', 0,
-        '\033', '[', '3', '2', '~', 0,
-        '\033', '[', '3', '3', '~', 0,
-        '\033', '[', '3', '4', '~', 0,
-        '\033', '[', '1', '~', 0,
-        '\033', '[', '2', '~', 0,
-        '\033', '[', '3', '~', 0,
-        '\033', '[', '4', '~', 0,
-        '\033', '[', '5', '~', 0,
-        '\033', '[', '6', '~', 0,
-        '\033', '[', 'M', 0,
-        '\033', '[', 'P', 0,
-};
-
-char *funcbufptr = func_buf;
-int funcbufsize = sizeof(func_buf);
-int funcbufleft = 0;          /* space left */
-
-char *func_table[MAX_NR_FUNC] = {
-        func_buf + 0,
-        func_buf + 5,
-        func_buf + 10,
-        func_buf + 15,
-        func_buf + 20,
-        func_buf + 25,
-        func_buf + 31,
-        func_buf + 37,
-        func_buf + 43,
-        func_buf + 49,
-        func_buf + 55,
-        func_buf + 61,
-        func_buf + 67,
-        func_buf + 73,
-        func_buf + 79,
-        func_buf + 85,
-        func_buf + 91,
-        func_buf + 97,
-        func_buf + 103,
-        func_buf + 109,
-        func_buf + 115,
-        func_buf + 120,
-        func_buf + 125,
-        func_buf + 130,
-        func_buf + 135,
-        func_buf + 140,
-        func_buf + 145,
-        0,
-        0,
-        func_buf + 149,
-        0,
-};
-
-struct kbdiacruc accent_table[MAX_DIACR] = {
-        {'`', 'A', 0300},       {'`', 'a', 0340},
-        {'\'', 'A', 0301},      {'\'', 'a', 0341},
-        {'^', 'A', 0302},       {'^', 'a', 0342},
-        {'~', 'A', 0303},       {'~', 'a', 0343},
-        {'"', 'A', 0304},       {'"', 'a', 0344},
-        {'O', 'A', 0305},       {'o', 'a', 0345},
-        {'0', 'A', 0305},       {'0', 'a', 0345},
-        {'A', 'A', 0305},       {'a', 'a', 0345},
-        {'A', 'E', 0306},       {'a', 'e', 0346},
-        {',', 'C', 0307},       {',', 'c', 0347},
-        {'`', 'E', 0310},       {'`', 'e', 0350},
-        {'\'', 'E', 0311},      {'\'', 'e', 0351},
-        {'^', 'E', 0312},       {'^', 'e', 0352},
-        {'"', 'E', 0313},       {'"', 'e', 0353},
-        {'`', 'I', 0314},       {'`', 'i', 0354},
-        {'\'', 'I', 0315},      {'\'', 'i', 0355},
-        {'^', 'I', 0316},       {'^', 'i', 0356},
-        {'"', 'I', 0317},       {'"', 'i', 0357},
-        {'-', 'D', 0320},       {'-', 'd', 0360},
-        {'~', 'N', 0321},       {'~', 'n', 0361},
-        {'`', 'O', 0322},       {'`', 'o', 0362},
-        {'\'', 'O', 0323},      {'\'', 'o', 0363},
-        {'^', 'O', 0324},       {'^', 'o', 0364},
-        {'~', 'O', 0325},       {'~', 'o', 0365},
-        {'"', 'O', 0326},       {'"', 'o', 0366},
-        {'/', 'O', 0330},       {'/', 'o', 0370},
-        {'`', 'U', 0331},       {'`', 'u', 0371},
-        {'\'', 'U', 0332},      {'\'', 'u', 0372},
-        {'^', 'U', 0333},       {'^', 'u', 0373},
-        {'"', 'U', 0334},       {'"', 'u', 0374},
-        {'\'', 'Y', 0335},      {'\'', 'y', 0375},
-        {'T', 'H', 0336},       {'t', 'h', 0376},
-        {'s', 's', 0337},       {'"', 'y', 0377},
-        {'s', 'z', 0337},       {'i', 'j', 0377},
-};
-
-unsigned int accent_table_size = 68;
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c52fca833268..bba867391a85 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -4,8 +4,6 @@
 
 menuconfig ACPI
         bool "ACPI (Advanced Configuration and Power Interface) Support"
-        depends on !X86_NUMAQ
-        depends on !X86_VISWS
         depends on !IA64_HP_SIM
         depends on IA64 || X86
         depends on PCI
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 57a43649a461..499ccc628d81 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -885,7 +885,8 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
                 /* set the min alignment and padding */
                 blk_queue_update_dma_alignment(sdev->request_queue,
                                                ATA_DMA_PAD_SZ - 1);
-                blk_queue_dma_pad(sdev->request_queue, ATA_DMA_PAD_SZ - 1);
+                blk_queue_update_dma_pad(sdev->request_queue,
+                                         ATA_DMA_PAD_SZ - 1);
 
                 /* configure draining */
                 buf = kmalloc(ATAPI_MAX_DRAIN, q->bounce_gfp | GFP_KERNEL);
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index 2b4b392dcbc1..87a7f1d02578 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -153,7 +153,7 @@ EXPORT_SYMBOL(set_trace_device);
  * it's not any guarantee, but it's a high _likelihood_ that
  * the match is valid).
  */
-void generate_resume_trace(void *tracedata, unsigned int user)
+void generate_resume_trace(const void *tracedata, unsigned int user)
 {
         unsigned short lineno = *(unsigned short *)tracedata;
         const char *file = *(const char **)(tracedata + 2);
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index fdf4044d2e74..1efe162e16d7 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -40,6 +40,7 @@ static ssize_t show_##name(struct sys_device *dev, char *buf)	\
         return sprintf(buf, "%d\n", topology_##name(cpu));      \
 }
 
+#if defined(topology_thread_siblings) || defined(topology_core_siblings)
 static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf)
 {
         ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf;
@@ -54,21 +55,41 @@ static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf)
         }
         return n;
 }
+#endif
 
+#ifdef arch_provides_topology_pointers
 #define define_siblings_show_map(name)                                  \
-static inline ssize_t show_##name(struct sys_device *dev, char *buf)    \
+static ssize_t show_##name(struct sys_device *dev, char *buf)   \
 {                                                                       \
         unsigned int cpu = dev->id;                                     \
         return show_cpumap(0, &(topology_##name(cpu)), buf);            \
 }
 
 #define define_siblings_show_list(name)                                 \
-static inline ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
+static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
 {                                                                       \
         unsigned int cpu = dev->id;                                     \
         return show_cpumap(1, &(topology_##name(cpu)), buf);            \
 }
 
+#else
+#define define_siblings_show_map(name)                                  \
+static ssize_t show_##name(struct sys_device *dev, char *buf)   \
+{                                                                       \
+        unsigned int cpu = dev->id;                                     \
+        cpumask_t mask = topology_##name(cpu);                          \
+        return show_cpumap(0, &mask, buf);                              \
+}
+
+#define define_siblings_show_list(name)                                 \
+static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
+{                                                                       \
+        unsigned int cpu = dev->id;                                     \
+        cpumask_t mask = topology_##name(cpu);                          \
+        return show_cpumap(1, &mask, buf);                              \
+}
+#endif
+
 #define define_siblings_show_func(name)         \
         define_siblings_show_map(name); define_siblings_show_list(name)
 
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index cd03473f3547..a002a381df92 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -6628,15 +6628,18 @@ static void DAC960_DestroyProcEntries(DAC960_Controller_T *Controller)
  * DAC960_gam_ioctl is the ioctl function for performing RAID operations.
 */
 
-static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
-                            unsigned int Request, unsigned long Argument)
+static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
+                                                unsigned long Argument)
 {
-  int ErrorCode = 0;
+  long ErrorCode = 0;
   if (!capable(CAP_SYS_ADMIN)) return -EACCES;
+
+  lock_kernel();
   switch (Request)
     {
     case DAC960_IOCTL_GET_CONTROLLER_COUNT:
-      return DAC960_ControllerCount;
+      ErrorCode = DAC960_ControllerCount;
+      break;
     case DAC960_IOCTL_GET_CONTROLLER_INFO:
       {
         DAC960_ControllerInfo_T __user *UserSpaceControllerInfo =
@@ -6644,15 +6647,20 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
         DAC960_ControllerInfo_T ControllerInfo;
         DAC960_Controller_T *Controller;
         int ControllerNumber;
-        if (UserSpaceControllerInfo == NULL) return -EINVAL;
-        ErrorCode = get_user(ControllerNumber,
+        if (UserSpaceControllerInfo == NULL)
+                ErrorCode = -EINVAL;
+        else ErrorCode = get_user(ControllerNumber,
                              &UserSpaceControllerInfo->ControllerNumber);
-        if (ErrorCode != 0) return ErrorCode;
+        if (ErrorCode != 0)
+                break;;
+        ErrorCode = -ENXIO;
         if (ControllerNumber < 0 ||
-            ControllerNumber > DAC960_ControllerCount - 1)
-          return -ENXIO;
+            ControllerNumber > DAC960_ControllerCount - 1) {
+          break;
+        }
         Controller = DAC960_Controllers[ControllerNumber];
-        if (Controller == NULL) return -ENXIO;
+        if (Controller == NULL)
+                break;;
         memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T));
         ControllerInfo.ControllerNumber = ControllerNumber;
         ControllerInfo.FirmwareType = Controller->FirmwareType;
@@ -6665,8 +6673,9 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
         ControllerInfo.PCI_Address = Controller->PCI_Address;
         strcpy(ControllerInfo.ModelName, Controller->ModelName);
         strcpy(ControllerInfo.FirmwareVersion, Controller->FirmwareVersion);
-        return (copy_to_user(UserSpaceControllerInfo, &ControllerInfo,
+        ErrorCode = (copy_to_user(UserSpaceControllerInfo, &ControllerInfo,
                              sizeof(DAC960_ControllerInfo_T)) ? -EFAULT : 0);
+        break;
       }
     case DAC960_IOCTL_V1_EXECUTE_COMMAND:
       {
@@ -6684,30 +6693,39 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
         int ControllerNumber, DataTransferLength;
         unsigned char *DataTransferBuffer = NULL;
         dma_addr_t DataTransferBufferDMA;
-        if (UserSpaceUserCommand == NULL) return -EINVAL;
+        if (UserSpaceUserCommand == NULL) {
+                ErrorCode = -EINVAL;
+                break;
+        }
         if (copy_from_user(&UserCommand, UserSpaceUserCommand,
                                    sizeof(DAC960_V1_UserCommand_T))) {
                 ErrorCode = -EFAULT;
-                goto Failure1a;
+                break;
         }
         ControllerNumber = UserCommand.ControllerNumber;
+        ErrorCode = -ENXIO;
         if (ControllerNumber < 0 ||
             ControllerNumber > DAC960_ControllerCount - 1)
-          return -ENXIO;
+                break;
         Controller = DAC960_Controllers[ControllerNumber];
-        if (Controller == NULL) return -ENXIO;
-        if (Controller->FirmwareType != DAC960_V1_Controller) return -EINVAL;
+        if (Controller == NULL)
+                break;
+        ErrorCode = -EINVAL;
+        if (Controller->FirmwareType != DAC960_V1_Controller)
+                break;
         CommandOpcode = UserCommand.CommandMailbox.Common.CommandOpcode;
         DataTransferLength = UserCommand.DataTransferLength;
-        if (CommandOpcode & 0x80) return -EINVAL;
+        if (CommandOpcode & 0x80)
+                break;
         if (CommandOpcode == DAC960_V1_DCDB)
           {
             if (copy_from_user(&DCDB, UserCommand.DCDB,
                                sizeof(DAC960_V1_DCDB_T))) {
                 ErrorCode = -EFAULT;
-                goto Failure1a;
+                break;
             }
-            if (DCDB.Channel >= DAC960_V1_MaxChannels) return -EINVAL;
+            if (DCDB.Channel >= DAC960_V1_MaxChannels)
+                        break;
             if (!((DataTransferLength == 0 &&
                    DCDB.Direction
                    == DAC960_V1_DCDB_NoDataTransfer) ||
@@ -6717,38 +6735,37 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
                   (DataTransferLength < 0 &&
                    DCDB.Direction
                    == DAC960_V1_DCDB_DataTransferSystemToDevice)))
-              return -EINVAL;
+                        break;
             if (((DCDB.TransferLengthHigh4 << 16) | DCDB.TransferLength)
                 != abs(DataTransferLength))
-              return -EINVAL;
+                        break;
             DCDB_IOBUF = pci_alloc_consistent(Controller->PCIDevice,
                         sizeof(DAC960_V1_DCDB_T), &DCDB_IOBUFDMA);
-            if (DCDB_IOBUF == NULL)
-                        return -ENOMEM;
+            if (DCDB_IOBUF == NULL) {
+                        ErrorCode = -ENOMEM;
+                        break;
+                }
           }
+        ErrorCode = -ENOMEM;
         if (DataTransferLength > 0)
           {
             DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice,
                                 DataTransferLength, &DataTransferBufferDMA);
-            if (DataTransferBuffer == NULL) {
-                ErrorCode = -ENOMEM;
-                goto Failure1;
-            }
+            if (DataTransferBuffer == NULL)
+                break;
             memset(DataTransferBuffer, 0, DataTransferLength);
           }
         else if (DataTransferLength < 0)
           {
             DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice,
                                 -DataTransferLength, &DataTransferBufferDMA);
-            if (DataTransferBuffer == NULL) {
-                ErrorCode = -ENOMEM;
-                goto Failure1;
-            }
+            if (DataTransferBuffer == NULL)
+                break;
             if (copy_from_user(DataTransferBuffer,
                                UserCommand.DataTransferBuffer,
                                -DataTransferLength)) {
                 ErrorCode = -EFAULT;
-                goto Failure1;
+                break;
             }
           }
         if (CommandOpcode == DAC960_V1_DCDB)
@@ -6825,8 +6842,7 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
         if (DCDB_IOBUF != NULL)
           pci_free_consistent(Controller->PCIDevice, sizeof(DAC960_V1_DCDB_T),
                         DCDB_IOBUF, DCDB_IOBUFDMA);
-      Failure1a:
-        return ErrorCode;
+        break;
       }
     case DAC960_IOCTL_V2_EXECUTE_COMMAND:
       {
@@ -6844,32 +6860,43 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
         dma_addr_t DataTransferBufferDMA;
         unsigned char *RequestSenseBuffer = NULL;
         dma_addr_t RequestSenseBufferDMA;
-        if (UserSpaceUserCommand == NULL) return -EINVAL;
+
+        ErrorCode = -EINVAL;
+        if (UserSpaceUserCommand == NULL)
+                break;
         if (copy_from_user(&UserCommand, UserSpaceUserCommand,
                            sizeof(DAC960_V2_UserCommand_T))) {
                 ErrorCode = -EFAULT;
-                goto Failure2a;
+                break;
         }
+        ErrorCode = -ENXIO;
         ControllerNumber = UserCommand.ControllerNumber;
         if (ControllerNumber < 0 ||
             ControllerNumber > DAC960_ControllerCount - 1)
-          return -ENXIO;
+                break;
         Controller = DAC960_Controllers[ControllerNumber];
-        if (Controller == NULL) return -ENXIO;
-        if (Controller->FirmwareType != DAC960_V2_Controller) return -EINVAL;
+        if (Controller == NULL)
+                break;
+        if (Controller->FirmwareType != DAC960_V2_Controller){
+                ErrorCode = -EINVAL;
+                break;
+        }
         DataTransferLength = UserCommand.DataTransferLength;
+        ErrorCode = -ENOMEM;
         if (DataTransferLength > 0)
           {
             DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice,
                                 DataTransferLength, &DataTransferBufferDMA);
-            if (DataTransferBuffer == NULL) return -ENOMEM;
+            if (DataTransferBuffer == NULL)
+                break;
             memset(DataTransferBuffer, 0, DataTransferLength);
           }
         else if (DataTransferLength < 0)
           {
             DataTransferBuffer = pci_alloc_consistent(Controller->PCIDevice,
                                 -DataTransferLength, &DataTransferBufferDMA);
-            if (DataTransferBuffer == NULL) return -ENOMEM;
+            if (DataTransferBuffer == NULL)
+                break;
             if (copy_from_user(DataTransferBuffer,
                                UserCommand.DataTransferBuffer,
                                -DataTransferLength)) {
@@ -6979,8 +7006,7 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
         if (RequestSenseBuffer != NULL)
           pci_free_consistent(Controller->PCIDevice, RequestSenseLength,
                 RequestSenseBuffer, RequestSenseBufferDMA);
-      Failure2a:
-        return ErrorCode;
+        break;
       }
     case DAC960_IOCTL_V2_GET_HEALTH_STATUS:
       {
@@ -6990,21 +7016,33 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
         DAC960_V2_HealthStatusBuffer_T HealthStatusBuffer;
         DAC960_Controller_T *Controller;
         int ControllerNumber;
-        if (UserSpaceGetHealthStatus == NULL) return -EINVAL;
+        if (UserSpaceGetHealthStatus == NULL) {
+                ErrorCode = -EINVAL;
+                break;
+        }
         if (copy_from_user(&GetHealthStatus, UserSpaceGetHealthStatus,
-                           sizeof(DAC960_V2_GetHealthStatus_T)))
-                return -EFAULT;
+                           sizeof(DAC960_V2_GetHealthStatus_T))) {
+                ErrorCode = -EFAULT;
+                break;
+        }
+        ErrorCode = -ENXIO;
         ControllerNumber = GetHealthStatus.ControllerNumber;
         if (ControllerNumber < 0 ||
             ControllerNumber > DAC960_ControllerCount - 1)
-          return -ENXIO;
+                    break;
         Controller = DAC960_Controllers[ControllerNumber];
-        if (Controller == NULL) return -ENXIO;
-        if (Controller->FirmwareType != DAC960_V2_Controller) return -EINVAL;
+        if (Controller == NULL)
+                break;
+        if (Controller->FirmwareType != DAC960_V2_Controller) {
+                ErrorCode = -EINVAL;
+                break;
+        }
         if (copy_from_user(&HealthStatusBuffer,
                            GetHealthStatus.HealthStatusBuffer,
-                           sizeof(DAC960_V2_HealthStatusBuffer_T)))
-                return -EFAULT;
+                           sizeof(DAC960_V2_HealthStatusBuffer_T))) {
+                ErrorCode = -EFAULT;
+                break;
+        }
         while (Controller->V2.HealthStatusBuffer->StatusChangeCounter
                == HealthStatusBuffer.StatusChangeCounter &&
                Controller->V2.HealthStatusBuffer->NextEventSequenceNumber
@@ -7012,21 +7050,28 @@ static int DAC960_gam_ioctl(struct inode *inode, struct file *file,
           {
             interruptible_sleep_on_timeout(&Controller->HealthStatusWaitQueue,
                                            DAC960_MonitoringTimerInterval);
-            if (signal_pending(current)) return -EINTR;
+            if (signal_pending(current)) {
+                ErrorCode = -EINTR;
+                break;
+            }
           }
         if (copy_to_user(GetHealthStatus.HealthStatusBuffer,
                          Controller->V2.HealthStatusBuffer,
                          sizeof(DAC960_V2_HealthStatusBuffer_T)))
-                return -EFAULT;
-        return 0;
+                ErrorCode = -EFAULT;
+        else
+                ErrorCode =  0;
       }
+      default:
+        ErrorCode = -ENOTTY;
     }
-  return -EINVAL;
+  unlock_kernel();
+  return ErrorCode;
 }
 
 static const struct file_operations DAC960_gam_fops = {
         .owner          = THIS_MODULE,
-        .ioctl          = DAC960_gam_ioctl
+        .unlocked_ioctl = DAC960_gam_ioctl
 };
 
 static struct miscdevice DAC960_gam_dev = {
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index e8e60e7a2e70..d1de68a31920 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -7,6 +7,7 @@
 #include <linux/hdreg.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/smp_lock.h>
 #include "aoe.h"
 
 enum {
@@ -174,12 +175,16 @@ aoechr_open(struct inode *inode, struct file *filp)
 {
         int n, i;
 
+        lock_kernel();
         n = iminor(inode);
         filp->private_data = (void *) (unsigned long) n;
 
         for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-                if (chardevs[i].minor == n)
+                if (chardevs[i].minor == n) {
+                        unlock_kernel();
                         return 0;
+                }
+        unlock_kernel();
         return -EINVAL;
 }
 
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 41f818be2f7e..2f1746295d06 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1003,7 +1003,7 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
          * Enough people have their dip switches set backwards to
          * warrant a loud message for this special case.
          */
-        aoemajor = be16_to_cpu(get_unaligned(&h->major));
+        aoemajor = get_unaligned_be16(&h->major);
         if (aoemajor == 0xfff) {
                 printk(KERN_ERR "aoe: Warning: shelf address is all ones.  "
                         "Check shelf dip switches.\n");
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index ab86e23ddc69..9d92636350e5 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -162,6 +162,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 #include <linux/pg.h>
 #include <linux/device.h>
 #include <linux/sched.h>        /* current, TASK_* */
+#include <linux/smp_lock.h>
 #include <linux/jiffies.h>
 
 #include <asm/uaccess.h>
@@ -515,12 +516,18 @@ static int pg_open(struct inode *inode, struct file *file)
 {
         int unit = iminor(inode) & 0x7f;
         struct pg *dev = &devices[unit];
+        int ret = 0;
 
-        if ((unit >= PG_UNITS) || (!dev->present))
-                return -ENODEV;
+        lock_kernel();
+        if ((unit >= PG_UNITS) || (!dev->present)) {
+                ret = -ENODEV;
+                goto out;
+        }
 
-        if (test_and_set_bit(0, &dev->access))
-                return -EBUSY;
+        if (test_and_set_bit(0, &dev->access)) {
+                ret = -EBUSY;
+                goto out;
+        }
 
         if (dev->busy) {
                 pg_reset(dev);
@@ -533,12 +540,15 @@ static int pg_open(struct inode *inode, struct file *file)
         if (dev->bufptr == NULL) {
                 clear_bit(0, &dev->access);
                 printk("%s: buffer allocation failed\n", dev->name);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
 
         file->private_data = dev;
 
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int pg_release(struct inode *inode, struct file *file)
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 8b9549ab4a4e..5c74c3574a5a 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -146,6 +146,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
 #include <linux/mtio.h>
 #include <linux/device.h>
 #include <linux/sched.h>        /* current, TASK_*, schedule_timeout() */
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -189,8 +190,7 @@ module_param_array(drive3, int, NULL, 0);
 #define ATAPI_LOG_SENSE         0x4d
 
 static int pt_open(struct inode *inode, struct file *file);
-static int pt_ioctl(struct inode *inode, struct file *file,
-                    unsigned int cmd, unsigned long arg);
+static long pt_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 static int pt_release(struct inode *inode, struct file *file);
 static ssize_t pt_read(struct file *filp, char __user *buf,
                        size_t count, loff_t * ppos);
@@ -236,7 +236,7 @@ static const struct file_operations pt_fops = {
         .owner = THIS_MODULE,
         .read = pt_read,
         .write = pt_write,
-        .ioctl = pt_ioctl,
+        .unlocked_ioctl = pt_ioctl,
         .open = pt_open,
         .release = pt_release,
 };
@@ -650,8 +650,11 @@ static int pt_open(struct inode *inode, struct file *file)
         struct pt_unit *tape = pt + unit;
         int err;
 
-        if (unit >= PT_UNITS || (!tape->present))
+        lock_kernel();
+        if (unit >= PT_UNITS || (!tape->present)) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         err = -EBUSY;
         if (!atomic_dec_and_test(&tape->available))
@@ -678,15 +681,16 @@ static int pt_open(struct inode *inode, struct file *file)
         }
 
         file->private_data = tape;
+        unlock_kernel();
         return 0;
 
 out:
         atomic_inc(&tape->available);
+        unlock_kernel();
         return err;
 }
 
-static int pt_ioctl(struct inode *inode, struct file *file,
-         unsigned int cmd, unsigned long arg)
+static long pt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         struct pt_unit *tape = file->private_data;
         struct mtop __user *p = (void __user *)arg;
@@ -700,23 +704,26 @@ static int pt_ioctl(struct inode *inode, struct file *file,
                 switch (mtop.mt_op) {
 
                 case MTREW:
+                        lock_kernel();
                         pt_rewind(tape);
+                        unlock_kernel();
                         return 0;
 
                 case MTWEOF:
+                        lock_kernel();
                         pt_write_fm(tape);
+                        unlock_kernel();
                         return 0;
 
                 default:
-                        printk("%s: Unimplemented mt_op %d\n", tape->name,
+                        /* FIXME: rate limit ?? */
+                        printk(KERN_DEBUG "%s: Unimplemented mt_op %d\n", tape->name,
                                mtop.mt_op);
                         return -EINVAL;
                 }
 
         default:
-                printk("%s: Unimplemented ioctl 0x%x\n", tape->name, cmd);
-                return -EINVAL;
-
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 3ba1df93e9e3..45bee918c46a 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -49,6 +49,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
+#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
 #include <linux/file.h>
@@ -2079,7 +2080,6 @@ static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd,
         unsigned char buf[64];
         int ret;
 
-        memset(buf, 0, sizeof(buf));
         init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ);
         cgc.sense = &sense;
         cgc.buflen = pd->mode_offset + 12;
@@ -2126,7 +2126,6 @@ static noinline_for_stack int pkt_get_max_speed(struct pktcdvd_device *pd,
         unsigned char *cap_buf;
         int ret, offset;
 
-        memset(buf, 0, sizeof(buf));
         cap_buf = &buf[sizeof(struct mode_page_header) + pd->mode_offset];
         init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_UNKNOWN);
         cgc.sense = &sense;
@@ -2633,11 +2632,12 @@ end_io:
 
 
 
-static int pkt_merge_bvec(struct request_queue *q, struct bio *bio, struct bio_vec *bvec)
+static int pkt_merge_bvec(struct request_queue *q, struct bvec_merge_data *bmd,
+                          struct bio_vec *bvec)
 {
         struct pktcdvd_device *pd = q->queuedata;
-        sector_t zone = ZONE(bio->bi_sector, pd);
-        int used = ((bio->bi_sector - zone) << 9) + bio->bi_size;
+        sector_t zone = ZONE(bmd->bi_sector, pd);
+        int used = ((bmd->bi_sector - zone) << 9) + bmd->bi_size;
         int remaining = (pd->settings.size << 9) - used;
         int remaining2;
 
@@ -2645,7 +2645,7 @@ static int pkt_merge_bvec(struct request_queue *q, struct bio *bio, struct bio_v
          * A bio <= PAGE_SIZE must be allowed. If it crosses a packet
          * boundary, pkt_make_request() will split the bio.
          */
-        remaining2 = PAGE_SIZE - bio->bi_size;
+        remaining2 = PAGE_SIZE - bmd->bi_size;
         remaining = max(remaining, remaining2);
 
         BUG_ON(remaining < 0);
@@ -2796,9 +2796,14 @@ out_mem:
         return ret;
 }
 
-static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data;
+        struct inode *inode = file->f_path.dentry->d_inode;
+        struct pktcdvd_device *pd;
+        long ret;
+
+        lock_kernel();
+        pd = inode->i_bdev->bd_disk->private_data;
 
         VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));
 
@@ -2811,7 +2816,8 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
         case CDROM_LAST_WRITTEN:
         case CDROM_SEND_PACKET:
         case SCSI_IOCTL_SEND_COMMAND:
-                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+                ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+                break;
 
         case CDROMEJECT:
                 /*
@@ -2820,14 +2826,15 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                  */
                 if (pd->refcnt == 1)
                         pkt_lock_door(pd, 0);
-                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+                ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+                break;
 
         default:
                 VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd);
-                return -ENOTTY;
+                ret = -ENOTTY;
         }
-
-        return 0;
+        unlock_kernel();
+        return ret;
 }
 
 static int pkt_media_changed(struct gendisk *disk)
@@ -2849,7 +2856,7 @@ static struct block_device_operations pktcdvd_ops = {
         .owner =                THIS_MODULE,
         .open =                 pkt_open,
         .release =              pkt_close,
-        .ioctl =                pkt_ioctl,
+        .unlocked_ioctl =       pkt_ioctl,
         .media_changed =        pkt_media_changed,
 };
 
@@ -3014,7 +3021,8 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd)
         mutex_unlock(&ctl_mutex);
 }
 
-static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
+                                                unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
         struct pkt_ctrl_command ctrl_cmd;
@@ -3031,16 +3039,22 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm
         case PKT_CTRL_CMD_SETUP:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
+                lock_kernel();
                 ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev);
                 ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev);
+                unlock_kernel();
                 break;
         case PKT_CTRL_CMD_TEARDOWN:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
+                lock_kernel();
                 ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev));
+                unlock_kernel();
                 break;
         case PKT_CTRL_CMD_STATUS:
+                lock_kernel();
                 pkt_get_status(&ctrl_cmd);
+                unlock_kernel();
                 break;
         default:
                 return -ENOTTY;
@@ -3053,7 +3067,7 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm
 
 
 static const struct file_operations pkt_ctl_fops = {
-        .ioctl   = pkt_ctl_ioctl,
+        .unlocked_ioctl  = pkt_ctl_ioctl,
         .owner   = THIS_MODULE,
 };
 
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index f2fff5799ddf..9ae05c584234 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -38,6 +38,7 @@
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/hdreg.h>
+#include <linux/cdrom.h>
 #include <linux/module.h>
 
 #include <xen/xenbus.h>
@@ -153,6 +154,40 @@ static int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)
         return 0;
 }
 
+int blkif_ioctl(struct inode *inode, struct file *filep,
+                unsigned command, unsigned long argument)
+{
+        struct blkfront_info *info =
+                inode->i_bdev->bd_disk->private_data;
+        int i;
+
+        dev_dbg(&info->xbdev->dev, "command: 0x%x, argument: 0x%lx\n",
+                command, (long)argument);
+
+        switch (command) {
+        case CDROMMULTISESSION:
+                dev_dbg(&info->xbdev->dev, "FIXME: support multisession CDs later\n");
+                for (i = 0; i < sizeof(struct cdrom_multisession); i++)
+                        if (put_user(0, (char __user *)(argument + i)))
+                                return -EFAULT;
+                return 0;
+
+        case CDROM_GET_CAPABILITY: {
+                struct gendisk *gd = info->gd;
+                if (gd->flags & GENHD_FL_CD)
+                        return 0;
+                return -EINVAL;
+        }
+
+        default:
+                /*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
+                  command);*/
+                return -EINVAL; /* same return as native Linux */
+        }
+
+        return 0;
+}
+
 /*
  * blkif_queue_request
  *
@@ -324,6 +359,9 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
         /* Make sure buffer addresses are sector-aligned. */
         blk_queue_dma_alignment(rq, 511);
 
+        /* Make sure we don't use bounce buffers. */
+        blk_queue_bounce_limit(rq, BLK_BOUNCE_ANY);
+
         gd->queue = rq;
 
         return 0;
@@ -546,7 +584,7 @@ static int setup_blkring(struct xenbus_device *dev,
 
         info->ring_ref = GRANT_INVALID_REF;
 
-        sring = (struct blkif_sring *)__get_free_page(GFP_KERNEL);
+        sring = (struct blkif_sring *)__get_free_page(GFP_NOIO | __GFP_HIGH);
         if (!sring) {
                 xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring");
                 return -ENOMEM;
@@ -703,7 +741,8 @@ static int blkif_recover(struct blkfront_info *info)
         int j;
 
         /* Stage 1: Make a safe copy of the shadow state. */
-        copy = kmalloc(sizeof(info->shadow), GFP_KERNEL);
+        copy = kmalloc(sizeof(info->shadow),
+                       GFP_NOIO | __GFP_REPEAT | __GFP_HIGH);
         if (!copy)
                 return -ENOMEM;
         memcpy(copy, info->shadow, sizeof(info->shadow));
@@ -959,7 +998,7 @@ static int blkif_release(struct inode *inode, struct file *filep)
                 struct xenbus_device *dev = info->xbdev;
                 enum xenbus_state state = xenbus_read_driver_state(dev->otherend);
 
-                if (state == XenbusStateClosing)
+                if (state == XenbusStateClosing && info->is_ready)
                         blkfront_closing(dev);
         }
         return 0;
@@ -971,6 +1010,7 @@ static struct block_device_operations xlvbd_block_fops =
         .open = blkif_open,
         .release = blkif_release,
         .getgeo = blkif_getgeo,
+        .ioctl = blkif_ioctl,
 };
 
 
@@ -1006,7 +1046,7 @@ static int __init xlblk_init(void)
 module_init(xlblk_init);
 
 
-static void xlblk_exit(void)
+static void __exit xlblk_exit(void)
 {
         return xenbus_unregister_driver(&blkfront);
 }
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 0638730a4a19..d97700aa54a9 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -28,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
@@ -263,9 +264,11 @@ static int vhci_open(struct inode *inode, struct file *file)
         skb_queue_head_init(&data->readq);
         init_waitqueue_head(&data->read_wait);
 
+        lock_kernel();
         hdev = hci_alloc_dev();
         if (!hdev) {
                 kfree(data);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -286,10 +289,12 @@ static int vhci_open(struct inode *inode, struct file *file)
                 BT_ERR("Can't register HCI device");
                 kfree(data);
                 hci_free_dev(hdev);
+                unlock_kernel();
                 return -EBUSY;
         }
 
         file->private_data = data;
+        unlock_kernel();
 
         return nonseekable_open(inode, file);
 }
@@ -313,18 +318,21 @@ static int vhci_release(struct inode *inode, struct file *file)
 static int vhci_fasync(int fd, struct file *file, int on)
 {
         struct vhci_data *data = file->private_data;
-        int err;
+        int err = 0;
 
+        lock_kernel();
         err = fasync_helper(fd, file, on, &data->fasync);
         if (err < 0)
-                return err;
+                goto out;
 
         if (on)
                 data->flags |= VHCI_FASYNC;
         else
                 data->flags &= ~VHCI_FASYNC;
 
-        return 0;
+out:
+        unlock_kernel();
+        return err;
 }
 
 static const struct file_operations vhci_fops = {
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 69f26eb6415b..a5da35632651 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -461,37 +461,27 @@ int cdrom_get_media_event(struct cdrom_device_info *cdi,
                           struct media_event_desc *med)
 {
         struct packet_command cgc;
-        unsigned char *buffer;
-        struct event_header *eh;
-        int ret = 1;
-
-        buffer = kmalloc(8, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
+        unsigned char buffer[8];
+        struct event_header *eh = (struct event_header *) buffer;
 
-        eh = (struct event_header *)buffer;
-
-        init_cdrom_command(&cgc, buffer, 8, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
         cgc.cmd[0] = GPCMD_GET_EVENT_STATUS_NOTIFICATION;
         cgc.cmd[1] = 1;         /* IMMED */
         cgc.cmd[4] = 1 << 4;    /* media event */
-        cgc.cmd[8] = 8;
+        cgc.cmd[8] = sizeof(buffer);
         cgc.quiet = 1;
 
         if (cdi->ops->generic_packet(cdi, &cgc))
-                goto err;
+                return 1;
 
         if (be16_to_cpu(eh->data_len) < sizeof(*med))
-                goto err;
+                return 1;
 
         if (eh->nea || eh->notification_class != 0x4)
-                goto err;
+                return 1;
 
-        memcpy(med, buffer + sizeof(*eh), sizeof(*med));
-        ret = 0;
-err:
-        kfree(buffer);
-        return ret;
+        memcpy(med, &buffer[sizeof(*eh)], sizeof(*med));
+        return 0;
 }
 
 /*
@@ -501,82 +491,68 @@ err:
 static int cdrom_mrw_probe_pc(struct cdrom_device_info *cdi)
 {
         struct packet_command cgc;
-        char *buffer;
-        int ret = 1;
-
-        buffer = kmalloc(16, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
+        char buffer[16];
 
-        init_cdrom_command(&cgc, buffer, 16, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
 
         cgc.timeout = HZ;
         cgc.quiet = 1;
 
         if (!cdrom_mode_sense(cdi, &cgc, MRW_MODE_PC, 0)) {
                 cdi->mrw_mode_page = MRW_MODE_PC;
-                ret = 0;
+                return 0;
         } else if (!cdrom_mode_sense(cdi, &cgc, MRW_MODE_PC_PRE1, 0)) {
                 cdi->mrw_mode_page = MRW_MODE_PC_PRE1;
-                ret = 0;
+                return 0;
         }
-        kfree(buffer);
-        return ret;
+
+        return 1;
 }
 
 static int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write)
 {
         struct packet_command cgc;
         struct mrw_feature_desc *mfd;
-        unsigned char *buffer;
+        unsigned char buffer[16];
         int ret;
 
         *write = 0;
-        buffer = kmalloc(16, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
 
-        init_cdrom_command(&cgc, buffer, 16, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
 
         cgc.cmd[0] = GPCMD_GET_CONFIGURATION;
         cgc.cmd[3] = CDF_MRW;
-        cgc.cmd[8] = 16;
+        cgc.cmd[8] = sizeof(buffer);
         cgc.quiet = 1;
 
         if ((ret = cdi->ops->generic_packet(cdi, &cgc)))
-                goto err;
+                return ret;
 
         mfd = (struct mrw_feature_desc *)&buffer[sizeof(struct feature_header)];
-        if (be16_to_cpu(mfd->feature_code) != CDF_MRW) {
-                ret = 1;
-                goto err;
-        }
+        if (be16_to_cpu(mfd->feature_code) != CDF_MRW)
+                return 1;
         *write = mfd->write;
 
         if ((ret = cdrom_mrw_probe_pc(cdi))) {
                 *write = 0;
+                return ret;
         }
-err:
-        kfree(buffer);
-        return ret;
+
+        return 0;
 }
 
 static int cdrom_mrw_bgformat(struct cdrom_device_info *cdi, int cont)
 {
         struct packet_command cgc;
-        unsigned char *buffer;
+        unsigned char buffer[12];
         int ret;
 
         printk(KERN_INFO "cdrom: %sstarting format\n", cont ? "Re" : "");
 
-        buffer = kmalloc(12, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
         /*
          * FmtData bit set (bit 4), format type is 1
          */
-        init_cdrom_command(&cgc, buffer, 12, CGC_DATA_WRITE);
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_WRITE);
         cgc.cmd[0] = GPCMD_FORMAT_UNIT;
         cgc.cmd[1] = (1 << 4) | 1;
 
@@ -603,7 +579,6 @@ static int cdrom_mrw_bgformat(struct cdrom_device_info *cdi, int cont)
         if (ret)
                 printk(KERN_INFO "cdrom: bgformat failed\n");
 
-        kfree(buffer);
         return ret;
 }
 
@@ -663,17 +638,16 @@ static int cdrom_mrw_set_lba_space(struct cdrom_device_info *cdi, int space)
 {
         struct packet_command cgc;
         struct mode_page_header *mph;
-        char *buffer;
+        char buffer[16];
         int ret, offset, size;
 
-        buffer = kmalloc(16, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
 
-        init_cdrom_command(&cgc, buffer, 16, CGC_DATA_READ);
+        cgc.buffer = buffer;
+        cgc.buflen = sizeof(buffer);
 
         if ((ret = cdrom_mode_sense(cdi, &cgc, cdi->mrw_mode_page, 0)))
-                goto err;
+                return ret;
 
         mph = (struct mode_page_header *) buffer;
         offset = be16_to_cpu(mph->desc_length);
@@ -683,70 +657,55 @@ static int cdrom_mrw_set_lba_space(struct cdrom_device_info *cdi, int space)
         cgc.buflen = size;
 
         if ((ret = cdrom_mode_select(cdi, &cgc)))
-                goto err;
+                return ret;
 
         printk(KERN_INFO "cdrom: %s: mrw address space %s selected\n", cdi->name, mrw_address_space[space]);
-        ret = 0;
-err:
-        kfree(buffer);
-        return ret;
+        return 0;
 }
 
 static int cdrom_get_random_writable(struct cdrom_device_info *cdi,
                               struct rwrt_feature_desc *rfd)
 {
         struct packet_command cgc;
-        char *buffer;
+        char buffer[24];
         int ret;
 
-        buffer = kmalloc(24, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
-        init_cdrom_command(&cgc, buffer, 24, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
 
         cgc.cmd[0] = GPCMD_GET_CONFIGURATION;   /* often 0x46 */
         cgc.cmd[3] = CDF_RWRT;                  /* often 0x0020 */
-        cgc.cmd[8] = 24;                        /* often 0x18 */
+        cgc.cmd[8] = sizeof(buffer);            /* often 0x18 */
         cgc.quiet = 1;
 
         if ((ret = cdi->ops->generic_packet(cdi, &cgc)))
-                goto err;
+                return ret;
 
         memcpy(rfd, &buffer[sizeof(struct feature_header)], sizeof (*rfd));
-        ret = 0;
-err:
-        kfree(buffer);
-        return ret;
+        return 0;
 }
 
 static int cdrom_has_defect_mgt(struct cdrom_device_info *cdi)
 {
         struct packet_command cgc;
-        char *buffer;
+        char buffer[16];
         __be16 *feature_code;
         int ret;
 
-        buffer = kmalloc(16, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
-        init_cdrom_command(&cgc, buffer, 16, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
 
         cgc.cmd[0] = GPCMD_GET_CONFIGURATION;
         cgc.cmd[3] = CDF_HWDM;
-        cgc.cmd[8] = 16;
+        cgc.cmd[8] = sizeof(buffer);
         cgc.quiet = 1;
 
         if ((ret = cdi->ops->generic_packet(cdi, &cgc)))
-                goto err;
+                return ret;
 
         feature_code = (__be16 *) &buffer[sizeof(struct feature_header)];
         if (be16_to_cpu(*feature_code) == CDF_HWDM)
-                ret = 0;
-err:
-        kfree(buffer);
-        return ret;
+                return 0;
+
+        return 1;
 }
 
 
@@ -837,14 +796,10 @@ static int cdrom_mrw_open_write(struct cdrom_device_info *cdi)
 static int mo_open_write(struct cdrom_device_info *cdi)
 {
         struct packet_command cgc;
-        char *buffer;
+        char buffer[255];
         int ret;
 
-        buffer = kmalloc(255, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
-        init_cdrom_command(&cgc, buffer, 4, CGC_DATA_READ);
+        init_cdrom_command(&cgc, &buffer, 4, CGC_DATA_READ);
         cgc.quiet = 1;
 
         /*
@@ -861,15 +816,10 @@ static int mo_open_write(struct cdrom_device_info *cdi)
         }
 
         /* drive gave us no info, let the user go ahead */
-        if (ret) {
-                ret = 0;
-                goto err;
-        }
+        if (ret)
+                return 0;
 
-        ret = buffer[3] & 0x80;
-err:
-        kfree(buffer);
-        return ret;
+        return buffer[3] & 0x80;
 }
 
 static int cdrom_ram_open_write(struct cdrom_device_info *cdi)
@@ -892,19 +842,15 @@ static int cdrom_ram_open_write(struct cdrom_device_info *cdi)
 static void cdrom_mmc3_profile(struct cdrom_device_info *cdi)
 {
         struct packet_command cgc;
-        char *buffer;
+        char buffer[32];
         int ret, mmc3_profile;
 
-        buffer = kmalloc(32, GFP_KERNEL);
-        if (!buffer)
-                return;
-
-        init_cdrom_command(&cgc, buffer, 32, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
 
         cgc.cmd[0] = GPCMD_GET_CONFIGURATION;
         cgc.cmd[1] = 0;
         cgc.cmd[2] = cgc.cmd[3] = 0;            /* Starting Feature Number */
-        cgc.cmd[8] = 32;                        /* Allocation Length */
+        cgc.cmd[8] = sizeof(buffer);            /* Allocation Length */
         cgc.quiet = 1;
 
         if ((ret = cdi->ops->generic_packet(cdi, &cgc)))
@@ -913,7 +859,6 @@ static void cdrom_mmc3_profile(struct cdrom_device_info *cdi)
                 mmc3_profile = (buffer[6] << 8) | buffer[7];
 
         cdi->mmc3_profile = mmc3_profile;
-        kfree(buffer);
 }
 
 static int cdrom_is_dvd_rw(struct cdrom_device_info *cdi)
@@ -1628,15 +1573,12 @@ static void setup_send_key(struct packet_command *cgc, unsigned agid, unsigned t
 static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
 {
         int ret;
-        u_char *buf;
+        u_char buf[20];
         struct packet_command cgc;
         struct cdrom_device_ops *cdo = cdi->ops;
-        rpc_state_t *rpc_state;
-
-        buf = kzalloc(20, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
+        rpc_state_t rpc_state;
 
+        memset(buf, 0, sizeof(buf));
         init_cdrom_command(&cgc, buf, 0, CGC_DATA_READ);
 
         switch (ai->type) {
@@ -1647,7 +1589,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 setup_report_key(&cgc, ai->lsa.agid, 0);
 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
 
                 ai->lsa.agid = buf[7] >> 6;
                 /* Returning data, let host change state */
@@ -1658,7 +1600,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 setup_report_key(&cgc, ai->lsk.agid, 2);
 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
 
                 copy_key(ai->lsk.key, &buf[4]);
                 /* Returning data, let host change state */
@@ -1669,7 +1611,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 setup_report_key(&cgc, ai->lsc.agid, 1);
 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
 
                 copy_chal(ai->lsc.chal, &buf[4]);
                 /* Returning data, let host change state */
@@ -1686,7 +1628,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 cgc.cmd[2] = ai->lstk.lba >> 24;
 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
 
                 ai->lstk.cpm = (buf[4] >> 7) & 1;
                 ai->lstk.cp_sec = (buf[4] >> 6) & 1;
@@ -1700,7 +1642,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 setup_report_key(&cgc, ai->lsasf.agid, 5);
                 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
 
                 ai->lsasf.asf = buf[7] & 1;
                 break;
@@ -1713,7 +1655,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 copy_chal(&buf[4], ai->hsc.chal);
 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
 
                 ai->type = DVD_LU_SEND_KEY1;
                 break;
@@ -1726,7 +1668,7 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
 
                 if ((ret = cdo->generic_packet(cdi, &cgc))) {
                         ai->type = DVD_AUTH_FAILURE;
-                        goto err;
+                        return ret;
                 }
                 ai->type = DVD_AUTH_ESTABLISHED;
                 break;
@@ -1737,23 +1679,24 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 cdinfo(CD_DVD, "entering DVD_INVALIDATE_AGID\n"); 
                 setup_report_key(&cgc, ai->lsa.agid, 0x3f);
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
                 break;
 
         /* Get region settings */
         case DVD_LU_SEND_RPC_STATE:
                 cdinfo(CD_DVD, "entering DVD_LU_SEND_RPC_STATE\n");
                 setup_report_key(&cgc, 0, 8);
+                memset(&rpc_state, 0, sizeof(rpc_state_t));
+                cgc.buffer = (char *) &rpc_state;
 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
 
-                rpc_state = (rpc_state_t *)buf;
-                ai->lrpcs.type = rpc_state->type_code;
-                ai->lrpcs.vra = rpc_state->vra;
-                ai->lrpcs.ucca = rpc_state->ucca;
-                ai->lrpcs.region_mask = rpc_state->region_mask;
-                ai->lrpcs.rpc_scheme = rpc_state->rpc_scheme;
+                ai->lrpcs.type = rpc_state.type_code;
+                ai->lrpcs.vra = rpc_state.vra;
+                ai->lrpcs.ucca = rpc_state.ucca;
+                ai->lrpcs.region_mask = rpc_state.region_mask;
+                ai->lrpcs.rpc_scheme = rpc_state.rpc_scheme;
                 break;
 
         /* Set region settings */
@@ -1764,23 +1707,20 @@ static int dvd_do_auth(struct cdrom_device_info *cdi, dvd_authinfo *ai)
                 buf[4] = ai->hrpcs.pdrc;
 
                 if ((ret = cdo->generic_packet(cdi, &cgc)))
-                        goto err;
+                        return ret;
                 break;
 
         default:
                 cdinfo(CD_WARNING, "Invalid DVD key ioctl (%d)\n", ai->type);
-                ret = -ENOTTY;
-                goto err;
+                return -ENOTTY;
         }
-        ret = 0;
-err:
-        kfree(buf);
-        return ret;
+
+        return 0;
 }
 
 static int dvd_read_physical(struct cdrom_device_info *cdi, dvd_struct *s)
 {
-        unsigned char *buf, *base;
+        unsigned char buf[21], *base;
         struct dvd_layer *layer;
         struct packet_command cgc;
         struct cdrom_device_ops *cdo = cdi->ops;
@@ -1789,11 +1729,7 @@ static int dvd_read_physical(struct cdrom_device_info *cdi, dvd_struct *s)
         if (layer_num >= DVD_LAYERS)
                 return -EINVAL;
 
-        buf = kmalloc(21, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        init_cdrom_command(&cgc, buf, 21, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ);
         cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE;
         cgc.cmd[6] = layer_num;
         cgc.cmd[7] = s->type;
@@ -1805,7 +1741,7 @@ static int dvd_read_physical(struct cdrom_device_info *cdi, dvd_struct *s)
         cgc.quiet = 1;
 
         if ((ret = cdo->generic_packet(cdi, &cgc)))
-                goto err;
+                return ret;
 
         base = &buf[4];
         layer = &s->physical.layer[layer_num];
@@ -1829,24 +1765,17 @@ static int dvd_read_physical(struct cdrom_device_info *cdi, dvd_struct *s)
         layer->end_sector_l0 = base[13] << 16 | base[14] << 8 | base[15];
         layer->bca = base[16] >> 7;
 
-        ret = 0;
-err:
-        kfree(buf);
-        return ret;
+        return 0;
 }
 
 static int dvd_read_copyright(struct cdrom_device_info *cdi, dvd_struct *s)
 {
         int ret;
-        u_char *buf;
+        u_char buf[8];
         struct packet_command cgc;
         struct cdrom_device_ops *cdo = cdi->ops;
 
-        buf = kmalloc(8, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        init_cdrom_command(&cgc, buf, 8, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ);
         cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE;
         cgc.cmd[6] = s->copyright.layer_num;
         cgc.cmd[7] = s->type;
@@ -1854,15 +1783,12 @@ static int dvd_read_copyright(struct cdrom_device_info *cdi, dvd_struct *s)
         cgc.cmd[9] = cgc.buflen & 0xff;
 
         if ((ret = cdo->generic_packet(cdi, &cgc)))
-                goto err;
+                return ret;
 
         s->copyright.cpst = buf[4];
         s->copyright.rmi = buf[5];
 
-        ret = 0;
-err:
-        kfree(buf);
-        return ret;
+        return 0;
 }
 
 static int dvd_read_disckey(struct cdrom_device_info *cdi, dvd_struct *s)
@@ -1894,33 +1820,26 @@ static int dvd_read_disckey(struct cdrom_device_info *cdi, dvd_struct *s)
 static int dvd_read_bca(struct cdrom_device_info *cdi, dvd_struct *s)
 {
         int ret;
-        u_char *buf;
+        u_char buf[4 + 188];
         struct packet_command cgc;
         struct cdrom_device_ops *cdo = cdi->ops;
 
-        buf = kmalloc(4 + 188, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        init_cdrom_command(&cgc, buf, 4 + 188, CGC_DATA_READ);
+        init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ);
         cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE;
         cgc.cmd[7] = s->type;
         cgc.cmd[9] = cgc.buflen & 0xff;
 
         if ((ret = cdo->generic_packet(cdi, &cgc)))
-                goto err;
+                return ret;
 
         s->bca.len = buf[0] << 8 | buf[1];
         if (s->bca.len < 12 || s->bca.len > 188) {
                 cdinfo(CD_WARNING, "Received invalid BCA length (%d)\n", s->bca.len);
-                ret = -EIO;
-                goto err;
+                return -EIO;
         }
         memcpy(s->bca.value, &buf[4], s->bca.len);
-        ret = 0;
-err:
-        kfree(buf);
-        return ret;
+
+        return 0;
 }
 
 static int dvd_read_manufact(struct cdrom_device_info *cdi, dvd_struct *s)
@@ -2020,13 +1939,9 @@ static int cdrom_read_subchannel(struct cdrom_device_info *cdi,
 {
         struct cdrom_device_ops *cdo = cdi->ops;
         struct packet_command cgc;
-        char *buffer;
+        char buffer[32];
         int ret;
 
-        buffer = kmalloc(32, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
         init_cdrom_command(&cgc, buffer, 16, CGC_DATA_READ);
         cgc.cmd[0] = GPCMD_READ_SUBCHANNEL;
         cgc.cmd[1] = 2;     /* MSF addressing */
@@ -2035,7 +1950,7 @@ static int cdrom_read_subchannel(struct cdrom_device_info *cdi,
         cgc.cmd[8] = 16;
 
         if ((ret = cdo->generic_packet(cdi, &cgc)))
-                goto err;
+                return ret;
 
         subchnl->cdsc_audiostatus = cgc.buffer[1];
         subchnl->cdsc_format = CDROM_MSF;
@@ -2050,10 +1965,7 @@ static int cdrom_read_subchannel(struct cdrom_device_info *cdi,
         subchnl->cdsc_absaddr.msf.second = cgc.buffer[10];
         subchnl->cdsc_absaddr.msf.frame = cgc.buffer[11];
 
-        ret = 0;
-err:
-        kfree(buffer);
-        return ret;
+        return 0;
 }
 
 /*
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d38ac5030763..0e0d12a06462 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -102,7 +102,6 @@ obj-$(CONFIG_TELCLOCK)		+= tlclk.o
 
 obj-$(CONFIG_MWAVE)             += mwave/
 obj-$(CONFIG_AGP)               += agp/
-obj-$(CONFIG_DRM)               += drm/
 obj-$(CONFIG_PCMCIA)            += pcmcia/
 obj-$(CONFIG_IPMI_HANDLER)      += ipmi/
 
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 13665db363d6..481ffe87c716 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -16,28 +16,9 @@
 #include <asm/page.h>           /* PAGE_SIZE */
 #include <asm/e820.h>
 #include <asm/k8.h>
+#include <asm/gart.h>
 #include "agp.h"
 
-/* PTE bits. */
-#define GPTE_VALID      1
-#define GPTE_COHERENT   2
-
-/* Aperture control register bits. */
-#define GARTEN          (1<<0)
-#define DISGARTCPU      (1<<4)
-#define DISGARTIO       (1<<5)
-
-/* GART cache control register bits. */
-#define INVGART         (1<<0)
-#define GARTPTEERR      (1<<1)
-
-/* K8 On-cpu GART registers */
-#define AMD64_GARTAPERTURECTL   0x90
-#define AMD64_GARTAPERTUREBASE  0x94
-#define AMD64_GARTTABLEBASE     0x98
-#define AMD64_GARTCACHECTL      0x9c
-#define AMD64_GARTEN            (1<<0)
-
 /* NVIDIA K8 registers */
 #define NVIDIA_X86_64_0_APBASE          0x10
 #define NVIDIA_X86_64_1_APBASE1         0x50
@@ -165,29 +146,18 @@ static int amd64_fetch_size(void)
  * In a multiprocessor x86-64 system, this function gets
  * called once for each CPU.
  */
-static u64 amd64_configure (struct pci_dev *hammer, u64 gatt_table)
+static u64 amd64_configure(struct pci_dev *hammer, u64 gatt_table)
 {
         u64 aperturebase;
         u32 tmp;
-        u64 addr, aper_base;
+        u64 aper_base;
 
         /* Address to map to */
-        pci_read_config_dword (hammer, AMD64_GARTAPERTUREBASE, &tmp);
+        pci_read_config_dword(hammer, AMD64_GARTAPERTUREBASE, &tmp);
         aperturebase = tmp << 25;
         aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK);
 
-        /* address of the mappings table */
-        addr = (u64) gatt_table;
-        addr >>= 12;
-        tmp = (u32) addr<<4;
-        tmp &= ~0xf;
-        pci_write_config_dword (hammer, AMD64_GARTTABLEBASE, tmp);
-
-        /* Enable GART translation for this hammer. */
-        pci_read_config_dword(hammer, AMD64_GARTAPERTURECTL, &tmp);
-        tmp |= GARTEN;
-        tmp &= ~(DISGARTCPU | DISGARTIO);
-        pci_write_config_dword(hammer, AMD64_GARTAPERTURECTL, tmp);
+        enable_gart_translation(hammer, gatt_table);
 
         return aper_base;
 }
@@ -226,9 +196,9 @@ static void amd64_cleanup(void)
         for (i = 0; i < num_k8_northbridges; i++) {
                 struct pci_dev *dev = k8_northbridges[i];
                 /* disable gart translation */
-                pci_read_config_dword (dev, AMD64_GARTAPERTURECTL, &tmp);
+                pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &tmp);
                 tmp &= ~AMD64_GARTEN;
-                pci_write_config_dword (dev, AMD64_GARTAPERTURECTL, tmp);
+                pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, tmp);
         }
 }
 
@@ -258,24 +228,10 @@ static const struct agp_bridge_driver amd_8151_driver = {
 };
 
 /* Some basic sanity checks for the aperture. */
-static int __devinit aperture_valid(u64 aper, u32 size)
+static int __devinit agp_aperture_valid(u64 aper, u32 size)
 {
-        if (aper == 0) {
-                printk(KERN_ERR PFX "No aperture\n");
-                return 0;
-        }
-        if (size < 32*1024*1024) {
-                printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20);
-                return 0;
-        }
-       if ((u64)aper + size > 0x100000000ULL) {
-                printk(KERN_ERR PFX "Aperture out of bounds\n");
+        if (!aperture_valid(aper, size, 32*1024*1024))
                 return 0;
-        }
-        if (e820_any_mapped(aper, aper + size, E820_RAM)) {
-                printk(KERN_ERR PFX "Aperture pointing to RAM\n");
-                return 0;
-        }
 
         /* Request the Aperture. This catches cases when someone else
            already put a mapping in there - happens with some very broken BIOS
@@ -308,11 +264,11 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
         u32 nb_order, nb_base;
         u16 apsize;
 
-        pci_read_config_dword(nb, 0x90, &nb_order);
+        pci_read_config_dword(nb, AMD64_GARTAPERTURECTL, &nb_order);
         nb_order = (nb_order >> 1) & 7;
-        pci_read_config_dword(nb, 0x94, &nb_base);
+        pci_read_config_dword(nb, AMD64_GARTAPERTUREBASE, &nb_base);
         nb_aper = nb_base << 25;
-        if (aperture_valid(nb_aper, (32*1024*1024)<<nb_order)) {
+        if (agp_aperture_valid(nb_aper, (32*1024*1024)<<nb_order)) {
                 return 0;
         }
 
@@ -331,12 +287,23 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
         pci_read_config_dword(agp, 0x10, &aper_low);
         pci_read_config_dword(agp, 0x14, &aper_hi);
         aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32);
+
+        /*
+         * On some sick chips APSIZE is 0. This means it wants 4G
+         * so let double check that order, and lets trust the AMD NB settings
+         */
+        if (order >=0 && aper + (32ULL<<(20 + order)) > 0x100000000ULL) {
+                printk(KERN_INFO "Aperture size %u MB is not right, using settings from NB\n",
+                                  32 << order);
+                order = nb_order;
+        }
+
         printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order);
-        if (order < 0 || !aperture_valid(aper, (32*1024*1024)<<order))
+        if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order))
                 return -1;
 
-        pci_write_config_dword(nb, 0x90, order << 1);
-        pci_write_config_dword(nb, 0x94, aper >> 25);
+        pci_write_config_dword(nb, AMD64_GARTAPERTURECTL, order << 1);
+        pci_write_config_dword(nb, AMD64_GARTAPERTUREBASE, aper >> 25);
 
         return 0;
 }
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index e6cb1ab03e06..a96f3197e60f 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -39,6 +39,7 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include "agp.h"
@@ -677,6 +678,7 @@ static int agp_open(struct inode *inode, struct file *file)
         struct agp_client *client;
         int rc = -ENXIO;
 
+        lock_kernel();
         mutex_lock(&(agp_fe.agp_mutex));
 
         if (minor != AGPGART_MINOR)
@@ -703,12 +705,14 @@ static int agp_open(struct inode *inode, struct file *file)
         agp_insert_file_private(priv);
         DBG("private=%p, client=%p", priv, client);
         mutex_unlock(&(agp_fe.agp_mutex));
+        unlock_kernel();
         return 0;
 
 err_out_nomem:
         rc = -ENOMEM;
 err_out:
         mutex_unlock(&(agp_fe.agp_mutex));
+        unlock_kernel();
         return rc;
 }
 
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index cdd876dbb2b0..da8a1658a273 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/poll.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/miscdevice.h>
@@ -416,6 +417,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
+        lock_kernel();
         as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
@@ -435,6 +437,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 
                 filp->private_data = as;
         }
+        unlock_kernel();
 
         return as ? 0 : -ENOMEM;
 }
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index b6f2639f903d..d8cff909001c 100644
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
@@ -6,6 +6,7 @@
 
 #include <linux/module.h>
 
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/tty.h>
@@ -67,11 +68,15 @@ static void set_led(char state)
 
 static int briq_panel_open(struct inode *ino, struct file *filep)
 {
-        /* enforce single access */
-        if (vfd_is_open)
+        lock_kernel();
+        /* enforce single access, vfd_is_open is protected by BKL */
+        if (vfd_is_open) {
+                unlock_kernel();
                 return -EBUSY;
+        }
         vfd_is_open = 1;
 
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c
index c0a4a0bb509e..04ba906b4880 100644
--- a/drivers/char/cs5535_gpio.c
+++ b/drivers/char/cs5535_gpio.c
@@ -17,6 +17,7 @@
 #include <linux/cdev.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -157,6 +158,7 @@ static int cs5535_gpio_open(struct inode *inode, struct file *file)
 {
         u32 m = iminor(inode);
 
+        cycle_kernel_lock();
         /* the mask says which pins are usable by this driver */
         if ((mask & (1 << m)) == 0)
                 return -EINVAL;
diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
deleted file mode 100644
index 1283ded88ead..000000000000
--- a/drivers/char/drm/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Makefile for the drm device driver.  This driver provides support for the
-# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
-
-drm-objs    :=  drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
-                drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \
-                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
-                drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-                drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o
-
-tdfx-objs   := tdfx_drv.o
-r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
-mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
-i810-objs   := i810_drv.o i810_dma.o
-i830-objs   := i830_drv.o i830_dma.o i830_irq.o
-i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
-radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
-sis-objs    := sis_drv.o sis_mm.o
-savage-objs := savage_drv.o savage_bci.o savage_state.o
-via-objs    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
-
-ifeq ($(CONFIG_COMPAT),y)
-drm-objs    += drm_ioc32.o
-radeon-objs += radeon_ioc32.o
-mga-objs    += mga_ioc32.o
-r128-objs   += r128_ioc32.o
-i915-objs   += i915_ioc32.o
-endif
-
-obj-$(CONFIG_DRM)       += drm.o
-obj-$(CONFIG_DRM_TDFX)  += tdfx.o
-obj-$(CONFIG_DRM_R128)  += r128.o
-obj-$(CONFIG_DRM_RADEON)+= radeon.o
-obj-$(CONFIG_DRM_MGA)   += mga.o
-obj-$(CONFIG_DRM_I810)  += i810.o
-obj-$(CONFIG_DRM_I830)  += i830.o
-obj-$(CONFIG_DRM_I915)  += i915.o
-obj-$(CONFIG_DRM_SIS)   += sis.o
-obj-$(CONFIG_DRM_SAVAGE)+= savage.o
-obj-$(CONFIG_DRM_VIA)   +=via.o
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
deleted file mode 100644
index 38d3c6b8276a..000000000000
--- a/drivers/char/drm/drm.h
+++ /dev/null
@@ -1,694 +0,0 @@
-/**
- * \file drm.h
- * Header for the Direct Rendering Manager
- *
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- *
- * \par Acknowledgments:
- * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic \c cmpxchg.
- */
-
-/*
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _DRM_H_
-#define _DRM_H_
-
-#if defined(__linux__)
-#if defined(__KERNEL__)
-#endif
-#include <asm/ioctl.h>          /* For _IO* macros */
-#define DRM_IOCTL_NR(n)         _IOC_NR(n)
-#define DRM_IOC_VOID            _IOC_NONE
-#define DRM_IOC_READ            _IOC_READ
-#define DRM_IOC_WRITE           _IOC_WRITE
-#define DRM_IOC_READWRITE       _IOC_READ|_IOC_WRITE
-#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__) && defined(IN_MODULE)
-/* Prevent name collision when including sys/ioccom.h */
-#undef ioctl
-#include <sys/ioccom.h>
-#define ioctl(a,b,c)            xf86ioctl(a,b,c)
-#else
-#include <sys/ioccom.h>
-#endif                          /* __FreeBSD__ && xf86ioctl */
-#define DRM_IOCTL_NR(n)         ((n) & 0xff)
-#define DRM_IOC_VOID            IOC_VOID
-#define DRM_IOC_READ            IOC_OUT
-#define DRM_IOC_WRITE           IOC_IN
-#define DRM_IOC_READWRITE       IOC_INOUT
-#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#endif
-
-#define DRM_MAJOR       226
-#define DRM_MAX_MINOR   15
-
-#define DRM_NAME        "drm"     /**< Name in kernel, /dev, and /proc */
-#define DRM_MIN_ORDER   5         /**< At least 2^5 bytes = 32 bytes */
-#define DRM_MAX_ORDER   22        /**< Up to 2^22 bytes = 4MB */
-#define DRM_RAM_PERCENT 10        /**< How much system ram can we lock? */
-
-#define _DRM_LOCK_HELD  0x80000000U /**< Hardware lock is held */
-#define _DRM_LOCK_CONT  0x40000000U /**< Hardware lock is contended */
-#define _DRM_LOCK_IS_HELD(lock)    ((lock) & _DRM_LOCK_HELD)
-#define _DRM_LOCK_IS_CONT(lock)    ((lock) & _DRM_LOCK_CONT)
-#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
-
-typedef unsigned int drm_handle_t;
-typedef unsigned int drm_context_t;
-typedef unsigned int drm_drawable_t;
-typedef unsigned int drm_magic_t;
-
-/**
- * Cliprect.
- *
- * \warning: If you change this structure, make sure you change
- * XF86DRIClipRectRec in the server as well
- *
- * \note KW: Actually it's illegal to change either for
- * backwards-compatibility reasons.
- */
-struct drm_clip_rect {
-        unsigned short x1;
-        unsigned short y1;
-        unsigned short x2;
-        unsigned short y2;
-};
-
-/**
- * Drawable information.
- */
-struct drm_drawable_info {
-        unsigned int num_rects;
-        struct drm_clip_rect *rects;
-};
-
-/**
- * Texture region,
- */
-struct drm_tex_region {
-        unsigned char next;
-        unsigned char prev;
-        unsigned char in_use;
-        unsigned char padding;
-        unsigned int age;
-};
-
-/**
- * Hardware lock.
- *
- * The lock structure is a simple cache-line aligned integer.  To avoid
- * processor bus contention on a multiprocessor system, there should not be any
- * other data stored in the same cache line.
- */
-struct drm_hw_lock {
-        __volatile__ unsigned int lock;         /**< lock variable */
-        char padding[60];                       /**< Pad to cache line */
-};
-
-/**
- * DRM_IOCTL_VERSION ioctl argument type.
- *
- * \sa drmGetVersion().
- */
-struct drm_version {
-        int version_major;        /**< Major version */
-        int version_minor;        /**< Minor version */
-        int version_patchlevel;   /**< Patch level */
-        size_t name_len;          /**< Length of name buffer */
-        char __user *name;        /**< Name of driver */
-        size_t date_len;          /**< Length of date buffer */
-        char __user *date;        /**< User-space buffer to hold date */
-        size_t desc_len;          /**< Length of desc buffer */
-        char __user *desc;        /**< User-space buffer to hold desc */
-};
-
-/**
- * DRM_IOCTL_GET_UNIQUE ioctl argument type.
- *
- * \sa drmGetBusid() and drmSetBusId().
- */
-struct drm_unique {
-        size_t unique_len;        /**< Length of unique */
-        char __user *unique;      /**< Unique name for driver instantiation */
-};
-
-struct drm_list {
-        int count;                /**< Length of user-space structures */
-        struct drm_version __user *version;
-};
-
-struct drm_block {
-        int unused;
-};
-
-/**
- * DRM_IOCTL_CONTROL ioctl argument type.
- *
- * \sa drmCtlInstHandler() and drmCtlUninstHandler().
- */
-struct drm_control {
-        enum {
-                DRM_ADD_COMMAND,
-                DRM_RM_COMMAND,
-                DRM_INST_HANDLER,
-                DRM_UNINST_HANDLER
-        } func;
-        int irq;
-};
-
-/**
- * Type of memory to map.
- */
-enum drm_map_type {
-        _DRM_FRAME_BUFFER = 0,    /**< WC (no caching), no core dump */
-        _DRM_REGISTERS = 1,       /**< no caching, no core dump */
-        _DRM_SHM = 2,             /**< shared, cached */
-        _DRM_AGP = 3,             /**< AGP/GART */
-        _DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
-        _DRM_CONSISTENT = 5,      /**< Consistent memory for PCI DMA */
-};
-
-/**
- * Memory mapping flags.
- */
-enum drm_map_flags {
-        _DRM_RESTRICTED = 0x01,      /**< Cannot be mapped to user-virtual */
-        _DRM_READ_ONLY = 0x02,
-        _DRM_LOCKED = 0x04,          /**< shared, cached, locked */
-        _DRM_KERNEL = 0x08,          /**< kernel requires access */
-        _DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */
-        _DRM_CONTAINS_LOCK = 0x20,   /**< SHM page that contains lock */
-        _DRM_REMOVABLE = 0x40,       /**< Removable mapping */
-        _DRM_DRIVER = 0x80           /**< Managed by driver */
-};
-
-struct drm_ctx_priv_map {
-        unsigned int ctx_id;     /**< Context requesting private mapping */
-        void *handle;            /**< Handle of map */
-};
-
-/**
- * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls
- * argument type.
- *
- * \sa drmAddMap().
- */
-struct drm_map {
-        unsigned long offset;    /**< Requested physical address (0 for SAREA)*/
-        unsigned long size;      /**< Requested physical size (bytes) */
-        enum drm_map_type type;  /**< Type of memory to map */
-        enum drm_map_flags flags;        /**< Flags */
-        void *handle;            /**< User-space: "Handle" to pass to mmap() */
-                                 /**< Kernel-space: kernel-virtual address */
-        int mtrr;                /**< MTRR slot used */
-        /*   Private data */
-};
-
-/**
- * DRM_IOCTL_GET_CLIENT ioctl argument type.
- */
-struct drm_client {
-        int idx;                /**< Which client desired? */
-        int auth;               /**< Is client authenticated? */
-        unsigned long pid;      /**< Process ID */
-        unsigned long uid;      /**< User ID */
-        unsigned long magic;    /**< Magic */
-        unsigned long iocs;     /**< Ioctl count */
-};
-
-enum drm_stat_type {
-        _DRM_STAT_LOCK,
-        _DRM_STAT_OPENS,
-        _DRM_STAT_CLOSES,
-        _DRM_STAT_IOCTLS,
-        _DRM_STAT_LOCKS,
-        _DRM_STAT_UNLOCKS,
-        _DRM_STAT_VALUE,        /**< Generic value */
-        _DRM_STAT_BYTE,         /**< Generic byte counter (1024bytes/K) */
-        _DRM_STAT_COUNT,        /**< Generic non-byte counter (1000/k) */
-
-        _DRM_STAT_IRQ,          /**< IRQ */
-        _DRM_STAT_PRIMARY,      /**< Primary DMA bytes */
-        _DRM_STAT_SECONDARY,    /**< Secondary DMA bytes */
-        _DRM_STAT_DMA,          /**< DMA */
-        _DRM_STAT_SPECIAL,      /**< Special DMA (e.g., priority or polled) */
-        _DRM_STAT_MISSED        /**< Missed DMA opportunity */
-            /* Add to the *END* of the list */
-};
-
-/**
- * DRM_IOCTL_GET_STATS ioctl argument type.
- */
-struct drm_stats {
-        unsigned long count;
-        struct {
-                unsigned long value;
-                enum drm_stat_type type;
-        } data[15];
-};
-
-/**
- * Hardware locking flags.
- */
-enum drm_lock_flags {
-        _DRM_LOCK_READY = 0x01,      /**< Wait until hardware is ready for DMA */
-        _DRM_LOCK_QUIESCENT = 0x02,  /**< Wait until hardware quiescent */
-        _DRM_LOCK_FLUSH = 0x04,      /**< Flush this context's DMA queue first */
-        _DRM_LOCK_FLUSH_ALL = 0x08,  /**< Flush all DMA queues first */
-        /* These *HALT* flags aren't supported yet
-           -- they will be used to support the
-           full-screen DGA-like mode. */
-        _DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */
-        _DRM_HALT_CUR_QUEUES = 0x20  /**< Halt all current queues */
-};
-
-/**
- * DRM_IOCTL_LOCK, DRM_IOCTL_UNLOCK and DRM_IOCTL_FINISH ioctl argument type.
- *
- * \sa drmGetLock() and drmUnlock().
- */
-struct drm_lock {
-        int context;
-        enum drm_lock_flags flags;
-};
-
-/**
- * DMA flags
- *
- * \warning
- * These values \e must match xf86drm.h.
- *
- * \sa drm_dma.
- */
-enum drm_dma_flags {
-        /* Flags for DMA buffer dispatch */
-        _DRM_DMA_BLOCK = 0x01,        /**<
-                                       * Block until buffer dispatched.
-                                       *
-                                       * \note The buffer may not yet have
-                                       * been processed by the hardware --
-                                       * getting a hardware lock with the
-                                       * hardware quiescent will ensure
-                                       * that the buffer has been
-                                       * processed.
-                                       */
-        _DRM_DMA_WHILE_LOCKED = 0x02, /**< Dispatch while lock held */
-        _DRM_DMA_PRIORITY = 0x04,     /**< High priority dispatch */
-
-        /* Flags for DMA buffer request */
-        _DRM_DMA_WAIT = 0x10,         /**< Wait for free buffers */
-        _DRM_DMA_SMALLER_OK = 0x20,   /**< Smaller-than-requested buffers OK */
-        _DRM_DMA_LARGER_OK = 0x40     /**< Larger-than-requested buffers OK */
-};
-
-/**
- * DRM_IOCTL_ADD_BUFS and DRM_IOCTL_MARK_BUFS ioctl argument type.
- *
- * \sa drmAddBufs().
- */
-struct drm_buf_desc {
-        int count;               /**< Number of buffers of this size */
-        int size;                /**< Size in bytes */
-        int low_mark;            /**< Low water mark */
-        int high_mark;           /**< High water mark */
-        enum {
-                _DRM_PAGE_ALIGN = 0x01, /**< Align on page boundaries for DMA */
-                _DRM_AGP_BUFFER = 0x02, /**< Buffer is in AGP space */
-                _DRM_SG_BUFFER = 0x04,  /**< Scatter/gather memory buffer */
-                _DRM_FB_BUFFER = 0x08,  /**< Buffer is in frame buffer */
-                _DRM_PCI_BUFFER_RO = 0x10 /**< Map PCI DMA buffer read-only */
-        } flags;
-        unsigned long agp_start; /**<
-                                  * Start address of where the AGP buffers are
-                                  * in the AGP aperture
-                                  */
-};
-
-/**
- * DRM_IOCTL_INFO_BUFS ioctl argument type.
- */
-struct drm_buf_info {
-        int count;              /**< Entries in list */
-        struct drm_buf_desc __user *list;
-};
-
-/**
- * DRM_IOCTL_FREE_BUFS ioctl argument type.
- */
-struct drm_buf_free {
-        int count;
-        int __user *list;
-};
-
-/**
- * Buffer information
- *
- * \sa drm_buf_map.
- */
-struct drm_buf_pub {
-        int idx;                       /**< Index into the master buffer list */
-        int total;                     /**< Buffer size */
-        int used;                      /**< Amount of buffer in use (for DMA) */
-        void __user *address;          /**< Address of buffer */
-};
-
-/**
- * DRM_IOCTL_MAP_BUFS ioctl argument type.
- */
-struct drm_buf_map {
-        int count;              /**< Length of the buffer list */
-        void __user *virtual;           /**< Mmap'd area in user-virtual */
-        struct drm_buf_pub __user *list;        /**< Buffer information */
-};
-
-/**
- * DRM_IOCTL_DMA ioctl argument type.
- *
- * Indices here refer to the offset into the buffer list in drm_buf_get.
- *
- * \sa drmDMA().
- */
-struct drm_dma {
-        int context;                      /**< Context handle */
-        int send_count;                   /**< Number of buffers to send */
-        int __user *send_indices;         /**< List of handles to buffers */
-        int __user *send_sizes;           /**< Lengths of data to send */
-        enum drm_dma_flags flags;         /**< Flags */
-        int request_count;                /**< Number of buffers requested */
-        int request_size;                 /**< Desired size for buffers */
-        int __user *request_indices;      /**< Buffer information */
-        int __user *request_sizes;
-        int granted_count;                /**< Number of buffers granted */
-};
-
-enum drm_ctx_flags {
-        _DRM_CONTEXT_PRESERVED = 0x01,
-        _DRM_CONTEXT_2DONLY = 0x02
-};
-
-/**
- * DRM_IOCTL_ADD_CTX ioctl argument type.
- *
- * \sa drmCreateContext() and drmDestroyContext().
- */
-struct drm_ctx {
-        drm_context_t handle;
-        enum drm_ctx_flags flags;
-};
-
-/**
- * DRM_IOCTL_RES_CTX ioctl argument type.
- */
-struct drm_ctx_res {
-        int count;
-        struct drm_ctx __user *contexts;
-};
-
-/**
- * DRM_IOCTL_ADD_DRAW and DRM_IOCTL_RM_DRAW ioctl argument type.
- */
-struct drm_draw {
-        drm_drawable_t handle;
-};
-
-/**
- * DRM_IOCTL_UPDATE_DRAW ioctl argument type.
- */
-typedef enum {
-        DRM_DRAWABLE_CLIPRECTS,
-} drm_drawable_info_type_t;
-
-struct drm_update_draw {
-        drm_drawable_t handle;
-        unsigned int type;
-        unsigned int num;
-        unsigned long long data;
-};
-
-/**
- * DRM_IOCTL_GET_MAGIC and DRM_IOCTL_AUTH_MAGIC ioctl argument type.
- */
-struct drm_auth {
-        drm_magic_t magic;
-};
-
-/**
- * DRM_IOCTL_IRQ_BUSID ioctl argument type.
- *
- * \sa drmGetInterruptFromBusID().
- */
-struct drm_irq_busid {
-        int irq;        /**< IRQ number */
-        int busnum;     /**< bus number */
-        int devnum;     /**< device number */
-        int funcnum;    /**< function number */
-};
-
-enum drm_vblank_seq_type {
-        _DRM_VBLANK_ABSOLUTE = 0x0,     /**< Wait for specific vblank sequence number */
-        _DRM_VBLANK_RELATIVE = 0x1,     /**< Wait for given number of vblanks */
-        _DRM_VBLANK_NEXTONMISS = 0x10000000,    /**< If missed, wait for next vblank */
-        _DRM_VBLANK_SECONDARY = 0x20000000,     /**< Secondary display controller */
-        _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking */
-};
-
-#define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE)
-#define _DRM_VBLANK_FLAGS_MASK (_DRM_VBLANK_SIGNAL | _DRM_VBLANK_SECONDARY | \
-                                _DRM_VBLANK_NEXTONMISS)
-
-struct drm_wait_vblank_request {
-        enum drm_vblank_seq_type type;
-        unsigned int sequence;
-        unsigned long signal;
-};
-
-struct drm_wait_vblank_reply {
-        enum drm_vblank_seq_type type;
-        unsigned int sequence;
-        long tval_sec;
-        long tval_usec;
-};
-
-/**
- * DRM_IOCTL_WAIT_VBLANK ioctl argument type.
- *
- * \sa drmWaitVBlank().
- */
-union drm_wait_vblank {
-        struct drm_wait_vblank_request request;
-        struct drm_wait_vblank_reply reply;
-};
-
-/**
- * DRM_IOCTL_AGP_ENABLE ioctl argument type.
- *
- * \sa drmAgpEnable().
- */
-struct drm_agp_mode {
-        unsigned long mode;     /**< AGP mode */
-};
-
-/**
- * DRM_IOCTL_AGP_ALLOC and DRM_IOCTL_AGP_FREE ioctls argument type.
- *
- * \sa drmAgpAlloc() and drmAgpFree().
- */
-struct drm_agp_buffer {
-        unsigned long size;     /**< In bytes -- will round to page boundary */
-        unsigned long handle;   /**< Used for binding / unbinding */
-        unsigned long type;     /**< Type of memory to allocate */
-        unsigned long physical; /**< Physical used by i810 */
-};
-
-/**
- * DRM_IOCTL_AGP_BIND and DRM_IOCTL_AGP_UNBIND ioctls argument type.
- *
- * \sa drmAgpBind() and drmAgpUnbind().
- */
-struct drm_agp_binding {
-        unsigned long handle;   /**< From drm_agp_buffer */
-        unsigned long offset;   /**< In bytes -- will round to page boundary */
-};
-
-/**
- * DRM_IOCTL_AGP_INFO ioctl argument type.
- *
- * \sa drmAgpVersionMajor(), drmAgpVersionMinor(), drmAgpGetMode(),
- * drmAgpBase(), drmAgpSize(), drmAgpMemoryUsed(), drmAgpMemoryAvail(),
- * drmAgpVendorId() and drmAgpDeviceId().
- */
-struct drm_agp_info {
-        int agp_version_major;
-        int agp_version_minor;
-        unsigned long mode;
-        unsigned long aperture_base;    /* physical address */
-        unsigned long aperture_size;    /* bytes */
-        unsigned long memory_allowed;   /* bytes */
-        unsigned long memory_used;
-
-        /* PCI information */
-        unsigned short id_vendor;
-        unsigned short id_device;
-};
-
-/**
- * DRM_IOCTL_SG_ALLOC ioctl argument type.
- */
-struct drm_scatter_gather {
-        unsigned long size;     /**< In bytes -- will round to page boundary */
-        unsigned long handle;   /**< Used for mapping / unmapping */
-};
-
-/**
- * DRM_IOCTL_SET_VERSION ioctl argument type.
- */
-struct drm_set_version {
-        int drm_di_major;
-        int drm_di_minor;
-        int drm_dd_major;
-        int drm_dd_minor;
-};
-
-#define DRM_IOCTL_BASE                  'd'
-#define DRM_IO(nr)                      _IO(DRM_IOCTL_BASE,nr)
-#define DRM_IOR(nr,type)                _IOR(DRM_IOCTL_BASE,nr,type)
-#define DRM_IOW(nr,type)                _IOW(DRM_IOCTL_BASE,nr,type)
-#define DRM_IOWR(nr,type)               _IOWR(DRM_IOCTL_BASE,nr,type)
-
-#define DRM_IOCTL_VERSION               DRM_IOWR(0x00, struct drm_version)
-#define DRM_IOCTL_GET_UNIQUE            DRM_IOWR(0x01, struct drm_unique)
-#define DRM_IOCTL_GET_MAGIC             DRM_IOR( 0x02, struct drm_auth)
-#define DRM_IOCTL_IRQ_BUSID             DRM_IOWR(0x03, struct drm_irq_busid)
-#define DRM_IOCTL_GET_MAP               DRM_IOWR(0x04, struct drm_map)
-#define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
-#define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
-#define DRM_IOCTL_SET_VERSION           DRM_IOWR(0x07, struct drm_set_version)
-
-#define DRM_IOCTL_SET_UNIQUE            DRM_IOW( 0x10, struct drm_unique)
-#define DRM_IOCTL_AUTH_MAGIC            DRM_IOW( 0x11, struct drm_auth)
-#define DRM_IOCTL_BLOCK                 DRM_IOWR(0x12, struct drm_block)
-#define DRM_IOCTL_UNBLOCK               DRM_IOWR(0x13, struct drm_block)
-#define DRM_IOCTL_CONTROL               DRM_IOW( 0x14, struct drm_control)
-#define DRM_IOCTL_ADD_MAP               DRM_IOWR(0x15, struct drm_map)
-#define DRM_IOCTL_ADD_BUFS              DRM_IOWR(0x16, struct drm_buf_desc)
-#define DRM_IOCTL_MARK_BUFS             DRM_IOW( 0x17, struct drm_buf_desc)
-#define DRM_IOCTL_INFO_BUFS             DRM_IOWR(0x18, struct drm_buf_info)
-#define DRM_IOCTL_MAP_BUFS              DRM_IOWR(0x19, struct drm_buf_map)
-#define DRM_IOCTL_FREE_BUFS             DRM_IOW( 0x1a, struct drm_buf_free)
-
-#define DRM_IOCTL_RM_MAP                DRM_IOW( 0x1b, struct drm_map)
-
-#define DRM_IOCTL_SET_SAREA_CTX         DRM_IOW( 0x1c, struct drm_ctx_priv_map)
-#define DRM_IOCTL_GET_SAREA_CTX         DRM_IOWR(0x1d, struct drm_ctx_priv_map)
-
-#define DRM_IOCTL_ADD_CTX               DRM_IOWR(0x20, struct drm_ctx)
-#define DRM_IOCTL_RM_CTX                DRM_IOWR(0x21, struct drm_ctx)
-#define DRM_IOCTL_MOD_CTX               DRM_IOW( 0x22, struct drm_ctx)
-#define DRM_IOCTL_GET_CTX               DRM_IOWR(0x23, struct drm_ctx)
-#define DRM_IOCTL_SWITCH_CTX            DRM_IOW( 0x24, struct drm_ctx)
-#define DRM_IOCTL_NEW_CTX               DRM_IOW( 0x25, struct drm_ctx)
-#define DRM_IOCTL_RES_CTX               DRM_IOWR(0x26, struct drm_ctx_res)
-#define DRM_IOCTL_ADD_DRAW              DRM_IOWR(0x27, struct drm_draw)
-#define DRM_IOCTL_RM_DRAW               DRM_IOWR(0x28, struct drm_draw)
-#define DRM_IOCTL_DMA                   DRM_IOWR(0x29, struct drm_dma)
-#define DRM_IOCTL_LOCK                  DRM_IOW( 0x2a, struct drm_lock)
-#define DRM_IOCTL_UNLOCK                DRM_IOW( 0x2b, struct drm_lock)
-#define DRM_IOCTL_FINISH                DRM_IOW( 0x2c, struct drm_lock)
-
-#define DRM_IOCTL_AGP_ACQUIRE           DRM_IO(  0x30)
-#define DRM_IOCTL_AGP_RELEASE           DRM_IO(  0x31)
-#define DRM_IOCTL_AGP_ENABLE            DRM_IOW( 0x32, struct drm_agp_mode)
-#define DRM_IOCTL_AGP_INFO              DRM_IOR( 0x33, struct drm_agp_info)
-#define DRM_IOCTL_AGP_ALLOC             DRM_IOWR(0x34, struct drm_agp_buffer)
-#define DRM_IOCTL_AGP_FREE              DRM_IOW( 0x35, struct drm_agp_buffer)
-#define DRM_IOCTL_AGP_BIND              DRM_IOW( 0x36, struct drm_agp_binding)
-#define DRM_IOCTL_AGP_UNBIND            DRM_IOW( 0x37, struct drm_agp_binding)
-
-#define DRM_IOCTL_SG_ALLOC              DRM_IOWR(0x38, struct drm_scatter_gather)
-#define DRM_IOCTL_SG_FREE               DRM_IOW( 0x39, struct drm_scatter_gather)
-
-#define DRM_IOCTL_WAIT_VBLANK           DRM_IOWR(0x3a, union drm_wait_vblank)
-
-#define DRM_IOCTL_UPDATE_DRAW           DRM_IOW(0x3f, struct drm_update_draw)
-
-/**
- * Device specific ioctls should only be in their respective headers
- * The device specific ioctl range is from 0x40 to 0x99.
- * Generic IOCTLS restart at 0xA0.
- *
- * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and
- * drmCommandReadWrite().
- */
-#define DRM_COMMAND_BASE                0x40
-#define DRM_COMMAND_END                 0xA0
-
-/* typedef area */
-#ifndef __KERNEL__
-typedef struct drm_clip_rect drm_clip_rect_t;
-typedef struct drm_drawable_info drm_drawable_info_t;
-typedef struct drm_tex_region drm_tex_region_t;
-typedef struct drm_hw_lock drm_hw_lock_t;
-typedef struct drm_version drm_version_t;
-typedef struct drm_unique drm_unique_t;
-typedef struct drm_list drm_list_t;
-typedef struct drm_block drm_block_t;
-typedef struct drm_control drm_control_t;
-typedef enum drm_map_type drm_map_type_t;
-typedef enum drm_map_flags drm_map_flags_t;
-typedef struct drm_ctx_priv_map drm_ctx_priv_map_t;
-typedef struct drm_map drm_map_t;
-typedef struct drm_client drm_client_t;
-typedef enum drm_stat_type drm_stat_type_t;
-typedef struct drm_stats drm_stats_t;
-typedef enum drm_lock_flags drm_lock_flags_t;
-typedef struct drm_lock drm_lock_t;
-typedef enum drm_dma_flags drm_dma_flags_t;
-typedef struct drm_buf_desc drm_buf_desc_t;
-typedef struct drm_buf_info drm_buf_info_t;
-typedef struct drm_buf_free drm_buf_free_t;
-typedef struct drm_buf_pub drm_buf_pub_t;
-typedef struct drm_buf_map drm_buf_map_t;
-typedef struct drm_dma drm_dma_t;
-typedef union drm_wait_vblank drm_wait_vblank_t;
-typedef struct drm_agp_mode drm_agp_mode_t;
-typedef enum drm_ctx_flags drm_ctx_flags_t;
-typedef struct drm_ctx drm_ctx_t;
-typedef struct drm_ctx_res drm_ctx_res_t;
-typedef struct drm_draw drm_draw_t;
-typedef struct drm_update_draw drm_update_draw_t;
-typedef struct drm_auth drm_auth_t;
-typedef struct drm_irq_busid drm_irq_busid_t;
-typedef enum drm_vblank_seq_type drm_vblank_seq_type_t;
-
-typedef struct drm_agp_buffer drm_agp_buffer_t;
-typedef struct drm_agp_binding drm_agp_binding_t;
-typedef struct drm_agp_info drm_agp_info_t;
-typedef struct drm_scatter_gather drm_scatter_gather_t;
-typedef struct drm_set_version drm_set_version_t;
-#endif
-
-#endif
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
deleted file mode 100644
index 0764b662b339..000000000000
--- a/drivers/char/drm/drmP.h
+++ /dev/null
@@ -1,1153 +0,0 @@
-/**
- * \file drmP.h
- * Private header for Direct Rendering Manager
- *
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- * \author Gareth Hughes <gareth@valinux.com>
- */
-
-/*
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _DRM_P_H_
-#define _DRM_P_H_
-
-/* If you want the memory alloc debug functionality, change define below */
-/* #define DEBUG_MEMORY */
-
-#ifdef __KERNEL__
-#ifdef __alpha__
-/* add include of current.h so that "current" is defined
- * before static inline funcs in wait.h. Doing this so we
- * can build the DRM (part of PI DRI). 4/21/2000 S + B */
-#include <asm/current.h>
-#endif                          /* __alpha__ */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/miscdevice.h>
-#include <linux/fs.h>
-#include <linux/proc_fs.h>
-#include <linux/init.h>
-#include <linux/file.h>
-#include <linux/pci.h>
-#include <linux/jiffies.h>
-#include <linux/smp_lock.h>     /* For (un)lock_kernel */
-#include <linux/dma-mapping.h>
-#include <linux/mm.h>
-#include <linux/cdev.h>
-#include <linux/mutex.h>
-#if defined(__alpha__) || defined(__powerpc__)
-#include <asm/pgtable.h>        /* For pte_wrprotect */
-#endif
-#include <asm/io.h>
-#include <asm/mman.h>
-#include <asm/uaccess.h>
-#ifdef CONFIG_MTRR
-#include <asm/mtrr.h>
-#endif
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
-#include <linux/types.h>
-#include <linux/agp_backend.h>
-#endif
-#include <linux/workqueue.h>
-#include <linux/poll.h>
-#include <asm/pgalloc.h>
-#include "drm.h"
-
-#include <linux/idr.h>
-
-#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
-#define __OS_HAS_MTRR (defined(CONFIG_MTRR))
-
-struct drm_file;
-struct drm_device;
-
-#include "drm_os_linux.h"
-#include "drm_hashtab.h"
-
-/***********************************************************************/
-/** \name DRM template customization defaults */
-/*@{*/
-
-/* driver capabilities and requirements mask */
-#define DRIVER_USE_AGP     0x1
-#define DRIVER_REQUIRE_AGP 0x2
-#define DRIVER_USE_MTRR    0x4
-#define DRIVER_PCI_DMA     0x8
-#define DRIVER_SG          0x10
-#define DRIVER_HAVE_DMA    0x20
-#define DRIVER_HAVE_IRQ    0x40
-#define DRIVER_IRQ_SHARED  0x80
-#define DRIVER_IRQ_VBL     0x100
-#define DRIVER_DMA_QUEUE   0x200
-#define DRIVER_FB_DMA      0x400
-#define DRIVER_IRQ_VBL2    0x800
-
-/***********************************************************************/
-/** \name Begin the DRM... */
-/*@{*/
-
-#define DRM_DEBUG_CODE 2          /**< Include debugging code if > 1, then
-                                     also include looping detection. */
-
-#define DRM_MAGIC_HASH_ORDER  4  /**< Size of key hash table. Must be power of 2. */
-#define DRM_KERNEL_CONTEXT    0  /**< Change drm_resctx if changed */
-#define DRM_RESERVED_CONTEXTS 1  /**< Change drm_resctx if changed */
-#define DRM_LOOPING_LIMIT     5000000
-#define DRM_TIME_SLICE        (HZ/20)  /**< Time slice for GLXContexts */
-#define DRM_LOCK_SLICE        1 /**< Time slice for lock, in jiffies */
-
-#define DRM_FLAG_DEBUG    0x01
-
-#define DRM_MEM_DMA        0
-#define DRM_MEM_SAREA      1
-#define DRM_MEM_DRIVER     2
-#define DRM_MEM_MAGIC      3
-#define DRM_MEM_IOCTLS     4
-#define DRM_MEM_MAPS       5
-#define DRM_MEM_VMAS       6
-#define DRM_MEM_BUFS       7
-#define DRM_MEM_SEGS       8
-#define DRM_MEM_PAGES      9
-#define DRM_MEM_FILES     10
-#define DRM_MEM_QUEUES    11
-#define DRM_MEM_CMDS      12
-#define DRM_MEM_MAPPINGS  13
-#define DRM_MEM_BUFLISTS  14
-#define DRM_MEM_AGPLISTS  15
-#define DRM_MEM_TOTALAGP  16
-#define DRM_MEM_BOUNDAGP  17
-#define DRM_MEM_CTXBITMAP 18
-#define DRM_MEM_STUB      19
-#define DRM_MEM_SGLISTS   20
-#define DRM_MEM_CTXLIST   21
-#define DRM_MEM_MM        22
-#define DRM_MEM_HASHTAB   23
-
-#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
-#define DRM_MAP_HASH_OFFSET 0x10000000
-
-/*@}*/
-
-/***********************************************************************/
-/** \name Macros to make printk easier */
-/*@{*/
-
-/**
- * Error output.
- *
- * \param fmt printf() like format string.
- * \param arg arguments
- */
-#define DRM_ERROR(fmt, arg...) \
-        printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __func__ , ##arg)
-
-/**
- * Memory error output.
- *
- * \param area memory area where the error occurred.
- * \param fmt printf() like format string.
- * \param arg arguments
- */
-#define DRM_MEM_ERROR(area, fmt, arg...) \
-        printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __func__, \
-               drm_mem_stats[area].name , ##arg)
-
-#define DRM_INFO(fmt, arg...)  printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
-
-/**
- * Debug output.
- *
- * \param fmt printf() like format string.
- * \param arg arguments
- */
-#if DRM_DEBUG_CODE
-#define DRM_DEBUG(fmt, arg...)                                          \
-        do {                                                            \
-                if ( drm_debug )                        \
-                        printk(KERN_DEBUG                               \
-                               "[" DRM_NAME ":%s] " fmt ,       \
-                               __func__ , ##arg);                       \
-        } while (0)
-#else
-#define DRM_DEBUG(fmt, arg...)           do { } while (0)
-#endif
-
-#define DRM_PROC_LIMIT (PAGE_SIZE-80)
-
-#define DRM_PROC_PRINT(fmt, arg...)                                     \
-   len += sprintf(&buf[len], fmt , ##arg);                              \
-   if (len > DRM_PROC_LIMIT) { *eof = 1; return len - offset; }
-
-#define DRM_PROC_PRINT_RET(ret, fmt, arg...)                            \
-   len += sprintf(&buf[len], fmt , ##arg);                              \
-   if (len > DRM_PROC_LIMIT) { ret; *eof = 1; return len - offset; }
-
-/*@}*/
-
-/***********************************************************************/
-/** \name Internal types and structures */
-/*@{*/
-
-#define DRM_ARRAY_SIZE(x) ARRAY_SIZE(x)
-
-#define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1))
-#define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x))
-#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)
-
-#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
-/**
- * Get the private SAREA mapping.
- *
- * \param _dev DRM device.
- * \param _ctx context number.
- * \param _map output mapping.
- */
-#define DRM_GET_PRIV_SAREA(_dev, _ctx, _map) do {       \
-        (_map) = (_dev)->context_sareas[_ctx];          \
-} while(0)
-
-/**
- * Test that the hardware lock is held by the caller, returning otherwise.
- *
- * \param dev DRM device.
- * \param filp file pointer of the caller.
- */
-#define LOCK_TEST_WITH_RETURN( dev, file_priv )                         \
-do {                                                                    \
-        if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||           \
-             dev->lock.file_priv != file_priv ) {                       \
-                DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
-                           __func__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\
-                           dev->lock.file_priv, file_priv );            \
-                return -EINVAL;                                         \
-        }                                                               \
-} while (0)
-
-/**
- * Copy and IOCTL return string to user space
- */
-#define DRM_COPY( name, value )                                         \
-        len = strlen( value );                                          \
-        if ( len > name##_len ) len = name##_len;                       \
-        name##_len = strlen( value );                                   \
-        if ( len && name ) {                                            \
-                if ( copy_to_user( name, value, len ) )                 \
-                        return -EFAULT;                                 \
-        }
-
-/**
- * Ioctl function type.
- *
- * \param inode device inode.
- * \param file_priv DRM file private pointer.
- * \param cmd command.
- * \param arg argument.
- */
-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-
-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
-                               unsigned long arg);
-
-#define DRM_AUTH        0x1
-#define DRM_MASTER      0x2
-#define DRM_ROOT_ONLY   0x4
-
-struct drm_ioctl_desc {
-        unsigned int cmd;
-        drm_ioctl_t *func;
-        int flags;
-};
-
-/**
- * Creates a driver or general drm_ioctl_desc array entry for the given
- * ioctl, for use by drm_ioctl().
- */
-#define DRM_IOCTL_DEF(ioctl, func, flags) \
-        [DRM_IOCTL_NR(ioctl)] = {ioctl, func, flags}
-
-struct drm_magic_entry {
-        struct list_head head;
-        struct drm_hash_item hash_item;
-        struct drm_file *priv;
-};
-
-struct drm_vma_entry {
-        struct list_head head;
-        struct vm_area_struct *vma;
-        pid_t pid;
-};
-
-/**
- * DMA buffer.
- */
-struct drm_buf {
-        int idx;                       /**< Index into master buflist */
-        int total;                     /**< Buffer size */
-        int order;                     /**< log-base-2(total) */
-        int used;                      /**< Amount of buffer in use (for DMA) */
-        unsigned long offset;          /**< Byte offset (used internally) */
-        void *address;                 /**< Address of buffer */
-        unsigned long bus_address;     /**< Bus address of buffer */
-        struct drm_buf *next;          /**< Kernel-only: used for free list */
-        __volatile__ int waiting;      /**< On kernel DMA queue */
-        __volatile__ int pending;      /**< On hardware DMA queue */
-        wait_queue_head_t dma_wait;    /**< Processes waiting */
-        struct drm_file *file_priv;    /**< Private of holding file descr */
-        int context;                   /**< Kernel queue for this buffer */
-        int while_locked;              /**< Dispatch this buffer while locked */
-        enum {
-                DRM_LIST_NONE = 0,
-                DRM_LIST_FREE = 1,
-                DRM_LIST_WAIT = 2,
-                DRM_LIST_PEND = 3,
-                DRM_LIST_PRIO = 4,
-                DRM_LIST_RECLAIM = 5
-        } list;                        /**< Which list we're on */
-
-        int dev_priv_size;               /**< Size of buffer private storage */
-        void *dev_private;               /**< Per-buffer private storage */
-};
-
-/** bufs is one longer than it has to be */
-struct drm_waitlist {
-        int count;                      /**< Number of possible buffers */
-        struct drm_buf **bufs;          /**< List of pointers to buffers */
-        struct drm_buf **rp;                    /**< Read pointer */
-        struct drm_buf **wp;                    /**< Write pointer */
-        struct drm_buf **end;           /**< End pointer */
-        spinlock_t read_lock;
-        spinlock_t write_lock;
-};
-
-struct drm_freelist {
-        int initialized;               /**< Freelist in use */
-        atomic_t count;                /**< Number of free buffers */
-        struct drm_buf *next;          /**< End pointer */
-
-        wait_queue_head_t waiting;     /**< Processes waiting on free bufs */
-        int low_mark;                  /**< Low water mark */
-        int high_mark;                 /**< High water mark */
-        atomic_t wfh;                  /**< If waiting for high mark */
-        spinlock_t lock;
-};
-
-typedef struct drm_dma_handle {
-        dma_addr_t busaddr;
-        void *vaddr;
-        size_t size;
-} drm_dma_handle_t;
-
-/**
- * Buffer entry.  There is one of this for each buffer size order.
- */
-struct drm_buf_entry {
-        int buf_size;                   /**< size */
-        int buf_count;                  /**< number of buffers */
-        struct drm_buf *buflist;                /**< buffer list */
-        int seg_count;
-        int page_order;
-        struct drm_dma_handle **seglist;
-
-        struct drm_freelist freelist;
-};
-
-/** File private data */
-struct drm_file {
-        int authenticated;
-        int master;
-        pid_t pid;
-        uid_t uid;
-        drm_magic_t magic;
-        unsigned long ioctl_count;
-        struct list_head lhead;
-        struct drm_minor *minor;
-        int remove_auth_on_close;
-        unsigned long lock_count;
-        struct file *filp;
-        void *driver_priv;
-};
-
-/** Wait queue */
-struct drm_queue {
-        atomic_t use_count;             /**< Outstanding uses (+1) */
-        atomic_t finalization;          /**< Finalization in progress */
-        atomic_t block_count;           /**< Count of processes waiting */
-        atomic_t block_read;            /**< Queue blocked for reads */
-        wait_queue_head_t read_queue;   /**< Processes waiting on block_read */
-        atomic_t block_write;           /**< Queue blocked for writes */
-        wait_queue_head_t write_queue;  /**< Processes waiting on block_write */
-        atomic_t total_queued;          /**< Total queued statistic */
-        atomic_t total_flushed;         /**< Total flushes statistic */
-        atomic_t total_locks;           /**< Total locks statistics */
-        enum drm_ctx_flags flags;       /**< Context preserving and 2D-only */
-        struct drm_waitlist waitlist;   /**< Pending buffers */
-        wait_queue_head_t flush_queue;  /**< Processes waiting until flush */
-};
-
-/**
- * Lock data.
- */
-struct drm_lock_data {
-        struct drm_hw_lock *hw_lock;    /**< Hardware lock */
-        /** Private of lock holder's file (NULL=kernel) */
-        struct drm_file *file_priv;
-        wait_queue_head_t lock_queue;   /**< Queue of blocked processes */
-        unsigned long lock_time;        /**< Time of last lock in jiffies */
-        spinlock_t spinlock;
-        uint32_t kernel_waiters;
-        uint32_t user_waiters;
-        int idle_has_lock;
-};
-
-/**
- * DMA data.
- */
-struct drm_device_dma {
-
-        struct drm_buf_entry bufs[DRM_MAX_ORDER + 1];   /**< buffers, grouped by their size order */
-        int buf_count;                  /**< total number of buffers */
-        struct drm_buf **buflist;               /**< Vector of pointers into drm_device_dma::bufs */
-        int seg_count;
-        int page_count;                 /**< number of pages */
-        unsigned long *pagelist;        /**< page list */
-        unsigned long byte_count;
-        enum {
-                _DRM_DMA_USE_AGP = 0x01,
-                _DRM_DMA_USE_SG = 0x02,
-                _DRM_DMA_USE_FB = 0x04,
-                _DRM_DMA_USE_PCI_RO = 0x08
-        } flags;
-
-};
-
-/**
- * AGP memory entry.  Stored as a doubly linked list.
- */
-struct drm_agp_mem {
-        unsigned long handle;           /**< handle */
-        DRM_AGP_MEM *memory;
-        unsigned long bound;            /**< address */
-        int pages;
-        struct list_head head;
-};
-
-/**
- * AGP data.
- *
- * \sa drm_agp_init() and drm_device::agp.
- */
-struct drm_agp_head {
-        DRM_AGP_KERN agp_info;          /**< AGP device information */
-        struct list_head memory;
-        unsigned long mode;             /**< AGP mode */
-        struct agp_bridge_data *bridge;
-        int enabled;                    /**< whether the AGP bus as been enabled */
-        int acquired;                   /**< whether the AGP device has been acquired */
-        unsigned long base;
-        int agp_mtrr;
-        int cant_use_aperture;
-        unsigned long page_mask;
-};
-
-/**
- * Scatter-gather memory.
- */
-struct drm_sg_mem {
-        unsigned long handle;
-        void *virtual;
-        int pages;
-        struct page **pagelist;
-        dma_addr_t *busaddr;
-};
-
-struct drm_sigdata {
-        int context;
-        struct drm_hw_lock *lock;
-};
-
-
-/*
- * Generic memory manager structs
- */
-
-struct drm_mm_node {
-        struct list_head fl_entry;
-        struct list_head ml_entry;
-        int free;
-        unsigned long start;
-        unsigned long size;
-        struct drm_mm *mm;
-        void *private;
-};
-
-struct drm_mm {
-        struct list_head fl_entry;
-        struct list_head ml_entry;
-};
-
-
-/**
- * Mappings list
- */
-struct drm_map_list {
-        struct list_head head;          /**< list head */
-        struct drm_hash_item hash;
-        struct drm_map *map;                    /**< mapping */
-        uint64_t user_token;
-};
-
-typedef struct drm_map drm_local_map_t;
-
-/**
- * Context handle list
- */
-struct drm_ctx_list {
-        struct list_head head;          /**< list head */
-        drm_context_t handle;           /**< context handle */
-        struct drm_file *tag;           /**< associated fd private data */
-};
-
-struct drm_vbl_sig {
-        struct list_head head;
-        unsigned int sequence;
-        struct siginfo info;
-        struct task_struct *task;
-};
-
-/* location of GART table */
-#define DRM_ATI_GART_MAIN 1
-#define DRM_ATI_GART_FB   2
-
-#define DRM_ATI_GART_PCI 1
-#define DRM_ATI_GART_PCIE 2
-#define DRM_ATI_GART_IGP 3
-
-struct drm_ati_pcigart_info {
-        int gart_table_location;
-        int gart_reg_if;
-        void *addr;
-        dma_addr_t bus_addr;
-        dma_addr_t table_mask;
-        struct drm_dma_handle *table_handle;
-        drm_local_map_t mapping;
-        int table_size;
-};
-
-/**
- * DRM driver structure. This structure represent the common code for
- * a family of cards. There will one drm_device for each card present
- * in this family
- */
-struct drm_driver {
-        int (*load) (struct drm_device *, unsigned long flags);
-        int (*firstopen) (struct drm_device *);
-        int (*open) (struct drm_device *, struct drm_file *);
-        void (*preclose) (struct drm_device *, struct drm_file *file_priv);
-        void (*postclose) (struct drm_device *, struct drm_file *);
-        void (*lastclose) (struct drm_device *);
-        int (*unload) (struct drm_device *);
-        int (*suspend) (struct drm_device *, pm_message_t state);
-        int (*resume) (struct drm_device *);
-        int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
-        void (*dma_ready) (struct drm_device *);
-        int (*dma_quiescent) (struct drm_device *);
-        int (*context_ctor) (struct drm_device *dev, int context);
-        int (*context_dtor) (struct drm_device *dev, int context);
-        int (*kernel_context_switch) (struct drm_device *dev, int old,
-                                      int new);
-        void (*kernel_context_switch_unlock) (struct drm_device *dev);
-        int (*vblank_wait) (struct drm_device *dev, unsigned int *sequence);
-        int (*vblank_wait2) (struct drm_device *dev, unsigned int *sequence);
-        int (*dri_library_name) (struct drm_device *dev, char *buf);
-
-        /**
-         * Called by \c drm_device_is_agp.  Typically used to determine if a
-         * card is really attached to AGP or not.
-         *
-         * \param dev  DRM device handle
-         *
-         * \returns
-         * One of three values is returned depending on whether or not the
-         * card is absolutely \b not AGP (return of 0), absolutely \b is AGP
-         * (return of 1), or may or may not be AGP (return of 2).
-         */
-        int (*device_is_agp) (struct drm_device *dev);
-
-        /* these have to be filled in */
-
-        irqreturn_t(*irq_handler) (DRM_IRQ_ARGS);
-        void (*irq_preinstall) (struct drm_device *dev);
-        void (*irq_postinstall) (struct drm_device *dev);
-        void (*irq_uninstall) (struct drm_device *dev);
-        void (*reclaim_buffers) (struct drm_device *dev,
-                                 struct drm_file * file_priv);
-        void (*reclaim_buffers_locked) (struct drm_device *dev,
-                                        struct drm_file *file_priv);
-        void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
-                                            struct drm_file *file_priv);
-        unsigned long (*get_map_ofs) (struct drm_map * map);
-        unsigned long (*get_reg_ofs) (struct drm_device *dev);
-        void (*set_version) (struct drm_device *dev,
-                             struct drm_set_version *sv);
-
-        int major;
-        int minor;
-        int patchlevel;
-        char *name;
-        char *desc;
-        char *date;
-
-        u32 driver_features;
-        int dev_priv_size;
-        struct drm_ioctl_desc *ioctls;
-        int num_ioctls;
-        struct file_operations fops;
-        struct pci_driver pci_driver;
-};
-
-#define DRM_MINOR_UNASSIGNED 0
-#define DRM_MINOR_LEGACY 1
-
-/**
- * DRM minor structure. This structure represents a drm minor number.
- */
-struct drm_minor {
-        int index;                      /**< Minor device number */
-        int type;                       /**< Control or render */
-        dev_t device;                   /**< Device number for mknod */
-        struct device kdev;             /**< Linux device */
-        struct drm_device *dev;
-        struct proc_dir_entry *dev_root;  /**< proc directory entry */
-};
-
-/**
- * DRM device structure. This structure represent a complete card that
- * may contain multiple heads.
- */
-struct drm_device {
-        char *unique;                   /**< Unique identifier: e.g., busid */
-        int unique_len;                 /**< Length of unique field */
-        char *devname;                  /**< For /proc/interrupts */
-        int if_version;                 /**< Highest interface version set */
-
-        int blocked;                    /**< Blocked due to VC switch? */
-
-        /** \name Locks */
-        /*@{ */
-        spinlock_t count_lock;          /**< For inuse, drm_device::open_count, drm_device::buf_use */
-        struct mutex struct_mutex;      /**< For others */
-        /*@} */
-
-        /** \name Usage Counters */
-        /*@{ */
-        int open_count;                 /**< Outstanding files open */
-        atomic_t ioctl_count;           /**< Outstanding IOCTLs pending */
-        atomic_t vma_count;             /**< Outstanding vma areas open */
-        int buf_use;                    /**< Buffers in use -- cannot alloc */
-        atomic_t buf_alloc;             /**< Buffer allocation in progress */
-        /*@} */
-
-        /** \name Performance counters */
-        /*@{ */
-        unsigned long counters;
-        enum drm_stat_type types[15];
-        atomic_t counts[15];
-        /*@} */
-
-        /** \name Authentication */
-        /*@{ */
-        struct list_head filelist;
-        struct drm_open_hash magiclist; /**< magic hash table */
-        struct list_head magicfree;
-        /*@} */
-
-        /** \name Memory management */
-        /*@{ */
-        struct list_head maplist;       /**< Linked list of regions */
-        int map_count;                  /**< Number of mappable regions */
-        struct drm_open_hash map_hash;  /**< User token hash table for maps */
-
-        /** \name Context handle management */
-        /*@{ */
-        struct list_head ctxlist;       /**< Linked list of context handles */
-        int ctx_count;                  /**< Number of context handles */
-        struct mutex ctxlist_mutex;     /**< For ctxlist */
-
-        struct idr ctx_idr;
-
-        struct list_head vmalist;       /**< List of vmas (for debugging) */
-        struct drm_lock_data lock;      /**< Information on hardware lock */
-        /*@} */
-
-        /** \name DMA queues (contexts) */
-        /*@{ */
-        int queue_count;                /**< Number of active DMA queues */
-        int queue_reserved;               /**< Number of reserved DMA queues */
-        int queue_slots;                /**< Actual length of queuelist */
-        struct drm_queue **queuelist;   /**< Vector of pointers to DMA queues */
-        struct drm_device_dma *dma;             /**< Optional pointer for DMA support */
-        /*@} */
-
-        /** \name Context support */
-        /*@{ */
-        int irq;                        /**< Interrupt used by board */
-        int irq_enabled;                /**< True if irq handler is enabled */
-        __volatile__ long context_flag; /**< Context swapping flag */
-        __volatile__ long interrupt_flag; /**< Interruption handler flag */
-        __volatile__ long dma_flag;     /**< DMA dispatch flag */
-        struct timer_list timer;        /**< Timer for delaying ctx switch */
-        wait_queue_head_t context_wait; /**< Processes waiting on ctx switch */
-        int last_checked;               /**< Last context checked for DMA */
-        int last_context;               /**< Last current context */
-        unsigned long last_switch;      /**< jiffies at last context switch */
-        /*@} */
-
-        struct work_struct work;
-        /** \name VBLANK IRQ support */
-        /*@{ */
-
-        wait_queue_head_t vbl_queue;    /**< VBLANK wait queue */
-        atomic_t vbl_received;
-        atomic_t vbl_received2;         /**< number of secondary VBLANK interrupts */
-        spinlock_t vbl_lock;
-        struct list_head vbl_sigs;              /**< signal list to send on VBLANK */
-        struct list_head vbl_sigs2;     /**< signals to send on secondary VBLANK */
-        unsigned int vbl_pending;
-        spinlock_t tasklet_lock;        /**< For drm_locked_tasklet */
-        void (*locked_tasklet_func)(struct drm_device *dev);
-
-        /*@} */
-        cycles_t ctx_start;
-        cycles_t lck_start;
-
-        struct fasync_struct *buf_async;/**< Processes waiting for SIGIO */
-        wait_queue_head_t buf_readers;  /**< Processes waiting to read */
-        wait_queue_head_t buf_writers;  /**< Processes waiting to ctx switch */
-
-        struct drm_agp_head *agp;       /**< AGP data */
-
-        struct pci_dev *pdev;           /**< PCI device structure */
-        int pci_vendor;                 /**< PCI vendor id */
-        int pci_device;                 /**< PCI device id */
-#ifdef __alpha__
-        struct pci_controller *hose;
-#endif
-        struct drm_sg_mem *sg;  /**< Scatter gather memory */
-        void *dev_private;              /**< device private data */
-        struct drm_sigdata sigdata;        /**< For block_all_signals */
-        sigset_t sigmask;
-
-        struct drm_driver *driver;
-        drm_local_map_t *agp_buffer_map;
-        unsigned int agp_buffer_token;
-        struct drm_minor *primary;              /**< render type primary screen head */
-
-        /** \name Drawable information */
-        /*@{ */
-        spinlock_t drw_lock;
-        struct idr drw_idr;
-        /*@} */
-};
-
-static __inline__ int drm_core_check_feature(struct drm_device *dev,
-                                             int feature)
-{
-        return ((dev->driver->driver_features & feature) ? 1 : 0);
-}
-
-#ifdef __alpha__
-#define drm_get_pci_domain(dev) dev->hose->index
-#else
-#define drm_get_pci_domain(dev) 0
-#endif
-
-#if __OS_HAS_AGP
-static inline int drm_core_has_AGP(struct drm_device *dev)
-{
-        return drm_core_check_feature(dev, DRIVER_USE_AGP);
-}
-#else
-#define drm_core_has_AGP(dev) (0)
-#endif
-
-#if __OS_HAS_MTRR
-static inline int drm_core_has_MTRR(struct drm_device *dev)
-{
-        return drm_core_check_feature(dev, DRIVER_USE_MTRR);
-}
-
-#define DRM_MTRR_WC             MTRR_TYPE_WRCOMB
-
-static inline int drm_mtrr_add(unsigned long offset, unsigned long size,
-                               unsigned int flags)
-{
-        return mtrr_add(offset, size, flags, 1);
-}
-
-static inline int drm_mtrr_del(int handle, unsigned long offset,
-                               unsigned long size, unsigned int flags)
-{
-        return mtrr_del(handle, offset, size);
-}
-
-#else
-#define drm_core_has_MTRR(dev) (0)
-
-#define DRM_MTRR_WC             0
-
-static inline int drm_mtrr_add(unsigned long offset, unsigned long size,
-                               unsigned int flags)
-{
-        return 0;
-}
-
-static inline int drm_mtrr_del(int handle, unsigned long offset,
-                               unsigned long size, unsigned int flags)
-{
-        return 0;
-}
-#endif
-
-/******************************************************************/
-/** \name Internal function definitions */
-/*@{*/
-
-                                /* Driver support (drm_drv.h) */
-extern int drm_init(struct drm_driver *driver);
-extern void drm_exit(struct drm_driver *driver);
-extern int drm_ioctl(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg);
-extern long drm_compat_ioctl(struct file *filp,
-                             unsigned int cmd, unsigned long arg);
-extern int drm_lastclose(struct drm_device *dev);
-
-                                /* Device support (drm_fops.h) */
-extern int drm_open(struct inode *inode, struct file *filp);
-extern int drm_stub_open(struct inode *inode, struct file *filp);
-extern int drm_fasync(int fd, struct file *filp, int on);
-extern int drm_release(struct inode *inode, struct file *filp);
-
-                                /* Mapping support (drm_vm.h) */
-extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
-extern unsigned long drm_core_get_map_ofs(struct drm_map * map);
-extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
-extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
-
-                                /* Memory management support (drm_memory.h) */
-#include "drm_memory.h"
-extern void drm_mem_init(void);
-extern int drm_mem_info(char *buf, char **start, off_t offset,
-                        int request, int *eof, void *data);
-extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
-
-extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type);
-extern int drm_free_agp(DRM_AGP_MEM * handle, int pages);
-extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
-extern int drm_unbind_agp(DRM_AGP_MEM * handle);
-
-                                /* Misc. IOCTL support (drm_ioctl.h) */
-extern int drm_irq_by_busid(struct drm_device *dev, void *data,
-                            struct drm_file *file_priv);
-extern int drm_getunique(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-extern int drm_setunique(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-extern int drm_getmap(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_getclient(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-extern int drm_getstats(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_setversion(struct drm_device *dev, void *data,
-                          struct drm_file *file_priv);
-extern int drm_noop(struct drm_device *dev, void *data,
-                    struct drm_file *file_priv);
-
-                                /* Context IOCTL support (drm_context.h) */
-extern int drm_resctx(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_addctx(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_modctx(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_getctx(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_switchctx(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-extern int drm_newctx(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_rmctx(struct drm_device *dev, void *data,
-                     struct drm_file *file_priv);
-
-extern int drm_ctxbitmap_init(struct drm_device *dev);
-extern void drm_ctxbitmap_cleanup(struct drm_device *dev);
-extern void drm_ctxbitmap_free(struct drm_device *dev, int ctx_handle);
-
-extern int drm_setsareactx(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv);
-extern int drm_getsareactx(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv);
-
-                                /* Drawable IOCTL support (drm_drawable.h) */
-extern int drm_adddraw(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv);
-extern int drm_rmdraw(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_update_drawable_info(struct drm_device *dev, void *data,
-                                    struct drm_file *file_priv);
-extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,
-                                                  drm_drawable_t id);
-extern void drm_drawable_free_all(struct drm_device *dev);
-
-                                /* Authentication IOCTL support (drm_auth.h) */
-extern int drm_getmagic(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_authmagic(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-
-                                /* Locking IOCTL support (drm_lock.h) */
-extern int drm_lock(struct drm_device *dev, void *data,
-                    struct drm_file *file_priv);
-extern int drm_unlock(struct drm_device *dev, void *data,
-                      struct drm_file *file_priv);
-extern int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
-extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context);
-extern void drm_idlelock_take(struct drm_lock_data *lock_data);
-extern void drm_idlelock_release(struct drm_lock_data *lock_data);
-
-/*
- * These are exported to drivers so that they can implement fencing using
- * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
- */
-
-extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);
-
-                                /* Buffer management support (drm_bufs.h) */
-extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
-extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
-extern int drm_addmap(struct drm_device *dev, unsigned int offset,
-                      unsigned int size, enum drm_map_type type,
-                      enum drm_map_flags flags, drm_local_map_t ** map_ptr);
-extern int drm_addmap_ioctl(struct drm_device *dev, void *data,
-                            struct drm_file *file_priv);
-extern int drm_rmmap(struct drm_device *dev, drm_local_map_t *map);
-extern int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map);
-extern int drm_rmmap_ioctl(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv);
-extern int drm_addbufs(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv);
-extern int drm_infobufs(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_markbufs(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_freebufs(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_mapbufs(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv);
-extern int drm_order(unsigned long size);
-extern unsigned long drm_get_resource_start(struct drm_device *dev,
-                                            unsigned int resource);
-extern unsigned long drm_get_resource_len(struct drm_device *dev,
-                                          unsigned int resource);
-
-                                /* DMA support (drm_dma.h) */
-extern int drm_dma_setup(struct drm_device *dev);
-extern void drm_dma_takedown(struct drm_device *dev);
-extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf);
-extern void drm_core_reclaim_buffers(struct drm_device *dev,
-                                     struct drm_file *filp);
-
-                                /* IRQ support (drm_irq.h) */
-extern int drm_control(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv);
-extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
-extern int drm_irq_uninstall(struct drm_device *dev);
-extern void drm_driver_irq_preinstall(struct drm_device *dev);
-extern void drm_driver_irq_postinstall(struct drm_device *dev);
-extern void drm_driver_irq_uninstall(struct drm_device *dev);
-
-extern int drm_wait_vblank(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv);
-extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
-extern void drm_vbl_send_signals(struct drm_device *dev);
-extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*));
-
-                                /* AGP/GART support (drm_agpsupport.h) */
-extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
-extern int drm_agp_acquire(struct drm_device *dev);
-extern int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
-                                 struct drm_file *file_priv);
-extern int drm_agp_release(struct drm_device *dev);
-extern int drm_agp_release_ioctl(struct drm_device *dev, void *data,
-                                 struct drm_file *file_priv);
-extern int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);
-extern int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
-                                struct drm_file *file_priv);
-extern int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info);
-extern int drm_agp_info_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);
-extern int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-extern int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
-extern int drm_agp_free_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
-extern int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
-                          struct drm_file *file_priv);
-extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
-extern int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size_t pages, u32 type);
-extern int drm_agp_free_memory(DRM_AGP_MEM * handle);
-extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start);
-extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
-
-                                /* Stub support (drm_stub.h) */
-extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
-                       struct drm_driver *driver);
-extern int drm_put_dev(struct drm_device *dev);
-extern int drm_put_minor(struct drm_minor **minor);
-extern unsigned int drm_debug;
-
-extern struct class *drm_class;
-extern struct proc_dir_entry *drm_proc_root;
-
-extern struct idr drm_minors_idr;
-
-extern drm_local_map_t *drm_getsarea(struct drm_device *dev);
-
-                                /* Proc support (drm_proc.h) */
-extern int drm_proc_init(struct drm_minor *minor, int minor_id,
-                         struct proc_dir_entry *root);
-extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root);
-
-                                /* Scatter Gather Support (drm_scatter.h) */
-extern void drm_sg_cleanup(struct drm_sg_mem * entry);
-extern int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv);
-extern int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request);
-extern int drm_sg_free(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv);
-
-                               /* ATI PCIGART support (ati_pcigart.h) */
-extern int drm_ati_pcigart_init(struct drm_device *dev,
-                                struct drm_ati_pcigart_info * gart_info);
-extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
-                                   struct drm_ati_pcigart_info * gart_info);
-
-extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
-                                       size_t align, dma_addr_t maxaddr);
-extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
-extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
-
-                               /* sysfs support (drm_sysfs.c) */
-struct drm_sysfs_class;
-extern struct class *drm_sysfs_create(struct module *owner, char *name);
-extern void drm_sysfs_destroy(void);
-extern int drm_sysfs_device_add(struct drm_minor *minor);
-extern void drm_sysfs_device_remove(struct drm_minor *minor);
-
-/*
- * Basic memory manager support (drm_mm.c)
- */
-extern struct drm_mm_node *drm_mm_get_block(struct drm_mm_node * parent,
-                                       unsigned long size,
-                                       unsigned alignment);
-extern void drm_mm_put_block(struct drm_mm_node * cur);
-extern struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, unsigned long size,
-                                         unsigned alignment, int best_match);
-extern int drm_mm_init(struct drm_mm *mm, unsigned long start, unsigned long size);
-extern void drm_mm_takedown(struct drm_mm *mm);
-extern int drm_mm_clean(struct drm_mm *mm);
-extern unsigned long drm_mm_tail_space(struct drm_mm *mm);
-extern int drm_mm_remove_space_from_tail(struct drm_mm *mm, unsigned long size);
-extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size);
-
-extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev);
-extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev);
-
-static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
-                                                   unsigned int token)
-{
-        struct drm_map_list *_entry;
-        list_for_each_entry(_entry, &dev->maplist, head)
-            if (_entry->user_token == token)
-                return _entry->map;
-        return NULL;
-}
-
-static __inline__ int drm_device_is_agp(struct drm_device *dev)
-{
-        if (dev->driver->device_is_agp != NULL) {
-                int err = (*dev->driver->device_is_agp) (dev);
-
-                if (err != 2) {
-                        return err;
-                }
-        }
-
-        return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
-}
-
-static __inline__ int drm_device_is_pcie(struct drm_device *dev)
-{
-        return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
-}
-
-static __inline__ void drm_core_dropmap(struct drm_map *map)
-{
-}
-
-#ifndef DEBUG_MEMORY
-/** Wrapper around kmalloc() */
-static __inline__ void *drm_alloc(size_t size, int area)
-{
-        return kmalloc(size, GFP_KERNEL);
-}
-
-/** Wrapper around kfree() */
-static __inline__ void drm_free(void *pt, size_t size, int area)
-{
-        kfree(pt);
-}
-
-/** Wrapper around kcalloc() */
-static __inline__ void *drm_calloc(size_t nmemb, size_t size, int area)
-{
-        return kcalloc(nmemb, size, GFP_KERNEL);
-}
-#else
-extern void *drm_alloc(size_t size, int area);
-extern void drm_free(void *pt, size_t size, int area);
-extern void *drm_calloc(size_t nmemb, size_t size, int area);
-#endif
-
-/*@}*/
-
-#endif                          /* __KERNEL__ */
-#endif
diff --git a/drivers/char/drm/drm_core.h b/drivers/char/drm/drm_core.h
deleted file mode 100644
index 316739036079..000000000000
--- a/drivers/char/drm/drm_core.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2004 Jon Smirl <jonsmirl@gmail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#define CORE_AUTHOR             "Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl"
-
-#define CORE_NAME               "drm"
-#define CORE_DESC               "DRM shared core routines"
-#define CORE_DATE               "20060810"
-
-#define DRM_IF_MAJOR    1
-#define DRM_IF_MINOR    3
-
-#define CORE_MAJOR      1
-#define CORE_MINOR      1
-#define CORE_PATCHLEVEL 0
diff --git a/drivers/char/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h
deleted file mode 100644
index cd2b189e1be6..000000000000
--- a/drivers/char/drm/drm_hashtab.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2006 Tungsten Graphics, Inc., Bismack, ND. USA.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *
- **************************************************************************/
-/*
- * Simple open hash tab implementation.
- *
- * Authors:
- * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
- */
-
-#ifndef DRM_HASHTAB_H
-#define DRM_HASHTAB_H
-
-#define drm_hash_entry(_ptr, _type, _member) container_of(_ptr, _type, _member)
-
-struct drm_hash_item {
-        struct hlist_node head;
-        unsigned long key;
-};
-
-struct drm_open_hash {
-        unsigned int size;
-        unsigned int order;
-        unsigned int fill;
-        struct hlist_head *table;
-        int use_vmalloc;
-};
-
-
-extern int drm_ht_create(struct drm_open_hash *ht, unsigned int order);
-extern int drm_ht_insert_item(struct drm_open_hash *ht, struct drm_hash_item *item);
-extern int drm_ht_just_insert_please(struct drm_open_hash *ht, struct drm_hash_item *item,
-                                     unsigned long seed, int bits, int shift,
-                                     unsigned long add);
-extern int drm_ht_find_item(struct drm_open_hash *ht, unsigned long key, struct drm_hash_item **item);
-
-extern void drm_ht_verbose_list(struct drm_open_hash *ht, unsigned long key);
-extern int drm_ht_remove_key(struct drm_open_hash *ht, unsigned long key);
-extern int drm_ht_remove_item(struct drm_open_hash *ht, struct drm_hash_item *item);
-extern void drm_ht_remove(struct drm_open_hash *ht);
-
-
-#endif
diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h
deleted file mode 100644
index 63e425b5ea82..000000000000
--- a/drivers/char/drm/drm_memory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * \file drm_memory.h
- * Memory management wrappers for DRM
- *
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- * \author Gareth Hughes <gareth@valinux.com>
- */
-
-/*
- * Created: Thu Feb  4 14:00:34 1999 by faith@valinux.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <linux/highmem.h>
-#include <linux/vmalloc.h>
-#include "drmP.h"
-
-/**
- * Cut down version of drm_memory_debug.h, which used to be called
- * drm_memory.h.
- */
-
-#if __OS_HAS_AGP
-
-#include <linux/vmalloc.h>
-
-#ifdef HAVE_PAGE_AGP
-#include <asm/agp.h>
-#else
-# ifdef __powerpc__
-#  define PAGE_AGP      __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-# else
-#  define PAGE_AGP      PAGE_KERNEL
-# endif
-#endif
-
-#else                           /* __OS_HAS_AGP */
-
-#endif
diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h
deleted file mode 100644
index 6463271deea8..000000000000
--- a/drivers/char/drm/drm_memory_debug.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/**
- * \file drm_memory_debug.h
- * Memory management wrappers for DRM.
- *
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- * \author Gareth Hughes <gareth@valinux.com>
- */
-
-/*
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "drmP.h"
-
-typedef struct drm_mem_stats {
-        const char *name;
-        int succeed_count;
-        int free_count;
-        int fail_count;
-        unsigned long bytes_allocated;
-        unsigned long bytes_freed;
-} drm_mem_stats_t;
-
-static DEFINE_SPINLOCK(drm_mem_lock);
-static unsigned long drm_ram_available = 0;     /* In pages */
-static unsigned long drm_ram_used = 0;
-static drm_mem_stats_t drm_mem_stats[] =
-{
-        [DRM_MEM_DMA] = {"dmabufs"},
-        [DRM_MEM_SAREA] = {"sareas"},
-        [DRM_MEM_DRIVER] = {"driver"},
-        [DRM_MEM_MAGIC] = {"magic"},
-        [DRM_MEM_IOCTLS] = {"ioctltab"},
-        [DRM_MEM_MAPS] = {"maplist"},
-        [DRM_MEM_VMAS] = {"vmalist"},
-        [DRM_MEM_BUFS] = {"buflist"},
-        [DRM_MEM_SEGS] = {"seglist"},
-        [DRM_MEM_PAGES] = {"pagelist"},
-        [DRM_MEM_FILES] = {"files"},
-        [DRM_MEM_QUEUES] = {"queues"},
-        [DRM_MEM_CMDS] = {"commands"},
-        [DRM_MEM_MAPPINGS] = {"mappings"},
-        [DRM_MEM_BUFLISTS] = {"buflists"},
-        [DRM_MEM_AGPLISTS] = {"agplist"},
-        [DRM_MEM_SGLISTS] = {"sglist"},
-        [DRM_MEM_TOTALAGP] = {"totalagp"},
-        [DRM_MEM_BOUNDAGP] = {"boundagp"},
-        [DRM_MEM_CTXBITMAP] = {"ctxbitmap"},
-        [DRM_MEM_CTXLIST] = {"ctxlist"},
-        [DRM_MEM_STUB] = {"stub"},
-        {NULL, 0,}              /* Last entry must be null */
-};
-
-void drm_mem_init (void) {
-        drm_mem_stats_t *mem;
-        struct sysinfo si;
-
-        for (mem = drm_mem_stats; mem->name; ++mem) {
-                mem->succeed_count = 0;
-                mem->free_count = 0;
-                mem->fail_count = 0;
-                mem->bytes_allocated = 0;
-                mem->bytes_freed = 0;
-        }
-
-        si_meminfo(&si);
-        drm_ram_available = si.totalram;
-        drm_ram_used = 0;
-}
-
-/* drm_mem_info is called whenever a process reads /dev/drm/mem. */
-
-static int drm__mem_info (char *buf, char **start, off_t offset,
-                           int request, int *eof, void *data) {
-        drm_mem_stats_t *pt;
-        int len = 0;
-
-        if (offset > DRM_PROC_LIMIT) {
-                *eof = 1;
-                return 0;
-        }
-
-        *eof = 0;
-        *start = &buf[offset];
-
-        DRM_PROC_PRINT("                  total counts                  "
-                       " |    outstanding  \n");
-        DRM_PROC_PRINT("type       alloc freed fail     bytes      freed"
-                       " | allocs      bytes\n\n");
-        DRM_PROC_PRINT("%-9.9s %5d %5d %4d %10lu kB         |\n",
-                       "system", 0, 0, 0,
-                       drm_ram_available << (PAGE_SHIFT - 10));
-        DRM_PROC_PRINT("%-9.9s %5d %5d %4d %10lu kB         |\n",
-                       "locked", 0, 0, 0, drm_ram_used >> 10);
-        DRM_PROC_PRINT("\n");
-        for (pt = drm_mem_stats; pt->name; pt++) {
-                DRM_PROC_PRINT("%-9.9s %5d %5d %4d %10lu %10lu | %6d %10ld\n",
-                               pt->name,
-                               pt->succeed_count,
-                               pt->free_count,
-                               pt->fail_count,
-                               pt->bytes_allocated,
-                               pt->bytes_freed,
-                               pt->succeed_count - pt->free_count,
-                               (long)pt->bytes_allocated
-                               - (long)pt->bytes_freed);
-        }
-
-        if (len > request + offset)
-                return request;
-        *eof = 1;
-        return len - offset;
-}
-
-int drm_mem_info (char *buf, char **start, off_t offset,
-                   int len, int *eof, void *data) {
-        int ret;
-
-        spin_lock(&drm_mem_lock);
-        ret = drm__mem_info (buf, start, offset, len, eof, data);
-        spin_unlock(&drm_mem_lock);
-        return ret;
-}
-
-void *drm_alloc (size_t size, int area) {
-        void *pt;
-
-        if (!size) {
-                DRM_MEM_ERROR(area, "Allocating 0 bytes\n");
-                return NULL;
-        }
-
-        if (!(pt = kmalloc(size, GFP_KERNEL))) {
-                spin_lock(&drm_mem_lock);
-                ++drm_mem_stats[area].fail_count;
-                spin_unlock(&drm_mem_lock);
-                return NULL;
-        }
-        spin_lock(&drm_mem_lock);
-        ++drm_mem_stats[area].succeed_count;
-        drm_mem_stats[area].bytes_allocated += size;
-        spin_unlock(&drm_mem_lock);
-        return pt;
-}
-
-void *drm_calloc (size_t nmemb, size_t size, int area) {
-        void *addr;
-
-        addr = drm_alloc (nmemb * size, area);
-        if (addr != NULL)
-                memset((void *)addr, 0, size * nmemb);
-
-        return addr;
-}
-
-void *drm_realloc (void *oldpt, size_t oldsize, size_t size, int area) {
-        void *pt;
-
-        if (!(pt = drm_alloc (size, area)))
-                return NULL;
-        if (oldpt && oldsize) {
-                memcpy(pt, oldpt, oldsize);
-                drm_free (oldpt, oldsize, area);
-        }
-        return pt;
-}
-
-void drm_free (void *pt, size_t size, int area) {
-        int alloc_count;
-        int free_count;
-
-        if (!pt)
-                DRM_MEM_ERROR(area, "Attempt to free NULL pointer\n");
-        else
-                kfree(pt);
-        spin_lock(&drm_mem_lock);
-        drm_mem_stats[area].bytes_freed += size;
-        free_count = ++drm_mem_stats[area].free_count;
-        alloc_count = drm_mem_stats[area].succeed_count;
-        spin_unlock(&drm_mem_lock);
-        if (free_count > alloc_count) {
-                DRM_MEM_ERROR(area, "Excess frees: %d frees, %d allocs\n",
-                              free_count, alloc_count);
-        }
-}
-
-#if __OS_HAS_AGP
-
-DRM_AGP_MEM *drm_alloc_agp (drm_device_t *dev, int pages, u32 type) {
-        DRM_AGP_MEM *handle;
-
-        if (!pages) {
-                DRM_MEM_ERROR(DRM_MEM_TOTALAGP, "Allocating 0 pages\n");
-                return NULL;
-        }
-
-        if ((handle = drm_agp_allocate_memory (pages, type))) {
-                spin_lock(&drm_mem_lock);
-                ++drm_mem_stats[DRM_MEM_TOTALAGP].succeed_count;
-                drm_mem_stats[DRM_MEM_TOTALAGP].bytes_allocated
-                    += pages << PAGE_SHIFT;
-                spin_unlock(&drm_mem_lock);
-                return handle;
-        }
-        spin_lock(&drm_mem_lock);
-        ++drm_mem_stats[DRM_MEM_TOTALAGP].fail_count;
-        spin_unlock(&drm_mem_lock);
-        return NULL;
-}
-
-int drm_free_agp (DRM_AGP_MEM * handle, int pages) {
-        int alloc_count;
-        int free_count;
-        int retval = -EINVAL;
-
-        if (!handle) {
-                DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
-                              "Attempt to free NULL AGP handle\n");
-                return retval;
-        }
-
-        if (drm_agp_free_memory (handle)) {
-                spin_lock(&drm_mem_lock);
-                free_count = ++drm_mem_stats[DRM_MEM_TOTALAGP].free_count;
-                alloc_count = drm_mem_stats[DRM_MEM_TOTALAGP].succeed_count;
-                drm_mem_stats[DRM_MEM_TOTALAGP].bytes_freed
-                    += pages << PAGE_SHIFT;
-                spin_unlock(&drm_mem_lock);
-                if (free_count > alloc_count) {
-                        DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
-                                      "Excess frees: %d frees, %d allocs\n",
-                                      free_count, alloc_count);
-                }
-                return 0;
-        }
-        return retval;
-}
-
-int drm_bind_agp (DRM_AGP_MEM * handle, unsigned int start) {
-        int retcode = -EINVAL;
-
-        if (!handle) {
-                DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
-                              "Attempt to bind NULL AGP handle\n");
-                return retcode;
-        }
-
-        if (!(retcode = drm_agp_bind_memory (handle, start))) {
-                spin_lock(&drm_mem_lock);
-                ++drm_mem_stats[DRM_MEM_BOUNDAGP].succeed_count;
-                drm_mem_stats[DRM_MEM_BOUNDAGP].bytes_allocated
-                    += handle->page_count << PAGE_SHIFT;
-                spin_unlock(&drm_mem_lock);
-                return retcode;
-        }
-        spin_lock(&drm_mem_lock);
-        ++drm_mem_stats[DRM_MEM_BOUNDAGP].fail_count;
-        spin_unlock(&drm_mem_lock);
-        return retcode;
-}
-
-int drm_unbind_agp (DRM_AGP_MEM * handle) {
-        int alloc_count;
-        int free_count;
-        int retcode = -EINVAL;
-
-        if (!handle) {
-                DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
-                              "Attempt to unbind NULL AGP handle\n");
-                return retcode;
-        }
-
-        if ((retcode = drm_agp_unbind_memory (handle)))
-                return retcode;
-        spin_lock(&drm_mem_lock);
-        free_count = ++drm_mem_stats[DRM_MEM_BOUNDAGP].free_count;
-        alloc_count = drm_mem_stats[DRM_MEM_BOUNDAGP].succeed_count;
-        drm_mem_stats[DRM_MEM_BOUNDAGP].bytes_freed
-            += handle->page_count << PAGE_SHIFT;
-        spin_unlock(&drm_mem_lock);
-        if (free_count > alloc_count) {
-                DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
-                              "Excess frees: %d frees, %d allocs\n",
-                              free_count, alloc_count);
-        }
-        return retcode;
-}
-#endif
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h
deleted file mode 100644
index 8dbd2572b7c3..000000000000
--- a/drivers/char/drm/drm_os_linux.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * \file drm_os_linux.h
- * OS abstraction macros.
- */
-
-#include <linux/interrupt.h>    /* For task queue support */
-#include <linux/delay.h>
-
-/** Current process ID */
-#define DRM_CURRENTPID                  task_pid_nr(current)
-#define DRM_SUSER(p)                    capable(CAP_SYS_ADMIN)
-#define DRM_UDELAY(d)                   udelay(d)
-/** Read a byte from a MMIO region */
-#define DRM_READ8(map, offset)          readb(((void __iomem *)(map)->handle) + (offset))
-/** Read a word from a MMIO region */
-#define DRM_READ16(map, offset)         readw(((void __iomem *)(map)->handle) + (offset))
-/** Read a dword from a MMIO region */
-#define DRM_READ32(map, offset)         readl(((void __iomem *)(map)->handle) + (offset))
-/** Write a byte into a MMIO region */
-#define DRM_WRITE8(map, offset, val)    writeb(val, ((void __iomem *)(map)->handle) + (offset))
-/** Write a word into a MMIO region */
-#define DRM_WRITE16(map, offset, val)   writew(val, ((void __iomem *)(map)->handle) + (offset))
-/** Write a dword into a MMIO region */
-#define DRM_WRITE32(map, offset, val)   writel(val, ((void __iomem *)(map)->handle) + (offset))
-/** Read memory barrier */
-#define DRM_READMEMORYBARRIER()         rmb()
-/** Write memory barrier */
-#define DRM_WRITEMEMORYBARRIER()        wmb()
-/** Read/write memory barrier */
-#define DRM_MEMORYBARRIER()             mb()
-
-/** IRQ handler arguments and return type and values */
-#define DRM_IRQ_ARGS            int irq, void *arg
-
-/** AGP types */
-#if __OS_HAS_AGP
-#define DRM_AGP_MEM             struct agp_memory
-#define DRM_AGP_KERN            struct agp_kern_info
-#else
-/* define some dummy types for non AGP supporting kernels */
-struct no_agp_kern {
-        unsigned long aper_base;
-        unsigned long aper_size;
-};
-#define DRM_AGP_MEM             int
-#define DRM_AGP_KERN            struct no_agp_kern
-#endif
-
-#if !(__OS_HAS_MTRR)
-static __inline__ int mtrr_add(unsigned long base, unsigned long size,
-                               unsigned int type, char increment)
-{
-        return -ENODEV;
-}
-
-static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size)
-{
-        return -ENODEV;
-}
-
-#define MTRR_TYPE_WRCOMB     1
-
-#endif
-
-/** Other copying of data to kernel space */
-#define DRM_COPY_FROM_USER(arg1, arg2, arg3)            \
-        copy_from_user(arg1, arg2, arg3)
-/** Other copying of data from kernel space */
-#define DRM_COPY_TO_USER(arg1, arg2, arg3)              \
-        copy_to_user(arg1, arg2, arg3)
-/* Macros for copyfrom user, but checking readability only once */
-#define DRM_VERIFYAREA_READ( uaddr, size )              \
-        (access_ok( VERIFY_READ, uaddr, size ) ? 0 : -EFAULT)
-#define DRM_COPY_FROM_USER_UNCHECKED(arg1, arg2, arg3)  \
-        __copy_from_user(arg1, arg2, arg3)
-#define DRM_COPY_TO_USER_UNCHECKED(arg1, arg2, arg3)    \
-        __copy_to_user(arg1, arg2, arg3)
-#define DRM_GET_USER_UNCHECKED(val, uaddr)              \
-        __get_user(val, uaddr)
-
-#define DRM_HZ HZ
-
-#define DRM_WAIT_ON( ret, queue, timeout, condition )           \
-do {                                                            \
-        DECLARE_WAITQUEUE(entry, current);                      \
-        unsigned long end = jiffies + (timeout);                \
-        add_wait_queue(&(queue), &entry);                       \
-                                                                \
-        for (;;) {                                              \
-                __set_current_state(TASK_INTERRUPTIBLE);        \
-                if (condition)                                  \
-                        break;                                  \
-                if (time_after_eq(jiffies, end)) {              \
-                        ret = -EBUSY;                           \
-                        break;                                  \
-                }                                               \
-                schedule_timeout((HZ/100 > 1) ? HZ/100 : 1);    \
-                if (signal_pending(current)) {                  \
-                        ret = -EINTR;                           \
-                        break;                                  \
-                }                                               \
-        }                                                       \
-        __set_current_state(TASK_RUNNING);                      \
-        remove_wait_queue(&(queue), &entry);                    \
-} while (0)
-
-#define DRM_WAKEUP( queue ) wake_up_interruptible( queue )
-#define DRM_INIT_WAITQUEUE( queue ) init_waitqueue_head( queue )
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
deleted file mode 100644
index 135bd19499fc..000000000000
--- a/drivers/char/drm/drm_pciids.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
-   This file is auto-generated from the drm_pciids.txt in the DRM CVS
-   Please contact dri-devel@lists.sf.net to add new cards to this list
-*/
-#define radeon_PCI_IDS \
-        {0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x3152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x3154, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x3E50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x3E54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS100|RADEON_IS_IGP}, \
-        {0x1002, 0x4137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|RADEON_IS_IGP}, \
-        {0x1002, 0x4144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4147, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4148, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x4149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x414A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x414B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x4150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
-        {0x1002, 0x4151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
-        {0x1002, 0x4152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
-        {0x1002, 0x4153, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
-        {0x1002, 0x4154, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
-        {0x1002, 0x4155, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
-        {0x1002, 0x4156, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
-        {0x1002, 0x4237, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|RADEON_IS_IGP}, \
-        {0x1002, 0x4242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
-        {0x1002, 0x4243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
-        {0x1002, 0x4336, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS100|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4337, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4437, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4966, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250}, \
-        {0x1002, 0x4967, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250}, \
-        {0x1002, 0x4A48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A4C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A4D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A4E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A4F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4A54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4B49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4B4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4B4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4B4C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x4C57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4C58, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4C59, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4C5A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4C64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4E47, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
-        {0x1002, 0x4E48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x4E49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x4E4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x4E4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
-        {0x1002, 0x4E50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4E51, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4E52, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4E53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4E54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x4E56, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x5144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|RADEON_SINGLE_CRTC}, \
-        {0x1002, 0x5145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|RADEON_SINGLE_CRTC}, \
-        {0x1002, 0x5146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|RADEON_SINGLE_CRTC}, \
-        {0x1002, 0x5147, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|RADEON_SINGLE_CRTC}, \
-        {0x1002, 0x5148, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
-        {0x1002, 0x514C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
-        {0x1002, 0x514D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
-        {0x1002, 0x5157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200}, \
-        {0x1002, 0x5158, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200}, \
-        {0x1002, 0x5159, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \
-        {0x1002, 0x515A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \
-        {0x1002, 0x515E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \
-        {0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x5462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x5464, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x5657, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5548, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5549, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x554A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x554B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x554C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x554D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x554E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x554F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5550, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5551, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5552, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5554, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x564A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x564B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x564F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP}, \
-        {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x5954, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
-        {0x1002, 0x5955, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
-        {0x1002, 0x5974, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
-        {0x1002, 0x5975, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
-        {0x1002, 0x5960, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-        {0x1002, 0x5961, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-        {0x1002, 0x5962, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-        {0x1002, 0x5964, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-        {0x1002, 0x5965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-        {0x1002, 0x5969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \
-        {0x1002, 0x5a61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
-        {0x1002, 0x5a62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
-        {0x1002, 0x5b60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5b62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5b63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5b64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5b65, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5c61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|RADEON_IS_MOBILITY}, \
-        {0x1002, 0x5d48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d4a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d4c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d4f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d52, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5d57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5e48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5e4a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5e4b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5e4c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5e4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x5e4f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7101, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7103, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7104, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x710A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x710B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x710C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x710E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x710F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R520|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7143, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7147, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x714A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x714B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x714C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x714D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x714E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x714F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7153, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x715E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x715F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7181, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7183, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7186, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7187, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7188, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x718A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x718B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x718C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x718D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x718F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7193, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7196, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x719B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x719F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71CE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71D2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71D4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71D5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71D6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x71DE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7244, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7245, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7246, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7247, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7248, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x724A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x724B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x724C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x724D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x724E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x724F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7280, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV570|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7281, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7283, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7284, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7287, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV570|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7289, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV570|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x728B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV570|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x728C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV570|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7290, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7291, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7293, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7297, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
-        {0x1002, 0x791f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
-        {0, 0, 0}
-
-#define r128_PCI_IDS \
-        {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4d46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4d4c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5041, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5044, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5045, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5046, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5047, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5048, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5049, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x504A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x504B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x504C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x504D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x504E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x504F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5052, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5245, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5246, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5247, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x524b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x524c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x534d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
-#define mga_PCI_IDS \
-        {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \
-        {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \
-        {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \
-        {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \
-        {0, 0, 0}
-
-#define mach64_PCI_IDS \
-        {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4742, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4744, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c51, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x474c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x474f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4752, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4753, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x474d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x474e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c52, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
-#define sisdrv_PCI_IDS \
-        {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1039, 0x5300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1039, 0x6300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1039, 0x6330, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
-        {0x1039, 0x6351, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
-        {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
-        {0, 0, 0}
-
-#define tdfx_PCI_IDS \
-        {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x121a, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x121a, 0x0005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
-#define viadrv_PCI_IDS \
-        {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x3118, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
-        {0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x3344, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
-        {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
-        {0, 0, 0}
-
-#define i810_PCI_IDS \
-        {0x8086, 0x7121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x7123, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x7125, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x1132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
-#define i830_PCI_IDS \
-        {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
-#define gamma_PCI_IDS \
-        {0x3d3d, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
-#define savage_PCI_IDS \
-        {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
-        {0x5333, 0x8a21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
-        {0x5333, 0x8a22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE4}, \
-        {0x5333, 0x8a23, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE4}, \
-        {0x5333, 0x8c10, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
-        {0x5333, 0x8c11, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
-        {0x5333, 0x8c12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
-        {0x5333, 0x8c13, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
-        {0x5333, 0x8c22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c24, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c2a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c2b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c2c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8c2f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
-        {0x5333, 0x8a25, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGE}, \
-        {0x5333, 0x8a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGE}, \
-        {0x5333, 0x8d01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
-        {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
-        {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
-        {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
-        {0, 0, 0}
-
-#define ffb_PCI_IDS \
-        {0, 0, 0}
-
-#define i915_PCI_IDS \
-        {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x258a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x27a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x27ae, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2972, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2982, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x29a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x29b2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x29c2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x29d2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2a42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2e02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h
deleted file mode 100644
index 480037331e4e..000000000000
--- a/drivers/char/drm/drm_sarea.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * \file drm_sarea.h
- * \brief SAREA definitions
- *
- * \author Michel Dänzer <michel@daenzer.net>
- */
-
-/*
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _DRM_SAREA_H_
-#define _DRM_SAREA_H_
-
-#include "drm.h"
-
-/* SAREA area needs to be at least a page */
-#if defined(__alpha__)
-#define SAREA_MAX                       0x2000
-#elif defined(__ia64__)
-#define SAREA_MAX                       0x10000 /* 64kB */
-#else
-/* Intel 830M driver needs at least 8k SAREA */
-#define SAREA_MAX                       0x2000
-#endif
-
-/** Maximum number of drawables in the SAREA */
-#define SAREA_MAX_DRAWABLES             256
-
-#define SAREA_DRAWABLE_CLAIMED_ENTRY    0x80000000
-
-/** SAREA drawable */
-struct drm_sarea_drawable {
-        unsigned int stamp;
-        unsigned int flags;
-};
-
-/** SAREA frame */
-struct drm_sarea_frame {
-        unsigned int x;
-        unsigned int y;
-        unsigned int width;
-        unsigned int height;
-        unsigned int fullscreen;
-};
-
-/** SAREA */
-struct drm_sarea {
-    /** first thing is always the DRM locking structure */
-        struct drm_hw_lock lock;
-    /** \todo Use readers/writer lock for drm_sarea::drawable_lock */
-        struct drm_hw_lock drawable_lock;
-        struct drm_sarea_drawable drawableTable[SAREA_MAX_DRAWABLES];   /**< drawables */
-        struct drm_sarea_frame frame;   /**< frame */
-        drm_context_t dummy_context;
-};
-
-#ifndef __KERNEL__
-typedef struct drm_sarea_drawable drm_sarea_drawable_t;
-typedef struct drm_sarea_frame drm_sarea_frame_t;
-typedef struct drm_sarea drm_sarea_t;
-#endif
-
-#endif                          /* _DRM_SAREA_H_ */
diff --git a/drivers/char/drm/drm_sman.h b/drivers/char/drm/drm_sman.h
deleted file mode 100644
index 08ecf83ad5d4..000000000000
--- a/drivers/char/drm/drm_sman.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *
- **************************************************************************/
-/*
- * Simple memory MANager interface that keeps track on allocate regions on a
- * per "owner" basis. All regions associated with an "owner" can be released
- * with a simple call. Typically if the "owner" exists. The owner is any
- * "unsigned long" identifier. Can typically be a pointer to a file private
- * struct or a context identifier.
- *
- * Authors:
- * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
- */
-
-#ifndef DRM_SMAN_H
-#define DRM_SMAN_H
-
-#include "drmP.h"
-#include "drm_hashtab.h"
-
-/*
- * A class that is an abstration of a simple memory allocator.
- * The sman implementation provides a default such allocator
- * using the drm_mm.c implementation. But the user can replace it.
- * See the SiS implementation, which may use the SiS FB kernel module
- * for memory management.
- */
-
-struct drm_sman_mm {
-        /* private info. If allocated, needs to be destroyed by the destroy
-           function */
-        void *private;
-
-        /* Allocate a memory block with given size and alignment.
-           Return an opaque reference to the memory block */
-
-        void *(*allocate) (void *private, unsigned long size,
-                           unsigned alignment);
-
-        /* Free a memory block. "ref" is the opaque reference that we got from
-           the "alloc" function */
-
-        void (*free) (void *private, void *ref);
-
-        /* Free all resources associated with this allocator */
-
-        void (*destroy) (void *private);
-
-        /* Return a memory offset from the opaque reference returned from the
-           "alloc" function */
-
-        unsigned long (*offset) (void *private, void *ref);
-};
-
-struct drm_memblock_item {
-        struct list_head owner_list;
-        struct drm_hash_item user_hash;
-        void *mm_info;
-        struct drm_sman_mm *mm;
-        struct drm_sman *sman;
-};
-
-struct drm_sman {
-        struct drm_sman_mm *mm;
-        int num_managers;
-        struct drm_open_hash owner_hash_tab;
-        struct drm_open_hash user_hash_tab;
-        struct list_head owner_items;
-};
-
-/*
- * Take down a memory manager. This function should only be called after a
- * successful init and after a call to drm_sman_cleanup.
- */
-
-extern void drm_sman_takedown(struct drm_sman * sman);
-
-/*
- * Allocate structures for a manager.
- * num_managers are the number of memory pools to manage. (VRAM, AGP, ....)
- * user_order is the log2 of the number of buckets in the user hash table.
- *          set this to approximately log2 of the max number of memory regions
- *          that will be allocated for _all_ pools together.
- * owner_order is the log2 of the number of buckets in the owner hash table.
- *          set this to approximately log2 of
- *          the number of client file connections that will
- *          be using the manager.
- *
- */
-
-extern int drm_sman_init(struct drm_sman * sman, unsigned int num_managers,
-                         unsigned int user_order, unsigned int owner_order);
-
-/*
- * Initialize a drm_mm.c allocator. Should be called only once for each
- * manager unless a customized allogator is used.
- */
-
-extern int drm_sman_set_range(struct drm_sman * sman, unsigned int manager,
-                              unsigned long start, unsigned long size);
-
-/*
- * Initialize a customized allocator for one of the managers.
- * (See the SiS module). The object pointed to by "allocator" is copied,
- * so it can be destroyed after this call.
- */
-
-extern int drm_sman_set_manager(struct drm_sman * sman, unsigned int mananger,
-                                struct drm_sman_mm * allocator);
-
-/*
- * Allocate a memory block. Aligment is not implemented yet.
- */
-
-extern struct drm_memblock_item *drm_sman_alloc(struct drm_sman * sman,
-                                                unsigned int manager,
-                                                unsigned long size,
-                                                unsigned alignment,
-                                                unsigned long owner);
-/*
- * Free a memory block identified by its user hash key.
- */
-
-extern int drm_sman_free_key(struct drm_sman * sman, unsigned int key);
-
-/*
- * returns 1 iff there are no stale memory blocks associated with this owner.
- * Typically called to determine if we need to idle the hardware and call
- * drm_sman_owner_cleanup. If there are no stale memory blocks, it removes all
- * resources associated with owner.
- */
-
-extern int drm_sman_owner_clean(struct drm_sman * sman, unsigned long owner);
-
-/*
- * Frees all stale memory blocks associated with this owner. Note that this
- * requires that the hardware is finished with all blocks, so the graphics engine
- * should be idled before this call is made. This function also frees
- * any resources associated with "owner" and should be called when owner
- * is not going to be referenced anymore.
- */
-
-extern void drm_sman_owner_cleanup(struct drm_sman * sman, unsigned long owner);
-
-/*
- * Frees all stale memory blocks associated with the memory manager.
- * See idling above.
- */
-
-extern void drm_sman_cleanup(struct drm_sman * sman);
-
-#endif
diff --git a/drivers/char/drm/i810_drm.h b/drivers/char/drm/i810_drm.h
deleted file mode 100644
index 7a10bb6f2c0f..000000000000
--- a/drivers/char/drm/i810_drm.h
+++ /dev/null
@@ -1,281 +0,0 @@
-#ifndef _I810_DRM_H_
-#define _I810_DRM_H_
-
-/* WARNING: These defines must be the same as what the Xserver uses.
- * if you change them, you must change the defines in the Xserver.
- */
-
-#ifndef _I810_DEFINES_
-#define _I810_DEFINES_
-
-#define I810_DMA_BUF_ORDER              12
-#define I810_DMA_BUF_SZ                 (1<<I810_DMA_BUF_ORDER)
-#define I810_DMA_BUF_NR                 256
-#define I810_NR_SAREA_CLIPRECTS         8
-
-/* Each region is a minimum of 64k, and there are at most 64 of them.
- */
-#define I810_NR_TEX_REGIONS 64
-#define I810_LOG_MIN_TEX_REGION_SIZE 16
-#endif
-
-#define I810_UPLOAD_TEX0IMAGE  0x1      /* handled clientside */
-#define I810_UPLOAD_TEX1IMAGE  0x2      /* handled clientside */
-#define I810_UPLOAD_CTX        0x4
-#define I810_UPLOAD_BUFFERS    0x8
-#define I810_UPLOAD_TEX0       0x10
-#define I810_UPLOAD_TEX1       0x20
-#define I810_UPLOAD_CLIPRECTS  0x40
-
-/* Indices into buf.Setup where various bits of state are mirrored per
- * context and per buffer.  These can be fired at the card as a unit,
- * or in a piecewise fashion as required.
- */
-
-/* Destbuffer state
- *    - backbuffer linear offset and pitch -- invarient in the current dri
- *    - zbuffer linear offset and pitch -- also invarient
- *    - drawing origin in back and depth buffers.
- *
- * Keep the depth/back buffer state here to accommodate private buffers
- * in the future.
- */
-#define I810_DESTREG_DI0  0     /* CMD_OP_DESTBUFFER_INFO (2 dwords) */
-#define I810_DESTREG_DI1  1
-#define I810_DESTREG_DV0  2     /* GFX_OP_DESTBUFFER_VARS (2 dwords) */
-#define I810_DESTREG_DV1  3
-#define I810_DESTREG_DR0  4     /* GFX_OP_DRAWRECT_INFO (4 dwords) */
-#define I810_DESTREG_DR1  5
-#define I810_DESTREG_DR2  6
-#define I810_DESTREG_DR3  7
-#define I810_DESTREG_DR4  8
-#define I810_DEST_SETUP_SIZE 10
-
-/* Context state
- */
-#define I810_CTXREG_CF0   0     /* GFX_OP_COLOR_FACTOR */
-#define I810_CTXREG_CF1   1
-#define I810_CTXREG_ST0   2     /* GFX_OP_STIPPLE */
-#define I810_CTXREG_ST1   3
-#define I810_CTXREG_VF    4     /* GFX_OP_VERTEX_FMT */
-#define I810_CTXREG_MT    5     /* GFX_OP_MAP_TEXELS */
-#define I810_CTXREG_MC0   6     /* GFX_OP_MAP_COLOR_STAGES - stage 0 */
-#define I810_CTXREG_MC1   7     /* GFX_OP_MAP_COLOR_STAGES - stage 1 */
-#define I810_CTXREG_MC2   8     /* GFX_OP_MAP_COLOR_STAGES - stage 2 */
-#define I810_CTXREG_MA0   9     /* GFX_OP_MAP_ALPHA_STAGES - stage 0 */
-#define I810_CTXREG_MA1   10    /* GFX_OP_MAP_ALPHA_STAGES - stage 1 */
-#define I810_CTXREG_MA2   11    /* GFX_OP_MAP_ALPHA_STAGES - stage 2 */
-#define I810_CTXREG_SDM   12    /* GFX_OP_SRC_DEST_MONO */
-#define I810_CTXREG_FOG   13    /* GFX_OP_FOG_COLOR */
-#define I810_CTXREG_B1    14    /* GFX_OP_BOOL_1 */
-#define I810_CTXREG_B2    15    /* GFX_OP_BOOL_2 */
-#define I810_CTXREG_LCS   16    /* GFX_OP_LINEWIDTH_CULL_SHADE_MODE */
-#define I810_CTXREG_PV    17    /* GFX_OP_PV_RULE -- Invarient! */
-#define I810_CTXREG_ZA    18    /* GFX_OP_ZBIAS_ALPHAFUNC */
-#define I810_CTXREG_AA    19    /* GFX_OP_ANTIALIAS */
-#define I810_CTX_SETUP_SIZE 20
-
-/* Texture state (per tex unit)
- */
-#define I810_TEXREG_MI0  0      /* GFX_OP_MAP_INFO (4 dwords) */
-#define I810_TEXREG_MI1  1
-#define I810_TEXREG_MI2  2
-#define I810_TEXREG_MI3  3
-#define I810_TEXREG_MF   4      /* GFX_OP_MAP_FILTER */
-#define I810_TEXREG_MLC  5      /* GFX_OP_MAP_LOD_CTL */
-#define I810_TEXREG_MLL  6      /* GFX_OP_MAP_LOD_LIMITS */
-#define I810_TEXREG_MCS  7      /* GFX_OP_MAP_COORD_SETS ??? */
-#define I810_TEX_SETUP_SIZE 8
-
-/* Flags for clear ioctl
- */
-#define I810_FRONT   0x1
-#define I810_BACK    0x2
-#define I810_DEPTH   0x4
-
-typedef enum _drm_i810_init_func {
-        I810_INIT_DMA = 0x01,
-        I810_CLEANUP_DMA = 0x02,
-        I810_INIT_DMA_1_4 = 0x03
-} drm_i810_init_func_t;
-
-/* This is the init structure after v1.2 */
-typedef struct _drm_i810_init {
-        drm_i810_init_func_t func;
-        unsigned int mmio_offset;
-        unsigned int buffers_offset;
-        int sarea_priv_offset;
-        unsigned int ring_start;
-        unsigned int ring_end;
-        unsigned int ring_size;
-        unsigned int front_offset;
-        unsigned int back_offset;
-        unsigned int depth_offset;
-        unsigned int overlay_offset;
-        unsigned int overlay_physical;
-        unsigned int w;
-        unsigned int h;
-        unsigned int pitch;
-        unsigned int pitch_bits;
-} drm_i810_init_t;
-
-/* This is the init structure prior to v1.2 */
-typedef struct _drm_i810_pre12_init {
-        drm_i810_init_func_t func;
-        unsigned int mmio_offset;
-        unsigned int buffers_offset;
-        int sarea_priv_offset;
-        unsigned int ring_start;
-        unsigned int ring_end;
-        unsigned int ring_size;
-        unsigned int front_offset;
-        unsigned int back_offset;
-        unsigned int depth_offset;
-        unsigned int w;
-        unsigned int h;
-        unsigned int pitch;
-        unsigned int pitch_bits;
-} drm_i810_pre12_init_t;
-
-/* Warning: If you change the SAREA structure you must change the Xserver
- * structure as well */
-
-typedef struct _drm_i810_tex_region {
-        unsigned char next, prev;       /* indices to form a circular LRU  */
-        unsigned char in_use;   /* owned by a client, or free? */
-        int age;                /* tracked by clients to update local LRU's */
-} drm_i810_tex_region_t;
-
-typedef struct _drm_i810_sarea {
-        unsigned int ContextState[I810_CTX_SETUP_SIZE];
-        unsigned int BufferState[I810_DEST_SETUP_SIZE];
-        unsigned int TexState[2][I810_TEX_SETUP_SIZE];
-        unsigned int dirty;
-
-        unsigned int nbox;
-        struct drm_clip_rect boxes[I810_NR_SAREA_CLIPRECTS];
-
-        /* Maintain an LRU of contiguous regions of texture space.  If
-         * you think you own a region of texture memory, and it has an
-         * age different to the one you set, then you are mistaken and
-         * it has been stolen by another client.  If global texAge
-         * hasn't changed, there is no need to walk the list.
-         *
-         * These regions can be used as a proxy for the fine-grained
-         * texture information of other clients - by maintaining them
-         * in the same lru which is used to age their own textures,
-         * clients have an approximate lru for the whole of global
-         * texture space, and can make informed decisions as to which
-         * areas to kick out.  There is no need to choose whether to
-         * kick out your own texture or someone else's - simply eject
-         * them all in LRU order.
-         */
-
-        drm_i810_tex_region_t texList[I810_NR_TEX_REGIONS + 1];
-        /* Last elt is sentinal */
-        int texAge;             /* last time texture was uploaded */
-        int last_enqueue;       /* last time a buffer was enqueued */
-        int last_dispatch;      /* age of the most recently dispatched buffer */
-        int last_quiescent;     /*  */
-        int ctxOwner;           /* last context to upload state */
-
-        int vertex_prim;
-
-        int pf_enabled;         /* is pageflipping allowed? */
-        int pf_active;
-        int pf_current_page;    /* which buffer is being displayed? */
-} drm_i810_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmMga.h)
- */
-
-/* i810 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_I810_INIT           0x00
-#define DRM_I810_VERTEX         0x01
-#define DRM_I810_CLEAR          0x02
-#define DRM_I810_FLUSH          0x03
-#define DRM_I810_GETAGE         0x04
-#define DRM_I810_GETBUF         0x05
-#define DRM_I810_SWAP           0x06
-#define DRM_I810_COPY           0x07
-#define DRM_I810_DOCOPY         0x08
-#define DRM_I810_OV0INFO        0x09
-#define DRM_I810_FSTATUS        0x0a
-#define DRM_I810_OV0FLIP        0x0b
-#define DRM_I810_MC             0x0c
-#define DRM_I810_RSTATUS        0x0d
-#define DRM_I810_FLIP           0x0e
-
-#define DRM_IOCTL_I810_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I810_INIT, drm_i810_init_t)
-#define DRM_IOCTL_I810_VERTEX           DRM_IOW( DRM_COMMAND_BASE + DRM_I810_VERTEX, drm_i810_vertex_t)
-#define DRM_IOCTL_I810_CLEAR            DRM_IOW( DRM_COMMAND_BASE + DRM_I810_CLEAR, drm_i810_clear_t)
-#define DRM_IOCTL_I810_FLUSH            DRM_IO(  DRM_COMMAND_BASE + DRM_I810_FLUSH)
-#define DRM_IOCTL_I810_GETAGE           DRM_IO(  DRM_COMMAND_BASE + DRM_I810_GETAGE)
-#define DRM_IOCTL_I810_GETBUF           DRM_IOWR(DRM_COMMAND_BASE + DRM_I810_GETBUF, drm_i810_dma_t)
-#define DRM_IOCTL_I810_SWAP             DRM_IO(  DRM_COMMAND_BASE + DRM_I810_SWAP)
-#define DRM_IOCTL_I810_COPY             DRM_IOW( DRM_COMMAND_BASE + DRM_I810_COPY, drm_i810_copy_t)
-#define DRM_IOCTL_I810_DOCOPY           DRM_IO(  DRM_COMMAND_BASE + DRM_I810_DOCOPY)
-#define DRM_IOCTL_I810_OV0INFO          DRM_IOR( DRM_COMMAND_BASE + DRM_I810_OV0INFO, drm_i810_overlay_t)
-#define DRM_IOCTL_I810_FSTATUS          DRM_IO ( DRM_COMMAND_BASE + DRM_I810_FSTATUS)
-#define DRM_IOCTL_I810_OV0FLIP          DRM_IO ( DRM_COMMAND_BASE + DRM_I810_OV0FLIP)
-#define DRM_IOCTL_I810_MC               DRM_IOW( DRM_COMMAND_BASE + DRM_I810_MC, drm_i810_mc_t)
-#define DRM_IOCTL_I810_RSTATUS          DRM_IO ( DRM_COMMAND_BASE + DRM_I810_RSTATUS)
-#define DRM_IOCTL_I810_FLIP             DRM_IO ( DRM_COMMAND_BASE + DRM_I810_FLIP)
-
-typedef struct _drm_i810_clear {
-        int clear_color;
-        int clear_depth;
-        int flags;
-} drm_i810_clear_t;
-
-/* These may be placeholders if we have more cliprects than
- * I810_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
- * false, indicating that the buffer will be dispatched again with a
- * new set of cliprects.
- */
-typedef struct _drm_i810_vertex {
-        int idx;                /* buffer index */
-        int used;               /* nr bytes in use */
-        int discard;            /* client is finished with the buffer? */
-} drm_i810_vertex_t;
-
-typedef struct _drm_i810_copy_t {
-        int idx;                /* buffer index */
-        int used;               /* nr bytes in use */
-        void *address;          /* Address to copy from */
-} drm_i810_copy_t;
-
-#define PR_TRIANGLES         (0x0<<18)
-#define PR_TRISTRIP_0        (0x1<<18)
-#define PR_TRISTRIP_1        (0x2<<18)
-#define PR_TRIFAN            (0x3<<18)
-#define PR_POLYGON           (0x4<<18)
-#define PR_LINES             (0x5<<18)
-#define PR_LINESTRIP         (0x6<<18)
-#define PR_RECTS             (0x7<<18)
-#define PR_MASK              (0x7<<18)
-
-typedef struct drm_i810_dma {
-        void *virtual;
-        int request_idx;
-        int request_size;
-        int granted;
-} drm_i810_dma_t;
-
-typedef struct _drm_i810_overlay_t {
-        unsigned int offset;    /* Address of the Overlay Regs */
-        unsigned int physical;
-} drm_i810_overlay_t;
-
-typedef struct _drm_i810_mc {
-        int idx;                /* buffer index */
-        int used;               /* nr bytes in use */
-        int num_blocks;         /* number of GFXBlocks */
-        int *length;            /* List of lengths for GFXBlocks (FUTURE) */
-        unsigned int last_render;       /* Last Render Request */
-} drm_i810_mc_t;
-
-#endif                          /* _I810_DRM_H_ */
diff --git a/drivers/char/drm/i830_drm.h b/drivers/char/drm/i830_drm.h
deleted file mode 100644
index 4b00d2dd4f68..000000000000
--- a/drivers/char/drm/i830_drm.h
+++ /dev/null
@@ -1,342 +0,0 @@
-#ifndef _I830_DRM_H_
-#define _I830_DRM_H_
-
-/* WARNING: These defines must be the same as what the Xserver uses.
- * if you change them, you must change the defines in the Xserver.
- *
- * KW: Actually, you can't ever change them because doing so would
- * break backwards compatibility.
- */
-
-#ifndef _I830_DEFINES_
-#define _I830_DEFINES_
-
-#define I830_DMA_BUF_ORDER              12
-#define I830_DMA_BUF_SZ                 (1<<I830_DMA_BUF_ORDER)
-#define I830_DMA_BUF_NR                 256
-#define I830_NR_SAREA_CLIPRECTS         8
-
-/* Each region is a minimum of 64k, and there are at most 64 of them.
- */
-#define I830_NR_TEX_REGIONS 64
-#define I830_LOG_MIN_TEX_REGION_SIZE 16
-
-/* KW: These aren't correct but someone set them to two and then
- * released the module.  Now we can't change them as doing so would
- * break backwards compatibility.
- */
-#define I830_TEXTURE_COUNT      2
-#define I830_TEXBLEND_COUNT     I830_TEXTURE_COUNT
-
-#define I830_TEXBLEND_SIZE      12      /* (4 args + op) * 2 + COLOR_FACTOR */
-
-#define I830_UPLOAD_CTX                 0x1
-#define I830_UPLOAD_BUFFERS             0x2
-#define I830_UPLOAD_CLIPRECTS           0x4
-#define I830_UPLOAD_TEX0_IMAGE          0x100   /* handled clientside */
-#define I830_UPLOAD_TEX0_CUBE           0x200   /* handled clientside */
-#define I830_UPLOAD_TEX1_IMAGE          0x400   /* handled clientside */
-#define I830_UPLOAD_TEX1_CUBE           0x800   /* handled clientside */
-#define I830_UPLOAD_TEX2_IMAGE          0x1000  /* handled clientside */
-#define I830_UPLOAD_TEX2_CUBE           0x2000  /* handled clientside */
-#define I830_UPLOAD_TEX3_IMAGE          0x4000  /* handled clientside */
-#define I830_UPLOAD_TEX3_CUBE           0x8000  /* handled clientside */
-#define I830_UPLOAD_TEX_N_IMAGE(n)      (0x100 << (n * 2))
-#define I830_UPLOAD_TEX_N_CUBE(n)       (0x200 << (n * 2))
-#define I830_UPLOAD_TEXIMAGE_MASK       0xff00
-#define I830_UPLOAD_TEX0                        0x10000
-#define I830_UPLOAD_TEX1                        0x20000
-#define I830_UPLOAD_TEX2                        0x40000
-#define I830_UPLOAD_TEX3                        0x80000
-#define I830_UPLOAD_TEX_N(n)            (0x10000 << (n))
-#define I830_UPLOAD_TEX_MASK            0xf0000
-#define I830_UPLOAD_TEXBLEND0           0x100000
-#define I830_UPLOAD_TEXBLEND1           0x200000
-#define I830_UPLOAD_TEXBLEND2           0x400000
-#define I830_UPLOAD_TEXBLEND3           0x800000
-#define I830_UPLOAD_TEXBLEND_N(n)       (0x100000 << (n))
-#define I830_UPLOAD_TEXBLEND_MASK       0xf00000
-#define I830_UPLOAD_TEX_PALETTE_N(n)    (0x1000000 << (n))
-#define I830_UPLOAD_TEX_PALETTE_SHARED  0x4000000
-#define I830_UPLOAD_STIPPLE             0x8000000
-
-/* Indices into buf.Setup where various bits of state are mirrored per
- * context and per buffer.  These can be fired at the card as a unit,
- * or in a piecewise fashion as required.
- */
-
-/* Destbuffer state
- *    - backbuffer linear offset and pitch -- invarient in the current dri
- *    - zbuffer linear offset and pitch -- also invarient
- *    - drawing origin in back and depth buffers.
- *
- * Keep the depth/back buffer state here to accommodate private buffers
- * in the future.
- */
-
-#define I830_DESTREG_CBUFADDR 0
-#define I830_DESTREG_DBUFADDR 1
-#define I830_DESTREG_DV0 2
-#define I830_DESTREG_DV1 3
-#define I830_DESTREG_SENABLE 4
-#define I830_DESTREG_SR0 5
-#define I830_DESTREG_SR1 6
-#define I830_DESTREG_SR2 7
-#define I830_DESTREG_DR0 8
-#define I830_DESTREG_DR1 9
-#define I830_DESTREG_DR2 10
-#define I830_DESTREG_DR3 11
-#define I830_DESTREG_DR4 12
-#define I830_DEST_SETUP_SIZE 13
-
-/* Context state
- */
-#define I830_CTXREG_STATE1              0
-#define I830_CTXREG_STATE2              1
-#define I830_CTXREG_STATE3              2
-#define I830_CTXREG_STATE4              3
-#define I830_CTXREG_STATE5              4
-#define I830_CTXREG_IALPHAB             5
-#define I830_CTXREG_STENCILTST          6
-#define I830_CTXREG_ENABLES_1           7
-#define I830_CTXREG_ENABLES_2           8
-#define I830_CTXREG_AA                  9
-#define I830_CTXREG_FOGCOLOR            10
-#define I830_CTXREG_BLENDCOLR0          11
-#define I830_CTXREG_BLENDCOLR           12      /* Dword 1 of 2 dword command */
-#define I830_CTXREG_VF                  13
-#define I830_CTXREG_VF2                 14
-#define I830_CTXREG_MCSB0               15
-#define I830_CTXREG_MCSB1               16
-#define I830_CTX_SETUP_SIZE             17
-
-/* 1.3: Stipple state
- */
-#define I830_STPREG_ST0 0
-#define I830_STPREG_ST1 1
-#define I830_STP_SETUP_SIZE 2
-
-/* Texture state (per tex unit)
- */
-
-#define I830_TEXREG_MI0 0       /* GFX_OP_MAP_INFO (6 dwords) */
-#define I830_TEXREG_MI1 1
-#define I830_TEXREG_MI2 2
-#define I830_TEXREG_MI3 3
-#define I830_TEXREG_MI4 4
-#define I830_TEXREG_MI5 5
-#define I830_TEXREG_MF  6       /* GFX_OP_MAP_FILTER */
-#define I830_TEXREG_MLC 7       /* GFX_OP_MAP_LOD_CTL */
-#define I830_TEXREG_MLL 8       /* GFX_OP_MAP_LOD_LIMITS */
-#define I830_TEXREG_MCS 9       /* GFX_OP_MAP_COORD_SETS */
-#define I830_TEX_SETUP_SIZE 10
-
-#define I830_TEXREG_TM0LI      0        /* load immediate 2 texture map n */
-#define I830_TEXREG_TM0S0      1
-#define I830_TEXREG_TM0S1      2
-#define I830_TEXREG_TM0S2      3
-#define I830_TEXREG_TM0S3      4
-#define I830_TEXREG_TM0S4      5
-#define I830_TEXREG_NOP0       6        /* noop */
-#define I830_TEXREG_NOP1       7        /* noop */
-#define I830_TEXREG_NOP2       8        /* noop */
-#define __I830_TEXREG_MCS      9        /* GFX_OP_MAP_COORD_SETS -- shared */
-#define __I830_TEX_SETUP_SIZE   10
-
-#define I830_FRONT   0x1
-#define I830_BACK    0x2
-#define I830_DEPTH   0x4
-
-#endif                          /* _I830_DEFINES_ */
-
-typedef struct _drm_i830_init {
-        enum {
-                I830_INIT_DMA = 0x01,
-                I830_CLEANUP_DMA = 0x02
-        } func;
-        unsigned int mmio_offset;
-        unsigned int buffers_offset;
-        int sarea_priv_offset;
-        unsigned int ring_start;
-        unsigned int ring_end;
-        unsigned int ring_size;
-        unsigned int front_offset;
-        unsigned int back_offset;
-        unsigned int depth_offset;
-        unsigned int w;
-        unsigned int h;
-        unsigned int pitch;
-        unsigned int pitch_bits;
-        unsigned int back_pitch;
-        unsigned int depth_pitch;
-        unsigned int cpp;
-} drm_i830_init_t;
-
-/* Warning: If you change the SAREA structure you must change the Xserver
- * structure as well */
-
-typedef struct _drm_i830_tex_region {
-        unsigned char next, prev;       /* indices to form a circular LRU  */
-        unsigned char in_use;   /* owned by a client, or free? */
-        int age;                /* tracked by clients to update local LRU's */
-} drm_i830_tex_region_t;
-
-typedef struct _drm_i830_sarea {
-        unsigned int ContextState[I830_CTX_SETUP_SIZE];
-        unsigned int BufferState[I830_DEST_SETUP_SIZE];
-        unsigned int TexState[I830_TEXTURE_COUNT][I830_TEX_SETUP_SIZE];
-        unsigned int TexBlendState[I830_TEXBLEND_COUNT][I830_TEXBLEND_SIZE];
-        unsigned int TexBlendStateWordsUsed[I830_TEXBLEND_COUNT];
-        unsigned int Palette[2][256];
-        unsigned int dirty;
-
-        unsigned int nbox;
-        struct drm_clip_rect boxes[I830_NR_SAREA_CLIPRECTS];
-
-        /* Maintain an LRU of contiguous regions of texture space.  If
-         * you think you own a region of texture memory, and it has an
-         * age different to the one you set, then you are mistaken and
-         * it has been stolen by another client.  If global texAge
-         * hasn't changed, there is no need to walk the list.
-         *
-         * These regions can be used as a proxy for the fine-grained
-         * texture information of other clients - by maintaining them
-         * in the same lru which is used to age their own textures,
-         * clients have an approximate lru for the whole of global
-         * texture space, and can make informed decisions as to which
-         * areas to kick out.  There is no need to choose whether to
-         * kick out your own texture or someone else's - simply eject
-         * them all in LRU order.
-         */
-
-        drm_i830_tex_region_t texList[I830_NR_TEX_REGIONS + 1];
-        /* Last elt is sentinal */
-        int texAge;             /* last time texture was uploaded */
-        int last_enqueue;       /* last time a buffer was enqueued */
-        int last_dispatch;      /* age of the most recently dispatched buffer */
-        int last_quiescent;     /*  */
-        int ctxOwner;           /* last context to upload state */
-
-        int vertex_prim;
-
-        int pf_enabled;         /* is pageflipping allowed? */
-        int pf_active;
-        int pf_current_page;    /* which buffer is being displayed? */
-
-        int perf_boxes;         /* performance boxes to be displayed */
-
-        /* Here's the state for texunits 2,3:
-         */
-        unsigned int TexState2[I830_TEX_SETUP_SIZE];
-        unsigned int TexBlendState2[I830_TEXBLEND_SIZE];
-        unsigned int TexBlendStateWordsUsed2;
-
-        unsigned int TexState3[I830_TEX_SETUP_SIZE];
-        unsigned int TexBlendState3[I830_TEXBLEND_SIZE];
-        unsigned int TexBlendStateWordsUsed3;
-
-        unsigned int StippleState[I830_STP_SETUP_SIZE];
-} drm_i830_sarea_t;
-
-/* Flags for perf_boxes
- */
-#define I830_BOX_RING_EMPTY    0x1      /* populated by kernel */
-#define I830_BOX_FLIP          0x2      /* populated by kernel */
-#define I830_BOX_WAIT          0x4      /* populated by kernel & client */
-#define I830_BOX_TEXTURE_LOAD  0x8      /* populated by kernel */
-#define I830_BOX_LOST_CONTEXT  0x10     /* populated by client */
-
-/* I830 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_I830_INIT   0x00
-#define DRM_I830_VERTEX 0x01
-#define DRM_I830_CLEAR  0x02
-#define DRM_I830_FLUSH  0x03
-#define DRM_I830_GETAGE 0x04
-#define DRM_I830_GETBUF 0x05
-#define DRM_I830_SWAP   0x06
-#define DRM_I830_COPY   0x07
-#define DRM_I830_DOCOPY 0x08
-#define DRM_I830_FLIP   0x09
-#define DRM_I830_IRQ_EMIT       0x0a
-#define DRM_I830_IRQ_WAIT       0x0b
-#define DRM_I830_GETPARAM       0x0c
-#define DRM_I830_SETPARAM       0x0d
-
-#define DRM_IOCTL_I830_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_IOCTL_I830_INIT, drm_i830_init_t)
-#define DRM_IOCTL_I830_VERTEX           DRM_IOW( DRM_COMMAND_BASE + DRM_IOCTL_I830_VERTEX, drm_i830_vertex_t)
-#define DRM_IOCTL_I830_CLEAR            DRM_IOW( DRM_COMMAND_BASE + DRM_IOCTL_I830_CLEAR, drm_i830_clear_t)
-#define DRM_IOCTL_I830_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_IOCTL_I830_FLUSH)
-#define DRM_IOCTL_I830_GETAGE           DRM_IO ( DRM_COMMAND_BASE + DRM_IOCTL_I830_GETAGE)
-#define DRM_IOCTL_I830_GETBUF           DRM_IOWR(DRM_COMMAND_BASE + DRM_IOCTL_I830_GETBUF, drm_i830_dma_t)
-#define DRM_IOCTL_I830_SWAP             DRM_IO ( DRM_COMMAND_BASE + DRM_IOCTL_I830_SWAP)
-#define DRM_IOCTL_I830_COPY             DRM_IOW( DRM_COMMAND_BASE + DRM_IOCTL_I830_COPY, drm_i830_copy_t)
-#define DRM_IOCTL_I830_DOCOPY           DRM_IO ( DRM_COMMAND_BASE + DRM_IOCTL_I830_DOCOPY)
-#define DRM_IOCTL_I830_FLIP             DRM_IO ( DRM_COMMAND_BASE + DRM_IOCTL_I830_FLIP)
-#define DRM_IOCTL_I830_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_IOCTL_I830_IRQ_EMIT, drm_i830_irq_emit_t)
-#define DRM_IOCTL_I830_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_IOCTL_I830_IRQ_WAIT, drm_i830_irq_wait_t)
-#define DRM_IOCTL_I830_GETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_IOCTL_I830_GETPARAM, drm_i830_getparam_t)
-#define DRM_IOCTL_I830_SETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_IOCTL_I830_SETPARAM, drm_i830_setparam_t)
-
-typedef struct _drm_i830_clear {
-        int clear_color;
-        int clear_depth;
-        int flags;
-        unsigned int clear_colormask;
-        unsigned int clear_depthmask;
-} drm_i830_clear_t;
-
-/* These may be placeholders if we have more cliprects than
- * I830_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
- * false, indicating that the buffer will be dispatched again with a
- * new set of cliprects.
- */
-typedef struct _drm_i830_vertex {
-        int idx;                /* buffer index */
-        int used;               /* nr bytes in use */
-        int discard;            /* client is finished with the buffer? */
-} drm_i830_vertex_t;
-
-typedef struct _drm_i830_copy_t {
-        int idx;                /* buffer index */
-        int used;               /* nr bytes in use */
-        void __user *address;   /* Address to copy from */
-} drm_i830_copy_t;
-
-typedef struct drm_i830_dma {
-        void __user *virtual;
-        int request_idx;
-        int request_size;
-        int granted;
-} drm_i830_dma_t;
-
-/* 1.3: Userspace can request & wait on irq's:
- */
-typedef struct drm_i830_irq_emit {
-        int __user *irq_seq;
-} drm_i830_irq_emit_t;
-
-typedef struct drm_i830_irq_wait {
-        int irq_seq;
-} drm_i830_irq_wait_t;
-
-/* 1.3: New ioctl to query kernel params:
- */
-#define I830_PARAM_IRQ_ACTIVE            1
-
-typedef struct drm_i830_getparam {
-        int param;
-        int __user *value;
-} drm_i830_getparam_t;
-
-/* 1.3: New ioctl to set kernel params:
- */
-#define I830_SETPARAM_USE_MI_BATCHBUFFER_START            1
-
-typedef struct drm_i830_setparam {
-        int param;
-        int value;
-} drm_i830_setparam_t;
-
-#endif                          /* _I830_DRM_H_ */
diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h
deleted file mode 100644
index 05c66cf03a9e..000000000000
--- a/drivers/char/drm/i915_drm.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef _I915_DRM_H_
-#define _I915_DRM_H_
-
-/* Please note that modifications to all structs defined here are
- * subject to backwards-compatibility constraints.
- */
-
-#include "drm.h"
-
-/* Each region is a minimum of 16k, and there are at most 255 of them.
- */
-#define I915_NR_TEX_REGIONS 255 /* table size 2k - maximum due to use
-                                 * of chars for next/prev indices */
-#define I915_LOG_MIN_TEX_REGION_SIZE 14
-
-typedef struct _drm_i915_init {
-        enum {
-                I915_INIT_DMA = 0x01,
-                I915_CLEANUP_DMA = 0x02,
-                I915_RESUME_DMA = 0x03
-        } func;
-        unsigned int mmio_offset;
-        int sarea_priv_offset;
-        unsigned int ring_start;
-        unsigned int ring_end;
-        unsigned int ring_size;
-        unsigned int front_offset;
-        unsigned int back_offset;
-        unsigned int depth_offset;
-        unsigned int w;
-        unsigned int h;
-        unsigned int pitch;
-        unsigned int pitch_bits;
-        unsigned int back_pitch;
-        unsigned int depth_pitch;
-        unsigned int cpp;
-        unsigned int chipset;
-} drm_i915_init_t;
-
-typedef struct _drm_i915_sarea {
-        struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
-        int last_upload;        /* last time texture was uploaded */
-        int last_enqueue;       /* last time a buffer was enqueued */
-        int last_dispatch;      /* age of the most recently dispatched buffer */
-        int ctxOwner;           /* last context to upload state */
-        int texAge;
-        int pf_enabled;         /* is pageflipping allowed? */
-        int pf_active;
-        int pf_current_page;    /* which buffer is being displayed? */
-        int perf_boxes;         /* performance boxes to be displayed */
-        int width, height;      /* screen size in pixels */
-
-        drm_handle_t front_handle;
-        int front_offset;
-        int front_size;
-
-        drm_handle_t back_handle;
-        int back_offset;
-        int back_size;
-
-        drm_handle_t depth_handle;
-        int depth_offset;
-        int depth_size;
-
-        drm_handle_t tex_handle;
-        int tex_offset;
-        int tex_size;
-        int log_tex_granularity;
-        int pitch;
-        int rotation;           /* 0, 90, 180 or 270 */
-        int rotated_offset;
-        int rotated_size;
-        int rotated_pitch;
-        int virtualX, virtualY;
-
-        unsigned int front_tiled;
-        unsigned int back_tiled;
-        unsigned int depth_tiled;
-        unsigned int rotated_tiled;
-        unsigned int rotated2_tiled;
-
-        int pipeA_x;
-        int pipeA_y;
-        int pipeA_w;
-        int pipeA_h;
-        int pipeB_x;
-        int pipeB_y;
-        int pipeB_w;
-        int pipeB_h;
-} drm_i915_sarea_t;
-
-/* Flags for perf_boxes
- */
-#define I915_BOX_RING_EMPTY    0x1
-#define I915_BOX_FLIP          0x2
-#define I915_BOX_WAIT          0x4
-#define I915_BOX_TEXTURE_LOAD  0x8
-#define I915_BOX_LOST_CONTEXT  0x10
-
-/* I915 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_I915_INIT           0x00
-#define DRM_I915_FLUSH          0x01
-#define DRM_I915_FLIP           0x02
-#define DRM_I915_BATCHBUFFER    0x03
-#define DRM_I915_IRQ_EMIT       0x04
-#define DRM_I915_IRQ_WAIT       0x05
-#define DRM_I915_GETPARAM       0x06
-#define DRM_I915_SETPARAM       0x07
-#define DRM_I915_ALLOC          0x08
-#define DRM_I915_FREE           0x09
-#define DRM_I915_INIT_HEAP      0x0a
-#define DRM_I915_CMDBUFFER      0x0b
-#define DRM_I915_DESTROY_HEAP   0x0c
-#define DRM_I915_SET_VBLANK_PIPE        0x0d
-#define DRM_I915_GET_VBLANK_PIPE        0x0e
-#define DRM_I915_VBLANK_SWAP    0x0f
-#define DRM_I915_HWS_ADDR       0x11
-
-#define DRM_IOCTL_I915_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
-#define DRM_IOCTL_I915_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
-#define DRM_IOCTL_I915_FLIP             DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP)
-#define DRM_IOCTL_I915_BATCHBUFFER      DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
-#define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
-#define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
-#define DRM_IOCTL_I915_GETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GETPARAM, drm_i915_getparam_t)
-#define DRM_IOCTL_I915_SETPARAM         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SETPARAM, drm_i915_setparam_t)
-#define DRM_IOCTL_I915_ALLOC            DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_ALLOC, drm_i915_mem_alloc_t)
-#define DRM_IOCTL_I915_FREE             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FREE, drm_i915_mem_free_t)
-#define DRM_IOCTL_I915_INIT_HEAP        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)
-#define DRM_IOCTL_I915_CMDBUFFER        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t)
-#define DRM_IOCTL_I915_DESTROY_HEAP     DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)
-#define DRM_IOCTL_I915_SET_VBLANK_PIPE  DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
-#define DRM_IOCTL_I915_GET_VBLANK_PIPE  DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
-#define DRM_IOCTL_I915_VBLANK_SWAP      DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
-
-/* Allow drivers to submit batchbuffers directly to hardware, relying
- * on the security mechanisms provided by hardware.
- */
-typedef struct _drm_i915_batchbuffer {
-        int start;              /* agp offset */
-        int used;               /* nr bytes in use */
-        int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
-        int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
-        int num_cliprects;      /* mulitpass with multiple cliprects? */
-        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
-} drm_i915_batchbuffer_t;
-
-/* As above, but pass a pointer to userspace buffer which can be
- * validated by the kernel prior to sending to hardware.
- */
-typedef struct _drm_i915_cmdbuffer {
-        char __user *buf;       /* pointer to userspace command buffer */
-        int sz;                 /* nr bytes in buf */
-        int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
-        int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
-        int num_cliprects;      /* mulitpass with multiple cliprects? */
-        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
-} drm_i915_cmdbuffer_t;
-
-/* Userspace can request & wait on irq's:
- */
-typedef struct drm_i915_irq_emit {
-        int __user *irq_seq;
-} drm_i915_irq_emit_t;
-
-typedef struct drm_i915_irq_wait {
-        int irq_seq;
-} drm_i915_irq_wait_t;
-
-/* Ioctl to query kernel params:
- */
-#define I915_PARAM_IRQ_ACTIVE            1
-#define I915_PARAM_ALLOW_BATCHBUFFER     2
-#define I915_PARAM_LAST_DISPATCH         3
-
-typedef struct drm_i915_getparam {
-        int param;
-        int __user *value;
-} drm_i915_getparam_t;
-
-/* Ioctl to set kernel params:
- */
-#define I915_SETPARAM_USE_MI_BATCHBUFFER_START            1
-#define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY             2
-#define I915_SETPARAM_ALLOW_BATCHBUFFER                   3
-
-typedef struct drm_i915_setparam {
-        int param;
-        int value;
-} drm_i915_setparam_t;
-
-/* A memory manager for regions of shared memory:
- */
-#define I915_MEM_REGION_AGP 1
-
-typedef struct drm_i915_mem_alloc {
-        int region;
-        int alignment;
-        int size;
-        int __user *region_offset;      /* offset from start of fb or agp */
-} drm_i915_mem_alloc_t;
-
-typedef struct drm_i915_mem_free {
-        int region;
-        int region_offset;
-} drm_i915_mem_free_t;
-
-typedef struct drm_i915_mem_init_heap {
-        int region;
-        int size;
-        int start;
-} drm_i915_mem_init_heap_t;
-
-/* Allow memory manager to be torn down and re-initialized (eg on
- * rotate):
- */
-typedef struct drm_i915_mem_destroy_heap {
-        int region;
-} drm_i915_mem_destroy_heap_t;
-
-/* Allow X server to configure which pipes to monitor for vblank signals
- */
-#define DRM_I915_VBLANK_PIPE_A  1
-#define DRM_I915_VBLANK_PIPE_B  2
-
-typedef struct drm_i915_vblank_pipe {
-        int pipe;
-} drm_i915_vblank_pipe_t;
-
-/* Schedule buffer swap at given vertical blank:
- */
-typedef struct drm_i915_vblank_swap {
-        drm_drawable_t drawable;
-        enum drm_vblank_seq_type seqtype;
-        unsigned int sequence;
-} drm_i915_vblank_swap_t;
-
-typedef struct drm_i915_hws_addr {
-        uint64_t addr;
-} drm_i915_hws_addr_t;
-
-#endif                          /* _I915_DRM_H_ */
diff --git a/drivers/char/drm/mga_drm.h b/drivers/char/drm/mga_drm.h
deleted file mode 100644
index 944b50a5ff24..000000000000
--- a/drivers/char/drm/mga_drm.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/* mga_drm.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
- * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Jeff Hartmann <jhartmann@valinux.com>
- *    Keith Whitwell <keith@tungstengraphics.com>
- *
- * Rewritten by:
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-#ifndef __MGA_DRM_H__
-#define __MGA_DRM_H__
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (mga_sarea.h)
- */
-
-#ifndef __MGA_SAREA_DEFINES__
-#define __MGA_SAREA_DEFINES__
-
-/* WARP pipe flags
- */
-#define MGA_F                   0x1     /* fog */
-#define MGA_A                   0x2     /* alpha */
-#define MGA_S                   0x4     /* specular */
-#define MGA_T2                  0x8     /* multitexture */
-
-#define MGA_WARP_TGZ            0
-#define MGA_WARP_TGZF           (MGA_F)
-#define MGA_WARP_TGZA           (MGA_A)
-#define MGA_WARP_TGZAF          (MGA_F|MGA_A)
-#define MGA_WARP_TGZS           (MGA_S)
-#define MGA_WARP_TGZSF          (MGA_S|MGA_F)
-#define MGA_WARP_TGZSA          (MGA_S|MGA_A)
-#define MGA_WARP_TGZSAF         (MGA_S|MGA_F|MGA_A)
-#define MGA_WARP_T2GZ           (MGA_T2)
-#define MGA_WARP_T2GZF          (MGA_T2|MGA_F)
-#define MGA_WARP_T2GZA          (MGA_T2|MGA_A)
-#define MGA_WARP_T2GZAF         (MGA_T2|MGA_A|MGA_F)
-#define MGA_WARP_T2GZS          (MGA_T2|MGA_S)
-#define MGA_WARP_T2GZSF         (MGA_T2|MGA_S|MGA_F)
-#define MGA_WARP_T2GZSA         (MGA_T2|MGA_S|MGA_A)
-#define MGA_WARP_T2GZSAF        (MGA_T2|MGA_S|MGA_F|MGA_A)
-
-#define MGA_MAX_G200_PIPES      8       /* no multitex */
-#define MGA_MAX_G400_PIPES      16
-#define MGA_MAX_WARP_PIPES      MGA_MAX_G400_PIPES
-#define MGA_WARP_UCODE_SIZE     32768   /* in bytes */
-
-#define MGA_CARD_TYPE_G200      1
-#define MGA_CARD_TYPE_G400      2
-#define MGA_CARD_TYPE_G450      3       /* not currently used */
-#define MGA_CARD_TYPE_G550      4
-
-#define MGA_FRONT               0x1
-#define MGA_BACK                0x2
-#define MGA_DEPTH               0x4
-
-/* What needs to be changed for the current vertex dma buffer?
- */
-#define MGA_UPLOAD_CONTEXT      0x1
-#define MGA_UPLOAD_TEX0         0x2
-#define MGA_UPLOAD_TEX1         0x4
-#define MGA_UPLOAD_PIPE         0x8
-#define MGA_UPLOAD_TEX0IMAGE    0x10    /* handled client-side */
-#define MGA_UPLOAD_TEX1IMAGE    0x20    /* handled client-side */
-#define MGA_UPLOAD_2D           0x40
-#define MGA_WAIT_AGE            0x80    /* handled client-side */
-#define MGA_UPLOAD_CLIPRECTS    0x100   /* handled client-side */
-#if 0
-#define MGA_DMA_FLUSH           0x200   /* set when someone gets the lock
-                                           quiescent */
-#endif
-
-/* 32 buffers of 64k each, total 2 meg.
- */
-#define MGA_BUFFER_SIZE         (1 << 16)
-#define MGA_NUM_BUFFERS         128
-
-/* Keep these small for testing.
- */
-#define MGA_NR_SAREA_CLIPRECTS  8
-
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
- * regions, subject to a minimum region size of (1<<16) == 64k.
- *
- * Clients may subdivide regions internally, but when sharing between
- * clients, the region size is the minimum granularity.
- */
-
-#define MGA_CARD_HEAP                   0
-#define MGA_AGP_HEAP                    1
-#define MGA_NR_TEX_HEAPS                2
-#define MGA_NR_TEX_REGIONS              16
-#define MGA_LOG_MIN_TEX_REGION_SIZE     16
-
-#define  DRM_MGA_IDLE_RETRY          2048
-
-#endif                          /* __MGA_SAREA_DEFINES__ */
-
-/* Setup registers for 3D context
- */
-typedef struct {
-        unsigned int dstorg;
-        unsigned int maccess;
-        unsigned int plnwt;
-        unsigned int dwgctl;
-        unsigned int alphactrl;
-        unsigned int fogcolor;
-        unsigned int wflag;
-        unsigned int tdualstage0;
-        unsigned int tdualstage1;
-        unsigned int fcol;
-        unsigned int stencil;
-        unsigned int stencilctl;
-} drm_mga_context_regs_t;
-
-/* Setup registers for 2D, X server
- */
-typedef struct {
-        unsigned int pitch;
-} drm_mga_server_regs_t;
-
-/* Setup registers for each texture unit
- */
-typedef struct {
-        unsigned int texctl;
-        unsigned int texctl2;
-        unsigned int texfilter;
-        unsigned int texbordercol;
-        unsigned int texorg;
-        unsigned int texwidth;
-        unsigned int texheight;
-        unsigned int texorg1;
-        unsigned int texorg2;
-        unsigned int texorg3;
-        unsigned int texorg4;
-} drm_mga_texture_regs_t;
-
-/* General aging mechanism
- */
-typedef struct {
-        unsigned int head;      /* Position of head pointer          */
-        unsigned int wrap;      /* Primary DMA wrap count            */
-} drm_mga_age_t;
-
-typedef struct _drm_mga_sarea {
-        /* The channel for communication of state information to the kernel
-         * on firing a vertex dma buffer.
-         */
-        drm_mga_context_regs_t context_state;
-        drm_mga_server_regs_t server_state;
-        drm_mga_texture_regs_t tex_state[2];
-        unsigned int warp_pipe;
-        unsigned int dirty;
-        unsigned int vertsize;
-
-        /* The current cliprects, or a subset thereof.
-         */
-        struct drm_clip_rect boxes[MGA_NR_SAREA_CLIPRECTS];
-        unsigned int nbox;
-
-        /* Information about the most recently used 3d drawable.  The
-         * client fills in the req_* fields, the server fills in the
-         * exported_ fields and puts the cliprects into boxes, above.
-         *
-         * The client clears the exported_drawable field before
-         * clobbering the boxes data.
-         */
-        unsigned int req_drawable;      /* the X drawable id */
-        unsigned int req_draw_buffer;   /* MGA_FRONT or MGA_BACK */
-
-        unsigned int exported_drawable;
-        unsigned int exported_index;
-        unsigned int exported_stamp;
-        unsigned int exported_buffers;
-        unsigned int exported_nfront;
-        unsigned int exported_nback;
-        int exported_back_x, exported_front_x, exported_w;
-        int exported_back_y, exported_front_y, exported_h;
-        struct drm_clip_rect exported_boxes[MGA_NR_SAREA_CLIPRECTS];
-
-        /* Counters for aging textures and for client-side throttling.
-         */
-        unsigned int status[4];
-        unsigned int last_wrap;
-
-        drm_mga_age_t last_frame;
-        unsigned int last_enqueue;      /* last time a buffer was enqueued */
-        unsigned int last_dispatch;     /* age of the most recently dispatched buffer */
-        unsigned int last_quiescent;    /*  */
-
-        /* LRU lists for texture memory in agp space and on the card.
-         */
-        struct drm_tex_region texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS + 1];
-        unsigned int texAge[MGA_NR_TEX_HEAPS];
-
-        /* Mechanism to validate card state.
-         */
-        int ctxOwner;
-} drm_mga_sarea_t;
-
-/* MGA specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_MGA_INIT     0x00
-#define DRM_MGA_FLUSH    0x01
-#define DRM_MGA_RESET    0x02
-#define DRM_MGA_SWAP     0x03
-#define DRM_MGA_CLEAR    0x04
-#define DRM_MGA_VERTEX   0x05
-#define DRM_MGA_INDICES  0x06
-#define DRM_MGA_ILOAD    0x07
-#define DRM_MGA_BLIT     0x08
-#define DRM_MGA_GETPARAM 0x09
-
-/* 3.2:
- * ioctls for operating on fences.
- */
-#define DRM_MGA_SET_FENCE      0x0a
-#define DRM_MGA_WAIT_FENCE     0x0b
-#define DRM_MGA_DMA_BOOTSTRAP  0x0c
-
-#define DRM_IOCTL_MGA_INIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INIT, drm_mga_init_t)
-#define DRM_IOCTL_MGA_FLUSH    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, drm_lock_t)
-#define DRM_IOCTL_MGA_RESET    DRM_IO(  DRM_COMMAND_BASE + DRM_MGA_RESET)
-#define DRM_IOCTL_MGA_SWAP     DRM_IO(  DRM_COMMAND_BASE + DRM_MGA_SWAP)
-#define DRM_IOCTL_MGA_CLEAR    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_CLEAR, drm_mga_clear_t)
-#define DRM_IOCTL_MGA_VERTEX   DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_VERTEX, drm_mga_vertex_t)
-#define DRM_IOCTL_MGA_INDICES  DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INDICES, drm_mga_indices_t)
-#define DRM_IOCTL_MGA_ILOAD    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_ILOAD, drm_mga_iload_t)
-#define DRM_IOCTL_MGA_BLIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_BLIT, drm_mga_blit_t)
-#define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_GETPARAM, drm_mga_getparam_t)
-#define DRM_IOCTL_MGA_SET_FENCE     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_SET_FENCE, uint32_t)
-#define DRM_IOCTL_MGA_WAIT_FENCE    DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_WAIT_FENCE, uint32_t)
-#define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
-
-typedef struct _drm_mga_warp_index {
-        int installed;
-        unsigned long phys_addr;
-        int size;
-} drm_mga_warp_index_t;
-
-typedef struct drm_mga_init {
-        enum {
-                MGA_INIT_DMA = 0x01,
-                MGA_CLEANUP_DMA = 0x02
-        } func;
-
-        unsigned long sarea_priv_offset;
-
-        int chipset;
-        int sgram;
-
-        unsigned int maccess;
-
-        unsigned int fb_cpp;
-        unsigned int front_offset, front_pitch;
-        unsigned int back_offset, back_pitch;
-
-        unsigned int depth_cpp;
-        unsigned int depth_offset, depth_pitch;
-
-        unsigned int texture_offset[MGA_NR_TEX_HEAPS];
-        unsigned int texture_size[MGA_NR_TEX_HEAPS];
-
-        unsigned long fb_offset;
-        unsigned long mmio_offset;
-        unsigned long status_offset;
-        unsigned long warp_offset;
-        unsigned long primary_offset;
-        unsigned long buffers_offset;
-} drm_mga_init_t;
-
-typedef struct drm_mga_dma_bootstrap {
-        /**
-         * \name AGP texture region
-         *
-         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, these fields will
-         * be filled in with the actual AGP texture settings.
-         *
-         * \warning
-         * If these fields are non-zero, but dma_mga_dma_bootstrap::agp_mode
-         * is zero, it means that PCI memory (most likely through the use of
-         * an IOMMU) is being used for "AGP" textures.
-         */
-        /*@{ */
-        unsigned long texture_handle; /**< Handle used to map AGP textures. */
-        uint32_t texture_size;        /**< Size of the AGP texture region. */
-        /*@} */
-
-        /**
-         * Requested size of the primary DMA region.
-         *
-         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
-         * filled in with the actual AGP mode.  If AGP was not available
-         */
-        uint32_t primary_size;
-
-        /**
-         * Requested number of secondary DMA buffers.
-         *
-         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
-         * filled in with the actual number of secondary DMA buffers
-         * allocated.  Particularly when PCI DMA is used, this may be
-         * (subtantially) less than the number requested.
-         */
-        uint32_t secondary_bin_count;
-
-        /**
-         * Requested size of each secondary DMA buffer.
-         *
-         * While the kernel \b is free to reduce
-         * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
-         * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
-         */
-        uint32_t secondary_bin_size;
-
-        /**
-         * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
-         * \c AGPSTAT2_2X, and \c AGPSTAT2_4X are supported.  If this value is
-         * zero, it means that PCI DMA should be used, even if AGP is
-         * possible.
-         *
-         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
-         * filled in with the actual AGP mode.  If AGP was not available
-         * (i.e., PCI DMA was used), this value will be zero.
-         */
-        uint32_t agp_mode;
-
-        /**
-         * Desired AGP GART size, measured in megabytes.
-         */
-        uint8_t agp_size;
-} drm_mga_dma_bootstrap_t;
-
-typedef struct drm_mga_clear {
-        unsigned int flags;
-        unsigned int clear_color;
-        unsigned int clear_depth;
-        unsigned int color_mask;
-        unsigned int depth_mask;
-} drm_mga_clear_t;
-
-typedef struct drm_mga_vertex {
-        int idx;                /* buffer to queue */
-        int used;               /* bytes in use */
-        int discard;            /* client finished with buffer?  */
-} drm_mga_vertex_t;
-
-typedef struct drm_mga_indices {
-        int idx;                /* buffer to queue */
-        unsigned int start;
-        unsigned int end;
-        int discard;            /* client finished with buffer?  */
-} drm_mga_indices_t;
-
-typedef struct drm_mga_iload {
-        int idx;
-        unsigned int dstorg;
-        unsigned int length;
-} drm_mga_iload_t;
-
-typedef struct _drm_mga_blit {
-        unsigned int planemask;
-        unsigned int srcorg;
-        unsigned int dstorg;
-        int src_pitch, dst_pitch;
-        int delta_sx, delta_sy;
-        int delta_dx, delta_dy;
-        int height, ydir;       /* flip image vertically */
-        int source_pitch, dest_pitch;
-} drm_mga_blit_t;
-
-/* 3.1: An ioctl to get parameters that aren't available to the 3d
- * client any other way.
- */
-#define MGA_PARAM_IRQ_NR            1
-
-/* 3.2: Query the actual card type.  The DDX only distinguishes between
- * G200 chips and non-G200 chips, which it calls G400.  It turns out that
- * there are some very sublte differences between the G4x0 chips and the G550
- * chips.  Using this parameter query, a client-side driver can detect the
- * difference between a G4x0 and a G550.
- */
-#define MGA_PARAM_CARD_TYPE         2
-
-typedef struct drm_mga_getparam {
-        int param;
-        void __user *value;
-} drm_mga_getparam_t;
-
-#endif
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
deleted file mode 100644
index 8d8878b55f55..000000000000
--- a/drivers/char/drm/r128_drm.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
- * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
- */
-/*
- * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Gareth Hughes <gareth@valinux.com>
- *    Kevin E. Martin <martin@valinux.com>
- */
-
-#ifndef __R128_DRM_H__
-#define __R128_DRM_H__
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the X server file (r128_sarea.h)
- */
-#ifndef __R128_SAREA_DEFINES__
-#define __R128_SAREA_DEFINES__
-
-/* What needs to be changed for the current vertex buffer?
- */
-#define R128_UPLOAD_CONTEXT             0x001
-#define R128_UPLOAD_SETUP               0x002
-#define R128_UPLOAD_TEX0                0x004
-#define R128_UPLOAD_TEX1                0x008
-#define R128_UPLOAD_TEX0IMAGES          0x010
-#define R128_UPLOAD_TEX1IMAGES          0x020
-#define R128_UPLOAD_CORE                0x040
-#define R128_UPLOAD_MASKS               0x080
-#define R128_UPLOAD_WINDOW              0x100
-#define R128_UPLOAD_CLIPRECTS           0x200   /* handled client-side */
-#define R128_REQUIRE_QUIESCENCE         0x400
-#define R128_UPLOAD_ALL                 0x7ff
-
-#define R128_FRONT                      0x1
-#define R128_BACK                       0x2
-#define R128_DEPTH                      0x4
-
-/* Primitive types
- */
-#define R128_POINTS                     0x1
-#define R128_LINES                      0x2
-#define R128_LINE_STRIP                 0x3
-#define R128_TRIANGLES                  0x4
-#define R128_TRIANGLE_FAN               0x5
-#define R128_TRIANGLE_STRIP             0x6
-
-/* Vertex/indirect buffer size
- */
-#define R128_BUFFER_SIZE                16384
-
-/* Byte offsets for indirect buffer data
- */
-#define R128_INDEX_PRIM_OFFSET          20
-#define R128_HOSTDATA_BLIT_OFFSET       32
-
-/* Keep these small for testing.
- */
-#define R128_NR_SAREA_CLIPRECTS         12
-
-/* There are 2 heaps (local/AGP).  Each region within a heap is a
- *  minimum of 64k, and there are at most 64 of them per heap.
- */
-#define R128_LOCAL_TEX_HEAP             0
-#define R128_AGP_TEX_HEAP               1
-#define R128_NR_TEX_HEAPS               2
-#define R128_NR_TEX_REGIONS             64
-#define R128_LOG_TEX_GRANULARITY        16
-
-#define R128_NR_CONTEXT_REGS            12
-
-#define R128_MAX_TEXTURE_LEVELS         11
-#define R128_MAX_TEXTURE_UNITS          2
-
-#endif                          /* __R128_SAREA_DEFINES__ */
-
-typedef struct {
-        /* Context state - can be written in one large chunk */
-        unsigned int dst_pitch_offset_c;
-        unsigned int dp_gui_master_cntl_c;
-        unsigned int sc_top_left_c;
-        unsigned int sc_bottom_right_c;
-        unsigned int z_offset_c;
-        unsigned int z_pitch_c;
-        unsigned int z_sten_cntl_c;
-        unsigned int tex_cntl_c;
-        unsigned int misc_3d_state_cntl_reg;
-        unsigned int texture_clr_cmp_clr_c;
-        unsigned int texture_clr_cmp_msk_c;
-        unsigned int fog_color_c;
-
-        /* Texture state */
-        unsigned int tex_size_pitch_c;
-        unsigned int constant_color_c;
-
-        /* Setup state */
-        unsigned int pm4_vc_fpu_setup;
-        unsigned int setup_cntl;
-
-        /* Mask state */
-        unsigned int dp_write_mask;
-        unsigned int sten_ref_mask_c;
-        unsigned int plane_3d_mask_c;
-
-        /* Window state */
-        unsigned int window_xy_offset;
-
-        /* Core state */
-        unsigned int scale_3d_cntl;
-} drm_r128_context_regs_t;
-
-/* Setup registers for each texture unit
- */
-typedef struct {
-        unsigned int tex_cntl;
-        unsigned int tex_combine_cntl;
-        unsigned int tex_size_pitch;
-        unsigned int tex_offset[R128_MAX_TEXTURE_LEVELS];
-        unsigned int tex_border_color;
-} drm_r128_texture_regs_t;
-
-typedef struct drm_r128_sarea {
-        /* The channel for communication of state information to the kernel
-         * on firing a vertex buffer.
-         */
-        drm_r128_context_regs_t context_state;
-        drm_r128_texture_regs_t tex_state[R128_MAX_TEXTURE_UNITS];
-        unsigned int dirty;
-        unsigned int vertsize;
-        unsigned int vc_format;
-
-        /* The current cliprects, or a subset thereof.
-         */
-        struct drm_clip_rect boxes[R128_NR_SAREA_CLIPRECTS];
-        unsigned int nbox;
-
-        /* Counters for client-side throttling of rendering clients.
-         */
-        unsigned int last_frame;
-        unsigned int last_dispatch;
-
-        struct drm_tex_region tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS + 1];
-        unsigned int tex_age[R128_NR_TEX_HEAPS];
-        int ctx_owner;
-        int pfAllowPageFlip;    /* number of 3d windows (0,1,2 or more) */
-        int pfCurrentPage;      /* which buffer is being displayed? */
-} drm_r128_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmR128.h)
- */
-
-/* Rage 128 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_R128_INIT       0x00
-#define DRM_R128_CCE_START  0x01
-#define DRM_R128_CCE_STOP   0x02
-#define DRM_R128_CCE_RESET  0x03
-#define DRM_R128_CCE_IDLE   0x04
-/* 0x05 not used */
-#define DRM_R128_RESET      0x06
-#define DRM_R128_SWAP       0x07
-#define DRM_R128_CLEAR      0x08
-#define DRM_R128_VERTEX     0x09
-#define DRM_R128_INDICES    0x0a
-#define DRM_R128_BLIT       0x0b
-#define DRM_R128_DEPTH      0x0c
-#define DRM_R128_STIPPLE    0x0d
-/* 0x0e not used */
-#define DRM_R128_INDIRECT   0x0f
-#define DRM_R128_FULLSCREEN 0x10
-#define DRM_R128_CLEAR2     0x11
-#define DRM_R128_GETPARAM   0x12
-#define DRM_R128_FLIP       0x13
-
-#define DRM_IOCTL_R128_INIT       DRM_IOW( DRM_COMMAND_BASE + DRM_R128_INIT, drm_r128_init_t)
-#define DRM_IOCTL_R128_CCE_START  DRM_IO(  DRM_COMMAND_BASE + DRM_R128_CCE_START)
-#define DRM_IOCTL_R128_CCE_STOP   DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CCE_STOP, drm_r128_cce_stop_t)
-#define DRM_IOCTL_R128_CCE_RESET  DRM_IO(  DRM_COMMAND_BASE + DRM_R128_CCE_RESET)
-#define DRM_IOCTL_R128_CCE_IDLE   DRM_IO(  DRM_COMMAND_BASE + DRM_R128_CCE_IDLE)
-/* 0x05 not used */
-#define DRM_IOCTL_R128_RESET      DRM_IO(  DRM_COMMAND_BASE + DRM_R128_RESET)
-#define DRM_IOCTL_R128_SWAP       DRM_IO(  DRM_COMMAND_BASE + DRM_R128_SWAP)
-#define DRM_IOCTL_R128_CLEAR      DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR, drm_r128_clear_t)
-#define DRM_IOCTL_R128_VERTEX     DRM_IOW( DRM_COMMAND_BASE + DRM_R128_VERTEX, drm_r128_vertex_t)
-#define DRM_IOCTL_R128_INDICES    DRM_IOW( DRM_COMMAND_BASE + DRM_R128_INDICES, drm_r128_indices_t)
-#define DRM_IOCTL_R128_BLIT       DRM_IOW( DRM_COMMAND_BASE + DRM_R128_BLIT, drm_r128_blit_t)
-#define DRM_IOCTL_R128_DEPTH      DRM_IOW( DRM_COMMAND_BASE + DRM_R128_DEPTH, drm_r128_depth_t)
-#define DRM_IOCTL_R128_STIPPLE    DRM_IOW( DRM_COMMAND_BASE + DRM_R128_STIPPLE, drm_r128_stipple_t)
-/* 0x0e not used */
-#define DRM_IOCTL_R128_INDIRECT   DRM_IOWR(DRM_COMMAND_BASE + DRM_R128_INDIRECT, drm_r128_indirect_t)
-#define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_R128_FULLSCREEN, drm_r128_fullscreen_t)
-#define DRM_IOCTL_R128_CLEAR2     DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR2, drm_r128_clear2_t)
-#define DRM_IOCTL_R128_GETPARAM   DRM_IOWR( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t)
-#define DRM_IOCTL_R128_FLIP       DRM_IO(  DRM_COMMAND_BASE + DRM_R128_FLIP)
-
-typedef struct drm_r128_init {
-        enum {
-                R128_INIT_CCE = 0x01,
-                R128_CLEANUP_CCE = 0x02
-        } func;
-        unsigned long sarea_priv_offset;
-        int is_pci;
-        int cce_mode;
-        int cce_secure;
-        int ring_size;
-        int usec_timeout;
-
-        unsigned int fb_bpp;
-        unsigned int front_offset, front_pitch;
-        unsigned int back_offset, back_pitch;
-        unsigned int depth_bpp;
-        unsigned int depth_offset, depth_pitch;
-        unsigned int span_offset;
-
-        unsigned long fb_offset;
-        unsigned long mmio_offset;
-        unsigned long ring_offset;
-        unsigned long ring_rptr_offset;
-        unsigned long buffers_offset;
-        unsigned long agp_textures_offset;
-} drm_r128_init_t;
-
-typedef struct drm_r128_cce_stop {
-        int flush;
-        int idle;
-} drm_r128_cce_stop_t;
-
-typedef struct drm_r128_clear {
-        unsigned int flags;
-        unsigned int clear_color;
-        unsigned int clear_depth;
-        unsigned int color_mask;
-        unsigned int depth_mask;
-} drm_r128_clear_t;
-
-typedef struct drm_r128_vertex {
-        int prim;
-        int idx;                /* Index of vertex buffer */
-        int count;              /* Number of vertices in buffer */
-        int discard;            /* Client finished with buffer? */
-} drm_r128_vertex_t;
-
-typedef struct drm_r128_indices {
-        int prim;
-        int idx;
-        int start;
-        int end;
-        int discard;            /* Client finished with buffer? */
-} drm_r128_indices_t;
-
-typedef struct drm_r128_blit {
-        int idx;
-        int pitch;
-        int offset;
-        int format;
-        unsigned short x, y;
-        unsigned short width, height;
-} drm_r128_blit_t;
-
-typedef struct drm_r128_depth {
-        enum {
-                R128_WRITE_SPAN = 0x01,
-                R128_WRITE_PIXELS = 0x02,
-                R128_READ_SPAN = 0x03,
-                R128_READ_PIXELS = 0x04
-        } func;
-        int n;
-        int __user *x;
-        int __user *y;
-        unsigned int __user *buffer;
-        unsigned char __user *mask;
-} drm_r128_depth_t;
-
-typedef struct drm_r128_stipple {
-        unsigned int __user *mask;
-} drm_r128_stipple_t;
-
-typedef struct drm_r128_indirect {
-        int idx;
-        int start;
-        int end;
-        int discard;
-} drm_r128_indirect_t;
-
-typedef struct drm_r128_fullscreen {
-        enum {
-                R128_INIT_FULLSCREEN = 0x01,
-                R128_CLEANUP_FULLSCREEN = 0x02
-        } func;
-} drm_r128_fullscreen_t;
-
-/* 2.3: An ioctl to get parameters that aren't available to the 3d
- * client any other way.
- */
-#define R128_PARAM_IRQ_NR            1
-
-typedef struct drm_r128_getparam {
-        int param;
-        void __user *value;
-} drm_r128_getparam_t;
-
-#endif
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h
deleted file mode 100644
index 73ff51f12311..000000000000
--- a/drivers/char/drm/radeon_drm.h
+++ /dev/null
@@ -1,749 +0,0 @@
-/* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*-
- *
- * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Kevin E. Martin <martin@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#ifndef __RADEON_DRM_H__
-#define __RADEON_DRM_H__
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the X server file (radeon_sarea.h)
- */
-#ifndef __RADEON_SAREA_DEFINES__
-#define __RADEON_SAREA_DEFINES__
-
-/* Old style state flags, required for sarea interface (1.1 and 1.2
- * clears) and 1.2 drm_vertex2 ioctl.
- */
-#define RADEON_UPLOAD_CONTEXT           0x00000001
-#define RADEON_UPLOAD_VERTFMT           0x00000002
-#define RADEON_UPLOAD_LINE              0x00000004
-#define RADEON_UPLOAD_BUMPMAP           0x00000008
-#define RADEON_UPLOAD_MASKS             0x00000010
-#define RADEON_UPLOAD_VIEWPORT          0x00000020
-#define RADEON_UPLOAD_SETUP             0x00000040
-#define RADEON_UPLOAD_TCL               0x00000080
-#define RADEON_UPLOAD_MISC              0x00000100
-#define RADEON_UPLOAD_TEX0              0x00000200
-#define RADEON_UPLOAD_TEX1              0x00000400
-#define RADEON_UPLOAD_TEX2              0x00000800
-#define RADEON_UPLOAD_TEX0IMAGES        0x00001000
-#define RADEON_UPLOAD_TEX1IMAGES        0x00002000
-#define RADEON_UPLOAD_TEX2IMAGES        0x00004000
-#define RADEON_UPLOAD_CLIPRECTS         0x00008000      /* handled client-side */
-#define RADEON_REQUIRE_QUIESCENCE       0x00010000
-#define RADEON_UPLOAD_ZBIAS             0x00020000      /* version 1.2 and newer */
-#define RADEON_UPLOAD_ALL               0x003effff
-#define RADEON_UPLOAD_CONTEXT_ALL       0x003e01ff
-
-/* New style per-packet identifiers for use in cmd_buffer ioctl with
- * the RADEON_EMIT_PACKET command.  Comments relate new packets to old
- * state bits and the packet size:
- */
-#define RADEON_EMIT_PP_MISC                         0   /* context/7 */
-#define RADEON_EMIT_PP_CNTL                         1   /* context/3 */
-#define RADEON_EMIT_RB3D_COLORPITCH                 2   /* context/1 */
-#define RADEON_EMIT_RE_LINE_PATTERN                 3   /* line/2 */
-#define RADEON_EMIT_SE_LINE_WIDTH                   4   /* line/1 */
-#define RADEON_EMIT_PP_LUM_MATRIX                   5   /* bumpmap/1 */
-#define RADEON_EMIT_PP_ROT_MATRIX_0                 6   /* bumpmap/2 */
-#define RADEON_EMIT_RB3D_STENCILREFMASK             7   /* masks/3 */
-#define RADEON_EMIT_SE_VPORT_XSCALE                 8   /* viewport/6 */
-#define RADEON_EMIT_SE_CNTL                         9   /* setup/2 */
-#define RADEON_EMIT_SE_CNTL_STATUS                  10  /* setup/1 */
-#define RADEON_EMIT_RE_MISC                         11  /* misc/1 */
-#define RADEON_EMIT_PP_TXFILTER_0                   12  /* tex0/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_0               13  /* tex0/1 */
-#define RADEON_EMIT_PP_TXFILTER_1                   14  /* tex1/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_1               15  /* tex1/1 */
-#define RADEON_EMIT_PP_TXFILTER_2                   16  /* tex2/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_2               17  /* tex2/1 */
-#define RADEON_EMIT_SE_ZBIAS_FACTOR                 18  /* zbias/2 */
-#define RADEON_EMIT_SE_TCL_OUTPUT_VTX_FMT           19  /* tcl/11 */
-#define RADEON_EMIT_SE_TCL_MATERIAL_EMMISSIVE_RED   20  /* material/17 */
-#define R200_EMIT_PP_TXCBLEND_0                     21  /* tex0/4 */
-#define R200_EMIT_PP_TXCBLEND_1                     22  /* tex1/4 */
-#define R200_EMIT_PP_TXCBLEND_2                     23  /* tex2/4 */
-#define R200_EMIT_PP_TXCBLEND_3                     24  /* tex3/4 */
-#define R200_EMIT_PP_TXCBLEND_4                     25  /* tex4/4 */
-#define R200_EMIT_PP_TXCBLEND_5                     26  /* tex5/4 */
-#define R200_EMIT_PP_TXCBLEND_6                     27  /* /4 */
-#define R200_EMIT_PP_TXCBLEND_7                     28  /* /4 */
-#define R200_EMIT_TCL_LIGHT_MODEL_CTL_0             29  /* tcl/7 */
-#define R200_EMIT_TFACTOR_0                         30  /* tf/7 */
-#define R200_EMIT_VTX_FMT_0                         31  /* vtx/5 */
-#define R200_EMIT_VAP_CTL                           32  /* vap/1 */
-#define R200_EMIT_MATRIX_SELECT_0                   33  /* msl/5 */
-#define R200_EMIT_TEX_PROC_CTL_2                    34  /* tcg/5 */
-#define R200_EMIT_TCL_UCP_VERT_BLEND_CTL            35  /* tcl/1 */
-#define R200_EMIT_PP_TXFILTER_0                     36  /* tex0/6 */
-#define R200_EMIT_PP_TXFILTER_1                     37  /* tex1/6 */
-#define R200_EMIT_PP_TXFILTER_2                     38  /* tex2/6 */
-#define R200_EMIT_PP_TXFILTER_3                     39  /* tex3/6 */
-#define R200_EMIT_PP_TXFILTER_4                     40  /* tex4/6 */
-#define R200_EMIT_PP_TXFILTER_5                     41  /* tex5/6 */
-#define R200_EMIT_PP_TXOFFSET_0                     42  /* tex0/1 */
-#define R200_EMIT_PP_TXOFFSET_1                     43  /* tex1/1 */
-#define R200_EMIT_PP_TXOFFSET_2                     44  /* tex2/1 */
-#define R200_EMIT_PP_TXOFFSET_3                     45  /* tex3/1 */
-#define R200_EMIT_PP_TXOFFSET_4                     46  /* tex4/1 */
-#define R200_EMIT_PP_TXOFFSET_5                     47  /* tex5/1 */
-#define R200_EMIT_VTE_CNTL                          48  /* vte/1 */
-#define R200_EMIT_OUTPUT_VTX_COMP_SEL               49  /* vtx/1 */
-#define R200_EMIT_PP_TAM_DEBUG3                     50  /* tam/1 */
-#define R200_EMIT_PP_CNTL_X                         51  /* cst/1 */
-#define R200_EMIT_RB3D_DEPTHXY_OFFSET               52  /* cst/1 */
-#define R200_EMIT_RE_AUX_SCISSOR_CNTL               53  /* cst/1 */
-#define R200_EMIT_RE_SCISSOR_TL_0                   54  /* cst/2 */
-#define R200_EMIT_RE_SCISSOR_TL_1                   55  /* cst/2 */
-#define R200_EMIT_RE_SCISSOR_TL_2                   56  /* cst/2 */
-#define R200_EMIT_SE_VAP_CNTL_STATUS                57  /* cst/1 */
-#define R200_EMIT_SE_VTX_STATE_CNTL                 58  /* cst/1 */
-#define R200_EMIT_RE_POINTSIZE                      59  /* cst/1 */
-#define R200_EMIT_TCL_INPUT_VTX_VECTOR_ADDR_0       60  /* cst/4 */
-#define R200_EMIT_PP_CUBIC_FACES_0                  61
-#define R200_EMIT_PP_CUBIC_OFFSETS_0                62
-#define R200_EMIT_PP_CUBIC_FACES_1                  63
-#define R200_EMIT_PP_CUBIC_OFFSETS_1                64
-#define R200_EMIT_PP_CUBIC_FACES_2                  65
-#define R200_EMIT_PP_CUBIC_OFFSETS_2                66
-#define R200_EMIT_PP_CUBIC_FACES_3                  67
-#define R200_EMIT_PP_CUBIC_OFFSETS_3                68
-#define R200_EMIT_PP_CUBIC_FACES_4                  69
-#define R200_EMIT_PP_CUBIC_OFFSETS_4                70
-#define R200_EMIT_PP_CUBIC_FACES_5                  71
-#define R200_EMIT_PP_CUBIC_OFFSETS_5                72
-#define RADEON_EMIT_PP_TEX_SIZE_0                   73
-#define RADEON_EMIT_PP_TEX_SIZE_1                   74
-#define RADEON_EMIT_PP_TEX_SIZE_2                   75
-#define R200_EMIT_RB3D_BLENDCOLOR                   76
-#define R200_EMIT_TCL_POINT_SPRITE_CNTL             77
-#define RADEON_EMIT_PP_CUBIC_FACES_0                78
-#define RADEON_EMIT_PP_CUBIC_OFFSETS_T0             79
-#define RADEON_EMIT_PP_CUBIC_FACES_1                80
-#define RADEON_EMIT_PP_CUBIC_OFFSETS_T1             81
-#define RADEON_EMIT_PP_CUBIC_FACES_2                82
-#define RADEON_EMIT_PP_CUBIC_OFFSETS_T2             83
-#define R200_EMIT_PP_TRI_PERF_CNTL                  84
-#define R200_EMIT_PP_AFS_0                          85
-#define R200_EMIT_PP_AFS_1                          86
-#define R200_EMIT_ATF_TFACTOR                       87
-#define R200_EMIT_PP_TXCTLALL_0                     88
-#define R200_EMIT_PP_TXCTLALL_1                     89
-#define R200_EMIT_PP_TXCTLALL_2                     90
-#define R200_EMIT_PP_TXCTLALL_3                     91
-#define R200_EMIT_PP_TXCTLALL_4                     92
-#define R200_EMIT_PP_TXCTLALL_5                     93
-#define R200_EMIT_VAP_PVS_CNTL                      94
-#define RADEON_MAX_STATE_PACKETS                    95
-
-/* Commands understood by cmd_buffer ioctl.  More can be added but
- * obviously these can't be removed or changed:
- */
-#define RADEON_CMD_PACKET      1        /* emit one of the register packets above */
-#define RADEON_CMD_SCALARS     2        /* emit scalar data */
-#define RADEON_CMD_VECTORS     3        /* emit vector data */
-#define RADEON_CMD_DMA_DISCARD 4        /* discard current dma buf */
-#define RADEON_CMD_PACKET3     5        /* emit hw packet */
-#define RADEON_CMD_PACKET3_CLIP 6       /* emit hw packet wrapped in cliprects */
-#define RADEON_CMD_SCALARS2     7       /* r200 stopgap */
-#define RADEON_CMD_WAIT         8       /* emit hw wait commands -- note:
-                                         *  doesn't make the cpu wait, just
-                                         *  the graphics hardware */
-#define RADEON_CMD_VECLINEAR    9       /* another r200 stopgap */
-
-typedef union {
-        int i;
-        struct {
-                unsigned char cmd_type, pad0, pad1, pad2;
-        } header;
-        struct {
-                unsigned char cmd_type, packet_id, pad0, pad1;
-        } packet;
-        struct {
-                unsigned char cmd_type, offset, stride, count;
-        } scalars;
-        struct {
-                unsigned char cmd_type, offset, stride, count;
-        } vectors;
-        struct {
-                unsigned char cmd_type, addr_lo, addr_hi, count;
-        } veclinear;
-        struct {
-                unsigned char cmd_type, buf_idx, pad0, pad1;
-        } dma;
-        struct {
-                unsigned char cmd_type, flags, pad0, pad1;
-        } wait;
-} drm_radeon_cmd_header_t;
-
-#define RADEON_WAIT_2D  0x1
-#define RADEON_WAIT_3D  0x2
-
-/* Allowed parameters for R300_CMD_PACKET3
- */
-#define R300_CMD_PACKET3_CLEAR          0
-#define R300_CMD_PACKET3_RAW            1
-
-/* Commands understood by cmd_buffer ioctl for R300.
- * The interface has not been stabilized, so some of these may be removed
- * and eventually reordered before stabilization.
- */
-#define R300_CMD_PACKET0                1
-#define R300_CMD_VPU                    2       /* emit vertex program upload */
-#define R300_CMD_PACKET3                3       /* emit a packet3 */
-#define R300_CMD_END3D                  4       /* emit sequence ending 3d rendering */
-#define R300_CMD_CP_DELAY               5
-#define R300_CMD_DMA_DISCARD            6
-#define R300_CMD_WAIT                   7
-#       define R300_WAIT_2D             0x1
-#       define R300_WAIT_3D             0x2
-/* these two defines are DOING IT WRONG - however
- * we have userspace which relies on using these.
- * The wait interface is backwards compat new 
- * code should use the NEW_WAIT defines below
- * THESE ARE NOT BIT FIELDS
- */
-#       define R300_WAIT_2D_CLEAN       0x3
-#       define R300_WAIT_3D_CLEAN       0x4
-
-#       define R300_NEW_WAIT_2D_3D      0x3
-#       define R300_NEW_WAIT_2D_2D_CLEAN        0x4
-#       define R300_NEW_WAIT_3D_3D_CLEAN        0x6
-#       define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN    0x8
-
-#define R300_CMD_SCRATCH                8
-#define R300_CMD_R500FP                 9
-
-typedef union {
-        unsigned int u;
-        struct {
-                unsigned char cmd_type, pad0, pad1, pad2;
-        } header;
-        struct {
-                unsigned char cmd_type, count, reglo, reghi;
-        } packet0;
-        struct {
-                unsigned char cmd_type, count, adrlo, adrhi;
-        } vpu;
-        struct {
-                unsigned char cmd_type, packet, pad0, pad1;
-        } packet3;
-        struct {
-                unsigned char cmd_type, packet;
-                unsigned short count;   /* amount of packet2 to emit */
-        } delay;
-        struct {
-                unsigned char cmd_type, buf_idx, pad0, pad1;
-        } dma;
-        struct {
-                unsigned char cmd_type, flags, pad0, pad1;
-        } wait;
-        struct {
-                unsigned char cmd_type, reg, n_bufs, flags;
-        } scratch;
-        struct {
-                unsigned char cmd_type, count, adrlo, adrhi_flags;
-        } r500fp;
-} drm_r300_cmd_header_t;
-
-#define RADEON_FRONT                    0x1
-#define RADEON_BACK                     0x2
-#define RADEON_DEPTH                    0x4
-#define RADEON_STENCIL                  0x8
-#define RADEON_CLEAR_FASTZ              0x80000000
-#define RADEON_USE_HIERZ                0x40000000
-#define RADEON_USE_COMP_ZBUF            0x20000000
-
-#define R500FP_CONSTANT_TYPE  (1 << 1)
-#define R500FP_CONSTANT_CLAMP (1 << 2)
-
-/* Primitive types
- */
-#define RADEON_POINTS                   0x1
-#define RADEON_LINES                    0x2
-#define RADEON_LINE_STRIP               0x3
-#define RADEON_TRIANGLES                0x4
-#define RADEON_TRIANGLE_FAN             0x5
-#define RADEON_TRIANGLE_STRIP           0x6
-
-/* Vertex/indirect buffer size
- */
-#define RADEON_BUFFER_SIZE              65536
-
-/* Byte offsets for indirect buffer data
- */
-#define RADEON_INDEX_PRIM_OFFSET        20
-
-#define RADEON_SCRATCH_REG_OFFSET       32
-
-#define RADEON_NR_SAREA_CLIPRECTS       12
-
-/* There are 2 heaps (local/GART).  Each region within a heap is a
- * minimum of 64k, and there are at most 64 of them per heap.
- */
-#define RADEON_LOCAL_TEX_HEAP           0
-#define RADEON_GART_TEX_HEAP            1
-#define RADEON_NR_TEX_HEAPS             2
-#define RADEON_NR_TEX_REGIONS           64
-#define RADEON_LOG_TEX_GRANULARITY      16
-
-#define RADEON_MAX_TEXTURE_LEVELS       12
-#define RADEON_MAX_TEXTURE_UNITS        3
-
-#define RADEON_MAX_SURFACES             8
-
-/* Blits have strict offset rules.  All blit offset must be aligned on
- * a 1K-byte boundary.
- */
-#define RADEON_OFFSET_SHIFT             10
-#define RADEON_OFFSET_ALIGN             (1 << RADEON_OFFSET_SHIFT)
-#define RADEON_OFFSET_MASK              (RADEON_OFFSET_ALIGN - 1)
-
-#endif                          /* __RADEON_SAREA_DEFINES__ */
-
-typedef struct {
-        unsigned int red;
-        unsigned int green;
-        unsigned int blue;
-        unsigned int alpha;
-} radeon_color_regs_t;
-
-typedef struct {
-        /* Context state */
-        unsigned int pp_misc;   /* 0x1c14 */
-        unsigned int pp_fog_color;
-        unsigned int re_solid_color;
-        unsigned int rb3d_blendcntl;
-        unsigned int rb3d_depthoffset;
-        unsigned int rb3d_depthpitch;
-        unsigned int rb3d_zstencilcntl;
-
-        unsigned int pp_cntl;   /* 0x1c38 */
-        unsigned int rb3d_cntl;
-        unsigned int rb3d_coloroffset;
-        unsigned int re_width_height;
-        unsigned int rb3d_colorpitch;
-        unsigned int se_cntl;
-
-        /* Vertex format state */
-        unsigned int se_coord_fmt;      /* 0x1c50 */
-
-        /* Line state */
-        unsigned int re_line_pattern;   /* 0x1cd0 */
-        unsigned int re_line_state;
-
-        unsigned int se_line_width;     /* 0x1db8 */
-
-        /* Bumpmap state */
-        unsigned int pp_lum_matrix;     /* 0x1d00 */
-
-        unsigned int pp_rot_matrix_0;   /* 0x1d58 */
-        unsigned int pp_rot_matrix_1;
-
-        /* Mask state */
-        unsigned int rb3d_stencilrefmask;       /* 0x1d7c */
-        unsigned int rb3d_ropcntl;
-        unsigned int rb3d_planemask;
-
-        /* Viewport state */
-        unsigned int se_vport_xscale;   /* 0x1d98 */
-        unsigned int se_vport_xoffset;
-        unsigned int se_vport_yscale;
-        unsigned int se_vport_yoffset;
-        unsigned int se_vport_zscale;
-        unsigned int se_vport_zoffset;
-
-        /* Setup state */
-        unsigned int se_cntl_status;    /* 0x2140 */
-
-        /* Misc state */
-        unsigned int re_top_left;       /* 0x26c0 */
-        unsigned int re_misc;
-} drm_radeon_context_regs_t;
-
-typedef struct {
-        /* Zbias state */
-        unsigned int se_zbias_factor;   /* 0x1dac */
-        unsigned int se_zbias_constant;
-} drm_radeon_context2_regs_t;
-
-/* Setup registers for each texture unit
- */
-typedef struct {
-        unsigned int pp_txfilter;
-        unsigned int pp_txformat;
-        unsigned int pp_txoffset;
-        unsigned int pp_txcblend;
-        unsigned int pp_txablend;
-        unsigned int pp_tfactor;
-        unsigned int pp_border_color;
-} drm_radeon_texture_regs_t;
-
-typedef struct {
-        unsigned int start;
-        unsigned int finish;
-        unsigned int prim:8;
-        unsigned int stateidx:8;
-        unsigned int numverts:16;       /* overloaded as offset/64 for elt prims */
-        unsigned int vc_format; /* vertex format */
-} drm_radeon_prim_t;
-
-typedef struct {
-        drm_radeon_context_regs_t context;
-        drm_radeon_texture_regs_t tex[RADEON_MAX_TEXTURE_UNITS];
-        drm_radeon_context2_regs_t context2;
-        unsigned int dirty;
-} drm_radeon_state_t;
-
-typedef struct {
-        /* The channel for communication of state information to the
-         * kernel on firing a vertex buffer with either of the
-         * obsoleted vertex/index ioctls.
-         */
-        drm_radeon_context_regs_t context_state;
-        drm_radeon_texture_regs_t tex_state[RADEON_MAX_TEXTURE_UNITS];
-        unsigned int dirty;
-        unsigned int vertsize;
-        unsigned int vc_format;
-
-        /* The current cliprects, or a subset thereof.
-         */
-        struct drm_clip_rect boxes[RADEON_NR_SAREA_CLIPRECTS];
-        unsigned int nbox;
-
-        /* Counters for client-side throttling of rendering clients.
-         */
-        unsigned int last_frame;
-        unsigned int last_dispatch;
-        unsigned int last_clear;
-
-        struct drm_tex_region tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS +
-                                                       1];
-        unsigned int tex_age[RADEON_NR_TEX_HEAPS];
-        int ctx_owner;
-        int pfState;            /* number of 3d windows (0,1,2ormore) */
-        int pfCurrentPage;      /* which buffer is being displayed? */
-        int crtc2_base;         /* CRTC2 frame offset */
-        int tiling_enabled;     /* set by drm, read by 2d + 3d clients */
-} drm_radeon_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmRadeon.h)
- *
- * KW: actually it's illegal to change any of this (backwards compatibility).
- */
-
-/* Radeon specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_RADEON_CP_INIT    0x00
-#define DRM_RADEON_CP_START   0x01
-#define DRM_RADEON_CP_STOP    0x02
-#define DRM_RADEON_CP_RESET   0x03
-#define DRM_RADEON_CP_IDLE    0x04
-#define DRM_RADEON_RESET      0x05
-#define DRM_RADEON_FULLSCREEN 0x06
-#define DRM_RADEON_SWAP       0x07
-#define DRM_RADEON_CLEAR      0x08
-#define DRM_RADEON_VERTEX     0x09
-#define DRM_RADEON_INDICES    0x0A
-#define DRM_RADEON_NOT_USED
-#define DRM_RADEON_STIPPLE    0x0C
-#define DRM_RADEON_INDIRECT   0x0D
-#define DRM_RADEON_TEXTURE    0x0E
-#define DRM_RADEON_VERTEX2    0x0F
-#define DRM_RADEON_CMDBUF     0x10
-#define DRM_RADEON_GETPARAM   0x11
-#define DRM_RADEON_FLIP       0x12
-#define DRM_RADEON_ALLOC      0x13
-#define DRM_RADEON_FREE       0x14
-#define DRM_RADEON_INIT_HEAP  0x15
-#define DRM_RADEON_IRQ_EMIT   0x16
-#define DRM_RADEON_IRQ_WAIT   0x17
-#define DRM_RADEON_CP_RESUME  0x18
-#define DRM_RADEON_SETPARAM   0x19
-#define DRM_RADEON_SURF_ALLOC 0x1a
-#define DRM_RADEON_SURF_FREE  0x1b
-
-#define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
-#define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
-#define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-#define DRM_IOCTL_RADEON_CP_RESET   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_RESET)
-#define DRM_IOCTL_RADEON_CP_IDLE    DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_IDLE)
-#define DRM_IOCTL_RADEON_RESET      DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_RESET)
-#define DRM_IOCTL_RADEON_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_FULLSCREEN, drm_radeon_fullscreen_t)
-#define DRM_IOCTL_RADEON_SWAP       DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_SWAP)
-#define DRM_IOCTL_RADEON_CLEAR      DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CLEAR, drm_radeon_clear_t)
-#define DRM_IOCTL_RADEON_VERTEX     DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_VERTEX, drm_radeon_vertex_t)
-#define DRM_IOCTL_RADEON_INDICES    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_INDICES, drm_radeon_indices_t)
-#define DRM_IOCTL_RADEON_STIPPLE    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_STIPPLE, drm_radeon_stipple_t)
-#define DRM_IOCTL_RADEON_INDIRECT   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INDIRECT, drm_radeon_indirect_t)
-#define DRM_IOCTL_RADEON_TEXTURE    DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_TEXTURE, drm_radeon_texture_t)
-#define DRM_IOCTL_RADEON_VERTEX2    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_VERTEX2, drm_radeon_vertex2_t)
-#define DRM_IOCTL_RADEON_CMDBUF     DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CMDBUF, drm_radeon_cmd_buffer_t)
-#define DRM_IOCTL_RADEON_GETPARAM   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GETPARAM, drm_radeon_getparam_t)
-#define DRM_IOCTL_RADEON_FLIP       DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_FLIP)
-#define DRM_IOCTL_RADEON_ALLOC      DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_ALLOC, drm_radeon_mem_alloc_t)
-#define DRM_IOCTL_RADEON_FREE       DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_FREE, drm_radeon_mem_free_t)
-#define DRM_IOCTL_RADEON_INIT_HEAP  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_INIT_HEAP, drm_radeon_mem_init_heap_t)
-#define DRM_IOCTL_RADEON_IRQ_EMIT   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_IRQ_EMIT, drm_radeon_irq_emit_t)
-#define DRM_IOCTL_RADEON_IRQ_WAIT   DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_IRQ_WAIT, drm_radeon_irq_wait_t)
-#define DRM_IOCTL_RADEON_CP_RESUME  DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_RESUME)
-#define DRM_IOCTL_RADEON_SETPARAM   DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SETPARAM, drm_radeon_setparam_t)
-#define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
-#define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
-
-typedef struct drm_radeon_init {
-        enum {
-                RADEON_INIT_CP = 0x01,
-                RADEON_CLEANUP_CP = 0x02,
-                RADEON_INIT_R200_CP = 0x03,
-                RADEON_INIT_R300_CP = 0x04
-        } func;
-        unsigned long sarea_priv_offset;
-        int is_pci;
-        int cp_mode;
-        int gart_size;
-        int ring_size;
-        int usec_timeout;
-
-        unsigned int fb_bpp;
-        unsigned int front_offset, front_pitch;
-        unsigned int back_offset, back_pitch;
-        unsigned int depth_bpp;
-        unsigned int depth_offset, depth_pitch;
-
-        unsigned long fb_offset;
-        unsigned long mmio_offset;
-        unsigned long ring_offset;
-        unsigned long ring_rptr_offset;
-        unsigned long buffers_offset;
-        unsigned long gart_textures_offset;
-} drm_radeon_init_t;
-
-typedef struct drm_radeon_cp_stop {
-        int flush;
-        int idle;
-} drm_radeon_cp_stop_t;
-
-typedef struct drm_radeon_fullscreen {
-        enum {
-                RADEON_INIT_FULLSCREEN = 0x01,
-                RADEON_CLEANUP_FULLSCREEN = 0x02
-        } func;
-} drm_radeon_fullscreen_t;
-
-#define CLEAR_X1        0
-#define CLEAR_Y1        1
-#define CLEAR_X2        2
-#define CLEAR_Y2        3
-#define CLEAR_DEPTH     4
-
-typedef union drm_radeon_clear_rect {
-        float f[5];
-        unsigned int ui[5];
-} drm_radeon_clear_rect_t;
-
-typedef struct drm_radeon_clear {
-        unsigned int flags;
-        unsigned int clear_color;
-        unsigned int clear_depth;
-        unsigned int color_mask;
-        unsigned int depth_mask;        /* misnamed field:  should be stencil */
-        drm_radeon_clear_rect_t __user *depth_boxes;
-} drm_radeon_clear_t;
-
-typedef struct drm_radeon_vertex {
-        int prim;
-        int idx;                /* Index of vertex buffer */
-        int count;              /* Number of vertices in buffer */
-        int discard;            /* Client finished with buffer? */
-} drm_radeon_vertex_t;
-
-typedef struct drm_radeon_indices {
-        int prim;
-        int idx;
-        int start;
-        int end;
-        int discard;            /* Client finished with buffer? */
-} drm_radeon_indices_t;
-
-/* v1.2 - obsoletes drm_radeon_vertex and drm_radeon_indices
- *      - allows multiple primitives and state changes in a single ioctl
- *      - supports driver change to emit native primitives
- */
-typedef struct drm_radeon_vertex2 {
-        int idx;                /* Index of vertex buffer */
-        int discard;            /* Client finished with buffer? */
-        int nr_states;
-        drm_radeon_state_t __user *state;
-        int nr_prims;
-        drm_radeon_prim_t __user *prim;
-} drm_radeon_vertex2_t;
-
-/* v1.3 - obsoletes drm_radeon_vertex2
- *      - allows arbitarily large cliprect list
- *      - allows updating of tcl packet, vector and scalar state
- *      - allows memory-efficient description of state updates
- *      - allows state to be emitted without a primitive
- *           (for clears, ctx switches)
- *      - allows more than one dma buffer to be referenced per ioctl
- *      - supports tcl driver
- *      - may be extended in future versions with new cmd types, packets
- */
-typedef struct drm_radeon_cmd_buffer {
-        int bufsz;
-        char __user *buf;
-        int nbox;
-        struct drm_clip_rect __user *boxes;
-} drm_radeon_cmd_buffer_t;
-
-typedef struct drm_radeon_tex_image {
-        unsigned int x, y;      /* Blit coordinates */
-        unsigned int width, height;
-        const void __user *data;
-} drm_radeon_tex_image_t;
-
-typedef struct drm_radeon_texture {
-        unsigned int offset;
-        int pitch;
-        int format;
-        int width;              /* Texture image coordinates */
-        int height;
-        drm_radeon_tex_image_t __user *image;
-} drm_radeon_texture_t;
-
-typedef struct drm_radeon_stipple {
-        unsigned int __user *mask;
-} drm_radeon_stipple_t;
-
-typedef struct drm_radeon_indirect {
-        int idx;
-        int start;
-        int end;
-        int discard;
-} drm_radeon_indirect_t;
-
-/* enum for card type parameters */
-#define RADEON_CARD_PCI 0
-#define RADEON_CARD_AGP 1
-#define RADEON_CARD_PCIE 2
-
-/* 1.3: An ioctl to get parameters that aren't available to the 3d
- * client any other way.
- */
-#define RADEON_PARAM_GART_BUFFER_OFFSET    1    /* card offset of 1st GART buffer */
-#define RADEON_PARAM_LAST_FRAME            2
-#define RADEON_PARAM_LAST_DISPATCH         3
-#define RADEON_PARAM_LAST_CLEAR            4
-/* Added with DRM version 1.6. */
-#define RADEON_PARAM_IRQ_NR                5
-#define RADEON_PARAM_GART_BASE             6    /* card offset of GART base */
-/* Added with DRM version 1.8. */
-#define RADEON_PARAM_REGISTER_HANDLE       7    /* for drmMap() */
-#define RADEON_PARAM_STATUS_HANDLE         8
-#define RADEON_PARAM_SAREA_HANDLE          9
-#define RADEON_PARAM_GART_TEX_HANDLE       10
-#define RADEON_PARAM_SCRATCH_OFFSET        11
-#define RADEON_PARAM_CARD_TYPE             12
-#define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
-#define RADEON_PARAM_FB_LOCATION           14   /* FB location */
-#define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-
-typedef struct drm_radeon_getparam {
-        int param;
-        void __user *value;
-} drm_radeon_getparam_t;
-
-/* 1.6: Set up a memory manager for regions of shared memory:
- */
-#define RADEON_MEM_REGION_GART 1
-#define RADEON_MEM_REGION_FB   2
-
-typedef struct drm_radeon_mem_alloc {
-        int region;
-        int alignment;
-        int size;
-        int __user *region_offset;      /* offset from start of fb or GART */
-} drm_radeon_mem_alloc_t;
-
-typedef struct drm_radeon_mem_free {
-        int region;
-        int region_offset;
-} drm_radeon_mem_free_t;
-
-typedef struct drm_radeon_mem_init_heap {
-        int region;
-        int size;
-        int start;
-} drm_radeon_mem_init_heap_t;
-
-/* 1.6: Userspace can request & wait on irq's:
- */
-typedef struct drm_radeon_irq_emit {
-        int __user *irq_seq;
-} drm_radeon_irq_emit_t;
-
-typedef struct drm_radeon_irq_wait {
-        int irq_seq;
-} drm_radeon_irq_wait_t;
-
-/* 1.10: Clients tell the DRM where they think the framebuffer is located in
- * the card's address space, via a new generic ioctl to set parameters
- */
-
-typedef struct drm_radeon_setparam {
-        unsigned int param;
-        int64_t value;
-} drm_radeon_setparam_t;
-
-#define RADEON_SETPARAM_FB_LOCATION    1        /* determined framebuffer location */
-#define RADEON_SETPARAM_SWITCH_TILING  2        /* enable/disable color tiling */
-#define RADEON_SETPARAM_PCIGART_LOCATION 3      /* PCI Gart Location */
-#define RADEON_SETPARAM_NEW_MEMMAP 4            /* Use new memory map */
-#define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
-#define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
-/* 1.14: Clients can allocate/free a surface
- */
-typedef struct drm_radeon_surface_alloc {
-        unsigned int address;
-        unsigned int size;
-        unsigned int flags;
-} drm_radeon_surface_alloc_t;
-
-typedef struct drm_radeon_surface_free {
-        unsigned int address;
-} drm_radeon_surface_free_t;
-
-#define DRM_RADEON_VBLANK_CRTC1         1
-#define DRM_RADEON_VBLANK_CRTC2         2
-
-#endif
diff --git a/drivers/char/drm/savage_drm.h b/drivers/char/drm/savage_drm.h
deleted file mode 100644
index 8a576ef01821..000000000000
--- a/drivers/char/drm/savage_drm.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* savage_drm.h -- Public header for the savage driver
- *
- * Copyright 2004  Felix Kuehling
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __SAVAGE_DRM_H__
-#define __SAVAGE_DRM_H__
-
-#ifndef __SAVAGE_SAREA_DEFINES__
-#define __SAVAGE_SAREA_DEFINES__
-
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
- * regions, subject to a minimum region size of (1<<16) == 64k.
- *
- * Clients may subdivide regions internally, but when sharing between
- * clients, the region size is the minimum granularity.
- */
-
-#define SAVAGE_CARD_HEAP                0
-#define SAVAGE_AGP_HEAP                 1
-#define SAVAGE_NR_TEX_HEAPS             2
-#define SAVAGE_NR_TEX_REGIONS           16
-#define SAVAGE_LOG_MIN_TEX_REGION_SIZE  16
-
-#endif                          /* __SAVAGE_SAREA_DEFINES__ */
-
-typedef struct _drm_savage_sarea {
-        /* LRU lists for texture memory in agp space and on the card.
-         */
-        struct drm_tex_region texList[SAVAGE_NR_TEX_HEAPS][SAVAGE_NR_TEX_REGIONS +
-                                                      1];
-        unsigned int texAge[SAVAGE_NR_TEX_HEAPS];
-
-        /* Mechanism to validate card state.
-         */
-        int ctxOwner;
-} drm_savage_sarea_t, *drm_savage_sarea_ptr;
-
-/* Savage-specific ioctls
- */
-#define DRM_SAVAGE_BCI_INIT             0x00
-#define DRM_SAVAGE_BCI_CMDBUF           0x01
-#define DRM_SAVAGE_BCI_EVENT_EMIT       0x02
-#define DRM_SAVAGE_BCI_EVENT_WAIT       0x03
-
-#define DRM_IOCTL_SAVAGE_INIT           DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_INIT, drm_savage_init_t)
-#define DRM_IOCTL_SAVAGE_CMDBUF         DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_CMDBUF, drm_savage_cmdbuf_t)
-#define DRM_IOCTL_SAVAGE_EVENT_EMIT     DRM_IOWR(DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_EMIT, drm_savage_event_emit_t)
-#define DRM_IOCTL_SAVAGE_EVENT_WAIT     DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_WAIT, drm_savage_event_wait_t)
-
-#define SAVAGE_DMA_PCI  1
-#define SAVAGE_DMA_AGP  3
-typedef struct drm_savage_init {
-        enum {
-                SAVAGE_INIT_BCI = 1,
-                SAVAGE_CLEANUP_BCI = 2
-        } func;
-        unsigned int sarea_priv_offset;
-
-        /* some parameters */
-        unsigned int cob_size;
-        unsigned int bci_threshold_lo, bci_threshold_hi;
-        unsigned int dma_type;
-
-        /* frame buffer layout */
-        unsigned int fb_bpp;
-        unsigned int front_offset, front_pitch;
-        unsigned int back_offset, back_pitch;
-        unsigned int depth_bpp;
-        unsigned int depth_offset, depth_pitch;
-
-        /* local textures */
-        unsigned int texture_offset;
-        unsigned int texture_size;
-
-        /* physical locations of non-permanent maps */
-        unsigned long status_offset;
-        unsigned long buffers_offset;
-        unsigned long agp_textures_offset;
-        unsigned long cmd_dma_offset;
-} drm_savage_init_t;
-
-typedef union drm_savage_cmd_header drm_savage_cmd_header_t;
-typedef struct drm_savage_cmdbuf {
-        /* command buffer in client's address space */
-        drm_savage_cmd_header_t __user *cmd_addr;
-        unsigned int size;      /* size of the command buffer in 64bit units */
-
-        unsigned int dma_idx;   /* DMA buffer index to use */
-        int discard;            /* discard DMA buffer when done */
-        /* vertex buffer in client's address space */
-        unsigned int __user *vb_addr;
-        unsigned int vb_size;   /* size of client vertex buffer in bytes */
-        unsigned int vb_stride; /* stride of vertices in 32bit words */
-        /* boxes in client's address space */
-        struct drm_clip_rect __user *box_addr;
-        unsigned int nbox;      /* number of clipping boxes */
-} drm_savage_cmdbuf_t;
-
-#define SAVAGE_WAIT_2D  0x1     /* wait for 2D idle before updating event tag */
-#define SAVAGE_WAIT_3D  0x2     /* wait for 3D idle before updating event tag */
-#define SAVAGE_WAIT_IRQ 0x4     /* emit or wait for IRQ, not implemented yet */
-typedef struct drm_savage_event {
-        unsigned int count;
-        unsigned int flags;
-} drm_savage_event_emit_t, drm_savage_event_wait_t;
-
-/* Commands for the cmdbuf ioctl
- */
-#define SAVAGE_CMD_STATE        0       /* a range of state registers */
-#define SAVAGE_CMD_DMA_PRIM     1       /* vertices from DMA buffer */
-#define SAVAGE_CMD_VB_PRIM      2       /* vertices from client vertex buffer */
-#define SAVAGE_CMD_DMA_IDX      3       /* indexed vertices from DMA buffer */
-#define SAVAGE_CMD_VB_IDX       4       /* indexed vertices client vertex buffer */
-#define SAVAGE_CMD_CLEAR        5       /* clear buffers */
-#define SAVAGE_CMD_SWAP         6       /* swap buffers */
-
-/* Primitive types
-*/
-#define SAVAGE_PRIM_TRILIST     0       /* triangle list */
-#define SAVAGE_PRIM_TRISTRIP    1       /* triangle strip */
-#define SAVAGE_PRIM_TRIFAN      2       /* triangle fan */
-#define SAVAGE_PRIM_TRILIST_201 3       /* reorder verts for correct flat
-                                         * shading on s3d */
-
-/* Skip flags (vertex format)
- */
-#define SAVAGE_SKIP_Z           0x01
-#define SAVAGE_SKIP_W           0x02
-#define SAVAGE_SKIP_C0          0x04
-#define SAVAGE_SKIP_C1          0x08
-#define SAVAGE_SKIP_S0          0x10
-#define SAVAGE_SKIP_T0          0x20
-#define SAVAGE_SKIP_ST0         0x30
-#define SAVAGE_SKIP_S1          0x40
-#define SAVAGE_SKIP_T1          0x80
-#define SAVAGE_SKIP_ST1         0xc0
-#define SAVAGE_SKIP_ALL_S3D     0x3f
-#define SAVAGE_SKIP_ALL_S4      0xff
-
-/* Buffer names for clear command
- */
-#define SAVAGE_FRONT            0x1
-#define SAVAGE_BACK             0x2
-#define SAVAGE_DEPTH            0x4
-
-/* 64-bit command header
- */
-union drm_savage_cmd_header {
-        struct {
-                unsigned char cmd;      /* command */
-                unsigned char pad0;
-                unsigned short pad1;
-                unsigned short pad2;
-                unsigned short pad3;
-        } cmd;                  /* generic */
-        struct {
-                unsigned char cmd;
-                unsigned char global;   /* need idle engine? */
-                unsigned short count;   /* number of consecutive registers */
-                unsigned short start;   /* first register */
-                unsigned short pad3;
-        } state;                /* SAVAGE_CMD_STATE */
-        struct {
-                unsigned char cmd;
-                unsigned char prim;     /* primitive type */
-                unsigned short skip;    /* vertex format (skip flags) */
-                unsigned short count;   /* number of vertices */
-                unsigned short start;   /* first vertex in DMA/vertex buffer */
-        } prim;                 /* SAVAGE_CMD_DMA_PRIM, SAVAGE_CMD_VB_PRIM */
-        struct {
-                unsigned char cmd;
-                unsigned char prim;
-                unsigned short skip;
-                unsigned short count;   /* number of indices that follow */
-                unsigned short pad3;
-        } idx;                  /* SAVAGE_CMD_DMA_IDX, SAVAGE_CMD_VB_IDX */
-        struct {
-                unsigned char cmd;
-                unsigned char pad0;
-                unsigned short pad1;
-                unsigned int flags;
-        } clear0;               /* SAVAGE_CMD_CLEAR */
-        struct {
-                unsigned int mask;
-                unsigned int value;
-        } clear1;               /* SAVAGE_CMD_CLEAR data */
-};
-
-#endif
diff --git a/drivers/char/drm/sis_drm.h b/drivers/char/drm/sis_drm.h
deleted file mode 100644
index 30f7b3827466..000000000000
--- a/drivers/char/drm/sis_drm.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */
-/*
- * Copyright 2005 Eric Anholt
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef __SIS_DRM_H__
-#define __SIS_DRM_H__
-
-/* SiS specific ioctls */
-#define NOT_USED_0_3
-#define DRM_SIS_FB_ALLOC        0x04
-#define DRM_SIS_FB_FREE         0x05
-#define NOT_USED_6_12
-#define DRM_SIS_AGP_INIT        0x13
-#define DRM_SIS_AGP_ALLOC       0x14
-#define DRM_SIS_AGP_FREE        0x15
-#define DRM_SIS_FB_INIT         0x16
-
-#define DRM_IOCTL_SIS_FB_ALLOC          DRM_IOWR(DRM_COMMAND_BASE + DRM_SIS_FB_ALLOC, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_FB_FREE           DRM_IOW( DRM_COMMAND_BASE + DRM_SIS_FB_FREE, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_AGP_INIT          DRM_IOWR(DRM_COMMAND_BASE + DRM_SIS_AGP_INIT, drm_sis_agp_t)
-#define DRM_IOCTL_SIS_AGP_ALLOC         DRM_IOWR(DRM_COMMAND_BASE + DRM_SIS_AGP_ALLOC, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_AGP_FREE          DRM_IOW( DRM_COMMAND_BASE + DRM_SIS_AGP_FREE, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_FB_INIT           DRM_IOW( DRM_COMMAND_BASE + DRM_SIS_FB_INIT, drm_sis_fb_t)
-/*
-#define DRM_IOCTL_SIS_FLIP              DRM_IOW( 0x48, drm_sis_flip_t)
-#define DRM_IOCTL_SIS_FLIP_INIT         DRM_IO(  0x49)
-#define DRM_IOCTL_SIS_FLIP_FINAL        DRM_IO(  0x50)
-*/
-
-typedef struct {
-        int context;
-        unsigned int offset;
-        unsigned int size;
-        unsigned long free;
-} drm_sis_mem_t;
-
-typedef struct {
-        unsigned int offset, size;
-} drm_sis_agp_t;
-
-typedef struct {
-        unsigned int offset, size;
-} drm_sis_fb_t;
-
-#endif                          /* __SIS_DRM_H__ */
diff --git a/drivers/char/drm/via_drm.h b/drivers/char/drm/via_drm.h
deleted file mode 100644
index a3b5c102b067..000000000000
--- a/drivers/char/drm/via_drm.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#ifndef _VIA_DRM_H_
-#define _VIA_DRM_H_
-
-/* WARNING: These defines must be the same as what the Xserver uses.
- * if you change them, you must change the defines in the Xserver.
- */
-
-#ifndef _VIA_DEFINES_
-#define _VIA_DEFINES_
-
-#ifndef __KERNEL__
-#include "via_drmclient.h"
-#endif
-
-#define VIA_NR_SAREA_CLIPRECTS          8
-#define VIA_NR_XVMC_PORTS               10
-#define VIA_NR_XVMC_LOCKS               5
-#define VIA_MAX_CACHELINE_SIZE          64
-#define XVMCLOCKPTR(saPriv,lockNo)                                      \
-        ((volatile struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \
-                                      (VIA_MAX_CACHELINE_SIZE - 1)) &   \
-                                     ~(VIA_MAX_CACHELINE_SIZE - 1)) +   \
-                                    VIA_MAX_CACHELINE_SIZE*(lockNo)))
-
-/* Each region is a minimum of 64k, and there are at most 64 of them.
- */
-#define VIA_NR_TEX_REGIONS 64
-#define VIA_LOG_MIN_TEX_REGION_SIZE 16
-#endif
-
-#define VIA_UPLOAD_TEX0IMAGE  0x1       /* handled clientside */
-#define VIA_UPLOAD_TEX1IMAGE  0x2       /* handled clientside */
-#define VIA_UPLOAD_CTX        0x4
-#define VIA_UPLOAD_BUFFERS    0x8
-#define VIA_UPLOAD_TEX0       0x10
-#define VIA_UPLOAD_TEX1       0x20
-#define VIA_UPLOAD_CLIPRECTS  0x40
-#define VIA_UPLOAD_ALL        0xff
-
-/* VIA specific ioctls */
-#define DRM_VIA_ALLOCMEM        0x00
-#define DRM_VIA_FREEMEM         0x01
-#define DRM_VIA_AGP_INIT        0x02
-#define DRM_VIA_FB_INIT         0x03
-#define DRM_VIA_MAP_INIT        0x04
-#define DRM_VIA_DEC_FUTEX       0x05
-#define NOT_USED
-#define DRM_VIA_DMA_INIT        0x07
-#define DRM_VIA_CMDBUFFER       0x08
-#define DRM_VIA_FLUSH           0x09
-#define DRM_VIA_PCICMD          0x0a
-#define DRM_VIA_CMDBUF_SIZE     0x0b
-#define NOT_USED
-#define DRM_VIA_WAIT_IRQ        0x0d
-#define DRM_VIA_DMA_BLIT        0x0e
-#define DRM_VIA_BLIT_SYNC       0x0f
-
-#define DRM_IOCTL_VIA_ALLOCMEM    DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_ALLOCMEM, drm_via_mem_t)
-#define DRM_IOCTL_VIA_FREEMEM     DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_FREEMEM, drm_via_mem_t)
-#define DRM_IOCTL_VIA_AGP_INIT    DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_AGP_INIT, drm_via_agp_t)
-#define DRM_IOCTL_VIA_FB_INIT     DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_FB_INIT, drm_via_fb_t)
-#define DRM_IOCTL_VIA_MAP_INIT    DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_MAP_INIT, drm_via_init_t)
-#define DRM_IOCTL_VIA_DEC_FUTEX   DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_DEC_FUTEX, drm_via_futex_t)
-#define DRM_IOCTL_VIA_DMA_INIT    DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_DMA_INIT, drm_via_dma_init_t)
-#define DRM_IOCTL_VIA_CMDBUFFER   DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_CMDBUFFER, drm_via_cmdbuffer_t)
-#define DRM_IOCTL_VIA_FLUSH       DRM_IO(  DRM_COMMAND_BASE + DRM_VIA_FLUSH)
-#define DRM_IOCTL_VIA_PCICMD      DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_PCICMD, drm_via_cmdbuffer_t)
-#define DRM_IOCTL_VIA_CMDBUF_SIZE DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_CMDBUF_SIZE, \
-                                            drm_via_cmdbuf_size_t)
-#define DRM_IOCTL_VIA_WAIT_IRQ    DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_WAIT_IRQ, drm_via_irqwait_t)
-#define DRM_IOCTL_VIA_DMA_BLIT    DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_DMA_BLIT, drm_via_dmablit_t)
-#define DRM_IOCTL_VIA_BLIT_SYNC   DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_BLIT_SYNC, drm_via_blitsync_t)
-
-/* Indices into buf.Setup where various bits of state are mirrored per
- * context and per buffer.  These can be fired at the card as a unit,
- * or in a piecewise fashion as required.
- */
-
-#define VIA_TEX_SETUP_SIZE 8
-
-/* Flags for clear ioctl
- */
-#define VIA_FRONT   0x1
-#define VIA_BACK    0x2
-#define VIA_DEPTH   0x4
-#define VIA_STENCIL 0x8
-#define VIA_MEM_VIDEO   0       /* matches drm constant */
-#define VIA_MEM_AGP     1       /* matches drm constant */
-#define VIA_MEM_SYSTEM  2
-#define VIA_MEM_MIXED   3
-#define VIA_MEM_UNKNOWN 4
-
-typedef struct {
-        uint32_t offset;
-        uint32_t size;
-} drm_via_agp_t;
-
-typedef struct {
-        uint32_t offset;
-        uint32_t size;
-} drm_via_fb_t;
-
-typedef struct {
-        uint32_t context;
-        uint32_t type;
-        uint32_t size;
-        unsigned long index;
-        unsigned long offset;
-} drm_via_mem_t;
-
-typedef struct _drm_via_init {
-        enum {
-                VIA_INIT_MAP = 0x01,
-                VIA_CLEANUP_MAP = 0x02
-        } func;
-
-        unsigned long sarea_priv_offset;
-        unsigned long fb_offset;
-        unsigned long mmio_offset;
-        unsigned long agpAddr;
-} drm_via_init_t;
-
-typedef struct _drm_via_futex {
-        enum {
-                VIA_FUTEX_WAIT = 0x00,
-                VIA_FUTEX_WAKE = 0X01
-        } func;
-        uint32_t ms;
-        uint32_t lock;
-        uint32_t val;
-} drm_via_futex_t;
-
-typedef struct _drm_via_dma_init {
-        enum {
-                VIA_INIT_DMA = 0x01,
-                VIA_CLEANUP_DMA = 0x02,
-                VIA_DMA_INITIALIZED = 0x03
-        } func;
-
-        unsigned long offset;
-        unsigned long size;
-        unsigned long reg_pause_addr;
-} drm_via_dma_init_t;
-
-typedef struct _drm_via_cmdbuffer {
-        char __user *buf;
-        unsigned long size;
-} drm_via_cmdbuffer_t;
-
-/* Warning: If you change the SAREA structure you must change the Xserver
- * structure as well */
-
-typedef struct _drm_via_tex_region {
-        unsigned char next, prev;       /* indices to form a circular LRU  */
-        unsigned char inUse;    /* owned by a client, or free? */
-        int age;                /* tracked by clients to update local LRU's */
-} drm_via_tex_region_t;
-
-typedef struct _drm_via_sarea {
-        unsigned int dirty;
-        unsigned int nbox;
-        struct drm_clip_rect boxes[VIA_NR_SAREA_CLIPRECTS];
-        drm_via_tex_region_t texList[VIA_NR_TEX_REGIONS + 1];
-        int texAge;             /* last time texture was uploaded */
-        int ctxOwner;           /* last context to upload state */
-        int vertexPrim;
-
-        /*
-         * Below is for XvMC.
-         * We want the lock integers alone on, and aligned to, a cache line.
-         * Therefore this somewhat strange construct.
-         */
-
-        char XvMCLockArea[VIA_MAX_CACHELINE_SIZE * (VIA_NR_XVMC_LOCKS + 1)];
-
-        unsigned int XvMCDisplaying[VIA_NR_XVMC_PORTS];
-        unsigned int XvMCSubPicOn[VIA_NR_XVMC_PORTS];
-        unsigned int XvMCCtxNoGrabbed;  /* Last context to hold decoder */
-
-        /* Used by the 3d driver only at this point, for pageflipping:
-         */
-        unsigned int pfCurrentOffset;
-} drm_via_sarea_t;
-
-typedef struct _drm_via_cmdbuf_size {
-        enum {
-                VIA_CMDBUF_SPACE = 0x01,
-                VIA_CMDBUF_LAG = 0x02
-        } func;
-        int wait;
-        uint32_t size;
-} drm_via_cmdbuf_size_t;
-
-typedef enum {
-        VIA_IRQ_ABSOLUTE = 0x0,
-        VIA_IRQ_RELATIVE = 0x1,
-        VIA_IRQ_SIGNAL = 0x10000000,
-        VIA_IRQ_FORCE_SEQUENCE = 0x20000000
-} via_irq_seq_type_t;
-
-#define VIA_IRQ_FLAGS_MASK 0xF0000000
-
-enum drm_via_irqs {
-        drm_via_irq_hqv0 = 0,
-        drm_via_irq_hqv1,
-        drm_via_irq_dma0_dd,
-        drm_via_irq_dma0_td,
-        drm_via_irq_dma1_dd,
-        drm_via_irq_dma1_td,
-        drm_via_irq_num
-};
-
-struct drm_via_wait_irq_request {
-        unsigned irq;
-        via_irq_seq_type_t type;
-        uint32_t sequence;
-        uint32_t signal;
-};
-
-typedef union drm_via_irqwait {
-        struct drm_via_wait_irq_request request;
-        struct drm_wait_vblank_reply reply;
-} drm_via_irqwait_t;
-
-typedef struct drm_via_blitsync {
-        uint32_t sync_handle;
-        unsigned engine;
-} drm_via_blitsync_t;
-
-/* - * Below,"flags" is currently unused but will be used for possible future
- * extensions like kernel space bounce buffers for bad alignments and
- * blit engine busy-wait polling for better latency in the absence of
- * interrupts.
- */
-
-typedef struct drm_via_dmablit {
-        uint32_t num_lines;
-        uint32_t line_length;
-
-        uint32_t fb_addr;
-        uint32_t fb_stride;
-
-        unsigned char *mem_addr;
-        uint32_t mem_stride;
-
-        uint32_t flags;
-        int to_fb;
-
-        drm_via_blitsync_t sync;
-} drm_via_dmablit_t;
-
-#endif                          /* _VIA_DRM_H_ */
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
index ea35ab2c9909..fb584938c9c3 100644
--- a/drivers/char/ds1286.c
+++ b/drivers/char/ds1286.c
@@ -27,6 +27,7 @@
  * option) any later version.
  */
 #include <linux/ds1286.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
@@ -252,6 +253,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
 
 static int ds1286_open(struct inode *inode, struct file *file)
 {
+        lock_kernel();
         spin_lock_irq(&ds1286_lock);
 
         if (ds1286_status & RTC_IS_OPEN)
@@ -260,10 +262,12 @@ static int ds1286_open(struct inode *inode, struct file *file)
         ds1286_status |= RTC_IS_OPEN;
 
         spin_unlock_irq(&ds1286_lock);
+        unlock_kernel();
         return 0;
 
 out_busy:
         spin_lock_irq(&ds1286_lock);
+        unlock_kernel();
         return -EBUSY;
 }
 
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index 334ad5bbe6b6..34275c6f1da2 100644
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -8,6 +8,7 @@
 #include <linux/proc_fs.h>
 #include <linux/capability.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
@@ -208,6 +209,12 @@ static void ds1620_read_state(struct therm *therm)
         therm->hi = cvt_9_to_int(ds1620_in(THERM_READ_TH, 9));
 }
 
+static int ds1620_open(struct inode *inode, struct file *file)
+{
+        cycle_kernel_lock();
+        return nonseekable_open(inode, file);
+}
+
 static ssize_t
 ds1620_read(struct file *file, char __user *buf, size_t count, loff_t *ptr)
 {
@@ -336,7 +343,7 @@ static struct proc_dir_entry *proc_therm_ds1620;
 
 static const struct file_operations ds1620_fops = {
         .owner          = THIS_MODULE,
-        .open           = nonseekable_open,
+        .open           = ds1620_open,
         .read           = ds1620_read,
         .ioctl          = ds1620_ioctl,
 };
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index a69c65283260..7bf7485377e6 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -33,6 +33,7 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/smp_lock.h>
 
 #include <asm/atarihw.h>
 #include <asm/traps.h>
@@ -436,13 +437,17 @@ static unsigned int dsp56k_poll(struct file *file, poll_table *wait)
 static int dsp56k_open(struct inode *inode, struct file *file)
 {
         int dev = iminor(inode) & 0x0f;
+        int ret = 0;
 
+        lock_kernel();
         switch(dev)
         {
         case DSP56K_DEV_56001:
 
-                if (test_and_set_bit(0, &dsp56k.in_use))
-                        return -EBUSY;
+                if (test_and_set_bit(0, &dsp56k.in_use)) {
+                        ret = -EBUSY;
+                        goto out;
+                }
 
                 dsp56k.timeout = TIMEOUT;
                 dsp56k.maxio = MAXIO;
@@ -458,10 +463,11 @@ static int dsp56k_open(struct inode *inode, struct file *file)
                 break;
 
         default:
-                return -ENODEV;
+                ret = -ENODEV;
         }
-
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int dsp56k_release(struct inode *inode, struct file *file)
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index abde6ddefe69..6b900b297cc6 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -56,6 +56,7 @@
 #include <linux/errno.h>        /* for -EBUSY */
 #include <linux/ioport.h>       /* for request_region */
 #include <linux/delay.h>        /* for loops_per_jiffy */
+#include <linux/smp_lock.h>     /* cycle_kernel_lock() */
 #include <asm/io.h>             /* for inb_p, outb_p, inb, outb, etc. */
 #include <asm/uaccess.h>        /* for get_user, etc. */
 #include <linux/wait.h>         /* for wait_queue */
@@ -288,10 +289,12 @@ static int dtlk_ioctl(struct inode *inode,
         }
 }
 
+/* Note that nobody ever sets dtlk_busy... */
 static int dtlk_open(struct inode *inode, struct file *file)
 {
         TRACE_TEXT("(dtlk_open");
 
+        cycle_kernel_lock();
         nonseekable_open(inode, file);
         switch (iminor(inode)) {
         case DTLK_MINOR:
diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c
index 49233f589874..d57ca3e4e534 100644
--- a/drivers/char/efirtc.c
+++ b/drivers/char/efirtc.c
@@ -28,6 +28,7 @@
  */
 
 
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
@@ -272,6 +273,7 @@ efi_rtc_open(struct inode *inode, struct file *file)
          * We do accept multiple open files at the same time as we
          * synchronize on the per call operation.
          */
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
index 69f0a2993af0..aac0985a572b 100644
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
@@ -51,6 +51,7 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
+#include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 
 #include <asm/uaccess.h>
@@ -338,12 +339,16 @@ static int gen_rtc_ioctl(struct inode *inode, struct file *file,
 
 static int gen_rtc_open(struct inode *inode, struct file *file)
 {
-        if (gen_rtc_status & RTC_IS_OPEN)
+        lock_kernel();
+        if (gen_rtc_status & RTC_IS_OPEN) {
+                unlock_kernel();
                 return -EBUSY;
+        }
 
         gen_rtc_status |= RTC_IS_OPEN;
         gen_rtc_irq_data = 0;
         irq_active = 0;
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index e7fb0bca3667..fb0a85a1eb36 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/miscdevice.h>
 #include <linux/major.h>
@@ -193,6 +194,7 @@ static int hpet_open(struct inode *inode, struct file *file)
         if (file->f_mode & FMODE_WRITE)
                 return -EINVAL;
 
+        lock_kernel();
         spin_lock_irq(&hpet_lock);
 
         for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next)
@@ -207,6 +209,7 @@ static int hpet_open(struct inode *inode, struct file *file)
 
         if (!devp) {
                 spin_unlock_irq(&hpet_lock);
+                unlock_kernel();
                 return -EBUSY;
         }
 
@@ -214,6 +217,7 @@ static int hpet_open(struct inode *inode, struct file *file)
         devp->hd_irqdata = 0;
         devp->hd_flags |= HPET_OPEN;
         spin_unlock_irq(&hpet_lock);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c
index dd68f8541c2d..db2ae4216279 100644
--- a/drivers/char/hvc_xen.c
+++ b/drivers/char/hvc_xen.c
@@ -39,9 +39,14 @@ static int xencons_irq;
 
 /* ------------------------------------------------------------------ */
 
+static unsigned long console_pfn = ~0ul;
+
 static inline struct xencons_interface *xencons_interface(void)
 {
-        return mfn_to_virt(xen_start_info->console.domU.mfn);
+        if (console_pfn == ~0ul)
+                return mfn_to_virt(xen_start_info->console.domU.mfn);
+        else
+                return __va(console_pfn << PAGE_SHIFT);
 }
 
 static inline void notify_daemon(void)
@@ -101,20 +106,32 @@ static int __init xen_init(void)
 {
         struct hvc_struct *hp;
 
-        if (!is_running_on_xen())
-                return 0;
+        if (!is_running_on_xen() ||
+            is_initial_xendomain() ||
+            !xen_start_info->console.domU.evtchn)
+                return -ENODEV;
 
         xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn);
         if (xencons_irq < 0)
-                xencons_irq = 0 /* NO_IRQ */;
+                xencons_irq = 0; /* NO_IRQ */
+
         hp = hvc_alloc(HVC_COOKIE, xencons_irq, &hvc_ops, 256);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
 
         hvc = hp;
+
+        console_pfn = mfn_to_pfn(xen_start_info->console.domU.mfn);
+
         return 0;
 }
 
+void xen_console_resume(void)
+{
+        if (xencons_irq)
+                rebind_evtchn_irq(xen_start_info->console.domU.evtchn, xencons_irq);
+}
+
 static void __exit xen_fini(void)
 {
         if (hvc)
@@ -134,12 +151,28 @@ module_init(xen_init);
 module_exit(xen_fini);
 console_initcall(xen_cons_init);
 
+static void raw_console_write(const char *str, int len)
+{
+        while(len > 0) {
+                int rc = HYPERVISOR_console_io(CONSOLEIO_write, len, (char *)str);
+                if (rc <= 0)
+                        break;
+
+                str += rc;
+                len -= rc;
+        }
+}
+
+#ifdef CONFIG_EARLY_PRINTK
 static void xenboot_write_console(struct console *console, const char *string,
                                   unsigned len)
 {
         unsigned int linelen, off = 0;
         const char *pos;
 
+        raw_console_write(string, len);
+
+        write_console(0, "(early) ", 8);
         while (off < len && NULL != (pos = strchr(string+off, '\n'))) {
                 linelen = pos-string+off;
                 if (off + linelen > len)
@@ -155,5 +188,23 @@ static void xenboot_write_console(struct console *console, const char *string,
 struct console xenboot_console = {
         .name           = "xenboot",
         .write          = xenboot_write_console,
-        .flags          = CON_PRINTBUFFER | CON_BOOT,
+        .flags          = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
 };
+#endif  /* CONFIG_EARLY_PRINTK */
+
+void xen_raw_console_write(const char *str)
+{
+        raw_console_write(str, strlen(str));
+}
+
+void xen_raw_printk(const char *fmt, ...)
+{
+        static char buf[512];
+        va_list ap;
+
+        va_start(ap, fmt);
+        vsnprintf(buf, sizeof(buf), fmt, ap);
+        va_end(ap);
+
+        xen_raw_console_write(buf);
+}
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 662d60e44e9a..e5d583c84e4f 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -37,6 +37,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
@@ -86,6 +87,7 @@ static int rng_dev_open(struct inode *inode, struct file *filp)
                 return -EINVAL;
         if (filp->f_mode & FMODE_WRITE)
                 return -EINVAL;
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index c12cf8fc4be0..61b6fe4156bb 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -98,6 +98,7 @@
 #include <linux/major.h>
 #include <linux/wait.h>
 #include <linux/device.h>
+#include <linux/smp_lock.h>
 
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
@@ -2908,42 +2909,11 @@ ip2_ipl_ioctl ( struct inode *pInode, struct file *pFile, UINT cmd, ULONG arg )
 static int
 ip2_ipl_open( struct inode *pInode, struct file *pFile )
 {
-        unsigned int iplminor = iminor(pInode);
-        i2eBordStrPtr pB;
-        i2ChanStrPtr  pCh;
 
 #ifdef IP2DEBUG_IPL
         printk (KERN_DEBUG "IP2IPL: open\n" );
 #endif
-
-        switch(iplminor) {
-        // These are the IPL devices
-        case 0:
-        case 4:
-        case 8:
-        case 12:
-                break;
-
-        // These are the status devices
-        case 1:
-        case 5:
-        case 9:
-        case 13:
-                break;
-
-        // These are the debug devices
-        case 2:
-        case 6:
-        case 10:
-        case 14:
-                pB = i2BoardPtrTable[iplminor / 4];
-                pCh = (i2ChanStrPtr) pB->i2eChannelPtr;
-                break;
-
-        // This is the trace device
-        case 3:
-                break;
-        }
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c
index 86e6538a77b0..ec9d0443d92c 100644
--- a/drivers/char/ip27-rtc.c
+++ b/drivers/char/ip27-rtc.c
@@ -27,6 +27,7 @@
 #include <linux/bcd.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/miscdevice.h>
 #include <linux/ioport.h>
@@ -163,15 +164,18 @@ static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
 static int rtc_open(struct inode *inode, struct file *file)
 {
+        lock_kernel();
         spin_lock_irq(&rtc_lock);
 
         if (rtc_status & RTC_IS_OPEN) {
                 spin_unlock_irq(&rtc_lock);
+                unlock_kernel();
                 return -EBUSY;
         }
 
         rtc_status |= RTC_IS_OPEN;
         spin_unlock_irq(&rtc_lock);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 0246a2b8ce48..c11a40483459 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -43,6 +43,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/compat.h>
+#include <linux/smp_lock.h>
 
 struct ipmi_file_private
 {
@@ -100,7 +101,9 @@ static int ipmi_fasync(int fd, struct file *file, int on)
         struct ipmi_file_private *priv = file->private_data;
         int                      result;
 
+        lock_kernel(); /* could race against open() otherwise */
         result = fasync_helper(fd, file, on, &priv->fasync_queue);
+        unlock_kernel();
 
         return (result);
 }
@@ -121,6 +124,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
         if (!priv)
                 return -ENOMEM;
 
+        lock_kernel();
         priv->file = file;
 
         rv = ipmi_create_user(if_num,
@@ -129,7 +133,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
                               &(priv->user));
         if (rv) {
                 kfree(priv);
-                return rv;
+                goto out;
         }
 
         file->private_data = priv;
@@ -144,7 +148,9 @@ static int ipmi_open(struct inode *inode, struct file *file)
         priv->default_retries = -1;
         priv->default_retry_time_ms = 0;
 
-        return 0;
+out:
+        unlock_kernel();
+        return rv;
 }
 
 static int ipmi_release(struct inode *inode, struct file *file)
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 0e6df289cb46..235fab0bdf79 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -35,6 +35,7 @@
 #include <linux/moduleparam.h>
 #include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
+#include <linux/smp_lock.h>
 #include <linux/watchdog.h>
 #include <linux/miscdevice.h>
 #include <linux/init.h>
@@ -818,6 +819,8 @@ static int ipmi_open(struct inode *ino, struct file *filep)
                 if (test_and_set_bit(0, &ipmi_wdog_open))
                         return -EBUSY;
 
+                cycle_kernel_lock();
+
                 /*
                  * Don't start the timer now, let it start on the
                  * first heartbeat.
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 4fe9206f84de..1c29b20e4f4c 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -20,6 +20,7 @@
 #include <linux/mc146818rtc.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
@@ -414,6 +415,8 @@ static int lcd_ioctl(struct inode *inode, struct file *file,
 
 static int lcd_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
+
         if (!lcd_present)
                 return -ENXIO;
         else
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 60ac642752be..71abb4c33aa2 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -126,6 +126,7 @@
 #include <linux/device.h>
 #include <linux/wait.h>
 #include <linux/jiffies.h>
+#include <linux/smp_lock.h>
 
 #include <linux/parport.h>
 #undef LP_STATS
@@ -489,14 +490,21 @@ static ssize_t lp_read(struct file * file, char __user * buf,
 static int lp_open(struct inode * inode, struct file * file)
 {
         unsigned int minor = iminor(inode);
+        int ret = 0;
 
-        if (minor >= LP_NO)
-                return -ENXIO;
-        if ((LP_F(minor) & LP_EXIST) == 0)
-                return -ENXIO;
-        if (test_and_set_bit(LP_BUSY_BIT_POS, &LP_F(minor)))
-                return -EBUSY;
-
+        lock_kernel();
+        if (minor >= LP_NO) {
+                ret = -ENXIO;
+                goto out;
+        }
+        if ((LP_F(minor) & LP_EXIST) == 0) {
+                ret = -ENXIO;
+                goto out;
+        }
+        if (test_and_set_bit(LP_BUSY_BIT_POS, &LP_F(minor))) {
+                ret = -EBUSY;
+                goto out;
+        }
         /* If ABORTOPEN is set and the printer is offline or out of paper,
            we may still want to open it to perform ioctl()s.  Therefore we
            have commandeered O_NONBLOCK, even though it is being used in
@@ -510,21 +518,25 @@ static int lp_open(struct inode * inode, struct file * file)
                 if (status & LP_POUTPA) {
                         printk(KERN_INFO "lp%d out of paper\n", minor);
                         LP_F(minor) &= ~LP_BUSY;
-                        return -ENOSPC;
+                        ret = -ENOSPC;
+                        goto out;
                 } else if (!(status & LP_PSELECD)) {
                         printk(KERN_INFO "lp%d off-line\n", minor);
                         LP_F(minor) &= ~LP_BUSY;
-                        return -EIO;
+                        ret = -EIO;
+                        goto out;
                 } else if (!(status & LP_PERRORP)) {
                         printk(KERN_ERR "lp%d printer error\n", minor);
                         LP_F(minor) &= ~LP_BUSY;
-                        return -EIO;
+                        ret = -EIO;
+                        goto out;
                 }
         }
         lp_table[minor].lp_buffer = kmalloc(LP_BUFFER_SIZE, GFP_KERNEL);
         if (!lp_table[minor].lp_buffer) {
                 LP_F(minor) &= ~LP_BUSY;
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
         /* Determine if the peripheral supports ECP mode */
         lp_claim_parport_or_block (&lp_table[minor]);
@@ -540,7 +552,9 @@ static int lp_open(struct inode * inode, struct file * file)
         parport_negotiate (lp_table[minor].dev->port, IEEE1284_MODE_COMPAT);
         lp_release_parport (&lp_table[minor]);
         lp_table[minor].current_mode = IEEE1284_MODE_COMPAT;
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int lp_release(struct inode * inode, struct file * file)
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index f4716ad7348a..acd8e9ed474a 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -24,6 +24,7 @@
 #include <linux/mm.h>
 #include <linux/uio.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -382,15 +383,19 @@ static int mbcs_open(struct inode *ip, struct file *fp)
         struct mbcs_soft *soft;
         int minor;
 
+        lock_kernel();
         minor = iminor(ip);
 
+        /* Nothing protects access to this list... */
         list_for_each_entry(soft, &soft_list, list) {
                 if (soft->nasid == minor) {
                         fp->private_data = soft->cxdev;
+                        unlock_kernel();
                         return 0;
                 }
         }
 
+        unlock_kernel();
         return -ENODEV;
 }
 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 934ffafedaea..070e22e8ea9e 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -26,6 +26,7 @@
 #include <linux/bootmem.h>
 #include <linux/splice.h>
 #include <linux/pfn.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -889,6 +890,9 @@ static const struct file_operations kmsg_fops = {
 
 static int memory_open(struct inode * inode, struct file * filp)
 {
+        int ret = 0;
+
+        lock_kernel();
         switch (iminor(inode)) {
                 case 1:
                         filp->f_op = &mem_fops;
@@ -932,11 +936,13 @@ static int memory_open(struct inode * inode, struct file * filp)
                         break;
 #endif
                 default:
+                        unlock_kernel();
                         return -ENXIO;
         }
         if (filp->f_op && filp->f_op->open)
-                return filp->f_op->open(inode,filp);
-        return 0;
+                ret = filp->f_op->open(inode,filp);
+        unlock_kernel();
+        return ret;
 }
 
 static const struct file_operations memory_fops = {
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index eaace0db0ff4..6e1563c3d30a 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -49,6 +49,7 @@
 #include <linux/device.h>
 #include <linux/tty.h>
 #include <linux/kmod.h>
+#include <linux/smp_lock.h>
 
 /*
  * Head entry for the doubly linked miscdevice list
@@ -118,6 +119,7 @@ static int misc_open(struct inode * inode, struct file * file)
         int err = -ENODEV;
         const struct file_operations *old_fops, *new_fops = NULL;
         
+        lock_kernel();
         mutex_lock(&misc_mtx);
         
         list_for_each_entry(c, &misc_list, list) {
@@ -155,6 +157,7 @@ static int misc_open(struct inode * inode, struct file * file)
         fops_put(old_fops);
 fail:
         mutex_unlock(&misc_mtx);
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index 8d14823b0514..50243fcd87e8 100644
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -56,6 +56,7 @@
 #include <linux/serial.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 #include <linux/delay.h>
 #include <linux/serial_8250.h>
 #include "smapi.h"
@@ -100,6 +101,7 @@ static int mwave_open(struct inode *inode, struct file *file)
         PRINTK_2(TRACE_MWAVE,
                 "mwavedd::mwave_open, exit return retval %x\n", retval);
 
+        cycle_kernel_lock();
         return retval;
 }
 
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 98dec380af49..197cd7a0c332 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -107,6 +107,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -333,12 +334,14 @@ nvram_ioctl(struct inode *inode, struct file *file,
 static int
 nvram_open(struct inode *inode, struct file *file)
 {
+        lock_kernel();
         spin_lock(&nvram_state_lock);
 
         if ((nvram_open_cnt && (file->f_flags & O_EXCL)) ||
             (nvram_open_mode & NVRAM_EXCL) ||
             ((file->f_mode & 2) && (nvram_open_mode & NVRAM_WRITE))) {
                 spin_unlock(&nvram_state_lock);
+                unlock_kernel();
                 return -EBUSY;
         }
 
@@ -349,6 +352,7 @@ nvram_open(struct inode *inode, struct file *file)
         nvram_open_cnt++;
 
         spin_unlock(&nvram_state_lock);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index ecfaf180e5bd..b930de50407a 100644
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -20,6 +20,7 @@
 #include <linux/mutex.h>
 #include <linux/nsc_gpio.h>
 #include <linux/platform_device.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 #define DEVNAME "pc8736x_gpio"
@@ -217,6 +218,7 @@ static int pc8736x_gpio_open(struct inode *inode, struct file *file)
         unsigned m = iminor(inode);
         file->private_data = &pc8736x_gpio_ops;
 
+        cycle_kernel_lock();
         dev_dbg(&pdev->dev, "open %d\n", m);
 
         if (m >= PC8736X_GPIO_CT)
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 4a933d413423..59ca35156d81 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -32,8 +32,9 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/bitrev.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/smp_lock.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
@@ -1405,11 +1406,11 @@ static void stop_monitor(struct cm4000_dev *dev)
         DEBUGP(3, dev, "<- stop_monitor\n");
 }
 
-static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-                     unsigned long arg)
+static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
         struct cm4000_dev *dev = filp->private_data;
         unsigned int iobase = dev->p_dev->io.BasePort1;
+        struct inode *inode = filp->f_path.dentry->d_inode;
         struct pcmcia_device *link;
         int size;
         int rc;
@@ -1426,38 +1427,42 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
         DEBUGP(3, dev, "cmm_ioctl(device=%d.%d) %s\n", imajor(inode),
                iminor(inode), ioctl_names[_IOC_NR(cmd)]);
 
+        lock_kernel();
+        rc = -ENODEV;
         link = dev_table[iminor(inode)];
         if (!pcmcia_dev_present(link)) {
                 DEBUGP(4, dev, "DEV_OK false\n");
-                return -ENODEV;
+                goto out;
         }
 
         if (test_bit(IS_CMM_ABSENT, &dev->flags)) {
                 DEBUGP(4, dev, "CMM_ABSENT flag set\n");
-                return -ENODEV;
+                goto out;
         }
+        rc = EINVAL;
 
         if (_IOC_TYPE(cmd) != CM_IOC_MAGIC) {
                 DEBUGP(4, dev, "ioctype mismatch\n");
-                return -EINVAL;
+                goto out;
         }
         if (_IOC_NR(cmd) > CM_IOC_MAXNR) {
                 DEBUGP(4, dev, "iocnr mismatch\n");
-                return -EINVAL;
+                goto out;
         }
         size = _IOC_SIZE(cmd);
-        rc = 0;
+        rc = -EFAULT;
         DEBUGP(4, dev, "iocdir=%.4x iocr=%.4x iocw=%.4x iocsize=%d cmd=%.4x\n",
               _IOC_DIR(cmd), _IOC_READ, _IOC_WRITE, size, cmd);
 
         if (_IOC_DIR(cmd) & _IOC_READ) {
                 if (!access_ok(VERIFY_WRITE, argp, size))
-                        return -EFAULT;
+                        goto out;
         }
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 if (!access_ok(VERIFY_READ, argp, size))
-                        return -EFAULT;
+                        goto out;
         }
+        rc = 0;
 
         switch (cmd) {
         case CM_IOCGSTATUS:
@@ -1477,9 +1482,9 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                         if (test_bit(IS_BAD_CARD, &dev->flags))
                                 status |= CM_BAD_CARD;
                         if (copy_to_user(argp, &status, sizeof(int)))
-                                return -EFAULT;
+                                rc = -EFAULT;
                 }
-                return 0;
+                break;
         case CM_IOCGATR:
                 DEBUGP(4, dev, "... in CM_IOCGATR\n");
                 {
@@ -1492,25 +1497,29 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                               || (test_bit(IS_ATR_PRESENT, (void *)&dev->flags)
                                   != 0)))) {
                                 if (filp->f_flags & O_NONBLOCK)
-                                        return -EAGAIN;
-                                return -ERESTARTSYS;
+                                        rc = -EAGAIN;
+                                else
+                                        rc = -ERESTARTSYS;
+                                break;
                         }
 
+                        rc = -EFAULT;
                         if (test_bit(IS_ATR_VALID, &dev->flags) == 0) {
                                 tmp = -1;
                                 if (copy_to_user(&(atreq->atr_len), &tmp,
                                                  sizeof(int)))
-                                        return -EFAULT;
+                                        break;
                         } else {
                                 if (copy_to_user(atreq->atr, dev->atr,
                                                  dev->atr_len))
-                                        return -EFAULT;
+                                        break;
 
                                 tmp = dev->atr_len;
                                 if (copy_to_user(&(atreq->atr_len), &tmp, sizeof(int)))
-                                        return -EFAULT;
+                                        break;
                         }
-                        return 0;
+                        rc = 0;
+                        break;
                 }
         case CM_IOCARDOFF:
 
@@ -1538,8 +1547,10 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                               || (test_and_set_bit(LOCK_IO, (void *)&dev->flags)
                                   == 0)))) {
                                 if (filp->f_flags & O_NONBLOCK)
-                                        return -EAGAIN;
-                                return -ERESTARTSYS;
+                                        rc = -EAGAIN;
+                                else
+                                        rc = -ERESTARTSYS;
+                                break;
                         }
                         /* Set Flags0 = 0x42 */
                         DEBUGP(4, dev, "Set Flags0=0x42 \n");
@@ -1554,8 +1565,10 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                               || (test_bit(IS_ATR_VALID, (void *)&dev->flags) !=
                                   0)))) {
                                 if (filp->f_flags & O_NONBLOCK)
-                                        return -EAGAIN;
-                                return -ERESTARTSYS;
+                                        rc = -EAGAIN;
+                                else
+                                        rc = -ERESTARTSYS;
+                                break;
                         }
                 }
                 /* release lock */
@@ -1568,8 +1581,10 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                         struct ptsreq krnptsreq;
 
                         if (copy_from_user(&krnptsreq, argp,
-                                           sizeof(struct ptsreq)))
-                                return -EFAULT;
+                                           sizeof(struct ptsreq))) {
+                                rc = -EFAULT;
+                                break;
+                        }
 
                         rc = 0;
                         DEBUGP(4, dev, "... in CM_IOCSPTS\n");
@@ -1580,8 +1595,10 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                               || (test_bit(IS_ATR_PRESENT, (void *)&dev->flags)
                                   != 0)))) {
                                 if (filp->f_flags & O_NONBLOCK)
-                                        return -EAGAIN;
-                                return -ERESTARTSYS;
+                                        rc = -EAGAIN;
+                                else
+                                        rc = -ERESTARTSYS;
+                                break;
                         }
                         /* get IO lock */
                         if (wait_event_interruptible
@@ -1590,8 +1607,10 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                               || (test_and_set_bit(LOCK_IO, (void *)&dev->flags)
                                   == 0)))) {
                                 if (filp->f_flags & O_NONBLOCK)
-                                        return -EAGAIN;
-                                return -ERESTARTSYS;
+                                        rc = -EAGAIN;
+                                else
+                                        rc = -ERESTARTSYS;
+                                break;
                         }
 
                         if ((rc = set_protocol(dev, &krnptsreq)) != 0) {
@@ -1604,7 +1623,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                         wake_up_interruptible(&dev->ioq);
 
                 }
-                return rc;
+                break;
 #ifdef PCMCIA_DEBUG
         case CM_IOSDBGLVL:      /* set debug log level */
                 {
@@ -1612,18 +1631,20 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 
                         old_pc_debug = pc_debug;
                         if (copy_from_user(&pc_debug, argp, sizeof(int)))
-                                return -EFAULT;
-
-                        if (old_pc_debug != pc_debug)
+                                rc = -EFAULT;
+                        else if (old_pc_debug != pc_debug)
                                 DEBUGP(0, dev, "Changed debug log level "
                                        "to %i\n", pc_debug);
                 }
-                return rc;
+                break;
 #endif
         default:
                 DEBUGP(4, dev, "... in default (unknown IOCTL code)\n");
-                return -EINVAL;
+                rc = -ENOTTY;
         }
+out:
+        unlock_kernel();
+        return rc;
 }
 
 static int cmm_open(struct inode *inode, struct file *filp)
@@ -1631,16 +1652,22 @@ static int cmm_open(struct inode *inode, struct file *filp)
         struct cm4000_dev *dev;
         struct pcmcia_device *link;
         int minor = iminor(inode);
+        int ret;
 
         if (minor >= CM4000_MAX_DEV)
                 return -ENODEV;
 
+        lock_kernel();
         link = dev_table[minor];
-        if (link == NULL || !pcmcia_dev_present(link))
-                return -ENODEV;
+        if (link == NULL || !pcmcia_dev_present(link)) {
+                ret = -ENODEV;
+                goto out;
+        }
 
-        if (link->open)
-                return -EBUSY;
+        if (link->open) {
+                ret = -EBUSY;
+                goto out;
+        }
 
         dev = link->priv;
         filp->private_data = dev;
@@ -1660,8 +1687,10 @@ static int cmm_open(struct inode *inode, struct file *filp)
          * vaild = block until valid (or card
          * inserted)
          */
-        if (filp->f_flags & O_NONBLOCK)
-                return -EAGAIN;
+        if (filp->f_flags & O_NONBLOCK) {
+                ret = -EAGAIN;
+                goto out;
+        }
 
         dev->mdelay = T_50MSEC;
 
@@ -1671,7 +1700,10 @@ static int cmm_open(struct inode *inode, struct file *filp)
         link->open = 1;         /* only one open per device */
 
         DEBUGP(2, dev, "<- cmm_open\n");
-        return nonseekable_open(inode, filp);
+        ret = nonseekable_open(inode, filp);
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int cmm_close(struct inode *inode, struct file *filp)
@@ -1897,7 +1929,7 @@ static const struct file_operations cm4000_fops = {
         .owner  = THIS_MODULE,
         .read   = cmm_read,
         .write  = cmm_write,
-        .ioctl  = cmm_ioctl,
+        .unlocked_ioctl = cmm_ioctl,
         .open   = cmm_open,
         .release= cmm_close,
 };
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 035084c07329..6181f8a9b0bd 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -26,6 +26,7 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/poll.h>
+#include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -448,23 +449,30 @@ static int cm4040_open(struct inode *inode, struct file *filp)
         struct reader_dev *dev;
         struct pcmcia_device *link;
         int minor = iminor(inode);
+        int ret;
 
         if (minor >= CM_MAX_DEV)
                 return -ENODEV;
 
+        lock_kernel();
         link = dev_table[minor];
-        if (link == NULL || !pcmcia_dev_present(link))
-                return -ENODEV;
+        if (link == NULL || !pcmcia_dev_present(link)) {
+                ret = -ENODEV;
+                goto out;
+        }
 
-        if (link->open)
-                return -EBUSY;
+        if (link->open) {
+                ret = -EBUSY;
+                goto out;
+        }
 
         dev = link->priv;
         filp->private_data = dev;
 
         if (filp->f_flags & O_NONBLOCK) {
                 DEBUGP(4, dev, "filep->f_flags O_NONBLOCK set\n");
-                return -EAGAIN;
+                ret = -EAGAIN;
+                goto out;
         }
 
         link->open = 1;
@@ -473,7 +481,10 @@ static int cm4040_open(struct inode *inode, struct file *filp)
         mod_timer(&dev->poll_timer, jiffies + POLL_PERIOD);
 
         DEBUGP(2, dev, "<- cm4040_open (successfully)\n");
-        return nonseekable_open(inode, filp);
+        ret = nonseekable_open(inode, filp);
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int cm4040_close(struct inode *inode, struct file *filp)
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 00c7f8407e3e..cc7dcea2d283 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -28,7 +28,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-#include <pcmcia/version.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/device_id.h>
 #include <pcmcia/ss.h>
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 3aab837d9480..f6e6acadd9a0 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -66,6 +66,7 @@
 #include <linux/poll.h>
 #include <linux/major.h>
 #include <linux/ppdev.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 #define PP_VERSION "ppdev: user-space parallel port driver"
@@ -638,6 +639,7 @@ static int pp_open (struct inode * inode, struct file * file)
         unsigned int minor = iminor(inode);
         struct pp_struct *pp;
 
+        cycle_kernel_lock();
         if (minor >= PARPORT_MAX)
                 return -ENXIO;
 
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index bbfa0e241cba..505fcbe884a4 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -19,6 +19,7 @@
 #include <linux/cdev.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -53,6 +54,7 @@ static int raw_open(struct inode *inode, struct file *filp)
                 return 0;
         }
 
+        lock_kernel();
         mutex_lock(&raw_mutex);
 
         /*
@@ -79,6 +81,7 @@ static int raw_open(struct inode *inode, struct file *filp)
                         bdev->bd_inode->i_mapping;
         filp->private_data = bdev;
         mutex_unlock(&raw_mutex);
+        unlock_kernel();
         return 0;
 
 out2:
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 909cac93fa2a..fa92a8af5a5a 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -73,6 +73,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 #include <linux/sysctl.h>
 #include <linux/wait.h>
 #include <linux/bcd.h>
@@ -734,6 +735,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
  * needed here. Or anywhere else in this driver. */
 static int rtc_open(struct inode *inode, struct file *file)
 {
+        lock_kernel();
         spin_lock_irq(&rtc_lock);
 
         if (rtc_status & RTC_IS_OPEN)
@@ -743,10 +745,12 @@ static int rtc_open(struct inode *inode, struct file *file)
 
         rtc_irq_data = 0;
         spin_unlock_irq(&rtc_lock);
+        unlock_kernel();
         return 0;
 
 out_busy:
         spin_unlock_irq(&rtc_lock);
+        unlock_kernel();
         return -EBUSY;
 }
 
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index 99e5272e3c53..1d9100561c8a 100644
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -51,6 +52,7 @@ static int scx200_gpio_open(struct inode *inode, struct file *file)
         unsigned m = iminor(inode);
         file->private_data = &scx200_gpio_ops;
 
+        cycle_kernel_lock();
         if (m >= MAX_PINS)
                 return -EINVAL;
         return nonseekable_open(inode, file);
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 8fe099a41065..0b799ac1b049 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -21,6 +21,7 @@
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <asm/sn/io.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/module.h>
@@ -104,6 +105,7 @@ scdrv_open(struct inode *inode, struct file *file)
         file->private_data = sd;
 
         /* hook this subchannel up to the system controller interrupt */
+        lock_kernel();
         rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
                          IRQF_SHARED | IRQF_DISABLED,
                          SYSCTL_BASENAME, sd);
@@ -111,9 +113,10 @@ scdrv_open(struct inode *inode, struct file *file)
                 ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
                 kfree(sd);
                 printk("%s: irq request failed (%d)\n", __func__, rv);
+                unlock_kernel();
                 return -EBUSY;
         }
-
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 58533de59027..85e0eb76eeab 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -49,6 +49,7 @@
 #include <linux/err.h>
 #include <linux/kfifo.h>
 #include <linux/platform_device.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -906,12 +907,14 @@ static int sonypi_misc_release(struct inode *inode, struct file *file)
 
 static int sonypi_misc_open(struct inode *inode, struct file *file)
 {
+        lock_kernel();
         mutex_lock(&sonypi_device.lock);
         /* Flush input queue on first open */
         if (!sonypi_device.open_count)
                 kfifo_reset(sonypi_device.fifo);
         sonypi_device.open_count++;
         mutex_unlock(&sonypi_device.lock);
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c
index 4c431cb7cf1b..6062b62800fd 100644
--- a/drivers/char/tb0219.c
+++ b/drivers/char/tb0219.c
@@ -21,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/smp_lock.h>
 
 #include <asm/io.h>
 #include <asm/reboot.h>
@@ -236,6 +237,7 @@ static int tanbac_tb0219_open(struct inode *inode, struct file *file)
 {
         unsigned int minor;
 
+        cycle_kernel_lock();
         minor = iminor(inode);
         switch (minor) {
         case 0:
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 35e58030d296..8f2284be68e1 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -36,6 +36,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/sysfs.h>
 #include <linux/device.h>
@@ -204,11 +205,14 @@ static int tlclk_open(struct inode *inode, struct file *filp)
 {
         int result;
 
-        if (test_and_set_bit(0, &useflags))
-                return -EBUSY;
+        lock_kernel();
+        if (test_and_set_bit(0, &useflags)) {
+                result = -EBUSY;
                 /* this legacy device is always one per system and it doesn't
                  * know how to handle multiple concurrent clients.
                  */
+                goto out;
+        }
 
         /* Make sure there is no interrupt pending while
          * initialising interrupt handler */
@@ -218,13 +222,14 @@ static int tlclk_open(struct inode *inode, struct file *filp)
          * we can't share this IRQ */
         result = request_irq(telclk_interrupt, &tlclk_interrupt,
                              IRQF_DISABLED, "telco_clock", tlclk_interrupt);
-        if (result == -EBUSY) {
+        if (result == -EBUSY)
                 printk(KERN_ERR "tlclk: Interrupt can't be reserved.\n");
-                return -EBUSY;
-        }
-        inb(TLCLK_REG6);        /* Clear interrupt events */
+        else
+                inb(TLCLK_REG6);        /* Clear interrupt events */
 
-        return 0;
+out:
+        unlock_kernel();
+        return result;
 }
 
 static int tlclk_release(struct inode *inode, struct file *filp)
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index a5d8bcb40000..e1fc193d9396 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -26,6 +26,7 @@
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 
 #include "tpm.h"
 
@@ -897,6 +898,7 @@ int tpm_open(struct inode *inode, struct file *file)
         int rc = 0, minor = iminor(inode);
         struct tpm_chip *chip = NULL, *pos;
 
+        lock_kernel();
         spin_lock(&driver_lock);
 
         list_for_each_entry(pos, &tpm_chip_list, list) {
@@ -926,16 +928,19 @@ int tpm_open(struct inode *inode, struct file *file)
         if (chip->data_buffer == NULL) {
                 chip->num_opens--;
                 put_device(chip->dev);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
         atomic_set(&chip->data_pending, 0);
 
         file->private_data = chip;
+        unlock_kernel();
         return 0;
 
 err_out:
         spin_unlock(&driver_lock);
+        unlock_kernel();
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_open);
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 750131010af0..047a17339f83 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2665,7 +2665,7 @@ static void release_dev(struct file *filp)
  *               ->siglock protects ->signal/->sighand
  */
 
-static int tty_open(struct inode *inode, struct file *filp)
+static int __tty_open(struct inode *inode, struct file *filp)
 {
         struct tty_struct *tty;
         int noctty, retval;
@@ -2779,6 +2779,19 @@ got_driver:
         return 0;
 }
 
+/* BKL pushdown: scary code avoidance wrapper */
+static int tty_open(struct inode *inode, struct file *filp)
+{
+        int ret;
+
+        lock_kernel();
+        ret = __tty_open(inode, filp);
+        unlock_kernel();
+        return ret;
+}
+
+
+
 #ifdef CONFIG_UNIX98_PTYS
 /**
  *      ptmx_open               -       open a unix 98 pty master
@@ -2792,7 +2805,7 @@ got_driver:
  *              allocated_ptys_lock handles the list of free pty numbers
  */
 
-static int ptmx_open(struct inode *inode, struct file *filp)
+static int __ptmx_open(struct inode *inode, struct file *filp)
 {
         struct tty_struct *tty;
         int retval;
@@ -2831,6 +2844,16 @@ out:
         devpts_kill_index(index);
         return retval;
 }
+
+static int ptmx_open(struct inode *inode, struct file *filp)
+{
+        int ret;
+
+        lock_kernel();
+        ret = __ptmx_open(inode, filp);
+        unlock_kernel();
+        return ret;
+}
 #endif
 
 /**
@@ -2886,15 +2909,16 @@ static int tty_fasync(int fd, struct file *filp, int on)
 {
         struct tty_struct *tty;
         unsigned long flags;
-        int retval;
+        int retval = 0;
 
+        lock_kernel();
         tty = (struct tty_struct *)filp->private_data;
         if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))
-                return 0;
+                goto out;
 
         retval = fasync_helper(fd, filp, on, &tty->fasync);
         if (retval <= 0)
-                return retval;
+                goto out;
 
         if (on) {
                 enum pid_type type;
@@ -2912,12 +2936,15 @@ static int tty_fasync(int fd, struct file *filp, int on)
                 spin_unlock_irqrestore(&tty->ctrl_lock, flags);
                 retval = __f_setown(filp, pid, type, 0);
                 if (retval)
-                        return retval;
+                        goto out;
         } else {
                 if (!tty->fasync && !waitqueue_active(&tty->read_wait))
                         tty->minimum_to_wake = N_TTY_BUF_SIZE;
         }
-        return 0;
+        retval = 0;
+out:
+        unlock_kernel();
+        return retval;
 }
 
 /**
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 83aeedda200c..eebfad2777d2 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -34,6 +34,7 @@
 #include <linux/kbd_kern.h>
 #include <linux/console.h>
 #include <linux/device.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
@@ -460,9 +461,13 @@ static int
 vcs_open(struct inode *inode, struct file *filp)
 {
         unsigned int currcons = iminor(inode) & 127;
+        int ret = 0;
+        
+        lock_kernel();
         if(currcons && !vc_cons_allocated(currcons-1))
-                return -ENXIO;
-        return 0;
+                ret = -ENXIO;
+        unlock_kernel();
+        return ret;
 }
 
 static const struct file_operations vcs_fops = {
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index d4db42ca71e6..e5da98d8f9cd 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -699,6 +699,7 @@ static int viotap_open(struct inode *inode, struct file *file)
         if (op == NULL)
                 return -ENOMEM;
 
+        lock_kernel();
         get_dev_info(file->f_path.dentry->d_inode, &devi);
 
         /* Note: We currently only support one mode! */
@@ -729,6 +730,7 @@ static int viotap_open(struct inode *inode, struct file *file)
 
 free_op:
         free_op_struct(op);
+        unlock_kernel();
         return ret;
 }
 
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index e5ed09192be8..ffe9b4e3072e 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
@@ -547,6 +548,7 @@ static int gpio_open(struct inode *inode, struct file *file)
 {
         unsigned int pin;
 
+        cycle_kernel_lock();
         pin = iminor(inode);
         if (pin >= giu_nr_pins)
                 return -EBADF;
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 3edf1fc12963..1e1b81e57cdc 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -85,6 +85,7 @@
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <linux/sysctl.h>
 #include <linux/version.h>
 #include <linux/fs.h>
@@ -504,11 +505,12 @@ static int hwicap_open(struct inode *inode, struct file *file)
         struct hwicap_drvdata *drvdata;
         int status;
 
+        lock_kernel();
         drvdata = container_of(inode->i_cdev, struct hwicap_drvdata, cdev);
 
         status = mutex_lock_interruptible(&drvdata->sem);
         if (status)
-                return status;
+                goto out;
 
         if (drvdata->is_open) {
                 status = -EBUSY;
@@ -528,6 +530,8 @@ static int hwicap_open(struct inode *inode, struct file *file)
 
  error:
         mutex_unlock(&drvdata->sem);
+ out:
+        unlock_kernel();
         return status;
 }
 
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 43b71b69daa5..e522144cba3a 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -174,4 +174,30 @@ config CRYPTO_DEV_HIFN_795X_RNG
           Select this option if you want to enable the random number generator
           on the HIFN 795x crypto adapters.
 
+config CRYPTO_DEV_TALITOS
+        tristate "Talitos Freescale Security Engine (SEC)"
+        select CRYPTO_ALGAPI
+        select CRYPTO_AUTHENC
+        select HW_RANDOM
+        depends on FSL_SOC
+        help
+          Say 'Y' here to use the Freescale Security Engine (SEC)
+          to offload cryptographic algorithm computation.
+
+          The Freescale SEC is present on PowerQUICC 'E' processors, such
+          as the MPC8349E and MPC8548E.
+
+          To compile this driver as a module, choose M here: the module
+          will be called talitos.
+
+config CRYPTO_DEV_IXP4XX
+        tristate "Driver for IXP4xx crypto hardware acceleration"
+        depends on ARCH_IXP4XX
+        select CRYPTO_DES
+        select CRYPTO_ALGAPI
+        select CRYPTO_AUTHENC
+        select CRYPTO_BLKCIPHER
+        help
+          Driver for the IXP4xx NPE crypto engine.
+
 endif # CRYPTO_HW
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index c0327f0dadc5..73557b2968d3 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -2,3 +2,5 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
 obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
+obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
+obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 81f3f950cd7d..4d22b21bd3e3 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -29,7 +29,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/highmem.h>
-#include <linux/interrupt.h>
 #include <linux/crypto.h>
 #include <linux/hw_random.h>
 #include <linux/ktime.h>
@@ -369,7 +368,9 @@ static atomic_t hifn_dev_number;
 #define HIFN_D_DST_RSIZE                80*4
 #define HIFN_D_RES_RSIZE                24*4
 
-#define HIFN_QUEUE_LENGTH               HIFN_D_CMD_RSIZE-5
+#define HIFN_D_DST_DALIGN               4
+
+#define HIFN_QUEUE_LENGTH               HIFN_D_CMD_RSIZE-1
 
 #define AES_MIN_KEY_SIZE                16
 #define AES_MAX_KEY_SIZE                32
@@ -535,10 +536,10 @@ struct hifn_crypt_command
  */
 struct hifn_mac_command
 {
-        volatile u16            masks;
-        volatile u16            header_skip;
-        volatile u16            source_count;
-        volatile u16            reserved;
+        volatile __le16         masks;
+        volatile __le16         header_skip;
+        volatile __le16         source_count;
+        volatile __le16         reserved;
 };
 
 #define HIFN_MAC_CMD_ALG_MASK           0x0001
@@ -564,10 +565,10 @@ struct hifn_mac_command
 
 struct hifn_comp_command
 {
-        volatile u16            masks;
-        volatile u16            header_skip;
-        volatile u16            source_count;
-        volatile u16            reserved;
+        volatile __le16         masks;
+        volatile __le16         header_skip;
+        volatile __le16         source_count;
+        volatile __le16         reserved;
 };
 
 #define HIFN_COMP_CMD_SRCLEN_M          0xc000
@@ -583,10 +584,10 @@ struct hifn_comp_command
 
 struct hifn_base_result
 {
-        volatile u16            flags;
-        volatile u16            session;
-        volatile u16            src_cnt;                /* 15:0 of source count */
-        volatile u16            dst_cnt;                /* 15:0 of dest count */
+        volatile __le16         flags;
+        volatile __le16         session;
+        volatile __le16         src_cnt;                /* 15:0 of source count */
+        volatile __le16         dst_cnt;                /* 15:0 of dest count */
 };
 
 #define HIFN_BASE_RES_DSTOVERRUN        0x0200  /* destination overrun */
@@ -597,8 +598,8 @@ struct hifn_base_result
 
 struct hifn_comp_result
 {
-        volatile u16            flags;
-        volatile u16            crc;
+        volatile __le16         flags;
+        volatile __le16         crc;
 };
 
 #define HIFN_COMP_RES_LCB_M             0xff00  /* longitudinal check byte */
@@ -609,8 +610,8 @@ struct hifn_comp_result
 
 struct hifn_mac_result
 {
-        volatile u16            flags;
-        volatile u16            reserved;
+        volatile __le16         flags;
+        volatile __le16         reserved;
         /* followed by 0, 6, 8, or 10 u16's of the MAC, then crypt */
 };
 
@@ -619,8 +620,8 @@ struct hifn_mac_result
 
 struct hifn_crypt_result
 {
-        volatile u16            flags;
-        volatile u16            reserved;
+        volatile __le16         flags;
+        volatile __le16         reserved;
 };
 
 #define HIFN_CRYPT_RES_SRC_NOTZERO      0x0001  /* source expired */
@@ -686,12 +687,12 @@ static inline u32 hifn_read_1(struct hifn_device *dev, u32 reg)
 
 static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
 {
-        writel(val, dev->bar[0] + reg);
+        writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
 }
 
 static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
 {
-        writel(val, dev->bar[1] + reg);
+        writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
 }
 
 static void hifn_wait_puc(struct hifn_device *dev)
@@ -894,7 +895,7 @@ static int hifn_enable_crypto(struct hifn_device *dev)
         char *offtbl = NULL;
         int i;
 
-        for (i = 0; i < sizeof(pci2id)/sizeof(pci2id[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(pci2id); i++) {
                 if (pci2id[i].pci_vendor == dev->pdev->vendor &&
                                 pci2id[i].pci_prod == dev->pdev->device) {
                         offtbl = pci2id[i].card_id;
@@ -1037,14 +1038,14 @@ static void hifn_init_registers(struct hifn_device *dev)
         hifn_write_0(dev, HIFN_0_PUIER, HIFN_PUIER_DSTOVER);
 
         /* write all 4 ring address registers */
-        hifn_write_1(dev, HIFN_1_DMA_CRAR, __cpu_to_le32(dptr +
-                                offsetof(struct hifn_dma, cmdr[0])));
-        hifn_write_1(dev, HIFN_1_DMA_SRAR, __cpu_to_le32(dptr +
-                                offsetof(struct hifn_dma, srcr[0])));
-        hifn_write_1(dev, HIFN_1_DMA_DRAR, __cpu_to_le32(dptr +
-                                offsetof(struct hifn_dma, dstr[0])));
-        hifn_write_1(dev, HIFN_1_DMA_RRAR, __cpu_to_le32(dptr +
-                                offsetof(struct hifn_dma, resr[0])));
+        hifn_write_1(dev, HIFN_1_DMA_CRAR, dptr +
+                                offsetof(struct hifn_dma, cmdr[0]));
+        hifn_write_1(dev, HIFN_1_DMA_SRAR, dptr +
+                                offsetof(struct hifn_dma, srcr[0]));
+        hifn_write_1(dev, HIFN_1_DMA_DRAR, dptr +
+                                offsetof(struct hifn_dma, dstr[0]));
+        hifn_write_1(dev, HIFN_1_DMA_RRAR, dptr +
+                                offsetof(struct hifn_dma, resr[0]));
 
         mdelay(2);
 #if 0
@@ -1166,109 +1167,15 @@ static int hifn_setup_crypto_command(struct hifn_device *dev,
         return cmd_len;
 }
 
-static int hifn_setup_src_desc(struct hifn_device *dev, struct page *page,
-                unsigned int offset, unsigned int size)
-{
-        struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
-        int idx;
-        dma_addr_t addr;
-
-        addr = pci_map_page(dev->pdev, page, offset, size, PCI_DMA_TODEVICE);
-
-        idx = dma->srci;
-
-        dma->srcr[idx].p = __cpu_to_le32(addr);
-        dma->srcr[idx].l = __cpu_to_le32(size) | HIFN_D_VALID |
-                        HIFN_D_MASKDONEIRQ | HIFN_D_NOINVALID | HIFN_D_LAST;
-
-        if (++idx == HIFN_D_SRC_RSIZE) {
-                dma->srcr[idx].l = __cpu_to_le32(HIFN_D_VALID |
-                                HIFN_D_JUMP |
-                                HIFN_D_MASKDONEIRQ | HIFN_D_LAST);
-                idx = 0;
-        }
-
-        dma->srci = idx;
-        dma->srcu++;
-
-        if (!(dev->flags & HIFN_FLAG_SRC_BUSY)) {
-                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_S_CTRL_ENA);
-                dev->flags |= HIFN_FLAG_SRC_BUSY;
-        }
-
-        return size;
-}
-
-static void hifn_setup_res_desc(struct hifn_device *dev)
-{
-        struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
-
-        dma->resr[dma->resi].l = __cpu_to_le32(HIFN_USED_RESULT |
-                        HIFN_D_VALID | HIFN_D_LAST);
-        /*
-         * dma->resr[dma->resi].l = __cpu_to_le32(HIFN_MAX_RESULT | HIFN_D_VALID |
-         *                                      HIFN_D_LAST | HIFN_D_NOINVALID);
-         */
-
-        if (++dma->resi == HIFN_D_RES_RSIZE) {
-                dma->resr[HIFN_D_RES_RSIZE].l = __cpu_to_le32(HIFN_D_VALID |
-                                HIFN_D_JUMP | HIFN_D_MASKDONEIRQ | HIFN_D_LAST);
-                dma->resi = 0;
-        }
-
-        dma->resu++;
-
-        if (!(dev->flags & HIFN_FLAG_RES_BUSY)) {
-                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_R_CTRL_ENA);
-                dev->flags |= HIFN_FLAG_RES_BUSY;
-        }
-}
-
-static void hifn_setup_dst_desc(struct hifn_device *dev, struct page *page,
-                unsigned offset, unsigned size)
-{
-        struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
-        int idx;
-        dma_addr_t addr;
-
-        addr = pci_map_page(dev->pdev, page, offset, size, PCI_DMA_FROMDEVICE);
-
-        idx = dma->dsti;
-        dma->dstr[idx].p = __cpu_to_le32(addr);
-        dma->dstr[idx].l = __cpu_to_le32(size | HIFN_D_VALID |
-                        HIFN_D_MASKDONEIRQ | HIFN_D_NOINVALID | HIFN_D_LAST);
-
-        if (++idx == HIFN_D_DST_RSIZE) {
-                dma->dstr[idx].l = __cpu_to_le32(HIFN_D_VALID |
-                                HIFN_D_JUMP | HIFN_D_MASKDONEIRQ |
-                                HIFN_D_LAST | HIFN_D_NOINVALID);
-                idx = 0;
-        }
-        dma->dsti = idx;
-        dma->dstu++;
-
-        if (!(dev->flags & HIFN_FLAG_DST_BUSY)) {
-                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_D_CTRL_ENA);
-                dev->flags |= HIFN_FLAG_DST_BUSY;
-        }
-}
-
-static int hifn_setup_dma(struct hifn_device *dev, struct page *spage, unsigned int soff,
-                struct page *dpage, unsigned int doff, unsigned int nbytes, void *priv,
-                struct hifn_context *ctx)
+static int hifn_setup_cmd_desc(struct hifn_device *dev,
+                struct hifn_context *ctx, void *priv, unsigned int nbytes)
 {
         struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
         int cmd_len, sa_idx;
         u8 *buf, *buf_pos;
         u16 mask;
 
-        dprintk("%s: spage: %p, soffset: %u, dpage: %p, doffset: %u, nbytes: %u, priv: %p, ctx: %p.\n",
-                        dev->name, spage, soff, dpage, doff, nbytes, priv, ctx);
-
-        sa_idx = dma->resi;
-
-        hifn_setup_src_desc(dev, spage, soff, nbytes);
-
+        sa_idx = dma->cmdi;
         buf_pos = buf = dma->command_bufs[dma->cmdi];
 
         mask = 0;
@@ -1370,16 +1277,113 @@ static int hifn_setup_dma(struct hifn_device *dev, struct page *spage, unsigned
                 hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_C_CTRL_ENA);
                 dev->flags |= HIFN_FLAG_CMD_BUSY;
         }
-
-        hifn_setup_dst_desc(dev, dpage, doff, nbytes);
-        hifn_setup_res_desc(dev);
-
         return 0;
 
 err_out:
         return -EINVAL;
 }
 
+static int hifn_setup_src_desc(struct hifn_device *dev, struct page *page,
+                unsigned int offset, unsigned int size)
+{
+        struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
+        int idx;
+        dma_addr_t addr;
+
+        addr = pci_map_page(dev->pdev, page, offset, size, PCI_DMA_TODEVICE);
+
+        idx = dma->srci;
+
+        dma->srcr[idx].p = __cpu_to_le32(addr);
+        dma->srcr[idx].l = __cpu_to_le32(size | HIFN_D_VALID |
+                        HIFN_D_MASKDONEIRQ | HIFN_D_LAST);
+
+        if (++idx == HIFN_D_SRC_RSIZE) {
+                dma->srcr[idx].l = __cpu_to_le32(HIFN_D_VALID |
+                                HIFN_D_JUMP |
+                                HIFN_D_MASKDONEIRQ | HIFN_D_LAST);
+                idx = 0;
+        }
+
+        dma->srci = idx;
+        dma->srcu++;
+
+        if (!(dev->flags & HIFN_FLAG_SRC_BUSY)) {
+                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_S_CTRL_ENA);
+                dev->flags |= HIFN_FLAG_SRC_BUSY;
+        }
+
+        return size;
+}
+
+static void hifn_setup_res_desc(struct hifn_device *dev)
+{
+        struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
+
+        dma->resr[dma->resi].l = __cpu_to_le32(HIFN_USED_RESULT |
+                        HIFN_D_VALID | HIFN_D_LAST);
+        /*
+         * dma->resr[dma->resi].l = __cpu_to_le32(HIFN_MAX_RESULT | HIFN_D_VALID |
+         *                                      HIFN_D_LAST);
+         */
+
+        if (++dma->resi == HIFN_D_RES_RSIZE) {
+                dma->resr[HIFN_D_RES_RSIZE].l = __cpu_to_le32(HIFN_D_VALID |
+                                HIFN_D_JUMP | HIFN_D_MASKDONEIRQ | HIFN_D_LAST);
+                dma->resi = 0;
+        }
+
+        dma->resu++;
+
+        if (!(dev->flags & HIFN_FLAG_RES_BUSY)) {
+                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_R_CTRL_ENA);
+                dev->flags |= HIFN_FLAG_RES_BUSY;
+        }
+}
+
+static void hifn_setup_dst_desc(struct hifn_device *dev, struct page *page,
+                unsigned offset, unsigned size)
+{
+        struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
+        int idx;
+        dma_addr_t addr;
+
+        addr = pci_map_page(dev->pdev, page, offset, size, PCI_DMA_FROMDEVICE);
+
+        idx = dma->dsti;
+        dma->dstr[idx].p = __cpu_to_le32(addr);
+        dma->dstr[idx].l = __cpu_to_le32(size | HIFN_D_VALID |
+                        HIFN_D_MASKDONEIRQ | HIFN_D_LAST);
+
+        if (++idx == HIFN_D_DST_RSIZE) {
+                dma->dstr[idx].l = __cpu_to_le32(HIFN_D_VALID |
+                                HIFN_D_JUMP | HIFN_D_MASKDONEIRQ |
+                                HIFN_D_LAST);
+                idx = 0;
+        }
+        dma->dsti = idx;
+        dma->dstu++;
+
+        if (!(dev->flags & HIFN_FLAG_DST_BUSY)) {
+                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_D_CTRL_ENA);
+                dev->flags |= HIFN_FLAG_DST_BUSY;
+        }
+}
+
+static int hifn_setup_dma(struct hifn_device *dev, struct page *spage, unsigned int soff,
+                struct page *dpage, unsigned int doff, unsigned int nbytes, void *priv,
+                struct hifn_context *ctx)
+{
+        dprintk("%s: spage: %p, soffset: %u, dpage: %p, doffset: %u, nbytes: %u, priv: %p, ctx: %p.\n",
+                        dev->name, spage, soff, dpage, doff, nbytes, priv, ctx);
+
+        hifn_setup_src_desc(dev, spage, soff, nbytes);
+        hifn_setup_cmd_desc(dev, ctx, priv, nbytes);
+        hifn_setup_dst_desc(dev, dpage, doff, nbytes);
+        hifn_setup_res_desc(dev);
+        return 0;
+}
+
 static int ablkcipher_walk_init(struct ablkcipher_walk *w,
                 int num, gfp_t gfp_flags)
 {
@@ -1431,7 +1435,7 @@ static int ablkcipher_add(void *daddr, unsigned int *drestp, struct scatterlist
                 return -EINVAL;
 
         while (size) {
-                copy = min(drest, src->length);
+                copy = min(drest, min(size, src->length));
 
                 saddr = kmap_atomic(sg_page(src), KM_SOFTIRQ1);
                 memcpy(daddr, saddr + src->offset, copy);
@@ -1458,10 +1462,6 @@ static int ablkcipher_add(void *daddr, unsigned int *drestp, struct scatterlist
 static int ablkcipher_walk(struct ablkcipher_request *req,
                 struct ablkcipher_walk *w)
 {
-        unsigned blocksize =
-                crypto_ablkcipher_blocksize(crypto_ablkcipher_reqtfm(req));
-        unsigned alignmask =
-                crypto_ablkcipher_alignmask(crypto_ablkcipher_reqtfm(req));
         struct scatterlist *src, *dst, *t;
         void *daddr;
         unsigned int nbytes = req->nbytes, offset, copy, diff;
@@ -1477,16 +1477,14 @@ static int ablkcipher_walk(struct ablkcipher_request *req,
                 dst = &req->dst[idx];
 
                 dprintk("\n%s: slen: %u, dlen: %u, soff: %u, doff: %u, offset: %u, "
-                                "blocksize: %u, nbytes: %u.\n",
+                                "nbytes: %u.\n",
                                 __func__, src->length, dst->length, src->offset,
-                                dst->offset, offset, blocksize, nbytes);
-
-                if (src->length & (blocksize - 1) ||
-                                src->offset & (alignmask - 1) ||
-                                dst->length & (blocksize - 1) ||
-                                dst->offset & (alignmask - 1) ||
-                                offset) {
-                        unsigned slen = src->length - offset;
+                                dst->offset, offset, nbytes);
+
+                if (!IS_ALIGNED(dst->offset, HIFN_D_DST_DALIGN) ||
+                    !IS_ALIGNED(dst->length, HIFN_D_DST_DALIGN) ||
+                    offset) {
+                        unsigned slen = min(src->length - offset, nbytes);
                         unsigned dlen = PAGE_SIZE;
 
                         t = &w->cache[idx];
@@ -1498,8 +1496,8 @@ static int ablkcipher_walk(struct ablkcipher_request *req,
 
                         idx += err;
 
-                        copy = slen & ~(blocksize - 1);
-                        diff = slen & (blocksize - 1);
+                        copy = slen & ~(HIFN_D_DST_DALIGN - 1);
+                        diff = slen & (HIFN_D_DST_DALIGN - 1);
 
                         if (dlen < nbytes) {
                                 /*
@@ -1507,7 +1505,7 @@ static int ablkcipher_walk(struct ablkcipher_request *req,
                                  * to put there additional blocksized chunk,
                                  * so we mark that page as containing only
                                  * blocksize aligned chunks:
-                                 *      t->length = (slen & ~(blocksize - 1));
+                                 *      t->length = (slen & ~(HIFN_D_DST_DALIGN - 1));
                                  * and increase number of bytes to be processed
                                  * in next chunk:
                                  *      nbytes += diff;
@@ -1544,7 +1542,7 @@ static int ablkcipher_walk(struct ablkcipher_request *req,
 
                         kunmap_atomic(daddr, KM_SOFTIRQ0);
                 } else {
-                        nbytes -= src->length;
+                        nbytes -= min(src->length, nbytes);
                         idx++;
                 }
 
@@ -1563,14 +1561,10 @@ static int hifn_setup_session(struct ablkcipher_request *req)
         struct hifn_context *ctx = crypto_tfm_ctx(req->base.tfm);
         struct hifn_device *dev = ctx->dev;
         struct page *spage, *dpage;
-        unsigned long soff, doff, flags;
+        unsigned long soff, doff, dlen, flags;
         unsigned int nbytes = req->nbytes, idx = 0, len;
         int err = -EINVAL, sg_num;
         struct scatterlist *src, *dst, *t;
-        unsigned blocksize =
-                crypto_ablkcipher_blocksize(crypto_ablkcipher_reqtfm(req));
-        unsigned alignmask =
-                crypto_ablkcipher_alignmask(crypto_ablkcipher_reqtfm(req));
 
         if (ctx->iv && !ctx->ivsize && ctx->mode != ACRYPTO_MODE_ECB)
                 goto err_out_exit;
@@ -1578,17 +1572,14 @@ static int hifn_setup_session(struct ablkcipher_request *req)
         ctx->walk.flags = 0;
 
         while (nbytes) {
-                src = &req->src[idx];
                 dst = &req->dst[idx];
+                dlen = min(dst->length, nbytes);
 
-                if (src->length & (blocksize - 1) ||
-                                src->offset & (alignmask - 1) ||
-                                dst->length & (blocksize - 1) ||
-                                dst->offset & (alignmask - 1)) {
+                if (!IS_ALIGNED(dst->offset, HIFN_D_DST_DALIGN) ||
+                    !IS_ALIGNED(dlen, HIFN_D_DST_DALIGN))
                         ctx->walk.flags |= ASYNC_FLAGS_MISALIGNED;
-                }
 
-                nbytes -= src->length;
+                nbytes -= dlen;
                 idx++;
         }
 
@@ -1602,7 +1593,10 @@ static int hifn_setup_session(struct ablkcipher_request *req)
         idx = 0;
 
         sg_num = ablkcipher_walk(req, &ctx->walk);
-
+        if (sg_num < 0) {
+                err = sg_num;
+                goto err_out_exit;
+        }
         atomic_set(&ctx->sg_num, sg_num);
 
         spin_lock_irqsave(&dev->lock, flags);
@@ -1640,7 +1634,7 @@ static int hifn_setup_session(struct ablkcipher_request *req)
                 if (err)
                         goto err_out;
 
-                nbytes -= len;
+                nbytes -= min(len, nbytes);
         }
 
         dev->active = HIFN_DEFAULT_ACTIVE_NUM;
@@ -1651,7 +1645,7 @@ static int hifn_setup_session(struct ablkcipher_request *req)
 err_out:
         spin_unlock_irqrestore(&dev->lock, flags);
 err_out_exit:
-        if (err && printk_ratelimit())
+        if (err)
                 dprintk("%s: iv: %p [%d], key: %p [%d], mode: %u, op: %u, "
                                 "type: %u, err: %d.\n",
                         dev->name, ctx->iv, ctx->ivsize,
@@ -1745,8 +1739,7 @@ static int ablkcipher_get(void *saddr, unsigned int *srestp, unsigned int offset
                 return -EINVAL;
 
         while (size) {
-
-                copy = min(dst->length, srest);
+                copy = min(srest, min(dst->length, size));
 
                 daddr = kmap_atomic(sg_page(dst), KM_IRQ0);
                 memcpy(daddr + dst->offset + offset, saddr, copy);
@@ -1803,7 +1796,7 @@ static void hifn_process_ready(struct ablkcipher_request *req, int error)
                                         sg_page(dst), dst->length, nbytes);
 
                                 if (!t->length) {
-                                        nbytes -= dst->length;
+                                        nbytes -= min(dst->length, nbytes);
                                         idx++;
                                         continue;
                                 }
@@ -2202,9 +2195,9 @@ static int hifn_setup_crypto(struct ablkcipher_request *req, u8 op,
                 return err;
 
         if (dev->started < HIFN_QUEUE_LENGTH && dev->queue.qlen)
-                err = hifn_process_queue(dev);
+                hifn_process_queue(dev);
 
-        return err;
+        return -EINPROGRESS;
 }
 
 /*
@@ -2364,7 +2357,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
          * 3DES ECB, CBC, CFB and OFB modes.
          */
         {
-                .name = "cfb(des3_ede)", .drv_name = "hifn-3des", .bsize = 8,
+                .name = "cfb(des3_ede)", .drv_name = "cfb-3des", .bsize = 8,
                 .ablkcipher = {
                         .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_3DES_KEY_LENGTH,
@@ -2374,7 +2367,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "ofb(des3_ede)", .drv_name = "hifn-3des", .bsize = 8,
+                .name = "ofb(des3_ede)", .drv_name = "ofb-3des", .bsize = 8,
                 .ablkcipher = {
                         .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_3DES_KEY_LENGTH,
@@ -2384,8 +2377,9 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "cbc(des3_ede)", .drv_name = "hifn-3des", .bsize = 8,
+                .name = "cbc(des3_ede)", .drv_name = "cbc-3des", .bsize = 8,
                 .ablkcipher = {
+                        .ivsize         =       HIFN_IV_LENGTH,
                         .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_3DES_KEY_LENGTH,
                         .setkey         =       hifn_setkey,
@@ -2394,7 +2388,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "ecb(des3_ede)", .drv_name = "hifn-3des", .bsize = 8,
+                .name = "ecb(des3_ede)", .drv_name = "ecb-3des", .bsize = 8,
                 .ablkcipher = {
                         .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_3DES_KEY_LENGTH,
@@ -2408,7 +2402,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
          * DES ECB, CBC, CFB and OFB modes.
          */
         {
-                .name = "cfb(des)", .drv_name = "hifn-des", .bsize = 8,
+                .name = "cfb(des)", .drv_name = "cfb-des", .bsize = 8,
                 .ablkcipher = {
                         .min_keysize    =       HIFN_DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_DES_KEY_LENGTH,
@@ -2418,7 +2412,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "ofb(des)", .drv_name = "hifn-des", .bsize = 8,
+                .name = "ofb(des)", .drv_name = "ofb-des", .bsize = 8,
                 .ablkcipher = {
                         .min_keysize    =       HIFN_DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_DES_KEY_LENGTH,
@@ -2428,8 +2422,9 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "cbc(des)", .drv_name = "hifn-des", .bsize = 8,
+                .name = "cbc(des)", .drv_name = "cbc-des", .bsize = 8,
                 .ablkcipher = {
+                        .ivsize         =       HIFN_IV_LENGTH,
                         .min_keysize    =       HIFN_DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_DES_KEY_LENGTH,
                         .setkey         =       hifn_setkey,
@@ -2438,7 +2433,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "ecb(des)", .drv_name = "hifn-des", .bsize = 8,
+                .name = "ecb(des)", .drv_name = "ecb-des", .bsize = 8,
                 .ablkcipher = {
                         .min_keysize    =       HIFN_DES_KEY_LENGTH,
                         .max_keysize    =       HIFN_DES_KEY_LENGTH,
@@ -2452,7 +2447,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
          * AES ECB, CBC, CFB and OFB modes.
          */
         {
-                .name = "ecb(aes)", .drv_name = "hifn-aes", .bsize = 16,
+                .name = "ecb(aes)", .drv_name = "ecb-aes", .bsize = 16,
                 .ablkcipher = {
                         .min_keysize    =       AES_MIN_KEY_SIZE,
                         .max_keysize    =       AES_MAX_KEY_SIZE,
@@ -2462,8 +2457,9 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "cbc(aes)", .drv_name = "hifn-aes", .bsize = 16,
+                .name = "cbc(aes)", .drv_name = "cbc-aes", .bsize = 16,
                 .ablkcipher = {
+                        .ivsize         =       HIFN_AES_IV_LENGTH,
                         .min_keysize    =       AES_MIN_KEY_SIZE,
                         .max_keysize    =       AES_MAX_KEY_SIZE,
                         .setkey         =       hifn_setkey,
@@ -2472,7 +2468,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "cfb(aes)", .drv_name = "hifn-aes", .bsize = 16,
+                .name = "cfb(aes)", .drv_name = "cfb-aes", .bsize = 16,
                 .ablkcipher = {
                         .min_keysize    =       AES_MIN_KEY_SIZE,
                         .max_keysize    =       AES_MAX_KEY_SIZE,
@@ -2482,7 +2478,7 @@ static struct hifn_alg_template hifn_alg_templates[] = {
                 },
         },
         {
-                .name = "ofb(aes)", .drv_name = "hifn-aes", .bsize = 16,
+                .name = "ofb(aes)", .drv_name = "ofb-aes", .bsize = 16,
                 .ablkcipher = {
                         .min_keysize    =       AES_MIN_KEY_SIZE,
                         .max_keysize    =       AES_MAX_KEY_SIZE,
@@ -2514,15 +2510,14 @@ static int hifn_alg_alloc(struct hifn_device *dev, struct hifn_alg_template *t)
                 return -ENOMEM;
 
         snprintf(alg->alg.cra_name, CRYPTO_MAX_ALG_NAME, "%s", t->name);
-        snprintf(alg->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s", t->drv_name);
+        snprintf(alg->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s-%s",
+                 t->drv_name, dev->name);
 
         alg->alg.cra_priority = 300;
         alg->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;
         alg->alg.cra_blocksize = t->bsize;
         alg->alg.cra_ctxsize = sizeof(struct hifn_context);
-        alg->alg.cra_alignmask = 15;
-        if (t->bsize == 8)
-                alg->alg.cra_alignmask = 3;
+        alg->alg.cra_alignmask = 0;
         alg->alg.cra_type = &crypto_ablkcipher_type;
         alg->alg.cra_module = THIS_MODULE;
         alg->alg.cra_u.ablkcipher = t->ablkcipher;
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
new file mode 100644
index 000000000000..42a107fe9233
--- /dev/null
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -0,0 +1,1506 @@
+/*
+ * Intel IXP4xx NPE-C crypto driver
+ *
+ * Copyright (C) 2008 Christian Hohnstaedt <chohnstaedt@innominate.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/dmapool.h>
+#include <linux/crypto.h>
+#include <linux/kernel.h>
+#include <linux/rtnetlink.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+
+#include <crypto/ctr.h>
+#include <crypto/des.h>
+#include <crypto/aes.h>
+#include <crypto/sha.h>
+#include <crypto/algapi.h>
+#include <crypto/aead.h>
+#include <crypto/authenc.h>
+#include <crypto/scatterwalk.h>
+
+#include <asm/arch/npe.h>
+#include <asm/arch/qmgr.h>
+
+#define MAX_KEYLEN 32
+
+/* hash: cfgword + 2 * digestlen; crypt: keylen + cfgword */
+#define NPE_CTX_LEN 80
+#define AES_BLOCK128 16
+
+#define NPE_OP_HASH_VERIFY   0x01
+#define NPE_OP_CCM_ENABLE    0x04
+#define NPE_OP_CRYPT_ENABLE  0x08
+#define NPE_OP_HASH_ENABLE   0x10
+#define NPE_OP_NOT_IN_PLACE  0x20
+#define NPE_OP_HMAC_DISABLE  0x40
+#define NPE_OP_CRYPT_ENCRYPT 0x80
+
+#define NPE_OP_CCM_GEN_MIC   0xcc
+#define NPE_OP_HASH_GEN_ICV  0x50
+#define NPE_OP_ENC_GEN_KEY   0xc9
+
+#define MOD_ECB     0x0000
+#define MOD_CTR     0x1000
+#define MOD_CBC_ENC 0x2000
+#define MOD_CBC_DEC 0x3000
+#define MOD_CCM_ENC 0x4000
+#define MOD_CCM_DEC 0x5000
+
+#define KEYLEN_128  4
+#define KEYLEN_192  6
+#define KEYLEN_256  8
+
+#define CIPH_DECR   0x0000
+#define CIPH_ENCR   0x0400
+
+#define MOD_DES     0x0000
+#define MOD_TDEA2   0x0100
+#define MOD_3DES   0x0200
+#define MOD_AES     0x0800
+#define MOD_AES128  (0x0800 | KEYLEN_128)
+#define MOD_AES192  (0x0900 | KEYLEN_192)
+#define MOD_AES256  (0x0a00 | KEYLEN_256)
+
+#define MAX_IVLEN   16
+#define NPE_ID      2  /* NPE C */
+#define NPE_QLEN    16
+/* Space for registering when the first
+ * NPE_QLEN crypt_ctl are busy */
+#define NPE_QLEN_TOTAL 64
+
+#define SEND_QID    29
+#define RECV_QID    30
+
+#define CTL_FLAG_UNUSED         0x0000
+#define CTL_FLAG_USED           0x1000
+#define CTL_FLAG_PERFORM_ABLK   0x0001
+#define CTL_FLAG_GEN_ICV        0x0002
+#define CTL_FLAG_GEN_REVAES     0x0004
+#define CTL_FLAG_PERFORM_AEAD   0x0008
+#define CTL_FLAG_MASK           0x000f
+
+#define HMAC_IPAD_VALUE   0x36
+#define HMAC_OPAD_VALUE   0x5C
+#define HMAC_PAD_BLOCKLEN SHA1_BLOCK_SIZE
+
+#define MD5_DIGEST_SIZE   16
+
+struct buffer_desc {
+        u32 phys_next;
+        u16 buf_len;
+        u16 pkt_len;
+        u32 phys_addr;
+        u32 __reserved[4];
+        struct buffer_desc *next;
+};
+
+struct crypt_ctl {
+        u8 mode;                /* NPE_OP_*  operation mode */
+        u8 init_len;
+        u16 reserved;
+        u8 iv[MAX_IVLEN];       /* IV for CBC mode or CTR IV for CTR mode */
+        u32 icv_rev_aes;        /* icv or rev aes */
+        u32 src_buf;
+        u32 dst_buf;
+        u16 auth_offs;          /* Authentication start offset */
+        u16 auth_len;           /* Authentication data length */
+        u16 crypt_offs;         /* Cryption start offset */
+        u16 crypt_len;          /* Cryption data length */
+        u32 aadAddr;            /* Additional Auth Data Addr for CCM mode */
+        u32 crypto_ctx;         /* NPE Crypto Param structure address */
+
+        /* Used by Host: 4*4 bytes*/
+        unsigned ctl_flags;
+        union {
+                struct ablkcipher_request *ablk_req;
+                struct aead_request *aead_req;
+                struct crypto_tfm *tfm;
+        } data;
+        struct buffer_desc *regist_buf;
+        u8 *regist_ptr;
+};
+
+struct ablk_ctx {
+        struct buffer_desc *src;
+        struct buffer_desc *dst;
+        unsigned src_nents;
+        unsigned dst_nents;
+};
+
+struct aead_ctx {
+        struct buffer_desc *buffer;
+        unsigned short assoc_nents;
+        unsigned short src_nents;
+        struct scatterlist ivlist;
+        /* used when the hmac is not on one sg entry */
+        u8 *hmac_virt;
+        int encrypt;
+};
+
+struct ix_hash_algo {
+        u32 cfgword;
+        unsigned char *icv;
+};
+
+struct ix_sa_dir {
+        unsigned char *npe_ctx;
+        dma_addr_t npe_ctx_phys;
+        int npe_ctx_idx;
+        u8 npe_mode;
+};
+
+struct ixp_ctx {
+        struct ix_sa_dir encrypt;
+        struct ix_sa_dir decrypt;
+        int authkey_len;
+        u8 authkey[MAX_KEYLEN];
+        int enckey_len;
+        u8 enckey[MAX_KEYLEN];
+        u8 salt[MAX_IVLEN];
+        u8 nonce[CTR_RFC3686_NONCE_SIZE];
+        unsigned salted;
+        atomic_t configuring;
+        struct completion completion;
+};
+
+struct ixp_alg {
+        struct crypto_alg crypto;
+        const struct ix_hash_algo *hash;
+        u32 cfg_enc;
+        u32 cfg_dec;
+
+        int registered;
+};
+
+static const struct ix_hash_algo hash_alg_md5 = {
+        .cfgword        = 0xAA010004,
+        .icv            = "\x01\x23\x45\x67\x89\xAB\xCD\xEF"
+                          "\xFE\xDC\xBA\x98\x76\x54\x32\x10",
+};
+static const struct ix_hash_algo hash_alg_sha1 = {
+        .cfgword        = 0x00000005,
+        .icv            = "\x67\x45\x23\x01\xEF\xCD\xAB\x89\x98\xBA"
+                          "\xDC\xFE\x10\x32\x54\x76\xC3\xD2\xE1\xF0",
+};
+
+static struct npe *npe_c;
+static struct dma_pool *buffer_pool = NULL;
+static struct dma_pool *ctx_pool = NULL;
+
+static struct crypt_ctl *crypt_virt = NULL;
+static dma_addr_t crypt_phys;
+
+static int support_aes = 1;
+
+static void dev_release(struct device *dev)
+{
+        return;
+}
+
+#define DRIVER_NAME "ixp4xx_crypto"
+static struct platform_device pseudo_dev = {
+        .name = DRIVER_NAME,
+        .id   = 0,
+        .num_resources = 0,
+        .dev  = {
+                .coherent_dma_mask = DMA_32BIT_MASK,
+                .release = dev_release,
+        }
+};
+
+static struct device *dev = &pseudo_dev.dev;
+
+static inline dma_addr_t crypt_virt2phys(struct crypt_ctl *virt)
+{
+        return crypt_phys + (virt - crypt_virt) * sizeof(struct crypt_ctl);
+}
+
+static inline struct crypt_ctl *crypt_phys2virt(dma_addr_t phys)
+{
+        return crypt_virt + (phys - crypt_phys) / sizeof(struct crypt_ctl);
+}
+
+static inline u32 cipher_cfg_enc(struct crypto_tfm *tfm)
+{
+        return container_of(tfm->__crt_alg, struct ixp_alg,crypto)->cfg_enc;
+}
+
+static inline u32 cipher_cfg_dec(struct crypto_tfm *tfm)
+{
+        return container_of(tfm->__crt_alg, struct ixp_alg,crypto)->cfg_dec;
+}
+
+static inline const struct ix_hash_algo *ix_hash(struct crypto_tfm *tfm)
+{
+        return container_of(tfm->__crt_alg, struct ixp_alg, crypto)->hash;
+}
+
+static int setup_crypt_desc(void)
+{
+        BUILD_BUG_ON(sizeof(struct crypt_ctl) != 64);
+        crypt_virt = dma_alloc_coherent(dev,
+                        NPE_QLEN * sizeof(struct crypt_ctl),
+                        &crypt_phys, GFP_KERNEL);
+        if (!crypt_virt)
+                return -ENOMEM;
+        memset(crypt_virt, 0, NPE_QLEN * sizeof(struct crypt_ctl));
+        return 0;
+}
+
+static spinlock_t desc_lock;
+static struct crypt_ctl *get_crypt_desc(void)
+{
+        int i;
+        static int idx = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&desc_lock, flags);
+
+        if (unlikely(!crypt_virt))
+                setup_crypt_desc();
+        if (unlikely(!crypt_virt)) {
+                spin_unlock_irqrestore(&desc_lock, flags);
+                return NULL;
+        }
+        i = idx;
+        if (crypt_virt[i].ctl_flags == CTL_FLAG_UNUSED) {
+                if (++idx >= NPE_QLEN)
+                        idx = 0;
+                crypt_virt[i].ctl_flags = CTL_FLAG_USED;
+                spin_unlock_irqrestore(&desc_lock, flags);
+                return crypt_virt +i;
+        } else {
+                spin_unlock_irqrestore(&desc_lock, flags);
+                return NULL;
+        }
+}
+
+static spinlock_t emerg_lock;
+static struct crypt_ctl *get_crypt_desc_emerg(void)
+{
+        int i;
+        static int idx = NPE_QLEN;
+        struct crypt_ctl *desc;
+        unsigned long flags;
+
+        desc = get_crypt_desc();
+        if (desc)
+                return desc;
+        if (unlikely(!crypt_virt))
+                return NULL;
+
+        spin_lock_irqsave(&emerg_lock, flags);
+        i = idx;
+        if (crypt_virt[i].ctl_flags == CTL_FLAG_UNUSED) {
+                if (++idx >= NPE_QLEN_TOTAL)
+                        idx = NPE_QLEN;
+                crypt_virt[i].ctl_flags = CTL_FLAG_USED;
+                spin_unlock_irqrestore(&emerg_lock, flags);
+                return crypt_virt +i;
+        } else {
+                spin_unlock_irqrestore(&emerg_lock, flags);
+                return NULL;
+        }
+}
+
+static void free_buf_chain(struct buffer_desc *buf, u32 phys)
+{
+        while (buf) {
+                struct buffer_desc *buf1;
+                u32 phys1;
+
+                buf1 = buf->next;
+                phys1 = buf->phys_next;
+                dma_pool_free(buffer_pool, buf, phys);
+                buf = buf1;
+                phys = phys1;
+        }
+}
+
+static struct tasklet_struct crypto_done_tasklet;
+
+static void finish_scattered_hmac(struct crypt_ctl *crypt)
+{
+        struct aead_request *req = crypt->data.aead_req;
+        struct aead_ctx *req_ctx = aead_request_ctx(req);
+        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+        int authsize = crypto_aead_authsize(tfm);
+        int decryptlen = req->cryptlen - authsize;
+
+        if (req_ctx->encrypt) {
+                scatterwalk_map_and_copy(req_ctx->hmac_virt,
+                        req->src, decryptlen, authsize, 1);
+        }
+        dma_pool_free(buffer_pool, req_ctx->hmac_virt, crypt->icv_rev_aes);
+}
+
+static void one_packet(dma_addr_t phys)
+{
+        struct crypt_ctl *crypt;
+        struct ixp_ctx *ctx;
+        int failed;
+        enum dma_data_direction src_direction = DMA_BIDIRECTIONAL;
+
+        failed = phys & 0x1 ? -EBADMSG : 0;
+        phys &= ~0x3;
+        crypt = crypt_phys2virt(phys);
+
+        switch (crypt->ctl_flags & CTL_FLAG_MASK) {
+        case CTL_FLAG_PERFORM_AEAD: {
+                struct aead_request *req = crypt->data.aead_req;
+                struct aead_ctx *req_ctx = aead_request_ctx(req);
+                dma_unmap_sg(dev, req->assoc, req_ctx->assoc_nents,
+                                DMA_TO_DEVICE);
+                dma_unmap_sg(dev, &req_ctx->ivlist, 1, DMA_BIDIRECTIONAL);
+                dma_unmap_sg(dev, req->src, req_ctx->src_nents,
+                                DMA_BIDIRECTIONAL);
+
+                free_buf_chain(req_ctx->buffer, crypt->src_buf);
+                if (req_ctx->hmac_virt) {
+                        finish_scattered_hmac(crypt);
+                }
+                req->base.complete(&req->base, failed);
+                break;
+        }
+        case CTL_FLAG_PERFORM_ABLK: {
+                struct ablkcipher_request *req = crypt->data.ablk_req;
+                struct ablk_ctx *req_ctx = ablkcipher_request_ctx(req);
+                int nents;
+                if (req_ctx->dst) {
+                        nents = req_ctx->dst_nents;
+                        dma_unmap_sg(dev, req->dst, nents, DMA_FROM_DEVICE);
+                        free_buf_chain(req_ctx->dst, crypt->dst_buf);
+                        src_direction = DMA_TO_DEVICE;
+                }
+                nents = req_ctx->src_nents;
+                dma_unmap_sg(dev, req->src, nents, src_direction);
+                free_buf_chain(req_ctx->src, crypt->src_buf);
+                req->base.complete(&req->base, failed);
+                break;
+        }
+        case CTL_FLAG_GEN_ICV:
+                ctx = crypto_tfm_ctx(crypt->data.tfm);
+                dma_pool_free(ctx_pool, crypt->regist_ptr,
+                                crypt->regist_buf->phys_addr);
+                dma_pool_free(buffer_pool, crypt->regist_buf, crypt->src_buf);
+                if (atomic_dec_and_test(&ctx->configuring))
+                        complete(&ctx->completion);
+                break;
+        case CTL_FLAG_GEN_REVAES:
+                ctx = crypto_tfm_ctx(crypt->data.tfm);
+                *(u32*)ctx->decrypt.npe_ctx &= cpu_to_be32(~CIPH_ENCR);
+                if (atomic_dec_and_test(&ctx->configuring))
+                        complete(&ctx->completion);
+                break;
+        default:
+                BUG();
+        }
+        crypt->ctl_flags = CTL_FLAG_UNUSED;
+}
+
+static void irqhandler(void *_unused)
+{
+        tasklet_schedule(&crypto_done_tasklet);
+}
+
+static void crypto_done_action(unsigned long arg)
+{
+        int i;
+
+        for(i=0; i<4; i++) {
+                dma_addr_t phys = qmgr_get_entry(RECV_QID);
+                if (!phys)
+                        return;
+                one_packet(phys);
+        }
+        tasklet_schedule(&crypto_done_tasklet);
+}
+
+static int init_ixp_crypto(void)
+{
+        int ret = -ENODEV;
+
+        if (! ( ~(*IXP4XX_EXP_CFG2) & (IXP4XX_FEATURE_HASH |
+                                IXP4XX_FEATURE_AES | IXP4XX_FEATURE_DES))) {
+                printk(KERN_ERR "ixp_crypto: No HW crypto available\n");
+                return ret;
+        }
+        npe_c = npe_request(NPE_ID);
+        if (!npe_c)
+                return ret;
+
+        if (!npe_running(npe_c)) {
+                npe_load_firmware(npe_c, npe_name(npe_c), dev);
+        }
+
+        /* buffer_pool will also be used to sometimes store the hmac,
+         * so assure it is large enough
+         */
+        BUILD_BUG_ON(SHA1_DIGEST_SIZE > sizeof(struct buffer_desc));
+        buffer_pool = dma_pool_create("buffer", dev,
+                        sizeof(struct buffer_desc), 32, 0);
+        ret = -ENOMEM;
+        if (!buffer_pool) {
+                goto err;
+        }
+        ctx_pool = dma_pool_create("context", dev,
+                        NPE_CTX_LEN, 16, 0);
+        if (!ctx_pool) {
+                goto err;
+        }
+        ret = qmgr_request_queue(SEND_QID, NPE_QLEN_TOTAL, 0, 0);
+        if (ret)
+                goto err;
+        ret = qmgr_request_queue(RECV_QID, NPE_QLEN, 0, 0);
+        if (ret) {
+                qmgr_release_queue(SEND_QID);
+                goto err;
+        }
+        qmgr_set_irq(RECV_QID, QUEUE_IRQ_SRC_NOT_EMPTY, irqhandler, NULL);
+        tasklet_init(&crypto_done_tasklet, crypto_done_action, 0);
+
+        qmgr_enable_irq(RECV_QID);
+        return 0;
+err:
+        if (ctx_pool)
+                dma_pool_destroy(ctx_pool);
+        if (buffer_pool)
+                dma_pool_destroy(buffer_pool);
+        npe_release(npe_c);
+        return ret;
+}
+
+static void release_ixp_crypto(void)
+{
+        qmgr_disable_irq(RECV_QID);
+        tasklet_kill(&crypto_done_tasklet);
+
+        qmgr_release_queue(SEND_QID);
+        qmgr_release_queue(RECV_QID);
+
+        dma_pool_destroy(ctx_pool);
+        dma_pool_destroy(buffer_pool);
+
+        npe_release(npe_c);
+
+        if (crypt_virt) {
+                dma_free_coherent(dev,
+                        NPE_QLEN_TOTAL * sizeof( struct crypt_ctl),
+                        crypt_virt, crypt_phys);
+        }
+        return;
+}
+
+static void reset_sa_dir(struct ix_sa_dir *dir)
+{
+        memset(dir->npe_ctx, 0, NPE_CTX_LEN);
+        dir->npe_ctx_idx = 0;
+        dir->npe_mode = 0;
+}
+
+static int init_sa_dir(struct ix_sa_dir *dir)
+{
+        dir->npe_ctx = dma_pool_alloc(ctx_pool, GFP_KERNEL, &dir->npe_ctx_phys);
+        if (!dir->npe_ctx) {
+                return -ENOMEM;
+        }
+        reset_sa_dir(dir);
+        return 0;
+}
+
+static void free_sa_dir(struct ix_sa_dir *dir)
+{
+        memset(dir->npe_ctx, 0, NPE_CTX_LEN);
+        dma_pool_free(ctx_pool, dir->npe_ctx, dir->npe_ctx_phys);
+}
+
+static int init_tfm(struct crypto_tfm *tfm)
+{
+        struct ixp_ctx *ctx = crypto_tfm_ctx(tfm);
+        int ret;
+
+        atomic_set(&ctx->configuring, 0);
+        ret = init_sa_dir(&ctx->encrypt);
+        if (ret)
+                return ret;
+        ret = init_sa_dir(&ctx->decrypt);
+        if (ret) {
+                free_sa_dir(&ctx->encrypt);
+        }
+        return ret;
+}
+
+static int init_tfm_ablk(struct crypto_tfm *tfm)
+{
+        tfm->crt_ablkcipher.reqsize = sizeof(struct ablk_ctx);
+        return init_tfm(tfm);
+}
+
+static int init_tfm_aead(struct crypto_tfm *tfm)
+{
+        tfm->crt_aead.reqsize = sizeof(struct aead_ctx);
+        return init_tfm(tfm);
+}
+
+static void exit_tfm(struct crypto_tfm *tfm)
+{
+        struct ixp_ctx *ctx = crypto_tfm_ctx(tfm);
+        free_sa_dir(&ctx->encrypt);
+        free_sa_dir(&ctx->decrypt);
+}
+
+static int register_chain_var(struct crypto_tfm *tfm, u8 xpad, u32 target,
+                int init_len, u32 ctx_addr, const u8 *key, int key_len)
+{
+        struct ixp_ctx *ctx = crypto_tfm_ctx(tfm);
+        struct crypt_ctl *crypt;
+        struct buffer_desc *buf;
+        int i;
+        u8 *pad;
+        u32 pad_phys, buf_phys;
+
+        BUILD_BUG_ON(NPE_CTX_LEN < HMAC_PAD_BLOCKLEN);
+        pad = dma_pool_alloc(ctx_pool, GFP_KERNEL, &pad_phys);
+        if (!pad)
+                return -ENOMEM;
+        buf = dma_pool_alloc(buffer_pool, GFP_KERNEL, &buf_phys);
+        if (!buf) {
+                dma_pool_free(ctx_pool, pad, pad_phys);
+                return -ENOMEM;
+        }
+        crypt = get_crypt_desc_emerg();
+        if (!crypt) {
+                dma_pool_free(ctx_pool, pad, pad_phys);
+                dma_pool_free(buffer_pool, buf, buf_phys);
+                return -EAGAIN;
+        }
+
+        memcpy(pad, key, key_len);
+        memset(pad + key_len, 0, HMAC_PAD_BLOCKLEN - key_len);
+        for (i = 0; i < HMAC_PAD_BLOCKLEN; i++) {
+                pad[i] ^= xpad;
+        }
+
+        crypt->data.tfm = tfm;
+        crypt->regist_ptr = pad;
+        crypt->regist_buf = buf;
+
+        crypt->auth_offs = 0;
+        crypt->auth_len = HMAC_PAD_BLOCKLEN;
+        crypt->crypto_ctx = ctx_addr;
+        crypt->src_buf = buf_phys;
+        crypt->icv_rev_aes = target;
+        crypt->mode = NPE_OP_HASH_GEN_ICV;
+        crypt->init_len = init_len;
+        crypt->ctl_flags |= CTL_FLAG_GEN_ICV;
+
+        buf->next = 0;
+        buf->buf_len = HMAC_PAD_BLOCKLEN;
+        buf->pkt_len = 0;
+        buf->phys_addr = pad_phys;
+
+        atomic_inc(&ctx->configuring);
+        qmgr_put_entry(SEND_QID, crypt_virt2phys(crypt));
+        BUG_ON(qmgr_stat_overflow(SEND_QID));
+        return 0;
+}
+
+static int setup_auth(struct crypto_tfm *tfm, int encrypt, unsigned authsize,
+                const u8 *key, int key_len, unsigned digest_len)
+{
+        u32 itarget, otarget, npe_ctx_addr;
+        unsigned char *cinfo;
+        int init_len, ret = 0;
+        u32 cfgword;
+        struct ix_sa_dir *dir;
+        struct ixp_ctx *ctx = crypto_tfm_ctx(tfm);
+        const struct ix_hash_algo *algo;
+
+        dir = encrypt ? &ctx->encrypt : &ctx->decrypt;
+        cinfo = dir->npe_ctx + dir->npe_ctx_idx;
+        algo = ix_hash(tfm);
+
+        /* write cfg word to cryptinfo */
+        cfgword = algo->cfgword | ( authsize << 6); /* (authsize/4) << 8 */
+        *(u32*)cinfo = cpu_to_be32(cfgword);
+        cinfo += sizeof(cfgword);
+
+        /* write ICV to cryptinfo */
+        memcpy(cinfo, algo->icv, digest_len);
+        cinfo += digest_len;
+
+        itarget = dir->npe_ctx_phys + dir->npe_ctx_idx
+                                + sizeof(algo->cfgword);
+        otarget = itarget + digest_len;
+        init_len = cinfo - (dir->npe_ctx + dir->npe_ctx_idx);
+        npe_ctx_addr = dir->npe_ctx_phys + dir->npe_ctx_idx;
+
+        dir->npe_ctx_idx += init_len;
+        dir->npe_mode |= NPE_OP_HASH_ENABLE;
+
+        if (!encrypt)
+                dir->npe_mode |= NPE_OP_HASH_VERIFY;
+
+        ret = register_chain_var(tfm, HMAC_OPAD_VALUE, otarget,
+                        init_len, npe_ctx_addr, key, key_len);
+        if (ret)
+                return ret;
+        return register_chain_var(tfm, HMAC_IPAD_VALUE, itarget,
+                        init_len, npe_ctx_addr, key, key_len);
+}
+
+static int gen_rev_aes_key(struct crypto_tfm *tfm)
+{
+        struct crypt_ctl *crypt;
+        struct ixp_ctx *ctx = crypto_tfm_ctx(tfm);
+        struct ix_sa_dir *dir = &ctx->decrypt;
+
+        crypt = get_crypt_desc_emerg();
+        if (!crypt) {
+                return -EAGAIN;
+        }
+        *(u32*)dir->npe_ctx |= cpu_to_be32(CIPH_ENCR);
+
+        crypt->data.tfm = tfm;
+        crypt->crypt_offs = 0;
+        crypt->crypt_len = AES_BLOCK128;
+        crypt->src_buf = 0;
+        crypt->crypto_ctx = dir->npe_ctx_phys;
+        crypt->icv_rev_aes = dir->npe_ctx_phys + sizeof(u32);
+        crypt->mode = NPE_OP_ENC_GEN_KEY;
+        crypt->init_len = dir->npe_ctx_idx;
+        crypt->ctl_flags |= CTL_FLAG_GEN_REVAES;
+
+        atomic_inc(&ctx->configuring);
+        qmgr_put_entry(SEND_QID, crypt_virt2phys(crypt));
+        BUG_ON(qmgr_stat_overflow(SEND_QID));
+        return 0;
+}
+
+static int setup_cipher(struct crypto_tfm *tfm, int encrypt,
+                const u8 *key, int key_len)
+{
+        u8 *cinfo;
+        u32 cipher_cfg;
+        u32 keylen_cfg = 0;
+        struct ix_sa_dir *dir;
+        struct ixp_ctx *ctx = crypto_tfm_ctx(tfm);
+        u32 *flags = &tfm->crt_flags;
+
+        dir = encrypt ? &ctx->encrypt : &ctx->decrypt;
+        cinfo = dir->npe_ctx;
+
+        if (encrypt) {
+                cipher_cfg = cipher_cfg_enc(tfm);
+                dir->npe_mode |= NPE_OP_CRYPT_ENCRYPT;
+        } else {
+                cipher_cfg = cipher_cfg_dec(tfm);
+        }
+        if (cipher_cfg & MOD_AES) {
+                switch (key_len) {
+                        case 16: keylen_cfg = MOD_AES128 | KEYLEN_128; break;
+                        case 24: keylen_cfg = MOD_AES192 | KEYLEN_192; break;
+                        case 32: keylen_cfg = MOD_AES256 | KEYLEN_256; break;
+                        default:
+                                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+                                return -EINVAL;
+                }
+                cipher_cfg |= keylen_cfg;
+        } else if (cipher_cfg & MOD_3DES) {
+                const u32 *K = (const u32 *)key;
+                if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
+                             !((K[2] ^ K[4]) | (K[3] ^ K[5]))))
+                {
+                        *flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;
+                        return -EINVAL;
+                }
+        } else {
+                u32 tmp[DES_EXPKEY_WORDS];
+                if (des_ekey(tmp, key) == 0) {
+                        *flags |= CRYPTO_TFM_RES_WEAK_KEY;
+                }
+        }
+        /* write cfg word to cryptinfo */
+        *(u32*)cinfo = cpu_to_be32(cipher_cfg);
+        cinfo += sizeof(cipher_cfg);
+
+        /* write cipher key to cryptinfo */
+        memcpy(cinfo, key, key_len);
+        /* NPE wants keylen set to DES3_EDE_KEY_SIZE even for single DES */
+        if (key_len < DES3_EDE_KEY_SIZE && !(cipher_cfg & MOD_AES)) {
+                memset(cinfo + key_len, 0, DES3_EDE_KEY_SIZE -key_len);
+                key_len = DES3_EDE_KEY_SIZE;
+        }
+        dir->npe_ctx_idx = sizeof(cipher_cfg) + key_len;
+        dir->npe_mode |= NPE_OP_CRYPT_ENABLE;
+        if ((cipher_cfg & MOD_AES) && !encrypt) {
+                return gen_rev_aes_key(tfm);
+        }
+        return 0;
+}
+
+static int count_sg(struct scatterlist *sg, int nbytes)
+{
+        int i;
+        for (i = 0; nbytes > 0; i++, sg = sg_next(sg))
+                nbytes -= sg->length;
+        return i;
+}
+
+static struct buffer_desc *chainup_buffers(struct scatterlist *sg,
+                        unsigned nbytes, struct buffer_desc *buf, gfp_t flags)
+{
+        int nents = 0;
+
+        while (nbytes > 0) {
+                struct buffer_desc *next_buf;
+                u32 next_buf_phys;
+                unsigned len = min(nbytes, sg_dma_len(sg));
+
+                nents++;
+                nbytes -= len;
+                if (!buf->phys_addr) {
+                        buf->phys_addr = sg_dma_address(sg);
+                        buf->buf_len = len;
+                        buf->next = NULL;
+                        buf->phys_next = 0;
+                        goto next;
+                }
+                /* Two consecutive chunks on one page may be handled by the old
+                 * buffer descriptor, increased by the length of the new one
+                 */
+                if (sg_dma_address(sg) == buf->phys_addr + buf->buf_len) {
+                        buf->buf_len += len;
+                        goto next;
+                }
+                next_buf = dma_pool_alloc(buffer_pool, flags, &next_buf_phys);
+                if (!next_buf)
+                        return NULL;
+                buf->next = next_buf;
+                buf->phys_next = next_buf_phys;
+
+                buf = next_buf;
+                buf->next = NULL;
+                buf->phys_next = 0;
+                buf->phys_addr = sg_dma_address(sg);
+                buf->buf_len = len;
+next:
+                if (nbytes > 0) {
+                        sg = sg_next(sg);
+                }
+        }
+        return buf;
+}
+
+static int ablk_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
+                        unsigned int key_len)
+{
+        struct ixp_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+        u32 *flags = &tfm->base.crt_flags;
+        int ret;
+
+        init_completion(&ctx->completion);
+        atomic_inc(&ctx->configuring);
+
+        reset_sa_dir(&ctx->encrypt);
+        reset_sa_dir(&ctx->decrypt);
+
+        ctx->encrypt.npe_mode = NPE_OP_HMAC_DISABLE;
+        ctx->decrypt.npe_mode = NPE_OP_HMAC_DISABLE;
+
+        ret = setup_cipher(&tfm->base, 0, key, key_len);
+        if (ret)
+                goto out;
+        ret = setup_cipher(&tfm->base, 1, key, key_len);
+        if (ret)
+                goto out;
+
+        if (*flags & CRYPTO_TFM_RES_WEAK_KEY) {
+                if (*flags & CRYPTO_TFM_REQ_WEAK_KEY) {
+                        ret = -EINVAL;
+                } else {
+                        *flags &= ~CRYPTO_TFM_RES_WEAK_KEY;
+                }
+        }
+out:
+        if (!atomic_dec_and_test(&ctx->configuring))
+                wait_for_completion(&ctx->completion);
+        return ret;
+}
+
+static int ablk_rfc3686_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
+                unsigned int key_len)
+{
+        struct ixp_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+
+        /* the nonce is stored in bytes at end of key */
+        if (key_len < CTR_RFC3686_NONCE_SIZE)
+                return -EINVAL;
+
+        memcpy(ctx->nonce, key + (key_len - CTR_RFC3686_NONCE_SIZE),
+                        CTR_RFC3686_NONCE_SIZE);
+
+        key_len -= CTR_RFC3686_NONCE_SIZE;
+        return ablk_setkey(tfm, key, key_len);
+}
+
+static int ablk_perform(struct ablkcipher_request *req, int encrypt)
+{
+        struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);
+        struct ixp_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+        unsigned ivsize = crypto_ablkcipher_ivsize(tfm);
+        int ret = -ENOMEM;
+        struct ix_sa_dir *dir;
+        struct crypt_ctl *crypt;
+        unsigned int nbytes = req->nbytes, nents;
+        enum dma_data_direction src_direction = DMA_BIDIRECTIONAL;
+        struct ablk_ctx *req_ctx = ablkcipher_request_ctx(req);
+        gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ?
+                                GFP_KERNEL : GFP_ATOMIC;
+
+        if (qmgr_stat_full(SEND_QID))
+                return -EAGAIN;
+        if (atomic_read(&ctx->configuring))
+                return -EAGAIN;
+
+        dir = encrypt ? &ctx->encrypt : &ctx->decrypt;
+
+        crypt = get_crypt_desc();
+        if (!crypt)
+                return ret;
+
+        crypt->data.ablk_req = req;
+        crypt->crypto_ctx = dir->npe_ctx_phys;
+        crypt->mode = dir->npe_mode;
+        crypt->init_len = dir->npe_ctx_idx;
+
+        crypt->crypt_offs = 0;
+        crypt->crypt_len = nbytes;
+
+        BUG_ON(ivsize && !req->info);
+        memcpy(crypt->iv, req->info, ivsize);
+        if (req->src != req->dst) {
+                crypt->mode |= NPE_OP_NOT_IN_PLACE;
+                nents = count_sg(req->dst, nbytes);
+                /* This was never tested by Intel
+                 * for more than one dst buffer, I think. */
+                BUG_ON(nents != 1);
+                req_ctx->dst_nents = nents;
+                dma_map_sg(dev, req->dst, nents, DMA_FROM_DEVICE);
+                req_ctx->dst = dma_pool_alloc(buffer_pool, flags,&crypt->dst_buf);
+                if (!req_ctx->dst)
+                        goto unmap_sg_dest;
+                req_ctx->dst->phys_addr = 0;
+                if (!chainup_buffers(req->dst, nbytes, req_ctx->dst, flags))
+                        goto free_buf_dest;
+                src_direction = DMA_TO_DEVICE;
+        } else {
+                req_ctx->dst = NULL;
+                req_ctx->dst_nents = 0;
+        }
+        nents = count_sg(req->src, nbytes);
+        req_ctx->src_nents = nents;
+        dma_map_sg(dev, req->src, nents, src_direction);
+
+        req_ctx->src = dma_pool_alloc(buffer_pool, flags, &crypt->src_buf);
+        if (!req_ctx->src)
+                goto unmap_sg_src;
+        req_ctx->src->phys_addr = 0;
+        if (!chainup_buffers(req->src, nbytes, req_ctx->src, flags))
+                goto free_buf_src;
+
+        crypt->ctl_flags |= CTL_FLAG_PERFORM_ABLK;
+        qmgr_put_entry(SEND_QID, crypt_virt2phys(crypt));
+        BUG_ON(qmgr_stat_overflow(SEND_QID));
+        return -EINPROGRESS;
+
+free_buf_src:
+        free_buf_chain(req_ctx->src, crypt->src_buf);
+unmap_sg_src:
+        dma_unmap_sg(dev, req->src, req_ctx->src_nents, src_direction);
+free_buf_dest:
+        if (req->src != req->dst) {
+                free_buf_chain(req_ctx->dst, crypt->dst_buf);
+unmap_sg_dest:
+                dma_unmap_sg(dev, req->src, req_ctx->dst_nents,
+                        DMA_FROM_DEVICE);
+        }
+        crypt->ctl_flags = CTL_FLAG_UNUSED;
+        return ret;
+}
+
+static int ablk_encrypt(struct ablkcipher_request *req)
+{
+        return ablk_perform(req, 1);
+}
+
+static int ablk_decrypt(struct ablkcipher_request *req)
+{
+        return ablk_perform(req, 0);
+}
+
+static int ablk_rfc3686_crypt(struct ablkcipher_request *req)
+{
+        struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);
+        struct ixp_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+        u8 iv[CTR_RFC3686_BLOCK_SIZE];
+        u8 *info = req->info;
+        int ret;
+
+        /* set up counter block */
+        memcpy(iv, ctx->nonce, CTR_RFC3686_NONCE_SIZE);
+        memcpy(iv + CTR_RFC3686_NONCE_SIZE, info, CTR_RFC3686_IV_SIZE);
+
+        /* initialize counter portion of counter block */
+        *(__be32 *)(iv + CTR_RFC3686_NONCE_SIZE + CTR_RFC3686_IV_SIZE) =
+                cpu_to_be32(1);
+
+        req->info = iv;
+        ret = ablk_perform(req, 1);
+        req->info = info;
+        return ret;
+}
+
+static int hmac_inconsistent(struct scatterlist *sg, unsigned start,
+                unsigned int nbytes)
+{
+        int offset = 0;
+
+        if (!nbytes)
+                return 0;
+
+        for (;;) {
+                if (start < offset + sg->length)
+                        break;
+
+                offset += sg->length;
+                sg = sg_next(sg);
+        }
+        return (start + nbytes > offset + sg->length);
+}
+
+static int aead_perform(struct aead_request *req, int encrypt,
+                int cryptoffset, int eff_cryptlen, u8 *iv)
+{
+        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+        struct ixp_ctx *ctx = crypto_aead_ctx(tfm);
+        unsigned ivsize = crypto_aead_ivsize(tfm);
+        unsigned authsize = crypto_aead_authsize(tfm);
+        int ret = -ENOMEM;
+        struct ix_sa_dir *dir;
+        struct crypt_ctl *crypt;
+        unsigned int cryptlen, nents;
+        struct buffer_desc *buf;
+        struct aead_ctx *req_ctx = aead_request_ctx(req);
+        gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ?
+                                GFP_KERNEL : GFP_ATOMIC;
+
+        if (qmgr_stat_full(SEND_QID))
+                return -EAGAIN;
+        if (atomic_read(&ctx->configuring))
+                return -EAGAIN;
+
+        if (encrypt) {
+                dir = &ctx->encrypt;
+                cryptlen = req->cryptlen;
+        } else {
+                dir = &ctx->decrypt;
+                /* req->cryptlen includes the authsize when decrypting */
+                cryptlen = req->cryptlen -authsize;
+                eff_cryptlen -= authsize;
+        }
+        crypt = get_crypt_desc();
+        if (!crypt)
+                return ret;
+
+        crypt->data.aead_req = req;
+        crypt->crypto_ctx = dir->npe_ctx_phys;
+        crypt->mode = dir->npe_mode;
+        crypt->init_len = dir->npe_ctx_idx;
+
+        crypt->crypt_offs = cryptoffset;
+        crypt->crypt_len = eff_cryptlen;
+
+        crypt->auth_offs = 0;
+        crypt->auth_len = req->assoclen + ivsize + cryptlen;
+        BUG_ON(ivsize && !req->iv);
+        memcpy(crypt->iv, req->iv, ivsize);
+
+        if (req->src != req->dst) {
+                BUG(); /* -ENOTSUP because of my lazyness */
+        }
+
+        req_ctx->buffer = dma_pool_alloc(buffer_pool, flags, &crypt->src_buf);
+        if (!req_ctx->buffer)
+                goto out;
+        req_ctx->buffer->phys_addr = 0;
+        /* ASSOC data */
+        nents = count_sg(req->assoc, req->assoclen);
+        req_ctx->assoc_nents = nents;
+        dma_map_sg(dev, req->assoc, nents, DMA_TO_DEVICE);
+        buf = chainup_buffers(req->assoc, req->assoclen, req_ctx->buffer,flags);
+        if (!buf)
+                goto unmap_sg_assoc;
+        /* IV */
+        sg_init_table(&req_ctx->ivlist, 1);
+        sg_set_buf(&req_ctx->ivlist, iv, ivsize);
+        dma_map_sg(dev, &req_ctx->ivlist, 1, DMA_BIDIRECTIONAL);
+        buf = chainup_buffers(&req_ctx->ivlist, ivsize, buf, flags);
+        if (!buf)
+                goto unmap_sg_iv;
+        if (unlikely(hmac_inconsistent(req->src, cryptlen, authsize))) {
+                /* The 12 hmac bytes are scattered,
+                 * we need to copy them into a safe buffer */
+                req_ctx->hmac_virt = dma_pool_alloc(buffer_pool, flags,
+                                &crypt->icv_rev_aes);
+                if (unlikely(!req_ctx->hmac_virt))
+                        goto unmap_sg_iv;
+                if (!encrypt) {
+                        scatterwalk_map_and_copy(req_ctx->hmac_virt,
+                                req->src, cryptlen, authsize, 0);
+                }
+                req_ctx->encrypt = encrypt;
+        } else {
+                req_ctx->hmac_virt = NULL;
+        }
+        /* Crypt */
+        nents = count_sg(req->src, cryptlen + authsize);
+        req_ctx->src_nents = nents;
+        dma_map_sg(dev, req->src, nents, DMA_BIDIRECTIONAL);
+        buf = chainup_buffers(req->src, cryptlen + authsize, buf, flags);
+        if (!buf)
+                goto unmap_sg_src;
+        if (!req_ctx->hmac_virt) {
+                crypt->icv_rev_aes = buf->phys_addr + buf->buf_len - authsize;
+        }
+        crypt->ctl_flags |= CTL_FLAG_PERFORM_AEAD;
+        qmgr_put_entry(SEND_QID, crypt_virt2phys(crypt));
+        BUG_ON(qmgr_stat_overflow(SEND_QID));
+        return -EINPROGRESS;
+unmap_sg_src:
+        dma_unmap_sg(dev, req->src, req_ctx->src_nents, DMA_BIDIRECTIONAL);
+        if (req_ctx->hmac_virt) {
+                dma_pool_free(buffer_pool, req_ctx->hmac_virt,
+                                crypt->icv_rev_aes);
+        }
+unmap_sg_iv:
+        dma_unmap_sg(dev, &req_ctx->ivlist, 1, DMA_BIDIRECTIONAL);
+unmap_sg_assoc:
+        dma_unmap_sg(dev, req->assoc, req_ctx->assoc_nents, DMA_TO_DEVICE);
+        free_buf_chain(req_ctx->buffer, crypt->src_buf);
+out:
+        crypt->ctl_flags = CTL_FLAG_UNUSED;
+        return ret;
+}
+
+static int aead_setup(struct crypto_aead *tfm, unsigned int authsize)
+{
+        struct ixp_ctx *ctx = crypto_aead_ctx(tfm);
+        u32 *flags = &tfm->base.crt_flags;
+        unsigned digest_len = crypto_aead_alg(tfm)->maxauthsize;
+        int ret;
+
+        if (!ctx->enckey_len && !ctx->authkey_len)
+                return 0;
+        init_completion(&ctx->completion);
+        atomic_inc(&ctx->configuring);
+
+        reset_sa_dir(&ctx->encrypt);
+        reset_sa_dir(&ctx->decrypt);
+
+        ret = setup_cipher(&tfm->base, 0, ctx->enckey, ctx->enckey_len);
+        if (ret)
+                goto out;
+        ret = setup_cipher(&tfm->base, 1, ctx->enckey, ctx->enckey_len);
+        if (ret)
+                goto out;
+        ret = setup_auth(&tfm->base, 0, authsize, ctx->authkey,
+                        ctx->authkey_len, digest_len);
+        if (ret)
+                goto out;
+        ret = setup_auth(&tfm->base, 1, authsize,  ctx->authkey,
+                        ctx->authkey_len, digest_len);
+        if (ret)
+                goto out;
+
+        if (*flags & CRYPTO_TFM_RES_WEAK_KEY) {
+                if (*flags & CRYPTO_TFM_REQ_WEAK_KEY) {
+                        ret = -EINVAL;
+                        goto out;
+                } else {
+                        *flags &= ~CRYPTO_TFM_RES_WEAK_KEY;
+                }
+        }
+out:
+        if (!atomic_dec_and_test(&ctx->configuring))
+                wait_for_completion(&ctx->completion);
+        return ret;
+}
+
+static int aead_setauthsize(struct crypto_aead *tfm, unsigned int authsize)
+{
+        int max = crypto_aead_alg(tfm)->maxauthsize >> 2;
+
+        if ((authsize>>2) < 1 || (authsize>>2) > max || (authsize & 3))
+                return -EINVAL;
+        return aead_setup(tfm, authsize);
+}
+
+static int aead_setkey(struct crypto_aead *tfm, const u8 *key,
+                        unsigned int keylen)
+{
+        struct ixp_ctx *ctx = crypto_aead_ctx(tfm);
+        struct rtattr *rta = (struct rtattr *)key;
+        struct crypto_authenc_key_param *param;
+
+        if (!RTA_OK(rta, keylen))
+                goto badkey;
+        if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
+                goto badkey;
+        if (RTA_PAYLOAD(rta) < sizeof(*param))
+                goto badkey;
+
+        param = RTA_DATA(rta);
+        ctx->enckey_len = be32_to_cpu(param->enckeylen);
+
+        key += RTA_ALIGN(rta->rta_len);
+        keylen -= RTA_ALIGN(rta->rta_len);
+
+        if (keylen < ctx->enckey_len)
+                goto badkey;
+
+        ctx->authkey_len = keylen - ctx->enckey_len;
+        memcpy(ctx->enckey, key + ctx->authkey_len, ctx->enckey_len);
+        memcpy(ctx->authkey, key, ctx->authkey_len);
+
+        return aead_setup(tfm, crypto_aead_authsize(tfm));
+badkey:
+        ctx->enckey_len = 0;
+        crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+        return -EINVAL;
+}
+
+static int aead_encrypt(struct aead_request *req)
+{
+        unsigned ivsize = crypto_aead_ivsize(crypto_aead_reqtfm(req));
+        return aead_perform(req, 1, req->assoclen + ivsize,
+                        req->cryptlen, req->iv);
+}
+
+static int aead_decrypt(struct aead_request *req)
+{
+        unsigned ivsize = crypto_aead_ivsize(crypto_aead_reqtfm(req));
+        return aead_perform(req, 0, req->assoclen + ivsize,
+                        req->cryptlen, req->iv);
+}
+
+static int aead_givencrypt(struct aead_givcrypt_request *req)
+{
+        struct crypto_aead *tfm = aead_givcrypt_reqtfm(req);
+        struct ixp_ctx *ctx = crypto_aead_ctx(tfm);
+        unsigned len, ivsize = crypto_aead_ivsize(tfm);
+        __be64 seq;
+
+        /* copied from eseqiv.c */
+        if (!ctx->salted) {
+                get_random_bytes(ctx->salt, ivsize);
+                ctx->salted = 1;
+        }
+        memcpy(req->areq.iv, ctx->salt, ivsize);
+        len = ivsize;
+        if (ivsize > sizeof(u64)) {
+                memset(req->giv, 0, ivsize - sizeof(u64));
+                len = sizeof(u64);
+        }
+        seq = cpu_to_be64(req->seq);
+        memcpy(req->giv + ivsize - len, &seq, len);
+        return aead_perform(&req->areq, 1, req->areq.assoclen,
+                        req->areq.cryptlen +ivsize, req->giv);
+}
+
+static struct ixp_alg ixp4xx_algos[] = {
+{
+        .crypto = {
+                .cra_name       = "cbc(des)",
+                .cra_blocksize  = DES_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = DES_KEY_SIZE,
+                        .max_keysize    = DES_KEY_SIZE,
+                        .ivsize         = DES_BLOCK_SIZE,
+                        .geniv          = "eseqiv",
+                        }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_DES | MOD_CBC_ENC | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_DES | MOD_CBC_DEC | KEYLEN_192,
+
+}, {
+        .crypto = {
+                .cra_name       = "ecb(des)",
+                .cra_blocksize  = DES_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = DES_KEY_SIZE,
+                        .max_keysize    = DES_KEY_SIZE,
+                        }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_DES | MOD_ECB | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_DES | MOD_ECB | KEYLEN_192,
+}, {
+        .crypto = {
+                .cra_name       = "cbc(des3_ede)",
+                .cra_blocksize  = DES3_EDE_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = DES3_EDE_KEY_SIZE,
+                        .max_keysize    = DES3_EDE_KEY_SIZE,
+                        .ivsize         = DES3_EDE_BLOCK_SIZE,
+                        .geniv          = "eseqiv",
+                        }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_3DES | MOD_CBC_ENC | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_3DES | MOD_CBC_DEC | KEYLEN_192,
+}, {
+        .crypto = {
+                .cra_name       = "ecb(des3_ede)",
+                .cra_blocksize  = DES3_EDE_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = DES3_EDE_KEY_SIZE,
+                        .max_keysize    = DES3_EDE_KEY_SIZE,
+                        }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_3DES | MOD_ECB | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_3DES | MOD_ECB | KEYLEN_192,
+}, {
+        .crypto = {
+                .cra_name       = "cbc(aes)",
+                .cra_blocksize  = AES_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = AES_MIN_KEY_SIZE,
+                        .max_keysize    = AES_MAX_KEY_SIZE,
+                        .ivsize         = AES_BLOCK_SIZE,
+                        .geniv          = "eseqiv",
+                        }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_AES | MOD_CBC_ENC,
+        .cfg_dec = CIPH_DECR | MOD_AES | MOD_CBC_DEC,
+}, {
+        .crypto = {
+                .cra_name       = "ecb(aes)",
+                .cra_blocksize  = AES_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = AES_MIN_KEY_SIZE,
+                        .max_keysize    = AES_MAX_KEY_SIZE,
+                        }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_AES | MOD_ECB,
+        .cfg_dec = CIPH_DECR | MOD_AES | MOD_ECB,
+}, {
+        .crypto = {
+                .cra_name       = "ctr(aes)",
+                .cra_blocksize  = AES_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = AES_MIN_KEY_SIZE,
+                        .max_keysize    = AES_MAX_KEY_SIZE,
+                        .ivsize         = AES_BLOCK_SIZE,
+                        .geniv          = "eseqiv",
+                        }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_AES | MOD_CTR,
+        .cfg_dec = CIPH_ENCR | MOD_AES | MOD_CTR,
+}, {
+        .crypto = {
+                .cra_name       = "rfc3686(ctr(aes))",
+                .cra_blocksize  = AES_BLOCK_SIZE,
+                .cra_u          = { .ablkcipher = {
+                        .min_keysize    = AES_MIN_KEY_SIZE,
+                        .max_keysize    = AES_MAX_KEY_SIZE,
+                        .ivsize         = AES_BLOCK_SIZE,
+                        .geniv          = "eseqiv",
+                        .setkey         = ablk_rfc3686_setkey,
+                        .encrypt        = ablk_rfc3686_crypt,
+                        .decrypt        = ablk_rfc3686_crypt }
+                }
+        },
+        .cfg_enc = CIPH_ENCR | MOD_AES | MOD_CTR,
+        .cfg_dec = CIPH_ENCR | MOD_AES | MOD_CTR,
+}, {
+        .crypto = {
+                .cra_name       = "authenc(hmac(md5),cbc(des))",
+                .cra_blocksize  = DES_BLOCK_SIZE,
+                .cra_u          = { .aead = {
+                        .ivsize         = DES_BLOCK_SIZE,
+                        .maxauthsize    = MD5_DIGEST_SIZE,
+                        }
+                }
+        },
+        .hash = &hash_alg_md5,
+        .cfg_enc = CIPH_ENCR | MOD_DES | MOD_CBC_ENC | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_DES | MOD_CBC_DEC | KEYLEN_192,
+}, {
+        .crypto = {
+                .cra_name       = "authenc(hmac(md5),cbc(des3_ede))",
+                .cra_blocksize  = DES3_EDE_BLOCK_SIZE,
+                .cra_u          = { .aead = {
+                        .ivsize         = DES3_EDE_BLOCK_SIZE,
+                        .maxauthsize    = MD5_DIGEST_SIZE,
+                        }
+                }
+        },
+        .hash = &hash_alg_md5,
+        .cfg_enc = CIPH_ENCR | MOD_3DES | MOD_CBC_ENC | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_3DES | MOD_CBC_DEC | KEYLEN_192,
+}, {
+        .crypto = {
+                .cra_name       = "authenc(hmac(sha1),cbc(des))",
+                .cra_blocksize  = DES_BLOCK_SIZE,
+                .cra_u          = { .aead = {
+                        .ivsize         = DES_BLOCK_SIZE,
+                        .maxauthsize    = SHA1_DIGEST_SIZE,
+                        }
+                }
+        },
+        .hash = &hash_alg_sha1,
+        .cfg_enc = CIPH_ENCR | MOD_DES | MOD_CBC_ENC | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_DES | MOD_CBC_DEC | KEYLEN_192,
+}, {
+        .crypto = {
+                .cra_name       = "authenc(hmac(sha1),cbc(des3_ede))",
+                .cra_blocksize  = DES3_EDE_BLOCK_SIZE,
+                .cra_u          = { .aead = {
+                        .ivsize         = DES3_EDE_BLOCK_SIZE,
+                        .maxauthsize    = SHA1_DIGEST_SIZE,
+                        }
+                }
+        },
+        .hash = &hash_alg_sha1,
+        .cfg_enc = CIPH_ENCR | MOD_3DES | MOD_CBC_ENC | KEYLEN_192,
+        .cfg_dec = CIPH_DECR | MOD_3DES | MOD_CBC_DEC | KEYLEN_192,
+}, {
+        .crypto = {
+                .cra_name       = "authenc(hmac(md5),cbc(aes))",
+                .cra_blocksize  = AES_BLOCK_SIZE,
+                .cra_u          = { .aead = {
+                        .ivsize         = AES_BLOCK_SIZE,
+                        .maxauthsize    = MD5_DIGEST_SIZE,
+                        }
+                }
+        },
+        .hash = &hash_alg_md5,
+        .cfg_enc = CIPH_ENCR | MOD_AES | MOD_CBC_ENC,
+        .cfg_dec = CIPH_DECR | MOD_AES | MOD_CBC_DEC,
+}, {
+        .crypto = {
+                .cra_name       = "authenc(hmac(sha1),cbc(aes))",
+                .cra_blocksize  = AES_BLOCK_SIZE,
+                .cra_u          = { .aead = {
+                        .ivsize         = AES_BLOCK_SIZE,
+                        .maxauthsize    = SHA1_DIGEST_SIZE,
+                        }
+                }
+        },
+        .hash = &hash_alg_sha1,
+        .cfg_enc = CIPH_ENCR | MOD_AES | MOD_CBC_ENC,
+        .cfg_dec = CIPH_DECR | MOD_AES | MOD_CBC_DEC,
+} };
+
+#define IXP_POSTFIX "-ixp4xx"
+static int __init ixp_module_init(void)
+{
+        int num = ARRAY_SIZE(ixp4xx_algos);
+        int i,err ;
+
+        if (platform_device_register(&pseudo_dev))
+                return -ENODEV;
+
+        spin_lock_init(&desc_lock);
+        spin_lock_init(&emerg_lock);
+
+        err = init_ixp_crypto();
+        if (err) {
+                platform_device_unregister(&pseudo_dev);
+                return err;
+        }
+        for (i=0; i< num; i++) {
+                struct crypto_alg *cra = &ixp4xx_algos[i].crypto;
+
+                if (snprintf(cra->cra_driver_name, CRYPTO_MAX_ALG_NAME,
+                        "%s"IXP_POSTFIX, cra->cra_name) >=
+                        CRYPTO_MAX_ALG_NAME)
+                {
+                        continue;
+                }
+                if (!support_aes && (ixp4xx_algos[i].cfg_enc & MOD_AES)) {
+                        continue;
+                }
+                if (!ixp4xx_algos[i].hash) {
+                        /* block ciphers */
+                        cra->cra_type = &crypto_ablkcipher_type;
+                        cra->cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                         CRYPTO_ALG_ASYNC;
+                        if (!cra->cra_ablkcipher.setkey)
+                                cra->cra_ablkcipher.setkey = ablk_setkey;
+                        if (!cra->cra_ablkcipher.encrypt)
+                                cra->cra_ablkcipher.encrypt = ablk_encrypt;
+                        if (!cra->cra_ablkcipher.decrypt)
+                                cra->cra_ablkcipher.decrypt = ablk_decrypt;
+                        cra->cra_init = init_tfm_ablk;
+                } else {
+                        /* authenc */
+                        cra->cra_type = &crypto_aead_type;
+                        cra->cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                         CRYPTO_ALG_ASYNC;
+                        cra->cra_aead.setkey = aead_setkey;
+                        cra->cra_aead.setauthsize = aead_setauthsize;
+                        cra->cra_aead.encrypt = aead_encrypt;
+                        cra->cra_aead.decrypt = aead_decrypt;
+                        cra->cra_aead.givencrypt = aead_givencrypt;
+                        cra->cra_init = init_tfm_aead;
+                }
+                cra->cra_ctxsize = sizeof(struct ixp_ctx);
+                cra->cra_module = THIS_MODULE;
+                cra->cra_alignmask = 3;
+                cra->cra_priority = 300;
+                cra->cra_exit = exit_tfm;
+                if (crypto_register_alg(cra))
+                        printk(KERN_ERR "Failed to register '%s'\n",
+                                cra->cra_name);
+                else
+                        ixp4xx_algos[i].registered = 1;
+        }
+        return 0;
+}
+
+static void __exit ixp_module_exit(void)
+{
+        int num = ARRAY_SIZE(ixp4xx_algos);
+        int i;
+
+        for (i=0; i< num; i++) {
+                if (ixp4xx_algos[i].registered)
+                        crypto_unregister_alg(&ixp4xx_algos[i].crypto);
+        }
+        release_ixp_crypto();
+        platform_device_unregister(&pseudo_dev);
+}
+
+module_init(ixp_module_init);
+module_exit(ixp_module_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Hohnstaedt <chohnstaedt@innominate.com>");
+MODULE_DESCRIPTION("IXP4xx hardware crypto");
+
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index bb30eb9b93ef..54a2a166e566 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -385,12 +385,12 @@ static int __init padlock_init(void)
         int ret;
 
         if (!cpu_has_xcrypt) {
-                printk(KERN_ERR PFX "VIA PadLock not detected.\n");
+                printk(KERN_NOTICE PFX "VIA PadLock not detected.\n");
                 return -ENODEV;
         }
 
         if (!cpu_has_xcrypt_enabled) {
-                printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
+                printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
index c666b4e0933e..40d5680fa013 100644
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
@@ -254,12 +254,12 @@ static int __init padlock_init(void)
         int rc = -ENODEV;
 
         if (!cpu_has_phe) {
-                printk(KERN_ERR PFX "VIA PadLock Hash Engine not detected.\n");
+                printk(KERN_NOTICE PFX "VIA PadLock Hash Engine not detected.\n");
                 return -ENODEV;
         }
 
         if (!cpu_has_phe_enabled) {
-                printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
+                printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
new file mode 100644
index 000000000000..b11943dadefd
--- /dev/null
+++ b/drivers/crypto/talitos.c
@@ -0,0 +1,1597 @@
+/*
+ * talitos - Freescale Integrated Security Engine (SEC) device driver
+ *
+ * Copyright (c) 2008 Freescale Semiconductor, Inc.
+ *
+ * Scatterlist Crypto API glue code copied from files with the following:
+ * Copyright (c) 2006-2007 Herbert Xu <herbert@gondor.apana.org.au>
+ *
+ * Crypto algorithm registration code copied from hifn driver:
+ * 2007+ Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+ * 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/crypto.h>
+#include <linux/hw_random.h>
+#include <linux/of_platform.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
+#include <linux/spinlock.h>
+#include <linux/rtnetlink.h>
+
+#include <crypto/algapi.h>
+#include <crypto/aes.h>
+#include <crypto/des.h>
+#include <crypto/sha.h>
+#include <crypto/aead.h>
+#include <crypto/authenc.h>
+
+#include "talitos.h"
+
+#define TALITOS_TIMEOUT 100000
+#define TALITOS_MAX_DATA_LEN 65535
+
+#define DESC_TYPE(desc_hdr) ((be32_to_cpu(desc_hdr) >> 3) & 0x1f)
+#define PRIMARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 28) & 0xf)
+#define SECONDARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 16) & 0xf)
+
+/* descriptor pointer entry */
+struct talitos_ptr {
+        __be16 len;     /* length */
+        u8 j_extent;    /* jump to sg link table and/or extent */
+        u8 eptr;        /* extended address */
+        __be32 ptr;     /* address */
+};
+
+/* descriptor */
+struct talitos_desc {
+        __be32 hdr;                     /* header high bits */
+        __be32 hdr_lo;                  /* header low bits */
+        struct talitos_ptr ptr[7];      /* ptr/len pair array */
+};
+
+/**
+ * talitos_request - descriptor submission request
+ * @desc: descriptor pointer (kernel virtual)
+ * @dma_desc: descriptor's physical bus address
+ * @callback: whom to call when descriptor processing is done
+ * @context: caller context (optional)
+ */
+struct talitos_request {
+        struct talitos_desc *desc;
+        dma_addr_t dma_desc;
+        void (*callback) (struct device *dev, struct talitos_desc *desc,
+                          void *context, int error);
+        void *context;
+};
+
+struct talitos_private {
+        struct device *dev;
+        struct of_device *ofdev;
+        void __iomem *reg;
+        int irq;
+
+        /* SEC version geometry (from device tree node) */
+        unsigned int num_channels;
+        unsigned int chfifo_len;
+        unsigned int exec_units;
+        unsigned int desc_types;
+
+        /* next channel to be assigned next incoming descriptor */
+        atomic_t last_chan;
+
+        /* per-channel request fifo */
+        struct talitos_request **fifo;
+
+        /*
+         * length of the request fifo
+         * fifo_len is chfifo_len rounded up to next power of 2
+         * so we can use bitwise ops to wrap
+         */
+        unsigned int fifo_len;
+
+        /* per-channel index to next free descriptor request */
+        int *head;
+
+        /* per-channel index to next in-progress/done descriptor request */
+        int *tail;
+
+        /* per-channel request submission (head) and release (tail) locks */
+        spinlock_t *head_lock;
+        spinlock_t *tail_lock;
+
+        /* request callback tasklet */
+        struct tasklet_struct done_task;
+        struct tasklet_struct error_task;
+
+        /* list of registered algorithms */
+        struct list_head alg_list;
+
+        /* hwrng device */
+        struct hwrng rng;
+};
+
+/*
+ * map virtual single (contiguous) pointer to h/w descriptor pointer
+ */
+static void map_single_talitos_ptr(struct device *dev,
+                                   struct talitos_ptr *talitos_ptr,
+                                   unsigned short len, void *data,
+                                   unsigned char extent,
+                                   enum dma_data_direction dir)
+{
+        talitos_ptr->len = cpu_to_be16(len);
+        talitos_ptr->ptr = cpu_to_be32(dma_map_single(dev, data, len, dir));
+        talitos_ptr->j_extent = extent;
+}
+
+/*
+ * unmap bus single (contiguous) h/w descriptor pointer
+ */
+static void unmap_single_talitos_ptr(struct device *dev,
+                                     struct talitos_ptr *talitos_ptr,
+                                     enum dma_data_direction dir)
+{
+        dma_unmap_single(dev, be32_to_cpu(talitos_ptr->ptr),
+                         be16_to_cpu(talitos_ptr->len), dir);
+}
+
+static int reset_channel(struct device *dev, int ch)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        unsigned int timeout = TALITOS_TIMEOUT;
+
+        setbits32(priv->reg + TALITOS_CCCR(ch), TALITOS_CCCR_RESET);
+
+        while ((in_be32(priv->reg + TALITOS_CCCR(ch)) & TALITOS_CCCR_RESET)
+               && --timeout)
+                cpu_relax();
+
+        if (timeout == 0) {
+                dev_err(dev, "failed to reset channel %d\n", ch);
+                return -EIO;
+        }
+
+        /* set done writeback and IRQ */
+        setbits32(priv->reg + TALITOS_CCCR_LO(ch), TALITOS_CCCR_LO_CDWE |
+                  TALITOS_CCCR_LO_CDIE);
+
+        return 0;
+}
+
+static int reset_device(struct device *dev)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        unsigned int timeout = TALITOS_TIMEOUT;
+
+        setbits32(priv->reg + TALITOS_MCR, TALITOS_MCR_SWR);
+
+        while ((in_be32(priv->reg + TALITOS_MCR) & TALITOS_MCR_SWR)
+               && --timeout)
+                cpu_relax();
+
+        if (timeout == 0) {
+                dev_err(dev, "failed to reset device\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+/*
+ * Reset and initialize the device
+ */
+static int init_device(struct device *dev)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        int ch, err;
+
+        /*
+         * Master reset
+         * errata documentation: warning: certain SEC interrupts
+         * are not fully cleared by writing the MCR:SWR bit,
+         * set bit twice to completely reset
+         */
+        err = reset_device(dev);
+        if (err)
+                return err;
+
+        err = reset_device(dev);
+        if (err)
+                return err;
+
+        /* reset channels */
+        for (ch = 0; ch < priv->num_channels; ch++) {
+                err = reset_channel(dev, ch);
+                if (err)
+                        return err;
+        }
+
+        /* enable channel done and error interrupts */
+        setbits32(priv->reg + TALITOS_IMR, TALITOS_IMR_INIT);
+        setbits32(priv->reg + TALITOS_IMR_LO, TALITOS_IMR_LO_INIT);
+
+        return 0;
+}
+
+/**
+ * talitos_submit - submits a descriptor to the device for processing
+ * @dev:        the SEC device to be used
+ * @desc:       the descriptor to be processed by the device
+ * @callback:   whom to call when processing is complete
+ * @context:    a handle for use by caller (optional)
+ *
+ * desc must contain valid dma-mapped (bus physical) address pointers.
+ * callback must check err and feedback in descriptor header
+ * for device processing status.
+ */
+static int talitos_submit(struct device *dev, struct talitos_desc *desc,
+                          void (*callback)(struct device *dev,
+                                           struct talitos_desc *desc,
+                                           void *context, int error),
+                          void *context)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        struct talitos_request *request;
+        unsigned long flags, ch;
+        int head;
+
+        /* select done notification */
+        desc->hdr |= DESC_HDR_DONE_NOTIFY;
+
+        /* emulate SEC's round-robin channel fifo polling scheme */
+        ch = atomic_inc_return(&priv->last_chan) & (priv->num_channels - 1);
+
+        spin_lock_irqsave(&priv->head_lock[ch], flags);
+
+        head = priv->head[ch];
+        request = &priv->fifo[ch][head];
+
+        if (request->desc) {
+                /* request queue is full */
+                spin_unlock_irqrestore(&priv->head_lock[ch], flags);
+                return -EAGAIN;
+        }
+
+        /* map descriptor and save caller data */
+        request->dma_desc = dma_map_single(dev, desc, sizeof(*desc),
+                                           DMA_BIDIRECTIONAL);
+        request->callback = callback;
+        request->context = context;
+
+        /* increment fifo head */
+        priv->head[ch] = (priv->head[ch] + 1) & (priv->fifo_len - 1);
+
+        smp_wmb();
+        request->desc = desc;
+
+        /* GO! */
+        wmb();
+        out_be32(priv->reg + TALITOS_FF_LO(ch), request->dma_desc);
+
+        spin_unlock_irqrestore(&priv->head_lock[ch], flags);
+
+        return -EINPROGRESS;
+}
+
+/*
+ * process what was done, notify callback of error if not
+ */
+static void flush_channel(struct device *dev, int ch, int error, int reset_ch)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        struct talitos_request *request, saved_req;
+        unsigned long flags;
+        int tail, status;
+
+        spin_lock_irqsave(&priv->tail_lock[ch], flags);
+
+        tail = priv->tail[ch];
+        while (priv->fifo[ch][tail].desc) {
+                request = &priv->fifo[ch][tail];
+
+                /* descriptors with their done bits set don't get the error */
+                rmb();
+                if ((request->desc->hdr & DESC_HDR_DONE) == DESC_HDR_DONE)
+                        status = 0;
+                else
+                        if (!error)
+                                break;
+                        else
+                                status = error;
+
+                dma_unmap_single(dev, request->dma_desc,
+                        sizeof(struct talitos_desc), DMA_BIDIRECTIONAL);
+
+                /* copy entries so we can call callback outside lock */
+                saved_req.desc = request->desc;
+                saved_req.callback = request->callback;
+                saved_req.context = request->context;
+
+                /* release request entry in fifo */
+                smp_wmb();
+                request->desc = NULL;
+
+                /* increment fifo tail */
+                priv->tail[ch] = (tail + 1) & (priv->fifo_len - 1);
+
+                spin_unlock_irqrestore(&priv->tail_lock[ch], flags);
+                saved_req.callback(dev, saved_req.desc, saved_req.context,
+                                   status);
+                /* channel may resume processing in single desc error case */
+                if (error && !reset_ch && status == error)
+                        return;
+                spin_lock_irqsave(&priv->tail_lock[ch], flags);
+                tail = priv->tail[ch];
+        }
+
+        spin_unlock_irqrestore(&priv->tail_lock[ch], flags);
+}
+
+/*
+ * process completed requests for channels that have done status
+ */
+static void talitos_done(unsigned long data)
+{
+        struct device *dev = (struct device *)data;
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        int ch;
+
+        for (ch = 0; ch < priv->num_channels; ch++)
+                flush_channel(dev, ch, 0, 0);
+}
+
+/*
+ * locate current (offending) descriptor
+ */
+static struct talitos_desc *current_desc(struct device *dev, int ch)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        int tail = priv->tail[ch];
+        dma_addr_t cur_desc;
+
+        cur_desc = in_be32(priv->reg + TALITOS_CDPR_LO(ch));
+
+        while (priv->fifo[ch][tail].dma_desc != cur_desc) {
+                tail = (tail + 1) & (priv->fifo_len - 1);
+                if (tail == priv->tail[ch]) {
+                        dev_err(dev, "couldn't locate current descriptor\n");
+                        return NULL;
+                }
+        }
+
+        return priv->fifo[ch][tail].desc;
+}
+
+/*
+ * user diagnostics; report root cause of error based on execution unit status
+ */
+static void report_eu_error(struct device *dev, int ch, struct talitos_desc *desc)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        int i;
+
+        switch (desc->hdr & DESC_HDR_SEL0_MASK) {
+        case DESC_HDR_SEL0_AFEU:
+                dev_err(dev, "AFEUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_AFEUISR),
+                        in_be32(priv->reg + TALITOS_AFEUISR_LO));
+                break;
+        case DESC_HDR_SEL0_DEU:
+                dev_err(dev, "DEUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_DEUISR),
+                        in_be32(priv->reg + TALITOS_DEUISR_LO));
+                break;
+        case DESC_HDR_SEL0_MDEUA:
+        case DESC_HDR_SEL0_MDEUB:
+                dev_err(dev, "MDEUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_MDEUISR),
+                        in_be32(priv->reg + TALITOS_MDEUISR_LO));
+                break;
+        case DESC_HDR_SEL0_RNG:
+                dev_err(dev, "RNGUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_RNGUISR),
+                        in_be32(priv->reg + TALITOS_RNGUISR_LO));
+                break;
+        case DESC_HDR_SEL0_PKEU:
+                dev_err(dev, "PKEUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_PKEUISR),
+                        in_be32(priv->reg + TALITOS_PKEUISR_LO));
+                break;
+        case DESC_HDR_SEL0_AESU:
+                dev_err(dev, "AESUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_AESUISR),
+                        in_be32(priv->reg + TALITOS_AESUISR_LO));
+                break;
+        case DESC_HDR_SEL0_CRCU:
+                dev_err(dev, "CRCUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_CRCUISR),
+                        in_be32(priv->reg + TALITOS_CRCUISR_LO));
+                break;
+        case DESC_HDR_SEL0_KEU:
+                dev_err(dev, "KEUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_KEUISR),
+                        in_be32(priv->reg + TALITOS_KEUISR_LO));
+                break;
+        }
+
+        switch (desc->hdr & DESC_HDR_SEL1_MASK) {
+        case DESC_HDR_SEL1_MDEUA:
+        case DESC_HDR_SEL1_MDEUB:
+                dev_err(dev, "MDEUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_MDEUISR),
+                        in_be32(priv->reg + TALITOS_MDEUISR_LO));
+                break;
+        case DESC_HDR_SEL1_CRCU:
+                dev_err(dev, "CRCUISR 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_CRCUISR),
+                        in_be32(priv->reg + TALITOS_CRCUISR_LO));
+                break;
+        }
+
+        for (i = 0; i < 8; i++)
+                dev_err(dev, "DESCBUF 0x%08x_%08x\n",
+                        in_be32(priv->reg + TALITOS_DESCBUF(ch) + 8*i),
+                        in_be32(priv->reg + TALITOS_DESCBUF_LO(ch) + 8*i));
+}
+
+/*
+ * recover from error interrupts
+ */
+static void talitos_error(unsigned long data)
+{
+        struct device *dev = (struct device *)data;
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        unsigned int timeout = TALITOS_TIMEOUT;
+        int ch, error, reset_dev = 0, reset_ch = 0;
+        u32 isr, isr_lo, v, v_lo;
+
+        isr = in_be32(priv->reg + TALITOS_ISR);
+        isr_lo = in_be32(priv->reg + TALITOS_ISR_LO);
+
+        for (ch = 0; ch < priv->num_channels; ch++) {
+                /* skip channels without errors */
+                if (!(isr & (1 << (ch * 2 + 1))))
+                        continue;
+
+                error = -EINVAL;
+
+                v = in_be32(priv->reg + TALITOS_CCPSR(ch));
+                v_lo = in_be32(priv->reg + TALITOS_CCPSR_LO(ch));
+
+                if (v_lo & TALITOS_CCPSR_LO_DOF) {
+                        dev_err(dev, "double fetch fifo overflow error\n");
+                        error = -EAGAIN;
+                        reset_ch = 1;
+                }
+                if (v_lo & TALITOS_CCPSR_LO_SOF) {
+                        /* h/w dropped descriptor */
+                        dev_err(dev, "single fetch fifo overflow error\n");
+                        error = -EAGAIN;
+                }
+                if (v_lo & TALITOS_CCPSR_LO_MDTE)
+                        dev_err(dev, "master data transfer error\n");
+                if (v_lo & TALITOS_CCPSR_LO_SGDLZ)
+                        dev_err(dev, "s/g data length zero error\n");
+                if (v_lo & TALITOS_CCPSR_LO_FPZ)
+                        dev_err(dev, "fetch pointer zero error\n");
+                if (v_lo & TALITOS_CCPSR_LO_IDH)
+                        dev_err(dev, "illegal descriptor header error\n");
+                if (v_lo & TALITOS_CCPSR_LO_IEU)
+                        dev_err(dev, "invalid execution unit error\n");
+                if (v_lo & TALITOS_CCPSR_LO_EU)
+                        report_eu_error(dev, ch, current_desc(dev, ch));
+                if (v_lo & TALITOS_CCPSR_LO_GB)
+                        dev_err(dev, "gather boundary error\n");
+                if (v_lo & TALITOS_CCPSR_LO_GRL)
+                        dev_err(dev, "gather return/length error\n");
+                if (v_lo & TALITOS_CCPSR_LO_SB)
+                        dev_err(dev, "scatter boundary error\n");
+                if (v_lo & TALITOS_CCPSR_LO_SRL)
+                        dev_err(dev, "scatter return/length error\n");
+
+                flush_channel(dev, ch, error, reset_ch);
+
+                if (reset_ch) {
+                        reset_channel(dev, ch);
+                } else {
+                        setbits32(priv->reg + TALITOS_CCCR(ch),
+                                  TALITOS_CCCR_CONT);
+                        setbits32(priv->reg + TALITOS_CCCR_LO(ch), 0);
+                        while ((in_be32(priv->reg + TALITOS_CCCR(ch)) &
+                               TALITOS_CCCR_CONT) && --timeout)
+                                cpu_relax();
+                        if (timeout == 0) {
+                                dev_err(dev, "failed to restart channel %d\n",
+                                        ch);
+                                reset_dev = 1;
+                        }
+                }
+        }
+        if (reset_dev || isr & ~TALITOS_ISR_CHERR || isr_lo) {
+                dev_err(dev, "done overflow, internal time out, or rngu error: "
+                        "ISR 0x%08x_%08x\n", isr, isr_lo);
+
+                /* purge request queues */
+                for (ch = 0; ch < priv->num_channels; ch++)
+                        flush_channel(dev, ch, -EIO, 1);
+
+                /* reset and reinitialize the device */
+                init_device(dev);
+        }
+}
+
+static irqreturn_t talitos_interrupt(int irq, void *data)
+{
+        struct device *dev = data;
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        u32 isr, isr_lo;
+
+        isr = in_be32(priv->reg + TALITOS_ISR);
+        isr_lo = in_be32(priv->reg + TALITOS_ISR_LO);
+
+        /* ack */
+        out_be32(priv->reg + TALITOS_ICR, isr);
+        out_be32(priv->reg + TALITOS_ICR_LO, isr_lo);
+
+        if (unlikely((isr & ~TALITOS_ISR_CHDONE) || isr_lo))
+                talitos_error((unsigned long)data);
+        else
+                if (likely(isr & TALITOS_ISR_CHDONE))
+                        tasklet_schedule(&priv->done_task);
+
+        return (isr || isr_lo) ? IRQ_HANDLED : IRQ_NONE;
+}
+
+/*
+ * hwrng
+ */
+static int talitos_rng_data_present(struct hwrng *rng, int wait)
+{
+        struct device *dev = (struct device *)rng->priv;
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        u32 ofl;
+        int i;
+
+        for (i = 0; i < 20; i++) {
+                ofl = in_be32(priv->reg + TALITOS_RNGUSR_LO) &
+                      TALITOS_RNGUSR_LO_OFL;
+                if (ofl || !wait)
+                        break;
+                udelay(10);
+        }
+
+        return !!ofl;
+}
+
+static int talitos_rng_data_read(struct hwrng *rng, u32 *data)
+{
+        struct device *dev = (struct device *)rng->priv;
+        struct talitos_private *priv = dev_get_drvdata(dev);
+
+        /* rng fifo requires 64-bit accesses */
+        *data = in_be32(priv->reg + TALITOS_RNGU_FIFO);
+        *data = in_be32(priv->reg + TALITOS_RNGU_FIFO_LO);
+
+        return sizeof(u32);
+}
+
+static int talitos_rng_init(struct hwrng *rng)
+{
+        struct device *dev = (struct device *)rng->priv;
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        unsigned int timeout = TALITOS_TIMEOUT;
+
+        setbits32(priv->reg + TALITOS_RNGURCR_LO, TALITOS_RNGURCR_LO_SR);
+        while (!(in_be32(priv->reg + TALITOS_RNGUSR_LO) & TALITOS_RNGUSR_LO_RD)
+               && --timeout)
+                cpu_relax();
+        if (timeout == 0) {
+                dev_err(dev, "failed to reset rng hw\n");
+                return -ENODEV;
+        }
+
+        /* start generating */
+        setbits32(priv->reg + TALITOS_RNGUDSR_LO, 0);
+
+        return 0;
+}
+
+static int talitos_register_rng(struct device *dev)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+
+        priv->rng.name          = dev_driver_string(dev),
+        priv->rng.init          = talitos_rng_init,
+        priv->rng.data_present  = talitos_rng_data_present,
+        priv->rng.data_read     = talitos_rng_data_read,
+        priv->rng.priv          = (unsigned long)dev;
+
+        return hwrng_register(&priv->rng);
+}
+
+static void talitos_unregister_rng(struct device *dev)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+
+        hwrng_unregister(&priv->rng);
+}
+
+/*
+ * crypto alg
+ */
+#define TALITOS_CRA_PRIORITY            3000
+#define TALITOS_MAX_KEY_SIZE            64
+#define TALITOS_MAX_IV_LENGTH           16 /* max of AES_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE */
+
+#define MD5_DIGEST_SIZE   16
+
+struct talitos_ctx {
+        struct device *dev;
+        __be32 desc_hdr_template;
+        u8 key[TALITOS_MAX_KEY_SIZE];
+        u8 iv[TALITOS_MAX_IV_LENGTH];
+        unsigned int keylen;
+        unsigned int enckeylen;
+        unsigned int authkeylen;
+        unsigned int authsize;
+};
+
+static int aead_authenc_setauthsize(struct crypto_aead *authenc,
+                                                 unsigned int authsize)
+{
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+
+        ctx->authsize = authsize;
+
+        return 0;
+}
+
+static int aead_authenc_setkey(struct crypto_aead *authenc,
+                                            const u8 *key, unsigned int keylen)
+{
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+        struct rtattr *rta = (void *)key;
+        struct crypto_authenc_key_param *param;
+        unsigned int authkeylen;
+        unsigned int enckeylen;
+
+        if (!RTA_OK(rta, keylen))
+                goto badkey;
+
+        if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
+                goto badkey;
+
+        if (RTA_PAYLOAD(rta) < sizeof(*param))
+                goto badkey;
+
+        param = RTA_DATA(rta);
+        enckeylen = be32_to_cpu(param->enckeylen);
+
+        key += RTA_ALIGN(rta->rta_len);
+        keylen -= RTA_ALIGN(rta->rta_len);
+
+        if (keylen < enckeylen)
+                goto badkey;
+
+        authkeylen = keylen - enckeylen;
+
+        if (keylen > TALITOS_MAX_KEY_SIZE)
+                goto badkey;
+
+        memcpy(&ctx->key, key, keylen);
+
+        ctx->keylen = keylen;
+        ctx->enckeylen = enckeylen;
+        ctx->authkeylen = authkeylen;
+
+        return 0;
+
+badkey:
+        crypto_aead_set_flags(authenc, CRYPTO_TFM_RES_BAD_KEY_LEN);
+        return -EINVAL;
+}
+
+/*
+ * ipsec_esp_edesc - s/w-extended ipsec_esp descriptor
+ * @src_nents: number of segments in input scatterlist
+ * @dst_nents: number of segments in output scatterlist
+ * @dma_len: length of dma mapped link_tbl space
+ * @dma_link_tbl: bus physical address of link_tbl
+ * @desc: h/w descriptor
+ * @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1)
+ *
+ * if decrypting (with authcheck), or either one of src_nents or dst_nents
+ * is greater than 1, an integrity check value is concatenated to the end
+ * of link_tbl data
+ */
+struct ipsec_esp_edesc {
+        int src_nents;
+        int dst_nents;
+        int dma_len;
+        dma_addr_t dma_link_tbl;
+        struct talitos_desc desc;
+        struct talitos_ptr link_tbl[0];
+};
+
+static void ipsec_esp_unmap(struct device *dev,
+                            struct ipsec_esp_edesc *edesc,
+                            struct aead_request *areq)
+{
+        unmap_single_talitos_ptr(dev, &edesc->desc.ptr[6], DMA_FROM_DEVICE);
+        unmap_single_talitos_ptr(dev, &edesc->desc.ptr[3], DMA_TO_DEVICE);
+        unmap_single_talitos_ptr(dev, &edesc->desc.ptr[2], DMA_TO_DEVICE);
+        unmap_single_talitos_ptr(dev, &edesc->desc.ptr[0], DMA_TO_DEVICE);
+
+        dma_unmap_sg(dev, areq->assoc, 1, DMA_TO_DEVICE);
+
+        if (areq->src != areq->dst) {
+                dma_unmap_sg(dev, areq->src, edesc->src_nents ? : 1,
+                             DMA_TO_DEVICE);
+                dma_unmap_sg(dev, areq->dst, edesc->dst_nents ? : 1,
+                             DMA_FROM_DEVICE);
+        } else {
+                dma_unmap_sg(dev, areq->src, edesc->src_nents ? : 1,
+                             DMA_BIDIRECTIONAL);
+        }
+
+        if (edesc->dma_len)
+                dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len,
+                                 DMA_BIDIRECTIONAL);
+}
+
+/*
+ * ipsec_esp descriptor callbacks
+ */
+static void ipsec_esp_encrypt_done(struct device *dev,
+                                   struct talitos_desc *desc, void *context,
+                                   int err)
+{
+        struct aead_request *areq = context;
+        struct ipsec_esp_edesc *edesc =
+                 container_of(desc, struct ipsec_esp_edesc, desc);
+        struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+        struct scatterlist *sg;
+        void *icvdata;
+
+        ipsec_esp_unmap(dev, edesc, areq);
+
+        /* copy the generated ICV to dst */
+        if (edesc->dma_len) {
+                icvdata = &edesc->link_tbl[edesc->src_nents +
+                                           edesc->dst_nents + 1];
+                sg = sg_last(areq->dst, edesc->dst_nents);
+                memcpy((char *)sg_virt(sg) + sg->length - ctx->authsize,
+                       icvdata, ctx->authsize);
+        }
+
+        kfree(edesc);
+
+        aead_request_complete(areq, err);
+}
+
+static void ipsec_esp_decrypt_done(struct device *dev,
+                                   struct talitos_desc *desc, void *context,
+                                   int err)
+{
+        struct aead_request *req = context;
+        struct ipsec_esp_edesc *edesc =
+                 container_of(desc, struct ipsec_esp_edesc, desc);
+        struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+        struct scatterlist *sg;
+        void *icvdata;
+
+        ipsec_esp_unmap(dev, edesc, req);
+
+        if (!err) {
+                /* auth check */
+                if (edesc->dma_len)
+                        icvdata = &edesc->link_tbl[edesc->src_nents +
+                                                   edesc->dst_nents + 1];
+                else
+                        icvdata = &edesc->link_tbl[0];
+
+                sg = sg_last(req->dst, edesc->dst_nents ? : 1);
+                err = memcmp(icvdata, (char *)sg_virt(sg) + sg->length -
+                             ctx->authsize, ctx->authsize) ? -EBADMSG : 0;
+        }
+
+        kfree(edesc);
+
+        aead_request_complete(req, err);
+}
+
+/*
+ * convert scatterlist to SEC h/w link table format
+ * stop at cryptlen bytes
+ */
+static int sg_to_link_tbl(struct scatterlist *sg, int sg_count,
+                           int cryptlen, struct talitos_ptr *link_tbl_ptr)
+{
+        int n_sg = sg_count;
+
+        while (n_sg--) {
+                link_tbl_ptr->ptr = cpu_to_be32(sg_dma_address(sg));
+                link_tbl_ptr->len = cpu_to_be16(sg_dma_len(sg));
+                link_tbl_ptr->j_extent = 0;
+                link_tbl_ptr++;
+                cryptlen -= sg_dma_len(sg);
+                sg = sg_next(sg);
+        }
+
+        /* adjust (decrease) last one (or two) entry's len to cryptlen */
+        link_tbl_ptr--;
+        while (link_tbl_ptr->len <= (-cryptlen)) {
+                /* Empty this entry, and move to previous one */
+                cryptlen += be16_to_cpu(link_tbl_ptr->len);
+                link_tbl_ptr->len = 0;
+                sg_count--;
+                link_tbl_ptr--;
+        }
+        link_tbl_ptr->len = cpu_to_be16(be16_to_cpu(link_tbl_ptr->len)
+                                        + cryptlen);
+
+        /* tag end of link table */
+        link_tbl_ptr->j_extent = DESC_PTR_LNKTBL_RETURN;
+
+        return sg_count;
+}
+
+/*
+ * fill in and submit ipsec_esp descriptor
+ */
+static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq,
+                     u8 *giv, u64 seq,
+                     void (*callback) (struct device *dev,
+                                       struct talitos_desc *desc,
+                                       void *context, int error))
+{
+        struct crypto_aead *aead = crypto_aead_reqtfm(areq);
+        struct talitos_ctx *ctx = crypto_aead_ctx(aead);
+        struct device *dev = ctx->dev;
+        struct talitos_desc *desc = &edesc->desc;
+        unsigned int cryptlen = areq->cryptlen;
+        unsigned int authsize = ctx->authsize;
+        unsigned int ivsize;
+        int sg_count;
+
+        /* hmac key */
+        map_single_talitos_ptr(dev, &desc->ptr[0], ctx->authkeylen, &ctx->key,
+                               0, DMA_TO_DEVICE);
+        /* hmac data */
+        map_single_talitos_ptr(dev, &desc->ptr[1], sg_virt(areq->src) -
+                               sg_virt(areq->assoc), sg_virt(areq->assoc), 0,
+                               DMA_TO_DEVICE);
+        /* cipher iv */
+        ivsize = crypto_aead_ivsize(aead);
+        map_single_talitos_ptr(dev, &desc->ptr[2], ivsize, giv ?: areq->iv, 0,
+                               DMA_TO_DEVICE);
+
+        /* cipher key */
+        map_single_talitos_ptr(dev, &desc->ptr[3], ctx->enckeylen,
+                               (char *)&ctx->key + ctx->authkeylen, 0,
+                               DMA_TO_DEVICE);
+
+        /*
+         * cipher in
+         * map and adjust cipher len to aead request cryptlen.
+         * extent is bytes of HMAC postpended to ciphertext,
+         * typically 12 for ipsec
+         */
+        desc->ptr[4].len = cpu_to_be16(cryptlen);
+        desc->ptr[4].j_extent = authsize;
+
+        if (areq->src == areq->dst)
+                sg_count = dma_map_sg(dev, areq->src, edesc->src_nents ? : 1,
+                                      DMA_BIDIRECTIONAL);
+        else
+                sg_count = dma_map_sg(dev, areq->src, edesc->src_nents ? : 1,
+                                      DMA_TO_DEVICE);
+
+        if (sg_count == 1) {
+                desc->ptr[4].ptr = cpu_to_be32(sg_dma_address(areq->src));
+        } else {
+                sg_count = sg_to_link_tbl(areq->src, sg_count, cryptlen,
+                                          &edesc->link_tbl[0]);
+                if (sg_count > 1) {
+                        desc->ptr[4].j_extent |= DESC_PTR_LNKTBL_JUMP;
+                        desc->ptr[4].ptr = cpu_to_be32(edesc->dma_link_tbl);
+                        dma_sync_single_for_device(ctx->dev, edesc->dma_link_tbl,
+                                                   edesc->dma_len, DMA_BIDIRECTIONAL);
+                } else {
+                        /* Only one segment now, so no link tbl needed */
+                        desc->ptr[4].ptr = cpu_to_be32(sg_dma_address(areq->src));
+                }
+        }
+
+        /* cipher out */
+        desc->ptr[5].len = cpu_to_be16(cryptlen);
+        desc->ptr[5].j_extent = authsize;
+
+        if (areq->src != areq->dst) {
+                sg_count = dma_map_sg(dev, areq->dst, edesc->dst_nents ? : 1,
+                                      DMA_FROM_DEVICE);
+        }
+
+        if (sg_count == 1) {
+                desc->ptr[5].ptr = cpu_to_be32(sg_dma_address(areq->dst));
+        } else {
+                struct talitos_ptr *link_tbl_ptr =
+                        &edesc->link_tbl[edesc->src_nents];
+                struct scatterlist *sg;
+
+                desc->ptr[5].ptr = cpu_to_be32((struct talitos_ptr *)
+                                               edesc->dma_link_tbl +
+                                               edesc->src_nents);
+                if (areq->src == areq->dst) {
+                        memcpy(link_tbl_ptr, &edesc->link_tbl[0],
+                               edesc->src_nents * sizeof(struct talitos_ptr));
+                } else {
+                        sg_count = sg_to_link_tbl(areq->dst, sg_count, cryptlen,
+                                                  link_tbl_ptr);
+                }
+                link_tbl_ptr += sg_count - 1;
+
+                /* handle case where sg_last contains the ICV exclusively */
+                sg = sg_last(areq->dst, edesc->dst_nents);
+                if (sg->length == ctx->authsize)
+                        link_tbl_ptr--;
+
+                link_tbl_ptr->j_extent = 0;
+                link_tbl_ptr++;
+                link_tbl_ptr->j_extent = DESC_PTR_LNKTBL_RETURN;
+                link_tbl_ptr->len = cpu_to_be16(authsize);
+
+                /* icv data follows link tables */
+                link_tbl_ptr->ptr = cpu_to_be32((struct talitos_ptr *)
+                                                edesc->dma_link_tbl +
+                                                edesc->src_nents +
+                                                edesc->dst_nents + 1);
+
+                desc->ptr[5].j_extent |= DESC_PTR_LNKTBL_JUMP;
+                dma_sync_single_for_device(ctx->dev, edesc->dma_link_tbl,
+                                           edesc->dma_len, DMA_BIDIRECTIONAL);
+        }
+
+        /* iv out */
+        map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv, 0,
+                               DMA_FROM_DEVICE);
+
+        return talitos_submit(dev, desc, callback, areq);
+}
+
+
+/*
+ * derive number of elements in scatterlist
+ */
+static int sg_count(struct scatterlist *sg_list, int nbytes)
+{
+        struct scatterlist *sg = sg_list;
+        int sg_nents = 0;
+
+        while (nbytes) {
+                sg_nents++;
+                nbytes -= sg->length;
+                sg = sg_next(sg);
+        }
+
+        return sg_nents;
+}
+
+/*
+ * allocate and map the ipsec_esp extended descriptor
+ */
+static struct ipsec_esp_edesc *ipsec_esp_edesc_alloc(struct aead_request *areq,
+                                                     int icv_stashing)
+{
+        struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+        struct ipsec_esp_edesc *edesc;
+        int src_nents, dst_nents, alloc_len, dma_len;
+
+        if (areq->cryptlen + ctx->authsize > TALITOS_MAX_DATA_LEN) {
+                dev_err(ctx->dev, "cryptlen exceeds h/w max limit\n");
+                return ERR_PTR(-EINVAL);
+        }
+
+        src_nents = sg_count(areq->src, areq->cryptlen + ctx->authsize);
+        src_nents = (src_nents == 1) ? 0 : src_nents;
+
+        if (areq->dst == areq->src) {
+                dst_nents = src_nents;
+        } else {
+                dst_nents = sg_count(areq->dst, areq->cryptlen + ctx->authsize);
+                dst_nents = (dst_nents == 1) ? 0 : src_nents;
+        }
+
+        /*
+         * allocate space for base edesc plus the link tables,
+         * allowing for a separate entry for the generated ICV (+ 1),
+         * and the ICV data itself
+         */
+        alloc_len = sizeof(struct ipsec_esp_edesc);
+        if (src_nents || dst_nents) {
+                dma_len = (src_nents + dst_nents + 1) *
+                                 sizeof(struct talitos_ptr) + ctx->authsize;
+                alloc_len += dma_len;
+        } else {
+                dma_len = 0;
+                alloc_len += icv_stashing ? ctx->authsize : 0;
+        }
+
+        edesc = kmalloc(alloc_len, GFP_DMA);
+        if (!edesc) {
+                dev_err(ctx->dev, "could not allocate edescriptor\n");
+                return ERR_PTR(-ENOMEM);
+        }
+
+        edesc->src_nents = src_nents;
+        edesc->dst_nents = dst_nents;
+        edesc->dma_len = dma_len;
+        edesc->dma_link_tbl = dma_map_single(ctx->dev, &edesc->link_tbl[0],
+                                             edesc->dma_len, DMA_BIDIRECTIONAL);
+
+        return edesc;
+}
+
+static int aead_authenc_encrypt(struct aead_request *req)
+{
+        struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+        struct ipsec_esp_edesc *edesc;
+
+        /* allocate extended descriptor */
+        edesc = ipsec_esp_edesc_alloc(req, 0);
+        if (IS_ERR(edesc))
+                return PTR_ERR(edesc);
+
+        /* set encrypt */
+        edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT;
+
+        return ipsec_esp(edesc, req, NULL, 0, ipsec_esp_encrypt_done);
+}
+
+static int aead_authenc_decrypt(struct aead_request *req)
+{
+        struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+        unsigned int authsize = ctx->authsize;
+        struct ipsec_esp_edesc *edesc;
+        struct scatterlist *sg;
+        void *icvdata;
+
+        req->cryptlen -= authsize;
+
+        /* allocate extended descriptor */
+        edesc = ipsec_esp_edesc_alloc(req, 1);
+        if (IS_ERR(edesc))
+                return PTR_ERR(edesc);
+
+        /* stash incoming ICV for later cmp with ICV generated by the h/w */
+        if (edesc->dma_len)
+                icvdata = &edesc->link_tbl[edesc->src_nents +
+                                           edesc->dst_nents + 1];
+        else
+                icvdata = &edesc->link_tbl[0];
+
+        sg = sg_last(req->src, edesc->src_nents ? : 1);
+
+        memcpy(icvdata, (char *)sg_virt(sg) + sg->length - ctx->authsize,
+               ctx->authsize);
+
+        /* decrypt */
+        edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND;
+
+        return ipsec_esp(edesc, req, NULL, 0, ipsec_esp_decrypt_done);
+}
+
+static int aead_authenc_givencrypt(
+        struct aead_givcrypt_request *req)
+{
+        struct aead_request *areq = &req->areq;
+        struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
+        struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
+        struct ipsec_esp_edesc *edesc;
+
+        /* allocate extended descriptor */
+        edesc = ipsec_esp_edesc_alloc(areq, 0);
+        if (IS_ERR(edesc))
+                return PTR_ERR(edesc);
+
+        /* set encrypt */
+        edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT;
+
+        memcpy(req->giv, ctx->iv, crypto_aead_ivsize(authenc));
+
+        return ipsec_esp(edesc, areq, req->giv, req->seq,
+                         ipsec_esp_encrypt_done);
+}
+
+struct talitos_alg_template {
+        char name[CRYPTO_MAX_ALG_NAME];
+        char driver_name[CRYPTO_MAX_ALG_NAME];
+        unsigned int blocksize;
+        struct aead_alg aead;
+        struct device *dev;
+        __be32 desc_hdr_template;
+};
+
+static struct talitos_alg_template driver_algs[] = {
+        /* single-pass ipsec_esp descriptor */
+        {
+                .name = "authenc(hmac(sha1),cbc(aes))",
+                .driver_name = "authenc-hmac-sha1-cbc-aes-talitos",
+                .blocksize = AES_BLOCK_SIZE,
+                .aead = {
+                        .setkey = aead_authenc_setkey,
+                        .setauthsize = aead_authenc_setauthsize,
+                        .encrypt = aead_authenc_encrypt,
+                        .decrypt = aead_authenc_decrypt,
+                        .givencrypt = aead_authenc_givencrypt,
+                        .geniv = "<built-in>",
+                        .ivsize = AES_BLOCK_SIZE,
+                        .maxauthsize = SHA1_DIGEST_SIZE,
+                        },
+                .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
+                                     DESC_HDR_SEL0_AESU |
+                                     DESC_HDR_MODE0_AESU_CBC |
+                                     DESC_HDR_SEL1_MDEUA |
+                                     DESC_HDR_MODE1_MDEU_INIT |
+                                     DESC_HDR_MODE1_MDEU_PAD |
+                                     DESC_HDR_MODE1_MDEU_SHA1_HMAC,
+        },
+        {
+                .name = "authenc(hmac(sha1),cbc(des3_ede))",
+                .driver_name = "authenc-hmac-sha1-cbc-3des-talitos",
+                .blocksize = DES3_EDE_BLOCK_SIZE,
+                .aead = {
+                        .setkey = aead_authenc_setkey,
+                        .setauthsize = aead_authenc_setauthsize,
+                        .encrypt = aead_authenc_encrypt,
+                        .decrypt = aead_authenc_decrypt,
+                        .givencrypt = aead_authenc_givencrypt,
+                        .geniv = "<built-in>",
+                        .ivsize = DES3_EDE_BLOCK_SIZE,
+                        .maxauthsize = SHA1_DIGEST_SIZE,
+                        },
+                .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
+                                     DESC_HDR_SEL0_DEU |
+                                     DESC_HDR_MODE0_DEU_CBC |
+                                     DESC_HDR_MODE0_DEU_3DES |
+                                     DESC_HDR_SEL1_MDEUA |
+                                     DESC_HDR_MODE1_MDEU_INIT |
+                                     DESC_HDR_MODE1_MDEU_PAD |
+                                     DESC_HDR_MODE1_MDEU_SHA1_HMAC,
+        },
+        {
+                .name = "authenc(hmac(sha256),cbc(aes))",
+                .driver_name = "authenc-hmac-sha256-cbc-aes-talitos",
+                .blocksize = AES_BLOCK_SIZE,
+                .aead = {
+                        .setkey = aead_authenc_setkey,
+                        .setauthsize = aead_authenc_setauthsize,
+                        .encrypt = aead_authenc_encrypt,
+                        .decrypt = aead_authenc_decrypt,
+                        .givencrypt = aead_authenc_givencrypt,
+                        .geniv = "<built-in>",
+                        .ivsize = AES_BLOCK_SIZE,
+                        .maxauthsize = SHA256_DIGEST_SIZE,
+                        },
+                .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
+                                     DESC_HDR_SEL0_AESU |
+                                     DESC_HDR_MODE0_AESU_CBC |
+                                     DESC_HDR_SEL1_MDEUA |
+                                     DESC_HDR_MODE1_MDEU_INIT |
+                                     DESC_HDR_MODE1_MDEU_PAD |
+                                     DESC_HDR_MODE1_MDEU_SHA256_HMAC,
+        },
+        {
+                .name = "authenc(hmac(sha256),cbc(des3_ede))",
+                .driver_name = "authenc-hmac-sha256-cbc-3des-talitos",
+                .blocksize = DES3_EDE_BLOCK_SIZE,
+                .aead = {
+                        .setkey = aead_authenc_setkey,
+                        .setauthsize = aead_authenc_setauthsize,
+                        .encrypt = aead_authenc_encrypt,
+                        .decrypt = aead_authenc_decrypt,
+                        .givencrypt = aead_authenc_givencrypt,
+                        .geniv = "<built-in>",
+                        .ivsize = DES3_EDE_BLOCK_SIZE,
+                        .maxauthsize = SHA256_DIGEST_SIZE,
+                        },
+                .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
+                                     DESC_HDR_SEL0_DEU |
+                                     DESC_HDR_MODE0_DEU_CBC |
+                                     DESC_HDR_MODE0_DEU_3DES |
+                                     DESC_HDR_SEL1_MDEUA |
+                                     DESC_HDR_MODE1_MDEU_INIT |
+                                     DESC_HDR_MODE1_MDEU_PAD |
+                                     DESC_HDR_MODE1_MDEU_SHA256_HMAC,
+        },
+        {
+                .name = "authenc(hmac(md5),cbc(aes))",
+                .driver_name = "authenc-hmac-md5-cbc-aes-talitos",
+                .blocksize = AES_BLOCK_SIZE,
+                .aead = {
+                        .setkey = aead_authenc_setkey,
+                        .setauthsize = aead_authenc_setauthsize,
+                        .encrypt = aead_authenc_encrypt,
+                        .decrypt = aead_authenc_decrypt,
+                        .givencrypt = aead_authenc_givencrypt,
+                        .geniv = "<built-in>",
+                        .ivsize = AES_BLOCK_SIZE,
+                        .maxauthsize = MD5_DIGEST_SIZE,
+                        },
+                .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
+                                     DESC_HDR_SEL0_AESU |
+                                     DESC_HDR_MODE0_AESU_CBC |
+                                     DESC_HDR_SEL1_MDEUA |
+                                     DESC_HDR_MODE1_MDEU_INIT |
+                                     DESC_HDR_MODE1_MDEU_PAD |
+                                     DESC_HDR_MODE1_MDEU_MD5_HMAC,
+        },
+        {
+                .name = "authenc(hmac(md5),cbc(des3_ede))",
+                .driver_name = "authenc-hmac-md5-cbc-3des-talitos",
+                .blocksize = DES3_EDE_BLOCK_SIZE,
+                .aead = {
+                        .setkey = aead_authenc_setkey,
+                        .setauthsize = aead_authenc_setauthsize,
+                        .encrypt = aead_authenc_encrypt,
+                        .decrypt = aead_authenc_decrypt,
+                        .givencrypt = aead_authenc_givencrypt,
+                        .geniv = "<built-in>",
+                        .ivsize = DES3_EDE_BLOCK_SIZE,
+                        .maxauthsize = MD5_DIGEST_SIZE,
+                        },
+                .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
+                                     DESC_HDR_SEL0_DEU |
+                                     DESC_HDR_MODE0_DEU_CBC |
+                                     DESC_HDR_MODE0_DEU_3DES |
+                                     DESC_HDR_SEL1_MDEUA |
+                                     DESC_HDR_MODE1_MDEU_INIT |
+                                     DESC_HDR_MODE1_MDEU_PAD |
+                                     DESC_HDR_MODE1_MDEU_MD5_HMAC,
+        }
+};
+
+struct talitos_crypto_alg {
+        struct list_head entry;
+        struct device *dev;
+        __be32 desc_hdr_template;
+        struct crypto_alg crypto_alg;
+};
+
+static int talitos_cra_init(struct crypto_tfm *tfm)
+{
+        struct crypto_alg *alg = tfm->__crt_alg;
+        struct talitos_crypto_alg *talitos_alg =
+                 container_of(alg, struct talitos_crypto_alg, crypto_alg);
+        struct talitos_ctx *ctx = crypto_tfm_ctx(tfm);
+
+        /* update context with ptr to dev */
+        ctx->dev = talitos_alg->dev;
+        /* copy descriptor header template value */
+        ctx->desc_hdr_template = talitos_alg->desc_hdr_template;
+
+        /* random first IV */
+        get_random_bytes(ctx->iv, TALITOS_MAX_IV_LENGTH);
+
+        return 0;
+}
+
+/*
+ * given the alg's descriptor header template, determine whether descriptor
+ * type and primary/secondary execution units required match the hw
+ * capabilities description provided in the device tree node.
+ */
+static int hw_supports(struct device *dev, __be32 desc_hdr_template)
+{
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        int ret;
+
+        ret = (1 << DESC_TYPE(desc_hdr_template) & priv->desc_types) &&
+              (1 << PRIMARY_EU(desc_hdr_template) & priv->exec_units);
+
+        if (SECONDARY_EU(desc_hdr_template))
+                ret = ret && (1 << SECONDARY_EU(desc_hdr_template)
+                              & priv->exec_units);
+
+        return ret;
+}
+
+static int __devexit talitos_remove(struct of_device *ofdev)
+{
+        struct device *dev = &ofdev->dev;
+        struct talitos_private *priv = dev_get_drvdata(dev);
+        struct talitos_crypto_alg *t_alg, *n;
+        int i;
+
+        list_for_each_entry_safe(t_alg, n, &priv->alg_list, entry) {
+                crypto_unregister_alg(&t_alg->crypto_alg);
+                list_del(&t_alg->entry);
+                kfree(t_alg);
+        }
+
+        if (hw_supports(dev, DESC_HDR_SEL0_RNG))
+                talitos_unregister_rng(dev);
+
+        kfree(priv->tail);
+        kfree(priv->head);
+
+        if (priv->fifo)
+                for (i = 0; i < priv->num_channels; i++)
+                        kfree(priv->fifo[i]);
+
+        kfree(priv->fifo);
+        kfree(priv->head_lock);
+        kfree(priv->tail_lock);
+
+        if (priv->irq != NO_IRQ) {
+                free_irq(priv->irq, dev);
+                irq_dispose_mapping(priv->irq);
+        }
+
+        tasklet_kill(&priv->done_task);
+        tasklet_kill(&priv->error_task);
+
+        iounmap(priv->reg);
+
+        dev_set_drvdata(dev, NULL);
+
+        kfree(priv);
+
+        return 0;
+}
+
+static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
+                                                    struct talitos_alg_template
+                                                           *template)
+{
+        struct talitos_crypto_alg *t_alg;
+        struct crypto_alg *alg;
+
+        t_alg = kzalloc(sizeof(struct talitos_crypto_alg), GFP_KERNEL);
+        if (!t_alg)
+                return ERR_PTR(-ENOMEM);
+
+        alg = &t_alg->crypto_alg;
+
+        snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s", template->name);
+        snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
+                 template->driver_name);
+        alg->cra_module = THIS_MODULE;
+        alg->cra_init = talitos_cra_init;
+        alg->cra_priority = TALITOS_CRA_PRIORITY;
+        alg->cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;
+        alg->cra_blocksize = template->blocksize;
+        alg->cra_alignmask = 0;
+        alg->cra_type = &crypto_aead_type;
+        alg->cra_ctxsize = sizeof(struct talitos_ctx);
+        alg->cra_u.aead = template->aead;
+
+        t_alg->desc_hdr_template = template->desc_hdr_template;
+        t_alg->dev = dev;
+
+        return t_alg;
+}
+
+static int talitos_probe(struct of_device *ofdev,
+                         const struct of_device_id *match)
+{
+        struct device *dev = &ofdev->dev;
+        struct device_node *np = ofdev->node;
+        struct talitos_private *priv;
+        const unsigned int *prop;
+        int i, err;
+
+        priv = kzalloc(sizeof(struct talitos_private), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        dev_set_drvdata(dev, priv);
+
+        priv->ofdev = ofdev;
+
+        tasklet_init(&priv->done_task, talitos_done, (unsigned long)dev);
+        tasklet_init(&priv->error_task, talitos_error, (unsigned long)dev);
+
+        priv->irq = irq_of_parse_and_map(np, 0);
+
+        if (priv->irq == NO_IRQ) {
+                dev_err(dev, "failed to map irq\n");
+                err = -EINVAL;
+                goto err_out;
+        }
+
+        /* get the irq line */
+        err = request_irq(priv->irq, talitos_interrupt, 0,
+                          dev_driver_string(dev), dev);
+        if (err) {
+                dev_err(dev, "failed to request irq %d\n", priv->irq);
+                irq_dispose_mapping(priv->irq);
+                priv->irq = NO_IRQ;
+                goto err_out;
+        }
+
+        priv->reg = of_iomap(np, 0);
+        if (!priv->reg) {
+                dev_err(dev, "failed to of_iomap\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+
+        /* get SEC version capabilities from device tree */
+        prop = of_get_property(np, "fsl,num-channels", NULL);
+        if (prop)
+                priv->num_channels = *prop;
+
+        prop = of_get_property(np, "fsl,channel-fifo-len", NULL);
+        if (prop)
+                priv->chfifo_len = *prop;
+
+        prop = of_get_property(np, "fsl,exec-units-mask", NULL);
+        if (prop)
+                priv->exec_units = *prop;
+
+        prop = of_get_property(np, "fsl,descriptor-types-mask", NULL);
+        if (prop)
+                priv->desc_types = *prop;
+
+        if (!is_power_of_2(priv->num_channels) || !priv->chfifo_len ||
+            !priv->exec_units || !priv->desc_types) {
+                dev_err(dev, "invalid property data in device tree node\n");
+                err = -EINVAL;
+                goto err_out;
+        }
+
+        of_node_put(np);
+        np = NULL;
+
+        priv->head_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels,
+                                  GFP_KERNEL);
+        priv->tail_lock = kmalloc(sizeof(spinlock_t) * priv->num_channels,
+                                  GFP_KERNEL);
+        if (!priv->head_lock || !priv->tail_lock) {
+                dev_err(dev, "failed to allocate fifo locks\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+
+        for (i = 0; i < priv->num_channels; i++) {
+                spin_lock_init(&priv->head_lock[i]);
+                spin_lock_init(&priv->tail_lock[i]);
+        }
+
+        priv->fifo = kmalloc(sizeof(struct talitos_request *) *
+                             priv->num_channels, GFP_KERNEL);
+        if (!priv->fifo) {
+                dev_err(dev, "failed to allocate request fifo\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+
+        priv->fifo_len = roundup_pow_of_two(priv->chfifo_len);
+
+        for (i = 0; i < priv->num_channels; i++) {
+                priv->fifo[i] = kzalloc(sizeof(struct talitos_request) *
+                                        priv->fifo_len, GFP_KERNEL);
+                if (!priv->fifo[i]) {
+                        dev_err(dev, "failed to allocate request fifo %d\n", i);
+                        err = -ENOMEM;
+                        goto err_out;
+                }
+        }
+
+        priv->head = kzalloc(sizeof(int) * priv->num_channels, GFP_KERNEL);
+        priv->tail = kzalloc(sizeof(int) * priv->num_channels, GFP_KERNEL);
+        if (!priv->head || !priv->tail) {
+                dev_err(dev, "failed to allocate request index space\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+
+        /* reset and initialize the h/w */
+        err = init_device(dev);
+        if (err) {
+                dev_err(dev, "failed to initialize device\n");
+                goto err_out;
+        }
+
+        /* register the RNG, if available */
+        if (hw_supports(dev, DESC_HDR_SEL0_RNG)) {
+                err = talitos_register_rng(dev);
+                if (err) {
+                        dev_err(dev, "failed to register hwrng: %d\n", err);
+                        goto err_out;
+                } else
+                        dev_info(dev, "hwrng\n");
+        }
+
+        /* register crypto algorithms the device supports */
+        INIT_LIST_HEAD(&priv->alg_list);
+
+        for (i = 0; i < ARRAY_SIZE(driver_algs); i++) {
+                if (hw_supports(dev, driver_algs[i].desc_hdr_template)) {
+                        struct talitos_crypto_alg *t_alg;
+
+                        t_alg = talitos_alg_alloc(dev, &driver_algs[i]);
+                        if (IS_ERR(t_alg)) {
+                                err = PTR_ERR(t_alg);
+                                goto err_out;
+                        }
+
+                        err = crypto_register_alg(&t_alg->crypto_alg);
+                        if (err) {
+                                dev_err(dev, "%s alg registration failed\n",
+                                        t_alg->crypto_alg.cra_driver_name);
+                                kfree(t_alg);
+                        } else {
+                                list_add_tail(&t_alg->entry, &priv->alg_list);
+                                dev_info(dev, "%s\n",
+                                         t_alg->crypto_alg.cra_driver_name);
+                        }
+                }
+        }
+
+        return 0;
+
+err_out:
+        talitos_remove(ofdev);
+        if (np)
+                of_node_put(np);
+
+        return err;
+}
+
+static struct of_device_id talitos_match[] = {
+        {
+                .compatible = "fsl,sec2.0",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, talitos_match);
+
+static struct of_platform_driver talitos_driver = {
+        .name = "talitos",
+        .match_table = talitos_match,
+        .probe = talitos_probe,
+        .remove = __devexit_p(talitos_remove),
+};
+
+static int __init talitos_init(void)
+{
+        return of_register_platform_driver(&talitos_driver);
+}
+module_init(talitos_init);
+
+static void __exit talitos_exit(void)
+{
+        of_unregister_platform_driver(&talitos_driver);
+}
+module_exit(talitos_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Kim Phillips <kim.phillips@freescale.com>");
+MODULE_DESCRIPTION("Freescale integrated security engine (SEC) driver");
diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h
new file mode 100644
index 000000000000..c48a405abf70
--- /dev/null
+++ b/drivers/crypto/talitos.h
@@ -0,0 +1,199 @@
+/*
+ * Freescale SEC (talitos) device register and descriptor header defines
+ *
+ * Copyright (c) 2006-2008 Freescale Semiconductor, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * TALITOS_xxx_LO addresses point to the low data bits (32-63) of the register
+ */
+
+/* global register offset addresses */
+#define TALITOS_MCR                     0x1030  /* master control register */
+#define TALITOS_MCR_LO                  0x1038
+#define   TALITOS_MCR_SWR               0x1     /* s/w reset */
+#define TALITOS_IMR                     0x1008  /* interrupt mask register */
+#define   TALITOS_IMR_INIT              0x10fff /* enable channel IRQs */
+#define TALITOS_IMR_LO                  0x100C
+#define   TALITOS_IMR_LO_INIT           0x20000 /* allow RNGU error IRQs */
+#define TALITOS_ISR                     0x1010  /* interrupt status register */
+#define   TALITOS_ISR_CHERR             0xaa    /* channel errors mask */
+#define   TALITOS_ISR_CHDONE            0x55    /* channel done mask */
+#define TALITOS_ISR_LO                  0x1014
+#define TALITOS_ICR                     0x1018  /* interrupt clear register */
+#define TALITOS_ICR_LO                  0x101C
+
+/* channel register address stride */
+#define TALITOS_CH_STRIDE               0x100
+
+/* channel configuration register  */
+#define TALITOS_CCCR(ch)                (ch * TALITOS_CH_STRIDE + 0x1108)
+#define   TALITOS_CCCR_CONT             0x2    /* channel continue */
+#define   TALITOS_CCCR_RESET            0x1    /* channel reset */
+#define TALITOS_CCCR_LO(ch)             (ch * TALITOS_CH_STRIDE + 0x110c)
+#define   TALITOS_CCCR_LO_CDWE          0x10   /* chan. done writeback enab. */
+#define   TALITOS_CCCR_LO_NT            0x4    /* notification type */
+#define   TALITOS_CCCR_LO_CDIE          0x2    /* channel done IRQ enable */
+
+/* CCPSR: channel pointer status register */
+#define TALITOS_CCPSR(ch)               (ch * TALITOS_CH_STRIDE + 0x1110)
+#define TALITOS_CCPSR_LO(ch)            (ch * TALITOS_CH_STRIDE + 0x1114)
+#define   TALITOS_CCPSR_LO_DOF          0x8000 /* double FF write oflow error */
+#define   TALITOS_CCPSR_LO_SOF          0x4000 /* single FF write oflow error */
+#define   TALITOS_CCPSR_LO_MDTE         0x2000 /* master data transfer error */
+#define   TALITOS_CCPSR_LO_SGDLZ        0x1000 /* s/g data len zero error */
+#define   TALITOS_CCPSR_LO_FPZ          0x0800 /* fetch ptr zero error */
+#define   TALITOS_CCPSR_LO_IDH          0x0400 /* illegal desc hdr error */
+#define   TALITOS_CCPSR_LO_IEU          0x0200 /* invalid EU error */
+#define   TALITOS_CCPSR_LO_EU           0x0100 /* EU error detected */
+#define   TALITOS_CCPSR_LO_GB           0x0080 /* gather boundary error */
+#define   TALITOS_CCPSR_LO_GRL          0x0040 /* gather return/length error */
+#define   TALITOS_CCPSR_LO_SB           0x0020 /* scatter boundary error */
+#define   TALITOS_CCPSR_LO_SRL          0x0010 /* scatter return/length error */
+
+/* channel fetch fifo register */
+#define TALITOS_FF(ch)                  (ch * TALITOS_CH_STRIDE + 0x1148)
+#define TALITOS_FF_LO(ch)               (ch * TALITOS_CH_STRIDE + 0x114c)
+
+/* current descriptor pointer register */
+#define TALITOS_CDPR(ch)                (ch * TALITOS_CH_STRIDE + 0x1140)
+#define TALITOS_CDPR_LO(ch)             (ch * TALITOS_CH_STRIDE + 0x1144)
+
+/* descriptor buffer register */
+#define TALITOS_DESCBUF(ch)             (ch * TALITOS_CH_STRIDE + 0x1180)
+#define TALITOS_DESCBUF_LO(ch)          (ch * TALITOS_CH_STRIDE + 0x1184)
+
+/* gather link table */
+#define TALITOS_GATHER(ch)              (ch * TALITOS_CH_STRIDE + 0x11c0)
+#define TALITOS_GATHER_LO(ch)           (ch * TALITOS_CH_STRIDE + 0x11c4)
+
+/* scatter link table */
+#define TALITOS_SCATTER(ch)             (ch * TALITOS_CH_STRIDE + 0x11e0)
+#define TALITOS_SCATTER_LO(ch)          (ch * TALITOS_CH_STRIDE + 0x11e4)
+
+/* execution unit interrupt status registers */
+#define TALITOS_DEUISR                  0x2030 /* DES unit */
+#define TALITOS_DEUISR_LO               0x2034
+#define TALITOS_AESUISR                 0x4030 /* AES unit */
+#define TALITOS_AESUISR_LO              0x4034
+#define TALITOS_MDEUISR                 0x6030 /* message digest unit */
+#define TALITOS_MDEUISR_LO              0x6034
+#define TALITOS_AFEUISR                 0x8030 /* arc4 unit */
+#define TALITOS_AFEUISR_LO              0x8034
+#define TALITOS_RNGUISR                 0xa030 /* random number unit */
+#define TALITOS_RNGUISR_LO              0xa034
+#define TALITOS_RNGUSR                  0xa028 /* rng status */
+#define TALITOS_RNGUSR_LO               0xa02c
+#define   TALITOS_RNGUSR_LO_RD          0x1     /* reset done */
+#define   TALITOS_RNGUSR_LO_OFL         0xff0000/* output FIFO length */
+#define TALITOS_RNGUDSR                 0xa010  /* data size */
+#define TALITOS_RNGUDSR_LO              0xa014
+#define TALITOS_RNGU_FIFO               0xa800  /* output FIFO */
+#define TALITOS_RNGU_FIFO_LO            0xa804  /* output FIFO */
+#define TALITOS_RNGURCR                 0xa018  /* reset control */
+#define TALITOS_RNGURCR_LO              0xa01c
+#define   TALITOS_RNGURCR_LO_SR         0x1     /* software reset */
+#define TALITOS_PKEUISR                 0xc030 /* public key unit */
+#define TALITOS_PKEUISR_LO              0xc034
+#define TALITOS_KEUISR                  0xe030 /* kasumi unit */
+#define TALITOS_KEUISR_LO               0xe034
+#define TALITOS_CRCUISR                 0xf030 /* cyclic redundancy check unit*/
+#define TALITOS_CRCUISR_LO              0xf034
+
+/*
+ * talitos descriptor header (hdr) bits
+ */
+
+/* written back when done */
+#define DESC_HDR_DONE                   __constant_cpu_to_be32(0xff000000)
+
+/* primary execution unit select */
+#define DESC_HDR_SEL0_MASK              __constant_cpu_to_be32(0xf0000000)
+#define DESC_HDR_SEL0_AFEU              __constant_cpu_to_be32(0x10000000)
+#define DESC_HDR_SEL0_DEU               __constant_cpu_to_be32(0x20000000)
+#define DESC_HDR_SEL0_MDEUA             __constant_cpu_to_be32(0x30000000)
+#define DESC_HDR_SEL0_MDEUB             __constant_cpu_to_be32(0xb0000000)
+#define DESC_HDR_SEL0_RNG               __constant_cpu_to_be32(0x40000000)
+#define DESC_HDR_SEL0_PKEU              __constant_cpu_to_be32(0x50000000)
+#define DESC_HDR_SEL0_AESU              __constant_cpu_to_be32(0x60000000)
+#define DESC_HDR_SEL0_KEU               __constant_cpu_to_be32(0x70000000)
+#define DESC_HDR_SEL0_CRCU              __constant_cpu_to_be32(0x80000000)
+
+/* primary execution unit mode (MODE0) and derivatives */
+#define DESC_HDR_MODE0_ENCRYPT          __constant_cpu_to_be32(0x00100000)
+#define DESC_HDR_MODE0_AESU_CBC         __constant_cpu_to_be32(0x00200000)
+#define DESC_HDR_MODE0_DEU_CBC          __constant_cpu_to_be32(0x00400000)
+#define DESC_HDR_MODE0_DEU_3DES         __constant_cpu_to_be32(0x00200000)
+#define DESC_HDR_MODE0_MDEU_INIT        __constant_cpu_to_be32(0x01000000)
+#define DESC_HDR_MODE0_MDEU_HMAC        __constant_cpu_to_be32(0x00800000)
+#define DESC_HDR_MODE0_MDEU_PAD         __constant_cpu_to_be32(0x00400000)
+#define DESC_HDR_MODE0_MDEU_MD5         __constant_cpu_to_be32(0x00200000)
+#define DESC_HDR_MODE0_MDEU_SHA256      __constant_cpu_to_be32(0x00100000)
+#define DESC_HDR_MODE0_MDEU_SHA1        __constant_cpu_to_be32(0x00000000)
+#define DESC_HDR_MODE0_MDEU_MD5_HMAC    (DESC_HDR_MODE0_MDEU_MD5 | \
+                                         DESC_HDR_MODE0_MDEU_HMAC)
+#define DESC_HDR_MODE0_MDEU_SHA256_HMAC (DESC_HDR_MODE0_MDEU_SHA256 | \
+                                         DESC_HDR_MODE0_MDEU_HMAC)
+#define DESC_HDR_MODE0_MDEU_SHA1_HMAC   (DESC_HDR_MODE0_MDEU_SHA1 | \
+                                         DESC_HDR_MODE0_MDEU_HMAC)
+
+/* secondary execution unit select (SEL1) */
+#define DESC_HDR_SEL1_MASK              __constant_cpu_to_be32(0x000f0000)
+#define DESC_HDR_SEL1_MDEUA             __constant_cpu_to_be32(0x00030000)
+#define DESC_HDR_SEL1_MDEUB             __constant_cpu_to_be32(0x000b0000)
+#define DESC_HDR_SEL1_CRCU              __constant_cpu_to_be32(0x00080000)
+
+/* secondary execution unit mode (MODE1) and derivatives */
+#define DESC_HDR_MODE1_MDEU_INIT        __constant_cpu_to_be32(0x00001000)
+#define DESC_HDR_MODE1_MDEU_HMAC        __constant_cpu_to_be32(0x00000800)
+#define DESC_HDR_MODE1_MDEU_PAD         __constant_cpu_to_be32(0x00000400)
+#define DESC_HDR_MODE1_MDEU_MD5         __constant_cpu_to_be32(0x00000200)
+#define DESC_HDR_MODE1_MDEU_SHA256      __constant_cpu_to_be32(0x00000100)
+#define DESC_HDR_MODE1_MDEU_SHA1        __constant_cpu_to_be32(0x00000000)
+#define DESC_HDR_MODE1_MDEU_MD5_HMAC    (DESC_HDR_MODE1_MDEU_MD5 | \
+                                         DESC_HDR_MODE1_MDEU_HMAC)
+#define DESC_HDR_MODE1_MDEU_SHA256_HMAC (DESC_HDR_MODE1_MDEU_SHA256 | \
+                                         DESC_HDR_MODE1_MDEU_HMAC)
+#define DESC_HDR_MODE1_MDEU_SHA1_HMAC   (DESC_HDR_MODE1_MDEU_SHA1 | \
+                                         DESC_HDR_MODE1_MDEU_HMAC)
+
+/* direction of overall data flow (DIR) */
+#define DESC_HDR_DIR_INBOUND            __constant_cpu_to_be32(0x00000002)
+
+/* request done notification (DN) */
+#define DESC_HDR_DONE_NOTIFY            __constant_cpu_to_be32(0x00000001)
+
+/* descriptor types */
+#define DESC_HDR_TYPE_AESU_CTR_NONSNOOP         __constant_cpu_to_be32(0 << 3)
+#define DESC_HDR_TYPE_IPSEC_ESP                 __constant_cpu_to_be32(1 << 3)
+#define DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU   __constant_cpu_to_be32(2 << 3)
+#define DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU        __constant_cpu_to_be32(4 << 3)
+
+/* link table extent field bits */
+#define DESC_PTR_LNKTBL_JUMP                    0x80
+#define DESC_PTR_LNKTBL_RETURN                  0x02
+#define DESC_PTR_LNKTBL_NEXT                    0x01
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index dc2cec6127d1..ebb9e51deb0c 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -26,6 +26,16 @@ config EDD_OFF
           kernel. Say N if you want EDD enabled by default. EDD can be dynamically set
           using the kernel parameter 'edd={on|skipmbr|off}'.
 
+config FIRMWARE_MEMMAP
+    bool "Add firmware-provided memory map to sysfs" if EMBEDDED
+    default (X86_64 || X86_32)
+    help
+      Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap.
+      That memory map is used for example by kexec to set up parameter area
+      for the next kernel, but can also be used for debugging purposes.
+
+      See also Documentation/ABI/testing/sysfs-firmware-memmap.
+
 config EFI_VARS
         tristate "EFI Variable Support via sysfs"
         depends on EFI
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 4c9147154df8..1c3c17343dbe 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_DCDBAS)		+= dcdbas.o
 obj-$(CONFIG_DMIID)             += dmi-id.o
 obj-$(CONFIG_ISCSI_IBFT_FIND)   += iscsi_ibft_find.o
 obj-$(CONFIG_ISCSI_IBFT)        += iscsi_ibft.o
+obj-$(CONFIG_FIRMWARE_MEMMAP)   += memmap.o
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index c5e3ed7e903b..455575be3560 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -8,6 +8,11 @@
 #include <linux/slab.h>
 #include <asm/dmi.h>
 
+/*
+ * DMI stands for "Desktop Management Interface".  It is part
+ * of and an antecedent to, SMBIOS, which stands for System
+ * Management BIOS.  See further: http://www.dmtf.org/standards
+ */
 static char dmi_empty_string[] = "        ";
 
 static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
new file mode 100644
index 000000000000..e23399c7f773
--- /dev/null
+++ b/drivers/firmware/memmap.c
@@ -0,0 +1,205 @@
+/*
+ * linux/drivers/firmware/memmap.c
+ *  Copyright (C) 2008 SUSE LINUX Products GmbH
+ *  by Bernhard Walle <bwalle@suse.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2.0 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/string.h>
+#include <linux/firmware-map.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/bootmem.h>
+
+/*
+ * Data types ------------------------------------------------------------------
+ */
+
+/*
+ * Firmware map entry. Because firmware memory maps are flat and not
+ * hierarchical, it's ok to organise them in a linked list. No parent
+ * information is necessary as for the resource tree.
+ */
+struct firmware_map_entry {
+        resource_size_t         start;  /* start of the memory range */
+        resource_size_t         end;    /* end of the memory range (incl.) */
+        const char              *type;  /* type of the memory range */
+        struct list_head        list;   /* entry for the linked list */
+        struct kobject          kobj;   /* kobject for each entry */
+};
+
+/*
+ * Forward declarations --------------------------------------------------------
+ */
+static ssize_t memmap_attr_show(struct kobject *kobj,
+                                struct attribute *attr, char *buf);
+static ssize_t start_show(struct firmware_map_entry *entry, char *buf);
+static ssize_t end_show(struct firmware_map_entry *entry, char *buf);
+static ssize_t type_show(struct firmware_map_entry *entry, char *buf);
+
+/*
+ * Static data -----------------------------------------------------------------
+ */
+
+struct memmap_attribute {
+        struct attribute attr;
+        ssize_t (*show)(struct firmware_map_entry *entry, char *buf);
+};
+
+struct memmap_attribute memmap_start_attr = __ATTR_RO(start);
+struct memmap_attribute memmap_end_attr   = __ATTR_RO(end);
+struct memmap_attribute memmap_type_attr  = __ATTR_RO(type);
+
+/*
+ * These are default attributes that are added for every memmap entry.
+ */
+static struct attribute *def_attrs[] = {
+        &memmap_start_attr.attr,
+        &memmap_end_attr.attr,
+        &memmap_type_attr.attr,
+        NULL
+};
+
+static struct sysfs_ops memmap_attr_ops = {
+        .show = memmap_attr_show,
+};
+
+static struct kobj_type memmap_ktype = {
+        .sysfs_ops      = &memmap_attr_ops,
+        .default_attrs  = def_attrs,
+};
+
+/*
+ * Registration functions ------------------------------------------------------
+ */
+
+/*
+ * Firmware memory map entries
+ */
+static LIST_HEAD(map_entries);
+
+/**
+ * Common implementation of firmware_map_add() and firmware_map_add_early()
+ * which expects a pre-allocated struct firmware_map_entry.
+ *
+ * @start: Start of the memory range.
+ * @end:   End of the memory range (inclusive).
+ * @type:  Type of the memory range.
+ * @entry: Pre-allocated (either kmalloc() or bootmem allocator), uninitialised
+ *         entry.
+ */
+static int firmware_map_add_entry(resource_size_t start, resource_size_t end,
+                                  const char *type,
+                                  struct firmware_map_entry *entry)
+{
+        BUG_ON(start > end);
+
+        entry->start = start;
+        entry->end = end;
+        entry->type = type;
+        INIT_LIST_HEAD(&entry->list);
+        kobject_init(&entry->kobj, &memmap_ktype);
+
+        list_add_tail(&entry->list, &map_entries);
+
+        return 0;
+}
+
+/*
+ * See <linux/firmware-map.h> for documentation.
+ */
+int firmware_map_add(resource_size_t start, resource_size_t end,
+                     const char *type)
+{
+        struct firmware_map_entry *entry;
+
+        entry = kmalloc(sizeof(struct firmware_map_entry), GFP_ATOMIC);
+        WARN_ON(!entry);
+        if (!entry)
+                return -ENOMEM;
+
+        return firmware_map_add_entry(start, end, type, entry);
+}
+
+/*
+ * See <linux/firmware-map.h> for documentation.
+ */
+int __init firmware_map_add_early(resource_size_t start, resource_size_t end,
+                                  const char *type)
+{
+        struct firmware_map_entry *entry;
+
+        entry = alloc_bootmem_low(sizeof(struct firmware_map_entry));
+        WARN_ON(!entry);
+        if (!entry)
+                return -ENOMEM;
+
+        return firmware_map_add_entry(start, end, type, entry);
+}
+
+/*
+ * Sysfs functions -------------------------------------------------------------
+ */
+
+static ssize_t start_show(struct firmware_map_entry *entry, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "0x%llx\n", entry->start);
+}
+
+static ssize_t end_show(struct firmware_map_entry *entry, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "0x%llx\n", entry->end);
+}
+
+static ssize_t type_show(struct firmware_map_entry *entry, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", entry->type);
+}
+
+#define to_memmap_attr(_attr) container_of(_attr, struct memmap_attribute, attr)
+#define to_memmap_entry(obj) container_of(obj, struct firmware_map_entry, kobj)
+
+static ssize_t memmap_attr_show(struct kobject *kobj,
+                                struct attribute *attr, char *buf)
+{
+        struct firmware_map_entry *entry = to_memmap_entry(kobj);
+        struct memmap_attribute *memmap_attr = to_memmap_attr(attr);
+
+        return memmap_attr->show(entry, buf);
+}
+
+/*
+ * Initialises stuff and adds the entries in the map_entries list to
+ * sysfs. Important is that firmware_map_add() and firmware_map_add_early()
+ * must be called before late_initcall.
+ */
+static int __init memmap_init(void)
+{
+        int i = 0;
+        struct firmware_map_entry *entry;
+        struct kset *memmap_kset;
+
+        memmap_kset = kset_create_and_add("memmap", NULL, firmware_kobj);
+        WARN_ON(!memmap_kset);
+        if (!memmap_kset)
+                return -ENOMEM;
+
+        list_for_each_entry(entry, &map_entries, list) {
+                entry->kobj.kset = memmap_kset;
+                kobject_add(&entry->kobj, NULL, "%d", i++);
+        }
+
+        return 0;
+}
+late_initcall(memmap_init);
+
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
new file mode 100644
index 000000000000..de566cf0414c
--- /dev/null
+++ b/drivers/gpu/Makefile
@@ -0,0 +1 @@
+obj-y                   += drm/
diff --git a/drivers/char/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 610d6fd5bb50..610d6fd5bb50 100644
--- a/drivers/char/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
new file mode 100644
index 000000000000..e9f9a97ae00a
--- /dev/null
+++ b/drivers/gpu/drm/Makefile
@@ -0,0 +1,26 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+
+drm-y       :=  drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
+                drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \
+                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
+                drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
+                drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o
+
+drm-$(CONFIG_COMPAT) += drm_ioc32.o
+
+obj-$(CONFIG_DRM)       += drm.o
+obj-$(CONFIG_DRM_TDFX)  += tdfx/
+obj-$(CONFIG_DRM_R128)  += r128/
+obj-$(CONFIG_DRM_RADEON)+= radeon/
+obj-$(CONFIG_DRM_MGA)   += mga/
+obj-$(CONFIG_DRM_I810)  += i810/
+obj-$(CONFIG_DRM_I830)  += i830/
+obj-$(CONFIG_DRM_I915)  += i915/
+obj-$(CONFIG_DRM_SIS)   += sis/
+obj-$(CONFIG_DRM_SAVAGE)+= savage/
+obj-$(CONFIG_DRM_VIA)   +=via/
+
diff --git a/drivers/char/drm/README.drm b/drivers/gpu/drm/README.drm
index b5b332722581..b5b332722581 100644
--- a/drivers/char/drm/README.drm
+++ b/drivers/gpu/drm/README.drm
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
index c533d0c9ec61..c533d0c9ec61 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index aefa5ac4c0b1..aefa5ac4c0b1 100644
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
diff --git a/drivers/char/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index a73462723d2d..a73462723d2d 100644
--- a/drivers/char/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index bde64b84166e..bde64b84166e 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
diff --git a/drivers/char/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index d505f695421f..d505f695421f 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
diff --git a/drivers/char/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
index 7a8e2fba4678..7a8e2fba4678 100644
--- a/drivers/char/drm/drm_dma.c
+++ b/drivers/gpu/drm/drm_dma.c
diff --git a/drivers/char/drm/drm_drawable.c b/drivers/gpu/drm/drm_drawable.c
index 1839c57663c5..1839c57663c5 100644
--- a/drivers/char/drm/drm_drawable.c
+++ b/drivers/gpu/drm/drm_drawable.c
diff --git a/drivers/char/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 564138714bb5..564138714bb5 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
diff --git a/drivers/char/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index d2e6da85f58a..851a53f1acce 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -37,6 +37,7 @@
 #include "drmP.h"
 #include "drm_sarea.h"
 #include <linux/poll.h>
+#include <linux/smp_lock.h>
 
 static int drm_open_helper(struct inode *inode, struct file *filp,
                            struct drm_device * dev);
@@ -174,12 +175,14 @@ int drm_stub_open(struct inode *inode, struct file *filp)
 
         DRM_DEBUG("\n");
 
+        /* BKL pushdown: note that nothing else serializes idr_find() */
+        lock_kernel();
         minor = idr_find(&drm_minors_idr, minor_id);
         if (!minor)
-                return -ENODEV;
+                goto out;
 
         if (!(dev = minor->dev))
-                return -ENODEV;
+                goto out;
 
         old_fops = filp->f_op;
         filp->f_op = fops_get(&dev->driver->fops);
@@ -189,6 +192,8 @@ int drm_stub_open(struct inode *inode, struct file *filp)
         }
         fops_put(old_fops);
 
+out:
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/char/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c
index 33160673a7b7..33160673a7b7 100644
--- a/drivers/char/drm/drm_hashtab.c
+++ b/drivers/gpu/drm/drm_hashtab.c
diff --git a/drivers/char/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 90f5a8d9bdcb..90f5a8d9bdcb 100644
--- a/drivers/char/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 16829fb3089d..16829fb3089d 100644
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
diff --git a/drivers/char/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 089c015c01d1..089c015c01d1 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
diff --git a/drivers/char/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 0998723cde79..0998723cde79 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
diff --git a/drivers/char/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index 845081b44f63..845081b44f63 100644
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
diff --git a/drivers/char/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index dcff9e9b52e3..dcff9e9b52e3 100644
--- a/drivers/char/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
diff --git a/drivers/char/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index b55d5bc6ea61..b55d5bc6ea61 100644
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
diff --git a/drivers/char/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
index 93b1e0475c93..93b1e0475c93 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/gpu/drm/drm_proc.c
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c
index b2b0f3d41714..b2b0f3d41714 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/gpu/drm/drm_scatter.c
diff --git a/drivers/char/drm/drm_sman.c b/drivers/gpu/drm/drm_sman.c
index 926f146390ce..926f146390ce 100644
--- a/drivers/char/drm/drm_sman.c
+++ b/drivers/gpu/drm/drm_sman.c
diff --git a/drivers/char/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index c2f584f3b46c..c2f584f3b46c 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index af211a0ef179..af211a0ef179 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
diff --git a/drivers/char/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index c234c6f24a8d..c234c6f24a8d 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
diff --git a/drivers/gpu/drm/i810/Makefile b/drivers/gpu/drm/i810/Makefile
new file mode 100644
index 000000000000..43844ecafcc5
--- /dev/null
+++ b/drivers/gpu/drm/i810/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+i810-y := i810_drv.o i810_dma.o
+
+obj-$(CONFIG_DRM_I810)  += i810.o
diff --git a/drivers/char/drm/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index e5de8ea41544..e5de8ea41544 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
diff --git a/drivers/char/drm/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index fabb9a817966..fabb9a817966 100644
--- a/drivers/char/drm/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
diff --git a/drivers/char/drm/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index 0118849a5672..0118849a5672 100644
--- a/drivers/char/drm/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
diff --git a/drivers/gpu/drm/i830/Makefile b/drivers/gpu/drm/i830/Makefile
new file mode 100644
index 000000000000..c642ee0b238c
--- /dev/null
+++ b/drivers/gpu/drm/i830/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+i830-y := i830_drv.o i830_dma.o i830_irq.o
+
+obj-$(CONFIG_DRM_I830) += i830.o
diff --git a/drivers/char/drm/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c
index a86ab30b4620..a86ab30b4620 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/gpu/drm/i830/i830_dma.c
diff --git a/drivers/char/drm/i830_drv.c b/drivers/gpu/drm/i830/i830_drv.c
index 389597e4a623..389597e4a623 100644
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/gpu/drm/i830/i830_drv.c
diff --git a/drivers/char/drm/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h
index b5bf8cc0fdaa..b5bf8cc0fdaa 100644
--- a/drivers/char/drm/i830_drv.h
+++ b/drivers/gpu/drm/i830/i830_drv.h
diff --git a/drivers/char/drm/i830_irq.c b/drivers/gpu/drm/i830/i830_irq.c
index 91ec2bb497e9..91ec2bb497e9 100644
--- a/drivers/char/drm/i830_irq.c
+++ b/drivers/gpu/drm/i830/i830_irq.c
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
new file mode 100644
index 000000000000..a9e60464df74
--- /dev/null
+++ b/drivers/gpu/drm/i915/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
+
+i915-$(CONFIG_COMPAT)   += i915_ioc32.o
+
+obj-$(CONFIG_DRM_I915)  += i915.o
diff --git a/drivers/char/drm/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 88974342933c..88974342933c 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
diff --git a/drivers/char/drm/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 93aed1c38bd2..93aed1c38bd2 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
diff --git a/drivers/char/drm/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d7326d92a237..d7326d92a237 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
diff --git a/drivers/char/drm/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
index 1fe68a251b75..1fe68a251b75 100644
--- a/drivers/char/drm/i915_ioc32.c
+++ b/drivers/gpu/drm/i915/i915_ioc32.c
diff --git a/drivers/char/drm/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index df036118b8b1..df036118b8b1 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
diff --git a/drivers/char/drm/i915_mem.c b/drivers/gpu/drm/i915/i915_mem.c
index 6126a60dc9cb..6126a60dc9cb 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/gpu/drm/i915/i915_mem.c
diff --git a/drivers/gpu/drm/mga/Makefile b/drivers/gpu/drm/mga/Makefile
new file mode 100644
index 000000000000..60684785c203
--- /dev/null
+++ b/drivers/gpu/drm/mga/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+mga-y := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
+
+mga-$(CONFIG_COMPAT) += mga_ioc32.o
+
+obj-$(CONFIG_DRM_MGA)   += mga.o
+
diff --git a/drivers/char/drm/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index c1d12dbfa8d8..c1d12dbfa8d8 100644
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c
diff --git a/drivers/char/drm/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index 5572939fc7d1..5572939fc7d1 100644
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
diff --git a/drivers/char/drm/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index f6ebd24bd587..f6ebd24bd587 100644
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
diff --git a/drivers/char/drm/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
index 30d00478ddee..30d00478ddee 100644
--- a/drivers/char/drm/mga_ioc32.c
+++ b/drivers/gpu/drm/mga/mga_ioc32.c
diff --git a/drivers/char/drm/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
index 9302cb8f0f83..9302cb8f0f83 100644
--- a/drivers/char/drm/mga_irq.c
+++ b/drivers/gpu/drm/mga/mga_irq.c
diff --git a/drivers/char/drm/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index d3f8aade07b3..d3f8aade07b3 100644
--- a/drivers/char/drm/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c
diff --git a/drivers/char/drm/mga_ucode.h b/drivers/gpu/drm/mga/mga_ucode.h
index b611e27470e1..b611e27470e1 100644
--- a/drivers/char/drm/mga_ucode.h
+++ b/drivers/gpu/drm/mga/mga_ucode.h
diff --git a/drivers/char/drm/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c
index 651b93c8ab5d..651b93c8ab5d 100644
--- a/drivers/char/drm/mga_warp.c
+++ b/drivers/gpu/drm/mga/mga_warp.c
diff --git a/drivers/gpu/drm/r128/Makefile b/drivers/gpu/drm/r128/Makefile
new file mode 100644
index 000000000000..1cc72ae3a880
--- /dev/null
+++ b/drivers/gpu/drm/r128/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+r128-y   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
+
+r128-$(CONFIG_COMPAT)   += r128_ioc32.o
+
+obj-$(CONFIG_DRM_R128)  += r128.o
diff --git a/drivers/char/drm/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index c31afbde62e7..c31afbde62e7 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
diff --git a/drivers/char/drm/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 6108e7587e12..6108e7587e12 100644
--- a/drivers/char/drm/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
diff --git a/drivers/char/drm/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 011105e51ac6..011105e51ac6 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
diff --git a/drivers/char/drm/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
index d3cb676eee84..d3cb676eee84 100644
--- a/drivers/char/drm/r128_ioc32.c
+++ b/drivers/gpu/drm/r128/r128_ioc32.c
diff --git a/drivers/char/drm/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
index c76fdca7662d..c76fdca7662d 100644
--- a/drivers/char/drm/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c
diff --git a/drivers/char/drm/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index 51a9afce7b9b..51a9afce7b9b 100644
--- a/drivers/char/drm/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
new file mode 100644
index 000000000000..feb521ebc393
--- /dev/null
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
+
+radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
+
+obj-$(CONFIG_DRM_RADEON)+= radeon.o
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index 702df45320f7..702df45320f7 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
diff --git a/drivers/char/drm/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h
index a6802f26afc4..a6802f26afc4 100644
--- a/drivers/char/drm/r300_reg.h
+++ b/drivers/gpu/drm/radeon/r300_reg.h
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index e53158f0ecb5..e53158f0ecb5 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
diff --git a/drivers/char/drm/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 349ac3d3b848..349ac3d3b848 100644
--- a/drivers/char/drm/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 3f0eca957aa7..3f0eca957aa7 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
diff --git a/drivers/char/drm/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
index 56decda2a71f..56decda2a71f 100644
--- a/drivers/char/drm/radeon_ioc32.c
+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
index ee40d197deb7..ee40d197deb7 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/gpu/drm/radeon/radeon_mem.c
index 4af5286a36fb..4af5286a36fb 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/gpu/drm/radeon/radeon_mem.c
diff --git a/drivers/char/drm/radeon_microcode.h b/drivers/gpu/drm/radeon/radeon_microcode.h
index a348c9e7db1c..a348c9e7db1c 100644
--- a/drivers/char/drm/radeon_microcode.h
+++ b/drivers/gpu/drm/radeon/radeon_microcode.h
diff --git a/drivers/char/drm/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
index 11c146b49211..11c146b49211 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
diff --git a/drivers/gpu/drm/savage/Makefile b/drivers/gpu/drm/savage/Makefile
new file mode 100644
index 000000000000..d8f84ac7bb26
--- /dev/null
+++ b/drivers/gpu/drm/savage/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y = -Iinclude/drm
+savage-y := savage_drv.o savage_bci.o savage_state.o
+
+obj-$(CONFIG_DRM_SAVAGE)+= savage.o
+
diff --git a/drivers/char/drm/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index d465b2f9c1cd..d465b2f9c1cd 100644
--- a/drivers/char/drm/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
diff --git a/drivers/char/drm/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index eee52aa92a7c..eee52aa92a7c 100644
--- a/drivers/char/drm/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c
diff --git a/drivers/char/drm/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h
index df2aac6636f7..df2aac6636f7 100644
--- a/drivers/char/drm/savage_drv.h
+++ b/drivers/gpu/drm/savage/savage_drv.h
diff --git a/drivers/char/drm/savage_state.c b/drivers/gpu/drm/savage/savage_state.c
index 5f6238fdf1fa..5f6238fdf1fa 100644
--- a/drivers/char/drm/savage_state.c
+++ b/drivers/gpu/drm/savage/savage_state.c
diff --git a/drivers/gpu/drm/sis/Makefile b/drivers/gpu/drm/sis/Makefile
new file mode 100644
index 000000000000..441c061c3ad0
--- /dev/null
+++ b/drivers/gpu/drm/sis/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y = -Iinclude/drm
+sis-y := sis_drv.o sis_mm.o
+
+obj-$(CONFIG_DRM_SIS)   += sis.o
+
+
diff --git a/drivers/char/drm/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 7dacc64e9b56..7dacc64e9b56 100644
--- a/drivers/char/drm/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
diff --git a/drivers/char/drm/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index ef940bad63f7..ef940bad63f7 100644
--- a/drivers/char/drm/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h
diff --git a/drivers/char/drm/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index b3878770fce1..b3878770fce1 100644
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
diff --git a/drivers/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/tdfx/Makefile
new file mode 100644
index 000000000000..0379f294b32a
--- /dev/null
+++ b/drivers/gpu/drm/tdfx/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+tdfx-y := tdfx_drv.o
+
+obj-$(CONFIG_DRM_TDFX)  += tdfx.o
diff --git a/drivers/char/drm/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index 012ff2e356b2..012ff2e356b2 100644
--- a/drivers/char/drm/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
diff --git a/drivers/char/drm/tdfx_drv.h b/drivers/gpu/drm/tdfx/tdfx_drv.h
index 84204ec1b046..84204ec1b046 100644
--- a/drivers/char/drm/tdfx_drv.h
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.h
diff --git a/drivers/gpu/drm/via/Makefile b/drivers/gpu/drm/via/Makefile
new file mode 100644
index 000000000000..d59e258e2c13
--- /dev/null
+++ b/drivers/gpu/drm/via/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+via-y    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
+
+obj-$(CONFIG_DRM_VIA)   +=via.o
diff --git a/drivers/char/drm/via_3d_reg.h b/drivers/gpu/drm/via/via_3d_reg.h
index 462375d543b9..462375d543b9 100644
--- a/drivers/char/drm/via_3d_reg.h
+++ b/drivers/gpu/drm/via/via_3d_reg.h
diff --git a/drivers/char/drm/via_dma.c b/drivers/gpu/drm/via/via_dma.c
index 7a339dba6a69..7a339dba6a69 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/gpu/drm/via/via_dma.c
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 409e00afdd07..409e00afdd07 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c
diff --git a/drivers/char/drm/via_dmablit.h b/drivers/gpu/drm/via/via_dmablit.h
index 7408a547a036..7408a547a036 100644
--- a/drivers/char/drm/via_dmablit.h
+++ b/drivers/gpu/drm/via/via_dmablit.h
diff --git a/drivers/char/drm/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 80c01cdfa37d..80c01cdfa37d 100644
--- a/drivers/char/drm/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
diff --git a/drivers/char/drm/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 2daae81874cd..2daae81874cd 100644
--- a/drivers/char/drm/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
diff --git a/drivers/char/drm/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index c6bb978a1106..c6bb978a1106 100644
--- a/drivers/char/drm/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
diff --git a/drivers/char/drm/via_map.c b/drivers/gpu/drm/via/via_map.c
index a967556be014..a967556be014 100644
--- a/drivers/char/drm/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
diff --git a/drivers/char/drm/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index e64094916e4f..e64094916e4f 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
diff --git a/drivers/char/drm/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c
index 46a579198747..46a579198747 100644
--- a/drivers/char/drm/via_verifier.c
+++ b/drivers/gpu/drm/via/via_verifier.c
diff --git a/drivers/char/drm/via_verifier.h b/drivers/gpu/drm/via/via_verifier.h
index d6f8214b69f5..d6f8214b69f5 100644
--- a/drivers/char/drm/via_verifier.h
+++ b/drivers/gpu/drm/via/via_verifier.h
diff --git a/drivers/char/drm/via_video.c b/drivers/gpu/drm/via/via_video.c
index 6ec04ac12459..6ec04ac12459 100644
--- a/drivers/char/drm/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 1ca6f4635eeb..2fde6c63f47d 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -30,6 +30,7 @@
 #include <linux/major.h>
 #include <linux/hid.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 
 #include <linux/hidraw.h>
 
@@ -157,6 +158,7 @@ static int hidraw_open(struct inode *inode, struct file *file)
         struct hidraw_list *list;
         int err = 0;
 
+        lock_kernel();
         if (!(list = kzalloc(sizeof(struct hidraw_list), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto out;
@@ -183,6 +185,7 @@ static int hidraw_open(struct inode *inode, struct file *file)
 out_unlock:
         spin_unlock(&minors_lock);
 out:
+        unlock_kernel();
         return err;
 
 }
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index eb69fbadc9cb..dde6ce963a19 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -39,7 +39,6 @@
 #include <asm/io.h>
 #include <asm/arch/i2c.h>
 #include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
 
 struct pxa_i2c {
         spinlock_t              lock;
@@ -945,32 +944,6 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
         .functionality  = i2c_pxa_functionality,
 };
 
-static void i2c_pxa_enable(struct platform_device *dev)
-{
-        if (cpu_is_pxa27x()) {
-                switch (dev->id) {
-                case 0:
-                        pxa_gpio_mode(GPIO117_I2CSCL_MD);
-                        pxa_gpio_mode(GPIO118_I2CSDA_MD);
-                        break;
-                case 1:
-                        local_irq_disable();
-                        PCFR |= PCFR_PI2CEN;
-                        local_irq_enable();
-                        break;
-                }
-        }
-}
-
-static void i2c_pxa_disable(struct platform_device *dev)
-{
-        if (cpu_is_pxa27x() && dev->id == 1) {
-                local_irq_disable();
-                PCFR &= ~PCFR_PI2CEN;
-                local_irq_enable();
-        }
-}
-
 #define res_len(r)              ((r)->end - (r)->start + 1)
 static int i2c_pxa_probe(struct platform_device *dev)
 {
@@ -1036,7 +1009,6 @@ static int i2c_pxa_probe(struct platform_device *dev)
 #endif
 
         clk_enable(i2c->clk);
-        i2c_pxa_enable(dev);
 
         if (plat) {
                 i2c->adap.class = plat->class;
@@ -1080,7 +1052,6 @@ eadapt:
                 free_irq(irq, i2c);
 ereqirq:
         clk_disable(i2c->clk);
-        i2c_pxa_disable(dev);
         iounmap(i2c->reg_base);
 eremap:
         clk_put(i2c->clk);
@@ -1103,7 +1074,6 @@ static int __exit i2c_pxa_remove(struct platform_device *dev)
 
         clk_disable(i2c->clk);
         clk_put(i2c->clk);
-        i2c_pxa_disable(dev);
 
         iounmap(i2c->reg_base);
         release_mem_region(i2c->iobase, i2c->iosize);
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index b1b45dddb17e..03a33f1b9cd3 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -72,7 +72,7 @@ struct isp1301 {
 };
 
 
-/* bits in OTG_CTRL_REG */
+/* bits in OTG_CTRL */
 
 #define OTG_XCEIV_OUTPUTS \
         (OTG_ASESSVLD|OTG_BSESSEND|OTG_BSESSVLD|OTG_VBUSVLD|OTG_ID)
@@ -186,8 +186,8 @@ isp1301_clear_bits(struct isp1301 *isp, u8 reg, u8 bits)
 
 /* operational registers */
 #define ISP1301_MODE_CONTROL_1          0x04    /* u8 read, set, +1 clear */
-#       define  MC1_SPEED_REG           (1 << 0)
-#       define  MC1_SUSPEND_REG         (1 << 1)
+#       define  MC1_SPEED               (1 << 0)
+#       define  MC1_SUSPEND             (1 << 1)
 #       define  MC1_DAT_SE0             (1 << 2)
 #       define  MC1_TRANSPARENT         (1 << 3)
 #       define  MC1_BDIS_ACON_EN        (1 << 4)
@@ -274,7 +274,7 @@ static void power_down(struct isp1301 *isp)
         isp->otg.state = OTG_STATE_UNDEFINED;
 
         // isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN);
-        isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND_REG);
+        isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND);
 
         isp1301_clear_bits(isp, ISP1301_OTG_CONTROL_1, OTG1_ID_PULLDOWN);
         isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
@@ -283,7 +283,7 @@ static void power_down(struct isp1301 *isp)
 static void power_up(struct isp1301 *isp)
 {
         // isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_2, MC2_GLOBAL_PWR_DN);
-        isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND_REG);
+        isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1, MC1_SUSPEND);
 
         /* do this only when cpu is driving transceiver,
          * so host won't see a low speed device...
@@ -360,6 +360,8 @@ isp1301_defer_work(struct isp1301 *isp, int work)
 /* called from irq handlers */
 static void a_idle(struct isp1301 *isp, const char *tag)
 {
+        u32 l;
+
         if (isp->otg.state == OTG_STATE_A_IDLE)
                 return;
 
@@ -373,13 +375,17 @@ static void a_idle(struct isp1301 *isp, const char *tag)
                 gadget_suspend(isp);
         }
         isp->otg.state = OTG_STATE_A_IDLE;
-        isp->last_otg_ctrl = OTG_CTRL_REG = OTG_CTRL_REG & OTG_XCEIV_OUTPUTS;
+        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+        omap_writel(l, OTG_CTRL);
+        isp->last_otg_ctrl = l;
         pr_debug("  --> %s/%s\n", state_name(isp), tag);
 }
 
 /* called from irq handlers */
 static void b_idle(struct isp1301 *isp, const char *tag)
 {
+        u32 l;
+
         if (isp->otg.state == OTG_STATE_B_IDLE)
                 return;
 
@@ -393,7 +399,9 @@ static void b_idle(struct isp1301 *isp, const char *tag)
                 gadget_suspend(isp);
         }
         isp->otg.state = OTG_STATE_B_IDLE;
-        isp->last_otg_ctrl = OTG_CTRL_REG = OTG_CTRL_REG & OTG_XCEIV_OUTPUTS;
+        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+        omap_writel(l, OTG_CTRL);
+        isp->last_otg_ctrl = l;
         pr_debug("  --> %s/%s\n", state_name(isp), tag);
 }
 
@@ -406,7 +414,7 @@ dump_regs(struct isp1301 *isp, const char *label)
         u8      src = isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE);
 
         pr_debug("otg: %06x, %s %s, otg/%02x stat/%02x.%02x\n",
-                OTG_CTRL_REG, label, state_name(isp),
+                omap_readl(OTG_CTRL), label, state_name(isp),
                 ctrl, status, src);
         /* mode control and irq enables don't change much */
 #endif
@@ -429,7 +437,7 @@ dump_regs(struct isp1301 *isp, const char *label)
 static void check_state(struct isp1301 *isp, const char *tag)
 {
         enum usb_otg_state      state = OTG_STATE_UNDEFINED;
-        u8                      fsm = OTG_TEST_REG & 0x0ff;
+        u8                      fsm = omap_readw(OTG_TEST) & 0x0ff;
         unsigned                extra = 0;
 
         switch (fsm) {
@@ -494,7 +502,8 @@ static void check_state(struct isp1301 *isp, const char *tag)
         if (isp->otg.state == state && !extra)
                 return;
         pr_debug("otg: %s FSM %s/%02x, %s, %06x\n", tag,
-                state_string(state), fsm, state_name(isp), OTG_CTRL_REG);
+                state_string(state), fsm, state_name(isp),
+                omap_readl(OTG_CTRL));
 }
 
 #else
@@ -508,10 +517,11 @@ static void update_otg1(struct isp1301 *isp, u8 int_src)
 {
         u32     otg_ctrl;
 
-        otg_ctrl = OTG_CTRL_REG
-                        & OTG_CTRL_MASK
-                        & ~OTG_XCEIV_INPUTS
-                        & ~(OTG_ID|OTG_ASESSVLD|OTG_VBUSVLD);
+        otg_ctrl = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+        otg_ctrl &= ~OTG_XCEIV_INPUTS;
+        otg_ctrl &= ~(OTG_ID|OTG_ASESSVLD|OTG_VBUSVLD);
+
+
         if (int_src & INTR_SESS_VLD)
                 otg_ctrl |= OTG_ASESSVLD;
         else if (isp->otg.state == OTG_STATE_A_WAIT_VFALL) {
@@ -534,7 +544,7 @@ static void update_otg1(struct isp1301 *isp, u8 int_src)
                         return;
                 }
         }
-        OTG_CTRL_REG = otg_ctrl;
+        omap_writel(otg_ctrl, OTG_CTRL);
 }
 
 /* outputs from ISP1301_OTG_STATUS */
@@ -542,15 +552,14 @@ static void update_otg2(struct isp1301 *isp, u8 otg_status)
 {
         u32     otg_ctrl;
 
-        otg_ctrl = OTG_CTRL_REG
-                        & OTG_CTRL_MASK
-                        & ~OTG_XCEIV_INPUTS
-                        & ~(OTG_BSESSVLD|OTG_BSESSEND);
+        otg_ctrl = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+        otg_ctrl &= ~OTG_XCEIV_INPUTS;
+        otg_ctrl &= ~(OTG_BSESSVLD | OTG_BSESSEND);
         if (otg_status & OTG_B_SESS_VLD)
                 otg_ctrl |= OTG_BSESSVLD;
         else if (otg_status & OTG_B_SESS_END)
                 otg_ctrl |= OTG_BSESSEND;
-        OTG_CTRL_REG = otg_ctrl;
+        omap_writel(otg_ctrl, OTG_CTRL);
 }
 
 /* inputs going to ISP1301 */
@@ -559,7 +568,7 @@ static void otg_update_isp(struct isp1301 *isp)
         u32     otg_ctrl, otg_change;
         u8      set = OTG1_DM_PULLDOWN, clr = OTG1_DM_PULLUP;
 
-        otg_ctrl = OTG_CTRL_REG;
+        otg_ctrl = omap_readl(OTG_CTRL);
         otg_change = otg_ctrl ^ isp->last_otg_ctrl;
         isp->last_otg_ctrl = otg_ctrl;
         otg_ctrl = otg_ctrl & OTG_XCEIV_INPUTS;
@@ -639,6 +648,8 @@ pulldown:
 
         /* HNP switch to host or peripheral; and SRP */
         if (otg_change & OTG_PULLUP) {
+                u32 l;
+
                 switch (isp->otg.state) {
                 case OTG_STATE_B_IDLE:
                         if (clr & OTG1_DP_PULLUP)
@@ -655,7 +666,9 @@ pulldown:
                 default:
                         break;
                 }
-                OTG_CTRL_REG |= OTG_PULLUP;
+                l = omap_readl(OTG_CTRL);
+                l |= OTG_PULLUP;
+                omap_writel(l, OTG_CTRL);
         }
 
         check_state(isp, __func__);
@@ -664,20 +677,20 @@ pulldown:
 
 static irqreturn_t omap_otg_irq(int irq, void *_isp)
 {
-        u16             otg_irq = OTG_IRQ_SRC_REG;
+        u16             otg_irq = omap_readw(OTG_IRQ_SRC);
         u32             otg_ctrl;
         int             ret = IRQ_NONE;
         struct isp1301  *isp = _isp;
 
         /* update ISP1301 transciever from OTG controller */
         if (otg_irq & OPRT_CHG) {
-                OTG_IRQ_SRC_REG = OPRT_CHG;
+                omap_writew(OPRT_CHG, OTG_IRQ_SRC);
                 isp1301_defer_work(isp, WORK_UPDATE_ISP);
                 ret = IRQ_HANDLED;
 
         /* SRP to become b_peripheral failed */
         } else if (otg_irq & B_SRP_TMROUT) {
-                pr_debug("otg: B_SRP_TIMEOUT, %06x\n", OTG_CTRL_REG);
+                pr_debug("otg: B_SRP_TIMEOUT, %06x\n", omap_readl(OTG_CTRL));
                 notresponding(isp);
 
                 /* gadget drivers that care should monitor all kinds of
@@ -687,31 +700,31 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                 if (isp->otg.state == OTG_STATE_B_SRP_INIT)
                         b_idle(isp, "srp_timeout");
 
-                OTG_IRQ_SRC_REG = B_SRP_TMROUT;
+                omap_writew(B_SRP_TMROUT, OTG_IRQ_SRC);
                 ret = IRQ_HANDLED;
 
         /* HNP to become b_host failed */
         } else if (otg_irq & B_HNP_FAIL) {
                 pr_debug("otg: %s B_HNP_FAIL, %06x\n",
-                                state_name(isp), OTG_CTRL_REG);
+                                state_name(isp), omap_readl(OTG_CTRL));
                 notresponding(isp);
 
-                otg_ctrl = OTG_CTRL_REG;
+                otg_ctrl = omap_readl(OTG_CTRL);
                 otg_ctrl |= OTG_BUSDROP;
                 otg_ctrl &= OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-                OTG_CTRL_REG = otg_ctrl;
+                omap_writel(otg_ctrl, OTG_CTRL);
 
                 /* subset of b_peripheral()... */
                 isp->otg.state = OTG_STATE_B_PERIPHERAL;
                 pr_debug("  --> b_peripheral\n");
 
-                OTG_IRQ_SRC_REG = B_HNP_FAIL;
+                omap_writew(B_HNP_FAIL, OTG_IRQ_SRC);
                 ret = IRQ_HANDLED;
 
         /* detect SRP from B-device ... */
         } else if (otg_irq & A_SRP_DETECT) {
                 pr_debug("otg: %s SRP_DETECT, %06x\n",
-                                state_name(isp), OTG_CTRL_REG);
+                                state_name(isp), omap_readl(OTG_CTRL));
 
                 isp1301_defer_work(isp, WORK_UPDATE_OTG);
                 switch (isp->otg.state) {
@@ -719,49 +732,49 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                         if (!isp->otg.host)
                                 break;
                         isp1301_defer_work(isp, WORK_HOST_RESUME);
-                        otg_ctrl = OTG_CTRL_REG;
+                        otg_ctrl = omap_readl(OTG_CTRL);
                         otg_ctrl |= OTG_A_BUSREQ;
                         otg_ctrl &= ~(OTG_BUSDROP|OTG_B_BUSREQ)
                                         & ~OTG_XCEIV_INPUTS
                                         & OTG_CTRL_MASK;
-                        OTG_CTRL_REG = otg_ctrl;
+                        omap_writel(otg_ctrl, OTG_CTRL);
                         break;
                 default:
                         break;
                 }
 
-                OTG_IRQ_SRC_REG = A_SRP_DETECT;
+                omap_writew(A_SRP_DETECT, OTG_IRQ_SRC);
                 ret = IRQ_HANDLED;
 
         /* timer expired:  T(a_wait_bcon) and maybe T(a_wait_vrise)
          * we don't track them separately
          */
         } else if (otg_irq & A_REQ_TMROUT) {
-                otg_ctrl = OTG_CTRL_REG;
+                otg_ctrl = omap_readl(OTG_CTRL);
                 pr_info("otg: BCON_TMOUT from %s, %06x\n",
                                 state_name(isp), otg_ctrl);
                 notresponding(isp);
 
                 otg_ctrl |= OTG_BUSDROP;
                 otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-                OTG_CTRL_REG = otg_ctrl;
+                omap_writel(otg_ctrl, OTG_CTRL);
                 isp->otg.state = OTG_STATE_A_WAIT_VFALL;
 
-                OTG_IRQ_SRC_REG = A_REQ_TMROUT;
+                omap_writew(A_REQ_TMROUT, OTG_IRQ_SRC);
                 ret = IRQ_HANDLED;
 
         /* A-supplied voltage fell too low; overcurrent */
         } else if (otg_irq & A_VBUS_ERR) {
-                otg_ctrl = OTG_CTRL_REG;
+                otg_ctrl = omap_readl(OTG_CTRL);
                 printk(KERN_ERR "otg: %s, VBUS_ERR %04x ctrl %06x\n",
                         state_name(isp), otg_irq, otg_ctrl);
 
                 otg_ctrl |= OTG_BUSDROP;
                 otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-                OTG_CTRL_REG = otg_ctrl;
+                omap_writel(otg_ctrl, OTG_CTRL);
                 isp->otg.state = OTG_STATE_A_VBUS_ERR;
 
-                OTG_IRQ_SRC_REG = A_VBUS_ERR;
+                omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
                 ret = IRQ_HANDLED;
 
         /* switch driver; the transciever code activates it,
@@ -770,7 +783,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
         } else if (otg_irq & DRIVER_SWITCH) {
                 int     kick = 0;
 
-                otg_ctrl = OTG_CTRL_REG;
+                otg_ctrl = omap_readl(OTG_CTRL);
                 printk(KERN_NOTICE "otg: %s, SWITCH to %s, ctrl %06x\n",
                                 state_name(isp),
                                 (otg_ctrl & OTG_DRIVER_SEL)
@@ -793,7 +806,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                 } else {
                         if (!(otg_ctrl & OTG_ID)) {
                                 otg_ctrl &= OTG_CTRL_MASK & ~OTG_XCEIV_INPUTS;
-                                OTG_CTRL_REG = otg_ctrl | OTG_A_BUSREQ;
+                                omap_writel(otg_ctrl | OTG_A_BUSREQ, OTG_CTRL);
                         }
 
                         if (isp->otg.host) {
@@ -818,7 +831,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
                         }
                 }
 
-                OTG_IRQ_SRC_REG = DRIVER_SWITCH;
+                omap_writew(DRIVER_SWITCH, OTG_IRQ_SRC);
                 ret = IRQ_HANDLED;
 
                 if (kick)
@@ -834,12 +847,15 @@ static struct platform_device *otg_dev;
 
 static int otg_init(struct isp1301 *isp)
 {
+        u32 l;
+
         if (!otg_dev)
                 return -ENODEV;
 
         dump_regs(isp, __func__);
         /* some of these values are board-specific... */
-        OTG_SYSCON_2_REG |= OTG_EN
+        l = omap_readl(OTG_SYSCON_2);
+        l |= OTG_EN
                 /* for B-device: */
                 | SRP_GPDATA            /* 9msec Bdev D+ pulse */
                 | SRP_GPDVBUS           /* discharge after VBUS pulse */
@@ -849,18 +865,22 @@ static int otg_init(struct isp1301 *isp)
                 | SRP_DPW               /* detect 167+ns SRP pulses */
                 | SRP_DATA | SRP_VBUS   /* accept both kinds of SRP pulse */
                 ;
+        omap_writel(l, OTG_SYSCON_2);
 
         update_otg1(isp, isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE));
         update_otg2(isp, isp1301_get_u8(isp, ISP1301_OTG_STATUS));
 
         check_state(isp, __func__);
         pr_debug("otg: %s, %s %06x\n",
-                        state_name(isp), __func__, OTG_CTRL_REG);
+                        state_name(isp), __func__, omap_readl(OTG_CTRL));
 
-        OTG_IRQ_EN_REG = DRIVER_SWITCH | OPRT_CHG
+        omap_writew(DRIVER_SWITCH | OPRT_CHG
                         | B_SRP_TMROUT | B_HNP_FAIL
-                        | A_VBUS_ERR | A_SRP_DETECT | A_REQ_TMROUT;
-        OTG_SYSCON_2_REG |= OTG_EN;
+                        | A_VBUS_ERR | A_SRP_DETECT | A_REQ_TMROUT, OTG_IRQ_EN);
+
+        l = omap_readl(OTG_SYSCON_2);
+        l |= OTG_EN;
+        omap_writel(l, OTG_SYSCON_2);
 
         return 0;
 }
@@ -927,7 +947,11 @@ static void otg_unbind(struct isp1301 *isp)
 
 static void b_peripheral(struct isp1301 *isp)
 {
-        OTG_CTRL_REG = OTG_CTRL_REG & OTG_XCEIV_OUTPUTS;
+        u32 l;
+
+        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+        omap_writel(l, OTG_CTRL);
+
         usb_gadget_vbus_connect(isp->otg.gadget);
 
 #ifdef  CONFIG_USB_OTG
@@ -999,6 +1023,8 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                         isp_bstat = 0;
                 }
         } else {
+                u32 l;
+
                 /* if user unplugged mini-A end of cable,
                  * don't bypass A_WAIT_VFALL.
                  */
@@ -1019,8 +1045,9 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                                 isp1301_clear_bits(isp, ISP1301_MODE_CONTROL_1,
                                                 MC1_BDIS_ACON_EN);
                                 isp->otg.state = OTG_STATE_B_IDLE;
-                                OTG_CTRL_REG &= OTG_CTRL_REG & OTG_CTRL_MASK
-                                                & ~OTG_CTRL_BITS;
+                                l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+                                l &= ~OTG_CTRL_BITS;
+                                omap_writel(l, OTG_CTRL);
                                 break;
                         case OTG_STATE_B_IDLE:
                                 break;
@@ -1046,7 +1073,8 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                         /* FALLTHROUGH */
                 case OTG_STATE_B_SRP_INIT:
                         b_idle(isp, __func__);
-                        OTG_CTRL_REG &= OTG_CTRL_REG & OTG_XCEIV_OUTPUTS;
+                        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
+                        omap_writel(l, OTG_CTRL);
                         /* FALLTHROUGH */
                 case OTG_STATE_B_IDLE:
                         if (isp->otg.gadget && (isp_bstat & OTG_B_SESS_VLD)) {
@@ -1130,11 +1158,11 @@ isp1301_work(struct work_struct *work)
                         case OTG_STATE_A_WAIT_VRISE:
                                 isp->otg.state = OTG_STATE_A_HOST;
                                 pr_debug("  --> a_host\n");
-                                otg_ctrl = OTG_CTRL_REG;
+                                otg_ctrl = omap_readl(OTG_CTRL);
                                 otg_ctrl |= OTG_A_BUSREQ;
                                 otg_ctrl &= ~(OTG_BUSDROP|OTG_B_BUSREQ)
                                                 & OTG_CTRL_MASK;
-                                OTG_CTRL_REG = otg_ctrl;
+                                omap_writel(otg_ctrl, OTG_CTRL);
                                 break;
                         case OTG_STATE_B_WAIT_ACON:
                                 isp->otg.state = OTG_STATE_B_HOST;
@@ -1274,7 +1302,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
                 return -ENODEV;
 
         if (!host) {
-                OTG_IRQ_EN_REG = 0;
+                omap_writew(0, OTG_IRQ_EN);
                 power_down(isp);
                 isp->otg.host = 0;
                 return 0;
@@ -1325,12 +1353,13 @@ static int
 isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
 {
         struct isp1301  *isp = container_of(otg, struct isp1301, otg);
+        u32 l;
 
         if (!otg || isp != the_transceiver)
                 return -ENODEV;
 
         if (!gadget) {
-                OTG_IRQ_EN_REG = 0;
+                omap_writew(0, OTG_IRQ_EN);
                 if (!isp->otg.default_a)
                         enable_vbus_draw(isp, 0);
                 usb_gadget_vbus_disconnect(isp->otg.gadget);
@@ -1351,9 +1380,11 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
         isp->otg.gadget = gadget;
         // FIXME update its refcount
 
-        OTG_CTRL_REG = (OTG_CTRL_REG & OTG_CTRL_MASK
-                                & ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS))
-                        | OTG_ID;
+        l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+        l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS);
+        l |= OTG_ID;
+        omap_writel(l, OTG_CTRL);
+
         power_up(isp);
         isp->otg.state = OTG_STATE_B_IDLE;
 
@@ -1405,16 +1436,17 @@ isp1301_start_srp(struct otg_transceiver *dev)
                         || isp->otg.state != OTG_STATE_B_IDLE)
                 return -ENODEV;
 
-        otg_ctrl = OTG_CTRL_REG;
+        otg_ctrl = omap_readl(OTG_CTRL);
         if (!(otg_ctrl & OTG_BSESSEND))
                 return -EINVAL;
 
         otg_ctrl |= OTG_B_BUSREQ;
         otg_ctrl &= ~OTG_A_BUSREQ & OTG_CTRL_MASK;
-        OTG_CTRL_REG = otg_ctrl;
+        omap_writel(otg_ctrl, OTG_CTRL);
         isp->otg.state = OTG_STATE_B_SRP_INIT;
 
-        pr_debug("otg: SRP, %s ... %06x\n", state_name(isp), OTG_CTRL_REG);
+        pr_debug("otg: SRP, %s ... %06x\n", state_name(isp),
+                        omap_readl(OTG_CTRL));
 #ifdef  CONFIG_USB_OTG
         check_state(isp, __func__);
 #endif
@@ -1426,6 +1458,7 @@ isp1301_start_hnp(struct otg_transceiver *dev)
 {
 #ifdef  CONFIG_USB_OTG
         struct isp1301  *isp = container_of(dev, struct isp1301, otg);
+        u32 l;
 
         if (!dev || isp != the_transceiver)
                 return -ENODEV;
@@ -1452,7 +1485,9 @@ isp1301_start_hnp(struct otg_transceiver *dev)
 #endif
                 /* caller must suspend then clear A_BUSREQ */
                 usb_gadget_vbus_connect(isp->otg.gadget);
-                OTG_CTRL_REG |= OTG_A_SETB_HNPEN;
+                l = omap_readl(OTG_CTRL);
+                l |= OTG_A_SETB_HNPEN;
+                omap_writel(l, OTG_CTRL);
 
                 break;
         case OTG_STATE_A_PERIPHERAL:
@@ -1462,7 +1497,7 @@ isp1301_start_hnp(struct otg_transceiver *dev)
                 return -EILSEQ;
         }
         pr_debug("otg: HNP %s, %06x ...\n",
-                state_name(isp), OTG_CTRL_REG);
+                state_name(isp), omap_readl(OTG_CTRL));
         check_state(isp, __func__);
         return 0;
 #else
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index d34c14c81c29..006a5857256a 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -34,6 +34,7 @@
 #include <linux/list.h>
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 static struct i2c_driver i2cdev_driver;
@@ -441,14 +442,20 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         struct i2c_client *client;
         struct i2c_adapter *adap;
         struct i2c_dev *i2c_dev;
+        int ret = 0;
 
+        lock_kernel();
         i2c_dev = i2c_dev_get_by_minor(minor);
-        if (!i2c_dev)
-                return -ENODEV;
+        if (!i2c_dev) {
+                ret = -ENODEV;
+                goto out;
+        }
 
         adap = i2c_get_adapter(i2c_dev->adap->nr);
-        if (!adap)
-                return -ENODEV;
+        if (!adap) {
+                ret = -ENODEV;
+                goto out;
+        }
 
         /* This creates an anonymous i2c_client, which may later be
          * pointed to some address using I2C_SLAVE or I2C_SLAVE_FORCE.
@@ -460,7 +467,8 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         client = kzalloc(sizeof(*client), GFP_KERNEL);
         if (!client) {
                 i2c_put_adapter(adap);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
         snprintf(client->name, I2C_NAME_SIZE, "i2c-dev %d", adap->nr);
         client->driver = &i2cdev_driver;
@@ -468,7 +476,9 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         client->adapter = adap;
         file->private_data = client;
 
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int i2cdev_release(struct inode *inode, struct file *file)
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1e1f26331a24..a3d228302d20 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2421,9 +2421,12 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
         if (i >= MAX_HWIFS * MAX_DRIVES)
                 return -ENXIO;
 
+        lock_kernel();
         tape = ide_tape_chrdev_get(i);
-        if (!tape)
+        if (!tape) {
+                unlock_kernel();
                 return -ENXIO;
+        }
 
         debug_log(DBG_CHRDEV, "Enter %s\n", __func__);
 
@@ -2482,10 +2485,12 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
                         }
                 }
         }
+        unlock_kernel();
         return 0;
 
 out_put_tape:
         ide_tape_put(tape);
+        unlock_kernel();
         return retval;
 }
 
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 3381424d70a1..8dbf4d9b6447 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -63,11 +63,11 @@ MODULE_LICENSE("Dual MPL/GPL");
 
 #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0)
 
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
+#ifdef CONFIG_PCMCIA_DEBUG
+INT_MODULE_PARM(pc_debug, 0);
 #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
-"ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";
+/*static char *version =
+"ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";*/
 #else
 #define DEBUG(n, args...)
 #endif
@@ -375,7 +375,7 @@ failed:
 
 ======================================================================*/
 
-void ide_release(struct pcmcia_device *link)
+static void ide_release(struct pcmcia_device *link)
 {
     ide_info_t *info = link->priv;
     ide_hwif_t *hwif = info->hwif;
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index d7a6881b571d..b25675faaaf5 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -45,6 +45,7 @@
 #include <linux/cdev.h>
 #include <linux/idr.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -1159,6 +1160,7 @@ static int ib_ucm_open(struct inode *inode, struct file *filp)
 {
         struct ib_ucm_file *file;
 
+        cycle_kernel_lock();
         file = kmalloc(sizeof(*file), GFP_KERNEL);
         if (!file)
                 return -ENOMEM;
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index ca4cf3a511ab..195f97302fe5 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -38,6 +38,7 @@
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <linux/miscdevice.h>
+#include <linux/smp_lock.h>
 
 #include <rdma/rdma_user_cm.h>
 #include <rdma/ib_marshall.h>
@@ -1156,6 +1157,7 @@ static int ucma_open(struct inode *inode, struct file *filp)
         if (!file)
                 return -ENOMEM;
 
+        lock_kernel();
         INIT_LIST_HEAD(&file->event_list);
         INIT_LIST_HEAD(&file->ctx_list);
         init_waitqueue_head(&file->poll_wait);
@@ -1163,6 +1165,7 @@ static int ucma_open(struct inode *inode, struct file *filp)
 
         filp->private_data = file;
         file->filp = filp;
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 840ede9ae965..208c7f34323c 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -777,6 +777,19 @@ static long ib_umad_compat_ioctl(struct file *filp, unsigned int cmd,
 }
 #endif
 
+/*
+ * ib_umad_open() does not need the BKL:
+ *
+ *  - umad_port[] accesses are protected by port_lock, the
+ *    ib_umad_port structures are properly reference counted, and
+ *    everything else is purely local to the file being created, so
+ *    races against other open calls are not a problem;
+ *  - the ioctl method does not affect any global state outside of the
+ *    file structure being operated on;
+ *  - the port is added to umad_port[] as the last part of module
+ *    initialization so the open method will either immediately run
+ *    -ENXIO, or all required initialization will be done.
+ */
 static int ib_umad_open(struct inode *inode, struct file *filp)
 {
         struct ib_umad_port *port;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index caed42bf7ef5..0f34858e31e7 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -610,6 +610,18 @@ static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)
                 return file->device->ib_dev->mmap(file->ucontext, vma);
 }
 
+/*
+ * ib_uverbs_open() does not need the BKL:
+ *
+ *  - dev_table[] accesses are protected by map_lock, the
+ *    ib_uverbs_device structures are properly reference counted, and
+ *    everything else is purely local to the file being created, so
+ *    races against other open calls are not a problem;
+ *  - there is no ioctl method to race against;
+ *  - the device is added to dev_table[] as the last part of module
+ *    initialization, the open method will either immediately run
+ *    -ENXIO, or all required initialization will be done.
+ */
 static int ib_uverbs_open(struct inode *inode, struct file *filp)
 {
         struct ib_uverbs_device *dev;
@@ -651,7 +663,6 @@ err_module:
 
 err:
         kref_put(&dev->ref, ib_uverbs_release_dev);
-
         return ret;
 }
 
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index b472b15637f0..35f301c88b57 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -39,6 +39,7 @@
 #include <linux/highmem.h>
 #include <linux/io.h>
 #include <linux/jiffies.h>
+#include <linux/smp_lock.h>
 #include <asm/pgtable.h>
 
 #include "ipath_kernel.h"
@@ -1815,6 +1816,7 @@ done:
 static int ipath_open(struct inode *in, struct file *fp)
 {
         /* The real work is performed later in ipath_assign_port() */
+        cycle_kernel_lock();
         fp->private_data = kzalloc(sizeof(struct ipath_filedata), GFP_KERNEL);
         return fp->private_data ? 0 : -ENOMEM;
 }
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 27006fc18305..408df0bd6be5 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -21,6 +21,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/rcupdate.h>
+#include <linux/smp_lock.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("Input core");
@@ -1588,13 +1589,17 @@ EXPORT_SYMBOL(input_unregister_handle);
 
 static int input_open_file(struct inode *inode, struct file *file)
 {
-        struct input_handler *handler = input_table[iminor(inode) >> 5];
+        struct input_handler *handler;
         const struct file_operations *old_fops, *new_fops = NULL;
         int err;
 
+        lock_kernel();
         /* No load-on-demand here? */
-        if (!handler || !(new_fops = fops_get(handler->fops)))
-                return -ENODEV;
+        handler = input_table[iminor(inode) >> 5];
+        if (!handler || !(new_fops = fops_get(handler->fops))) {
+                err = -ENODEV;
+                goto out;
+        }
 
         /*
          * That's _really_ odd. Usually NULL ->open means "nothing special",
@@ -1602,7 +1607,8 @@ static int input_open_file(struct inode *inode, struct file *file)
          */
         if (!new_fops->open) {
                 fops_put(new_fops);
-                return -ENODEV;
+                err = -ENODEV;
+                goto out;
         }
         old_fops = file->f_op;
         file->f_op = new_fops;
@@ -1614,6 +1620,8 @@ static int input_open_file(struct inode *inode, struct file *file)
                 file->f_op = fops_get(old_fops);
         }
         fops_put(old_fops);
+out:
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 45e5d05b01de..49d8abfe38fe 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -35,6 +35,7 @@
 
 #include <linux/hp_sdc.h>
 #include <linux/errno.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -408,6 +409,7 @@ static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait)
 
 static int hp_sdc_rtc_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index a56ad4ba8fe2..2bcfa0b35061 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -37,6 +37,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/uinput.h>
+#include <linux/smp_lock.h>
 
 static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
@@ -222,6 +223,7 @@ static int uinput_open(struct inode *inode, struct file *file)
         if (!newdev)
                 return -ENOMEM;
 
+        lock_kernel();
         mutex_init(&newdev->mutex);
         spin_lock_init(&newdev->requests_lock);
         init_waitqueue_head(&newdev->requests_waitq);
@@ -229,6 +231,7 @@ static int uinput_open(struct inode *inode, struct file *file)
         newdev->state = UIST_NEW_DEVICE;
 
         file->private_data = newdev;
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index b989748598ae..8137e50ded87 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -14,6 +14,7 @@
 #define MOUSEDEV_MIX            31
 
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -545,16 +546,21 @@ static int mousedev_open(struct inode *inode, struct file *file)
         if (i >= MOUSEDEV_MINORS)
                 return -ENODEV;
 
+        lock_kernel();
         error = mutex_lock_interruptible(&mousedev_table_mutex);
-        if (error)
+        if (error) {
+                unlock_kernel();
                 return error;
+        }
         mousedev = mousedev_table[i];
         if (mousedev)
                 get_device(&mousedev->dev);
         mutex_unlock(&mousedev_table_mutex);
 
-        if (!mousedev)
+        if (!mousedev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         client = kzalloc(sizeof(struct mousedev_client), GFP_KERNEL);
         if (!client) {
@@ -573,6 +579,7 @@ static int mousedev_open(struct inode *inode, struct file *file)
                 goto err_free_client;
 
         file->private_data = client;
+        unlock_kernel();
         return 0;
 
  err_free_client:
@@ -580,6 +587,7 @@ static int mousedev_open(struct inode *inode, struct file *file)
         kfree(client);
  err_put_mousedev:
         put_device(&mousedev->dev);
+        unlock_kernel();
         return error;
 }
 
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 0403622ae267..c9397c8ee97e 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/serio.h>
@@ -81,9 +82,10 @@ static int serio_raw_open(struct inode *inode, struct file *file)
         struct serio_raw_list *list;
         int retval = 0;
 
+        lock_kernel();
         retval = mutex_lock_interruptible(&serio_raw_mutex);
         if (retval)
-                return retval;
+                goto out_bkl;
 
         if (!(serio_raw = serio_raw_locate(iminor(inode)))) {
                 retval = -ENODEV;
@@ -108,6 +110,8 @@ static int serio_raw_open(struct inode *inode, struct file *file)
 
 out:
         mutex_unlock(&serio_raw_mutex);
+out_bkl:
+        unlock_kernel();
         return retval;
 }
 
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index 0f47f4697cdf..9ce3b3baf3a2 100644
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -66,6 +66,9 @@ static irqreturn_t input_handler(int rq, void *dev_id)
                 case XENKBD_TYPE_MOTION:
                         input_report_rel(dev, REL_X, event->motion.rel_x);
                         input_report_rel(dev, REL_Y, event->motion.rel_y);
+                        if (event->motion.rel_z)
+                                input_report_rel(dev, REL_WHEEL,
+                                                 -event->motion.rel_z);
                         break;
                 case XENKBD_TYPE_KEY:
                         dev = NULL;
@@ -84,6 +87,9 @@ static irqreturn_t input_handler(int rq, void *dev_id)
                 case XENKBD_TYPE_POS:
                         input_report_abs(dev, ABS_X, event->pos.abs_x);
                         input_report_abs(dev, ABS_Y, event->pos.abs_y);
+                        if (event->pos.rel_z)
+                                input_report_rel(dev, REL_WHEEL,
+                                                 -event->pos.rel_z);
                         break;
                 }
                 if (dev)
@@ -152,7 +158,7 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev,
         ptr->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
         for (i = BTN_LEFT; i <= BTN_TASK; i++)
                 set_bit(i, ptr->keybit);
-        ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL);
         input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0);
         input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0);
 
@@ -294,6 +300,16 @@ InitWait:
                  */
                 if (dev->state != XenbusStateConnected)
                         goto InitWait; /* no InitWait seen yet, fudge it */
+
+                /* Set input abs params to match backend screen res */
+                if (xenbus_scanf(XBT_NIL, info->xbdev->otherend,
+                                 "width", "%d", &val) > 0)
+                        input_set_abs_params(info->ptr, ABS_X, 0, val, 0, 0);
+
+                if (xenbus_scanf(XBT_NIL, info->xbdev->otherend,
+                                 "height", "%d", &val) > 0)
+                        input_set_abs_params(info->ptr, ABS_Y, 0, val, 0, 0);
+
                 break;
 
         case XenbusStateClosing:
@@ -337,4 +353,6 @@ static void __exit xenkbd_cleanup(void)
 module_init(xenkbd_init);
 module_exit(xenkbd_cleanup);
 
+MODULE_DESCRIPTION("Xen virtual keyboard/pointer device frontend");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("xen:vkbd");
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 6ca0bb949ad3..2095153582f1 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -20,6 +20,7 @@
 #include <linux/signal.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
+#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -983,13 +984,17 @@ capi_ioctl(struct inode *inode, struct file *file,
 static int
 capi_open(struct inode *inode, struct file *file)
 {
+        int ret;
+        
+        lock_kernel();
         if (file->private_data)
-                return -EEXIST;
-
-        if ((file->private_data = capidev_alloc()) == NULL)
-                return -ENOMEM;
-
-        return nonseekable_open(inode, file);
+                ret = -EEXIST;
+        else if ((file->private_data = capidev_alloc()) == NULL)
+                ret = -ENOMEM;
+        else
+                ret = nonseekable_open(inode, file);
+        unlock_kernel();
+        return ret;
 }
 
 static int
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index c90928974249..1e85f743214e 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/poll.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 #include "platform.h"
@@ -127,14 +128,19 @@ static unsigned int maint_poll(struct file *file, poll_table * wait)
 
 static int maint_open(struct inode *ino, struct file *filep)
 {
+        int ret;
+
+        lock_kernel();
         /* only one open is allowed, so we test
            it atomically */
         if (test_and_set_bit(0, &opened))
-                return (-EBUSY);
-
-        filep->private_data = NULL;
-
-        return nonseekable_open(ino, filep);
+                ret = -EBUSY;
+        else {
+                filep->private_data = NULL;
+                ret = nonseekable_open(ino, filep);
+        }
+        unlock_kernel();
+        return ret;
 }
 
 static int maint_close(struct inode *ino, struct file *filep)
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index 78f141e77466..f4969fe0a055 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -17,6 +17,7 @@
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 #include "platform.h"
@@ -400,6 +401,7 @@ static unsigned int um_idi_poll(struct file *file, poll_table * wait)
 
 static int um_idi_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
         return (0);
 }
 
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 16a874bb1561..fbbcb27fb681 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -21,6 +21,7 @@
 #include <linux/list.h>
 #include <linux/poll.h>
 #include <linux/kmod.h>
+#include <linux/smp_lock.h>
 
 #include "platform.h"
 #undef ID_MASK
@@ -580,6 +581,7 @@ xdi_copy_from_user(void *os_handle, void *dst, const void __user *src, int lengt
  */
 static int divas_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
         return (0);
 }
 
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 8d8c6b736167..7188c59a76ff 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1732,7 +1732,7 @@ isdn_open(struct inode *ino, struct file *filep)
         int chidx;
         int retval = -ENODEV;
 
-
+        lock_kernel();
         if (minor == ISDN_MINOR_STATUS) {
                 infostruct *p;
 
@@ -1783,6 +1783,7 @@ isdn_open(struct inode *ino, struct file *filep)
 #endif
  out:
         nonseekable_open(ino, filep);
+        unlock_kernel();
         return retval;
 }
 
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 6b8dbb9ba73b..76f2b36881c3 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
         tristate "Linux hypervisor example code"
-        depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
+        depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !X86_VOYAGER
         select HVC_DRIVER
         ---help---
           This is a very simple module which allows you to run
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index 005bd045d2eb..5faefeaf6790 100644
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -136,7 +136,6 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user);
  * first step in the migration to the kernel types.  pte_pfn is already defined
  * in the kernel. */
 #define pgd_flags(x)    (pgd_val(x) & ~PAGE_MASK)
-#define pte_flags(x)    (pte_val(x) & ~PAGE_MASK)
 #define pgd_pfn(x)      (pgd_val(x) >> PAGE_SHIFT)
 
 /* interrupts_and_traps.c: */
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 61b62a6f681b..e5d446804d32 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -643,12 +643,18 @@ do_adb_query(struct adb_request *req)
 static int adb_open(struct inode *inode, struct file *file)
 {
         struct adbdev_state *state;
+        int ret = 0;
 
-        if (iminor(inode) > 0 || adb_controller == NULL)
-                return -ENXIO;
+        lock_kernel();
+        if (iminor(inode) > 0 || adb_controller == NULL) {
+                ret = -ENXIO;
+                goto out;
+        }
         state = kmalloc(sizeof(struct adbdev_state), GFP_KERNEL);
-        if (state == 0)
-                return -ENOMEM;
+        if (state == 0) {
+                ret = -ENOMEM;
+                goto out;
+        }
         file->private_data = state;
         spin_lock_init(&state->lock);
         atomic_set(&state->n_pending, 0);
@@ -656,7 +662,9 @@ static int adb_open(struct inode *inode, struct file *file)
         init_waitqueue_head(&state->wait_queue);
         state->inuse = 1;
 
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int adb_release(struct inode *inode, struct file *file)
diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index 73c50bc02095..6a8221893256 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -119,6 +120,7 @@ anslcd_ioctl( struct inode * inode, struct file * file,
 static int
 anslcd_open( struct inode * inode, struct file * file )
 {
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 76dbf25cb70f..96faa799b82a 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -19,6 +19,7 @@
  *    the userland interface
  */
 
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
@@ -1090,10 +1091,12 @@ static int smu_open(struct inode *inode, struct file *file)
         pp->mode = smu_file_commands;
         init_waitqueue_head(&pp->wait);
 
+        lock_kernel();
         spin_lock_irqsave(&smu_clist_lock, flags);
         list_add(&pp->list, &smu_clist);
         spin_unlock_irqrestore(&smu_clist_lock, flags);
         file->private_data = pp;
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index d6365a9f0637..d524dc245a2c 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -18,6 +18,7 @@
  *
  */
 #include <stdarg.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
@@ -2047,6 +2048,7 @@ pmu_open(struct inode *inode, struct file *file)
         pp->rb_get = pp->rb_put = 0;
         spin_lock_init(&pp->lock);
         init_waitqueue_head(&pp->wait);
+        lock_kernel();
         spin_lock_irqsave(&all_pvt_lock, flags);
 #if defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_PMAC_BACKLIGHT)
         pp->backlight_locker = 0;
@@ -2054,6 +2056,7 @@ pmu_open(struct inode *inode, struct file *file)
         list_add(&pp->list, &all_pmu_pvt);
         spin_unlock_irqrestore(&all_pvt_lock, flags);
         file->private_data = pp;
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 10748240cb2f..6a866d7c8ae5 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -50,17 +50,19 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)
 /**
  *      linear_mergeable_bvec -- tell bio layer if two requests can be merged
  *      @q: request queue
- *      @bio: the buffer head that's been built up so far
+ *      @bvm: properties of new bio
  *      @biovec: the request that could be merged to it.
  *
  *      Return amount of bytes we can take at this offset
  */
-static int linear_mergeable_bvec(struct request_queue *q, struct bio *bio, struct bio_vec *biovec)
+static int linear_mergeable_bvec(struct request_queue *q,
+                                 struct bvec_merge_data *bvm,
+                                 struct bio_vec *biovec)
 {
         mddev_t *mddev = q->queuedata;
         dev_info_t *dev0;
-        unsigned long maxsectors, bio_sectors = bio->bi_size >> 9;
-        sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev);
+        unsigned long maxsectors, bio_sectors = bvm->bi_size >> 9;
+        sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
 
         dev0 = which_dev(mddev, sector);
         maxsectors = (dev0->size << 1) - (sector - (dev0->offset<<1));
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 914c04ddec7c..bcbb82594a19 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -241,18 +241,20 @@ static int create_strip_zones (mddev_t *mddev)
 /**
  *      raid0_mergeable_bvec -- tell bio layer if a two requests can be merged
  *      @q: request queue
- *      @bio: the buffer head that's been built up so far
+ *      @bvm: properties of new bio
  *      @biovec: the request that could be merged to it.
  *
  *      Return amount of bytes we can accept at this offset
  */
-static int raid0_mergeable_bvec(struct request_queue *q, struct bio *bio, struct bio_vec *biovec)
+static int raid0_mergeable_bvec(struct request_queue *q,
+                                struct bvec_merge_data *bvm,
+                                struct bio_vec *biovec)
 {
         mddev_t *mddev = q->queuedata;
-        sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev);
+        sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
         int max;
         unsigned int chunk_sectors = mddev->chunk_size >> 9;
-        unsigned int bio_sectors = bio->bi_size >> 9;
+        unsigned int bio_sectors = bvm->bi_size >> 9;
 
         max =  (chunk_sectors - ((sector & (chunk_sectors - 1)) + bio_sectors)) << 9;
         if (max < 0) max = 0; /* bio_add cannot handle a negative return */
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index a71277b640ab..22bb2b1b886d 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -439,26 +439,27 @@ static sector_t raid10_find_virt(conf_t *conf, sector_t sector, int dev)
 /**
  *      raid10_mergeable_bvec -- tell bio layer if a two requests can be merged
  *      @q: request queue
- *      @bio: the buffer head that's been built up so far
+ *      @bvm: properties of new bio
  *      @biovec: the request that could be merged to it.
  *
  *      Return amount of bytes we can accept at this offset
  *      If near_copies == raid_disk, there are no striping issues,
  *      but in that case, the function isn't called at all.
  */
-static int raid10_mergeable_bvec(struct request_queue *q, struct bio *bio,
-                                struct bio_vec *bio_vec)
+static int raid10_mergeable_bvec(struct request_queue *q,
+                                 struct bvec_merge_data *bvm,
+                                 struct bio_vec *biovec)
 {
         mddev_t *mddev = q->queuedata;
-        sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev);
+        sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
         int max;
         unsigned int chunk_sectors = mddev->chunk_size >> 9;
-        unsigned int bio_sectors = bio->bi_size >> 9;
+        unsigned int bio_sectors = bvm->bi_size >> 9;
 
         max =  (chunk_sectors - ((sector & (chunk_sectors - 1)) + bio_sectors)) << 9;
         if (max < 0) max = 0; /* bio_add cannot handle a negative return */
-        if (max <= bio_vec->bv_len && bio_sectors == 0)
-                return bio_vec->bv_len;
+        if (max <= biovec->bv_len && bio_sectors == 0)
+                return biovec->bv_len;
         else
                 return max;
 }
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 3b27df52456b..9ce7154845c6 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3314,15 +3314,17 @@ static int raid5_congested(void *data, int bits)
 /* We want read requests to align with chunks where possible,
  * but write requests don't need to.
  */
-static int raid5_mergeable_bvec(struct request_queue *q, struct bio *bio, struct bio_vec *biovec)
+static int raid5_mergeable_bvec(struct request_queue *q,
+                                struct bvec_merge_data *bvm,
+                                struct bio_vec *biovec)
 {
         mddev_t *mddev = q->queuedata;
-        sector_t sector = bio->bi_sector + get_start_sect(bio->bi_bdev);
+        sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
         int max;
         unsigned int chunk_sectors = mddev->chunk_size >> 9;
-        unsigned int bio_sectors = bio->bi_size >> 9;
+        unsigned int bio_sectors = bvm->bi_size >> 9;
 
-        if (bio_data_dir(bio) == WRITE)
+        if ((bvm->bi_rw & 1) == WRITE)
                 return biovec->bv_len; /* always allow writes to be mergeable */
 
         max =  (chunk_sectors - ((sector & (chunk_sectors - 1)) + bio_sectors)) << 9;
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 8b56d929f7fd..e208a60c048a 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -32,6 +32,7 @@
 #include <linux/fs.h>
 #include <linux/cdev.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include "dvbdev.h"
 
 static int dvbdev_debug;
@@ -74,6 +75,7 @@ static int dvb_device_open(struct inode *inode, struct file *file)
 {
         struct dvb_device *dvbdev;
 
+        lock_kernel();
         dvbdev = dvbdev_find_device (iminor(inode));
 
         if (dvbdev && dvbdev->fops) {
@@ -90,8 +92,10 @@ static int dvb_device_open(struct inode *inode, struct file *file)
                         file->f_op = fops_get(old_fops);
                 }
                 fops_put(old_fops);
+                unlock_kernel();
                 return err;
         }
+        unlock_kernel();
         return -ENODEV;
 }
 
diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index 06dfed9ef4c7..3e840f74d45c 100644
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
@@ -27,13 +28,16 @@ static int rds_f_open(struct inode *in, struct file *fi)
         if (rds_users)
                 return -EBUSY;
 
+        lock_kernel();
         rds_users++;
         if ((text_buffer=kmalloc(66, GFP_KERNEL)) == 0) {
                 rds_users--;
                 printk(KERN_NOTICE "aci-rds: Out of memory by open()...\n");
+                unlock_kernel();
                 return -ENOMEM;
         }
 
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 67a661cf5219..7649860a388d 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
@@ -442,6 +443,7 @@ static int video_open(struct inode *inode, struct file *file)
 
         if(minor>=VIDEO_NUM_DEVICES)
                 return -ENODEV;
+        lock_kernel();
         mutex_lock(&videodev_lock);
         vfl=video_device[minor];
         if(vfl==NULL) {
@@ -451,6 +453,7 @@ static int video_open(struct inode *inode, struct file *file)
                 vfl=video_device[minor];
                 if (vfl==NULL) {
                         mutex_unlock(&videodev_lock);
+                        unlock_kernel();
                         return -ENODEV;
                 }
         }
@@ -464,6 +467,7 @@ static int video_open(struct inode *inode, struct file *file)
         }
         fops_put(old_fops);
         mutex_unlock(&videodev_lock);
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index e630b50966ec..c5946560c4e2 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -548,11 +548,15 @@ static int
 mptctl_fasync(int fd, struct file *filep, int mode)
 {
         MPT_ADAPTER     *ioc;
+        int ret;
 
+        lock_kernel();
         list_for_each_entry(ioc, &ioc_list, list)
                 ioc->aen_event_read_flag=0;
 
-        return fasync_helper(fd, filep, mode, &async_queue);
+        ret = fasync_helper(fd, filep, mode, &async_queue);
+        unlock_kernel();
+        return ret;
 }
 
 static int
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index c0fb77dc19bb..4238de98d4a6 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -1061,6 +1061,7 @@ static int cfg_open(struct inode *inode, struct file *file)
         if (!tmp)
                 return -ENOMEM;
 
+        lock_kernel();
         file->private_data = (void *)(i2o_cfg_info_id++);
         tmp->fp = file;
         tmp->fasync = NULL;
@@ -1074,6 +1075,7 @@ static int cfg_open(struct inode *inode, struct file *file)
         spin_lock_irqsave(&i2o_config_lock, flags);
         open_files = tmp;
         spin_unlock_irqrestore(&i2o_config_lock, flags);
+        unlock_kernel();
 
         return 0;
 }
@@ -1082,15 +1084,17 @@ static int cfg_fasync(int fd, struct file *fp, int on)
 {
         ulong id = (ulong) fp->private_data;
         struct i2o_cfg_info *p;
+        int ret = -EBADF;
 
+        lock_kernel();
         for (p = open_files; p; p = p->next)
                 if (p->q_id == id)
                         break;
 
-        if (!p)
-                return -EBADF;
-
-        return fasync_helper(fd, fp, on, &p->fasync);
+        if (p)
+                ret = fasync_helper(fd, fp, on, &p->fasync);
+        unlock_kernel();
+        return ret;
 }
 
 static int cfg_release(struct inode *inode, struct file *file)
diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c
index 0d5ce03cdff2..5b5a14dab3d3 100644
--- a/drivers/misc/atmel_pwm.c
+++ b/drivers/misc/atmel_pwm.c
@@ -332,7 +332,7 @@ static int __init pwm_probe(struct platform_device *pdev)
         p->base = ioremap(r->start, r->end - r->start + 1);
         if (!p->base)
                 goto fail;
-        p->clk = clk_get(&pdev->dev, "mck");
+        p->clk = clk_get(&pdev->dev, "pwm_clk");
         if (IS_ERR(p->clk)) {
                 status = PTR_ERR(p->clk);
                 p->clk = NULL;
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index ff51ab67231c..176fe4e09d3f 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 #include <linux/miscdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/hdpu_features.h>
@@ -151,7 +152,13 @@ static ssize_t cpustate_write(struct file *file, const char *buf,
 
 static int cpustate_open(struct inode *inode, struct file *file)
 {
-        return cpustate_get_ref((file->f_flags & O_EXCL));
+        int ret;
+
+        lock_kernel();
+        ret = cpustate_get_ref((file->f_flags & O_EXCL));
+        unlock_kernel();
+
+        return ret;
 }
 
 static int cpustate_release(struct inode *inode, struct file *file)
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 71d1c84e2fa8..186162470090 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/cdev.h>
 #include <linux/phantom.h>
+#include <linux/smp_lock.h>
 
 #include <asm/atomic.h>
 #include <asm/io.h>
@@ -212,13 +213,17 @@ static int phantom_open(struct inode *inode, struct file *file)
         struct phantom_device *dev = container_of(inode->i_cdev,
                         struct phantom_device, cdev);
 
+        lock_kernel();
         nonseekable_open(inode, file);
 
-        if (mutex_lock_interruptible(&dev->open_lock))
+        if (mutex_lock_interruptible(&dev->open_lock)) {
+                unlock_kernel();
                 return -ERESTARTSYS;
+        }
 
         if (dev->opened) {
                 mutex_unlock(&dev->open_lock);
+                unlock_kernel();
                 return -EINVAL;
         }
 
@@ -229,7 +234,7 @@ static int phantom_open(struct inode *inode, struct file *file)
         atomic_set(&dev->counter, 0);
         dev->opened++;
         mutex_unlock(&dev->open_lock);
-
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 00e48e2a9c11..60775be22822 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -46,6 +46,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
@@ -1927,8 +1928,10 @@ static int sonypi_misc_release(struct inode *inode, struct file *file)
 static int sonypi_misc_open(struct inode *inode, struct file *file)
 {
         /* Flush input queue on first open */
+        lock_kernel();
         if (atomic_inc_return(&sonypi_compat.open_count) == 1)
                 kfifo_reset(sonypi_compat.fifo);
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 95f33e87a99c..eed211b2ac70 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -42,6 +42,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 
 #include <asm/dma.h>
 #include <asm/io.h>
@@ -92,6 +93,8 @@ struct imxmci_host {
         unsigned char           actual_bus_width;
 
         int                     prev_cmd_code;
+
+        struct clk              *clk;
 };
 
 #define IMXMCI_PEND_IRQ_b       0
@@ -841,7 +844,7 @@ static void imxmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 /* The prescaler is 5 for PERCLK2 equal to 96MHz
                  * then 96MHz / 5 = 19.2 MHz
                  */
-                clk=imx_get_perclk2();
+                clk = clk_get_rate(host->clk);
                 prescaler=(clk+(CLK_RATE*7)/8)/CLK_RATE;
                 switch(prescaler) {
                 case 0:
@@ -994,6 +997,13 @@ static int imxmci_probe(struct platform_device *pdev)
         host->res = r;
         host->irq = irq;
 
+        host->clk = clk_get(&pdev->dev, "perclk2");
+        if (IS_ERR(host->clk)) {
+                ret = PTR_ERR(host->clk);
+                goto out;
+        }
+        clk_enable(host->clk);
+
         imx_gpio_mode(PB8_PF_SD_DAT0);
         imx_gpio_mode(PB9_PF_SD_DAT1);
         imx_gpio_mode(PB10_PF_SD_DAT2);
@@ -1017,8 +1027,8 @@ static int imxmci_probe(struct platform_device *pdev)
         host->imask = IMXMCI_INT_MASK_DEFAULT;
         MMC_INT_MASK = host->imask;
 
-
-        if(imx_dma_request_by_prio(&host->dma, DRIVER_NAME, DMA_PRIO_LOW)<0){
+        host->dma = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_LOW);
+        if(host->dma < 0) {
                 dev_err(mmc_dev(host->mmc), "imx_dma_request_by_prio failed\n");
                 ret = -EBUSY;
                 goto out;
@@ -1053,6 +1063,10 @@ out:
                         imx_dma_free(host->dma);
                         host->dma_allocated=0;
                 }
+                if (host->clk) {
+                        clk_disable(host->clk);
+                        clk_put(host->clk);
+                }
         }
         if (mmc)
                 mmc_free_host(mmc);
@@ -1082,6 +1096,9 @@ static int imxmci_remove(struct platform_device *pdev)
 
                 tasklet_kill(&host->tasklet);
 
+                clk_disable(host->clk);
+                clk_put(host->clk);
+
                 release_resource(host->res);
 
                 mmc_free_host(mmc);
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 4a79b187b568..5c29872184e6 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -130,10 +130,6 @@ typedef struct partition_t {
     u_int16_t           DataUnits;
     u_int32_t           BlocksPerUnit;
     erase_unit_header_t header;
-#if 0
-    region_info_t       region;
-    memory_handle_t     handle;
-#endif
 } partition_t;
 
 /* Partition state flags */
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index c12d8056bebd..68eec6c6c517 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -60,13 +60,22 @@ struct omapflash_info {
 static void omap_set_vpp(struct map_info *map, int enable)
 {
         static int      count;
-
-        if (enable) {
-                if (count++ == 0)
-                        OMAP_EMIFS_CONFIG_REG |= OMAP_EMIFS_CONFIG_WP;
-        } else {
-                if (count && (--count == 0))
-                        OMAP_EMIFS_CONFIG_REG &= ~OMAP_EMIFS_CONFIG_WP;
+        u32 l;
+
+        if (cpu_class_is_omap1()) {
+                if (enable) {
+                        if (count++ == 0) {
+                                l = omap_readl(EMIFS_CONFIG);
+                                l |= OMAP_EMIFS_CONFIG_WP;
+                                omap_writel(l, EMIFS_CONFIG);
+                        }
+                } else {
+                        if (count && (--count == 0)) {
+                                l = omap_readl(EMIFS_CONFIG);
+                                l &= ~OMAP_EMIFS_CONFIG_WP;
+                                omap_writel(l, EMIFS_CONFIG);
+                        }
+                }
         }
 }
 
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 1912d968718b..0cc31675aeb9 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -498,17 +498,14 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         int i;
         config_info_t t;
         static char *probes[] = { "jedec_probe", "cfi_probe" };
-        cisinfo_t cisinfo;
         int new_name = 0;
 
         DEBUG(3, "link=0x%p", link);
 
         DEBUG(2, "Validating CIS");
-        ret = pcmcia_validate_cis(link, &cisinfo);
+        ret = pcmcia_validate_cis(link, NULL);
         if(ret != CS_SUCCESS) {
                 cs_error(link, GetTupleData, ret);
-        } else {
-                DEBUG(2, "ValidateCIS found %d chains", cisinfo.Chains);
         }
 
         card_settings(dev, link, &new_name);
@@ -563,9 +560,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10);
 
         /* Get write protect status */
-        CS_CHECK(GetStatus, pcmcia_get_status(link, &status));
-        DEBUG(2, "status value: 0x%x window handle = 0x%8.8lx",
-              status.CardState, (unsigned long)link->win);
+        DEBUG(2, "window handle = 0x%8.8lx", (unsigned long)link->win);
         dev->win_base = ioremap(req.Base, req.Size);
         if(!dev->win_base) {
                 err("ioremap(%lu, %u) failed", req.Base, req.Size);
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 5d3ac512ce16..129d429cd2da 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/compatmac.h>
@@ -86,6 +87,7 @@ static int mtd_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
         int devnum = minor >> 1;
+        int ret = 0;
         struct mtd_info *mtd;
         struct mtd_file_info *mfi;
 
@@ -98,31 +100,39 @@ static int mtd_open(struct inode *inode, struct file *file)
         if ((file->f_mode & 2) && (minor & 1))
                 return -EACCES;
 
+        lock_kernel();
         mtd = get_mtd_device(NULL, devnum);
 
-        if (IS_ERR(mtd))
-                return PTR_ERR(mtd);
+        if (IS_ERR(mtd)) {
+                ret = PTR_ERR(mtd);
+                goto out;
+        }
 
         if (MTD_ABSENT == mtd->type) {
                 put_mtd_device(mtd);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out;
         }
 
         /* You can't open it RW if it's not a writeable device */
         if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) {
                 put_mtd_device(mtd);
-                return -EACCES;
+                ret = -EACCES;
+                goto out;
         }
 
         mfi = kzalloc(sizeof(*mfi), GFP_KERNEL);
         if (!mfi) {
                 put_mtd_device(mtd);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
         mfi->mtd = mtd;
         file->private_data = mfi;
 
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 } /* mtd_open */
 
 /*====================================================================*/
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 59e05a1c50cf..ee2ac3948cd8 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -85,6 +85,9 @@ static int __init orion_nand_probe(struct platform_device *pdev)
         nc->cmd_ctrl = orion_nand_cmd_ctrl;
         nc->ecc.mode = NAND_ECC_SOFT;
 
+        if (board->chip_delay)
+                nc->chip_delay = board->chip_delay;
+
         if (board->width == 16)
                 nc->options |= NAND_BUSWIDTH_16;
 
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 9d6aae5449b6..89193ba9451e 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -39,6 +39,7 @@
 #include <linux/stat.h>
 #include <linux/ioctl.h>
 #include <linux/capability.h>
+#include <linux/smp_lock.h>
 #include <mtd/ubi-user.h>
 #include <asm/uaccess.h>
 #include <asm/div64.h>
@@ -103,9 +104,12 @@ static int vol_cdev_open(struct inode *inode, struct file *file)
         struct ubi_volume_desc *desc;
         int vol_id = iminor(inode) - 1, mode, ubi_num;
 
+        lock_kernel();
         ubi_num = ubi_major2num(imajor(inode));
-        if (ubi_num < 0)
+        if (ubi_num < 0) {
+                unlock_kernel();
                 return ubi_num;
+        }
 
         if (file->f_mode & FMODE_WRITE)
                 mode = UBI_READWRITE;
@@ -115,6 +119,7 @@ static int vol_cdev_open(struct inode *inode, struct file *file)
         dbg_msg("open volume %d, mode %d", vol_id, mode);
 
         desc = ubi_open_volume(ubi_num, vol_id, mode);
+        unlock_kernel();
         if (IS_ERR(desc))
                 return PTR_ERR(desc);
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8e3e968b2957..2683ee32fc11 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -217,7 +217,7 @@ config MII
 
 config MACB
         tristate "Atmel MACB support"
-        depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91CAP9
+        depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9
         select PHYLIB
         help
           The Atmel MACB ethernet interface is found on many AT32 and AT91
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 00081d2b9cd5..e9d15eccad08 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -647,7 +647,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         struct ei_device *ei_local;
         struct net_device *dev;
         struct etherh_priv *eh;
-        int i, ret;
+        int ret;
         DECLARE_MAC_BUF(mac);
 
         etherh_banner();
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index d5c2d27f3ea4..f76b0b6c277d 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -13,16 +13,8 @@
  *
  */
 #include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/errno.h>
 #include <linux/netdevice.h>
-#include <linux/slab.h>
-#include <linux/rtnetlink.h>
-#include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
-#include <linux/pm.h>
 #include <linux/clk.h>
 
 #include <net/irda/irda.h>
@@ -30,17 +22,9 @@
 #include <net/irda/wrapper.h>
 #include <net/irda/irda_device.h>
 
-#include <asm/irq.h>
 #include <asm/dma.h>
-#include <asm/delay.h>
-#include <asm/hardware.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-
-#ifdef CONFIG_MACH_MAINSTONE
-#include <asm/arch/mainstone.h>
-#endif
 
 #define IrSR_RXPL_NEG_IS_ZERO (1<<4)
 #define IrSR_RXPL_POS_IS_ZERO 0x0
@@ -163,10 +147,6 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                         /* set board transceiver to SIR mode */
                         si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
 
-                        /* configure GPIO46/47 */
-                        pxa_gpio_mode(GPIO46_STRXD_MD);
-                        pxa_gpio_mode(GPIO47_STTXD_MD);
-
                         /* enable the STUART clock */
                         pxa_irda_enable_sirclk(si);
                 }
@@ -201,10 +181,6 @@ static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
                 /* set board transceiver to FIR mode */
                 si->pdata->transceiver_mode(si->dev, IR_FIRMODE);
 
-                /* configure GPIO46/47 */
-                pxa_gpio_mode(GPIO46_ICPRXD_MD);
-                pxa_gpio_mode(GPIO47_ICPTXD_MD);
-
                 /* enable the FICP clock */
                 pxa_irda_enable_firclk(si);
 
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 92dccd43bdca..0a5745a854c7 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1277,8 +1277,45 @@ static int __exit macb_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int macb_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct net_device *netdev = platform_get_drvdata(pdev);
+        struct macb *bp = netdev_priv(netdev);
+
+        netif_device_detach(netdev);
+
+#ifndef CONFIG_ARCH_AT91
+        clk_disable(bp->hclk);
+#endif
+        clk_disable(bp->pclk);
+
+        return 0;
+}
+
+static int macb_resume(struct platform_device *pdev)
+{
+        struct net_device *netdev = platform_get_drvdata(pdev);
+        struct macb *bp = netdev_priv(netdev);
+
+        clk_enable(bp->pclk);
+#ifndef CONFIG_ARCH_AT91
+        clk_enable(bp->hclk);
+#endif
+
+        netif_device_attach(netdev);
+
+        return 0;
+}
+#else
+#define macb_suspend    NULL
+#define macb_resume     NULL
+#endif
+
 static struct platform_driver macb_driver = {
         .remove         = __exit_p(macb_remove),
+        .suspend        = macb_suspend,
+        .resume         = macb_resume,
         .driver         = {
                 .name           = "macb",
                 .owner  = THIS_MODULE,
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 1f4ca2b54a73..83625fdff3dd 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -39,6 +39,7 @@
 #include <linux/if_arp.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
+#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/rwsem.h>
 #include <linux/stddef.h>
@@ -353,6 +354,7 @@ static const int npindex_to_ethertype[NUM_NP] = {
  */
 static int ppp_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
         /*
          * This could (should?) be enforced by the permissions on /dev/ppp.
          */
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index b9018bfa0a97..eba1271b9735 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -48,6 +48,7 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/init.h>
@@ -802,22 +803,26 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
 
         DBG(KERN_INFO "%s: tun_chr_fasync %d\n", tun->dev->name, on);
 
+        lock_kernel();
         if ((ret = fasync_helper(fd, file, on, &tun->fasync)) < 0)
-                return ret;
+                goto out;
 
         if (on) {
                 ret = __f_setown(file, task_pid(current), PIDTYPE_PID, 0);
                 if (ret)
-                        return ret;
+                        goto out;
                 tun->flags |= TUN_FASYNC;
         } else
                 tun->flags &= ~TUN_FASYNC;
-
-        return 0;
+        ret = 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int tun_chr_open(struct inode *inode, struct file * file)
 {
+        cycle_kernel_lock();
         DBG1(KERN_INFO "tunX: tun_chr_open\n");
         file->private_data = NULL;
         return 0;
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index b0fce1387eaf..5827324e9d9f 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -92,6 +92,7 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
+#include <linux/smp_lock.h>
 
 #undef COSA_SLOW_IO     /* for testing purposes only */
 
@@ -970,15 +971,21 @@ static int cosa_open(struct inode *inode, struct file *file)
         struct channel_data *chan;
         unsigned long flags;
         int n;
+        int ret = 0;
 
+        lock_kernel();
         if ((n=iminor(file->f_path.dentry->d_inode)>>CARD_MINOR_BITS)
-                >= nr_cards)
-                return -ENODEV;
+                >= nr_cards) {
+                ret = -ENODEV;
+                goto out;
+        }
         cosa = cosa_cards+n;
 
         if ((n=iminor(file->f_path.dentry->d_inode)
-                & ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels)
-                return -ENODEV;
+                & ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels) {
+                ret = -ENODEV;
+                goto out;
+        }
         chan = cosa->chan + n;
         
         file->private_data = chan;
@@ -987,7 +994,8 @@ static int cosa_open(struct inode *inode, struct file *file)
 
         if (chan->usage < 0) { /* in netdev mode */
                 spin_unlock_irqrestore(&cosa->lock, flags);
-                return -EBUSY;
+                ret = -EBUSY;
+                goto out;
         }
         cosa->usage++;
         chan->usage++;
@@ -996,7 +1004,9 @@ static int cosa_open(struct inode *inode, struct file *file)
         chan->setup_rx = chrdev_setup_rx;
         chan->rx_done = chrdev_rx_done;
         spin_unlock_irqrestore(&cosa->lock, flags);
-        return 0;
+out:
+        unlock_kernel();
+        return ret;
 }
 
 static int cosa_release(struct inode *inode, struct file *file)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index d26f69b0184f..ef671d1a3bf0 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1324,7 +1324,7 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
                 goto fail;
         }
 
-        txs = (struct xen_netif_tx_sring *)get_zeroed_page(GFP_KERNEL);
+        txs = (struct xen_netif_tx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
         if (!txs) {
                 err = -ENOMEM;
                 xenbus_dev_fatal(dev, err, "allocating tx ring page");
@@ -1340,7 +1340,7 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
         }
 
         info->tx_ring_ref = err;
-        rxs = (struct xen_netif_rx_sring *)get_zeroed_page(GFP_KERNEL);
+        rxs = (struct xen_netif_rx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
         if (!rxs) {
                 err = -ENOMEM;
                 xenbus_dev_fatal(dev, err, "allocating rx ring page");
diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 86e9c84a965e..5ac207932fd7 100644
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -83,6 +84,8 @@ static int eisa_eeprom_ioctl(struct inode *inode, struct file *file,
 
 static int eisa_eeprom_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
+
         if (file->f_mode & 2)
                 return -EINVAL;
    
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 66c0fd21894b..bb0642318a95 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1637,12 +1637,43 @@ static inline int iommu_prepare_rmrr_dev(struct dmar_rmrr_unit *rmrr,
 }
 
 #ifdef CONFIG_DMAR_GFX_WA
-extern int arch_get_ram_range(int slot, u64 *addr, u64 *size);
+struct iommu_prepare_data {
+        struct pci_dev *pdev;
+        int ret;
+};
+
+static int __init iommu_prepare_work_fn(unsigned long start_pfn,
+                                         unsigned long end_pfn, void *datax)
+{
+        struct iommu_prepare_data *data;
+
+        data = (struct iommu_prepare_data *)datax;
+
+        data->ret = iommu_prepare_identity_map(data->pdev,
+                                start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT);
+        return data->ret;
+
+}
+
+static int __init iommu_prepare_with_active_regions(struct pci_dev *pdev)
+{
+        int nid;
+        struct iommu_prepare_data data;
+
+        data.pdev = pdev;
+        data.ret = 0;
+
+        for_each_online_node(nid) {
+                work_with_active_regions(nid, iommu_prepare_work_fn, &data);
+                if (data.ret)
+                        return data.ret;
+        }
+        return data.ret;
+}
+
 static void __init iommu_prepare_gfx_mapping(void)
 {
         struct pci_dev *pdev = NULL;
-        u64 base, size;
-        int slot;
         int ret;
 
         for_each_pci_dev(pdev) {
@@ -1651,17 +1682,9 @@ static void __init iommu_prepare_gfx_mapping(void)
                         continue;
                 printk(KERN_INFO "IOMMU: gfx device %s 1-1 mapping\n",
                         pci_name(pdev));
-                slot = arch_get_ram_range(0, &base, &size);
-                while (slot >= 0) {
-                        ret = iommu_prepare_identity_map(pdev,
-                                        base, base + size);
-                        if (ret)
-                                goto error;
-                        slot = arch_get_ram_range(slot, &base, &size);
-                }
-                continue;
-error:
-                printk(KERN_ERR "IOMMU: mapping reserved region failed\n");
+                ret = iommu_prepare_with_active_regions(pdev);
+                if (ret)
+                        printk(KERN_ERR "IOMMU: mapping reserved region failed\n");
         }
 }
 #endif
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 1b0eb5aaf650..e45402adac3f 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -263,6 +263,13 @@ config OMAP_CF
           Say Y here to support the CompactFlash controller on OMAP.
           Note that this doesn't support "True IDE" mode.
 
+config BFIN_CFPCMCIA
+        tristate "Blackfin CompactFlash PCMCIA Driver"
+        depends on PCMCIA && BLACKFIN
+        help
+          Say Y here to support the CompactFlash PCMCIA driver for Blackfin.
+
+
 config AT91_CF
         tristate "AT91 CompactFlash Controller"
         depends on PCMCIA && ARCH_AT91RM9200
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 6f6478ba7174..85c6cc931f97 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_PCMCIA_AU1X00)			+= au1x00_ss.o
 obj-$(CONFIG_PCMCIA_VRC4171)                    += vrc4171_card.o
 obj-$(CONFIG_PCMCIA_VRC4173)                    += vrc4173_cardu.o
 obj-$(CONFIG_OMAP_CF)                           += omap_cf.o
+obj-$(CONFIG_BFIN_CFPCMCIA)                     += bfin_cf_pcmcia.o
 obj-$(CONFIG_AT91_CF)                           += at91_cf.o
 obj-$(CONFIG_ELECTRA_CF)                        += electra_cf.o
 
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h
index 1e467bb54077..a53ef5902518 100644
--- a/drivers/pcmcia/au1000_generic.h
+++ b/drivers/pcmcia/au1000_generic.h
@@ -26,7 +26,6 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
@@ -34,9 +33,9 @@
 #define AU1000_PCMCIA_IO_SPEED       (255)
 #define AU1000_PCMCIA_MEM_SPEED      (300)
 
-#define AU1X_SOCK0_IO        0xF00000000
-#define AU1X_SOCK0_PHYS_ATTR 0xF40000000
-#define AU1X_SOCK0_PHYS_MEM  0xF80000000
+#define AU1X_SOCK0_IO        0xF00000000ULL
+#define AU1X_SOCK0_PHYS_ATTR 0xF40000000ULL
+#define AU1X_SOCK0_PHYS_MEM  0xF80000000ULL
 /* pseudo 32 bit phys addresses, which get fixed up to the
  * real 36 bit address in fixup_bigphys_addr() */
 #define AU1X_SOCK0_PSEUDO_PHYS_ATTR 0xF4000000
@@ -45,16 +44,20 @@
 /* pcmcia socket 1 needs external glue logic so the memory map
  * differs from board to board.
  */
-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_PB1200)
-#define AU1X_SOCK1_IO        0xF08000000
-#define AU1X_SOCK1_PHYS_ATTR 0xF48000000
-#define AU1X_SOCK1_PHYS_MEM  0xF88000000
+#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || \
+    defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || \
+    defined(CONFIG_MIPS_PB1200)
+#define AU1X_SOCK1_IO        0xF08000000ULL
+#define AU1X_SOCK1_PHYS_ATTR 0xF48000000ULL
+#define AU1X_SOCK1_PHYS_MEM  0xF88000000ULL
 #define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000
 #define AU1X_SOCK1_PSEUDO_PHYS_MEM  0xF8800000
-#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || defined(CONFIG_MIPS_DB1200)
-#define AU1X_SOCK1_IO        0xF04000000
-#define AU1X_SOCK1_PHYS_ATTR 0xF44000000
-#define AU1X_SOCK1_PHYS_MEM  0xF84000000
+#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || \
+      defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || \
+      defined(CONFIG_MIPS_DB1200)
+#define AU1X_SOCK1_IO        0xF04000000ULL
+#define AU1X_SOCK1_PHYS_ATTR 0xF44000000ULL
+#define AU1X_SOCK1_PHYS_MEM  0xF84000000ULL
 #define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4400000
 #define AU1X_SOCK1_PSEUDO_PHYS_MEM  0xF8400000
 #endif
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c
index 157e41423a0a..aa1cd4d3aa29 100644
--- a/drivers/pcmcia/au1000_pb1x00.c
+++ b/drivers/pcmcia/au1000_pb1x00.c
@@ -35,7 +35,6 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/bus_ops.h>
 #include "cs_internal.h"
diff --git a/drivers/pcmcia/au1000_xxs1500.c b/drivers/pcmcia/au1000_xxs1500.c
index c78ed5347510..8a9b18cee847 100644
--- a/drivers/pcmcia/au1000_xxs1500.c
+++ b/drivers/pcmcia/au1000_xxs1500.c
@@ -39,7 +39,6 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/bus_ops.h>
 #include "cs_internal.h"
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
new file mode 100644
index 000000000000..bb7338863fb9
--- /dev/null
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -0,0 +1,339 @@
+/*
+ * file: drivers/pcmcia/bfin_cf.c
+ *
+ * based on: drivers/pcmcia/omap_cf.c
+ * omap_cf.c -- OMAP 16xx CompactFlash controller driver
+ *
+ * Copyright (c) 2005 David Brownell
+ * Copyright (c) 2006-2008 Michael Hennerich Analog Devices Inc.
+ *
+ * bugs:         enter bugs at http://blackfin.uclinux.org/
+ *
+ * this program is free software; you can redistribute it and/or modify
+ * it under the terms of the gnu general public license as published by
+ * the free software foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * 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.
+ *
+ * you should have received a copy of the gnu general public license
+ * along with this program; see the file copying.
+ * if not, write to the free software foundation,
+ * 59 temple place - suite 330, boston, ma 02111-1307, usa.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/platform_device.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+
+#include <pcmcia/ss.h>
+#include <pcmcia/cisreg.h>
+#include <asm/gpio.h>
+
+#define SZ_1K   0x00000400
+#define SZ_8K   0x00002000
+#define SZ_2K   (2 * SZ_1K)
+
+#define POLL_INTERVAL   (2 * HZ)
+
+#define CF_ATASEL_ENA   0x20311802      /* Inverts RESET */
+#define CF_ATASEL_DIS   0x20311800
+
+#define bfin_cf_present(pfx) (gpio_get_value(pfx))
+
+/*--------------------------------------------------------------------------*/
+
+static const char driver_name[] = "bfin_cf_pcmcia";
+
+struct bfin_cf_socket {
+        struct pcmcia_socket socket;
+
+        struct timer_list timer;
+        unsigned present:1;
+        unsigned active:1;
+
+        struct platform_device *pdev;
+        unsigned long phys_cf_io;
+        unsigned long phys_cf_attr;
+        u_int irq;
+        u_short cd_pfx;
+};
+
+/*--------------------------------------------------------------------------*/
+static int bfin_cf_reset(void)
+{
+        outw(0, CF_ATASEL_ENA);
+        mdelay(200);
+        outw(0, CF_ATASEL_DIS);
+
+        return 0;
+}
+
+static int bfin_cf_ss_init(struct pcmcia_socket *s)
+{
+        return 0;
+}
+
+/* the timer is primarily to kick this socket's pccardd */
+static void bfin_cf_timer(unsigned long _cf)
+{
+        struct bfin_cf_socket *cf = (void *)_cf;
+        unsigned short present = bfin_cf_present(cf->cd_pfx);
+
+        if (present != cf->present) {
+                cf->present = present;
+                dev_dbg(&cf->pdev->dev, ": card %s\n",
+                         present ? "present" : "gone");
+                pcmcia_parse_events(&cf->socket, SS_DETECT);
+        }
+
+        if (cf->active)
+                mod_timer(&cf->timer, jiffies + POLL_INTERVAL);
+}
+
+static int bfin_cf_get_status(struct pcmcia_socket *s, u_int *sp)
+{
+        struct bfin_cf_socket *cf;
+
+        if (!sp)
+                return -EINVAL;
+
+        cf = container_of(s, struct bfin_cf_socket, socket);
+
+        if (bfin_cf_present(cf->cd_pfx)) {
+                *sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD;
+                s->irq.AssignedIRQ = 0;
+                s->pci_irq = cf->irq;
+
+        } else
+                *sp = 0;
+        return 0;
+}
+
+static int
+bfin_cf_set_socket(struct pcmcia_socket *sock, struct socket_state_t *s)
+{
+
+        struct bfin_cf_socket *cf;
+        cf = container_of(sock, struct bfin_cf_socket, socket);
+
+        switch (s->Vcc) {
+        case 0:
+        case 33:
+                break;
+        case 50:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (s->flags & SS_RESET) {
+                disable_irq(cf->irq);
+                bfin_cf_reset();
+                enable_irq(cf->irq);
+        }
+
+        dev_dbg(&cf->pdev->dev, ": Vcc %d, io_irq %d, flags %04x csc %04x\n",
+                 s->Vcc, s->io_irq, s->flags, s->csc_mask);
+
+        return 0;
+}
+
+static int bfin_cf_ss_suspend(struct pcmcia_socket *s)
+{
+        return bfin_cf_set_socket(s, &dead_socket);
+}
+
+/* regions are 2K each:  mem, attrib, io (and reserved-for-ide) */
+
+static int bfin_cf_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io)
+{
+        struct bfin_cf_socket *cf;
+
+        cf = container_of(s, struct bfin_cf_socket, socket);
+        io->flags &= MAP_ACTIVE | MAP_ATTRIB | MAP_16BIT;
+        io->start = cf->phys_cf_io;
+        io->stop = io->start + SZ_2K - 1;
+        return 0;
+}
+
+static int
+bfin_cf_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *map)
+{
+        struct bfin_cf_socket *cf;
+
+        if (map->card_start)
+                return -EINVAL;
+        cf = container_of(s, struct bfin_cf_socket, socket);
+        map->static_start = cf->phys_cf_io;
+        map->flags &= MAP_ACTIVE | MAP_ATTRIB | MAP_16BIT;
+        if (map->flags & MAP_ATTRIB)
+                map->static_start = cf->phys_cf_attr;
+
+        return 0;
+}
+
+static struct pccard_operations bfin_cf_ops = {
+        .init = bfin_cf_ss_init,
+        .suspend = bfin_cf_ss_suspend,
+        .get_status = bfin_cf_get_status,
+        .set_socket = bfin_cf_set_socket,
+        .set_io_map = bfin_cf_set_io_map,
+        .set_mem_map = bfin_cf_set_mem_map,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __devinit bfin_cf_probe(struct platform_device *pdev)
+{
+        struct bfin_cf_socket *cf;
+        struct resource *io_mem, *attr_mem;
+        int irq;
+        unsigned short cd_pfx;
+        int status = 0;
+
+        dev_info(&pdev->dev, "Blackfin CompactFlash/PCMCIA Socket Driver\n");
+
+        irq = platform_get_irq(pdev, 0);
+        if (!irq)
+                return -EINVAL;
+
+        cd_pfx = platform_get_irq(pdev, 1);     /*Card Detect GPIO PIN */
+
+        if (gpio_request(cd_pfx, "pcmcia: CD")) {
+                dev_err(&pdev->dev,
+                       "Failed ro request Card Detect GPIO_%d\n",
+                       cd_pfx);
+                return -EBUSY;
+        }
+        gpio_direction_input(cd_pfx);
+
+        cf = kzalloc(sizeof *cf, GFP_KERNEL);
+        if (!cf) {
+                gpio_free(cd_pfx);
+                return -ENOMEM;
+        }
+
+        cf->cd_pfx = cd_pfx;
+
+        setup_timer(&cf->timer, bfin_cf_timer, (unsigned long)cf);
+
+        cf->pdev = pdev;
+        platform_set_drvdata(pdev, cf);
+
+        cf->irq = irq;
+        cf->socket.pci_irq = irq;
+
+        set_irq_type(irq, IRQF_TRIGGER_LOW);
+
+        io_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        attr_mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+
+        if (!io_mem || !attr_mem)
+                goto fail0;
+
+        cf->phys_cf_io = io_mem->start;
+        cf->phys_cf_attr = attr_mem->start;
+
+        /* pcmcia layer only remaps "real" memory */
+        cf->socket.io_offset = (unsigned long)
+            ioremap(cf->phys_cf_io, SZ_2K);
+
+        if (!cf->socket.io_offset)
+                goto fail0;
+
+        dev_err(&pdev->dev, ": on irq %d\n", irq);
+
+        dev_dbg(&pdev->dev, ": %s\n",
+                 bfin_cf_present(cf->cd_pfx) ? "present" : "(not present)");
+
+        cf->socket.owner = THIS_MODULE;
+        cf->socket.dev.parent = &pdev->dev;
+        cf->socket.ops = &bfin_cf_ops;
+        cf->socket.resource_ops = &pccard_static_ops;
+        cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP
+            | SS_CAP_MEM_ALIGN;
+        cf->socket.map_size = SZ_2K;
+
+        status = pcmcia_register_socket(&cf->socket);
+        if (status < 0)
+                goto fail2;
+
+        cf->active = 1;
+        mod_timer(&cf->timer, jiffies + POLL_INTERVAL);
+        return 0;
+
+fail2:
+        iounmap((void __iomem *)cf->socket.io_offset);
+        release_mem_region(cf->phys_cf_io, SZ_8K);
+
+fail0:
+        gpio_free(cf->cd_pfx);
+        kfree(cf);
+        platform_set_drvdata(pdev, NULL);
+
+        return status;
+}
+
+static int __devexit bfin_cf_remove(struct platform_device *pdev)
+{
+        struct bfin_cf_socket *cf = platform_get_drvdata(pdev);
+
+        gpio_free(cf->cd_pfx);
+        cf->active = 0;
+        pcmcia_unregister_socket(&cf->socket);
+        del_timer_sync(&cf->timer);
+        iounmap((void __iomem *)cf->socket.io_offset);
+        release_mem_region(cf->phys_cf_io, SZ_8K);
+        platform_set_drvdata(pdev, NULL);
+        kfree(cf);
+        return 0;
+}
+
+static int bfin_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
+{
+        return pcmcia_socket_dev_suspend(&pdev->dev, mesg);
+}
+
+static int bfin_cf_resume(struct platform_device *pdev)
+{
+        return pcmcia_socket_dev_resume(&pdev->dev);
+}
+
+static struct platform_driver bfin_cf_driver = {
+        .driver = {
+                   .name = (char *)driver_name,
+                   .owner = THIS_MODULE,
+                   },
+        .probe = bfin_cf_probe,
+        .remove = __devexit_p(bfin_cf_remove),
+        .suspend = bfin_cf_suspend,
+        .resume = bfin_cf_resume,
+};
+
+static int __init bfin_cf_init(void)
+{
+        return platform_driver_register(&bfin_cf_driver);
+}
+
+static void __exit bfin_cf_exit(void)
+{
+        platform_driver_unregister(&bfin_cf_driver);
+}
+
+module_init(bfin_cf_init);
+module_exit(bfin_cf_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>")
+MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index fb2f38dc92c5..911ca0e8dfc2 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -30,11 +30,9 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#define IN_CARD_SERVICES
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index 36379535f9da..9fcff0c33619 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -30,7 +30,6 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
@@ -1439,10 +1438,11 @@ EXPORT_SYMBOL(pccard_read_tuple);
     
 ======================================================================*/
 
-int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_t *info)
+int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned int *info)
 {
     tuple_t *tuple;
     cisparse_t *p;
+    unsigned int count = 0;
     int ret, reserved, dev_ok = 0, ident_ok = 0;
 
     if (!s)
@@ -1457,7 +1457,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_
         return CS_OUT_OF_RESOURCE;
     }
 
-    info->Chains = reserved = 0;
+    count = reserved = 0;
     tuple->DesiredTuple = RETURN_FIRST_TUPLE;
     tuple->Attributes = TUPLE_RETURN_COMMON;
     ret = pccard_get_first_tuple(s, function, tuple);
@@ -1482,7 +1482,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_
     if (!dev_ok && !ident_ok)
         goto done;
 
-    for (info->Chains = 1; info->Chains < MAX_TUPLES; info->Chains++) {
+    for (count = 1; count < MAX_TUPLES; count++) {
         ret = pccard_get_next_tuple(s, function, tuple);
         if (ret != CS_SUCCESS) break;
         if (((tuple->TupleCode > 0x23) && (tuple->TupleCode < 0x40)) ||
@@ -1490,11 +1490,13 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_
             ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
             reserved++;
     }
-    if ((info->Chains == MAX_TUPLES) || (reserved > 5) ||
-        ((!dev_ok || !ident_ok) && (info->Chains > 10)))
-        info->Chains = 0;
+    if ((count) || (reserved > 5) ||
+        ((!dev_ok || !ident_ok) && (count > 10)))
+        count = 0;
 
 done:
+    if (info)
+            *info = count;
     kfree(tuple);
     kfree(p);
     return CS_SUCCESS;
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 29276bd28295..d1207393fc3e 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -32,11 +32,9 @@
 #include <asm/system.h>
 #include <asm/irq.h>
 
-#define IN_CARD_SERVICES
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -238,7 +236,6 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
 
         init_completion(&socket->socket_released);
         init_completion(&socket->thread_done);
-        init_waitqueue_head(&socket->thread_wait);
         mutex_init(&socket->skt_mutex);
         spin_lock_init(&socket->thread_lock);
 
@@ -278,10 +275,9 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
 
         cs_dbg(socket, 0, "pcmcia_unregister_socket(0x%p)\n", socket->ops);
 
-        if (socket->thread) {
-                wake_up(&socket->thread_wait);
+        if (socket->thread)
                 kthread_stop(socket->thread);
-        }
+
         release_cis_mem(socket);
 
         /* remove from our own list */
@@ -635,7 +631,6 @@ static void socket_detect_change(struct pcmcia_socket *skt)
 static int pccardd(void *__skt)
 {
         struct pcmcia_socket *skt = __skt;
-        DECLARE_WAITQUEUE(wait, current);
         int ret;
 
         skt->thread = current;
@@ -656,7 +651,6 @@ static int pccardd(void *__skt)
         if (ret)
                 dev_warn(&skt->dev, "err %d adding socket attributes\n", ret);
 
-        add_wait_queue(&skt->thread_wait, &wait);
         complete(&skt->thread_done);
 
         set_freezable();
@@ -694,8 +688,6 @@ static int pccardd(void *__skt)
         /* make sure we are running before we exit */
         set_current_state(TASK_RUNNING);
 
-        remove_wait_queue(&skt->thread_wait, &wait);
-
         /* remove from the device core */
         pccard_sysfs_remove_socket(&skt->dev);
         device_unregister(&skt->dev);
@@ -716,7 +708,7 @@ void pcmcia_parse_events(struct pcmcia_socket *s, u_int events)
                 s->thread_events |= events;
                 spin_unlock_irqrestore(&s->thread_lock, flags);
 
-                wake_up(&s->thread_wait);
+                wake_up_process(s->thread);
         }
 } /* pcmcia_parse_events */
 EXPORT_SYMBOL(pcmcia_parse_events);
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index e7d5d141f24d..63dc1a28bda2 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -26,18 +26,6 @@
 #define CLIENT_WIN_REQ(i)       (0x1<<(i))
 #define CLIENT_CARDBUS          0x8000
 
-#define REGION_MAGIC    0xE3C9
-typedef struct region_t {
-    u_short             region_magic;
-    u_short             state;
-    dev_info_t          dev_info;
-    struct pcmcia_device        *mtd;
-    u_int               MediaID;
-    region_info_t       info;
-} region_t;
-
-#define REGION_STALE    0x01
-
 /* Each card function gets one of these guys */
 typedef struct config_t {
         struct kref     ref;
@@ -130,7 +118,6 @@ extern struct list_head pcmcia_socket_list;
 int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle, int idx, win_req_t *req);
 int pccard_get_configuration_info(struct pcmcia_socket *s, struct pcmcia_device *p_dev, config_info_t *config);
 int pccard_reset_card(struct pcmcia_socket *skt);
-int pccard_get_status(struct pcmcia_socket *s, struct pcmcia_device *p_dev, cs_status_t *status);
 
 
 struct pcmcia_callback{
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index e40775443d04..4174d9656e35 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -25,7 +25,6 @@
 #include <linux/kref.h>
 #include <linux/dma-mapping.h>
 
-#define IN_CARD_SERVICES
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -741,9 +740,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
 
 static int pcmcia_card_add(struct pcmcia_socket *s)
 {
-        cisinfo_t cisinfo;
         cistpl_longlink_mfc_t mfc;
-        unsigned int no_funcs, i;
+        unsigned int no_funcs, i, no_chains;
         int ret = 0;
 
         if (!(s->resource_setup_done)) {
@@ -757,8 +755,8 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
                 return -EAGAIN; /* try again, but later... */
         }
 
-        ret = pccard_validate_cis(s, BIND_FN_ALL, &cisinfo);
-        if (ret || !cisinfo.Chains) {
+        ret = pccard_validate_cis(s, BIND_FN_ALL, &no_chains);
+        if (ret || !no_chains) {
                 ds_dbg(0, "invalid CIS or invalid resources\n");
                 return -ENODEV;
         }
@@ -852,7 +850,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
 {
         struct pcmcia_socket *s = dev->socket;
         const struct firmware *fw;
-        char path[20];
+        char path[FIRMWARE_NAME_MAX];
         int ret = -ENOMEM;
         int no_funcs;
         int old_funcs;
@@ -864,7 +862,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
 
         ds_dbg(1, "trying to load CIS file %s\n", filename);
 
-        if (strlen(filename) > 14) {
+        if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {
                 printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
                         filename);
                 return -EINVAL;
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
index f2e810f53c81..fb2bc1fb015d 100644
--- a/drivers/pcmcia/hd64465_ss.c
+++ b/drivers/pcmcia/hd64465_ss.c
@@ -1,6 +1,4 @@
 /*
- * $Id: hd64465_ss.c,v 1.7 2003/07/06 14:42:50 lethal Exp $
- *
  * Device driver for the PCMCIA controller module of the
  * Hitachi HD64465 handheld companion chip.
  *
@@ -48,7 +46,6 @@
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include "cs_internal.h"
 
 #define MODNAME "hd64465_ss"
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index e13618656ff7..46561face128 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -5,8 +5,6 @@
  *
  * Author: Arjan Van De Ven <arjanv@redhat.com>
  * Loosly based on i82365.c from the pcmcia-cs package
- *
- * $Id: i82092aa.c,v 1.2 2001/10/23 14:43:34 arjanv Exp $
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/pcmcia/i82092aa.h b/drivers/pcmcia/i82092aa.h
index b0d453303c5d..8836d393ad02 100644
--- a/drivers/pcmcia/i82092aa.h
+++ b/drivers/pcmcia/i82092aa.h
@@ -3,8 +3,6 @@
 
 #include <linux/interrupt.h>
 
-/* $Id: i82092aa.h,v 1.1.1.1 2001/09/19 14:53:15 dwmw2 Exp $ */
-
 /* Debuging defines */
 #ifdef NOTRACE
 #define enter(x)   printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index 32a2ab119798..68f6b2702bc4 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -1263,7 +1263,7 @@ static int __init init_i82365(void)
 
     ret = driver_register(&i82365_driver);
     if (ret)
-        return ret;
+        goto err_out;
 
     i82365_device = platform_device_alloc("i82365", 0);
     if (i82365_device) {
@@ -1273,10 +1273,8 @@ static int __init init_i82365(void)
     } else
             ret = -ENOMEM;
 
-    if (ret) {
-        driver_unregister(&i82365_driver);
-        return ret;
-    }
+    if (ret)
+        goto err_driver_unregister;
 
     printk(KERN_INFO "Intel ISA PCIC probe: ");
     sockets = 0;
@@ -1285,16 +1283,17 @@ static int __init init_i82365(void)
 
     if (sockets == 0) {
         printk("not found.\n");
-        platform_device_unregister(i82365_device);
-        release_region(i365_base, 2);
-        driver_unregister(&i82365_driver);
-        return -ENODEV;
+        ret = -ENODEV;
+        goto err_dev_unregister;
     }
 
     /* Set up interrupt handler(s) */
     if (grab_irq != 0)
-        request_irq(cs_irq, pcic_interrupt, 0, "i82365", pcic_interrupt);
-    
+        ret = request_irq(cs_irq, pcic_interrupt, 0, "i82365", pcic_interrupt);
+
+    if (ret)
+        goto err_socket_release;
+
     /* register sockets with the pcmcia core */
     for (i = 0; i < sockets; i++) {
             socket[i].socket.dev.parent = &i82365_device->dev;
@@ -1324,7 +1323,23 @@ static int __init init_i82365(void)
     }
     
     return 0;
-    
+err_socket_release:
+    for (i = 0; i < sockets; i++) {
+        /* Turn off all interrupt sources! */
+        i365_set(i, I365_CSCINT, 0);
+        release_region(socket[i].ioaddr, 2);
+    }
+err_dev_unregister:
+    platform_device_unregister(i82365_device);
+    release_region(i365_base, 2);
+#ifdef CONFIG_PNP
+    if (i82365_pnpdev)
+        pnp_disable_dev(i82365_pnpdev);
+#endif
+err_driver_unregister:
+    driver_unregister(&i82365_driver);
+err_out:
+    return ret;
 } /* init_i82365 */
 
 static void __exit exit_i82365(void)
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 9c5be9a2f3fd..ff66604e90d4 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1,7 +1,7 @@
 /*
  * m8xx_pcmcia.c - Linux PCMCIA socket driver for the mpc8xx series.
  *
- * (C) 1999-2000 Magnus Damm <damm@bitsmart.com>
+ * (C) 1999-2000 Magnus Damm <damm@opensource.se>
  * (C) 2001-2002 Montavista Software, Inc.
  *     <mlocke@mvista.com>
  *
@@ -60,7 +60,6 @@
 #include <asm/irq.h>
 #include <asm/fs_pd.h>
 
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 46314b420765..569b746b5731 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -38,19 +38,19 @@
 #define CF_BASE 0xfffe2800
 
 /* status; read after IRQ */
-#define CF_STATUS_REG           __REG16(CF_BASE + 0x00)
+#define CF_STATUS                       (CF_BASE + 0x00)
 #       define  CF_STATUS_BAD_READ      (1 << 2)
 #       define  CF_STATUS_BAD_WRITE     (1 << 1)
 #       define  CF_STATUS_CARD_DETECT   (1 << 0)
 
 /* which chipselect (CS0..CS3) is used for CF (active low) */
-#define CF_CFG_REG              __REG16(CF_BASE + 0x02)
+#define CF_CFG                          (CF_BASE + 0x02)
 
 /* card reset */
-#define CF_CONTROL_REG          __REG16(CF_BASE + 0x04)
+#define CF_CONTROL                      (CF_BASE + 0x04)
 #       define  CF_CONTROL_RESET        (1 << 0)
 
-#define omap_cf_present() (!(CF_STATUS_REG & CF_STATUS_CARD_DETECT))
+#define omap_cf_present() (!(omap_readw(CF_STATUS) & CF_STATUS_CARD_DETECT))
 
 /*--------------------------------------------------------------------------*/
 
@@ -139,11 +139,11 @@ omap_cf_set_socket(struct pcmcia_socket *sock, struct socket_state_t *s)
                 return -EINVAL;
         }
 
-        control = CF_CONTROL_REG;
+        control = omap_readw(CF_CONTROL);
         if (s->flags & SS_RESET)
-                CF_CONTROL_REG = CF_CONTROL_RESET;
+                omap_writew(CF_CONTROL_RESET, CF_CONTROL);
         else
-                CF_CONTROL_REG = 0;
+                omap_writew(0, CF_CONTROL);
 
         pr_debug("%s: Vcc %d, io_irq %d, flags %04x csc %04x\n",
                 driver_name, s->Vcc, s->io_irq, s->flags, s->csc_mask);
@@ -270,7 +270,7 @@ static int __init omap_cf_probe(struct platform_device *pdev)
         omap_cfg_reg(V10_1610_CF_IREQ);
         omap_cfg_reg(W10_1610_CF_RESET);
 
-        CF_CFG_REG = ~(1 << seg);
+        omap_writew(~(1 << seg), CF_CFG);
 
         pr_info("%s: cs%d on irq %d\n", driver_name, seg, irq);
 
@@ -279,14 +279,15 @@ static int __init omap_cf_probe(struct platform_device *pdev)
          * CF/PCMCIA variants...
          */
         pr_debug("%s: cs%d, previous ccs %08x acs %08x\n", driver_name,
-                        seg, EMIFS_CCS(seg), EMIFS_ACS(seg));
-        EMIFS_CCS(seg) = 0x0004a1b3;    /* synch mode 4 etc */
-        EMIFS_ACS(seg) = 0x00000000;    /* OE hold/setup */
+                seg, omap_readl(EMIFS_CCS(seg)), omap_readl(EMIFS_ACS(seg)));
+        omap_writel(0x0004a1b3, EMIFS_CCS(seg));        /* synch mode 4 etc */
+        omap_writel(0x00000000, EMIFS_ACS(seg));        /* OE hold/setup */
 
         /* CF uses armxor_ck, which is "always" available */
 
         pr_debug("%s: sts %04x cfg %04x control %04x %s\n", driver_name,
-                CF_STATUS_REG, CF_CFG_REG, CF_CONTROL_REG,
+                omap_readw(CF_STATUS), omap_readw(CF_CFG),
+                omap_readw(CF_CONTROL),
                 omap_cf_present() ? "present" : "(not present)");
 
         cf->socket.owner = THIS_MODULE;
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 5f186abca108..419f97fc9a62 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -27,12 +27,13 @@
 #include <linux/proc_fs.h>
 #include <linux/poll.h>
 #include <linux/pci.h>
+#include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 
-#define IN_CARD_SERVICES
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
+#include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
 #include <pcmcia/ss.h>
 
@@ -138,6 +139,154 @@ static int proc_read_drivers(char *buf, char **start, off_t pos,
 }
 #endif
 
+
+#ifdef CONFIG_PCMCIA_PROBE
+
+static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
+{
+        int irq;
+        u32 mask;
+
+        irq = adj->resource.irq.IRQ;
+        if ((irq < 0) || (irq > 15))
+                return CS_BAD_IRQ;
+
+        if (adj->Action != REMOVE_MANAGED_RESOURCE)
+                return 0;
+
+        mask = 1 << irq;
+
+        if (!(s->irq_mask & mask))
+                return 0;
+
+        s->irq_mask &= ~mask;
+
+        return 0;
+}
+
+#else
+
+static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {
+        return CS_SUCCESS;
+}
+
+#endif
+
+static int pcmcia_adjust_resource_info(adjust_t *adj)
+{
+        struct pcmcia_socket *s;
+        int ret = CS_UNSUPPORTED_FUNCTION;
+        unsigned long flags;
+
+        down_read(&pcmcia_socket_list_rwsem);
+        list_for_each_entry(s, &pcmcia_socket_list, socket_list) {
+
+                if (adj->Resource == RES_IRQ)
+                        ret = adjust_irq(s, adj);
+
+                else if (s->resource_ops->add_io) {
+                        unsigned long begin, end;
+
+                        /* you can't use the old interface if the new
+                         * one was used before */
+                        spin_lock_irqsave(&s->lock, flags);
+                        if ((s->resource_setup_new) &&
+                            !(s->resource_setup_old)) {
+                                spin_unlock_irqrestore(&s->lock, flags);
+                                continue;
+                        } else if (!(s->resource_setup_old))
+                                s->resource_setup_old = 1;
+                        spin_unlock_irqrestore(&s->lock, flags);
+
+                        switch (adj->Resource) {
+                        case RES_MEMORY_RANGE:
+                                begin = adj->resource.memory.Base;
+                                end = adj->resource.memory.Base + adj->resource.memory.Size - 1;
+                                if (s->resource_ops->add_mem)
+                                        ret =s->resource_ops->add_mem(s, adj->Action, begin, end);
+                        case RES_IO_RANGE:
+                                begin = adj->resource.io.BasePort;
+                                end = adj->resource.io.BasePort + adj->resource.io.NumPorts - 1;
+                                if (s->resource_ops->add_io)
+                                        ret = s->resource_ops->add_io(s, adj->Action, begin, end);
+                        }
+                        if (!ret) {
+                                /* as there's no way we know this is the
+                                 * last call to adjust_resource_info, we
+                                 * always need to assume this is the latest
+                                 * one... */
+                                spin_lock_irqsave(&s->lock, flags);
+                                s->resource_setup_done = 1;
+                                spin_unlock_irqrestore(&s->lock, flags);
+                        }
+                }
+        }
+        up_read(&pcmcia_socket_list_rwsem);
+
+        return (ret);
+}
+
+/** pccard_get_status
+ *
+ * Get the current socket state bits.  We don't support the latched
+ * SocketState yet: I haven't seen any point for it.
+ */
+
+static int pccard_get_status(struct pcmcia_socket *s,
+                             struct pcmcia_device *p_dev,
+                             cs_status_t *status)
+{
+        config_t *c;
+        int val;
+
+        s->ops->get_status(s, &val);
+        status->CardState = status->SocketState = 0;
+        status->CardState |= (val & SS_DETECT) ? CS_EVENT_CARD_DETECT : 0;
+        status->CardState |= (val & SS_CARDBUS) ? CS_EVENT_CB_DETECT : 0;
+        status->CardState |= (val & SS_3VCARD) ? CS_EVENT_3VCARD : 0;
+        status->CardState |= (val & SS_XVCARD) ? CS_EVENT_XVCARD : 0;
+        if (s->state & SOCKET_SUSPEND)
+                status->CardState |= CS_EVENT_PM_SUSPEND;
+        if (!(s->state & SOCKET_PRESENT))
+                return CS_NO_CARD;
+
+        c = (p_dev) ? p_dev->function_config : NULL;
+
+        if ((c != NULL) && (c->state & CONFIG_LOCKED) &&
+            (c->IntType & (INT_MEMORY_AND_IO | INT_ZOOMED_VIDEO))) {
+                u_char reg;
+                if (c->CardValues & PRESENT_PIN_REPLACE) {
+                        pcmcia_read_cis_mem(s, 1, (c->ConfigBase+CISREG_PRR)>>1, 1, &reg);
+                        status->CardState |=
+                                (reg & PRR_WP_STATUS) ? CS_EVENT_WRITE_PROTECT : 0;
+                        status->CardState |=
+                                (reg & PRR_READY_STATUS) ? CS_EVENT_READY_CHANGE : 0;
+                        status->CardState |=
+                                (reg & PRR_BVD2_STATUS) ? CS_EVENT_BATTERY_LOW : 0;
+                        status->CardState |=
+                                (reg & PRR_BVD1_STATUS) ? CS_EVENT_BATTERY_DEAD : 0;
+                } else {
+                        /* No PRR?  Then assume we're always ready */
+                        status->CardState |= CS_EVENT_READY_CHANGE;
+                }
+                if (c->CardValues & PRESENT_EXT_STATUS) {
+                        pcmcia_read_cis_mem(s, 1, (c->ConfigBase+CISREG_ESR)>>1, 1, &reg);
+                        status->CardState |=
+                                (reg & ESR_REQ_ATTN) ? CS_EVENT_REQUEST_ATTENTION : 0;
+                }
+                return CS_SUCCESS;
+        }
+        status->CardState |=
+                (val & SS_WRPROT) ? CS_EVENT_WRITE_PROTECT : 0;
+        status->CardState |=
+                (val & SS_BATDEAD) ? CS_EVENT_BATTERY_DEAD : 0;
+        status->CardState |=
+                (val & SS_BATWARN) ? CS_EVENT_BATTERY_LOW : 0;
+        status->CardState |=
+                (val & SS_READY) ? CS_EVENT_READY_CHANGE : 0;
+        return CS_SUCCESS;
+} /* pccard_get_status */
+
 /*======================================================================
 
     These manage a ring buffer of events pending for one user process
@@ -397,20 +546,27 @@ static int ds_open(struct inode *inode, struct file *file)
     struct pcmcia_socket *s;
     user_info_t *user;
     static int warning_printed = 0;
+    int ret = 0;
 
     ds_dbg(0, "ds_open(socket %d)\n", i);
 
+    lock_kernel();
     s = pcmcia_get_socket_by_nr(i);
-    if (!s)
-            return -ENODEV;
+    if (!s) {
+            ret = -ENODEV;
+            goto out;
+    }
     s = pcmcia_get_socket(s);
-    if (!s)
-            return -ENODEV;
+    if (!s) {
+            ret = -ENODEV;
+            goto out;
+    }
 
     if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
             if (s->pcmcia_state.busy) {
                     pcmcia_put_socket(s);
-                    return -EBUSY;
+                    ret = -EBUSY;
+                    goto out;
             }
         else
             s->pcmcia_state.busy = 1;
@@ -419,7 +575,8 @@ static int ds_open(struct inode *inode, struct file *file)
     user = kmalloc(sizeof(user_info_t), GFP_KERNEL);
     if (!user) {
             pcmcia_put_socket(s);
-            return -ENOMEM;
+            ret = -ENOMEM;
+            goto out;
     }
     user->event_tail = user->event_head = 0;
     user->next = s->user;
@@ -441,7 +598,9 @@ static int ds_open(struct inode *inode, struct file *file)
 
     if (s->pcmcia_state.present)
         queue_event(user, CS_EVENT_CARD_INSERTION);
-    return 0;
+out:
+    unlock_kernel();
+    return ret;
 } /* ds_open */
 
 /*====================================================================*/
@@ -546,8 +705,6 @@ static u_int ds_poll(struct file *file, poll_table *wait)
 
 /*====================================================================*/
 
-extern int pcmcia_adjust_resource_info(adjust_t *adj);
-
 static int ds_ioctl(struct inode * inode, struct file * file,
                     u_int cmd, u_long arg)
 {
@@ -649,7 +806,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
         mutex_lock(&s->skt_mutex);
         pcmcia_validate_mem(s);
         mutex_unlock(&s->skt_mutex);
-        ret = pccard_validate_cis(s, BIND_FN_ALL, &buf->cisinfo);
+        ret = pccard_validate_cis(s, BIND_FN_ALL, &buf->cisinfo.Chains);
         break;
     case DS_SUSPEND_CARD:
         ret = pcmcia_suspend_card(s);
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 1d128fbd1a92..4884a18cf9e6 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -21,11 +21,9 @@
 #include <linux/pci.h>
 #include <linux/device.h>
 
-#define IN_CARD_SERVICES
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -311,74 +309,6 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,
 EXPORT_SYMBOL(pcmcia_get_window);
 
 
-/** pccard_get_status
- *
- * Get the current socket state bits.  We don't support the latched
- * SocketState yet: I haven't seen any point for it.
- */
-
-int pccard_get_status(struct pcmcia_socket *s, struct pcmcia_device *p_dev,
-                      cs_status_t *status)
-{
-        config_t *c;
-        int val;
-
-        s->ops->get_status(s, &val);
-        status->CardState = status->SocketState = 0;
-        status->CardState |= (val & SS_DETECT) ? CS_EVENT_CARD_DETECT : 0;
-        status->CardState |= (val & SS_CARDBUS) ? CS_EVENT_CB_DETECT : 0;
-        status->CardState |= (val & SS_3VCARD) ? CS_EVENT_3VCARD : 0;
-        status->CardState |= (val & SS_XVCARD) ? CS_EVENT_XVCARD : 0;
-        if (s->state & SOCKET_SUSPEND)
-                status->CardState |= CS_EVENT_PM_SUSPEND;
-        if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
-
-        c = (p_dev) ? p_dev->function_config : NULL;
-
-        if ((c != NULL) && (c->state & CONFIG_LOCKED) &&
-            (c->IntType & (INT_MEMORY_AND_IO | INT_ZOOMED_VIDEO))) {
-                u_char reg;
-                if (c->CardValues & PRESENT_PIN_REPLACE) {
-                        pcmcia_read_cis_mem(s, 1, (c->ConfigBase+CISREG_PRR)>>1, 1, &reg);
-                        status->CardState |=
-                                (reg & PRR_WP_STATUS) ? CS_EVENT_WRITE_PROTECT : 0;
-                        status->CardState |=
-                                (reg & PRR_READY_STATUS) ? CS_EVENT_READY_CHANGE : 0;
-                        status->CardState |=
-                                (reg & PRR_BVD2_STATUS) ? CS_EVENT_BATTERY_LOW : 0;
-                        status->CardState |=
-                                (reg & PRR_BVD1_STATUS) ? CS_EVENT_BATTERY_DEAD : 0;
-                } else {
-                        /* No PRR?  Then assume we're always ready */
-                        status->CardState |= CS_EVENT_READY_CHANGE;
-                }
-                if (c->CardValues & PRESENT_EXT_STATUS) {
-                        pcmcia_read_cis_mem(s, 1, (c->ConfigBase+CISREG_ESR)>>1, 1, &reg);
-                        status->CardState |=
-                                (reg & ESR_REQ_ATTN) ? CS_EVENT_REQUEST_ATTENTION : 0;
-                }
-                return CS_SUCCESS;
-        }
-        status->CardState |=
-                (val & SS_WRPROT) ? CS_EVENT_WRITE_PROTECT : 0;
-        status->CardState |=
-                (val & SS_BATDEAD) ? CS_EVENT_BATTERY_DEAD : 0;
-        status->CardState |=
-                (val & SS_BATWARN) ? CS_EVENT_BATTERY_LOW : 0;
-        status->CardState |=
-                (val & SS_READY) ? CS_EVENT_READY_CHANGE : 0;
-        return CS_SUCCESS;
-} /* pccard_get_status */
-
-int pcmcia_get_status(struct pcmcia_device *p_dev, cs_status_t *status)
-{
-        return pccard_get_status(p_dev->socket, p_dev, status);
-}
-EXPORT_SYMBOL(pcmcia_get_status);
-
-
-
 /** pcmcia_get_mem_page
  *
  * Change the card address of an already open memory window.
@@ -812,6 +742,15 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                 type = IRQF_SHARED;
 
 #ifdef CONFIG_PCMCIA_PROBE
+
+#ifdef IRQ_NOAUTOEN
+        /* if the underlying IRQ infrastructure allows for it, only allocate
+         * the IRQ, but do not enable it
+         */
+        if (!(req->Attributes & IRQ_HANDLE_PRESENT))
+                type |= IRQ_NOAUTOEN;
+#endif /* IRQ_NOAUTOEN */
+
         if (s->irq.AssignedIRQ != 0) {
                 /* If the interrupt is already assigned, it must be the same */
                 irq = s->irq.AssignedIRQ;
@@ -966,7 +905,7 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) {
         pcmcia_release_configuration(p_dev);
         pcmcia_release_io(p_dev, &p_dev->io);
         pcmcia_release_irq(p_dev, &p_dev->irq);
-        if (&p_dev->win)
+        if (p_dev->win)
                 pcmcia_release_window(p_dev->win);
 }
 EXPORT_SYMBOL(pcmcia_disable_device);
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 9414163c78e7..ccfdf1969a7f 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -33,7 +33,6 @@
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 
 #include "cs_internal.h"
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index e7ab060ff118..f123fce65f2e 100644
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -18,6 +18,7 @@
 
 #include <pcmcia/ss.h>
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/pxa2xx-gpio.h>
@@ -130,7 +131,7 @@ static void cmx270_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 }
 
 
-static struct pcmcia_low_level cmx270_pcmcia_ops = {
+static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = {
         .owner                  = THIS_MODULE,
         .hw_init                = cmx270_pcmcia_hw_init,
         .hw_shutdown            = cmx270_pcmcia_shutdown,
@@ -147,15 +148,21 @@ static int __init cmx270_pcmcia_init(void)
 {
         int ret;
 
+        if (!machine_is_armcore())
+                return -ENODEV;
+
         cmx270_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
 
         if (!cmx270_pcmcia_device)
                 return -ENOMEM;
 
-        cmx270_pcmcia_device->dev.platform_data = &cmx270_pcmcia_ops;
+        ret = platform_device_add_data(cmx270_pcmcia_device, &cmx270_pcmcia_ops,
+                                       sizeof(cmx270_pcmcia_ops));
 
-        printk(KERN_INFO "Registering cm-x270 PCMCIA interface.\n");
-        ret = platform_device_add(cmx270_pcmcia_device);
+        if (ret == 0) {
+                printk(KERN_INFO "Registering cm-x270 PCMCIA interface.\n");
+                ret = platform_device_add(cmx270_pcmcia_device);
+        }
 
         if (ret)
                 platform_device_put(cmx270_pcmcia_device);
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index 145b85e0f02c..92d1cc33808c 100644
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -22,6 +22,7 @@
 #include <pcmcia/ss.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 
 #include <asm/arch/pxa-regs.h>
@@ -136,7 +137,7 @@ static void mst_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 {
 }
 
-static struct pcmcia_low_level mst_pcmcia_ops = {
+static struct pcmcia_low_level mst_pcmcia_ops __initdata = {
         .owner                  = THIS_MODULE,
         .hw_init                = mst_pcmcia_hw_init,
         .hw_shutdown            = mst_pcmcia_hw_shutdown,
@@ -153,13 +154,17 @@ static int __init mst_pcmcia_init(void)
 {
         int ret;
 
+        if (!machine_is_mainstone())
+                return -ENODEV;
+
         mst_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
         if (!mst_pcmcia_device)
                 return -ENOMEM;
 
-        mst_pcmcia_device->dev.platform_data = &mst_pcmcia_ops;
-
-        ret = platform_device_add(mst_pcmcia_device);
+        ret = platform_device_add_data(mst_pcmcia_device, &mst_pcmcia_ops,
+                                       sizeof(mst_pcmcia_ops));
+        if (ret == 0)
+                ret = platform_device_add(mst_pcmcia_device);
 
         if (ret)
                 platform_device_put(mst_pcmcia_device);
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index d5c33bd78d68..d71f93d45833 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -222,7 +222,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
         sharpsl_pcmcia_init_reset(skt);
 }
 
-static struct pcmcia_low_level sharpsl_pcmcia_ops = {
+static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
         .owner                  = THIS_MODULE,
         .hw_init                = sharpsl_pcmcia_hw_init,
         .hw_shutdown            = sharpsl_pcmcia_hw_shutdown,
@@ -261,10 +261,12 @@ static int __init sharpsl_pcmcia_init(void)
         if (!sharpsl_pcmcia_device)
                 return -ENOMEM;
 
-        sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops;
-        sharpsl_pcmcia_device->dev.parent = platform_scoop_config->devs[0].dev;
-
-        ret = platform_device_add(sharpsl_pcmcia_device);
+        ret = platform_device_add_data(sharpsl_pcmcia_device,
+                        &sharpsl_pcmcia_ops, sizeof(sharpsl_pcmcia_ops));
+        if (ret == 0) {
+                sharpsl_pcmcia_device->dev.parent = platform_scoop_config->devs[0].dev;
+                ret = platform_device_add(sharpsl_pcmcia_device);
+        }
 
         if (ret)
                 platform_device_put(sharpsl_pcmcia_device);
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index ce2226273aaa..c0e2afc79e3e 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -21,86 +21,6 @@
 #include "cs_internal.h"
 
 
-#ifdef CONFIG_PCMCIA_IOCTL
-
-#ifdef CONFIG_PCMCIA_PROBE
-
-static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
-{
-        int irq;
-        u32 mask;
-
-        irq = adj->resource.irq.IRQ;
-        if ((irq < 0) || (irq > 15))
-                return CS_BAD_IRQ;
-
-        if (adj->Action != REMOVE_MANAGED_RESOURCE)
-                return 0;
-
-        mask = 1 << irq;
-
-        if (!(s->irq_mask & mask))
-                return 0;
-
-        s->irq_mask &= ~mask;
-
-        return 0;
-}
-
-#else
-
-static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {
-        return CS_SUCCESS;
-}
-
-#endif
-
-
-int pcmcia_adjust_resource_info(adjust_t *adj)
-{
-        struct pcmcia_socket *s;
-        int ret = CS_UNSUPPORTED_FUNCTION;
-        unsigned long flags;
-
-        down_read(&pcmcia_socket_list_rwsem);
-        list_for_each_entry(s, &pcmcia_socket_list, socket_list) {
-
-                if (adj->Resource == RES_IRQ)
-                        ret = adjust_irq(s, adj);
-
-                else if (s->resource_ops->adjust_resource) {
-
-                        /* you can't use the old interface if the new
-                         * one was used before */
-                        spin_lock_irqsave(&s->lock, flags);
-                        if ((s->resource_setup_new) &&
-                            !(s->resource_setup_old)) {
-                                spin_unlock_irqrestore(&s->lock, flags);
-                                continue;
-                        } else if (!(s->resource_setup_old))
-                                s->resource_setup_old = 1;
-                        spin_unlock_irqrestore(&s->lock, flags);
-
-                        ret = s->resource_ops->adjust_resource(s, adj);
-                        if (!ret) {
-                                /* as there's no way we know this is the
-                                 * last call to adjust_resource_info, we
-                                 * always need to assume this is the latest
-                                 * one... */
-                                spin_lock_irqsave(&s->lock, flags);
-                                s->resource_setup_done = 1;
-                                spin_unlock_irqrestore(&s->lock, flags);
-                        }
-                }
-        }
-        up_read(&pcmcia_socket_list_rwsem);
-
-        return (ret);
-}
-EXPORT_SYMBOL(pcmcia_adjust_resource_info);
-
-#endif
-
 int pcmcia_validate_mem(struct pcmcia_socket *s)
 {
         if (s->resource_ops->validate_mem)
@@ -164,7 +84,8 @@ struct pccard_resource_ops pccard_static_ops = {
         .adjust_io_region = NULL,
         .find_io = NULL,
         .find_mem = NULL,
-        .adjust_resource = NULL,
+        .add_io = NULL,
+        .add_mem = NULL,
         .init = static_init,
         .exit = NULL,
 };
@@ -264,7 +185,8 @@ struct pccard_resource_ops pccard_iodyn_ops = {
         .adjust_io_region = iodyn_adjust_io_region,
         .find_io = iodyn_find_io_region,
         .find_mem = NULL,
-        .adjust_resource = NULL,
+        .add_io = NULL,
+        .add_mem = NULL,
         .init = static_init,
         .exit = NULL,
 };
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 0fcf763b9175..d0c1d63d1891 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -31,7 +31,6 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
@@ -261,21 +260,22 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base,
 ======================================================================*/
 
 /* Validation function for cards with a valid CIS */
-static int readable(struct pcmcia_socket *s, struct resource *res, cisinfo_t *info)
+static int readable(struct pcmcia_socket *s, struct resource *res,
+                    unsigned int *count)
 {
         int ret = -1;
 
         s->cis_mem.res = res;
         s->cis_virt = ioremap(res->start, s->map_size);
         if (s->cis_virt) {
-                ret = pccard_validate_cis(s, BIND_FN_ALL, info);
+                ret = pccard_validate_cis(s, BIND_FN_ALL, count);
                 /* invalidate mapping and CIS cache */
                 iounmap(s->cis_virt);
                 s->cis_virt = NULL;
                 destroy_cis_cache(s);
         }
         s->cis_mem.res = NULL;
-        if ((ret != 0) || (info->Chains == 0))
+        if ((ret != 0) || (count == 0))
                 return 0;
         return 1;
 }
@@ -316,7 +316,7 @@ static int
 cis_readable(struct pcmcia_socket *s, unsigned long base, unsigned long size)
 {
         struct resource *res1, *res2;
-        cisinfo_t info1, info2;
+        unsigned int info1, info2;
         int ret = 0;
 
         res1 = claim_region(s, base, size/2, IORESOURCE_MEM, "cs memory probe");
@@ -330,7 +330,7 @@ cis_readable(struct pcmcia_socket *s, unsigned long base, unsigned long size)
         free_region(res2);
         free_region(res1);
 
-        return (ret == 2) && (info1.Chains == info2.Chains);
+        return (ret == 2) && (info1 == info2);
 }
 
 static int
@@ -766,21 +766,6 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
 }
 
 
-static int nonstatic_adjust_resource_info(struct pcmcia_socket *s, adjust_t *adj)
-{
-        unsigned long end;
-
-        switch (adj->Resource) {
-        case RES_MEMORY_RANGE:
-                end = adj->resource.memory.Base + adj->resource.memory.Size - 1;
-                return adjust_memory(s, adj->Action, adj->resource.memory.Base, end);
-        case RES_IO_RANGE:
-                end = adj->resource.io.BasePort + adj->resource.io.NumPorts - 1;
-                return adjust_io(s, adj->Action, adj->resource.io.BasePort, end);
-        }
-        return CS_UNSUPPORTED_FUNCTION;
-}
-
 #ifdef CONFIG_PCI
 static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
 {
@@ -889,7 +874,8 @@ struct pccard_resource_ops pccard_nonstatic_ops = {
         .adjust_io_region = nonstatic_adjust_io_region,
         .find_io = nonstatic_find_io_region,
         .find_mem = nonstatic_find_mem_region,
-        .adjust_resource = nonstatic_adjust_resource_info,
+        .add_io = adjust_io,
+        .add_mem = adjust_memory,
         .init = nonstatic_init,
         .exit = nonstatic_release_resource_db,
 };
@@ -1008,41 +994,34 @@ static ssize_t store_mem_db(struct device *dev,
 }
 static DEVICE_ATTR(available_resources_mem, 0600, show_mem_db, store_mem_db);
 
-static struct device_attribute *pccard_rsrc_attributes[] = {
-        &dev_attr_available_resources_io,
-        &dev_attr_available_resources_mem,
+static struct attribute *pccard_rsrc_attributes[] = {
+        &dev_attr_available_resources_io.attr,
+        &dev_attr_available_resources_mem.attr,
         NULL,
 };
 
+static const struct attribute_group rsrc_attributes = {
+        .attrs = pccard_rsrc_attributes,
+};
+
 static int __devinit pccard_sysfs_add_rsrc(struct device *dev,
                                            struct class_interface *class_intf)
 {
         struct pcmcia_socket *s = dev_get_drvdata(dev);
-        struct device_attribute **attr;
-        int ret = 0;
+
         if (s->resource_ops != &pccard_nonstatic_ops)
                 return 0;
-
-        for (attr = pccard_rsrc_attributes; *attr; attr++) {
-                ret = device_create_file(dev, *attr);
-                if (ret)
-                        break;
-        }
-
-        return ret;
+        return sysfs_create_group(&dev->kobj, &rsrc_attributes);
 }
 
 static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,
                                                struct class_interface *class_intf)
 {
         struct pcmcia_socket *s = dev_get_drvdata(dev);
-        struct device_attribute **attr;
 
         if (s->resource_ops != &pccard_nonstatic_ops)
                 return;
-
-        for (attr = pccard_rsrc_attributes; *attr; attr++)
-                device_remove_file(dev, *attr);
+        sysfs_remove_group(&dev->kobj, &rsrc_attributes);
 }
 
 static struct class_interface pccard_rsrc_interface __refdata = {
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index 1edc1da9d353..91ef6a0da3ab 100644
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -14,7 +14,6 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 562384d6f321..006a29e91d83 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -27,11 +27,9 @@
 #include <asm/system.h>
 #include <asm/irq.h>
 
-#define IN_CARD_SERVICES
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -293,7 +291,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj,
                 count = 0;
         else {
                 struct pcmcia_socket *s;
-                cisinfo_t cisinfo;
+                unsigned int chains;
 
                 if (off + count > size)
                         count = size - off;
@@ -302,9 +300,9 @@ static ssize_t pccard_show_cis(struct kobject *kobj,
 
                 if (!(s->state & SOCKET_PRESENT))
                         return -ENODEV;
-                if (pccard_validate_cis(s, BIND_FN_ALL, &cisinfo))
+                if (pccard_validate_cis(s, BIND_FN_ALL, &chains))
                         return -EIO;
-                if (!cisinfo.Chains)
+                if (!chains)
                         return -ENODATA;
 
                 count = pccard_extract_cis(s, buf, off, count);
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index d29657bf1b40..129db7bd06c3 100644
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
@@ -155,7 +155,7 @@
 #define ENE_TEST_C9_TLTENABLE           0x02
 #define ENE_TEST_C9_PFENABLE_F0         0x04
 #define ENE_TEST_C9_PFENABLE_F1         0x08
-#define ENE_TEST_C9_PFENABLE            (ENE_TEST_C9_PFENABLE_F0 | ENE_TEST_C9_PFENABLE_F0)
+#define ENE_TEST_C9_PFENABLE            (ENE_TEST_C9_PFENABLE_F0 | ENE_TEST_C9_PFENABLE_F1)
 #define ENE_TEST_C9_WPDISALBLE_F0       0x40
 #define ENE_TEST_C9_WPDISALBLE_F1       0x80
 #define ENE_TEST_C9_WPDISALBLE          (ENE_TEST_C9_WPDISALBLE_F0 | ENE_TEST_C9_WPDISALBLE_F1)
@@ -692,7 +692,7 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)
                 goto out;
 
         /* check state */
-        yenta_get_status(&socket->socket, &state);
+        yenta_get_status(&slot2->socket, &state);
         if (state & SS_DETECT) {
                 ret = 0;
                 goto out;
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 4949dc4859be..fc85bf2e4a97 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -469,6 +469,16 @@ config RTC_DRV_VR41XX
           To compile this driver as a module, choose M here: the
           module will be called rtc-vr41xx.
 
+config RTC_DRV_PL030
+        tristate "ARM AMBA PL030 RTC"
+        depends on ARM_AMBA
+        help
+          If you say Y here you will get access to ARM AMBA
+          PrimeCell PL030 RTC found on certain ARM SOCs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rtc-pl030.
+
 config RTC_DRV_PL031
         tristate "ARM AMBA PL031 RTC"
         depends on ARM_AMBA
@@ -495,12 +505,13 @@ config RTC_DRV_AT91RM9200
           this is powered by the backup power supply.
 
 config RTC_DRV_AT91SAM9
-        tristate "AT91SAM9x"
+        tristate "AT91SAM9x/AT91CAP9"
         depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
         help
-          RTC driver for the Atmel AT91SAM9x internal RTT (Real Time Timer).
-          These timers are powered by the backup power supply (such as a
-          small coin cell battery), but do not need to be used as RTCs.
+          RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
+          (Real Time Timer). These timers are powered by the backup power
+          supply (such as a small coin cell battery), but do not need to
+          be used as RTCs.
 
           (On AT91SAM9rl chips you probably want to use the dedicated RTC
           module and leave the RTT available for other uses.)
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index b6e14d51670b..b5d9d67df887 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o
 obj-$(CONFIG_RTC_DRV_OMAP)      += rtc-omap.o
 obj-$(CONFIG_RTC_DRV_PCF8563)   += rtc-pcf8563.o
 obj-$(CONFIG_RTC_DRV_PCF8583)   += rtc-pcf8583.o
+obj-$(CONFIG_RTC_DRV_PL030)     += rtc-pl030.o
 obj-$(CONFIG_RTC_DRV_PL031)     += rtc-pl031.o
 obj-$(CONFIG_RTC_DRV_PPC)       += rtc-ppc.o
 obj-$(CONFIG_RTC_DRV_R9701)     += rtc-r9701.o
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c
index 2ef8cdfda4a7..90b9a6503e15 100644
--- a/drivers/rtc/rtc-at32ap700x.c
+++ b/drivers/rtc/rtc-at32ap700x.c
@@ -265,6 +265,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
         }
 
         platform_set_drvdata(pdev, rtc);
+        device_init_wakeup(&pdev->dev, 1);
 
         dev_info(&pdev->dev, "Atmel RTC for AT32AP700x at %08lx irq %ld\n",
                         (unsigned long)rtc->regs, rtc->irq);
@@ -284,6 +285,8 @@ static int __exit at32_rtc_remove(struct platform_device *pdev)
 {
         struct rtc_at32ap700x *rtc = platform_get_drvdata(pdev);
 
+        device_init_wakeup(&pdev->dev, 0);
+
         free_irq(rtc->irq, rtc);
         iounmap(rtc->regs);
         rtc_device_unregister(rtc->rtc);
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 39e64ab1ecb7..9c3db934cc24 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -29,10 +29,6 @@
 #include <linux/completion.h>
 
 #include <asm/uaccess.h>
-#include <asm/rtc.h>
-
-#include <asm/mach/time.h>
-
 #include <asm/arch/at91_rtc.h>
 
 
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 38d8742a4bdf..f0246ef413a4 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/ioctl.h>
 
-#include <asm/mach/time.h>
 #include <asm/arch/board.h>
 #include <asm/arch/at91_rtt.h>
 
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 90dfa0df747a..0114a78b7cbb 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -13,6 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/rtc.h>
+#include <linux/smp_lock.h>
 #include "rtc-core.h"
 
 static dev_t rtc_devt;
@@ -26,8 +27,11 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
                                         struct rtc_device, char_dev);
         const struct rtc_class_ops *ops = rtc->ops;
 
-        if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags))
-                return -EBUSY;
+        lock_kernel();
+        if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags)) {
+                err = -EBUSY;
+                goto out;
+        }
 
         file->private_data = rtc;
 
@@ -37,11 +41,13 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
                 rtc->irq_data = 0;
                 spin_unlock_irq(&rtc->irq_lock);
 
-                return 0;
+                goto out;
         }
 
         /* something has gone wrong */
         clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
+out:
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index a3e0880b38fb..0a19c06019be 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/i2c.h>
 #include <linux/rtc.h>
@@ -655,12 +656,16 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 static int wdt_open(struct inode *inode, struct file *file)
 {
         if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
-                if (test_and_set_bit(0, &wdt_is_open))
+                lock_kernel();
+                if (test_and_set_bit(0, &wdt_is_open)) {
+                        unlock_kernel();
                         return -EBUSY;
+                }
                 /*
                  *      Activate
                  */
                 wdt_is_open = 1;
+                unlock_kernel();
                 return 0;
         }
         return -ENODEV;
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 58f81c774943..eb23d8423f42 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -22,7 +22,6 @@
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
-#include <asm/mach/time.h>
 
 
 /* The OMAP1 RTC is a year/month/day/hours/minutes/seconds BCD clock
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
new file mode 100644
index 000000000000..8448eeb9d675
--- /dev/null
+++ b/drivers/rtc/rtc-pl030.c
@@ -0,0 +1,217 @@
+/*
+ *  linux/drivers/rtc/rtc-pl030.c
+ *
+ *  Copyright (C) 2000-2001 Deep Blue Solutions Ltd.
+ *
+ * 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/module.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/amba/bus.h>
+#include <linux/io.h>
+
+#define RTC_DR          (0)
+#define RTC_MR          (4)
+#define RTC_STAT        (8)
+#define RTC_EOI         (8)
+#define RTC_LR          (12)
+#define RTC_CR          (16)
+#define RTC_CR_MIE      (1 << 0)
+
+struct pl030_rtc {
+        struct rtc_device       *rtc;
+        void __iomem            *base;
+};
+
+static irqreturn_t pl030_interrupt(int irq, void *dev_id)
+{
+        struct pl030_rtc *rtc = dev_id;
+        writel(0, rtc->base + RTC_EOI);
+        return IRQ_HANDLED;
+}
+
+static int pl030_open(struct device *dev)
+{
+        return 0;
+}
+
+static void pl030_release(struct device *dev)
+{
+}
+
+static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+        return -ENOIOCTLCMD;
+}
+
+static int pl030_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct pl030_rtc *rtc = dev_get_drvdata(dev);
+
+        rtc_time_to_tm(readl(rtc->base + RTC_MR), &alrm->time);
+        return 0;
+}
+
+static int pl030_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct pl030_rtc *rtc = dev_get_drvdata(dev);
+        unsigned long time;
+        int ret;
+
+        /*
+         * At the moment, we can only deal with non-wildcarded alarm times.
+         */
+        ret = rtc_valid_tm(&alrm->time);
+        if (ret == 0)
+                ret = rtc_tm_to_time(&alrm->time, &time);
+        if (ret == 0)
+                writel(time, rtc->base + RTC_MR);
+        return ret;
+}
+
+static int pl030_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct pl030_rtc *rtc = dev_get_drvdata(dev);
+
+        rtc_time_to_tm(readl(rtc->base + RTC_DR), tm);
+
+        return 0;
+}
+
+/*
+ * Set the RTC time.  Unfortunately, we can't accurately set
+ * the point at which the counter updates.
+ *
+ * Also, since RTC_LR is transferred to RTC_CR on next rising
+ * edge of the 1Hz clock, we must write the time one second
+ * in advance.
+ */
+static int pl030_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct pl030_rtc *rtc = dev_get_drvdata(dev);
+        unsigned long time;
+        int ret;
+
+        ret = rtc_tm_to_time(tm, &time);
+        if (ret == 0)
+                writel(time + 1, rtc->base + RTC_LR);
+
+        return ret;
+}
+
+static const struct rtc_class_ops pl030_ops = {
+        .open           = pl030_open,
+        .release        = pl030_release,
+        .ioctl          = pl030_ioctl,
+        .read_time      = pl030_read_time,
+        .set_time       = pl030_set_time,
+        .read_alarm     = pl030_read_alarm,
+        .set_alarm      = pl030_set_alarm,
+};
+
+static int pl030_probe(struct amba_device *dev, void *id)
+{
+        struct pl030_rtc *rtc;
+        int ret;
+
+        ret = amba_request_regions(dev, NULL);
+        if (ret)
+                goto err_req;
+
+        rtc = kmalloc(sizeof(*rtc), GFP_KERNEL);
+        if (!rtc) {
+                ret = -ENOMEM;
+                goto err_rtc;
+        }
+
+        rtc->base = ioremap(dev->res.start, SZ_4K);
+        if (!rtc->base) {
+                ret = -ENOMEM;
+                goto err_map;
+        }
+
+        __raw_writel(0, rtc->base + RTC_CR);
+        __raw_writel(0, rtc->base + RTC_EOI);
+
+        amba_set_drvdata(dev, rtc);
+
+        ret = request_irq(dev->irq[0], pl030_interrupt, IRQF_DISABLED,
+                          "rtc-pl030", rtc);
+        if (ret)
+                goto err_irq;
+
+        rtc->rtc = rtc_device_register("pl030", &dev->dev, &pl030_ops,
+                                       THIS_MODULE);
+        if (IS_ERR(rtc->rtc)) {
+                ret = PTR_ERR(rtc->rtc);
+                goto err_reg;
+        }
+
+        return 0;
+
+ err_reg:
+        free_irq(dev->irq[0], rtc);
+ err_irq:
+        iounmap(rtc->base);
+ err_map:
+        kfree(rtc);
+ err_rtc:
+        amba_release_regions(dev);
+ err_req:
+        return ret;
+}
+
+static int pl030_remove(struct amba_device *dev)
+{
+        struct pl030_rtc *rtc = amba_get_drvdata(dev);
+
+        amba_set_drvdata(dev, NULL);
+
+        writel(0, rtc->base + RTC_CR);
+
+        free_irq(dev->irq[0], rtc);
+        rtc_device_unregister(rtc->rtc);
+        iounmap(rtc->base);
+        kfree(rtc);
+        amba_release_regions(dev);
+
+        return 0;
+}
+
+static struct amba_id pl030_ids[] = {
+        {
+                .id     = 0x00041030,
+                .mask   = 0x000fffff,
+        },
+        { 0, 0 },
+};
+
+static struct amba_driver pl030_driver = {
+        .drv            = {
+                .name   = "rtc-pl030",
+        },
+        .probe          = pl030_probe,
+        .remove         = pl030_remove,
+        .id_table       = pl030_ids,
+};
+
+static int __init pl030_init(void)
+{
+        return amba_driver_register(&pl030_driver);
+}
+
+static void __exit pl030_exit(void)
+{
+        amba_driver_unregister(&pl030_driver);
+}
+
+module_init(pl030_init);
+module_exit(pl030_exit);
+
+MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
+MODULE_DESCRIPTION("ARM AMBA PL030 RTC Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 2fd49edcc712..08b4610ec5a6 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -12,23 +12,12 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
-
-#include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/rtc.h>
 #include <linux/init.h>
-#include <linux/fs.h>
 #include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/pm.h>
-#include <linux/bitops.h>
-
 #include <linux/amba/bus.h>
-
-#include <asm/io.h>
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/rtc.h>
+#include <linux/io.h>
 
 /*
  * Register definitions
@@ -142,13 +131,12 @@ static int pl031_remove(struct amba_device *adev)
 {
         struct pl031_local *ldata = dev_get_drvdata(&adev->dev);
 
-        if (ldata) {
-                dev_set_drvdata(&adev->dev, NULL);
-                free_irq(adev->irq[0], ldata->rtc);
-                rtc_device_unregister(ldata->rtc);
-                iounmap(ldata->base);
-                kfree(ldata);
-        }
+        amba_set_drvdata(adev, NULL);
+        free_irq(adev->irq[0], ldata->rtc);
+        rtc_device_unregister(ldata->rtc);
+        iounmap(ldata->base);
+        kfree(ldata);
+        amba_release_regions(adev);
 
         return 0;
 }
@@ -158,13 +146,15 @@ static int pl031_probe(struct amba_device *adev, void *id)
         int ret;
         struct pl031_local *ldata;
 
+        ret = amba_request_regions(adev, NULL);
+        if (ret)
+                goto err_req;
 
         ldata = kmalloc(sizeof(struct pl031_local), GFP_KERNEL);
         if (!ldata) {
                 ret = -ENOMEM;
                 goto out;
         }
-        dev_set_drvdata(&adev->dev, ldata);
 
         ldata->base = ioremap(adev->res.start,
                               adev->res.end - adev->res.start + 1);
@@ -173,6 +163,8 @@ static int pl031_probe(struct amba_device *adev, void *id)
                 goto out_no_remap;
         }
 
+        amba_set_drvdata(adev, ldata);
+
         if (request_irq(adev->irq[0], pl031_interrupt, IRQF_DISABLED,
                         "rtc-pl031", ldata->rtc)) {
                 ret = -EIO;
@@ -192,10 +184,12 @@ out_no_rtc:
         free_irq(adev->irq[0], ldata->rtc);
 out_no_irq:
         iounmap(ldata->base);
+        amba_set_drvdata(adev, NULL);
 out_no_remap:
-        dev_set_drvdata(&adev->dev, NULL);
         kfree(ldata);
 out:
+        amba_release_regions(adev);
+err_req:
         return ret;
 }
 
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index f26e0cad8f16..fed86e507fdf 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -26,10 +26,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/rtc.h>
-
-#include <asm/mach/time.h>
-
 #include <asm/plat-s3c/regs-rtc.h>
 
 /* I have yet to find an S3C implementation with more than one
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 67421b0d3a7b..f47294c60148 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -33,7 +33,6 @@
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
-#include <asm/rtc.h>
 
 #ifdef CONFIG_ARCH_PXA
 #include <asm/arch/pxa-regs.h>
@@ -47,6 +46,42 @@ static unsigned long rtc_freq = 1024;
 static struct rtc_time rtc_alarm;
 static DEFINE_SPINLOCK(sa1100_rtc_lock);
 
+static inline int rtc_periodic_alarm(struct rtc_time *tm)
+{
+        return  (tm->tm_year == -1) ||
+                ((unsigned)tm->tm_mon >= 12) ||
+                ((unsigned)(tm->tm_mday - 1) >= 31) ||
+                ((unsigned)tm->tm_hour > 23) ||
+                ((unsigned)tm->tm_min > 59) ||
+                ((unsigned)tm->tm_sec > 59);
+}
+
+/*
+ * Calculate the next alarm time given the requested alarm time mask
+ * and the current time.
+ */
+static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc_time *alrm)
+{
+        unsigned long next_time;
+        unsigned long now_time;
+
+        next->tm_year = now->tm_year;
+        next->tm_mon = now->tm_mon;
+        next->tm_mday = now->tm_mday;
+        next->tm_hour = alrm->tm_hour;
+        next->tm_min = alrm->tm_min;
+        next->tm_sec = alrm->tm_sec;
+
+        rtc_tm_to_time(now, &now_time);
+        rtc_tm_to_time(next, &next_time);
+
+        if (next_time < now_time) {
+                /* Advance one day */
+                next_time += 60 * 60 * 24;
+                rtc_time_to_tm(next_time, next);
+        }
+}
+
 static int rtc_update_alarm(struct rtc_time *alrm)
 {
         struct rtc_time alarm_tm, now_tm;
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1a4025683362..1b6c52ef7339 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -995,14 +995,14 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         now = get_clock();
 
         DBF_EVENT(DBF_ERR, "Interrupt: bus_id %s CS/DS %04x ip %08x",
-                  cdev->dev.bus_id, ((irb->scsw.cstat<<8)|irb->scsw.dstat),
-                  (unsigned int) intparm);
+                  cdev->dev.bus_id, ((irb->scsw.cmd.cstat << 8) |
+                  irb->scsw.cmd.dstat), (unsigned int) intparm);
 
         /* check for unsolicited interrupts */
         cqr = (struct dasd_ccw_req *) intparm;
-        if (!cqr || ((irb->scsw.cc == 1) &&
-                     (irb->scsw.fctl & SCSW_FCTL_START_FUNC) &&
-                     (irb->scsw.stctl & SCSW_STCTL_STATUS_PEND)) ) {
+        if (!cqr || ((irb->scsw.cmd.cc == 1) &&
+                     (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
+                     (irb->scsw.cmd.stctl & SCSW_STCTL_STATUS_PEND))) {
                 if (cqr && cqr->status == DASD_CQR_IN_IO)
                         cqr->status = DASD_CQR_QUEUED;
                 device = dasd_device_from_cdev_locked(cdev);
@@ -1025,7 +1025,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
 
         /* Check for clear pending */
         if (cqr->status == DASD_CQR_CLEAR_PENDING &&
-            irb->scsw.fctl & SCSW_FCTL_CLEAR_FUNC) {
+            irb->scsw.cmd.fctl & SCSW_FCTL_CLEAR_FUNC) {
                 cqr->status = DASD_CQR_CLEARED;
                 dasd_device_clear_timer(device);
                 wake_up(&dasd_flush_wq);
@@ -1041,11 +1041,11 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
                 return;
         }
         DBF_DEV_EVENT(DBF_DEBUG, device, "Int: CS/DS 0x%04x for cqr %p",
-                      ((irb->scsw.cstat << 8) | irb->scsw.dstat), cqr);
+                      ((irb->scsw.cmd.cstat << 8) | irb->scsw.cmd.dstat), cqr);
         next = NULL;
         expires = 0;
-        if (irb->scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END) &&
-            irb->scsw.cstat == 0 && !irb->esw.esw0.erw.cons) {
+        if (irb->scsw.cmd.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END) &&
+            irb->scsw.cmd.cstat == 0 && !irb->esw.esw0.erw.cons) {
                 /* request was completed successfully */
                 cqr->status = DASD_CQR_SUCCESS;
                 cqr->stopclk = now;
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index e6700df52df4..5c6e6f331cb0 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -1572,7 +1572,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
 
         /* determine the address of the CCW to be restarted */
         /* Imprecise ending is not set -> addr from IRB-SCSW */
-        cpa = default_erp->refers->irb.scsw.cpa;
+        cpa = default_erp->refers->irb.scsw.cmd.cpa;
 
         if (cpa == 0) {
 
@@ -1725,7 +1725,7 @@ dasd_3990_update_1B(struct dasd_ccw_req * previous_erp, char *sense)
 
         /* determine the address of the CCW to be restarted */
         /* Imprecise ending is not set -> addr from IRB-SCSW */
-        cpa = previous_erp->irb.scsw.cpa;
+        cpa = previous_erp->irb.scsw.cmd.cpa;
 
         if (cpa == 0) {
 
@@ -2171,7 +2171,7 @@ dasd_3990_erp_control_check(struct dasd_ccw_req *erp)
 {
         struct dasd_device *device = erp->startdev;
 
-        if (erp->refers->irb.scsw.cstat & (SCHN_STAT_INTF_CTRL_CHK
+        if (erp->refers->irb.scsw.cmd.cstat & (SCHN_STAT_INTF_CTRL_CHK
                                            | SCHN_STAT_CHN_CTRL_CHK)) {
                 DEV_MESSAGE(KERN_DEBUG, device, "%s",
                             "channel or interface control check");
@@ -2352,9 +2352,9 @@ dasd_3990_erp_error_match(struct dasd_ccw_req *cqr1, struct dasd_ccw_req *cqr2)
 
         if ((cqr1->irb.esw.esw0.erw.cons == 0) &&
             (cqr2->irb.esw.esw0.erw.cons == 0)) {
-                if ((cqr1->irb.scsw.cstat & (SCHN_STAT_INTF_CTRL_CHK |
+                if ((cqr1->irb.scsw.cmd.cstat & (SCHN_STAT_INTF_CTRL_CHK |
                                              SCHN_STAT_CHN_CTRL_CHK)) ==
-                    (cqr2->irb.scsw.cstat & (SCHN_STAT_INTF_CTRL_CHK |
+                    (cqr2->irb.scsw.cmd.cstat & (SCHN_STAT_INTF_CTRL_CHK |
                                              SCHN_STAT_CHN_CTRL_CHK)))
                         return 1; /* match with ifcc*/
         }
@@ -2622,8 +2622,9 @@ dasd_3990_erp_action(struct dasd_ccw_req * cqr)
         }
 
         /* double-check if current erp/cqr was successfull */
-        if ((cqr->irb.scsw.cstat == 0x00) &&
-            (cqr->irb.scsw.dstat == (DEV_STAT_CHN_END|DEV_STAT_DEV_END))) {
+        if ((cqr->irb.scsw.cmd.cstat == 0x00) &&
+            (cqr->irb.scsw.cmd.dstat ==
+             (DEV_STAT_CHN_END | DEV_STAT_DEV_END))) {
 
                 DEV_MESSAGE(KERN_DEBUG, device,
                             "ERP called for successful request %p"
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index a0edae091b5e..e0b77210d37a 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1404,13 +1404,14 @@ static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,
 
         /* first of all check for state change pending interrupt */
         mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
-        if ((irb->scsw.dstat & mask) == mask) {
+        if ((irb->scsw.cmd.dstat & mask) == mask) {
                 dasd_generic_handle_state_change(device);
                 return;
         }
 
         /* summary unit check */
-        if ((irb->scsw.dstat & DEV_STAT_UNIT_CHECK) && irb->ecw[7] == 0x0D) {
+        if ((irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) &&
+            (irb->ecw[7] == 0x0D)) {
                 dasd_alias_handle_summary_unit_check(device, irb);
                 return;
         }
@@ -2068,11 +2069,11 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
                       device->cdev->dev.bus_id);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
-                       irb->scsw.cstat, irb->scsw.dstat);
+                       irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
                        device->cdev->dev.bus_id,
-                       (void *) (addr_t) irb->scsw.cpa);
+                       (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
                         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
@@ -2122,7 +2123,8 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
                 /* scsw->cda is either valid or zero  */
                 len = 0;
                 from = ++to;
-                fail = (struct ccw1 *)(addr_t) irb->scsw.cpa; /* failing CCW */
+                fail = (struct ccw1 *)(addr_t)
+                                irb->scsw.cmd.cpa; /* failing CCW */
                 if (from <  fail - 2) {
                         from = fail - 2;     /* there is a gap - print header */
                         len += sprintf(page, KERN_ERR PRINTK_HEADER "......\n");
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 6e53ab606e97..29da4413ad43 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/poll.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -525,6 +526,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
         eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);
         if (!eerb)
                 return -ENOMEM;
+        lock_kernel();
         eerb->buffer_page_count = eer_pages;
         if (eerb->buffer_page_count < 1 ||
             eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
@@ -532,6 +534,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
                 MESSAGE(KERN_WARNING, "can't open device since module "
                         "parameter eer_pages is smaller then 1 or"
                         " bigger then %d", (int)(INT_MAX / PAGE_SIZE));
+                unlock_kernel();
                 return -EINVAL;
         }
         eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE;
@@ -539,12 +542,14 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
                                GFP_KERNEL);
         if (!eerb->buffer) {
                 kfree(eerb);
+                unlock_kernel();
                 return -ENOMEM;
         }
         if (dasd_eer_allocate_buffer_pages(eerb->buffer,
                                            eerb->buffer_page_count)) {
                 kfree(eerb->buffer);
                 kfree(eerb);
+                unlock_kernel();
                 return -ENOMEM;
         }
         filp->private_data = eerb;
@@ -552,6 +557,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
         list_add(&eerb->list, &bufferlist);
         spin_unlock_irqrestore(&bufferlock, flags);
 
+        unlock_kernel();
         return nonseekable_open(inp,filp);
 }
 
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 116611583df8..aee4656127f7 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -222,7 +222,7 @@ static void dasd_fba_handle_unsolicited_interrupt(struct dasd_device *device,
 
         /* first of all check for state change pending interrupt */
         mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
-        if ((irb->scsw.dstat & mask) == mask) {
+        if ((irb->scsw.cmd.dstat & mask) == mask) {
                 dasd_generic_handle_state_change(device);
                 return;
         }
@@ -449,11 +449,11 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                       device->cdev->dev.bus_id);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
-                       irb->scsw.cstat, irb->scsw.dstat);
+                       irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                        " device %s: Failing CCW: %p\n",
                        device->cdev->dev.bus_id,
-                       (void *) (addr_t) irb->scsw.cpa);
+                       (void *) (addr_t) irb->scsw.cmd.cpa);
         if (irb->esw.esw0.erw.cons) {
                 for (sl = 0; sl < 4; sl++) {
                         len += sprintf(page + len, KERN_ERR PRINTK_HEADER
@@ -498,11 +498,11 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
 
         /* print failing CCW area */
         len = 0;
-        if (act <  ((struct ccw1 *)(addr_t) irb->scsw.cpa) - 2) {
-                act = ((struct ccw1 *)(addr_t) irb->scsw.cpa) - 2;
+        if (act <  ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2) {
+                act = ((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa) - 2;
                 len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");
         }
-        end = min((struct ccw1 *)(addr_t) irb->scsw.cpa + 2, last);
+        end = min((struct ccw1 *)(addr_t) irb->scsw.cmd.cpa + 2, last);
         while (act <= end) {
                 len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                                " CCW %p: %08X %08X DAT:",
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index bb52d2fbac18..01fcdd91b846 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -167,10 +167,8 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch
         struct dcssblk_dev_info *dev_info;
         int rc;
 
-        if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0')) {
-                PRINT_WARN("Invalid value, must be 0 or 1\n");
+        if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0'))
                 return -EINVAL;
-        }
         down_write(&dcssblk_devices_sem);
         dev_info = container_of(dev, struct dcssblk_dev_info, dev);
         if (atomic_read(&dev_info->use_count)) {
@@ -215,7 +213,6 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch
                         set_disk_ro(dev_info->gd, 0);
                 }
         } else {
-                PRINT_WARN("Invalid value, must be 0 or 1\n");
                 rc = -EINVAL;
                 goto out;
         }
@@ -258,10 +255,8 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char
 {
         struct dcssblk_dev_info *dev_info;
 
-        if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0')) {
-                PRINT_WARN("Invalid value, must be 0 or 1\n");
+        if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0'))
                 return -EINVAL;
-        }
         dev_info = container_of(dev, struct dcssblk_dev_info, dev);
 
         down_write(&dcssblk_devices_sem);
@@ -289,7 +284,6 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char
                 }
         } else {
                 up_write(&dcssblk_devices_sem);
-                PRINT_WARN("Invalid value, must be 0 or 1\n");
                 return -EINVAL;
         }
         up_write(&dcssblk_devices_sem);
@@ -441,7 +435,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         goto out;
 
 unregister_dev:
-        PRINT_ERR("device_create_file() failed!\n");
         list_del(&dev_info->lh);
         blk_cleanup_queue(dev_info->dcssblk_queue);
         dev_info->gd->queue = NULL;
@@ -702,10 +695,8 @@ dcssblk_check_params(void)
 static void __exit
 dcssblk_exit(void)
 {
-        PRINT_DEBUG("DCSSBLOCK EXIT...\n");
         s390_root_dev_unregister(dcssblk_root_dev);
         unregister_blkdev(dcssblk_major, DCSSBLK_NAME);
-        PRINT_DEBUG("...finished!\n");
 }
 
 static int __init
@@ -713,27 +704,21 @@ dcssblk_init(void)
 {
         int rc;
 
-        PRINT_DEBUG("DCSSBLOCK INIT...\n");
         dcssblk_root_dev = s390_root_dev_register("dcssblk");
-        if (IS_ERR(dcssblk_root_dev)) {
-                PRINT_ERR("device_register() failed!\n");
+        if (IS_ERR(dcssblk_root_dev))
                 return PTR_ERR(dcssblk_root_dev);
-        }
         rc = device_create_file(dcssblk_root_dev, &dev_attr_add);
         if (rc) {
-                PRINT_ERR("device_create_file(add) failed!\n");
                 s390_root_dev_unregister(dcssblk_root_dev);
                 return rc;
         }
         rc = device_create_file(dcssblk_root_dev, &dev_attr_remove);
         if (rc) {
-                PRINT_ERR("device_create_file(remove) failed!\n");
                 s390_root_dev_unregister(dcssblk_root_dev);
                 return rc;
         }
         rc = register_blkdev(0, DCSSBLK_NAME);
         if (rc < 0) {
-                PRINT_ERR("Can't get dynamic major!\n");
                 s390_root_dev_unregister(dcssblk_root_dev);
                 return rc;
         }
@@ -742,7 +727,6 @@ dcssblk_init(void)
 
         dcssblk_check_params();
 
-        PRINT_DEBUG("...finished!\n");
         return 0;
 }
 
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index f231bc21b1ca..dd9b986389a2 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -100,15 +100,10 @@ static int xpram_page_in (unsigned long page_addr, unsigned int xpage_index)
                 : "+d" (cc) : "a" (__pa(page_addr)), "d" (xpage_index) : "cc");
         if (cc == 3)
                 return -ENXIO;
-        if (cc == 2) {
-                PRINT_ERR("expanded storage lost!\n");
+        if (cc == 2)
                 return -ENXIO;
-        }
-        if (cc == 1) {
-                PRINT_ERR("page in failed for page index %u.\n",
-                          xpage_index);
+        if (cc == 1)
                 return -EIO;
-        }
         return 0;
 }
 
@@ -135,15 +130,10 @@ static long xpram_page_out (unsigned long page_addr, unsigned int xpage_index)
                 : "+d" (cc) : "a" (__pa(page_addr)), "d" (xpage_index) : "cc");
         if (cc == 3)
                 return -ENXIO;
-        if (cc == 2) {
-                PRINT_ERR("expanded storage lost!\n");
+        if (cc == 2)
                 return -ENXIO;
-        }
-        if (cc == 1) {
-                PRINT_ERR("page out failed for page index %u.\n",
-                          xpage_index);
+        if (cc == 1)
                 return -EIO;
-        }
         return 0;
 }
 
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 3e5653c92f4b..d3ec9b55ab35 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -93,9 +93,6 @@ struct raw3215_info {
         struct raw3215_req *queued_write;/* pointer to queued write requests */
         wait_queue_head_t empty_wait; /* wait queue for flushing */
         struct timer_list timer;      /* timer for delayed output */
-        char *message;                /* pending message from raw3215_irq */
-        int msg_dstat;                /* dstat for pending message */
-        int msg_cstat;                /* cstat for pending message */
         int line_pos;                 /* position on the line (for tabs) */
         char ubuffer[80];             /* copy_from_user buffer */
 };
@@ -359,11 +356,6 @@ raw3215_tasklet(void *data)
         raw3215_mk_write_req(raw);
         raw3215_try_io(raw);
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
-        /* Check for pending message from raw3215_irq */
-        if (raw->message != NULL) {
-                printk(raw->message, raw->msg_dstat, raw->msg_cstat);
-                raw->message = NULL;
-        }
         tty = raw->tty;
         if (tty != NULL &&
             RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
@@ -381,20 +373,14 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         struct raw3215_req *req;
         struct tty_struct *tty;
         int cstat, dstat;
-        int count, slen;
+        int count;
 
         raw = cdev->dev.driver_data;
         req = (struct raw3215_req *) intparm;
-        cstat = irb->scsw.cstat;
-        dstat = irb->scsw.dstat;
-        if (cstat != 0) {
-                raw->message = KERN_WARNING
-                        "Got nonzero channel status in raw3215_irq "
-                        "(dev sts 0x%2x, sch sts 0x%2x)";
-                raw->msg_dstat = dstat;
-                raw->msg_cstat = cstat;
+        cstat = irb->scsw.cmd.cstat;
+        dstat = irb->scsw.cmd.dstat;
+        if (cstat != 0)
                 tasklet_schedule(&raw->tasklet);
-        }
         if (dstat & 0x01) { /* we got a unit exception */
                 dstat &= ~0x01;  /* we can ignore it */
         }
@@ -404,8 +390,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         break;
                 /* Attention interrupt, someone hit the enter key */
                 raw3215_mk_read_req(raw);
-                if (MACHINE_IS_P390)
-                        memset(raw->inbuf, 0, RAW3215_INBUF_SIZE);
                 tasklet_schedule(&raw->tasklet);
                 break;
         case 0x08:
@@ -415,7 +399,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         return;              /* That shouldn't happen ... */
                 if (req->type == RAW3215_READ) {
                         /* store residual count, then wait for device end */
-                        req->residual = irb->scsw.count;
+                        req->residual = irb->scsw.cmd.count;
                 }
                 if (dstat == 0x08)
                         break;
@@ -428,11 +412,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
                         tty = raw->tty;
                         count = 160 - req->residual;
-                        if (MACHINE_IS_P390) {
-                                slen = strnlen(raw->inbuf, RAW3215_INBUF_SIZE);
-                                if (count > slen)
-                                        count = slen;
-                        } else
                         EBCASC(raw->inbuf, count);
                         cchar = ctrlchar_handle(raw->inbuf, count, tty);
                         switch (cchar & CTRLCHAR_MASK) {
@@ -481,11 +460,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         raw->flags &= ~RAW3215_WORKING;
                         raw3215_free_req(req);
                 }
-                raw->message = KERN_WARNING
-                        "Spurious interrupt in in raw3215_irq "
-                        "(dev sts 0x%2x, sch sts 0x%2x)";
-                raw->msg_dstat = dstat;
-                raw->msg_cstat = cstat;
                 tasklet_schedule(&raw->tasklet);
         }
         return;
@@ -883,7 +857,6 @@ con3215_init(void)
                 free_bootmem((unsigned long) raw->buffer, RAW3215_BUFFER_SIZE);
                 free_bootmem((unsigned long) raw, sizeof(struct raw3215_info));
                 raw3215[0] = NULL;
-                printk("Couldn't find a 3215 console device\n");
                 return -ENODEV;
         }
         register_console(&con3215);
@@ -1157,7 +1130,6 @@ tty3215_init(void)
         tty_set_operations(driver, &tty3215_ops);
         ret = tty_register_driver(driver);
         if (ret) {
-                printk("Couldn't register tty3215 driver\n");
                 put_tty_driver(driver);
                 return ret;
         }
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index 0b040557db02..3c07974886ed 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -411,15 +411,15 @@ static int
 con3270_irq(struct con3270 *cp, struct raw3270_request *rq, struct irb *irb)
 {
         /* Handle ATTN. Schedule tasklet to read aid. */
-        if (irb->scsw.dstat & DEV_STAT_ATTENTION)
+        if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION)
                 con3270_issue_read(cp);
 
         if (rq) {
-                if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK)
+                if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)
                         rq->rc = -EIO;
                 else
                         /* Normal end. Copy residual count. */
-                        rq->rescnt = irb->scsw.count;
+                        rq->rescnt = irb->scsw.cmd.count;
         }
         return RAW3270_IO_DONE;
 }
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index ef36f2132aa4..d18e6d2e0b49 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/smp_lock.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -216,17 +217,17 @@ static int
 fs3270_irq(struct fs3270 *fp, struct raw3270_request *rq, struct irb *irb)
 {
         /* Handle ATTN. Set indication and wake waiters for attention. */
-        if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION) {
                 fp->attention = 1;
                 wake_up(&fp->wait);
         }
 
         if (rq) {
-                if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK)
+                if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)
                         rq->rc = -EIO;
                 else
                         /* Normal end. Copy residual count. */
-                        rq->rescnt = irb->scsw.count;
+                        rq->rescnt = irb->scsw.cmd.count;
         }
         return RAW3270_IO_DONE;
 }
@@ -421,6 +422,7 @@ fs3270_open(struct inode *inode, struct file *filp)
 
         if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
                 return -ENODEV;
+        lock_kernel();
         minor = iminor(filp->f_path.dentry->d_inode);
         /* Check for minor 0 multiplexer. */
         if (minor == 0) {
@@ -429,7 +431,8 @@ fs3270_open(struct inode *inode, struct file *filp)
                 tty = get_current_tty();
                 if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) {
                         mutex_unlock(&tty_mutex);
-                        return -ENODEV;
+                        rc = -ENODEV;
+                        goto out;
                 }
                 minor = tty->index + RAW3270_FIRSTMINOR;
                 mutex_unlock(&tty_mutex);
@@ -438,19 +441,22 @@ fs3270_open(struct inode *inode, struct file *filp)
         fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);
         if (!IS_ERR(fp)) {
                 raw3270_put_view(&fp->view);
-                return -EBUSY;
+                rc = -EBUSY;
+                goto out;
         }
         /* Allocate fullscreen view structure. */
         fp = fs3270_alloc_view();
-        if (IS_ERR(fp))
-                return PTR_ERR(fp);
+        if (IS_ERR(fp)) {
+                rc = PTR_ERR(fp);
+                goto out;
+        }
 
         init_waitqueue_head(&fp->wait);
         fp->fs_pid = get_pid(task_pid(current));
         rc = raw3270_add_view(&fp->view, &fs3270_fn, minor);
         if (rc) {
                 fs3270_free_view(&fp->view);
-                return rc;
+                goto out;
         }
 
         /* Allocate idal-buffer. */
@@ -458,7 +464,8 @@ fs3270_open(struct inode *inode, struct file *filp)
         if (IS_ERR(ib)) {
                 raw3270_put_view(&fp->view);
                 raw3270_del_view(&fp->view);
-                return PTR_ERR(fp);
+                rc = PTR_ERR(fp);
+                goto out;
         }
         fp->rdbuf = ib;
 
@@ -466,9 +473,11 @@ fs3270_open(struct inode *inode, struct file *filp)
         if (rc) {
                 raw3270_put_view(&fp->view);
                 raw3270_del_view(&fp->view);
-                return rc;
+                goto out;
         }
         filp->private_data = fp;
+out:
+        unlock_kernel();
         return 0;
 }
 
@@ -512,11 +521,8 @@ fs3270_init(void)
         int rc;
 
         rc = register_chrdev(IBM_FS3270_MAJOR, "fs3270", &fs3270_fops);
-        if (rc) {
-                printk(KERN_ERR "fs3270 can't get major number %d: errno %d\n",
-                       IBM_FS3270_MAJOR, rc);
+        if (rc)
                 return rc;
-        }
         return 0;
 }
 
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 1e1f50655bbf..35fd8dfcaaa6 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -3,14 +3,14 @@
  *
  * Character device driver for reading z/VM *MONITOR service records.
  *
- * Copyright 2004 IBM Corporation, IBM Deutschland Entwicklung GmbH.
- *
- * Author: Gerald Schaefer <geraldsc@de.ibm.com>
+ *   Copyright IBM Corp. 2004, 2008
+ *   Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -18,12 +18,11 @@
 #include <linux/ctype.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/poll.h>
+#include <net/iucv/iucv.h>
 #include <asm/uaccess.h>
 #include <asm/ebcdic.h>
 #include <asm/extmem.h>
-#include <linux/poll.h>
-#include <net/iucv/iucv.h>
-
 
 //#define MON_DEBUG                     /* Debug messages on/off */
 
@@ -152,10 +151,7 @@ static int mon_check_mca(struct mon_msg *monmsg)
             (mon_mca_end(monmsg) > mon_dcss_end) ||
             (mon_mca_start(monmsg) < mon_dcss_start) ||
             ((mon_mca_type(monmsg, 1) == 0) && (mon_mca_type(monmsg, 2) == 0)))
-        {
-                P_DEBUG("READ, IGNORED INVALID MCA\n\n");
                 return -EINVAL;
-        }
         return 0;
 }
 
@@ -164,10 +160,6 @@ static int mon_send_reply(struct mon_msg *monmsg,
 {
         int rc;
 
-        P_DEBUG("read, REPLY: pathid = 0x%04X, msgid = 0x%08X, trgcls = "
-                "0x%08X\n\n",
-                monpriv->path->pathid, monmsg->msg.id, monmsg->msg.class);
-
         rc = iucv_message_reply(monpriv->path, &monmsg->msg,
                                 IUCV_IPRMDATA, NULL, 0);
         atomic_dec(&monpriv->msglim_count);
@@ -202,15 +194,12 @@ static struct mon_private *mon_alloc_mem(void)
         struct mon_private *monpriv;
 
         monpriv = kzalloc(sizeof(struct mon_private), GFP_KERNEL);
-        if (!monpriv) {
-                P_ERROR("no memory for monpriv\n");
+        if (!monpriv)
                 return NULL;
-        }
         for (i = 0; i < MON_MSGLIM; i++) {
                 monpriv->msg_array[i] = kzalloc(sizeof(struct mon_msg),
                                                     GFP_KERNEL);
                 if (!monpriv->msg_array[i]) {
-                        P_ERROR("open, no memory for msg_array\n");
                         mon_free_mem(monpriv);
                         return NULL;
                 }
@@ -218,41 +207,10 @@ static struct mon_private *mon_alloc_mem(void)
         return monpriv;
 }
 
-static inline void mon_read_debug(struct mon_msg *monmsg,
-                                  struct mon_private *monpriv)
-{
-#ifdef MON_DEBUG
-        u8 msg_type[2], mca_type;
-        unsigned long records_len;
-
-        records_len = mon_rec_end(monmsg) - mon_rec_start(monmsg) + 1;
-
-        memcpy(msg_type, &monmsg->msg.class, 2);
-        EBCASC(msg_type, 2);
-        mca_type = mon_mca_type(monmsg, 0);
-        EBCASC(&mca_type, 1);
-
-        P_DEBUG("read, mon_read_index = %i, mon_write_index = %i\n",
-                monpriv->read_index, monpriv->write_index);
-        P_DEBUG("read, pathid = 0x%04X, msgid = 0x%08X, trgcls = 0x%08X\n",
-                monpriv->path->pathid, monmsg->msg.id, monmsg->msg.class);
-        P_DEBUG("read, msg_type = '%c%c', mca_type = '%c' / 0x%X / 0x%X\n",
-                msg_type[0], msg_type[1], mca_type ? mca_type : 'X',
-                mon_mca_type(monmsg, 1), mon_mca_type(monmsg, 2));
-        P_DEBUG("read, MCA: start = 0x%lX, end = 0x%lX\n",
-                mon_mca_start(monmsg), mon_mca_end(monmsg));
-        P_DEBUG("read, REC: start = 0x%X, end = 0x%X, len = %lu\n\n",
-                mon_rec_start(monmsg), mon_rec_end(monmsg), records_len);
-        if (mon_mca_size(monmsg) > 12)
-                P_DEBUG("READ, MORE THAN ONE MCA\n\n");
-#endif
-}
-
 static inline void mon_next_mca(struct mon_msg *monmsg)
 {
         if (likely((mon_mca_size(monmsg) - monmsg->mca_offset) == 12))
                 return;
-        P_DEBUG("READ, NEXT MCA\n\n");
         monmsg->mca_offset += 12;
         monmsg->pos = 0;
 }
@@ -269,7 +227,6 @@ static struct mon_msg *mon_next_message(struct mon_private *monpriv)
                 monmsg->msglim_reached = 0;
                 monmsg->pos = 0;
                 monmsg->mca_offset = 0;
-                P_WARNING("read, message limit reached\n");
                 monpriv->read_index = (monpriv->read_index + 1) %
                                       MON_MSGLIM;
                 atomic_dec(&monpriv->read_ready);
@@ -286,10 +243,6 @@ static void mon_iucv_path_complete(struct iucv_path *path, u8 ipuser[16])
 {
         struct mon_private *monpriv = path->private;
 
-        P_DEBUG("IUCV connection completed\n");
-        P_DEBUG("IUCV ACCEPT (from *MONITOR): Version = 0x%02X, Event = "
-                "0x%02X, Sample = 0x%02X\n",
-                ipuser[0], ipuser[1], ipuser[2]);
         atomic_set(&monpriv->iucv_connected, 1);
         wake_up(&mon_conn_wait_queue);
 }
@@ -310,7 +263,6 @@ static void mon_iucv_message_pending(struct iucv_path *path,
 {
         struct mon_private *monpriv = path->private;
 
-        P_DEBUG("IUCV message pending\n");
         memcpy(&monpriv->msg_array[monpriv->write_index]->msg,
                msg, sizeof(*msg));
         if (atomic_inc_return(&monpriv->msglim_count) == MON_MSGLIM) {
@@ -340,6 +292,7 @@ static int mon_open(struct inode *inode, struct file *filp)
         /*
          * only one user allowed
          */
+        lock_kernel();
         rc = -EBUSY;
         if (test_and_set_bit(MON_IN_USE, &mon_in_use))
                 goto out;
@@ -375,8 +328,8 @@ static int mon_open(struct inode *inode, struct file *filp)
                 rc = -EIO;
                 goto out_path;
         }
-        P_INFO("open, established connection to *MONITOR service\n\n");
         filp->private_data = monpriv;
+        unlock_kernel();
         return nonseekable_open(inode, filp);
 
 out_path:
@@ -386,6 +339,7 @@ out_priv:
 out_use:
         clear_bit(MON_IN_USE, &mon_in_use);
 out:
+        unlock_kernel();
         return rc;
 }
 
@@ -400,8 +354,6 @@ static int mon_close(struct inode *inode, struct file *filp)
         rc = iucv_path_sever(monpriv->path, user_data_sever);
         if (rc)
                 P_ERROR("close, iucv_sever failed with rc = %i\n", rc);
-        else
-                P_INFO("close, terminated connection to *MONITOR service\n");
 
         atomic_set(&monpriv->iucv_severed, 0);
         atomic_set(&monpriv->iucv_connected, 0);
@@ -442,10 +394,8 @@ static ssize_t mon_read(struct file *filp, char __user *data,
                 monmsg = monpriv->msg_array[monpriv->read_index];
         }
 
-        if (!monmsg->pos) {
+        if (!monmsg->pos)
                 monmsg->pos = mon_mca_start(monmsg) + monmsg->mca_offset;
-                mon_read_debug(monmsg, monpriv);
-        }
         if (mon_check_mca(monmsg))
                 goto reply;
 
@@ -531,7 +481,6 @@ static int __init mon_init(void)
                 P_ERROR("failed to register with iucv driver\n");
                 return rc;
         }
-        P_INFO("open, registered with IUCV\n");
 
         rc = segment_type(mon_dcss_name);
         if (rc < 0) {
@@ -555,13 +504,8 @@ static int __init mon_init(void)
         dcss_mkname(mon_dcss_name, &user_data_connect[8]);
 
         rc = misc_register(&mon_dev);
-        if (rc < 0 ) {
-                P_ERROR("misc_register failed, rc = %i\n", rc);
+        if (rc < 0 )
                 goto out;
-        }
-        P_INFO("Loaded segment %s from %p to %p, size = %lu Byte\n",
-                mon_dcss_name, (void *) mon_dcss_start, (void *) mon_dcss_end,
-                mon_dcss_end - mon_dcss_start + 1);
         return 0;
 
 out:
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index a86c0534cd49..4d71aa8c1a79 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -12,6 +12,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -179,10 +180,12 @@ static int monwrite_open(struct inode *inode, struct file *filp)
         monpriv = kzalloc(sizeof(struct mon_private), GFP_KERNEL);
         if (!monpriv)
                 return -ENOMEM;
+        lock_kernel();
         INIT_LIST_HEAD(&monpriv->list);
         monpriv->hdr_to_read = sizeof(monpriv->hdr);
         mutex_init(&monpriv->thread_mutex);
         filp->private_data = monpriv;
+        unlock_kernel();
         return nonseekable_open(inode, filp);
 }
 
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 848ef7e8523f..81a96e019080 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -153,19 +153,10 @@ struct raw3270_request __init *raw3270_request_alloc_bootmem(size_t size)
         struct raw3270_request *rq;
 
         rq = alloc_bootmem_low(sizeof(struct raw3270));
-        if (!rq)
-                return ERR_PTR(-ENOMEM);
-        memset(rq, 0, sizeof(struct raw3270_request));
 
         /* alloc output buffer. */
-        if (size > 0) {
+        if (size > 0)
                 rq->buffer = alloc_bootmem_low(size);
-                if (!rq->buffer) {
-                        free_bootmem((unsigned long) rq,
-                                     sizeof(struct raw3270));
-                        return ERR_PTR(-ENOMEM);
-                }
-        }
         rq->size = size;
         INIT_LIST_HEAD(&rq->list);
 
@@ -372,17 +363,17 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
         if (IS_ERR(irb))
                 rc = RAW3270_IO_RETRY;
-        else if (irb->scsw.fctl & SCSW_FCTL_HALT_FUNC) {
+        else if (irb->scsw.cmd.fctl & SCSW_FCTL_HALT_FUNC) {
                 rq->rc = -EIO;
                 rc = RAW3270_IO_DONE;
-        } else if (irb->scsw.dstat ==  (DEV_STAT_CHN_END | DEV_STAT_DEV_END |
-                                        DEV_STAT_UNIT_EXCEP)) {
+        } else if (irb->scsw.cmd.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END |
+                                           DEV_STAT_UNIT_EXCEP)) {
                 /* Handle CE-DE-UE and subsequent UDE */
                 set_bit(RAW3270_FLAGS_BUSY, &rp->flags);
                 rc = RAW3270_IO_BUSY;
         } else if (test_bit(RAW3270_FLAGS_BUSY, &rp->flags)) {
                 /* Wait for UDE if busy flag is set. */
-                if (irb->scsw.dstat & DEV_STAT_DEV_END) {
+                if (irb->scsw.cmd.dstat & DEV_STAT_DEV_END) {
                         clear_bit(RAW3270_FLAGS_BUSY, &rp->flags);
                         /* Got it, now retry. */
                         rc = RAW3270_IO_RETRY;
@@ -497,7 +488,7 @@ raw3270_init_irq(struct raw3270_view *view, struct raw3270_request *rq,
          * Unit-Check Processing:
          * Expect Command Reject or Intervention Required.
          */
-        if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) {
                 /* Request finished abnormally. */
                 if (irb->ecw[0] & SNS0_INTERVENTION_REQ) {
                         set_bit(RAW3270_FLAGS_BUSY, &view->dev->flags);
@@ -505,16 +496,16 @@ raw3270_init_irq(struct raw3270_view *view, struct raw3270_request *rq,
                 }
         }
         if (rq) {
-                if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK) {
+                if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) {
                         if (irb->ecw[0] & SNS0_CMD_REJECT)
                                 rq->rc = -EOPNOTSUPP;
                         else
                                 rq->rc = -EIO;
                 } else
                         /* Request finished normally. Copy residual count. */
-                        rq->rescnt = irb->scsw.count;
+                        rq->rescnt = irb->scsw.cmd.count;
         }
-        if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION) {
                 set_bit(RAW3270_FLAGS_ATTN, &view->dev->flags);
                 wake_up(&raw3270_wait_queue);
         }
@@ -619,7 +610,6 @@ __raw3270_size_device_vm(struct raw3270 *rp)
                 rp->cols = 132;
                 break;
         default:
-                printk(KERN_WARNING "vrdccrmd is 0x%.8x\n", model);
                 rc = -EOPNOTSUPP;
                 break;
         }
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 2c7a1ee6b041..3c8b25e6c345 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -506,6 +506,8 @@ sclp_state_change_cb(struct evbuf_header *evbuf)
         if (scbuf->validity_sclp_send_mask)
                 sclp_send_mask = scbuf->sclp_send_mask;
         spin_unlock_irqrestore(&sclp_lock, flags);
+        if (scbuf->validity_sclp_active_facility_mask)
+                sclp_facilities = scbuf->sclp_active_facility_mask;
         sclp_dispatch_state_change();
 }
 
@@ -782,11 +784,9 @@ sclp_check_handler(__u16 code)
         /* Is this the interrupt we are waiting for? */
         if (finished_sccb == 0)
                 return;
-        if (finished_sccb != (u32) (addr_t) sclp_init_sccb) {
-                printk(KERN_WARNING SCLP_HEADER "unsolicited interrupt "
-                       "for buffer at 0x%x\n", finished_sccb);
-                return;
-        }
+        if (finished_sccb != (u32) (addr_t) sclp_init_sccb)
+                panic("sclp: unsolicited interrupt for buffer at 0x%x\n",
+                      finished_sccb);
         spin_lock(&sclp_lock);
         if (sclp_running_state == sclp_running_state_running) {
                 sclp_init_req.status = SCLP_REQ_DONE;
@@ -883,8 +883,6 @@ sclp_init(void)
         unsigned long flags;
         int rc;
 
-        if (!MACHINE_HAS_SCLP)
-                return -ENODEV;
         spin_lock_irqsave(&sclp_lock, flags);
         /* Check for previous or running initialization */
         if (sclp_init_state != sclp_init_state_uninitialized) {
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index b5c23396f8fe..0c2b77493db4 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -11,6 +11,9 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/mmzone.h>
+#include <linux/memory.h>
 #include <asm/chpid.h>
 #include <asm/sclp.h>
 #include "sclp.h"
@@ -43,6 +46,8 @@ static int __initdata early_read_info_sccb_valid;
 
 u64 sclp_facilities;
 static u8 sclp_fac84;
+static unsigned long long rzm;
+static unsigned long long rnmax;
 
 static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb)
 {
@@ -62,7 +67,7 @@ out:
         return rc;
 }
 
-void __init sclp_read_info_early(void)
+static void __init sclp_read_info_early(void)
 {
         int rc;
         int i;
@@ -92,34 +97,33 @@ void __init sclp_read_info_early(void)
 
 void __init sclp_facilities_detect(void)
 {
+        struct read_info_sccb *sccb;
+
+        sclp_read_info_early();
         if (!early_read_info_sccb_valid)
                 return;
-        sclp_facilities = early_read_info_sccb.facilities;
-        sclp_fac84 = early_read_info_sccb.fac84;
+
+        sccb = &early_read_info_sccb;
+        sclp_facilities = sccb->facilities;
+        sclp_fac84 = sccb->fac84;
+        rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;
+        rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;
+        rzm <<= 20;
 }
 
-unsigned long long __init sclp_memory_detect(void)
+unsigned long long sclp_get_rnmax(void)
 {
-        unsigned long long memsize;
-        struct read_info_sccb *sccb;
+        return rnmax;
+}
 
-        if (!early_read_info_sccb_valid)
-                return 0;
-        sccb = &early_read_info_sccb;
-        if (sccb->rnsize)
-                memsize = sccb->rnsize << 20;
-        else
-                memsize = sccb->rnsize2 << 20;
-        if (sccb->rnmax)
-                memsize *= sccb->rnmax;
-        else
-                memsize *= sccb->rnmax2;
-        return memsize;
+unsigned long long sclp_get_rzm(void)
+{
+        return rzm;
 }
 
 /*
- * This function will be called after sclp_memory_detect(), which gets called
- * early from early.c code. Therefore the sccb should have valid contents.
+ * This function will be called after sclp_facilities_detect(), which gets
+ * called from early.c code. Therefore the sccb should have valid contents.
  */
 void __init sclp_get_ipl_info(struct sclp_ipl_info *info)
 {
@@ -278,6 +282,305 @@ int sclp_cpu_deconfigure(u8 cpu)
         return do_cpu_configure(SCLP_CMDW_DECONFIGURE_CPU | cpu << 8);
 }
 
+#ifdef CONFIG_MEMORY_HOTPLUG
+
+static DEFINE_MUTEX(sclp_mem_mutex);
+static LIST_HEAD(sclp_mem_list);
+static u8 sclp_max_storage_id;
+static unsigned long sclp_storage_ids[256 / BITS_PER_LONG];
+
+struct memory_increment {
+        struct list_head list;
+        u16 rn;
+        int standby;
+        int usecount;
+};
+
+struct assign_storage_sccb {
+        struct sccb_header header;
+        u16 rn;
+} __packed;
+
+static unsigned long long rn2addr(u16 rn)
+{
+        return (unsigned long long) (rn - 1) * rzm;
+}
+
+static int do_assign_storage(sclp_cmdw_t cmd, u16 rn)
+{
+        struct assign_storage_sccb *sccb;
+        int rc;
+
+        sccb = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!sccb)
+                return -ENOMEM;
+        sccb->header.length = PAGE_SIZE;
+        sccb->rn = rn;
+        rc = do_sync_request(cmd, sccb);
+        if (rc)
+                goto out;
+        switch (sccb->header.response_code) {
+        case 0x0020:
+        case 0x0120:
+                break;
+        default:
+                rc = -EIO;
+                break;
+        }
+out:
+        free_page((unsigned long) sccb);
+        return rc;
+}
+
+static int sclp_assign_storage(u16 rn)
+{
+        return do_assign_storage(0x000d0001, rn);
+}
+
+static int sclp_unassign_storage(u16 rn)
+{
+        return do_assign_storage(0x000c0001, rn);
+}
+
+struct attach_storage_sccb {
+        struct sccb_header header;
+        u16 :16;
+        u16 assigned;
+        u32 :32;
+        u32 entries[0];
+} __packed;
+
+static int sclp_attach_storage(u8 id)
+{
+        struct attach_storage_sccb *sccb;
+        int rc;
+        int i;
+
+        sccb = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!sccb)
+                return -ENOMEM;
+        sccb->header.length = PAGE_SIZE;
+        rc = do_sync_request(0x00080001 | id << 8, sccb);
+        if (rc)
+                goto out;
+        switch (sccb->header.response_code) {
+        case 0x0020:
+                set_bit(id, sclp_storage_ids);
+                for (i = 0; i < sccb->assigned; i++)
+                        sclp_unassign_storage(sccb->entries[i] >> 16);
+                break;
+        default:
+                rc = -EIO;
+                break;
+        }
+out:
+        free_page((unsigned long) sccb);
+        return rc;
+}
+
+static int sclp_mem_change_state(unsigned long start, unsigned long size,
+                                 int online)
+{
+        struct memory_increment *incr;
+        unsigned long long istart;
+        int rc = 0;
+
+        list_for_each_entry(incr, &sclp_mem_list, list) {
+                istart = rn2addr(incr->rn);
+                if (start + size - 1 < istart)
+                        break;
+                if (start > istart + rzm - 1)
+                        continue;
+                if (online) {
+                        if (incr->usecount++)
+                                continue;
+                        /*
+                         * Don't break the loop if one assign fails. Loop may
+                         * be walked again on CANCEL and we can't save
+                         * information if state changed before or not.
+                         * So continue and increase usecount for all increments.
+                         */
+                        rc |= sclp_assign_storage(incr->rn);
+                } else {
+                        if (--incr->usecount)
+                                continue;
+                        sclp_unassign_storage(incr->rn);
+                }
+        }
+        return rc ? -EIO : 0;
+}
+
+static int sclp_mem_notifier(struct notifier_block *nb,
+                             unsigned long action, void *data)
+{
+        unsigned long start, size;
+        struct memory_notify *arg;
+        unsigned char id;
+        int rc = 0;
+
+        arg = data;
+        start = arg->start_pfn << PAGE_SHIFT;
+        size = arg->nr_pages << PAGE_SHIFT;
+        mutex_lock(&sclp_mem_mutex);
+        for (id = 0; id <= sclp_max_storage_id; id++)
+                if (!test_bit(id, sclp_storage_ids))
+                        sclp_attach_storage(id);
+        switch (action) {
+        case MEM_ONLINE:
+                break;
+        case MEM_GOING_ONLINE:
+                rc = sclp_mem_change_state(start, size, 1);
+                break;
+        case MEM_CANCEL_ONLINE:
+                sclp_mem_change_state(start, size, 0);
+                break;
+        default:
+                rc = -EINVAL;
+                break;
+        }
+        mutex_unlock(&sclp_mem_mutex);
+        return rc ? NOTIFY_BAD : NOTIFY_OK;
+}
+
+static struct notifier_block sclp_mem_nb = {
+        .notifier_call = sclp_mem_notifier,
+};
+
+static void __init add_memory_merged(u16 rn)
+{
+        static u16 first_rn, num;
+        unsigned long long start, size;
+
+        if (rn && first_rn && (first_rn + num == rn)) {
+                num++;
+                return;
+        }
+        if (!first_rn)
+                goto skip_add;
+        start = rn2addr(first_rn);
+        size = (unsigned long long ) num * rzm;
+        if (start >= VMEM_MAX_PHYS)
+                goto skip_add;
+        if (start + size > VMEM_MAX_PHYS)
+                size = VMEM_MAX_PHYS - start;
+        add_memory(0, start, size);
+skip_add:
+        first_rn = rn;
+        num = 1;
+}
+
+static void __init sclp_add_standby_memory(void)
+{
+        struct memory_increment *incr;
+
+        list_for_each_entry(incr, &sclp_mem_list, list)
+                if (incr->standby)
+                        add_memory_merged(incr->rn);
+        add_memory_merged(0);
+}
+
+static void __init insert_increment(u16 rn, int standby, int assigned)
+{
+        struct memory_increment *incr, *new_incr;
+        struct list_head *prev;
+        u16 last_rn;
+
+        new_incr = kzalloc(sizeof(*new_incr), GFP_KERNEL);
+        if (!new_incr)
+                return;
+        new_incr->rn = rn;
+        new_incr->standby = standby;
+        last_rn = 0;
+        prev = &sclp_mem_list;
+        list_for_each_entry(incr, &sclp_mem_list, list) {
+                if (assigned && incr->rn > rn)
+                        break;
+                if (!assigned && incr->rn - last_rn > 1)
+                        break;
+                last_rn = incr->rn;
+                prev = &incr->list;
+        }
+        if (!assigned)
+                new_incr->rn = last_rn + 1;
+        if (new_incr->rn > rnmax) {
+                kfree(new_incr);
+                return;
+        }
+        list_add(&new_incr->list, prev);
+}
+
+struct read_storage_sccb {
+        struct sccb_header header;
+        u16 max_id;
+        u16 assigned;
+        u16 standby;
+        u16 :16;
+        u32 entries[0];
+} __packed;
+
+static int __init sclp_detect_standby_memory(void)
+{
+        struct read_storage_sccb *sccb;
+        int i, id, assigned, rc;
+
+        if (!early_read_info_sccb_valid)
+                return 0;
+        if ((sclp_facilities & 0xe00000000000ULL) != 0xe00000000000ULL)
+                return 0;
+        rc = -ENOMEM;
+        sccb = (void *) __get_free_page(GFP_KERNEL | GFP_DMA);
+        if (!sccb)
+                goto out;
+        assigned = 0;
+        for (id = 0; id <= sclp_max_storage_id; id++) {
+                memset(sccb, 0, PAGE_SIZE);
+                sccb->header.length = PAGE_SIZE;
+                rc = do_sync_request(0x00040001 | id << 8, sccb);
+                if (rc)
+                        goto out;
+                switch (sccb->header.response_code) {
+                case 0x0010:
+                        set_bit(id, sclp_storage_ids);
+                        for (i = 0; i < sccb->assigned; i++) {
+                                if (!sccb->entries[i])
+                                        continue;
+                                assigned++;
+                                insert_increment(sccb->entries[i] >> 16, 0, 1);
+                        }
+                        break;
+                case 0x0310:
+                        break;
+                case 0x0410:
+                        for (i = 0; i < sccb->assigned; i++) {
+                                if (!sccb->entries[i])
+                                        continue;
+                                assigned++;
+                                insert_increment(sccb->entries[i] >> 16, 1, 1);
+                        }
+                        break;
+                default:
+                        rc = -EIO;
+                        break;
+                }
+                if (!rc)
+                        sclp_max_storage_id = sccb->max_id;
+        }
+        if (rc || list_empty(&sclp_mem_list))
+                goto out;
+        for (i = 1; i <= rnmax - assigned; i++)
+                insert_increment(0, 1, 0);
+        rc = register_memory_notifier(&sclp_mem_nb);
+        if (rc)
+                goto out;
+        sclp_add_standby_memory();
+out:
+        free_page((unsigned long) sccb);
+        return rc;
+}
+__initcall(sclp_detect_standby_memory);
+
+#endif /* CONFIG_MEMORY_HOTPLUG */
+
 /*
  * Channel path configuration related functions.
  */
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c
index ead1043d788e..7e619c534bf4 100644
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -14,14 +14,13 @@
 #include <linux/timer.h>
 #include <linux/jiffies.h>
 #include <linux/bootmem.h>
+#include <linux/termios.h>
 #include <linux/err.h>
 
 #include "sclp.h"
 #include "sclp_rw.h"
 #include "sclp_tty.h"
 
-#define SCLP_CON_PRINT_HEADER "sclp console driver: "
-
 #define sclp_console_major 4            /* TTYAUX_MAJOR */
 #define sclp_console_minor 64
 #define sclp_console_name  "ttyS"
@@ -222,8 +221,6 @@ sclp_console_init(void)
         INIT_LIST_HEAD(&sclp_con_pages);
         for (i = 0; i < MAX_CONSOLE_PAGES; i++) {
                 page = alloc_bootmem_low_pages(PAGE_SIZE);
-                if (page == NULL)
-                        return -ENOMEM;
                 list_add_tail((struct list_head *) page, &sclp_con_pages);
         }
         INIT_LIST_HEAD(&sclp_con_outqueue);
diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index ad05a87bc480..fff4ff485d9b 100644
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -8,6 +8,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/cpu.h>
+#include <linux/kthread.h>
 #include <linux/sysdev.h>
 #include <linux/workqueue.h>
 #include <asm/smp.h>
@@ -40,9 +41,19 @@ static void sclp_cpu_capability_notify(struct work_struct *work)
         put_online_cpus();
 }
 
-static void __ref sclp_cpu_change_notify(struct work_struct *work)
+static int sclp_cpu_kthread(void *data)
 {
         smp_rescan_cpus();
+        return 0;
+}
+
+static void __ref sclp_cpu_change_notify(struct work_struct *work)
+{
+        /* Can't call smp_rescan_cpus() from  workqueue context since it may
+         * deadlock in case of cpu hotplug. So we have to create a kernel
+         * thread in order to call it.
+         */
+        kthread_run(sclp_cpu_kthread, NULL, "cpu_rescan");
 }
 
 static void sclp_conf_receiver_fn(struct evbuf_header *evbuf)
@@ -74,10 +85,8 @@ static int __init sclp_conf_init(void)
         INIT_WORK(&sclp_cpu_change_work, sclp_cpu_change_notify);
 
         rc = sclp_register(&sclp_conf_register);
-        if (rc) {
-                printk(KERN_ERR TAG "failed to register (%d).\n", rc);
+        if (rc)
                 return rc;
-        }
 
         if (!(sclp_conf_register.sclp_send_mask & EVTYP_CONFMGMDATA_MASK)) {
                 printk(KERN_WARNING TAG "no configuration management.\n");
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 9f37456222e9..d887bd261d28 100644
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -27,6 +27,8 @@
 #define CPI_LENGTH_NAME 8
 #define CPI_LENGTH_LEVEL 16
 
+static DEFINE_MUTEX(sclp_cpi_mutex);
+
 struct cpi_evbuf {
         struct evbuf_header header;
         u8      id_format;
@@ -124,21 +126,15 @@ static int cpi_req(void)
         int response;
 
         rc = sclp_register(&sclp_cpi_event);
-        if (rc) {
-                printk(KERN_WARNING "cpi: could not register "
-                        "to hardware console.\n");
+        if (rc)
                 goto out;
-        }
         if (!(sclp_cpi_event.sclp_receive_mask & EVTYP_CTLPROGIDENT_MASK)) {
-                printk(KERN_WARNING "cpi: no control program "
-                        "identification support\n");
                 rc = -EOPNOTSUPP;
                 goto out_unregister;
         }
 
         req = cpi_prepare_req();
         if (IS_ERR(req)) {
-                printk(KERN_WARNING "cpi: could not allocate request\n");
                 rc = PTR_ERR(req);
                 goto out_unregister;
         }
@@ -148,10 +144,8 @@ static int cpi_req(void)
 
         /* Add request to sclp queue */
         rc = sclp_add_request(req);
-        if (rc) {
-                printk(KERN_WARNING "cpi: could not start request\n");
+        if (rc)
                 goto out_free_req;
-        }
 
         wait_for_completion(&completion);
 
@@ -223,7 +217,12 @@ static void set_string(char *attr, const char *value)
 static ssize_t system_name_show(struct kobject *kobj,
                                 struct kobj_attribute *attr, char *page)
 {
-        return snprintf(page, PAGE_SIZE, "%s\n", system_name);
+        int rc;
+
+        mutex_lock(&sclp_cpi_mutex);
+        rc = snprintf(page, PAGE_SIZE, "%s\n", system_name);
+        mutex_unlock(&sclp_cpi_mutex);
+        return rc;
 }
 
 static ssize_t system_name_store(struct kobject *kobj,
@@ -237,7 +236,9 @@ static ssize_t system_name_store(struct kobject *kobj,
         if (rc)
                 return rc;
 
+        mutex_lock(&sclp_cpi_mutex);
         set_string(system_name, buf);
+        mutex_unlock(&sclp_cpi_mutex);
 
         return len;
 }
@@ -248,7 +249,12 @@ static struct kobj_attribute system_name_attr =
 static ssize_t sysplex_name_show(struct kobject *kobj,
                                  struct kobj_attribute *attr, char *page)
 {
-        return snprintf(page, PAGE_SIZE, "%s\n", sysplex_name);
+        int rc;
+
+        mutex_lock(&sclp_cpi_mutex);
+        rc = snprintf(page, PAGE_SIZE, "%s\n", sysplex_name);
+        mutex_unlock(&sclp_cpi_mutex);
+        return rc;
 }
 
 static ssize_t sysplex_name_store(struct kobject *kobj,
@@ -262,7 +268,9 @@ static ssize_t sysplex_name_store(struct kobject *kobj,
         if (rc)
                 return rc;
 
+        mutex_lock(&sclp_cpi_mutex);
         set_string(sysplex_name, buf);
+        mutex_unlock(&sclp_cpi_mutex);
 
         return len;
 }
@@ -273,7 +281,12 @@ static struct kobj_attribute sysplex_name_attr =
 static ssize_t system_type_show(struct kobject *kobj,
                                 struct kobj_attribute *attr, char *page)
 {
-        return snprintf(page, PAGE_SIZE, "%s\n", system_type);
+        int rc;
+
+        mutex_lock(&sclp_cpi_mutex);
+        rc = snprintf(page, PAGE_SIZE, "%s\n", system_type);
+        mutex_unlock(&sclp_cpi_mutex);
+        return rc;
 }
 
 static ssize_t system_type_store(struct kobject *kobj,
@@ -287,7 +300,9 @@ static ssize_t system_type_store(struct kobject *kobj,
         if (rc)
                 return rc;
 
+        mutex_lock(&sclp_cpi_mutex);
         set_string(system_type, buf);
+        mutex_unlock(&sclp_cpi_mutex);
 
         return len;
 }
@@ -298,8 +313,11 @@ static struct kobj_attribute system_type_attr =
 static ssize_t system_level_show(struct kobject *kobj,
                                  struct kobj_attribute *attr, char *page)
 {
-        unsigned long long level = system_level;
+        unsigned long long level;
 
+        mutex_lock(&sclp_cpi_mutex);
+        level = system_level;
+        mutex_unlock(&sclp_cpi_mutex);
         return snprintf(page, PAGE_SIZE, "%#018llx\n", level);
 }
 
@@ -320,8 +338,9 @@ static ssize_t system_level_store(struct kobject *kobj,
         if (*endp)
                 return -EINVAL;
 
+        mutex_lock(&sclp_cpi_mutex);
         system_level = level;
-
+        mutex_unlock(&sclp_cpi_mutex);
         return len;
 }
 
@@ -334,7 +353,9 @@ static ssize_t set_store(struct kobject *kobj,
 {
         int rc;
 
+        mutex_lock(&sclp_cpi_mutex);
         rc = cpi_req();
+        mutex_unlock(&sclp_cpi_mutex);
         if (rc)
                 return rc;
 
@@ -373,12 +394,16 @@ int sclp_cpi_set_data(const char *system, const char *sysplex, const char *type,
         if (rc)
                 return rc;
 
+        mutex_lock(&sclp_cpi_mutex);
         set_string(system_name, system);
         set_string(sysplex_name, sysplex);
         set_string(system_type, type);
         system_level = level;
 
-        return cpi_req();
+        rc = cpi_req();
+        mutex_unlock(&sclp_cpi_mutex);
+
+        return rc;
 }
 EXPORT_SYMBOL(sclp_cpi_set_data);
 
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index 45ff25e787cb..84c191c1cd62 100644
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -51,13 +51,7 @@ static struct sclp_register sclp_quiesce_event = {
 static int __init
 sclp_quiesce_init(void)
 {
-        int rc;
-
-        rc = sclp_register(&sclp_quiesce_event);
-        if (rc)
-                printk(KERN_WARNING "sclp: could not register quiesce handler "
-                       "(rc=%d)\n", rc);
-        return rc;
+        return sclp_register(&sclp_quiesce_event);
 }
 
 module_init(sclp_quiesce_init);
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index da09781b32f7..710af42603f8 100644
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -19,8 +19,6 @@
 #include "sclp.h"
 #include "sclp_rw.h"
 
-#define SCLP_RW_PRINT_HEADER "sclp low level driver: "
-
 /*
  * The room for the SCCB (only for writing) is not equal to a pages size
  * (as it is specified as the maximum size in the SCLP documentation)
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 1c064976b32b..8b854857ba07 100644
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -239,10 +239,8 @@ int __init sclp_sdias_init(void)
         debug_register_view(sdias_dbf, &debug_sprintf_view);
         debug_set_level(sdias_dbf, 6);
         rc = sclp_register(&sclp_sdias_register);
-        if (rc) {
-                ERROR_MSG("sclp register failed\n");
+        if (rc)
                 return rc;
-        }
         init_waitqueue_head(&sdias_wq);
         TRACE("init done\n");
         return 0;
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 40b11521cd20..434ba04b1309 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -13,7 +13,6 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
-#include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -25,8 +24,6 @@
 #include "sclp_rw.h"
 #include "sclp_tty.h"
 
-#define SCLP_TTY_PRINT_HEADER "sclp tty driver: "
-
 /*
  * size of a buffer that collects single characters coming in
  * via sclp_tty_put_char()
@@ -50,8 +47,6 @@ static int sclp_tty_buffer_count;
 static struct sclp_buffer *sclp_ttybuf;
 /* Timer for delayed output of console messages. */
 static struct timer_list sclp_tty_timer;
-/* Waitqueue to wait for buffers to get empty. */
-static wait_queue_head_t sclp_tty_waitq;
 
 static struct tty_struct *sclp_tty;
 static unsigned char sclp_tty_chars[SCLP_TTY_BUF_SIZE];
@@ -59,19 +54,11 @@ static unsigned short int sclp_tty_chars_count;
 
 struct tty_driver *sclp_tty_driver;
 
-static struct sclp_ioctls sclp_ioctls;
-static struct sclp_ioctls sclp_ioctls_init =
-{
-        8,                      /* 1 hor. tab. = 8 spaces */
-        0,                      /* no echo of input by this driver */
-        80,                     /* 80 characters/line */
-        1,                      /* write after 1/10 s without final new line */
-        MAX_KMEM_PAGES,         /* quick fix: avoid __alloc_pages */
-        MAX_KMEM_PAGES,         /* take 32/64 pages from kernel memory, */
-        0,                      /* do not convert to lower case */
-        0x6c                    /* to seprate upper and lower case */
-                                /* ('%' in EBCDIC) */
-};
+static int sclp_tty_tolower;
+static int sclp_tty_columns = 80;
+
+#define SPACES_PER_TAB 8
+#define CASE_DELIMITER 0x6c /* to separate upper and lower case (% in EBCDIC) */
 
 /* This routine is called whenever we try to open a SCLP terminal. */
 static int
@@ -92,136 +79,6 @@ sclp_tty_close(struct tty_struct *tty, struct file *filp)
         sclp_tty = NULL;
 }
 
-/* execute commands to control the i/o behaviour of the SCLP tty at runtime */
-static int
-sclp_tty_ioctl(struct tty_struct *tty, struct file * file,
-               unsigned int cmd, unsigned long arg)
-{
-        unsigned long flags;
-        unsigned int obuf;
-        int check;
-        int rc;
-
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-        rc = 0;
-        check = 0;
-        switch (cmd) {
-        case TIOCSCLPSHTAB:
-                /* set width of horizontal tab  */
-                if (get_user(sclp_ioctls.htab, (unsigned short __user *) arg))
-                        rc = -EFAULT;
-                else
-                        check = 1;
-                break;
-        case TIOCSCLPGHTAB:
-                /* get width of horizontal tab  */
-                if (put_user(sclp_ioctls.htab, (unsigned short __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPSECHO:
-                /* enable/disable echo of input */
-                if (get_user(sclp_ioctls.echo, (unsigned char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPGECHO:
-                /* Is echo of input enabled ?  */
-                if (put_user(sclp_ioctls.echo, (unsigned char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPSCOLS:
-                /* set number of columns for output  */
-                if (get_user(sclp_ioctls.columns, (unsigned short __user *) arg))
-                        rc = -EFAULT;
-                else
-                        check = 1;
-                break;
-        case TIOCSCLPGCOLS:
-                /* get number of columns for output  */
-                if (put_user(sclp_ioctls.columns, (unsigned short __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPSNL:
-                /* enable/disable writing without final new line character  */
-                if (get_user(sclp_ioctls.final_nl, (signed char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPGNL:
-                /* Is writing without final new line character enabled ?  */
-                if (put_user(sclp_ioctls.final_nl, (signed char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPSOBUF:
-                /*
-                 * set the maximum buffers size for output, will be rounded
-                 * up to next 4kB boundary and stored as number of SCCBs
-                 * (4kB Buffers) limitation: 256 x 4kB
-                 */
-                if (get_user(obuf, (unsigned int __user *) arg) == 0) {
-                        if (obuf & 0xFFF)
-                                sclp_ioctls.max_sccb = (obuf >> 12) + 1;
-                        else
-                                sclp_ioctls.max_sccb = (obuf >> 12);
-                } else
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPGOBUF:
-                /* get the maximum buffers size for output  */
-                obuf = sclp_ioctls.max_sccb << 12;
-                if (put_user(obuf, (unsigned int __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPGKBUF:
-                /* get the number of buffers got from kernel at startup */
-                if (put_user(sclp_ioctls.kmem_sccb, (unsigned short __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPSCASE:
-                /* enable/disable conversion from upper to lower case */
-                if (get_user(sclp_ioctls.tolower, (unsigned char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPGCASE:
-                /* Is conversion from upper to lower case of input enabled? */
-                if (put_user(sclp_ioctls.tolower, (unsigned char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPSDELIM:
-                /*
-                 * set special character used for separating upper and
-                 * lower case, 0x00 disables this feature
-                 */
-                if (get_user(sclp_ioctls.delim, (unsigned char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPGDELIM:
-                /*
-                 * get special character used for separating upper and
-                 * lower case, 0x00 disables this feature
-                 */
-                if (put_user(sclp_ioctls.delim, (unsigned char __user *) arg))
-                        rc = -EFAULT;
-                break;
-        case TIOCSCLPSINIT:
-                /* set initial (default) sclp ioctls  */
-                sclp_ioctls = sclp_ioctls_init;
-                check = 1;
-                break;
-        default:
-                rc = -ENOIOCTLCMD;
-                break;
-        }
-        if (check) {
-                spin_lock_irqsave(&sclp_tty_lock, flags);
-                if (sclp_ttybuf != NULL) {
-                        sclp_set_htab(sclp_ttybuf, sclp_ioctls.htab);
-                        sclp_set_columns(sclp_ttybuf, sclp_ioctls.columns);
-                }
-                spin_unlock_irqrestore(&sclp_tty_lock, flags);
-        }
-        return rc;
-}
-
 /*
  * This routine returns the numbers of characters the tty driver
  * will accept for queuing to be written.  This number is subject
@@ -268,7 +125,6 @@ sclp_ttybuf_callback(struct sclp_buffer *buffer, int rc)
                                             struct sclp_buffer, list);
                 spin_unlock_irqrestore(&sclp_tty_lock, flags);
         } while (buffer && sclp_emit_buffer(buffer, sclp_ttybuf_callback));
-        wake_up(&sclp_tty_waitq);
         /* check if the tty needs a wake up call */
         if (sclp_tty != NULL) {
                 tty_wakeup(sclp_tty);
@@ -316,37 +172,37 @@ sclp_tty_timeout(unsigned long data)
 /*
  * Write a string to the sclp tty.
  */
-static void
-sclp_tty_write_string(const unsigned char *str, int count)
+static int sclp_tty_write_string(const unsigned char *str, int count, int may_fail)
 {
         unsigned long flags;
         void *page;
         int written;
+        int overall_written;
         struct sclp_buffer *buf;
 
         if (count <= 0)
-                return;
+                return 0;
+        overall_written = 0;
         spin_lock_irqsave(&sclp_tty_lock, flags);
         do {
                 /* Create a sclp output buffer if none exists yet */
                 if (sclp_ttybuf == NULL) {
                         while (list_empty(&sclp_tty_pages)) {
                                 spin_unlock_irqrestore(&sclp_tty_lock, flags);
-                                if (in_interrupt())
-                                        sclp_sync_wait();
+                                if (may_fail)
+                                        goto out;
                                 else
-                                        wait_event(sclp_tty_waitq,
-                                                !list_empty(&sclp_tty_pages));
+                                        sclp_sync_wait();
                                 spin_lock_irqsave(&sclp_tty_lock, flags);
                         }
                         page = sclp_tty_pages.next;
                         list_del((struct list_head *) page);
-                        sclp_ttybuf = sclp_make_buffer(page,
-                                                       sclp_ioctls.columns,
-                                                       sclp_ioctls.htab);
+                        sclp_ttybuf = sclp_make_buffer(page, sclp_tty_columns,
+                                                       SPACES_PER_TAB);
                 }
                 /* try to write the string to the current output buffer */
                 written = sclp_write(sclp_ttybuf, str, count);
+                overall_written += written;
                 if (written == count)
                         break;
                 /*
@@ -363,27 +219,17 @@ sclp_tty_write_string(const unsigned char *str, int count)
                 count -= written;
         } while (count > 0);
         /* Setup timer to output current console buffer after 1/10 second */
-        if (sclp_ioctls.final_nl) {
-                if (sclp_ttybuf != NULL &&
-                    sclp_chars_in_buffer(sclp_ttybuf) != 0 &&
-                    !timer_pending(&sclp_tty_timer)) {
-                        init_timer(&sclp_tty_timer);
-                        sclp_tty_timer.function = sclp_tty_timeout;
-                        sclp_tty_timer.data = 0UL;
-                        sclp_tty_timer.expires = jiffies + HZ/10;
-                        add_timer(&sclp_tty_timer);
-                }
-        } else {
-                if (sclp_ttybuf != NULL &&
-                    sclp_chars_in_buffer(sclp_ttybuf) != 0) {
-                        buf = sclp_ttybuf;
-                        sclp_ttybuf = NULL;
-                        spin_unlock_irqrestore(&sclp_tty_lock, flags);
-                        __sclp_ttybuf_emit(buf);
-                        spin_lock_irqsave(&sclp_tty_lock, flags);
-                }
+        if (sclp_ttybuf && sclp_chars_in_buffer(sclp_ttybuf) &&
+            !timer_pending(&sclp_tty_timer)) {
+                init_timer(&sclp_tty_timer);
+                sclp_tty_timer.function = sclp_tty_timeout;
+                sclp_tty_timer.data = 0UL;
+                sclp_tty_timer.expires = jiffies + HZ/10;
+                add_timer(&sclp_tty_timer);
         }
         spin_unlock_irqrestore(&sclp_tty_lock, flags);
+out:
+        return overall_written;
 }
 
 /*
@@ -395,11 +241,10 @@ static int
 sclp_tty_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
         if (sclp_tty_chars_count > 0) {
-                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count);
+                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count, 0);
                 sclp_tty_chars_count = 0;
         }
-        sclp_tty_write_string(buf, count);
-        return count;
+        return sclp_tty_write_string(buf, count, 1);
 }
 
 /*
@@ -417,9 +262,10 @@ sclp_tty_put_char(struct tty_struct *tty, unsigned char ch)
 {
         sclp_tty_chars[sclp_tty_chars_count++] = ch;
         if (ch == '\n' || sclp_tty_chars_count >= SCLP_TTY_BUF_SIZE) {
-                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count);
+                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count, 0);
                 sclp_tty_chars_count = 0;
-        } return 1;
+        }
+        return 1;
 }
 
 /*
@@ -430,7 +276,7 @@ static void
 sclp_tty_flush_chars(struct tty_struct *tty)
 {
         if (sclp_tty_chars_count > 0) {
-                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count);
+                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count, 0);
                 sclp_tty_chars_count = 0;
         }
 }
@@ -469,7 +315,7 @@ static void
 sclp_tty_flush_buffer(struct tty_struct *tty)
 {
         if (sclp_tty_chars_count > 0) {
-                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count);
+                sclp_tty_write_string(sclp_tty_chars, sclp_tty_chars_count, 0);
                 sclp_tty_chars_count = 0;
         }
 }
@@ -517,9 +363,7 @@ sclp_tty_input(unsigned char* buf, unsigned int count)
  * modifiy original string,
  * returns length of resulting string
  */
-static int
-sclp_switch_cases(unsigned char *buf, int count,
-                  unsigned char delim, int tolower)
+static int sclp_switch_cases(unsigned char *buf, int count)
 {
         unsigned char *ip, *op;
         int toggle;
@@ -529,9 +373,9 @@ sclp_switch_cases(unsigned char *buf, int count,
         ip = op = buf;
         while (count-- > 0) {
                 /* compare with special character */
-                if (*ip == delim) {
+                if (*ip == CASE_DELIMITER) {
                         /* followed by another special character? */
-                        if (count && ip[1] == delim) {
+                        if (count && ip[1] == CASE_DELIMITER) {
                                 /*
                                  * ... then put a single copy of the special
                                  * character to the output string
@@ -550,7 +394,7 @@ sclp_switch_cases(unsigned char *buf, int count,
                         /* not the special character */
                         if (toggle)
                                 /* but case switching is on */
-                                if (tolower)
+                                if (sclp_tty_tolower)
                                         /* switch to uppercase */
                                         *op++ = _ebc_toupper[(int) *ip++];
                                 else
@@ -570,30 +414,12 @@ sclp_get_input(unsigned char *start, unsigned char *end)
         int count;
 
         count = end - start;
-        /*
-         * if set in ioctl convert EBCDIC to lower case
-         * (modify original input in SCCB)
-         */
-        if (sclp_ioctls.tolower)
+        if (sclp_tty_tolower)
                 EBC_TOLOWER(start, count);
-
-        /*
-         * if set in ioctl find out characters in lower or upper case
-         * (depends on current case) separated by a special character,
-         * works on EBCDIC
-         */
-        if (sclp_ioctls.delim)
-                count = sclp_switch_cases(start, count,
-                                          sclp_ioctls.delim,
-                                          sclp_ioctls.tolower);
-
+        count = sclp_switch_cases(start, count);
         /* convert EBCDIC to ASCII (modify original input in SCCB) */
         sclp_ebcasc_str(start, count);
 
-        /* if set in ioctl write operators input to console  */
-        if (sclp_ioctls.echo)
-                sclp_tty_write(sclp_tty, start, count);
-
         /* transfer input to high level driver */
         sclp_tty_input(start, count);
 }
@@ -717,7 +543,6 @@ static const struct tty_operations sclp_ops = {
         .write_room = sclp_tty_write_room,
         .chars_in_buffer = sclp_tty_chars_in_buffer,
         .flush_buffer = sclp_tty_flush_buffer,
-        .ioctl = sclp_tty_ioctl,
 };
 
 static int __init
@@ -736,9 +561,6 @@ sclp_tty_init(void)
 
         rc = sclp_rw_init();
         if (rc) {
-                printk(KERN_ERR SCLP_TTY_PRINT_HEADER
-                       "could not register tty - "
-                       "sclp_rw_init returned %d\n", rc);
                 put_tty_driver(driver);
                 return rc;
         }
@@ -754,7 +576,6 @@ sclp_tty_init(void)
         }
         INIT_LIST_HEAD(&sclp_tty_outqueue);
         spin_lock_init(&sclp_tty_lock);
-        init_waitqueue_head(&sclp_tty_waitq);
         init_timer(&sclp_tty_timer);
         sclp_ttybuf = NULL;
         sclp_tty_buffer_count = 0;
@@ -763,11 +584,10 @@ sclp_tty_init(void)
                  * save 4 characters for the CPU number
                  * written at start of each line by VM/CP
                  */
-                sclp_ioctls_init.columns = 76;
+                sclp_tty_columns = 76;
                 /* case input lines to lowercase */
-                sclp_ioctls_init.tolower = 1;
+                sclp_tty_tolower = 1;
         }
-        sclp_ioctls = sclp_ioctls_init;
         sclp_tty_chars_count = 0;
         sclp_tty = NULL;
 
@@ -792,9 +612,6 @@ sclp_tty_init(void)
         tty_set_operations(driver, &sclp_ops);
         rc = tty_register_driver(driver);
         if (rc) {
-                printk(KERN_ERR SCLP_TTY_PRINT_HEADER
-                       "could not register tty - "
-                       "tty_register_driver returned %d\n", rc);
                 put_tty_driver(driver);
                 return rc;
         }
diff --git a/drivers/s390/char/sclp_tty.h b/drivers/s390/char/sclp_tty.h
index 0ce2c1fc5340..4b965b22fecd 100644
--- a/drivers/s390/char/sclp_tty.h
+++ b/drivers/s390/char/sclp_tty.h
@@ -11,61 +11,8 @@
 #ifndef __SCLP_TTY_H__
 #define __SCLP_TTY_H__
 
-#include <linux/ioctl.h>
-#include <linux/termios.h>
 #include <linux/tty_driver.h>
 
-/* This is the type of data structures storing sclp ioctl setting. */
-struct sclp_ioctls {
-        unsigned short htab;
-        unsigned char echo;
-        unsigned short columns;
-        unsigned char final_nl;
-        unsigned short max_sccb;
-        unsigned short kmem_sccb;       /* can't be modified at run time */
-        unsigned char tolower;
-        unsigned char delim;
-};
-
-/* must be unique, FIXME: must be added in Documentation/ioctl_number.txt */
-#define SCLP_IOCTL_LETTER 'B'
-
-/* set width of horizontal tabulator */
-#define TIOCSCLPSHTAB   _IOW(SCLP_IOCTL_LETTER, 0, unsigned short)
-/* enable/disable echo of input (independent from line discipline) */
-#define TIOCSCLPSECHO   _IOW(SCLP_IOCTL_LETTER, 1, unsigned char)
-/* set number of colums for output */
-#define TIOCSCLPSCOLS   _IOW(SCLP_IOCTL_LETTER, 2, unsigned short)
-/* enable/disable writing without final new line character */
-#define TIOCSCLPSNL     _IOW(SCLP_IOCTL_LETTER, 4, signed char)
-/* set the maximum buffers size for output, rounded up to next 4kB boundary */
-#define TIOCSCLPSOBUF   _IOW(SCLP_IOCTL_LETTER, 5, unsigned short)
-/* set initial (default) sclp ioctls */
-#define TIOCSCLPSINIT   _IO(SCLP_IOCTL_LETTER, 6)
-/* enable/disable conversion from upper to lower case of input */
-#define TIOCSCLPSCASE   _IOW(SCLP_IOCTL_LETTER, 7, unsigned char)
-/* set special character used for separating upper and lower case, */
-/* 0x00 disables this feature */
-#define TIOCSCLPSDELIM  _IOW(SCLP_IOCTL_LETTER, 9, unsigned char)
-
-/* get width of horizontal tabulator */
-#define TIOCSCLPGHTAB   _IOR(SCLP_IOCTL_LETTER, 10, unsigned short)
-/* Is echo of input enabled ? (independent from line discipline) */
-#define TIOCSCLPGECHO   _IOR(SCLP_IOCTL_LETTER, 11, unsigned char)
-/* get number of colums for output */
-#define TIOCSCLPGCOLS   _IOR(SCLP_IOCTL_LETTER, 12, unsigned short)
-/* Is writing without final new line character enabled ? */
-#define TIOCSCLPGNL     _IOR(SCLP_IOCTL_LETTER, 14, signed char)
-/* get the maximum buffers size for output */
-#define TIOCSCLPGOBUF   _IOR(SCLP_IOCTL_LETTER, 15, unsigned short)
-/* Is conversion from upper to lower case of input enabled ? */
-#define TIOCSCLPGCASE   _IOR(SCLP_IOCTL_LETTER, 17, unsigned char)
-/* get special character used for separating upper and lower case, */
-/* 0x00 disables this feature */
-#define TIOCSCLPGDELIM  _IOR(SCLP_IOCTL_LETTER, 19, unsigned char)
-/* get the number of buffers/pages got from kernel at startup */
-#define TIOCSCLPGKBUF   _IOR(SCLP_IOCTL_LETTER, 20, unsigned short)
-
 extern struct tty_driver *sclp_tty_driver;
 
 #endif  /* __SCLP_TTY_H__ */
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 3e577f655b18..ad51738c4261 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -27,7 +27,6 @@
 #include <asm/uaccess.h>
 #include "sclp.h"
 
-#define SCLP_VT220_PRINT_HEADER         "sclp vt220 tty driver: "
 #define SCLP_VT220_MAJOR                TTY_MAJOR
 #define SCLP_VT220_MINOR                65
 #define SCLP_VT220_DRIVER_NAME          "sclp_vt220"
@@ -82,8 +81,8 @@ static struct sclp_vt220_request *sclp_vt220_current_request;
 /* Number of characters in current request buffer */
 static int sclp_vt220_buffered_chars;
 
-/* Flag indicating whether this driver has already been initialized */
-static int sclp_vt220_initialized = 0;
+/* Counter controlling core driver initialization. */
+static int __initdata sclp_vt220_init_count;
 
 /* Flag indicating that sclp_vt220_current_request should really
  * have been already queued but wasn't because the SCLP was processing
@@ -609,10 +608,8 @@ sclp_vt220_flush_buffer(struct tty_struct *tty)
         sclp_vt220_emit_current();
 }
 
-/*
- * Initialize all relevant components and register driver with system.
- */
-static void __init __sclp_vt220_cleanup(void)
+/* Release allocated pages. */
+static void __init __sclp_vt220_free_pages(void)
 {
         struct list_head *page, *p;
 
@@ -623,21 +620,30 @@ static void __init __sclp_vt220_cleanup(void)
                 else
                         free_bootmem((unsigned long) page, PAGE_SIZE);
         }
-        if (!list_empty(&sclp_vt220_register.list))
-                sclp_unregister(&sclp_vt220_register);
-        sclp_vt220_initialized = 0;
 }
 
-static int __init __sclp_vt220_init(void)
+/* Release memory and unregister from sclp core. Controlled by init counting -
+ * only the last invoker will actually perform these actions. */
+static void __init __sclp_vt220_cleanup(void)
+{
+        sclp_vt220_init_count--;
+        if (sclp_vt220_init_count != 0)
+                return;
+        sclp_unregister(&sclp_vt220_register);
+        __sclp_vt220_free_pages();
+}
+
+/* Allocate buffer pages and register with sclp core. Controlled by init
+ * counting - only the first invoker will actually perform these actions. */
+static int __init __sclp_vt220_init(int num_pages)
 {
         void *page;
         int i;
-        int num_pages;
         int rc;
 
-        if (sclp_vt220_initialized)
+        sclp_vt220_init_count++;
+        if (sclp_vt220_init_count != 1)
                 return 0;
-        sclp_vt220_initialized = 1;
         spin_lock_init(&sclp_vt220_lock);
         INIT_LIST_HEAD(&sclp_vt220_empty);
         INIT_LIST_HEAD(&sclp_vt220_outqueue);
@@ -649,24 +655,22 @@ static int __init __sclp_vt220_init(void)
         sclp_vt220_flush_later = 0;
 
         /* Allocate pages for output buffering */
-        num_pages = slab_is_available() ? MAX_KMEM_PAGES : MAX_CONSOLE_PAGES;
         for (i = 0; i < num_pages; i++) {
                 if (slab_is_available())
                         page = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
                 else
                         page = alloc_bootmem_low_pages(PAGE_SIZE);
                 if (!page) {
-                        __sclp_vt220_cleanup();
-                        return -ENOMEM;
+                        rc = -ENOMEM;
+                        goto out;
                 }
                 list_add_tail((struct list_head *) page, &sclp_vt220_empty);
         }
         rc = sclp_register(&sclp_vt220_register);
+out:
         if (rc) {
-                printk(KERN_ERR SCLP_VT220_PRINT_HEADER
-                       "could not register vt220 - "
-                       "sclp_register returned %d\n", rc);
-                __sclp_vt220_cleanup();
+                __sclp_vt220_free_pages();
+                sclp_vt220_init_count--;
         }
         return rc;
 }
@@ -689,15 +693,13 @@ static int __init sclp_vt220_tty_init(void)
 {
         struct tty_driver *driver;
         int rc;
-        int cleanup;
 
         /* Note: we're not testing for CONSOLE_IS_SCLP here to preserve
          * symmetry between VM and LPAR systems regarding ttyS1. */
         driver = alloc_tty_driver(1);
         if (!driver)
                 return -ENOMEM;
-        cleanup = !sclp_vt220_initialized;
-        rc = __sclp_vt220_init();
+        rc = __sclp_vt220_init(MAX_KMEM_PAGES);
         if (rc)
                 goto out_driver;
 
@@ -713,18 +715,13 @@ static int __init sclp_vt220_tty_init(void)
         tty_set_operations(driver, &sclp_vt220_ops);
 
         rc = tty_register_driver(driver);
-        if (rc) {
-                printk(KERN_ERR SCLP_VT220_PRINT_HEADER
-                       "could not register tty - "
-                       "tty_register_driver returned %d\n", rc);
+        if (rc)
                 goto out_init;
-        }
         sclp_vt220_driver = driver;
         return 0;
 
 out_init:
-        if (cleanup)
-                __sclp_vt220_cleanup();
+        __sclp_vt220_cleanup();
 out_driver:
         put_tty_driver(driver);
         return rc;
@@ -773,10 +770,9 @@ sclp_vt220_con_init(void)
 {
         int rc;
 
-        INIT_LIST_HEAD(&sclp_vt220_register.list);
         if (!CONSOLE_IS_SCLP)
                 return 0;
-        rc = __sclp_vt220_init();
+        rc = __sclp_vt220_init(MAX_CONSOLE_PAGES);
         if (rc)
                 return rc;
         /* Attach linux console */
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 874adf365e46..22ca34361ed7 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -196,7 +196,7 @@ tape_34xx_erp_retry(struct tape_request *request)
 static int
 tape_34xx_unsolicited_irq(struct tape_device *device, struct irb *irb)
 {
-        if (irb->scsw.dstat == 0x85 /* READY */) {
+        if (irb->scsw.cmd.dstat == 0x85) { /* READY */
                 /* A medium was inserted in the drive. */
                 DBF_EVENT(6, "xuud med\n");
                 tape_34xx_delete_sbid_from(device, 0);
@@ -844,22 +844,22 @@ tape_34xx_irq(struct tape_device *device, struct tape_request *request,
         if (request == NULL)
                 return tape_34xx_unsolicited_irq(device, irb);
 
-        if ((irb->scsw.dstat & DEV_STAT_UNIT_EXCEP) &&
-            (irb->scsw.dstat & DEV_STAT_DEV_END) &&
+        if ((irb->scsw.cmd.dstat & DEV_STAT_UNIT_EXCEP) &&
+            (irb->scsw.cmd.dstat & DEV_STAT_DEV_END) &&
             (request->op == TO_WRI)) {
                 /* Write at end of volume */
                 PRINT_INFO("End of volume\n"); /* XXX */
                 return tape_34xx_erp_failed(request, -ENOSPC);
         }
 
-        if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK)
+        if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)
                 return tape_34xx_unit_check(device, request, irb);
 
-        if (irb->scsw.dstat & DEV_STAT_DEV_END) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_DEV_END) {
                 /*
                  * A unit exception occurs on skipping over a tapemark block.
                  */
-                if (irb->scsw.dstat & DEV_STAT_UNIT_EXCEP) {
+                if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_EXCEP) {
                         if (request->op == TO_BSB || request->op == TO_FSB)
                                 request->rescnt++;
                         else
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 42ce7915fc5d..839987618ffd 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -837,13 +837,13 @@ tape_3590_erp_retry(struct tape_device *device, struct tape_request *request,
 static int
 tape_3590_unsolicited_irq(struct tape_device *device, struct irb *irb)
 {
-        if (irb->scsw.dstat == DEV_STAT_CHN_END)
+        if (irb->scsw.cmd.dstat == DEV_STAT_CHN_END)
                 /* Probably result of halt ssch */
                 return TAPE_IO_PENDING;
-        else if (irb->scsw.dstat == 0x85)
+        else if (irb->scsw.cmd.dstat == 0x85)
                 /* Device Ready */
                 DBF_EVENT(3, "unsol.irq! tape ready: %08x\n", device->cdev_id);
-        else if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
+        else if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION) {
                 tape_3590_schedule_work(device, TO_READ_ATTMSG);
         } else {
                 DBF_EVENT(3, "unsol.irq! dev end: %08x\n", device->cdev_id);
@@ -1515,18 +1515,19 @@ tape_3590_irq(struct tape_device *device, struct tape_request *request,
         if (request == NULL)
                 return tape_3590_unsolicited_irq(device, irb);
 
-        if ((irb->scsw.dstat & DEV_STAT_UNIT_EXCEP) &&
-            (irb->scsw.dstat & DEV_STAT_DEV_END) && (request->op == TO_WRI)) {
+        if ((irb->scsw.cmd.dstat & DEV_STAT_UNIT_EXCEP) &&
+            (irb->scsw.cmd.dstat & DEV_STAT_DEV_END) &&
+            (request->op == TO_WRI)) {
                 /* Write at end of volume */
                 DBF_EVENT(2, "End of volume\n");
                 return tape_3590_erp_failed(device, request, irb, -ENOSPC);
         }
 
-        if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK)
+        if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)
                 return tape_3590_unit_check(device, request, irb);
 
-        if (irb->scsw.dstat & DEV_STAT_DEV_END) {
-                if (irb->scsw.dstat == DEV_STAT_UNIT_EXCEP) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_DEV_END) {
+                if (irb->scsw.cmd.dstat == DEV_STAT_UNIT_EXCEP) {
                         if (request->op == TO_FSB || request->op == TO_BSB)
                                 request->rescnt++;
                         else
@@ -1536,12 +1537,12 @@ tape_3590_irq(struct tape_device *device, struct tape_request *request,
                 return tape_3590_done(device, request);
         }
 
-        if (irb->scsw.dstat & DEV_STAT_CHN_END) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) {
                 DBF_EVENT(2, "cannel end\n");
                 return TAPE_IO_PENDING;
         }
 
-        if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION) {
                 DBF_EVENT(2, "Unit Attention when busy..\n");
                 return TAPE_IO_PENDING;
         }
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index ebe84067bae9..687720b552d1 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/mtio.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -289,21 +290,26 @@ tapechar_open (struct inode *inode, struct file *filp)
         if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
                 return -ENODEV;
 
+        lock_kernel();
         minor = iminor(filp->f_path.dentry->d_inode);
         device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
         if (IS_ERR(device)) {
                 DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n");
-                return PTR_ERR(device);
+                rc = PTR_ERR(device);
+                goto out;
         }
 
 
         rc = tape_open(device);
         if (rc == 0) {
                 filp->private_data = device;
-                return nonseekable_open(inode, filp);
+                rc = nonseekable_open(inode, filp);
         }
-        tape_put_device(device);
+        else
+                tape_put_device(device);
 
+out:
+        unlock_kernel();
         return rc;
 }
 
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index c20e3c548343..181a5441af16 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -839,7 +839,7 @@ tape_dump_sense(struct tape_device* device, struct tape_request *request,
 
         PRINT_INFO("-------------------------------------------------\n");
         PRINT_INFO("DSTAT : %02x  CSTAT: %02x   CPA: %04x\n",
-                   irb->scsw.dstat, irb->scsw.cstat, irb->scsw.cpa);
+                   irb->scsw.cmd.dstat, irb->scsw.cmd.cstat, irb->scsw.cmd.cpa);
         PRINT_INFO("DEVICE: %s\n", device->cdev->dev.bus_id);
         if (request != NULL)
                 PRINT_INFO("OP    : %s\n", tape_op_verbose[request->op]);
@@ -867,7 +867,7 @@ tape_dump_sense_dbf(struct tape_device *device, struct tape_request *request,
         else
                 op = "---";
         DBF_EVENT(3, "DSTAT : %02x   CSTAT: %02x\n",
-                  irb->scsw.dstat,irb->scsw.cstat);
+                  irb->scsw.cmd.dstat, irb->scsw.cmd.cstat);
         DBF_EVENT(3, "DEVICE: %08x OP\t: %s\n", device->cdev_id, op);
         sptr = (unsigned int *) irb->ecw;
         DBF_EVENT(3, "%08x %08x\n", sptr[0], sptr[1]);
@@ -1083,10 +1083,11 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
          * error might still apply. So we just schedule the request to be
          * started later.
          */
-        if (irb->scsw.cc != 0 && (irb->scsw.fctl & SCSW_FCTL_START_FUNC) &&
+        if (irb->scsw.cmd.cc != 0 &&
+            (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
             (request->status == TAPE_REQUEST_IN_IO)) {
                 DBF_EVENT(3,"(%08x): deferred cc=%i, fctl=%i. restarting\n",
-                        device->cdev_id, irb->scsw.cc, irb->scsw.fctl);
+                        device->cdev_id, irb->scsw.cmd.cc, irb->scsw.cmd.fctl);
                 request->status = TAPE_REQUEST_QUEUED;
                 schedule_delayed_work(&device->tape_dnr, HZ);
                 return;
@@ -1094,8 +1095,8 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
         /* May be an unsolicited irq */
         if(request != NULL)
-                request->rescnt = irb->scsw.count;
-        else if ((irb->scsw.dstat == 0x85 || irb->scsw.dstat == 0x80) &&
+                request->rescnt = irb->scsw.cmd.count;
+        else if ((irb->scsw.cmd.dstat == 0x85 || irb->scsw.cmd.dstat == 0x80) &&
                  !list_empty(&device->req_queue)) {
                 /* Not Ready to Ready after long busy ? */
                 struct tape_request *req;
@@ -1111,7 +1112,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                         return;
                 }
         }
-        if (irb->scsw.dstat != 0x0c) {
+        if (irb->scsw.cmd.dstat != 0x0c) {
                 /* Set the 'ONLINE' flag depending on sense byte 1 */
                 if(*(((__u8 *) irb->ecw) + 1) & SENSE_DRIVE_ONLINE)
                         device->tape_generic_status |= GMT_ONLINE(~0);
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 5043150019ac..a7fe6302c982 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -663,7 +663,7 @@ static int
 tty3270_irq(struct tty3270 *tp, struct raw3270_request *rq, struct irb *irb)
 {
         /* Handle ATTN. Schedule tasklet to read aid. */
-        if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION) {
                 if (!tp->throttle)
                         tty3270_issue_read(tp, 0);
                 else
@@ -671,11 +671,11 @@ tty3270_irq(struct tty3270 *tp, struct raw3270_request *rq, struct irb *irb)
         }
 
         if (rq) {
-                if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK)
+                if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)
                         rq->rc = -EIO;
                 else
                         /* Normal end. Copy residual count. */
-                        rq->rescnt = irb->scsw.count;
+                        rq->rescnt = irb->scsw.cmd.count;
         }
         return RAW3270_IO_DONE;
 }
@@ -1792,15 +1792,12 @@ static int __init tty3270_init(void)
         tty_set_operations(driver, &tty3270_ops);
         ret = tty_register_driver(driver);
         if (ret) {
-                printk(KERN_ERR "tty3270 registration failed with %d\n", ret);
                 put_tty_driver(driver);
                 return ret;
         }
         tty3270_driver = driver;
         ret = raw3270_register_notifier(tty3270_notifier);
         if (ret) {
-                printk(KERN_ERR "tty3270 notifier registration failed "
-                       "with %d\n", ret);
                 put_tty_driver(driver);
                 return ret;
 
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 2f419b0ea628..09e7d9bf438b 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
+#include <linux/smp_lock.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
 #include <asm/uaccess.h>
@@ -39,11 +40,14 @@ static int vmcp_open(struct inode *inode, struct file *file)
         session = kmalloc(sizeof(*session), GFP_KERNEL);
         if (!session)
                 return -ENOMEM;
+
+        lock_kernel();
         session->bufsize = PAGE_SIZE;
         session->response = NULL;
         session->resp_size = 0;
         mutex_init(&session->mutex);
         file->private_data = session;
+        unlock_kernel();
         return nonseekable_open(inode, file);
 }
 
@@ -61,30 +65,24 @@ static int vmcp_release(struct inode *inode, struct file *file)
 static ssize_t
 vmcp_read(struct file *file, char __user *buff, size_t count, loff_t *ppos)
 {
-        size_t tocopy;
+        ssize_t ret;
+        size_t size;
         struct vmcp_session *session;
 
-        session = (struct vmcp_session *)file->private_data;
+        session = file->private_data;
         if (mutex_lock_interruptible(&session->mutex))
                 return -ERESTARTSYS;
         if (!session->response) {
                 mutex_unlock(&session->mutex);
                 return 0;
         }
-        if (*ppos > session->resp_size) {
-                mutex_unlock(&session->mutex);
-                return 0;
-        }
-        tocopy = min(session->resp_size - (size_t) (*ppos), count);
-        tocopy = min(tocopy, session->bufsize - (size_t) (*ppos));
+        size = min_t(size_t, session->resp_size, session->bufsize);
+        ret = simple_read_from_buffer(buff, count, ppos,
+                                        session->response, size);
 
-        if (copy_to_user(buff, session->response + (*ppos), tocopy)) {
-                mutex_unlock(&session->mutex);
-                return -EFAULT;
-        }
         mutex_unlock(&session->mutex);
-        *ppos += tocopy;
-        return tocopy;
+
+        return ret;
 }
 
 static ssize_t
@@ -198,27 +196,23 @@ static int __init vmcp_init(void)
                 PRINT_WARN("z/VM CP interface is only available under z/VM\n");
                 return -ENODEV;
         }
+
         vmcp_debug = debug_register("vmcp", 1, 1, 240);
-        if (!vmcp_debug) {
-                PRINT_ERR("z/VM CP interface not loaded. Could not register "
-                           "debug feature\n");
+        if (!vmcp_debug)
                 return -ENOMEM;
-        }
+
         ret = debug_register_view(vmcp_debug, &debug_hex_ascii_view);
         if (ret) {
-                PRINT_ERR("z/VM CP interface not loaded. Could not register "
-                          "debug feature view. Error code: %d\n", ret);
                 debug_unregister(vmcp_debug);
                 return ret;
         }
+
         ret = misc_register(&vmcp_dev);
         if (ret) {
-                PRINT_ERR("z/VM CP interface not loaded. Could not register "
-                           "misc device. Error code: %d\n", ret);
                 debug_unregister(vmcp_debug);
                 return ret;
         }
-        PRINT_INFO("z/VM CP interface loaded\n");
+
         return 0;
 }
 
@@ -226,7 +220,6 @@ static void __exit vmcp_exit(void)
 {
         misc_deregister(&vmcp_dev);
         debug_unregister(vmcp_debug);
-        PRINT_INFO("z/VM CP interface unloaded.\n");
 }
 
 module_init(vmcp_init);
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 2c2428cc05d8..c31faefa2b3b 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -25,6 +25,7 @@
 #include <linux/kmod.h>
 #include <linux/cdev.h>
 #include <linux/device.h>
+#include <linux/smp_lock.h>
 #include <linux/string.h>
 
 
@@ -216,9 +217,7 @@ static int vmlogrdr_get_recording_class_AB(void)
         char *tail;
         int len,i;
 
-        printk (KERN_DEBUG "vmlogrdr: query command: %s\n", cp_command);
         cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
-        printk (KERN_DEBUG "vmlogrdr: response: %s", cp_response);
         len = strnlen(cp_response,sizeof(cp_response));
         // now the parsing
         tail=strnchr(cp_response,len,'=');
@@ -268,11 +267,7 @@ static int vmlogrdr_recording(struct vmlogrdr_priv_t * logptr,
                          logptr->recording_name,
                          qid_string);
 
-                printk (KERN_DEBUG "vmlogrdr: recording command: %s\n",
-                        cp_command);
                 cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
-                printk (KERN_DEBUG "vmlogrdr: recording response: %s",
-                        cp_response);
         }
 
         memset(cp_command, 0x00, sizeof(cp_command));
@@ -282,10 +277,7 @@ static int vmlogrdr_recording(struct vmlogrdr_priv_t * logptr,
                 onoff,
                 qid_string);
 
-        printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
         cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
-        printk (KERN_DEBUG "vmlogrdr: recording response: %s",
-                cp_response);
         /* The recording command will usually answer with 'Command complete'
          * on success, but when the specific service was never connected
          * before then there might be an additional informational message
@@ -319,9 +311,11 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
                 return -ENOSYS;
 
         /* Besure this device hasn't already been opened */
+        lock_kernel();
         spin_lock_bh(&logptr->priv_lock);
         if (logptr->dev_in_use) {
                 spin_unlock_bh(&logptr->priv_lock);
+                unlock_kernel();
                 return -EBUSY;
         }
         logptr->dev_in_use = 1;
@@ -365,7 +359,9 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
                    || (logptr->iucv_path_severed));
         if (logptr->iucv_path_severed)
                 goto out_record;
-        return nonseekable_open(inode, filp);
+        ret = nonseekable_open(inode, filp);
+        unlock_kernel();
+        return ret;
 
 out_record:
         if (logptr->autorecording)
@@ -375,6 +371,7 @@ out_path:
         logptr->path = NULL;
 out_dev:
         logptr->dev_in_use = 0;
+        unlock_kernel();
         return -EIO;
 }
 
@@ -567,10 +564,7 @@ static ssize_t vmlogrdr_purge_store(struct device * dev,
                          "RECORDING %s PURGE ",
                          priv->recording_name);
 
-        printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
         cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
-        printk (KERN_DEBUG "vmlogrdr: recording response: %s",
-                cp_response);
 
         return count;
 }
@@ -682,28 +676,20 @@ static int vmlogrdr_register_driver(void)
 
         /* Register with iucv driver */
         ret = iucv_register(&vmlogrdr_iucv_handler, 1);
-        if (ret) {
-                printk (KERN_ERR "vmlogrdr: failed to register with "
-                        "iucv driver\n");
+        if (ret)
                 goto out;
-        }
 
         ret = driver_register(&vmlogrdr_driver);
-        if (ret) {
-                printk(KERN_ERR "vmlogrdr: failed to register driver.\n");
+        if (ret)
                 goto out_iucv;
-        }
 
         ret = driver_create_file(&vmlogrdr_driver,
                                  &driver_attr_recording_status);
-        if (ret) {
-                printk(KERN_ERR "vmlogrdr: failed to add driver attribute.\n");
+        if (ret)
                 goto out_driver;
-        }
 
         vmlogrdr_class = class_create(THIS_MODULE, "vmlogrdr");
         if (IS_ERR(vmlogrdr_class)) {
-                printk(KERN_ERR "vmlogrdr: failed to create class.\n");
                 ret = PTR_ERR(vmlogrdr_class);
                 vmlogrdr_class = NULL;
                 goto out_attr;
@@ -871,12 +857,10 @@ static int __init vmlogrdr_init(void)
         rc = vmlogrdr_register_cdev(dev);
         if (rc)
                 goto cleanup;
-        printk (KERN_INFO "vmlogrdr: driver loaded\n");
         return 0;
 
 cleanup:
         vmlogrdr_cleanup();
-        printk (KERN_ERR "vmlogrdr: driver not loaded.\n");
         return rc;
 }
 
@@ -884,7 +868,6 @@ cleanup:
 static void __exit vmlogrdr_exit(void)
 {
         vmlogrdr_cleanup();
-        printk (KERN_INFO "vmlogrdr: driver unloaded\n");
         return;
 }
 
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 83ae9a852f00..0a9f1cccbe58 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/cdev.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/cio.h>
@@ -277,7 +278,8 @@ static void ur_int_handler(struct ccw_device *cdev, unsigned long intparm,
         struct urdev *urd;
 
         TRACE("ur_int_handler: intparm=0x%lx cstat=%02x dstat=%02x res=%u\n",
-              intparm, irb->scsw.cstat, irb->scsw.dstat, irb->scsw.count);
+              intparm, irb->scsw.cmd.cstat, irb->scsw.cmd.dstat,
+              irb->scsw.cmd.count);
 
         if (!intparm) {
                 TRACE("ur_int_handler: unsolicited interrupt\n");
@@ -288,7 +290,7 @@ static void ur_int_handler(struct ccw_device *cdev, unsigned long intparm,
         /* On special conditions irb is an error pointer */
         if (IS_ERR(irb))
                 urd->io_request_rc = PTR_ERR(irb);
-        else if (irb->scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END))
+        else if (irb->scsw.cmd.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END))
                 urd->io_request_rc = 0;
         else
                 urd->io_request_rc = -EIO;
@@ -668,7 +670,7 @@ static int ur_open(struct inode *inode, struct file *file)
 
         if (accmode == O_RDWR)
                 return -EACCES;
-
+        lock_kernel();
         /*
          * We treat the minor number as the devno of the ur device
          * to find in the driver tree.
@@ -676,8 +678,10 @@ static int ur_open(struct inode *inode, struct file *file)
         devno = MINOR(file->f_dentry->d_inode->i_rdev);
 
         urd = urdev_get_from_devno(devno);
-        if (!urd)
-                return -ENXIO;
+        if (!urd) {
+                rc = -ENXIO;
+                goto out;
+        }
 
         spin_lock(&urd->open_lock);
         while (urd->open_flag) {
@@ -720,6 +724,7 @@ static int ur_open(struct inode *inode, struct file *file)
                 goto fail_urfile_free;
         urf->file_reclen = rc;
         file->private_data = urf;
+        unlock_kernel();
         return 0;
 
 fail_urfile_free:
@@ -730,6 +735,8 @@ fail_unlock:
         spin_unlock(&urd->open_lock);
 fail_put:
         urdev_put(urd);
+out:
+        unlock_kernel();
         return rc;
 }
 
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 19f8389291b6..21a2a829bf4e 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/watchdog.h>
+#include <linux/smp_lock.h>
 
 #include <asm/ebcdic.h>
 #include <asm/io.h>
@@ -92,23 +93,15 @@ static int vmwdt_keepalive(void)
 
         func = vmwdt_conceal ? (wdt_init | wdt_conceal) : wdt_init;
         ret = __diag288(func, vmwdt_interval, ebc_cmd, len);
+        WARN_ON(ret != 0);
         kfree(ebc_cmd);
-
-        if (ret) {
-                printk(KERN_WARNING "%s: problem setting interval %d, "
-                        "cmd %s\n", __func__, vmwdt_interval,
-                        vmwdt_cmd);
-        }
         return ret;
 }
 
 static int vmwdt_disable(void)
 {
         int ret = __diag288(wdt_cancel, 0, "", 0);
-        if (ret) {
-                printk(KERN_WARNING "%s: problem disabling watchdog\n",
-                        __func__);
-        }
+        WARN_ON(ret != 0);
         return ret;
 }
 
@@ -121,21 +114,23 @@ static int __init vmwdt_probe(void)
         static char __initdata ebc_begin[] = {
                 194, 197, 199, 201, 213
         };
-        if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0) {
-                printk(KERN_INFO "z/VM watchdog not available\n");
+        if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0)
                 return -EINVAL;
-        }
         return vmwdt_disable();
 }
 
 static int vmwdt_open(struct inode *i, struct file *f)
 {
         int ret;
-        if (test_and_set_bit(0, &vmwdt_is_open))
+        lock_kernel();
+        if (test_and_set_bit(0, &vmwdt_is_open)) {
+                unlock_kernel();
                 return -EBUSY;
+        }
         ret = vmwdt_keepalive();
         if (ret)
                 clear_bit(0, &vmwdt_is_open);
+        unlock_kernel();
         return ret ? ret : nonseekable_open(i, f);
 }
 
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index bbbd14e9d48f..047dd92ae804 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -223,12 +223,10 @@ static int __init init_cpu_info(enum arch_id arch)
         /* get info for boot cpu from lowcore, stored in the HSA */
 
         sa = kmalloc(sizeof(*sa), GFP_KERNEL);
-        if (!sa) {
-                ERROR_MSG("kmalloc failed: %s: %i\n",__func__, __LINE__);
+        if (!sa)
                 return -ENOMEM;
-        }
         if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) {
-                ERROR_MSG("could not copy from HSA\n");
+                TRACE("could not copy from HSA\n");
                 kfree(sa);
                 return -EIO;
         }
@@ -511,6 +509,8 @@ static void __init set_s390x_lc_mask(union save_area *map)
  */
 static int __init sys_info_init(enum arch_id arch)
 {
+        int rc;
+
         switch (arch) {
         case ARCH_S390X:
                 MSG("DETECTED 'S390X (64 bit) OS'\n");
@@ -529,10 +529,9 @@ static int __init sys_info_init(enum arch_id arch)
                 return -EINVAL;
         }
         sys_info.arch = arch;
-        if (init_cpu_info(arch)) {
-                ERROR_MSG("get cpu info failed\n");
-                return -ENOMEM;
-        }
+        rc = init_cpu_info(arch);
+        if (rc)
+                return rc;
         sys_info.mem_size = real_memory_size;
 
         return 0;
@@ -544,12 +543,12 @@ static int __init check_sdias(void)
 
         rc = sclp_sdias_blk_count();
         if (rc < 0) {
-                ERROR_MSG("Could not determine HSA size\n");
+                TRACE("Could not determine HSA size\n");
                 return rc;
         }
         act_hsa_size = (rc - 1) * PAGE_SIZE;
         if (act_hsa_size < ZFCPDUMP_HSA_SIZE) {
-                ERROR_MSG("HSA size too small: %i\n", act_hsa_size);
+                TRACE("HSA size too small: %i\n", act_hsa_size);
                 return -EINVAL;
         }
         return 0;
@@ -590,16 +589,12 @@ static int __init zcore_init(void)
                 goto fail;
 
         rc = check_sdias();
-        if (rc) {
-                ERROR_MSG("Dump initialization failed\n");
+        if (rc)
                 goto fail;
-        }
 
         rc = memcpy_hsa_kernel(&arch, __LC_AR_MODE_ID, 1);
-        if (rc) {
-                ERROR_MSG("sdial memcpy for arch id failed\n");
+        if (rc)
                 goto fail;
-        }
 
 #ifndef __s390x__
         if (arch == ARCH_S390X) {
@@ -610,10 +605,8 @@ static int __init zcore_init(void)
 #endif
 
         rc = sys_info_init(arch);
-        if (rc) {
-                ERROR_MSG("arch init failed\n");
+        if (rc)
                 goto fail;
-        }
 
         zcore_header_init(arch, &zcore_header);
 
diff --git a/drivers/s390/cio/Makefile b/drivers/s390/cio/Makefile
index cfaf77b320f5..91e9e3f3073a 100644
--- a/drivers/s390/cio/Makefile
+++ b/drivers/s390/cio/Makefile
@@ -2,9 +2,11 @@
 # Makefile for the S/390 common i/o drivers
 #
 
-obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o
+obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o scsw.o \
+        fcx.o itcw.o
 ccw_device-objs += device.o device_fsm.o device_ops.o
 ccw_device-objs += device_id.o device_pgid.o device_status.o
 obj-y += ccw_device.o cmf.o
+obj-$(CONFIG_CHSC_SCH) += chsc_sch.o
 obj-$(CONFIG_CCWGROUP) += ccwgroup.o
 obj-$(CONFIG_QDIO) += qdio.o
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index b7a07a866291..fe6cea15bbaf 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -15,6 +15,7 @@
 #include <linux/rcupdate.h>
 
 #include <asm/airq.h>
+#include <asm/isc.h>
 
 #include "cio.h"
 #include "cio_debug.h"
@@ -33,15 +34,15 @@ struct airq_t {
         void *drv_data;
 };
 
-static union indicator_t indicators;
-static struct airq_t *airqs[NR_AIRQS];
+static union indicator_t indicators[MAX_ISC];
+static struct airq_t *airqs[MAX_ISC][NR_AIRQS];
 
-static int register_airq(struct airq_t *airq)
+static int register_airq(struct airq_t *airq, u8 isc)
 {
         int i;
 
         for (i = 0; i < NR_AIRQS; i++)
-                if (!cmpxchg(&airqs[i], NULL, airq))
+                if (!cmpxchg(&airqs[isc][i], NULL, airq))
                         return i;
         return -ENOMEM;
 }
@@ -50,18 +51,21 @@ static int register_airq(struct airq_t *airq)
  * s390_register_adapter_interrupt() - register adapter interrupt handler
  * @handler: adapter handler to be registered
  * @drv_data: driver data passed with each call to the handler
+ * @isc: isc for which the handler should be called
  *
  * Returns:
  *  Pointer to the indicator to be used on success
  *  ERR_PTR() if registration failed
  */
 void *s390_register_adapter_interrupt(adapter_int_handler_t handler,
-                                      void *drv_data)
+                                      void *drv_data, u8 isc)
 {
         struct airq_t *airq;
         char dbf_txt[16];
         int ret;
 
+        if (isc > MAX_ISC)
+                return ERR_PTR(-EINVAL);
         airq = kmalloc(sizeof(struct airq_t), GFP_KERNEL);
         if (!airq) {
                 ret = -ENOMEM;
@@ -69,34 +73,35 @@ void *s390_register_adapter_interrupt(adapter_int_handler_t handler,
         }
         airq->handler = handler;
         airq->drv_data = drv_data;
-        ret = register_airq(airq);
-        if (ret < 0)
-                kfree(airq);
+
+        ret = register_airq(airq, isc);
 out:
         snprintf(dbf_txt, sizeof(dbf_txt), "rairq:%d", ret);
         CIO_TRACE_EVENT(4, dbf_txt);
-        if (ret < 0)
+        if (ret < 0) {
+                kfree(airq);
                 return ERR_PTR(ret);
-        else
-                return &indicators.byte[ret];
+        } else
+                return &indicators[isc].byte[ret];
 }
 EXPORT_SYMBOL(s390_register_adapter_interrupt);
 
 /**
  * s390_unregister_adapter_interrupt - unregister adapter interrupt handler
  * @ind: indicator for which the handler is to be unregistered
+ * @isc: interruption subclass
  */
-void s390_unregister_adapter_interrupt(void *ind)
+void s390_unregister_adapter_interrupt(void *ind, u8 isc)
 {
         struct airq_t *airq;
         char dbf_txt[16];
         int i;
 
-        i = (int) ((addr_t) ind) - ((addr_t) &indicators.byte[0]);
+        i = (int) ((addr_t) ind) - ((addr_t) &indicators[isc].byte[0]);
         snprintf(dbf_txt, sizeof(dbf_txt), "urairq:%d", i);
         CIO_TRACE_EVENT(4, dbf_txt);
-        indicators.byte[i] = 0;
-        airq = xchg(&airqs[i], NULL);
+        indicators[isc].byte[i] = 0;
+        airq = xchg(&airqs[isc][i], NULL);
         /*
          * Allow interrupts to complete. This will ensure that the airq handle
          * is no longer referenced by any interrupt handler.
@@ -108,7 +113,7 @@ EXPORT_SYMBOL(s390_unregister_adapter_interrupt);
 
 #define INDICATOR_MASK  (0xffUL << ((NR_AIRQS_PER_WORD - 1) * 8))
 
-void do_adapter_IO(void)
+void do_adapter_IO(u8 isc)
 {
         int w;
         int i;
@@ -120,22 +125,22 @@ void do_adapter_IO(void)
          * fetch operations.
          */
         for (w = 0; w < NR_AIRQ_WORDS; w++) {
-                word = indicators.word[w];
+                word = indicators[isc].word[w];
                 i = w * NR_AIRQS_PER_WORD;
                 /*
                  * Check bytes within word for active indicators.
                  */
                 while (word) {
                         if (word & INDICATOR_MASK) {
-                                airq = airqs[i];
+                                airq = airqs[isc][i];
                                 if (likely(airq))
-                                        airq->handler(&indicators.byte[i],
+                                        airq->handler(&indicators[isc].byte[i],
                                                       airq->drv_data);
                                 else
                                         /*
                                          * Reset ill-behaved indicator.
                                          */
-                                        indicators.byte[i] = 0;
+                                        indicators[isc].byte[i] = 0;
                         }
                         word <<= 8;
                         i++;
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 297cdceb0ca4..db00b0591733 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -18,6 +18,7 @@
 #include <asm/chpid.h>
 #include <asm/sclp.h>
 
+#include "../s390mach.h"
 #include "cio.h"
 #include "css.h"
 #include "ioasm.h"
@@ -94,6 +95,7 @@ u8 chp_get_sch_opm(struct subchannel *sch)
         }
         return opm;
 }
+EXPORT_SYMBOL_GPL(chp_get_sch_opm);
 
 /**
  * chp_is_registered - check if a channel-path is registered
@@ -121,11 +123,8 @@ static int s390_vary_chpid(struct chp_id chpid, int on)
         CIO_TRACE_EVENT(2, dbf_text);
 
         status = chp_get_status(chpid);
-        if (!on && !status) {
-                printk(KERN_ERR "cio: chpid %x.%02x is already offline\n",
-                       chpid.cssid, chpid.id);
-                return -EINVAL;
-        }
+        if (!on && !status)
+                return 0;
 
         set_chp_logically_online(chpid, on);
         chsc_chp_vary(chpid, on);
@@ -141,21 +140,14 @@ static ssize_t chp_measurement_chars_read(struct kobject *kobj,
 {
         struct channel_path *chp;
         struct device *device;
-        unsigned int size;
 
         device = container_of(kobj, struct device, kobj);
         chp = to_channelpath(device);
         if (!chp->cmg_chars)
                 return 0;
 
-        size = sizeof(struct cmg_chars);
-
-        if (off > size)
-                return 0;
-        if (off + count > size)
-                count = size - off;
-        memcpy(buf, chp->cmg_chars + off, count);
-        return count;
+        return memory_read_from_buffer(buf, count, &off,
+                                chp->cmg_chars, sizeof(struct cmg_chars));
 }
 
 static struct bin_attribute chp_measurement_chars_attr = {
@@ -405,7 +397,7 @@ int chp_new(struct chp_id chpid)
                  chpid.id);
 
         /* Obtain channel path description and fill it in. */
-        ret = chsc_determine_channel_path_description(chpid, &chp->desc);
+        ret = chsc_determine_base_channel_path_desc(chpid, &chp->desc);
         if (ret)
                 goto out_free;
         if ((chp->desc.flags & 0x80) == 0) {
@@ -413,8 +405,7 @@ int chp_new(struct chp_id chpid)
                 goto out_free;
         }
         /* Get channel-measurement characteristics. */
-        if (css_characteristics_avail && css_chsc_characteristics.scmc
-            && css_chsc_characteristics.secm) {
+        if (css_chsc_characteristics.scmc && css_chsc_characteristics.secm) {
                 ret = chsc_get_channel_measurement_chars(chp);
                 if (ret)
                         goto out_free;
@@ -476,26 +467,74 @@ void *chp_get_chp_desc(struct chp_id chpid)
 
 /**
  * chp_process_crw - process channel-path status change
- * @id: channel-path ID number
- * @status: non-zero if channel-path has become available, zero otherwise
+ * @crw0: channel report-word to handler
+ * @crw1: second channel-report word (always NULL)
+ * @overflow: crw overflow indication
  *
  * Handle channel-report-words indicating that the status of a channel-path
  * has changed.
  */
-void chp_process_crw(int id, int status)
+static void chp_process_crw(struct crw *crw0, struct crw *crw1,
+                            int overflow)
 {
         struct chp_id chpid;
 
+        if (overflow) {
+                css_schedule_eval_all();
+                return;
+        }
+        CIO_CRW_EVENT(2, "CRW reports slct=%d, oflw=%d, "
+                      "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
+                      crw0->slct, crw0->oflw, crw0->chn, crw0->rsc, crw0->anc,
+                      crw0->erc, crw0->rsid);
+        /*
+         * Check for solicited machine checks. These are
+         * created by reset channel path and need not be
+         * handled here.
+         */
+        if (crw0->slct) {
+                CIO_CRW_EVENT(2, "solicited machine check for "
+                              "channel path %02X\n", crw0->rsid);
+                return;
+        }
         chp_id_init(&chpid);
-        chpid.id = id;
-        if (status) {
+        chpid.id = crw0->rsid;
+        switch (crw0->erc) {
+        case CRW_ERC_IPARM: /* Path has come. */
                 if (!chp_is_registered(chpid))
                         chp_new(chpid);
                 chsc_chp_online(chpid);
-        } else
+                break;
+        case CRW_ERC_PERRI: /* Path has gone. */
+        case CRW_ERC_PERRN:
                 chsc_chp_offline(chpid);
+                break;
+        default:
+                CIO_CRW_EVENT(2, "Don't know how to handle erc=%x\n",
+                              crw0->erc);
+        }
 }
 
+int chp_ssd_get_mask(struct chsc_ssd_info *ssd, struct chp_link *link)
+{
+        int i;
+        int mask;
+
+        for (i = 0; i < 8; i++) {
+                mask = 0x80 >> i;
+                if (!(ssd->path_mask & mask))
+                        continue;
+                if (!chp_id_is_equal(&ssd->chpid[i], &link->chpid))
+                        continue;
+                if ((ssd->fla_valid_mask & mask) &&
+                    ((ssd->fla[i] & link->fla_mask) != link->fla))
+                        continue;
+                return mask;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(chp_ssd_get_mask);
+
 static inline int info_bit_num(struct chp_id id)
 {
         return id.id + id.cssid * (__MAX_CHPID + 1);
@@ -575,6 +614,7 @@ static void cfg_func(struct work_struct *work)
 {
         struct chp_id chpid;
         enum cfg_task_t t;
+        int rc;
 
         mutex_lock(&cfg_lock);
         t = cfg_none;
@@ -589,14 +629,24 @@ static void cfg_func(struct work_struct *work)
 
         switch (t) {
         case cfg_configure:
-                sclp_chp_configure(chpid);
-                info_expire();
-                chsc_chp_online(chpid);
+                rc = sclp_chp_configure(chpid);
+                if (rc)
+                        CIO_MSG_EVENT(2, "chp: sclp_chp_configure(%x.%02x)="
+                                      "%d\n", chpid.cssid, chpid.id, rc);
+                else {
+                        info_expire();
+                        chsc_chp_online(chpid);
+                }
                 break;
         case cfg_deconfigure:
-                sclp_chp_deconfigure(chpid);
-                info_expire();
-                chsc_chp_offline(chpid);
+                rc = sclp_chp_deconfigure(chpid);
+                if (rc)
+                        CIO_MSG_EVENT(2, "chp: sclp_chp_deconfigure(%x.%02x)="
+                                      "%d\n", chpid.cssid, chpid.id, rc);
+                else {
+                        info_expire();
+                        chsc_chp_offline(chpid);
+                }
                 break;
         case cfg_none:
                 /* Get updated information after last change. */
@@ -654,10 +704,16 @@ static int cfg_wait_idle(void)
 static int __init chp_init(void)
 {
         struct chp_id chpid;
+        int ret;
 
+        ret = s390_register_crw_handler(CRW_RSC_CPATH, chp_process_crw);
+        if (ret)
+                return ret;
         chp_wq = create_singlethread_workqueue("cio_chp");
-        if (!chp_wq)
+        if (!chp_wq) {
+                s390_unregister_crw_handler(CRW_RSC_CPATH);
                 return -ENOMEM;
+        }
         INIT_WORK(&cfg_work, cfg_func);
         init_waitqueue_head(&cfg_wait_queue);
         if (info_update())
diff --git a/drivers/s390/cio/chp.h b/drivers/s390/cio/chp.h
index 65286563c592..26c3d2246176 100644
--- a/drivers/s390/cio/chp.h
+++ b/drivers/s390/cio/chp.h
@@ -12,12 +12,24 @@
 #include <linux/device.h>
 #include <asm/chpid.h>
 #include "chsc.h"
+#include "css.h"
 
 #define CHP_STATUS_STANDBY              0
 #define CHP_STATUS_CONFIGURED           1
 #define CHP_STATUS_RESERVED             2
 #define CHP_STATUS_NOT_RECOGNIZED       3
 
+#define CHP_ONLINE 0
+#define CHP_OFFLINE 1
+#define CHP_VARY_ON 2
+#define CHP_VARY_OFF 3
+
+struct chp_link {
+        struct chp_id chpid;
+        u32 fla_mask;
+        u16 fla;
+};
+
 static inline int chp_test_bit(u8 *bitmap, int num)
 {
         int byte = num >> 3;
@@ -42,12 +54,11 @@ int chp_get_status(struct chp_id chpid);
 u8 chp_get_sch_opm(struct subchannel *sch);
 int chp_is_registered(struct chp_id chpid);
 void *chp_get_chp_desc(struct chp_id chpid);
-void chp_process_crw(int id, int available);
 void chp_remove_cmg_attr(struct channel_path *chp);
 int chp_add_cmg_attr(struct channel_path *chp);
 int chp_new(struct chp_id chpid);
 void chp_cfg_schedule(struct chp_id chpid, int configure);
 void chp_cfg_cancel_deconfigure(struct chp_id chpid);
 int chp_info_get_status(struct chp_id chpid);
-
+int chp_ssd_get_mask(struct chsc_ssd_info *, struct chp_link *);
 #endif /* S390_CHP_H */
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 5de86908b0d0..65264a38057d 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -2,8 +2,7 @@
  *  drivers/s390/cio/chsc.c
  *   S/390 common I/O routines -- channel subsystem call
  *
- *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
- *                            IBM Corporation
+ *    Copyright IBM Corp. 1999,2008
  *    Author(s): Ingo Adlung (adlung@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Arnd Bergmann (arndb@de.ibm.com)
@@ -16,7 +15,9 @@
 
 #include <asm/cio.h>
 #include <asm/chpid.h>
+#include <asm/chsc.h>
 
+#include "../s390mach.h"
 #include "css.h"
 #include "cio.h"
 #include "cio_debug.h"
@@ -127,77 +128,12 @@ out_free:
         return ret;
 }
 
-static int check_for_io_on_path(struct subchannel *sch, int mask)
-{
-        int cc;
-
-        cc = stsch(sch->schid, &sch->schib);
-        if (cc)
-                return 0;
-        if (sch->schib.scsw.actl && sch->schib.pmcw.lpum == mask)
-                return 1;
-        return 0;
-}
-
-static void terminate_internal_io(struct subchannel *sch)
-{
-        if (cio_clear(sch)) {
-                /* Recheck device in case clear failed. */
-                sch->lpm = 0;
-                if (device_trigger_verify(sch) != 0)
-                        css_schedule_eval(sch->schid);
-                return;
-        }
-        /* Request retry of internal operation. */
-        device_set_intretry(sch);
-        /* Call handler. */
-        if (sch->driver && sch->driver->termination)
-                sch->driver->termination(sch);
-}
-
 static int s390_subchannel_remove_chpid(struct subchannel *sch, void *data)
 {
-        int j;
-        int mask;
-        struct chp_id *chpid = data;
-        struct schib schib;
-
-        for (j = 0; j < 8; j++) {
-                mask = 0x80 >> j;
-                if ((sch->schib.pmcw.pim & mask) &&
-                    (sch->schib.pmcw.chpid[j] == chpid->id))
-                        break;
-        }
-        if (j >= 8)
-                return 0;
-
         spin_lock_irq(sch->lock);
-
-        stsch(sch->schid, &schib);
-        if (!css_sch_is_valid(&schib))
-                goto out_unreg;
-        memcpy(&sch->schib, &schib, sizeof(struct schib));
-        /* Check for single path devices. */
-        if (sch->schib.pmcw.pim == 0x80)
-                goto out_unreg;
-
-        if (check_for_io_on_path(sch, mask)) {
-                if (device_is_online(sch))
-                        device_kill_io(sch);
-                else {
-                        terminate_internal_io(sch);
-                        /* Re-start path verification. */
-                        if (sch->driver && sch->driver->verify)
-                                sch->driver->verify(sch);
-                }
-        } else {
-                /* trigger path verification. */
-                if (sch->driver && sch->driver->verify)
-                        sch->driver->verify(sch);
-                else if (sch->lpm == mask)
+        if (sch->driver && sch->driver->chp_event)
+                if (sch->driver->chp_event(sch, data, CHP_OFFLINE) != 0)
                         goto out_unreg;
-        }
-
         spin_unlock_irq(sch->lock);
         return 0;
 
@@ -211,15 +147,18 @@ out_unreg:
 void chsc_chp_offline(struct chp_id chpid)
 {
         char dbf_txt[15];
+        struct chp_link link;
 
         sprintf(dbf_txt, "chpr%x.%02x", chpid.cssid, chpid.id);
         CIO_TRACE_EVENT(2, dbf_txt);
 
         if (chp_get_status(chpid) <= 0)
                 return;
+        memset(&link, 0, sizeof(struct chp_link));
+        link.chpid = chpid;
         /* Wait until previous actions have settled. */
         css_wait_for_slow_path();
-        for_each_subchannel_staged(s390_subchannel_remove_chpid, NULL, &chpid);
+        for_each_subchannel_staged(s390_subchannel_remove_chpid, NULL, &link);
 }
 
 static int s390_process_res_acc_new_sch(struct subchannel_id schid, void *data)
@@ -242,67 +181,25 @@ static int s390_process_res_acc_new_sch(struct subchannel_id schid, void *data)
         return 0;
 }
 
-struct res_acc_data {
-        struct chp_id chpid;
-        u32 fla_mask;
-        u16 fla;
-};
-
-static int get_res_chpid_mask(struct chsc_ssd_info *ssd,
-                              struct res_acc_data *data)
-{
-        int i;
-        int mask;
-
-        for (i = 0; i < 8; i++) {
-                mask = 0x80 >> i;
-                if (!(ssd->path_mask & mask))
-                        continue;
-                if (!chp_id_is_equal(&ssd->chpid[i], &data->chpid))
-                        continue;
-                if ((ssd->fla_valid_mask & mask) &&
-                    ((ssd->fla[i] & data->fla_mask) != data->fla))
-                        continue;
-                return mask;
-        }
-        return 0;
-}
-
 static int __s390_process_res_acc(struct subchannel *sch, void *data)
 {
-        int chp_mask, old_lpm;
-        struct res_acc_data *res_data = data;
-
         spin_lock_irq(sch->lock);
-        chp_mask = get_res_chpid_mask(&sch->ssd_info, res_data);
-        if (chp_mask == 0)
-                goto out;
-        if (stsch(sch->schid, &sch->schib))
-                goto out;
-        old_lpm = sch->lpm;
-        sch->lpm = ((sch->schib.pmcw.pim &
-                     sch->schib.pmcw.pam &
-                     sch->schib.pmcw.pom)
-                    | chp_mask) & sch->opm;
-        if (!old_lpm && sch->lpm)
-                device_trigger_reprobe(sch);
-        else if (sch->driver && sch->driver->verify)
-                sch->driver->verify(sch);
-out:
+        if (sch->driver && sch->driver->chp_event)
+                sch->driver->chp_event(sch, data, CHP_ONLINE);
         spin_unlock_irq(sch->lock);
 
         return 0;
 }
 
-static void s390_process_res_acc (struct res_acc_data *res_data)
+static void s390_process_res_acc(struct chp_link *link)
 {
         char dbf_txt[15];
 
-        sprintf(dbf_txt, "accpr%x.%02x", res_data->chpid.cssid,
-                res_data->chpid.id);
+        sprintf(dbf_txt, "accpr%x.%02x", link->chpid.cssid,
+                link->chpid.id);
         CIO_TRACE_EVENT( 2, dbf_txt);
-        if (res_data->fla != 0) {
-                sprintf(dbf_txt, "fla%x", res_data->fla);
+        if (link->fla != 0) {
+                sprintf(dbf_txt, "fla%x", link->fla);
                 CIO_TRACE_EVENT( 2, dbf_txt);
         }
         /* Wait until previous actions have settled. */
@@ -315,7 +212,7 @@ static void s390_process_res_acc (struct res_acc_data *res_data)
          * will we have to do.
          */
         for_each_subchannel_staged(__s390_process_res_acc,
-                                   s390_process_res_acc_new_sch, res_data);
+                                   s390_process_res_acc_new_sch, link);
 }
 
 static int
@@ -388,7 +285,7 @@ static void chsc_process_sei_link_incident(struct chsc_sei_area *sei_area)
 
 static void chsc_process_sei_res_acc(struct chsc_sei_area *sei_area)
 {
-        struct res_acc_data res_data;
+        struct chp_link link;
         struct chp_id chpid;
         int status;
 
@@ -404,18 +301,18 @@ static void chsc_process_sei_res_acc(struct chsc_sei_area *sei_area)
                 chp_new(chpid);
         else if (!status)
                 return;
-        memset(&res_data, 0, sizeof(struct res_acc_data));
-        res_data.chpid = chpid;
+        memset(&link, 0, sizeof(struct chp_link));
+        link.chpid = chpid;
         if ((sei_area->vf & 0xc0) != 0) {
-                res_data.fla = sei_area->fla;
+                link.fla = sei_area->fla;
                 if ((sei_area->vf & 0xc0) == 0xc0)
                         /* full link address */
-                        res_data.fla_mask = 0xffff;
+                        link.fla_mask = 0xffff;
                 else
                         /* link address */
-                        res_data.fla_mask = 0xff00;
+                        link.fla_mask = 0xff00;
         }
-        s390_process_res_acc(&res_data);
+        s390_process_res_acc(&link);
 }
 
 struct chp_config_data {
@@ -480,17 +377,25 @@ static void chsc_process_sei(struct chsc_sei_area *sei_area)
         }
 }
 
-void chsc_process_crw(void)
+static void chsc_process_crw(struct crw *crw0, struct crw *crw1, int overflow)
 {
         struct chsc_sei_area *sei_area;
 
+        if (overflow) {
+                css_schedule_eval_all();
+                return;
+        }
+        CIO_CRW_EVENT(2, "CRW reports slct=%d, oflw=%d, "
+                      "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
+                      crw0->slct, crw0->oflw, crw0->chn, crw0->rsc, crw0->anc,
+                      crw0->erc, crw0->rsid);
         if (!sei_page)
                 return;
         /* Access to sei_page is serialized through machine check handler
          * thread, so no need for locking. */
         sei_area = sei_page;
 
-        CIO_TRACE_EVENT( 2, "prcss");
+        CIO_TRACE_EVENT(2, "prcss");
         do {
                 memset(sei_area, 0, sizeof(*sei_area));
                 sei_area->request.length = 0x0010;
@@ -509,114 +414,36 @@ void chsc_process_crw(void)
         } while (sei_area->flags & 0x80);
 }
 
-static int __chp_add_new_sch(struct subchannel_id schid, void *data)
-{
-        struct schib schib;
-
-        if (stsch_err(schid, &schib))
-                /* We're through */
-                return -ENXIO;
-
-        /* Put it on the slow path. */
-        css_schedule_eval(schid);
-        return 0;
-}
-
-
-static int __chp_add(struct subchannel *sch, void *data)
-{
-        int i, mask;
-        struct chp_id *chpid = data;
-
-        spin_lock_irq(sch->lock);
-        for (i=0; i<8; i++) {
-                mask = 0x80 >> i;
-                if ((sch->schib.pmcw.pim & mask) &&
-                    (sch->schib.pmcw.chpid[i] == chpid->id))
-                        break;
-        }
-        if (i==8) {
-                spin_unlock_irq(sch->lock);
-                return 0;
-        }
-        if (stsch(sch->schid, &sch->schib)) {
-                spin_unlock_irq(sch->lock);
-                css_schedule_eval(sch->schid);
-                return 0;
-        }
-        sch->lpm = ((sch->schib.pmcw.pim &
-                     sch->schib.pmcw.pam &
-                     sch->schib.pmcw.pom)
-                    | mask) & sch->opm;
-
-        if (sch->driver && sch->driver->verify)
-                sch->driver->verify(sch);
-
-        spin_unlock_irq(sch->lock);
-
-        return 0;
-}
-
 void chsc_chp_online(struct chp_id chpid)
 {
         char dbf_txt[15];
+        struct chp_link link;
 
         sprintf(dbf_txt, "cadd%x.%02x", chpid.cssid, chpid.id);
         CIO_TRACE_EVENT(2, dbf_txt);
 
         if (chp_get_status(chpid) != 0) {
+                memset(&link, 0, sizeof(struct chp_link));
+                link.chpid = chpid;
                 /* Wait until previous actions have settled. */
                 css_wait_for_slow_path();
-                for_each_subchannel_staged(__chp_add, __chp_add_new_sch,
-                                           &chpid);
+                for_each_subchannel_staged(__s390_process_res_acc, NULL,
+                                           &link);
         }
 }
 
 static void __s390_subchannel_vary_chpid(struct subchannel *sch,
                                          struct chp_id chpid, int on)
 {
-        int chp, old_lpm;
-        int mask;
         unsigned long flags;
+        struct chp_link link;
 
+        memset(&link, 0, sizeof(struct chp_link));
+        link.chpid = chpid;
         spin_lock_irqsave(sch->lock, flags);
-        old_lpm = sch->lpm;
-        for (chp = 0; chp < 8; chp++) {
-                mask = 0x80 >> chp;
-                if (!(sch->ssd_info.path_mask & mask))
-                        continue;
-                if (!chp_id_is_equal(&sch->ssd_info.chpid[chp], &chpid))
-                        continue;
-
-                if (on) {
-                        sch->opm |= mask;
-                        sch->lpm |= mask;
-                        if (!old_lpm)
-                                device_trigger_reprobe(sch);
-                        else if (sch->driver && sch->driver->verify)
-                                sch->driver->verify(sch);
-                        break;
-                }
-                sch->opm &= ~mask;
-                sch->lpm &= ~mask;
-                if (check_for_io_on_path(sch, mask)) {
-                        if (device_is_online(sch))
-                                /* Path verification is done after killing. */
-                                device_kill_io(sch);
-                        else {
-                                /* Kill and retry internal I/O. */
-                                terminate_internal_io(sch);
-                                /* Re-start path verification. */
-                                if (sch->driver && sch->driver->verify)
-                                        sch->driver->verify(sch);
-                        }
-                } else if (!sch->lpm) {
-                        if (device_trigger_verify(sch) != 0)
-                                css_schedule_eval(sch->schid);
-                } else if (sch->driver && sch->driver->verify)
-                        sch->driver->verify(sch);
-                break;
-        }
+        if (sch->driver && sch->driver->chp_event)
+                sch->driver->chp_event(sch, &link,
+                                       on ? CHP_VARY_ON : CHP_VARY_OFF);
         spin_unlock_irqrestore(sch->lock, flags);
 }
 
@@ -656,6 +483,10 @@ __s390_vary_chpid_on(struct subchannel_id schid, void *data)
  */
 int chsc_chp_vary(struct chp_id chpid, int on)
 {
+        struct chp_link link;
+
+        memset(&link, 0, sizeof(struct chp_link));
+        link.chpid = chpid;
         /* Wait until previous actions have settled. */
         css_wait_for_slow_path();
         /*
@@ -664,10 +495,10 @@ int chsc_chp_vary(struct chp_id chpid, int on)
 
         if (on)
                 for_each_subchannel_staged(s390_subchannel_vary_chpid_on,
-                                           __s390_vary_chpid_on, &chpid);
+                                           __s390_vary_chpid_on, &link);
         else
                 for_each_subchannel_staged(s390_subchannel_vary_chpid_off,
-                                           NULL, &chpid);
+                                           NULL, &link);
 
         return 0;
 }
@@ -797,23 +628,33 @@ chsc_secm(struct channel_subsystem *css, int enable)
         return ret;
 }
 
-int chsc_determine_channel_path_description(struct chp_id chpid,
-                                            struct channel_path_desc *desc)
+int chsc_determine_channel_path_desc(struct chp_id chpid, int fmt, int rfmt,
+                                     int c, int m,
+                                     struct chsc_response_struct *resp)
 {
         int ccode, ret;
 
         struct {
                 struct chsc_header request;
-                u32 : 24;
+                u32 : 2;
+                u32 m : 1;
+                u32 c : 1;
+                u32 fmt : 4;
+                u32 cssid : 8;
+                u32 : 4;
+                u32 rfmt : 4;
                 u32 first_chpid : 8;
                 u32 : 24;
                 u32 last_chpid : 8;
                 u32 zeroes1;
                 struct chsc_header response;
-                u32 zeroes2;
-                struct channel_path_desc desc;
+                u8 data[PAGE_SIZE - 20];
         } __attribute__ ((packed)) *scpd_area;
 
+        if ((rfmt == 1) && !css_general_characteristics.fcs)
+                return -EINVAL;
+        if ((rfmt == 2) && !css_general_characteristics.cib)
+                return -EINVAL;
         scpd_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
         if (!scpd_area)
                 return -ENOMEM;
@@ -821,8 +662,13 @@ int chsc_determine_channel_path_description(struct chp_id chpid,
         scpd_area->request.length = 0x0010;
         scpd_area->request.code = 0x0002;
 
+        scpd_area->cssid = chpid.cssid;
         scpd_area->first_chpid = chpid.id;
         scpd_area->last_chpid = chpid.id;
+        scpd_area->m = m;
+        scpd_area->c = c;
+        scpd_area->fmt = fmt;
+        scpd_area->rfmt = rfmt;
 
         ccode = chsc(scpd_area);
         if (ccode > 0) {
@@ -833,8 +679,7 @@ int chsc_determine_channel_path_description(struct chp_id chpid,
         ret = chsc_error_from_response(scpd_area->response.code);
         if (ret == 0)
                 /* Success. */
-                memcpy(desc, &scpd_area->desc,
-                       sizeof(struct channel_path_desc));
+                memcpy(resp, &scpd_area->response, scpd_area->response.length);
         else
                 CIO_CRW_EVENT(2, "chsc: scpd failed (rc=%04x)\n",
                               scpd_area->response.code);
@@ -842,6 +687,25 @@ out:
         free_page((unsigned long)scpd_area);
         return ret;
 }
+EXPORT_SYMBOL_GPL(chsc_determine_channel_path_desc);
+
+int chsc_determine_base_channel_path_desc(struct chp_id chpid,
+                                          struct channel_path_desc *desc)
+{
+        struct chsc_response_struct *chsc_resp;
+        int ret;
+
+        chsc_resp = kzalloc(sizeof(*chsc_resp), GFP_KERNEL);
+        if (!chsc_resp)
+                return -ENOMEM;
+        ret = chsc_determine_channel_path_desc(chpid, 0, 0, 0, 0, chsc_resp);
+        if (ret)
+                goto out_free;
+        memcpy(desc, &chsc_resp->data, chsc_resp->length);
+out_free:
+        kfree(chsc_resp);
+        return ret;
+}
 
 static void
 chsc_initialize_cmg_chars(struct channel_path *chp, u8 cmcv,
@@ -937,15 +801,23 @@ out:
 
 int __init chsc_alloc_sei_area(void)
 {
+        int ret;
+
         sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
-        if (!sei_page)
+        if (!sei_page) {
                 CIO_MSG_EVENT(0, "Can't allocate page for processing of "
                               "chsc machine checks!\n");
-        return (sei_page ? 0 : -ENOMEM);
+                return -ENOMEM;
+        }
+        ret = s390_register_crw_handler(CRW_RSC_CSS, chsc_process_crw);
+        if (ret)
+                kfree(sei_page);
+        return ret;
 }
 
 void __init chsc_free_sei_area(void)
 {
+        s390_unregister_crw_handler(CRW_RSC_CSS);
         kfree(sei_page);
 }
 
@@ -1043,3 +915,52 @@ exit:
 
 EXPORT_SYMBOL_GPL(css_general_characteristics);
 EXPORT_SYMBOL_GPL(css_chsc_characteristics);
+
+int chsc_sstpc(void *page, unsigned int op, u16 ctrl)
+{
+        struct {
+                struct chsc_header request;
+                unsigned int rsvd0;
+                unsigned int op : 8;
+                unsigned int rsvd1 : 8;
+                unsigned int ctrl : 16;
+                unsigned int rsvd2[5];
+                struct chsc_header response;
+                unsigned int rsvd3[7];
+        } __attribute__ ((packed)) *rr;
+        int rc;
+
+        memset(page, 0, PAGE_SIZE);
+        rr = page;
+        rr->request.length = 0x0020;
+        rr->request.code = 0x0033;
+        rr->op = op;
+        rr->ctrl = ctrl;
+        rc = chsc(rr);
+        if (rc)
+                return -EIO;
+        rc = (rr->response.code == 0x0001) ? 0 : -EIO;
+        return rc;
+}
+
+int chsc_sstpi(void *page, void *result, size_t size)
+{
+        struct {
+                struct chsc_header request;
+                unsigned int rsvd0[3];
+                struct chsc_header response;
+                char data[size];
+        } __attribute__ ((packed)) *rr;
+        int rc;
+
+        memset(page, 0, PAGE_SIZE);
+        rr = page;
+        rr->request.length = 0x0010;
+        rr->request.code = 0x0038;
+        rc = chsc(rr);
+        if (rc)
+                return -EIO;
+        memcpy(result, &rr->data, size);
+        return (rr->response.code == 0x0001) ? 0 : -EIO;
+}
+
diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index d1f5db1e69b9..fb6c4d6c45b4 100644
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -4,7 +4,8 @@
 #include <linux/types.h>
 #include <linux/device.h>
 #include <asm/chpid.h>
-#include "schid.h"
+#include <asm/chsc.h>
+#include <asm/schid.h>
 
 #define CHSC_SDA_OC_MSS   0x2
 
@@ -36,14 +37,15 @@ struct channel_path_desc {
 
 struct channel_path;
 
-extern void chsc_process_crw(void);
-
 struct css_general_char {
-        u64 : 41;
+        u64 : 12;
+        u32 dynio : 1;   /* bit 12 */
+        u32 : 28;
         u32 aif : 1;     /* bit 41 */
         u32 : 3;
         u32 mcss : 1;    /* bit 45 */
-        u32 : 2;
+        u32 fcs : 1;     /* bit 46 */
+        u32 : 1;
         u32 ext_mb : 1;  /* bit 48 */
         u32 : 7;
         u32 aif_tdd : 1; /* bit 56 */
@@ -51,7 +53,11 @@ struct css_general_char {
         u32 qebsm : 1;   /* bit 58 */
         u32 : 8;
         u32 aif_osa : 1; /* bit 67 */
-        u32 : 28;
+        u32 : 14;
+        u32 cib : 1;     /* bit 82 */
+        u32 : 5;
+        u32 fcx : 1;     /* bit 88 */
+        u32 : 7;
 }__attribute__((packed));
 
 struct css_chsc_char {
@@ -78,7 +84,6 @@ struct chsc_ssd_info {
 extern int chsc_get_ssd_info(struct subchannel_id schid,
                              struct chsc_ssd_info *ssd);
 extern int chsc_determine_css_characteristics(void);
-extern int css_characteristics_avail;
 extern int chsc_alloc_sei_area(void);
 extern void chsc_free_sei_area(void);
 
@@ -87,8 +92,11 @@ struct channel_subsystem;
 extern int chsc_secm(struct channel_subsystem *, int);
 
 int chsc_chp_vary(struct chp_id chpid, int on);
-int chsc_determine_channel_path_description(struct chp_id chpid,
-                                            struct channel_path_desc *desc);
+int chsc_determine_channel_path_desc(struct chp_id chpid, int fmt, int rfmt,
+                                     int c, int m,
+                                     struct chsc_response_struct *resp);
+int chsc_determine_base_channel_path_desc(struct chp_id chpid,
+                                          struct channel_path_desc *desc);
 void chsc_chp_online(struct chp_id chpid);
 void chsc_chp_offline(struct chp_id chpid);
 int chsc_get_channel_measurement_chars(struct channel_path *chp);
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
new file mode 100644
index 000000000000..91ca87aa9f97
--- /dev/null
+++ b/drivers/s390/cio/chsc_sch.c
@@ -0,0 +1,820 @@
+/*
+ * Driver for s390 chsc subchannels
+ *
+ * Copyright IBM Corp. 2008
+ * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
+ *
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/uaccess.h>
+#include <linux/miscdevice.h>
+
+#include <asm/cio.h>
+#include <asm/chsc.h>
+#include <asm/isc.h>
+
+#include "cio.h"
+#include "cio_debug.h"
+#include "css.h"
+#include "chsc_sch.h"
+#include "ioasm.h"
+
+static debug_info_t *chsc_debug_msg_id;
+static debug_info_t *chsc_debug_log_id;
+
+#define CHSC_MSG(imp, args...) do {                                     \
+                debug_sprintf_event(chsc_debug_msg_id, imp , ##args);   \
+        } while (0)
+
+#define CHSC_LOG(imp, txt) do {                                 \
+                debug_text_event(chsc_debug_log_id, imp , txt); \
+        } while (0)
+
+static void CHSC_LOG_HEX(int level, void *data, int length)
+{
+        while (length > 0) {
+                debug_event(chsc_debug_log_id, level, data, length);
+                length -= chsc_debug_log_id->buf_size;
+                data += chsc_debug_log_id->buf_size;
+        }
+}
+
+MODULE_AUTHOR("IBM Corporation");
+MODULE_DESCRIPTION("driver for s390 chsc subchannels");
+MODULE_LICENSE("GPL");
+
+static void chsc_subchannel_irq(struct subchannel *sch)
+{
+        struct chsc_private *private = sch->private;
+        struct chsc_request *request = private->request;
+        struct irb *irb = (struct irb *)__LC_IRB;
+
+        CHSC_LOG(4, "irb");
+        CHSC_LOG_HEX(4, irb, sizeof(*irb));
+        /* Copy irb to provided request and set done. */
+        if (!request) {
+                CHSC_MSG(0, "Interrupt on sch 0.%x.%04x with no request\n",
+                         sch->schid.ssid, sch->schid.sch_no);
+                return;
+        }
+        private->request = NULL;
+        memcpy(&request->irb, irb, sizeof(*irb));
+        stsch(sch->schid, &sch->schib);
+        complete(&request->completion);
+        put_device(&sch->dev);
+}
+
+static int chsc_subchannel_probe(struct subchannel *sch)
+{
+        struct chsc_private *private;
+        int ret;
+
+        CHSC_MSG(6, "Detected chsc subchannel 0.%x.%04x\n",
+                 sch->schid.ssid, sch->schid.sch_no);
+        sch->isc = CHSC_SCH_ISC;
+        private = kzalloc(sizeof(*private), GFP_KERNEL);
+        if (!private)
+                return -ENOMEM;
+        ret = cio_enable_subchannel(sch, (u32)(unsigned long)sch);
+        if (ret) {
+                CHSC_MSG(0, "Failed to enable 0.%x.%04x: %d\n",
+                         sch->schid.ssid, sch->schid.sch_no, ret);
+                kfree(private);
+        } else {
+                sch->private = private;
+                if (sch->dev.uevent_suppress) {
+                        sch->dev.uevent_suppress = 0;
+                        kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
+                }
+        }
+        return ret;
+}
+
+static int chsc_subchannel_remove(struct subchannel *sch)
+{
+        struct chsc_private *private;
+
+        cio_disable_subchannel(sch);
+        private = sch->private;
+        sch->private = NULL;
+        if (private->request) {
+                complete(&private->request->completion);
+                put_device(&sch->dev);
+        }
+        kfree(private);
+        return 0;
+}
+
+static void chsc_subchannel_shutdown(struct subchannel *sch)
+{
+        cio_disable_subchannel(sch);
+}
+
+static struct css_device_id chsc_subchannel_ids[] = {
+        { .match_flags = 0x1, .type =SUBCHANNEL_TYPE_CHSC, },
+        { /* end of list */ },
+};
+MODULE_DEVICE_TABLE(css, chsc_subchannel_ids);
+
+static struct css_driver chsc_subchannel_driver = {
+        .owner = THIS_MODULE,
+        .subchannel_type = chsc_subchannel_ids,
+        .irq = chsc_subchannel_irq,
+        .probe = chsc_subchannel_probe,
+        .remove = chsc_subchannel_remove,
+        .shutdown = chsc_subchannel_shutdown,
+        .name = "chsc_subchannel",
+};
+
+static int __init chsc_init_dbfs(void)
+{
+        chsc_debug_msg_id = debug_register("chsc_msg", 16, 1,
+                                           16 * sizeof(long));
+        if (!chsc_debug_msg_id)
+                goto out;
+        debug_register_view(chsc_debug_msg_id, &debug_sprintf_view);
+        debug_set_level(chsc_debug_msg_id, 2);
+        chsc_debug_log_id = debug_register("chsc_log", 16, 1, 16);
+        if (!chsc_debug_log_id)
+                goto out;
+        debug_register_view(chsc_debug_log_id, &debug_hex_ascii_view);
+        debug_set_level(chsc_debug_log_id, 2);
+        return 0;
+out:
+        if (chsc_debug_msg_id)
+                debug_unregister(chsc_debug_msg_id);
+        return -ENOMEM;
+}
+
+static void chsc_remove_dbfs(void)
+{
+        debug_unregister(chsc_debug_log_id);
+        debug_unregister(chsc_debug_msg_id);
+}
+
+static int __init chsc_init_sch_driver(void)
+{
+        return css_driver_register(&chsc_subchannel_driver);
+}
+
+static void chsc_cleanup_sch_driver(void)
+{
+        css_driver_unregister(&chsc_subchannel_driver);
+}
+
+static DEFINE_SPINLOCK(chsc_lock);
+
+static int chsc_subchannel_match_next_free(struct device *dev, void *data)
+{
+        struct subchannel *sch = to_subchannel(dev);
+
+        return sch->schib.pmcw.ena && !scsw_fctl(&sch->schib.scsw);
+}
+
+static struct subchannel *chsc_get_next_subchannel(struct subchannel *sch)
+{
+        struct device *dev;
+
+        dev = driver_find_device(&chsc_subchannel_driver.drv,
+                                 sch ? &sch->dev : NULL, NULL,
+                                 chsc_subchannel_match_next_free);
+        return dev ? to_subchannel(dev) : NULL;
+}
+
+/**
+ * chsc_async() - try to start a chsc request asynchronously
+ * @chsc_area: request to be started
+ * @request: request structure to associate
+ *
+ * Tries to start a chsc request on one of the existing chsc subchannels.
+ * Returns:
+ *  %0 if the request was performed synchronously
+ *  %-EINPROGRESS if the request was successfully started
+ *  %-EBUSY if all chsc subchannels are busy
+ *  %-ENODEV if no chsc subchannels are available
+ * Context:
+ *  interrupts disabled, chsc_lock held
+ */
+static int chsc_async(struct chsc_async_area *chsc_area,
+                      struct chsc_request *request)
+{
+        int cc;
+        struct chsc_private *private;
+        struct subchannel *sch = NULL;
+        int ret = -ENODEV;
+        char dbf[10];
+
+        chsc_area->header.key = PAGE_DEFAULT_KEY;
+        while ((sch = chsc_get_next_subchannel(sch))) {
+                spin_lock(sch->lock);
+                private = sch->private;
+                if (private->request) {
+                        spin_unlock(sch->lock);
+                        ret = -EBUSY;
+                        continue;
+                }
+                chsc_area->header.sid = sch->schid;
+                CHSC_LOG(2, "schid");
+                CHSC_LOG_HEX(2, &sch->schid, sizeof(sch->schid));
+                cc = chsc(chsc_area);
+                sprintf(dbf, "cc:%d", cc);
+                CHSC_LOG(2, dbf);
+                switch (cc) {
+                case 0:
+                        ret = 0;
+                        break;
+                case 1:
+                        sch->schib.scsw.cmd.fctl |= SCSW_FCTL_START_FUNC;
+                        ret = -EINPROGRESS;
+                        private->request = request;
+                        break;
+                case 2:
+                        ret = -EBUSY;
+                        break;
+                default:
+                        ret = -ENODEV;
+                }
+                spin_unlock(sch->lock);
+                CHSC_MSG(2, "chsc on 0.%x.%04x returned cc=%d\n",
+                         sch->schid.ssid, sch->schid.sch_no, cc);
+                if (ret == -EINPROGRESS)
+                        return -EINPROGRESS;
+                put_device(&sch->dev);
+                if (ret == 0)
+                        return 0;
+        }
+        return ret;
+}
+
+static void chsc_log_command(struct chsc_async_area *chsc_area)
+{
+        char dbf[10];
+
+        sprintf(dbf, "CHSC:%x", chsc_area->header.code);
+        CHSC_LOG(0, dbf);
+        CHSC_LOG_HEX(0, chsc_area, 32);
+}
+
+static int chsc_examine_irb(struct chsc_request *request)
+{
+        int backed_up;
+
+        if (!scsw_stctl(&request->irb.scsw) & SCSW_STCTL_STATUS_PEND)
+                return -EIO;
+        backed_up = scsw_cstat(&request->irb.scsw) & SCHN_STAT_CHAIN_CHECK;
+        request->irb.scsw.cmd.cstat &= ~SCHN_STAT_CHAIN_CHECK;
+        if (scsw_cstat(&request->irb.scsw) == 0)
+                return 0;
+        if (!backed_up)
+                return 0;
+        if (scsw_cstat(&request->irb.scsw) & SCHN_STAT_PROG_CHECK)
+                return -EIO;
+        if (scsw_cstat(&request->irb.scsw) & SCHN_STAT_PROT_CHECK)
+                return -EPERM;
+        if (scsw_cstat(&request->irb.scsw) & SCHN_STAT_CHN_DATA_CHK)
+                return -EAGAIN;
+        if (scsw_cstat(&request->irb.scsw) & SCHN_STAT_CHN_CTRL_CHK)
+                return -EAGAIN;
+        return -EIO;
+}
+
+static int chsc_ioctl_start(void __user *user_area)
+{
+        struct chsc_request *request;
+        struct chsc_async_area *chsc_area;
+        int ret;
+        char dbf[10];
+
+        if (!css_general_characteristics.dynio)
+                /* It makes no sense to try. */
+                return -EOPNOTSUPP;
+        chsc_area = (void *)get_zeroed_page(GFP_DMA | GFP_KERNEL);
+        if (!chsc_area)
+                return -ENOMEM;
+        request = kzalloc(sizeof(*request), GFP_KERNEL);
+        if (!request) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+        init_completion(&request->completion);
+        if (copy_from_user(chsc_area, user_area, PAGE_SIZE)) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        chsc_log_command(chsc_area);
+        spin_lock_irq(&chsc_lock);
+        ret = chsc_async(chsc_area, request);
+        spin_unlock_irq(&chsc_lock);
+        if (ret == -EINPROGRESS) {
+                wait_for_completion(&request->completion);
+                ret = chsc_examine_irb(request);
+        }
+        /* copy area back to user */
+        if (!ret)
+                if (copy_to_user(user_area, chsc_area, PAGE_SIZE))
+                        ret = -EFAULT;
+out_free:
+        sprintf(dbf, "ret:%d", ret);
+        CHSC_LOG(0, dbf);
+        kfree(request);
+        free_page((unsigned long)chsc_area);
+        return ret;
+}
+
+static int chsc_ioctl_info_channel_path(void __user *user_cd)
+{
+        struct chsc_chp_cd *cd;
+        int ret, ccode;
+        struct {
+                struct chsc_header request;
+                u32 : 2;
+                u32 m : 1;
+                u32 : 1;
+                u32 fmt1 : 4;
+                u32 cssid : 8;
+                u32 : 8;
+                u32 first_chpid : 8;
+                u32 : 24;
+                u32 last_chpid : 8;
+                u32 : 32;
+                struct chsc_header response;
+                u8 data[PAGE_SIZE - 20];
+        } __attribute__ ((packed)) *scpcd_area;
+
+        scpcd_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!scpcd_area)
+                return -ENOMEM;
+        cd = kzalloc(sizeof(*cd), GFP_KERNEL);
+        if (!cd) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+        if (copy_from_user(cd, user_cd, sizeof(*cd))) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        scpcd_area->request.length = 0x0010;
+        scpcd_area->request.code = 0x0028;
+        scpcd_area->m = cd->m;
+        scpcd_area->fmt1 = cd->fmt;
+        scpcd_area->cssid = cd->chpid.cssid;
+        scpcd_area->first_chpid = cd->chpid.id;
+        scpcd_area->last_chpid = cd->chpid.id;
+
+        ccode = chsc(scpcd_area);
+        if (ccode != 0) {
+                ret = -EIO;
+                goto out_free;
+        }
+        if (scpcd_area->response.code != 0x0001) {
+                ret = -EIO;
+                CHSC_MSG(0, "scpcd: response code=%x\n",
+                         scpcd_area->response.code);
+                goto out_free;
+        }
+        memcpy(&cd->cpcb, &scpcd_area->response, scpcd_area->response.length);
+        if (copy_to_user(user_cd, cd, sizeof(*cd)))
+                ret = -EFAULT;
+        else
+                ret = 0;
+out_free:
+        kfree(cd);
+        free_page((unsigned long)scpcd_area);
+        return ret;
+}
+
+static int chsc_ioctl_info_cu(void __user *user_cd)
+{
+        struct chsc_cu_cd *cd;
+        int ret, ccode;
+        struct {
+                struct chsc_header request;
+                u32 : 2;
+                u32 m : 1;
+                u32 : 1;
+                u32 fmt1 : 4;
+                u32 cssid : 8;
+                u32 : 8;
+                u32 first_cun : 8;
+                u32 : 24;
+                u32 last_cun : 8;
+                u32 : 32;
+                struct chsc_header response;
+                u8 data[PAGE_SIZE - 20];
+        } __attribute__ ((packed)) *scucd_area;
+
+        scucd_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!scucd_area)
+                return -ENOMEM;
+        cd = kzalloc(sizeof(*cd), GFP_KERNEL);
+        if (!cd) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+        if (copy_from_user(cd, user_cd, sizeof(*cd))) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        scucd_area->request.length = 0x0010;
+        scucd_area->request.code = 0x0028;
+        scucd_area->m = cd->m;
+        scucd_area->fmt1 = cd->fmt;
+        scucd_area->cssid = cd->cssid;
+        scucd_area->first_cun = cd->cun;
+        scucd_area->last_cun = cd->cun;
+
+        ccode = chsc(scucd_area);
+        if (ccode != 0) {
+                ret = -EIO;
+                goto out_free;
+        }
+        if (scucd_area->response.code != 0x0001) {
+                ret = -EIO;
+                CHSC_MSG(0, "scucd: response code=%x\n",
+                         scucd_area->response.code);
+                goto out_free;
+        }
+        memcpy(&cd->cucb, &scucd_area->response, scucd_area->response.length);
+        if (copy_to_user(user_cd, cd, sizeof(*cd)))
+                ret = -EFAULT;
+        else
+                ret = 0;
+out_free:
+        kfree(cd);
+        free_page((unsigned long)scucd_area);
+        return ret;
+}
+
+static int chsc_ioctl_info_sch_cu(void __user *user_cud)
+{
+        struct chsc_sch_cud *cud;
+        int ret, ccode;
+        struct {
+                struct chsc_header request;
+                u32 : 2;
+                u32 m : 1;
+                u32 : 5;
+                u32 fmt1 : 4;
+                u32 : 2;
+                u32 ssid : 2;
+                u32 first_sch : 16;
+                u32 : 8;
+                u32 cssid : 8;
+                u32 last_sch : 16;
+                u32 : 32;
+                struct chsc_header response;
+                u8 data[PAGE_SIZE - 20];
+        } __attribute__ ((packed)) *sscud_area;
+
+        sscud_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!sscud_area)
+                return -ENOMEM;
+        cud = kzalloc(sizeof(*cud), GFP_KERNEL);
+        if (!cud) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+        if (copy_from_user(cud, user_cud, sizeof(*cud))) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        sscud_area->request.length = 0x0010;
+        sscud_area->request.code = 0x0006;
+        sscud_area->m = cud->schid.m;
+        sscud_area->fmt1 = cud->fmt;
+        sscud_area->ssid = cud->schid.ssid;
+        sscud_area->first_sch = cud->schid.sch_no;
+        sscud_area->cssid = cud->schid.cssid;
+        sscud_area->last_sch = cud->schid.sch_no;
+
+        ccode = chsc(sscud_area);
+        if (ccode != 0) {
+                ret = -EIO;
+                goto out_free;
+        }
+        if (sscud_area->response.code != 0x0001) {
+                ret = -EIO;
+                CHSC_MSG(0, "sscud: response code=%x\n",
+                         sscud_area->response.code);
+                goto out_free;
+        }
+        memcpy(&cud->scub, &sscud_area->response, sscud_area->response.length);
+        if (copy_to_user(user_cud, cud, sizeof(*cud)))
+                ret = -EFAULT;
+        else
+                ret = 0;
+out_free:
+        kfree(cud);
+        free_page((unsigned long)sscud_area);
+        return ret;
+}
+
+static int chsc_ioctl_conf_info(void __user *user_ci)
+{
+        struct chsc_conf_info *ci;
+        int ret, ccode;
+        struct {
+                struct chsc_header request;
+                u32 : 2;
+                u32 m : 1;
+                u32 : 1;
+                u32 fmt1 : 4;
+                u32 cssid : 8;
+                u32 : 6;
+                u32 ssid : 2;
+                u32 : 8;
+                u64 : 64;
+                struct chsc_header response;
+                u8 data[PAGE_SIZE - 20];
+        } __attribute__ ((packed)) *sci_area;
+
+        sci_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!sci_area)
+                return -ENOMEM;
+        ci = kzalloc(sizeof(*ci), GFP_KERNEL);
+        if (!ci) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+        if (copy_from_user(ci, user_ci, sizeof(*ci))) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        sci_area->request.length = 0x0010;
+        sci_area->request.code = 0x0012;
+        sci_area->m = ci->id.m;
+        sci_area->fmt1 = ci->fmt;
+        sci_area->cssid = ci->id.cssid;
+        sci_area->ssid = ci->id.ssid;
+
+        ccode = chsc(sci_area);
+        if (ccode != 0) {
+                ret = -EIO;
+                goto out_free;
+        }
+        if (sci_area->response.code != 0x0001) {
+                ret = -EIO;
+                CHSC_MSG(0, "sci: response code=%x\n",
+                         sci_area->response.code);
+                goto out_free;
+        }
+        memcpy(&ci->scid, &sci_area->response, sci_area->response.length);
+        if (copy_to_user(user_ci, ci, sizeof(*ci)))
+                ret = -EFAULT;
+        else
+                ret = 0;
+out_free:
+        kfree(ci);
+        free_page((unsigned long)sci_area);
+        return ret;
+}
+
+static int chsc_ioctl_conf_comp_list(void __user *user_ccl)
+{
+        struct chsc_comp_list *ccl;
+        int ret, ccode;
+        struct {
+                struct chsc_header request;
+                u32 ctype : 8;
+                u32 : 4;
+                u32 fmt : 4;
+                u32 : 16;
+                u64 : 64;
+                u32 list_parm[2];
+                u64 : 64;
+                struct chsc_header response;
+                u8 data[PAGE_SIZE - 36];
+        } __attribute__ ((packed)) *sccl_area;
+        struct {
+                u32 m : 1;
+                u32 : 31;
+                u32 cssid : 8;
+                u32 : 16;
+                u32 chpid : 8;
+        } __attribute__ ((packed)) *chpid_parm;
+        struct {
+                u32 f_cssid : 8;
+                u32 l_cssid : 8;
+                u32 : 16;
+                u32 res;
+        } __attribute__ ((packed)) *cssids_parm;
+
+        sccl_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!sccl_area)
+                return -ENOMEM;
+        ccl = kzalloc(sizeof(*ccl), GFP_KERNEL);
+        if (!ccl) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+        if (copy_from_user(ccl, user_ccl, sizeof(*ccl))) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        sccl_area->request.length = 0x0020;
+        sccl_area->request.code = 0x0030;
+        sccl_area->fmt = ccl->req.fmt;
+        sccl_area->ctype = ccl->req.ctype;
+        switch (sccl_area->ctype) {
+        case CCL_CU_ON_CHP:
+        case CCL_IOP_CHP:
+                chpid_parm = (void *)&sccl_area->list_parm;
+                chpid_parm->m = ccl->req.chpid.m;
+                chpid_parm->cssid = ccl->req.chpid.chp.cssid;
+                chpid_parm->chpid = ccl->req.chpid.chp.id;
+                break;
+        case CCL_CSS_IMG:
+        case CCL_CSS_IMG_CONF_CHAR:
+                cssids_parm = (void *)&sccl_area->list_parm;
+                cssids_parm->f_cssid = ccl->req.cssids.f_cssid;
+                cssids_parm->l_cssid = ccl->req.cssids.l_cssid;
+                break;
+        }
+        ccode = chsc(sccl_area);
+        if (ccode != 0) {
+                ret = -EIO;
+                goto out_free;
+        }
+        if (sccl_area->response.code != 0x0001) {
+                ret = -EIO;
+                CHSC_MSG(0, "sccl: response code=%x\n",
+                         sccl_area->response.code);
+                goto out_free;
+        }
+        memcpy(&ccl->sccl, &sccl_area->response, sccl_area->response.length);
+        if (copy_to_user(user_ccl, ccl, sizeof(*ccl)))
+                ret = -EFAULT;
+        else
+                ret = 0;
+out_free:
+        kfree(ccl);
+        free_page((unsigned long)sccl_area);
+        return ret;
+}
+
+static int chsc_ioctl_chpd(void __user *user_chpd)
+{
+        struct chsc_cpd_info *chpd;
+        int ret;
+
+        chpd = kzalloc(sizeof(*chpd), GFP_KERNEL);
+        if (!chpd)
+                return -ENOMEM;
+        if (copy_from_user(chpd, user_chpd, sizeof(*chpd))) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        ret = chsc_determine_channel_path_desc(chpd->chpid, chpd->fmt,
+                                               chpd->rfmt, chpd->c, chpd->m,
+                                               &chpd->chpdb);
+        if (ret)
+                goto out_free;
+        if (copy_to_user(user_chpd, chpd, sizeof(*chpd)))
+                ret = -EFAULT;
+out_free:
+        kfree(chpd);
+        return ret;
+}
+
+static int chsc_ioctl_dcal(void __user *user_dcal)
+{
+        struct chsc_dcal *dcal;
+        int ret, ccode;
+        struct {
+                struct chsc_header request;
+                u32 atype : 8;
+                u32 : 4;
+                u32 fmt : 4;
+                u32 : 16;
+                u32 res0[2];
+                u32 list_parm[2];
+                u32 res1[2];
+                struct chsc_header response;
+                u8 data[PAGE_SIZE - 36];
+        } __attribute__ ((packed)) *sdcal_area;
+
+        sdcal_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!sdcal_area)
+                return -ENOMEM;
+        dcal = kzalloc(sizeof(*dcal), GFP_KERNEL);
+        if (!dcal) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+        if (copy_from_user(dcal, user_dcal, sizeof(*dcal))) {
+                ret = -EFAULT;
+                goto out_free;
+        }
+        sdcal_area->request.length = 0x0020;
+        sdcal_area->request.code = 0x0034;
+        sdcal_area->atype = dcal->req.atype;
+        sdcal_area->fmt = dcal->req.fmt;
+        memcpy(&sdcal_area->list_parm, &dcal->req.list_parm,
+               sizeof(sdcal_area->list_parm));
+
+        ccode = chsc(sdcal_area);
+        if (ccode != 0) {
+                ret = -EIO;
+                goto out_free;
+        }
+        if (sdcal_area->response.code != 0x0001) {
+                ret = -EIO;
+                CHSC_MSG(0, "sdcal: response code=%x\n",
+                         sdcal_area->response.code);
+                goto out_free;
+        }
+        memcpy(&dcal->sdcal, &sdcal_area->response,
+               sdcal_area->response.length);
+        if (copy_to_user(user_dcal, dcal, sizeof(*dcal)))
+                ret = -EFAULT;
+        else
+                ret = 0;
+out_free:
+        kfree(dcal);
+        free_page((unsigned long)sdcal_area);
+        return ret;
+}
+
+static long chsc_ioctl(struct file *filp, unsigned int cmd,
+                       unsigned long arg)
+{
+        CHSC_MSG(2, "chsc_ioctl called, cmd=%x\n", cmd);
+        switch (cmd) {
+        case CHSC_START:
+                return chsc_ioctl_start((void __user *)arg);
+        case CHSC_INFO_CHANNEL_PATH:
+                return chsc_ioctl_info_channel_path((void __user *)arg);
+        case CHSC_INFO_CU:
+                return chsc_ioctl_info_cu((void __user *)arg);
+        case CHSC_INFO_SCH_CU:
+                return chsc_ioctl_info_sch_cu((void __user *)arg);
+        case CHSC_INFO_CI:
+                return chsc_ioctl_conf_info((void __user *)arg);
+        case CHSC_INFO_CCL:
+                return chsc_ioctl_conf_comp_list((void __user *)arg);
+        case CHSC_INFO_CPD:
+                return chsc_ioctl_chpd((void __user *)arg);
+        case CHSC_INFO_DCAL:
+                return chsc_ioctl_dcal((void __user *)arg);
+        default: /* unknown ioctl number */
+                return -ENOIOCTLCMD;
+        }
+}
+
+static const struct file_operations chsc_fops = {
+        .owner = THIS_MODULE,
+        .unlocked_ioctl = chsc_ioctl,
+        .compat_ioctl = chsc_ioctl,
+};
+
+static struct miscdevice chsc_misc_device = {
+        .minor = MISC_DYNAMIC_MINOR,
+        .name = "chsc",
+        .fops = &chsc_fops,
+};
+
+static int __init chsc_misc_init(void)
+{
+        return misc_register(&chsc_misc_device);
+}
+
+static void chsc_misc_cleanup(void)
+{
+        misc_deregister(&chsc_misc_device);
+}
+
+static int __init chsc_sch_init(void)
+{
+        int ret;
+
+        ret = chsc_init_dbfs();
+        if (ret)
+                return ret;
+        isc_register(CHSC_SCH_ISC);
+        ret = chsc_init_sch_driver();
+        if (ret)
+                goto out_dbf;
+        ret = chsc_misc_init();
+        if (ret)
+                goto out_driver;
+        return ret;
+out_driver:
+        chsc_cleanup_sch_driver();
+out_dbf:
+        isc_unregister(CHSC_SCH_ISC);
+        chsc_remove_dbfs();
+        return ret;
+}
+
+static void __exit chsc_sch_exit(void)
+{
+        chsc_misc_cleanup();
+        chsc_cleanup_sch_driver();
+        isc_unregister(CHSC_SCH_ISC);
+        chsc_remove_dbfs();
+}
+
+module_init(chsc_sch_init);
+module_exit(chsc_sch_exit);
diff --git a/drivers/s390/cio/chsc_sch.h b/drivers/s390/cio/chsc_sch.h
new file mode 100644
index 000000000000..589ebfad6aad
--- /dev/null
+++ b/drivers/s390/cio/chsc_sch.h
@@ -0,0 +1,13 @@
+#ifndef _CHSC_SCH_H
+#define _CHSC_SCH_H
+
+struct chsc_request {
+        struct completion completion;
+        struct irb irb;
+};
+
+struct chsc_private {
+        struct chsc_request *request;
+};
+
+#endif
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index b32d7eb3d81a..33bff8fec7d1 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -2,7 +2,7 @@
  *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
  *
- *    Copyright (C) IBM Corp. 1999,2006
+ *    Copyright IBM Corp. 1999,2008
  *    Author(s): Ingo Adlung (adlung@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Arnd Bergmann (arndb@de.ibm.com)
@@ -24,7 +24,9 @@
 #include <asm/ipl.h>
 #include <asm/chpid.h>
 #include <asm/airq.h>
+#include <asm/isc.h>
 #include <asm/cpu.h>
+#include <asm/fcx.h>
 #include "cio.h"
 #include "css.h"
 #include "chsc.h"
@@ -72,7 +74,6 @@ out_unregister:
                 debug_unregister(cio_debug_trace_id);
         if (cio_debug_crw_id)
                 debug_unregister(cio_debug_crw_id);
-        printk(KERN_WARNING"cio: could not initialize debugging\n");
         return -1;
 }
 
@@ -128,7 +129,7 @@ cio_tpi(void)
         local_bh_disable();
         irq_enter ();
         spin_lock(sch->lock);
-        memcpy (&sch->schib.scsw, &irb->scsw, sizeof (struct scsw));
+        memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
         if (sch->driver && sch->driver->irq)
                 sch->driver->irq(sch);
         spin_unlock(sch->lock);
@@ -167,30 +168,30 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
 {
         char dbf_txt[15];
         int ccode;
-        struct orb *orb;
+        union orb *orb;
 
         CIO_TRACE_EVENT(4, "stIO");
         CIO_TRACE_EVENT(4, sch->dev.bus_id);
 
         orb = &to_io_private(sch)->orb;
         /* sch is always under 2G. */
-        orb->intparm = (u32)(addr_t)sch;
-        orb->fmt = 1;
+        orb->cmd.intparm = (u32)(addr_t)sch;
+        orb->cmd.fmt = 1;
 
-        orb->pfch = sch->options.prefetch == 0;
-        orb->spnd = sch->options.suspend;
-        orb->ssic = sch->options.suspend && sch->options.inter;
-        orb->lpm = (lpm != 0) ? lpm : sch->lpm;
+        orb->cmd.pfch = sch->options.prefetch == 0;
+        orb->cmd.spnd = sch->options.suspend;
+        orb->cmd.ssic = sch->options.suspend && sch->options.inter;
+        orb->cmd.lpm = (lpm != 0) ? lpm : sch->lpm;
 #ifdef CONFIG_64BIT
         /*
          * for 64 bit we always support 64 bit IDAWs with 4k page size only
          */
-        orb->c64 = 1;
-        orb->i2k = 0;
+        orb->cmd.c64 = 1;
+        orb->cmd.i2k = 0;
 #endif
-        orb->key = key >> 4;
+        orb->cmd.key = key >> 4;
         /* issue "Start Subchannel" */
-        orb->cpa = (__u32) __pa(cpa);
+        orb->cmd.cpa = (__u32) __pa(cpa);
         ccode = ssch(sch->schid, orb);
 
         /* process condition code */
@@ -202,7 +203,7 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
                 /*
                  * initialize device status information
                  */
-                sch->schib.scsw.actl |= SCSW_ACTL_START_PEND;
+                sch->schib.scsw.cmd.actl |= SCSW_ACTL_START_PEND;
                 return 0;
         case 1:         /* status pending */
         case 2:         /* busy */
@@ -237,7 +238,7 @@ cio_resume (struct subchannel *sch)
 
         switch (ccode) {
         case 0:
-                sch->schib.scsw.actl |= SCSW_ACTL_RESUME_PEND;
+                sch->schib.scsw.cmd.actl |= SCSW_ACTL_RESUME_PEND;
                 return 0;
         case 1:
                 return -EBUSY;
@@ -277,7 +278,7 @@ cio_halt(struct subchannel *sch)
 
         switch (ccode) {
         case 0:
-                sch->schib.scsw.actl |= SCSW_ACTL_HALT_PEND;
+                sch->schib.scsw.cmd.actl |= SCSW_ACTL_HALT_PEND;
                 return 0;
         case 1:         /* status pending */
         case 2:         /* busy */
@@ -312,7 +313,7 @@ cio_clear(struct subchannel *sch)
 
         switch (ccode) {
         case 0:
-                sch->schib.scsw.actl |= SCSW_ACTL_CLEAR_PEND;
+                sch->schib.scsw.cmd.actl |= SCSW_ACTL_CLEAR_PEND;
                 return 0;
         default:                /* device not operational */
                 return -ENODEV;
@@ -387,8 +388,10 @@ cio_modify (struct subchannel *sch)
         return ret;
 }
 
-/*
- * Enable subchannel.
+/**
+ * cio_enable_subchannel - enable a subchannel.
+ * @sch: subchannel to be enabled
+ * @intparm: interruption parameter to set
  */
 int cio_enable_subchannel(struct subchannel *sch, u32 intparm)
 {
@@ -434,12 +437,13 @@ int cio_enable_subchannel(struct subchannel *sch, u32 intparm)
         CIO_TRACE_EVENT (2, dbf_txt);
         return ret;
 }
+EXPORT_SYMBOL_GPL(cio_enable_subchannel);
 
-/*
- * Disable subchannel.
+/**
+ * cio_disable_subchannel - disable a subchannel.
+ * @sch: subchannel to disable
  */
-int
-cio_disable_subchannel (struct subchannel *sch)
+int cio_disable_subchannel(struct subchannel *sch)
 {
         char dbf_txt[15];
         int ccode;
@@ -455,7 +459,7 @@ cio_disable_subchannel (struct subchannel *sch)
         if (ccode == 3)         /* Not operational. */
                 return -ENODEV;
 
-        if (sch->schib.scsw.actl != 0)
+        if (scsw_actl(&sch->schib.scsw) != 0)
                 /*
                  * the disable function must not be called while there are
                  *  requests pending for completion !
@@ -484,6 +488,7 @@ cio_disable_subchannel (struct subchannel *sch)
         CIO_TRACE_EVENT (2, dbf_txt);
         return ret;
 }
+EXPORT_SYMBOL_GPL(cio_disable_subchannel);
 
 int cio_create_sch_lock(struct subchannel *sch)
 {
@@ -494,27 +499,61 @@ int cio_create_sch_lock(struct subchannel *sch)
         return 0;
 }
 
-/*
- * cio_validate_subchannel()
+static int cio_check_devno_blacklisted(struct subchannel *sch)
+{
+        if (is_blacklisted(sch->schid.ssid, sch->schib.pmcw.dev)) {
+                /*
+                 * This device must not be known to Linux. So we simply
+                 * say that there is no device and return ENODEV.
+                 */
+                CIO_MSG_EVENT(6, "Blacklisted device detected "
+                              "at devno %04X, subchannel set %x\n",
+                              sch->schib.pmcw.dev, sch->schid.ssid);
+                return -ENODEV;
+        }
+        return 0;
+}
+
+static int cio_validate_io_subchannel(struct subchannel *sch)
+{
+        /* Initialization for io subchannels. */
+        if (!css_sch_is_valid(&sch->schib))
+                return -ENODEV;
+
+        /* Devno is valid. */
+        return cio_check_devno_blacklisted(sch);
+}
+
+static int cio_validate_msg_subchannel(struct subchannel *sch)
+{
+        /* Initialization for message subchannels. */
+        if (!css_sch_is_valid(&sch->schib))
+                return -ENODEV;
+
+        /* Devno is valid. */
+        return cio_check_devno_blacklisted(sch);
+}
+
+/**
+ * cio_validate_subchannel - basic validation of subchannel
+ * @sch: subchannel structure to be filled out
+ * @schid: subchannel id
  *
  * Find out subchannel type and initialize struct subchannel.
  * Return codes:
- *   SUBCHANNEL_TYPE_IO for a normal io subchannel
- *   SUBCHANNEL_TYPE_CHSC for a chsc subchannel
- *   SUBCHANNEL_TYPE_MESSAGE for a messaging subchannel
- *   SUBCHANNEL_TYPE_ADM for a adm(?) subchannel
+ *   0 on success
  *   -ENXIO for non-defined subchannels
- *   -ENODEV for subchannels with invalid device number or blacklisted devices
+ *   -ENODEV for invalid subchannels or blacklisted devices
+ *   -EIO for subchannels in an invalid subchannel set
  */
-int
-cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
+int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
 {
         char dbf_txt[15];
         int ccode;
         int err;
 
-        sprintf (dbf_txt, "valsch%x", schid.sch_no);
-        CIO_TRACE_EVENT (4, dbf_txt);
+        sprintf(dbf_txt, "valsch%x", schid.sch_no);
+        CIO_TRACE_EVENT(4, dbf_txt);
 
         /* Nuke all fields. */
         memset(sch, 0, sizeof(struct subchannel));
@@ -546,67 +585,21 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
         /* Copy subchannel type from path management control word. */
         sch->st = sch->schib.pmcw.st;
 
-        /*
-         * ... just being curious we check for non I/O subchannels
-         */
-        if (sch->st != 0) {
-                CIO_MSG_EVENT(4, "Subchannel 0.%x.%04x reports "
-                              "non-I/O subchannel type %04X\n",
-                              sch->schid.ssid, sch->schid.sch_no, sch->st);
-                /* We stop here for non-io subchannels. */
-                err = sch->st;
-                goto out;
-        }
-
-        /* Initialization for io subchannels. */
-        if (!css_sch_is_valid(&sch->schib)) {
-                err = -ENODEV;
-                goto out;
+        switch (sch->st) {
+        case SUBCHANNEL_TYPE_IO:
+                err = cio_validate_io_subchannel(sch);
+                break;
+        case SUBCHANNEL_TYPE_MSG:
+                err = cio_validate_msg_subchannel(sch);
+                break;
+        default:
+                err = 0;
         }
-
-        /* Devno is valid. */
-        if (is_blacklisted (sch->schid.ssid, sch->schib.pmcw.dev)) {
-                /*
-                 * This device must not be known to Linux. So we simply
-                 * say that there is no device and return ENODEV.
-                 */
-                CIO_MSG_EVENT(6, "Blacklisted device detected "
-                              "at devno %04X, subchannel set %x\n",
-                              sch->schib.pmcw.dev, sch->schid.ssid);
-                err = -ENODEV;
+        if (err)
                 goto out;
-        }
-        if (cio_is_console(sch->schid)) {
-                sch->opm = 0xff;
-                sch->isc = 1;
-        } else {
-                sch->opm = chp_get_sch_opm(sch);
-                sch->isc = 3;
-        }
-        sch->lpm = sch->schib.pmcw.pam & sch->opm;
-
-        CIO_MSG_EVENT(6, "Detected device %04x on subchannel 0.%x.%04X "
-                      "- PIM = %02X, PAM = %02X, POM = %02X\n",
-                      sch->schib.pmcw.dev, sch->schid.ssid,
-                      sch->schid.sch_no, sch->schib.pmcw.pim,
-                      sch->schib.pmcw.pam, sch->schib.pmcw.pom);
 
-        /*
-         * We now have to initially ...
-         *  ... enable "concurrent sense"
-         *  ... enable "multipath mode" if more than one
-         *        CHPID is available. This is done regardless
-         *        whether multiple paths are available for us.
-         */
-        sch->schib.pmcw.csense = 1;     /* concurrent sense */
-        sch->schib.pmcw.ena = 0;
-        if ((sch->lpm & (sch->lpm - 1)) != 0)
-                sch->schib.pmcw.mp = 1; /* multipath mode */
-        /* clean up possible residual cmf stuff */
-        sch->schib.pmcw.mme = 0;
-        sch->schib.pmcw.mbfc = 0;
-        sch->schib.pmcw.mbi = 0;
-        sch->schib.mba = 0;
+        CIO_MSG_EVENT(4, "Subchannel 0.%x.%04x reports subchannel type %04X\n",
+                      sch->schid.ssid, sch->schid.sch_no, sch->st);
         return 0;
 out:
         if (!cio_is_console(schid))
@@ -647,7 +640,7 @@ do_IRQ (struct pt_regs *regs)
                  */
                 if (tpi_info->adapter_IO == 1 &&
                     tpi_info->int_type == IO_INTERRUPT_TYPE) {
-                        do_adapter_IO();
+                        do_adapter_IO(tpi_info->isc);
                         continue;
                 }
                 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
@@ -706,9 +699,9 @@ void wait_cons_dev(void)
         if (!console_subchannel_in_use)
                 return;
 
-        /* disable all but isc 1 (console device) */
+        /* disable all but the console isc */
         __ctl_store (save_cr6, 6, 6);
-        cr6 = 0x40000000;
+        cr6 = 1UL << (31 - CONSOLE_ISC);
         __ctl_load (cr6, 6, 6);
 
         do {
@@ -716,7 +709,7 @@ void wait_cons_dev(void)
                 if (!cio_tpi())
                         cpu_relax();
                 spin_lock(console_subchannel.lock);
-        } while (console_subchannel.schib.scsw.actl != 0);
+        } while (console_subchannel.schib.scsw.cmd.actl != 0);
         /*
          * restore previous isc value
          */
@@ -761,7 +754,6 @@ cio_get_console_sch_no(void)
                 /* unlike in 2.4, we cannot autoprobe here, since
                  * the channel subsystem is not fully initialized.
                  * With some luck, the HWC console can take over */
-                printk(KERN_WARNING "cio: No ccw console found!\n");
                 return -1;
         }
         return console_irq;
@@ -778,6 +770,7 @@ cio_probe_console(void)
         sch_no = cio_get_console_sch_no();
         if (sch_no == -1) {
                 console_subchannel_in_use = 0;
+                printk(KERN_WARNING "cio: No ccw console found!\n");
                 return ERR_PTR(-ENODEV);
         }
         memset(&console_subchannel, 0, sizeof(struct subchannel));
@@ -790,15 +783,15 @@ cio_probe_console(void)
         }
 
         /*
-         * enable console I/O-interrupt subclass 1
+         * enable console I/O-interrupt subclass
          */
-        ctl_set_bit(6, 30);
-        console_subchannel.isc = 1;
-        console_subchannel.schib.pmcw.isc = 1;
+        isc_register(CONSOLE_ISC);
+        console_subchannel.schib.pmcw.isc = CONSOLE_ISC;
         console_subchannel.schib.pmcw.intparm =
                 (u32)(addr_t)&console_subchannel;
         ret = cio_modify(&console_subchannel);
         if (ret) {
+                isc_unregister(CONSOLE_ISC);
                 console_subchannel_in_use = 0;
                 return ERR_PTR(ret);
         }
@@ -810,7 +803,7 @@ cio_release_console(void)
 {
         console_subchannel.schib.pmcw.intparm = 0;
         cio_modify(&console_subchannel);
-        ctl_clear_bit(6, 24);
+        isc_unregister(CONSOLE_ISC);
         console_subchannel_in_use = 0;
 }
 
@@ -864,7 +857,7 @@ static void udelay_reset(unsigned long usecs)
 }
 
 static int
-__clear_subchannel_easy(struct subchannel_id schid)
+__clear_io_subchannel_easy(struct subchannel_id schid)
 {
         int retry;
 
@@ -883,6 +876,12 @@ __clear_subchannel_easy(struct subchannel_id schid)
         return -EBUSY;
 }
 
+static void __clear_chsc_subchannel_easy(void)
+{
+        /* It seems we can only wait for a bit here :/ */
+        udelay_reset(100);
+}
+
 static int pgm_check_occured;
 
 static void cio_reset_pgm_check_handler(void)
@@ -921,11 +920,22 @@ static int __shutdown_subchannel_easy(struct subchannel_id schid, void *data)
         case -ENODEV:
                 break;
         default: /* -EBUSY */
-                if (__clear_subchannel_easy(schid))
-                        break; /* give up... */
+                switch (schib.pmcw.st) {
+                case SUBCHANNEL_TYPE_IO:
+                        if (__clear_io_subchannel_easy(schid))
+                                goto out; /* give up... */
+                        break;
+                case SUBCHANNEL_TYPE_CHSC:
+                        __clear_chsc_subchannel_easy();
+                        break;
+                default:
+                        /* No default clear strategy */
+                        break;
+                }
                 stsch(schid, &schib);
                 __disable_subchannel_easy(schid, &schib);
         }
+out:
         return 0;
 }
 
@@ -1068,3 +1078,61 @@ int __init cio_get_iplinfo(struct cio_iplinfo *iplinfo)
         iplinfo->is_qdio = schib.pmcw.qf;
         return 0;
 }
+
+/**
+ * cio_tm_start_key - perform start function
+ * @sch: subchannel on which to perform the start function
+ * @tcw: transport-command word to be started
+ * @lpm: mask of paths to use
+ * @key: storage key to use for storage access
+ *
+ * Start the tcw on the given subchannel. Return zero on success, non-zero
+ * otherwise.
+ */
+int cio_tm_start_key(struct subchannel *sch, struct tcw *tcw, u8 lpm, u8 key)
+{
+        int cc;
+        union orb *orb = &to_io_private(sch)->orb;
+
+        memset(orb, 0, sizeof(union orb));
+        orb->tm.intparm = (u32) (addr_t) sch;
+        orb->tm.key = key >> 4;
+        orb->tm.b = 1;
+        orb->tm.lpm = lpm ? lpm : sch->lpm;
+        orb->tm.tcw = (u32) (addr_t) tcw;
+        cc = ssch(sch->schid, orb);
+        switch (cc) {
+        case 0:
+                return 0;
+        case 1:
+        case 2:
+                return -EBUSY;
+        default:
+                return cio_start_handle_notoper(sch, lpm);
+        }
+}
+
+/**
+ * cio_tm_intrg - perform interrogate function
+ * @sch - subchannel on which to perform the interrogate function
+ *
+ * If the specified subchannel is running in transport-mode, perform the
+ * interrogate function. Return zero on success, non-zero otherwie.
+ */
+int cio_tm_intrg(struct subchannel *sch)
+{
+        int cc;
+
+        if (!to_io_private(sch)->orb.tm.b)
+                return -EINVAL;
+        cc = xsch(sch->schid);
+        switch (cc) {
+        case 0:
+        case 2:
+                return 0;
+        case 1:
+                return -EBUSY;
+        default:
+                return -ENODEV;
+        }
+}
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 6e933aebe013..3b236d20e835 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -3,9 +3,12 @@
 
 #include <linux/mutex.h>
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
 #include <asm/chpid.h>
+#include <asm/cio.h>
+#include <asm/fcx.h>
+#include <asm/schid.h>
 #include "chsc.h"
-#include "schid.h"
 
 /*
  * path management control word
@@ -13,7 +16,7 @@
 struct pmcw {
         u32 intparm;            /* interruption parameter */
         u32 qf   : 1;           /* qdio facility */
-        u32 res0 : 1;           /* reserved zeros */
+        u32 w    : 1;
         u32 isc  : 3;           /* interruption sublass */
         u32 res5 : 3;           /* reserved zeros */
         u32 ena  : 1;           /* enabled */
@@ -47,7 +50,7 @@ struct pmcw {
  */
 struct schib {
         struct pmcw pmcw;        /* path management control word */
-        struct scsw scsw;        /* subchannel status word */
+        union scsw scsw;         /* subchannel status word */
         __u64 mba;               /* measurement block address */
         __u8 mda[4];             /* model dependent area */
 } __attribute__ ((packed,aligned(4)));
@@ -99,8 +102,11 @@ extern int cio_set_options (struct subchannel *, int);
 extern int cio_get_options (struct subchannel *);
 extern int cio_modify (struct subchannel *);
 
+int cio_tm_start_key(struct subchannel *sch, struct tcw *tcw, u8 lpm, u8 key);
+int cio_tm_intrg(struct subchannel *sch);
+
 int cio_create_sch_lock(struct subchannel *);
-void do_adapter_IO(void);
+void do_adapter_IO(u8 isc);
 void do_IRQ(struct pt_regs *);
 
 /* Use with care. */
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 2808b6833b9e..a90b28c0be57 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -341,12 +341,12 @@ static int cmf_copy_block(struct ccw_device *cdev)
         if (stsch(sch->schid, &sch->schib))
                 return -ENODEV;
 
-        if (sch->schib.scsw.fctl & SCSW_FCTL_START_FUNC) {
+        if (scsw_fctl(&sch->schib.scsw) & SCSW_FCTL_START_FUNC) {
                 /* Don't copy if a start function is in progress. */
-                if ((!(sch->schib.scsw.actl & SCSW_ACTL_SUSPENDED)) &&
-                    (sch->schib.scsw.actl &
+                if ((!(scsw_actl(&sch->schib.scsw) & SCSW_ACTL_SUSPENDED)) &&
+                    (scsw_actl(&sch->schib.scsw) &
                      (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) &&
-                    (!(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)))
+                    (!(scsw_stctl(&sch->schib.scsw) & SCSW_STCTL_SEC_STATUS)))
                         return -EBUSY;
         }
         cmb_data = cdev->private->cmb;
@@ -612,9 +612,6 @@ static int alloc_cmb(struct ccw_device *cdev)
                         free_pages((unsigned long)mem, get_order(size));
                 } else if (!mem) {
                         /* no luck */
-                        printk(KERN_WARNING "cio: failed to allocate area "
-                               "for measuring %d subchannels\n",
-                               cmb_area.num_channels);
                         ret = -ENOMEM;
                         goto out;
                 } else {
@@ -1230,13 +1227,9 @@ static ssize_t cmb_enable_store(struct device *dev,
         switch (val) {
         case 0:
                 ret = disable_cmf(cdev);
-                if (ret)
-                        dev_info(&cdev->dev, "disable_cmf failed (%d)\n", ret);
                 break;
         case 1:
                 ret = enable_cmf(cdev);
-                if (ret && ret != -EBUSY)
-                        dev_info(&cdev->dev, "enable_cmf failed (%d)\n", ret);
                 break;
         }
 
@@ -1344,8 +1337,7 @@ static int __init init_cmf(void)
          * to basic mode.
          */
         if (format == CMF_AUTODETECT) {
-                if (!css_characteristics_avail ||
-                    !css_general_characteristics.ext_mb) {
+                if (!css_general_characteristics.ext_mb) {
                         format = CMF_BASIC;
                 } else {
                         format = CMF_EXTENDED;
@@ -1365,8 +1357,6 @@ static int __init init_cmf(void)
                 cmbops = &cmbops_extended;
                 break;
         default:
-                printk(KERN_ERR "cio: Invalid format %d for channel "
-                        "measurement facility\n", format);
                 return 1;
         }
 
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index a76956512b2d..46c021d880dc 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -2,8 +2,7 @@
  *  drivers/s390/cio/css.c
  *  driver for channel subsystem
  *
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
- *                       IBM Corporation
+ *    Copyright IBM Corp. 2002,2008
  *    Author(s): Arnd Bergmann (arndb@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  */
@@ -14,7 +13,9 @@
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/reboot.h>
+#include <asm/isc.h>
 
+#include "../s390mach.h"
 #include "css.h"
 #include "cio.h"
 #include "cio_debug.h"
@@ -30,8 +31,6 @@ static int max_ssid = 0;
 
 struct channel_subsystem *channel_subsystems[__MAX_CSSID + 1];
 
-int css_characteristics_avail = 0;
-
 int
 for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *data)
 {
@@ -121,25 +120,6 @@ css_alloc_subchannel(struct subchannel_id schid)
                 kfree(sch);
                 return ERR_PTR(ret);
         }
-
-        if (sch->st != SUBCHANNEL_TYPE_IO) {
-                /* For now we ignore all non-io subchannels. */
-                kfree(sch);
-                return ERR_PTR(-EINVAL);
-        }
-
-        /* 
-         * Set intparm to subchannel address.
-         * This is fine even on 64bit since the subchannel is always located
-         * under 2G.
-         */
-        sch->schib.pmcw.intparm = (u32)(addr_t)sch;
-        ret = cio_modify(sch);
-        if (ret) {
-                kfree(sch->lock);
-                kfree(sch);
-                return ERR_PTR(ret);
-        }
         return sch;
 }
 
@@ -177,12 +157,18 @@ static int css_sch_device_register(struct subchannel *sch)
         return ret;
 }
 
+/**
+ * css_sch_device_unregister - unregister a subchannel
+ * @sch: subchannel to be unregistered
+ */
 void css_sch_device_unregister(struct subchannel *sch)
 {
         mutex_lock(&sch->reg_mutex);
-        device_unregister(&sch->dev);
+        if (device_is_registered(&sch->dev))
+                device_unregister(&sch->dev);
         mutex_unlock(&sch->reg_mutex);
 }
+EXPORT_SYMBOL_GPL(css_sch_device_unregister);
 
 static void ssd_from_pmcw(struct chsc_ssd_info *ssd, struct pmcw *pmcw)
 {
@@ -229,6 +215,41 @@ void css_update_ssd_info(struct subchannel *sch)
         }
 }
 
+static ssize_t type_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct subchannel *sch = to_subchannel(dev);
+
+        return sprintf(buf, "%01x\n", sch->st);
+}
+
+static DEVICE_ATTR(type, 0444, type_show, NULL);
+
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        struct subchannel *sch = to_subchannel(dev);
+
+        return sprintf(buf, "css:t%01X\n", sch->st);
+}
+
+static DEVICE_ATTR(modalias, 0444, modalias_show, NULL);
+
+static struct attribute *subch_attrs[] = {
+        &dev_attr_type.attr,
+        &dev_attr_modalias.attr,
+        NULL,
+};
+
+static struct attribute_group subch_attr_group = {
+        .attrs = subch_attrs,
+};
+
+static struct attribute_group *default_subch_attr_groups[] = {
+        &subch_attr_group,
+        NULL,
+};
+
 static int css_register_subchannel(struct subchannel *sch)
 {
         int ret;
@@ -237,16 +258,17 @@ static int css_register_subchannel(struct subchannel *sch)
         sch->dev.parent = &channel_subsystems[0]->device;
         sch->dev.bus = &css_bus_type;
         sch->dev.release = &css_subchannel_release;
-        sch->dev.groups = subch_attr_groups;
+        sch->dev.groups = default_subch_attr_groups;
         /*
          * We don't want to generate uevents for I/O subchannels that don't
          * have a working ccw device behind them since they will be
          * unregistered before they can be used anyway, so we delay the add
          * uevent until after device recognition was successful.
+         * Note that we suppress the uevent for all subchannel types;
+         * the subchannel driver can decide itself when it wants to inform
+         * userspace of its existence.
          */
-        if (!cio_is_console(sch->schid))
-                /* Console is special, no need to suppress. */
-                sch->dev.uevent_suppress = 1;
+        sch->dev.uevent_suppress = 1;
         css_update_ssd_info(sch);
         /* make it known to the system */
         ret = css_sch_device_register(sch);
@@ -255,10 +277,19 @@ static int css_register_subchannel(struct subchannel *sch)
                               sch->schid.ssid, sch->schid.sch_no, ret);
                 return ret;
         }
+        if (!sch->driver) {
+                /*
+                 * No driver matched. Generate the uevent now so that
+                 * a fitting driver module may be loaded based on the
+                 * modalias.
+                 */
+                sch->dev.uevent_suppress = 0;
+                kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
+        }
         return ret;
 }
 
-static int css_probe_device(struct subchannel_id schid)
+int css_probe_device(struct subchannel_id schid)
 {
         int ret;
         struct subchannel *sch;
@@ -301,116 +332,12 @@ int css_sch_is_valid(struct schib *schib)
 {
         if ((schib->pmcw.st == SUBCHANNEL_TYPE_IO) && !schib->pmcw.dnv)
                 return 0;
+        if ((schib->pmcw.st == SUBCHANNEL_TYPE_MSG) && !schib->pmcw.w)
+                return 0;
         return 1;
 }
 EXPORT_SYMBOL_GPL(css_sch_is_valid);
 
-static int css_get_subchannel_status(struct subchannel *sch)
-{
-        struct schib schib;
-
-        if (stsch(sch->schid, &schib))
-                return CIO_GONE;
-        if (!css_sch_is_valid(&schib))
-                return CIO_GONE;
-        if (sch->schib.pmcw.dnv && (schib.pmcw.dev != sch->schib.pmcw.dev))
-                return CIO_REVALIDATE;
-        if (!sch->lpm)
-                return CIO_NO_PATH;
-        return CIO_OPER;
-}
-
-static int css_evaluate_known_subchannel(struct subchannel *sch, int slow)
-{
-        int event, ret, disc;
-        unsigned long flags;
-        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE } action;
-
-        spin_lock_irqsave(sch->lock, flags);
-        disc = device_is_disconnected(sch);
-        if (disc && slow) {
-                /* Disconnected devices are evaluated directly only.*/
-                spin_unlock_irqrestore(sch->lock, flags);
-                return 0;
-        }
-        /* No interrupt after machine check - kill pending timers. */
-        device_kill_pending_timer(sch);
-        if (!disc && !slow) {
-                /* Non-disconnected devices are evaluated on the slow path. */
-                spin_unlock_irqrestore(sch->lock, flags);
-                return -EAGAIN;
-        }
-        event = css_get_subchannel_status(sch);
-        CIO_MSG_EVENT(4, "Evaluating schid 0.%x.%04x, event %d, %s, %s path.\n",
-                      sch->schid.ssid, sch->schid.sch_no, event,
-                      disc ? "disconnected" : "normal",
-                      slow ? "slow" : "fast");
-        /* Analyze subchannel status. */
-        action = NONE;
-        switch (event) {
-        case CIO_NO_PATH:
-                if (disc) {
-                        /* Check if paths have become available. */
-                        action = REPROBE;
-                        break;
-                }
-                /* fall through */
-        case CIO_GONE:
-                /* Prevent unwanted effects when opening lock. */
-                cio_disable_subchannel(sch);
-                device_set_disconnected(sch);
-                /* Ask driver what to do with device. */
-                action = UNREGISTER;
-                if (sch->driver && sch->driver->notify) {
-                        spin_unlock_irqrestore(sch->lock, flags);
-                        ret = sch->driver->notify(sch, event);
-                        spin_lock_irqsave(sch->lock, flags);
-                        if (ret)
-                                action = NONE;
-                }
-                break;
-        case CIO_REVALIDATE:
-                /* Device will be removed, so no notify necessary. */
-                if (disc)
-                        /* Reprobe because immediate unregister might block. */
-                        action = REPROBE;
-                else
-                        action = UNREGISTER_PROBE;
-                break;
-        case CIO_OPER:
-                if (disc)
-                        /* Get device operational again. */
-                        action = REPROBE;
-                break;
-        }
-        /* Perform action. */
-        ret = 0;
-        switch (action) {
-        case UNREGISTER:
-        case UNREGISTER_PROBE:
-                /* Unregister device (will use subchannel lock). */
-                spin_unlock_irqrestore(sch->lock, flags);
-                css_sch_device_unregister(sch);
-                spin_lock_irqsave(sch->lock, flags);
-
-                /* Reset intparm to zeroes. */
-                sch->schib.pmcw.intparm = 0;
-                cio_modify(sch);
-                break;
-        case REPROBE:
-                device_trigger_reprobe(sch);
-                break;
-        default:
-                break;
-        }
-        spin_unlock_irqrestore(sch->lock, flags);
-        /* Probe if necessary. */
-        if (action == UNREGISTER_PROBE)
-                ret = css_probe_device(sch->schid);
-
-        return ret;
-}
-
 static int css_evaluate_new_subchannel(struct subchannel_id schid, int slow)
 {
         struct schib schib;
@@ -429,6 +356,21 @@ static int css_evaluate_new_subchannel(struct subchannel_id schid, int slow)
         return css_probe_device(schid);
 }
 
+static int css_evaluate_known_subchannel(struct subchannel *sch, int slow)
+{
+        int ret = 0;
+
+        if (sch->driver) {
+                if (sch->driver->sch_event)
+                        ret = sch->driver->sch_event(sch, slow);
+                else
+                        dev_dbg(&sch->dev,
+                                "Got subchannel machine check but "
+                                "no sch_event handler provided.\n");
+        }
+        return ret;
+}
+
 static void css_evaluate_subchannel(struct subchannel_id schid, int slow)
 {
         struct subchannel *sch;
@@ -596,18 +538,29 @@ EXPORT_SYMBOL_GPL(css_schedule_reprobe);
 /*
  * Called from the machine check handler for subchannel report words.
  */
-void css_process_crw(int rsid1, int rsid2)
+static void css_process_crw(struct crw *crw0, struct crw *crw1, int overflow)
 {
         struct subchannel_id mchk_schid;
 
-        CIO_CRW_EVENT(2, "source is subchannel %04X, subsystem id %x\n",
-                      rsid1, rsid2);
+        if (overflow) {
+                css_schedule_eval_all();
+                return;
+        }
+        CIO_CRW_EVENT(2, "CRW0 reports slct=%d, oflw=%d, "
+                      "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
+                      crw0->slct, crw0->oflw, crw0->chn, crw0->rsc, crw0->anc,
+                      crw0->erc, crw0->rsid);
+        if (crw1)
+                CIO_CRW_EVENT(2, "CRW1 reports slct=%d, oflw=%d, "
+                              "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
+                              crw1->slct, crw1->oflw, crw1->chn, crw1->rsc,
+                              crw1->anc, crw1->erc, crw1->rsid);
         init_subchannel_id(&mchk_schid);
-        mchk_schid.sch_no = rsid1;
-        if (rsid2 != 0)
-                mchk_schid.ssid = (rsid2 >> 8) & 3;
+        mchk_schid.sch_no = crw0->rsid;
+        if (crw1)
+                mchk_schid.ssid = (crw1->rsid >> 8) & 3;
 
-        /* 
+        /*
          * Since we are always presented with IPI in the CRW, we have to
          * use stsch() to find out if the subchannel in question has come
          * or gone.
@@ -658,7 +611,7 @@ __init_channel_subsystem(struct subchannel_id schid, void *data)
 static void __init
 css_generate_pgid(struct channel_subsystem *css, u32 tod_high)
 {
-        if (css_characteristics_avail && css_general_characteristics.mcss) {
+        if (css_general_characteristics.mcss) {
                 css->global_pgid.pgid_high.ext_cssid.version = 0x80;
                 css->global_pgid.pgid_high.ext_cssid.cssid = css->cssid;
         } else {
@@ -795,8 +748,6 @@ init_channel_subsystem (void)
         ret = chsc_determine_css_characteristics();
         if (ret == -ENOMEM)
                 goto out; /* No need to continue. */
-        if (ret == 0)
-                css_characteristics_avail = 1;
 
         ret = chsc_alloc_sei_area();
         if (ret)
@@ -806,6 +757,10 @@ init_channel_subsystem (void)
         if (ret)
                 goto out;
 
+        ret = s390_register_crw_handler(CRW_RSC_SCH, css_process_crw);
+        if (ret)
+                goto out;
+
         if ((ret = bus_register(&css_bus_type)))
                 goto out;
 
@@ -836,8 +791,7 @@ init_channel_subsystem (void)
                 ret = device_register(&css->device);
                 if (ret)
                         goto out_free_all;
-                if (css_characteristics_avail &&
-                    css_chsc_characteristics.secm) {
+                if (css_chsc_characteristics.secm) {
                         ret = device_create_file(&css->device,
                                                  &dev_attr_cm_enable);
                         if (ret)
@@ -852,7 +806,8 @@ init_channel_subsystem (void)
                 goto out_pseudo;
         css_init_done = 1;
 
-        ctl_set_bit(6, 28);
+        /* Enable default isc for I/O subchannels. */
+        isc_register(IO_SCH_ISC);
 
         for_each_subchannel(__init_channel_subsystem, NULL);
         return 0;
@@ -875,7 +830,7 @@ out_unregister:
                 i--;
                 css = channel_subsystems[i];
                 device_unregister(&css->pseudo_subchannel->dev);
-                if (css_characteristics_avail && css_chsc_characteristics.secm)
+                if (css_chsc_characteristics.secm)
                         device_remove_file(&css->device,
                                            &dev_attr_cm_enable);
                 device_unregister(&css->device);
@@ -883,6 +838,7 @@ out_unregister:
 out_bus:
         bus_unregister(&css_bus_type);
 out:
+        s390_unregister_crw_handler(CRW_RSC_CSS);
         chsc_free_sei_area();
         kfree(slow_subchannel_set);
         printk(KERN_WARNING"cio: failed to initialize css driver (%d)!\n",
@@ -895,19 +851,16 @@ int sch_is_pseudo_sch(struct subchannel *sch)
         return sch == to_css(sch->dev.parent)->pseudo_subchannel;
 }
 
-/*
- * find a driver for a subchannel. They identify by the subchannel
- * type with the exception that the console subchannel driver has its own
- * subchannel type although the device is an i/o subchannel
- */
-static int
-css_bus_match (struct device *dev, struct device_driver *drv)
+static int css_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct subchannel *sch = to_subchannel(dev);
         struct css_driver *driver = to_cssdriver(drv);
+        struct css_device_id *id;
 
-        if (sch->st == driver->subchannel_type)
-                return 1;
+        for (id = driver->subchannel_type; id->match_flags; id++) {
+                if (sch->st == id->type)
+                        return 1;
+        }
 
         return 0;
 }
@@ -945,12 +898,25 @@ static void css_shutdown(struct device *dev)
                 sch->driver->shutdown(sch);
 }
 
+static int css_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct subchannel *sch = to_subchannel(dev);
+        int ret;
+
+        ret = add_uevent_var(env, "ST=%01X", sch->st);
+        if (ret)
+                return ret;
+        ret = add_uevent_var(env, "MODALIAS=css:t%01X", sch->st);
+        return ret;
+}
+
 struct bus_type css_bus_type = {
         .name     = "css",
         .match    = css_bus_match,
         .probe    = css_probe,
         .remove   = css_remove,
         .shutdown = css_shutdown,
+        .uevent   = css_uevent,
 };
 
 /**
@@ -985,4 +951,3 @@ subsys_initcall(init_channel_subsystem);
 
 MODULE_LICENSE("GPL");
 EXPORT_SYMBOL(css_bus_type);
-EXPORT_SYMBOL_GPL(css_characteristics_avail);
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index e1913518f354..57ebf120f825 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -9,8 +9,7 @@
 
 #include <asm/cio.h>
 #include <asm/chpid.h>
-
-#include "schid.h"
+#include <asm/schid.h>
 
 /*
  * path grouping stuff
@@ -58,20 +57,28 @@ struct pgid {
         __u32 tod_high;         /* high word TOD clock */
 } __attribute__ ((packed));
 
-/*
- * A css driver handles all subchannels of one type.
- * Currently, we only care about I/O subchannels (type 0), these
- * have a ccw_device connected to them.
- */
 struct subchannel;
+struct chp_link;
+/**
+ * struct css_driver - device driver for subchannels
+ * @owner: owning module
+ * @subchannel_type: subchannel type supported by this driver
+ * @drv: embedded device driver structure
+ * @irq: called on interrupts
+ * @chp_event: called for events affecting a channel path
+ * @sch_event: called for events affecting the subchannel
+ * @probe: function called on probe
+ * @remove: function called on remove
+ * @shutdown: called at device shutdown
+ * @name: name of the device driver
+ */
 struct css_driver {
         struct module *owner;
-        unsigned int subchannel_type;
+        struct css_device_id *subchannel_type;
         struct device_driver drv;
         void (*irq)(struct subchannel *);
-        int (*notify)(struct subchannel *, int);
-        void (*verify)(struct subchannel *);
-        void (*termination)(struct subchannel *);
+        int (*chp_event)(struct subchannel *, struct chp_link *, int);
+        int (*sch_event)(struct subchannel *, int);
         int (*probe)(struct subchannel *);
         int (*remove)(struct subchannel *);
         void (*shutdown)(struct subchannel *);
@@ -89,13 +96,13 @@ extern int css_driver_register(struct css_driver *);
 extern void css_driver_unregister(struct css_driver *);
 
 extern void css_sch_device_unregister(struct subchannel *);
-extern struct subchannel * get_subchannel_by_schid(struct subchannel_id);
+extern int css_probe_device(struct subchannel_id);
+extern struct subchannel *get_subchannel_by_schid(struct subchannel_id);
 extern int css_init_done;
 int for_each_subchannel_staged(int (*fn_known)(struct subchannel *, void *),
                                int (*fn_unknown)(struct subchannel_id,
                                void *), void *data);
 extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *);
-extern void css_process_crw(int, int);
 extern void css_reiterate_subchannels(void);
 void css_update_ssd_info(struct subchannel *sch);
 
@@ -121,20 +128,6 @@ struct channel_subsystem {
 extern struct bus_type css_bus_type;
 extern struct channel_subsystem *channel_subsystems[];
 
-/* Some helper functions for disconnected state. */
-int device_is_disconnected(struct subchannel *);
-void device_set_disconnected(struct subchannel *);
-void device_trigger_reprobe(struct subchannel *);
-
-/* Helper functions for vary on/off. */
-int device_is_online(struct subchannel *);
-void device_kill_io(struct subchannel *);
-void device_set_intretry(struct subchannel *sch);
-int device_trigger_verify(struct subchannel *sch);
-
-/* Machine check helper function. */
-void device_kill_pending_timer(struct subchannel *);
-
 /* Helper functions to build lists for the slow path. */
 void css_schedule_eval(struct subchannel_id schid);
 void css_schedule_eval_all(void);
@@ -145,6 +138,4 @@ int css_sch_is_valid(struct schib *);
 
 extern struct workqueue_struct *slow_path_wq;
 void css_wait_for_slow_path(void);
-
-extern struct attribute_group *subch_attr_groups[];
 #endif
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index e22813db74a2..e818d0c54c09 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -2,8 +2,7 @@
  *  drivers/s390/cio/device.c
  *  bus driver for ccw devices
  *
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
- *                       IBM Corporation
+ *    Copyright IBM Corp. 2002,2008
  *    Author(s): Arnd Bergmann (arndb@de.ibm.com)
  *               Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
@@ -23,7 +22,9 @@
 #include <asm/cio.h>
 #include <asm/param.h>          /* HZ */
 #include <asm/cmb.h>
+#include <asm/isc.h>
 
+#include "chp.h"
 #include "cio.h"
 #include "cio_debug.h"
 #include "css.h"
@@ -125,19 +126,24 @@ struct bus_type ccw_bus_type;
 static void io_subchannel_irq(struct subchannel *);
 static int io_subchannel_probe(struct subchannel *);
 static int io_subchannel_remove(struct subchannel *);
-static int io_subchannel_notify(struct subchannel *, int);
-static void io_subchannel_verify(struct subchannel *);
-static void io_subchannel_ioterm(struct subchannel *);
 static void io_subchannel_shutdown(struct subchannel *);
+static int io_subchannel_sch_event(struct subchannel *, int);
+static int io_subchannel_chp_event(struct subchannel *, struct chp_link *,
+                                   int);
+
+static struct css_device_id io_subchannel_ids[] = {
+        { .match_flags = 0x1, .type = SUBCHANNEL_TYPE_IO, },
+        { /* end of list */ },
+};
+MODULE_DEVICE_TABLE(css, io_subchannel_ids);
 
 static struct css_driver io_subchannel_driver = {
         .owner = THIS_MODULE,
-        .subchannel_type = SUBCHANNEL_TYPE_IO,
+        .subchannel_type = io_subchannel_ids,
         .name = "io_subchannel",
         .irq = io_subchannel_irq,
-        .notify = io_subchannel_notify,
-        .verify = io_subchannel_verify,
-        .termination = io_subchannel_ioterm,
+        .sch_event = io_subchannel_sch_event,
+        .chp_event = io_subchannel_chp_event,
         .probe = io_subchannel_probe,
         .remove = io_subchannel_remove,
         .shutdown = io_subchannel_shutdown,
@@ -487,25 +493,22 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
                 ccw_device_set_online(cdev);
         return 0;
 }
-static void online_store_handle_online(struct ccw_device *cdev, int force)
+static int online_store_handle_online(struct ccw_device *cdev, int force)
 {
         int ret;
 
         ret = online_store_recog_and_online(cdev);
         if (ret)
-                return;
+                return ret;
         if (force && cdev->private->state == DEV_STATE_BOXED) {
                 ret = ccw_device_stlck(cdev);
-                if (ret) {
-                        dev_warn(&cdev->dev,
-                                 "ccw_device_stlck returned %d!\n", ret);
-                        return;
-                }
+                if (ret)
+                        return ret;
                 if (cdev->id.cu_type == 0)
                         cdev->private->state = DEV_STATE_NOT_OPER;
                 online_store_recog_and_online(cdev);
         }
-
+        return 0;
 }
 
 static ssize_t online_store (struct device *dev, struct device_attribute *attr,
@@ -538,8 +541,9 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
                 ret = count;
                 break;
         case 1:
-                online_store_handle_online(cdev, force);
-                ret = count;
+                ret = online_store_handle_online(cdev, force);
+                if (!ret)
+                        ret = count;
                 break;
         default:
                 ret = -EINVAL;
@@ -584,19 +588,14 @@ static DEVICE_ATTR(modalias, 0444, modalias_show, NULL);
 static DEVICE_ATTR(online, 0644, online_show, online_store);
 static DEVICE_ATTR(availability, 0444, available_show, NULL);
 
-static struct attribute * subch_attrs[] = {
+static struct attribute *io_subchannel_attrs[] = {
         &dev_attr_chpids.attr,
         &dev_attr_pimpampom.attr,
         NULL,
 };
 
-static struct attribute_group subch_attr_group = {
-        .attrs = subch_attrs,
-};
-
-struct attribute_group *subch_attr_groups[] = {
-        &subch_attr_group,
-        NULL,
+static struct attribute_group io_subchannel_attr_group = {
+        .attrs = io_subchannel_attrs,
 };
 
 static struct attribute * ccwdev_attrs[] = {
@@ -790,7 +789,7 @@ static void sch_attach_device(struct subchannel *sch,
         sch_set_cdev(sch, cdev);
         cdev->private->schid = sch->schid;
         cdev->ccwlock = sch->lock;
-        device_trigger_reprobe(sch);
+        ccw_device_trigger_reprobe(cdev);
         spin_unlock_irq(sch->lock);
 }
 
@@ -1037,7 +1036,6 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
         struct ccw_device_private *priv;
 
         sch_set_cdev(sch, cdev);
-        sch->driver = &io_subchannel_driver;
         cdev->ccwlock = sch->lock;
 
         /* Init private data. */
@@ -1122,8 +1120,33 @@ static void io_subchannel_irq(struct subchannel *sch)
                 dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
 }
 
-static int
-io_subchannel_probe (struct subchannel *sch)
+static void io_subchannel_init_fields(struct subchannel *sch)
+{
+        if (cio_is_console(sch->schid))
+                sch->opm = 0xff;
+        else
+                sch->opm = chp_get_sch_opm(sch);
+        sch->lpm = sch->schib.pmcw.pam & sch->opm;
+        sch->isc = cio_is_console(sch->schid) ? CONSOLE_ISC : IO_SCH_ISC;
+
+        CIO_MSG_EVENT(6, "Detected device %04x on subchannel 0.%x.%04X"
+                      " - PIM = %02X, PAM = %02X, POM = %02X\n",
+                      sch->schib.pmcw.dev, sch->schid.ssid,
+                      sch->schid.sch_no, sch->schib.pmcw.pim,
+                      sch->schib.pmcw.pam, sch->schib.pmcw.pom);
+        /* Initially set up some fields in the pmcw. */
+        sch->schib.pmcw.ena = 0;
+        sch->schib.pmcw.csense = 1;     /* concurrent sense */
+        if ((sch->lpm & (sch->lpm - 1)) != 0)
+                sch->schib.pmcw.mp = 1; /* multipath mode */
+        /* clean up possible residual cmf stuff */
+        sch->schib.pmcw.mme = 0;
+        sch->schib.pmcw.mbfc = 0;
+        sch->schib.pmcw.mbi = 0;
+        sch->schib.mba = 0;
+}
+
+static int io_subchannel_probe(struct subchannel *sch)
 {
         struct ccw_device *cdev;
         int rc;
@@ -1132,11 +1155,21 @@ io_subchannel_probe (struct subchannel *sch)
 
         cdev = sch_get_cdev(sch);
         if (cdev) {
+                rc = sysfs_create_group(&sch->dev.kobj,
+                                        &io_subchannel_attr_group);
+                if (rc)
+                        CIO_MSG_EVENT(0, "Failed to create io subchannel "
+                                      "attributes for subchannel "
+                                      "0.%x.%04x (rc=%d)\n",
+                                      sch->schid.ssid, sch->schid.sch_no, rc);
                 /*
                  * This subchannel already has an associated ccw_device.
-                 * Register it and exit. This happens for all early
-                 * device, e.g. the console.
+                 * Throw the delayed uevent for the subchannel, register
+                 * the ccw_device and exit. This happens for all early
+                 * devices, e.g. the console.
                  */
+                sch->dev.uevent_suppress = 0;
+                kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
                 cdev->dev.groups = ccwdev_attr_groups;
                 device_initialize(&cdev->dev);
                 ccw_device_register(cdev);
@@ -1152,17 +1185,24 @@ io_subchannel_probe (struct subchannel *sch)
                         get_device(&cdev->dev);
                 return 0;
         }
+        io_subchannel_init_fields(sch);
         /*
          * First check if a fitting device may be found amongst the
          * disconnected devices or in the orphanage.
          */
         dev_id.devno = sch->schib.pmcw.dev;
         dev_id.ssid = sch->schid.ssid;
+        rc = sysfs_create_group(&sch->dev.kobj,
+                                &io_subchannel_attr_group);
+        if (rc)
+                return rc;
         /* Allocate I/O subchannel private data. */
         sch->private = kzalloc(sizeof(struct io_subchannel_private),
                                GFP_KERNEL | GFP_DMA);
-        if (!sch->private)
-                return -ENOMEM;
+        if (!sch->private) {
+                rc = -ENOMEM;
+                goto out_err;
+        }
         cdev = get_disc_ccwdev_by_dev_id(&dev_id, NULL);
         if (!cdev)
                 cdev = get_orphaned_ccwdev_by_dev_id(to_css(sch->dev.parent),
@@ -1181,8 +1221,8 @@ io_subchannel_probe (struct subchannel *sch)
         }
         cdev = io_subchannel_create_ccwdev(sch);
         if (IS_ERR(cdev)) {
-                kfree(sch->private);
-                return PTR_ERR(cdev);
+                rc = PTR_ERR(cdev);
+                goto out_err;
         }
         rc = io_subchannel_recog(cdev, sch);
         if (rc) {
@@ -1191,9 +1231,12 @@ io_subchannel_probe (struct subchannel *sch)
                 spin_unlock_irqrestore(sch->lock, flags);
                 if (cdev->dev.release)
                         cdev->dev.release(&cdev->dev);
-                kfree(sch->private);
+                goto out_err;
         }
-
+        return 0;
+out_err:
+        kfree(sch->private);
+        sysfs_remove_group(&sch->dev.kobj, &io_subchannel_attr_group);
         return rc;
 }
 
@@ -1214,6 +1257,7 @@ io_subchannel_remove (struct subchannel *sch)
         ccw_device_unregister(cdev);
         put_device(&cdev->dev);
         kfree(sch->private);
+        sysfs_remove_group(&sch->dev.kobj, &io_subchannel_attr_group);
         return 0;
 }
 
@@ -1224,11 +1268,7 @@ static int io_subchannel_notify(struct subchannel *sch, int event)
         cdev = sch_get_cdev(sch);
         if (!cdev)
                 return 0;
-        if (!cdev->drv)
-                return 0;
-        if (!cdev->online)
-                return 0;
-        return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
+        return ccw_device_notify(cdev, event);
 }
 
 static void io_subchannel_verify(struct subchannel *sch)
@@ -1240,22 +1280,96 @@ static void io_subchannel_verify(struct subchannel *sch)
                 dev_fsm_event(cdev, DEV_EVENT_VERIFY);
 }
 
-static void io_subchannel_ioterm(struct subchannel *sch)
+static int check_for_io_on_path(struct subchannel *sch, int mask)
 {
-        struct ccw_device *cdev;
+        int cc;
 
-        cdev = sch_get_cdev(sch);
-        if (!cdev)
-                return;
-        /* Internal I/O will be retried by the interrupt handler. */
-        if (cdev->private->flags.intretry)
+        cc = stsch(sch->schid, &sch->schib);
+        if (cc)
+                return 0;
+        if (scsw_actl(&sch->schib.scsw) && sch->schib.pmcw.lpum == mask)
+                return 1;
+        return 0;
+}
+
+static void terminate_internal_io(struct subchannel *sch,
+                                  struct ccw_device *cdev)
+{
+        if (cio_clear(sch)) {
+                /* Recheck device in case clear failed. */
+                sch->lpm = 0;
+                if (cdev->online)
+                        dev_fsm_event(cdev, DEV_EVENT_VERIFY);
+                else
+                        css_schedule_eval(sch->schid);
                 return;
+        }
         cdev->private->state = DEV_STATE_CLEAR_VERIFY;
+        /* Request retry of internal operation. */
+        cdev->private->flags.intretry = 1;
+        /* Call handler. */
         if (cdev->handler)
                 cdev->handler(cdev, cdev->private->intparm,
                               ERR_PTR(-EIO));
 }
 
+static void io_subchannel_terminate_path(struct subchannel *sch, u8 mask)
+{
+        struct ccw_device *cdev;
+
+        cdev = sch_get_cdev(sch);
+        if (!cdev)
+                return;
+        if (check_for_io_on_path(sch, mask)) {
+                if (cdev->private->state == DEV_STATE_ONLINE)
+                        ccw_device_kill_io(cdev);
+                else {
+                        terminate_internal_io(sch, cdev);
+                        /* Re-start path verification. */
+                        dev_fsm_event(cdev, DEV_EVENT_VERIFY);
+                }
+        } else
+                /* trigger path verification. */
+                dev_fsm_event(cdev, DEV_EVENT_VERIFY);
+
+}
+
+static int io_subchannel_chp_event(struct subchannel *sch,
+                                   struct chp_link *link, int event)
+{
+        int mask;
+
+        mask = chp_ssd_get_mask(&sch->ssd_info, link);
+        if (!mask)
+                return 0;
+        switch (event) {
+        case CHP_VARY_OFF:
+                sch->opm &= ~mask;
+                sch->lpm &= ~mask;
+                io_subchannel_terminate_path(sch, mask);
+                break;
+        case CHP_VARY_ON:
+                sch->opm |= mask;
+                sch->lpm |= mask;
+                io_subchannel_verify(sch);
+                break;
+        case CHP_OFFLINE:
+                if (stsch(sch->schid, &sch->schib))
+                        return -ENXIO;
+                if (!css_sch_is_valid(&sch->schib))
+                        return -ENODEV;
+                io_subchannel_terminate_path(sch, mask);
+                break;
+        case CHP_ONLINE:
+                if (stsch(sch->schid, &sch->schib))
+                        return -ENXIO;
+                sch->lpm |= mask & sch->opm;
+                io_subchannel_verify(sch);
+                break;
+        }
+        return 0;
+}
+
 static void
 io_subchannel_shutdown(struct subchannel *sch)
 {
@@ -1285,6 +1399,195 @@ io_subchannel_shutdown(struct subchannel *sch)
         cio_disable_subchannel(sch);
 }
 
+static int io_subchannel_get_status(struct subchannel *sch)
+{
+        struct schib schib;
+
+        if (stsch(sch->schid, &schib) || !schib.pmcw.dnv)
+                return CIO_GONE;
+        if (sch->schib.pmcw.dnv && (schib.pmcw.dev != sch->schib.pmcw.dev))
+                return CIO_REVALIDATE;
+        if (!sch->lpm)
+                return CIO_NO_PATH;
+        return CIO_OPER;
+}
+
+static int device_is_disconnected(struct ccw_device *cdev)
+{
+        if (!cdev)
+                return 0;
+        return (cdev->private->state == DEV_STATE_DISCONNECTED ||
+                cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID);
+}
+
+static int recovery_check(struct device *dev, void *data)
+{
+        struct ccw_device *cdev = to_ccwdev(dev);
+        int *redo = data;
+
+        spin_lock_irq(cdev->ccwlock);
+        switch (cdev->private->state) {
+        case DEV_STATE_DISCONNECTED:
+                CIO_MSG_EVENT(3, "recovery: trigger 0.%x.%04x\n",
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno);
+                dev_fsm_event(cdev, DEV_EVENT_VERIFY);
+                *redo = 1;
+                break;
+        case DEV_STATE_DISCONNECTED_SENSE_ID:
+                *redo = 1;
+                break;
+        }
+        spin_unlock_irq(cdev->ccwlock);
+
+        return 0;
+}
+
+static void recovery_work_func(struct work_struct *unused)
+{
+        int redo = 0;
+
+        bus_for_each_dev(&ccw_bus_type, NULL, &redo, recovery_check);
+        if (redo) {
+                spin_lock_irq(&recovery_lock);
+                if (!timer_pending(&recovery_timer)) {
+                        if (recovery_phase < ARRAY_SIZE(recovery_delay) - 1)
+                                recovery_phase++;
+                        mod_timer(&recovery_timer, jiffies +
+                                  recovery_delay[recovery_phase] * HZ);
+                }
+                spin_unlock_irq(&recovery_lock);
+        } else
+                CIO_MSG_EVENT(4, "recovery: end\n");
+}
+
+static DECLARE_WORK(recovery_work, recovery_work_func);
+
+static void recovery_func(unsigned long data)
+{
+        /*
+         * We can't do our recovery in softirq context and it's not
+         * performance critical, so we schedule it.
+         */
+        schedule_work(&recovery_work);
+}
+
+static void ccw_device_schedule_recovery(void)
+{
+        unsigned long flags;
+
+        CIO_MSG_EVENT(4, "recovery: schedule\n");
+        spin_lock_irqsave(&recovery_lock, flags);
+        if (!timer_pending(&recovery_timer) || (recovery_phase != 0)) {
+                recovery_phase = 0;
+                mod_timer(&recovery_timer, jiffies + recovery_delay[0] * HZ);
+        }
+        spin_unlock_irqrestore(&recovery_lock, flags);
+}
+
+static void device_set_disconnected(struct ccw_device *cdev)
+{
+        if (!cdev)
+                return;
+        ccw_device_set_timeout(cdev, 0);
+        cdev->private->flags.fake_irb = 0;
+        cdev->private->state = DEV_STATE_DISCONNECTED;
+        if (cdev->online)
+                ccw_device_schedule_recovery();
+}
+
+static int io_subchannel_sch_event(struct subchannel *sch, int slow)
+{
+        int event, ret, disc;
+        unsigned long flags;
+        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE } action;
+        struct ccw_device *cdev;
+
+        spin_lock_irqsave(sch->lock, flags);
+        cdev = sch_get_cdev(sch);
+        disc = device_is_disconnected(cdev);
+        if (disc && slow) {
+                /* Disconnected devices are evaluated directly only.*/
+                spin_unlock_irqrestore(sch->lock, flags);
+                return 0;
+        }
+        /* No interrupt after machine check - kill pending timers. */
+        if (cdev)
+                ccw_device_set_timeout(cdev, 0);
+        if (!disc && !slow) {
+                /* Non-disconnected devices are evaluated on the slow path. */
+                spin_unlock_irqrestore(sch->lock, flags);
+                return -EAGAIN;
+        }
+        event = io_subchannel_get_status(sch);
+        CIO_MSG_EVENT(4, "Evaluating schid 0.%x.%04x, event %d, %s, %s path.\n",
+                      sch->schid.ssid, sch->schid.sch_no, event,
+                      disc ? "disconnected" : "normal",
+                      slow ? "slow" : "fast");
+        /* Analyze subchannel status. */
+        action = NONE;
+        switch (event) {
+        case CIO_NO_PATH:
+                if (disc) {
+                        /* Check if paths have become available. */
+                        action = REPROBE;
+                        break;
+                }
+                /* fall through */
+        case CIO_GONE:
+                /* Prevent unwanted effects when opening lock. */
+                cio_disable_subchannel(sch);
+                device_set_disconnected(cdev);
+                /* Ask driver what to do with device. */
+                action = UNREGISTER;
+                spin_unlock_irqrestore(sch->lock, flags);
+                ret = io_subchannel_notify(sch, event);
+                spin_lock_irqsave(sch->lock, flags);
+                if (ret)
+                        action = NONE;
+                break;
+        case CIO_REVALIDATE:
+                /* Device will be removed, so no notify necessary. */
+                if (disc)
+                        /* Reprobe because immediate unregister might block. */
+                        action = REPROBE;
+                else
+                        action = UNREGISTER_PROBE;
+                break;
+        case CIO_OPER:
+                if (disc)
+                        /* Get device operational again. */
+                        action = REPROBE;
+                break;
+        }
+        /* Perform action. */
+        ret = 0;
+        switch (action) {
+        case UNREGISTER:
+        case UNREGISTER_PROBE:
+                /* Unregister device (will use subchannel lock). */
+                spin_unlock_irqrestore(sch->lock, flags);
+                css_sch_device_unregister(sch);
+                spin_lock_irqsave(sch->lock, flags);
+
+                /* Reset intparm to zeroes. */
+                sch->schib.pmcw.intparm = 0;
+                cio_modify(sch);
+                break;
+        case REPROBE:
+                ccw_device_trigger_reprobe(cdev);
+                break;
+        default:
+                break;
+        }
+        spin_unlock_irqrestore(sch->lock, flags);
+        /* Probe if necessary. */
+        if (action == UNREGISTER_PROBE)
+                ret = css_probe_device(sch->schid);
+
+        return ret;
+}
+
 #ifdef CONFIG_CCW_CONSOLE
 static struct ccw_device console_cdev;
 static struct ccw_device_private console_private;
@@ -1297,14 +1600,16 @@ spinlock_t * cio_get_console_lock(void)
         return &ccw_console_lock;
 }
 
-static int
-ccw_device_console_enable (struct ccw_device *cdev, struct subchannel *sch)
+static int ccw_device_console_enable(struct ccw_device *cdev,
+                                     struct subchannel *sch)
 {
         int rc;
 
         /* Attach subchannel private data. */
         sch->private = cio_get_console_priv();
         memset(sch->private, 0, sizeof(struct io_subchannel_private));
+        io_subchannel_init_fields(sch);
+        sch->driver = &io_subchannel_driver;
         /* Initialize the ccw_device structure. */
         cdev->dev.parent= &sch->dev;
         rc = io_subchannel_recog(cdev, sch);
@@ -1515,71 +1820,6 @@ ccw_device_get_subchannel_id(struct ccw_device *cdev)
         return sch->schid;
 }
 
-static int recovery_check(struct device *dev, void *data)
-{
-        struct ccw_device *cdev = to_ccwdev(dev);
-        int *redo = data;
-
-        spin_lock_irq(cdev->ccwlock);
-        switch (cdev->private->state) {
-        case DEV_STATE_DISCONNECTED:
-                CIO_MSG_EVENT(4, "recovery: trigger 0.%x.%04x\n",
-                              cdev->private->dev_id.ssid,
-                              cdev->private->dev_id.devno);
-                dev_fsm_event(cdev, DEV_EVENT_VERIFY);
-                *redo = 1;
-                break;
-        case DEV_STATE_DISCONNECTED_SENSE_ID:
-                *redo = 1;
-                break;
-        }
-        spin_unlock_irq(cdev->ccwlock);
-
-        return 0;
-}
-
-static void recovery_work_func(struct work_struct *unused)
-{
-        int redo = 0;
-
-        bus_for_each_dev(&ccw_bus_type, NULL, &redo, recovery_check);
-        if (redo) {
-                spin_lock_irq(&recovery_lock);
-                if (!timer_pending(&recovery_timer)) {
-                        if (recovery_phase < ARRAY_SIZE(recovery_delay) - 1)
-                                recovery_phase++;
-                        mod_timer(&recovery_timer, jiffies +
-                                  recovery_delay[recovery_phase] * HZ);
-                }
-                spin_unlock_irq(&recovery_lock);
-        } else
-                CIO_MSG_EVENT(4, "recovery: end\n");
-}
-
-static DECLARE_WORK(recovery_work, recovery_work_func);
-
-static void recovery_func(unsigned long data)
-{
-        /*
-         * We can't do our recovery in softirq context and it's not
-         * performance critical, so we schedule it.
-         */
-        schedule_work(&recovery_work);
-}
-
-void ccw_device_schedule_recovery(void)
-{
-        unsigned long flags;
-
-        CIO_MSG_EVENT(4, "recovery: schedule\n");
-        spin_lock_irqsave(&recovery_lock, flags);
-        if (!timer_pending(&recovery_timer) || (recovery_phase != 0)) {
-                recovery_phase = 0;
-                mod_timer(&recovery_timer, jiffies + recovery_delay[0] * HZ);
-        }
-        spin_unlock_irqrestore(&recovery_lock, flags);
-}
-
 MODULE_LICENSE("GPL");
 EXPORT_SYMBOL(ccw_device_set_online);
 EXPORT_SYMBOL(ccw_device_set_offline);
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index cb08092be39f..9800a8335a3f 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -88,8 +88,6 @@ int ccw_device_recognition(struct ccw_device *);
 int ccw_device_online(struct ccw_device *);
 int ccw_device_offline(struct ccw_device *);
 
-void ccw_device_schedule_recovery(void);
-
 /* Function prototypes for device status and basic sense stuff. */
 void ccw_device_accumulate_irb(struct ccw_device *, struct irb *);
 void ccw_device_accumulate_basic_sense(struct ccw_device *, struct irb *);
@@ -118,6 +116,11 @@ int ccw_device_call_handler(struct ccw_device *);
 
 int ccw_device_stlck(struct ccw_device *);
 
+/* Helper function for machine check handling. */
+void ccw_device_trigger_reprobe(struct ccw_device *);
+void ccw_device_kill_io(struct ccw_device *);
+int ccw_device_notify(struct ccw_device *, int);
+
 /* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
 extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index e268d5a77c12..8b5fe57fb2f3 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -2,8 +2,7 @@
  * drivers/s390/cio/device_fsm.c
  * finite state machine for device handling
  *
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
- *                       IBM Corporation
+ *    Copyright IBM Corp. 2002,2008
  *    Author(s): Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
@@ -27,65 +26,6 @@
 
 static int timeout_log_enabled;
 
-int
-device_is_online(struct subchannel *sch)
-{
-        struct ccw_device *cdev;
-
-        cdev = sch_get_cdev(sch);
-        if (!cdev)
-                return 0;
-        return (cdev->private->state == DEV_STATE_ONLINE);
-}
-
-int
-device_is_disconnected(struct subchannel *sch)
-{
-        struct ccw_device *cdev;
-
-        cdev = sch_get_cdev(sch);
-        if (!cdev)
-                return 0;
-        return (cdev->private->state == DEV_STATE_DISCONNECTED ||
-                cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID);
-}
-
-void
-device_set_disconnected(struct subchannel *sch)
-{
-        struct ccw_device *cdev;
-
-        cdev = sch_get_cdev(sch);
-        if (!cdev)
-                return;
-        ccw_device_set_timeout(cdev, 0);
-        cdev->private->flags.fake_irb = 0;
-        cdev->private->state = DEV_STATE_DISCONNECTED;
-        if (cdev->online)
-                ccw_device_schedule_recovery();
-}
-
-void device_set_intretry(struct subchannel *sch)
-{
-        struct ccw_device *cdev;
-
-        cdev = sch_get_cdev(sch);
-        if (!cdev)
-                return;
-        cdev->private->flags.intretry = 1;
-}
-
-int device_trigger_verify(struct subchannel *sch)
-{
-        struct ccw_device *cdev;
-
-        cdev = sch_get_cdev(sch);
-        if (!cdev || !cdev->online)
-                return -EINVAL;
-        dev_fsm_event(cdev, DEV_EVENT_VERIFY);
-        return 0;
-}
-
 static int __init ccw_timeout_log_setup(char *unused)
 {
         timeout_log_enabled = 1;
@@ -99,31 +39,43 @@ static void ccw_timeout_log(struct ccw_device *cdev)
         struct schib schib;
         struct subchannel *sch;
         struct io_subchannel_private *private;
+        union orb *orb;
         int cc;
 
         sch = to_subchannel(cdev->dev.parent);
         private = to_io_private(sch);
+        orb = &private->orb;
         cc = stsch(sch->schid, &schib);
 
         printk(KERN_WARNING "cio: ccw device timeout occurred at %llx, "
                "device information:\n", get_clock());
         printk(KERN_WARNING "cio: orb:\n");
         print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,
-                       &private->orb, sizeof(private->orb), 0);
+                       orb, sizeof(*orb), 0);
         printk(KERN_WARNING "cio: ccw device bus id: %s\n", cdev->dev.bus_id);
         printk(KERN_WARNING "cio: subchannel bus id: %s\n", sch->dev.bus_id);
         printk(KERN_WARNING "cio: subchannel lpm: %02x, opm: %02x, "
                "vpm: %02x\n", sch->lpm, sch->opm, sch->vpm);
 
-        if ((void *)(addr_t)private->orb.cpa == &private->sense_ccw ||
-            (void *)(addr_t)private->orb.cpa == cdev->private->iccws)
-                printk(KERN_WARNING "cio: last channel program (intern):\n");
-        else
-                printk(KERN_WARNING "cio: last channel program:\n");
-
-        print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,
-                       (void *)(addr_t)private->orb.cpa,
-                       sizeof(struct ccw1), 0);
+        if (orb->tm.b) {
+                printk(KERN_WARNING "cio: orb indicates transport mode\n");
+                printk(KERN_WARNING "cio: last tcw:\n");
+                print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,
+                               (void *)(addr_t)orb->tm.tcw,
+                               sizeof(struct tcw), 0);
+        } else {
+                printk(KERN_WARNING "cio: orb indicates command mode\n");
+                if ((void *)(addr_t)orb->cmd.cpa == &private->sense_ccw ||
+                    (void *)(addr_t)orb->cmd.cpa == cdev->private->iccws)
+                        printk(KERN_WARNING "cio: last channel program "
+                               "(intern):\n");
+                else
+                        printk(KERN_WARNING "cio: last channel program:\n");
+
+                print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,
+                               (void *)(addr_t)orb->cmd.cpa,
+                               sizeof(struct ccw1), 0);
+        }
         printk(KERN_WARNING "cio: ccw device state: %d\n",
                cdev->private->state);
         printk(KERN_WARNING "cio: store subchannel returned: cc=%d\n", cc);
@@ -171,18 +123,6 @@ ccw_device_set_timeout(struct ccw_device *cdev, int expires)
         add_timer(&cdev->private->timer);
 }
 
-/* Kill any pending timers after machine check. */
-void
-device_kill_pending_timer(struct subchannel *sch)
-{
-        struct ccw_device *cdev;
-
-        cdev = sch_get_cdev(sch);
-        if (!cdev)
-                return;
-        ccw_device_set_timeout(cdev, 0);
-}
-
 /*
  * Cancel running i/o. This is called repeatedly since halt/clear are
  * asynchronous operations. We do one try with cio_cancel, two tries
@@ -205,15 +145,18 @@ ccw_device_cancel_halt_clear(struct ccw_device *cdev)
                 /* Not operational -> done. */
                 return 0;
         /* Stage 1: cancel io. */
-        if (!(sch->schib.scsw.actl & SCSW_ACTL_HALT_PEND) &&
-            !(sch->schib.scsw.actl & SCSW_ACTL_CLEAR_PEND)) {
-                ret = cio_cancel(sch);
-                if (ret != -EINVAL)
-                        return ret;
-                /* cancel io unsuccessful. From now on it is asynchronous. */
+        if (!(scsw_actl(&sch->schib.scsw) & SCSW_ACTL_HALT_PEND) &&
+            !(scsw_actl(&sch->schib.scsw) & SCSW_ACTL_CLEAR_PEND)) {
+                if (!scsw_is_tm(&sch->schib.scsw)) {
+                        ret = cio_cancel(sch);
+                        if (ret != -EINVAL)
+                                return ret;
+                }
+                /* cancel io unsuccessful or not applicable (transport mode).
+                 * Continue with asynchronous instructions. */
                 cdev->private->iretry = 3;      /* 3 halt retries. */
         }
-        if (!(sch->schib.scsw.actl & SCSW_ACTL_CLEAR_PEND)) {
+        if (!(scsw_actl(&sch->schib.scsw) & SCSW_ACTL_CLEAR_PEND)) {
                 /* Stage 2: halt io. */
                 if (cdev->private->iretry) {
                         cdev->private->iretry--;
@@ -388,34 +331,30 @@ ccw_device_sense_id_done(struct ccw_device *cdev, int err)
         }
 }
 
+int ccw_device_notify(struct ccw_device *cdev, int event)
+{
+        if (!cdev->drv)
+                return 0;
+        if (!cdev->online)
+                return 0;
+        return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
+}
+
 static void
 ccw_device_oper_notify(struct work_struct *work)
 {
         struct ccw_device_private *priv;
         struct ccw_device *cdev;
-        struct subchannel *sch;
         int ret;
-        unsigned long flags;
 
         priv = container_of(work, struct ccw_device_private, kick_work);
         cdev = priv->cdev;
-        spin_lock_irqsave(cdev->ccwlock, flags);
-        sch = to_subchannel(cdev->dev.parent);
-        if (sch->driver && sch->driver->notify) {
-                spin_unlock_irqrestore(cdev->ccwlock, flags);
-                ret = sch->driver->notify(sch, CIO_OPER);
-                spin_lock_irqsave(cdev->ccwlock, flags);
-        } else
-                ret = 0;
+        ret = ccw_device_notify(cdev, CIO_OPER);
         if (ret) {
                 /* Reenable channel measurements, if needed. */
-                spin_unlock_irqrestore(cdev->ccwlock, flags);
                 cmf_reenable(cdev);
-                spin_lock_irqsave(cdev->ccwlock, flags);
                 wake_up(&cdev->private->wait_q);
-        }
-        spin_unlock_irqrestore(cdev->ccwlock, flags);
-        if (!ret)
+        } else
                 /* Driver doesn't want device back. */
                 ccw_device_do_unreg_rereg(work);
 }
@@ -621,10 +560,11 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
                 /* Deliver fake irb to device driver, if needed. */
                 if (cdev->private->flags.fake_irb) {
                         memset(&cdev->private->irb, 0, sizeof(struct irb));
-                        cdev->private->irb.scsw.cc = 1;
-                        cdev->private->irb.scsw.fctl = SCSW_FCTL_START_FUNC;
-                        cdev->private->irb.scsw.actl = SCSW_ACTL_START_PEND;
-                        cdev->private->irb.scsw.stctl = SCSW_STCTL_STATUS_PEND;
+                        cdev->private->irb.scsw.cmd.cc = 1;
+                        cdev->private->irb.scsw.cmd.fctl = SCSW_FCTL_START_FUNC;
+                        cdev->private->irb.scsw.cmd.actl = SCSW_ACTL_START_PEND;
+                        cdev->private->irb.scsw.cmd.stctl =
+                                SCSW_STCTL_STATUS_PEND;
                         cdev->private->flags.fake_irb = 0;
                         if (cdev->handler)
                                 cdev->handler(cdev, cdev->private->intparm,
@@ -718,13 +658,10 @@ ccw_device_offline(struct ccw_device *cdev)
         sch = to_subchannel(cdev->dev.parent);
         if (stsch(sch->schid, &sch->schib) || !sch->schib.pmcw.dnv)
                 return -ENODEV;
-        if (cdev->private->state != DEV_STATE_ONLINE) {
-                if (sch->schib.scsw.actl != 0)
-                        return -EBUSY;
-                return -EINVAL;
-        }
-        if (sch->schib.scsw.actl != 0)
+        if (scsw_actl(&sch->schib.scsw) != 0)
                 return -EBUSY;
+        if (cdev->private->state != DEV_STATE_ONLINE)
+                return -EINVAL;
         /* Are we doing path grouping? */
         if (!cdev->private->options.pgroup) {
                 /* No, set state offline immediately. */
@@ -799,9 +736,9 @@ ccw_device_online_verify(struct ccw_device *cdev, enum dev_event dev_event)
          */
         stsch(sch->schid, &sch->schib);
 
-        if (sch->schib.scsw.actl != 0 ||
-            (sch->schib.scsw.stctl & SCSW_STCTL_STATUS_PEND) ||
-            (cdev->private->irb.scsw.stctl & SCSW_STCTL_STATUS_PEND)) {
+        if (scsw_actl(&sch->schib.scsw) != 0 ||
+            (scsw_stctl(&sch->schib.scsw) & SCSW_STCTL_STATUS_PEND) ||
+            (scsw_stctl(&cdev->private->irb.scsw) & SCSW_STCTL_STATUS_PEND)) {
                 /*
                  * No final status yet or final status not yet delivered
                  * to the device driver. Can't do path verfication now,
@@ -823,13 +760,13 @@ static void
 ccw_device_irq(struct ccw_device *cdev, enum dev_event dev_event)
 {
         struct irb *irb;
+        int is_cmd;
 
         irb = (struct irb *) __LC_IRB;
+        is_cmd = !scsw_is_tm(&irb->scsw);
         /* Check for unsolicited interrupt. */
-        if ((irb->scsw.stctl ==
-                        (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS))
-            && (!irb->scsw.cc)) {
-                if ((irb->scsw.dstat & DEV_STAT_UNIT_CHECK) &&
+        if (!scsw_is_solicited(&irb->scsw)) {
+                if (is_cmd && (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) &&
                     !irb->esw.esw0.erw.cons) {
                         /* Unit check but no sense data. Need basic sense. */
                         if (ccw_device_do_sense(cdev, irb) != 0)
@@ -848,7 +785,7 @@ call_handler_unsol:
         }
         /* Accumulate status and find out if a basic sense is needed. */
         ccw_device_accumulate_irb(cdev, irb);
-        if (cdev->private->flags.dosense) {
+        if (is_cmd && cdev->private->flags.dosense) {
                 if (ccw_device_do_sense(cdev, irb) == 0) {
                         cdev->private->state = DEV_STATE_W4SENSE;
                 }
@@ -892,9 +829,9 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
 
         irb = (struct irb *) __LC_IRB;
         /* Check for unsolicited interrupt. */
-        if (irb->scsw.stctl ==
-                        (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) {
-                if (irb->scsw.cc == 1)
+        if (scsw_stctl(&irb->scsw) ==
+            (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) {
+                if (scsw_cc(&irb->scsw) == 1)
                         /* Basic sense hasn't started. Try again. */
                         ccw_device_do_sense(cdev, irb);
                 else {
@@ -912,7 +849,8 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
          * only deliver the halt/clear interrupt to the device driver as if it
          * had killed the original request.
          */
-        if (irb->scsw.fctl & (SCSW_FCTL_CLEAR_FUNC | SCSW_FCTL_HALT_FUNC)) {
+        if (scsw_fctl(&irb->scsw) &
+            (SCSW_FCTL_CLEAR_FUNC | SCSW_FCTL_HALT_FUNC)) {
                 /* Retry Basic Sense if requested. */
                 if (cdev->private->flags.intretry) {
                         cdev->private->flags.intretry = 0;
@@ -986,12 +924,10 @@ ccw_device_killing_timeout(struct ccw_device *cdev, enum dev_event dev_event)
                               ERR_PTR(-EIO));
 }
 
-void device_kill_io(struct subchannel *sch)
+void ccw_device_kill_io(struct ccw_device *cdev)
 {
         int ret;
-        struct ccw_device *cdev;
 
-        cdev = sch_get_cdev(sch);
         ret = ccw_device_cancel_halt_clear(cdev);
         if (ret == -EBUSY) {
                 ccw_device_set_timeout(cdev, 3*HZ);
@@ -1021,9 +957,9 @@ ccw_device_stlck_done(struct ccw_device *cdev, enum dev_event dev_event)
         case DEV_EVENT_INTERRUPT:
                 irb = (struct irb *) __LC_IRB;
                 /* Check for unsolicited interrupt. */
-                if ((irb->scsw.stctl ==
+                if ((scsw_stctl(&irb->scsw) ==
                      (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) &&
-                    (!irb->scsw.cc))
+                    (!scsw_cc(&irb->scsw)))
                         /* FIXME: we should restart stlck here, but this
                          * is extremely unlikely ... */
                         goto out_wakeup;
@@ -1055,17 +991,14 @@ ccw_device_start_id(struct ccw_device *cdev, enum dev_event dev_event)
         ccw_device_sense_id_start(cdev);
 }
 
-void
-device_trigger_reprobe(struct subchannel *sch)
+void ccw_device_trigger_reprobe(struct ccw_device *cdev)
 {
-        struct ccw_device *cdev;
+        struct subchannel *sch;
 
-        cdev = sch_get_cdev(sch);
-        if (!cdev)
-                return;
         if (cdev->private->state != DEV_STATE_DISCONNECTED)
                 return;
 
+        sch = to_subchannel(cdev->dev.parent);
         /* Update some values. */
         if (stsch(sch->schid, &sch->schib))
                 return;
@@ -1081,7 +1014,6 @@ device_trigger_reprobe(struct subchannel *sch)
         sch->schib.pmcw.ena = 0;
         if ((sch->lpm & (sch->lpm - 1)) != 0)
                 sch->schib.pmcw.mp = 1;
-        sch->schib.pmcw.intparm = (u32)(addr_t)sch;
         /* We should also udate ssd info, but this has to wait. */
         /* Check if this is another device which appeared on the same sch. */
         if (sch->schib.pmcw.dev != cdev->private->dev_id.devno) {
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index cba7020517ed..1bdaa614e34f 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -196,7 +196,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
         irb = &cdev->private->irb;
 
         /* Check the error cases. */
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+        if (irb->scsw.cmd.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
                 /* Retry Sense ID if requested. */
                 if (cdev->private->flags.intretry) {
                         cdev->private->flags.intretry = 0;
@@ -234,10 +234,10 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                               irb->ecw[6], irb->ecw[7]);
                 return -EAGAIN;
         }
-        if (irb->scsw.cc == 3) {
+        if (irb->scsw.cmd.cc == 3) {
                 u8 lpm;
 
-                lpm = to_io_private(sch)->orb.lpm;
+                lpm = to_io_private(sch)->orb.cmd.lpm;
                 if ((lpm & sch->schib.pmcw.pim & sch->schib.pmcw.pam) != 0)
                         CIO_MSG_EVENT(4, "SenseID : path %02X for device %04x "
                                       "on subchannel 0.%x.%04x is "
@@ -248,9 +248,9 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
         }
 
         /* Did we get a proper answer ? */
-        if (irb->scsw.cc == 0 && cdev->private->senseid.cu_type != 0xFFFF &&
+        if (irb->scsw.cmd.cc == 0 && cdev->private->senseid.cu_type != 0xFFFF &&
             cdev->private->senseid.reserved == 0xFF) {
-                if (irb->scsw.count < sizeof(struct senseid) - 8)
+                if (irb->scsw.cmd.count < sizeof(struct senseid) - 8)
                         cdev->private->flags.esid = 1;
                 return 0; /* Success */
         }
@@ -260,7 +260,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                       "subchannel 0.%x.%04x returns status %02X%02X\n",
                       cdev->private->dev_id.devno, sch->schid.ssid,
                       sch->schid.sch_no,
-                      irb->scsw.dstat, irb->scsw.cstat);
+                      irb->scsw.cmd.dstat, irb->scsw.cmd.cstat);
         return -EAGAIN;
 }
 
@@ -277,9 +277,9 @@ ccw_device_sense_id_irq(struct ccw_device *cdev, enum dev_event dev_event)
         sch = to_subchannel(cdev->dev.parent);
         irb = (struct irb *) __LC_IRB;
         /* Retry sense id, if needed. */
-        if (irb->scsw.stctl ==
+        if (irb->scsw.cmd.stctl ==
             (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) {
-                if ((irb->scsw.cc == 1) || !irb->scsw.actl) {
+                if ((irb->scsw.cmd.cc == 1) || !irb->scsw.cmd.actl) {
                         ret = __ccw_device_sense_id_start(cdev);
                         if (ret && ret != -EBUSY)
                                 ccw_device_sense_id_done(cdev, ret);
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index f308ad55a6d5..ee1a28310fbb 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -17,6 +17,7 @@
 #include <asm/ccwdev.h>
 #include <asm/idals.h>
 #include <asm/chpid.h>
+#include <asm/fcx.h>
 
 #include "cio.h"
 #include "cio_debug.h"
@@ -179,8 +180,8 @@ int ccw_device_start_key(struct ccw_device *cdev, struct ccw1 *cpa,
                         return -EBUSY;
         }
         if (cdev->private->state != DEV_STATE_ONLINE ||
-            ((sch->schib.scsw.stctl & SCSW_STCTL_PRIM_STATUS) &&
-             !(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)) ||
+            ((sch->schib.scsw.cmd.stctl & SCSW_STCTL_PRIM_STATUS) &&
+             !(sch->schib.scsw.cmd.stctl & SCSW_STCTL_SEC_STATUS)) ||
             cdev->private->flags.doverify)
                 return -EBUSY;
         ret = cio_set_options (sch, flags);
@@ -379,7 +380,7 @@ int ccw_device_resume(struct ccw_device *cdev)
         if (cdev->private->state == DEV_STATE_NOT_OPER)
                 return -ENODEV;
         if (cdev->private->state != DEV_STATE_ONLINE ||
-            !(sch->schib.scsw.actl & SCSW_ACTL_SUSPENDED))
+            !(sch->schib.scsw.cmd.actl & SCSW_ACTL_SUSPENDED))
                 return -EINVAL;
         return cio_resume(sch);
 }
@@ -404,7 +405,7 @@ ccw_device_call_handler(struct ccw_device *cdev)
          *  - fast notification was requested (primary status)
          *  - unsolicited interrupts
          */
-        stctl = cdev->private->irb.scsw.stctl;
+        stctl = scsw_stctl(&cdev->private->irb.scsw);
         ending_status = (stctl & SCSW_STCTL_SEC_STATUS) ||
                 (stctl == (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)) ||
                 (stctl == SCSW_STCTL_STATUS_PEND);
@@ -528,14 +529,15 @@ ccw_device_stlck(struct ccw_device *cdev)
                 cio_disable_subchannel(sch); //FIXME: return code?
                 goto out_unlock;
         }
-        cdev->private->irb.scsw.actl |= SCSW_ACTL_START_PEND;
+        cdev->private->irb.scsw.cmd.actl |= SCSW_ACTL_START_PEND;
         spin_unlock_irqrestore(sch->lock, flags);
-        wait_event(cdev->private->wait_q, cdev->private->irb.scsw.actl == 0);
+        wait_event(cdev->private->wait_q,
+                   cdev->private->irb.scsw.cmd.actl == 0);
         spin_lock_irqsave(sch->lock, flags);
         cio_disable_subchannel(sch); //FIXME: return code?
-        if ((cdev->private->irb.scsw.dstat !=
+        if ((cdev->private->irb.scsw.cmd.dstat !=
              (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) ||
-            (cdev->private->irb.scsw.cstat != 0))
+            (cdev->private->irb.scsw.cmd.cstat != 0))
                 ret = -EIO;
         /* Clear irb. */
         memset(&cdev->private->irb, 0, sizeof(struct irb));
@@ -568,6 +570,122 @@ void ccw_device_get_id(struct ccw_device *cdev, struct ccw_dev_id *dev_id)
 }
 EXPORT_SYMBOL(ccw_device_get_id);
 
+/**
+ * ccw_device_tm_start_key - perform start function
+ * @cdev: ccw device on which to perform the start function
+ * @tcw: transport-command word to be started
+ * @intparm: user defined parameter to be passed to the interrupt handler
+ * @lpm: mask of paths to use
+ * @key: storage key to use for storage access
+ *
+ * Start the tcw on the given ccw device. Return zero on success, non-zero
+ * otherwise.
+ */
+int ccw_device_tm_start_key(struct ccw_device *cdev, struct tcw *tcw,
+                            unsigned long intparm, u8 lpm, u8 key)
+{
+        struct subchannel *sch;
+        int rc;
+
+        sch = to_subchannel(cdev->dev.parent);
+        if (cdev->private->state != DEV_STATE_ONLINE)
+                return -EIO;
+        /* Adjust requested path mask to excluded varied off paths. */
+        if (lpm) {
+                lpm &= sch->opm;
+                if (lpm == 0)
+                        return -EACCES;
+        }
+        rc = cio_tm_start_key(sch, tcw, lpm, key);
+        if (rc == 0)
+                cdev->private->intparm = intparm;
+        return rc;
+}
+EXPORT_SYMBOL(ccw_device_tm_start_key);
+
+/**
+ * ccw_device_tm_start_timeout_key - perform start function
+ * @cdev: ccw device on which to perform the start function
+ * @tcw: transport-command word to be started
+ * @intparm: user defined parameter to be passed to the interrupt handler
+ * @lpm: mask of paths to use
+ * @key: storage key to use for storage access
+ * @expires: time span in jiffies after which to abort request
+ *
+ * Start the tcw on the given ccw device. Return zero on success, non-zero
+ * otherwise.
+ */
+int ccw_device_tm_start_timeout_key(struct ccw_device *cdev, struct tcw *tcw,
+                                    unsigned long intparm, u8 lpm, u8 key,
+                                    int expires)
+{
+        int ret;
+
+        ccw_device_set_timeout(cdev, expires);
+        ret = ccw_device_tm_start_key(cdev, tcw, intparm, lpm, key);
+        if (ret != 0)
+                ccw_device_set_timeout(cdev, 0);
+        return ret;
+}
+EXPORT_SYMBOL(ccw_device_tm_start_timeout_key);
+
+/**
+ * ccw_device_tm_start - perform start function
+ * @cdev: ccw device on which to perform the start function
+ * @tcw: transport-command word to be started
+ * @intparm: user defined parameter to be passed to the interrupt handler
+ * @lpm: mask of paths to use
+ *
+ * Start the tcw on the given ccw device. Return zero on success, non-zero
+ * otherwise.
+ */
+int ccw_device_tm_start(struct ccw_device *cdev, struct tcw *tcw,
+                        unsigned long intparm, u8 lpm)
+{
+        return ccw_device_tm_start_key(cdev, tcw, intparm, lpm,
+                                       PAGE_DEFAULT_KEY);
+}
+EXPORT_SYMBOL(ccw_device_tm_start);
+
+/**
+ * ccw_device_tm_start_timeout - perform start function
+ * @cdev: ccw device on which to perform the start function
+ * @tcw: transport-command word to be started
+ * @intparm: user defined parameter to be passed to the interrupt handler
+ * @lpm: mask of paths to use
+ * @expires: time span in jiffies after which to abort request
+ *
+ * Start the tcw on the given ccw device. Return zero on success, non-zero
+ * otherwise.
+ */
+int ccw_device_tm_start_timeout(struct ccw_device *cdev, struct tcw *tcw,
+                               unsigned long intparm, u8 lpm, int expires)
+{
+        return ccw_device_tm_start_timeout_key(cdev, tcw, intparm, lpm,
+                                               PAGE_DEFAULT_KEY, expires);
+}
+EXPORT_SYMBOL(ccw_device_tm_start_timeout);
+
+/**
+ * ccw_device_tm_intrg - perform interrogate function
+ * @cdev: ccw device on which to perform the interrogate function
+ *
+ * Perform an interrogate function on the given ccw device. Return zero on
+ * success, non-zero otherwise.
+ */
+int ccw_device_tm_intrg(struct ccw_device *cdev)
+{
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+
+        if (cdev->private->state != DEV_STATE_ONLINE)
+                return -EIO;
+        if (!scsw_is_tm(&sch->schib.scsw) ||
+            !(scsw_actl(&sch->schib.scsw) | SCSW_ACTL_START_PEND))
+                return -EINVAL;
+        return cio_tm_intrg(sch);
+}
+EXPORT_SYMBOL(ccw_device_tm_intrg);
+
 // FIXME: these have to go:
 
 int
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index 5cf7be008e98..86bc94eb607f 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -28,13 +28,13 @@
  * Helper function called from interrupt context to decide whether an
  * operation should be tried again.
  */
-static int __ccw_device_should_retry(struct scsw *scsw)
+static int __ccw_device_should_retry(union scsw *scsw)
 {
         /* CC is only valid if start function bit is set. */
-        if ((scsw->fctl & SCSW_FCTL_START_FUNC) && scsw->cc == 1)
+        if ((scsw->cmd.fctl & SCSW_FCTL_START_FUNC) && scsw->cmd.cc == 1)
                 return 1;
         /* No more activity. For sense and set PGID we stubbornly try again. */
-        if (!scsw->actl)
+        if (!scsw->cmd.actl)
                 return 1;
         return 0;
 }
@@ -125,7 +125,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
 
         sch = to_subchannel(cdev->dev.parent);
         irb = &cdev->private->irb;
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+        if (irb->scsw.cmd.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
                 /* Retry Sense PGID if requested. */
                 if (cdev->private->flags.intretry) {
                         cdev->private->flags.intretry = 0;
@@ -155,10 +155,10 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
                               irb->ecw[6], irb->ecw[7]);
                 return -EAGAIN;
         }
-        if (irb->scsw.cc == 3) {
+        if (irb->scsw.cmd.cc == 3) {
                 u8 lpm;
 
-                lpm = to_io_private(sch)->orb.lpm;
+                lpm = to_io_private(sch)->orb.cmd.lpm;
                 CIO_MSG_EVENT(3, "SNID - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
                               cdev->private->dev_id.devno, sch->schid.ssid,
@@ -188,7 +188,7 @@ ccw_device_sense_pgid_irq(struct ccw_device *cdev, enum dev_event dev_event)
 
         irb = (struct irb *) __LC_IRB;
 
-        if (irb->scsw.stctl ==
+        if (irb->scsw.cmd.stctl ==
             (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) {
                 if (__ccw_device_should_retry(&irb->scsw)) {
                         ret = __ccw_device_sense_pgid_start(cdev);
@@ -331,7 +331,7 @@ __ccw_device_check_pgid(struct ccw_device *cdev)
 
         sch = to_subchannel(cdev->dev.parent);
         irb = &cdev->private->irb;
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+        if (irb->scsw.cmd.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
                 /* Retry Set PGID if requested. */
                 if (cdev->private->flags.intretry) {
                         cdev->private->flags.intretry = 0;
@@ -355,7 +355,7 @@ __ccw_device_check_pgid(struct ccw_device *cdev)
                               irb->ecw[6], irb->ecw[7]);
                 return -EAGAIN;
         }
-        if (irb->scsw.cc == 3) {
+        if (irb->scsw.cmd.cc == 3) {
                 CIO_MSG_EVENT(3, "SPID - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
                               cdev->private->dev_id.devno, sch->schid.ssid,
@@ -376,7 +376,7 @@ static int __ccw_device_check_nop(struct ccw_device *cdev)
 
         sch = to_subchannel(cdev->dev.parent);
         irb = &cdev->private->irb;
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
+        if (irb->scsw.cmd.fctl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
                 /* Retry NOP if requested. */
                 if (cdev->private->flags.intretry) {
                         cdev->private->flags.intretry = 0;
@@ -384,7 +384,7 @@ static int __ccw_device_check_nop(struct ccw_device *cdev)
                 }
                 return -ETIME;
         }
-        if (irb->scsw.cc == 3) {
+        if (irb->scsw.cmd.cc == 3) {
                 CIO_MSG_EVENT(3, "NOP - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
                               cdev->private->dev_id.devno, sch->schid.ssid,
@@ -438,7 +438,7 @@ ccw_device_verify_irq(struct ccw_device *cdev, enum dev_event dev_event)
 
         irb = (struct irb *) __LC_IRB;
 
-        if (irb->scsw.stctl ==
+        if (irb->scsw.cmd.stctl ==
             (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) {
                 if (__ccw_device_should_retry(&irb->scsw))
                         __ccw_device_verify_start(cdev);
@@ -544,7 +544,7 @@ ccw_device_disband_irq(struct ccw_device *cdev, enum dev_event dev_event)
 
         irb = (struct irb *) __LC_IRB;
 
-        if (irb->scsw.stctl ==
+        if (irb->scsw.cmd.stctl ==
             (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) {
                 if (__ccw_device_should_retry(&irb->scsw))
                         __ccw_device_disband_start(cdev);
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index 4a38993000f2..1b03c5423be2 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -29,9 +29,11 @@
 static void
 ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb)
 {
-        if (!(irb->scsw.cstat & (SCHN_STAT_CHN_DATA_CHK |
-                                 SCHN_STAT_CHN_CTRL_CHK |
-                                 SCHN_STAT_INTF_CTRL_CHK)))
+        char dbf_text[15];
+
+        if (!scsw_is_valid_cstat(&irb->scsw) ||
+            !(scsw_cstat(&irb->scsw) & (SCHN_STAT_CHN_DATA_CHK |
+              SCHN_STAT_CHN_CTRL_CHK | SCHN_STAT_INTF_CTRL_CHK)))
                 return;
         CIO_MSG_EVENT(0, "Channel-Check or Interface-Control-Check "
                       "received"
@@ -39,15 +41,10 @@ ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb)
                       ": %02X sch_stat : %02X\n",
                       cdev->private->dev_id.devno, cdev->private->schid.ssid,
                       cdev->private->schid.sch_no,
-                      irb->scsw.dstat, irb->scsw.cstat);
-
-        if (irb->scsw.cc != 3) {
-                char dbf_text[15];
-
-                sprintf(dbf_text, "chk%x", cdev->private->schid.sch_no);
-                CIO_TRACE_EVENT(0, dbf_text);
-                CIO_HEX_EVENT(0, irb, sizeof (struct irb));
-        }
+                      scsw_dstat(&irb->scsw), scsw_cstat(&irb->scsw));
+        sprintf(dbf_text, "chk%x", cdev->private->schid.sch_no);
+        CIO_TRACE_EVENT(0, dbf_text);
+        CIO_HEX_EVENT(0, irb, sizeof(struct irb));
 }
 
 /*
@@ -81,12 +78,12 @@ ccw_device_accumulate_ecw(struct ccw_device *cdev, struct irb *irb)
          * are condition that have to be met for the extended control
          * bit to have meaning. Sick.
          */
-        cdev->private->irb.scsw.ectl = 0;
-        if ((irb->scsw.stctl & SCSW_STCTL_ALERT_STATUS) &&
-            !(irb->scsw.stctl & SCSW_STCTL_INTER_STATUS))
-                cdev->private->irb.scsw.ectl = irb->scsw.ectl;
+        cdev->private->irb.scsw.cmd.ectl = 0;
+        if ((irb->scsw.cmd.stctl & SCSW_STCTL_ALERT_STATUS) &&
+            !(irb->scsw.cmd.stctl & SCSW_STCTL_INTER_STATUS))
+                cdev->private->irb.scsw.cmd.ectl = irb->scsw.cmd.ectl;
         /* Check if extended control word is valid. */
-        if (!cdev->private->irb.scsw.ectl)
+        if (!cdev->private->irb.scsw.cmd.ectl)
                 return;
         /* Copy concurrent sense / model dependent information. */
         memcpy (&cdev->private->irb.ecw, irb->ecw, sizeof (irb->ecw));
@@ -98,11 +95,12 @@ ccw_device_accumulate_ecw(struct ccw_device *cdev, struct irb *irb)
 static int
 ccw_device_accumulate_esw_valid(struct irb *irb)
 {
-        if (!irb->scsw.eswf && irb->scsw.stctl == SCSW_STCTL_STATUS_PEND)
+        if (!irb->scsw.cmd.eswf &&
+            (irb->scsw.cmd.stctl == SCSW_STCTL_STATUS_PEND))
                 return 0;
-        if (irb->scsw.stctl == 
-                        (SCSW_STCTL_INTER_STATUS|SCSW_STCTL_STATUS_PEND) &&
-            !(irb->scsw.actl & SCSW_ACTL_SUSPENDED))
+        if (irb->scsw.cmd.stctl ==
+                        (SCSW_STCTL_INTER_STATUS|SCSW_STCTL_STATUS_PEND) &&
+            !(irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED))
                 return 0;
         return 1;
 }
@@ -125,7 +123,7 @@ ccw_device_accumulate_esw(struct ccw_device *cdev, struct irb *irb)
         cdev_irb->esw.esw1.lpum = irb->esw.esw1.lpum;
 
         /* Copy subchannel logout information if esw is of format 0. */
-        if (irb->scsw.eswf) {
+        if (irb->scsw.cmd.eswf) {
                 cdev_sublog = &cdev_irb->esw.esw0.sublog;
                 sublog = &irb->esw.esw0.sublog;
                 /* Copy extended status flags. */
@@ -134,7 +132,7 @@ ccw_device_accumulate_esw(struct ccw_device *cdev, struct irb *irb)
                  * Copy fields that have a meaning for channel data check
                  * channel control check and interface control check.
                  */
-                if (irb->scsw.cstat & (SCHN_STAT_CHN_DATA_CHK |
+                if (irb->scsw.cmd.cstat & (SCHN_STAT_CHN_DATA_CHK |
                                        SCHN_STAT_CHN_CTRL_CHK |
                                        SCHN_STAT_INTF_CTRL_CHK)) {
                         /* Copy ancillary report bit. */
@@ -155,7 +153,7 @@ ccw_device_accumulate_esw(struct ccw_device *cdev, struct irb *irb)
                 /* Copy i/o-error alert. */
                 cdev_sublog->ioerr = sublog->ioerr;
                 /* Copy channel path timeout bit. */
-                if (irb->scsw.cstat & SCHN_STAT_INTF_CTRL_CHK)
+                if (irb->scsw.cmd.cstat & SCHN_STAT_INTF_CTRL_CHK)
                         cdev_irb->esw.esw0.erw.cpt = irb->esw.esw0.erw.cpt;
                 /* Copy failing storage address validity flag. */
                 cdev_irb->esw.esw0.erw.fsavf = irb->esw.esw0.erw.fsavf;
@@ -200,24 +198,24 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb)
          * If not, the remaining bit have no meaning and we must ignore them.
          * The esw is not meaningful as well...
          */
-        if (!(irb->scsw.stctl & SCSW_STCTL_STATUS_PEND))
+        if (!(scsw_stctl(&irb->scsw) & SCSW_STCTL_STATUS_PEND))
                 return;
 
         /* Check for channel checks and interface control checks. */
         ccw_device_msg_control_check(cdev, irb);
 
         /* Check for path not operational. */
-        if (irb->scsw.pno && irb->scsw.fctl != 0 &&
-            (!(irb->scsw.stctl & SCSW_STCTL_INTER_STATUS) ||
-             (irb->scsw.actl & SCSW_ACTL_SUSPENDED)))
+        if (scsw_is_valid_pno(&irb->scsw) && scsw_pno(&irb->scsw))
                 ccw_device_path_notoper(cdev);
-
+        /* No irb accumulation for transport mode irbs. */
+        if (scsw_is_tm(&irb->scsw)) {
+                memcpy(&cdev->private->irb, irb, sizeof(struct irb));
+                return;
+        }
         /*
          * Don't accumulate unsolicited interrupts.
          */
-        if ((irb->scsw.stctl ==
-             (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) &&
-            (!irb->scsw.cc))
+        if (!scsw_is_solicited(&irb->scsw))
                 return;
 
         cdev_irb = &cdev->private->irb;
@@ -227,62 +225,63 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb)
          * status at the subchannel has been cleared and we must not pass
          * intermediate accumulated status to the device driver.
          */
-        if (irb->scsw.fctl & SCSW_FCTL_CLEAR_FUNC)
+        if (irb->scsw.cmd.fctl & SCSW_FCTL_CLEAR_FUNC)
                 memset(&cdev->private->irb, 0, sizeof(struct irb));
 
         /* Copy bits which are valid only for the start function. */
-        if (irb->scsw.fctl & SCSW_FCTL_START_FUNC) {
+        if (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) {
                 /* Copy key. */
-                cdev_irb->scsw.key = irb->scsw.key;
+                cdev_irb->scsw.cmd.key = irb->scsw.cmd.key;
                 /* Copy suspend control bit. */
-                cdev_irb->scsw.sctl = irb->scsw.sctl;
+                cdev_irb->scsw.cmd.sctl = irb->scsw.cmd.sctl;
                 /* Accumulate deferred condition code. */
-                cdev_irb->scsw.cc |= irb->scsw.cc;
+                cdev_irb->scsw.cmd.cc |= irb->scsw.cmd.cc;
                 /* Copy ccw format bit. */
-                cdev_irb->scsw.fmt = irb->scsw.fmt;
+                cdev_irb->scsw.cmd.fmt = irb->scsw.cmd.fmt;
                 /* Copy prefetch bit. */
-                cdev_irb->scsw.pfch = irb->scsw.pfch;
+                cdev_irb->scsw.cmd.pfch = irb->scsw.cmd.pfch;
                 /* Copy initial-status-interruption-control. */
-                cdev_irb->scsw.isic = irb->scsw.isic;
+                cdev_irb->scsw.cmd.isic = irb->scsw.cmd.isic;
                 /* Copy address limit checking control. */
-                cdev_irb->scsw.alcc = irb->scsw.alcc;
+                cdev_irb->scsw.cmd.alcc = irb->scsw.cmd.alcc;
                 /* Copy suppress suspend bit. */
-                cdev_irb->scsw.ssi = irb->scsw.ssi;
+                cdev_irb->scsw.cmd.ssi = irb->scsw.cmd.ssi;
         }
 
         /* Take care of the extended control bit and extended control word. */
         ccw_device_accumulate_ecw(cdev, irb);
             
         /* Accumulate function control. */
-        cdev_irb->scsw.fctl |= irb->scsw.fctl;
+        cdev_irb->scsw.cmd.fctl |= irb->scsw.cmd.fctl;
         /* Copy activity control. */
-        cdev_irb->scsw.actl= irb->scsw.actl;
+        cdev_irb->scsw.cmd.actl = irb->scsw.cmd.actl;
         /* Accumulate status control. */
-        cdev_irb->scsw.stctl |= irb->scsw.stctl;
+        cdev_irb->scsw.cmd.stctl |= irb->scsw.cmd.stctl;
         /*
          * Copy ccw address if it is valid. This is a bit simplified
          * but should be close enough for all practical purposes.
          */
-        if ((irb->scsw.stctl & SCSW_STCTL_PRIM_STATUS) ||
-            ((irb->scsw.stctl == 
+        if ((irb->scsw.cmd.stctl & SCSW_STCTL_PRIM_STATUS) ||
+            ((irb->scsw.cmd.stctl ==
               (SCSW_STCTL_INTER_STATUS|SCSW_STCTL_STATUS_PEND)) &&
-             (irb->scsw.actl & SCSW_ACTL_DEVACT) &&
-             (irb->scsw.actl & SCSW_ACTL_SCHACT)) ||
-            (irb->scsw.actl & SCSW_ACTL_SUSPENDED))
-                cdev_irb->scsw.cpa = irb->scsw.cpa;
+             (irb->scsw.cmd.actl & SCSW_ACTL_DEVACT) &&
+             (irb->scsw.cmd.actl & SCSW_ACTL_SCHACT)) ||
+            (irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED))
+                cdev_irb->scsw.cmd.cpa = irb->scsw.cmd.cpa;
         /* Accumulate device status, but not the device busy flag. */
-        cdev_irb->scsw.dstat &= ~DEV_STAT_BUSY;
+        cdev_irb->scsw.cmd.dstat &= ~DEV_STAT_BUSY;
         /* dstat is not always valid. */
-        if (irb->scsw.stctl &
+        if (irb->scsw.cmd.stctl &
             (SCSW_STCTL_PRIM_STATUS | SCSW_STCTL_SEC_STATUS
              | SCSW_STCTL_INTER_STATUS | SCSW_STCTL_ALERT_STATUS))
-                cdev_irb->scsw.dstat |= irb->scsw.dstat;
+                cdev_irb->scsw.cmd.dstat |= irb->scsw.cmd.dstat;
         /* Accumulate subchannel status. */
-        cdev_irb->scsw.cstat |= irb->scsw.cstat;
+        cdev_irb->scsw.cmd.cstat |= irb->scsw.cmd.cstat;
         /* Copy residual count if it is valid. */
-        if ((irb->scsw.stctl & SCSW_STCTL_PRIM_STATUS) &&
-            (irb->scsw.cstat & ~(SCHN_STAT_PCI | SCHN_STAT_INCORR_LEN)) == 0)
-                cdev_irb->scsw.count = irb->scsw.count;
+        if ((irb->scsw.cmd.stctl & SCSW_STCTL_PRIM_STATUS) &&
+            (irb->scsw.cmd.cstat & ~(SCHN_STAT_PCI | SCHN_STAT_INCORR_LEN))
+             == 0)
+                cdev_irb->scsw.cmd.count = irb->scsw.cmd.count;
 
         /* Take care of bits in the extended status word. */
         ccw_device_accumulate_esw(cdev, irb);
@@ -299,7 +298,7 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb)
          *       sense facility available/supported when enabling the
          *       concurrent sense facility.
          */
-        if ((cdev_irb->scsw.dstat & DEV_STAT_UNIT_CHECK) &&
+        if ((cdev_irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) &&
             !(cdev_irb->esw.esw0.erw.cons))
                 cdev->private->flags.dosense = 1;
 }
@@ -317,7 +316,7 @@ ccw_device_do_sense(struct ccw_device *cdev, struct irb *irb)
         sch = to_subchannel(cdev->dev.parent);
 
         /* A sense is required, can we do it now ? */
-        if ((irb->scsw.actl  & (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) != 0)
+        if (scsw_actl(&irb->scsw) & (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT))
                 /*
                  * we received an Unit Check but we have no final
                  *  status yet, therefore we must delay the SENSE
@@ -355,20 +354,18 @@ ccw_device_accumulate_basic_sense(struct ccw_device *cdev, struct irb *irb)
          * If not, the remaining bit have no meaning and we must ignore them.
          * The esw is not meaningful as well...
          */
-        if (!(irb->scsw.stctl & SCSW_STCTL_STATUS_PEND))
+        if (!(scsw_stctl(&irb->scsw) & SCSW_STCTL_STATUS_PEND))
                 return;
 
         /* Check for channel checks and interface control checks. */
         ccw_device_msg_control_check(cdev, irb);
 
         /* Check for path not operational. */
-        if (irb->scsw.pno && irb->scsw.fctl != 0 &&
-            (!(irb->scsw.stctl & SCSW_STCTL_INTER_STATUS) ||
-             (irb->scsw.actl & SCSW_ACTL_SUSPENDED)))
+        if (scsw_is_valid_pno(&irb->scsw) && scsw_pno(&irb->scsw))
                 ccw_device_path_notoper(cdev);
 
-        if (!(irb->scsw.dstat & DEV_STAT_UNIT_CHECK) &&
-            (irb->scsw.dstat & DEV_STAT_CHN_END)) {
+        if (!(irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) &&
+            (irb->scsw.cmd.dstat & DEV_STAT_CHN_END)) {
                 cdev->private->irb.esw.esw0.erw.cons = 1;
                 cdev->private->flags.dosense = 0;
         }
@@ -386,11 +383,11 @@ int
 ccw_device_accumulate_and_sense(struct ccw_device *cdev, struct irb *irb)
 {
         ccw_device_accumulate_irb(cdev, irb);
-        if ((irb->scsw.actl  & (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) != 0)
+        if ((irb->scsw.cmd.actl  & (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) != 0)
                 return -EBUSY;
         /* Check for basic sense. */
         if (cdev->private->flags.dosense &&
-            !(irb->scsw.dstat & DEV_STAT_UNIT_CHECK)) {
+            !(irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)) {
                 cdev->private->irb.esw.esw0.erw.cons = 1;
                 cdev->private->flags.dosense = 0;
                 return 0;
diff --git a/drivers/s390/cio/fcx.c b/drivers/s390/cio/fcx.c
new file mode 100644
index 000000000000..61677dfbdc9b
--- /dev/null
+++ b/drivers/s390/cio/fcx.c
@@ -0,0 +1,350 @@
+/*
+ *  Functions for assembling fcx enabled I/O control blocks.
+ *
+ *    Copyright IBM Corp. 2008
+ *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <asm/fcx.h>
+#include "cio.h"
+
+/**
+ * tcw_get_intrg - return pointer to associated interrogate tcw
+ * @tcw: pointer to the original tcw
+ *
+ * Return a pointer to the interrogate tcw associated with the specified tcw
+ * or %NULL if there is no associated interrogate tcw.
+ */
+struct tcw *tcw_get_intrg(struct tcw *tcw)
+{
+        return (struct tcw *) ((addr_t) tcw->intrg);
+}
+EXPORT_SYMBOL(tcw_get_intrg);
+
+/**
+ * tcw_get_data - return pointer to input/output data associated with tcw
+ * @tcw: pointer to the tcw
+ *
+ * Return the input or output data address specified in the tcw depending
+ * on whether the r-bit or the w-bit is set. If neither bit is set, return
+ * %NULL.
+ */
+void *tcw_get_data(struct tcw *tcw)
+{
+        if (tcw->r)
+                return (void *) ((addr_t) tcw->input);
+        if (tcw->w)
+                return (void *) ((addr_t) tcw->output);
+        return NULL;
+}
+EXPORT_SYMBOL(tcw_get_data);
+
+/**
+ * tcw_get_tccb - return pointer to tccb associated with tcw
+ * @tcw: pointer to the tcw
+ *
+ * Return pointer to the tccb associated with this tcw.
+ */
+struct tccb *tcw_get_tccb(struct tcw *tcw)
+{
+        return (struct tccb *) ((addr_t) tcw->tccb);
+}
+EXPORT_SYMBOL(tcw_get_tccb);
+
+/**
+ * tcw_get_tsb - return pointer to tsb associated with tcw
+ * @tcw: pointer to the tcw
+ *
+ * Return pointer to the tsb associated with this tcw.
+ */
+struct tsb *tcw_get_tsb(struct tcw *tcw)
+{
+        return (struct tsb *) ((addr_t) tcw->tsb);
+}
+EXPORT_SYMBOL(tcw_get_tsb);
+
+/**
+ * tcw_init - initialize tcw data structure
+ * @tcw: pointer to the tcw to be initialized
+ * @r: initial value of the r-bit
+ * @w: initial value of the w-bit
+ *
+ * Initialize all fields of the specified tcw data structure with zero and
+ * fill in the format, flags, r and w fields.
+ */
+void tcw_init(struct tcw *tcw, int r, int w)
+{
+        memset(tcw, 0, sizeof(struct tcw));
+        tcw->format = TCW_FORMAT_DEFAULT;
+        tcw->flags = TCW_FLAGS_TIDAW_FORMAT(TCW_TIDAW_FORMAT_DEFAULT);
+        if (r)
+                tcw->r = 1;
+        if (w)
+                tcw->w = 1;
+}
+EXPORT_SYMBOL(tcw_init);
+
+static inline size_t tca_size(struct tccb *tccb)
+{
+        return tccb->tcah.tcal - 12;
+}
+
+static u32 calc_dcw_count(struct tccb *tccb)
+{
+        int offset;
+        struct dcw *dcw;
+        u32 count = 0;
+        size_t size;
+
+        size = tca_size(tccb);
+        for (offset = 0; offset < size;) {
+                dcw = (struct dcw *) &tccb->tca[offset];
+                count += dcw->count;
+                if (!(dcw->flags & DCW_FLAGS_CC))
+                        break;
+                offset += sizeof(struct dcw) + ALIGN((int) dcw->cd_count, 4);
+        }
+        return count;
+}
+
+static u32 calc_cbc_size(struct tidaw *tidaw, int num)
+{
+        int i;
+        u32 cbc_data;
+        u32 cbc_count = 0;
+        u64 data_count = 0;
+
+        for (i = 0; i < num; i++) {
+                if (tidaw[i].flags & TIDAW_FLAGS_LAST)
+                        break;
+                /* TODO: find out if padding applies to total of data
+                 * transferred or data transferred by this tidaw. Assumption:
+                 * applies to total. */
+                data_count += tidaw[i].count;
+                if (tidaw[i].flags & TIDAW_FLAGS_INSERT_CBC) {
+                        cbc_data = 4 + ALIGN(data_count, 4) - data_count;
+                        cbc_count += cbc_data;
+                        data_count += cbc_data;
+                }
+        }
+        return cbc_count;
+}
+
+/**
+ * tcw_finalize - finalize tcw length fields and tidaw list
+ * @tcw: pointer to the tcw
+ * @num_tidaws: the number of tidaws used to address input/output data or zero
+ * if no tida is used
+ *
+ * Calculate the input-/output-count and tccbl field in the tcw, add a
+ * tcat the tccb and terminate the data tidaw list if used.
+ *
+ * Note: in case input- or output-tida is used, the tidaw-list must be stored
+ * in contiguous storage (no ttic). The tcal field in the tccb must be
+ * up-to-date.
+ */
+void tcw_finalize(struct tcw *tcw, int num_tidaws)
+{
+        struct tidaw *tidaw;
+        struct tccb *tccb;
+        struct tccb_tcat *tcat;
+        u32 count;
+
+        /* Terminate tidaw list. */
+        tidaw = tcw_get_data(tcw);
+        if (num_tidaws > 0)
+                tidaw[num_tidaws - 1].flags |= TIDAW_FLAGS_LAST;
+        /* Add tcat to tccb. */
+        tccb = tcw_get_tccb(tcw);
+        tcat = (struct tccb_tcat *) &tccb->tca[tca_size(tccb)];
+        memset(tcat, 0, sizeof(tcat));
+        /* Calculate tcw input/output count and tcat transport count. */
+        count = calc_dcw_count(tccb);
+        if (tcw->w && (tcw->flags & TCW_FLAGS_OUTPUT_TIDA))
+                count += calc_cbc_size(tidaw, num_tidaws);
+        if (tcw->r)
+                tcw->input_count = count;
+        else if (tcw->w)
+                tcw->output_count = count;
+        tcat->count = ALIGN(count, 4) + 4;
+        /* Calculate tccbl. */
+        tcw->tccbl = (sizeof(struct tccb) + tca_size(tccb) +
+                      sizeof(struct tccb_tcat) - 20) >> 2;
+}
+EXPORT_SYMBOL(tcw_finalize);
+
+/**
+ * tcw_set_intrg - set the interrogate tcw address of a tcw
+ * @tcw: the tcw address
+ * @intrg_tcw: the address of the interrogate tcw
+ *
+ * Set the address of the interrogate tcw in the specified tcw.
+ */
+void tcw_set_intrg(struct tcw *tcw, struct tcw *intrg_tcw)
+{
+        tcw->intrg = (u32) ((addr_t) intrg_tcw);
+}
+EXPORT_SYMBOL(tcw_set_intrg);
+
+/**
+ * tcw_set_data - set data address and tida flag of a tcw
+ * @tcw: the tcw address
+ * @data: the data address
+ * @use_tidal: zero of the data address specifies a contiguous block of data,
+ * non-zero if it specifies a list if tidaws.
+ *
+ * Set the input/output data address of a tcw (depending on the value of the
+ * r-flag and w-flag). If @use_tidal is non-zero, the corresponding tida flag
+ * is set as well.
+ */
+void tcw_set_data(struct tcw *tcw, void *data, int use_tidal)
+{
+        if (tcw->r) {
+                tcw->input = (u64) ((addr_t) data);
+                if (use_tidal)
+                        tcw->flags |= TCW_FLAGS_INPUT_TIDA;
+        } else if (tcw->w) {
+                tcw->output = (u64) ((addr_t) data);
+                if (use_tidal)
+                        tcw->flags |= TCW_FLAGS_OUTPUT_TIDA;
+        }
+}
+EXPORT_SYMBOL(tcw_set_data);
+
+/**
+ * tcw_set_tccb - set tccb address of a tcw
+ * @tcw: the tcw address
+ * @tccb: the tccb address
+ *
+ * Set the address of the tccb in the specified tcw.
+ */
+void tcw_set_tccb(struct tcw *tcw, struct tccb *tccb)
+{
+        tcw->tccb = (u64) ((addr_t) tccb);
+}
+EXPORT_SYMBOL(tcw_set_tccb);
+
+/**
+ * tcw_set_tsb - set tsb address of a tcw
+ * @tcw: the tcw address
+ * @tsb: the tsb address
+ *
+ * Set the address of the tsb in the specified tcw.
+ */
+void tcw_set_tsb(struct tcw *tcw, struct tsb *tsb)
+{
+        tcw->tsb = (u64) ((addr_t) tsb);
+}
+EXPORT_SYMBOL(tcw_set_tsb);
+
+/**
+ * tccb_init - initialize tccb
+ * @tccb: the tccb address
+ * @size: the maximum size of the tccb
+ * @sac: the service-action-code to be user
+ *
+ * Initialize the header of the specified tccb by resetting all values to zero
+ * and filling in defaults for format, sac and initial tcal fields.
+ */
+void tccb_init(struct tccb *tccb, size_t size, u32 sac)
+{
+        memset(tccb, 0, size);
+        tccb->tcah.format = TCCB_FORMAT_DEFAULT;
+        tccb->tcah.sac = sac;
+        tccb->tcah.tcal = 12;
+}
+EXPORT_SYMBOL(tccb_init);
+
+/**
+ * tsb_init - initialize tsb
+ * @tsb: the tsb address
+ *
+ * Initialize the specified tsb by resetting all values to zero.
+ */
+void tsb_init(struct tsb *tsb)
+{
+        memset(tsb, 0, sizeof(tsb));
+}
+EXPORT_SYMBOL(tsb_init);
+
+/**
+ * tccb_add_dcw - add a dcw to the tccb
+ * @tccb: the tccb address
+ * @tccb_size: the maximum tccb size
+ * @cmd: the dcw command
+ * @flags: flags for the dcw
+ * @cd: pointer to control data for this dcw or NULL if none is required
+ * @cd_count: number of control data bytes for this dcw
+ * @count: number of data bytes for this dcw
+ *
+ * Add a new dcw to the specified tccb by writing the dcw information specified
+ * by @cmd, @flags, @cd, @cd_count and @count to the tca of the tccb. Return
+ * a pointer to the newly added dcw on success or -%ENOSPC if the new dcw
+ * would exceed the available space as defined by @tccb_size.
+ *
+ * Note: the tcal field of the tccb header will be updates to reflect added
+ * content.
+ */
+struct dcw *tccb_add_dcw(struct tccb *tccb, size_t tccb_size, u8 cmd, u8 flags,
+                         void *cd, u8 cd_count, u32 count)
+{
+        struct dcw *dcw;
+        int size;
+        int tca_offset;
+
+        /* Check for space. */
+        tca_offset = tca_size(tccb);
+        size = ALIGN(sizeof(struct dcw) + cd_count, 4);
+        if (sizeof(struct tccb_tcah) + tca_offset + size +
+            sizeof(struct tccb_tcat) > tccb_size)
+                return ERR_PTR(-ENOSPC);
+        /* Add dcw to tca. */
+        dcw = (struct dcw *) &tccb->tca[tca_offset];
+        memset(dcw, 0, size);
+        dcw->cmd = cmd;
+        dcw->flags = flags;
+        dcw->count = count;
+        dcw->cd_count = cd_count;
+        if (cd)
+                memcpy(&dcw->cd[0], cd, cd_count);
+        tccb->tcah.tcal += size;
+        return dcw;
+}
+EXPORT_SYMBOL(tccb_add_dcw);
+
+/**
+ * tcw_add_tidaw - add a tidaw to a tcw
+ * @tcw: the tcw address
+ * @num_tidaws: the current number of tidaws
+ * @flags: flags for the new tidaw
+ * @addr: address value for the new tidaw
+ * @count: count value for the new tidaw
+ *
+ * Add a new tidaw to the input/output data tidaw-list of the specified tcw
+ * (depending on the value of the r-flag and w-flag) and return a pointer to
+ * the new tidaw.
+ *
+ * Note: the tidaw-list is assumed to be contiguous with no ttics. The caller
+ * must ensure that there is enough space for the new tidaw. The last-tidaw
+ * flag for the last tidaw in the list will be set by tcw_finalize.
+ */
+struct tidaw *tcw_add_tidaw(struct tcw *tcw, int num_tidaws, u8 flags,
+                            void *addr, u32 count)
+{
+        struct tidaw *tidaw;
+
+        /* Add tidaw to tidaw-list. */
+        tidaw = ((struct tidaw *) tcw_get_data(tcw)) + num_tidaws;
+        memset(tidaw, 0, sizeof(struct tidaw));
+        tidaw->flags = flags;
+        tidaw->count = count;
+        tidaw->addr = (u64) ((addr_t) addr);
+        return tidaw;
+}
+EXPORT_SYMBOL(tcw_add_tidaw);
diff --git a/drivers/s390/cio/idset.h b/drivers/s390/cio/idset.h
index 144466ab8c15..528065cb5021 100644
--- a/drivers/s390/cio/idset.h
+++ b/drivers/s390/cio/idset.h
@@ -8,7 +8,7 @@
 #ifndef S390_IDSET_H
 #define S390_IDSET_H S390_IDSET_H
 
-#include "schid.h"
+#include <asm/schid.h>
 
 struct idset;
 
diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index 8c613160bfce..3f8f1cf69c76 100644
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -1,12 +1,12 @@
 #ifndef S390_IO_SCH_H
 #define S390_IO_SCH_H
 
-#include "schid.h"
+#include <asm/schid.h>
 
 /*
- * operation request block
+ * command-mode operation request block
  */
-struct orb {
+struct cmd_orb {
         u32 intparm;    /* interruption parameter */
         u32 key  : 4;   /* flags, like key, suspend control, etc. */
         u32 spnd : 1;   /* suspend control */
@@ -28,8 +28,36 @@ struct orb {
         u32 cpa;        /* channel program address */
 }  __attribute__ ((packed, aligned(4)));
 
+/*
+ * transport-mode operation request block
+ */
+struct tm_orb {
+        u32 intparm;
+        u32 key:4;
+        u32 :9;
+        u32 b:1;
+        u32 :2;
+        u32 lpm:8;
+        u32 :7;
+        u32 x:1;
+        u32 tcw;
+        u32 prio:8;
+        u32 :8;
+        u32 rsvpgm:8;
+        u32 :8;
+        u32 :32;
+        u32 :32;
+        u32 :32;
+        u32 :32;
+}  __attribute__ ((packed, aligned(4)));
+
+union orb {
+        struct cmd_orb cmd;
+        struct tm_orb tm;
+}  __attribute__ ((packed, aligned(4)));
+
 struct io_subchannel_private {
-        struct orb orb;         /* operation request block */
+        union orb orb;          /* operation request block */
         struct ccw1 sense_ccw;  /* static ccw for sense command */
 } __attribute__ ((aligned(8)));
 
@@ -95,16 +123,18 @@ struct ccw_device_private {
         void *cmb_wait;                 /* deferred cmb enable/disable */
 };
 
-static inline int ssch(struct subchannel_id schid, volatile struct orb *addr)
+static inline int ssch(struct subchannel_id schid, volatile union orb *addr)
 {
         register struct subchannel_id reg1 asm("1") = schid;
-        int ccode;
+        int ccode = -EIO;
 
         asm volatile(
                 "       ssch    0(%2)\n"
-                "       ipm     %0\n"
-                "       srl     %0,28"
-                : "=d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : "+d" (ccode) : "d" (reg1), "a" (addr), "m" (*addr) : "cc");
         return ccode;
 }
 
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index 652ea3625f9d..9fa2ac13ac85 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -2,7 +2,7 @@
 #define S390_CIO_IOASM_H
 
 #include <asm/chpid.h>
-#include "schid.h"
+#include <asm/schid.h>
 
 /*
  * TPI info structure
diff --git a/drivers/s390/cio/isc.c b/drivers/s390/cio/isc.c
new file mode 100644
index 000000000000..c592087be0f1
--- /dev/null
+++ b/drivers/s390/cio/isc.c
@@ -0,0 +1,68 @@
+/*
+ * Functions for registration of I/O interruption subclasses on s390.
+ *
+ * Copyright IBM Corp. 2008
+ * Authors: Sebastian Ott <sebott@linux.vnet.ibm.com>
+ */
+
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <asm/isc.h>
+
+static unsigned int isc_refs[MAX_ISC + 1];
+static DEFINE_SPINLOCK(isc_ref_lock);
+
+
+/**
+ * isc_register - register an I/O interruption subclass.
+ * @isc: I/O interruption subclass to register
+ *
+ * The number of users for @isc is increased. If this is the first user to
+ * register @isc, the corresponding I/O interruption subclass mask is enabled.
+ *
+ * Context:
+ *   This function must not be called in interrupt context.
+ */
+void isc_register(unsigned int isc)
+{
+        if (isc > MAX_ISC) {
+                WARN_ON(1);
+                return;
+        }
+
+        spin_lock(&isc_ref_lock);
+        if (isc_refs[isc] == 0)
+                ctl_set_bit(6, 31 - isc);
+        isc_refs[isc]++;
+        spin_unlock(&isc_ref_lock);
+}
+EXPORT_SYMBOL_GPL(isc_register);
+
+/**
+ * isc_unregister - unregister an I/O interruption subclass.
+ * @isc: I/O interruption subclass to unregister
+ *
+ * The number of users for @isc is decreased. If this is the last user to
+ * unregister @isc, the corresponding I/O interruption subclass mask is
+ * disabled.
+ * Note: This function must not be called if isc_register() hasn't been called
+ * before by the driver for @isc.
+ *
+ * Context:
+ *   This function must not be called in interrupt context.
+ */
+void isc_unregister(unsigned int isc)
+{
+        spin_lock(&isc_ref_lock);
+        /* check for misuse */
+        if (isc > MAX_ISC || isc_refs[isc] == 0) {
+                WARN_ON(1);
+                goto out_unlock;
+        }
+        if (isc_refs[isc] == 1)
+                ctl_clear_bit(6, 31 - isc);
+        isc_refs[isc]--;
+out_unlock:
+        spin_unlock(&isc_ref_lock);
+}
+EXPORT_SYMBOL_GPL(isc_unregister);
diff --git a/drivers/s390/cio/itcw.c b/drivers/s390/cio/itcw.c
new file mode 100644
index 000000000000..17da9ab932ed
--- /dev/null
+++ b/drivers/s390/cio/itcw.c
@@ -0,0 +1,327 @@
+/*
+ *  Functions for incremental construction of fcx enabled I/O control blocks.
+ *
+ *    Copyright IBM Corp. 2008
+ *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <asm/fcx.h>
+#include <asm/itcw.h>
+
+/**
+ * struct itcw - incremental tcw helper data type
+ *
+ * This structure serves as a handle for the incremental construction of a
+ * tcw and associated tccb, tsb, data tidaw-list plus an optional interrogate
+ * tcw and associated data. The data structures are contained inside a single
+ * contiguous buffer provided by the user.
+ *
+ * The itcw construction functions take care of overall data integrity:
+ * - reset unused fields to zero
+ * - fill in required pointers
+ * - ensure required alignment for data structures
+ * - prevent data structures to cross 4k-byte boundary where required
+ * - calculate tccb-related length fields
+ * - optionally provide ready-made interrogate tcw and associated structures
+ *
+ * Restrictions apply to the itcws created with these construction functions:
+ * - tida only supported for data address, not for tccb
+ * - only contiguous tidaw-lists (no ttic)
+ * - total number of bytes required per itcw may not exceed 4k bytes
+ * - either read or write operation (may not work with r=0 and w=0)
+ *
+ * Example:
+ * struct itcw *itcw;
+ * void *buffer;
+ * size_t size;
+ *
+ * size = itcw_calc_size(1, 2, 0);
+ * buffer = kmalloc(size, GFP_DMA);
+ * if (!buffer)
+ *      return -ENOMEM;
+ * itcw = itcw_init(buffer, size, ITCW_OP_READ, 1, 2, 0);
+ * if (IS_ERR(itcw))
+ *      return PTR_ER(itcw);
+ * itcw_add_dcw(itcw, 0x2, 0, NULL, 0, 72);
+ * itcw_add_tidaw(itcw, 0, 0x30000, 20);
+ * itcw_add_tidaw(itcw, 0, 0x40000, 52);
+ * itcw_finalize(itcw);
+ *
+ */
+struct itcw {
+        struct tcw *tcw;
+        struct tcw *intrg_tcw;
+        int num_tidaws;
+        int max_tidaws;
+        int intrg_num_tidaws;
+        int intrg_max_tidaws;
+};
+
+/**
+ * itcw_get_tcw - return pointer to tcw associated with the itcw
+ * @itcw: address of the itcw
+ *
+ * Return pointer to the tcw associated with the itcw.
+ */
+struct tcw *itcw_get_tcw(struct itcw *itcw)
+{
+        return itcw->tcw;
+}
+EXPORT_SYMBOL(itcw_get_tcw);
+
+/**
+ * itcw_calc_size - return the size of an itcw with the given parameters
+ * @intrg: if non-zero, add an interrogate tcw
+ * @max_tidaws: maximum number of tidaws to be used for data addressing or zero
+ * if no tida is to be used.
+ * @intrg_max_tidaws: maximum number of tidaws to be used for data addressing
+ * by the interrogate tcw, if specified
+ *
+ * Calculate and return the number of bytes required to hold an itcw with the
+ * given parameters and assuming tccbs with maximum size.
+ *
+ * Note that the resulting size also contains bytes needed for alignment
+ * padding as well as padding to ensure that data structures don't cross a
+ * 4k-boundary where required.
+ */
+size_t itcw_calc_size(int intrg, int max_tidaws, int intrg_max_tidaws)
+{
+        size_t len;
+
+        /* Main data. */
+        len = sizeof(struct itcw);
+        len += /* TCW */ sizeof(struct tcw) + /* TCCB */ TCCB_MAX_SIZE +
+               /* TSB */ sizeof(struct tsb) +
+               /* TIDAL */ max_tidaws * sizeof(struct tidaw);
+        /* Interrogate data. */
+        if (intrg) {
+                len += /* TCW */ sizeof(struct tcw) + /* TCCB */ TCCB_MAX_SIZE +
+                       /* TSB */ sizeof(struct tsb) +
+                       /* TIDAL */ intrg_max_tidaws * sizeof(struct tidaw);
+        }
+        /* Maximum required alignment padding. */
+        len += /* Initial TCW */ 63 + /* Interrogate TCCB */ 7;
+        /* Maximum padding for structures that may not cross 4k boundary. */
+        if ((max_tidaws > 0) || (intrg_max_tidaws > 0))
+                len += max(max_tidaws, intrg_max_tidaws) *
+                       sizeof(struct tidaw) - 1;
+        return len;
+}
+EXPORT_SYMBOL(itcw_calc_size);
+
+#define CROSS4K(x, l)   (((x) & ~4095) != ((x + l) & ~4095))
+
+static inline void *fit_chunk(addr_t *start, addr_t end, size_t len,
+                              int align, int check_4k)
+{
+        addr_t addr;
+
+        addr = ALIGN(*start, align);
+        if (check_4k && CROSS4K(addr, len)) {
+                addr = ALIGN(addr, 4096);
+                addr = ALIGN(addr, align);
+        }
+        if (addr + len > end)
+                return ERR_PTR(-ENOSPC);
+        *start = addr + len;
+        return (void *) addr;
+}
+
+/**
+ * itcw_init - initialize incremental tcw data structure
+ * @buffer: address of buffer to use for data structures
+ * @size: number of bytes in buffer
+ * @op: %ITCW_OP_READ for a read operation tcw, %ITCW_OP_WRITE for a write
+ * operation tcw
+ * @intrg: if non-zero, add and initialize an interrogate tcw
+ * @max_tidaws: maximum number of tidaws to be used for data addressing or zero
+ * if no tida is to be used.
+ * @intrg_max_tidaws: maximum number of tidaws to be used for data addressing
+ * by the interrogate tcw, if specified
+ *
+ * Prepare the specified buffer to be used as an incremental tcw, i.e. a
+ * helper data structure that can be used to construct a valid tcw by
+ * successive calls to other helper functions. Note: the buffer needs to be
+ * located below the 2G address limit. The resulting tcw has the following
+ * restrictions:
+ *  - no tccb tidal
+ *  - input/output tidal is contiguous (no ttic)
+ *  - total data should not exceed 4k
+ *  - tcw specifies either read or write operation
+ *
+ * On success, return pointer to the resulting incremental tcw data structure,
+ * ERR_PTR otherwise.
+ */
+struct itcw *itcw_init(void *buffer, size_t size, int op, int intrg,
+                       int max_tidaws, int intrg_max_tidaws)
+{
+        struct itcw *itcw;
+        void *chunk;
+        addr_t start;
+        addr_t end;
+
+        /* Check for 2G limit. */
+        start = (addr_t) buffer;
+        end = start + size;
+        if (end > (1 << 31))
+                return ERR_PTR(-EINVAL);
+        memset(buffer, 0, size);
+        /* ITCW. */
+        chunk = fit_chunk(&start, end, sizeof(struct itcw), 1, 0);
+        if (IS_ERR(chunk))
+                return chunk;
+        itcw = chunk;
+        itcw->max_tidaws = max_tidaws;
+        itcw->intrg_max_tidaws = intrg_max_tidaws;
+        /* Main TCW. */
+        chunk = fit_chunk(&start, end, sizeof(struct tcw), 64, 0);
+        if (IS_ERR(chunk))
+                return chunk;
+        itcw->tcw = chunk;
+        tcw_init(itcw->tcw, (op == ITCW_OP_READ) ? 1 : 0,
+                 (op == ITCW_OP_WRITE) ? 1 : 0);
+        /* Interrogate TCW. */
+        if (intrg) {
+                chunk = fit_chunk(&start, end, sizeof(struct tcw), 64, 0);
+                if (IS_ERR(chunk))
+                        return chunk;
+                itcw->intrg_tcw = chunk;
+                tcw_init(itcw->intrg_tcw, 1, 0);
+                tcw_set_intrg(itcw->tcw, itcw->intrg_tcw);
+        }
+        /* Data TIDAL. */
+        if (max_tidaws > 0) {
+                chunk = fit_chunk(&start, end, sizeof(struct tidaw) *
+                                  max_tidaws, 16, 1);
+                if (IS_ERR(chunk))
+                        return chunk;
+                tcw_set_data(itcw->tcw, chunk, 1);
+        }
+        /* Interrogate data TIDAL. */
+        if (intrg && (intrg_max_tidaws > 0)) {
+                chunk = fit_chunk(&start, end, sizeof(struct tidaw) *
+                                  intrg_max_tidaws, 16, 1);
+                if (IS_ERR(chunk))
+                        return chunk;
+                tcw_set_data(itcw->intrg_tcw, chunk, 1);
+        }
+        /* TSB. */
+        chunk = fit_chunk(&start, end, sizeof(struct tsb), 8, 0);
+        if (IS_ERR(chunk))
+                return chunk;
+        tsb_init(chunk);
+        tcw_set_tsb(itcw->tcw, chunk);
+        /* Interrogate TSB. */
+        if (intrg) {
+                chunk = fit_chunk(&start, end, sizeof(struct tsb), 8, 0);
+                if (IS_ERR(chunk))
+                        return chunk;
+                tsb_init(chunk);
+                tcw_set_tsb(itcw->intrg_tcw, chunk);
+        }
+        /* TCCB. */
+        chunk = fit_chunk(&start, end, TCCB_MAX_SIZE, 8, 0);
+        if (IS_ERR(chunk))
+                return chunk;
+        tccb_init(chunk, TCCB_MAX_SIZE, TCCB_SAC_DEFAULT);
+        tcw_set_tccb(itcw->tcw, chunk);
+        /* Interrogate TCCB. */
+        if (intrg) {
+                chunk = fit_chunk(&start, end, TCCB_MAX_SIZE, 8, 0);
+                if (IS_ERR(chunk))
+                        return chunk;
+                tccb_init(chunk, TCCB_MAX_SIZE, TCCB_SAC_INTRG);
+                tcw_set_tccb(itcw->intrg_tcw, chunk);
+                tccb_add_dcw(chunk, TCCB_MAX_SIZE, DCW_CMD_INTRG, 0, NULL,
+                             sizeof(struct dcw_intrg_data), 0);
+                tcw_finalize(itcw->intrg_tcw, 0);
+        }
+        return itcw;
+}
+EXPORT_SYMBOL(itcw_init);
+
+/**
+ * itcw_add_dcw - add a dcw to the itcw
+ * @itcw: address of the itcw
+ * @cmd: the dcw command
+ * @flags: flags for the dcw
+ * @cd: address of control data for this dcw or NULL if none is required
+ * @cd_count: number of control data bytes for this dcw
+ * @count: number of data bytes for this dcw
+ *
+ * Add a new dcw to the specified itcw by writing the dcw information specified
+ * by @cmd, @flags, @cd, @cd_count and @count to the tca of the tccb. Return
+ * a pointer to the newly added dcw on success or -%ENOSPC if the new dcw
+ * would exceed the available space.
+ *
+ * Note: the tcal field of the tccb header will be updated to reflect added
+ * content.
+ */
+struct dcw *itcw_add_dcw(struct itcw *itcw, u8 cmd, u8 flags, void *cd,
+                         u8 cd_count, u32 count)
+{
+        return tccb_add_dcw(tcw_get_tccb(itcw->tcw), TCCB_MAX_SIZE, cmd,
+                            flags, cd, cd_count, count);
+}
+EXPORT_SYMBOL(itcw_add_dcw);
+
+/**
+ * itcw_add_tidaw - add a tidaw to the itcw
+ * @itcw: address of the itcw
+ * @flags: flags for the new tidaw
+ * @addr: address value for the new tidaw
+ * @count: count value for the new tidaw
+ *
+ * Add a new tidaw to the input/output data tidaw-list of the specified itcw
+ * (depending on the value of the r-flag and w-flag). Return a pointer to
+ * the new tidaw on success or -%ENOSPC if the new tidaw would exceed the
+ * available space.
+ *
+ * Note: the tidaw-list is assumed to be contiguous with no ttics. The
+ * last-tidaw flag for the last tidaw in the list will be set by itcw_finalize.
+ */
+struct tidaw *itcw_add_tidaw(struct itcw *itcw, u8 flags, void *addr, u32 count)
+{
+        if (itcw->num_tidaws >= itcw->max_tidaws)
+                return ERR_PTR(-ENOSPC);
+        return tcw_add_tidaw(itcw->tcw, itcw->num_tidaws++, flags, addr, count);
+}
+EXPORT_SYMBOL(itcw_add_tidaw);
+
+/**
+ * itcw_set_data - set data address and tida flag of the itcw
+ * @itcw: address of the itcw
+ * @addr: the data address
+ * @use_tidal: zero of the data address specifies a contiguous block of data,
+ * non-zero if it specifies a list if tidaws.
+ *
+ * Set the input/output data address of the itcw (depending on the value of the
+ * r-flag and w-flag). If @use_tidal is non-zero, the corresponding tida flag
+ * is set as well.
+ */
+void itcw_set_data(struct itcw *itcw, void *addr, int use_tidal)
+{
+        tcw_set_data(itcw->tcw, addr, use_tidal);
+}
+EXPORT_SYMBOL(itcw_set_data);
+
+/**
+ * itcw_finalize - calculate length and count fields of the itcw
+ * @itcw: address of the itcw
+ *
+ * Calculate tcw input-/output-count and tccbl fields and add a tcat the tccb.
+ * In case input- or output-tida is used, the tidaw-list must be stored in
+ * continuous storage (no ttic). The tcal field in the tccb must be
+ * up-to-date.
+ */
+void itcw_finalize(struct itcw *itcw)
+{
+        tcw_finalize(itcw->tcw, itcw->num_tidaws);
+}
+EXPORT_SYMBOL(itcw_finalize);
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 445cf364e461..2bf36e14b102 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -2082,7 +2082,6 @@ qdio_timeout_handler(struct ccw_device *cdev)
         default:
                 BUG();
         }
-        ccw_device_set_timeout(cdev, 0);
         wake_up(&cdev->private->wait_q);
 }
 
@@ -2121,6 +2120,8 @@ qdio_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 case -EIO:
                         QDIO_PRINT_ERR("i/o error on device %s\n",
                                        cdev->dev.bus_id);
+                        qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
+                        wake_up(&cdev->private->wait_q);
                         return;
                 case -ETIMEDOUT:
                         qdio_timeout_handler(cdev);
@@ -2139,8 +2140,8 @@ qdio_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         QDIO_DBF_TEXT4(0, trace, dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
-        cstat = irb->scsw.cstat;
-        dstat = irb->scsw.dstat;
+        cstat = irb->scsw.cmd.cstat;
+        dstat = irb->scsw.cmd.dstat;
 
         switch (irq_ptr->state) {
         case QDIO_IRQ_STATE_INACTIVE:
@@ -2353,9 +2354,6 @@ tiqdio_check_chsc_availability(void)
 {
         char dbf_text[15];
 
-        if (!css_characteristics_avail)
-                return -EIO;
-
         /* Check for bit 41. */
         if (!css_general_characteristics.aif) {
                 QDIO_PRINT_WARN("Adapter interruption facility not " \
@@ -2667,12 +2665,12 @@ qdio_shutdown(struct ccw_device *cdev, int how)
                 spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
         } else if (rc == 0) {
                 qdio_set_state(irq_ptr, QDIO_IRQ_STATE_CLEANUP);
-                ccw_device_set_timeout(cdev, timeout);
                 spin_unlock_irqrestore(get_ccwdev_lock(cdev),flags);
 
-                wait_event(cdev->private->wait_q,
-                           irq_ptr->state == QDIO_IRQ_STATE_INACTIVE ||
-                           irq_ptr->state == QDIO_IRQ_STATE_ERR);
+                wait_event_interruptible_timeout(cdev->private->wait_q,
+                        irq_ptr->state == QDIO_IRQ_STATE_INACTIVE ||
+                        irq_ptr->state == QDIO_IRQ_STATE_ERR,
+                        timeout);
         } else {
                 QDIO_PRINT_INFO("ccw_device_{halt,clear} returned %d for "
                                 "device %s\n", result, cdev->dev.bus_id);
@@ -2692,7 +2690,6 @@ qdio_shutdown(struct ccw_device *cdev, int how)
 
         /* Ignore errors. */
         qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE);
-        ccw_device_set_timeout(cdev, 0);
 out:
         up(&irq_ptr->setting_up_sema);
         return result;
@@ -2907,13 +2904,10 @@ qdio_establish_handle_irq(struct ccw_device *cdev, int cstat, int dstat)
         QDIO_DBF_TEXT0(0,setup,dbf_text);
         QDIO_DBF_TEXT0(0,trace,dbf_text);
 
-        if (qdio_establish_irq_check_for_errors(cdev, cstat, dstat)) {
-                ccw_device_set_timeout(cdev, 0);
+        if (qdio_establish_irq_check_for_errors(cdev, cstat, dstat))
                 return;
-        }
 
         qdio_set_state(irq_ptr,QDIO_IRQ_STATE_ESTABLISHED);
-        ccw_device_set_timeout(cdev, 0);
 }
 
 int
@@ -3196,8 +3190,6 @@ qdio_establish(struct qdio_initialize *init_data)
                                 irq_ptr->schid.ssid, irq_ptr->schid.sch_no,
                                 result, result2);
                 result=result2;
-                if (result)
-                        ccw_device_set_timeout(cdev, 0);
         }
 
         spin_unlock_irqrestore(get_ccwdev_lock(cdev),saveflags);
@@ -3279,7 +3271,6 @@ qdio_activate(struct ccw_device *cdev, int flags)
 
         spin_lock_irqsave(get_ccwdev_lock(cdev),saveflags);
 
-        ccw_device_set_timeout(cdev, 0);
         ccw_device_set_options(cdev, CCWDEV_REPORT_ALL);
         result=ccw_device_start(cdev,&irq_ptr->ccw,QDIO_DOING_ACTIVATE,
                                 0, DOIO_DENY_PREFETCH);
@@ -3722,7 +3713,8 @@ tiqdio_register_thinints(void)
         char dbf_text[20];
 
         tiqdio_ind =
-                s390_register_adapter_interrupt(&tiqdio_thinint_handler, NULL);
+                s390_register_adapter_interrupt(&tiqdio_thinint_handler, NULL,
+                                                TIQDIO_THININT_ISC);
         if (IS_ERR(tiqdio_ind)) {
                 sprintf(dbf_text, "regthn%lx", PTR_ERR(tiqdio_ind));
                 QDIO_DBF_TEXT0(0,setup,dbf_text);
@@ -3738,7 +3730,8 @@ static void
 tiqdio_unregister_thinints(void)
 {
         if (tiqdio_ind)
-                s390_unregister_adapter_interrupt(tiqdio_ind);
+                s390_unregister_adapter_interrupt(tiqdio_ind,
+                                                  TIQDIO_THININT_ISC);
 }
 
 static int
@@ -3899,6 +3892,7 @@ init_QDIO(void)
                                             qdio_mempool_alloc,
                                             qdio_mempool_free, NULL);
 
+        isc_register(QDIO_AIRQ_ISC);
         if (tiqdio_check_chsc_availability())
                 QDIO_PRINT_ERR("Not all CHSCs supported. Continuing.\n");
 
@@ -3911,6 +3905,7 @@ static void __exit
 cleanup_QDIO(void)
 {
         tiqdio_unregister_thinints();
+        isc_unregister(QDIO_AIRQ_ISC);
         qdio_remove_procfs_entry();
         qdio_release_qdio_memory();
         qdio_unregister_dbf_views();
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index c3df6b2c38b7..7656081a24d2 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -2,8 +2,8 @@
 #define _CIO_QDIO_H
 
 #include <asm/page.h>
-
-#include "schid.h"
+#include <asm/isc.h>
+#include <asm/schid.h>
 
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_VERBOSE_LEVEL 9
@@ -26,7 +26,7 @@
  */
 #define IQDIO_FILL_LEVEL_TO_POLL 4
 
-#define TIQDIO_THININT_ISC 3
+#define TIQDIO_THININT_ISC QDIO_AIRQ_ISC
 #define TIQDIO_DELAY_TARGET 0
 #define QDIO_BUSY_BIT_PATIENCE 100 /* in microsecs */
 #define QDIO_BUSY_BIT_GIVE_UP 10000000 /* 10 seconds */
diff --git a/drivers/s390/cio/schid.h b/drivers/s390/cio/schid.h
deleted file mode 100644
index 54328fec5ade..000000000000
--- a/drivers/s390/cio/schid.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef S390_SCHID_H
-#define S390_SCHID_H
-
-struct subchannel_id {
-        __u32 reserved:13;
-        __u32 ssid:2;
-        __u32 one:1;
-        __u32 sch_no:16;
-} __attribute__ ((packed,aligned(4)));
-
-
-/* Helper function for sane state of pre-allocated subchannel_id. */
-static inline void
-init_subchannel_id(struct subchannel_id *schid)
-{
-        memset(schid, 0, sizeof(struct subchannel_id));
-        schid->one = 1;
-}
-
-static inline int
-schid_equal(struct subchannel_id *schid1, struct subchannel_id *schid2)
-{
-        return !memcmp(schid1, schid2, sizeof(struct subchannel_id));
-}
-
-#endif /* S390_SCHID_H */
diff --git a/drivers/s390/cio/scsw.c b/drivers/s390/cio/scsw.c
new file mode 100644
index 000000000000..f8da25ab576d
--- /dev/null
+++ b/drivers/s390/cio/scsw.c
@@ -0,0 +1,843 @@
+/*
+ *  Helper functions for scsw access.
+ *
+ *    Copyright IBM Corp. 2008
+ *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
+ */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <asm/cio.h>
+#include "css.h"
+#include "chsc.h"
+
+/**
+ * scsw_is_tm - check for transport mode scsw
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the specified scsw is a transport mode scsw, zero
+ * otherwise.
+ */
+int scsw_is_tm(union scsw *scsw)
+{
+        return css_general_characteristics.fcx && (scsw->tm.x == 1);
+}
+EXPORT_SYMBOL(scsw_is_tm);
+
+/**
+ * scsw_key - return scsw key field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the key field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_key(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.key;
+        else
+                return scsw->cmd.key;
+}
+EXPORT_SYMBOL(scsw_key);
+
+/**
+ * scsw_eswf - return scsw eswf field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the eswf field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_eswf(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.eswf;
+        else
+                return scsw->cmd.eswf;
+}
+EXPORT_SYMBOL(scsw_eswf);
+
+/**
+ * scsw_cc - return scsw cc field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the cc field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_cc(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.cc;
+        else
+                return scsw->cmd.cc;
+}
+EXPORT_SYMBOL(scsw_cc);
+
+/**
+ * scsw_ectl - return scsw ectl field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the ectl field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_ectl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.ectl;
+        else
+                return scsw->cmd.ectl;
+}
+EXPORT_SYMBOL(scsw_ectl);
+
+/**
+ * scsw_pno - return scsw pno field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the pno field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_pno(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.pno;
+        else
+                return scsw->cmd.pno;
+}
+EXPORT_SYMBOL(scsw_pno);
+
+/**
+ * scsw_fctl - return scsw fctl field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the fctl field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_fctl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.fctl;
+        else
+                return scsw->cmd.fctl;
+}
+EXPORT_SYMBOL(scsw_fctl);
+
+/**
+ * scsw_actl - return scsw actl field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the actl field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_actl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.actl;
+        else
+                return scsw->cmd.actl;
+}
+EXPORT_SYMBOL(scsw_actl);
+
+/**
+ * scsw_stctl - return scsw stctl field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the stctl field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_stctl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.stctl;
+        else
+                return scsw->cmd.stctl;
+}
+EXPORT_SYMBOL(scsw_stctl);
+
+/**
+ * scsw_dstat - return scsw dstat field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the dstat field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_dstat(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.dstat;
+        else
+                return scsw->cmd.dstat;
+}
+EXPORT_SYMBOL(scsw_dstat);
+
+/**
+ * scsw_cstat - return scsw cstat field
+ * @scsw: pointer to scsw
+ *
+ * Return the value of the cstat field of the specified scsw, regardless of
+ * whether it is a transport mode or command mode scsw.
+ */
+u32 scsw_cstat(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw->tm.cstat;
+        else
+                return scsw->cmd.cstat;
+}
+EXPORT_SYMBOL(scsw_cstat);
+
+/**
+ * scsw_cmd_is_valid_key - check key field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the key field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_key(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_key);
+
+/**
+ * scsw_cmd_is_valid_sctl - check fctl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the fctl field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_sctl(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_sctl);
+
+/**
+ * scsw_cmd_is_valid_eswf - check eswf field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the eswf field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_eswf(union scsw *scsw)
+{
+        return (scsw->cmd.stctl & SCSW_STCTL_STATUS_PEND);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_eswf);
+
+/**
+ * scsw_cmd_is_valid_cc - check cc field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the cc field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_cc(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC) &&
+               (scsw->cmd.stctl & SCSW_STCTL_STATUS_PEND);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_cc);
+
+/**
+ * scsw_cmd_is_valid_fmt - check fmt field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the fmt field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_fmt(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_fmt);
+
+/**
+ * scsw_cmd_is_valid_pfch - check pfch field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the pfch field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_pfch(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_pfch);
+
+/**
+ * scsw_cmd_is_valid_isic - check isic field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the isic field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_isic(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_isic);
+
+/**
+ * scsw_cmd_is_valid_alcc - check alcc field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the alcc field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_alcc(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_alcc);
+
+/**
+ * scsw_cmd_is_valid_ssi - check ssi field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the ssi field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_ssi(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_ssi);
+
+/**
+ * scsw_cmd_is_valid_zcc - check zcc field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the zcc field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_zcc(union scsw *scsw)
+{
+        return (scsw->cmd.fctl & SCSW_FCTL_START_FUNC) &&
+               (scsw->cmd.stctl & SCSW_STCTL_INTER_STATUS);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_zcc);
+
+/**
+ * scsw_cmd_is_valid_ectl - check ectl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the ectl field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_ectl(union scsw *scsw)
+{
+        return (scsw->cmd.stctl & SCSW_STCTL_STATUS_PEND) &&
+               !(scsw->cmd.stctl & SCSW_STCTL_INTER_STATUS) &&
+               (scsw->cmd.stctl & SCSW_STCTL_ALERT_STATUS);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_ectl);
+
+/**
+ * scsw_cmd_is_valid_pno - check pno field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the pno field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_pno(union scsw *scsw)
+{
+        return (scsw->cmd.fctl != 0) &&
+               (scsw->cmd.stctl & SCSW_STCTL_STATUS_PEND) &&
+               (!(scsw->cmd.stctl & SCSW_STCTL_INTER_STATUS) ||
+                 ((scsw->cmd.stctl & SCSW_STCTL_INTER_STATUS) &&
+                  (scsw->cmd.actl & SCSW_ACTL_SUSPENDED)));
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_pno);
+
+/**
+ * scsw_cmd_is_valid_fctl - check fctl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the fctl field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_fctl(union scsw *scsw)
+{
+        /* Only valid if pmcw.dnv == 1*/
+        return 1;
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_fctl);
+
+/**
+ * scsw_cmd_is_valid_actl - check actl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the actl field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_actl(union scsw *scsw)
+{
+        /* Only valid if pmcw.dnv == 1*/
+        return 1;
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_actl);
+
+/**
+ * scsw_cmd_is_valid_stctl - check stctl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the stctl field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_stctl(union scsw *scsw)
+{
+        /* Only valid if pmcw.dnv == 1*/
+        return 1;
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_stctl);
+
+/**
+ * scsw_cmd_is_valid_dstat - check dstat field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the dstat field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_dstat(union scsw *scsw)
+{
+        return (scsw->cmd.stctl & SCSW_STCTL_STATUS_PEND) &&
+               (scsw->cmd.cc != 3);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_dstat);
+
+/**
+ * scsw_cmd_is_valid_cstat - check cstat field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the cstat field of the specified command mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_cmd_is_valid_cstat(union scsw *scsw)
+{
+        return (scsw->cmd.stctl & SCSW_STCTL_STATUS_PEND) &&
+               (scsw->cmd.cc != 3);
+}
+EXPORT_SYMBOL(scsw_cmd_is_valid_cstat);
+
+/**
+ * scsw_tm_is_valid_key - check key field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the key field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_key(union scsw *scsw)
+{
+        return (scsw->tm.fctl & SCSW_FCTL_START_FUNC);
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_key);
+
+/**
+ * scsw_tm_is_valid_eswf - check eswf field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the eswf field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_eswf(union scsw *scsw)
+{
+        return (scsw->tm.stctl & SCSW_STCTL_STATUS_PEND);
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_eswf);
+
+/**
+ * scsw_tm_is_valid_cc - check cc field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the cc field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_cc(union scsw *scsw)
+{
+        return (scsw->tm.fctl & SCSW_FCTL_START_FUNC) &&
+               (scsw->tm.stctl & SCSW_STCTL_STATUS_PEND);
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_cc);
+
+/**
+ * scsw_tm_is_valid_fmt - check fmt field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the fmt field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_fmt(union scsw *scsw)
+{
+        return 1;
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_fmt);
+
+/**
+ * scsw_tm_is_valid_x - check x field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the x field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_x(union scsw *scsw)
+{
+        return 1;
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_x);
+
+/**
+ * scsw_tm_is_valid_q - check q field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the q field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_q(union scsw *scsw)
+{
+        return 1;
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_q);
+
+/**
+ * scsw_tm_is_valid_ectl - check ectl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the ectl field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_ectl(union scsw *scsw)
+{
+        return (scsw->tm.stctl & SCSW_STCTL_STATUS_PEND) &&
+               !(scsw->tm.stctl & SCSW_STCTL_INTER_STATUS) &&
+               (scsw->tm.stctl & SCSW_STCTL_ALERT_STATUS);
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_ectl);
+
+/**
+ * scsw_tm_is_valid_pno - check pno field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the pno field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_pno(union scsw *scsw)
+{
+        return (scsw->tm.fctl != 0) &&
+               (scsw->tm.stctl & SCSW_STCTL_STATUS_PEND) &&
+               (!(scsw->tm.stctl & SCSW_STCTL_INTER_STATUS) ||
+                 ((scsw->tm.stctl & SCSW_STCTL_INTER_STATUS) &&
+                  (scsw->tm.actl & SCSW_ACTL_SUSPENDED)));
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_pno);
+
+/**
+ * scsw_tm_is_valid_fctl - check fctl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the fctl field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_fctl(union scsw *scsw)
+{
+        /* Only valid if pmcw.dnv == 1*/
+        return 1;
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_fctl);
+
+/**
+ * scsw_tm_is_valid_actl - check actl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the actl field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_actl(union scsw *scsw)
+{
+        /* Only valid if pmcw.dnv == 1*/
+        return 1;
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_actl);
+
+/**
+ * scsw_tm_is_valid_stctl - check stctl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the stctl field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_stctl(union scsw *scsw)
+{
+        /* Only valid if pmcw.dnv == 1*/
+        return 1;
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_stctl);
+
+/**
+ * scsw_tm_is_valid_dstat - check dstat field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the dstat field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_dstat(union scsw *scsw)
+{
+        return (scsw->tm.stctl & SCSW_STCTL_STATUS_PEND) &&
+               (scsw->tm.cc != 3);
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_dstat);
+
+/**
+ * scsw_tm_is_valid_cstat - check cstat field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the cstat field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_cstat(union scsw *scsw)
+{
+        return (scsw->tm.stctl & SCSW_STCTL_STATUS_PEND) &&
+               (scsw->tm.cc != 3);
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_cstat);
+
+/**
+ * scsw_tm_is_valid_fcxs - check fcxs field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the fcxs field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_fcxs(union scsw *scsw)
+{
+        return 1;
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_fcxs);
+
+/**
+ * scsw_tm_is_valid_schxs - check schxs field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the schxs field of the specified transport mode scsw is
+ * valid, zero otherwise.
+ */
+int scsw_tm_is_valid_schxs(union scsw *scsw)
+{
+        return (scsw->tm.cstat & (SCHN_STAT_PROG_CHECK |
+                                  SCHN_STAT_INTF_CTRL_CHK |
+                                  SCHN_STAT_PROT_CHECK |
+                                  SCHN_STAT_CHN_DATA_CHK));
+}
+EXPORT_SYMBOL(scsw_tm_is_valid_schxs);
+
+/**
+ * scsw_is_valid_actl - check actl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the actl field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_actl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_actl(scsw);
+        else
+                return scsw_cmd_is_valid_actl(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_actl);
+
+/**
+ * scsw_is_valid_cc - check cc field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the cc field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_cc(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_cc(scsw);
+        else
+                return scsw_cmd_is_valid_cc(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_cc);
+
+/**
+ * scsw_is_valid_cstat - check cstat field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the cstat field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_cstat(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_cstat(scsw);
+        else
+                return scsw_cmd_is_valid_cstat(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_cstat);
+
+/**
+ * scsw_is_valid_dstat - check dstat field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the dstat field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_dstat(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_dstat(scsw);
+        else
+                return scsw_cmd_is_valid_dstat(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_dstat);
+
+/**
+ * scsw_is_valid_ectl - check ectl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the ectl field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_ectl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_ectl(scsw);
+        else
+                return scsw_cmd_is_valid_ectl(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_ectl);
+
+/**
+ * scsw_is_valid_eswf - check eswf field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the eswf field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_eswf(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_eswf(scsw);
+        else
+                return scsw_cmd_is_valid_eswf(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_eswf);
+
+/**
+ * scsw_is_valid_fctl - check fctl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the fctl field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_fctl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_fctl(scsw);
+        else
+                return scsw_cmd_is_valid_fctl(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_fctl);
+
+/**
+ * scsw_is_valid_key - check key field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the key field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_key(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_key(scsw);
+        else
+                return scsw_cmd_is_valid_key(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_key);
+
+/**
+ * scsw_is_valid_pno - check pno field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the pno field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_pno(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_pno(scsw);
+        else
+                return scsw_cmd_is_valid_pno(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_pno);
+
+/**
+ * scsw_is_valid_stctl - check stctl field validity
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the stctl field of the specified scsw is valid,
+ * regardless of whether it is a transport mode or command mode scsw.
+ * Return zero if the field does not contain a valid value.
+ */
+int scsw_is_valid_stctl(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_valid_stctl(scsw);
+        else
+                return scsw_cmd_is_valid_stctl(scsw);
+}
+EXPORT_SYMBOL(scsw_is_valid_stctl);
+
+/**
+ * scsw_cmd_is_solicited - check for solicited scsw
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the command mode scsw indicates that the associated
+ * status condition is solicited, zero if it is unsolicited.
+ */
+int scsw_cmd_is_solicited(union scsw *scsw)
+{
+        return (scsw->cmd.cc != 0) || (scsw->cmd.stctl !=
+                (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS));
+}
+EXPORT_SYMBOL(scsw_cmd_is_solicited);
+
+/**
+ * scsw_tm_is_solicited - check for solicited scsw
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the transport mode scsw indicates that the associated
+ * status condition is solicited, zero if it is unsolicited.
+ */
+int scsw_tm_is_solicited(union scsw *scsw)
+{
+        return (scsw->tm.cc != 0) || (scsw->tm.stctl !=
+                (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS));
+}
+EXPORT_SYMBOL(scsw_tm_is_solicited);
+
+/**
+ * scsw_is_solicited - check for solicited scsw
+ * @scsw: pointer to scsw
+ *
+ * Return non-zero if the transport or command mode scsw indicates that the
+ * associated status condition is solicited, zero if it is unsolicited.
+ */
+int scsw_is_solicited(union scsw *scsw)
+{
+        if (scsw_is_tm(scsw))
+                return scsw_tm_is_solicited(scsw);
+        else
+                return scsw_cmd_is_solicited(scsw);
+}
+EXPORT_SYMBOL(scsw_is_solicited);
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index a1ab3e3efd11..62b6b55230d0 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -34,13 +34,15 @@
 #include <linux/mutex.h>
 #include <asm/s390_rdev.h>
 #include <asm/reset.h>
+#include <linux/hrtimer.h>
+#include <linux/ktime.h>
 
 #include "ap_bus.h"
 
 /* Some prototypes. */
 static void ap_scan_bus(struct work_struct *);
 static void ap_poll_all(unsigned long);
-static void ap_poll_timeout(unsigned long);
+static enum hrtimer_restart ap_poll_timeout(struct hrtimer *);
 static int ap_poll_thread_start(void);
 static void ap_poll_thread_stop(void);
 static void ap_request_timeout(unsigned long);
@@ -80,12 +82,15 @@ static DECLARE_WORK(ap_config_work, ap_scan_bus);
 /*
  * Tasklet & timer for AP request polling.
  */
-static struct timer_list ap_poll_timer = TIMER_INITIALIZER(ap_poll_timeout,0,0);
 static DECLARE_TASKLET(ap_tasklet, ap_poll_all, 0);
 static atomic_t ap_poll_requests = ATOMIC_INIT(0);
 static DECLARE_WAIT_QUEUE_HEAD(ap_poll_wait);
 static struct task_struct *ap_poll_kthread = NULL;
 static DEFINE_MUTEX(ap_poll_thread_mutex);
+static struct hrtimer ap_poll_timer;
+/* In LPAR poll with 4kHz frequency. Poll every 250000 nanoseconds.
+ * If z/VM change to 1500000 nanoseconds to adjust to z/VM polling.*/
+static unsigned long long poll_timeout = 250000;
 
 /**
  * ap_intructions_available() - Test if AP instructions are available.
@@ -636,11 +641,39 @@ static ssize_t ap_poll_thread_store(struct bus_type *bus,
 
 static BUS_ATTR(poll_thread, 0644, ap_poll_thread_show, ap_poll_thread_store);
 
+static ssize_t poll_timeout_show(struct bus_type *bus, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%llu\n", poll_timeout);
+}
+
+static ssize_t poll_timeout_store(struct bus_type *bus, const char *buf,
+                                  size_t count)
+{
+        unsigned long long time;
+        ktime_t hr_time;
+
+        /* 120 seconds = maximum poll interval */
+        if (sscanf(buf, "%llu\n", &time) != 1 || time < 1 || time > 120000000000)
+                return -EINVAL;
+        poll_timeout = time;
+        hr_time = ktime_set(0, poll_timeout);
+
+        if (!hrtimer_is_queued(&ap_poll_timer) ||
+            !hrtimer_forward(&ap_poll_timer, ap_poll_timer.expires, hr_time)) {
+                ap_poll_timer.expires = hr_time;
+                hrtimer_start(&ap_poll_timer, hr_time, HRTIMER_MODE_ABS);
+        }
+        return count;
+}
+
+static BUS_ATTR(poll_timeout, 0644, poll_timeout_show, poll_timeout_store);
+
 static struct bus_attribute *const ap_bus_attrs[] = {
         &bus_attr_ap_domain,
         &bus_attr_config_time,
         &bus_attr_poll_thread,
-        NULL
+        &bus_attr_poll_timeout,
+        NULL,
 };
 
 /**
@@ -895,9 +928,10 @@ ap_config_timeout(unsigned long ptr)
  */
 static inline void ap_schedule_poll_timer(void)
 {
-        if (timer_pending(&ap_poll_timer))
+        if (hrtimer_is_queued(&ap_poll_timer))
                 return;
-        mod_timer(&ap_poll_timer, jiffies + AP_POLL_TIME);
+        hrtimer_start(&ap_poll_timer, ktime_set(0, poll_timeout),
+                      HRTIMER_MODE_ABS);
 }
 
 /**
@@ -1115,13 +1149,14 @@ EXPORT_SYMBOL(ap_cancel_message);
 
 /**
  * ap_poll_timeout(): AP receive polling for finished AP requests.
- * @unused: Unused variable.
+ * @unused: Unused pointer.
  *
- * Schedules the AP tasklet.
+ * Schedules the AP tasklet using a high resolution timer.
  */
-static void ap_poll_timeout(unsigned long unused)
+static enum hrtimer_restart ap_poll_timeout(struct hrtimer *unused)
 {
         tasklet_schedule(&ap_tasklet);
+        return HRTIMER_NORESTART;
 }
 
 /**
@@ -1344,6 +1379,14 @@ int __init ap_module_init(void)
         ap_config_timer.expires = jiffies + ap_config_time * HZ;
         add_timer(&ap_config_timer);
 
+        /* Setup the high resultion poll timer.
+         * If we are running under z/VM adjust polling to z/VM polling rate.
+         */
+        if (MACHINE_IS_VM)
+                poll_timeout = 1500000;
+        hrtimer_init(&ap_poll_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
+        ap_poll_timer.function = ap_poll_timeout;
+
         /* Start the low priority AP bus poll thread. */
         if (ap_thread_flag) {
                 rc = ap_poll_thread_start();
@@ -1355,7 +1398,7 @@ int __init ap_module_init(void)
 
 out_work:
         del_timer_sync(&ap_config_timer);
-        del_timer_sync(&ap_poll_timer);
+        hrtimer_cancel(&ap_poll_timer);
         destroy_workqueue(ap_work_queue);
 out_root:
         s390_root_dev_unregister(ap_root_device);
@@ -1386,7 +1429,7 @@ void ap_module_exit(void)
         ap_reset_domain();
         ap_poll_thread_stop();
         del_timer_sync(&ap_config_timer);
-        del_timer_sync(&ap_poll_timer);
+        hrtimer_cancel(&ap_poll_timer);
         destroy_workqueue(ap_work_queue);
         tasklet_kill(&ap_tasklet);
         s390_root_dev_unregister(ap_root_device);
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index c1e1200c43fc..446378b308fc 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -92,6 +92,8 @@ struct ap_queue_status {
 #define AP_DEVICE_TYPE_PCIXCC   5
 #define AP_DEVICE_TYPE_CEX2A    6
 #define AP_DEVICE_TYPE_CEX2C    7
+#define AP_DEVICE_TYPE_CEX2A2   8
+#define AP_DEVICE_TYPE_CEX2C2   9
 
 /*
  * AP reset flag states
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 4d36e805a234..cb22b97944b8 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -34,6 +34,7 @@
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 #include <linux/compat.h>
+#include <linux/smp_lock.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 #include <linux/hw_random.h>
@@ -300,7 +301,9 @@ static ssize_t zcrypt_write(struct file *filp, const char __user *buf,
  */
 static int zcrypt_open(struct inode *inode, struct file *filp)
 {
+        lock_kernel();
         atomic_inc(&zcrypt_open_count);
+        unlock_kernel();
         return 0;
 }
 
@@ -1068,10 +1071,8 @@ static int zcrypt_status_write(struct file *file, const char __user *buffer,
 
 #define LBUFSIZE 1200UL
         lbuf = kmalloc(LBUFSIZE, GFP_KERNEL);
-        if (!lbuf) {
-                PRINTK("kmalloc failed!\n");
+        if (!lbuf)
                 return 0;
-        }
 
         local_count = min(LBUFSIZE - 1, count);
         if (copy_from_user(lbuf, buffer, local_count) != 0) {
@@ -1081,23 +1082,15 @@ static int zcrypt_status_write(struct file *file, const char __user *buffer,
         lbuf[local_count] = '\0';
 
         ptr = strstr(lbuf, "Online devices");
-        if (!ptr) {
-                PRINTK("Unable to parse data (missing \"Online devices\")\n");
+        if (!ptr)
                 goto out;
-        }
         ptr = strstr(ptr, "\n");
-        if (!ptr) {
-                PRINTK("Unable to parse data (missing newline "
-                       "after \"Online devices\")\n");
+        if (!ptr)
                 goto out;
-        }
         ptr++;
 
-        if (strstr(ptr, "Waiting work element counts") == NULL) {
-                PRINTK("Unable to parse data (missing "
-                       "\"Waiting work element counts\")\n");
+        if (strstr(ptr, "Waiting work element counts") == NULL)
                 goto out;
-        }
 
         for (j = 0; j < 64 && *ptr; ptr++) {
                 /*
@@ -1197,16 +1190,12 @@ int __init zcrypt_api_init(void)
 
         /* Register the request sprayer. */
         rc = misc_register(&zcrypt_misc_device);
-        if (rc < 0) {
-                PRINTKW(KERN_ERR "misc_register (minor %d) failed with %d\n",
-                        zcrypt_misc_device.minor, rc);
+        if (rc < 0)
                 goto out;
-        }
 
         /* Set up the proc file system */
         zcrypt_entry = create_proc_entry("driver/z90crypt", 0644, NULL);
         if (!zcrypt_entry) {
-                PRINTK("Couldn't create z90crypt proc entry\n");
                 rc = -ENOMEM;
                 goto out_misc;
         }
diff --git a/drivers/s390/crypto/zcrypt_api.h b/drivers/s390/crypto/zcrypt_api.h
index 5c6e222b2ac4..1d1ec74dadb2 100644
--- a/drivers/s390/crypto/zcrypt_api.h
+++ b/drivers/s390/crypto/zcrypt_api.h
@@ -30,34 +30,6 @@
 #ifndef _ZCRYPT_API_H_
 #define _ZCRYPT_API_H_
 
-/**
- * Macro definitions
- *
- * PDEBUG debugs in the form "zcrypt: function_name -> message"
- *
- * PRINTK is like PDEBUG, except that it is always enabled
- * PRINTKN is like PRINTK, except that it does not include the function name
- * PRINTKW is like PRINTK, except that it uses KERN_WARNING
- * PRINTKC is like PRINTK, except that it uses KERN_CRIT
- */
-#define DEV_NAME        "zcrypt"
-
-#define PRINTK(fmt, args...) \
-        printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args)
-#define PRINTKN(fmt, args...) \
-        printk(KERN_DEBUG DEV_NAME ": " fmt, ## args)
-#define PRINTKW(fmt, args...) \
-        printk(KERN_WARNING DEV_NAME ": %s -> " fmt, __func__ , ## args)
-#define PRINTKC(fmt, args...) \
-        printk(KERN_CRIT DEV_NAME ": %s -> " fmt, __func__ , ## args)
-
-#ifdef ZCRYPT_DEBUG
-#define PDEBUG(fmt, args...) \
-        printk(KERN_DEBUG DEV_NAME ": %s -> " fmt, __func__ , ## args)
-#else
-#define PDEBUG(fmt, args...) do {} while (0)
-#endif
-
 #include "ap_bus.h"
 #include <asm/zcrypt.h>
 
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
index 08657f604b8c..54f4cbc3be9e 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.c
+++ b/drivers/s390/crypto/zcrypt_cex2a.c
@@ -49,6 +49,7 @@
 
 static struct ap_device_id zcrypt_cex2a_ids[] = {
         { AP_DEVICE(AP_DEVICE_TYPE_CEX2A) },
+        { AP_DEVICE(AP_DEVICE_TYPE_CEX2A2) },
         { /* end of list */ },
 };
 
@@ -242,9 +243,6 @@ static int convert_response(struct zcrypt_device *zdev,
                 return convert_type80(zdev, reply,
                                       outputdata, outputdatalength);
         default: /* Unknown response type, this should NEVER EVER happen */
-                PRINTK("Unrecognized Message Header: %08x%08x\n",
-                       *(unsigned int *) reply->message,
-                       *(unsigned int *) (reply->message+4));
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
diff --git a/drivers/s390/crypto/zcrypt_error.h b/drivers/s390/crypto/zcrypt_error.h
index 3e27fe77d207..03ba27f05f92 100644
--- a/drivers/s390/crypto/zcrypt_error.h
+++ b/drivers/s390/crypto/zcrypt_error.h
@@ -92,10 +92,6 @@ static inline int convert_error(struct zcrypt_device *zdev,
 {
         struct error_hdr *ehdr = reply->message;
 
-        PRINTK("Hardware error : Type %02x Message Header: %08x%08x\n",
-               ehdr->type, *(unsigned int *) reply->message,
-               *(unsigned int *) (reply->message + 4));
-
         switch (ehdr->reply_code) {
         case REP82_ERROR_OPERAND_INVALID:
         case REP82_ERROR_OPERAND_SIZE:
@@ -123,8 +119,6 @@ static inline int convert_error(struct zcrypt_device *zdev,
                 zdev->online = 0;
                 return -EAGAIN;
         default:
-                PRINTKW("unknown type %02x reply code = %d\n",
-                        ehdr->type, ehdr->reply_code);
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
index 6e93b4751782..12da4815ba8e 100644
--- a/drivers/s390/crypto/zcrypt_pcica.c
+++ b/drivers/s390/crypto/zcrypt_pcica.c
@@ -226,9 +226,6 @@ static int convert_response(struct zcrypt_device *zdev,
                 return convert_type84(zdev, reply,
                                       outputdata, outputdatalength);
         default: /* Unknown response type, this should NEVER EVER happen */
-                PRINTK("Unrecognized Message Header: %08x%08x\n",
-                       *(unsigned int *) reply->message,
-                       *(unsigned int *) (reply->message+4));
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index 17ea56ce1c11..779952cb19fc 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -361,26 +361,18 @@ static int convert_type86(struct zcrypt_device *zdev,
         service_rc = le16_to_cpu(msg->cprb.ccp_rtcode);
         if (unlikely(service_rc != 0)) {
                 service_rs = le16_to_cpu(msg->cprb.ccp_rscode);
-                if (service_rc == 8 && service_rs == 66) {
-                        PDEBUG("Bad block format on PCICC\n");
+                if (service_rc == 8 && service_rs == 66)
                         return -EINVAL;
-                }
-                if (service_rc == 8 && service_rs == 65) {
-                        PDEBUG("Probably an even modulus on PCICC\n");
+                if (service_rc == 8 && service_rs == 65)
                         return -EINVAL;
-                }
                 if (service_rc == 8 && service_rs == 770) {
-                        PDEBUG("Invalid key length on PCICC\n");
                         zdev->max_mod_size = PCICC_MAX_MOD_SIZE_OLD;
                         return -EAGAIN;
                 }
                 if (service_rc == 8 && service_rs == 783) {
-                        PDEBUG("Extended bitlengths not enabled on PCICC\n");
                         zdev->max_mod_size = PCICC_MAX_MOD_SIZE_OLD;
                         return -EAGAIN;
                 }
-                PRINTK("Unknown service rc/rs (PCICC): %d/%d\n",
-                       service_rc, service_rs);
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
@@ -434,9 +426,6 @@ static int convert_response(struct zcrypt_device *zdev,
                                               outputdata, outputdatalength);
                 /* no break, incorrect cprb version is an unknown response */
         default: /* Unknown response type, this should NEVER EVER happen */
-                PRINTK("Unrecognized Message Header: %08x%08x\n",
-                       *(unsigned int *) reply->message,
-                       *(unsigned int *) (reply->message+4));
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index 0bc9b3188e64..d8ad36f81540 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -72,6 +72,7 @@ struct response_type {
 static struct ap_device_id zcrypt_pcixcc_ids[] = {
         { AP_DEVICE(AP_DEVICE_TYPE_PCIXCC) },
         { AP_DEVICE(AP_DEVICE_TYPE_CEX2C) },
+        { AP_DEVICE(AP_DEVICE_TYPE_CEX2C2) },
         { /* end of list */ },
 };
 
@@ -289,38 +290,19 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,
         ap_msg->length = sizeof(struct type6_hdr) +
                 CEIL4(xcRB->request_control_blk_length) +
                 xcRB->request_data_length;
-        if (ap_msg->length > PCIXCC_MAX_XCRB_MESSAGE_SIZE) {
-                PRINTK("Combined message is too large (%ld/%d/%d).\n",
-                    sizeof(struct type6_hdr),
-                    xcRB->request_control_blk_length,
-                    xcRB->request_data_length);
+        if (ap_msg->length > PCIXCC_MAX_XCRB_MESSAGE_SIZE)
                 return -EFAULT;
-        }
-        if (CEIL4(xcRB->reply_control_blk_length) >
-            PCIXCC_MAX_XCRB_REPLY_SIZE) {
-                PDEBUG("Reply CPRB length is too large (%d).\n",
-                    xcRB->request_control_blk_length);
+        if (CEIL4(xcRB->reply_control_blk_length) > PCIXCC_MAX_XCRB_REPLY_SIZE)
                 return -EFAULT;
-        }
-        if (CEIL4(xcRB->reply_data_length) > PCIXCC_MAX_XCRB_DATA_SIZE) {
-                PDEBUG("Reply data block length is too large (%d).\n",
-                    xcRB->reply_data_length);
+        if (CEIL4(xcRB->reply_data_length) > PCIXCC_MAX_XCRB_DATA_SIZE)
                 return -EFAULT;
-        }
         replylen = CEIL4(xcRB->reply_control_blk_length) +
                 CEIL4(xcRB->reply_data_length) +
                 sizeof(struct type86_fmt2_msg);
         if (replylen > PCIXCC_MAX_XCRB_RESPONSE_SIZE) {
-                PDEBUG("Reply CPRB + data block > PCIXCC_MAX_XCRB_RESPONSE_SIZE"
-                       " (%d/%d/%d).\n",
-                       sizeof(struct type86_fmt2_msg),
-                       xcRB->reply_control_blk_length,
-                       xcRB->reply_data_length);
                 xcRB->reply_control_blk_length = PCIXCC_MAX_XCRB_RESPONSE_SIZE -
                         (sizeof(struct type86_fmt2_msg) +
                             CEIL4(xcRB->reply_data_length));
-                PDEBUG("Capping Reply CPRB length at %d\n",
-                       xcRB->reply_control_blk_length);
         }
 
         /* prepare type6 header */
@@ -339,11 +321,8 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,
                     xcRB->request_control_blk_length))
                 return -EFAULT;
         if (msg->cprbx.cprb_len + sizeof(msg->hdr.function_code) >
-            xcRB->request_control_blk_length) {
-                PDEBUG("cprb_len too large (%d/%d)\n", msg->cprbx.cprb_len,
-                    xcRB->request_control_blk_length);
+            xcRB->request_control_blk_length)
                 return -EFAULT;
-        }
         function_code = ((unsigned char *)&msg->cprbx) + msg->cprbx.cprb_len;
         memcpy(msg->hdr.function_code, function_code, sizeof(msg->hdr.function_code));
 
@@ -471,29 +450,18 @@ static int convert_type86_ica(struct zcrypt_device *zdev,
         service_rc = msg->cprbx.ccp_rtcode;
         if (unlikely(service_rc != 0)) {
                 service_rs = msg->cprbx.ccp_rscode;
-                if (service_rc == 8 && service_rs == 66) {
-                        PDEBUG("Bad block format on PCIXCC/CEX2C\n");
+                if (service_rc == 8 && service_rs == 66)
                         return -EINVAL;
-                }
-                if (service_rc == 8 && service_rs == 65) {
-                        PDEBUG("Probably an even modulus on PCIXCC/CEX2C\n");
+                if (service_rc == 8 && service_rs == 65)
                         return -EINVAL;
-                }
-                if (service_rc == 8 && service_rs == 770) {
-                        PDEBUG("Invalid key length on PCIXCC/CEX2C\n");
+                if (service_rc == 8 && service_rs == 770)
                         return -EINVAL;
-                }
                 if (service_rc == 8 && service_rs == 783) {
-                        PDEBUG("Extended bitlengths not enabled on PCIXCC/CEX2C\n");
                         zdev->min_mod_size = PCIXCC_MIN_MOD_SIZE_OLD;
                         return -EAGAIN;
                 }
-                if (service_rc == 12 && service_rs == 769) {
-                        PDEBUG("Invalid key on PCIXCC/CEX2C\n");
+                if (service_rc == 12 && service_rs == 769)
                         return -EINVAL;
-                }
-                PRINTK("Unknown service rc/rs (PCIXCC/CEX2C): %d/%d\n",
-                       service_rc, service_rs);
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
@@ -569,11 +537,8 @@ static int convert_type86_rng(struct zcrypt_device *zdev,
         } __attribute__((packed)) *msg = reply->message;
         char *data = reply->message;
 
-        if (msg->cprbx.ccp_rtcode != 0 || msg->cprbx.ccp_rscode != 0) {
-                PDEBUG("RNG response error on PCIXCC/CEX2C rc=%hu/rs=%hu\n",
-                       rc, rs);
+        if (msg->cprbx.ccp_rtcode != 0 || msg->cprbx.ccp_rscode != 0)
                 return -EINVAL;
-        }
         memcpy(buffer, data + msg->fmt2.offset2, msg->fmt2.count2);
         return msg->fmt2.count2;
 }
@@ -598,9 +563,6 @@ static int convert_response_ica(struct zcrypt_device *zdev,
                                                   outputdata, outputdatalength);
                 /* no break, incorrect cprb version is an unknown response */
         default: /* Unknown response type, this should NEVER EVER happen */
-                PRINTK("Unrecognized Message Header: %08x%08x\n",
-                       *(unsigned int *) reply->message,
-                       *(unsigned int *) (reply->message+4));
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
@@ -627,9 +589,6 @@ static int convert_response_xcrb(struct zcrypt_device *zdev,
                         return convert_type86_xcrb(zdev, reply, xcRB);
                 /* no break, incorrect cprb version is an unknown response */
         default: /* Unknown response type, this should NEVER EVER happen */
-                PRINTK("Unrecognized Message Header: %08x%08x\n",
-                       *(unsigned int *) reply->message,
-                       *(unsigned int *) (reply->message+4));
                 xcRB->status = 0x0008044DL; /* HDD_InvalidParm */
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
@@ -653,9 +612,6 @@ static int convert_response_rng(struct zcrypt_device *zdev,
                         return convert_type86_rng(zdev, reply, data);
                 /* no break, incorrect cprb version is an unknown response */
         default: /* Unknown response type, this should NEVER EVER happen */
-                PRINTK("Unrecognized Message Header: %08x%08x\n",
-                       *(unsigned int *) reply->message,
-                       *(unsigned int *) (reply->message+4));
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
         }
@@ -700,10 +656,7 @@ static void zcrypt_pcixcc_receive(struct ap_device *ap_dev,
                         memcpy(msg->message, reply->message, length);
                         break;
                 default:
-                        PRINTK("Invalid internal response type: %i\n",
-                            resp_type->type);
-                        memcpy(msg->message, &error_reply,
-                            sizeof error_reply);
+                        memcpy(msg->message, &error_reply, sizeof error_reply);
                 }
         } else
                 memcpy(msg->message, reply->message, sizeof error_reply);
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 04a1d7bf678c..c644669a75c2 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -703,7 +703,8 @@ claw_irq_handler(struct ccw_device *cdev,
         if (!cdev->dev.driver_data) {
                 printk(KERN_WARNING "claw: unsolicited interrupt for device:"
                         "%s received c-%02x d-%02x\n",
-                        cdev->dev.bus_id,irb->scsw.cstat, irb->scsw.dstat);
+                       cdev->dev.bus_id, irb->scsw.cmd.cstat,
+                       irb->scsw.cmd.dstat);
 #ifdef FUNCTRACE
                 printk(KERN_INFO "claw: %s() "
                         "exit on line %d\n",__func__,__LINE__);
@@ -732,22 +733,23 @@ claw_irq_handler(struct ccw_device *cdev,
 #ifdef IOTRACE
         printk(KERN_INFO "%s: interrupt for device: %04x "
                 "received c-%02x d-%02x state-%02x\n",
-                dev->name, p_ch->devno, irb->scsw.cstat,
-                irb->scsw.dstat, p_ch->claw_state);
+               dev->name, p_ch->devno, irb->scsw.cmd.cstat,
+               irb->scsw.cmd.dstat, p_ch->claw_state);
 #endif
 
         /* Copy interruption response block. */
         memcpy(p_ch->irb, irb, sizeof(struct irb));
 
         /* Check for good subchannel return code, otherwise error message */
-        if (irb->scsw.cstat  &&  !(irb->scsw.cstat & SCHN_STAT_PCI)) {
+        if (irb->scsw.cmd.cstat && !(irb->scsw.cmd.cstat & SCHN_STAT_PCI)) {
                 printk(KERN_INFO "%s: subchannel check for device: %04x -"
                         " Sch Stat %02x  Dev Stat %02x CPA - %04x\n",
                         dev->name, p_ch->devno,
-                        irb->scsw.cstat, irb->scsw.dstat,irb->scsw.cpa);
+                        irb->scsw.cmd.cstat, irb->scsw.cmd.dstat,
+                        irb->scsw.cmd.cpa);
 #ifdef IOTRACE
                 dumpit((char *)irb,sizeof(struct irb));
-                dumpit((char *)(unsigned long)irb->scsw.cpa,
+                dumpit((char *)(unsigned long)irb->scsw.cmd.cpa,
                         sizeof(struct ccw1));
 #endif
 #ifdef FUNCTRACE
@@ -759,22 +761,24 @@ claw_irq_handler(struct ccw_device *cdev,
         }
 
         /* Check the reason-code of a unit check */
-        if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)
                 ccw_check_unit_check(p_ch, irb->ecw[0]);
-        }
 
         /* State machine to bring the connection up, down and to restart */
-        p_ch->last_dstat = irb->scsw.dstat;
+        p_ch->last_dstat = irb->scsw.cmd.dstat;
 
         switch (p_ch->claw_state) {
                 case CLAW_STOP:/* HALT_IO by claw_release (halt sequence) */
 #ifdef DEBUGMSG
                         printk(KERN_INFO "%s: CLAW_STOP enter\n", dev->name);
 #endif
-                        if (!((p_ch->irb->scsw.stctl & SCSW_STCTL_SEC_STATUS) ||
-                        (p_ch->irb->scsw.stctl == SCSW_STCTL_STATUS_PEND) ||
-                        (p_ch->irb->scsw.stctl ==
-                        (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
+                        if (!((p_ch->irb->scsw.cmd.stctl &
+                               SCSW_STCTL_SEC_STATUS) ||
+                            (p_ch->irb->scsw.cmd.stctl ==
+                                SCSW_STCTL_STATUS_PEND) ||
+                            (p_ch->irb->scsw.cmd.stctl ==
+                                (SCSW_STCTL_ALERT_STATUS |
+                                 SCSW_STCTL_STATUS_PEND)))) {
 #ifdef FUNCTRACE
                                 printk(KERN_INFO "%s:%s Exit on line %d\n",
                                         dev->name,__func__,__LINE__);
@@ -798,10 +802,13 @@ claw_irq_handler(struct ccw_device *cdev,
                         printk(KERN_INFO "%s: process CLAW_STAT_HALT_IO\n",
                                 dev->name);
 #endif
-                        if (!((p_ch->irb->scsw.stctl & SCSW_STCTL_SEC_STATUS) ||
-                        (p_ch->irb->scsw.stctl == SCSW_STCTL_STATUS_PEND) ||
-                        (p_ch->irb->scsw.stctl ==
-                        (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
+                        if (!((p_ch->irb->scsw.cmd.stctl &
+                               SCSW_STCTL_SEC_STATUS) ||
+                            (p_ch->irb->scsw.cmd.stctl ==
+                             SCSW_STCTL_STATUS_PEND) ||
+                            (p_ch->irb->scsw.cmd.stctl ==
+                             (SCSW_STCTL_ALERT_STATUS |
+                              SCSW_STCTL_STATUS_PEND)))) {
 #ifdef FUNCTRACE
                                 printk(KERN_INFO "%s:%s Exit on line %d\n",
                                         dev->name,__func__,__LINE__);
@@ -828,8 +835,8 @@ claw_irq_handler(struct ccw_device *cdev,
                                         "interrupt for device:"
                                         "%s received c-%02x d-%02x\n",
                                         cdev->dev.bus_id,
-                                        irb->scsw.cstat,
-                                        irb->scsw.dstat);
+                                        irb->scsw.cmd.cstat,
+                                        irb->scsw.cmd.dstat);
                                 return;
                                 }
 #ifdef DEBUGMSG
@@ -844,7 +851,7 @@ claw_irq_handler(struct ccw_device *cdev,
                         return;
                 case CLAW_START_READ:
                         CLAW_DBF_TEXT(4,trace,"ReadIRQ");
-                        if (p_ch->irb->scsw.dstat & DEV_STAT_UNIT_CHECK) {
+                        if (p_ch->irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) {
                                 clear_bit(0, (void *)&p_ch->IO_active);
                                 if ((p_ch->irb->ecw[0] & 0x41) == 0x41 ||
                                     (p_ch->irb->ecw[0] & 0x40) == 0x40 ||
@@ -863,8 +870,8 @@ claw_irq_handler(struct ccw_device *cdev,
                                         CLAW_DBF_TEXT(4,trace,"notrdy");
                                         return;
                         }
-                        if ((p_ch->irb->scsw.cstat & SCHN_STAT_PCI) &&
-                            (p_ch->irb->scsw.dstat==0)) {
+                        if ((p_ch->irb->scsw.cmd.cstat & SCHN_STAT_PCI) &&
+                            (p_ch->irb->scsw.cmd.dstat == 0)) {
                                 if (test_and_set_bit(CLAW_BH_ACTIVE,
                                         (void *)&p_ch->flag_a) == 0) {
                                         tasklet_schedule(&p_ch->tasklet);
@@ -879,10 +886,13 @@ claw_irq_handler(struct ccw_device *cdev,
                                 CLAW_DBF_TEXT(4,trace,"PCI_read");
                                 return;
                         }
-                        if(!((p_ch->irb->scsw.stctl & SCSW_STCTL_SEC_STATUS) ||
-                         (p_ch->irb->scsw.stctl == SCSW_STCTL_STATUS_PEND) ||
-                         (p_ch->irb->scsw.stctl ==
-                         (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
+                        if (!((p_ch->irb->scsw.cmd.stctl &
+                               SCSW_STCTL_SEC_STATUS) ||
+                             (p_ch->irb->scsw.cmd.stctl ==
+                              SCSW_STCTL_STATUS_PEND) ||
+                             (p_ch->irb->scsw.cmd.stctl ==
+                              (SCSW_STCTL_ALERT_STATUS |
+                               SCSW_STCTL_STATUS_PEND)))) {
 #ifdef FUNCTRACE
                                 printk(KERN_INFO "%s:%s Exit on line %d\n",
                                         dev->name,__func__,__LINE__);
@@ -911,7 +921,7 @@ claw_irq_handler(struct ccw_device *cdev,
                         CLAW_DBF_TEXT(4,trace,"RdIRQXit");
                         return;
                 case CLAW_START_WRITE:
-                        if (p_ch->irb->scsw.dstat & DEV_STAT_UNIT_CHECK) {
+                        if (p_ch->irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) {
                                 printk(KERN_INFO "%s: Unit Check Occured in "
                                         "write channel\n",dev->name);
                                 clear_bit(0, (void *)&p_ch->IO_active);
@@ -934,16 +944,19 @@ claw_irq_handler(struct ccw_device *cdev,
                                 CLAW_DBF_TEXT(4,trace,"rstrtwrt");
                                 return;
                         }
-                        if (p_ch->irb->scsw.dstat & DEV_STAT_UNIT_EXCEP) {
+                        if (p_ch->irb->scsw.cmd.dstat & DEV_STAT_UNIT_EXCEP) {
                                         clear_bit(0, (void *)&p_ch->IO_active);
                                         printk(KERN_INFO "%s: Unit Exception "
                                                 "Occured in write channel\n",
                                                 dev->name);
                         }
-                        if(!((p_ch->irb->scsw.stctl & SCSW_STCTL_SEC_STATUS) ||
-                        (p_ch->irb->scsw.stctl == SCSW_STCTL_STATUS_PEND) ||
-                        (p_ch->irb->scsw.stctl ==
-                        (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))) {
+                        if (!((p_ch->irb->scsw.cmd.stctl &
+                               SCSW_STCTL_SEC_STATUS) ||
+                             (p_ch->irb->scsw.cmd.stctl ==
+                              SCSW_STCTL_STATUS_PEND) ||
+                             (p_ch->irb->scsw.cmd.stctl ==
+                              (SCSW_STCTL_ALERT_STATUS |
+                               SCSW_STCTL_STATUS_PEND)))) {
 #ifdef FUNCTRACE
                                 printk(KERN_INFO "%s:%s Exit on line %d\n",
                                         dev->name,__func__,__LINE__);
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index 2a106f3a076d..7e6bd387f4d8 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -257,9 +257,9 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg)
         if (duration > ch->prof.tx_time)
                 ch->prof.tx_time = duration;
 
-        if (ch->irb->scsw.count != 0)
+        if (ch->irb->scsw.cmd.count != 0)
                 ctcm_pr_debug("%s: TX not complete, remaining %d bytes\n",
-                             dev->name, ch->irb->scsw.count);
+                             dev->name, ch->irb->scsw.cmd.count);
         fsm_deltimer(&ch->timer);
         while ((skb = skb_dequeue(&ch->io_queue))) {
                 priv->stats.tx_packets++;
@@ -353,7 +353,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
         struct ctcm_priv *priv = dev->priv;
-        int len = ch->max_bufsize - ch->irb->scsw.count;
+        int len = ch->max_bufsize - ch->irb->scsw.cmd.count;
         struct sk_buff *skb = ch->trans_skb;
         __u16 block_len = *((__u16 *)skb->data);
         int check_len;
@@ -1234,9 +1234,9 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)
         if (duration > ch->prof.tx_time)
                 ch->prof.tx_time = duration;
 
-        if (ch->irb->scsw.count != 0)
+        if (ch->irb->scsw.cmd.count != 0)
                 ctcm_pr_debug("%s: TX not complete, remaining %d bytes\n",
-                                dev->name, ch->irb->scsw.count);
+                                dev->name, ch->irb->scsw.cmd.count);
         fsm_deltimer(&ch->timer);
         while ((skb = skb_dequeue(&ch->io_queue))) {
                 priv->stats.tx_packets++;
@@ -1394,7 +1394,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
         struct sk_buff          *skb = ch->trans_skb;
         struct sk_buff          *new_skb;
         unsigned long   saveflags = 0;  /* avoids compiler warning */
-        int len = ch->max_bufsize - ch->irb->scsw.count;
+        int len = ch->max_bufsize - ch->irb->scsw.cmd.count;
 
         if (do_debug_data) {
                 CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG, "mpc_ch_rx %s cp:%i %s\n",
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index d52843da4f55..6b13c1c1beb8 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1236,8 +1236,8 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
         /* Check for unsolicited interrupts. */
         if (cgdev == NULL) {
                 ctcm_pr_warn("ctcm: Got unsolicited irq: %s c-%02x d-%02x\n",
-                            cdev->dev.bus_id, irb->scsw.cstat,
-                            irb->scsw.dstat);
+                            cdev->dev.bus_id, irb->scsw.cmd.cstat,
+                            irb->scsw.cmd.dstat);
                 return;
         }
 
@@ -1266,40 +1266,40 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
                                 "received c-%02x d-%02x\n",
                                 dev->name,
                                 ch->id,
-                                irb->scsw.cstat,
-                                irb->scsw.dstat);
+                                irb->scsw.cmd.cstat,
+                                irb->scsw.cmd.dstat);
 
         /* Copy interruption response block. */
         memcpy(ch->irb, irb, sizeof(struct irb));
 
         /* Check for good subchannel return code, otherwise error message */
-        if (irb->scsw.cstat) {
+        if (irb->scsw.cmd.cstat) {
                 fsm_event(ch->fsm, CTC_EVENT_SC_UNKNOWN, ch);
                 ctcm_pr_warn("%s: subchannel check for dev: %s - %02x %02x\n",
-                            dev->name, ch->id, irb->scsw.cstat,
-                            irb->scsw.dstat);
+                            dev->name, ch->id, irb->scsw.cmd.cstat,
+                            irb->scsw.cmd.dstat);
                 return;
         }
 
         /* Check the reason-code of a unit check */
-        if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) {
                 ccw_unit_check(ch, irb->ecw[0]);
                 return;
         }
-        if (irb->scsw.dstat & DEV_STAT_BUSY) {
-                if (irb->scsw.dstat & DEV_STAT_ATTENTION)
+        if (irb->scsw.cmd.dstat & DEV_STAT_BUSY) {
+                if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION)
                         fsm_event(ch->fsm, CTC_EVENT_ATTNBUSY, ch);
                 else
                         fsm_event(ch->fsm, CTC_EVENT_BUSY, ch);
                 return;
         }
-        if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION) {
                 fsm_event(ch->fsm, CTC_EVENT_ATTN, ch);
                 return;
         }
-        if ((irb->scsw.stctl & SCSW_STCTL_SEC_STATUS) ||
-            (irb->scsw.stctl == SCSW_STCTL_STATUS_PEND) ||
-            (irb->scsw.stctl ==
+        if ((irb->scsw.cmd.stctl & SCSW_STCTL_SEC_STATUS) ||
+            (irb->scsw.cmd.stctl == SCSW_STCTL_STATUS_PEND) ||
+            (irb->scsw.cmd.stctl ==
              (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)))
                 fsm_event(ch->fsm, CTC_EVENT_FINSTAT, ch);
         else
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c
index 8e7697305a4c..f4a32375c037 100644
--- a/drivers/s390/net/cu3088.c
+++ b/drivers/s390/net/cu3088.c
@@ -36,7 +36,6 @@ const char *cu3088_type[] = {
         "CTC/A",
         "ESCON channel",
         "FICON channel",
-        "P390 LCS card",
         "OSA LCS card",
         "CLAW channel device",
         "unknown channel type",
@@ -49,7 +48,6 @@ static struct ccw_device_id cu3088_ids[] = {
         { CCW_DEVICE(0x3088, 0x08), .driver_info = channel_type_parallel },
         { CCW_DEVICE(0x3088, 0x1f), .driver_info = channel_type_escon },
         { CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },
-        { CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 },
         { CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },
         { CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw },
         { /* end of list */ }
diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h
index 1753661f702a..d8558a7105a5 100644
--- a/drivers/s390/net/cu3088.h
+++ b/drivers/s390/net/cu3088.h
@@ -17,9 +17,6 @@ enum channel_types {
         /* Device is a FICON channel */
         channel_type_ficon,
 
-        /* Device is a P390 LCS card */
-        channel_type_p390,
-
         /* Device is a OSA2 card */
         channel_type_osa2,
 
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index dd22f4b37037..6de28385b354 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1327,8 +1327,8 @@ lcs_get_problem(struct ccw_device *cdev, struct irb *irb)
         char *sense;
 
         sense = (char *) irb->ecw;
-        cstat = irb->scsw.cstat;
-        dstat = irb->scsw.dstat;
+        cstat = irb->scsw.cmd.cstat;
+        dstat = irb->scsw.cmd.dstat;
 
         if (cstat & (SCHN_STAT_CHN_CTRL_CHK | SCHN_STAT_INTF_CTRL_CHK |
                      SCHN_STAT_CHN_DATA_CHK | SCHN_STAT_CHAIN_CHECK |
@@ -1388,11 +1388,13 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         else
                 channel = &card->write;
 
-        cstat = irb->scsw.cstat;
-        dstat = irb->scsw.dstat;
+        cstat = irb->scsw.cmd.cstat;
+        dstat = irb->scsw.cmd.dstat;
         LCS_DBF_TEXT_(5, trace, "Rint%s",cdev->dev.bus_id);
-        LCS_DBF_TEXT_(5, trace, "%4x%4x",irb->scsw.cstat, irb->scsw.dstat);
-        LCS_DBF_TEXT_(5, trace, "%4x%4x",irb->scsw.fctl, irb->scsw.actl);
+        LCS_DBF_TEXT_(5, trace, "%4x%4x", irb->scsw.cmd.cstat,
+                      irb->scsw.cmd.dstat);
+        LCS_DBF_TEXT_(5, trace, "%4x%4x", irb->scsw.cmd.fctl,
+                      irb->scsw.cmd.actl);
 
         /* Check for channel and device errors presented */
         rc = lcs_get_problem(cdev, irb);
@@ -1410,11 +1412,11 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         }
         /* How far in the ccw chain have we processed? */
         if ((channel->state != LCS_CH_STATE_INIT) &&
-            (irb->scsw.fctl & SCSW_FCTL_START_FUNC)) {
-                index = (struct ccw1 *) __va((addr_t) irb->scsw.cpa)
+            (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) {
+                index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa)
                         - channel->ccws;
-                if ((irb->scsw.actl & SCSW_ACTL_SUSPENDED) ||
-                    (irb->scsw.cstat & SCHN_STAT_PCI))
+                if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) ||
+                    (irb->scsw.cmd.cstat & SCHN_STAT_PCI))
                         /* Bloody io subsystem tells us lies about cpa... */
                         index = (index - 1) & (LCS_NUM_BUFFS - 1);
                 while (channel->io_idx != index) {
@@ -1425,25 +1427,24 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 }
         }
 
-        if ((irb->scsw.dstat & DEV_STAT_DEV_END) ||
-            (irb->scsw.dstat & DEV_STAT_CHN_END) ||
-            (irb->scsw.dstat & DEV_STAT_UNIT_CHECK))
+        if ((irb->scsw.cmd.dstat & DEV_STAT_DEV_END) ||
+            (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) ||
+            (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK))
                 /* Mark channel as stopped. */
                 channel->state = LCS_CH_STATE_STOPPED;
-        else if (irb->scsw.actl & SCSW_ACTL_SUSPENDED)
+        else if (irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED)
                 /* CCW execution stopped on a suspend bit. */
                 channel->state = LCS_CH_STATE_SUSPENDED;
-        if (irb->scsw.fctl & SCSW_FCTL_HALT_FUNC) {
-                if (irb->scsw.cc != 0) {
+        if (irb->scsw.cmd.fctl & SCSW_FCTL_HALT_FUNC) {
+                if (irb->scsw.cmd.cc != 0) {
                         ccw_device_halt(channel->ccwdev, (addr_t) channel);
                         return;
                 }
                 /* The channel has been stopped by halt_IO. */
                 channel->state = LCS_CH_STATE_HALTED;
         }
-        if (irb->scsw.fctl & SCSW_FCTL_CLEAR_FUNC) {
+        if (irb->scsw.cmd.fctl & SCSW_FCTL_CLEAR_FUNC)
                 channel->state = LCS_CH_STATE_CLEARED;
-        }
         /* Do the rest in the tasklet. */
         tasklet_schedule(&channel->irq_tasklet);
 }
@@ -1761,7 +1762,7 @@ lcs_get_control(struct lcs_card *card, struct lcs_cmd *cmd)
                                 netif_carrier_off(card->dev);
                         break;
                 default:
-                        PRINT_INFO("UNRECOGNIZED LGW COMMAND\n");
+                        LCS_DBF_TEXT(5, trace, "noLGWcmd");
                         break;
                 }
         } else
@@ -2042,13 +2043,12 @@ lcs_probe_device(struct ccwgroup_device *ccwgdev)
         LCS_DBF_TEXT(2, setup, "add_dev");
         card = lcs_alloc_card();
         if (!card) {
-                PRINT_ERR("Allocation of lcs card failed\n");
+                LCS_DBF_TEXT_(2, setup, "  rc%d", -ENOMEM);
                 put_device(&ccwgdev->dev);
                 return -ENOMEM;
         }
         ret = sysfs_create_group(&ccwgdev->dev.kobj, &lcs_attr_group);
         if (ret) {
-                PRINT_ERR("Creating attributes failed");
                 lcs_free_card(card);
                 put_device(&ccwgdev->dev);
                 return ret;
@@ -2140,7 +2140,6 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
         default:
                 LCS_DBF_TEXT(3, setup, "errinit");
                 PRINT_ERR("LCS: Initialization failed\n");
-                PRINT_ERR("LCS: No device found!\n");
                 goto out;
         }
         if (!dev)
@@ -2269,7 +2268,6 @@ lcs_remove_device(struct ccwgroup_device *ccwgdev)
         if (!card)
                 return;
 
-        PRINT_INFO("Removing lcs group device ....\n");
         LCS_DBF_TEXT(3, setup, "remdev");
         LCS_DBF_HEX(3, setup, &card, sizeof(void*));
         if (ccwgdev->state == CCWGROUP_ONLINE) {
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index e4ba6a0372ac..9242b5acc66b 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -625,9 +625,6 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
                 offset += header->next;
                 header->next -= NETIUCV_HDRLEN;
                 if (skb_tailroom(pskb) < header->next) {
-                        PRINT_WARN("%s: Illegal next field in iucv header: "
-                               "%d > %d\n",
-                               dev->name, header->next, skb_tailroom(pskb));
                         IUCV_DBF_TEXT_(data, 2, "Illegal next field: %d > %d\n",
                                 header->next, skb_tailroom(pskb));
                         return;
@@ -636,8 +633,6 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
                 skb_reset_mac_header(pskb);
                 skb = dev_alloc_skb(pskb->len);
                 if (!skb) {
-                        PRINT_WARN("%s Out of memory in netiucv_unpack_skb\n",
-                               dev->name);
                         IUCV_DBF_TEXT(data, 2,
                                 "Out of memory in netiucv_unpack_skb\n");
                         privptr->stats.rx_dropped++;
@@ -674,7 +669,6 @@ static void conn_action_rx(fsm_instance *fi, int event, void *arg)
 
         if (!conn->netdev) {
                 iucv_message_reject(conn->path, msg);
-                PRINT_WARN("Received data for unlinked connection\n");
                 IUCV_DBF_TEXT(data, 2,
                               "Received data for unlinked connection\n");
                 return;
@@ -682,8 +676,6 @@ static void conn_action_rx(fsm_instance *fi, int event, void *arg)
         if (msg->length > conn->max_buffsize) {
                 iucv_message_reject(conn->path, msg);
                 privptr->stats.rx_dropped++;
-                PRINT_WARN("msglen %d > max_buffsize %d\n",
-                           msg->length, conn->max_buffsize);
                 IUCV_DBF_TEXT_(data, 2, "msglen %d > max_buffsize %d\n",
                                msg->length, conn->max_buffsize);
                 return;
@@ -695,7 +687,6 @@ static void conn_action_rx(fsm_instance *fi, int event, void *arg)
                                   msg->length, NULL);
         if (rc || msg->length < 5) {
                 privptr->stats.rx_errors++;
-                PRINT_WARN("iucv_receive returned %08x\n", rc);
                 IUCV_DBF_TEXT_(data, 2, "rc %d from iucv_receive\n", rc);
                 return;
         }
@@ -778,7 +769,6 @@ static void conn_action_txdone(fsm_instance *fi, int event, void *arg)
                 fsm_newstate(fi, CONN_STATE_IDLE);
                 if (privptr)
                         privptr->stats.tx_errors += txpackets;
-                PRINT_WARN("iucv_send returned %08x\n", rc);
                 IUCV_DBF_TEXT_(data, 2, "rc %d from iucv_send\n", rc);
         } else {
                 if (privptr) {
@@ -806,8 +796,6 @@ static void conn_action_connaccept(fsm_instance *fi, int event, void *arg)
         path->flags = 0;
         rc = iucv_path_accept(path, &netiucv_handler, NULL, conn);
         if (rc) {
-                PRINT_WARN("%s: IUCV accept failed with error %d\n",
-                       netdev->name, rc);
                 IUCV_DBF_TEXT_(setup, 2, "rc %d from iucv_accept", rc);
                 return;
         }
@@ -873,7 +861,7 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)
         IUCV_DBF_TEXT(trace, 3, __func__);
 
         fsm_newstate(fi, CONN_STATE_STARTWAIT);
-        PRINT_DEBUG("%s('%s'): connecting ...\n",
+        IUCV_DBF_TEXT_(setup, 2, "%s('%s'): connecting ...\n",
                     conn->netdev->name, conn->userid);
 
         /*
@@ -968,8 +956,8 @@ static void conn_action_inval(fsm_instance *fi, int event, void *arg)
         struct iucv_connection *conn = arg;
         struct net_device *netdev = conn->netdev;
 
-        PRINT_WARN("%s: Cannot connect without username\n", netdev->name);
-        IUCV_DBF_TEXT(data, 2, "conn_action_inval called\n");
+        IUCV_DBF_TEXT_(data, 2, "%s('%s'): conn_action_inval called\n",
+                netdev->name, conn->userid);
 }
 
 static const fsm_node conn_fsm[] = {
@@ -1077,9 +1065,6 @@ dev_action_connup(fsm_instance *fi, int event, void *arg)
                                 "connection is up and running\n");
                         break;
                 case DEV_STATE_STOPWAIT:
-                        PRINT_INFO(
-                               "%s: got connection UP event during shutdown!\n",
-                               dev->name);
                         IUCV_DBF_TEXT(data, 2,
                                 "dev_action_connup: in DEV_STATE_STOPWAIT\n");
                         break;
@@ -1174,8 +1159,6 @@ static int netiucv_transmit_skb(struct iucv_connection *conn,
                         nskb = alloc_skb(skb->len + NETIUCV_HDRLEN +
                                          NETIUCV_HDRLEN, GFP_ATOMIC | GFP_DMA);
                         if (!nskb) {
-                                PRINT_WARN("%s: Could not allocate tx_skb\n",
-                                       conn->netdev->name);
                                 IUCV_DBF_TEXT(data, 2, "alloc_skb failed\n");
                                 rc = -ENOMEM;
                                 return rc;
@@ -1223,7 +1206,6 @@ static int netiucv_transmit_skb(struct iucv_connection *conn,
                                 skb_pull(skb, NETIUCV_HDRLEN);
                                 skb_trim(skb, skb->len - NETIUCV_HDRLEN);
                         }
-                        PRINT_WARN("iucv_send returned %08x\n", rc);
                         IUCV_DBF_TEXT_(data, 2, "rc %d from iucv_send\n", rc);
                 } else {
                         if (copied)
@@ -1293,14 +1275,11 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
          * Some sanity checks ...
          */
         if (skb == NULL) {
-                PRINT_WARN("%s: NULL sk_buff passed\n", dev->name);
                 IUCV_DBF_TEXT(data, 2, "netiucv_tx: skb is NULL\n");
                 privptr->stats.tx_dropped++;
                 return 0;
         }
         if (skb_headroom(skb) < NETIUCV_HDRLEN) {
-                PRINT_WARN("%s: Got sk_buff with head room < %ld bytes\n",
-                       dev->name, NETIUCV_HDRLEN);
                 IUCV_DBF_TEXT(data, 2,
                         "netiucv_tx: skb_headroom < NETIUCV_HDRLEN\n");
                 dev_kfree_skb(skb);
@@ -1393,7 +1372,6 @@ static ssize_t user_write(struct device *dev, struct device_attribute *attr,
 
         IUCV_DBF_TEXT(trace, 3, __func__);
         if (count > 9) {
-                PRINT_WARN("netiucv: username too long (%d)!\n", (int) count);
                 IUCV_DBF_TEXT_(setup, 2,
                                "%d is length of username\n", (int) count);
                 return -EINVAL;
@@ -1409,7 +1387,6 @@ static ssize_t user_write(struct device *dev, struct device_attribute *attr,
                         /* trailing lf, grr */
                         break;
                 }
-                PRINT_WARN("netiucv: Invalid char %c in username!\n", *p);
                 IUCV_DBF_TEXT_(setup, 2,
                                "username: invalid character %c\n", *p);
                 return -EINVAL;
@@ -1421,18 +1398,15 @@ static ssize_t user_write(struct device *dev, struct device_attribute *attr,
         if (memcmp(username, priv->conn->userid, 9) &&
             (ndev->flags & (IFF_UP | IFF_RUNNING))) {
                 /* username changed while the interface is active. */
-                PRINT_WARN("netiucv: device %s active, connected to %s\n",
-                           dev->bus_id, priv->conn->userid);
-                PRINT_WARN("netiucv: user cannot be updated\n");
                 IUCV_DBF_TEXT(setup, 2, "user_write: device active\n");
-                return -EBUSY;
+                return -EPERM;
         }
         read_lock_bh(&iucv_connection_rwlock);
         list_for_each_entry(cp, &iucv_connection_list, list) {
                 if (!strncmp(username, cp->userid, 9) && cp->netdev != ndev) {
                         read_unlock_bh(&iucv_connection_rwlock);
-                        PRINT_WARN("netiucv: Connection to %s already "
-                                   "exists\n", username);
+                        IUCV_DBF_TEXT_(setup, 2, "user_write: Connection "
+                                "to %s already exists\n", username);
                         return -EEXIST;
                 }
         }
@@ -1466,13 +1440,10 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr,
         bs1 = simple_strtoul(buf, &e, 0);
 
         if (e && (!isspace(*e))) {
-                PRINT_WARN("netiucv: Invalid character in buffer!\n");
                 IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %c\n", *e);
                 return -EINVAL;
         }
         if (bs1 > NETIUCV_BUFSIZE_MAX) {
-                PRINT_WARN("netiucv: Given buffer size %d too large.\n",
-                        bs1);
                 IUCV_DBF_TEXT_(setup, 2,
                         "buffer_write: buffer size %d too large\n",
                         bs1);
@@ -1480,16 +1451,12 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr,
         }
         if ((ndev->flags & IFF_RUNNING) &&
             (bs1 < (ndev->mtu + NETIUCV_HDRLEN + 2))) {
-                PRINT_WARN("netiucv: Given buffer size %d too small.\n",
-                        bs1);
                 IUCV_DBF_TEXT_(setup, 2,
                         "buffer_write: buffer size %d too small\n",
                         bs1);
                 return -EINVAL;
         }
         if (bs1 < (576 + NETIUCV_HDRLEN + NETIUCV_HDRLEN)) {
-                PRINT_WARN("netiucv: Given buffer size %d too small.\n",
-                        bs1);
                 IUCV_DBF_TEXT_(setup, 2,
                         "buffer_write: buffer size %d too small\n",
                         bs1);
@@ -1963,7 +1930,6 @@ static ssize_t conn_write(struct device_driver *drv,
 
         IUCV_DBF_TEXT(trace, 3, __func__);
         if (count>9) {
-                PRINT_WARN("netiucv: username too long (%d)!\n", (int)count);
                 IUCV_DBF_TEXT(setup, 2, "conn_write: too long\n");
                 return -EINVAL;
         }
@@ -1976,7 +1942,6 @@ static ssize_t conn_write(struct device_driver *drv,
                 if (*p == '\n')
                         /* trailing lf, grr */
                         break;
-                PRINT_WARN("netiucv: Invalid character in username!\n");
                 IUCV_DBF_TEXT_(setup, 2,
                                "conn_write: invalid character %c\n", *p);
                 return -EINVAL;
@@ -1989,8 +1954,8 @@ static ssize_t conn_write(struct device_driver *drv,
         list_for_each_entry(cp, &iucv_connection_list, list) {
                 if (!strncmp(username, cp->userid, 9)) {
                         read_unlock_bh(&iucv_connection_rwlock);
-                        PRINT_WARN("netiucv: Connection to %s already "
-                                   "exists\n", username);
+                        IUCV_DBF_TEXT_(setup, 2, "conn_write: Connection "
+                                "to %s already exists\n", username);
                         return -EEXIST;
                 }
         }
@@ -1998,9 +1963,6 @@ static ssize_t conn_write(struct device_driver *drv,
 
         dev = netiucv_init_netdevice(username);
         if (!dev) {
-                PRINT_WARN("netiucv: Could not allocate network device "
-                           "structure for user '%s'\n",
-                           netiucv_printname(username));
                 IUCV_DBF_TEXT(setup, 2, "NULL from netiucv_init_netdevice\n");
                 return -ENODEV;
         }
@@ -2020,15 +1982,12 @@ static ssize_t conn_write(struct device_driver *drv,
         if (rc)
                 goto out_unreg;
 
-        PRINT_INFO("%s: '%s'\n", dev->name, netiucv_printname(username));
 
         return count;
 
 out_unreg:
         netiucv_unregister_device(priv->dev);
 out_free_ndev:
-        PRINT_WARN("netiucv: Could not register '%s'\n", dev->name);
-        IUCV_DBF_TEXT(setup, 2, "conn_write: could not register\n");
         netiucv_free_netdevice(dev);
         return rc;
 }
@@ -2073,14 +2032,13 @@ static ssize_t remove_write (struct device_driver *drv,
                         PRINT_WARN("netiucv: %s cannot be removed\n",
                                    ndev->name);
                         IUCV_DBF_TEXT(data, 2, "remove_write: still active\n");
-                        return -EBUSY;
+                        return -EPERM;
                 }
                 unregister_netdev(ndev);
                 netiucv_unregister_device(dev);
                 return count;
         }
         read_unlock_bh(&iucv_connection_rwlock);
-        PRINT_WARN("netiucv: net device %s unknown\n", name);
         IUCV_DBF_TEXT(data, 2, "remove_write: unknown device\n");
         return -EINVAL;
 }
@@ -2148,7 +2106,6 @@ static int __init netiucv_init(void)
         netiucv_driver.groups = netiucv_drv_attr_groups;
         rc = driver_register(&netiucv_driver);
         if (rc) {
-                PRINT_ERR("NETIUCV: failed to register driver.\n");
                 IUCV_DBF_TEXT_(setup, 2, "ret %d from driver_register\n", rc);
                 goto out_iucv;
         }
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 9a71dae223e8..0ac54dc638c2 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -420,7 +420,7 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
                                 QETH_DBF_TEXT(TRACE, 3, "urla");
                                 break;
                         default:
-                                PRINT_WARN("Received data is IPA "
+                                QETH_DBF_MESSAGE(2, "Received data is IPA "
                                            "but not a reply!\n");
                                 break;
                         }
@@ -735,8 +735,8 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
         char *sense;
 
         sense = (char *) irb->ecw;
-        cstat = irb->scsw.cstat;
-        dstat = irb->scsw.dstat;
+        cstat = irb->scsw.cmd.cstat;
+        dstat = irb->scsw.cmd.dstat;
 
         if (cstat & (SCHN_STAT_CHN_CTRL_CHK | SCHN_STAT_INTF_CTRL_CHK |
                      SCHN_STAT_CHN_DATA_CHK | SCHN_STAT_CHAIN_CHECK |
@@ -823,8 +823,8 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,
 
         if (__qeth_check_irb_error(cdev, intparm, irb))
                 return;
-        cstat = irb->scsw.cstat;
-        dstat = irb->scsw.dstat;
+        cstat = irb->scsw.cmd.cstat;
+        dstat = irb->scsw.cmd.dstat;
 
         card = CARD_FROM_CDEV(cdev);
         if (!card)
@@ -842,10 +842,10 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,
         }
         atomic_set(&channel->irq_pending, 0);
 
-        if (irb->scsw.fctl & (SCSW_FCTL_CLEAR_FUNC))
+        if (irb->scsw.cmd.fctl & (SCSW_FCTL_CLEAR_FUNC))
                 channel->state = CH_STATE_STOPPED;
 
-        if (irb->scsw.fctl & (SCSW_FCTL_HALT_FUNC))
+        if (irb->scsw.cmd.fctl & (SCSW_FCTL_HALT_FUNC))
                 channel->state = CH_STATE_HALTED;
 
         /*let's wake up immediately on data channel*/
@@ -4092,7 +4092,6 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
 
         rc = qeth_determine_card_type(card);
         if (rc) {
-                PRINT_WARN("%s: not a valid card type\n", __func__);
                 QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);
                 goto err_card;
         }
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 999552c83bbe..06deaee50f6d 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -944,15 +944,8 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card,
         else
                 rc = qeth_l3_send_setdelip(card, addr, IPA_CMD_DELIP,
                                         addr->del_flags);
-        if (rc) {
+        if (rc)
                 QETH_DBF_TEXT(TRACE, 2, "failed");
-                /* TODO: re-activate this warning as soon as we have a
-                 * clean mirco code
-                qeth_ipaddr_to_string(addr->proto, (u8 *)&addr->u, buf);
-                PRINT_WARN("Could not deregister IP address %s (rc=%x)\n",
-                           buf, rc);
-                */
-        }
 
         return rc;
 }
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 8735a415a116..164e090c2625 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -156,11 +156,8 @@ static int __init smsg_init(void)
         if (rc != 0)
                 goto out;
         rc = iucv_register(&smsg_handler, 1);
-        if (rc) {
-                printk(KERN_ERR "SMSGIUCV: failed to register to iucv");
-                rc = -EIO;      /* better errno ? */
+        if (rc)
                 goto out_driver;
-        }
         smsg_path = iucv_path_alloc(255, 0, GFP_KERNEL);
         if (!smsg_path) {
                 rc = -ENOMEM;
@@ -168,11 +165,8 @@ static int __init smsg_init(void)
         }
         rc = iucv_path_connect(smsg_path, &smsg_handler, "*MSG    ",
                                NULL, NULL, NULL);
-        if (rc) {
-                printk(KERN_ERR "SMSGIUCV: failed to connect to *MSG");
-                rc = -EIO;      /* better errno ? */
+        if (rc)
                 goto out_free;
-        }
         cpcmd("SET SMSG IUCV", NULL, 0, NULL);
         return 0;
 
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 5bfbe7659830..834e9ee7e934 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -2,10 +2,10 @@
  *  drivers/s390/s390mach.c
  *   S/390 machine check handler
  *
- *  S390 version
- *    Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 2000,2008
  *    Author(s): Ingo Adlung (adlung@de.ibm.com)
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
+ *               Cornelia Huck <cornelia.huck@de.ibm.com>
  */
 
 #include <linux/init.h>
@@ -18,10 +18,6 @@
 #include <asm/etr.h>
 #include <asm/lowcore.h>
 #include <asm/cio.h>
-#include "cio/cio.h"
-#include "cio/chsc.h"
-#include "cio/css.h"
-#include "cio/chp.h"
 #include "s390mach.h"
 
 static struct semaphore m_sem;
@@ -36,13 +32,40 @@ s390_handle_damage(char *msg)
         for(;;);
 }
 
+static crw_handler_t crw_handlers[NR_RSCS];
+
+/**
+ * s390_register_crw_handler() - register a channel report word handler
+ * @rsc: reporting source code to handle
+ * @handler: handler to be registered
+ *
+ * Returns %0 on success and a negative error value otherwise.
+ */
+int s390_register_crw_handler(int rsc, crw_handler_t handler)
+{
+        if ((rsc < 0) || (rsc >= NR_RSCS))
+                return -EINVAL;
+        if (!cmpxchg(&crw_handlers[rsc], NULL, handler))
+                return 0;
+        return -EBUSY;
+}
+
+/**
+ * s390_unregister_crw_handler() - unregister a channel report word handler
+ * @rsc: reporting source code to handle
+ */
+void s390_unregister_crw_handler(int rsc)
+{
+        if ((rsc < 0) || (rsc >= NR_RSCS))
+                return;
+        xchg(&crw_handlers[rsc], NULL);
+        synchronize_sched();
+}
+
 /*
  * Retrieve CRWs and call function to handle event.
- *
- * Note : we currently process CRWs for io and chsc subchannels only
  */
-static int
-s390_collect_crw_info(void *param)
+static int s390_collect_crw_info(void *param)
 {
         struct crw crw[2];
         int ccode;
@@ -84,57 +107,24 @@ repeat:
                        crw[chain].rsid);
                 /* Check for overflows. */
                 if (crw[chain].oflw) {
+                        int i;
+
                         pr_debug("%s: crw overflow detected!\n", __func__);
-                        css_schedule_eval_all();
+                        for (i = 0; i < NR_RSCS; i++) {
+                                if (crw_handlers[i])
+                                        crw_handlers[i](NULL, NULL, 1);
+                        }
                         chain = 0;
                         continue;
                 }
-                switch (crw[chain].rsc) {
-                case CRW_RSC_SCH:
-                        if (crw[0].chn && !chain)
-                                break;
-                        pr_debug("source is subchannel %04X\n", crw[0].rsid);
-                        css_process_crw(crw[0].rsid, chain ? crw[1].rsid : 0);
-                        break;
-                case CRW_RSC_MONITOR:
-                        pr_debug("source is monitoring facility\n");
-                        break;
-                case CRW_RSC_CPATH:
-                        pr_debug("source is channel path %02X\n", crw[0].rsid);
-                        /*
-                         * Check for solicited machine checks. These are
-                         * created by reset channel path and need not be
-                         * reported to the common I/O layer.
-                         */
-                        if (crw[chain].slct) {
-                                pr_debug("solicited machine check for "
-                                         "channel path %02X\n", crw[0].rsid);
-                                break;
-                        }
-                        switch (crw[0].erc) {
-                        case CRW_ERC_IPARM: /* Path has come. */
-                                chp_process_crw(crw[0].rsid, 1);
-                                break;
-                        case CRW_ERC_PERRI: /* Path has gone. */
-                        case CRW_ERC_PERRN:
-                                chp_process_crw(crw[0].rsid, 0);
-                                break;
-                        default:
-                                pr_debug("Don't know how to handle erc=%x\n",
-                                         crw[0].erc);
-                        }
-                        break;
-                case CRW_RSC_CONFIG:
-                        pr_debug("source is configuration-alert facility\n");
-                        break;
-                case CRW_RSC_CSS:
-                        pr_debug("source is channel subsystem\n");
-                        chsc_process_crw();
-                        break;
-                default:
-                        pr_debug("unknown source\n");
-                        break;
+                if (crw[0].chn && !chain) {
+                        chain++;
+                        continue;
                 }
+                if (crw_handlers[crw[chain].rsc])
+                        crw_handlers[crw[chain].rsc](&crw[0],
+                                                     chain ? &crw[1] : NULL,
+                                                     0);
                 /* chain is always 0 or 1 here. */
                 chain = crw[chain].chn ? chain + 1 : 0;
         }
@@ -468,6 +458,10 @@ s390_do_machine_check(struct pt_regs *regs)
                         etr_sync_check();
                 if (S390_lowcore.external_damage_code & (1U << ED_ETR_SWITCH))
                         etr_switch_to_local();
+                if (S390_lowcore.external_damage_code & (1U << ED_STP_SYNC))
+                        stp_sync_check();
+                if (S390_lowcore.external_damage_code & (1U << ED_STP_ISLAND))
+                        stp_island_check();
         }
 
         if (mci->se)
diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index ca681f9b67fc..d39f8b697d27 100644
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -72,6 +72,13 @@ struct crw {
         __u32 rsid    : 16;   /* reporting-source ID */
 } __attribute__ ((packed));
 
+typedef void (*crw_handler_t)(struct crw *, struct crw *, int);
+
+extern int s390_register_crw_handler(int rsc, crw_handler_t handler);
+extern void s390_unregister_crw_handler(int rsc);
+
+#define NR_RSCS 16
+
 #define CRW_RSC_MONITOR  0x2  /* monitoring facility */
 #define CRW_RSC_SCH      0x3  /* subchannel */
 #define CRW_RSC_CPATH    0x4  /* channel path */
@@ -105,6 +112,9 @@ static inline int stcrw(struct crw *pcrw )
 #define ED_ETR_SYNC     12      /* External damage ETR sync check */
 #define ED_ETR_SWITCH   13      /* External damage ETR switch to local */
 
+#define ED_STP_SYNC     7       /* External damage STP sync check */
+#define ED_STP_ISLAND   6       /* External damage STP island check */
+
 struct pt_regs;
 
 void s390_handle_mcck(void);
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 03c966059471..bba21e053a1b 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -19,6 +19,7 @@
 #include <linux/timer.h>
 #include <linux/ioport.h>
 #include <linux/major.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -429,6 +430,7 @@ static int bpp_open(struct inode *inode, struct file *f)
       unsigned minor = iminor(inode);
       int ret;
 
+      lock_kernel();
       spin_lock(&bpp_open_lock);
       ret = 0;
       if (minor >= BPP_NO) {
@@ -444,6 +446,7 @@ static int bpp_open(struct inode *inode, struct file *f)
               }
       }
       spin_unlock(&bpp_open_lock);
+      unlock_kernel();
 
       return ret;
 }
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 235703414370..23abfdfb44f1 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -279,6 +279,7 @@ static inline int wd_opt_timeout(void)
 
 static int wd_open(struct inode *inode, struct file *f)
 {
+        lock_kernel();
         switch(iminor(inode))
         {
                 case WD0_MINOR:
@@ -291,6 +292,7 @@ static int wd_open(struct inode *inode, struct file *f)
                         f->private_data = &wd_dev.watchdog[WD2_ID];
                         break;
                 default:
+                        unlock_kernel();
                         return(-ENODEV);
         }
 
@@ -304,11 +306,13 @@ static int wd_open(struct inode *inode, struct file *f)
                                                 (void *)wd_dev.regs)) {
                         printk("%s: Cannot register IRQ %d\n", 
                                 WD_OBPNAME, wd_dev.irq);
+                        unlock_kernel();
                         return(-EBUSY);
                 }
                 wd_dev.initialized = 1;
         }
 
+        unlock_kernel();
         return(nonseekable_open(inode, f));
 }
 
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 3279a1b6501d..d8f5c0ca236d 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -94,6 +94,7 @@ static int d7s_open(struct inode *inode, struct file *f)
 {
         if (D7S_MINOR != iminor(inode))
                 return -ENODEV;
+        cycle_kernel_lock();
         atomic_inc(&d7s_users);
         return 0;
 }
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index dadabef116b6..a408402426f8 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -27,6 +27,7 @@
 #include <linux/miscdevice.h>
 #include <linux/kmod.h>
 #include <linux/reboot.h>
+#include <linux/smp_lock.h>
 
 #include <asm/ebus.h>
 #include <asm/uaccess.h>
@@ -694,6 +695,7 @@ envctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 static int
 envctrl_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
         file->private_data = NULL;
         return 0;
 }
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 44e039865aa9..7d95e151513a 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -127,9 +127,13 @@ flash_read(struct file * file, char __user * buf,
 static int
 flash_open(struct inode *inode, struct file *file)
 {
-        if (test_and_set_bit(0, (void *)&flash.busy) != 0)
+        lock_kernel();
+        if (test_and_set_bit(0, (void *)&flash.busy) != 0) {
+                unlock_kernel();
                 return -EBUSY;
+        }
 
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 4b7079fdc10c..2bec9ccc0293 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -27,6 +27,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
@@ -417,11 +418,17 @@ static int jsf_mmap(struct file * file, struct vm_area_struct * vma)
 
 static int jsf_open(struct inode * inode, struct file * filp)
 {
-
-        if (jsf0.base == 0) return -ENXIO;
-        if (test_and_set_bit(0, (void *)&jsf0.busy) != 0)
+        lock_kernel();
+        if (jsf0.base == 0) {
+                unlock_kernel();
+                return -ENXIO;
+        }
+        if (test_and_set_bit(0, (void *)&jsf0.busy) != 0) {
+                unlock_kernel();
                 return -EBUSY;
+        }
 
+        unlock_kernel();
         return 0;       /* XXX What security? */
 }
 
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index fbfeb89a6f32..29dc735e1a20 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -33,6 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/miscdevice.h>
 #include <linux/init.h>
@@ -689,9 +690,11 @@ static int openprom_open(struct inode * inode, struct file * file)
         if (!data)
                 return -ENOMEM;
 
+        lock_kernel();
         data->current_node = of_find_node_by_path("/");
         data->lastnode = data->current_node;
         file->private_data = (void *) data;
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/sbus/char/riowatchdog.c b/drivers/sbus/char/riowatchdog.c
index a2fc6b8c1334..88c0fc6395e1 100644
--- a/drivers/sbus/char/riowatchdog.c
+++ b/drivers/sbus/char/riowatchdog.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
+#include <linux/smp_lock.h>
 
 #include <asm/io.h>
 #include <asm/ebus.h>
@@ -116,6 +117,7 @@ static void riowd_starttimer(void)
 
 static int riowd_open(struct inode *inode, struct file *filp)
 {
+        cycle_kernel_lock();
         nonseekable_open(inode, filp);
         return 0;
 }
diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c
index 18d18f1a114e..b0429917154d 100644
--- a/drivers/sbus/char/rtc.c
+++ b/drivers/sbus/char/rtc.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
@@ -213,6 +214,7 @@ static int rtc_open(struct inode *inode, struct file *file)
 {
         int ret;
 
+        lock_kernel();
         spin_lock_irq(&mostek_lock);
         if (rtc_busy) {
                 ret = -EBUSY;
@@ -221,6 +223,7 @@ static int rtc_open(struct inode *inode, struct file *file)
                 ret = 0;
         }
         spin_unlock_irq(&mostek_lock);
+        unlock_kernel();
 
         return ret;
 }
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 383f32c1d347..513ba61ae966 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -9,6 +9,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
@@ -211,8 +212,10 @@ uctrl_ioctl(struct inode *inode, struct file *file,
 static int
 uctrl_open(struct inode *inode, struct file *file)
 {
+        lock_kernel();
         uctrl_get_event_status();
         uctrl_get_external_status();
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index d4f8fcded51d..1f6cb8ae2784 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
+#include <linux/smp_lock.h>
 
 #include <asm/openprom.h>
 #include <asm/oplib.h>
@@ -178,14 +179,17 @@ static int vfc_open(struct inode *inode, struct file *file)
 {
         struct vfc_dev *dev;
 
+        lock_kernel();
         spin_lock(&vfc_dev_lock);
         dev = vfc_get_dev_ptr(iminor(inode));
         if (dev == NULL) {
                 spin_unlock(&vfc_dev_lock);
+                unlock_kernel();
                 return -ENODEV;
         }
         if (dev->busy) {
                 spin_unlock(&vfc_dev_lock);
+                unlock_kernel();
                 return -EBUSY;
         }
 
@@ -202,6 +206,7 @@ static int vfc_open(struct inode *inode, struct file *file)
         vfc_captstat_reset(dev);
         
         vfc_unlock_device(dev);
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 867f6fd5c2c0..7045511f9ad2 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -84,6 +84,7 @@
 #include <linux/pci.h>
 #include <linux/time.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -862,11 +863,13 @@ out:
 } /* End twa_chrdev_ioctl() */
 
 /* This function handles open for the character device */
+/* NOTE that this function will race with remove. */
 static int twa_chrdev_open(struct inode *inode, struct file *file)
 {
         unsigned int minor_number;
         int retval = TW_IOCTL_ERROR_OS_ENODEV;
 
+        cycle_kernel_lock();
         minor_number = iminor(inode);
         if (minor_number >= twa_device_extension_count)
                 goto out;
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 8c22329aa85e..a0537f09aa21 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -198,6 +198,7 @@
 
 #include <linux/module.h>
 #include <linux/reboot.h>
+#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/moduleparam.h>
@@ -1027,10 +1028,12 @@ out:
 } /* End tw_chrdev_ioctl() */
 
 /* This function handles open for the character device */
+/* NOTE that this function races with remove. */
 static int tw_chrdev_open(struct inode *inode, struct file *file)
 {
         unsigned int minor_number;
 
+        cycle_kernel_lock();
         dprintk(KERN_WARNING "3w-xxxx: tw_ioctl_open()\n");
 
         minor_number = iminor(inode);
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 1f7c83607f84..68c140e82673 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -38,6 +38,7 @@
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/syscalls.h>
 #include <linux/delay.h>
@@ -667,6 +668,7 @@ static int aac_cfg_open(struct inode *inode, struct file *file)
         unsigned minor_number = iminor(inode);
         int err = -ENODEV;
 
+        lock_kernel();  /* BKL pushdown: nothing else protects this list */
         list_for_each_entry(aac, &aac_devices, entry) {
                 if (aac->id == minor_number) {
                         file->private_data = aac;
@@ -674,6 +676,7 @@ static int aac_cfg_open(struct inode *inode, struct file *file)
                         break;
                 }
         }
+        unlock_kernel();
 
         return err;
 }
diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig
index 7236143941f3..a8587f1f5e7e 100644
--- a/drivers/scsi/arm/Kconfig
+++ b/drivers/scsi/arm/Kconfig
@@ -3,7 +3,7 @@
 #
 config SCSI_ACORNSCSI_3
         tristate "Acorn SCSI card (aka30) support"
-        depends on ARCH_ACORN && SCSI && BROKEN
+        depends on ARCH_ACORN && SCSI
         select SCSI_SPI_ATTRS
         help
           This enables support for the Acorn SCSI card (aka30). If you have an
diff --git a/drivers/scsi/arm/acornscsi-io.S b/drivers/scsi/arm/acornscsi-io.S
index 93467e6ac923..5cebe3105260 100644
--- a/drivers/scsi/arm/acornscsi-io.S
+++ b/drivers/scsi/arm/acornscsi-io.S
@@ -10,17 +10,10 @@
 #include <asm/assembler.h>
 #include <asm/hardware.h>
 
-#if (IO_BASE == (PCIO_BASE & 0xff000000))
-#define ADDR(off,reg)                                           \
-                tst     off, $0x80000000                        ;\
-                mov     reg, $IO_BASE                           ;\
-                orreq   reg, reg, $(PCIO_BASE & 0x00ff0000)
-#else
-#define ADDR(off,reg)                                           \
-                tst     off, $0x80000000                        ;\
-                movne   reg, $IO_BASE                           ;\
-                moveq   reg, $(PCIO_BASE & 0xff000000)          ;\
-                orreq   reg, reg, $(PCIO_BASE & 0x00ff0000)
+#if defined(__APCS_32__)
+#define LOADREGS(t,r,l...)      ldm##t  r, l
+#elif defined(__APCS_26__)
+#define LOADREGS(t,r,l...)      ldm##t  r, l##^
 #endif
 
 @ Purpose: transfer a block of data from the acorn scsi card to memory
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 8e53f02cc311..918ccf818757 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -123,12 +123,6 @@
 #define DBG(cmd,xxx...) xxx
 #endif
 
-#ifndef STRINGIFY
-#define STRINGIFY(x) #x
-#endif
-#define STRx(x) STRINGIFY(x)
-#define NO_WRITE_STR STRx(NO_WRITE)
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -141,9 +135,10 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
+#include <linux/stringify.h>
+#include <linux/io.h>
 
 #include <asm/system.h>
-#include <asm/io.h>
 #include <asm/ecard.h>
 
 #include "../scsi.h"
@@ -203,44 +198,46 @@ static void acornscsi_abortcmd(AS_Host *host, unsigned char tag);
  * Miscellaneous
  */
 
-static inline void
-sbic_arm_write(unsigned int io_port, int reg, int value)
+/* Offsets from MEMC base */
+#define SBIC_REGIDX     0x2000
+#define SBIC_REGVAL     0x2004
+#define DMAC_OFFSET     0x3000
+
+/* Offsets from FAST IOC base */
+#define INT_REG         0x2000
+#define PAGE_REG        0x3000
+
+static inline void sbic_arm_write(AS_Host *host, unsigned int reg, unsigned int value)
 {
-    __raw_writeb(reg, io_port);
-    __raw_writeb(value, io_port + 4);
+    writeb(reg, host->base + SBIC_REGIDX);
+    writeb(value, host->base + SBIC_REGVAL);
 }
 
-#define sbic_arm_writenext(io,val) \
-        __raw_writeb((val), (io) + 4)
-
-static inline
-int sbic_arm_read(unsigned int io_port, int reg)
+static inline int sbic_arm_read(AS_Host *host, unsigned int reg)
 {
     if(reg == SBIC_ASR)
-           return __raw_readl(io_port) & 255;
-    __raw_writeb(reg, io_port);
-    return __raw_readl(io_port + 4) & 255;
+           return readl(host->base + SBIC_REGIDX) & 255;
+    writeb(reg, host->base + SBIC_REGIDX);
+    return readl(host->base + SBIC_REGVAL) & 255;
 }
 
-#define sbic_arm_readnext(io) \
-        __raw_readb((io) + 4)
+#define sbic_arm_writenext(host, val)   writeb((val), (host)->base + SBIC_REGVAL)
+#define sbic_arm_readnext(host)         readb((host)->base + SBIC_REGVAL)
 
 #ifdef USE_DMAC
-#define dmac_read(io_port,reg) \
-        inb((io_port) + (reg))
+#define dmac_read(host,reg) \
+        readb((host)->base + DMAC_OFFSET + ((reg) << 2))
 
-#define dmac_write(io_port,reg,value) \
-        ({ outb((value), (io_port) + (reg)); })
+#define dmac_write(host,reg,value) \
+        ({ writeb((value), (host)->base + DMAC_OFFSET + ((reg) << 2)); })
 
-#define dmac_clearintr(io_port) \
-        ({ outb(0, (io_port)); })
+#define dmac_clearintr(host)    writeb(0, (host)->fast + INT_REG)
 
-static inline
-unsigned int dmac_address(unsigned int io_port)
+static inline unsigned int dmac_address(AS_Host *host)
 {
-    return dmac_read(io_port, DMAC_TXADRHI) << 16 |
-           dmac_read(io_port, DMAC_TXADRMD) << 8 |
-           dmac_read(io_port, DMAC_TXADRLO);
+    return dmac_read(host, DMAC_TXADRHI) << 16 |
+           dmac_read(host, DMAC_TXADRMD) << 8 |
+           dmac_read(host, DMAC_TXADRLO);
 }
 
 static
@@ -248,15 +245,15 @@ void acornscsi_dumpdma(AS_Host *host, char *where)
 {
         unsigned int mode, addr, len;
 
-        mode = dmac_read(host->dma.io_port, DMAC_MODECON);
-        addr = dmac_address(host->dma.io_port);
-        len  = dmac_read(host->dma.io_port, DMAC_TXCNTHI) << 8 |
-               dmac_read(host->dma.io_port, DMAC_TXCNTLO);
+        mode = dmac_read(host, DMAC_MODECON);
+        addr = dmac_address(host);
+        len  = dmac_read(host, DMAC_TXCNTHI) << 8 |
+               dmac_read(host, DMAC_TXCNTLO);
 
         printk("scsi%d: %s: DMAC %02x @%06x+%04x msk %02x, ",
                 host->host->host_no, where,
                 mode, addr, (len + 1) & 0xffff,
-                dmac_read(host->dma.io_port, DMAC_MASKREG));
+                dmac_read(host, DMAC_MASKREG));
 
         printk("DMA @%06x, ", host->dma.start_addr);
         printk("BH @%p +%04x, ", host->scsi.SCp.ptr,
@@ -272,9 +269,9 @@ unsigned long acornscsi_sbic_xfcount(AS_Host *host)
 {
     unsigned long length;
 
-    length = sbic_arm_read(host->scsi.io_port, SBIC_TRANSCNTH) << 16;
-    length |= sbic_arm_readnext(host->scsi.io_port) << 8;
-    length |= sbic_arm_readnext(host->scsi.io_port);
+    length = sbic_arm_read(host, SBIC_TRANSCNTH) << 16;
+    length |= sbic_arm_readnext(host) << 8;
+    length |= sbic_arm_readnext(host);
 
     return length;
 }
@@ -285,7 +282,7 @@ acornscsi_sbic_wait(AS_Host *host, int stat_mask, int stat, int timeout, char *m
         int asr;
 
         do {
-                asr = sbic_arm_read(host->scsi.io_port, SBIC_ASR);
+                asr = sbic_arm_read(host, SBIC_ASR);
 
                 if ((asr & stat_mask) == stat)
                         return 0;
@@ -304,7 +301,7 @@ int acornscsi_sbic_issuecmd(AS_Host *host, int command)
     if (acornscsi_sbic_wait(host, ASR_CIP, 0, 1000, "issuing command"))
         return -1;
 
-    sbic_arm_write(host->scsi.io_port, SBIC_CMND, command);
+    sbic_arm_write(host, SBIC_CMND, command);
 
     return 0;
 }
@@ -331,20 +328,20 @@ void acornscsi_resetcard(AS_Host *host)
 
     /* assert reset line */
     host->card.page_reg = 0x80;
-    outb(host->card.page_reg, host->card.io_page);
+    writeb(host->card.page_reg, host->fast + PAGE_REG);
 
     /* wait 3 cs.  SCSI standard says 25ms. */
     acornscsi_csdelay(3);
 
     host->card.page_reg = 0;
-    outb(host->card.page_reg, host->card.io_page);
+    writeb(host->card.page_reg, host->fast + PAGE_REG);
 
     /*
      * Should get a reset from the card
      */
     timeout = 1000;
     do {
-        if (inb(host->card.io_intr) & 8)
+        if (readb(host->fast + INT_REG) & 8)
             break;
         udelay(1);
     } while (--timeout);
@@ -353,19 +350,19 @@ void acornscsi_resetcard(AS_Host *host)
         printk("scsi%d: timeout while resetting card\n",
                 host->host->host_no);
 
-    sbic_arm_read(host->scsi.io_port, SBIC_ASR);
-    sbic_arm_read(host->scsi.io_port, SBIC_SSR);
+    sbic_arm_read(host, SBIC_ASR);
+    sbic_arm_read(host, SBIC_SSR);
 
     /* setup sbic - WD33C93A */
-    sbic_arm_write(host->scsi.io_port, SBIC_OWNID, OWNID_EAF | host->host->this_id);
-    sbic_arm_write(host->scsi.io_port, SBIC_CMND, CMND_RESET);
+    sbic_arm_write(host, SBIC_OWNID, OWNID_EAF | host->host->this_id);
+    sbic_arm_write(host, SBIC_CMND, CMND_RESET);
 
     /*
      * Command should cause a reset interrupt
      */
     timeout = 1000;
     do {
-        if (inb(host->card.io_intr) & 8)
+        if (readb(host->fast + INT_REG) & 8)
             break;
         udelay(1);
     } while (--timeout);
@@ -374,26 +371,26 @@ void acornscsi_resetcard(AS_Host *host)
         printk("scsi%d: timeout while resetting card\n",
                 host->host->host_no);
 
-    sbic_arm_read(host->scsi.io_port, SBIC_ASR);
-    if (sbic_arm_read(host->scsi.io_port, SBIC_SSR) != 0x01)
+    sbic_arm_read(host, SBIC_ASR);
+    if (sbic_arm_read(host, SBIC_SSR) != 0x01)
         printk(KERN_CRIT "scsi%d: WD33C93A didn't give enhanced reset interrupt\n",
                 host->host->host_no);
 
-    sbic_arm_write(host->scsi.io_port, SBIC_CTRL, INIT_SBICDMA | CTRL_IDI);
-    sbic_arm_write(host->scsi.io_port, SBIC_TIMEOUT, TIMEOUT_TIME);
-    sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, SYNCHTRANSFER_2DBA);
-    sbic_arm_write(host->scsi.io_port, SBIC_SOURCEID, SOURCEID_ER | SOURCEID_DSP);
+    sbic_arm_write(host, SBIC_CTRL, INIT_SBICDMA | CTRL_IDI);
+    sbic_arm_write(host, SBIC_TIMEOUT, TIMEOUT_TIME);
+    sbic_arm_write(host, SBIC_SYNCHTRANSFER, SYNCHTRANSFER_2DBA);
+    sbic_arm_write(host, SBIC_SOURCEID, SOURCEID_ER | SOURCEID_DSP);
 
     host->card.page_reg = 0x40;
-    outb(host->card.page_reg, host->card.io_page);
+    writeb(host->card.page_reg, host->fast + PAGE_REG);
 
     /* setup dmac - uPC71071 */
-    dmac_write(host->dma.io_port, DMAC_INIT, 0);
+    dmac_write(host, DMAC_INIT, 0);
 #ifdef USE_DMAC
-    dmac_write(host->dma.io_port, DMAC_INIT, INIT_8BIT);
-    dmac_write(host->dma.io_port, DMAC_CHANNEL, CHANNEL_0);
-    dmac_write(host->dma.io_port, DMAC_DEVCON0, INIT_DEVCON0);
-    dmac_write(host->dma.io_port, DMAC_DEVCON1, INIT_DEVCON1);
+    dmac_write(host, DMAC_INIT, INIT_8BIT);
+    dmac_write(host, DMAC_CHANNEL, CHANNEL_0);
+    dmac_write(host, DMAC_DEVCON0, INIT_DEVCON0);
+    dmac_write(host, DMAC_DEVCON1, INIT_DEVCON1);
 #endif
 
     host->SCpnt = NULL;
@@ -741,9 +738,9 @@ intr_ret_t acornscsi_kick(AS_Host *host)
      * If we have an interrupt pending, then we may have been reselected.
      * In this case, we don't want to write to the registers
      */
-    if (!(sbic_arm_read(host->scsi.io_port, SBIC_ASR) & (ASR_INT|ASR_BSY|ASR_CIP))) {
-        sbic_arm_write(host->scsi.io_port, SBIC_DESTID, SCpnt->device->id);
-        sbic_arm_write(host->scsi.io_port, SBIC_CMND, CMND_SELWITHATN);
+    if (!(sbic_arm_read(host, SBIC_ASR) & (ASR_INT|ASR_BSY|ASR_CIP))) {
+        sbic_arm_write(host, SBIC_DESTID, SCpnt->device->id);
+        sbic_arm_write(host, SBIC_CMND, CMND_SELWITHATN);
     }
 
     /*
@@ -807,7 +804,7 @@ static void acornscsi_done(AS_Host *host, struct scsi_cmnd **SCpntp,
         struct scsi_cmnd *SCpnt = *SCpntp;
 
     /* clean up */
-    sbic_arm_write(host->scsi.io_port, SBIC_SOURCEID, SOURCEID_ER | SOURCEID_DSP);
+    sbic_arm_write(host, SBIC_SOURCEID, SOURCEID_ER | SOURCEID_DSP);
 
     host->stats.fins += 1;
 
@@ -918,13 +915,13 @@ static
 void acornscsi_data_read(AS_Host *host, char *ptr,
                                  unsigned int start_addr, unsigned int length)
 {
-    extern void __acornscsi_in(int port, char *buf, int len);
+    extern void __acornscsi_in(void __iomem *, char *buf, int len);
     unsigned int page, offset, len = length;
 
     page = (start_addr >> 12);
     offset = start_addr & ((1 << 12) - 1);
 
-    outb((page & 0x3f) | host->card.page_reg, host->card.io_page);
+    writeb((page & 0x3f) | host->card.page_reg, host->fast + PAGE_REG);
 
     while (len > 0) {
         unsigned int this_len;
@@ -934,7 +931,7 @@ void acornscsi_data_read(AS_Host *host, char *ptr,
         else
             this_len = len;
 
-        __acornscsi_in(host->card.io_ram + (offset << 1), ptr, this_len);
+        __acornscsi_in(host->base + (offset << 1), ptr, this_len);
 
         offset += this_len;
         ptr += this_len;
@@ -943,10 +940,10 @@ void acornscsi_data_read(AS_Host *host, char *ptr,
         if (offset == (1 << 12)) {
             offset = 0;
             page ++;
-            outb((page & 0x3f) | host->card.page_reg, host->card.io_page);
+            writeb((page & 0x3f) | host->card.page_reg, host->fast + PAGE_REG);
         }
     }
-    outb(host->card.page_reg, host->card.io_page);
+    writeb(host->card.page_reg, host->fast + PAGE_REG);
 }
 
 /*
@@ -963,13 +960,13 @@ static
 void acornscsi_data_write(AS_Host *host, char *ptr,
                                  unsigned int start_addr, unsigned int length)
 {
-    extern void __acornscsi_out(int port, char *buf, int len);
+    extern void __acornscsi_out(void __iomem *, char *buf, int len);
     unsigned int page, offset, len = length;
 
     page = (start_addr >> 12);
     offset = start_addr & ((1 << 12) - 1);
 
-    outb((page & 0x3f) | host->card.page_reg, host->card.io_page);
+    writeb((page & 0x3f) | host->card.page_reg, host->fast + PAGE_REG);
 
     while (len > 0) {
         unsigned int this_len;
@@ -979,7 +976,7 @@ void acornscsi_data_write(AS_Host *host, char *ptr,
         else
             this_len = len;
 
-        __acornscsi_out(host->card.io_ram + (offset << 1), ptr, this_len);
+        __acornscsi_out(host->base + (offset << 1), ptr, this_len);
 
         offset += this_len;
         ptr += this_len;
@@ -988,10 +985,10 @@ void acornscsi_data_write(AS_Host *host, char *ptr,
         if (offset == (1 << 12)) {
             offset = 0;
             page ++;
-            outb((page & 0x3f) | host->card.page_reg, host->card.io_page);
+            writeb((page & 0x3f) | host->card.page_reg, host->fast + PAGE_REG);
         }
     }
-    outb(host->card.page_reg, host->card.io_page);
+    writeb(host->card.page_reg, host->fast + PAGE_REG);
 }
 
 /* =========================================================================================
@@ -1008,8 +1005,8 @@ void acornscsi_data_write(AS_Host *host, char *ptr,
 static inline
 void acornscsi_dma_stop(AS_Host *host)
 {
-    dmac_write(host->dma.io_port, DMAC_MASKREG, MASK_ON);
-    dmac_clearintr(host->dma.io_intr_clear);
+    dmac_write(host, DMAC_MASKREG, MASK_ON);
+    dmac_clearintr(host);
 
 #if (DEBUG & DEBUG_DMA)
     DBG(host->SCpnt, acornscsi_dumpdma(host, "stop"));
@@ -1031,7 +1028,7 @@ void acornscsi_dma_setup(AS_Host *host, dmadir_t direction)
 
     host->dma.direction = direction;
 
-    dmac_write(host->dma.io_port, DMAC_MASKREG, MASK_ON);
+    dmac_write(host, DMAC_MASKREG, MASK_ON);
 
     if (direction == DMA_OUT) {
 #if (DEBUG & DEBUG_NO_WRITE)
@@ -1062,13 +1059,13 @@ void acornscsi_dma_setup(AS_Host *host, dmadir_t direction)
                                 length);
 
         length -= 1;
-        dmac_write(host->dma.io_port, DMAC_TXCNTLO, length);
-        dmac_write(host->dma.io_port, DMAC_TXCNTHI, length >> 8);
-        dmac_write(host->dma.io_port, DMAC_TXADRLO, address);
-        dmac_write(host->dma.io_port, DMAC_TXADRMD, address >> 8);
-        dmac_write(host->dma.io_port, DMAC_TXADRHI, 0);
-        dmac_write(host->dma.io_port, DMAC_MODECON, mode);
-        dmac_write(host->dma.io_port, DMAC_MASKREG, MASK_OFF);
+        dmac_write(host, DMAC_TXCNTLO, length);
+        dmac_write(host, DMAC_TXCNTHI, length >> 8);
+        dmac_write(host, DMAC_TXADRLO, address);
+        dmac_write(host, DMAC_TXADRMD, address >> 8);
+        dmac_write(host, DMAC_TXADRHI, 0);
+        dmac_write(host, DMAC_MODECON, mode);
+        dmac_write(host, DMAC_MASKREG, MASK_OFF);
 
 #if (DEBUG & DEBUG_DMA)
         DBG(host->SCpnt, acornscsi_dumpdma(host, "strt"));
@@ -1088,8 +1085,8 @@ void acornscsi_dma_setup(AS_Host *host, dmadir_t direction)
 static
 void acornscsi_dma_cleanup(AS_Host *host)
 {
-    dmac_write(host->dma.io_port, DMAC_MASKREG, MASK_ON);
-    dmac_clearintr(host->dma.io_intr_clear);
+    dmac_write(host, DMAC_MASKREG, MASK_ON);
+    dmac_clearintr(host);
 
     /*
      * Check for a pending transfer
@@ -1116,7 +1113,7 @@ void acornscsi_dma_cleanup(AS_Host *host)
         /*
          * Calculate number of bytes transferred from DMA.
          */
-        transferred = dmac_address(host->dma.io_port) - host->dma.start_addr;
+        transferred = dmac_address(host) - host->dma.start_addr;
         host->dma.transferred += transferred;
 
         if (host->dma.direction == DMA_IN)
@@ -1152,13 +1149,13 @@ void acornscsi_dma_intr(AS_Host *host)
     DBG(host->SCpnt, acornscsi_dumpdma(host, "inti"));
 #endif
 
-    dmac_write(host->dma.io_port, DMAC_MASKREG, MASK_ON);
-    dmac_clearintr(host->dma.io_intr_clear);
+    dmac_write(host, DMAC_MASKREG, MASK_ON);
+    dmac_clearintr(host);
 
     /*
      * Calculate amount transferred via DMA
      */
-    transferred = dmac_address(host->dma.io_port) - host->dma.start_addr;
+    transferred = dmac_address(host) - host->dma.start_addr;
     host->dma.transferred += transferred;
 
     /*
@@ -1190,12 +1187,12 @@ void acornscsi_dma_intr(AS_Host *host)
                                 length);
 
         length -= 1;
-        dmac_write(host->dma.io_port, DMAC_TXCNTLO, length);
-        dmac_write(host->dma.io_port, DMAC_TXCNTHI, length >> 8);
-        dmac_write(host->dma.io_port, DMAC_TXADRLO, address);
-        dmac_write(host->dma.io_port, DMAC_TXADRMD, address >> 8);
-        dmac_write(host->dma.io_port, DMAC_TXADRHI, 0);
-        dmac_write(host->dma.io_port, DMAC_MASKREG, MASK_OFF);
+        dmac_write(host, DMAC_TXCNTLO, length);
+        dmac_write(host, DMAC_TXCNTHI, length >> 8);
+        dmac_write(host, DMAC_TXADRLO, address);
+        dmac_write(host, DMAC_TXADRMD, address >> 8);
+        dmac_write(host, DMAC_TXADRHI, 0);
+        dmac_write(host, DMAC_MASKREG, MASK_OFF);
 
 #if (DEBUG & DEBUG_DMA)
         DBG(host->SCpnt, acornscsi_dumpdma(host, "into"));
@@ -1209,15 +1206,15 @@ void acornscsi_dma_intr(AS_Host *host)
          * attention condition.  We continue giving one byte until
          * the device recognises the attention.
          */
-        if (dmac_read(host->dma.io_port, DMAC_STATUS) & STATUS_RQ0) {
+        if (dmac_read(host, DMAC_STATUS) & STATUS_RQ0) {
             acornscsi_abortcmd(host, host->SCpnt->tag);
 
-            dmac_write(host->dma.io_port, DMAC_TXCNTLO, 0);
-            dmac_write(host->dma.io_port, DMAC_TXCNTHI, 0);
-            dmac_write(host->dma.io_port, DMAC_TXADRLO, 0);
-            dmac_write(host->dma.io_port, DMAC_TXADRMD, 0);
-            dmac_write(host->dma.io_port, DMAC_TXADRHI, 0);
-            dmac_write(host->dma.io_port, DMAC_MASKREG, MASK_OFF);
+            dmac_write(host, DMAC_TXCNTLO, 0);
+            dmac_write(host, DMAC_TXCNTHI, 0);
+            dmac_write(host, DMAC_TXADRLO, 0);
+            dmac_write(host, DMAC_TXADRMD, 0);
+            dmac_write(host, DMAC_TXADRHI, 0);
+            dmac_write(host, DMAC_MASKREG, MASK_OFF);
         }
 #endif
     }
@@ -1271,9 +1268,9 @@ void acornscsi_dma_adjust(AS_Host *host)
             host->dma.xfer_setup = 0;
         else {
             transferred += host->dma.start_addr;
-            dmac_write(host->dma.io_port, DMAC_TXADRLO, transferred);
-            dmac_write(host->dma.io_port, DMAC_TXADRMD, transferred >> 8);
-            dmac_write(host->dma.io_port, DMAC_TXADRHI, transferred >> 16);
+            dmac_write(host, DMAC_TXADRLO, transferred);
+            dmac_write(host, DMAC_TXADRMD, transferred >> 8);
+            dmac_write(host, DMAC_TXADRHI, transferred >> 16);
 #if (DEBUG & (DEBUG_DMA|DEBUG_WRITE))
             DBG(host->SCpnt, acornscsi_dumpdma(host, "adjo"));
 #endif
@@ -1292,12 +1289,12 @@ acornscsi_write_pio(AS_Host *host, char *bytes, int *ptr, int len, unsigned int
         int my_ptr = *ptr;
 
         while (my_ptr < len) {
-                asr = sbic_arm_read(host->scsi.io_port, SBIC_ASR);
+                asr = sbic_arm_read(host, SBIC_ASR);
 
                 if (asr & ASR_DBR) {
                         timeout = max_timeout;
 
-                        sbic_arm_write(host->scsi.io_port, SBIC_DATA, bytes[my_ptr++]);
+                        sbic_arm_write(host, SBIC_DATA, bytes[my_ptr++]);
                 } else if (asr & ASR_INT)
                         break;
                 else if (--timeout == 0)
@@ -1320,9 +1317,9 @@ acornscsi_sendcommand(AS_Host *host)
 {
         struct scsi_cmnd *SCpnt = host->SCpnt;
 
-    sbic_arm_write(host->scsi.io_port, SBIC_TRANSCNTH, 0);
-    sbic_arm_writenext(host->scsi.io_port, 0);
-    sbic_arm_writenext(host->scsi.io_port, SCpnt->cmd_len - host->scsi.SCp.sent_command);
+    sbic_arm_write(host, SBIC_TRANSCNTH, 0);
+    sbic_arm_writenext(host, 0);
+    sbic_arm_writenext(host, SCpnt->cmd_len - host->scsi.SCp.sent_command);
 
     acornscsi_sbic_issuecmd(host, CMND_XFERINFO);
 
@@ -1351,7 +1348,7 @@ void acornscsi_sendmessage(AS_Host *host)
 
         acornscsi_sbic_wait(host, ASR_DBR, ASR_DBR, 1000, "sending message 1");
 
-        sbic_arm_write(host->scsi.io_port, SBIC_DATA, NOP);
+        sbic_arm_write(host, SBIC_DATA, NOP);
 
         host->scsi.last_message = NOP;
 #if (DEBUG & DEBUG_MESSAGES)
@@ -1365,7 +1362,7 @@ void acornscsi_sendmessage(AS_Host *host)
 
         acornscsi_sbic_wait(host, ASR_DBR, ASR_DBR, 1000, "sending message 2");
 
-        sbic_arm_write(host->scsi.io_port, SBIC_DATA, msg->msg[0]);
+        sbic_arm_write(host, SBIC_DATA, msg->msg[0]);
 
         host->scsi.last_message = msg->msg[0];
 #if (DEBUG & DEBUG_MESSAGES)
@@ -1382,9 +1379,9 @@ void acornscsi_sendmessage(AS_Host *host)
          *  initiator.  This provides an interlock so that the
          *  initiator can determine which message byte is rejected.
          */
-        sbic_arm_write(host->scsi.io_port, SBIC_TRANSCNTH, 0);
-        sbic_arm_writenext(host->scsi.io_port, 0);
-        sbic_arm_writenext(host->scsi.io_port, message_length);
+        sbic_arm_write(host, SBIC_TRANSCNTH, 0);
+        sbic_arm_writenext(host, 0);
+        sbic_arm_writenext(host, message_length);
         acornscsi_sbic_issuecmd(host, CMND_XFERINFO);
 
         msgnr = 0;
@@ -1421,7 +1418,7 @@ void acornscsi_readstatusbyte(AS_Host *host)
 {
     acornscsi_sbic_issuecmd(host, CMND_XFERINFO|CMND_SBT);
     acornscsi_sbic_wait(host, ASR_DBR, ASR_DBR, 1000, "reading status byte");
-    host->scsi.SCp.Status = sbic_arm_read(host->scsi.io_port, SBIC_DATA);
+    host->scsi.SCp.Status = sbic_arm_read(host, SBIC_DATA);
 }
 
 /*
@@ -1438,12 +1435,12 @@ unsigned char acornscsi_readmessagebyte(AS_Host *host)
 
     acornscsi_sbic_wait(host, ASR_DBR, ASR_DBR, 1000, "for message byte");
 
-    message = sbic_arm_read(host->scsi.io_port, SBIC_DATA);
+    message = sbic_arm_read(host, SBIC_DATA);
 
     /* wait for MSGIN-XFER-PAUSED */
     acornscsi_sbic_wait(host, ASR_INT, ASR_INT, 1000, "for interrupt after message byte");
 
-    sbic_arm_read(host->scsi.io_port, SBIC_SSR);
+    sbic_arm_read(host, SBIC_SSR);
 
     return message;
 }
@@ -1480,7 +1477,7 @@ void acornscsi_message(AS_Host *host)
 
             /* wait for next msg-in */
             acornscsi_sbic_wait(host, ASR_INT, ASR_INT, 1000, "for interrupt after negate ack");
-            sbic_arm_read(host->scsi.io_port, SBIC_SSR);
+            sbic_arm_read(host, SBIC_SSR);
         }
     } while (msgidx < msglen);
 
@@ -1602,7 +1599,7 @@ void acornscsi_message(AS_Host *host)
                     host->host->host_no, acornscsi_target(host));
             host->device[host->SCpnt->device->id].sync_xfer = SYNCHTRANSFER_2DBA;
             host->device[host->SCpnt->device->id].sync_state = SYNC_ASYNCHRONOUS;
-            sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer);
+            sbic_arm_write(host, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer);
             break;
 
         default:
@@ -1652,7 +1649,7 @@ void acornscsi_message(AS_Host *host)
                 host->device[host->SCpnt->device->id].sync_xfer =
                         calc_sync_xfer(period * 4, length);
             }
-            sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer);
+            sbic_arm_write(host, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer);
             break;
 #else
             /* We do not accept synchronous transfers.  Respond with a
@@ -1792,10 +1789,10 @@ int acornscsi_starttransfer(AS_Host *host)
 
     residual = scsi_bufflen(host->SCpnt) - host->scsi.SCp.scsi_xferred;
 
-    sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer);
-    sbic_arm_writenext(host->scsi.io_port, residual >> 16);
-    sbic_arm_writenext(host->scsi.io_port, residual >> 8);
-    sbic_arm_writenext(host->scsi.io_port, residual);
+    sbic_arm_write(host, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer);
+    sbic_arm_writenext(host, residual >> 16);
+    sbic_arm_writenext(host, residual >> 8);
+    sbic_arm_writenext(host, residual);
     acornscsi_sbic_issuecmd(host, CMND_XFERINFO);
     return 1;
 }
@@ -1816,7 +1813,7 @@ int acornscsi_reconnect(AS_Host *host)
 {
     unsigned int target, lun, ok = 0;
 
-    target = sbic_arm_read(host->scsi.io_port, SBIC_SOURCEID);
+    target = sbic_arm_read(host, SBIC_SOURCEID);
 
     if (!(target & 8))
         printk(KERN_ERR "scsi%d: invalid source id after reselection "
@@ -1832,7 +1829,7 @@ int acornscsi_reconnect(AS_Host *host)
         host->SCpnt = NULL;
     }
 
-    lun = sbic_arm_read(host->scsi.io_port, SBIC_DATA) & 7;
+    lun = sbic_arm_read(host, SBIC_DATA) & 7;
 
     host->scsi.reconnected.target = target;
     host->scsi.reconnected.lun = lun;
@@ -1952,7 +1949,7 @@ static
 void acornscsi_abortcmd(AS_Host *host, unsigned char tag)
 {
     host->scsi.phase = PHASE_ABORTED;
-    sbic_arm_write(host->scsi.io_port, SBIC_CMND, CMND_ASSERTATN);
+    sbic_arm_write(host, SBIC_CMND, CMND_ASSERTATN);
 
     msgqueue_flush(&host->scsi.msgs);
 #ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
@@ -1979,11 +1976,11 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
 {
     unsigned int asr, ssr;
 
-    asr = sbic_arm_read(host->scsi.io_port, SBIC_ASR);
+    asr = sbic_arm_read(host, SBIC_ASR);
     if (!(asr & ASR_INT))
         return INTR_IDLE;
 
-    ssr = sbic_arm_read(host->scsi.io_port, SBIC_SSR);
+    ssr = sbic_arm_read(host, SBIC_SSR);
 
 #if (DEBUG & DEBUG_PHASES)
     print_sbic_status(asr, ssr, host->scsi.phase);
@@ -1999,15 +1996,15 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
         printk(KERN_ERR "scsi%d: reset in standard mode but wanted advanced mode.\n",
                 host->host->host_no);
         /* setup sbic - WD33C93A */
-        sbic_arm_write(host->scsi.io_port, SBIC_OWNID, OWNID_EAF | host->host->this_id);
-        sbic_arm_write(host->scsi.io_port, SBIC_CMND, CMND_RESET);
+        sbic_arm_write(host, SBIC_OWNID, OWNID_EAF | host->host->this_id);
+        sbic_arm_write(host, SBIC_CMND, CMND_RESET);
         return INTR_IDLE;
 
     case 0x01:                          /* reset state - advanced                       */
-        sbic_arm_write(host->scsi.io_port, SBIC_CTRL, INIT_SBICDMA | CTRL_IDI);
-        sbic_arm_write(host->scsi.io_port, SBIC_TIMEOUT, TIMEOUT_TIME);
-        sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, SYNCHTRANSFER_2DBA);
-        sbic_arm_write(host->scsi.io_port, SBIC_SOURCEID, SOURCEID_ER | SOURCEID_DSP);
+        sbic_arm_write(host, SBIC_CTRL, INIT_SBICDMA | CTRL_IDI);
+        sbic_arm_write(host, SBIC_TIMEOUT, TIMEOUT_TIME);
+        sbic_arm_write(host, SBIC_SYNCHTRANSFER, SYNCHTRANSFER_2DBA);
+        sbic_arm_write(host, SBIC_SOURCEID, SOURCEID_ER | SOURCEID_DSP);
         msgqueue_flush(&host->scsi.msgs);
         return INTR_IDLE;
 
@@ -2025,10 +2022,10 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq)
             msgqueue_flush(&host->scsi.msgs);
             host->dma.transferred = host->scsi.SCp.scsi_xferred;
             /* 33C93 gives next interrupt indicating bus phase */
-            asr = sbic_arm_read(host->scsi.io_port, SBIC_ASR);
+            asr = sbic_arm_read(host, SBIC_ASR);
             if (!(asr & ASR_INT))
                 break;
-            ssr = sbic_arm_read(host->scsi.io_port, SBIC_SSR);
+            ssr = sbic_arm_read(host, SBIC_SSR);
             ADD_STATUS(8, ssr, host->scsi.phase, 1);
             ADD_STATUS(host->SCpnt->device->id, ssr, host->scsi.phase, 1);
             goto connected;
@@ -2476,11 +2473,11 @@ acornscsi_intr(int irq, void *dev_id)
     do {
         ret = INTR_IDLE;
 
-        iostatus = inb(host->card.io_intr);
+        iostatus = readb(host->fast + INT_REG);
 
         if (iostatus & 2) {
             acornscsi_dma_intr(host);
-            iostatus = inb(host->card.io_intr);
+            iostatus = readb(host->fast + INT_REG);
         }
 
         if (iostatus & 8)
@@ -2655,7 +2652,7 @@ static enum res_abort acornscsi_do_abort(AS_Host *host, struct scsi_cmnd *SCpnt)
                  * busylun bit.
                  */
                 case PHASE_CONNECTED:
-                        sbic_arm_write(host->scsi.io_port, SBIC_CMND, CMND_DISCONNECT);
+                        sbic_arm_write(host, SBIC_CMND, CMND_DISCONNECT);
                         host->SCpnt = NULL;
                         res = res_success_clear;
                         break;
@@ -2699,8 +2696,8 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
 #if (DEBUG & DEBUG_ABORT)
         {
                 int asr, ssr;
-                asr = sbic_arm_read(host->scsi.io_port, SBIC_ASR);
-                ssr = sbic_arm_read(host->scsi.io_port, SBIC_SSR);
+                asr = sbic_arm_read(host, SBIC_ASR);
+                ssr = sbic_arm_read(host, SBIC_SSR);
 
                 printk(KERN_WARNING "acornscsi_abort: ");
                 print_sbic_status(asr, ssr, host->scsi.phase);
@@ -2731,9 +2728,7 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
 //#if (DEBUG & DEBUG_ABORT)
                 printk("success\n");
 //#endif
-                SCpnt->result = DID_ABORT << 16;
-                SCpnt->scsi_done(SCpnt);
-                result = SCSI_ABORT_SUCCESS;
+                result = SUCCESS;
                 break;
 
         /*
@@ -2745,7 +2740,7 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
 //#if (DEBUG & DEBUG_ABORT)
                 printk("snooze\n");
 //#endif
-                result = SCSI_ABORT_SNOOZE;
+                result = FAILED;
                 break;
 
         /*
@@ -2755,11 +2750,7 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
         default:
         case res_not_running:
                 acornscsi_dumplog(host, SCpnt->device->id);
-#if (DEBUG & DEBUG_ABORT)
-                result = SCSI_ABORT_SNOOZE;
-#else
-                result = SCSI_ABORT_NOT_RUNNING;
-#endif
+                result = FAILED;
 //#if (DEBUG & DEBUG_ABORT)
                 printk("not running\n");
 //#endif
@@ -2770,13 +2761,12 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
 }
 
 /*
- * Prototype: int acornscsi_reset(struct scsi_cmnd *SCpnt, unsigned int reset_flags)
+ * Prototype: int acornscsi_reset(struct scsi_cmnd *SCpnt)
  * Purpose  : reset a command on this host/reset this host
  * Params   : SCpnt  - command causing reset
- *            result - what type of reset to perform
  * Returns  : one of SCSI_RESET_ macros
  */
-int acornscsi_reset(struct scsi_cmnd *SCpnt, unsigned int reset_flags)
+int acornscsi_bus_reset(struct scsi_cmnd *SCpnt)
 {
         AS_Host *host = (AS_Host *)SCpnt->device->host->hostdata;
         struct scsi_cmnd *SCptr;
@@ -2787,8 +2777,8 @@ int acornscsi_reset(struct scsi_cmnd *SCpnt, unsigned int reset_flags)
     {
         int asr, ssr;
 
-        asr = sbic_arm_read(host->scsi.io_port, SBIC_ASR);
-        ssr = sbic_arm_read(host->scsi.io_port, SBIC_SSR);
+        asr = sbic_arm_read(host, SBIC_ASR);
+        ssr = sbic_arm_read(host, SBIC_SSR);
 
         printk(KERN_WARNING "acornscsi_reset: ");
         print_sbic_status(asr, ssr, host->scsi.phase);
@@ -2798,28 +2788,16 @@ int acornscsi_reset(struct scsi_cmnd *SCpnt, unsigned int reset_flags)
 
     acornscsi_dma_stop(host);
 
-    SCptr = host->SCpnt;
-
     /*
      * do hard reset.  This resets all devices on this host, and so we
      * must set the reset status on all commands.
      */
     acornscsi_resetcard(host);
 
-    /*
-     * report reset on commands current connected/disconnected
-     */
-    acornscsi_reportstatus(&host->SCpnt, &SCptr, DID_RESET);
-
     while ((SCptr = queue_remove(&host->queues.disconnected)) != NULL)
-        acornscsi_reportstatus(&SCptr, &SCpnt, DID_RESET);
-
-    if (SCpnt) {
-        SCpnt->result = DID_RESET << 16;
-        SCpnt->scsi_done(SCpnt);
-    }
+        ;
 
-    return SCSI_RESET_BUS_RESET | SCSI_RESET_HOST_RESET | SCSI_RESET_SUCCESS;
+    return SUCCESS;
 }
 
 /*==============================================================================================
@@ -2850,7 +2828,7 @@ char *acornscsi_info(struct Scsi_Host *host)
     " LINK"
 #endif
 #if (DEBUG & DEBUG_NO_WRITE)
-    " NOWRITE ("NO_WRITE_STR")"
+    " NOWRITE (" __stringify(NO_WRITE) ")"
 #endif
                 , host->hostt->name, host->io_port, host->irq,
                 VER_MAJOR, VER_MINOR, VER_PATCH);
@@ -2881,15 +2859,15 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
     " LINK"
 #endif
 #if (DEBUG & DEBUG_NO_WRITE)
-    " NOWRITE ("NO_WRITE_STR")"
+    " NOWRITE (" __stringify(NO_WRITE) ")"
 #endif
                 "\n\n", VER_MAJOR, VER_MINOR, VER_PATCH);
 
-    p += sprintf(p,     "SBIC: WD33C93A  Address: %08X  IRQ : %d\n",
-                        host->scsi.io_port, host->scsi.irq);
+    p += sprintf(p,     "SBIC: WD33C93A  Address: %p    IRQ : %d\n",
+                        host->base + SBIC_REGIDX, host->scsi.irq);
 #ifdef USE_DMAC
-    p += sprintf(p,     "DMAC: uPC71071  Address: %08X  IRQ : %d\n\n",
-                        host->dma.io_port, host->scsi.irq);
+    p += sprintf(p,     "DMAC: uPC71071  Address: %p  IRQ : %d\n\n",
+                        host->base + DMAC_OFFSET, host->scsi.irq);
 #endif
 
     p += sprintf(p,     "Statistics:\n"
@@ -2976,9 +2954,8 @@ static struct scsi_host_template acornscsi_template = {
         .name                   = "AcornSCSI",
         .info                   = acornscsi_info,
         .queuecommand           = acornscsi_queuecmd,
-#warning fixme
-        .abort                  = acornscsi_abort,
-        .reset                  = acornscsi_reset,
+        .eh_abort_handler       = acornscsi_abort,
+        .eh_bus_reset_handler   = acornscsi_bus_reset,
         .can_queue              = 16,
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
@@ -2992,48 +2969,37 @@ acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         AS_Host *ashost;
-        int ret = -ENOMEM;
+        int ret;
 
-        host = scsi_host_alloc(&acornscsi_template, sizeof(AS_Host));
-        if (!host)
+        ret = ecard_request_resources(ec);
+        if (ret)
                 goto out;
 
+        host = scsi_host_alloc(&acornscsi_template, sizeof(AS_Host));
+        if (!host) {
+                ret = -ENOMEM;
+                goto out_release;
+        }
+
         ashost = (AS_Host *)host->hostdata;
 
-        host->io_port = ecard_address(ec, ECARD_MEMC, 0);
-        host->irq = ec->irq;
+        ashost->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
+        ashost->fast = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
+        if (!ashost->base || !ashost->fast)
+                goto out_put;
 
-        ashost->host            = host;
-        ashost->scsi.io_port    = ioaddr(host->io_port + 0x800);
-        ashost->scsi.irq        = host->irq;
-        ashost->card.io_intr    = POD_SPACE(host->io_port) + 0x800;
-        ashost->card.io_page    = POD_SPACE(host->io_port) + 0xc00;
-        ashost->card.io_ram     = ioaddr(host->io_port);
-        ashost->dma.io_port     = host->io_port + 0xc00;
-        ashost->dma.io_intr_clear = POD_SPACE(host->io_port) + 0x800;
+        host->irq = ec->irq;
+        ashost->host = host;
+        ashost->scsi.irq = host->irq;
 
-        ec->irqaddr     = (char *)ioaddr(ashost->card.io_intr);
+        ec->irqaddr     = ashost->fast + INT_REG;
         ec->irqmask     = 0x0a;
 
-        ret = -EBUSY;
-        if (!request_region(host->io_port + 0x800, 2, "acornscsi(sbic)"))
-                goto err_1;
-        if (!request_region(ashost->card.io_intr, 1, "acornscsi(intr)"))
-                goto err_2;
-        if (!request_region(ashost->card.io_page, 1, "acornscsi(page)"))
-                goto err_3;
-#ifdef USE_DMAC
-        if (!request_region(ashost->dma.io_port, 256, "acornscsi(dmac)"))
-                goto err_4;
-#endif
-        if (!request_region(host->io_port, 2048, "acornscsi(ram)"))
-                goto err_5;
-
         ret = request_irq(host->irq, acornscsi_intr, IRQF_DISABLED, "acornscsi", ashost);
         if (ret) {
                 printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n",
                         host->host_no, ashost->scsi.irq, ret);
-                goto err_6;
+                goto out_put;
         }
 
         memset(&ashost->stats, 0, sizeof (ashost->stats));
@@ -3045,27 +3011,22 @@ acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
         ret = scsi_add_host(host, &ec->dev);
         if (ret)
-                goto err_7;
+                goto out_irq;
 
         scsi_scan_host(host);
         goto out;
 
- err_7:
+ out_irq:
         free_irq(host->irq, ashost);
- err_6:
-        release_region(host->io_port, 2048);
- err_5:
-#ifdef USE_DMAC
-        release_region(ashost->dma.io_port, 256);
-#endif
- err_4:
-        release_region(ashost->card.io_page, 1);
- err_3:
-        release_region(ashost->card.io_intr, 1);    
- err_2:
-        release_region(host->io_port + 0x800, 2);
- err_1:
+        msgqueue_free(&ashost->scsi.msgs);
+        queue_free(&ashost->queues.disconnected);
+        queue_free(&ashost->queues.issue);
+ out_put:
+        ecardm_iounmap(ec, ashost->fast);
+        ecardm_iounmap(ec, ashost->base);
         scsi_host_put(host);
+ out_release:
+        ecard_release_resources(ec);
  out:
         return ret;
 }
@@ -3081,20 +3042,17 @@ static void __devexit acornscsi_remove(struct expansion_card *ec)
         /*
          * Put card into RESET state
          */
-        outb(0x80, ashost->card.io_page);
+        writeb(0x80, ashost->fast + PAGE_REG);
 
         free_irq(host->irq, ashost);
 
-        release_region(host->io_port + 0x800, 2);
-        release_region(ashost->card.io_intr, 1);
-        release_region(ashost->card.io_page, 1);
-        release_region(ashost->dma.io_port, 256);
-        release_region(host->io_port, 2048);
-
         msgqueue_free(&ashost->scsi.msgs);
         queue_free(&ashost->queues.disconnected);
         queue_free(&ashost->queues.issue);
+        ecardm_iounmap(ec, ashost->fast);
+        ecardm_iounmap(ec, ashost->base);
         scsi_host_put(host);
+        ecard_release_resources(ec);
 }
 
 static const struct ecard_id acornscsi_cids[] = {
diff --git a/drivers/scsi/arm/acornscsi.h b/drivers/scsi/arm/acornscsi.h
index d11424b89f42..8d2172a0b351 100644
--- a/drivers/scsi/arm/acornscsi.h
+++ b/drivers/scsi/arm/acornscsi.h
@@ -179,7 +179,6 @@
 
 /* miscellaneous internal variables */
 
-#define POD_SPACE(x)    ((x) + 0xd0000)
 #define MASK_ON         (MASKREG_M3|MASKREG_M2|MASKREG_M1|MASKREG_M0)
 #define MASK_OFF        (MASKREG_M3|MASKREG_M2|MASKREG_M1)
 
@@ -279,10 +278,11 @@ typedef struct acornscsi_hostdata {
     struct Scsi_Host    *host;                  /* host                                 */
     struct scsi_cmnd    *SCpnt;                 /* currently processing command         */
     struct scsi_cmnd    *origSCpnt;             /* original connecting command          */
+    void __iomem        *base;                  /* memc base address                    */
+    void __iomem        *fast;                  /* fast ioc base address                */
 
     /* driver information */
     struct {
-        unsigned int    io_port;                /* base address of WD33C93              */
         unsigned int    irq;                    /* interrupt                            */
         phase_t         phase;                  /* current phase                        */
 
@@ -329,8 +329,6 @@ typedef struct acornscsi_hostdata {
 
     /* DMA info */
     struct {
-        unsigned int    io_port;                /* base address of DMA controller       */
-        unsigned int    io_intr_clear;          /* address of DMA interrupt clear       */
         unsigned int    free_addr;              /* next free address                    */
         unsigned int    start_addr;             /* start address of current transfer    */
         dmadir_t        direction;              /* dma direction                        */
@@ -345,9 +343,6 @@ typedef struct acornscsi_hostdata {
 
     /* card info */
     struct {
-        unsigned int    io_intr;                /* base address of interrupt id reg     */
-        unsigned int    io_page;                /* base address of page reg             */
-        unsigned int    io_ram;                 /* base address of RAM access           */
         unsigned char   page_reg;               /* current setting of page reg          */
     } card;
 
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index c4b938bc30d3..aa2011b64683 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -22,6 +22,7 @@
 #include <linux/chio.h>                 /* here are all the ioctls */
 #include <linux/mutex.h>
 #include <linux/idr.h>
+#include <linux/smp_lock.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -571,16 +572,19 @@ ch_open(struct inode *inode, struct file *file)
         scsi_changer *ch;
         int minor = iminor(inode);
 
+        lock_kernel();
         spin_lock(&ch_index_lock);
         ch = idr_find(&ch_index_idr, minor);
 
         if (NULL == ch || scsi_device_get(ch->device)) {
                 spin_unlock(&ch_index_lock);
+                unlock_kernel();
                 return -ENXIO;
         }
         spin_unlock(&ch_index_lock);
 
         file->private_data = ch;
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 8508816f303d..2bc30e32b67a 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -49,6 +49,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
 #include <linux/kernel.h>       /* for printk */
 #include <linux/sched.h>
 #include <linux/reboot.h>
+#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
 
@@ -1727,10 +1728,12 @@ static int adpt_open(struct inode *inode, struct file *file)
         int minor;
         adpt_hba* pHba;
 
+        lock_kernel();
         //TODO check for root access
         //
         minor = iminor(inode);
         if (minor >= hba_count) {
+                unlock_kernel();
                 return -ENXIO;
         }
         mutex_lock(&adpt_configuration_lock);
@@ -1741,6 +1744,7 @@ static int adpt_open(struct inode *inode, struct file *file)
         }
         if (pHba == NULL) {
                 mutex_unlock(&adpt_configuration_lock);
+                unlock_kernel();
                 return -ENXIO;
         }
 
@@ -1751,6 +1755,7 @@ static int adpt_open(struct inode *inode, struct file *file)
 
         pHba->in_use = 1;
         mutex_unlock(&adpt_configuration_lock);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 46771d4c81bd..822d5214692b 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -120,6 +120,7 @@
 #include <linux/timer.h>
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
+#include <linux/smp_lock.h>
 
 #ifdef GDTH_RTC
 #include <linux/mc146818rtc.h>
@@ -4019,10 +4020,12 @@ static int gdth_open(struct inode *inode, struct file *filep)
 {
     gdth_ha_str *ha;
 
+    lock_kernel();
     list_for_each_entry(ha, &gdth_instances, list) {
         if (!ha->sdev)
             ha->sdev = scsi_get_host_dev(ha->shost);
     }
+    unlock_kernel();
 
     TRACE(("gdth_open()\n"));
     return 0;
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 18551aaf5e09..28c9da7d4a5c 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -46,6 +46,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
+#include <linux/smp_lock.h>
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
@@ -3272,12 +3273,12 @@ mega_init_scb(adapter_t *adapter)
  * @filep - unused
  *
  * Routines for the character/ioctl interface to the driver. Find out if this
- * is a valid open. If yes, increment the module use count so that it cannot
- * be unloaded.
+ * is a valid open. 
  */
 static int
 megadev_open (struct inode *inode, struct file *filep)
 {
+        cycle_kernel_lock();
         /*
          * Only allow superuser to access private ioctl interface
          */
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 0ad215e27b83..ac3b280c2a72 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -15,6 +15,7 @@
  * Common management module
  */
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include "megaraid_mm.h"
 
 
@@ -96,6 +97,7 @@ mraid_mm_open(struct inode *inode, struct file *filep)
          */
         if (!capable(CAP_SYS_ADMIN)) return (-EACCES);
 
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 7d84c8bbcf3f..fc7ac158476c 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -33,6 +33,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/smp_lock.h>
 #include <linux/uio.h>
 #include <asm/uaccess.h>
 #include <linux/fs.h>
@@ -2863,6 +2864,7 @@ static void megasas_shutdown(struct pci_dev *pdev)
  */
 static int megasas_mgmt_open(struct inode *inode, struct file *filep)
 {
+        cycle_kernel_lock();
         /*
          * Allow only those users with admin rights
          */
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 243d8becd30f..1c79f9794f4e 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -50,6 +50,7 @@ static const char * osst_version = "0.99.4";
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
 #include <linux/jiffies.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>
 #include <asm/system.h>
@@ -4359,7 +4360,7 @@ os_bypass:
 
 
 /* Open the device */
-static int os_scsi_tape_open(struct inode * inode, struct file * filp)
+static int __os_scsi_tape_open(struct inode * inode, struct file * filp)
 {
         unsigned short        flags;
         int                   i, b_size, new_session = 0, retval = 0;
@@ -4725,6 +4726,18 @@ err_out:
         return retval;
 }
 
+/* BKL pushdown: spaghetti avoidance wrapper */
+static int os_scsi_tape_open(struct inode * inode, struct file * filp)
+{
+        int ret;
+
+        lock_kernel();
+        ret = __os_scsi_tape_open(inode, filp);
+        unlock_kernel();
+        return ret;
+}
+
+
 
 /* Flush the tape buffer before close */
 static int os_scsi_tape_flush(struct file * filp, fl_owner_t id)
diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c
index d2557dbc2dc1..0e9533f7aabc 100644
--- a/drivers/scsi/scsi_tgt_if.c
+++ b/drivers/scsi/scsi_tgt_if.c
@@ -21,6 +21,7 @@
  */
 #include <linux/miscdevice.h>
 #include <linux/file.h>
+#include <linux/smp_lock.h>
 #include <net/tcp.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -321,6 +322,7 @@ static int tgt_open(struct inode *inode, struct file *file)
 {
         tx_ring.tr_idx = rx_ring.tr_idx = 0;
 
+        cycle_kernel_lock();
         return 0;
 }
 
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index ea0edd1b2e76..fccd2e88d600 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -49,6 +49,7 @@ static int sg_version_num = 30534;	/* 2 digits for each component */
 #include <linux/delay.h>
 #include <linux/scatterlist.h>
 #include <linux/blktrace_api.h>
+#include <linux/smp_lock.h>
 
 #include "scsi.h"
 #include <scsi/scsi_dbg.h>
@@ -182,8 +183,9 @@ static int sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp,
                          int tablesize);
 static ssize_t sg_new_read(Sg_fd * sfp, char __user *buf, size_t count,
                            Sg_request * srp);
-static ssize_t sg_new_write(Sg_fd * sfp, const char __user *buf, size_t count,
-                            int blocking, int read_only, Sg_request ** o_srp);
+static ssize_t sg_new_write(Sg_fd *sfp, struct file *file,
+                        const char __user *buf, size_t count, int blocking,
+                        int read_only, Sg_request **o_srp);
 static int sg_common_write(Sg_fd * sfp, Sg_request * srp,
                            unsigned char *cmnd, int timeout, int blocking);
 static int sg_u_iovec(sg_io_hdr_t * hp, int sg_num, int ind,
@@ -204,7 +206,6 @@ static Sg_request *sg_get_rq_mark(Sg_fd * sfp, int pack_id);
 static Sg_request *sg_add_request(Sg_fd * sfp);
 static int sg_remove_request(Sg_fd * sfp, Sg_request * srp);
 static int sg_res_in_use(Sg_fd * sfp);
-static int sg_allow_access(unsigned char opcode, char dev_type);
 static int sg_build_direct(Sg_request * srp, Sg_fd * sfp, int dxfer_len);
 static Sg_device *sg_get_dev(int dev);
 #ifdef CONFIG_SCSI_PROC_FS
@@ -227,19 +228,26 @@ sg_open(struct inode *inode, struct file *filp)
         int res;
         int retval;
 
+        lock_kernel();
         nonseekable_open(inode, filp);
         SCSI_LOG_TIMEOUT(3, printk("sg_open: dev=%d, flags=0x%x\n", dev, flags));
         sdp = sg_get_dev(dev);
-        if ((!sdp) || (!sdp->device))
+        if ((!sdp) || (!sdp->device)) {
+                unlock_kernel();
                 return -ENXIO;
-        if (sdp->detached)
+        }
+        if (sdp->detached) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         /* This driver's module count bumped by fops_get in <linux/fs.h> */
         /* Prevent the device driver from vanishing while we sleep */
         retval = scsi_device_get(sdp->device);
-        if (retval)
+        if (retval) {
+                unlock_kernel();
                 return retval;
+        }
 
         if (!((flags & O_NONBLOCK) ||
               scsi_block_when_processing_errors(sdp->device))) {
@@ -295,10 +303,12 @@ sg_open(struct inode *inode, struct file *filp)
                 retval = -ENOMEM;
                 goto error_out;
         }
+        unlock_kernel();
         return 0;
 
       error_out:
         scsi_device_put(sdp->device);
+        unlock_kernel();
         return retval;
 }
 
@@ -544,7 +554,7 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
                 return -EFAULT;
         blocking = !(filp->f_flags & O_NONBLOCK);
         if (old_hdr.reply_len < 0)
-                return sg_new_write(sfp, buf, count, blocking, 0, NULL);
+                return sg_new_write(sfp, filp, buf, count, blocking, 0, NULL);
         if (count < (SZ_SG_HEADER + 6))
                 return -EIO;    /* The minimum scsi command length is 6 bytes. */
 
@@ -621,8 +631,9 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
 }
 
 static ssize_t
-sg_new_write(Sg_fd * sfp, const char __user *buf, size_t count,
-             int blocking, int read_only, Sg_request ** o_srp)
+sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf,
+                 size_t count, int blocking, int read_only,
+                 Sg_request **o_srp)
 {
         int k;
         Sg_request *srp;
@@ -678,8 +689,7 @@ sg_new_write(Sg_fd * sfp, const char __user *buf, size_t count,
                 sg_remove_request(sfp, srp);
                 return -EFAULT;
         }
-        if (read_only &&
-            (!sg_allow_access(cmnd[0], sfp->parentdp->device->type))) {
+        if (read_only && !blk_verify_command(file, cmnd)) {
                 sg_remove_request(sfp, srp);
                 return -EPERM;
         }
@@ -799,7 +809,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
                         if (!access_ok(VERIFY_WRITE, p, SZ_SG_IO_HDR))
                                 return -EFAULT;
                         result =
-                            sg_new_write(sfp, p, SZ_SG_IO_HDR,
+                            sg_new_write(sfp, filp, p, SZ_SG_IO_HDR,
                                          blocking, read_only, &srp);
                         if (result < 0)
                                 return result;
@@ -1048,7 +1058,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
 
                         if (copy_from_user(&opcode, siocp->data, 1))
                                 return -EFAULT;
-                        if (!sg_allow_access(opcode, sdp->device->type))
+                        if (!blk_verify_command(filp, &opcode))
                                 return -EPERM;
                 }
                 return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p);
@@ -2502,30 +2512,6 @@ sg_page_free(struct page *page, int size)
         __free_pages(page, order);
 }
 
-#ifndef MAINTENANCE_IN_CMD
-#define MAINTENANCE_IN_CMD 0xa3
-#endif
-
-static unsigned char allow_ops[] = { TEST_UNIT_READY, REQUEST_SENSE,
-        INQUIRY, READ_CAPACITY, READ_BUFFER, READ_6, READ_10, READ_12,
-        READ_16, MODE_SENSE, MODE_SENSE_10, LOG_SENSE, REPORT_LUNS,
-        SERVICE_ACTION_IN, RECEIVE_DIAGNOSTIC, READ_LONG, MAINTENANCE_IN_CMD
-};
-
-static int
-sg_allow_access(unsigned char opcode, char dev_type)
-{
-        int k;
-
-        if (TYPE_SCANNER == dev_type)   /* TYPE_ROM maybe burner */
-                return 1;
-        for (k = 0; k < sizeof (allow_ops); ++k) {
-                if (opcode == allow_ops[k])
-                        return 1;
-        }
-        return 0;
-}
-
 #ifdef CONFIG_SCSI_PROC_FS
 static int
 sg_idr_max_id(int id, void *p, void *data)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index c82df8bd4d89..27f5bfd1def3 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -673,24 +673,20 @@ fail:
 static void get_sectorsize(struct scsi_cd *cd)
 {
         unsigned char cmd[10];
-        unsigned char *buffer;
+        unsigned char buffer[8];
         int the_result, retries = 3;
         int sector_size;
         struct request_queue *queue;
 
-        buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
-        if (!buffer)
-                goto Enomem;
-
         do {
                 cmd[0] = READ_CAPACITY;
                 memset((void *) &cmd[1], 0, 9);
-                memset(buffer, 0, 8);
+                memset(buffer, 0, sizeof(buffer));
 
                 /* Do the command and wait.. */
                 the_result = scsi_execute_req(cd->device, cmd, DMA_FROM_DEVICE,
-                                              buffer, 8, NULL, SR_TIMEOUT,
-                                              MAX_RETRIES);
+                                              buffer, sizeof(buffer), NULL,
+                                              SR_TIMEOUT, MAX_RETRIES);
 
                 retries--;
 
@@ -745,14 +741,8 @@ static void get_sectorsize(struct scsi_cd *cd)
 
         queue = cd->device->request_queue;
         blk_queue_hardsect_size(queue, sector_size);
-out:
-        kfree(buffer);
-        return;
 
-Enomem:
-        cd->capacity = 0x1fffff;
-        cd->device->sector_size = 2048; /* A guess, just in case */
-        goto out;
+        return;
 }
 
 static void get_capabilities(struct scsi_cd *cd)
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 6e5a5bb31311..4684cc716aa4 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -38,6 +38,7 @@ static const char *verstr = "20080224";
 #include <linux/cdev.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/dma.h>
@@ -1113,7 +1114,7 @@ static int check_tape(struct scsi_tape *STp, struct file *filp)
 }
 
 
-/* Open the device. Needs to be called with BKL only because of incrementing the SCSI host
+/* Open the device. Needs to take the BKL only because of incrementing the SCSI host
    module count. */
 static int st_open(struct inode *inode, struct file *filp)
 {
@@ -1123,6 +1124,7 @@ static int st_open(struct inode *inode, struct file *filp)
         int dev = TAPE_NR(inode);
         char *name;
 
+        lock_kernel();
         /*
          * We really want to do nonseekable_open(inode, filp); here, but some
          * versions of tar incorrectly call lseek on tapes and bail out if that
@@ -1130,8 +1132,10 @@ static int st_open(struct inode *inode, struct file *filp)
          */
         filp->f_mode &= ~(FMODE_PREAD | FMODE_PWRITE);
 
-        if (!(STp = scsi_tape_get(dev)))
+        if (!(STp = scsi_tape_get(dev))) {
+                unlock_kernel();
                 return -ENXIO;
+        }
 
         write_lock(&st_dev_arr_lock);
         filp->private_data = STp;
@@ -1140,6 +1144,7 @@ static int st_open(struct inode *inode, struct file *filp)
         if (STp->in_use) {
                 write_unlock(&st_dev_arr_lock);
                 scsi_tape_put(STp);
+                unlock_kernel();
                 DEB( printk(ST_DEB_MSG "%s: Device already in use.\n", name); )
                 return (-EBUSY);
         }
@@ -1188,12 +1193,14 @@ static int st_open(struct inode *inode, struct file *filp)
                         retval = (-EIO);
                 goto err_out;
         }
+        unlock_kernel();
         return 0;
 
  err_out:
         normalize_buffer(STp->buffer);
         STp->in_use = 0;
         scsi_tape_put(STp);
+        unlock_kernel();
         return retval;
 
 }
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 9bc42763623c..18ca9075e131 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -448,22 +448,27 @@ config SERIAL_CLPS711X_CONSOLE
           your boot loader (lilo or loadlin) about how to pass options to the
           kernel at boot time.)
 
-config SERIAL_S3C2410
-        tristate "Samsung S3C2410/S3C2440/S3C2442/S3C2412 Serial port support"
-        depends on ARM && ARCH_S3C2410
-        select SERIAL_CORE
+config SERIAL_SAMSUNG
+        tristate "Samsung SoC serial support"
+        depends on ARM && PLAT_S3C24XX
         help
           Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
           providing /dev/ttySAC0, 1 and 2 (note, some machines may not
           provide all of these ports, depending on how the serial port
           pins are configured.
 
-          Currently this driver supports the UARTS on the S3C2410, S3C2440,
-          S3C2442, S3C2412 and S3C2413 CPUs.
+config SERIAL_SAMSUNG_DEBUG
+        bool "Samsung SoC serial debug"
+        depends on SERIAL_SAMSUNG
+        help
+          Add support for debugging the serial driver. Since this is
+          generally being used as a console, we use our own output
+          routines that go via the low-level debug printascii()
+          function.
 
-config SERIAL_S3C2410_CONSOLE
-        bool "Support for console on S3C2410 serial port"
-        depends on SERIAL_S3C2410=y
+config SERIAL_SAMSUNG_CONSOLE
+        bool "Support for console on Samsung SoC serial port"
+        depends on SERIAL_SAMSUNG=y
         select SERIAL_CORE_CONSOLE
         help
           Allow selection of the S3C24XX on-board serial ports for use as
@@ -476,6 +481,37 @@ config SERIAL_S3C2410_CONSOLE
           your boot loader about how to pass options to the kernel at
           boot time.)
 
+config SERIAL_S3C2400
+        tristate "Samsung S3C2410 Serial port support"
+        depends on ARM && SERIAL_SAMSUNG && CPU_S3C2400
+        default y if CPU_S3C2400
+        help
+          Serial port support for the Samsung S3C2400 SoC
+
+config SERIAL_S3C2410
+        tristate "Samsung S3C2410 Serial port support"
+        depends on SERIAL_SAMSUNG && CPU_S3C2410
+        default y if CPU_S3C2410
+        help
+          Serial port support for the Samsung S3C2410 SoC
+
+config SERIAL_S3C2412
+        tristate "Samsung S3C2412/S3C2413 Serial port support"
+        depends on SERIAL_SAMSUNG && CPU_S3C2412
+        default y if CPU_S3C2412
+        help
+          Serial port support for the Samsung S3C2412 and S3C2413 SoC
+
+config SERIAL_S3C2440
+        tristate "Samsung S3C2440/S3C2442 Serial port support"
+        depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442)
+        default y if CPU_S3C2440
+        default y if CPU_S3C2442
+        help
+          Serial port support for the Samsung S3C2440 and S3C2442 SoC
+
+
+
 config SERIAL_DZ
         bool "DECstation DZ serial driver"
         depends on MACH_DECSTATION && 32BIT
@@ -753,7 +789,7 @@ config BFIN_UART3_CTSRTS
 
 config SERIAL_IMX
         bool "IMX serial port support"
-        depends on ARM && ARCH_IMX
+        depends on ARM && (ARCH_IMX || ARCH_MXC)
         select SERIAL_CORE
         help
           If you have a machine based on a Motorola IMX CPU you
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 0d9c09b1e836..7d85c1fbe7e0 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -28,7 +28,11 @@ obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
 obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
 obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o
 obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
+obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
+obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.o
 obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
+obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
+obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
 obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o
 obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o
 obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 42be8b01a40f..6aeef22bd203 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -1439,14 +1439,29 @@ static struct uart_driver atmel_uart = {
 };
 
 #ifdef CONFIG_PM
+static bool atmel_serial_clk_will_stop(void)
+{
+#ifdef CONFIG_ARCH_AT91
+        return at91_suspend_entering_slow_clock();
+#else
+        return false;
+#endif
+}
+
 static int atmel_serial_suspend(struct platform_device *pdev,
                                 pm_message_t state)
 {
         struct uart_port *port = platform_get_drvdata(pdev);
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
 
+        if (atmel_is_console_port(port) && console_suspend_enabled) {
+                /* Drain the TX shifter */
+                while (!(UART_GET_CSR(port) & ATMEL_US_TXEMPTY))
+                        cpu_relax();
+        }
+
         if (device_may_wakeup(&pdev->dev)
-            && !at91_suspend_entering_slow_clock())
+            && !atmel_serial_clk_will_stop())
                 enable_irq_wake(port->irq);
         else {
                 uart_suspend_port(&atmel_uart, port);
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 5a375bf0ebf4..64acb39a51ba 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -40,6 +40,7 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -61,6 +62,11 @@
 #define UBIR  0xa4 /* BRM Incremental Register */
 #define UBMR  0xa8 /* BRM Modulator Register */
 #define UBRC  0xac /* Baud Rate Count Register */
+#if defined CONFIG_ARCH_MX3 || defined CONFIG_ARCH_MX2
+#define ONEMS 0xb0 /* One Millisecond register */
+#define UTS   0xb4 /* UART Test Register */
+#endif
+#ifdef CONFIG_ARCH_IMX
 #define BIPR1 0xb0 /* Incremental Preset Register 1 */
 #define BIPR2 0xb4 /* Incremental Preset Register 2 */
 #define BIPR3 0xb8 /* Incremental Preset Register 3 */
@@ -70,6 +76,7 @@
 #define BMPR3 0xc8 /* BRM Modulator Register 3 */
 #define BMPR4 0xcc /* BRM Modulator Register 4 */
 #define UTS   0xd0 /* UART Test Register */
+#endif
 
 /* UART Control Register Bit Fields.*/
 #define  URXD_CHARRDY    (1<<15)
@@ -89,7 +96,12 @@
 #define  UCR1_RTSDEN     (1<<5)  /* RTS delta interrupt enable */
 #define  UCR1_SNDBRK     (1<<4)  /* Send break */
 #define  UCR1_TDMAEN     (1<<3)  /* Transmitter ready DMA enable */
+#ifdef CONFIG_ARCH_IMX
 #define  UCR1_UARTCLKEN  (1<<2)  /* UART clock enabled */
+#endif
+#if defined CONFIG_ARCH_MX3 || defined CONFIG_ARCH_MX2
+#define  UCR1_UARTCLKEN  (0)     /* not present on mx2/mx3 */
+#endif
 #define  UCR1_DOZE       (1<<1)  /* Doze */
 #define  UCR1_UARTEN     (1<<0)  /* UART enabled */
 #define  UCR2_ESCI       (1<<15) /* Escape seq interrupt enable */
@@ -163,8 +175,19 @@
 #define  UTS_SOFTRST     (1<<0)  /* Software reset */
 
 /* We've been assigned a range on the "Low-density serial ports" major */
+#ifdef CONFIG_ARCH_IMX
 #define SERIAL_IMX_MAJOR        204
 #define MINOR_START             41
+#define DEV_NAME                "ttySMX"
+#define MAX_INTERNAL_IRQ        IMX_IRQS
+#endif
+
+#if defined CONFIG_ARCH_MX3 || defined CONFIG_ARCH_MX2
+#define SERIAL_IMX_MAJOR        207
+#define MINOR_START             16
+#define DEV_NAME                "ttymxc"
+#define MAX_INTERNAL_IRQ        MXC_MAX_INT_LINES
+#endif
 
 /*
  * This determines how often we check the modem status signals
@@ -176,12 +199,15 @@
 
 #define DRIVER_NAME "IMX-uart"
 
+#define UART_NR 8
+
 struct imx_port {
         struct uart_port        port;
         struct timer_list       timer;
         unsigned int            old_status;
         int                     txirq,rxirq,rtsirq;
         int                     have_rtscts:1;
+        struct clk              *clk;
 };
 
 /*
@@ -405,6 +431,26 @@ out:
         return IRQ_HANDLED;
 }
 
+static irqreturn_t imx_int(int irq, void *dev_id)
+{
+        struct imx_port *sport = dev_id;
+        unsigned int sts;
+
+        sts = readl(sport->port.membase + USR1);
+
+        if (sts & USR1_RRDY)
+                imx_rxint(irq, dev_id);
+
+        if (sts & USR1_TRDY &&
+                        readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN)
+                imx_txint(irq, dev_id);
+
+        if (sts & USR1_RTSS)
+                imx_rtsint(irq, dev_id);
+
+        return IRQ_HANDLED;
+}
+
 /*
  * Return TIOCSER_TEMT when transmitter is not busy.
  */
@@ -477,7 +523,8 @@ static int imx_setup_ufcr(struct imx_port *sport, unsigned int mode)
          * RFDIV is set such way to satisfy requested uartclk value
          */
         val = TXTL << 10 | RXTL;
-        ufcr_rfdiv = (imx_get_perclk1() + sport->port.uartclk / 2) / sport->port.uartclk;
+        ufcr_rfdiv = (clk_get_rate(sport->clk) + sport->port.uartclk / 2)
+                        / sport->port.uartclk;
 
         if(!ufcr_rfdiv)
                 ufcr_rfdiv = 1;
@@ -509,21 +556,34 @@ static int imx_startup(struct uart_port *port)
         writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
 
         /*
-         * Allocate the IRQ
+         * Allocate the IRQ(s) i.MX1 has three interrupts whereas later
+         * chips only have one interrupt.
          */
-        retval = request_irq(sport->rxirq, imx_rxint, 0,
-                             DRIVER_NAME, sport);
-        if (retval) goto error_out1;
-
-        retval = request_irq(sport->txirq, imx_txint, 0,
-                             DRIVER_NAME, sport);
-        if (retval) goto error_out2;
-
-        retval = request_irq(sport->rtsirq, imx_rtsint,
-                             (sport->rtsirq < IMX_IRQS) ? 0 :
+        if (sport->txirq > 0) {
+                retval = request_irq(sport->rxirq, imx_rxint, 0,
+                                DRIVER_NAME, sport);
+                if (retval)
+                        goto error_out1;
+
+                retval = request_irq(sport->txirq, imx_txint, 0,
+                                DRIVER_NAME, sport);
+                if (retval)
+                        goto error_out2;
+
+                retval = request_irq(sport->rtsirq, imx_rtsint,
+                             (sport->rtsirq < MAX_INTERNAL_IRQ) ? 0 :
                                IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                             DRIVER_NAME, sport);
-        if (retval) goto error_out3;
+                                DRIVER_NAME, sport);
+                if (retval)
+                        goto error_out3;
+        } else {
+                retval = request_irq(sport->port.irq, imx_int, 0,
+                                DRIVER_NAME, sport);
+                if (retval) {
+                        free_irq(sport->port.irq, sport);
+                        goto error_out1;
+                }
+        }
 
         /*
          * Finally, clear and enable interrupts
@@ -548,9 +608,11 @@ static int imx_startup(struct uart_port *port)
         return 0;
 
 error_out3:
-        free_irq(sport->txirq, sport);
+        if (sport->txirq)
+                free_irq(sport->txirq, sport);
 error_out2:
-        free_irq(sport->rxirq, sport);
+        if (sport->rxirq)
+                free_irq(sport->rxirq, sport);
 error_out1:
         return retval;
 }
@@ -568,9 +630,12 @@ static void imx_shutdown(struct uart_port *port)
         /*
          * Free the interrupts
          */
-        free_irq(sport->rtsirq, sport);
-        free_irq(sport->txirq, sport);
-        free_irq(sport->rxirq, sport);
+        if (sport->txirq > 0) {
+                free_irq(sport->rtsirq, sport);
+                free_irq(sport->txirq, sport);
+                free_irq(sport->rxirq, sport);
+        } else
+                free_irq(sport->port.irq, sport);
 
         /*
          * Disable all interrupts, port and break condition.
@@ -589,6 +654,7 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
         unsigned long flags;
         unsigned int ucr2, old_ucr1, old_txrxen, baud, quot;
         unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8;
+        unsigned int div, num, denom, ufcr;
 
         /*
          * If we don't support modem control lines, don't allow
@@ -634,7 +700,7 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
         /*
          * Ask the core to calculate the divisor for us.
          */
-        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+        baud = uart_get_baud_rate(port, termios, old, 50, port->uartclk / 16);
         quot = uart_get_divisor(port, baud);
 
         spin_lock_irqsave(&sport->port.lock, flags);
@@ -684,14 +750,41 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
                         sport->port.membase + UCR2);
         old_txrxen &= (UCR2_TXEN | UCR2_RXEN);
 
-        /* set the baud rate. We assume uartclk = 16 MHz
-         *
-         * baud * 16   UBIR - 1
-         * --------- = --------
-         *  uartclk    UBMR - 1
-         */
-        writel((baud / 100) - 1, sport->port.membase + UBIR);
-        writel(10000 - 1, sport->port.membase + UBMR);
+        div = sport->port.uartclk / (baud * 16);
+        if (div > 7)
+                div = 7;
+        if (!div)
+                div = 1;
+
+        num = baud;
+        denom = port->uartclk / div / 16;
+
+        /* shift num and denom right until they fit into 16 bits */
+        while (num > 0x10000 || denom > 0x10000) {
+                num >>= 1;
+                denom >>= 1;
+        }
+        if (num > 0)
+                num -= 1;
+        if (denom > 0)
+                denom -= 1;
+
+        writel(num, sport->port.membase + UBIR);
+        writel(denom, sport->port.membase + UBMR);
+
+        if (div == 7)
+                div = 6; /* 6 in RFDIV means divide by 7 */
+        else
+                div = 6 - div;
+
+        ufcr = readl(sport->port.membase + UFCR);
+        ufcr = (ufcr & (~UFCR_RFDIV)) |
+            (div << 7);
+        writel(ufcr, sport->port.membase + UFCR);
+
+#ifdef ONEMS
+        writel(sport->port.uartclk / div / 1000, sport->port.membase + ONEMS);
+#endif
 
         writel(old_ucr1, sport->port.membase + UCR1);
 
@@ -801,65 +894,7 @@ static struct uart_ops imx_pops = {
         .verify_port    = imx_verify_port,
 };
 
-static struct imx_port imx_ports[] = {
-        {
-        .txirq  = UART1_MINT_TX,
-        .rxirq  = UART1_MINT_RX,
-        .rtsirq = UART1_MINT_RTS,
-        .port   = {
-                .type           = PORT_IMX,
-                .iotype         = UPIO_MEM,
-                .membase        = (void *)IMX_UART1_BASE,
-                .mapbase        = 0x00206000,
-                .irq            = UART1_MINT_RX,
-                .uartclk        = 16000000,
-                .fifosize       = 32,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .ops            = &imx_pops,
-                .line           = 0,
-        },
-        }, {
-        .txirq  = UART2_MINT_TX,
-        .rxirq  = UART2_MINT_RX,
-        .rtsirq = UART2_MINT_RTS,
-        .port   = {
-                .type           = PORT_IMX,
-                .iotype         = UPIO_MEM,
-                .membase        = (void *)IMX_UART2_BASE,
-                .mapbase        = 0x00207000,
-                .irq            = UART2_MINT_RX,
-                .uartclk        = 16000000,
-                .fifosize       = 32,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .ops            = &imx_pops,
-                .line           = 1,
-        },
-        }
-};
-
-/*
- * Setup the IMX serial ports.
- * Note also that we support "console=ttySMXx" where "x" is either 0 or 1.
- * Which serial port this ends up being depends on the machine you're
- * running this kernel on.  I'm not convinced that this is a good idea,
- * but that's the way it traditionally works.
- *
- */
-static void __init imx_init_ports(void)
-{
-        static int first = 1;
-        int i;
-
-        if (!first)
-                return;
-        first = 0;
-
-        for (i = 0; i < ARRAY_SIZE(imx_ports); i++) {
-                init_timer(&imx_ports[i].timer);
-                imx_ports[i].timer.function = imx_timeout;
-                imx_ports[i].timer.data     = (unsigned long)&imx_ports[i];
-        }
-}
+static struct imx_port *imx_ports[UART_NR];
 
 #ifdef CONFIG_SERIAL_IMX_CONSOLE
 static void imx_console_putchar(struct uart_port *port, int ch)
@@ -878,7 +913,7 @@ static void imx_console_putchar(struct uart_port *port, int ch)
 static void
 imx_console_write(struct console *co, const char *s, unsigned int count)
 {
-        struct imx_port *sport = &imx_ports[co->index];
+        struct imx_port *sport = imx_ports[co->index];
         unsigned int old_ucr1, old_ucr2;
 
         /*
@@ -944,7 +979,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                 else
                         ucfr_rfdiv = 6 - ucfr_rfdiv;
 
-                uartclk = imx_get_perclk1();
+                uartclk = clk_get_rate(sport->clk);
                 uartclk /= ucfr_rfdiv;
 
                 {       /*
@@ -984,7 +1019,7 @@ imx_console_setup(struct console *co, char *options)
          */
         if (co->index == -1 || co->index >= ARRAY_SIZE(imx_ports))
                 co->index = 0;
-        sport = &imx_ports[co->index];
+        sport = imx_ports[co->index];
 
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
@@ -998,7 +1033,7 @@ imx_console_setup(struct console *co, char *options)
 
 static struct uart_driver imx_reg;
 static struct console imx_console = {
-        .name           = "ttySMX",
+        .name           = DEV_NAME,
         .write          = imx_console_write,
         .device         = uart_console_device,
         .setup          = imx_console_setup,
@@ -1007,14 +1042,6 @@ static struct console imx_console = {
         .data           = &imx_reg,
 };
 
-static int __init imx_rs_console_init(void)
-{
-        imx_init_ports();
-        register_console(&imx_console);
-        return 0;
-}
-console_initcall(imx_rs_console_init);
-
 #define IMX_CONSOLE     &imx_console
 #else
 #define IMX_CONSOLE     NULL
@@ -1023,7 +1050,7 @@ console_initcall(imx_rs_console_init);
 static struct uart_driver imx_reg = {
         .owner          = THIS_MODULE,
         .driver_name    = DRIVER_NAME,
-        .dev_name       = "ttySMX",
+        .dev_name       = DEV_NAME,
         .major          = SERIAL_IMX_MAJOR,
         .minor          = MINOR_START,
         .nr             = ARRAY_SIZE(imx_ports),
@@ -1050,29 +1077,98 @@ static int serial_imx_resume(struct platform_device *dev)
         return 0;
 }
 
-static int serial_imx_probe(struct platform_device *dev)
+static int serial_imx_probe(struct platform_device *pdev)
 {
+        struct imx_port *sport;
         struct imxuart_platform_data *pdata;
+        void __iomem *base;
+        int ret = 0;
+        struct resource *res;
+
+        sport = kzalloc(sizeof(*sport), GFP_KERNEL);
+        if (!sport)
+                return -ENOMEM;
 
-        imx_ports[dev->id].port.dev = &dev->dev;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                ret = -ENODEV;
+                goto free;
+        }
+
+        base = ioremap(res->start, PAGE_SIZE);
+        if (!base) {
+                ret = -ENOMEM;
+                goto free;
+        }
+
+        sport->port.dev = &pdev->dev;
+        sport->port.mapbase = res->start;
+        sport->port.membase = base;
+        sport->port.type = PORT_IMX,
+        sport->port.iotype = UPIO_MEM;
+        sport->port.irq = platform_get_irq(pdev, 0);
+        sport->rxirq = platform_get_irq(pdev, 0);
+        sport->txirq = platform_get_irq(pdev, 1);
+        sport->rtsirq = platform_get_irq(pdev, 2);
+        sport->port.fifosize = 32;
+        sport->port.ops = &imx_pops;
+        sport->port.flags = UPF_BOOT_AUTOCONF;
+        sport->port.line = pdev->id;
+        init_timer(&sport->timer);
+        sport->timer.function = imx_timeout;
+        sport->timer.data     = (unsigned long)sport;
+
+        sport->clk = clk_get(&pdev->dev, "uart_clk");
+        if (IS_ERR(sport->clk)) {
+                ret = PTR_ERR(sport->clk);
+                goto unmap;
+        }
+        clk_enable(sport->clk);
 
-        pdata = (struct imxuart_platform_data *)dev->dev.platform_data;
+        sport->port.uartclk = clk_get_rate(sport->clk);
+
+        imx_ports[pdev->id] = sport;
+
+        pdata = pdev->dev.platform_data;
         if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
-                imx_ports[dev->id].have_rtscts = 1;
+                sport->have_rtscts = 1;
+
+        if (pdata->init)
+                pdata->init(pdev);
+
+        uart_add_one_port(&imx_reg, &sport->port);
+        platform_set_drvdata(pdev, &sport->port);
 
-        uart_add_one_port(&imx_reg, &imx_ports[dev->id].port);
-        platform_set_drvdata(dev, &imx_ports[dev->id]);
         return 0;
+unmap:
+        iounmap(sport->port.membase);
+free:
+        kfree(sport);
+
+        return ret;
 }
 
-static int serial_imx_remove(struct platform_device *dev)
+static int serial_imx_remove(struct platform_device *pdev)
 {
-        struct imx_port *sport = platform_get_drvdata(dev);
+        struct imxuart_platform_data *pdata;
+        struct imx_port *sport = platform_get_drvdata(pdev);
 
-        platform_set_drvdata(dev, NULL);
+        pdata = pdev->dev.platform_data;
 
-        if (sport)
+        platform_set_drvdata(pdev, NULL);
+
+        if (sport) {
                 uart_remove_one_port(&imx_reg, &sport->port);
+                clk_put(sport->clk);
+        }
+
+        clk_disable(sport->clk);
+
+        if (pdata->exit)
+                pdata->exit(pdev);
+
+        iounmap(sport->port.membase);
+        kfree(sport);
 
         return 0;
 }
@@ -1095,8 +1191,6 @@ static int __init imx_serial_init(void)
 
         printk(KERN_INFO "Serial: IMX driver\n");
 
-        imx_init_ports();
-
         ret = uart_register_driver(&imx_reg);
         if (ret)
                 return ret;
diff --git a/drivers/serial/s3c2400.c b/drivers/serial/s3c2400.c
new file mode 100644
index 000000000000..a1102053e553
--- /dev/null
+++ b/drivers/serial/s3c2400.c
@@ -0,0 +1,106 @@
+/* linux/drivers/serial/s3c240.c
+ *
+ * Driver for Samsung SoC onboard UARTs.
+ *
+ * Ben Dooks, Copyright (c) 2003-2005 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *
+ * 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/module.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+
+#include <asm/irq.h>
+
+#include <asm/hardware.h>
+
+#include <asm/plat-s3c/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+
+#include "samsung.h"
+
+static int s3c2400_serial_getsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        clk->divisor = 1;
+        clk->name = "pclk";
+
+        return 0;
+}
+
+static int s3c2400_serial_setsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        return 0;
+}
+
+static int s3c2400_serial_resetport(struct uart_port *port,
+                                    struct s3c2410_uartcfg *cfg)
+{
+        dbg("s3c2400_serial_resetport: port=%p (%08lx), cfg=%p\n",
+            port, port->mapbase, cfg);
+
+        wr_regl(port, S3C2410_UCON,  cfg->ucon);
+        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
+
+        /* reset both fifos */
+
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
+
+        return 0;
+}
+
+static struct s3c24xx_uart_info s3c2400_uart_inf = {
+        .name           = "Samsung S3C2400 UART",
+        .type           = PORT_S3C2400,
+        .fifosize       = 16,
+        .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
+        .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
+        .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
+        .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
+        .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
+        .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
+        .get_clksrc     = s3c2400_serial_getsource,
+        .set_clksrc     = s3c2400_serial_setsource,
+        .reset_port     = s3c2400_serial_resetport,
+};
+
+static int s3c2400_serial_probe(struct platform_device *dev)
+{
+        return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
+}
+
+static struct platform_driver s3c2400_serial_drv = {
+        .probe          = s3c2400_serial_probe,
+        .remove         = s3c24xx_serial_remove,
+        .driver         = {
+                .name   = "s3c2400-uart",
+                .owner  = THIS_MODULE,
+        },
+};
+
+s3c24xx_console_init(&s3c2400_serial_drv, &s3c2400_uart_inf);
+
+static inline int s3c2400_serial_init(void)
+{
+        return s3c24xx_serial_init(&s3c2400_serial_drv, &s3c2400_uart_inf);
+}
+
+static inline void s3c2400_serial_exit(void)
+{
+        platform_driver_unregister(&s3c2400_serial_drv);
+}
+
+module_init(s3c2400_serial_init);
+module_exit(s3c2400_serial_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_DESCRIPTION("Samsung S3C2400 SoC Serial port driver");
+MODULE_ALIAS("platform:s3c2400-uart");
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 2b6a013639e6..c5f03f41686f 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1,1270 +1,30 @@
-/*
- * linux/drivers/serial/s3c2410.c
+/* linux/drivers/serial/s3c2410.c
  *
- * Driver for onboard UARTs on the Samsung S3C24XX
+ * Driver for Samsung S3C2410 SoC onboard UARTs.
  *
- * Based on drivers/char/serial.c and drivers/char/21285.c
+ * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
  *
- * Ben Dooks, (c) 2003-2005 Simtec Electronics
- *      http://www.simtec.co.uk/products/SWLINUX/
- *
- * Changelog:
- *
- * 22-Jul-2004  BJD  Finished off device rewrite
- *
- * 21-Jul-2004  BJD  Thanks to <herbet@13thfloor.at> for pointing out
- *                   problems with baud rate and loss of IR settings. Update
- *                   to add configuration via platform_device structure
- *
- * 28-Sep-2004  BJD  Re-write for the following items
- *                   - S3C2410 and S3C2440 serial support
- *                   - Power Management support
- *                   - Fix console via IrDA devices
- *                   - SysReq (Herbert Pötzl)
- *                   - Break character handling (Herbert Pötzl)
- *                   - spin-lock initialisation (Dimitry Andric)
- *                   - added clock control
- *                   - updated init code to use platform_device info
- *
- * 06-Mar-2005  BJD  Add s3c2440 fclk clock source
- *
- * 09-Mar-2005  BJD  Add s3c2400 support
- *
- * 10-Mar-2005  LCVR Changed S3C2410_VA_UART to S3C24XX_VA_UART
-*/
-
-/* Note on 2440 fclk clock source handling
- *
- * Whilst it is possible to use the fclk as clock source, the method
- * of properly switching too/from this is currently un-implemented, so
- * whichever way is configured at startup is the one that will be used.
-*/
-
-/* Hote on 2410 error handling
- *
- * The s3c2410 manual has a love/hate affair with the contents of the
- * UERSTAT register in the UART blocks, and keeps marking some of the
- * error bits as reserved. Having checked with the s3c2410x01,
- * it copes with BREAKs properly, so I am happy to ignore the RESERVED
- * feature from the latter versions of the manual.
- *
- * If it becomes aparrent that latter versions of the 2410 remove these
- * bits, then action will have to be taken to differentiate the versions
- * and change the policy on BREAK
- *
- * BJD, 04-Nov-2004
+ * 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.
 */
 
-
-#if defined(CONFIG_SERIAL_S3C2410_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
 #include <linux/module.h>
 #include <linux/ioport.h>
+#include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
-#include <linux/sysrq.h>
-#include <linux/console.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
-#include <linux/delay.h>
-#include <linux/clk.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
-
 #include <asm/hardware.h>
 
 #include <asm/plat-s3c/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 
-/* structures */
-
-struct s3c24xx_uart_info {
-        char                    *name;
-        unsigned int            type;
-        unsigned int            fifosize;
-        unsigned long           rx_fifomask;
-        unsigned long           rx_fifoshift;
-        unsigned long           rx_fifofull;
-        unsigned long           tx_fifomask;
-        unsigned long           tx_fifoshift;
-        unsigned long           tx_fifofull;
-
-        /* clock source control */
-
-        int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
-        int (*set_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
-
-        /* uart controls */
-        int (*reset_port)(struct uart_port *, struct s3c2410_uartcfg *);
-};
-
-struct s3c24xx_uart_port {
-        unsigned char                   rx_claimed;
-        unsigned char                   tx_claimed;
-
-        struct s3c24xx_uart_info        *info;
-        struct s3c24xx_uart_clksrc      *clksrc;
-        struct clk                      *clk;
-        struct clk                      *baudclk;
-        struct uart_port                port;
-};
-
-
-/* configuration defines */
-
-#if 0
-#if 1
-/* send debug to the low-level output routines */
-
-extern void printascii(const char *);
-
-static void
-s3c24xx_serial_dbg(const char *fmt, ...)
-{
-        va_list va;
-        char buff[256];
-
-        va_start(va, fmt);
-        vsprintf(buff, fmt, va);
-        va_end(va);
-
-        printascii(buff);
-}
-
-#define dbg(x...) s3c24xx_serial_dbg(x)
-
-#else
-#define dbg(x...) printk(KERN_DEBUG "s3c24xx: ");
-#endif
-#else /* no debug */
-#define dbg(x...) do {} while(0)
-#endif
-
-/* UART name and device definitions */
-
-#define S3C24XX_SERIAL_NAME     "ttySAC"
-#define S3C24XX_SERIAL_MAJOR    204
-#define S3C24XX_SERIAL_MINOR    64
-
-
-/* conversion functions */
-
-#define s3c24xx_dev_to_port(__dev) (struct uart_port *)dev_get_drvdata(__dev)
-#define s3c24xx_dev_to_cfg(__dev) (struct s3c2410_uartcfg *)((__dev)->platform_data)
-
-/* we can support 3 uarts, but not always use them */
-
-#ifdef CONFIG_CPU_S3C2400
-#define NR_PORTS (2)
-#else
-#define NR_PORTS (3)
-#endif
-
-/* port irq numbers */
-
-#define TX_IRQ(port) ((port)->irq + 1)
-#define RX_IRQ(port) ((port)->irq)
-
-/* register access controls */
-
-#define portaddr(port, reg) ((port)->membase + (reg))
-
-#define rd_regb(port, reg) (__raw_readb(portaddr(port, reg)))
-#define rd_regl(port, reg) (__raw_readl(portaddr(port, reg)))
-
-#define wr_regb(port, reg, val) \
-  do { __raw_writeb(val, portaddr(port, reg)); } while(0)
-
-#define wr_regl(port, reg, val) \
-  do { __raw_writel(val, portaddr(port, reg)); } while(0)
-
-/* macros to change one thing to another */
-
-#define tx_enabled(port) ((port)->unused[0])
-#define rx_enabled(port) ((port)->unused[1])
-
-/* flag to ignore all characters comming in */
-#define RXSTAT_DUMMY_READ (0x10000000)
-
-static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port)
-{
-        return container_of(port, struct s3c24xx_uart_port, port);
-}
-
-/* translate a port to the device name */
-
-static inline const char *s3c24xx_serial_portname(struct uart_port *port)
-{
-        return to_platform_device(port->dev)->name;
-}
-
-static int s3c24xx_serial_txempty_nofifo(struct uart_port *port)
-{
-        return (rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE);
-}
-
-static void s3c24xx_serial_rx_enable(struct uart_port *port)
-{
-        unsigned long flags;
-        unsigned int ucon, ufcon;
-        int count = 10000;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        while (--count && !s3c24xx_serial_txempty_nofifo(port))
-                udelay(100);
-
-        ufcon = rd_regl(port, S3C2410_UFCON);
-        ufcon |= S3C2410_UFCON_RESETRX;
-        wr_regl(port, S3C2410_UFCON, ufcon);
-
-        ucon = rd_regl(port, S3C2410_UCON);
-        ucon |= S3C2410_UCON_RXIRQMODE;
-        wr_regl(port, S3C2410_UCON, ucon);
-
-        rx_enabled(port) = 1;
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static void s3c24xx_serial_rx_disable(struct uart_port *port)
-{
-        unsigned long flags;
-        unsigned int ucon;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        ucon = rd_regl(port, S3C2410_UCON);
-        ucon &= ~S3C2410_UCON_RXIRQMODE;
-        wr_regl(port, S3C2410_UCON, ucon);
-
-        rx_enabled(port) = 0;
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static void s3c24xx_serial_stop_tx(struct uart_port *port)
-{
-        if (tx_enabled(port)) {
-                disable_irq(TX_IRQ(port));
-                tx_enabled(port) = 0;
-                if (port->flags & UPF_CONS_FLOW)
-                        s3c24xx_serial_rx_enable(port);
-        }
-}
-
-static void s3c24xx_serial_start_tx(struct uart_port *port)
-{
-        if (!tx_enabled(port)) {
-                if (port->flags & UPF_CONS_FLOW)
-                        s3c24xx_serial_rx_disable(port);
-
-                enable_irq(TX_IRQ(port));
-                tx_enabled(port) = 1;
-        }
-}
-
-
-static void s3c24xx_serial_stop_rx(struct uart_port *port)
-{
-        if (rx_enabled(port)) {
-                dbg("s3c24xx_serial_stop_rx: port=%p\n", port);
-                disable_irq(RX_IRQ(port));
-                rx_enabled(port) = 0;
-        }
-}
-
-static void s3c24xx_serial_enable_ms(struct uart_port *port)
-{
-}
-
-static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port)
-{
-        return to_ourport(port)->info;
-}
-
-static inline struct s3c2410_uartcfg *s3c24xx_port_to_cfg(struct uart_port *port)
-{
-        if (port->dev == NULL)
-                return NULL;
-
-        return (struct s3c2410_uartcfg *)port->dev->platform_data;
-}
-
-static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport,
-                                     unsigned long ufstat)
-{
-        struct s3c24xx_uart_info *info = ourport->info;
-
-        if (ufstat & info->rx_fifofull)
-                return info->fifosize;
-
-        return (ufstat & info->rx_fifomask) >> info->rx_fifoshift;
-}
-
-
-/* ? - where has parity gone?? */
-#define S3C2410_UERSTAT_PARITY (0x1000)
-
-static irqreturn_t
-s3c24xx_serial_rx_chars(int irq, void *dev_id)
-{
-        struct s3c24xx_uart_port *ourport = dev_id;
-        struct uart_port *port = &ourport->port;
-        struct tty_struct *tty = port->info->tty;
-        unsigned int ufcon, ch, flag, ufstat, uerstat;
-        int max_count = 64;
-
-        while (max_count-- > 0) {
-                ufcon = rd_regl(port, S3C2410_UFCON);
-                ufstat = rd_regl(port, S3C2410_UFSTAT);
-
-                if (s3c24xx_serial_rx_fifocnt(ourport, ufstat) == 0)
-                        break;
-
-                uerstat = rd_regl(port, S3C2410_UERSTAT);
-                ch = rd_regb(port, S3C2410_URXH);
-
-                if (port->flags & UPF_CONS_FLOW) {
-                        int txe = s3c24xx_serial_txempty_nofifo(port);
-
-                        if (rx_enabled(port)) {
-                                if (!txe) {
-                                        rx_enabled(port) = 0;
-                                        continue;
-                                }
-                        } else {
-                                if (txe) {
-                                        ufcon |= S3C2410_UFCON_RESETRX;
-                                        wr_regl(port, S3C2410_UFCON, ufcon);
-                                        rx_enabled(port) = 1;
-                                        goto out;
-                                }
-                                continue;
-                        }
-                }
-
-                /* insert the character into the buffer */
-
-                flag = TTY_NORMAL;
-                port->icount.rx++;
-
-                if (unlikely(uerstat & S3C2410_UERSTAT_ANY)) {
-                        dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n",
-                            ch, uerstat);
-
-                        /* check for break */
-                        if (uerstat & S3C2410_UERSTAT_BREAK) {
-                                dbg("break!\n");
-                                port->icount.brk++;
-                                if (uart_handle_break(port))
-                                    goto ignore_char;
-                        }
-
-                        if (uerstat & S3C2410_UERSTAT_FRAME)
-                                port->icount.frame++;
-                        if (uerstat & S3C2410_UERSTAT_OVERRUN)
-                                port->icount.overrun++;
-
-                        uerstat &= port->read_status_mask;
-
-                        if (uerstat & S3C2410_UERSTAT_BREAK)
-                                flag = TTY_BREAK;
-                        else if (uerstat & S3C2410_UERSTAT_PARITY)
-                                flag = TTY_PARITY;
-                        else if (uerstat & ( S3C2410_UERSTAT_FRAME | S3C2410_UERSTAT_OVERRUN))
-                                flag = TTY_FRAME;
-                }
-
-                if (uart_handle_sysrq_char(port, ch))
-                        goto ignore_char;
-
-                uart_insert_char(port, uerstat, S3C2410_UERSTAT_OVERRUN, ch, flag);
-
-        ignore_char:
-                continue;
-        }
-        tty_flip_buffer_push(tty);
-
- out:
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
-{
-        struct s3c24xx_uart_port *ourport = id;
-        struct uart_port *port = &ourport->port;
-        struct circ_buf *xmit = &port->info->xmit;
-        int count = 256;
-
-        if (port->x_char) {
-                wr_regb(port, S3C2410_UTXH, port->x_char);
-                port->icount.tx++;
-                port->x_char = 0;
-                goto out;
-        }
-
-        /* if there isnt anything more to transmit, or the uart is now
-         * stopped, disable the uart and exit
-        */
-
-        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                s3c24xx_serial_stop_tx(port);
-                goto out;
-        }
-
-        /* try and drain the buffer... */
-
-        while (!uart_circ_empty(xmit) && count-- > 0) {
-                if (rd_regl(port, S3C2410_UFSTAT) & ourport->info->tx_fifofull)
-                        break;
-
-                wr_regb(port, S3C2410_UTXH, xmit->buf[xmit->tail]);
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                port->icount.tx++;
-        }
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(port);
-
-        if (uart_circ_empty(xmit))
-                s3c24xx_serial_stop_tx(port);
-
- out:
-        return IRQ_HANDLED;
-}
-
-static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-        unsigned long ufstat = rd_regl(port, S3C2410_UFSTAT);
-        unsigned long ufcon = rd_regl(port, S3C2410_UFCON);
-
-        if (ufcon & S3C2410_UFCON_FIFOMODE) {
-                if ((ufstat & info->tx_fifomask) != 0 ||
-                    (ufstat & info->tx_fifofull))
-                        return 0;
-
-                return 1;
-        }
-
-        return s3c24xx_serial_txempty_nofifo(port);
-}
-
-/* no modem control lines */
-static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port)
-{
-        unsigned int umstat = rd_regb(port,S3C2410_UMSTAT);
-
-        if (umstat & S3C2410_UMSTAT_CTS)
-                return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
-        else
-                return TIOCM_CAR | TIOCM_DSR;
-}
-
-static void s3c24xx_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        /* todo - possibly remove AFC and do manual CTS */
-}
-
-static void s3c24xx_serial_break_ctl(struct uart_port *port, int break_state)
-{
-        unsigned long flags;
-        unsigned int ucon;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        ucon = rd_regl(port, S3C2410_UCON);
-
-        if (break_state)
-                ucon |= S3C2410_UCON_SBREAK;
-        else
-                ucon &= ~S3C2410_UCON_SBREAK;
-
-        wr_regl(port, S3C2410_UCON, ucon);
-
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static void s3c24xx_serial_shutdown(struct uart_port *port)
-{
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-
-        if (ourport->tx_claimed) {
-                free_irq(TX_IRQ(port), ourport);
-                tx_enabled(port) = 0;
-                ourport->tx_claimed = 0;
-        }
-
-        if (ourport->rx_claimed) {
-                free_irq(RX_IRQ(port), ourport);
-                ourport->rx_claimed = 0;
-                rx_enabled(port) = 0;
-        }
-}
-
-
-static int s3c24xx_serial_startup(struct uart_port *port)
-{
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-        int ret;
-
-        dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
-            port->mapbase, port->membase);
-
-        rx_enabled(port) = 1;
-
-        ret = request_irq(RX_IRQ(port),
-                          s3c24xx_serial_rx_chars, 0,
-                          s3c24xx_serial_portname(port), ourport);
-
-        if (ret != 0) {
-                printk(KERN_ERR "cannot get irq %d\n", RX_IRQ(port));
-                return ret;
-        }
-
-        ourport->rx_claimed = 1;
-
-        dbg("requesting tx irq...\n");
-
-        tx_enabled(port) = 1;
-
-        ret = request_irq(TX_IRQ(port),
-                          s3c24xx_serial_tx_chars, 0,
-                          s3c24xx_serial_portname(port), ourport);
-
-        if (ret) {
-                printk(KERN_ERR "cannot get irq %d\n", TX_IRQ(port));
-                goto err;
-        }
-
-        ourport->tx_claimed = 1;
-
-        dbg("s3c24xx_serial_startup ok\n");
-
-        /* the port reset code should have done the correct
-         * register setup for the port controls */
-
-        return ret;
-
- err:
-        s3c24xx_serial_shutdown(port);
-        return ret;
-}
-
-/* power power management control */
-
-static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
-                              unsigned int old)
-{
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-
-        switch (level) {
-        case 3:
-                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
-                        clk_disable(ourport->baudclk);
-
-                clk_disable(ourport->clk);
-                break;
-
-        case 0:
-                clk_enable(ourport->clk);
-
-                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
-                        clk_enable(ourport->baudclk);
-
-                break;
-        default:
-                printk(KERN_ERR "s3c24xx_serial: unknown pm %d\n", level);
-        }
-}
-
-/* baud rate calculation
- *
- * The UARTs on the S3C2410/S3C2440 can take their clocks from a number
- * of different sources, including the peripheral clock ("pclk") and an
- * external clock ("uclk"). The S3C2440 also adds the core clock ("fclk")
- * with a programmable extra divisor.
- *
- * The following code goes through the clock sources, and calculates the
- * baud clocks (and the resultant actual baud rates) and then tries to
- * pick the closest one and select that.
- *
-*/
-
-
-#define MAX_CLKS (8)
-
-static struct s3c24xx_uart_clksrc tmp_clksrc = {
-        .name           = "pclk",
-        .min_baud       = 0,
-        .max_baud       = 0,
-        .divisor        = 1,
-};
-
-static inline int
-s3c24xx_serial_getsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-
-        return (info->get_clksrc)(port, c);
-}
-
-static inline int
-s3c24xx_serial_setsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-
-        return (info->set_clksrc)(port, c);
-}
-
-struct baud_calc {
-        struct s3c24xx_uart_clksrc      *clksrc;
-        unsigned int                     calc;
-        unsigned int                     quot;
-        struct clk                      *src;
-};
-
-static int s3c24xx_serial_calcbaud(struct baud_calc *calc,
-                                   struct uart_port *port,
-                                   struct s3c24xx_uart_clksrc *clksrc,
-                                   unsigned int baud)
-{
-        unsigned long rate;
-
-        calc->src = clk_get(port->dev, clksrc->name);
-        if (calc->src == NULL || IS_ERR(calc->src))
-                return 0;
-
-        rate = clk_get_rate(calc->src);
-        rate /= clksrc->divisor;
-
-        calc->clksrc = clksrc;
-        calc->quot = (rate + (8 * baud)) / (16 * baud);
-        calc->calc = (rate / (calc->quot * 16));
-
-        calc->quot--;
-        return 1;
-}
-
-static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
-                                          struct s3c24xx_uart_clksrc **clksrc,
-                                          struct clk **clk,
-                                          unsigned int baud)
-{
-        struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
-        struct s3c24xx_uart_clksrc *clkp;
-        struct baud_calc res[MAX_CLKS];
-        struct baud_calc *resptr, *best, *sptr;
-        int i;
-
-        clkp = cfg->clocks;
-        best = NULL;
-
-        if (cfg->clocks_size < 2) {
-                if (cfg->clocks_size == 0)
-                        clkp = &tmp_clksrc;
-
-                /* check to see if we're sourcing fclk, and if so we're
-                 * going to have to update the clock source
-                 */
-
-                if (strcmp(clkp->name, "fclk") == 0) {
-                        struct s3c24xx_uart_clksrc src;
-
-                        s3c24xx_serial_getsource(port, &src);
-
-                        /* check that the port already using fclk, and if
-                         * not, then re-select fclk
-                         */
-
-                        if (strcmp(src.name, clkp->name) == 0) {
-                                s3c24xx_serial_setsource(port, clkp);
-                                s3c24xx_serial_getsource(port, &src);
-                        }
-
-                        clkp->divisor = src.divisor;
-                }
-
-                s3c24xx_serial_calcbaud(res, port, clkp, baud);
-                best = res;
-                resptr = best + 1;
-        } else {
-                resptr = res;
-
-                for (i = 0; i < cfg->clocks_size; i++, clkp++) {
-                        if (s3c24xx_serial_calcbaud(resptr, port, clkp, baud))
-                                resptr++;
-                }
-        }
-
-        /* ok, we now need to select the best clock we found */
-
-        if (!best) {
-                unsigned int deviation = (1<<30)|((1<<30)-1);
-                int calc_deviation;
-
-                for (sptr = res; sptr < resptr; sptr++) {
-                        printk(KERN_DEBUG
-                               "found clk %p (%s) quot %d, calc %d\n",
-                               sptr->clksrc, sptr->clksrc->name,
-                               sptr->quot, sptr->calc);
-
-                        calc_deviation = baud - sptr->calc;
-                        if (calc_deviation < 0)
-                                calc_deviation = -calc_deviation;
-
-                        if (calc_deviation < deviation) {
-                                best = sptr;
-                                deviation = calc_deviation;
-                        }
-                }
-
-                printk(KERN_DEBUG "best %p (deviation %d)\n", best, deviation);
-        }
-
-        printk(KERN_DEBUG "selected clock %p (%s) quot %d, calc %d\n",
-               best->clksrc, best->clksrc->name, best->quot, best->calc);
-
-        /* store results to pass back */
-
-        *clksrc = best->clksrc;
-        *clk    = best->src;
-
-        return best->quot;
-}
-
-static void s3c24xx_serial_set_termios(struct uart_port *port,
-                                       struct ktermios *termios,
-                                       struct ktermios *old)
-{
-        struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-        struct s3c24xx_uart_clksrc *clksrc = NULL;
-        struct clk *clk = NULL;
-        unsigned long flags;
-        unsigned int baud, quot;
-        unsigned int ulcon;
-        unsigned int umcon;
-
-        /*
-         * We don't support modem control lines.
-         */
-        termios->c_cflag &= ~(HUPCL | CMSPAR);
-        termios->c_cflag |= CLOCAL;
-
-        /*
-         * Ask the core to calculate the divisor for us.
-         */
-
-        baud = uart_get_baud_rate(port, termios, old, 0, 115200*8);
-
-        if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
-                quot = port->custom_divisor;
-        else
-                quot = s3c24xx_serial_getclk(port, &clksrc, &clk, baud);
-
-        /* check to see if we need  to change clock source */
-
-        if (ourport->clksrc != clksrc || ourport->baudclk != clk) {
-                s3c24xx_serial_setsource(port, clksrc);
-
-                if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
-                        clk_disable(ourport->baudclk);
-                        ourport->baudclk  = NULL;
-                }
-
-                clk_enable(clk);
-
-                ourport->clksrc = clksrc;
-                ourport->baudclk = clk;
-        }
-
-        switch (termios->c_cflag & CSIZE) {
-        case CS5:
-                dbg("config: 5bits/char\n");
-                ulcon = S3C2410_LCON_CS5;
-                break;
-        case CS6:
-                dbg("config: 6bits/char\n");
-                ulcon = S3C2410_LCON_CS6;
-                break;
-        case CS7:
-                dbg("config: 7bits/char\n");
-                ulcon = S3C2410_LCON_CS7;
-                break;
-        case CS8:
-        default:
-                dbg("config: 8bits/char\n");
-                ulcon = S3C2410_LCON_CS8;
-                break;
-        }
-
-        /* preserve original lcon IR settings */
-        ulcon |= (cfg->ulcon & S3C2410_LCON_IRM);
-
-        if (termios->c_cflag & CSTOPB)
-                ulcon |= S3C2410_LCON_STOPB;
-
-        umcon = (termios->c_cflag & CRTSCTS) ? S3C2410_UMCOM_AFC : 0;
-
-        if (termios->c_cflag & PARENB) {
-                if (termios->c_cflag & PARODD)
-                        ulcon |= S3C2410_LCON_PODD;
-                else
-                        ulcon |= S3C2410_LCON_PEVEN;
-        } else {
-                ulcon |= S3C2410_LCON_PNONE;
-        }
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        dbg("setting ulcon to %08x, brddiv to %d\n", ulcon, quot);
-
-        wr_regl(port, S3C2410_ULCON, ulcon);
-        wr_regl(port, S3C2410_UBRDIV, quot);
-        wr_regl(port, S3C2410_UMCON, umcon);
-
-        dbg("uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n",
-            rd_regl(port, S3C2410_ULCON),
-            rd_regl(port, S3C2410_UCON),
-            rd_regl(port, S3C2410_UFCON));
-
-        /*
-         * Update the per-port timeout.
-         */
-        uart_update_timeout(port, termios->c_cflag, baud);
-
-        /*
-         * Which character status flags are we interested in?
-         */
-        port->read_status_mask = S3C2410_UERSTAT_OVERRUN;
-        if (termios->c_iflag & INPCK)
-                port->read_status_mask |= S3C2410_UERSTAT_FRAME | S3C2410_UERSTAT_PARITY;
-
-        /*
-         * Which character status flags should we ignore?
-         */
-        port->ignore_status_mask = 0;
-        if (termios->c_iflag & IGNPAR)
-                port->ignore_status_mask |= S3C2410_UERSTAT_OVERRUN;
-        if (termios->c_iflag & IGNBRK && termios->c_iflag & IGNPAR)
-                port->ignore_status_mask |= S3C2410_UERSTAT_FRAME;
-
-        /*
-         * Ignore all characters if CREAD is not set.
-         */
-        if ((termios->c_cflag & CREAD) == 0)
-                port->ignore_status_mask |= RXSTAT_DUMMY_READ;
-
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static const char *s3c24xx_serial_type(struct uart_port *port)
-{
-        switch (port->type) {
-        case PORT_S3C2410:
-                return "S3C2410";
-        case PORT_S3C2440:
-                return "S3C2440";
-        case PORT_S3C2412:
-                return "S3C2412";
-        default:
-                return NULL;
-        }
-}
-
-#define MAP_SIZE (0x100)
-
-static void s3c24xx_serial_release_port(struct uart_port *port)
-{
-        release_mem_region(port->mapbase, MAP_SIZE);
-}
-
-static int s3c24xx_serial_request_port(struct uart_port *port)
-{
-        const char *name = s3c24xx_serial_portname(port);
-        return request_mem_region(port->mapbase, MAP_SIZE, name) ? 0 : -EBUSY;
-}
-
-static void s3c24xx_serial_config_port(struct uart_port *port, int flags)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-
-        if (flags & UART_CONFIG_TYPE &&
-            s3c24xx_serial_request_port(port) == 0)
-                port->type = info->type;
-}
-
-/*
- * verify the new serial_struct (for TIOCSSERIAL).
- */
-static int
-s3c24xx_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-
-        if (ser->type != PORT_UNKNOWN && ser->type != info->type)
-                return -EINVAL;
-
-        return 0;
-}
-
-
-#ifdef CONFIG_SERIAL_S3C2410_CONSOLE
-
-static struct console s3c24xx_serial_console;
-
-#define S3C24XX_SERIAL_CONSOLE &s3c24xx_serial_console
-#else
-#define S3C24XX_SERIAL_CONSOLE NULL
-#endif
-
-static struct uart_ops s3c24xx_serial_ops = {
-        .pm             = s3c24xx_serial_pm,
-        .tx_empty       = s3c24xx_serial_tx_empty,
-        .get_mctrl      = s3c24xx_serial_get_mctrl,
-        .set_mctrl      = s3c24xx_serial_set_mctrl,
-        .stop_tx        = s3c24xx_serial_stop_tx,
-        .start_tx       = s3c24xx_serial_start_tx,
-        .stop_rx        = s3c24xx_serial_stop_rx,
-        .enable_ms      = s3c24xx_serial_enable_ms,
-        .break_ctl      = s3c24xx_serial_break_ctl,
-        .startup        = s3c24xx_serial_startup,
-        .shutdown       = s3c24xx_serial_shutdown,
-        .set_termios    = s3c24xx_serial_set_termios,
-        .type           = s3c24xx_serial_type,
-        .release_port   = s3c24xx_serial_release_port,
-        .request_port   = s3c24xx_serial_request_port,
-        .config_port    = s3c24xx_serial_config_port,
-        .verify_port    = s3c24xx_serial_verify_port,
-};
-
-
-static struct uart_driver s3c24xx_uart_drv = {
-        .owner          = THIS_MODULE,
-        .dev_name       = "s3c2410_serial",
-        .nr             = 3,
-        .cons           = S3C24XX_SERIAL_CONSOLE,
-        .driver_name    = S3C24XX_SERIAL_NAME,
-        .major          = S3C24XX_SERIAL_MAJOR,
-        .minor          = S3C24XX_SERIAL_MINOR,
-};
-
-static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
-        [0] = {
-                .port = {
-                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[0].port.lock),
-                        .iotype         = UPIO_MEM,
-                        .irq            = IRQ_S3CUART_RX0,
-                        .uartclk        = 0,
-                        .fifosize       = 16,
-                        .ops            = &s3c24xx_serial_ops,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 0,
-                }
-        },
-        [1] = {
-                .port = {
-                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[1].port.lock),
-                        .iotype         = UPIO_MEM,
-                        .irq            = IRQ_S3CUART_RX1,
-                        .uartclk        = 0,
-                        .fifosize       = 16,
-                        .ops            = &s3c24xx_serial_ops,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 1,
-                }
-        },
-#if NR_PORTS > 2
-
-        [2] = {
-                .port = {
-                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[2].port.lock),
-                        .iotype         = UPIO_MEM,
-                        .irq            = IRQ_S3CUART_RX2,
-                        .uartclk        = 0,
-                        .fifosize       = 16,
-                        .ops            = &s3c24xx_serial_ops,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 2,
-                }
-        }
-#endif
-};
-
-/* s3c24xx_serial_resetport
- *
- * wrapper to call the specific reset for this port (reset the fifos
- * and the settings)
-*/
-
-static inline int s3c24xx_serial_resetport(struct uart_port * port,
-                                           struct s3c2410_uartcfg *cfg)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-
-        return (info->reset_port)(port, cfg);
-}
-
-/* s3c24xx_serial_init_port
- *
- * initialise a single serial port from the platform device given
- */
-
-static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
-                                    struct s3c24xx_uart_info *info,
-                                    struct platform_device *platdev)
-{
-        struct uart_port *port = &ourport->port;
-        struct s3c2410_uartcfg *cfg;
-        struct resource *res;
-        int ret;
-
-        dbg("s3c24xx_serial_init_port: port=%p, platdev=%p\n", port, platdev);
-
-        if (platdev == NULL)
-                return -ENODEV;
-
-        cfg = s3c24xx_dev_to_cfg(&platdev->dev);
-
-        if (port->mapbase != 0)
-                return 0;
-
-        if (cfg->hwport > 3)
-                return -EINVAL;
-
-        /* setup info for port */
-        port->dev       = &platdev->dev;
-        ourport->info   = info;
-
-        /* copy the info in from provided structure */
-        ourport->port.fifosize = info->fifosize;
-
-        dbg("s3c24xx_serial_init_port: %p (hw %d)...\n", port, cfg->hwport);
-
-        port->uartclk = 1;
-
-        if (cfg->uart_flags & UPF_CONS_FLOW) {
-                dbg("s3c24xx_serial_init_port: enabling flow control\n");
-                port->flags |= UPF_CONS_FLOW;
-        }
-
-        /* sort our the physical and virtual addresses for each UART */
-
-        res = platform_get_resource(platdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
-                printk(KERN_ERR "failed to find memory resource for uart\n");
-                return -EINVAL;
-        }
-
-        dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
-
-        port->mapbase   = res->start;
-        port->membase   = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
-        ret = platform_get_irq(platdev, 0);
-        if (ret < 0)
-                port->irq = 0;
-        else
-                port->irq = ret;
-
-        ourport->clk    = clk_get(&platdev->dev, "uart");
-
-        dbg("port: map=%08x, mem=%08x, irq=%d, clock=%ld\n",
-            port->mapbase, port->membase, port->irq, port->uartclk);
-
-        /* reset the fifos (and setup the uart) */
-        s3c24xx_serial_resetport(port, cfg);
-        return 0;
-}
-
-/* Device driver serial port probe */
-
-static int probe_index = 0;
-
-static int s3c24xx_serial_probe(struct platform_device *dev,
-                                struct s3c24xx_uart_info *info)
-{
-        struct s3c24xx_uart_port *ourport;
-        int ret;
-
-        dbg("s3c24xx_serial_probe(%p, %p) %d\n", dev, info, probe_index);
-
-        ourport = &s3c24xx_serial_ports[probe_index];
-        probe_index++;
-
-        dbg("%s: initialising port %p...\n", __func__, ourport);
-
-        ret = s3c24xx_serial_init_port(ourport, info, dev);
-        if (ret < 0)
-                goto probe_err;
-
-        dbg("%s: adding port\n", __func__);
-        uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
-        platform_set_drvdata(dev, &ourport->port);
-
-        return 0;
-
- probe_err:
-        return ret;
-}
-
-static int s3c24xx_serial_remove(struct platform_device *dev)
-{
-        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
-
-        if (port)
-                uart_remove_one_port(&s3c24xx_uart_drv, port);
-
-        return 0;
-}
-
-/* UART power management code */
-
-#ifdef CONFIG_PM
-
-static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t state)
-{
-        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
-
-        if (port)
-                uart_suspend_port(&s3c24xx_uart_drv, port);
-
-        return 0;
-}
-
-static int s3c24xx_serial_resume(struct platform_device *dev)
-{
-        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-
-        if (port) {
-                clk_enable(ourport->clk);
-                s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
-                clk_disable(ourport->clk);
-
-                uart_resume_port(&s3c24xx_uart_drv, port);
-        }
-
-        return 0;
-}
-
-#else
-#define s3c24xx_serial_suspend NULL
-#define s3c24xx_serial_resume  NULL
-#endif
-
-static int s3c24xx_serial_init(struct platform_driver *drv,
-                               struct s3c24xx_uart_info *info)
-{
-        dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-        return platform_driver_register(drv);
-}
-
-
-/* now comes the code to initialise either the s3c2410 or s3c2440 serial
- * port information
-*/
-
-/* cpu specific variations on the serial port support */
-
-#ifdef CONFIG_CPU_S3C2400
-
-static int s3c2400_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        clk->divisor = 1;
-        clk->name = "pclk";
-
-        return 0;
-}
-
-static int s3c2400_serial_setsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        return 0;
-}
-
-static int s3c2400_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        dbg("s3c2400_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-
-        wr_regl(port, S3C2410_UCON,  cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c2400_uart_inf = {
-        .name           = "Samsung S3C2400 UART",
-        .type           = PORT_S3C2400,
-        .fifosize       = 16,
-        .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2400_serial_getsource,
-        .set_clksrc     = s3c2400_serial_setsource,
-        .reset_port     = s3c2400_serial_resetport,
-};
-
-static int s3c2400_serial_probe(struct platform_device *dev)
-{
-        return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
-}
-
-static struct platform_driver s3c2400_serial_drv = {
-        .probe          = s3c2400_serial_probe,
-        .remove         = s3c24xx_serial_remove,
-        .suspend        = s3c24xx_serial_suspend,
-        .resume         = s3c24xx_serial_resume,
-        .driver         = {
-                .name   = "s3c2400-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static inline int s3c2400_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2400_serial_drv, &s3c2400_uart_inf);
-}
-
-static inline void s3c2400_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2400_serial_drv);
-}
-
-#define s3c2400_uart_inf_at &s3c2400_uart_inf
-#else
-
-static inline int s3c2400_serial_init(void)
-{
-        return 0;
-}
-
-static inline void s3c2400_serial_exit(void)
-{
-}
-
-#define s3c2400_uart_inf_at NULL
-
-#endif /* CONFIG_CPU_S3C2400 */
-
-/* S3C2410 support */
-
-#ifdef CONFIG_CPU_S3C2410
+#include "samsung.h"
 
 static int s3c2410_serial_setsource(struct uart_port *port,
                                     struct s3c24xx_uart_clksrc *clk)
@@ -1323,8 +83,6 @@ static struct s3c24xx_uart_info s3c2410_uart_inf = {
         .reset_port     = s3c2410_serial_resetport,
 };
 
-/* device management */
-
 static int s3c2410_serial_probe(struct platform_device *dev)
 {
         return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);
@@ -1333,612 +91,28 @@ static int s3c2410_serial_probe(struct platform_device *dev)
 static struct platform_driver s3c2410_serial_drv = {
         .probe          = s3c2410_serial_probe,
         .remove         = s3c24xx_serial_remove,
-        .suspend        = s3c24xx_serial_suspend,
-        .resume         = s3c24xx_serial_resume,
         .driver         = {
                 .name   = "s3c2410-uart",
                 .owner  = THIS_MODULE,
         },
 };
 
-static inline int s3c2410_serial_init(void)
+s3c24xx_console_init(&s3c2410_serial_drv, &s3c2410_uart_inf);
+
+static int __init s3c2410_serial_init(void)
 {
         return s3c24xx_serial_init(&s3c2410_serial_drv, &s3c2410_uart_inf);
 }
 
-static inline void s3c2410_serial_exit(void)
+static void __exit s3c2410_serial_exit(void)
 {
         platform_driver_unregister(&s3c2410_serial_drv);
 }
 
-#define s3c2410_uart_inf_at &s3c2410_uart_inf
-#else
-
-static inline int s3c2410_serial_init(void)
-{
-        return 0;
-}
-
-static inline void s3c2410_serial_exit(void)
-{
-}
-
-#define s3c2410_uart_inf_at NULL
-
-#endif /* CONFIG_CPU_S3C2410 */
-
-#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
-
-static int s3c2440_serial_setsource(struct uart_port *port,
-                                     struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        // todo - proper fclk<>nonfclk switch //
-
-        ucon &= ~S3C2440_UCON_CLKMASK;
-
-        if (strcmp(clk->name, "uclk") == 0)
-                ucon |= S3C2440_UCON_UCLK;
-        else if (strcmp(clk->name, "pclk") == 0)
-                ucon |= S3C2440_UCON_PCLK;
-        else if (strcmp(clk->name, "fclk") == 0)
-                ucon |= S3C2440_UCON_FCLK;
-        else {
-                printk(KERN_ERR "unknown clock source %s\n", clk->name);
-                return -EINVAL;
-        }
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-
-static int s3c2440_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-        unsigned long ucon0, ucon1, ucon2;
-
-        switch (ucon & S3C2440_UCON_CLKMASK) {
-        case S3C2440_UCON_UCLK:
-                clk->divisor = 1;
-                clk->name = "uclk";
-                break;
-
-        case S3C2440_UCON_PCLK:
-        case S3C2440_UCON_PCLK2:
-                clk->divisor = 1;
-                clk->name = "pclk";
-                break;
-
-        case S3C2440_UCON_FCLK:
-                /* the fun of calculating the uart divisors on
-                 * the s3c2440 */
-
-                ucon0 = __raw_readl(S3C24XX_VA_UART0 + S3C2410_UCON);
-                ucon1 = __raw_readl(S3C24XX_VA_UART1 + S3C2410_UCON);
-                ucon2 = __raw_readl(S3C24XX_VA_UART2 + S3C2410_UCON);
-
-                printk("ucons: %08lx, %08lx, %08lx\n", ucon0, ucon1, ucon2);
-
-                ucon0 &= S3C2440_UCON0_DIVMASK;
-                ucon1 &= S3C2440_UCON1_DIVMASK;
-                ucon2 &= S3C2440_UCON2_DIVMASK;
-
-                if (ucon0 != 0) {
-                        clk->divisor = ucon0 >> S3C2440_UCON_DIVSHIFT;
-                        clk->divisor += 6;
-                } else if (ucon1 != 0) {
-                        clk->divisor = ucon1 >> S3C2440_UCON_DIVSHIFT;
-                        clk->divisor += 21;
-                } else if (ucon2 != 0) {
-                        clk->divisor = ucon2 >> S3C2440_UCON_DIVSHIFT;
-                        clk->divisor += 36;
-                } else {
-                        /* manual calims 44, seems to be 9 */
-                        clk->divisor = 9;
-                }
-
-                clk->name = "fclk";
-                break;
-        }
-
-        return 0;
-}
-
-static int s3c2440_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        dbg("s3c2440_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-
-        /* ensure we don't change the clock settings... */
-
-        ucon &= (S3C2440_UCON0_DIVMASK | (3<<10));
-
-        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c2440_uart_inf = {
-        .name           = "Samsung S3C2440 UART",
-        .type           = PORT_S3C2440,
-        .fifosize       = 64,
-        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2440_serial_getsource,
-        .set_clksrc     = s3c2440_serial_setsource,
-        .reset_port     = s3c2440_serial_resetport,
-};
-
-/* device management */
-
-static int s3c2440_serial_probe(struct platform_device *dev)
-{
-        dbg("s3c2440_serial_probe: dev=%p\n", dev);
-        return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
-}
-
-static struct platform_driver s3c2440_serial_drv = {
-        .probe          = s3c2440_serial_probe,
-        .remove         = s3c24xx_serial_remove,
-        .suspend        = s3c24xx_serial_suspend,
-        .resume         = s3c24xx_serial_resume,
-        .driver         = {
-                .name   = "s3c2440-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-
-static inline int s3c2440_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2440_serial_drv, &s3c2440_uart_inf);
-}
-
-static inline void s3c2440_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2440_serial_drv);
-}
-
-#define s3c2440_uart_inf_at &s3c2440_uart_inf
-#else
-
-static inline int s3c2440_serial_init(void)
-{
-        return 0;
-}
-
-static inline void s3c2440_serial_exit(void)
-{
-}
-
-#define s3c2440_uart_inf_at NULL
-#endif /* CONFIG_CPU_S3C2440 */
-
-#if defined(CONFIG_CPU_S3C2412)
-
-static int s3c2412_serial_setsource(struct uart_port *port,
-                                     struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        ucon &= ~S3C2412_UCON_CLKMASK;
-
-        if (strcmp(clk->name, "uclk") == 0)
-                ucon |= S3C2440_UCON_UCLK;
-        else if (strcmp(clk->name, "pclk") == 0)
-                ucon |= S3C2440_UCON_PCLK;
-        else if (strcmp(clk->name, "usysclk") == 0)
-                ucon |= S3C2412_UCON_USYSCLK;
-        else {
-                printk(KERN_ERR "unknown clock source %s\n", clk->name);
-                return -EINVAL;
-        }
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-
-static int s3c2412_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        switch (ucon & S3C2412_UCON_CLKMASK) {
-        case S3C2412_UCON_UCLK:
-                clk->divisor = 1;
-                clk->name = "uclk";
-                break;
-
-        case S3C2412_UCON_PCLK:
-        case S3C2412_UCON_PCLK2:
-                clk->divisor = 1;
-                clk->name = "pclk";
-                break;
-
-        case S3C2412_UCON_USYSCLK:
-                clk->divisor = 1;
-                clk->name = "usysclk";
-                break;
-        }
-
-        return 0;
-}
-
-static int s3c2412_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        dbg("%s: port=%p (%08lx), cfg=%p\n",
-            __func__, port, port->mapbase, cfg);
-
-        /* ensure we don't change the clock settings... */
-
-        ucon &= S3C2412_UCON_CLKMASK;
-
-        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c2412_uart_inf = {
-        .name           = "Samsung S3C2412 UART",
-        .type           = PORT_S3C2412,
-        .fifosize       = 64,
-        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2412_serial_getsource,
-        .set_clksrc     = s3c2412_serial_setsource,
-        .reset_port     = s3c2412_serial_resetport,
-};
-
-/* device management */
-
-static int s3c2412_serial_probe(struct platform_device *dev)
-{
-        dbg("s3c2440_serial_probe: dev=%p\n", dev);
-        return s3c24xx_serial_probe(dev, &s3c2412_uart_inf);
-}
-
-static struct platform_driver s3c2412_serial_drv = {
-        .probe          = s3c2412_serial_probe,
-        .remove         = s3c24xx_serial_remove,
-        .suspend        = s3c24xx_serial_suspend,
-        .resume         = s3c24xx_serial_resume,
-        .driver         = {
-                .name   = "s3c2412-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-
-static inline int s3c2412_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2412_serial_drv, &s3c2412_uart_inf);
-}
-
-static inline void s3c2412_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2412_serial_drv);
-}
-
-#define s3c2412_uart_inf_at &s3c2412_uart_inf
-#else
-
-static inline int s3c2412_serial_init(void)
-{
-        return 0;
-}
-
-static inline void s3c2412_serial_exit(void)
-{
-}
-
-#define s3c2412_uart_inf_at NULL
-#endif /* CONFIG_CPU_S3C2440 */
-
-
-/* module initialisation code */
-
-static int __init s3c24xx_serial_modinit(void)
-{
-        int ret;
-
-        ret = uart_register_driver(&s3c24xx_uart_drv);
-        if (ret < 0) {
-                printk(KERN_ERR "failed to register UART driver\n");
-                return -1;
-        }
-
-        s3c2400_serial_init();
-        s3c2410_serial_init();
-        s3c2412_serial_init();
-        s3c2440_serial_init();
-
-        return 0;
-}
-
-static void __exit s3c24xx_serial_modexit(void)
-{
-        s3c2400_serial_exit();
-        s3c2410_serial_exit();
-        s3c2412_serial_exit();
-        s3c2440_serial_exit();
-
-        uart_unregister_driver(&s3c24xx_uart_drv);
-}
-
-
-module_init(s3c24xx_serial_modinit);
-module_exit(s3c24xx_serial_modexit);
-
-/* Console code */
-
-#ifdef CONFIG_SERIAL_S3C2410_CONSOLE
-
-static struct uart_port *cons_uart;
-
-static int
-s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-        unsigned long ufstat, utrstat;
-
-        if (ufcon & S3C2410_UFCON_FIFOMODE) {
-                /* fifo mode - check ammount of data in fifo registers... */
-
-                ufstat = rd_regl(port, S3C2410_UFSTAT);
-                return (ufstat & info->tx_fifofull) ? 0 : 1;
-        }
-
-        /* in non-fifo mode, we go and use the tx buffer empty */
-
-        utrstat = rd_regl(port, S3C2410_UTRSTAT);
-        return (utrstat & S3C2410_UTRSTAT_TXE) ? 1 : 0;
-}
-
-static void
-s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
-{
-        unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-        while (!s3c24xx_serial_console_txrdy(port, ufcon))
-                barrier();
-        wr_regb(cons_uart, S3C2410_UTXH, ch);
-}
-
-static void
-s3c24xx_serial_console_write(struct console *co, const char *s,
-                             unsigned int count)
-{
-        uart_console_write(cons_uart, s, count, s3c24xx_serial_console_putchar);
-}
-
-static void __init
-s3c24xx_serial_get_options(struct uart_port *port, int *baud,
-                           int *parity, int *bits)
-{
-        struct s3c24xx_uart_clksrc clksrc;
-        struct clk *clk;
-        unsigned int ulcon;
-        unsigned int ucon;
-        unsigned int ubrdiv;
-        unsigned long rate;
-
-        ulcon  = rd_regl(port, S3C2410_ULCON);
-        ucon   = rd_regl(port, S3C2410_UCON);
-        ubrdiv = rd_regl(port, S3C2410_UBRDIV);
-
-        dbg("s3c24xx_serial_get_options: port=%p\n"
-            "registers: ulcon=%08x, ucon=%08x, ubdriv=%08x\n",
-            port, ulcon, ucon, ubrdiv);
-
-        if ((ucon & 0xf) != 0) {
-                /* consider the serial port configured if the tx/rx mode set */
-
-                switch (ulcon & S3C2410_LCON_CSMASK) {
-                case S3C2410_LCON_CS5:
-                        *bits = 5;
-                        break;
-                case S3C2410_LCON_CS6:
-                        *bits = 6;
-                        break;
-                case S3C2410_LCON_CS7:
-                        *bits = 7;
-                        break;
-                default:
-                case S3C2410_LCON_CS8:
-                        *bits = 8;
-                        break;
-                }
-
-                switch (ulcon & S3C2410_LCON_PMASK) {
-                case S3C2410_LCON_PEVEN:
-                        *parity = 'e';
-                        break;
-
-                case S3C2410_LCON_PODD:
-                        *parity = 'o';
-                        break;
-
-                case S3C2410_LCON_PNONE:
-                default:
-                        *parity = 'n';
-                }
-
-                /* now calculate the baud rate */
-
-                s3c24xx_serial_getsource(port, &clksrc);
-
-                clk = clk_get(port->dev, clksrc.name);
-                if (!IS_ERR(clk) && clk != NULL)
-                        rate = clk_get_rate(clk) / clksrc.divisor;
-                else
-                        rate = 1;
-
-
-                *baud = rate / ( 16 * (ubrdiv + 1));
-                dbg("calculated baud %d\n", *baud);
-        }
-
-}
-
-/* s3c24xx_serial_init_ports
- *
- * initialise the serial ports from the machine provided initialisation
- * data.
-*/
-
-static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
-{
-        struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports;
-        struct platform_device **platdev_ptr;
-        int i;
-
-        dbg("s3c24xx_serial_init_ports: initialising ports...\n");
-
-        platdev_ptr = s3c24xx_uart_devs;
-
-        for (i = 0; i < NR_PORTS; i++, ptr++, platdev_ptr++) {
-                s3c24xx_serial_init_port(ptr, info, *platdev_ptr);
-        }
-
-        return 0;
-}
-
-static int __init
-s3c24xx_serial_console_setup(struct console *co, char *options)
-{
-        struct uart_port *port;
-        int baud = 9600;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-
-        dbg("s3c24xx_serial_console_setup: co=%p (%d), %s\n",
-            co, co->index, options);
-
-        /* is this a valid port */
-
-        if (co->index == -1 || co->index >= NR_PORTS)
-                co->index = 0;
-
-        port = &s3c24xx_serial_ports[co->index].port;
-
-        /* is the port configured? */
-
-        if (port->mapbase == 0x0) {
-                co->index = 0;
-                port = &s3c24xx_serial_ports[co->index].port;
-        }
-
-        cons_uart = port;
-
-        dbg("s3c24xx_serial_console_setup: port=%p (%d)\n", port, co->index);
-
-        /*
-         * Check whether an invalid uart number has been specified, and
-         * if so, search for the first available port that does have
-         * console support.
-         */
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-        else
-                s3c24xx_serial_get_options(port, &baud, &parity, &bits);
-
-        dbg("s3c24xx_serial_console_setup: baud %d\n", baud);
-
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-/* s3c24xx_serial_initconsole
- *
- * initialise the console from one of the uart drivers
-*/
-
-static struct console s3c24xx_serial_console =
-{
-        .name           = S3C24XX_SERIAL_NAME,
-        .device         = uart_console_device,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-        .write          = s3c24xx_serial_console_write,
-        .setup          = s3c24xx_serial_console_setup
-};
-
-static int s3c24xx_serial_initconsole(void)
-{
-        struct s3c24xx_uart_info *info;
-        struct platform_device *dev = s3c24xx_uart_devs[0];
-
-        dbg("s3c24xx_serial_initconsole\n");
-
-        /* select driver based on the cpu */
-
-        if (dev == NULL) {
-                printk(KERN_ERR "s3c24xx: no devices for console init\n");
-                return 0;
-        }
-
-        if (strcmp(dev->name, "s3c2400-uart") == 0) {
-                info = s3c2400_uart_inf_at;
-        } else if (strcmp(dev->name, "s3c2410-uart") == 0) {
-                info = s3c2410_uart_inf_at;
-        } else if (strcmp(dev->name, "s3c2440-uart") == 0) {
-                info = s3c2440_uart_inf_at;
-        } else if (strcmp(dev->name, "s3c2412-uart") == 0) {
-                info = s3c2412_uart_inf_at;
-        } else {
-                printk(KERN_ERR "s3c24xx: no driver for %s\n", dev->name);
-                return 0;
-        }
-
-        if (info == NULL) {
-                printk(KERN_ERR "s3c24xx: no driver for console\n");
-                return 0;
-        }
-
-        s3c24xx_serial_console.data = &s3c24xx_uart_drv;
-        s3c24xx_serial_init_ports(info);
-
-        register_console(&s3c24xx_serial_console);
-        return 0;
-}
-
-console_initcall(s3c24xx_serial_initconsole);
-
-#endif /* CONFIG_SERIAL_S3C2410_CONSOLE */
+module_init(s3c2410_serial_init);
+module_exit(s3c2410_serial_exit);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_DESCRIPTION("Samsung S3C2410/S3C2440/S3C2412 Serial port driver");
-MODULE_ALIAS("platform:s3c2400-uart");
+MODULE_DESCRIPTION("Samsung S3C2410 SoC Serial port driver");
 MODULE_ALIAS("platform:s3c2410-uart");
-MODULE_ALIAS("platform:s3c2412-uart");
-MODULE_ALIAS("platform:s3c2440-uart");
diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c
new file mode 100644
index 000000000000..ce0c220e3e92
--- /dev/null
+++ b/drivers/serial/s3c2412.c
@@ -0,0 +1,151 @@
+/* linux/drivers/serial/s3c2412.c
+ *
+ * Driver for Samsung S3C2412 and S3C2413 SoC onboard UARTs.
+ *
+ * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *
+ * 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/module.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/irq.h>
+#include <asm/hardware.h>
+
+#include <asm/plat-s3c/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+
+#include "samsung.h"
+
+static int s3c2412_serial_setsource(struct uart_port *port,
+                                     struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        ucon &= ~S3C2412_UCON_CLKMASK;
+
+        if (strcmp(clk->name, "uclk") == 0)
+                ucon |= S3C2440_UCON_UCLK;
+        else if (strcmp(clk->name, "pclk") == 0)
+                ucon |= S3C2440_UCON_PCLK;
+        else if (strcmp(clk->name, "usysclk") == 0)
+                ucon |= S3C2412_UCON_USYSCLK;
+        else {
+                printk(KERN_ERR "unknown clock source %s\n", clk->name);
+                return -EINVAL;
+        }
+
+        wr_regl(port, S3C2410_UCON, ucon);
+        return 0;
+}
+
+
+static int s3c2412_serial_getsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        switch (ucon & S3C2412_UCON_CLKMASK) {
+        case S3C2412_UCON_UCLK:
+                clk->divisor = 1;
+                clk->name = "uclk";
+                break;
+
+        case S3C2412_UCON_PCLK:
+        case S3C2412_UCON_PCLK2:
+                clk->divisor = 1;
+                clk->name = "pclk";
+                break;
+
+        case S3C2412_UCON_USYSCLK:
+                clk->divisor = 1;
+                clk->name = "usysclk";
+                break;
+        }
+
+        return 0;
+}
+
+static int s3c2412_serial_resetport(struct uart_port *port,
+                                    struct s3c2410_uartcfg *cfg)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        dbg("%s: port=%p (%08lx), cfg=%p\n",
+            __func__, port, port->mapbase, cfg);
+
+        /* ensure we don't change the clock settings... */
+
+        ucon &= S3C2412_UCON_CLKMASK;
+
+        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
+        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
+
+        /* reset both fifos */
+
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
+
+        return 0;
+}
+
+static struct s3c24xx_uart_info s3c2412_uart_inf = {
+        .name           = "Samsung S3C2412 UART",
+        .type           = PORT_S3C2412,
+        .fifosize       = 64,
+        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
+        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
+        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
+        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
+        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
+        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
+        .get_clksrc     = s3c2412_serial_getsource,
+        .set_clksrc     = s3c2412_serial_setsource,
+        .reset_port     = s3c2412_serial_resetport,
+};
+
+/* device management */
+
+static int s3c2412_serial_probe(struct platform_device *dev)
+{
+        dbg("s3c2440_serial_probe: dev=%p\n", dev);
+        return s3c24xx_serial_probe(dev, &s3c2412_uart_inf);
+}
+
+static struct platform_driver s3c2412_serial_drv = {
+        .probe          = s3c2412_serial_probe,
+        .remove         = s3c24xx_serial_remove,
+        .driver         = {
+                .name   = "s3c2412-uart",
+                .owner  = THIS_MODULE,
+        },
+};
+
+s3c24xx_console_init(&s3c2412_serial_drv, &s3c2412_uart_inf);
+
+static inline int s3c2412_serial_init(void)
+{
+        return s3c24xx_serial_init(&s3c2412_serial_drv, &s3c2412_uart_inf);
+}
+
+static inline void s3c2412_serial_exit(void)
+{
+        platform_driver_unregister(&s3c2412_serial_drv);
+}
+
+module_init(s3c2412_serial_init);
+module_exit(s3c2412_serial_exit);
+
+MODULE_DESCRIPTION("Samsung S3C2412,S3C2413 SoC Serial port driver");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:s3c2412-uart");
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c
new file mode 100644
index 000000000000..38f954bd39c6
--- /dev/null
+++ b/drivers/serial/s3c2440.c
@@ -0,0 +1,181 @@
+/* linux/drivers/serial/s3c2440.c
+ *
+ * Driver for Samsung S3C2440 and S3C2442 SoC onboard UARTs.
+ *
+ * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *
+ * 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/module.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/irq.h>
+#include <asm/hardware.h>
+
+#include <asm/plat-s3c/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+
+#include "samsung.h"
+
+
+static int s3c2440_serial_setsource(struct uart_port *port,
+                                     struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        /* todo - proper fclk<>nonfclk switch. */
+
+        ucon &= ~S3C2440_UCON_CLKMASK;
+
+        if (strcmp(clk->name, "uclk") == 0)
+                ucon |= S3C2440_UCON_UCLK;
+        else if (strcmp(clk->name, "pclk") == 0)
+                ucon |= S3C2440_UCON_PCLK;
+        else if (strcmp(clk->name, "fclk") == 0)
+                ucon |= S3C2440_UCON_FCLK;
+        else {
+                printk(KERN_ERR "unknown clock source %s\n", clk->name);
+                return -EINVAL;
+        }
+
+        wr_regl(port, S3C2410_UCON, ucon);
+        return 0;
+}
+
+
+static int s3c2440_serial_getsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+        unsigned long ucon0, ucon1, ucon2;
+
+        switch (ucon & S3C2440_UCON_CLKMASK) {
+        case S3C2440_UCON_UCLK:
+                clk->divisor = 1;
+                clk->name = "uclk";
+                break;
+
+        case S3C2440_UCON_PCLK:
+        case S3C2440_UCON_PCLK2:
+                clk->divisor = 1;
+                clk->name = "pclk";
+                break;
+
+        case S3C2440_UCON_FCLK:
+                /* the fun of calculating the uart divisors on
+                 * the s3c2440 */
+
+                ucon0 = __raw_readl(S3C24XX_VA_UART0 + S3C2410_UCON);
+                ucon1 = __raw_readl(S3C24XX_VA_UART1 + S3C2410_UCON);
+                ucon2 = __raw_readl(S3C24XX_VA_UART2 + S3C2410_UCON);
+
+                printk("ucons: %08lx, %08lx, %08lx\n", ucon0, ucon1, ucon2);
+
+                ucon0 &= S3C2440_UCON0_DIVMASK;
+                ucon1 &= S3C2440_UCON1_DIVMASK;
+                ucon2 &= S3C2440_UCON2_DIVMASK;
+
+                if (ucon0 != 0) {
+                        clk->divisor = ucon0 >> S3C2440_UCON_DIVSHIFT;
+                        clk->divisor += 6;
+                } else if (ucon1 != 0) {
+                        clk->divisor = ucon1 >> S3C2440_UCON_DIVSHIFT;
+                        clk->divisor += 21;
+                } else if (ucon2 != 0) {
+                        clk->divisor = ucon2 >> S3C2440_UCON_DIVSHIFT;
+                        clk->divisor += 36;
+                } else {
+                        /* manual calims 44, seems to be 9 */
+                        clk->divisor = 9;
+                }
+
+                clk->name = "fclk";
+                break;
+        }
+
+        return 0;
+}
+
+static int s3c2440_serial_resetport(struct uart_port *port,
+                                    struct s3c2410_uartcfg *cfg)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        dbg("s3c2440_serial_resetport: port=%p (%08lx), cfg=%p\n",
+            port, port->mapbase, cfg);
+
+        /* ensure we don't change the clock settings... */
+
+        ucon &= (S3C2440_UCON0_DIVMASK | (3<<10));
+
+        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
+        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
+
+        /* reset both fifos */
+
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
+
+        return 0;
+}
+
+static struct s3c24xx_uart_info s3c2440_uart_inf = {
+        .name           = "Samsung S3C2440 UART",
+        .type           = PORT_S3C2440,
+        .fifosize       = 64,
+        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
+        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
+        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
+        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
+        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
+        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
+        .get_clksrc     = s3c2440_serial_getsource,
+        .set_clksrc     = s3c2440_serial_setsource,
+        .reset_port     = s3c2440_serial_resetport,
+};
+
+/* device management */
+
+static int s3c2440_serial_probe(struct platform_device *dev)
+{
+        dbg("s3c2440_serial_probe: dev=%p\n", dev);
+        return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
+}
+
+static struct platform_driver s3c2440_serial_drv = {
+        .probe          = s3c2440_serial_probe,
+        .remove         = s3c24xx_serial_remove,
+        .driver         = {
+                .name   = "s3c2440-uart",
+                .owner  = THIS_MODULE,
+        },
+};
+
+s3c24xx_console_init(&s3c2440_serial_drv, &s3c2440_uart_inf);
+
+static int __init s3c2440_serial_init(void)
+{
+        return s3c24xx_serial_init(&s3c2440_serial_drv, &s3c2440_uart_inf);
+}
+
+static void __exit s3c2440_serial_exit(void)
+{
+        platform_driver_unregister(&s3c2440_serial_drv);
+}
+
+module_init(s3c2440_serial_init);
+module_exit(s3c2440_serial_exit);
+
+MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_LICENSE("GPLi v2");
+MODULE_ALIAS("platform:s3c2440-uart");
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
new file mode 100644
index 000000000000..4a3ecaa629e6
--- /dev/null
+++ b/drivers/serial/samsung.c
@@ -0,0 +1,1317 @@
+/* linux/drivers/serial/samsuing.c
+ *
+ * Driver core for Samsung SoC onboard UARTs.
+ *
+ * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *
+ * 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.
+*/
+
+/* Hote on 2410 error handling
+ *
+ * The s3c2410 manual has a love/hate affair with the contents of the
+ * UERSTAT register in the UART blocks, and keeps marking some of the
+ * error bits as reserved. Having checked with the s3c2410x01,
+ * it copes with BREAKs properly, so I am happy to ignore the RESERVED
+ * feature from the latter versions of the manual.
+ *
+ * If it becomes aparrent that latter versions of the 2410 remove these
+ * bits, then action will have to be taken to differentiate the versions
+ * and change the policy on BREAK
+ *
+ * BJD, 04-Nov-2004
+*/
+
+#if defined(CONFIG_SERIAL_SAMSUNG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+#include <linux/delay.h>
+#include <linux/clk.h>
+
+#include <asm/irq.h>
+
+#include <asm/hardware.h>
+
+#include <asm/plat-s3c/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+
+#include "samsung.h"
+
+/* UART name and device definitions */
+
+#define S3C24XX_SERIAL_NAME     "ttySAC"
+#define S3C24XX_SERIAL_MAJOR    204
+#define S3C24XX_SERIAL_MINOR    64
+
+/* we can support 3 uarts, but not always use them */
+
+#ifdef CONFIG_CPU_S3C2400
+#define NR_PORTS (2)
+#else
+#define NR_PORTS (3)
+#endif
+
+/* port irq numbers */
+
+#define TX_IRQ(port) ((port)->irq + 1)
+#define RX_IRQ(port) ((port)->irq)
+
+/* macros to change one thing to another */
+
+#define tx_enabled(port) ((port)->unused[0])
+#define rx_enabled(port) ((port)->unused[1])
+
+/* flag to ignore all characters comming in */
+#define RXSTAT_DUMMY_READ (0x10000000)
+
+static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port)
+{
+        return container_of(port, struct s3c24xx_uart_port, port);
+}
+
+/* translate a port to the device name */
+
+static inline const char *s3c24xx_serial_portname(struct uart_port *port)
+{
+        return to_platform_device(port->dev)->name;
+}
+
+static int s3c24xx_serial_txempty_nofifo(struct uart_port *port)
+{
+        return (rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE);
+}
+
+static void s3c24xx_serial_rx_enable(struct uart_port *port)
+{
+        unsigned long flags;
+        unsigned int ucon, ufcon;
+        int count = 10000;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        while (--count && !s3c24xx_serial_txempty_nofifo(port))
+                udelay(100);
+
+        ufcon = rd_regl(port, S3C2410_UFCON);
+        ufcon |= S3C2410_UFCON_RESETRX;
+        wr_regl(port, S3C2410_UFCON, ufcon);
+
+        ucon = rd_regl(port, S3C2410_UCON);
+        ucon |= S3C2410_UCON_RXIRQMODE;
+        wr_regl(port, S3C2410_UCON, ucon);
+
+        rx_enabled(port) = 1;
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void s3c24xx_serial_rx_disable(struct uart_port *port)
+{
+        unsigned long flags;
+        unsigned int ucon;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ucon = rd_regl(port, S3C2410_UCON);
+        ucon &= ~S3C2410_UCON_RXIRQMODE;
+        wr_regl(port, S3C2410_UCON, ucon);
+
+        rx_enabled(port) = 0;
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void s3c24xx_serial_stop_tx(struct uart_port *port)
+{
+        if (tx_enabled(port)) {
+                disable_irq(TX_IRQ(port));
+                tx_enabled(port) = 0;
+                if (port->flags & UPF_CONS_FLOW)
+                        s3c24xx_serial_rx_enable(port);
+        }
+}
+
+static void s3c24xx_serial_start_tx(struct uart_port *port)
+{
+        if (!tx_enabled(port)) {
+                if (port->flags & UPF_CONS_FLOW)
+                        s3c24xx_serial_rx_disable(port);
+
+                enable_irq(TX_IRQ(port));
+                tx_enabled(port) = 1;
+        }
+}
+
+
+static void s3c24xx_serial_stop_rx(struct uart_port *port)
+{
+        if (rx_enabled(port)) {
+                dbg("s3c24xx_serial_stop_rx: port=%p\n", port);
+                disable_irq(RX_IRQ(port));
+                rx_enabled(port) = 0;
+        }
+}
+
+static void s3c24xx_serial_enable_ms(struct uart_port *port)
+{
+}
+
+static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port)
+{
+        return to_ourport(port)->info;
+}
+
+static inline struct s3c2410_uartcfg *s3c24xx_port_to_cfg(struct uart_port *port)
+{
+        if (port->dev == NULL)
+                return NULL;
+
+        return (struct s3c2410_uartcfg *)port->dev->platform_data;
+}
+
+static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport,
+                                     unsigned long ufstat)
+{
+        struct s3c24xx_uart_info *info = ourport->info;
+
+        if (ufstat & info->rx_fifofull)
+                return info->fifosize;
+
+        return (ufstat & info->rx_fifomask) >> info->rx_fifoshift;
+}
+
+
+/* ? - where has parity gone?? */
+#define S3C2410_UERSTAT_PARITY (0x1000)
+
+static irqreturn_t
+s3c24xx_serial_rx_chars(int irq, void *dev_id)
+{
+        struct s3c24xx_uart_port *ourport = dev_id;
+        struct uart_port *port = &ourport->port;
+        struct tty_struct *tty = port->info->tty;
+        unsigned int ufcon, ch, flag, ufstat, uerstat;
+        int max_count = 64;
+
+        while (max_count-- > 0) {
+                ufcon = rd_regl(port, S3C2410_UFCON);
+                ufstat = rd_regl(port, S3C2410_UFSTAT);
+
+                if (s3c24xx_serial_rx_fifocnt(ourport, ufstat) == 0)
+                        break;
+
+                uerstat = rd_regl(port, S3C2410_UERSTAT);
+                ch = rd_regb(port, S3C2410_URXH);
+
+                if (port->flags & UPF_CONS_FLOW) {
+                        int txe = s3c24xx_serial_txempty_nofifo(port);
+
+                        if (rx_enabled(port)) {
+                                if (!txe) {
+                                        rx_enabled(port) = 0;
+                                        continue;
+                                }
+                        } else {
+                                if (txe) {
+                                        ufcon |= S3C2410_UFCON_RESETRX;
+                                        wr_regl(port, S3C2410_UFCON, ufcon);
+                                        rx_enabled(port) = 1;
+                                        goto out;
+                                }
+                                continue;
+                        }
+                }
+
+                /* insert the character into the buffer */
+
+                flag = TTY_NORMAL;
+                port->icount.rx++;
+
+                if (unlikely(uerstat & S3C2410_UERSTAT_ANY)) {
+                        dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n",
+                            ch, uerstat);
+
+                        /* check for break */
+                        if (uerstat & S3C2410_UERSTAT_BREAK) {
+                                dbg("break!\n");
+                                port->icount.brk++;
+                                if (uart_handle_break(port))
+                                    goto ignore_char;
+                        }
+
+                        if (uerstat & S3C2410_UERSTAT_FRAME)
+                                port->icount.frame++;
+                        if (uerstat & S3C2410_UERSTAT_OVERRUN)
+                                port->icount.overrun++;
+
+                        uerstat &= port->read_status_mask;
+
+                        if (uerstat & S3C2410_UERSTAT_BREAK)
+                                flag = TTY_BREAK;
+                        else if (uerstat & S3C2410_UERSTAT_PARITY)
+                                flag = TTY_PARITY;
+                        else if (uerstat & (S3C2410_UERSTAT_FRAME |
+                                            S3C2410_UERSTAT_OVERRUN))
+                                flag = TTY_FRAME;
+                }
+
+                if (uart_handle_sysrq_char(port, ch))
+                        goto ignore_char;
+
+                uart_insert_char(port, uerstat, S3C2410_UERSTAT_OVERRUN,
+                                 ch, flag);
+
+ ignore_char:
+                continue;
+        }
+        tty_flip_buffer_push(tty);
+
+ out:
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
+{
+        struct s3c24xx_uart_port *ourport = id;
+        struct uart_port *port = &ourport->port;
+        struct circ_buf *xmit = &port->info->xmit;
+        int count = 256;
+
+        if (port->x_char) {
+                wr_regb(port, S3C2410_UTXH, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                goto out;
+        }
+
+        /* if there isnt anything more to transmit, or the uart is now
+         * stopped, disable the uart and exit
+        */
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                s3c24xx_serial_stop_tx(port);
+                goto out;
+        }
+
+        /* try and drain the buffer... */
+
+        while (!uart_circ_empty(xmit) && count-- > 0) {
+                if (rd_regl(port, S3C2410_UFSTAT) & ourport->info->tx_fifofull)
+                        break;
+
+                wr_regb(port, S3C2410_UTXH, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+        }
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                s3c24xx_serial_stop_tx(port);
+
+ out:
+        return IRQ_HANDLED;
+}
+
+static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        unsigned long ufstat = rd_regl(port, S3C2410_UFSTAT);
+        unsigned long ufcon = rd_regl(port, S3C2410_UFCON);
+
+        if (ufcon & S3C2410_UFCON_FIFOMODE) {
+                if ((ufstat & info->tx_fifomask) != 0 ||
+                    (ufstat & info->tx_fifofull))
+                        return 0;
+
+                return 1;
+        }
+
+        return s3c24xx_serial_txempty_nofifo(port);
+}
+
+/* no modem control lines */
+static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port)
+{
+        unsigned int umstat = rd_regb(port, S3C2410_UMSTAT);
+
+        if (umstat & S3C2410_UMSTAT_CTS)
+                return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
+        else
+                return TIOCM_CAR | TIOCM_DSR;
+}
+
+static void s3c24xx_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        /* todo - possibly remove AFC and do manual CTS */
+}
+
+static void s3c24xx_serial_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned long flags;
+        unsigned int ucon;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ucon = rd_regl(port, S3C2410_UCON);
+
+        if (break_state)
+                ucon |= S3C2410_UCON_SBREAK;
+        else
+                ucon &= ~S3C2410_UCON_SBREAK;
+
+        wr_regl(port, S3C2410_UCON, ucon);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void s3c24xx_serial_shutdown(struct uart_port *port)
+{
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+        if (ourport->tx_claimed) {
+                free_irq(TX_IRQ(port), ourport);
+                tx_enabled(port) = 0;
+                ourport->tx_claimed = 0;
+        }
+
+        if (ourport->rx_claimed) {
+                free_irq(RX_IRQ(port), ourport);
+                ourport->rx_claimed = 0;
+                rx_enabled(port) = 0;
+        }
+}
+
+
+static int s3c24xx_serial_startup(struct uart_port *port)
+{
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+        int ret;
+
+        dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
+            port->mapbase, port->membase);
+
+        rx_enabled(port) = 1;
+
+        ret = request_irq(RX_IRQ(port),
+                          s3c24xx_serial_rx_chars, 0,
+                          s3c24xx_serial_portname(port), ourport);
+
+        if (ret != 0) {
+                printk(KERN_ERR "cannot get irq %d\n", RX_IRQ(port));
+                return ret;
+        }
+
+        ourport->rx_claimed = 1;
+
+        dbg("requesting tx irq...\n");
+
+        tx_enabled(port) = 1;
+
+        ret = request_irq(TX_IRQ(port),
+                          s3c24xx_serial_tx_chars, 0,
+                          s3c24xx_serial_portname(port), ourport);
+
+        if (ret) {
+                printk(KERN_ERR "cannot get irq %d\n", TX_IRQ(port));
+                goto err;
+        }
+
+        ourport->tx_claimed = 1;
+
+        dbg("s3c24xx_serial_startup ok\n");
+
+        /* the port reset code should have done the correct
+         * register setup for the port controls */
+
+        return ret;
+
+ err:
+        s3c24xx_serial_shutdown(port);
+        return ret;
+}
+
+/* power power management control */
+
+static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
+                              unsigned int old)
+{
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+        switch (level) {
+        case 3:
+                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
+                        clk_disable(ourport->baudclk);
+
+                clk_disable(ourport->clk);
+                break;
+
+        case 0:
+                clk_enable(ourport->clk);
+
+                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
+                        clk_enable(ourport->baudclk);
+
+                break;
+        default:
+                printk(KERN_ERR "s3c24xx_serial: unknown pm %d\n", level);
+        }
+}
+
+/* baud rate calculation
+ *
+ * The UARTs on the S3C2410/S3C2440 can take their clocks from a number
+ * of different sources, including the peripheral clock ("pclk") and an
+ * external clock ("uclk"). The S3C2440 also adds the core clock ("fclk")
+ * with a programmable extra divisor.
+ *
+ * The following code goes through the clock sources, and calculates the
+ * baud clocks (and the resultant actual baud rates) and then tries to
+ * pick the closest one and select that.
+ *
+*/
+
+
+#define MAX_CLKS (8)
+
+static struct s3c24xx_uart_clksrc tmp_clksrc = {
+        .name           = "pclk",
+        .min_baud       = 0,
+        .max_baud       = 0,
+        .divisor        = 1,
+};
+
+static inline int
+s3c24xx_serial_getsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        return (info->get_clksrc)(port, c);
+}
+
+static inline int
+s3c24xx_serial_setsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        return (info->set_clksrc)(port, c);
+}
+
+struct baud_calc {
+        struct s3c24xx_uart_clksrc      *clksrc;
+        unsigned int                     calc;
+        unsigned int                     quot;
+        struct clk                      *src;
+};
+
+static int s3c24xx_serial_calcbaud(struct baud_calc *calc,
+                                   struct uart_port *port,
+                                   struct s3c24xx_uart_clksrc *clksrc,
+                                   unsigned int baud)
+{
+        unsigned long rate;
+
+        calc->src = clk_get(port->dev, clksrc->name);
+        if (calc->src == NULL || IS_ERR(calc->src))
+                return 0;
+
+        rate = clk_get_rate(calc->src);
+        rate /= clksrc->divisor;
+
+        calc->clksrc = clksrc;
+        calc->quot = (rate + (8 * baud)) / (16 * baud);
+        calc->calc = (rate / (calc->quot * 16));
+
+        calc->quot--;
+        return 1;
+}
+
+static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
+                                          struct s3c24xx_uart_clksrc **clksrc,
+                                          struct clk **clk,
+                                          unsigned int baud)
+{
+        struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
+        struct s3c24xx_uart_clksrc *clkp;
+        struct baud_calc res[MAX_CLKS];
+        struct baud_calc *resptr, *best, *sptr;
+        int i;
+
+        clkp = cfg->clocks;
+        best = NULL;
+
+        if (cfg->clocks_size < 2) {
+                if (cfg->clocks_size == 0)
+                        clkp = &tmp_clksrc;
+
+                /* check to see if we're sourcing fclk, and if so we're
+                 * going to have to update the clock source
+                 */
+
+                if (strcmp(clkp->name, "fclk") == 0) {
+                        struct s3c24xx_uart_clksrc src;
+
+                        s3c24xx_serial_getsource(port, &src);
+
+                        /* check that the port already using fclk, and if
+                         * not, then re-select fclk
+                         */
+
+                        if (strcmp(src.name, clkp->name) == 0) {
+                                s3c24xx_serial_setsource(port, clkp);
+                                s3c24xx_serial_getsource(port, &src);
+                        }
+
+                        clkp->divisor = src.divisor;
+                }
+
+                s3c24xx_serial_calcbaud(res, port, clkp, baud);
+                best = res;
+                resptr = best + 1;
+        } else {
+                resptr = res;
+
+                for (i = 0; i < cfg->clocks_size; i++, clkp++) {
+                        if (s3c24xx_serial_calcbaud(resptr, port, clkp, baud))
+                                resptr++;
+                }
+        }
+
+        /* ok, we now need to select the best clock we found */
+
+        if (!best) {
+                unsigned int deviation = (1<<30)|((1<<30)-1);
+                int calc_deviation;
+
+                for (sptr = res; sptr < resptr; sptr++) {
+                        calc_deviation = baud - sptr->calc;
+                        if (calc_deviation < 0)
+                                calc_deviation = -calc_deviation;
+
+                        if (calc_deviation < deviation) {
+                                best = sptr;
+                                deviation = calc_deviation;
+                        }
+                }
+        }
+
+        /* store results to pass back */
+
+        *clksrc = best->clksrc;
+        *clk    = best->src;
+
+        return best->quot;
+}
+
+static void s3c24xx_serial_set_termios(struct uart_port *port,
+                                       struct ktermios *termios,
+                                       struct ktermios *old)
+{
+        struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+        struct s3c24xx_uart_clksrc *clksrc = NULL;
+        struct clk *clk = NULL;
+        unsigned long flags;
+        unsigned int baud, quot;
+        unsigned int ulcon;
+        unsigned int umcon;
+
+        /*
+         * We don't support modem control lines.
+         */
+        termios->c_cflag &= ~(HUPCL | CMSPAR);
+        termios->c_cflag |= CLOCAL;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+
+        baud = uart_get_baud_rate(port, termios, old, 0, 115200*8);
+
+        if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
+                quot = port->custom_divisor;
+        else
+                quot = s3c24xx_serial_getclk(port, &clksrc, &clk, baud);
+
+        /* check to see if we need  to change clock source */
+
+        if (ourport->clksrc != clksrc || ourport->baudclk != clk) {
+                s3c24xx_serial_setsource(port, clksrc);
+
+                if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
+                        clk_disable(ourport->baudclk);
+                        ourport->baudclk  = NULL;
+                }
+
+                clk_enable(clk);
+
+                ourport->clksrc = clksrc;
+                ourport->baudclk = clk;
+        }
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                dbg("config: 5bits/char\n");
+                ulcon = S3C2410_LCON_CS5;
+                break;
+        case CS6:
+                dbg("config: 6bits/char\n");
+                ulcon = S3C2410_LCON_CS6;
+                break;
+        case CS7:
+                dbg("config: 7bits/char\n");
+                ulcon = S3C2410_LCON_CS7;
+                break;
+        case CS8:
+        default:
+                dbg("config: 8bits/char\n");
+                ulcon = S3C2410_LCON_CS8;
+                break;
+        }
+
+        /* preserve original lcon IR settings */
+        ulcon |= (cfg->ulcon & S3C2410_LCON_IRM);
+
+        if (termios->c_cflag & CSTOPB)
+                ulcon |= S3C2410_LCON_STOPB;
+
+        umcon = (termios->c_cflag & CRTSCTS) ? S3C2410_UMCOM_AFC : 0;
+
+        if (termios->c_cflag & PARENB) {
+                if (termios->c_cflag & PARODD)
+                        ulcon |= S3C2410_LCON_PODD;
+                else
+                        ulcon |= S3C2410_LCON_PEVEN;
+        } else {
+                ulcon |= S3C2410_LCON_PNONE;
+        }
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        dbg("setting ulcon to %08x, brddiv to %d\n", ulcon, quot);
+
+        wr_regl(port, S3C2410_ULCON, ulcon);
+        wr_regl(port, S3C2410_UBRDIV, quot);
+        wr_regl(port, S3C2410_UMCON, umcon);
+
+        dbg("uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n",
+            rd_regl(port, S3C2410_ULCON),
+            rd_regl(port, S3C2410_UCON),
+            rd_regl(port, S3C2410_UFCON));
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        /*
+         * Which character status flags are we interested in?
+         */
+        port->read_status_mask = S3C2410_UERSTAT_OVERRUN;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= S3C2410_UERSTAT_FRAME | S3C2410_UERSTAT_PARITY;
+
+        /*
+         * Which character status flags should we ignore?
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= S3C2410_UERSTAT_OVERRUN;
+        if (termios->c_iflag & IGNBRK && termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= S3C2410_UERSTAT_FRAME;
+
+        /*
+         * Ignore all characters if CREAD is not set.
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= RXSTAT_DUMMY_READ;
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *s3c24xx_serial_type(struct uart_port *port)
+{
+        switch (port->type) {
+        case PORT_S3C2410:
+                return "S3C2410";
+        case PORT_S3C2440:
+                return "S3C2440";
+        case PORT_S3C2412:
+                return "S3C2412";
+        default:
+                return NULL;
+        }
+}
+
+#define MAP_SIZE (0x100)
+
+static void s3c24xx_serial_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, MAP_SIZE);
+}
+
+static int s3c24xx_serial_request_port(struct uart_port *port)
+{
+        const char *name = s3c24xx_serial_portname(port);
+        return request_mem_region(port->mapbase, MAP_SIZE, name) ? 0 : -EBUSY;
+}
+
+static void s3c24xx_serial_config_port(struct uart_port *port, int flags)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        if (flags & UART_CONFIG_TYPE &&
+            s3c24xx_serial_request_port(port) == 0)
+                port->type = info->type;
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int
+s3c24xx_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        if (ser->type != PORT_UNKNOWN && ser->type != info->type)
+                return -EINVAL;
+
+        return 0;
+}
+
+
+#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
+
+static struct console s3c24xx_serial_console;
+
+#define S3C24XX_SERIAL_CONSOLE &s3c24xx_serial_console
+#else
+#define S3C24XX_SERIAL_CONSOLE NULL
+#endif
+
+static struct uart_ops s3c24xx_serial_ops = {
+        .pm             = s3c24xx_serial_pm,
+        .tx_empty       = s3c24xx_serial_tx_empty,
+        .get_mctrl      = s3c24xx_serial_get_mctrl,
+        .set_mctrl      = s3c24xx_serial_set_mctrl,
+        .stop_tx        = s3c24xx_serial_stop_tx,
+        .start_tx       = s3c24xx_serial_start_tx,
+        .stop_rx        = s3c24xx_serial_stop_rx,
+        .enable_ms      = s3c24xx_serial_enable_ms,
+        .break_ctl      = s3c24xx_serial_break_ctl,
+        .startup        = s3c24xx_serial_startup,
+        .shutdown       = s3c24xx_serial_shutdown,
+        .set_termios    = s3c24xx_serial_set_termios,
+        .type           = s3c24xx_serial_type,
+        .release_port   = s3c24xx_serial_release_port,
+        .request_port   = s3c24xx_serial_request_port,
+        .config_port    = s3c24xx_serial_config_port,
+        .verify_port    = s3c24xx_serial_verify_port,
+};
+
+
+static struct uart_driver s3c24xx_uart_drv = {
+        .owner          = THIS_MODULE,
+        .dev_name       = "s3c2410_serial",
+        .nr             = 3,
+        .cons           = S3C24XX_SERIAL_CONSOLE,
+        .driver_name    = S3C24XX_SERIAL_NAME,
+        .major          = S3C24XX_SERIAL_MAJOR,
+        .minor          = S3C24XX_SERIAL_MINOR,
+};
+
+static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
+        [0] = {
+                .port = {
+                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[0].port.lock),
+                        .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX0,
+                        .uartclk        = 0,
+                        .fifosize       = 16,
+                        .ops            = &s3c24xx_serial_ops,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 0,
+                }
+        },
+        [1] = {
+                .port = {
+                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[1].port.lock),
+                        .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX1,
+                        .uartclk        = 0,
+                        .fifosize       = 16,
+                        .ops            = &s3c24xx_serial_ops,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 1,
+                }
+        },
+#if NR_PORTS > 2
+
+        [2] = {
+                .port = {
+                        .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[2].port.lock),
+                        .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX2,
+                        .uartclk        = 0,
+                        .fifosize       = 16,
+                        .ops            = &s3c24xx_serial_ops,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 2,
+                }
+        }
+#endif
+};
+
+/* s3c24xx_serial_resetport
+ *
+ * wrapper to call the specific reset for this port (reset the fifos
+ * and the settings)
+*/
+
+static inline int s3c24xx_serial_resetport(struct uart_port *port,
+                                           struct s3c2410_uartcfg *cfg)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        return (info->reset_port)(port, cfg);
+}
+
+/* s3c24xx_serial_init_port
+ *
+ * initialise a single serial port from the platform device given
+ */
+
+static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
+                                    struct s3c24xx_uart_info *info,
+                                    struct platform_device *platdev)
+{
+        struct uart_port *port = &ourport->port;
+        struct s3c2410_uartcfg *cfg;
+        struct resource *res;
+        int ret;
+
+        dbg("s3c24xx_serial_init_port: port=%p, platdev=%p\n", port, platdev);
+
+        if (platdev == NULL)
+                return -ENODEV;
+
+        cfg = s3c24xx_dev_to_cfg(&platdev->dev);
+
+        if (port->mapbase != 0)
+                return 0;
+
+        if (cfg->hwport > 3)
+                return -EINVAL;
+
+        /* setup info for port */
+        port->dev       = &platdev->dev;
+        ourport->info   = info;
+
+        /* copy the info in from provided structure */
+        ourport->port.fifosize = info->fifosize;
+
+        dbg("s3c24xx_serial_init_port: %p (hw %d)...\n", port, cfg->hwport);
+
+        port->uartclk = 1;
+
+        if (cfg->uart_flags & UPF_CONS_FLOW) {
+                dbg("s3c24xx_serial_init_port: enabling flow control\n");
+                port->flags |= UPF_CONS_FLOW;
+        }
+
+        /* sort our the physical and virtual addresses for each UART */
+
+        res = platform_get_resource(platdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                printk(KERN_ERR "failed to find memory resource for uart\n");
+                return -EINVAL;
+        }
+
+        dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
+
+        port->mapbase   = res->start;
+        port->membase   = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
+        ret = platform_get_irq(platdev, 0);
+        if (ret < 0)
+                port->irq = 0;
+        else
+                port->irq = ret;
+
+        ourport->clk    = clk_get(&platdev->dev, "uart");
+
+        dbg("port: map=%08x, mem=%08x, irq=%d, clock=%ld\n",
+            port->mapbase, port->membase, port->irq, port->uartclk);
+
+        /* reset the fifos (and setup the uart) */
+        s3c24xx_serial_resetport(port, cfg);
+        return 0;
+}
+
+static ssize_t s3c24xx_serial_show_clksrc(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        struct uart_port *port = s3c24xx_dev_to_port(dev);
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+        return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->clksrc->name);
+}
+
+static DEVICE_ATTR(clock_source, S_IRUGO, s3c24xx_serial_show_clksrc, NULL);
+
+/* Device driver serial port probe */
+
+static int probe_index;
+
+int s3c24xx_serial_probe(struct platform_device *dev,
+                         struct s3c24xx_uart_info *info)
+{
+        struct s3c24xx_uart_port *ourport;
+        int ret;
+
+        dbg("s3c24xx_serial_probe(%p, %p) %d\n", dev, info, probe_index);
+
+        ourport = &s3c24xx_serial_ports[probe_index];
+        probe_index++;
+
+        dbg("%s: initialising port %p...\n", __func__, ourport);
+
+        ret = s3c24xx_serial_init_port(ourport, info, dev);
+        if (ret < 0)
+                goto probe_err;
+
+        dbg("%s: adding port\n", __func__);
+        uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
+        platform_set_drvdata(dev, &ourport->port);
+
+        ret = device_create_file(&dev->dev, &dev_attr_clock_source);
+        if (ret < 0)
+                printk(KERN_ERR "%s: failed to add clksrc attr.\n", __func__);
+
+        return 0;
+
+ probe_err:
+        return ret;
+}
+
+EXPORT_SYMBOL_GPL(s3c24xx_serial_probe);
+
+int s3c24xx_serial_remove(struct platform_device *dev)
+{
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
+
+        if (port) {
+                device_remove_file(&dev->dev, &dev_attr_clock_source);
+                uart_remove_one_port(&s3c24xx_uart_drv, port);
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(s3c24xx_serial_remove);
+
+/* UART power management code */
+
+#ifdef CONFIG_PM
+
+static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
+
+        if (port)
+                uart_suspend_port(&s3c24xx_uart_drv, port);
+
+        return 0;
+}
+
+static int s3c24xx_serial_resume(struct platform_device *dev)
+{
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+        if (port) {
+                clk_enable(ourport->clk);
+                s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
+                clk_disable(ourport->clk);
+
+                uart_resume_port(&s3c24xx_uart_drv, port);
+        }
+
+        return 0;
+}
+#endif
+
+int s3c24xx_serial_init(struct platform_driver *drv,
+                        struct s3c24xx_uart_info *info)
+{
+        dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
+
+#ifdef CONFIG_PM
+        drv->suspend = s3c24xx_serial_suspend;
+        drv->resume = s3c24xx_serial_resume;
+#endif
+
+        return platform_driver_register(drv);
+}
+
+EXPORT_SYMBOL_GPL(s3c24xx_serial_init);
+
+/* module initialisation code */
+
+static int __init s3c24xx_serial_modinit(void)
+{
+        int ret;
+
+        ret = uart_register_driver(&s3c24xx_uart_drv);
+        if (ret < 0) {
+                printk(KERN_ERR "failed to register UART driver\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static void __exit s3c24xx_serial_modexit(void)
+{
+        uart_unregister_driver(&s3c24xx_uart_drv);
+}
+
+module_init(s3c24xx_serial_modinit);
+module_exit(s3c24xx_serial_modexit);
+
+/* Console code */
+
+#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
+
+static struct uart_port *cons_uart;
+
+static int
+s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        unsigned long ufstat, utrstat;
+
+        if (ufcon & S3C2410_UFCON_FIFOMODE) {
+                /* fifo mode - check ammount of data in fifo registers... */
+
+                ufstat = rd_regl(port, S3C2410_UFSTAT);
+                return (ufstat & info->tx_fifofull) ? 0 : 1;
+        }
+
+        /* in non-fifo mode, we go and use the tx buffer empty */
+
+        utrstat = rd_regl(port, S3C2410_UTRSTAT);
+        return (utrstat & S3C2410_UTRSTAT_TXE) ? 1 : 0;
+}
+
+static void
+s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
+{
+        unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
+        while (!s3c24xx_serial_console_txrdy(port, ufcon))
+                barrier();
+        wr_regb(cons_uart, S3C2410_UTXH, ch);
+}
+
+static void
+s3c24xx_serial_console_write(struct console *co, const char *s,
+                             unsigned int count)
+{
+        uart_console_write(cons_uart, s, count, s3c24xx_serial_console_putchar);
+}
+
+static void __init
+s3c24xx_serial_get_options(struct uart_port *port, int *baud,
+                           int *parity, int *bits)
+{
+        struct s3c24xx_uart_clksrc clksrc;
+        struct clk *clk;
+        unsigned int ulcon;
+        unsigned int ucon;
+        unsigned int ubrdiv;
+        unsigned long rate;
+
+        ulcon  = rd_regl(port, S3C2410_ULCON);
+        ucon   = rd_regl(port, S3C2410_UCON);
+        ubrdiv = rd_regl(port, S3C2410_UBRDIV);
+
+        dbg("s3c24xx_serial_get_options: port=%p\n"
+            "registers: ulcon=%08x, ucon=%08x, ubdriv=%08x\n",
+            port, ulcon, ucon, ubrdiv);
+
+        if ((ucon & 0xf) != 0) {
+                /* consider the serial port configured if the tx/rx mode set */
+
+                switch (ulcon & S3C2410_LCON_CSMASK) {
+                case S3C2410_LCON_CS5:
+                        *bits = 5;
+                        break;
+                case S3C2410_LCON_CS6:
+                        *bits = 6;
+                        break;
+                case S3C2410_LCON_CS7:
+                        *bits = 7;
+                        break;
+                default:
+                case S3C2410_LCON_CS8:
+                        *bits = 8;
+                        break;
+                }
+
+                switch (ulcon & S3C2410_LCON_PMASK) {
+                case S3C2410_LCON_PEVEN:
+                        *parity = 'e';
+                        break;
+
+                case S3C2410_LCON_PODD:
+                        *parity = 'o';
+                        break;
+
+                case S3C2410_LCON_PNONE:
+                default:
+                        *parity = 'n';
+                }
+
+                /* now calculate the baud rate */
+
+                s3c24xx_serial_getsource(port, &clksrc);
+
+                clk = clk_get(port->dev, clksrc.name);
+                if (!IS_ERR(clk) && clk != NULL)
+                        rate = clk_get_rate(clk) / clksrc.divisor;
+                else
+                        rate = 1;
+
+
+                *baud = rate / (16 * (ubrdiv + 1));
+                dbg("calculated baud %d\n", *baud);
+        }
+
+}
+
+/* s3c24xx_serial_init_ports
+ *
+ * initialise the serial ports from the machine provided initialisation
+ * data.
+*/
+
+static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
+{
+        struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports;
+        struct platform_device **platdev_ptr;
+        int i;
+
+        dbg("s3c24xx_serial_init_ports: initialising ports...\n");
+
+        platdev_ptr = s3c24xx_uart_devs;
+
+        for (i = 0; i < NR_PORTS; i++, ptr++, platdev_ptr++) {
+                s3c24xx_serial_init_port(ptr, info, *platdev_ptr);
+        }
+
+        return 0;
+}
+
+static int __init
+s3c24xx_serial_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        dbg("s3c24xx_serial_console_setup: co=%p (%d), %s\n",
+            co, co->index, options);
+
+        /* is this a valid port */
+
+        if (co->index == -1 || co->index >= NR_PORTS)
+                co->index = 0;
+
+        port = &s3c24xx_serial_ports[co->index].port;
+
+        /* is the port configured? */
+
+        if (port->mapbase == 0x0) {
+                co->index = 0;
+                port = &s3c24xx_serial_ports[co->index].port;
+        }
+
+        cons_uart = port;
+
+        dbg("s3c24xx_serial_console_setup: port=%p (%d)\n", port, co->index);
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                s3c24xx_serial_get_options(port, &baud, &parity, &bits);
+
+        dbg("s3c24xx_serial_console_setup: baud %d\n", baud);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+/* s3c24xx_serial_initconsole
+ *
+ * initialise the console from one of the uart drivers
+*/
+
+static struct console s3c24xx_serial_console = {
+        .name           = S3C24XX_SERIAL_NAME,
+        .device         = uart_console_device,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .write          = s3c24xx_serial_console_write,
+        .setup          = s3c24xx_serial_console_setup
+};
+
+int s3c24xx_serial_initconsole(struct platform_driver *drv,
+                               struct s3c24xx_uart_info *info)
+
+{
+        struct platform_device *dev = s3c24xx_uart_devs[0];
+
+        dbg("s3c24xx_serial_initconsole\n");
+
+        /* select driver based on the cpu */
+
+        if (dev == NULL) {
+                printk(KERN_ERR "s3c24xx: no devices for console init\n");
+                return 0;
+        }
+
+        if (strcmp(dev->name, drv->driver.name) != 0)
+                return 0;
+
+        s3c24xx_serial_console.data = &s3c24xx_uart_drv;
+        s3c24xx_serial_init_ports(info);
+
+        register_console(&s3c24xx_serial_console);
+        return 0;
+}
+
+#endif /* CONFIG_SERIAL_SAMSUNG_CONSOLE */
+
+MODULE_DESCRIPTION("Samsung SoC Serial port driver");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h
new file mode 100644
index 000000000000..5c92ebbe7d9e
--- /dev/null
+++ b/drivers/serial/samsung.h
@@ -0,0 +1,102 @@
+/* linux/drivers/serial/samsung.h
+ *
+ * Driver for Samsung SoC onboard UARTs.
+ *
+ * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *
+ * 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.
+*/
+
+struct s3c24xx_uart_info {
+        char                    *name;
+        unsigned int            type;
+        unsigned int            fifosize;
+        unsigned long           rx_fifomask;
+        unsigned long           rx_fifoshift;
+        unsigned long           rx_fifofull;
+        unsigned long           tx_fifomask;
+        unsigned long           tx_fifoshift;
+        unsigned long           tx_fifofull;
+
+        /* clock source control */
+
+        int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
+        int (*set_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
+
+        /* uart controls */
+        int (*reset_port)(struct uart_port *, struct s3c2410_uartcfg *);
+};
+
+struct s3c24xx_uart_port {
+        unsigned char                   rx_claimed;
+        unsigned char                   tx_claimed;
+
+        struct s3c24xx_uart_info        *info;
+        struct s3c24xx_uart_clksrc      *clksrc;
+        struct clk                      *clk;
+        struct clk                      *baudclk;
+        struct uart_port                port;
+};
+
+/* conversion functions */
+
+#define s3c24xx_dev_to_port(__dev) (struct uart_port *)dev_get_drvdata(__dev)
+#define s3c24xx_dev_to_cfg(__dev) (struct s3c2410_uartcfg *)((__dev)->platform_data)
+
+/* register access controls */
+
+#define portaddr(port, reg) ((port)->membase + (reg))
+
+#define rd_regb(port, reg) (__raw_readb(portaddr(port, reg)))
+#define rd_regl(port, reg) (__raw_readl(portaddr(port, reg)))
+
+#define wr_regb(port, reg, val) __raw_writeb(val, portaddr(port, reg))
+#define wr_regl(port, reg, val) __raw_writel(val, portaddr(port, reg))
+
+extern int s3c24xx_serial_probe(struct platform_device *dev,
+                                struct s3c24xx_uart_info *uart);
+
+extern int s3c24xx_serial_remove(struct platform_device *dev);
+
+extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
+                                      struct s3c24xx_uart_info *uart);
+
+extern int s3c24xx_serial_init(struct platform_driver *drv,
+                               struct s3c24xx_uart_info *info);
+
+#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
+
+#define s3c24xx_console_init(__drv, __inf)                      \
+static int __init s3c_serial_console_init(void)                 \
+{                                                               \
+        return s3c24xx_serial_initconsole(__drv, __inf);        \
+}                                                               \
+                                                                \
+console_initcall(s3c_serial_console_init)
+
+#else
+#define s3c24xx_console_init(drv, inf) extern void no_console(void)
+#endif
+
+#ifdef CONFIG_SERIAL_SAMSUNG_DEBUG
+
+extern void printascii(const char *);
+
+static void dbg(const char *fmt, ...)
+{
+        va_list va;
+        char buff[256];
+
+        va_start(va, fmt);
+        vsprintf(buff, fmt, va);
+        va_end(va);
+
+        printascii(buff);
+}
+
+#else
+#define dbg(x...) do { } while (0)
+#endif
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index c730d05bfeb6..54ac7bea5f8c 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -29,6 +29,7 @@
 #include <linux/spi/spi.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -250,6 +251,8 @@ struct driver_data {
         int tx_dma_needs_unmap;
         size_t tx_map_len;
         u32 dummy_dma_buf ____cacheline_aligned;
+
+        struct clk *clk;
 };
 
 /* Runtime state */
@@ -855,15 +858,15 @@ static irqreturn_t spi_int(int irq, void *dev_id)
         return drv_data->transfer_handler(drv_data);
 }
 
-static inline u32 spi_speed_hz(u32 data_rate)
+static inline u32 spi_speed_hz(struct driver_data *drv_data, u32 data_rate)
 {
-        return imx_get_perclk2() / (4 << ((data_rate) >> 13));
+        return clk_get_rate(drv_data->clk) / (4 << ((data_rate) >> 13));
 }
 
-static u32 spi_data_rate(u32 speed_hz)
+static u32 spi_data_rate(struct driver_data *drv_data, u32 speed_hz)
 {
         u32 div;
-        u32 quantized_hz = imx_get_perclk2() >> 2;
+        u32 quantized_hz = clk_get_rate(drv_data->clk) >> 2;
 
         for (div = SPI_PERCLK2_DIV_MIN;
                 div <= SPI_PERCLK2_DIV_MAX;
@@ -947,7 +950,7 @@ static void pump_transfers(unsigned long data)
         tmp = transfer->speed_hz;
         if (tmp == 0)
                 tmp = chip->max_speed_hz;
-        tmp = spi_data_rate(tmp);
+        tmp = spi_data_rate(drv_data, tmp);
         u32_EDIT(control, SPI_CONTROL_DATARATE, tmp);
 
         writel(control, regs + SPI_CONTROL);
@@ -1109,7 +1112,7 @@ static int transfer(struct spi_device *spi, struct spi_message *msg)
         msg->actual_length = 0;
 
         /* Per transfer setup check */
-        min_speed_hz = spi_speed_hz(SPI_CONTROL_DATARATE_MIN);
+        min_speed_hz = spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN);
         max_speed_hz = spi->max_speed_hz;
         list_for_each_entry(trans, &msg->transfers, transfer_list) {
                 tmp = trans->bits_per_word;
@@ -1176,6 +1179,7 @@ msg_rejected:
    applied and notified to the calling driver. */
 static int setup(struct spi_device *spi)
 {
+        struct driver_data *drv_data = spi_master_get_devdata(spi->master);
         struct spi_imx_chip *chip_info;
         struct chip_data *chip;
         int first_setup = 0;
@@ -1304,14 +1308,14 @@ static int setup(struct spi_device *spi)
         chip->n_bytes = (tmp <= 8) ? 1 : 2;
 
         /* SPI datarate */
-        tmp = spi_data_rate(spi->max_speed_hz);
+        tmp = spi_data_rate(drv_data, spi->max_speed_hz);
         if (tmp == SPI_CONTROL_DATARATE_BAD) {
                 status = -EINVAL;
                 dev_err(&spi->dev,
                         "setup - "
                         "HW min speed (%d Hz) exceeds required "
                         "max speed (%d Hz)\n",
-                        spi_speed_hz(SPI_CONTROL_DATARATE_MIN),
+                        spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN),
                         spi->max_speed_hz);
                 if (first_setup)
                         goto err_first_setup;
@@ -1321,7 +1325,7 @@ static int setup(struct spi_device *spi)
         } else {
                 u32_EDIT(chip->control, SPI_CONTROL_DATARATE, tmp);
                 /* Actual rounded max_speed_hz */
-                tmp = spi_speed_hz(tmp);
+                tmp = spi_speed_hz(drv_data, tmp);
                 spi->max_speed_hz = tmp;
                 chip->max_speed_hz = tmp;
         }
@@ -1352,7 +1356,7 @@ static int setup(struct spi_device *spi)
                 chip->period & SPI_PERIOD_WAIT,
                 spi->mode,
                 spi->bits_per_word,
-                spi_speed_hz(SPI_CONTROL_DATARATE_MIN),
+                spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN),
                 spi->max_speed_hz);
         return status;
 
@@ -1465,6 +1469,14 @@ static int __init spi_imx_probe(struct platform_device *pdev)
                 goto err_no_pdata;
         }
 
+        drv_data->clk = clk_get(&pdev->dev, "perclk2");
+        if (IS_ERR(drv_data->clk)) {
+                dev_err(&pdev->dev, "probe - cannot get get\n");
+                status = PTR_ERR(drv_data->clk);
+                goto err_no_clk;
+        }
+        clk_enable(drv_data->clk);
+
         /* Allocate master with space for drv_data */
         master = spi_alloc_master(dev, sizeof(struct driver_data));
         if (!master) {
@@ -1526,24 +1538,24 @@ static int __init spi_imx_probe(struct platform_device *pdev)
         drv_data->rx_channel = -1;
         if (platform_info->enable_dma) {
                 /* Get rx DMA channel */
-                status = imx_dma_request_by_prio(&drv_data->rx_channel,
-                        "spi_imx_rx", DMA_PRIO_HIGH);
-                if (status < 0) {
+                drv_data->rx_channel = imx_dma_request_by_prio("spi_imx_rx",
+                                                               DMA_PRIO_HIGH);
+                if (drv_data->rx_channel < 0) {
                         dev_err(dev,
                                 "probe - problem (%d) requesting rx channel\n",
-                                status);
+                                drv_data->rx_channel);
                         goto err_no_rxdma;
                 } else
                         imx_dma_setup_handlers(drv_data->rx_channel, NULL,
                                                 dma_err_handler, drv_data);
 
                 /* Get tx DMA channel */
-                status = imx_dma_request_by_prio(&drv_data->tx_channel,
-                                                "spi_imx_tx", DMA_PRIO_MEDIUM);
-                if (status < 0) {
+                drv_data->tx_channel = imx_dma_request_by_prio("spi_imx_tx",
+                                                               DMA_PRIO_MEDIUM);
+                if (drv_data->tx_channel < 0) {
                         dev_err(dev,
                                 "probe - problem (%d) requesting tx channel\n",
-                                status);
+                                drv_data->tx_channel);
                         imx_dma_free(drv_data->rx_channel);
                         goto err_no_txdma;
                 } else
@@ -1623,6 +1635,9 @@ err_no_iores:
         spi_master_put(master);
 
 err_no_pdata:
+        clk_disable(drv_data->clk);
+        clk_put(drv_data->clk);
+err_no_clk:
 err_no_mem:
         return status;
 }
@@ -1662,6 +1677,9 @@ static int __exit spi_imx_remove(struct platform_device *pdev)
         if (irq >= 0)
                 free_irq(irq, drv_data);
 
+        clk_disable(drv_data->clk);
+        clk_put(drv_data->clk);
+
         /* Release map resources */
         iounmap(drv_data->regs);
         release_resource(drv_data->ioarea);
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index f5b60c70389b..ddbe1a5e970e 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -30,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/spidev.h>
@@ -464,6 +465,7 @@ static int spidev_open(struct inode *inode, struct file *filp)
         struct spidev_data      *spidev;
         int                     status = -ENXIO;
 
+        lock_kernel();
         mutex_lock(&device_list_lock);
 
         list_for_each_entry(spidev, &device_list, device_entry) {
@@ -489,6 +491,7 @@ static int spidev_open(struct inode *inode, struct file *filp)
                 pr_debug("spidev: nothing for minor %d\n", iminor(inode));
 
         mutex_unlock(&device_list_lock);
+        unlock_kernel();
         return status;
 }
 
diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index bcea8d9b718c..4d74ba36c3a1 100644
--- a/drivers/telephony/phonedev.c
+++ b/drivers/telephony/phonedev.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/phonedev.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
@@ -53,6 +54,7 @@ static int phone_open(struct inode *inode, struct file *file)
         if (minor >= PHONE_NUM_DEVICES)
                 return -ENODEV;
 
+        lock_kernel();
         mutex_lock(&phone_lock);
         p = phone_device[minor];
         if (p)
@@ -79,6 +81,7 @@ static int phone_open(struct inode *inode, struct file *file)
         fops_put(old_fops);
 end:
         mutex_unlock(&phone_lock);
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 0a12e90ad416..5a7ca2e6094d 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -297,12 +297,17 @@ static int uio_open(struct inode *inode, struct file *filep)
         struct uio_listener *listener;
         int ret = 0;
 
+        lock_kernel();
         idev = idr_find(&uio_idr, iminor(inode));
-        if (!idev)
-                return -ENODEV;
+        if (!idev) {
+                ret = -ENODEV;
+                goto out;
+        }
 
-        if (!try_module_get(idev->owner))
-                return -ENODEV;
+        if (!try_module_get(idev->owner)) {
+                ret = -ENODEV;
+                goto out;
+        }
 
         listener = kmalloc(sizeof(*listener), GFP_KERNEL);
         if (!listener) {
@@ -319,7 +324,7 @@ static int uio_open(struct inode *inode, struct file *filep)
                 if (ret)
                         goto err_infoopen;
         }
-
+        unlock_kernel();
         return 0;
 
 err_infoopen:
@@ -329,6 +334,8 @@ err_alloc_listener:
 
         module_put(idev->owner);
 
+out:
+        unlock_kernel();
         return ret;
 }
 
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index de17738f3acb..9218cca21043 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -565,6 +565,7 @@ static int usbdev_open(struct inode *inode, struct file *file)
         struct dev_state *ps;
         int ret;
 
+        lock_kernel();
         /* Protect against simultaneous removal or release */
         mutex_lock(&usbfs_mutex);
 
@@ -611,6 +612,7 @@ static int usbdev_open(struct inode *inode, struct file *file)
         if (ret)
                 kfree(ps);
         mutex_unlock(&usbfs_mutex);
+        unlock_kernel();
         return ret;
 }
 
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 8133c99c6c5c..c6a95395e52a 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/rwsem.h>
+#include <linux/smp_lock.h>
 #include <linux/usb.h>
 
 #include "usb.h"
@@ -33,6 +34,7 @@ static int usb_open(struct inode * inode, struct file * file)
         int err = -ENODEV;
         const struct file_operations *old_fops, *new_fops = NULL;
 
+        lock_kernel();
         down_read(&minor_rwsem);
         c = usb_minors[minor];
 
@@ -51,6 +53,7 @@ static int usb_open(struct inode * inode, struct file * file)
         fops_put(old_fops);
  done:
         up_read(&minor_rwsem);
+        unlock_kernel();
         return err;
 }
 
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 6e784d2db423..d6bab0d5f453 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -118,10 +118,10 @@ config USB_AMD5536UDC
 config USB_GADGET_ATMEL_USBA
         boolean "Atmel USBA"
         select USB_GADGET_DUALSPEED
-        depends on AVR32 || ARCH_AT91CAP9
+        depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL
         help
           USBA is the integrated high-speed USB Device controller on
-          the AT32AP700x and AT91CAP9 processors from Atmel.
+          the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
 
 config USB_ATMEL_USBA
         tristate
@@ -172,7 +172,7 @@ config USB_NET2280
         default USB_GADGET
         select USB_GADGET_SELECTED
 
-config USB_GADGET_PXA2XX
+config USB_GADGET_PXA25X
         boolean "PXA 25x or IXP 4xx"
         depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
         help
@@ -184,19 +184,19 @@ config USB_GADGET_PXA2XX
            zero (for control transfers).
 
            Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "pxa2xx_udc" and force all
+           dynamically linked module called "pxa25x_udc" and force all
            gadget drivers to also be dynamically linked.
 
-config USB_PXA2XX
+config USB_PXA25X
         tristate
-        depends on USB_GADGET_PXA2XX
+        depends on USB_GADGET_PXA25X
         default USB_GADGET
         select USB_GADGET_SELECTED
 
 # if there's only one gadget driver, using only two bulk endpoints,
 # don't waste memory for the other endpoints
-config USB_PXA2XX_SMALL
-        depends on USB_GADGET_PXA2XX
+config USB_PXA25X_SMALL
+        depends on USB_GADGET_PXA25X
         bool
         default n if USB_ETH_RNDIS
         default y if USB_ZERO
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 12357255d740..e258afd25faf 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -8,7 +8,7 @@ endif
 obj-$(CONFIG_USB_DUMMY_HCD)     += dummy_hcd.o
 obj-$(CONFIG_USB_NET2280)       += net2280.o
 obj-$(CONFIG_USB_AMD5536UDC)    += amd5536udc.o
-obj-$(CONFIG_USB_PXA2XX)        += pxa2xx_udc.o
+obj-$(CONFIG_USB_PXA25X)        += pxa25x_udc.o
 obj-$(CONFIG_USB_PXA27X)        += pxa27x_udc.o
 obj-$(CONFIG_USB_GOKU)          += goku_udc.o
 obj-$(CONFIG_USB_OMAP)          += omap_udc.o
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 274c60a970cd..b6b2a0a5ba37 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -888,7 +888,7 @@ static void pullup(struct at91_udc *udc, int is_on)
                 at91_udp_write(udc, AT91_UDP_TXVC, 0);
                 if (cpu_is_at91rm9200())
                         gpio_set_value(udc->board.pullup_pin, active);
-                else if (cpu_is_at91sam9260() || cpu_is_at91sam9263()) {
+                else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
                         u32     txvc = at91_udp_read(udc, AT91_UDP_TXVC);
 
                         txvc |= AT91_UDP_TXVC_PUON;
@@ -906,7 +906,7 @@ static void pullup(struct at91_udc *udc, int is_on)
                 at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
                 if (cpu_is_at91rm9200())
                         gpio_set_value(udc->board.pullup_pin, !active);
-                else if (cpu_is_at91sam9260() || cpu_is_at91sam9263()) {
+                else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
                         u32     txvc = at91_udp_read(udc, AT91_UDP_TXVC);
 
                         txvc &= ~AT91_UDP_TXVC_PUON;
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 8d61ea67a817..4ce3950b997f 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -262,7 +262,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethernet Address");
 /* For CDC-incapable hardware, choose the simple cdc subset.
  * Anything that talks bulk (without notable bugs) can do this.
  */
-#ifdef CONFIG_USB_GADGET_PXA2XX
+#ifdef CONFIG_USB_GADGET_PXA25X
 #define DEV_CONFIG_SUBSET
 #endif
 
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index f7f159c1002b..ca5149ea7312 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -29,8 +29,8 @@
 #define gadget_is_dummy(g)      0
 #endif
 
-#ifdef CONFIG_USB_GADGET_PXA2XX
-#define gadget_is_pxa(g)        !strcmp("pxa2xx_udc", (g)->name)
+#ifdef CONFIG_USB_GADGET_PXA25X
+#define gadget_is_pxa(g)        !strcmp("pxa25x_udc", (g)->name)
 #else
 #define gadget_is_pxa(g)        0
 #endif
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 69b0a2754f2a..f132a9219e11 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1501,7 +1501,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                 }
                 break;
 
-#ifndef CONFIG_USB_GADGET_PXA2XX
+#ifndef CONFIG_USB_GADGET_PXA25X
         /* PXA automagically handles this request too */
         case USB_REQ_GET_CONFIGURATION:
                 if (ctrl->bRequestType != 0x80)
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 881d74c3d964..03a7f49d207d 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -135,13 +135,17 @@ static void use_ep(struct omap_ep *ep, u16 select)
 
         if (ep->bEndpointAddress & USB_DIR_IN)
                 num |= UDC_EP_DIR;
-        UDC_EP_NUM_REG = num | select;
+        omap_writew(num | select, UDC_EP_NUM);
         /* when select, MUST deselect later !! */
 }
 
 static inline void deselect_ep(void)
 {
-        UDC_EP_NUM_REG &= ~UDC_EP_SEL;
+        u16 w;
+
+        w = omap_readw(UDC_EP_NUM);
+        w &= ~UDC_EP_SEL;
+        omap_writew(w, UDC_EP_NUM);
         /* 6 wait states before TX will happen */
 }
 
@@ -216,7 +220,7 @@ static int omap_ep_enable(struct usb_ep *_ep,
         ep->has_dma = 0;
         ep->lch = -1;
         use_ep(ep, UDC_EP_SEL);
-        UDC_CTRL_REG = udc->clr_halt;
+        omap_writew(udc->clr_halt, UDC_CTRL);
         ep->ackwait = 0;
         deselect_ep();
 
@@ -232,7 +236,7 @@ static int omap_ep_enable(struct usb_ep *_ep,
         if (desc->bmAttributes != USB_ENDPOINT_XFER_ISOC
                         && !ep->has_dma
                         && !(ep->bEndpointAddress & USB_DIR_IN)) {
-                UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                 ep->ackwait = 1 + ep->double_buf;
         }
 
@@ -259,7 +263,7 @@ static int omap_ep_disable(struct usb_ep *_ep)
         nuke (ep, -ESHUTDOWN);
         ep->ep.maxpacket = ep->maxpacket;
         ep->has_dma = 0;
-        UDC_CTRL_REG = UDC_SET_HALT;
+        omap_writew(UDC_SET_HALT, UDC_CTRL);
         list_del_init(&ep->iso);
         del_timer(&ep->timer);
 
@@ -360,13 +364,13 @@ write_packet(u8 *buf, struct omap_req *req, unsigned max)
         if (likely((((int)buf) & 1) == 0)) {
                 wp = (u16 *)buf;
                 while (max >= 2) {
-                        UDC_DATA_REG = *wp++;
+                        omap_writew(*wp++, UDC_DATA);
                         max -= 2;
                 }
                 buf = (u8 *)wp;
         }
         while (max--)
-                *(volatile u8 *)&UDC_DATA_REG = *buf++;
+                omap_writeb(*buf++, UDC_DATA);
         return len;
 }
 
@@ -385,13 +389,13 @@ static int write_fifo(struct omap_ep *ep, struct omap_req *req)
         prefetch(buf);
 
         /* PIO-IN isn't double buffered except for iso */
-        ep_stat = UDC_STAT_FLG_REG;
+        ep_stat = omap_readw(UDC_STAT_FLG);
         if (ep_stat & UDC_FIFO_UNWRITABLE)
                 return 0;
 
         count = ep->ep.maxpacket;
         count = write_packet(buf, req, count);
-        UDC_CTRL_REG = UDC_SET_FIFO_EN;
+        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
         ep->ackwait = 1;
 
         /* last packet is often short (sometimes a zlp) */
@@ -425,13 +429,13 @@ read_packet(u8 *buf, struct omap_req *req, unsigned avail)
         if (likely((((int)buf) & 1) == 0)) {
                 wp = (u16 *)buf;
                 while (avail >= 2) {
-                        *wp++ = UDC_DATA_REG;
+                        *wp++ = omap_readw(UDC_DATA);
                         avail -= 2;
                 }
                 buf = (u8 *)wp;
         }
         while (avail--)
-                *buf++ = *(volatile u8 *)&UDC_DATA_REG;
+                *buf++ = omap_readb(UDC_DATA);
         return len;
 }
 
@@ -446,7 +450,7 @@ static int read_fifo(struct omap_ep *ep, struct omap_req *req)
         prefetchw(buf);
 
         for (;;) {
-                u16     ep_stat = UDC_STAT_FLG_REG;
+                u16     ep_stat = omap_readw(UDC_STAT_FLG);
 
                 is_last = 0;
                 if (ep_stat & FIFO_EMPTY) {
@@ -460,7 +464,7 @@ static int read_fifo(struct omap_ep *ep, struct omap_req *req)
                 if (ep_stat & UDC_FIFO_FULL)
                         avail = ep->ep.maxpacket;
                 else  {
-                        avail = UDC_RXFSTAT_REG;
+                        avail = omap_readw(UDC_RXFSTAT);
                         ep->fnf = ep->double_buf;
                 }
                 count = read_packet(buf, req, avail);
@@ -473,7 +477,7 @@ static int read_fifo(struct omap_ep *ep, struct omap_req *req)
                                 req->req.status = -EOVERFLOW;
                                 avail -= count;
                                 while (avail--)
-                                        (void) *(volatile u8 *)&UDC_DATA_REG;
+                                        omap_readw(UDC_DATA);
                         }
                 } else if (req->req.length == req->req.actual)
                         is_last = 1;
@@ -491,32 +495,6 @@ static int read_fifo(struct omap_ep *ep, struct omap_req *req)
 
 /*-------------------------------------------------------------------------*/
 
-static inline dma_addr_t dma_csac(unsigned lch)
-{
-        dma_addr_t      csac;
-
-        /* omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is
-         * read before the DMA controller finished disabling the channel.
-         */
-        csac = OMAP_DMA_CSAC_REG(lch);
-        if (csac == 0)
-                csac = OMAP_DMA_CSAC_REG(lch);
-        return csac;
-}
-
-static inline dma_addr_t dma_cdac(unsigned lch)
-{
-        dma_addr_t      cdac;
-
-        /* omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is
-         * read before the DMA controller finished disabling the channel.
-         */
-        cdac = OMAP_DMA_CDAC_REG(lch);
-        if (cdac == 0)
-                cdac = OMAP_DMA_CDAC_REG(lch);
-        return cdac;
-}
-
 static u16 dma_src_len(struct omap_ep *ep, dma_addr_t start)
 {
         dma_addr_t      end;
@@ -527,7 +505,7 @@ static u16 dma_src_len(struct omap_ep *ep, dma_addr_t start)
         if (cpu_is_omap15xx())
                 return 0;
 
-        end = dma_csac(ep->lch);
+        end = omap_get_dma_src_pos(ep->lch);
         if (end == ep->dma_counter)
                 return 0;
 
@@ -537,15 +515,11 @@ static u16 dma_src_len(struct omap_ep *ep, dma_addr_t start)
         return end - start;
 }
 
-#define DMA_DEST_LAST(x) (cpu_is_omap15xx() \
-                ? OMAP_DMA_CSAC_REG(x) /* really: CPC */ \
-                : dma_cdac(x))
-
 static u16 dma_dest_len(struct omap_ep *ep, dma_addr_t start)
 {
         dma_addr_t      end;
 
-        end = DMA_DEST_LAST(ep->lch);
+        end = omap_get_dma_dst_pos(ep->lch);
         if (end == ep->dma_counter)
                 return 0;
 
@@ -565,7 +539,7 @@ static u16 dma_dest_len(struct omap_ep *ep, dma_addr_t start)
 
 static void next_in_dma(struct omap_ep *ep, struct omap_req *req)
 {
-        u16             txdma_ctrl;
+        u16             txdma_ctrl, w;
         unsigned        length = req->req.length - req->req.actual;
         const int       sync_mode = cpu_is_omap15xx()
                                 ? OMAP_DMA_SYNC_FRAME
@@ -596,14 +570,18 @@ static void next_in_dma(struct omap_ep *ep, struct omap_req *req)
                 0, 0);
 
         omap_start_dma(ep->lch);
-        ep->dma_counter = dma_csac(ep->lch);
-        UDC_DMA_IRQ_EN_REG |= UDC_TX_DONE_IE(ep->dma_channel);
-        UDC_TXDMA_REG(ep->dma_channel) = UDC_TXN_START | txdma_ctrl;
+        ep->dma_counter = omap_get_dma_src_pos(ep->lch);
+        w = omap_readw(UDC_DMA_IRQ_EN);
+        w |= UDC_TX_DONE_IE(ep->dma_channel);
+        omap_writew(w, UDC_DMA_IRQ_EN);
+        omap_writew(UDC_TXN_START | txdma_ctrl, UDC_TXDMA(ep->dma_channel));
         req->dma_bytes = length;
 }
 
 static void finish_in_dma(struct omap_ep *ep, struct omap_req *req, int status)
 {
+        u16 w;
+
         if (status == 0) {
                 req->req.actual += req->dma_bytes;
 
@@ -620,7 +598,9 @@ static void finish_in_dma(struct omap_ep *ep, struct omap_req *req, int status)
 
         /* tx completion */
         omap_stop_dma(ep->lch);
-        UDC_DMA_IRQ_EN_REG &= ~UDC_TX_DONE_IE(ep->dma_channel);
+        w = omap_readw(UDC_DMA_IRQ_EN);
+        w &= ~UDC_TX_DONE_IE(ep->dma_channel);
+        omap_writew(w, UDC_DMA_IRQ_EN);
         done(ep, req, status);
 }
 
@@ -628,6 +608,7 @@ static void next_out_dma(struct omap_ep *ep, struct omap_req *req)
 {
         unsigned packets = req->req.length - req->req.actual;
         int dma_trigger = 0;
+        u16 w;
 
         if (cpu_is_omap24xx())
                 dma_trigger = OMAP24XX_DMA(USB_W2FC_RX0, ep->dma_channel);
@@ -654,12 +635,14 @@ static void next_out_dma(struct omap_ep *ep, struct omap_req *req)
         omap_set_dma_dest_params(ep->lch, OMAP_DMA_PORT_EMIFF,
                 OMAP_DMA_AMODE_POST_INC, req->req.dma + req->req.actual,
                 0, 0);
-        ep->dma_counter = DMA_DEST_LAST(ep->lch);
+        ep->dma_counter = omap_get_dma_dst_pos(ep->lch);
 
-        UDC_RXDMA_REG(ep->dma_channel) = UDC_RXN_STOP | (packets - 1);
-        UDC_DMA_IRQ_EN_REG |= UDC_RX_EOT_IE(ep->dma_channel);
-        UDC_EP_NUM_REG = (ep->bEndpointAddress & 0xf);
-        UDC_CTRL_REG = UDC_SET_FIFO_EN;
+        omap_writew(UDC_RXN_STOP | (packets - 1), UDC_RXDMA(ep->dma_channel));
+        w = omap_readw(UDC_DMA_IRQ_EN);
+        w |= UDC_RX_EOT_IE(ep->dma_channel);
+        omap_writew(w, UDC_DMA_IRQ_EN);
+        omap_writew(ep->bEndpointAddress & 0xf, UDC_EP_NUM);
+        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
 
         omap_start_dma(ep->lch);
 }
@@ -667,7 +650,7 @@ static void next_out_dma(struct omap_ep *ep, struct omap_req *req)
 static void
 finish_out_dma(struct omap_ep *ep, struct omap_req *req, int status, int one)
 {
-        u16     count;
+        u16     count, w;
 
         if (status == 0)
                 ep->dma_counter = (u16) (req->req.dma + req->req.actual);
@@ -686,13 +669,15 @@ finish_out_dma(struct omap_ep *ep, struct omap_req *req, int status, int one)
                 return;
 
         /* rx completion */
-        UDC_DMA_IRQ_EN_REG &= ~UDC_RX_EOT_IE(ep->dma_channel);
+        w = omap_readw(UDC_DMA_IRQ_EN);
+        w &= ~UDC_RX_EOT_IE(ep->dma_channel);
+        omap_writew(w, UDC_DMA_IRQ_EN);
         done(ep, req, status);
 }
 
 static void dma_irq(struct omap_udc *udc, u16 irq_src)
 {
-        u16             dman_stat = UDC_DMAN_STAT_REG;
+        u16             dman_stat = omap_readw(UDC_DMAN_STAT);
         struct omap_ep  *ep;
         struct omap_req *req;
 
@@ -706,7 +691,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
                                                 struct omap_req, queue);
                         finish_in_dma(ep, req, 0);
                 }
-                UDC_IRQ_SRC_REG = UDC_TXN_DONE;
+                omap_writew(UDC_TXN_DONE, UDC_IRQ_SRC);
 
                 if (!list_empty (&ep->queue)) {
                         req = container_of(ep->queue.next,
@@ -725,7 +710,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
                                         struct omap_req, queue);
                         finish_out_dma(ep, req, 0, dman_stat & UDC_DMA_RX_SB);
                 }
-                UDC_IRQ_SRC_REG = UDC_RXN_EOT;
+                omap_writew(UDC_RXN_EOT, UDC_IRQ_SRC);
 
                 if (!list_empty (&ep->queue)) {
                         req = container_of(ep->queue.next,
@@ -739,7 +724,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
                 ep->irqs++;
                 /* omap15xx does this unasked... */
                 VDBG("%s, RX_CNT irq?\n", ep->ep.name);
-                UDC_IRQ_SRC_REG = UDC_RXN_CNT;
+                omap_writew(UDC_RXN_CNT, UDC_IRQ_SRC);
         }
 }
 
@@ -762,9 +747,9 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
 
         is_in = ep->bEndpointAddress & USB_DIR_IN;
         if (is_in)
-                reg = UDC_TXDMA_CFG_REG;
+                reg = omap_readw(UDC_TXDMA_CFG);
         else
-                reg = UDC_RXDMA_CFG_REG;
+                reg = omap_readw(UDC_RXDMA_CFG);
         reg |= UDC_DMA_REQ;             /* "pulse" activated */
 
         ep->dma_channel = 0;
@@ -792,7 +777,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
                 status = omap_request_dma(dma_channel,
                         ep->ep.name, dma_error, ep, &ep->lch);
                 if (status == 0) {
-                        UDC_TXDMA_CFG_REG = reg;
+                        omap_writew(reg, UDC_TXDMA_CFG);
                         /* EMIFF or SDRC */
                         omap_set_dma_src_burst_mode(ep->lch,
                                                 OMAP_DMA_DATA_BURST_4);
@@ -801,7 +786,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
                         omap_set_dma_dest_params(ep->lch,
                                 OMAP_DMA_PORT_TIPB,
                                 OMAP_DMA_AMODE_CONSTANT,
-                                (unsigned long) io_v2p((u32)&UDC_DATA_DMA_REG),
+                                (unsigned long) io_v2p(UDC_DATA_DMA),
                                 0, 0);
                 }
         } else {
@@ -813,12 +798,12 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
                 status = omap_request_dma(dma_channel,
                         ep->ep.name, dma_error, ep, &ep->lch);
                 if (status == 0) {
-                        UDC_RXDMA_CFG_REG = reg;
+                        omap_writew(reg, UDC_RXDMA_CFG);
                         /* TIPB */
                         omap_set_dma_src_params(ep->lch,
                                 OMAP_DMA_PORT_TIPB,
                                 OMAP_DMA_AMODE_CONSTANT,
-                                (unsigned long) io_v2p((u32)&UDC_DATA_DMA_REG),
+                                (unsigned long) io_v2p(UDC_DATA_DMA),
                                 0, 0);
                         /* EMIFF or SDRC */
                         omap_set_dma_dest_burst_mode(ep->lch,
@@ -834,7 +819,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
 
                 /* channel type P: hw synch (fifo) */
                 if (cpu_class_is_omap1() && !cpu_is_omap15xx())
-                        OMAP1_DMA_LCH_CTRL_REG(ep->lch) = 2;
+                        omap_set_dma_channel_mode(ep->lch, OMAP_DMA_LCH_P);
         }
 
 just_restart:
@@ -860,7 +845,7 @@ just_restart:
                         (is_in ? write_fifo : read_fifo)(ep, req);
                         deselect_ep();
                         if (!is_in) {
-                                UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                                omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                                 ep->ackwait = 1 + ep->double_buf;
                         }
                         /* IN: 6 wait states before it'll tx */
@@ -881,7 +866,7 @@ static void dma_channel_release(struct omap_ep *ep)
         else
                 req = NULL;
 
-        active = ((1 << 7) & OMAP_DMA_CCR_REG(ep->lch)) != 0;
+        active = omap_get_dma_active_status(ep->lch);
 
         DBG("%s release %s %cxdma%d %p\n", ep->ep.name,
                         active ? "active" : "idle",
@@ -894,23 +879,25 @@ static void dma_channel_release(struct omap_ep *ep)
 
         /* wait till current packet DMA finishes, and fifo empties */
         if (ep->bEndpointAddress & USB_DIR_IN) {
-                UDC_TXDMA_CFG_REG = (UDC_TXDMA_CFG_REG & ~mask) | UDC_DMA_REQ;
+                omap_writew((omap_readw(UDC_TXDMA_CFG) & ~mask) | UDC_DMA_REQ,
+                                        UDC_TXDMA_CFG);
 
                 if (req) {
                         finish_in_dma(ep, req, -ECONNRESET);
 
                         /* clear FIFO; hosts probably won't empty it */
                         use_ep(ep, UDC_EP_SEL);
-                        UDC_CTRL_REG = UDC_CLR_EP;
+                        omap_writew(UDC_CLR_EP, UDC_CTRL);
                         deselect_ep();
                 }
-                while (UDC_TXDMA_CFG_REG & mask)
+                while (omap_readw(UDC_TXDMA_CFG) & mask)
                         udelay(10);
         } else {
-                UDC_RXDMA_CFG_REG = (UDC_RXDMA_CFG_REG & ~mask) | UDC_DMA_REQ;
+                omap_writew((omap_readw(UDC_RXDMA_CFG) & ~mask) | UDC_DMA_REQ,
+                                        UDC_RXDMA_CFG);
 
                 /* dma empties the fifo */
-                while (UDC_RXDMA_CFG_REG & mask)
+                while (omap_readw(UDC_RXDMA_CFG) & mask)
                         udelay(10);
                 if (req)
                         finish_out_dma(ep, req, -ECONNRESET, 0);
@@ -997,9 +984,13 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
         req->req.actual = 0;
 
         /* maybe kickstart non-iso i/o queues */
-        if (is_iso)
-                UDC_IRQ_EN_REG |= UDC_SOF_IE;
-        else if (list_empty(&ep->queue) && !ep->stopped && !ep->ackwait) {
+        if (is_iso) {
+                u16 w;
+
+                w = omap_readw(UDC_IRQ_EN);
+                w |= UDC_SOF_IE;
+                omap_writew(w, UDC_IRQ_EN);
+        } else if (list_empty(&ep->queue) && !ep->stopped && !ep->ackwait) {
                 int     is_in;
 
                 if (ep->bEndpointAddress == 0) {
@@ -1017,23 +1008,23 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
                                  * requests to non-control endpoints
                                  */
                                 if (udc->ep0_set_config) {
-                                        u16     irq_en = UDC_IRQ_EN_REG;
+                                        u16     irq_en = omap_readw(UDC_IRQ_EN);
 
                                         irq_en |= UDC_DS_CHG_IE | UDC_EP0_IE;
                                         if (!udc->ep0_reset_config)
                                                 irq_en |= UDC_EPN_RX_IE
                                                         | UDC_EPN_TX_IE;
-                                        UDC_IRQ_EN_REG = irq_en;
+                                        omap_writew(irq_en, UDC_IRQ_EN);
                                 }
 
                                 /* STATUS for zero length DATA stages is
                                  * always an IN ... even for IN transfers,
                                  * a weird case which seem to stall OMAP.
                                  */
-                                UDC_EP_NUM_REG = (UDC_EP_SEL|UDC_EP_DIR);
-                                UDC_CTRL_REG = UDC_CLR_EP;
-                                UDC_CTRL_REG = UDC_SET_FIFO_EN;
-                                UDC_EP_NUM_REG = UDC_EP_DIR;
+                                omap_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
+                                omap_writew(UDC_CLR_EP, UDC_CTRL);
+                                omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+                                omap_writew(UDC_EP_DIR, UDC_EP_NUM);
 
                                 /* cleanup */
                                 udc->ep0_pending = 0;
@@ -1042,11 +1033,11 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 
                         /* non-empty DATA stage */
                         } else if (is_in) {
-                                UDC_EP_NUM_REG = UDC_EP_SEL|UDC_EP_DIR;
+                                omap_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
                         } else {
                                 if (udc->ep0_setup)
                                         goto irq_wait;
-                                UDC_EP_NUM_REG = UDC_EP_SEL;
+                                omap_writew(UDC_EP_SEL, UDC_EP_NUM);
                         }
                 } else {
                         is_in = ep->bEndpointAddress & USB_DIR_IN;
@@ -1062,7 +1053,7 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
                                 req = NULL;
                         deselect_ep();
                         if (!is_in) {
-                                UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                                omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                                 ep->ackwait = 1 + ep->double_buf;
                         }
                         /* IN: 6 wait states before it'll tx */
@@ -1130,9 +1121,9 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value)
                 else if (value) {
                         if (ep->udc->ep0_set_config) {
                                 WARN("error changing config?\n");
-                                UDC_SYSCON2_REG = UDC_CLR_CFG;
+                                omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
                         }
-                        UDC_SYSCON2_REG = UDC_STALL_CMD;
+                        omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
                         ep->udc->ep0_pending = 0;
                         status = 0;
                 } else /* NOP */
@@ -1159,8 +1150,8 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value)
                                 channel = 0;
 
                         use_ep(ep, UDC_EP_SEL);
-                        if (UDC_STAT_FLG_REG & UDC_NON_ISO_FIFO_EMPTY) {
-                                UDC_CTRL_REG = UDC_SET_HALT;
+                        if (omap_readw(UDC_STAT_FLG) & UDC_NON_ISO_FIFO_EMPTY) {
+                                omap_writew(UDC_SET_HALT, UDC_CTRL);
                                 status = 0;
                         } else
                                 status = -EAGAIN;
@@ -1170,10 +1161,10 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value)
                                 dma_channel_claim(ep, channel);
                 } else {
                         use_ep(ep, 0);
-                        UDC_CTRL_REG = ep->udc->clr_halt;
+                        omap_writew(ep->udc->clr_halt, UDC_CTRL);
                         ep->ackwait = 0;
                         if (!(ep->bEndpointAddress & USB_DIR_IN)) {
-                                UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                                omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                                 ep->ackwait = 1 + ep->double_buf;
                         }
                 }
@@ -1205,7 +1196,7 @@ static struct usb_ep_ops omap_ep_ops = {
 
 static int omap_get_frame(struct usb_gadget *gadget)
 {
-        u16     sof = UDC_SOF_REG;
+        u16     sof = omap_readw(UDC_SOF);
         return (sof & UDC_TS_OK) ? (sof & UDC_TS) : -EL2NSYNC;
 }
 
@@ -1224,7 +1215,7 @@ static int omap_wakeup(struct usb_gadget *gadget)
                  */
                 if (udc->devstat & (UDC_B_HNP_ENABLE|UDC_R_WK_OK)) {
                         DBG("remote wakeup...\n");
-                        UDC_SYSCON2_REG = UDC_RMT_WKP;
+                        omap_writew(UDC_RMT_WKP, UDC_SYSCON2);
                         retval = 0;
                 }
 
@@ -1247,12 +1238,12 @@ omap_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
 
         udc = container_of(gadget, struct omap_udc, gadget);
         spin_lock_irqsave(&udc->lock, flags);
-        syscon1 = UDC_SYSCON1_REG;
+        syscon1 = omap_readw(UDC_SYSCON1);
         if (is_selfpowered)
                 syscon1 |= UDC_SELF_PWR;
         else
                 syscon1 &= ~UDC_SELF_PWR;
-        UDC_SYSCON1_REG = syscon1;
+        omap_writew(syscon1, UDC_SYSCON1);
         spin_unlock_irqrestore(&udc->lock, flags);
 
         return 0;
@@ -1265,18 +1256,36 @@ static int can_pullup(struct omap_udc *udc)
 
 static void pullup_enable(struct omap_udc *udc)
 {
-        UDC_SYSCON1_REG |= UDC_PULLUP_EN;
-        if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx())
-                OTG_CTRL_REG |= OTG_BSESSVLD;
-        UDC_IRQ_EN_REG = UDC_DS_CHG_IE;
+        u16 w;
+
+        w = omap_readw(UDC_SYSCON1);
+        w |= UDC_PULLUP_EN;
+        omap_writew(w, UDC_SYSCON1);
+        if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) {
+                u32 l;
+
+                l = omap_readl(OTG_CTRL);
+                l |= OTG_BSESSVLD;
+                omap_writel(l, OTG_CTRL);
+        }
+        omap_writew(UDC_DS_CHG_IE, UDC_IRQ_EN);
 }
 
 static void pullup_disable(struct omap_udc *udc)
 {
-        if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx())
-                OTG_CTRL_REG &= ~OTG_BSESSVLD;
-        UDC_IRQ_EN_REG = UDC_DS_CHG_IE;
-        UDC_SYSCON1_REG &= ~UDC_PULLUP_EN;
+        u16 w;
+
+        if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) {
+                u32 l;
+
+                l = omap_readl(OTG_CTRL);
+                l &= ~OTG_BSESSVLD;
+                omap_writel(l, OTG_CTRL);
+        }
+        omap_writew(UDC_DS_CHG_IE, UDC_IRQ_EN);
+        w = omap_readw(UDC_SYSCON1);
+        w &= ~UDC_PULLUP_EN;
+        omap_writew(w, UDC_SYSCON1);
 }
 
 static struct omap_udc *udc;
@@ -1304,6 +1313,7 @@ static int omap_vbus_session(struct usb_gadget *gadget, int is_active)
 {
         struct omap_udc *udc;
         unsigned long   flags;
+        u32 l;
 
         udc = container_of(gadget, struct omap_udc, gadget);
         spin_lock_irqsave(&udc->lock, flags);
@@ -1311,10 +1321,12 @@ static int omap_vbus_session(struct usb_gadget *gadget, int is_active)
         udc->vbus_active = (is_active != 0);
         if (cpu_is_omap15xx()) {
                 /* "software" detect, ignored if !VBUS_MODE_1510 */
+                l = omap_readl(FUNC_MUX_CTRL_0);
                 if (is_active)
-                        FUNC_MUX_CTRL_0_REG |= VBUS_CTRL_1510;
+                        l |= VBUS_CTRL_1510;
                 else
-                        FUNC_MUX_CTRL_0_REG &= ~VBUS_CTRL_1510;
+                        l &= ~VBUS_CTRL_1510;
+                omap_writel(l, FUNC_MUX_CTRL_0);
         }
         if (udc->dc_clk != NULL && is_active) {
                 if (!udc->clk_requested) {
@@ -1384,9 +1396,9 @@ static void nuke(struct omap_ep *ep, int status)
                 dma_channel_release(ep);
 
         use_ep(ep, 0);
-        UDC_CTRL_REG = UDC_CLR_EP;
+        omap_writew(UDC_CLR_EP, UDC_CTRL);
         if (ep->bEndpointAddress && ep->bmAttributes != USB_ENDPOINT_XFER_ISOC)
-                UDC_CTRL_REG = UDC_SET_HALT;
+                omap_writew(UDC_SET_HALT, UDC_CTRL);
 
         while (!list_empty(&ep->queue)) {
                 req = list_entry(ep->queue.next, struct omap_req, queue);
@@ -1414,8 +1426,8 @@ static void update_otg(struct omap_udc *udc)
         if (!gadget_is_otg(&udc->gadget))
                 return;
 
-        if (OTG_CTRL_REG & OTG_ID)
-                devstat = UDC_DEVSTAT_REG;
+        if (omap_readl(OTG_CTRL) & OTG_ID)
+                devstat = omap_readw(UDC_DEVSTAT);
         else
                 devstat = 0;
 
@@ -1426,9 +1438,14 @@ static void update_otg(struct omap_udc *udc)
         /* Enable HNP early, avoiding races on suspend irq path.
          * ASSUMES OTG state machine B_BUS_REQ input is true.
          */
-        if (udc->gadget.b_hnp_enable)
-                OTG_CTRL_REG = (OTG_CTRL_REG | OTG_B_HNPEN | OTG_B_BUSREQ)
-                                & ~OTG_PULLUP;
+        if (udc->gadget.b_hnp_enable) {
+                u32 l;
+
+                l = omap_readl(OTG_CTRL);
+                l |= OTG_B_HNPEN | OTG_B_BUSREQ;
+                l &= ~OTG_PULLUP;
+                omap_writel(l, OTG_CTRL);
+        }
 }
 
 static void ep0_irq(struct omap_udc *udc, u16 irq_src)
@@ -1446,7 +1463,7 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 
                 nuke(ep0, 0);
                 if (ack) {
-                        UDC_IRQ_SRC_REG = ack;
+                        omap_writew(ack, UDC_IRQ_SRC);
                         irq_src = UDC_SETUP;
                 }
         }
@@ -1466,9 +1483,9 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
         if (irq_src & UDC_EP0_TX) {
                 int     stat;
 
-                UDC_IRQ_SRC_REG = UDC_EP0_TX;
-                UDC_EP_NUM_REG = UDC_EP_SEL|UDC_EP_DIR;
-                stat = UDC_STAT_FLG_REG;
+                omap_writew(UDC_EP0_TX, UDC_IRQ_SRC);
+                omap_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
+                stat = omap_readw(UDC_STAT_FLG);
                 if (stat & UDC_ACK) {
                         if (udc->ep0_in) {
                                 /* write next IN packet from response,
@@ -1476,26 +1493,26 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
                                  */
                                 if (req)
                                         stat = write_fifo(ep0, req);
-                                UDC_EP_NUM_REG = UDC_EP_DIR;
+                                omap_writew(UDC_EP_DIR, UDC_EP_NUM);
                                 if (!req && udc->ep0_pending) {
-                                        UDC_EP_NUM_REG = UDC_EP_SEL;
-                                        UDC_CTRL_REG = UDC_CLR_EP;
-                                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
-                                        UDC_EP_NUM_REG = 0;
+                                        omap_writew(UDC_EP_SEL, UDC_EP_NUM);
+                                        omap_writew(UDC_CLR_EP, UDC_CTRL);
+                                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+                                        omap_writew(0, UDC_EP_NUM);
                                         udc->ep0_pending = 0;
                                 } /* else:  6 wait states before it'll tx */
                         } else {
                                 /* ack status stage of OUT transfer */
-                                UDC_EP_NUM_REG = UDC_EP_DIR;
+                                omap_writew(UDC_EP_DIR, UDC_EP_NUM);
                                 if (req)
                                         done(ep0, req, 0);
                         }
                         req = NULL;
                 } else if (stat & UDC_STALL) {
-                        UDC_CTRL_REG = UDC_CLR_HALT;
-                        UDC_EP_NUM_REG = UDC_EP_DIR;
+                        omap_writew(UDC_CLR_HALT, UDC_CTRL);
+                        omap_writew(UDC_EP_DIR, UDC_EP_NUM);
                 } else {
-                        UDC_EP_NUM_REG = UDC_EP_DIR;
+                        omap_writew(UDC_EP_DIR, UDC_EP_NUM);
                 }
         }
 
@@ -1503,9 +1520,9 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
         if (irq_src & UDC_EP0_RX) {
                 int     stat;
 
-                UDC_IRQ_SRC_REG = UDC_EP0_RX;
-                UDC_EP_NUM_REG = UDC_EP_SEL;
-                stat = UDC_STAT_FLG_REG;
+                omap_writew(UDC_EP0_RX, UDC_IRQ_SRC);
+                omap_writew(UDC_EP_SEL, UDC_EP_NUM);
+                stat = omap_readw(UDC_STAT_FLG);
                 if (stat & UDC_ACK) {
                         if (!udc->ep0_in) {
                                 stat = 0;
@@ -1513,34 +1530,35 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
                                  * reactiviting the fifo; stall on errors.
                                  */
                                 if (!req || (stat = read_fifo(ep0, req)) < 0) {
-                                        UDC_SYSCON2_REG = UDC_STALL_CMD;
+                                        omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
                                         udc->ep0_pending = 0;
                                         stat = 0;
                                 } else if (stat == 0)
-                                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
-                                UDC_EP_NUM_REG = 0;
+                                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+                                omap_writew(0, UDC_EP_NUM);
 
                                 /* activate status stage */
                                 if (stat == 1) {
                                         done(ep0, req, 0);
                                         /* that may have STALLed ep0... */
-                                        UDC_EP_NUM_REG = UDC_EP_SEL|UDC_EP_DIR;
-                                        UDC_CTRL_REG = UDC_CLR_EP;
-                                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
-                                        UDC_EP_NUM_REG = UDC_EP_DIR;
+                                        omap_writew(UDC_EP_SEL | UDC_EP_DIR,
+                                                        UDC_EP_NUM);
+                                        omap_writew(UDC_CLR_EP, UDC_CTRL);
+                                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+                                        omap_writew(UDC_EP_DIR, UDC_EP_NUM);
                                         udc->ep0_pending = 0;
                                 }
                         } else {
                                 /* ack status stage of IN transfer */
-                                UDC_EP_NUM_REG = 0;
+                                omap_writew(0, UDC_EP_NUM);
                                 if (req)
                                         done(ep0, req, 0);
                         }
                 } else if (stat & UDC_STALL) {
-                        UDC_CTRL_REG = UDC_CLR_HALT;
-                        UDC_EP_NUM_REG = 0;
+                        omap_writew(UDC_CLR_HALT, UDC_CTRL);
+                        omap_writew(0, UDC_EP_NUM);
                 } else {
-                        UDC_EP_NUM_REG = 0;
+                        omap_writew(0, UDC_EP_NUM);
                 }
         }
 
@@ -1555,14 +1573,14 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
 
                 /* read the (latest) SETUP message */
                 do {
-                        UDC_EP_NUM_REG = UDC_SETUP_SEL;
+                        omap_writew(UDC_SETUP_SEL, UDC_EP_NUM);
                         /* two bytes at a time */
-                        u.word[0] = UDC_DATA_REG;
-                        u.word[1] = UDC_DATA_REG;
-                        u.word[2] = UDC_DATA_REG;
-                        u.word[3] = UDC_DATA_REG;
-                        UDC_EP_NUM_REG = 0;
-                } while (UDC_IRQ_SRC_REG & UDC_SETUP);
+                        u.word[0] = omap_readw(UDC_DATA);
+                        u.word[1] = omap_readw(UDC_DATA);
+                        u.word[2] = omap_readw(UDC_DATA);
+                        u.word[3] = omap_readw(UDC_DATA);
+                        omap_writew(0, UDC_EP_NUM);
+                } while (omap_readw(UDC_IRQ_SRC) & UDC_SETUP);
 
 #define w_value         le16_to_cpu(u.r.wValue)
 #define w_index         le16_to_cpu(u.r.wIndex)
@@ -1593,9 +1611,9 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
                          * later if it fails the request.
                          */
                         if (udc->ep0_reset_config)
-                                UDC_SYSCON2_REG = UDC_CLR_CFG;
+                                omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
                         else
-                                UDC_SYSCON2_REG = UDC_DEV_CFG;
+                                omap_writew(UDC_DEV_CFG, UDC_SYSCON2);
                         update_otg(udc);
                         goto delegate;
                 case USB_REQ_CLEAR_FEATURE:
@@ -1613,10 +1631,10 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
                                                 || !ep->desc)
                                         goto do_stall;
                                 use_ep(ep, 0);
-                                UDC_CTRL_REG = udc->clr_halt;
+                                omap_writew(udc->clr_halt, UDC_CTRL);
                                 ep->ackwait = 0;
                                 if (!(ep->bEndpointAddress & USB_DIR_IN)) {
-                                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                                         ep->ackwait = 1 + ep->double_buf;
                                 }
                                 /* NOTE:  assumes the host behaves sanely,
@@ -1649,15 +1667,15 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
                         }
                         use_ep(ep, 0);
                         /* can't halt if fifo isn't empty... */
-                        UDC_CTRL_REG = UDC_CLR_EP;
-                        UDC_CTRL_REG = UDC_SET_HALT;
+                        omap_writew(UDC_CLR_EP, UDC_CTRL);
+                        omap_writew(UDC_SET_HALT, UDC_CTRL);
                         VDBG("%s halted by host\n", ep->name);
 ep0out_status_stage:
                         status = 0;
-                        UDC_EP_NUM_REG = UDC_EP_SEL|UDC_EP_DIR;
-                        UDC_CTRL_REG = UDC_CLR_EP;
-                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
-                        UDC_EP_NUM_REG = UDC_EP_DIR;
+                        omap_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
+                        omap_writew(UDC_CLR_EP, UDC_CTRL);
+                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+                        omap_writew(UDC_EP_DIR, UDC_EP_NUM);
                         udc->ep0_pending = 0;
                         break;
                 case USB_REQ_GET_STATUS:
@@ -1694,10 +1712,10 @@ intf_status:
 
 zero_status:
                         /* return two zero bytes */
-                        UDC_EP_NUM_REG = UDC_EP_SEL|UDC_EP_DIR;
-                        UDC_DATA_REG = 0;
-                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
-                        UDC_EP_NUM_REG = UDC_EP_DIR;
+                        omap_writew(UDC_EP_SEL|UDC_EP_DIR, UDC_EP_NUM);
+                        omap_writew(0, UDC_DATA);
+                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
+                        omap_writew(UDC_EP_DIR, UDC_EP_NUM);
                         status = 0;
                         VDBG("GET_STATUS, interface %d\n", w_index);
                         /* next, status stage */
@@ -1706,8 +1724,8 @@ zero_status:
 delegate:
                         /* activate the ep0out fifo right away */
                         if (!udc->ep0_in && w_length) {
-                                UDC_EP_NUM_REG = 0;
-                                UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                                omap_writew(0, UDC_EP_NUM);
+                                omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                         }
 
                         /* gadget drivers see class/vendor specific requests,
@@ -1748,9 +1766,9 @@ do_stall:
                                 if (udc->ep0_reset_config)
                                         WARN("error resetting config?\n");
                                 else
-                                        UDC_SYSCON2_REG = UDC_CLR_CFG;
+                                        omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
                         }
-                        UDC_SYSCON2_REG = UDC_STALL_CMD;
+                        omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
                         udc->ep0_pending = 0;
                 }
         }
@@ -1764,7 +1782,7 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
 {
         u16     devstat, change;
 
-        devstat = UDC_DEVSTAT_REG;
+        devstat = omap_readw(UDC_DEVSTAT);
         change = devstat ^ udc->devstat;
         udc->devstat = devstat;
 
@@ -1804,7 +1822,8 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                                 INFO("USB reset done, gadget %s\n",
                                         udc->driver->driver.name);
                                 /* ep0 traffic is legal from now on */
-                                UDC_IRQ_EN_REG = UDC_DS_CHG_IE | UDC_EP0_IE;
+                                omap_writew(UDC_DS_CHG_IE | UDC_EP0_IE,
+                                                UDC_IRQ_EN);
                         }
                         change &= ~UDC_USB_RESET;
                 }
@@ -1848,7 +1867,7 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                 VDBG("devstat %03x, ignore change %03x\n",
                         devstat,  change);
 
-        UDC_IRQ_SRC_REG = UDC_DS_CHG;
+        omap_writew(UDC_DS_CHG, UDC_IRQ_SRC);
 }
 
 static irqreturn_t omap_udc_irq(int irq, void *_udc)
@@ -1859,7 +1878,7 @@ static irqreturn_t omap_udc_irq(int irq, void *_udc)
         unsigned long   flags;
 
         spin_lock_irqsave(&udc->lock, flags);
-        irq_src = UDC_IRQ_SRC_REG;
+        irq_src = omap_readw(UDC_IRQ_SRC);
 
         /* Device state change (usb ch9 stuff) */
         if (irq_src & UDC_DS_CHG) {
@@ -1882,7 +1901,7 @@ static irqreturn_t omap_udc_irq(int irq, void *_udc)
                 irq_src &= ~(UDC_TXN_DONE|UDC_RXN_CNT|UDC_RXN_EOT);
         }
 
-        irq_src &= ~(UDC_SOF|UDC_EPN_TX|UDC_EPN_RX);
+        irq_src &= ~(UDC_IRQ_SOF | UDC_EPN_TX|UDC_EPN_RX);
         if (irq_src)
                 DBG("udc_irq, unhandled %03x\n", irq_src);
         spin_unlock_irqrestore(&udc->lock, flags);
@@ -1903,7 +1922,7 @@ static void pio_out_timer(unsigned long _ep)
         spin_lock_irqsave(&ep->udc->lock, flags);
         if (!list_empty(&ep->queue) && ep->ackwait) {
                 use_ep(ep, UDC_EP_SEL);
-                stat_flg = UDC_STAT_FLG_REG;
+                stat_flg = omap_readw(UDC_STAT_FLG);
 
                 if ((stat_flg & UDC_ACK) && (!(stat_flg & UDC_FIFO_EN)
                                 || (ep->double_buf && HALF_FULL(stat_flg)))) {
@@ -1913,8 +1932,8 @@ static void pio_out_timer(unsigned long _ep)
                         req = container_of(ep->queue.next,
                                         struct omap_req, queue);
                         (void) read_fifo(ep, req);
-                        UDC_EP_NUM_REG = ep->bEndpointAddress;
-                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                        omap_writew(ep->bEndpointAddress, UDC_EP_NUM);
+                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                         ep->ackwait = 1 + ep->double_buf;
                 } else
                         deselect_ep();
@@ -1934,20 +1953,20 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
         unsigned long   flags;
 
         spin_lock_irqsave(&udc->lock, flags);
-        epn_stat = UDC_EPN_STAT_REG;
-        irq_src = UDC_IRQ_SRC_REG;
+        epn_stat = omap_readw(UDC_EPN_STAT);
+        irq_src = omap_readw(UDC_IRQ_SRC);
 
         /* handle OUT first, to avoid some wasteful NAKs */
         if (irq_src & UDC_EPN_RX) {
                 epnum = (epn_stat >> 8) & 0x0f;
-                UDC_IRQ_SRC_REG = UDC_EPN_RX;
+                omap_writew(UDC_EPN_RX, UDC_IRQ_SRC);
                 status = IRQ_HANDLED;
                 ep = &udc->ep[epnum];
                 ep->irqs++;
 
-                UDC_EP_NUM_REG = epnum | UDC_EP_SEL;
+                omap_writew(epnum | UDC_EP_SEL, UDC_EP_NUM);
                 ep->fnf = 0;
-                if ((UDC_STAT_FLG_REG & UDC_ACK)) {
+                if (omap_readw(UDC_STAT_FLG) & UDC_ACK) {
                         ep->ackwait--;
                         if (!list_empty(&ep->queue)) {
                                 int stat;
@@ -1959,15 +1978,15 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
                         }
                 }
                 /* min 6 clock delay before clearing EP_SEL ... */
-                epn_stat = UDC_EPN_STAT_REG;
-                epn_stat = UDC_EPN_STAT_REG;
-                UDC_EP_NUM_REG = epnum;
+                epn_stat = omap_readw(UDC_EPN_STAT);
+                epn_stat = omap_readw(UDC_EPN_STAT);
+                omap_writew(epnum, UDC_EP_NUM);
 
                 /* enabling fifo _after_ clearing ACK, contrary to docs,
                  * reduces lossage; timer still needed though (sigh).
                  */
                 if (ep->fnf) {
-                        UDC_CTRL_REG = UDC_SET_FIFO_EN;
+                        omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                         ep->ackwait = 1 + ep->double_buf;
                 }
                 mod_timer(&ep->timer, PIO_OUT_TIMEOUT);
@@ -1976,13 +1995,13 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
         /* then IN transfers */
         else if (irq_src & UDC_EPN_TX) {
                 epnum = epn_stat & 0x0f;
-                UDC_IRQ_SRC_REG = UDC_EPN_TX;
+                omap_writew(UDC_EPN_TX, UDC_IRQ_SRC);
                 status = IRQ_HANDLED;
                 ep = &udc->ep[16 + epnum];
                 ep->irqs++;
 
-                UDC_EP_NUM_REG = epnum | UDC_EP_DIR | UDC_EP_SEL;
-                if ((UDC_STAT_FLG_REG & UDC_ACK)) {
+                omap_writew(epnum | UDC_EP_DIR | UDC_EP_SEL, UDC_EP_NUM);
+                if (omap_readw(UDC_STAT_FLG) & UDC_ACK) {
                         ep->ackwait = 0;
                         if (!list_empty(&ep->queue)) {
                                 req = container_of(ep->queue.next,
@@ -1991,9 +2010,9 @@ static irqreturn_t omap_udc_pio_irq(int irq, void *_dev)
                         }
                 }
                 /* min 6 clock delay before clearing EP_SEL ... */
-                epn_stat = UDC_EPN_STAT_REG;
-                epn_stat = UDC_EPN_STAT_REG;
-                UDC_EP_NUM_REG = epnum | UDC_EP_DIR;
+                epn_stat = omap_readw(UDC_EPN_STAT);
+                epn_stat = omap_readw(UDC_EPN_STAT);
+                omap_writew(epnum | UDC_EP_DIR, UDC_EP_NUM);
                 /* then 6 clocks before it'd tx */
         }
 
@@ -2021,7 +2040,7 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)
                 req = list_entry(ep->queue.next, struct omap_req, queue);
 
                 use_ep(ep, UDC_EP_SEL);
-                stat = UDC_STAT_FLG_REG;
+                stat = omap_readw(UDC_STAT_FLG);
 
                 /* NOTE: like the other controller drivers, this isn't
                  * currently reporting lost or damaged frames.
@@ -2053,9 +2072,14 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)
                 if (!list_empty(&ep->queue))
                         pending = 1;
         }
-        if (!pending)
-                UDC_IRQ_EN_REG &= ~UDC_SOF_IE;
-        UDC_IRQ_SRC_REG = UDC_SOF;
+        if (!pending) {
+                u16 w;
+
+                w = omap_readw(UDC_IRQ_EN);
+                w &= ~UDC_SOF_IE;
+                omap_writew(w, UDC_IRQ_EN);
+        }
+        omap_writew(UDC_IRQ_SOF, UDC_IRQ_SRC);
 
         spin_unlock_irqrestore(&udc->lock, flags);
         return IRQ_HANDLED;
@@ -2104,7 +2128,7 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
                 if (ep->bmAttributes == USB_ENDPOINT_XFER_ISOC)
                         continue;
                 use_ep(ep, 0);
-                UDC_CTRL_REG = UDC_SET_HALT;
+                omap_writew(UDC_SET_HALT, UDC_CTRL);
         }
         udc->ep0_pending = 0;
         udc->ep[0].irqs = 0;
@@ -2128,7 +2152,7 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
         }
         DBG("bound to driver %s\n", driver->driver.name);
 
-        UDC_IRQ_SRC_REG = UDC_IRQ_SRC_MASK;
+        omap_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
 
         /* connect to bus through transceiver */
         if (udc->transceiver) {
@@ -2225,7 +2249,7 @@ static void proc_ep_show(struct seq_file *s, struct omap_ep *ep)
         else
                 buf[0] = 0;
 
-        stat_flg = UDC_STAT_FLG_REG;
+        stat_flg = omap_readw(UDC_STAT_FLG);
         seq_printf(s,
                 "\n%s %s%s%sirqs %ld stat %04x " EIGHTBITS FOURBITS "%s\n",
                 ep->name, buf,
@@ -2292,11 +2316,11 @@ static int proc_otg_show(struct seq_file *s)
                 trans = CONTROL_DEVCONF_REG;
         } else {
                 ctrl_name = "tranceiver_ctrl";
-                trans = USB_TRANSCEIVER_CTRL_REG;
+                trans = omap_readw(USB_TRANSCEIVER_CTRL);
         }
         seq_printf(s, "\nOTG rev %d.%d, %s %05x\n",
                 tmp >> 4, tmp & 0xf, ctrl_name, trans);
-        tmp = OTG_SYSCON_1_REG;
+        tmp = omap_readw(OTG_SYSCON_1);
         seq_printf(s, "otg_syscon1 %08x usb2 %s, usb1 %s, usb0 %s,"
                         FOURBITS "\n", tmp,
                 trx_mode(USB2_TRX_MODE(tmp), trans & CONF_USB2_UNI_R),
@@ -2308,7 +2332,7 @@ static int proc_otg_show(struct seq_file *s)
                 (tmp & HST_IDLE_EN) ? " !host" : "",
                 (tmp & DEV_IDLE_EN) ? " !dev" : "",
                 (tmp & OTG_RESET_DONE) ? " reset_done" : " reset_active");
-        tmp = OTG_SYSCON_2_REG;
+        tmp = omap_readl(OTG_SYSCON_2);
         seq_printf(s, "otg_syscon2 %08x%s" EIGHTBITS
                         " b_ase_brst=%d hmc=%d\n", tmp,
                 (tmp & OTG_EN) ? " otg_en" : "",
@@ -2323,7 +2347,7 @@ static int proc_otg_show(struct seq_file *s)
                 (tmp & HMC_TLLATTACH) ? " tllattach" : "",
                 B_ASE_BRST(tmp),
                 OTG_HMC(tmp));
-        tmp = OTG_CTRL_REG;
+        tmp = omap_readl(OTG_CTRL);
         seq_printf(s, "otg_ctrl    %06x" EIGHTBITS EIGHTBITS "%s\n", tmp,
                 (tmp & OTG_ASESSVLD) ? " asess" : "",
                 (tmp & OTG_BSESSEND) ? " bsess_end" : "",
@@ -2343,13 +2367,13 @@ static int proc_otg_show(struct seq_file *s)
                 (tmp & OTG_PU_VBUS) ? " pu_vb" : "",
                 (tmp & OTG_PU_ID) ? " pu_id" : ""
                 );
-        tmp = OTG_IRQ_EN_REG;
+        tmp = omap_readw(OTG_IRQ_EN);
         seq_printf(s, "otg_irq_en  %04x" "\n", tmp);
-        tmp = OTG_IRQ_SRC_REG;
+        tmp = omap_readw(OTG_IRQ_SRC);
         seq_printf(s, "otg_irq_src %04x" "\n", tmp);
-        tmp = OTG_OUTCTRL_REG;
+        tmp = omap_readw(OTG_OUTCTRL);
         seq_printf(s, "otg_outctrl %04x" "\n", tmp);
-        tmp = OTG_TEST_REG;
+        tmp = omap_readw(OTG_TEST);
         seq_printf(s, "otg_test    %04x" "\n", tmp);
         return 0;
 }
@@ -2370,7 +2394,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
                 driver_desc,
                 use_dma ?  " (dma)" : "");
 
-        tmp = UDC_REV_REG & 0xff;
+        tmp = omap_readw(UDC_REV) & 0xff;
         seq_printf(s,
                 "UDC rev %d.%d, fifo mode %d, gadget %s\n"
                 "hmc %d, transceiver %s\n",
@@ -2384,16 +2408,16 @@ static int proc_udc_show(struct seq_file *s, void *_)
                                 ? "external" : "(none)"));
         if (cpu_class_is_omap1()) {
                 seq_printf(s, "ULPD control %04x req %04x status %04x\n",
-                        __REG16(ULPD_CLOCK_CTRL),
-                        __REG16(ULPD_SOFT_REQ),
-                        __REG16(ULPD_STATUS_REQ));
+                        omap_readw(ULPD_CLOCK_CTRL),
+                        omap_readw(ULPD_SOFT_REQ),
+                        omap_readw(ULPD_STATUS_REQ));
         }
 
         /* OTG controller registers */
         if (!cpu_is_omap15xx())
                 proc_otg_show(s);
 
-        tmp = UDC_SYSCON1_REG;
+        tmp = omap_readw(UDC_SYSCON1);
         seq_printf(s, "\nsyscon1     %04x" EIGHTBITS "\n", tmp,
                 (tmp & UDC_CFG_LOCK) ? " cfg_lock" : "",
                 (tmp & UDC_DATA_ENDIAN) ? " data_endian" : "",
@@ -2412,7 +2436,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
                 return 0;
         }
 
-        tmp = UDC_DEVSTAT_REG;
+        tmp = omap_readw(UDC_DEVSTAT);
         seq_printf(s, "devstat     %04x" EIGHTBITS "%s%s\n", tmp,
                 (tmp & UDC_B_HNP_ENABLE) ? " b_hnp" : "",
                 (tmp & UDC_A_HNP_SUPPORT) ? " a_hnp" : "",
@@ -2424,20 +2448,20 @@ static int proc_udc_show(struct seq_file *s, void *_)
                 (tmp & UDC_ADD) ? " ADD" : "",
                 (tmp & UDC_DEF) ? " DEF" : "",
                 (tmp & UDC_ATT) ? " ATT" : "");
-        seq_printf(s, "sof         %04x\n", UDC_SOF_REG);
-        tmp = UDC_IRQ_EN_REG;
+        seq_printf(s, "sof         %04x\n", omap_readw(UDC_SOF));
+        tmp = omap_readw(UDC_IRQ_EN);
         seq_printf(s, "irq_en      %04x" FOURBITS "%s\n", tmp,
                 (tmp & UDC_SOF_IE) ? " sof" : "",
                 (tmp & UDC_EPN_RX_IE) ? " epn_rx" : "",
                 (tmp & UDC_EPN_TX_IE) ? " epn_tx" : "",
                 (tmp & UDC_DS_CHG_IE) ? " ds_chg" : "",
                 (tmp & UDC_EP0_IE) ? " ep0" : "");
-        tmp = UDC_IRQ_SRC_REG;
+        tmp = omap_readw(UDC_IRQ_SRC);
         seq_printf(s, "irq_src     %04x" EIGHTBITS "%s%s\n", tmp,
                 (tmp & UDC_TXN_DONE) ? " txn_done" : "",
                 (tmp & UDC_RXN_CNT) ? " rxn_cnt" : "",
                 (tmp & UDC_RXN_EOT) ? " rxn_eot" : "",
-                (tmp & UDC_SOF) ? " sof" : "",
+                (tmp & UDC_IRQ_SOF) ? " sof" : "",
                 (tmp & UDC_EPN_RX) ? " epn_rx" : "",
                 (tmp & UDC_EPN_TX) ? " epn_tx" : "",
                 (tmp & UDC_DS_CHG) ? " ds_chg" : "",
@@ -2447,7 +2471,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
         if (use_dma) {
                 unsigned i;
 
-                tmp = UDC_DMA_IRQ_EN_REG;
+                tmp = omap_readw(UDC_DMA_IRQ_EN);
                 seq_printf(s, "dma_irq_en  %04x%s" EIGHTBITS "\n", tmp,
                         (tmp & UDC_TX_DONE_IE(3)) ? " tx2_done" : "",
                         (tmp & UDC_RX_CNT_IE(3)) ? " rx2_cnt" : "",
@@ -2461,29 +2485,29 @@ static int proc_udc_show(struct seq_file *s, void *_)
                         (tmp & UDC_RX_CNT_IE(1)) ? " rx0_cnt" : "",
                         (tmp & UDC_RX_EOT_IE(1)) ? " rx0_eot" : "");
 
-                tmp = UDC_RXDMA_CFG_REG;
+                tmp = omap_readw(UDC_RXDMA_CFG);
                 seq_printf(s, "rxdma_cfg   %04x\n", tmp);
                 if (tmp) {
                         for (i = 0; i < 3; i++) {
                                 if ((tmp & (0x0f << (i * 4))) == 0)
                                         continue;
                                 seq_printf(s, "rxdma[%d]    %04x\n", i,
-                                                UDC_RXDMA_REG(i + 1));
+                                                omap_readw(UDC_RXDMA(i + 1)));
                         }
                 }
-                tmp = UDC_TXDMA_CFG_REG;
+                tmp = omap_readw(UDC_TXDMA_CFG);
                 seq_printf(s, "txdma_cfg   %04x\n", tmp);
                 if (tmp) {
                         for (i = 0; i < 3; i++) {
                                 if (!(tmp & (0x0f << (i * 4))))
                                         continue;
                                 seq_printf(s, "txdma[%d]    %04x\n", i,
-                                                UDC_TXDMA_REG(i + 1));
+                                                omap_readw(UDC_TXDMA(i + 1)));
                         }
                 }
         }
 
-        tmp = UDC_DEVSTAT_REG;
+        tmp = omap_readw(UDC_DEVSTAT);
         if (tmp & UDC_ATT) {
                 proc_ep_show(s, &udc->ep[0]);
                 if (tmp & UDC_ADD) {
@@ -2535,7 +2559,7 @@ static inline void remove_proc_file(void) {}
  * buffer space among the endpoints we'll be operating.
  *
  * NOTE: as of OMAP 1710 ES2.0, writing a new endpoint config when
- * UDC_SYSCON_1_REG.CFG_LOCK is set can now work.  We won't use that
+ * UDC_SYSCON_1.CFG_LOCK is set can now work.  We won't use that
  * capability yet though.
  */
 static unsigned __init
@@ -2597,9 +2621,9 @@ omap_ep_setup(char *name, u8 addr, u8 type,
                 name, addr, epn_rxtx, maxp, dbuf ? "x2" : "", buf);
 
         if (addr & USB_DIR_IN)
-                UDC_EP_TX_REG(addr & 0xf) = epn_rxtx;
+                omap_writew(epn_rxtx, UDC_EP_TX(addr & 0xf));
         else
-                UDC_EP_RX_REG(addr) = epn_rxtx;
+                omap_writew(epn_rxtx, UDC_EP_RX(addr));
 
         /* next endpoint's buffer starts after this one's */
         buf += maxp;
@@ -2638,15 +2662,15 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
         unsigned        tmp, buf;
 
         /* abolish any previous hardware state */
-        UDC_SYSCON1_REG = 0;
-        UDC_IRQ_EN_REG = 0;
-        UDC_IRQ_SRC_REG = UDC_IRQ_SRC_MASK;
-        UDC_DMA_IRQ_EN_REG = 0;
-        UDC_RXDMA_CFG_REG = 0;
-        UDC_TXDMA_CFG_REG = 0;
+        omap_writew(0, UDC_SYSCON1);
+        omap_writew(0, UDC_IRQ_EN);
+        omap_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
+        omap_writew(0, UDC_DMA_IRQ_EN);
+        omap_writew(0, UDC_RXDMA_CFG);
+        omap_writew(0, UDC_TXDMA_CFG);
 
         /* UDC_PULLUP_EN gates the chip clock */
-        // OTG_SYSCON_1_REG |= DEV_IDLE_EN;
+        // OTG_SYSCON_1 |= DEV_IDLE_EN;
 
         udc = kzalloc(sizeof(*udc), GFP_KERNEL);
         if (!udc)
@@ -2677,8 +2701,8 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
 
         /* initially disable all non-ep0 endpoints */
         for (tmp = 1; tmp < 15; tmp++) {
-                UDC_EP_RX_REG(tmp) = 0;
-                UDC_EP_TX_REG(tmp) = 0;
+                omap_writew(0, UDC_EP_RX(tmp));
+                omap_writew(0, UDC_EP_TX(tmp));
         }
 
 #define OMAP_BULK_EP(name,addr) \
@@ -2763,7 +2787,7 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
                 ERR("unsupported fifo_mode #%d\n", fifo_mode);
                 return -ENODEV;
         }
-        UDC_SYSCON1_REG = UDC_CFG_LOCK|UDC_SELF_PWR;
+        omap_writew(UDC_CFG_LOCK|UDC_SELF_PWR, UDC_SYSCON1);
         INFO("fifo mode %d, %d bytes not used\n", fifo_mode, 2048 - buf);
         return 0;
 }
@@ -2807,7 +2831,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
         }
 
         INFO("OMAP UDC rev %d.%d%s\n",
-                UDC_REV_REG >> 4, UDC_REV_REG & 0xf,
+                omap_readw(UDC_REV) >> 4, omap_readw(UDC_REV) & 0xf,
                 config->otg ? ", Mini-AB" : "");
 
         /* use the mode given to us by board init code */
@@ -2822,12 +2846,12 @@ static int __init omap_udc_probe(struct platform_device *pdev)
                          * know when to turn PULLUP_EN on/off; and that
                          * means we always "need" the 48MHz clock.
                          */
-                        u32 tmp = FUNC_MUX_CTRL_0_REG;
-
-                        FUNC_MUX_CTRL_0_REG &= ~VBUS_CTRL_1510;
+                        u32 tmp = omap_readl(FUNC_MUX_CTRL_0);
+                        tmp &= ~VBUS_CTRL_1510;
+                        omap_writel(tmp, FUNC_MUX_CTRL_0);
                         tmp |= VBUS_MODE_1510;
                         tmp &= ~VBUS_CTRL_1510;
-                        FUNC_MUX_CTRL_0_REG = tmp;
+                        omap_writel(tmp, FUNC_MUX_CTRL_0);
                 }
         } else {
                 /* The transceiver may package some GPIO logic or handle
@@ -2907,7 +2931,7 @@ known:
 #endif
 
         /* starting with omap1710 es2.0, clear toggle is a separate bit */
-        if (UDC_REV_REG >= 0x61)
+        if (omap_readw(UDC_REV) >= 0x61)
                 udc->clr_halt = UDC_RESET_EP | UDC_CLRDATA_TOGGLE;
         else
                 udc->clr_halt = UDC_RESET_EP;
@@ -3005,7 +3029,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
                 put_device(udc->transceiver->dev);
                 udc->transceiver = NULL;
         }
-        UDC_SYSCON1_REG = 0;
+        omap_writew(0, UDC_SYSCON1);
 
         remove_proc_file();
 
@@ -3036,7 +3060,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
  *
  * REVISIT we should probably reject suspend requests when there's a host
  * session active, rather than disconnecting, at least on boards that can
- * report VBUS irqs (UDC_DEVSTAT_REG.UDC_ATT).  And in any case, we need to
+ * report VBUS irqs (UDC_DEVSTAT.UDC_ATT).  And in any case, we need to
  * make host resumes and VBUS detection trigger OMAP wakeup events; that
  * may involve talking to an external transceiver (e.g. isp1301).
  */
@@ -3045,7 +3069,7 @@ static int omap_udc_suspend(struct platform_device *dev, pm_message_t message)
 {
         u32     devstat;
 
-        devstat = UDC_DEVSTAT_REG;
+        devstat = omap_readw(UDC_DEVSTAT);
 
         /* we're requesting 48 MHz clock if the pullup is enabled
          * (== we're attached to the host) and we're not suspended,
diff --git a/drivers/usb/gadget/omap_udc.h b/drivers/usb/gadget/omap_udc.h
index c6b9cbc7230a..8522bbb12278 100644
--- a/drivers/usb/gadget/omap_udc.h
+++ b/drivers/usb/gadget/omap_udc.h
@@ -8,23 +8,22 @@
 /*
  * USB device/endpoint management registers
  */
-#define UDC_REG(offset)              __REG16(UDC_BASE + (offset))
 
-#define UDC_REV_REG                     UDC_REG(0x0)    /* Revision */
-#define UDC_EP_NUM_REG                  UDC_REG(0x4)    /* Which endpoint */
+#define UDC_REV                         (UDC_BASE + 0x0)        /* Revision */
+#define UDC_EP_NUM                      (UDC_BASE + 0x4)        /* Which endpoint */
 #       define  UDC_SETUP_SEL           (1 << 6)
 #       define  UDC_EP_SEL              (1 << 5)
 #       define  UDC_EP_DIR              (1 << 4)
         /* low 4 bits for endpoint number */
-#define UDC_DATA_REG                    UDC_REG(0x08)   /* Endpoint FIFO */
-#define UDC_CTRL_REG                    UDC_REG(0x0C)   /* Endpoint control */
+#define UDC_DATA                        (UDC_BASE + 0x08)       /* Endpoint FIFO */
+#define UDC_CTRL                        (UDC_BASE + 0x0C)       /* Endpoint control */
 #       define  UDC_CLR_HALT            (1 << 7)
 #       define  UDC_SET_HALT            (1 << 6)
 #       define  UDC_CLRDATA_TOGGLE      (1 << 3)
 #       define  UDC_SET_FIFO_EN         (1 << 2)
 #       define  UDC_CLR_EP              (1 << 1)
 #       define  UDC_RESET_EP            (1 << 0)
-#define UDC_STAT_FLG_REG                UDC_REG(0x10)   /* Endpoint status */
+#define UDC_STAT_FLG                    (UDC_BASE + 0x10)       /* Endpoint status */
 #       define  UDC_NO_RXPACKET         (1 << 15)
 #       define  UDC_MISS_IN             (1 << 14)
 #       define  UDC_DATA_FLUSH          (1 << 13)
@@ -38,8 +37,8 @@
 #       define  UDC_FIFO_EN             (1 << 2)
 #       define  UDC_NON_ISO_FIFO_EMPTY  (1 << 1)
 #       define  UDC_NON_ISO_FIFO_FULL   (1 << 0)
-#define UDC_RXFSTAT_REG                 UDC_REG(0x14)   /* OUT bytecount */
-#define UDC_SYSCON1_REG                 UDC_REG(0x18)   /* System config 1 */
+#define UDC_RXFSTAT                     (UDC_BASE + 0x14)       /* OUT bytecount */
+#define UDC_SYSCON1                     (UDC_BASE + 0x18)       /* System config 1 */
 #       define  UDC_CFG_LOCK            (1 << 8)
 #       define  UDC_DATA_ENDIAN         (1 << 7)
 #       define  UDC_DMA_ENDIAN          (1 << 6)
@@ -48,12 +47,12 @@
 #       define  UDC_SELF_PWR            (1 << 2)
 #       define  UDC_SOFF_DIS            (1 << 1)
 #       define  UDC_PULLUP_EN           (1 << 0)
-#define UDC_SYSCON2_REG                 UDC_REG(0x1C)   /* System config 2 */
+#define UDC_SYSCON2                     (UDC_BASE + 0x1C)       /* System config 2 */
 #       define  UDC_RMT_WKP             (1 << 6)
 #       define  UDC_STALL_CMD           (1 << 5)
 #       define  UDC_DEV_CFG             (1 << 3)
 #       define  UDC_CLR_CFG             (1 << 2)
-#define UDC_DEVSTAT_REG                 UDC_REG(0x20)   /* Device status */
+#define UDC_DEVSTAT                     (UDC_BASE + 0x20)       /* Device status */
 #       define  UDC_B_HNP_ENABLE        (1 << 9)
 #       define  UDC_A_HNP_SUPPORT       (1 << 8)
 #       define  UDC_A_ALT_HNP_SUPPORT   (1 << 7)
@@ -64,26 +63,26 @@
 #       define  UDC_ADD                 (1 << 2)
 #       define  UDC_DEF                 (1 << 1)
 #       define  UDC_ATT                 (1 << 0)
-#define UDC_SOF_REG                     UDC_REG(0x24)   /* Start of frame */
+#define UDC_SOF                         (UDC_BASE + 0x24)       /* Start of frame */
 #       define  UDC_FT_LOCK             (1 << 12)
 #       define  UDC_TS_OK               (1 << 11)
 #       define  UDC_TS                  0x03ff
-#define UDC_IRQ_EN_REG                  UDC_REG(0x28)   /* Interrupt enable */
+#define UDC_IRQ_EN                      (UDC_BASE + 0x28)       /* Interrupt enable */
 #       define  UDC_SOF_IE              (1 << 7)
 #       define  UDC_EPN_RX_IE           (1 << 5)
 #       define  UDC_EPN_TX_IE           (1 << 4)
 #       define  UDC_DS_CHG_IE           (1 << 3)
 #       define  UDC_EP0_IE              (1 << 0)
-#define UDC_DMA_IRQ_EN_REG              UDC_REG(0x2C)   /* DMA irq enable */
+#define UDC_DMA_IRQ_EN                  (UDC_BASE + 0x2C)       /* DMA irq enable */
         /* rx/tx dma channels numbered 1-3 not 0-2 */
 #       define  UDC_TX_DONE_IE(n)       (1 << (4 * (n) - 2))
 #       define  UDC_RX_CNT_IE(n)        (1 << (4 * (n) - 3))
 #       define  UDC_RX_EOT_IE(n)        (1 << (4 * (n) - 4))
-#define UDC_IRQ_SRC_REG                 UDC_REG(0x30)   /* Interrupt source */
+#define UDC_IRQ_SRC                     (UDC_BASE + 0x30)       /* Interrupt source */
 #       define  UDC_TXN_DONE            (1 << 10)
 #       define  UDC_RXN_CNT             (1 << 9)
 #       define  UDC_RXN_EOT             (1 << 8)
-#       define  UDC_SOF                 (1 << 7)
+#       define  UDC_IRQ_SOF             (1 << 7)
 #       define  UDC_EPN_RX              (1 << 5)
 #       define  UDC_EPN_TX              (1 << 4)
 #       define  UDC_DS_CHG              (1 << 3)
@@ -91,41 +90,41 @@
 #       define  UDC_EP0_RX              (1 << 1)
 #       define  UDC_EP0_TX              (1 << 0)
 #       define  UDC_IRQ_SRC_MASK        0x7bf
-#define UDC_EPN_STAT_REG                UDC_REG(0x34)   /* EP irq status */
-#define UDC_DMAN_STAT_REG               UDC_REG(0x38)   /* DMA irq status */
+#define UDC_EPN_STAT                    (UDC_BASE + 0x34)       /* EP irq status */
+#define UDC_DMAN_STAT                   (UDC_BASE + 0x38)       /* DMA irq status */
 #       define  UDC_DMA_RX_SB           (1 << 12)
 #       define  UDC_DMA_RX_SRC(x)       (((x)>>8) & 0xf)
 #       define  UDC_DMA_TX_SRC(x)       (((x)>>0) & 0xf)
 
 
 /* DMA configuration registers:  up to three channels in each direction.  */
-#define UDC_RXDMA_CFG_REG               UDC_REG(0x40)   /* 3 eps for RX DMA */
+#define UDC_RXDMA_CFG                   (UDC_BASE + 0x40)       /* 3 eps for RX DMA */
 #       define  UDC_DMA_REQ             (1 << 12)
-#define UDC_TXDMA_CFG_REG               UDC_REG(0x44)   /* 3 eps for TX DMA */
-#define UDC_DATA_DMA_REG                UDC_REG(0x48)   /* rx/tx fifo addr */
+#define UDC_TXDMA_CFG                   (UDC_BASE + 0x44)       /* 3 eps for TX DMA */
+#define UDC_DATA_DMA                    (UDC_BASE + 0x48)       /* rx/tx fifo addr */
 
 /* rx/tx dma control, numbering channels 1-3 not 0-2 */
-#define UDC_TXDMA_REG(chan)             UDC_REG(0x50 - 4 + 4 * (chan))
+#define UDC_TXDMA(chan)                 (UDC_BASE + 0x50 - 4 + 4 * (chan))
 #       define UDC_TXN_EOT              (1 << 15)       /* bytes vs packets */
 #       define UDC_TXN_START            (1 << 14)       /* start transfer */
 #       define UDC_TXN_TSC              0x03ff          /* units in xfer */
-#define UDC_RXDMA_REG(chan)             UDC_REG(0x60 - 4 + 4 * (chan))
+#define UDC_RXDMA(chan)                 (UDC_BASE + 0x60 - 4 + 4 * (chan))
 #       define UDC_RXN_STOP             (1 << 15)       /* enable EOT irq */
 #       define UDC_RXN_TC               0x00ff          /* packets in xfer */
 
 
 /*
  * Endpoint configuration registers (used before CFG_LOCK is set)
- * UDC_EP_TX_REG(0) is unused
+ * UDC_EP_TX(0) is unused
  */
-#define UDC_EP_RX_REG(endpoint)         UDC_REG(0x80 + (endpoint)*4)
+#define UDC_EP_RX(endpoint)             (UDC_BASE + 0x80 + (endpoint)*4)
 #       define  UDC_EPN_RX_VALID        (1 << 15)
 #       define  UDC_EPN_RX_DB           (1 << 14)
         /* buffer size in bits 13, 12 */
 #       define  UDC_EPN_RX_ISO          (1 << 11)
         /* buffer pointer in low 11 bits */
-#define UDC_EP_TX_REG(endpoint)         UDC_REG(0xc0 + (endpoint)*4)
-        /* same bitfields as in RX_REG */
+#define UDC_EP_TX(endpoint)             (UDC_BASE + 0xc0 + (endpoint)*4)
+        /* same bitfields as in RX */
 
 /*-------------------------------------------------------------------------*/
 
@@ -195,14 +194,14 @@ struct omap_udc {
 
 /*-------------------------------------------------------------------------*/
 
-#define MOD_CONF_CTRL_0_REG     __REG32(MOD_CONF_CTRL_0)
-#define VBUS_W2FC_1510          (1 << 17)       /* 0 gpio0, 1 dvdd2 pin */
+/* MOD_CONF_CTRL_0 */
+#define VBUS_W2FC_1510          (1 << 17)       /* 0 gpio0, 1 dvdd2 pin */
 
-#define FUNC_MUX_CTRL_0_REG     __REG32(FUNC_MUX_CTRL_0)
+/* FUNC_MUX_CTRL_0 */
 #define VBUS_CTRL_1510          (1 << 19)       /* 1 connected (software) */
 #define VBUS_MODE_1510          (1 << 18)       /* 0 hardware, 1 software */
 
-#define HMC_1510        ((MOD_CONF_CTRL_0_REG >> 1) & 0x3f)
-#define HMC_1610        (OTG_SYSCON_2_REG & 0x3f)
+#define HMC_1510        ((omap_readl(MOD_CONF_CTRL_0) >> 1) & 0x3f)
+#define HMC_1610        (omap_readl(OTG_SYSCON_2) & 0x3f)
 #define HMC             (cpu_is_omap15xx() ? HMC_1510 : HMC_1610)
 
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 76be75e3ab8f..ec8f2eb041ca 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -462,6 +462,7 @@ printer_open(struct inode *inode, struct file *fd)
         unsigned long           flags;
         int                     ret = -EBUSY;
 
+        lock_kernel();
         dev = container_of(inode->i_cdev, struct printer_dev, printer_cdev);
 
         spin_lock_irqsave(&dev->lock, flags);
@@ -477,7 +478,7 @@ printer_open(struct inode *inode, struct file *fd)
         spin_unlock_irqrestore(&dev->lock, flags);
 
         DBG(dev, "printer_open returned %x\n", ret);
-
+        unlock_kernel();
         return ret;
 }
 
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 08f699b1fc57..031dceb93023 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -1,5 +1,4 @@
 /*
- * linux/drivers/usb/gadget/pxa2xx_udc.c
  * Intel PXA25x and IXP4xx on-chip full speed USB device controllers
  *
  * Copyright (C) 2002 Intrinsyc, Inc. (Frank Becker)
@@ -46,19 +45,25 @@
 #include <linux/err.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
+#include <linux/io.h>
 
 #include <asm/byteorder.h>
 #include <asm/dma.h>
 #include <asm/gpio.h>
-#include <asm/io.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
 #include <asm/unaligned.h>
-#include <asm/hardware.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
+/*
+ * This driver is PXA25x only.  Grab the right register definitions.
+ */
+#ifdef CONFIG_ARCH_PXA
+#include <asm/arch/pxa25x-udc.h>
+#endif
+
 #include <asm/mach/udc_pxa2xx.h>
 
 
@@ -91,7 +96,7 @@
 #define DRIVER_DESC     "PXA 25x USB Device Controller driver"
 
 
-static const char driver_name [] = "pxa2xx_udc";
+static const char driver_name [] = "pxa25x_udc";
 
 static const char ep0name [] = "ep0";
 
@@ -111,10 +116,10 @@ static const char ep0name [] = "ep0";
 
 #endif
 
-#include "pxa2xx_udc.h"
+#include "pxa25x_udc.h"
 
 
-#ifdef  CONFIG_USB_PXA2XX_SMALL
+#ifdef  CONFIG_USB_PXA25X_SMALL
 #define SIZE_STR        " (small)"
 #else
 #define SIZE_STR        ""
@@ -126,8 +131,8 @@ static const char ep0name [] = "ep0";
  * ---------------------------------------------------------------------------
  */
 
-static void pxa2xx_ep_fifo_flush (struct usb_ep *ep);
-static void nuke (struct pxa2xx_ep *, int status);
+static void pxa25x_ep_fifo_flush (struct usb_ep *ep);
+static void nuke (struct pxa25x_ep *, int status);
 
 /* one GPIO should be used to detect VBUS from the host */
 static int is_vbus_present(void)
@@ -212,24 +217,24 @@ static inline void udc_ack_int_UDCCR(int mask)
 /*
  * endpoint enable/disable
  *
- * we need to verify the descriptors used to enable endpoints.  since pxa2xx
+ * we need to verify the descriptors used to enable endpoints.  since pxa25x
  * endpoint configurations are fixed, and are pretty much always enabled,
  * there's not a lot to manage here.
  *
- * because pxa2xx can't selectively initialize bulk (or interrupt) endpoints,
+ * because pxa25x can't selectively initialize bulk (or interrupt) endpoints,
  * (resetting endpoint halt and toggle), SET_INTERFACE is unusable except
  * for a single interface (with only the default altsetting) and for gadget
  * drivers that don't halt endpoints (not reset by set_interface).  that also
  * means that if you use ISO, you must violate the USB spec rule that all
  * iso endpoints must be in non-default altsettings.
  */
-static int pxa2xx_ep_enable (struct usb_ep *_ep,
+static int pxa25x_ep_enable (struct usb_ep *_ep,
                 const struct usb_endpoint_descriptor *desc)
 {
-        struct pxa2xx_ep        *ep;
-        struct pxa2xx_udc       *dev;
+        struct pxa25x_ep        *ep;
+        struct pxa25x_udc       *dev;
 
-        ep = container_of (_ep, struct pxa2xx_ep, ep);
+        ep = container_of (_ep, struct pxa25x_ep, ep);
         if (!_ep || !desc || ep->desc || _ep->name == ep0name
                         || desc->bDescriptorType != USB_DT_ENDPOINT
                         || ep->bEndpointAddress != desc->bEndpointAddress
@@ -268,7 +273,7 @@ static int pxa2xx_ep_enable (struct usb_ep *_ep,
         ep->ep.maxpacket = le16_to_cpu (desc->wMaxPacketSize);
 
         /* flush fifo (mostly for OUT buffers) */
-        pxa2xx_ep_fifo_flush (_ep);
+        pxa25x_ep_fifo_flush (_ep);
 
         /* ... reset halt state too, if we could ... */
 
@@ -276,12 +281,12 @@ static int pxa2xx_ep_enable (struct usb_ep *_ep,
         return 0;
 }
 
-static int pxa2xx_ep_disable (struct usb_ep *_ep)
+static int pxa25x_ep_disable (struct usb_ep *_ep)
 {
-        struct pxa2xx_ep        *ep;
+        struct pxa25x_ep        *ep;
         unsigned long           flags;
 
-        ep = container_of (_ep, struct pxa2xx_ep, ep);
+        ep = container_of (_ep, struct pxa25x_ep, ep);
         if (!_ep || !ep->desc) {
                 DMSG("%s, %s not enabled\n", __func__,
                         _ep ? ep->ep.name : NULL);
@@ -292,7 +297,7 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep)
         nuke (ep, -ESHUTDOWN);
 
         /* flush fifo (mostly for IN buffers) */
-        pxa2xx_ep_fifo_flush (_ep);
+        pxa25x_ep_fifo_flush (_ep);
 
         ep->desc = NULL;
         ep->stopped = 1;
@@ -304,18 +309,18 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep)
 
 /*-------------------------------------------------------------------------*/
 
-/* for the pxa2xx, these can just wrap kmalloc/kfree.  gadget drivers
+/* for the pxa25x, these can just wrap kmalloc/kfree.  gadget drivers
  * must still pass correctly initialized endpoints, since other controller
  * drivers may care about how it's currently set up (dma issues etc).
  */
 
 /*
- *      pxa2xx_ep_alloc_request - allocate a request data structure
+ *      pxa25x_ep_alloc_request - allocate a request data structure
  */
 static struct usb_request *
-pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
+pxa25x_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
 {
-        struct pxa2xx_request *req;
+        struct pxa25x_request *req;
 
         req = kzalloc(sizeof(*req), gfp_flags);
         if (!req)
@@ -327,14 +332,14 @@ pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
 
 
 /*
- *      pxa2xx_ep_free_request - deallocate a request data structure
+ *      pxa25x_ep_free_request - deallocate a request data structure
  */
 static void
-pxa2xx_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
+pxa25x_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
 {
-        struct pxa2xx_request   *req;
+        struct pxa25x_request   *req;
 
-        req = container_of (_req, struct pxa2xx_request, req);
+        req = container_of (_req, struct pxa25x_request, req);
         WARN_ON (!list_empty (&req->queue));
         kfree(req);
 }
@@ -344,7 +349,7 @@ pxa2xx_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
 /*
  *      done - retire a request; caller blocked irqs
  */
-static void done(struct pxa2xx_ep *ep, struct pxa2xx_request *req, int status)
+static void done(struct pxa25x_ep *ep, struct pxa25x_request *req, int status)
 {
         unsigned                stopped = ep->stopped;
 
@@ -367,13 +372,13 @@ static void done(struct pxa2xx_ep *ep, struct pxa2xx_request *req, int status)
 }
 
 
-static inline void ep0_idle (struct pxa2xx_udc *dev)
+static inline void ep0_idle (struct pxa25x_udc *dev)
 {
         dev->ep0state = EP0_IDLE;
 }
 
 static int
-write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max)
+write_packet(volatile u32 *uddr, struct pxa25x_request *req, unsigned max)
 {
         u8              *buf;
         unsigned        length, count;
@@ -398,7 +403,7 @@ write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max)
  * caller guarantees at least one packet buffer is ready (or a zlp).
  */
 static int
-write_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
+write_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
 {
         unsigned                max;
 
@@ -455,7 +460,7 @@ write_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
  * ep0 data stage.  these chips want very simple state transitions.
  */
 static inline
-void ep0start(struct pxa2xx_udc *dev, u32 flags, const char *tag)
+void ep0start(struct pxa25x_udc *dev, u32 flags, const char *tag)
 {
         UDCCS0 = flags|UDCCS0_SA|UDCCS0_OPR;
         USIR0 = USIR0_IR0;
@@ -465,7 +470,7 @@ void ep0start(struct pxa2xx_udc *dev, u32 flags, const char *tag)
 }
 
 static int
-write_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
+write_ep0_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
 {
         unsigned        count;
         int             is_short;
@@ -525,7 +530,7 @@ write_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
  * request buffer having filled (and maybe overran till end-of-packet).
  */
 static int
-read_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
+read_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
 {
         for (;;) {
                 u32             udccs;
@@ -602,7 +607,7 @@ read_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
  * protocols do use them.
  */
 static int
-read_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
+read_ep0_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
 {
         u8              *buf, byte;
         unsigned        bufferspace;
@@ -641,21 +646,21 @@ read_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)
 /*-------------------------------------------------------------------------*/
 
 static int
-pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
+pxa25x_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 {
-        struct pxa2xx_request   *req;
-        struct pxa2xx_ep        *ep;
-        struct pxa2xx_udc       *dev;
+        struct pxa25x_request   *req;
+        struct pxa25x_ep        *ep;
+        struct pxa25x_udc       *dev;
         unsigned long           flags;
 
-        req = container_of(_req, struct pxa2xx_request, req);
+        req = container_of(_req, struct pxa25x_request, req);
         if (unlikely (!_req || !_req->complete || !_req->buf
                         || !list_empty(&req->queue))) {
                 DMSG("%s, bad params\n", __func__);
                 return -EINVAL;
         }
 
-        ep = container_of(_ep, struct pxa2xx_ep, ep);
+        ep = container_of(_ep, struct pxa25x_ep, ep);
         if (unlikely (!_ep || (!ep->desc && ep->ep.name != ep0name))) {
                 DMSG("%s, bad ep\n", __func__);
                 return -EINVAL;
@@ -751,14 +756,14 @@ pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 /*
  *      nuke - dequeue ALL requests
  */
-static void nuke(struct pxa2xx_ep *ep, int status)
+static void nuke(struct pxa25x_ep *ep, int status)
 {
-        struct pxa2xx_request *req;
+        struct pxa25x_request *req;
 
         /* called with irqs blocked */
         while (!list_empty(&ep->queue)) {
                 req = list_entry(ep->queue.next,
-                                struct pxa2xx_request,
+                                struct pxa25x_request,
                                 queue);
                 done(ep, req, status);
         }
@@ -768,13 +773,13 @@ static void nuke(struct pxa2xx_ep *ep, int status)
 
 
 /* dequeue JUST ONE request */
-static int pxa2xx_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
+static int pxa25x_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 {
-        struct pxa2xx_ep        *ep;
-        struct pxa2xx_request   *req;
+        struct pxa25x_ep        *ep;
+        struct pxa25x_request   *req;
         unsigned long           flags;
 
-        ep = container_of(_ep, struct pxa2xx_ep, ep);
+        ep = container_of(_ep, struct pxa25x_ep, ep);
         if (!_ep || ep->ep.name == ep0name)
                 return -EINVAL;
 
@@ -798,12 +803,12 @@ static int pxa2xx_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 
 /*-------------------------------------------------------------------------*/
 
-static int pxa2xx_ep_set_halt(struct usb_ep *_ep, int value)
+static int pxa25x_ep_set_halt(struct usb_ep *_ep, int value)
 {
-        struct pxa2xx_ep        *ep;
+        struct pxa25x_ep        *ep;
         unsigned long           flags;
 
-        ep = container_of(_ep, struct pxa2xx_ep, ep);
+        ep = container_of(_ep, struct pxa25x_ep, ep);
         if (unlikely (!_ep
                         || (!ep->desc && ep->ep.name != ep0name))
                         || ep->bmAttributes == USB_ENDPOINT_XFER_ISOC) {
@@ -853,11 +858,11 @@ static int pxa2xx_ep_set_halt(struct usb_ep *_ep, int value)
         return 0;
 }
 
-static int pxa2xx_ep_fifo_status(struct usb_ep *_ep)
+static int pxa25x_ep_fifo_status(struct usb_ep *_ep)
 {
-        struct pxa2xx_ep        *ep;
+        struct pxa25x_ep        *ep;
 
-        ep = container_of(_ep, struct pxa2xx_ep, ep);
+        ep = container_of(_ep, struct pxa25x_ep, ep);
         if (!_ep) {
                 DMSG("%s, bad ep\n", __func__);
                 return -ENODEV;
@@ -872,11 +877,11 @@ static int pxa2xx_ep_fifo_status(struct usb_ep *_ep)
                 return (*ep->reg_ubcr & 0xfff) + 1;
 }
 
-static void pxa2xx_ep_fifo_flush(struct usb_ep *_ep)
+static void pxa25x_ep_fifo_flush(struct usb_ep *_ep)
 {
-        struct pxa2xx_ep        *ep;
+        struct pxa25x_ep        *ep;
 
-        ep = container_of(_ep, struct pxa2xx_ep, ep);
+        ep = container_of(_ep, struct pxa25x_ep, ep);
         if (!_ep || ep->ep.name == ep0name || !list_empty(&ep->queue)) {
                 DMSG("%s, bad ep\n", __func__);
                 return;
@@ -898,19 +903,19 @@ static void pxa2xx_ep_fifo_flush(struct usb_ep *_ep)
 }
 
 
-static struct usb_ep_ops pxa2xx_ep_ops = {
-        .enable         = pxa2xx_ep_enable,
-        .disable        = pxa2xx_ep_disable,
+static struct usb_ep_ops pxa25x_ep_ops = {
+        .enable         = pxa25x_ep_enable,
+        .disable        = pxa25x_ep_disable,
 
-        .alloc_request  = pxa2xx_ep_alloc_request,
-        .free_request   = pxa2xx_ep_free_request,
+        .alloc_request  = pxa25x_ep_alloc_request,
+        .free_request   = pxa25x_ep_free_request,
 
-        .queue          = pxa2xx_ep_queue,
-        .dequeue        = pxa2xx_ep_dequeue,
+        .queue          = pxa25x_ep_queue,
+        .dequeue        = pxa25x_ep_dequeue,
 
-        .set_halt       = pxa2xx_ep_set_halt,
-        .fifo_status    = pxa2xx_ep_fifo_status,
-        .fifo_flush     = pxa2xx_ep_fifo_flush,
+        .set_halt       = pxa25x_ep_set_halt,
+        .fifo_status    = pxa25x_ep_fifo_status,
+        .fifo_flush     = pxa25x_ep_fifo_flush,
 };
 
 
@@ -919,12 +924,12 @@ static struct usb_ep_ops pxa2xx_ep_ops = {
  * ---------------------------------------------------------------------------
  */
 
-static int pxa2xx_udc_get_frame(struct usb_gadget *_gadget)
+static int pxa25x_udc_get_frame(struct usb_gadget *_gadget)
 {
         return ((UFNRH & 0x07) << 8) | (UFNRL & 0xff);
 }
 
-static int pxa2xx_udc_wakeup(struct usb_gadget *_gadget)
+static int pxa25x_udc_wakeup(struct usb_gadget *_gadget)
 {
         /* host may not have enabled remote wakeup */
         if ((UDCCS0 & UDCCS0_DRWF) == 0)
@@ -933,14 +938,14 @@ static int pxa2xx_udc_wakeup(struct usb_gadget *_gadget)
         return 0;
 }
 
-static void stop_activity(struct pxa2xx_udc *, struct usb_gadget_driver *);
-static void udc_enable (struct pxa2xx_udc *);
-static void udc_disable(struct pxa2xx_udc *);
+static void stop_activity(struct pxa25x_udc *, struct usb_gadget_driver *);
+static void udc_enable (struct pxa25x_udc *);
+static void udc_disable(struct pxa25x_udc *);
 
 /* We disable the UDC -- and its 48 MHz clock -- whenever it's not
  * in active use.
  */
-static int pullup(struct pxa2xx_udc *udc)
+static int pullup(struct pxa25x_udc *udc)
 {
         int is_active = udc->vbus && udc->pullup && !udc->suspended;
         DMSG("%s\n", is_active ? "active" : "inactive");
@@ -970,11 +975,11 @@ static int pullup(struct pxa2xx_udc *udc)
 }
 
 /* VBUS reporting logically comes from a transceiver */
-static int pxa2xx_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
+static int pxa25x_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
 {
-        struct pxa2xx_udc       *udc;
+        struct pxa25x_udc       *udc;
 
-        udc = container_of(_gadget, struct pxa2xx_udc, gadget);
+        udc = container_of(_gadget, struct pxa25x_udc, gadget);
         udc->vbus = (is_active != 0);
         DMSG("vbus %s\n", is_active ? "supplied" : "inactive");
         pullup(udc);
@@ -982,11 +987,11 @@ static int pxa2xx_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
 }
 
 /* drivers may have software control over D+ pullup */
-static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, int is_active)
+static int pxa25x_udc_pullup(struct usb_gadget *_gadget, int is_active)
 {
-        struct pxa2xx_udc       *udc;
+        struct pxa25x_udc       *udc;
 
-        udc = container_of(_gadget, struct pxa2xx_udc, gadget);
+        udc = container_of(_gadget, struct pxa25x_udc, gadget);
 
         /* not all boards support pullup control */
         if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
@@ -997,11 +1002,11 @@ static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, int is_active)
         return 0;
 }
 
-static const struct usb_gadget_ops pxa2xx_udc_ops = {
-        .get_frame      = pxa2xx_udc_get_frame,
-        .wakeup         = pxa2xx_udc_wakeup,
-        .vbus_session   = pxa2xx_udc_vbus_session,
-        .pullup         = pxa2xx_udc_pullup,
+static const struct usb_gadget_ops pxa25x_udc_ops = {
+        .get_frame      = pxa25x_udc_get_frame,
+        .wakeup         = pxa25x_udc_wakeup,
+        .vbus_session   = pxa25x_udc_vbus_session,
+        .pullup         = pxa25x_udc_pullup,
 
         // .vbus_draw ... boards may consume current from VBUS, up to
         // 100-500mA based on config.  the 500uA suspend ceiling means
@@ -1015,7 +1020,7 @@ static const struct usb_gadget_ops pxa2xx_udc_ops = {
 static int
 udc_seq_show(struct seq_file *m, void *_d)
 {
-        struct pxa2xx_udc       *dev = m->private;
+        struct pxa25x_udc       *dev = m->private;
         unsigned long           flags;
         int                     i;
         u32                     tmp;
@@ -1076,8 +1081,8 @@ udc_seq_show(struct seq_file *m, void *_d)
 
         /* dump endpoint queues */
         for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) {
-                struct pxa2xx_ep        *ep = &dev->ep [i];
-                struct pxa2xx_request   *req;
+                struct pxa25x_ep        *ep = &dev->ep [i];
+                struct pxa25x_request   *req;
 
                 if (i != 0) {
                         const struct usb_endpoint_descriptor    *desc;
@@ -1150,7 +1155,7 @@ static const struct file_operations debug_fops = {
 /*
  *      udc_disable - disable USB device controller
  */
-static void udc_disable(struct pxa2xx_udc *dev)
+static void udc_disable(struct pxa25x_udc *dev)
 {
         /* block all irqs */
         udc_set_mask_UDCCR(UDCCR_SRM|UDCCR_REM);
@@ -1170,7 +1175,7 @@ static void udc_disable(struct pxa2xx_udc *dev)
 /*
  *      udc_reinit - initialize software state
  */
-static void udc_reinit(struct pxa2xx_udc *dev)
+static void udc_reinit(struct pxa25x_udc *dev)
 {
         u32     i;
 
@@ -1181,7 +1186,7 @@ static void udc_reinit(struct pxa2xx_udc *dev)
 
         /* basic endpoint records init */
         for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) {
-                struct pxa2xx_ep *ep = &dev->ep[i];
+                struct pxa25x_ep *ep = &dev->ep[i];
 
                 if (i != 0)
                         list_add_tail (&ep->ep.ep_list, &dev->gadget.ep_list);
@@ -1198,7 +1203,7 @@ static void udc_reinit(struct pxa2xx_udc *dev)
 /* until it's enabled, this UDC should be completely invisible
  * to any USB host.
  */
-static void udc_enable (struct pxa2xx_udc *dev)
+static void udc_enable (struct pxa25x_udc *dev)
 {
         udc_clear_mask_UDCCR(UDCCR_UDE);
 
@@ -1254,7 +1259,7 @@ static void udc_enable (struct pxa2xx_udc *dev)
  */
 int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 {
-        struct pxa2xx_udc       *dev = the_controller;
+        struct pxa25x_udc       *dev = the_controller;
         int                     retval;
 
         if (!driver
@@ -1299,7 +1304,7 @@ fail:
 EXPORT_SYMBOL(usb_gadget_register_driver);
 
 static void
-stop_activity(struct pxa2xx_udc *dev, struct usb_gadget_driver *driver)
+stop_activity(struct pxa25x_udc *dev, struct usb_gadget_driver *driver)
 {
         int i;
 
@@ -1310,7 +1315,7 @@ stop_activity(struct pxa2xx_udc *dev, struct usb_gadget_driver *driver)
 
         /* prevent new request submissions, kill any outstanding requests  */
         for (i = 0; i < PXA_UDC_NUM_ENDPOINTS; i++) {
-                struct pxa2xx_ep *ep = &dev->ep[i];
+                struct pxa25x_ep *ep = &dev->ep[i];
 
                 ep->stopped = 1;
                 nuke(ep, -ESHUTDOWN);
@@ -1327,7 +1332,7 @@ stop_activity(struct pxa2xx_udc *dev, struct usb_gadget_driver *driver)
 
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 {
-        struct pxa2xx_udc       *dev = the_controller;
+        struct pxa25x_udc       *dev = the_controller;
 
         if (!dev)
                 return -ENODEV;
@@ -1364,7 +1369,7 @@ EXPORT_SYMBOL(usb_gadget_unregister_driver);
 static irqreturn_t
 lubbock_vbus_irq(int irq, void *_dev)
 {
-        struct pxa2xx_udc       *dev = _dev;
+        struct pxa25x_udc       *dev = _dev;
         int                     vbus;
 
         dev->stats.irqs++;
@@ -1383,7 +1388,7 @@ lubbock_vbus_irq(int irq, void *_dev)
                 return IRQ_NONE;
         }
 
-        pxa2xx_udc_vbus_session(&dev->gadget, vbus);
+        pxa25x_udc_vbus_session(&dev->gadget, vbus);
         return IRQ_HANDLED;
 }
 
@@ -1391,20 +1396,20 @@ lubbock_vbus_irq(int irq, void *_dev)
 
 static irqreturn_t udc_vbus_irq(int irq, void *_dev)
 {
-        struct pxa2xx_udc       *dev = _dev;
+        struct pxa25x_udc       *dev = _dev;
         int                     vbus = gpio_get_value(dev->mach->gpio_vbus);
 
         if (dev->mach->gpio_vbus_inverted)
                 vbus = !vbus;
 
-        pxa2xx_udc_vbus_session(&dev->gadget, vbus);
+        pxa25x_udc_vbus_session(&dev->gadget, vbus);
         return IRQ_HANDLED;
 }
 
 
 /*-------------------------------------------------------------------------*/
 
-static inline void clear_ep_state (struct pxa2xx_udc *dev)
+static inline void clear_ep_state (struct pxa25x_udc *dev)
 {
         unsigned i;
 
@@ -1417,7 +1422,7 @@ static inline void clear_ep_state (struct pxa2xx_udc *dev)
 
 static void udc_watchdog(unsigned long _dev)
 {
-        struct pxa2xx_udc       *dev = (void *)_dev;
+        struct pxa25x_udc       *dev = (void *)_dev;
 
         local_irq_disable();
         if (dev->ep0state == EP0_STALL
@@ -1430,11 +1435,11 @@ static void udc_watchdog(unsigned long _dev)
         local_irq_enable();
 }
 
-static void handle_ep0 (struct pxa2xx_udc *dev)
+static void handle_ep0 (struct pxa25x_udc *dev)
 {
         u32                     udccs0 = UDCCS0;
-        struct pxa2xx_ep        *ep = &dev->ep [0];
-        struct pxa2xx_request   *req;
+        struct pxa25x_ep        *ep = &dev->ep [0];
+        struct pxa25x_request   *req;
         union {
                 struct usb_ctrlrequest  r;
                 u8                      raw [8];
@@ -1444,7 +1449,7 @@ static void handle_ep0 (struct pxa2xx_udc *dev)
         if (list_empty(&ep->queue))
                 req = NULL;
         else
-                req = list_entry(ep->queue.next, struct pxa2xx_request, queue);
+                req = list_entry(ep->queue.next, struct pxa25x_request, queue);
 
         /* clear stall status */
         if (udccs0 & UDCCS0_SST) {
@@ -1654,9 +1659,9 @@ stall:
         USIR0 = USIR0_IR0;
 }
 
-static void handle_ep(struct pxa2xx_ep *ep)
+static void handle_ep(struct pxa25x_ep *ep)
 {
-        struct pxa2xx_request   *req;
+        struct pxa25x_request   *req;
         int                     is_in = ep->bEndpointAddress & USB_DIR_IN;
         int                     completed;
         u32                     udccs, tmp;
@@ -1665,7 +1670,7 @@ static void handle_ep(struct pxa2xx_ep *ep)
                 completed = 0;
                 if (likely (!list_empty(&ep->queue)))
                         req = list_entry(ep->queue.next,
-                                        struct pxa2xx_request, queue);
+                                        struct pxa25x_request, queue);
                 else
                         req = NULL;
 
@@ -1702,16 +1707,16 @@ static void handle_ep(struct pxa2xx_ep *ep)
 }
 
 /*
- *      pxa2xx_udc_irq - interrupt handler
+ *      pxa25x_udc_irq - interrupt handler
  *
  * avoid delays in ep0 processing. the control handshaking isn't always
  * under software control (pxa250c0 and the pxa255 are better), and delays
  * could cause usb protocol errors.
  */
 static irqreturn_t
-pxa2xx_udc_irq(int irq, void *_dev)
+pxa25x_udc_irq(int irq, void *_dev)
 {
-        struct pxa2xx_udc       *dev = _dev;
+        struct pxa25x_udc       *dev = _dev;
         int                     handled;
 
         dev->stats.irqs++;
@@ -1820,9 +1825,9 @@ static void nop_release (struct device *dev)
  * doing it at run-time) to save code, eliminate fault paths, and
  * be more obviously correct.
  */
-static struct pxa2xx_udc memory = {
+static struct pxa25x_udc memory = {
         .gadget = {
-                .ops            = &pxa2xx_udc_ops,
+                .ops            = &pxa25x_udc_ops,
                 .ep0            = &memory.ep[0].ep,
                 .name           = driver_name,
                 .dev = {
@@ -1835,7 +1840,7 @@ static struct pxa2xx_udc memory = {
         .ep[0] = {
                 .ep = {
                         .name           = ep0name,
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = EP0_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1847,7 +1852,7 @@ static struct pxa2xx_udc memory = {
         .ep[1] = {
                 .ep = {
                         .name           = "ep1in-bulk",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = BULK_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1860,7 +1865,7 @@ static struct pxa2xx_udc memory = {
         .ep[2] = {
                 .ep = {
                         .name           = "ep2out-bulk",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = BULK_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1871,11 +1876,11 @@ static struct pxa2xx_udc memory = {
                 .reg_ubcr       = &UBCR2,
                 .reg_uddr       = &UDDR2,
         },
-#ifndef CONFIG_USB_PXA2XX_SMALL
+#ifndef CONFIG_USB_PXA25X_SMALL
         .ep[3] = {
                 .ep = {
                         .name           = "ep3in-iso",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = ISO_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1888,7 +1893,7 @@ static struct pxa2xx_udc memory = {
         .ep[4] = {
                 .ep = {
                         .name           = "ep4out-iso",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = ISO_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1902,7 +1907,7 @@ static struct pxa2xx_udc memory = {
         .ep[5] = {
                 .ep = {
                         .name           = "ep5in-int",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = INT_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1917,7 +1922,7 @@ static struct pxa2xx_udc memory = {
         .ep[6] = {
                 .ep = {
                         .name           = "ep6in-bulk",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = BULK_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1930,7 +1935,7 @@ static struct pxa2xx_udc memory = {
         .ep[7] = {
                 .ep = {
                         .name           = "ep7out-bulk",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = BULK_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1944,7 +1949,7 @@ static struct pxa2xx_udc memory = {
         .ep[8] = {
                 .ep = {
                         .name           = "ep8in-iso",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = ISO_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1957,7 +1962,7 @@ static struct pxa2xx_udc memory = {
         .ep[9] = {
                 .ep = {
                         .name           = "ep9out-iso",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = ISO_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1971,7 +1976,7 @@ static struct pxa2xx_udc memory = {
         .ep[10] = {
                 .ep = {
                         .name           = "ep10in-int",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = INT_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1986,7 +1991,7 @@ static struct pxa2xx_udc memory = {
         .ep[11] = {
                 .ep = {
                         .name           = "ep11in-bulk",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = BULK_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -1999,7 +2004,7 @@ static struct pxa2xx_udc memory = {
         .ep[12] = {
                 .ep = {
                         .name           = "ep12out-bulk",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = BULK_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -2013,7 +2018,7 @@ static struct pxa2xx_udc memory = {
         .ep[13] = {
                 .ep = {
                         .name           = "ep13in-iso",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = ISO_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -2026,7 +2031,7 @@ static struct pxa2xx_udc memory = {
         .ep[14] = {
                 .ep = {
                         .name           = "ep14out-iso",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = ISO_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -2040,7 +2045,7 @@ static struct pxa2xx_udc memory = {
         .ep[15] = {
                 .ep = {
                         .name           = "ep15in-int",
-                        .ops            = &pxa2xx_ep_ops,
+                        .ops            = &pxa25x_ep_ops,
                         .maxpacket      = INT_FIFO_SIZE,
                 },
                 .dev            = &memory,
@@ -2050,7 +2055,7 @@ static struct pxa2xx_udc memory = {
                 .reg_udccs      = &UDCCS15,
                 .reg_uddr       = &UDDR15,
         },
-#endif /* !CONFIG_USB_PXA2XX_SMALL */
+#endif /* !CONFIG_USB_PXA25X_SMALL */
 };
 
 #define CP15R0_VENDOR_MASK      0xffffe000
@@ -2090,9 +2095,9 @@ static struct pxa2xx_udc memory = {
 /*
  *      probe - binds to the platform device
  */
-static int __init pxa2xx_udc_probe(struct platform_device *pdev)
+static int __init pxa25x_udc_probe(struct platform_device *pdev)
 {
-        struct pxa2xx_udc *dev = &memory;
+        struct pxa25x_udc *dev = &memory;
         int retval, vbus_irq, irq;
         u32 chiprev;
 
@@ -2155,7 +2160,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
 
         if (dev->mach->gpio_vbus) {
                 if ((retval = gpio_request(dev->mach->gpio_vbus,
-                                "pxa2xx_udc GPIO VBUS"))) {
+                                "pxa25x_udc GPIO VBUS"))) {
                         dev_dbg(&pdev->dev,
                                 "can't get vbus gpio %d, err: %d\n",
                                 dev->mach->gpio_vbus, retval);
@@ -2168,7 +2173,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
 
         if (dev->mach->gpio_pullup) {
                 if ((retval = gpio_request(dev->mach->gpio_pullup,
-                                "pca2xx_udc GPIO PULLUP"))) {
+                                "pca25x_udc GPIO PULLUP"))) {
                         dev_dbg(&pdev->dev,
                                 "can't get pullup gpio %d, err: %d\n",
                                 dev->mach->gpio_pullup, retval);
@@ -2194,7 +2199,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
         dev->vbus = is_vbus_present();
 
         /* irq setup after old hardware state is cleaned up */
-        retval = request_irq(irq, pxa2xx_udc_irq,
+        retval = request_irq(irq, pxa25x_udc_irq,
                         IRQF_DISABLED, driver_name, dev);
         if (retval != 0) {
                 pr_err("%s: can't get irq %d, err %d\n",
@@ -2260,14 +2265,14 @@ lubbock_fail0:
         return retval;
 }
 
-static void pxa2xx_udc_shutdown(struct platform_device *_dev)
+static void pxa25x_udc_shutdown(struct platform_device *_dev)
 {
         pullup_off();
 }
 
-static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
+static int __exit pxa25x_udc_remove(struct platform_device *pdev)
 {
-        struct pxa2xx_udc *dev = platform_get_drvdata(pdev);
+        struct pxa25x_udc *dev = platform_get_drvdata(pdev);
 
         if (dev->driver)
                 return -EBUSY;
@@ -2317,9 +2322,9 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
  * VBUS IRQs should probably be ignored so that the PXA device just acts
  * "dead" to USB hosts until system resume.
  */
-static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
+static int pxa25x_udc_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
+        struct pxa25x_udc       *udc = platform_get_drvdata(dev);
         unsigned long flags;
 
         if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
@@ -2333,9 +2338,9 @@ static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
         return 0;
 }
 
-static int pxa2xx_udc_resume(struct platform_device *dev)
+static int pxa25x_udc_resume(struct platform_device *dev)
 {
-        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
+        struct pxa25x_udc       *udc = platform_get_drvdata(dev);
         unsigned long flags;
 
         udc->suspended = 0;
@@ -2347,27 +2352,27 @@ static int pxa2xx_udc_resume(struct platform_device *dev)
 }
 
 #else
-#define pxa2xx_udc_suspend      NULL
-#define pxa2xx_udc_resume       NULL
+#define pxa25x_udc_suspend      NULL
+#define pxa25x_udc_resume       NULL
 #endif
 
 /*-------------------------------------------------------------------------*/
 
 static struct platform_driver udc_driver = {
-        .shutdown       = pxa2xx_udc_shutdown,
-        .remove         = __exit_p(pxa2xx_udc_remove),
-        .suspend        = pxa2xx_udc_suspend,
-        .resume         = pxa2xx_udc_resume,
+        .shutdown       = pxa25x_udc_shutdown,
+        .remove         = __exit_p(pxa25x_udc_remove),
+        .suspend        = pxa25x_udc_suspend,
+        .resume         = pxa25x_udc_resume,
         .driver         = {
                 .owner  = THIS_MODULE,
-                .name   = "pxa2xx-udc",
+                .name   = "pxa25x-udc",
         },
 };
 
 static int __init udc_init(void)
 {
         pr_info("%s: version %s\n", driver_name, DRIVER_VERSION);
-        return platform_driver_probe(&udc_driver, pxa2xx_udc_probe);
+        return platform_driver_probe(&udc_driver, pxa25x_udc_probe);
 }
 module_init(udc_init);
 
@@ -2380,4 +2385,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:pxa2xx-udc");
+MODULE_ALIAS("platform:pxa25x-udc");
diff --git a/drivers/usb/gadget/pxa2xx_udc.h b/drivers/usb/gadget/pxa25x_udc.h
index e2c19e88c875..4d11ece7c95f 100644
--- a/drivers/usb/gadget/pxa2xx_udc.h
+++ b/drivers/usb/gadget/pxa25x_udc.h
@@ -1,6 +1,5 @@
 /*
- * linux/drivers/usb/gadget/pxa2xx_udc.h
- * Intel PXA2xx on-chip full speed USB device controller
+ * Intel PXA25x on-chip full speed USB device controller
  *
  * Copyright (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix
  * Copyright (C) 2003 David Brownell
@@ -21,14 +20,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LINUX_USB_GADGET_PXA2XX_H
-#define __LINUX_USB_GADGET_PXA2XX_H
+#ifndef __LINUX_USB_GADGET_PXA25X_H
+#define __LINUX_USB_GADGET_PXA25X_H
 
 #include <linux/types.h>
 
 /*-------------------------------------------------------------------------*/
 
-/* pxa2xx has this (move to include/asm-arm/arch-pxa/pxa-regs.h) */
+/* pxa25x has this (move to include/asm-arm/arch-pxa/pxa-regs.h) */
 #define UFNRH_SIR       (1 << 7)        /* SOF interrupt request */
 #define UFNRH_SIM       (1 << 6)        /* SOF interrupt mask */
 #define UFNRH_IPE14     (1 << 5)        /* ISO packet error, ep14 */
@@ -45,11 +44,11 @@
 
 /*-------------------------------------------------------------------------*/
 
-struct pxa2xx_udc;
+struct pxa25x_udc;
 
-struct pxa2xx_ep {
+struct pxa25x_ep {
         struct usb_ep                           ep;
-        struct pxa2xx_udc                       *dev;
+        struct pxa25x_udc                       *dev;
 
         const struct usb_endpoint_descriptor    *desc;
         struct list_head                        queue;
@@ -72,7 +71,7 @@ struct pxa2xx_ep {
         volatile u32                            *reg_uddr;
 };
 
-struct pxa2xx_request {
+struct pxa25x_request {
         struct usb_request                      req;
         struct list_head                        queue;
 };
@@ -98,7 +97,7 @@ struct udc_stats {
         unsigned long                   irqs;
 };
 
-#ifdef CONFIG_USB_PXA2XX_SMALL
+#ifdef CONFIG_USB_PXA25X_SMALL
 /* when memory's tight, SMALL config saves code+data.  */
 #define PXA_UDC_NUM_ENDPOINTS   3
 #endif
@@ -107,7 +106,7 @@ struct udc_stats {
 #define PXA_UDC_NUM_ENDPOINTS   16
 #endif
 
-struct pxa2xx_udc {
+struct pxa25x_udc {
         struct usb_gadget                       gadget;
         struct usb_gadget_driver                *driver;
 
@@ -130,7 +129,7 @@ struct pxa2xx_udc {
         struct clk                              *clk;
         struct pxa2xx_udc_mach_info             *mach;
         u64                                     dma_mask;
-        struct pxa2xx_ep                        ep [PXA_UDC_NUM_ENDPOINTS];
+        struct pxa25x_ep                        ep [PXA_UDC_NUM_ENDPOINTS];
 
 #ifdef CONFIG_USB_GADGET_DEBUG_FS
         struct dentry                           *debugfs_udc;
@@ -144,7 +143,7 @@ struct pxa2xx_udc {
 /* lubbock can also report usb connect/disconnect irqs */
 #endif
 
-static struct pxa2xx_udc *the_controller;
+static struct pxa25x_udc *the_controller;
 
 /*-------------------------------------------------------------------------*/
 
@@ -209,7 +208,7 @@ dump_udccs0(const char *label)
 }
 
 static void __maybe_unused
-dump_state(struct pxa2xx_udc *dev)
+dump_state(struct pxa25x_udc *dev)
 {
         u32             tmp;
         unsigned        i;
@@ -264,4 +263,4 @@ dump_state(struct pxa2xx_udc *dev)
 #define INFO(stuff...)          pr_info("udc: " stuff)
 
 
-#endif /* __LINUX_USB_GADGET_PXA2XX_H */
+#endif /* __LINUX_USB_GADGET_PXA25X_H */
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index e02bfd4df3a6..9c0e82ec5c43 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -38,7 +38,7 @@
 #include <linux/usb.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
-
+#include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */
 #include <asm/arch/udc.h>
 
 #include "pxa27x_udc.h"
@@ -2360,18 +2360,19 @@ static int pxa_udc_resume(struct platform_device *_dev)
          * Software must configure the USB OTG pad, UDC, and UHC
          * to the state they were in before entering sleep mode.
          */
-        PSSR |= PSSR_OTGPH;
+        if (cpu_is_pxa27x())
+                PSSR |= PSSR_OTGPH;
 
         return 0;
 }
 #endif
 
 /* work with hotplug and coldplug */
-MODULE_ALIAS("platform:pxa2xx-udc");
+MODULE_ALIAS("platform:pxa27x-udc");
 
 static struct platform_driver udc_driver = {
         .driver         = {
-                .name   = "pxa2xx-udc",
+                .name   = "pxa27x-udc",
                 .owner  = THIS_MODULE,
         },
         .remove         = __exit_p(pxa_udc_remove),
diff --git a/drivers/usb/gadget/pxa27x_udc.h b/drivers/usb/gadget/pxa27x_udc.h
index 97453db924ff..1d1b7936ee11 100644
--- a/drivers/usb/gadget/pxa27x_udc.h
+++ b/drivers/usb/gadget/pxa27x_udc.h
@@ -484,12 +484,4 @@ static inline struct pxa_udc *to_gadget_udc(struct usb_gadget *gadget)
 #define ep_warn(ep, fmt, arg...) \
         dev_warn(ep->dev->dev, "%s:%s:" fmt, EPNAME(ep), __func__, ## arg)
 
-/*
- * Cannot include pxa-regs.h, as register names are similar.
- * So PSSR is redefined here. This should be removed once UDC registers will
- * be gone from pxa-regs.h.
- */
-#define PSSR            __REG(0x40F00004)       /* Power Manager Sleep Status */
-#define PSSR_OTGPH      (1 << 6)                /* OTG Peripheral Hold */
-
 #endif /* __LINUX_USB_GADGET_PXA27X_H */
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 3a7c24c03671..a19a4f80a6e1 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -169,13 +169,16 @@ static void start_hnp(struct ohci_hcd *ohci)
 {
         const unsigned  port = ohci_to_hcd(ohci)->self.otg_port - 1;
         unsigned long   flags;
+        u32 l;
 
         otg_start_hnp(ohci->transceiver);
 
         local_irq_save(flags);
         ohci->transceiver->state = OTG_STATE_A_SUSPEND;
         writel (RH_PS_PSS, &ohci->regs->roothub.portstatus [port]);
-        OTG_CTRL_REG &= ~OTG_A_BUSREQ;
+        l = omap_readl(OTG_CTRL);
+        l &= ~OTG_A_BUSREQ;
+        omap_writel(l, OTG_CTRL);
         local_irq_restore(flags);
 }
 
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index d4ee27d92be8..127b15799024 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -27,6 +27,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */
 #include <asm/arch/ohci.h>
 
 #define PXA_UHC_MAX_PORTNUM    3
@@ -104,7 +105,7 @@ static int pxa27x_start_hc(struct device *dev)
         UHCHIE = (UHCHIE_UPRIE | UHCHIE_RWIE);
 
         /* Clear any OTG Pin Hold */
-        if (PSSR & PSSR_OTGPH)
+        if (cpu_is_pxa27x() && (PSSR & PSSR_OTGPH))
                 PSSR |= PSSR_OTGPH;
 
         return 0;
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index 49145534e06e..293a46247c3b 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -15,6 +15,7 @@
 #include <linux/poll.h>
 #include <linux/compat.h>
 #include <linux/mm.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -527,14 +528,17 @@ static int mon_bin_open(struct inode *inode, struct file *file)
         size_t size;
         int rc;
 
+        lock_kernel();
         mutex_lock(&mon_lock);
         if ((mbus = mon_bus_lookup(iminor(inode))) == NULL) {
                 mutex_unlock(&mon_lock);
+                unlock_kernel();
                 return -ENODEV;
         }
         if (mbus != &mon_bus0 && mbus->u_bus == NULL) {
                 printk(KERN_ERR TAG ": consistency error on open\n");
                 mutex_unlock(&mon_lock);
+                unlock_kernel();
                 return -ENODEV;
         }
 
@@ -568,6 +572,7 @@ static int mon_bin_open(struct inode *inode, struct file *file)
 
         file->private_data = rp;
         mutex_unlock(&mon_lock);
+        unlock_kernel();
         return 0;
 
 err_allocbuff:
@@ -576,6 +581,7 @@ err_allocvec:
         kfree(rp);
 err_alloc:
         mutex_unlock(&mon_lock);
+        unlock_kernel();
         return rc;
 }
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e0c5f96b273d..9b887ef64ff1 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -7,7 +7,7 @@ menu "Graphics support"
 
 source "drivers/char/agp/Kconfig"
 
-source "drivers/char/drm/Kconfig"
+source "drivers/gpu/drm/Kconfig"
 
 config VGASTATE
        tristate
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index dcd8073c2369..30bf7f2f1635 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -112,3 +112,10 @@ config BACKLIGHT_CARILLO_RANCH
         help
           If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
           backlight driver.
+
+config BACKLIGHT_PWM
+        tristate "Generic PWM based Backlight Driver"
+        depends on BACKLIGHT_CLASS_DEVICE && HAVE_PWM
+        help
+          If you have a LCD backlight adjustable by PWM, say Y to enable
+          this driver.
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 33f6c7cecc73..b51a7cd12500 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_BACKLIGHT_LOCOMO)	+= locomolcd.o
 obj-$(CONFIG_BACKLIGHT_OMAP1)   += omap1_bl.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
+obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
new file mode 100644
index 000000000000..6338d0e2fe07
--- /dev/null
+++ b/drivers/video/backlight/pwm_bl.c
@@ -0,0 +1,185 @@
+/*
+ * linux/drivers/video/backlight/pwm_bl.c
+ *
+ * simple PWM based backlight control, board code has to setup
+ * 1) pin configuration so PWM waveforms can output
+ * 2) platform_data casts to the PWM id (0/1/2/3 on PXA)
+ *
+ * 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/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/pwm.h>
+#include <linux/pwm_backlight.h>
+
+struct pwm_bl_data {
+        struct pwm_device       *pwm;
+        unsigned int            period;
+        int                     (*notify)(int brightness);
+};
+
+static int pwm_backlight_update_status(struct backlight_device *bl)
+{
+        struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
+        int brightness = bl->props.brightness;
+        int max = bl->props.max_brightness;
+
+        if (bl->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (pb->notify)
+                brightness = pb->notify(brightness);
+
+        if (brightness == 0) {
+                pwm_config(pb->pwm, 0, pb->period);
+                pwm_disable(pb->pwm);
+        } else {
+                pwm_config(pb->pwm, brightness * pb->period / max, pb->period);
+                pwm_enable(pb->pwm);
+        }
+        return 0;
+}
+
+static int pwm_backlight_get_brightness(struct backlight_device *bl)
+{
+        return bl->props.brightness;
+}
+
+static struct backlight_ops pwm_backlight_ops = {
+        .update_status  = pwm_backlight_update_status,
+        .get_brightness = pwm_backlight_get_brightness,
+};
+
+static int pwm_backlight_probe(struct platform_device *pdev)
+{
+        struct platform_pwm_backlight_data *data = pdev->dev.platform_data;
+        struct backlight_device *bl;
+        struct pwm_bl_data *pb;
+        int ret;
+
+        if (!data)
+                return -EINVAL;
+
+        if (data->init) {
+                ret = data->init(&pdev->dev);
+                if (ret < 0)
+                        return ret;
+        }
+
+        pb = kzalloc(sizeof(*pb), GFP_KERNEL);
+        if (!pb) {
+                ret = -ENOMEM;
+                goto err_alloc;
+        }
+
+        pb->period = data->pwm_period_ns;
+        pb->notify = data->notify;
+
+        pb->pwm = pwm_request(data->pwm_id, "backlight");
+        if (IS_ERR(pb->pwm)) {
+                dev_err(&pdev->dev, "unable to request PWM for backlight\n");
+                ret = PTR_ERR(pb->pwm);
+                goto err_pwm;
+        }
+
+        bl = backlight_device_register(pdev->name, &pdev->dev,
+                        pb, &pwm_backlight_ops);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "failed to register backlight\n");
+                ret = PTR_ERR(bl);
+                goto err_bl;
+        }
+
+        bl->props.max_brightness = data->max_brightness;
+        bl->props.brightness = data->dft_brightness;
+        backlight_update_status(bl);
+
+        platform_set_drvdata(pdev, bl);
+        return 0;
+
+err_bl:
+        pwm_free(pb->pwm);
+err_pwm:
+        kfree(pb);
+err_alloc:
+        if (data->exit)
+                data->exit(&pdev->dev);
+        return ret;
+}
+
+static int pwm_backlight_remove(struct platform_device *pdev)
+{
+        struct platform_pwm_backlight_data *data = pdev->dev.platform_data;
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
+
+        backlight_device_unregister(bl);
+        pwm_config(pb->pwm, 0, pb->period);
+        pwm_disable(pb->pwm);
+        pwm_free(pb->pwm);
+        kfree(pb);
+        if (data->exit)
+                data->exit(&pdev->dev);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int pwm_backlight_suspend(struct platform_device *pdev,
+                                 pm_message_t state)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
+
+        pwm_config(pb->pwm, 0, pb->period);
+        pwm_disable(pb->pwm);
+        return 0;
+}
+
+static int pwm_backlight_resume(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+
+        backlight_update_status(bl);
+        return 0;
+}
+#else
+#define pwm_backlight_suspend   NULL
+#define pwm_backlight_resume    NULL
+#endif
+
+static struct platform_driver pwm_backlight_driver = {
+        .driver         = {
+                .name   = "pwm-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = pwm_backlight_probe,
+        .remove         = pwm_backlight_remove,
+        .suspend        = pwm_backlight_suspend,
+        .resume         = pwm_backlight_resume,
+};
+
+static int __init pwm_backlight_init(void)
+{
+        return platform_driver_register(&pwm_backlight_driver);
+}
+module_init(pwm_backlight_init);
+
+static void __exit pwm_backlight_exit(void)
+{
+        platform_driver_unregister(&pwm_backlight_driver);
+}
+module_exit(pwm_backlight_exit);
+
+MODULE_DESCRIPTION("PWM based Backlight Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 776f7fcd2fbf..33ebdb198daf 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1326,20 +1326,27 @@ fb_open(struct inode *inode, struct file *file)
 
         if (fbidx >= FB_MAX)
                 return -ENODEV;
+        lock_kernel();
 #ifdef CONFIG_KMOD
         if (!(info = registered_fb[fbidx]))
                 try_to_load(fbidx);
 #endif /* CONFIG_KMOD */
-        if (!(info = registered_fb[fbidx]))
-                return -ENODEV;
-        if (!try_module_get(info->fbops->owner))
-                return -ENODEV;
+        if (!(info = registered_fb[fbidx])) {
+                res = -ENODEV;
+                goto out;
+        }
+        if (!try_module_get(info->fbops->owner)) {
+                res = -ENODEV;
+                goto out;
+        }
         file->private_data = info;
         if (info->fbops->fb_open) {
                 res = info->fbops->fb_open(info,1);
                 if (res)
                         module_put(info->fbops->owner);
         }
+out:
+        unlock_kernel();
         return res;
 }
 
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index fafe7db20d6d..d0746261c957 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1792,11 +1792,49 @@ failed:
         return ret;
 }
 
+static int __devexit pxafb_remove(struct platform_device *dev)
+{
+        struct pxafb_info *fbi = platform_get_drvdata(dev);
+        struct resource *r;
+        int irq;
+        struct fb_info *info;
+
+        if (!fbi)
+                return 0;
+
+        info = &fbi->fb;
+
+        unregister_framebuffer(info);
+
+        pxafb_disable_controller(fbi);
+
+        if (fbi->fb.cmap.len)
+                fb_dealloc_cmap(&fbi->fb.cmap);
+
+        irq = platform_get_irq(dev, 0);
+        free_irq(irq, fbi);
+
+        dma_free_writecombine(&dev->dev, fbi->map_size,
+                                        fbi->map_cpu, fbi->map_dma);
+
+        iounmap(fbi->mmio_base);
+
+        r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        release_mem_region(r->start, r->end - r->start + 1);
+
+        clk_put(fbi->clk);
+        kfree(fbi);
+
+        return 0;
+}
+
 static struct platform_driver pxafb_driver = {
         .probe          = pxafb_probe,
+        .remove         = pxafb_remove,
         .suspend        = pxafb_suspend,
         .resume         = pxafb_resume,
         .driver         = {
+                .owner  = THIS_MODULE,
                 .name   = "pxa2xx-fb",
         },
 };
@@ -1809,7 +1847,13 @@ static int __init pxafb_init(void)
         return platform_driver_register(&pxafb_driver);
 }
 
+static void __exit pxafb_exit(void)
+{
+        platform_driver_unregister(&pxafb_driver);
+}
+
 module_init(pxafb_init);
+module_exit(pxafb_exit);
 
 MODULE_DESCRIPTION("loadable framebuffer driver for PXA");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 4fb16240c04d..f5252c2552fd 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -21,8 +21,7 @@
 
 #include <asm/io.h>
 #include <asm/mtrr.h>
-
-#include <setup_arch.h>
+#include <asm/visws/sgivw.h>
 
 #define INCLUDE_TIMING_TABLE_DATA
 #define DBE_REG_BASE par->regs
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 619a6f8d65a2..47ed39b52f9c 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -18,6 +18,7 @@
  * frame buffer.
  */
 
+#include <linux/console.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/fb.h>
@@ -42,37 +43,68 @@ struct xenfb_info {
         struct xenfb_page       *page;
         unsigned long           *mfns;
         int                     update_wanted; /* XENFB_TYPE_UPDATE wanted */
+        int                     feature_resize; /* XENFB_TYPE_RESIZE ok */
+        struct xenfb_resize     resize;         /* protected by resize_lock */
+        int                     resize_dpy;     /* ditto */
+        spinlock_t              resize_lock;
 
         struct xenbus_device    *xbdev;
 };
 
-static u32 xenfb_mem_len = XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8;
+#define XENFB_DEFAULT_FB_LEN (XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8)
 
+enum { KPARAM_MEM, KPARAM_WIDTH, KPARAM_HEIGHT, KPARAM_CNT };
+static int video[KPARAM_CNT] = { 2, XENFB_WIDTH, XENFB_HEIGHT };
+module_param_array(video, int, NULL, 0);
+MODULE_PARM_DESC(video,
+        "Video memory size in MB, width, height in pixels (default 2,800,600)");
+
+static void xenfb_make_preferred_console(void);
 static int xenfb_remove(struct xenbus_device *);
-static void xenfb_init_shared_page(struct xenfb_info *);
+static void xenfb_init_shared_page(struct xenfb_info *, struct fb_info *);
 static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *);
 static void xenfb_disconnect_backend(struct xenfb_info *);
 
+static void xenfb_send_event(struct xenfb_info *info,
+                             union xenfb_out_event *event)
+{
+        u32 prod;
+
+        prod = info->page->out_prod;
+        /* caller ensures !xenfb_queue_full() */
+        mb();                   /* ensure ring space available */
+        XENFB_OUT_RING_REF(info->page, prod) = *event;
+        wmb();                  /* ensure ring contents visible */
+        info->page->out_prod = prod + 1;
+
+        notify_remote_via_irq(info->irq);
+}
+
 static void xenfb_do_update(struct xenfb_info *info,
                             int x, int y, int w, int h)
 {
         union xenfb_out_event event;
-        u32 prod;
 
+        memset(&event, 0, sizeof(event));
         event.type = XENFB_TYPE_UPDATE;
         event.update.x = x;
         event.update.y = y;
         event.update.width = w;
         event.update.height = h;
 
-        prod = info->page->out_prod;
         /* caller ensures !xenfb_queue_full() */
-        mb();                   /* ensure ring space available */
-        XENFB_OUT_RING_REF(info->page, prod) = event;
-        wmb();                  /* ensure ring contents visible */
-        info->page->out_prod = prod + 1;
+        xenfb_send_event(info, &event);
+}
 
-        notify_remote_via_irq(info->irq);
+static void xenfb_do_resize(struct xenfb_info *info)
+{
+        union xenfb_out_event event;
+
+        memset(&event, 0, sizeof(event));
+        event.resize = info->resize;
+
+        /* caller ensures !xenfb_queue_full() */
+        xenfb_send_event(info, &event);
 }
 
 static int xenfb_queue_full(struct xenfb_info *info)
@@ -84,12 +116,28 @@ static int xenfb_queue_full(struct xenfb_info *info)
         return prod - cons == XENFB_OUT_RING_LEN;
 }
 
+static void xenfb_handle_resize_dpy(struct xenfb_info *info)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&info->resize_lock, flags);
+        if (info->resize_dpy) {
+                if (!xenfb_queue_full(info)) {
+                        info->resize_dpy = 0;
+                        xenfb_do_resize(info);
+                }
+        }
+        spin_unlock_irqrestore(&info->resize_lock, flags);
+}
+
 static void xenfb_refresh(struct xenfb_info *info,
                           int x1, int y1, int w, int h)
 {
         unsigned long flags;
-        int y2 = y1 + h - 1;
         int x2 = x1 + w - 1;
+        int y2 = y1 + h - 1;
+
+        xenfb_handle_resize_dpy(info);
 
         if (!info->update_wanted)
                 return;
@@ -222,6 +270,57 @@ static ssize_t xenfb_write(struct fb_info *p, const char __user *buf,
         return res;
 }
 
+static int
+xenfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct xenfb_info *xenfb_info;
+        int required_mem_len;
+
+        xenfb_info = info->par;
+
+        if (!xenfb_info->feature_resize) {
+                if (var->xres == video[KPARAM_WIDTH] &&
+                    var->yres == video[KPARAM_HEIGHT] &&
+                    var->bits_per_pixel == xenfb_info->page->depth) {
+                        return 0;
+                }
+                return -EINVAL;
+        }
+
+        /* Can't resize past initial width and height */
+        if (var->xres > video[KPARAM_WIDTH] || var->yres > video[KPARAM_HEIGHT])
+                return -EINVAL;
+
+        required_mem_len = var->xres * var->yres * xenfb_info->page->depth / 8;
+        if (var->bits_per_pixel == xenfb_info->page->depth &&
+            var->xres <= info->fix.line_length / (XENFB_DEPTH / 8) &&
+            required_mem_len <= info->fix.smem_len) {
+                var->xres_virtual = var->xres;
+                var->yres_virtual = var->yres;
+                return 0;
+        }
+        return -EINVAL;
+}
+
+static int xenfb_set_par(struct fb_info *info)
+{
+        struct xenfb_info *xenfb_info;
+        unsigned long flags;
+
+        xenfb_info = info->par;
+
+        spin_lock_irqsave(&xenfb_info->resize_lock, flags);
+        xenfb_info->resize.type = XENFB_TYPE_RESIZE;
+        xenfb_info->resize.width = info->var.xres;
+        xenfb_info->resize.height = info->var.yres;
+        xenfb_info->resize.stride = info->fix.line_length;
+        xenfb_info->resize.depth = info->var.bits_per_pixel;
+        xenfb_info->resize.offset = 0;
+        xenfb_info->resize_dpy = 1;
+        spin_unlock_irqrestore(&xenfb_info->resize_lock, flags);
+        return 0;
+}
+
 static struct fb_ops xenfb_fb_ops = {
         .owner          = THIS_MODULE,
         .fb_read        = fb_sys_read,
@@ -230,6 +329,8 @@ static struct fb_ops xenfb_fb_ops = {
         .fb_fillrect    = xenfb_fillrect,
         .fb_copyarea    = xenfb_copyarea,
         .fb_imageblit   = xenfb_imageblit,
+        .fb_check_var   = xenfb_check_var,
+        .fb_set_par     = xenfb_set_par,
 };
 
 static irqreturn_t xenfb_event_handler(int rq, void *dev_id)
@@ -258,6 +359,8 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
 {
         struct xenfb_info *info;
         struct fb_info *fb_info;
+        int fb_size;
+        int val;
         int ret;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
@@ -265,18 +368,35 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
                 xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
                 return -ENOMEM;
         }
+
+        /* Limit kernel param videoram amount to what is in xenstore */
+        if (xenbus_scanf(XBT_NIL, dev->otherend, "videoram", "%d", &val) == 1) {
+                if (val < video[KPARAM_MEM])
+                        video[KPARAM_MEM] = val;
+        }
+
+        /* If requested res does not fit in available memory, use default */
+        fb_size = video[KPARAM_MEM] * 1024 * 1024;
+        if (video[KPARAM_WIDTH] * video[KPARAM_HEIGHT] * XENFB_DEPTH / 8
+            > fb_size) {
+                video[KPARAM_WIDTH] = XENFB_WIDTH;
+                video[KPARAM_HEIGHT] = XENFB_HEIGHT;
+                fb_size = XENFB_DEFAULT_FB_LEN;
+        }
+
         dev->dev.driver_data = info;
         info->xbdev = dev;
         info->irq = -1;
         info->x1 = info->y1 = INT_MAX;
         spin_lock_init(&info->dirty_lock);
+        spin_lock_init(&info->resize_lock);
 
-        info->fb = vmalloc(xenfb_mem_len);
+        info->fb = vmalloc(fb_size);
         if (info->fb == NULL)
                 goto error_nomem;
-        memset(info->fb, 0, xenfb_mem_len);
+        memset(info->fb, 0, fb_size);
 
-        info->nr_pages = (xenfb_mem_len + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        info->nr_pages = (fb_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
 
         info->mfns = vmalloc(sizeof(unsigned long) * info->nr_pages);
         if (!info->mfns)
@@ -287,8 +407,6 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         if (!info->page)
                 goto error_nomem;
 
-        xenfb_init_shared_page(info);
-
         /* abusing framebuffer_alloc() to allocate pseudo_palette */
         fb_info = framebuffer_alloc(sizeof(u32) * 256, NULL);
         if (fb_info == NULL)
@@ -301,9 +419,9 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         fb_info->screen_base = info->fb;
 
         fb_info->fbops = &xenfb_fb_ops;
-        fb_info->var.xres_virtual = fb_info->var.xres = info->page->width;
-        fb_info->var.yres_virtual = fb_info->var.yres = info->page->height;
-        fb_info->var.bits_per_pixel = info->page->depth;
+        fb_info->var.xres_virtual = fb_info->var.xres = video[KPARAM_WIDTH];
+        fb_info->var.yres_virtual = fb_info->var.yres = video[KPARAM_HEIGHT];
+        fb_info->var.bits_per_pixel = XENFB_DEPTH;
 
         fb_info->var.red = (struct fb_bitfield){16, 8, 0};
         fb_info->var.green = (struct fb_bitfield){8, 8, 0};
@@ -315,9 +433,9 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         fb_info->var.vmode = FB_VMODE_NONINTERLACED;
 
         fb_info->fix.visual = FB_VISUAL_TRUECOLOR;
-        fb_info->fix.line_length = info->page->line_length;
+        fb_info->fix.line_length = fb_info->var.xres * XENFB_DEPTH / 8;
         fb_info->fix.smem_start = 0;
-        fb_info->fix.smem_len = xenfb_mem_len;
+        fb_info->fix.smem_len = fb_size;
         strcpy(fb_info->fix.id, "xen");
         fb_info->fix.type = FB_TYPE_PACKED_PIXELS;
         fb_info->fix.accel = FB_ACCEL_NONE;
@@ -334,6 +452,8 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         fb_info->fbdefio = &xenfb_defio;
         fb_deferred_io_init(fb_info);
 
+        xenfb_init_shared_page(info, fb_info);
+
         ret = register_framebuffer(fb_info);
         if (ret) {
                 fb_deferred_io_cleanup(fb_info);
@@ -348,6 +468,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         if (ret < 0)
                 goto error;
 
+        xenfb_make_preferred_console();
         return 0;
 
  error_nomem:
@@ -358,12 +479,34 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         return ret;
 }
 
+static __devinit void
+xenfb_make_preferred_console(void)
+{
+        struct console *c;
+
+        if (console_set_on_cmdline)
+                return;
+
+        acquire_console_sem();
+        for (c = console_drivers; c; c = c->next) {
+                if (!strcmp(c->name, "tty") && c->index == 0)
+                        break;
+        }
+        release_console_sem();
+        if (c) {
+                unregister_console(c);
+                c->flags |= CON_CONSDEV;
+                c->flags &= ~CON_PRINTBUFFER; /* don't print again */
+                register_console(c);
+        }
+}
+
 static int xenfb_resume(struct xenbus_device *dev)
 {
         struct xenfb_info *info = dev->dev.driver_data;
 
         xenfb_disconnect_backend(info);
-        xenfb_init_shared_page(info);
+        xenfb_init_shared_page(info, info->fb_info);
         return xenfb_connect_backend(dev, info);
 }
 
@@ -391,20 +534,23 @@ static unsigned long vmalloc_to_mfn(void *address)
         return pfn_to_mfn(vmalloc_to_pfn(address));
 }
 
-static void xenfb_init_shared_page(struct xenfb_info *info)
+static void xenfb_init_shared_page(struct xenfb_info *info,
+                                   struct fb_info *fb_info)
 {
         int i;
+        int epd = PAGE_SIZE / sizeof(info->mfns[0]);
 
         for (i = 0; i < info->nr_pages; i++)
                 info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE);
 
-        info->page->pd[0] = vmalloc_to_mfn(info->mfns);
-        info->page->pd[1] = 0;
-        info->page->width = XENFB_WIDTH;
-        info->page->height = XENFB_HEIGHT;
-        info->page->depth = XENFB_DEPTH;
-        info->page->line_length = (info->page->depth / 8) * info->page->width;
-        info->page->mem_length = xenfb_mem_len;
+        for (i = 0; i * epd < info->nr_pages; i++)
+                info->page->pd[i] = vmalloc_to_mfn(&info->mfns[i * epd]);
+
+        info->page->width = fb_info->var.xres;
+        info->page->height = fb_info->var.yres;
+        info->page->depth = fb_info->var.bits_per_pixel;
+        info->page->line_length = fb_info->fix.line_length;
+        info->page->mem_length = fb_info->fix.smem_len;
         info->page->in_cons = info->page->in_prod = 0;
         info->page->out_cons = info->page->out_prod = 0;
 }
@@ -504,6 +650,11 @@ InitWait:
                         val = 0;
                 if (val)
                         info->update_wanted = 1;
+
+                if (xenbus_scanf(XBT_NIL, dev->otherend,
+                                 "feature-resize", "%d", &val) < 0)
+                        val = 0;
+                info->feature_resize = val;
                 break;
 
         case XenbusStateClosing:
@@ -547,4 +698,6 @@ static void __exit xenfb_cleanup(void)
 module_init(xenfb_init);
 module_exit(xenfb_cleanup);
 
+MODULE_DESCRIPTION("Xen virtual framebuffer device frontend");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("xen:vfb");
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 37af04f1ffd9..363286c54290 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,4 +1,4 @@
-obj-y   += grant-table.o features.o events.o
+obj-y   += grant-table.o features.o events.o manage.o
 obj-y   += xenbus/
 obj-$(CONFIG_XEN_XENCOMM)       += xencomm.o
 obj-$(CONFIG_XEN_BALLOON)       += balloon.o
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index ab25ba6cbbb9..591bc29b55f5 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -225,7 +225,7 @@ static int increase_reservation(unsigned long nr_pages)
                 page = balloon_next_page(page);
         }
 
-        reservation.extent_start = (unsigned long)frame_list;
+        set_xen_guest_handle(reservation.extent_start, frame_list);
         reservation.nr_extents   = nr_pages;
         rc = HYPERVISOR_memory_op(
                 XENMEM_populate_physmap, &reservation);
@@ -321,7 +321,7 @@ static int decrease_reservation(unsigned long nr_pages)
                 balloon_append(pfn_to_page(pfn));
         }
 
-        reservation.extent_start = (unsigned long)frame_list;
+        set_xen_guest_handle(reservation.extent_start, frame_list);
         reservation.nr_extents   = nr_pages;
         ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
         BUG_ON(ret != nr_pages);
@@ -368,7 +368,7 @@ static void balloon_process(struct work_struct *work)
 }
 
 /* Resets the Xen limit, sets new target, and kicks off processing. */
-void balloon_set_new_target(unsigned long target)
+static void balloon_set_new_target(unsigned long target)
 {
         /* No need for lock. Not read-modify-write updates. */
         balloon_stats.hard_limit   = ~0UL;
@@ -483,7 +483,7 @@ static int dealloc_pte_fn(
                 .extent_order = 0,
                 .domid        = DOMID_SELF
         };
-        reservation.extent_start = (unsigned long)&mfn;
+        set_xen_guest_handle(reservation.extent_start, &mfn);
         set_pte_at(&init_mm, addr, pte, __pte_ma(0ull));
         set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY);
         ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
@@ -519,7 +519,7 @@ static struct page **alloc_empty_pages_and_pagevec(int nr_pages)
                                 .extent_order = 0,
                                 .domid        = DOMID_SELF
                         };
-                        reservation.extent_start = (unsigned long)&gmfn;
+                        set_xen_guest_handle(reservation.extent_start, &gmfn);
                         ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
                                                    &reservation);
                         if (ret == 1)
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 76e5b7386af9..332dd63750a0 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -355,7 +355,7 @@ static void unbind_from_irq(unsigned int irq)
 
         spin_lock(&irq_mapping_update_lock);
 
-        if (VALID_EVTCHN(evtchn) && (--irq_bindcount[irq] == 0)) {
+        if ((--irq_bindcount[irq] == 0) && VALID_EVTCHN(evtchn)) {
                 close.port = evtchn;
                 if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
                         BUG();
@@ -375,7 +375,7 @@ static void unbind_from_irq(unsigned int irq)
                 evtchn_to_irq[evtchn] = -1;
                 irq_info[irq] = IRQ_UNBOUND;
 
-                dynamic_irq_init(irq);
+                dynamic_irq_cleanup(irq);
         }
 
         spin_unlock(&irq_mapping_update_lock);
@@ -557,6 +557,33 @@ out:
         put_cpu();
 }
 
+/* Rebind a new event channel to an existing irq. */
+void rebind_evtchn_irq(int evtchn, int irq)
+{
+        /* Make sure the irq is masked, since the new event channel
+           will also be masked. */
+        disable_irq(irq);
+
+        spin_lock(&irq_mapping_update_lock);
+
+        /* After resume the irq<->evtchn mappings are all cleared out */
+        BUG_ON(evtchn_to_irq[evtchn] != -1);
+        /* Expect irq to have been bound before,
+           so the bindcount should be non-0 */
+        BUG_ON(irq_bindcount[irq] == 0);
+
+        evtchn_to_irq[evtchn] = irq;
+        irq_info[irq] = mk_irq_info(IRQT_EVTCHN, 0, evtchn);
+
+        spin_unlock(&irq_mapping_update_lock);
+
+        /* new event channels are always bound to cpu 0 */
+        irq_set_affinity(irq, cpumask_of_cpu(0));
+
+        /* Unmask the event channel. */
+        enable_irq(irq);
+}
+
 /* Rebind an evtchn so that it gets delivered to a specific cpu */
 static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
 {
@@ -647,6 +674,89 @@ static int retrigger_dynirq(unsigned int irq)
         return ret;
 }
 
+static void restore_cpu_virqs(unsigned int cpu)
+{
+        struct evtchn_bind_virq bind_virq;
+        int virq, irq, evtchn;
+
+        for (virq = 0; virq < NR_VIRQS; virq++) {
+                if ((irq = per_cpu(virq_to_irq, cpu)[virq]) == -1)
+                        continue;
+
+                BUG_ON(irq_info[irq].type != IRQT_VIRQ);
+                BUG_ON(irq_info[irq].index != virq);
+
+                /* Get a new binding from Xen. */
+                bind_virq.virq = virq;
+                bind_virq.vcpu = cpu;
+                if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
+                                                &bind_virq) != 0)
+                        BUG();
+                evtchn = bind_virq.port;
+
+                /* Record the new mapping. */
+                evtchn_to_irq[evtchn] = irq;
+                irq_info[irq] = mk_irq_info(IRQT_VIRQ, virq, evtchn);
+                bind_evtchn_to_cpu(evtchn, cpu);
+
+                /* Ready for use. */
+                unmask_evtchn(evtchn);
+        }
+}
+
+static void restore_cpu_ipis(unsigned int cpu)
+{
+        struct evtchn_bind_ipi bind_ipi;
+        int ipi, irq, evtchn;
+
+        for (ipi = 0; ipi < XEN_NR_IPIS; ipi++) {
+                if ((irq = per_cpu(ipi_to_irq, cpu)[ipi]) == -1)
+                        continue;
+
+                BUG_ON(irq_info[irq].type != IRQT_IPI);
+                BUG_ON(irq_info[irq].index != ipi);
+
+                /* Get a new binding from Xen. */
+                bind_ipi.vcpu = cpu;
+                if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi,
+                                                &bind_ipi) != 0)
+                        BUG();
+                evtchn = bind_ipi.port;
+
+                /* Record the new mapping. */
+                evtchn_to_irq[evtchn] = irq;
+                irq_info[irq] = mk_irq_info(IRQT_IPI, ipi, evtchn);
+                bind_evtchn_to_cpu(evtchn, cpu);
+
+                /* Ready for use. */
+                unmask_evtchn(evtchn);
+
+        }
+}
+
+void xen_irq_resume(void)
+{
+        unsigned int cpu, irq, evtchn;
+
+        init_evtchn_cpu_bindings();
+
+        /* New event-channel space is not 'live' yet. */
+        for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++)
+                mask_evtchn(evtchn);
+
+        /* No IRQ <-> event-channel mappings. */
+        for (irq = 0; irq < NR_IRQS; irq++)
+                irq_info[irq].evtchn = 0; /* zap event-channel binding */
+
+        for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++)
+                evtchn_to_irq[evtchn] = -1;
+
+        for_each_possible_cpu(cpu) {
+                restore_cpu_virqs(cpu);
+                restore_cpu_ipis(cpu);
+        }
+}
+
 static struct irq_chip xen_dynamic_chip __read_mostly = {
         .name           = "xen-dyn",
         .mask           = disable_dynirq,
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 52b6b41b909d..e9e11168616a 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -471,14 +471,14 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
         return 0;
 }
 
-static int gnttab_resume(void)
+int gnttab_resume(void)
 {
         if (max_nr_grant_frames() < nr_grant_frames)
                 return -ENOSYS;
         return gnttab_map(0, nr_grant_frames - 1);
 }
 
-static int gnttab_suspend(void)
+int gnttab_suspend(void)
 {
         arch_gnttab_unmap_shared(shared, nr_grant_frames);
         return 0;
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
new file mode 100644
index 000000000000..5b546e365f00
--- /dev/null
+++ b/drivers/xen/manage.c
@@ -0,0 +1,252 @@
+/*
+ * Handle extern requests for shutdown, reboot and sysrq
+ */
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/reboot.h>
+#include <linux/sysrq.h>
+#include <linux/stop_machine.h>
+#include <linux/freezer.h>
+
+#include <xen/xenbus.h>
+#include <xen/grant_table.h>
+#include <xen/events.h>
+#include <xen/hvc-console.h>
+#include <xen/xen-ops.h>
+
+#include <asm/xen/hypercall.h>
+#include <asm/xen/page.h>
+
+enum shutdown_state {
+        SHUTDOWN_INVALID = -1,
+        SHUTDOWN_POWEROFF = 0,
+        SHUTDOWN_SUSPEND = 2,
+        /* Code 3 is SHUTDOWN_CRASH, which we don't use because the domain can only
+           report a crash, not be instructed to crash!
+           HALT is the same as POWEROFF, as far as we're concerned.  The tools use
+           the distinction when we return the reason code to them.  */
+         SHUTDOWN_HALT = 4,
+};
+
+/* Ignore multiple shutdown requests. */
+static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
+
+#ifdef CONFIG_PM_SLEEP
+static int xen_suspend(void *data)
+{
+        int *cancelled = data;
+        int err;
+
+        BUG_ON(!irqs_disabled());
+
+        load_cr3(swapper_pg_dir);
+
+        err = device_power_down(PMSG_SUSPEND);
+        if (err) {
+                printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",
+                       err);
+                return err;
+        }
+
+        xen_mm_pin_all();
+        gnttab_suspend();
+        xen_pre_suspend();
+
+        /*
+         * This hypercall returns 1 if suspend was cancelled
+         * or the domain was merely checkpointed, and 0 if it
+         * is resuming in a new domain.
+         */
+        *cancelled = HYPERVISOR_suspend(virt_to_mfn(xen_start_info));
+
+        xen_post_suspend(*cancelled);
+        gnttab_resume();
+        xen_mm_unpin_all();
+
+        device_power_up();
+
+        if (!*cancelled) {
+                xen_irq_resume();
+                xen_console_resume();
+        }
+
+        return 0;
+}
+
+static void do_suspend(void)
+{
+        int err;
+        int cancelled = 1;
+
+        shutting_down = SHUTDOWN_SUSPEND;
+
+#ifdef CONFIG_PREEMPT
+        /* If the kernel is preemptible, we need to freeze all the processes
+           to prevent them from being in the middle of a pagetable update
+           during suspend. */
+        err = freeze_processes();
+        if (err) {
+                printk(KERN_ERR "xen suspend: freeze failed %d\n", err);
+                return;
+        }
+#endif
+
+        err = device_suspend(PMSG_SUSPEND);
+        if (err) {
+                printk(KERN_ERR "xen suspend: device_suspend %d\n", err);
+                goto out;
+        }
+
+        printk("suspending xenbus...\n");
+        /* XXX use normal device tree? */
+        xenbus_suspend();
+
+        err = stop_machine_run(xen_suspend, &cancelled, 0);
+        if (err) {
+                printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
+                goto out;
+        }
+
+        if (!cancelled)
+                xenbus_resume();
+        else
+                xenbus_suspend_cancel();
+
+        device_resume();
+
+        /* Make sure timer events get retriggered on all CPUs */
+        clock_was_set();
+out:
+#ifdef CONFIG_PREEMPT
+        thaw_processes();
+#endif
+        shutting_down = SHUTDOWN_INVALID;
+}
+#endif  /* CONFIG_PM_SLEEP */
+
+static void shutdown_handler(struct xenbus_watch *watch,
+                             const char **vec, unsigned int len)
+{
+        char *str;
+        struct xenbus_transaction xbt;
+        int err;
+
+        if (shutting_down != SHUTDOWN_INVALID)
+                return;
+
+ again:
+        err = xenbus_transaction_start(&xbt);
+        if (err)
+                return;
+
+        str = (char *)xenbus_read(xbt, "control", "shutdown", NULL);
+        /* Ignore read errors and empty reads. */
+        if (XENBUS_IS_ERR_READ(str)) {
+                xenbus_transaction_end(xbt, 1);
+                return;
+        }
+
+        xenbus_write(xbt, "control", "shutdown", "");
+
+        err = xenbus_transaction_end(xbt, 0);
+        if (err == -EAGAIN) {
+                kfree(str);
+                goto again;
+        }
+
+        if (strcmp(str, "poweroff") == 0 ||
+            strcmp(str, "halt") == 0) {
+                shutting_down = SHUTDOWN_POWEROFF;
+                orderly_poweroff(false);
+        } else if (strcmp(str, "reboot") == 0) {
+                shutting_down = SHUTDOWN_POWEROFF; /* ? */
+                ctrl_alt_del();
+#ifdef CONFIG_PM_SLEEP
+        } else if (strcmp(str, "suspend") == 0) {
+                do_suspend();
+#endif
+        } else {
+                printk(KERN_INFO "Ignoring shutdown request: %s\n", str);
+                shutting_down = SHUTDOWN_INVALID;
+        }
+
+        kfree(str);
+}
+
+static void sysrq_handler(struct xenbus_watch *watch, const char **vec,
+                          unsigned int len)
+{
+        char sysrq_key = '\0';
+        struct xenbus_transaction xbt;
+        int err;
+
+ again:
+        err = xenbus_transaction_start(&xbt);
+        if (err)
+                return;
+        if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) {
+                printk(KERN_ERR "Unable to read sysrq code in "
+                       "control/sysrq\n");
+                xenbus_transaction_end(xbt, 1);
+                return;
+        }
+
+        if (sysrq_key != '\0')
+                xenbus_printf(xbt, "control", "sysrq", "%c", '\0');
+
+        err = xenbus_transaction_end(xbt, 0);
+        if (err == -EAGAIN)
+                goto again;
+
+        if (sysrq_key != '\0')
+                handle_sysrq(sysrq_key, NULL);
+}
+
+static struct xenbus_watch shutdown_watch = {
+        .node = "control/shutdown",
+        .callback = shutdown_handler
+};
+
+static struct xenbus_watch sysrq_watch = {
+        .node = "control/sysrq",
+        .callback = sysrq_handler
+};
+
+static int setup_shutdown_watcher(void)
+{
+        int err;
+
+        err = register_xenbus_watch(&shutdown_watch);
+        if (err) {
+                printk(KERN_ERR "Failed to set shutdown watcher\n");
+                return err;
+        }
+
+        err = register_xenbus_watch(&sysrq_watch);
+        if (err) {
+                printk(KERN_ERR "Failed to set sysrq watcher\n");
+                return err;
+        }
+
+        return 0;
+}
+
+static int shutdown_event(struct notifier_block *notifier,
+                          unsigned long event,
+                          void *data)
+{
+        setup_shutdown_watcher();
+        return NOTIFY_DONE;
+}
+
+static int __init setup_shutdown_event(void)
+{
+        static struct notifier_block xenstore_notifier = {
+                .notifier_call = shutdown_event
+        };
+        register_xenstore_notifier(&xenstore_notifier);
+
+        return 0;
+}
+
+subsys_initcall(setup_shutdown_event);
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index 0f86b0ff7879..9678b3e98c63 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -117,7 +117,7 @@ int xenbus_watch_pathfmt(struct xenbus_device *dev,
         char *path;
 
         va_start(ap, pathfmt);
-        path = kvasprintf(GFP_KERNEL, pathfmt, ap);
+        path = kvasprintf(GFP_NOIO | __GFP_HIGH, pathfmt, ap);
         va_end(ap);
 
         if (!path) {
diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c
index 6efbe3f29ca5..090c61ee8fd0 100644
--- a/drivers/xen/xenbus/xenbus_comms.c
+++ b/drivers/xen/xenbus/xenbus_comms.c
@@ -203,7 +203,6 @@ int xb_read(void *data, unsigned len)
 int xb_init_comms(void)
 {
         struct xenstore_domain_interface *intf = xen_store_interface;
-        int err;
 
         if (intf->req_prod != intf->req_cons)
                 printk(KERN_ERR "XENBUS request ring is not quiescent "
@@ -216,18 +215,20 @@ int xb_init_comms(void)
                 intf->rsp_cons = intf->rsp_prod;
         }
 
-        if (xenbus_irq)
-                unbind_from_irqhandler(xenbus_irq, &xb_waitq);
+        if (xenbus_irq) {
+                /* Already have an irq; assume we're resuming */
+                rebind_evtchn_irq(xen_store_evtchn, xenbus_irq);
+        } else {
+                int err;
+                err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting,
+                                                0, "xenbus", &xb_waitq);
+                if (err <= 0) {
+                        printk(KERN_ERR "XENBUS request irq failed %i\n", err);
+                        return err;
+                }
 
-        err = bind_evtchn_to_irqhandler(
-                xen_store_evtchn, wake_waiting,
-                0, "xenbus", &xb_waitq);
-        if (err <= 0) {
-                printk(KERN_ERR "XENBUS request irq failed %i\n", err);
-                return err;
+                xenbus_irq = err;
         }
 
-        xenbus_irq = err;
-
         return 0;
 }
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index 227d53b12a5c..7f2f91c0e11d 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -283,9 +283,9 @@ static char *join(const char *dir, const char *name)
         char *buffer;
 
         if (strlen(name) == 0)
-                buffer = kasprintf(GFP_KERNEL, "%s", dir);
+                buffer = kasprintf(GFP_NOIO | __GFP_HIGH, "%s", dir);
         else
-                buffer = kasprintf(GFP_KERNEL, "%s/%s", dir, name);
+                buffer = kasprintf(GFP_NOIO | __GFP_HIGH, "%s/%s", dir, name);
         return (!buffer) ? ERR_PTR(-ENOMEM) : buffer;
 }
 
@@ -297,7 +297,7 @@ static char **split(char *strings, unsigned int len, unsigned int *num)
         *num = count_strings(strings, len);
 
         /* Transfer to one big alloc for easy freeing. */
-        ret = kmalloc(*num * sizeof(char *) + len, GFP_KERNEL);
+        ret = kmalloc(*num * sizeof(char *) + len, GFP_NOIO | __GFP_HIGH);
         if (!ret) {
                 kfree(strings);
                 return ERR_PTR(-ENOMEM);
@@ -751,7 +751,7 @@ static int process_msg(void)
         }
 
 
-        msg = kmalloc(sizeof(*msg), GFP_KERNEL);
+        msg = kmalloc(sizeof(*msg), GFP_NOIO | __GFP_HIGH);
         if (msg == NULL) {
                 err = -ENOMEM;
                 goto out;
@@ -763,7 +763,7 @@ static int process_msg(void)
                 goto out;
         }
 
-        body = kmalloc(msg->hdr.len + 1, GFP_KERNEL);
+        body = kmalloc(msg->hdr.len + 1, GFP_NOIO | __GFP_HIGH);
         if (body == NULL) {
                 kfree(msg);
                 err = -ENOMEM;