Commit 926146a8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 's390-net-updates-2022-02-21' 

Alexandra Winter says:

====================
s390/net: updates 2022-02-21

Just cleanup. No functional changes, as currently virt=phys in s390.
====================

Link: https://lore.kernel.org/r/20220221145633.3869621-1-wintera@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ee8f97ef 1bb7e8df

drivers/s390/net/lcs.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

drivers/s390/net/qeth_core_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

net/iucv/iucv.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static inline int iucv_call_b2f0(int command, union iucv_param *parm) 
 */

static int __iucv_query_maxconn(void *param, unsigned long *max_pathid)

{

	unsigned long reg1 = (unsigned long)param;

	unsigned long reg1 = virt_to_phys(param);

	int cc;



	asm volatile (