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 1FDBD5DF06; Tue, 26 Dec 2023 00:26:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IyFSy4bs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 919A9C433C9; Tue, 26 Dec 2023 00:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703550383; bh=pUI+BkAkFtp05WdgjDZvtYYBdmXmtT6NR+Yefnz7D/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IyFSy4bsR5KMbDGcaXsHrj3ylnttErmXvQsinPO8csQmcpeBJOkXQbbTCv/Zq3Bc7 rkgRHE21Pn+eGGREhULdpHqfuVab8O1zGY6TlpfUR50+y8Aa7MiyBqVdSa9VXYSekQ vCLDO+NJXRvEWResG8o/LNy7SZER+1X+o/0JzslrWuXQU51PGAY71F6cx+7Zn1W+HZ sOfc3/hcG7iwBY/4Y4pUmNgSSJtolsxv1bn3qV6nkGVTZ9V8Gk9f9erNTHx3eq6U7Q sxQ+2Dxwm3HdS0klUva/u5GhbhdhB0FcM605RLsJuyy+Iy1Wwt6bRT6BurDXgUs1KG 7DE7OUrTG0AEQ== 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.4 5/8] s390/scm: fix virtual vs physical address confusion Date: Mon, 25 Dec 2023 19:25:48 -0500 Message-ID: <20231226002608.7089-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231226002608.7089-1-sashal@kernel.org> References: <20231226002608.7089-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.4.265 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 e01889394c841..d3133023a5574 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