Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45b44d76 authored by Stefan Weinhuber's avatar Stefan Weinhuber Committed by Martin Schwidefsky
Browse files

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



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: default avatarStefan Weinhuber <wein@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d0591485

drivers/s390/block/dasd_eckd.c

+8 −3
Original line number Diff line number Diff line
@@ -2336,9 +2336,10 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, 
{

	int tpm, cmdrtd, cmdwtd;

	int use_prefix;



	struct dasd_eckd_private *private;

#if defined(CONFIG_64BIT)

	int fcx_in_css, fcx_in_gneq, fcx_in_features;

#endif

	struct dasd_eckd_private *private;

	struct dasd_device *basedev;

	sector_t first_rec, last_rec;

	sector_t first_trk, last_trk;
@@ -2362,10 +2363,14 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, 
	cdlspecial = (private->uses_cdl && first_rec < 2*blk_per_trk);



	/* is transport mode supported? */

#if defined(CONFIG_64BIT)

	fcx_in_css = css_general_characteristics.fcx;

	fcx_in_gneq = private->gneq->reserved2[7] & 0x04;

	fcx_in_features = private->features.feature[40] & 0x80;

	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? */

	cmdrtd = private->features.feature[9] & 0x20;