iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

of/irq: little endian fixes

Browse Source 
Fix some endian issues in the irq mapping OF code.

Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
CC: Michal Simek <monstr@monstr.eu>
CC: Wolfram Sang <w.sang@pengutronix.de>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Rob Herring 2010-06-08 07:48:08 -06:00 committed by Grant Likely
parent 7dc2e1134a
commit a7c194b007
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/of/irq.c
View File

@ -95,7 +95,7 @@ int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
const u32 *addr, struct of_irq *out_irq) const u32 *addr, struct of_irq *out_irq)
{ {
struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL; struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL;
const u32 *tmp, *imap, *imask; const __be32 *tmp, *imap, *imask;
u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0; u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;
int imaplen, match, i; int imaplen, match, i;
@ -111,7 +111,7 @@ int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
do { do {
tmp = of_get_property(ipar, "#interrupt-cells", NULL); tmp = of_get_property(ipar, "#interrupt-cells", NULL);
if (tmp != NULL) { if (tmp != NULL) {
intsize = *tmp; intsize = be32_to_cpu(*tmp);
break; break;
} }
tnode = ipar; tnode = ipar;
@ -140,7 +140,7 @@ int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
} while (old && tmp == NULL); } while (old && tmp == NULL);
of_node_put(old); of_node_put(old);
old = NULL; old = NULL;
addrsize = (tmp == NULL) ? 2 : *tmp; addrsize = (tmp == NULL) ? 2 : be32_to_cpu(*tmp);
pr_debug(" -> addrsize=%d\n", addrsize); pr_debug(" -> addrsize=%d\n", addrsize);
@ -152,8 +152,9 @@ int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
if (of_get_property(ipar, "interrupt-controller", NULL) != if (of_get_property(ipar, "interrupt-controller", NULL) !=
NULL) { NULL) {
pr_debug(" -> got it !\n"); pr_debug(" -> got it !\n");
memcpy(out_irq->specifier, intspec, for (i = 0; i < intsize; i++)
intsize * sizeof(u32)); out_irq->specifier[i] =
of_read_number(intspec +i, 1);
out_irq->size = intsize; out_irq->size = intsize;
out_irq->controller = ipar; out_irq->controller = ipar;
of_node_put(old); of_node_put(old);
@ -223,9 +224,9 @@ int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
pr_debug(" -> parent lacks #interrupt-cells!\n"); pr_debug(" -> parent lacks #interrupt-cells!\n");
goto fail; goto fail;
} }
newintsize = *tmp; newintsize = be32_to_cpu(*tmp);
tmp = of_get_property(newpar, "#address-cells", NULL); tmp = of_get_property(newpar, "#address-cells", NULL);
newaddrsize = (tmp == NULL) ? 0 : *tmp; newaddrsize = (tmp == NULL) ? 0 : be32_to_cpu(*tmp);
pr_debug(" -> newintsize=%d, newaddrsize=%d\n", pr_debug(" -> newintsize=%d, newaddrsize=%d\n",
newintsize, newaddrsize); newintsize, newaddrsize);
@ -307,7 +308,7 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
tmp = of_get_property(p, "#interrupt-cells", NULL); tmp = of_get_property(p, "#interrupt-cells", NULL);
if (tmp == NULL) if (tmp == NULL)
goto out; goto out;
intsize = *tmp; intsize = be32_to_cpu(*tmp);
pr_debug(" intsize=%d intlen=%d\n", intsize, intlen); pr_debug(" intsize=%d intlen=%d\n", intsize, intlen);