s390/net: sort out physical vs virtual pointers usage

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

Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
Reviewed-by: Wenjia Zhang <wenjia@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index a61d38a..bab9b34 100644 (file)
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -223,7 +223,7 @@ lcs_setup_read_ccws(struct lcs_card *card)
                 * we do not need to do set_normalized_cda.
                 */
                card->read.ccws[cnt].cda =
-                       (__u32) __pa(card->read.iob[cnt].data);
+                       (__u32)virt_to_phys(card->read.iob[cnt].data);
                ((struct lcs_header *)
                 card->read.iob[cnt].data)->offset = LCS_ILLEGAL_OFFSET;
                card->read.iob[cnt].callback = lcs_get_frames_cb;
@@ -236,7 +236,7 @@ lcs_setup_read_ccws(struct lcs_card *card)
        /* Last ccw is a tic (transfer in channel). */
        card->read.ccws[LCS_NUM_BUFFS].cmd_code = LCS_CCW_TRANSFER;
        card->read.ccws[LCS_NUM_BUFFS].cda =
-               (__u32) __pa(card->read.ccws);
+               (__u32)virt_to_phys(card->read.ccws);
        /* Setg initial state of the read channel. */
        card->read.state = LCS_CH_STATE_INIT;
 
@@ -278,12 +278,12 @@ lcs_setup_write_ccws(struct lcs_card *card)
                 * we do not need to do set_normalized_cda.
                 */
                card->write.ccws[cnt].cda =
-                       (__u32) __pa(card->write.iob[cnt].data);
+                       (__u32)virt_to_phys(card->write.iob[cnt].data);
        }
        /* Last ccw is a tic (transfer in channel). */
        card->write.ccws[LCS_NUM_BUFFS].cmd_code = LCS_CCW_TRANSFER;
        card->write.ccws[LCS_NUM_BUFFS].cda =
-               (__u32) __pa(card->write.ccws);
+               (__u32)virt_to_phys(card->write.ccws);
        /* Set initial state of the write channel. */
        card->read.state = LCS_CH_STATE_INIT;
 

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 29f0111..d99c5b7 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -426,7 +426,7 @@ static void qeth_setup_ccw(struct ccw1 *ccw, u8 cmd_code, u8 flags, u32 len,
        ccw->cmd_code = cmd_code;
        ccw->flags = flags | CCW_FLAG_SLI;
        ccw->count = len;
-       ccw->cda = (__u32) __pa(data);
+       ccw->cda = (__u32)virt_to_phys(data);
 }
 
 static int __qeth_issue_next_read(struct qeth_card *card)