Commit 6848408a authored by Stefan Richter's avatar Stefan Richter

ieee1394: regression in 2.6.25: updates should happen before probes

Regression since commit 73cf6023,
"ieee1394: use class iteration api":  The two loops for (1.) driver
updates and (2.) driver probes were replaced by a single loop with
bogus needs_probe checks.  Hence updates and probes were now intermixed,
and especially sbp2 updates (reconnects) held up longer than necessary.

While we fix it, change the needs_probe flag to bool type for clarity.

Tested by Damien Benoist.
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 1fca2542
...@@ -844,7 +844,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr ...@@ -844,7 +844,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr
ne->host = host; ne->host = host;
ne->nodeid = nodeid; ne->nodeid = nodeid;
ne->generation = generation; ne->generation = generation;
ne->needs_probe = 1; ne->needs_probe = true;
ne->guid = guid; ne->guid = guid;
ne->guid_vendor_id = (guid >> 40) & 0xffffff; ne->guid_vendor_id = (guid >> 40) & 0xffffff;
...@@ -1144,7 +1144,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent ...@@ -1144,7 +1144,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
struct csr1212_keyval *kv, *vendor_name_kv = NULL; struct csr1212_keyval *kv, *vendor_name_kv = NULL;
u8 last_key_id = 0; u8 last_key_id = 0;
ne->needs_probe = 0; ne->needs_probe = false;
csr1212_for_each_dir_entry(ne->csr, kv, ne->csr->root_kv, dentry) { csr1212_for_each_dir_entry(ne->csr, kv, ne->csr->root_kv, dentry) {
switch (kv->key.id) { switch (kv->key.id) {
...@@ -1295,7 +1295,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr, ...@@ -1295,7 +1295,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,
nodemgr_update_bus_options(ne); nodemgr_update_bus_options(ne);
/* Mark the node as new, so it gets re-probed */ /* Mark the node as new, so it gets re-probed */
ne->needs_probe = 1; ne->needs_probe = true;
} else { } else {
/* old cache is valid, so update its generation */ /* old cache is valid, so update its generation */
struct nodemgr_csr_info *ci = ne->csr->private; struct nodemgr_csr_info *ci = ne->csr->private;
...@@ -1566,28 +1566,27 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge ...@@ -1566,28 +1566,27 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge
struct probe_param { struct probe_param {
struct host_info *hi; struct host_info *hi;
int generation; int generation;
bool probe_now;
}; };
static int __nodemgr_node_probe(struct device *dev, void *data) static int node_probe(struct device *dev, void *data)
{ {
struct probe_param *param = (struct probe_param *)data; struct probe_param *p = data;
struct node_entry *ne; struct node_entry *ne;
ne = container_of(dev, struct node_entry, node_dev); ne = container_of(dev, struct node_entry, node_dev);
if (!ne->needs_probe) if (ne->needs_probe == p->probe_now)
nodemgr_probe_ne(param->hi, ne, param->generation); nodemgr_probe_ne(p->hi, ne, p->generation);
if (ne->needs_probe)
nodemgr_probe_ne(param->hi, ne, param->generation);
return 0; return 0;
} }
static void nodemgr_node_probe(struct host_info *hi, int generation) static void nodemgr_node_probe(struct host_info *hi, int generation)
{ {
struct hpsb_host *host = hi->host; struct hpsb_host *host = hi->host;
struct probe_param param; struct probe_param p;
param.hi = hi; p.hi = hi;
param.generation = generation; p.generation = generation;
/* Do some processing of the nodes we've probed. This pulls them /* Do some processing of the nodes we've probed. This pulls them
* into the sysfs layer if needed, and can result in processing of * into the sysfs layer if needed, and can result in processing of
* unit-directories, or just updating the node and it's * unit-directories, or just updating the node and it's
...@@ -1597,8 +1596,10 @@ static void nodemgr_node_probe(struct host_info *hi, int generation) ...@@ -1597,8 +1596,10 @@ static void nodemgr_node_probe(struct host_info *hi, int generation)
* while probes are time-consuming. (Well, those probes need some * while probes are time-consuming. (Well, those probes need some
* improvement...) */ * improvement...) */
class_for_each_device(&nodemgr_ne_class, NULL, &param, p.probe_now = false;
__nodemgr_node_probe); class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe);
p.probe_now = true;
class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe);
/* If we had a bus reset while we were scanning the bus, it is /* If we had a bus reset while we were scanning the bus, it is
* possible that we did not probe all nodes. In that case, we * possible that we did not probe all nodes. In that case, we
......
...@@ -97,7 +97,7 @@ struct node_entry { ...@@ -97,7 +97,7 @@ struct node_entry {
struct hpsb_host *host; /* Host this node is attached to */ struct hpsb_host *host; /* Host this node is attached to */
nodeid_t nodeid; /* NodeID */ nodeid_t nodeid; /* NodeID */
struct bus_options busopt; /* Bus Options */ struct bus_options busopt; /* Bus Options */
int needs_probe; bool needs_probe;
unsigned int generation; /* Synced with hpsb generation */ unsigned int generation; /* Synced with hpsb generation */
/* The following is read from the config rom */ /* The following is read from the config rom */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment