Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/ieee1394/nodemgr.c

+15 −14
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr 
	ne->host = host;

	ne->nodeid = nodeid;

	ne->generation = generation;

	ne->needs_probe = 1;

	ne->needs_probe = true;



	ne->guid = guid;

	ne->guid_vendor_id = (guid >> 40) & 0xffffff;
@@ -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;

	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) {

		switch (kv->key.id) {
@@ -1295,7 +1295,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr, 
		nodemgr_update_bus_options(ne);



		/* Mark the node as new, so it gets re-probed */

		ne->needs_probe = 1;

		ne->needs_probe = true;

	} else {

		/* old cache is valid, so update its generation */

		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 
struct probe_param {

	struct host_info *hi;

	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;



	ne = container_of(dev, struct node_entry, node_dev);

	if (!ne->needs_probe)

		nodemgr_probe_ne(param->hi, ne, param->generation);

	if (ne->needs_probe)

		nodemgr_probe_ne(param->hi, ne, param->generation);

	if (ne->needs_probe == p->probe_now)

		nodemgr_probe_ne(p->hi, ne, p->generation);

	return 0;

}



static void nodemgr_node_probe(struct host_info *hi, int generation)

{

	struct hpsb_host *host = hi->host;

	struct probe_param param;

	struct probe_param p;



	param.hi = hi;

	param.generation = generation;

	p.hi = hi;

	p.generation = generation;

	/* Do some processing of the nodes we've probed. This pulls them

	 * into the sysfs layer if needed, and can result in processing of

	 * 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) 
	 * while probes are time-consuming. (Well, those probes need some

	 * improvement...) */



	class_for_each_device(&nodemgr_ne_class, NULL, &param,

			      __nodemgr_node_probe);

	p.probe_now = false;

	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

	 * possible that we did not probe all nodes.  In that case, we

drivers/ieee1394/nodemgr.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct node_entry { 
	struct hpsb_host *host;		/* Host this node is attached to */

	nodeid_t nodeid;		/* NodeID */

	struct bus_options busopt;	/* Bus Options */

	int needs_probe;

	bool needs_probe;

	unsigned int generation;	/* Synced with hpsb generation */



	/* The following is read from the config rom */