public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
From: Michael Schmitz <schmitzmic@gmail.com>
To: linux-m68k@vger.kernel.org
Cc: geert@linux-m68k.org, debian-68k@lists.debian.org,
	Michael Schmitz <schmitz@debian.org>
Subject: [PATCH 3/4] m68k/atari - ataflop: use correct virt/phys translation for DMA buffer
Date: Sun, 30 Mar 2014 13:01:25 +1300	[thread overview]
Message-ID: <1396137686-32678-4-git-send-email-schmitz@debian.org> (raw)
In-Reply-To: <1396137686-32678-1-git-send-email-schmitz@debian.org>

With new ST-RAM allocation to work also when the kernel is running
from FastRAM, use dedicated virt/phys translation for this case.

Signed-off-by: Michael Schmitz <schmitz@debian.org>
---
 drivers/block/ataflop.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 0e30c6e..f54655a 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1952,7 +1952,7 @@ static int __init atari_floppy_init (void)
 		goto Enomem;
 	}
 	TrackBuffer = DMABuffer + 512;
-	PhysDMABuffer = virt_to_phys(DMABuffer);
+	PhysDMABuffer = atari_stram_to_phys(DMABuffer);
 	PhysTrackBuffer = virt_to_phys(TrackBuffer);
 	BufferDrive = BufferSide = BufferTrack = -1;
 
-- 
1.7.0.4

  parent reply	other threads:[~2014-03-30  0:01 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-30  0:01 [PATCH 0/4] Atari kernel-in-FastRAM patches, take three Michael Schmitz
2014-03-30  0:01 ` [PATCH 1/4] m68k/atari - stram: alloc ST-RAM pool even if kernel not in ST-RAM Michael Schmitz
2014-03-30 19:11   ` Geert Uytterhoeven
2014-03-31  1:58     ` Michael Schmitz
2014-03-30  0:01 ` [PATCH 2/4] m68k/atari - atafb: convert allocation of fb ram to new interface Michael Schmitz
2014-03-30 19:11   ` Geert Uytterhoeven
2014-03-30  0:01 ` Michael Schmitz [this message]
2014-03-31  7:46   ` [PATCH 3/4] m68k/atari - ataflop: use correct virt/phys translation for DMA buffer Geert Uytterhoeven
2014-03-31 14:28     ` Jens Axboe
2014-03-30  0:01 ` [PATCH 4/4] m68k/atari - atari_scsi: " Michael Schmitz
2014-03-31  7:48   ` Geert Uytterhoeven
2014-03-30 22:34 ` [PATCH 0/4] Atari kernel-in-FastRAM patches, take three Andreas Schwab
2014-03-31  1:55   ` Michael Schmitz
2014-03-31 20:58     ` Andreas Schwab
2014-03-31 21:24       ` Michael Schmitz
2014-03-31 22:39         ` Andreas Schwab
2014-03-31 23:52           ` Michael Schmitz
2014-04-01  7:28             ` Geert Uytterhoeven
2014-04-01  7:45               ` schmitz
2014-04-01  7:50                 ` Geert Uytterhoeven
2014-04-01 12:23               ` Finn Thain
2014-04-01 12:41                 ` Geert Uytterhoeven
2014-04-01 18:56                 ` Michael Schmitz
2014-04-04  6:12                   ` Finn Thain
2014-04-09  6:44                     ` Finn Thain
2014-04-04  3:43                 ` Scott Holder
2014-04-04  6:08                   ` Finn Thain
2014-04-01  7:24         ` Geert Uytterhoeven
2014-04-01  7:39           ` schmitz
2014-04-01  7:49             ` Geert Uytterhoeven
2014-04-01  8:12               ` schmitz
2014-04-01  8:23                 ` Geert Uytterhoeven
2014-04-01  9:06             ` Andreas Schwab
2014-03-31  7:42 ` Geert Uytterhoeven
2014-03-31  7:54   ` Michael Schmitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1396137686-32678-4-git-send-email-schmitz@debian.org \
    --to=schmitzmic@gmail.com \
    --cc=debian-68k@lists.debian.org \
    --cc=geert@linux-m68k.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=schmitz@debian.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox