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

Commit 4a31ba57 authored by Stefan Weinhuber's avatar Stefan Weinhuber Committed by Martin Schwidefsky
Browse files

[S390] dasd: fix alignment of transport mode recovery TCW 



All TCWs need to be aligned on a 64 byte boundary or the I/O will be
rejected. For recovery requests we create fresh TCWs, so we need to
do the proper alignment here as well.

Signed-off-by: default avatarStefan Weinhuber <wein@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1bff7792

drivers/s390/block/dasd_3990_erp.c

+4 −3
Original line number Diff line number Diff line
@@ -2287,7 +2287,8 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) 


	if (cqr->cpmode == 1) {

		cplength = 0;

		datasize = sizeof(struct tcw) + sizeof(struct tsb);

		/* TCW needs to be 64 byte aligned, so leave enough room */

		datasize = 64 + sizeof(struct tcw) + sizeof(struct tsb);

	} else {

		cplength = 2;

		datasize = 0;
@@ -2316,8 +2317,8 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) 
	if (cqr->cpmode == 1) {

		/* make a shallow copy of the original tcw but set new tsb */

		erp->cpmode = 1;

		erp->cpaddr = erp->data;

		tcw = erp->data;

		erp->cpaddr = PTR_ALIGN(erp->data, 64);

		tcw = erp->cpaddr;

		tsb = (struct tsb *) &tcw[1];

		*tcw = *((struct tcw *)cqr->cpaddr);

		tcw->tsb = (long)tsb;