Skip to content

Commit

Permalink
s390/qeth: consolidate QDIO queue setup
Browse files Browse the repository at this point in the history 
Move some duplicated logic into a shared code path.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julian Wiedmann authored and David S. Miller committed Jan 26, 2020
1 parent 8ca769e commit aa3ad39
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 17 deletions.
1 change: 0 additions & 1 deletion drivers/s390/net/qeth_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
9 changes: 7 additions & 2 deletions drivers/s390/net/qeth_core_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -5026,6 +5025,12 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok)
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 "
Expand Down
8 changes: 1 addition & 7 deletions drivers/s390/net/qeth_l2_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 1 addition & 7 deletions drivers/s390/net/qeth_l3_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit aa3ad39

Please sign in to comment.