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

Commit 64e03ff7 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Martin Schwidefsky
Browse files

s390/qdio: reset old sbal_state flags 



When allocating a new AOB fails, handle_outbound() is still capable of
transmitting the selected buffer (just without async completion).

But if a previous transfer on this queue slot used async completion, its
sbal_state flags field is still set to QDIO_OUTBUF_STATE_FLAG_PENDING.
So when the upper layer driver sees this stale flag, it expects an async
completion that never happens.

Fix this by unconditionally clearing the flags field.

Fixes: 104ea556 ("qdio: support asynchronous delivery of storage blocks")
Cc: <stable@vger.kernel.org> #v3.2+
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 891f6a72

arch/s390/include/asm/qdio.h

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ struct qdio_outbuf_state { 
	void *user;

};



#define QDIO_OUTBUF_STATE_FLAG_NONE	0x00

#define QDIO_OUTBUF_STATE_FLAG_PENDING	0x01



#define CHSC_AC1_INITIATE_INPUTQ	0x80

drivers/s390/cio/qdio_main.c

+2 −3
Original line number Diff line number Diff line
@@ -631,21 +631,20 @@ static inline unsigned long qdio_aob_for_buffer(struct qdio_output_q *q, 
	unsigned long phys_aob = 0;



	if (!q->use_cq)

		goto out;

		return 0;



	if (!q->aobs[bufnr]) {

		struct qaob *aob = qdio_allocate_aob();

		q->aobs[bufnr] = aob;

	}

	if (q->aobs[bufnr]) {

		q->sbal_state[bufnr].flags = QDIO_OUTBUF_STATE_FLAG_NONE;

		q->sbal_state[bufnr].aob = q->aobs[bufnr];

		q->aobs[bufnr]->user1 = (u64) q->sbal_state[bufnr].user;

		phys_aob = virt_to_phys(q->aobs[bufnr]);

		WARN_ON_ONCE(phys_aob & 0xFF);

	}



out:

	q->sbal_state[bufnr].flags = 0;

	return phys_aob;

}