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

Commit d60d61f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:

 - a missing -msoft-float for the compile of the kexec purgatory

 - a fix for the dasd driver to avoid the double use of a field in the
   'struct request'

[ That latter one is being discussed, and Christoph asked for something
  cleaner, but for now it's a fix ]

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/dasd: use blk_mq_rq_from_pdu for per request data
  s390/purgatory: Fix endless interrupt loop
parents 0044cdeb f0f59a2f

arch/s390/purgatory/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ LDFLAGS_purgatory.ro += -z nodefaultlib 
KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes

KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare

KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding

KBUILD_CFLAGS += -c -MD -Os -m64

KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float

KBUILD_CFLAGS += $(call cc-option,-fno-PIE)



$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE

drivers/s390/block/dasd.c

+5 −2
Original line number Diff line number Diff line
@@ -3034,7 +3034,8 @@ static blk_status_t do_dasd_request(struct blk_mq_hw_ctx *hctx, 
	cqr->callback_data = req;

	cqr->status = DASD_CQR_FILLED;

	cqr->dq = dq;

	req->completion_data = cqr;

	*((struct dasd_ccw_req **) blk_mq_rq_to_pdu(req)) = cqr;



	blk_mq_start_request(req);

	spin_lock(&block->queue_lock);

	list_add_tail(&cqr->blocklist, &block->ccw_queue);
@@ -3058,12 +3059,13 @@ static blk_status_t do_dasd_request(struct blk_mq_hw_ctx *hctx, 
 */

enum blk_eh_timer_return dasd_times_out(struct request *req, bool reserved)

{

	struct dasd_ccw_req *cqr = req->completion_data;

	struct dasd_block *block = req->q->queuedata;

	struct dasd_device *device;

	struct dasd_ccw_req *cqr;

	unsigned long flags;

	int rc = 0;



	cqr = *((struct dasd_ccw_req **) blk_mq_rq_to_pdu(req));

	if (!cqr)

		return BLK_EH_NOT_HANDLED;
@@ -3169,6 +3171,7 @@ static int dasd_alloc_queue(struct dasd_block *block) 
	int rc;



	block->tag_set.ops = &dasd_mq_ops;

	block->tag_set.cmd_size = sizeof(struct dasd_ccw_req *);

	block->tag_set.nr_hw_queues = DASD_NR_HW_QUEUES;

	block->tag_set.queue_depth = DASD_MAX_LCU_DEV * DASD_REQ_PER_DEV;

	block->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;