The patch titled
ieee1394: sbp2: fix S800 transfers if phys_dma is off
has been removed from the -mm tree. Its filename is
ieee1394-sbp2-fix-s800-transfers-if-phys_dma-is.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ieee1394: sbp2: fix S800 transfers if phys_dma is off
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
If sbp2 is forced to move data via ARM handler, the maximum packet size
allowed for S800 transfers exceeds ohci1394's buffer size on platforms where
PAGE_SIZE is 4096.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/sbp2.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff -puN drivers/ieee1394/sbp2.c~ieee1394-sbp2-fix-s800-transfers-if-phys_dma-is drivers/ieee1394/sbp2.c
--- 25/drivers/ieee1394/sbp2.c~ieee1394-sbp2-fix-s800-transfers-if-phys_dma-is Fri Jun 2 14:44:08 2006
+++ 25-akpm/drivers/ieee1394/sbp2.c Fri Jun 2 14:44:08 2006
@@ -1649,6 +1649,8 @@ static void sbp2_parse_unit_directory(st
}
}
+#define SBP2_PAYLOAD_TO_BYTES(p) (1 << ((p) + 2))
+
/*
* This function is called in order to determine the max speed and packet
* size we can use in our ORBs. Note, that we (the driver and host) only
@@ -1661,6 +1663,7 @@ static void sbp2_parse_unit_directory(st
static int sbp2_max_speed_and_size(struct scsi_id_instance_data *scsi_id)
{
struct sbp2scsi_host_info *hi = scsi_id->hi;
+ u8 payload;
SBP2_DEBUG_ENTER();
@@ -1676,15 +1679,22 @@ static int sbp2_max_speed_and_size(struc
/* Payload size is the lesser of what our speed supports and what
* our host supports. */
- scsi_id->max_payload_size =
- min(sbp2_speedto_max_payload[scsi_id->speed_code],
- (u8) (hi->host->csr.max_rec - 1));
+ payload = min(sbp2_speedto_max_payload[scsi_id->speed_code],
+ (u8) (hi->host->csr.max_rec - 1));
+
+ /* If physical DMA is off, work around limitation in ohci1394:
+ * packet size must not exceed PAGE_SIZE */
+ if (scsi_id->ne->host->low_addr_space < (1ULL << 32))
+ while (SBP2_PAYLOAD_TO_BYTES(payload) + 24 > PAGE_SIZE &&
+ payload)
+ payload--;
HPSB_DEBUG("Node " NODE_BUS_FMT ": Max speed [%s] - Max payload [%u]",
NODE_BUS_ARGS(hi->host, scsi_id->ne->nodeid),
hpsb_speedto_str[scsi_id->speed_code],
- 1 << ((u32) scsi_id->max_payload_size + 2));
+ SBP2_PAYLOAD_TO_BYTES(payload));
+ scsi_id->max_payload_size = payload;
return 0;
}
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
git-ieee1394.patch
lock-validator-annotate-ieee1394-skb-head-locking.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
