Commit 83b1bfba authored Jan 30, 2014 by Alessandro Rubini Committed by Greg Kroah-Hartman Feb 15, 2014

FMC: show_sdb_tree: fix offset calculation



The code reported wrong addresses in the sdb dumps.  All sdb addresses
are relative, but the code was adding the base address twice.  Bug
exposed by a gateware image with two bridge levels.

Thanks David for reporting the problem.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Reported-by: Juan David Gonzalez Cobas <dcobas@cern.ch>
Tested-by: Juan David Gonzalez Cobas <dcobas@cern.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e4d6c4b7

drivers/fmc/fmc-sdb.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -153,20 +153,17 @@ EXPORT_SYMBOL(fmc_reprogram);
		static void __fmc_show_sdb_tree(const struct fmc_device *fmc,
		const struct sdb_array *arr)
		{
		unsigned long base = arr->baseaddr;
		int i, j, n = arr->len, level = arr->level;
		const struct sdb_array *ap;

		for (i = 0; i < n; i++) {
		unsigned long base;
		union sdb_record *r;
		struct sdb_product *p;
		struct sdb_component *c;
		r = &arr->record[i];
		c = &r->dev.sdb_component;
		p = &c->product;
		base = 0;
		for (ap = arr; ap; ap = ap->parent)
		base += ap->baseaddr;

		dev_info(&fmc->dev, "SDB: ");

		for (j = 0; j < level; j++)

Admin message