Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[S390] dasd: no High Performance FICON in 31-bit mode

Browse Source 
The High Performance FICON feature is not supported in 31-bit mode,
no matter what the various flags say. So we need to check for the
CONFIG_64BIT option as well.

Signed-off-by: Stefan Weinhuber <wein@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Stefan Weinhuber 2009-06-12 10:26:36 +02:00 committed by Martin Schwidefsky
parent d0591485e1
commit 45b44d76d3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/s390/block/dasd_eckd.c
View File

@ -2336,9 +2336,10 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
{ {
int tpm, cmdrtd, cmdwtd; int tpm, cmdrtd, cmdwtd;
int use_prefix; int use_prefix;
#if defined(CONFIG_64BIT)
struct dasd_eckd_private *private;
int fcx_in_css, fcx_in_gneq, fcx_in_features; int fcx_in_css, fcx_in_gneq, fcx_in_features;
#endif
struct dasd_eckd_private *private;
struct dasd_device *basedev; struct dasd_device *basedev;
sector_t first_rec, last_rec; sector_t first_rec, last_rec;
sector_t first_trk, last_trk; sector_t first_trk, last_trk;
@ -2361,11 +2362,15 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
last_offs = sector_div(last_trk, blk_per_trk); last_offs = sector_div(last_trk, blk_per_trk);
cdlspecial = (private->uses_cdl && first_rec < 2*blk_per_trk); cdlspecial = (private->uses_cdl && first_rec < 2*blk_per_trk);
/* is transport mode supported ? */ /* is transport mode supported? */
#if defined(CONFIG_64BIT)
fcx_in_css = css_general_characteristics.fcx; fcx_in_css = css_general_characteristics.fcx;
fcx_in_gneq = private->gneq->reserved2[7] & 0x04; fcx_in_gneq = private->gneq->reserved2[7] & 0x04;
fcx_in_features = private->features.feature[40] & 0x80; fcx_in_features = private->features.feature[40] & 0x80;
tpm = fcx_in_css && fcx_in_gneq && fcx_in_features; tpm = fcx_in_css && fcx_in_gneq && fcx_in_features;
#else
tpm = 0;
#endif
/* is read track data and write track data in command mode supported? */ /* is read track data and write track data in command mode supported? */
cmdrtd = private->features.feature[9] & 0x20; cmdrtd = private->features.feature[9] & 0x20;