From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C77446420; Tue, 26 Dec 2023 00:25:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RE7xuwVU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 738B5C433C9; Tue, 26 Dec 2023 00:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703550341; bh=8iIbIF7h7TBS+p/2yypaxqrpDeJoh+tiqXNhYIA/jVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RE7xuwVUWPlj36VXHYJ8jlHsIjmExQn7ssyFxC6WGT0XPBwZN4YaE+OVam8juoPgZ yJKSZpYu2POoYsRFhZ0OIxhpCOJ816KEOH6HbiiiKFnRQpLMQ0D5R1uNs8cmLCk3cr TmOQsJ8AuDbKFZkcS/dkC58JpmG5jjBrPjpSqiDA0RNCpFsN9QlZtFQlTcEGxlIunz YE/JlMpE7Zi6/qcbOrPvKHIc2fXB8wGSVxcZynxT7tXtI7Zxb4LAwoKv3srOBZKPn+ +FEK3oDK0o07jvtbGUGw1/LQUUr8+pzPzaBv3friq4zPM9Zeap25KlqrEhV9Plfije iFSetmVRuzfvQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vineeth Vijayan , Peter Oberparleiter , Alexander Gordeev , Sasha Levin , hca@linux.ibm.com, gor@linux.ibm.com, linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 5/9] s390/scm: fix virtual vs physical address confusion Date: Mon, 25 Dec 2023 19:24:49 -0500 Message-ID: <20231226002526.6605-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231226002526.6605-1-sashal@kernel.org> References: <20231226002526.6605-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.205 Content-Transfer-Encoding: 8bit From: Vineeth Vijayan [ Upstream commit b1a6a1a77f0666a5a6dc0893ab6ec8fcae46f24c ] Fix virtual vs physical address confusion (which currently are the same). Signed-off-by: Vineeth Vijayan Reviewed-by: Peter Oberparleiter Acked-by: Alexander Gordeev Signed-off-by: Alexander Gordeev Signed-off-by: Sasha Levin --- drivers/s390/block/scm_blk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c index a4f6f2e62b1dc..b5b36217b15eb 100644 --- a/drivers/s390/block/scm_blk.c +++ b/drivers/s390/block/scm_blk.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #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++; } -- 2.43.0