Commit 10376b53 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Vasily Gorbik
Browse files

s390/qdio: clean up SIGA capability tracking 



Don't bother with translating the SIGA-related capability bits into
our own internal format, just cache the full qdioac1 field instead.

Also adjust the helper macros so that they take a qdio_irq argument
and can be used everywhere, instead of taking a qdio_q and then
internally dereferencing the parent pointer.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent e2af48df

drivers/s390/cio/qdio.h

+4 −12
Original line number Diff line number Diff line
@@ -126,13 +126,6 @@ static inline int do_eqbs(u64 token, unsigned char *state, int queue, 


struct qdio_irq;



struct siga_flag {

	u8 input:1;

	u8 output:1;

	u8 sync:1;

	u8:5;

} __attribute__ ((packed));



struct qdio_dev_perf_stat {

	unsigned int adapter_int;

	unsigned int qdio_int;
@@ -238,8 +231,7 @@ struct qdio_irq { 
	unsigned long sch_token;	/* QEBSM facility */



	enum qdio_irq_states state;



	struct siga_flag siga_flag;	/* siga sync information from qdioac */

	u8 qdioac1;



	int nr_input_qs;

	int nr_output_qs;
@@ -312,9 +304,9 @@ static inline void qdio_deliver_irq(struct qdio_irq *irq) 
#define pci_out_supported(irq) ((irq)->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED)

#define is_qebsm(q)			(q->irq_ptr->sch_token != 0)



#define need_siga_in(q)			(q->irq_ptr->siga_flag.input)

#define need_siga_out(q)		(q->irq_ptr->siga_flag.output)

#define need_siga_sync(q)		(unlikely(q->irq_ptr->siga_flag.sync))

#define qdio_need_siga_in(irq)		((irq)->qdioac1 & AC1_SIGA_INPUT_NEEDED)

#define qdio_need_siga_out(irq)		((irq)->qdioac1 & AC1_SIGA_OUTPUT_NEEDED)

#define qdio_need_siga_sync(irq)	(unlikely((irq)->qdioac1 & AC1_SIGA_SYNC_NEEDED))



#define for_each_input_queue(irq_ptr, q, i)		\

	for (i = 0; i < irq_ptr->nr_input_qs &&		\

drivers/s390/cio/qdio_main.c

+6 −6
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static inline int qdio_siga_input(struct qdio_q *q) 
int debug_get_buf_state(struct qdio_q *q, unsigned int bufnr,

			unsigned char *state)

{

	if (need_siga_sync(q))

	if (qdio_need_siga_sync(q->irq_ptr))

		qdio_siga_sync_q(q);

	return get_buf_state(q, bufnr, state, 0);

}
@@ -497,7 +497,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q, unsigned int start) 
	if (!atomic_read(&q->nr_buf_used))

		return 1;



	if (need_siga_sync(q))

	if (qdio_need_siga_sync(q->irq_ptr))

		qdio_siga_sync_q(q);

	get_buf_state(q, start, &state, 0);
@@ -572,7 +572,7 @@ static int qdio_kick_outbound_q(struct qdio_q *q, unsigned int count, 
	int retries = 0, cc;

	unsigned int busy_bit;



	if (!need_siga_out(q))

	if (!qdio_need_siga_out(q->irq_ptr))

		return 0;



	DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w:%1d", q->nr);
@@ -1127,7 +1127,7 @@ static int handle_inbound(struct qdio_q *q, int bufnr, int count) 
	count = set_buf_states(q, bufnr, SLSB_CU_INPUT_EMPTY, count);

	atomic_add(count, &q->nr_buf_used);



	if (need_siga_in(q))

	if (qdio_need_siga_in(q->irq_ptr))

		return qdio_siga_input(q);



	return 0;
@@ -1159,7 +1159,7 @@ static int handle_outbound(struct qdio_q *q, unsigned int bufnr, unsigned int co 


		WARN_ON_ONCE(!IS_ALIGNED(phys_aob, 256));

		rc = qdio_kick_outbound_q(q, count, phys_aob);

	} else if (need_siga_sync(q)) {

	} else if (qdio_need_siga_sync(q->irq_ptr)) {

		rc = qdio_siga_sync_q(q);

	} else if (count < QDIO_MAX_BUFFERS_PER_Q &&

		   get_buf_state(q, prev_buf(bufnr), &state, 0) > 0 &&
@@ -1283,7 +1283,7 @@ int qdio_inspect_queue(struct ccw_device *cdev, unsigned int nr, bool is_input, 
		return -ENODEV;

	q = is_input ? irq_ptr->input_qs[nr] : irq_ptr->output_qs[nr];



	if (need_siga_sync(q))

	if (qdio_need_siga_sync(irq_ptr))

		qdio_siga_sync_q(q);



	return __qdio_inspect_queue(q, bufnr, error);

drivers/s390/cio/qdio_setup.c

+5 −15
Original line number Diff line number Diff line
@@ -270,16 +270,6 @@ static void setup_queues(struct qdio_irq *irq_ptr, 
	}

}



static void process_ac_flags(struct qdio_irq *irq_ptr, unsigned char qdioac)

{

	if (qdioac & AC1_SIGA_INPUT_NEEDED)

		irq_ptr->siga_flag.input = 1;

	if (qdioac & AC1_SIGA_OUTPUT_NEEDED)

		irq_ptr->siga_flag.output = 1;

	if (qdioac & AC1_SIGA_SYNC_NEEDED)

		irq_ptr->siga_flag.sync = 1;

}



static void check_and_setup_qebsm(struct qdio_irq *irq_ptr,

				  unsigned char qdioac, unsigned long token)

{
@@ -356,7 +346,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr) 
		qdioac = irq_ptr->ssqd_desc.qdioac1;



	check_and_setup_qebsm(irq_ptr, qdioac, irq_ptr->ssqd_desc.sch_token);

	process_ac_flags(irq_ptr, qdioac);

	irq_ptr->qdioac1 = qdioac;

	DBF_EVENT("ac 1:%2x 2:%4x", qdioac, irq_ptr->ssqd_desc.qdioac2);

	DBF_EVENT("3:%4x qib:%4x", irq_ptr->ssqd_desc.qdioac3, irq_ptr->qib.ac);

}
@@ -420,7 +410,7 @@ int qdio_setup_irq(struct qdio_irq *irq_ptr, struct qdio_initialize *init_data) 
	struct ciw *ciw;



	memset(&irq_ptr->qib, 0, sizeof(irq_ptr->qib));

	memset(&irq_ptr->siga_flag, 0, sizeof(irq_ptr->siga_flag));

	irq_ptr->qdioac1 = 0;

	memset(&irq_ptr->ccw, 0, sizeof(irq_ptr->ccw));

	memset(&irq_ptr->ssqd_desc, 0, sizeof(irq_ptr->ssqd_desc));

	memset(&irq_ptr->perf_stat, 0, sizeof(irq_ptr->perf_stat));
@@ -500,9 +490,9 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr) 
		 (irq_ptr->sch_token) ? 1 : 0,

		 pci_out_supported(irq_ptr) ? 1 : 0,

		 css_general_characteristics.aif_tdd,

		 (irq_ptr->siga_flag.input) ? "R" : " ",

		 (irq_ptr->siga_flag.output) ? "W" : " ",

		 (irq_ptr->siga_flag.sync) ? "S" : " ");

		 qdio_need_siga_in(irq_ptr) ? "R" : " ",

		 qdio_need_siga_out(irq_ptr) ? "W" : " ",

		 qdio_need_siga_sync(irq_ptr) ? "S" : " ");

	printk(KERN_INFO "%s", s);

}