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

Commit 0fe64316 authored by Vineeth Vijayan's avatar Vineeth Vijayan Committed by Greg Kroah-Hartman
Browse files

s390/scm: fix virtual vs physical address confusion 



[ Upstream commit b1a6a1a77f0666a5a6dc0893ab6ec8fcae46f24c ]

Fix virtual vs physical address confusion (which currently are the same).

Signed-off-by: default avatarVineeth Vijayan <vneethv@linux.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8fb5795b

drivers/s390/block/scm_blk.c

+4 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/genhd.h>

#include <linux/slab.h>

#include <linux/list.h>

#include <linux/io.h>

#include <asm/eadm.h>

#include "scm_blk.h"
@@ -131,7 +132,7 @@ static void scm_request_done(struct scm_request *scmrq) 


	for (i = 0; i < nr_requests_per_io && scmrq->request[i]; i++) {

		msb = &scmrq->aob->msb[i];

		aidaw = msb->data_addr;

		aidaw = (u64)phys_to_virt(msb->data_addr);



		if ((msb->flags & MSB_FLAG_IDA) && aidaw &&

		    IS_ALIGNED(aidaw, PAGE_SIZE))
@@ -196,12 +197,12 @@ static int scm_request_prepare(struct scm_request *scmrq) 
	msb->scm_addr = scmdev->address + ((u64) blk_rq_pos(req) << 9);

	msb->oc = (rq_data_dir(req) == READ) ? MSB_OC_READ : MSB_OC_WRITE;

	msb->flags |= MSB_FLAG_IDA;

	msb->data_addr = (u64) aidaw;

	msb->data_addr = (u64)virt_to_phys(aidaw);



	rq_for_each_segment(bv, req, iter) {

		WARN_ON(bv.bv_offset);

		msb->blk_count += bv.bv_len >> 12;

		aidaw->data_addr = (u64) page_address(bv.bv_page);

		aidaw->data_addr = virt_to_phys(page_address(bv.bv_page));

		aidaw++;

	}