Skip to contentSkip to conversation

ieee1394: support for speeds greater than S800

PATCH New Stefan Richter 1 participant 2 messages Jan 19, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ieee1394: support for speeds greater than S800

The hard-wired configuration of the top speed (until now S800) was unnecessary, remove it.

If the local link layer controller supports S1600 or S3200, we now assume this speed for all present 1394b PHYs (except if they are behind 1394a repeaters) until nodemgr figured out the actual speed while fetching the config ROM.

---

Side note: drivers/firewire is already S3200 capable.

 drivers/ieee1394/ieee1394.h      |    4 +---
 drivers/ieee1394/ieee1394_core.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/ieee1394/ieee1394.h +1 -3
Index: linux/drivers/ieee1394/ieee1394.h
===================================================================
@@ -54,9 +54,7 @@
 #define IEEE1394_SPEED_800	0x03
 #define IEEE1394_SPEED_1600	0x04
 #define IEEE1394_SPEED_3200	0x05
-
-/* The current highest tested speed supported by the subsystem */
-#define IEEE1394_SPEED_MAX	IEEE1394_SPEED_800
+#define IEEE1394_SPEED_MAX	IEEE1394_SPEED_3200
 
 /* Maps speed values above to a string representation */
 extern const char *hpsb_speedto_str[];
drivers/ieee1394/ieee1394_core.c +8 -8
Index: linux/drivers/ieee1394/ieee1394_core.c
===================================================================
@@ -338,6 +338,7 @@ static void build_speed_map(struct hpsb_
 	u8 cldcnt[nodecount];
 	u8 *map = host->speed_map;
 	u8 *speedcap = host->speed;
+	u8 local_link_speed = host->csr.lnk_spd;
 	struct selfid *sid;
 	struct ext_selfid *esid;
 	int i, j, n;
@@ -373,8 +374,8 @@ static void build_speed_map(struct hpsb_
 			if (sid->port2 == SELFID_PORT_CHILD) cldcnt[n]++;
 
 			speedcap[n] = sid->speed;
-			if (speedcap[n] > host->csr.lnk_spd)
-				speedcap[n] = host->csr.lnk_spd;
+			if (speedcap[n] > local_link_speed)
+				speedcap[n] = local_link_speed;
 			n--;
 		}
 	}
@@ -407,12 +408,11 @@ static void build_speed_map(struct hpsb_
 		}
 	}
 
-#if SELFID_SPEED_UNKNOWN != IEEE1394_SPEED_MAX
-	/* assume maximum speed for 1394b PHYs, nodemgr will correct it */
-	for (n = 0; n < nodecount; n++)
-		if (speedcap[n] == SELFID_SPEED_UNKNOWN)
-			speedcap[n] = IEEE1394_SPEED_MAX;
-#endif
+	/* assume a maximum speed for 1394b PHYs, nodemgr will correct it */
+	if (local_link_speed > SELFID_SPEED_UNKNOWN)
+		for (i = 0; i < nodecount; i++)
+			if (speedcap[i] == SELFID_SPEED_UNKNOWN)
+				speedcap[i] = local_link_speed;
 }
 
 
Signature · 3 lines
Stefan Richter
-=====-==--= ---= =--==
http://arcgraph.de/sr/
#1 lore raw

PATCH 1/1 ieee1394: sbp2: update a help string

---
 drivers/ieee1394/sbp2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ieee1394/sbp2.c +2 -2
Index: linux/drivers/ieee1394/sbp2.c
===================================================================
@@ -115,8 +115,8 @@
  */
 static int sbp2_max_speed = IEEE1394_SPEED_MAX;
 module_param_named(max_speed, sbp2_max_speed, int, 0644);
-MODULE_PARM_DESC(max_speed, "Force max speed "
-		 "(3 = 800Mb/s, 2 = 400Mb/s, 1 = 200Mb/s, 0 = 100Mb/s)");
+MODULE_PARM_DESC(max_speed, "Limit data transfer speed (5 <= 3200, "
+		 "4 <= 1600, 3 <= 800, 2 <= 400, 1 <= 200, 0 = 100 Mb/s)");
 
 /*
  * Set serialize_io to 0 or N to use dynamically appended lists of command ORBs.
Signature · 3 lines
Stefan Richter
-=====-==--= ---= =--==
http://arcgraph.de/sr/