summaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/cio.c
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2008-07-14 09:58:58 +0200
committerHeiko Carstens <heiko.carstens@de.ibm.com>2008-07-14 10:02:10 +0200
commit3a3fc29a6d0626fb4897b7391c4e956efbacd394 (patch)
tree7107a7883f44c6350d8d85bab7a1871b6cb342e6 /drivers/s390/cio/cio.c
parent75784c00876c88ca6e955c39cbb5d47cf408fd3c (diff)
downloadop-kernel-dev-3a3fc29a6d0626fb4897b7391c4e956efbacd394.zip
op-kernel-dev-3a3fc29a6d0626fb4897b7391c4e956efbacd394.tar.gz
[S390] cio: Introduce abstract isc definitions.
Replace the numeric values for I/O interruption subclass usage with abstract definitions and collect them all in asm/isc.h. This gives us a better overview of which iscs are actually used and makes it possible to better spread out isc usage in the future. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/cio.c')
-rw-r--r--drivers/s390/cio/cio.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index c24dfcd8..a4f9130 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -24,6 +24,7 @@
#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"
@@ -699,9 +700,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 {
@@ -783,10 +784,10 @@ cio_probe_console(void)
}
/*
- * enable console I/O-interrupt subclass 1
+ * enable console I/O-interrupt subclass
*/
- ctl_set_bit(6, 30);
- console_subchannel.schib.pmcw.isc = 1;
+ ctl_set_bit(6, 31 - CONSOLE_ISC);
+ console_subchannel.schib.pmcw.isc = CONSOLE_ISC;
console_subchannel.schib.pmcw.intparm =
(u32)(addr_t)&console_subchannel;
ret = cio_modify(&console_subchannel);
@@ -802,7 +803,7 @@ cio_release_console(void)
{
console_subchannel.schib.pmcw.intparm = 0;
cio_modify(&console_subchannel);
- ctl_clear_bit(6, 30);
+ ctl_clear_bit(6, 31 - CONSOLE_ISC);
console_subchannel_in_use = 0;
}
OpenPOWER on IntegriCloud