Commit b87c52e4 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Jens Axboe
Browse files

s390/dasd: sort out physical vs virtual pointers usage 



This does not fix a real bug, since virtual addresses
are currently indentical to physical ones.

Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarStefan Haberland <sth@linux.ibm.com>
Link: https://lore.kernel.org/r/20230210000253.1644903-2-sth@linux.ibm.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9af99354

drivers/s390/block/dasd.c

+2 −3
Original line number Diff line number Diff line
@@ -3978,7 +3978,7 @@ static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device, 


	ccw = cqr->cpaddr;

	ccw->cmd_code = CCW_CMD_RDC;

	ccw->cda = (__u32)(addr_t) cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);

	ccw->flags = 0;

	ccw->count = rdc_buffer_size;

	cqr->startdev = device;
@@ -4022,8 +4022,7 @@ char *dasd_get_sense(struct irb *irb) 


	if (scsw_is_tm(&irb->scsw) && (irb->scsw.tm.fcxs == 0x01)) {

		if (irb->scsw.tm.tcw)

			tsb = tcw_get_tsb((struct tcw *)(unsigned long)

					  irb->scsw.tm.tcw);

			tsb = tcw_get_tsb(phys_to_virt(irb->scsw.tm.tcw));

		if (tsb && tsb->length == 64 && tsb->flags)

			switch (tsb->flags & 0x07) {

			case 1:	/* tsa_iostat */

drivers/s390/block/dasd_3990_erp.c

+5 −5
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ dasd_3990_erp_DCTL(struct dasd_ccw_req * erp, char modifier) 
	memset(ccw, 0, sizeof(struct ccw1));

	ccw->cmd_code = CCW_CMD_DCTL;

	ccw->count = 4;

	ccw->cda = (__u32)(addr_t) DCTL_data;

	ccw->cda = (__u32)virt_to_phys(DCTL_data);

	dctl_cqr->flags = erp->flags;

	dctl_cqr->function = dasd_3990_erp_DCTL;

	dctl_cqr->refers = erp;
@@ -1714,7 +1714,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense) 
	ccw->cmd_code = DASD_ECKD_CCW_DEFINE_EXTENT;

	ccw->flags = CCW_FLAG_CC;

	ccw->count = 16;

	ccw->cda = (__u32)(addr_t) DE_data;

	ccw->cda = (__u32)virt_to_phys(DE_data);



	/* create LO ccw */

	ccw++;
@@ -1722,7 +1722,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense) 
	ccw->cmd_code = DASD_ECKD_CCW_LOCATE_RECORD;

	ccw->flags = CCW_FLAG_CC;

	ccw->count = 16;

	ccw->cda = (__u32)(addr_t) LO_data;

	ccw->cda = (__u32)virt_to_phys(LO_data);



	/* TIC to the failed ccw */

	ccw++;
@@ -2419,7 +2419,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) 
		tcw = erp->cpaddr;

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

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

		tcw->tsb = (long)tsb;

		tcw->tsb = virt_to_phys(tsb);

	} else if (ccw->cmd_code == DASD_ECKD_CCW_PSF) {

		/* PSF cannot be chained from NOOP/TIC */

		erp->cpaddr = cqr->cpaddr;
@@ -2430,7 +2430,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) 
		ccw->flags = CCW_FLAG_CC;

		ccw++;

		ccw->cmd_code = CCW_CMD_TIC;

		ccw->cda      = (long)(cqr->cpaddr);

		ccw->cda      = (__u32)virt_to_phys(cqr->cpaddr);

	}



	erp->flags = cqr->flags;

drivers/s390/block/dasd_alias.c

