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

Commit 3c9757b7 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m68k: fix PIO case in esp 



we always set ->SCp.ptr to physical address of buffer; for DMA that's
just what we need, but we end up using it as virtual address in PIO
case of esp_do_data(), with obvious breakage as soon as memory mapping
becomes non-trivial.  The fix is obvious.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ed1705af

drivers/scsi/NCR53C9x.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1799,6 +1799,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs) 
		 */

		 */

		int oldphase, i = 0; /* or where we left off last time ?? esp->current_data ?? */

		int oldphase, i = 0; /* or where we left off last time ?? esp->current_data ?? */

		int fifocnt = 0;

		int fifocnt = 0;

		unsigned char *p = phys_to_virt((unsigned long)SCptr->SCp.ptr);





		oldphase = esp_read(eregs->esp_status) & ESP_STAT_PMASK;

		oldphase = esp_read(eregs->esp_status) & ESP_STAT_PMASK;
@@ -1860,7 +1861,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs) 




				/* read fifo */

				/* read fifo */

				for(j=0;j<fifocnt;j++)

				for(j=0;j<fifocnt;j++)

					SCptr->SCp.ptr[i++] = esp_read(eregs->esp_fdata);

					p[i++] = esp_read(eregs->esp_fdata);





				ESPDATA(("(%d) ", i));

				ESPDATA(("(%d) ", i));
@@ -1882,7 +1883,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs) 




				/* fill fifo */

				/* fill fifo */

				for(j=0;j<this_count;j++)

				for(j=0;j<this_count;j++)

					esp_write(eregs->esp_fdata, SCptr->SCp.ptr[i++]);

					esp_write(eregs->esp_fdata, p[i++]);





				/* how many left if this goes out ?? */

				/* how many left if this goes out ?? */

				hmuch -= this_count;

				hmuch -= this_count;