Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[POWERPC] Fix cell "new style" mapping and add debug

Browse source 
This fixes a typo in the "new style" code for mapping SPE resources,
which causes it to try to map the same resource 4 times.

It also adds some pr_debug's that are useful to track down issues with
the firmware when bringinh up new machines.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt 2006-11-10 15:11:20 +11:00 committed by Paul Mackerras
parent ae883cab94
commit ab56dbddc8
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
arch/powerpc/platforms/cell/spu_base.c
View file

@ -655,14 +655,19 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
for (i=0; i < 3; i++) { for (i=0; i < 3; i++) {
ret = of_irq_map_one(np, i, &oirq); ret = of_irq_map_one(np, i, &oirq);
if (ret) if (ret) {
pr_debug("spu_new: failed to get irq %d\n", i);
goto err; goto err;
}
ret = -EINVAL; ret = -EINVAL;
pr_debug(" irq %d no 0x%x on %s\n", i, oirq.specifier[0],
oirq.controller->full_name);
spu->irqs[i] = irq_create_of_mapping(oirq.controller, spu->irqs[i] = irq_create_of_mapping(oirq.controller,
oirq.specifier, oirq.size); oirq.specifier, oirq.size);
if (spu->irqs[i] == NO_IRQ) if (spu->irqs[i] == NO_IRQ) {
pr_debug("spu_new: failed to map it !\n");
goto err; goto err;
}
} }
return 0; return 0;
@ -681,7 +686,7 @@ static int spu_map_resource(struct device_node *node, int nr,
struct resource resource = { }; struct resource resource = { };
int ret; int ret;
ret = of_address_to_resource(node, 0, &resource); ret = of_address_to_resource(node, nr, &resource);
if (ret) if (ret)
goto out; goto out;
@ -704,22 +709,42 @@ static int __init spu_map_device(struct spu *spu, struct device_node *node)
ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store, ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store,
&spu->local_store_phys); &spu->local_store_phys);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 0\n",
node->full_name);
goto out; goto out;
}
ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem, ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem,
&spu->problem_phys); &spu->problem_phys);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 1\n",
node->full_name);
goto out_unmap; goto out_unmap;
}
ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2, ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2,
NULL); NULL);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 2\n",
node->full_name);
goto out_unmap; goto out_unmap;
}
if (!firmware_has_feature(FW_FEATURE_LPAR)) if (!firmware_has_feature(FW_FEATURE_LPAR))
ret = spu_map_resource(node, 3, (void __iomem**)&spu->priv1, ret = spu_map_resource(node, 3, (void __iomem**)&spu->priv1,
NULL); NULL);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 3\n",
node->full_name);
goto out_unmap; goto out_unmap;
}
pr_debug("spu_new: %s maps:\n", node->full_name);
pr_debug(" local store : 0x%016lx -> 0x%p\n",
spu->local_store_phys, spu->local_store);
pr_debug(" problem state : 0x%016lx -> 0x%p\n",
spu->problem_phys, spu->problem);
pr_debug(" priv2 : 0x%p\n", spu->priv2);
pr_debug(" priv1 : 0x%p\n", spu->priv1);
return 0; return 0;
out_unmap: out_unmap: