From: James Bottomley <James.Bottomley@SteelEye.com>
To: Andrew Morton <akpm@osdl.org>
Cc: William Lee Irwin III <wli@holomorphy.com>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: 2.6.7-mm7
Date: 09 Jul 2004 17:24:47 -0500 [thread overview]
Message-ID: <1089411888.1799.146.camel@mulgrave> (raw)
In-Reply-To: <20040709151448.28f1dbf7.akpm@osdl.org>
On Fri, 2004-07-09 at 17:14, Andrew Morton wrote:
> btw, James, I'm unable to convince myself that
> dma_mark_declared_memory_occupied() reserves enough pages if device_addr is
> not page-aligned. Could you double-check that? If all callers are
> expected to use a page-aligned address then a BUG_ON might be appropriate.
> Or a comment.
Oh, you mean when addr isn't page aligned and size causes it just to
span a page, like addr = 0xfff, size=2?
You're right, it doesn't. How about the attached
James
===== arch/i386/kernel/pci-dma.c 1.13 vs edited =====
--- 1.13/arch/i386/kernel/pci-dma.c 2004-06-30 21:37:55 -05:00
+++ edited/arch/i386/kernel/pci-dma.c 2004-07-09 17:20:14 -05:00
@@ -131,7 +131,7 @@
dma_addr_t device_addr, size_t size)
{
struct dma_coherent_mem *mem = dev->dma_mem;
- int pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ int pages = (size + (addr & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;
int pos, err;
if (!mem)
next prev parent reply other threads:[~2004-07-09 22:25 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-09 6:50 2.6.7-mm7 Andrew Morton
2004-07-09 8:15 ` 2.6.7-mm7 Stefano Rivoir
2004-07-09 9:41 ` 2.6.7-mm7 Andrew Morton
2004-07-09 10:27 ` 2.6.7-mm7 Stefano Rivoir
2004-07-09 10:32 ` 2.6.7-mm7 Stefano Rivoir
2004-07-09 11:45 ` 2.6.7-mm7 Jesse Stockall
2004-07-09 18:54 ` 2.6.7-mm7 Andrew Morton
2004-07-09 19:52 ` 2.6.7-mm7 Jesse Stockall
2004-07-09 20:00 ` 2.6.7-mm7 Andrew Morton
2004-07-09 22:21 ` 2.6.7-mm7 Greg KH
2004-07-09 19:56 ` 2.6.7-mm7 Alan Stern
2004-07-09 10:32 ` 2.6.7-mm7 Jurgen Kramer
2004-07-09 10:39 ` 2.6.7-mm7 Andrew Morton
2004-07-09 11:16 ` 2.6.7-mm7 Jurgen Kramer
2004-07-09 14:40 ` 2.6.7-mm7 Felipe Alfaro Solana
2004-07-09 16:40 ` 2.6.7-mm7 Jurgen Kramer
2004-07-09 11:44 ` 2.6.7-mm7 Michael Geithe
2004-07-09 22:15 ` 2.6.7-mm7 Greg KH
2004-07-10 0:07 ` 2.6.7-mm7 Michael Geithe
2004-07-09 20:38 ` 2.6.7-mm7 Joseph Fannin
2004-07-09 21:11 ` 2.6.7-mm7 Andrew Morton
2004-07-14 22:01 ` 2.6.7-mm7 Tom Rini
2004-07-17 16:17 ` 2.6.7-mm7 Paul Mackerras
2004-07-17 19:19 ` 2.6.7-mm7 Joseph Fannin
2004-07-09 21:04 ` 2.6.7-mm7 William Lee Irwin III
2004-07-09 22:11 ` 2.6.7-mm7 William Lee Irwin III
2004-07-09 22:14 ` 2.6.7-mm7 Andrew Morton
2004-07-09 22:24 ` James Bottomley [this message]
2004-07-09 23:40 ` 2.6.7-mm7 Andrew Morton
2004-07-10 2:47 ` 2.6.7-mm7 James Bottomley
2004-07-10 4:34 ` 2.6.7-mm7 Joshua Kwan
2004-07-10 4:40 ` 2.6.7-mm7 Joshua Kwan
2004-07-10 18:29 ` 2.6.7-mm7 Diego Calleja García
2004-07-10 20:04 ` 2.6.7-mm7 Marcin Gibuła
2004-07-10 20:10 ` 2.6.7-mm7 Marcin Gibuła
2004-07-10 20:27 ` 2.6.7-mm7 Andrew Morton
2004-07-10 20:32 ` 2.6.7-mm7 Marcin Gibuła
2004-07-11 4:19 ` 2.6.7-mm7 Dax Kelson
2004-07-11 4:40 ` 2.6.7-mm7 Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2004-07-10 6:21 2.6.7-mm7 Zoltan Boszormenyi
[not found] <A6974D8E5F98D511BB910002A50A6647615FFB70@hdsmsx403.hd.intel.com>
2004-07-11 2:23 ` 2.6.7-mm7 Len Brown
2004-07-11 10:23 ` 2.6.7-mm7 Thomas Svedberg
2004-07-11 15:49 ` 2.6.7-mm7 Zoltan Boszormenyi
[not found] <A6974D8E5F98D511BB910002A50A6647615FFA5D@hdsmsx403.hd.intel.com>
2004-07-11 2:34 ` 2.6.7-mm7 Len Brown
2004-07-11 18:32 ` 2.6.7-mm7 Michael Geithe
[not found] <A6974D8E5F98D511BB910002A50A6647615FFA8A@hdsmsx403.hd.intel.com>
2004-07-11 2:36 ` 2.6.7-mm7 Len Brown
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=1089411888.1799.146.camel@mulgrave \
--to=james.bottomley@steeleye.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wli@holomorphy.com \
/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