Commit 6984ee79 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras

[POWERPC] Fix cell's mmio nvram to properly parse device tree

The mmio nvram driver (used by cell only atm) isn't properly parsing
the device-tree, meaning that nvram isn't found correctly on the new
Cell blades.  It works ok for old blades where the nvram is at the
root of the device tree but fails on Malta and CAB when it's hanging
off axon.  This fixes it by using the proper OF parsing functions.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 4ef6e681
...@@ -80,33 +80,39 @@ static ssize_t mmio_nvram_get_size(void) ...@@ -80,33 +80,39 @@ static ssize_t mmio_nvram_get_size(void)
int __init mmio_nvram_init(void) int __init mmio_nvram_init(void)
{ {
struct device_node *nvram_node; struct device_node *nvram_node;
const unsigned long *buffer;
int proplen;
unsigned long nvram_addr; unsigned long nvram_addr;
struct resource r;
int ret; int ret;
ret = -ENODEV;
nvram_node = of_find_node_by_type(NULL, "nvram"); nvram_node = of_find_node_by_type(NULL, "nvram");
if (!nvram_node) if (!nvram_node) {
printk(KERN_WARNING "nvram: no node found in device-tree\n");
return -ENODEV;
}
ret = of_address_to_resource(nvram_node, 0, &r);
if (ret) {
printk(KERN_WARNING "nvram: failed to get address (err %d)\n",
ret);
goto out; goto out;
}
ret = -EIO; nvram_addr = r.start;
buffer = get_property(nvram_node, "reg", &proplen); mmio_nvram_len = r.end - r.start + 1;
if (proplen != 2*sizeof(unsigned long)) if ( (!mmio_nvram_len) || (!nvram_addr) ) {
goto out; printk(KERN_WARNING "nvram: address or lenght is 0\n");
ret = -EIO;
ret = -ENODEV;
nvram_addr = buffer[0];
mmio_nvram_len = buffer[1];
if ( (!mmio_nvram_len) || (!nvram_addr) )
goto out; goto out;
}
mmio_nvram_start = ioremap(nvram_addr, mmio_nvram_len); mmio_nvram_start = ioremap(nvram_addr, mmio_nvram_len);
if (!mmio_nvram_start) if (!mmio_nvram_start) {
printk(KERN_WARNING "nvram: failed to ioremap\n");
ret = -ENOMEM;
goto out; goto out;
}
printk(KERN_INFO "mmio NVRAM, %luk mapped to %p\n", printk(KERN_INFO "mmio NVRAM, %luk at 0x%lx mapped to %p\n",
mmio_nvram_len >> 10, mmio_nvram_start); mmio_nvram_len >> 10, nvram_addr, mmio_nvram_start);
ppc_md.nvram_read = mmio_nvram_read; ppc_md.nvram_read = mmio_nvram_read;
ppc_md.nvram_write = mmio_nvram_write; ppc_md.nvram_write = mmio_nvram_write;
......
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