From fd4c696243cc971245d7e4075b189f4d79569f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg=2C=20Stefan=20Richter?= Date: Wed, 9 May 2007 19:23:10 -0400 Subject: [PATCH] --- yaml --- r: 55808 b: refs/heads/master c: 36abb3b18e26bf980e8529512853c5d73971a48b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-sbp2.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 512ad758e664..3966ee86552d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1b68c4dcfb8bb7d79b6771e48767039ffbe00a8 +refs/heads/master: 36abb3b18e26bf980e8529512853c5d73971a48b diff --git a/trunk/drivers/firewire/fw-sbp2.c b/trunk/drivers/firewire/fw-sbp2.c index 07be24e2d201..cb808d525314 100644 --- a/trunk/drivers/firewire/fw-sbp2.c +++ b/trunk/drivers/firewire/fw-sbp2.c @@ -926,7 +926,10 @@ static int sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb) /* * Convert the scatterlist to an sbp2 page table. If any - * scatterlist entries are too big for sbp2 we split the as we go. + * scatterlist entries are too big for sbp2, we split them as we + * go. Even if we ask the block I/O layer to not give us sg + * elements larger than 65535 bytes, some IOMMUs may merge sg elements + * during DMA mapping, and Linux currently doesn't prevent this. */ for (i = 0, j = 0; i < count; i++) { sg_len = sg_dma_len(sg + i);