Commit aa3ad392 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: consolidate QDIO queue setup 



Move some duplicated logic into a shared code path.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ca769e2

drivers/s390/net/qeth_core.h

+0 −1
Original line number Diff line number Diff line
@@ -994,7 +994,6 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok); 
int qeth_stop_channel(struct qeth_channel *channel);



void qeth_print_status_message(struct qeth_card *);

int qeth_init_qdio_queues(struct qeth_card *);

int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *,

		  int (*reply_cb)

		  (struct qeth_card *, struct qeth_reply *, unsigned long),

drivers/s390/net/qeth_core_main.c

+7 −2
Original line number Diff line number Diff line
@@ -2665,7 +2665,7 @@ static unsigned int qeth_tx_select_bulk_max(struct qeth_card *card, 
	return card->ssqd.mmwc ? card->ssqd.mmwc : 1;

}



int qeth_init_qdio_queues(struct qeth_card *card)

static int qeth_init_qdio_queues(struct qeth_card *card)

{

	unsigned int i;

	int rc;
@@ -2713,7 +2713,6 @@ int qeth_init_qdio_queues(struct qeth_card *card) 
	}

	return 0;

}

EXPORT_SYMBOL_GPL(qeth_init_qdio_queues);



static void qeth_ipa_finalize_cmd(struct qeth_card *card,

				  struct qeth_cmd_buffer *iob)
@@ -5026,6 +5025,12 @@ retriable: 
	if (rc)

		goto out;



	rc = qeth_init_qdio_queues(card);

	if (rc) {

		QETH_CARD_TEXT_(card, 2, "9err%d", rc);

		goto out;

	}



	return 0;

out:

	dev_warn(&card->gdev->dev, "The qeth device driver failed to recover "

drivers/s390/net/qeth_l2_main.c

+1 −7
Original line number Diff line number Diff line
@@ -288,11 +288,11 @@ static void qeth_l2_stop_card(struct qeth_card *card) 
	}

	if (card->state == CARD_STATE_HARDSETUP) {

		qeth_drain_output_queues(card);

		qeth_clear_working_pool_list(card);

		card->state = CARD_STATE_DOWN;

	}



	qeth_qdio_clear_card(card, 0);

	qeth_clear_working_pool_list(card);

	flush_workqueue(card->event_wq);

	card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;

	card->info.promisc_mode = 0;
@@ -787,12 +787,6 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) 
	/* softsetup */

	QETH_CARD_TEXT(card, 2, "softsetp");



	rc = qeth_init_qdio_queues(card);

	if (rc) {

		QETH_CARD_TEXT_(card, 2, "6err%d", rc);

		rc = -ENODEV;

		goto out_remove;

	}

	card->state = CARD_STATE_SOFTSETUP;



	qeth_set_allowed_threads(card, 0xffffffff, 0);

drivers/s390/net/qeth_l3_main.c

+1 −7
Original line number Diff line number Diff line
@@ -1184,11 +1184,11 @@ static void qeth_l3_stop_card(struct qeth_card *card) 
	}

	if (card->state == CARD_STATE_HARDSETUP) {

		qeth_drain_output_queues(card);

		qeth_clear_working_pool_list(card);

		card->state = CARD_STATE_DOWN;

	}



	qeth_qdio_clear_card(card, 0);

	qeth_clear_working_pool_list(card);

	flush_workqueue(card->event_wq);

	card->info.promisc_mode = 0;

}
@@ -2097,12 +2097,6 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev) 
			QETH_CARD_TEXT_(card, 2, "5err%04x", rc);

	}



	rc = qeth_init_qdio_queues(card);

	if (rc) {

		QETH_CARD_TEXT_(card, 2, "6err%d", rc);

		rc = -ENODEV;

		goto out_remove;

	}

	card->state = CARD_STATE_SOFTSETUP;



	qeth_set_allowed_threads(card, 0xffffffff, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE