2005-01-14 18:58:10

by Martin Schwidefsky

[permalink] [raw]
Subject: [patch 3/8] s390: Common I/O layer changes.

[patch 3/8] s390: Common I/O layer changes.

From: Steffen Thoss <[email protected]>

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 <[email protected]>

diffstat:
drivers/s390/cio/qdio.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

diff -urN linux-2.6/drivers/s390/cio/qdio.c linux-2.6-patched/drivers/s390/cio/qdio.c
--- linux-2.6/drivers/s390/cio/qdio.c 2005-01-14 19:44:49.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/qdio.c 2005-01-14 19:45:17.000000000 +0100
@@ -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 <[email protected]>");
@@ -2043,6 +2043,7 @@
"installed.\n");
return -ENOENT;
}
+
/* Check for bits 107 and 108. */
if (!css_chsc_characteristics.scssc ||
!css_chsc_characteristics.scsscf) {
@@ -2132,7 +2133,11 @@
/* 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");