lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] cio: use barrier() in stsch_reset.

Browse Source 
Use barrier() in stsch_reset() instead of duplicating the stsch()
inline assembly and adding "memory" to the clobberlist.
Pointed out by Chuck Ebbert.

Real fix would be to add a fixup section to the stsch() and extend the
basic program check handler so it searches the exception tables in case
of a program check.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
2007-01-09 10:18:41 +01:00
committed by Martin Schwidefsky
parent dd401e2b92
commit 6faf4444f2
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/s390/cio/cio.c
View File

@@ -880,19 +880,15 @@ static void cio_reset_pgm_check_handler(void)
static int stsch_reset(struct subchannel_id schid, volatile struct schib *addr) static int stsch_reset(struct subchannel_id schid, volatile struct schib *addr)
{ {
int rc; int rc;
register struct subchannel_id reg1 asm ("1") = schid;
pgm_check_occured = 0; pgm_check_occured = 0;
s390_reset_pgm_handler = cio_reset_pgm_check_handler; 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; s390_reset_pgm_handler = NULL;
/* The program check handler could have changed pgm_check_occured */
barrier();
if (pgm_check_occured) if (pgm_check_occured)
return -EIO; return -EIO;
else else