+3 −3
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static int read_unit_address_configuration(struct dasd_device *device, 
	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->count = sizeof(struct dasd_psf_prssd_data);

	ccw->flags |= CCW_FLAG_CC;

	ccw->cda = (__u32)(addr_t) prssdp;

	ccw->cda = (__u32)virt_to_phys(prssdp);



	/* Read Subsystem Data - feature codes */

	memset(lcu->uac, 0, sizeof(*(lcu->uac)));
@@ -451,7 +451,7 @@ static int read_unit_address_configuration(struct dasd_device *device, 
	ccw++;

	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = sizeof(*(lcu->uac));

	ccw->cda = (__u32)(addr_t) lcu->uac;

	ccw->cda = (__u32)virt_to_phys(lcu->uac);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;
@@ -747,7 +747,7 @@ static int reset_summary_unit_check(struct alias_lcu *lcu, 
	ccw->cmd_code = DASD_ECKD_CCW_RSCK;

	ccw->flags = CCW_FLAG_SLI;

	ccw->count = 16;

	ccw->cda = (__u32)(addr_t) cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);

	((char *)cqr->data)[0] = reason;



	clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);

drivers/s390/block/dasd_eckd.c

+49 −51
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ define_extent(struct ccw1 *ccw, struct DE_eckd_data *data, unsigned int trk, 
		ccw->cmd_code = DASD_ECKD_CCW_DEFINE_EXTENT;

		ccw->flags = 0;

		ccw->count = 16;

		ccw->cda = (__u32)__pa(data);

		ccw->cda = (__u32)virt_to_phys(data);

	}



	memset(data, 0, sizeof(struct DE_eckd_data));
@@ -398,7 +398,7 @@ static void locate_record_ext(struct ccw1 *ccw, struct LRE_eckd_data *data, 
			ccw->count = 22;

		else

			ccw->count = 20;

		ccw->cda = (__u32)__pa(data);

		ccw->cda = (__u32)virt_to_phys(data);

	}



	memset(data, 0, sizeof(*data));
@@ -544,11 +544,11 @@ static int prefix_LRE(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata, 
	ccw->flags = 0;

	if (cmd == DASD_ECKD_CCW_WRITE_FULL_TRACK) {

		ccw->count = sizeof(*pfxdata) + 2;

		ccw->cda = (__u32) __pa(pfxdata);

		ccw->cda = (__u32)virt_to_phys(pfxdata);

		memset(pfxdata, 0, sizeof(*pfxdata) + 2);

	} else {

		ccw->count = sizeof(*pfxdata);

		ccw->cda = (__u32) __pa(pfxdata);

		ccw->cda = (__u32)virt_to_phys(pfxdata);

		memset(pfxdata, 0, sizeof(*pfxdata));

	}
@@ -615,7 +615,7 @@ locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, unsigned int trk, 
	ccw->cmd_code = DASD_ECKD_CCW_LOCATE_RECORD;

	ccw->flags = 0;

	ccw->count = 16;

	ccw->cda = (__u32) __pa(data);

	ccw->cda = (__u32)virt_to_phys(data);



	memset(data, 0, sizeof(struct LO_eckd_data));

	sector = 0;
@@ -830,7 +830,7 @@ static void dasd_eckd_fill_rcd_cqr(struct dasd_device *device, 
	ccw = cqr->cpaddr;

	ccw->cmd_code = DASD_ECKD_CCW_RCD;

	ccw->flags = 0;

	ccw->cda = (__u32)(addr_t)rcd_buffer;

	ccw->cda = (__u32)virt_to_phys(rcd_buffer);

	ccw->count = DASD_ECKD_RCD_DATA_SIZE;

	cqr->magic = DASD_ECKD_MAGIC;
@@ -858,7 +858,7 @@ static void read_conf_cb(struct dasd_ccw_req *cqr, void *data) 


	if (cqr->status !=  DASD_CQR_DONE) {

		ccw = cqr->cpaddr;

		rcd_buffer = (__u8 *)((addr_t) ccw->cda);

		rcd_buffer = phys_to_virt(ccw->cda);

		memset(rcd_buffer, 0, sizeof(*rcd_buffer));



		rcd_buffer[0] = 0xE5;
@@ -1547,7 +1547,7 @@ static int dasd_eckd_read_features(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->count = sizeof(struct dasd_psf_prssd_data);

	ccw->flags |= CCW_FLAG_CC;

	ccw->cda = (__u32)(addr_t) prssdp;

	ccw->cda = (__u32)virt_to_phys(prssdp);



	/* Read Subsystem Data - feature codes */

	features = (struct dasd_rssd_features *) (prssdp + 1);
@@ -1556,7 +1556,7 @@ static int dasd_eckd_read_features(struct dasd_device *device) 
	ccw++;

	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = sizeof(struct dasd_rssd_features);

	ccw->cda = (__u32)(addr_t) features;

	ccw->cda = (__u32)virt_to_phys(features);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;
@@ -1616,7 +1616,7 @@ static int dasd_eckd_read_vol_info(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->count = sizeof(*prssdp);

	ccw->flags |= CCW_FLAG_CC;

	ccw->cda = (__u32)(addr_t)prssdp;

	ccw->cda = (__u32)virt_to_phys(prssdp);



	/* Read Subsystem Data - Volume Storage Query */

	vsq = (struct dasd_rssd_vsq *)(prssdp + 1);
@@ -1626,7 +1626,7 @@ static int dasd_eckd_read_vol_info(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = sizeof(*vsq);

	ccw->flags |= CCW_FLAG_SLI;

	ccw->cda = (__u32)(addr_t)vsq;

	ccw->cda = (__u32)virt_to_phys(vsq);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;
@@ -1801,7 +1801,7 @@ static int dasd_eckd_read_ext_pool_info(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->count = sizeof(*prssdp);

	ccw->flags |= CCW_FLAG_CC;

	ccw->cda = (__u32)(addr_t)prssdp;

	ccw->cda = (__u32)virt_to_phys(prssdp);



	lcq = (struct dasd_rssd_lcq *)(prssdp + 1);

	memset(lcq, 0, sizeof(*lcq));
@@ -1810,7 +1810,7 @@ static int dasd_eckd_read_ext_pool_info(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = sizeof(*lcq);

	ccw->flags |= CCW_FLAG_SLI;

	ccw->cda = (__u32)(addr_t)lcq;

	ccw->cda = (__u32)virt_to_phys(lcq);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;
@@ -1907,7 +1907,7 @@ static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device, 
	}

	ccw = cqr->cpaddr;

	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->cda = (__u32)(addr_t)psf_ssc_data;

	ccw->cda = (__u32)virt_to_phys(psf_ssc_data);

	ccw->count = 66;



	cqr->startdev = device;
@@ -2262,7 +2262,7 @@ dasd_eckd_analysis_ccw(struct dasd_device *device) 
		ccw->cmd_code = DASD_ECKD_CCW_READ_COUNT;

		ccw->flags = 0;

		ccw->count = 8;

		ccw->cda = (__u32)(addr_t) count_data;

		ccw->cda = (__u32)virt_to_phys(count_data);

		ccw++;

		count_data++;

	}
@@ -2276,7 +2276,7 @@ dasd_eckd_analysis_ccw(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_READ_COUNT;

	ccw->flags = 0;

	ccw->count = 8;

	ccw->cda = (__u32)(addr_t) count_data;

	ccw->cda = (__u32)virt_to_phys(count_data);



	cqr->block = NULL;

	cqr->startdev = device;
@@ -2647,7 +2647,7 @@ dasd_eckd_build_check(struct dasd_device *base, struct format_data_t *fdata, 
		ccw->cmd_code = DASD_ECKD_CCW_READ_COUNT;

		ccw->flags = CCW_FLAG_SLI;

		ccw->count = 8;

		ccw->cda = (__u32)(addr_t) fmt_buffer;

		ccw->cda = (__u32)virt_to_phys(fmt_buffer);

		ccw++;

		fmt_buffer++;

	}
@@ -2857,7 +2857,7 @@ dasd_eckd_build_format(struct dasd_device *base, struct dasd_device *startdev, 
			ccw->cmd_code = DASD_ECKD_CCW_WRITE_RECORD_ZERO;

			ccw->flags = CCW_FLAG_SLI;

			ccw->count = 8;

			ccw->cda = (__u32)(addr_t) ect;

			ccw->cda = (__u32)virt_to_phys(ect);

			ccw++;

		}

		if ((intensity & ~0x08) & 0x04) {	/* erase track */
@@ -2872,7 +2872,7 @@ dasd_eckd_build_format(struct dasd_device *base, struct dasd_device *startdev, 
			ccw->cmd_code = DASD_ECKD_CCW_WRITE_CKD;

			ccw->flags = CCW_FLAG_SLI;

			ccw->count = 8;

			ccw->cda = (__u32)(addr_t) ect;

			ccw->cda = (__u32)virt_to_phys(ect);

		} else {		/* write remaining records */

			for (i = 0; i < rpt; i++) {

				ect = (struct eckd_count *) data;
@@ -2907,7 +2907,7 @@ dasd_eckd_build_format(struct dasd_device *base, struct dasd_device *startdev, 
						DASD_ECKD_CCW_WRITE_CKD_MT;

				ccw->flags = CCW_FLAG_SLI;

				ccw->count = 8;

				ccw->cda = (__u32)(addr_t) ect;

				ccw->cda = (__u32)virt_to_phys(ect);

				ccw++;

			}

		}
@@ -3821,7 +3821,7 @@ dasd_eckd_dso_ras(struct dasd_device *device, struct dasd_block *block, 
	}



	ccw = cqr->cpaddr;

	ccw->cda = (__u32)(addr_t)cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);

	ccw->cmd_code = DASD_ECKD_CCW_DSO;

	ccw->count = size;
@@ -4090,11 +4090,11 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single( 
			ccw->cmd_code = rcmd;

			ccw->count = count;

			if (idal_is_needed(dst, blksize)) {

				ccw->cda = (__u32)(addr_t) idaws;

				ccw->cda = (__u32)virt_to_phys(idaws);

				ccw->flags = CCW_FLAG_IDA;

				idaws = idal_create_words(idaws, dst, blksize);

			} else {

				ccw->cda = (__u32)(addr_t) dst;

				ccw->cda = (__u32)virt_to_phys(dst);

				ccw->flags = 0;

			}

			ccw++;
@@ -4228,7 +4228,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( 
				ccw[-1].flags |= CCW_FLAG_CC;

				ccw->cmd_code = cmd;

				ccw->count = len_to_track_end;

				ccw->cda = (__u32)(addr_t)idaws;

				ccw->cda = (__u32)virt_to_phys(idaws);

				ccw->flags = CCW_FLAG_IDA;

				ccw++;

				recid += count;
@@ -4244,7 +4244,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( 
			 * idaw ends

			 */

			if (!idaw_dst) {

				if (__pa(dst) & (IDA_BLOCK_SIZE-1)) {

				if ((__u32)virt_to_phys(dst) & (IDA_BLOCK_SIZE - 1)) {

					dasd_sfree_request(cqr, startdev);

					return ERR_PTR(-ERANGE);

				} else
@@ -4264,7 +4264,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( 
			 * idal_create_words will handle cases where idaw_len

			 * is larger then IDA_BLOCK_SIZE

			 */

			if (!(__pa(idaw_dst + idaw_len) & (IDA_BLOCK_SIZE-1)))

			if (!((__u32)virt_to_phys(idaw_dst + idaw_len) & (IDA_BLOCK_SIZE - 1)))

				end_idaw = 1;

			/* We also need to end the idaw at track end */

			if (!len_to_track_end) {
@@ -4817,7 +4817,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev, 
		ccw->count = 57326;

		/* 64k map to one track */

		len_to_track_end = 65536 - start_padding_sectors * 512;

		ccw->cda = (__u32)(addr_t)idaws;

		ccw->cda = (__u32)virt_to_phys(idaws);

		ccw->flags |= CCW_FLAG_IDA;

		ccw->flags |= CCW_FLAG_SLI;

		ccw++;
@@ -4836,7 +4836,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev, 
			ccw->count = 57326;

			/* 64k map to one track */

			len_to_track_end = 65536;

			ccw->cda = (__u32)(addr_t)idaws;

			ccw->cda = (__u32)virt_to_phys(idaws);

			ccw->flags |= CCW_FLAG_IDA;

			ccw->flags |= CCW_FLAG_SLI;

			ccw++;
@@ -4893,9 +4893,9 @@ dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req) 
				ccw++;

			if (dst) {

				if (ccw->flags & CCW_FLAG_IDA)

					cda = *((char **)((addr_t) ccw->cda));

					cda = *((char **)phys_to_virt(ccw->cda));

				else

					cda = (char *)((addr_t) ccw->cda);

					cda = phys_to_virt(ccw->cda);

				if (dst != cda) {

					if (rq_data_dir(req) == READ)

						memcpy(dst, cda, bv.bv_len);
@@ -5045,7 +5045,7 @@ dasd_eckd_release(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_RELEASE;

	ccw->flags |= CCW_FLAG_SLI;

	ccw->count = 32;

	ccw->cda = (__u32)(addr_t) cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);

	cqr->startdev = device;

	cqr->memdev = device;

	clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
@@ -5100,7 +5100,7 @@ dasd_eckd_reserve(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_RESERVE;

	ccw->flags |= CCW_FLAG_SLI;

	ccw->count = 32;

	ccw->cda = (__u32)(addr_t) cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);

	cqr->startdev = device;

	cqr->memdev = device;

	clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
@@ -5154,7 +5154,7 @@ dasd_eckd_steal_lock(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_SLCK;

	ccw->flags |= CCW_FLAG_SLI;

	ccw->count = 32;

	ccw->cda = (__u32)(addr_t) cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);

	cqr->startdev = device;

	cqr->memdev = device;

	clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
@@ -5215,7 +5215,7 @@ static int dasd_eckd_snid(struct dasd_device *device, 
	ccw->cmd_code = DASD_ECKD_CCW_SNID;

	ccw->flags |= CCW_FLAG_SLI;

	ccw->count = 12;

	ccw->cda = (__u32)(addr_t) cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);

	cqr->startdev = device;

	cqr->memdev = device;

	clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
@@ -5282,7 +5282,7 @@ dasd_eckd_performance(struct dasd_device *device, void __user *argp) 
	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->count = sizeof(struct dasd_psf_prssd_data);

	ccw->flags |= CCW_FLAG_CC;

	ccw->cda = (__u32)(addr_t) prssdp;

	ccw->cda = (__u32)virt_to_phys(prssdp);



	/* Read Subsystem Data - Performance Statistics */

	stats = (struct dasd_rssd_perf_stats_t *) (prssdp + 1);
@@ -5291,7 +5291,7 @@ dasd_eckd_performance(struct dasd_device *device, void __user *argp) 
	ccw++;

	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = sizeof(struct dasd_rssd_perf_stats_t);

	ccw->cda = (__u32)(addr_t) stats;

	ccw->cda = (__u32)virt_to_phys(stats);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;
@@ -5435,7 +5435,7 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp) 
	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->count = usrparm.psf_data_len;

	ccw->flags |= CCW_FLAG_CC;

	ccw->cda = (__u32)(addr_t) psf_data;

	ccw->cda = (__u32)virt_to_phys(psf_data);



	ccw++;
@@ -5443,7 +5443,7 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp) 
	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = usrparm.rssd_result_len;

	ccw->flags = CCW_FLAG_SLI ;

	ccw->cda = (__u32)(addr_t) rssd_result;

	ccw->cda = (__u32)virt_to_phys(rssd_result);



	rc = dasd_sleep_on(cqr);

	if (rc)
@@ -5512,9 +5512,9 @@ dasd_eckd_dump_ccw_range(struct ccw1 *from, struct ccw1 *to, char *page) 


		/* get pointer to data (consider IDALs) */

		if (from->flags & CCW_FLAG_IDA)

			datap = (char *) *((addr_t *) (addr_t) from->cda);

			datap = (char *)*((addr_t *)phys_to_virt(from->cda));

		else

			datap = (char *) ((addr_t) from->cda);

			datap = phys_to_virt(from->cda);



		/* dump data (max 128 bytes) */

		for (count = 0; count < from->count && count < 128; count++) {
@@ -5585,7 +5585,7 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device, 
	len += sprintf(page + len, PRINTK_HEADER

		       " device %s: Failing CCW: %p\n",

		       dev_name(&device->cdev->dev),

		       (void *) (addr_t) irb->scsw.cmd.cpa);

		       phys_to_virt(irb->scsw.cmd.cpa));

	if (irb->esw.esw0.erw.cons) {

		for (sl = 0; sl < 4; sl++) {

			len += sprintf(page + len, PRINTK_HEADER
@@ -5632,8 +5632,7 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device, 
		/* print failing CCW area (maximum 4) */

		/* scsw->cda is either valid or zero  */

		from = ++to;

		fail = (struct ccw1 *)(addr_t)

				irb->scsw.cmd.cpa; /* failing CCW */

		fail = phys_to_virt(irb->scsw.cmd.cpa); /* failing CCW */

		if (from <  fail - 2) {

			from = fail - 2;     /* there is a gap - print header */

			printk(KERN_ERR PRINTK_HEADER "......\n");
@@ -5687,13 +5686,12 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device, 
	len += sprintf(page + len, PRINTK_HEADER

		       " device %s: Failing TCW: %p\n",

		       dev_name(&device->cdev->dev),

		       (void *) (addr_t) irb->scsw.tm.tcw);

		       phys_to_virt(irb->scsw.tm.tcw));



	tsb = NULL;

	sense = NULL;

	if (irb->scsw.tm.tcw && (irb->scsw.tm.fcxs & 0x01))

		tsb = tcw_get_tsb(

			(struct tcw *)(unsigned long)irb->scsw.tm.tcw);

		tsb = tcw_get_tsb(phys_to_virt(irb->scsw.tm.tcw));



	if (tsb) {

		len += sprintf(page + len, PRINTK_HEADER
@@ -5917,7 +5915,7 @@ static int dasd_eckd_read_message_buffer(struct dasd_device *device, 
	ccw->count = sizeof(struct dasd_psf_prssd_data);

	ccw->flags |= CCW_FLAG_CC;

	ccw->flags |= CCW_FLAG_SLI;

	ccw->cda = (__u32)(addr_t) prssdp;

	ccw->cda = (__u32)virt_to_phys(prssdp);



	/* Read Subsystem Data - message buffer */

	message_buf = (struct dasd_rssd_messages *) (prssdp + 1);
@@ -5927,7 +5925,7 @@ static int dasd_eckd_read_message_buffer(struct dasd_device *device, 
	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = sizeof(struct dasd_rssd_messages);

	ccw->flags |= CCW_FLAG_SLI;

	ccw->cda = (__u32)(addr_t) message_buf;

	ccw->cda = (__u32)virt_to_phys(message_buf);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;
@@ -6008,14 +6006,14 @@ static int dasd_eckd_query_host_access(struct dasd_device *device, 
	ccw->count = sizeof(struct dasd_psf_prssd_data);

	ccw->flags |= CCW_FLAG_CC;

	ccw->flags |= CCW_FLAG_SLI;

	ccw->cda = (__u32)(addr_t) prssdp;

	ccw->cda = (__u32)virt_to_phys(prssdp);



	/* Read Subsystem Data - query host access */

	ccw++;

	ccw->cmd_code = DASD_ECKD_CCW_RSSD;

	ccw->count = sizeof(struct dasd_psf_query_host_access);

	ccw->flags |= CCW_FLAG_SLI;

	ccw->cda = (__u32)(addr_t) host_access;

	ccw->cda = (__u32)virt_to_phys(host_access);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;
@@ -6351,7 +6349,7 @@ dasd_eckd_psf_cuir_response(struct dasd_device *device, int response, 
	psf_cuir->ssid = device->path[pos].ssid;

	ccw = cqr->cpaddr;

	ccw->cmd_code = DASD_ECKD_CCW_PSF;

	ccw->cda = (__u32)(addr_t)psf_cuir;

	ccw->cda = (__u32)virt_to_phys(psf_cuir);

	ccw->flags = CCW_FLAG_SLI;

	ccw->count = sizeof(struct dasd_psf_cuir_response);

drivers/s390/block/dasd_eer.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ int dasd_eer_enable(struct dasd_device *device) 
	ccw->cmd_code = DASD_ECKD_CCW_SNSS;

	ccw->count = SNSS_DATA_SIZE;

	ccw->flags = 0;

	ccw->cda = (__u32)(addr_t) cqr->data;

	ccw->cda = (__u32)virt_to_phys(cqr->data);



	cqr->buildclk = get_tod_clock();

	cqr->status = DASD_CQR_FILLED;