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

Commit 23d046f4 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] ARM SCSI: Don't try to dma_map_sg too many scatterlist entries 



An off-by-one bug meant we were always trying to map one too many
scatterlist entries.  This was mostly harmless prior to the checks
going in to consistent_sync(), but now causes the kernel to BUG.

Also, powertec.c was missing an assignment to info->ec.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6b4df7ee

drivers/scsi/arm/cumana_2.c

+2 −2
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ cumanascsi_2_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp, 
			dma_dir = DMA_MODE_READ,

			alatch_dir = ALATCH_DMA_IN;



		dma_map_sg(dev, info->sg, bufs + 1, map_dir);

		dma_map_sg(dev, info->sg, bufs, map_dir);



		disable_dma(dmach);

		set_dma_sg(dmach, info->sg, bufs + 1);

		set_dma_sg(dmach, info->sg, bufs);

		writeb(alatch_dir, info->base + CUMANASCSI2_ALATCH);

		set_dma_mode(dmach, dma_dir);

		enable_dma(dmach);

drivers/scsi/arm/eesox.c

+2 −2
Original line number Diff line number Diff line
@@ -175,10 +175,10 @@ eesoxscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp, 
			map_dir = DMA_FROM_DEVICE,

			dma_dir = DMA_MODE_READ;



		dma_map_sg(dev, info->sg, bufs + 1, map_dir);

		dma_map_sg(dev, info->sg, bufs, map_dir);



		disable_dma(dmach);

		set_dma_sg(dmach, info->sg, bufs + 1);

		set_dma_sg(dmach, info->sg, bufs);

		set_dma_mode(dmach, dma_dir);

		enable_dma(dmach);

		return fasdma_real_all;

drivers/scsi/arm/powertec.c

+3 −2
Original line number Diff line number Diff line
@@ -148,10 +148,10 @@ powertecscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp, 
			map_dir = DMA_FROM_DEVICE,

			dma_dir = DMA_MODE_READ;



		dma_map_sg(dev, info->sg, bufs + 1, map_dir);

		dma_map_sg(dev, info->sg, bufs, map_dir);



		disable_dma(dmach);

		set_dma_sg(dmach, info->sg, bufs + 1);

		set_dma_sg(dmach, info->sg, bufs);

		set_dma_mode(dmach, dma_dir);

		enable_dma(dmach);

		return fasdma_real_all;
@@ -342,6 +342,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id) 
	info->base = base;

	powertecscsi_terminator_ctl(host, term[ec->slot_no]);



	info->ec = ec;

	info->info.scsi.io_base		= base + POWERTEC_FAS216_OFFSET;

	info->info.scsi.io_shift	= POWERTEC_FAS216_SHIFT;

	info->info.scsi.irq		= ec->irq;