Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

s390/qeth: skip QDIO queue handler indirection 



Both qeth sub drivers use the same QDIO queue handlers, there's no need
to expose them via the driver's discipline. No functional change.

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

drivers/s390/net/qeth_core.h

+0 −9
Original line number Diff line number Diff line
@@ -712,9 +712,6 @@ enum qeth_discipline_id { 


struct qeth_discipline {

	const struct device_type *devtype;

	void (*start_poll)(struct ccw_device *, int, unsigned long);

	qdio_handler_t *input_handler;

	qdio_handler_t *output_handler;

	int (*process_rx_buffer)(struct qeth_card *card, int budget, int *done);

	int (*recover)(void *ptr);

	int (*setup) (struct ccwgroup_device *);
@@ -921,13 +918,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *, 
		struct qeth_qdio_buffer *, struct qdio_buffer_element **, int *,

		struct qeth_hdr **);

void qeth_schedule_recovery(struct qeth_card *);

void qeth_qdio_start_poll(struct ccw_device *, int, unsigned long);

int qeth_poll(struct napi_struct *napi, int budget);

void qeth_qdio_input_handler(struct ccw_device *,

		unsigned int, unsigned int, int,

		int, unsigned long);

void qeth_qdio_output_handler(struct ccw_device *, unsigned int,

			int, int, int, unsigned long);

void qeth_clear_ipacmd_list(struct qeth_card *);

int qeth_qdio_clear_card(struct qeth_card *, int);

void qeth_clear_working_pool_list(struct qeth_card *);

drivers/s390/net/qeth_core_main.c

+13 −16
Original line number Diff line number Diff line
@@ -3588,7 +3588,7 @@ static void qeth_check_outbound_queue(struct qeth_qdio_out_q *queue) 
	}

}



void qeth_qdio_start_poll(struct ccw_device *ccwdev, int queue,

static void qeth_qdio_start_poll(struct ccw_device *ccwdev, int queue,

				 unsigned long card_ptr)

{

	struct qeth_card *card = (struct qeth_card *)card_ptr;
@@ -3596,7 +3596,6 @@ void qeth_qdio_start_poll(struct ccw_device *ccwdev, int queue, 
	if (card->dev && (card->dev->flags & IFF_UP))

		napi_schedule(&card->napi);

}

EXPORT_SYMBOL_GPL(qeth_qdio_start_poll);



int qeth_configure_cq(struct qeth_card *card, enum qeth_cq cq)

{
@@ -3698,8 +3697,9 @@ static void qeth_qdio_cq_handler(struct qeth_card *card, 
	return;

}



void qeth_qdio_input_handler(struct ccw_device *ccwdev, unsigned int qdio_err,

		unsigned int queue, int first_elem, int count,

static void qeth_qdio_input_handler(struct ccw_device *ccwdev,

				    unsigned int qdio_err, int queue,

				    int first_elem, int count,

				    unsigned long card_ptr)

{

	struct qeth_card *card = (struct qeth_card *)card_ptr;
@@ -3711,14 +3711,12 @@ void qeth_qdio_input_handler(struct ccw_device *ccwdev, unsigned int qdio_err, 
		qeth_qdio_cq_handler(card, qdio_err, queue, first_elem, count);

	else if (qdio_err)

		qeth_schedule_recovery(card);





}

EXPORT_SYMBOL_GPL(qeth_qdio_input_handler);



void qeth_qdio_output_handler(struct ccw_device *ccwdev,

		unsigned int qdio_error, int __queue, int first_element,

		int count, unsigned long card_ptr)

static void qeth_qdio_output_handler(struct ccw_device *ccwdev,

				     unsigned int qdio_error, int __queue,

				     int first_element, int count,

				     unsigned long card_ptr)

{

	struct qeth_card *card        = (struct qeth_card *) card_ptr;

	struct qeth_qdio_out_q *queue = card->qdio.out_qs[__queue];
@@ -3787,7 +3785,6 @@ void qeth_qdio_output_handler(struct ccw_device *ccwdev, 
		card->perf_stats.outbound_handler_time += qeth_get_micros() -

			card->perf_stats.outbound_handler_start_time;

}

EXPORT_SYMBOL_GPL(qeth_qdio_output_handler);



/* We cannot use outbound queue 3 for unicast packets on HiperSockets */

static inline int qeth_cut_iqd_prio(struct qeth_card *card, int queue_num)
@@ -4995,7 +4992,7 @@ static int qeth_qdio_establish(struct qeth_card *card) 
		goto out_free_in_sbals;

	}

	for (i = 0; i < card->qdio.no_in_queues; ++i)

		queue_start_poll[i] = card->discipline->start_poll;

		queue_start_poll[i] = qeth_qdio_start_poll;



	qeth_qdio_establish_cq(card, in_sbal_ptrs, queue_start_poll);
@@ -5019,8 +5016,8 @@ static int qeth_qdio_establish(struct qeth_card *card) 
	init_data.qib_param_field        = qib_param_field;

	init_data.no_input_qs            = card->qdio.no_in_queues;

	init_data.no_output_qs           = card->qdio.no_out_queues;

	init_data.input_handler 	 = card->discipline->input_handler;

	init_data.output_handler	 = card->discipline->output_handler;

	init_data.input_handler		 = qeth_qdio_input_handler;

	init_data.output_handler	 = qeth_qdio_output_handler;

	init_data.queue_start_poll_array = queue_start_poll;

	init_data.int_parm               = (unsigned long) card;

	init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;

drivers/s390/net/qeth_l2_main.c

+0 −3
Original line number Diff line number Diff line
@@ -1315,9 +1315,6 @@ static int qeth_l2_control_event(struct qeth_card *card, 


struct qeth_discipline qeth_l2_discipline = {

	.devtype = &qeth_l2_devtype,

	.start_poll = qeth_qdio_start_poll,

	.input_handler = (qdio_handler_t *) qeth_qdio_input_handler,

	.output_handler = (qdio_handler_t *) qeth_qdio_output_handler,

	.process_rx_buffer = qeth_l2_process_inbound_buffer,

	.recover = qeth_l2_recover,

	.setup = qeth_l2_probe_device,

drivers/s390/net/qeth_l3_main.c

+0 −3
Original line number Diff line number Diff line
@@ -2960,9 +2960,6 @@ static int qeth_l3_control_event(struct qeth_card *card, 


struct qeth_discipline qeth_l3_discipline = {

	.devtype = &qeth_l3_devtype,

	.start_poll = qeth_qdio_start_poll,

	.input_handler = (qdio_handler_t *) qeth_qdio_input_handler,

	.output_handler = (qdio_handler_t *) qeth_qdio_output_handler,

	.process_rx_buffer = qeth_l3_process_inbound_buffer,

	.recover = qeth_l3_recover,

	.setup = qeth_l3_probe_device,