diff options
| author | Steffen Thoss <thoss@de.ibm.com> | 2005-01-14 23:32:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:32:09 -0800 |
| commit | f86e570be4bace9ff771d94ca9a0f03c44fe0884 (patch) | |
| tree | e7dbb4b7d245f233e7d4f1dd144966a5fc5def87 /drivers | |
| parent | 7b9ae9f9b01a880ac3c57882ebb74f3da1287326 (diff) | |
| download | history-f86e570be4bace9ff771d94ca9a0f03c44fe0884.tar.gz | |
[PATCH] s390: Common I/O layer changes
Common I/O layer changes:
- Check if AIF is available on hardware before enabling
the AIF time delay disablement facility.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/cio/qdio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index ef1057fcfb080d..46105ed76d540d 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c @@ -56,7 +56,7 @@ #include "ioasm.h" #include "chsc.h" -#define VERSION_QDIO_C "$Revision: 1.94 $" +#define VERSION_QDIO_C "$Revision: 1.98 $" /****************** MODULE PARAMETER VARIABLES ********************/ MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>"); @@ -2043,6 +2043,7 @@ tiqdio_check_chsc_availability(void) "installed.\n"); return -ENOENT; } + /* Check for bits 107 and 108. */ if (!css_chsc_characteristics.scssc || !css_chsc_characteristics.scsscf) { @@ -2132,7 +2133,11 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero) /* enables the time delay disablement facility. Don't care * whether it is really there (i.e. we haven't checked for * it) */ - scssc_area->word_with_d_bit = 0x10000000; + if (css_general_characteristics.aif_tdd) + scssc_area->word_with_d_bit = 0x10000000; + else + QDIO_PRINT_WARN("Time delay disablement facility " \ + "not available\n"); |