hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] s390: dasd diag inline assembly 

Future versions of gcc may remove initialization code for control blocks used
by the diag250 inline assembly due to incompletely specified constraints.
This may lead to erratic behavior.  Fix the diag250 inline assembly
constraints.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
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>
This commit is contained in:
Peter Oberparleiter 2005-11-07 00:59:08 -08:00 committed by Linus Torvalds
parent 187dfc67b4
commit 86b368a580
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/s390/block/dasd_diag.c
View File

@ -6,7 +6,7 @@
* Bugreports.to..: <Linux390@de.ibm.com> * Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
* *
* $Revision: 1.49 $ * $Revision: 1.50 $
*/ */
#include <linux/config.h> #include <linux/config.h>
@ -67,9 +67,9 @@ static const u8 DASD_DIAG_CMS1[] = { 0xc3, 0xd4, 0xe2, 0xf1 };/* EBCDIC CMS1 */
static __inline__ int static __inline__ int
dia250(void *iob, int cmd) dia250(void *iob, int cmd)
{ {
typedef struct { typedef union {
char _[max(sizeof (struct dasd_diag_init_io), struct dasd_diag_init_io init_io;
sizeof (struct dasd_diag_rw_io))]; struct dasd_diag_rw_io rw_io;
} addr_type; } addr_type;
int rc; int rc;
@ -190,7 +190,7 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
private->iob.flags = DASD_DIAG_RWFLAG_ASYNC; private->iob.flags = DASD_DIAG_RWFLAG_ASYNC;
private->iob.block_count = dreq->block_count; private->iob.block_count = dreq->block_count;
private->iob.interrupt_params = (addr_t) cqr; private->iob.interrupt_params = (addr_t) cqr;
private->iob.bio_list = __pa(dreq->bio); private->iob.bio_list = dreq->bio;
private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT; private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
cqr->startclk = get_clock(); cqr->startclk = get_clock();
@ -394,14 +394,14 @@ dasd_diag_check_device(struct dasd_device *device)
memset(&bio, 0, sizeof (struct dasd_diag_bio)); memset(&bio, 0, sizeof (struct dasd_diag_bio));
bio.type = MDSK_READ_REQ; bio.type = MDSK_READ_REQ;
bio.block_number = private->pt_block + 1; bio.block_number = private->pt_block + 1;
bio.buffer = __pa(label); bio.buffer = label;
memset(&private->iob, 0, sizeof (struct dasd_diag_rw_io)); memset(&private->iob, 0, sizeof (struct dasd_diag_rw_io));
private->iob.dev_nr = rdc_data->dev_nr; private->iob.dev_nr = rdc_data->dev_nr;
private->iob.key = 0; private->iob.key = 0;
private->iob.flags = 0; /* do synchronous io */ private->iob.flags = 0; /* do synchronous io */
private->iob.block_count = 1; private->iob.block_count = 1;
private->iob.interrupt_params = 0; private->iob.interrupt_params = 0;
private->iob.bio_list = __pa(&bio); private->iob.bio_list = &bio;
private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT; private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
rc = dia250(&private->iob, RW_BIO); rc = dia250(&private->iob, RW_BIO);
if (rc == 0 || rc == 3) if (rc == 0 || rc == 3)
@ -529,7 +529,7 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
memset(dbio, 0, sizeof (struct dasd_diag_bio)); memset(dbio, 0, sizeof (struct dasd_diag_bio));
dbio->type = rw_cmd; dbio->type = rw_cmd;
dbio->block_number = recid + 1; dbio->block_number = recid + 1;
dbio->buffer = __pa(dst); dbio->buffer = dst;
dbio++; dbio++;
dst += blksize; dst += blksize;
recid++; recid++;

10
drivers/s390/block/dasd_diag.h
View File

@ -6,7 +6,7 @@
* Bugreports.to..: <Linux390@de.ibm.com> * Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
*/ */
#define MDSK_WRITE_REQ 0x01 #define MDSK_WRITE_REQ 0x01
@ -78,7 +78,7 @@ struct dasd_diag_bio {
u8 spare1[2]; u8 spare1[2];
u32 alet; u32 alet;
blocknum_t block_number; blocknum_t block_number;
u64 buffer; void *buffer;
} __attribute__ ((packed, aligned(8))); } __attribute__ ((packed, aligned(8)));
struct dasd_diag_init_io { struct dasd_diag_init_io {
@ -104,7 +104,7 @@ struct dasd_diag_rw_io {
u32 alet; u32 alet;
u8 spare3[4]; u8 spare3[4];
u64 interrupt_params; u64 interrupt_params;
u64 bio_list; struct dasd_diag_bio *bio_list;
u8 spare4[8]; u8 spare4[8];
} __attribute__ ((packed, aligned(8))); } __attribute__ ((packed, aligned(8)));
#else /* CONFIG_ARCH_S390X */ #else /* CONFIG_ARCH_S390X */
@ -119,7 +119,7 @@ struct dasd_diag_bio {
u16 spare1; u16 spare1;
blocknum_t block_number; blocknum_t block_number;
u32 alet; u32 alet;
u32 buffer; void *buffer;
} __attribute__ ((packed, aligned(8))); } __attribute__ ((packed, aligned(8)));
struct dasd_diag_init_io { struct dasd_diag_init_io {
@ -142,7 +142,7 @@ struct dasd_diag_rw_io {
u8 spare2[2]; u8 spare2[2];
u32 block_count; u32 block_count;
u32 alet; u32 alet;
u32 bio_list; struct dasd_diag_bio *bio_list;
u32 interrupt_params; u32 interrupt_params;
u8 spare3[20]; u8 spare3[20];
} __attribute__ ((packed, aligned(8))); } __attribute__ ((packed, aligned(8)));