From: Michael Holzheu <[EMAIL PROTECTED]>
[S390] cio: fix stsch_reset.
Copy inline assembly of stsch and add "memory" to clobber list in order
to prevent gcc from optimizing away the checking of the global variable
"pgm_check_occured".
Signed-off-by: Michael Holzheu <[EMAIL PROTECTED]>
Signed-off-by: Martin Schwidefsky <[EMAIL PROTECTED]>
---
drivers/s390/cio/cio.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff -urpN linux-2.6/drivers/s390/cio/cio.c
linux-2.6-patched/drivers/s390/cio/cio.c
--- linux-2.6/drivers/s390/cio/cio.c 2006-12-28 00:33:22.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/cio.c 2006-12-28 00:33:36.000000000
+0100
@@ -2,8 +2,7 @@
* drivers/s390/cio/cio.c
* S/390 common I/O routines -- low level i/o calls
*
- * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
- * IBM Corporation
+ * Copyright (C) IBM Corp. 1999,2006
* Author(s): Ingo Adlung ([EMAIL PROTECTED])
* Cornelia Huck ([EMAIL PROTECTED])
* Arnd Bergmann ([EMAIL PROTECTED])
@@ -881,10 +880,18 @@ static void cio_reset_pgm_check_handler(
static int stsch_reset(struct subchannel_id schid, volatile struct schib *addr)
{
int rc;
+ register struct subchannel_id reg1 asm ("1") = schid;
pgm_check_occured = 0;
s390_reset_pgm_handler = cio_reset_pgm_check_handler;
- rc = stsch(schid, addr);
+
+ asm volatile(
+ " stsch 0(%2)\n"
+ " ipm %0\n"
+ " srl %0,28"
+ : "=d" (rc)
+ : "d" (reg1), "a" (addr), "m" (*addr) : "memory", "cc");
+
s390_reset_pgm_handler = NULL;
if (pgm_check_occured)
return -EIO;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
