diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-26 11:44:12 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-26 15:37:57 -0400 |
commit | d8f1bd2ffcce6af1ace4f1efb327765144aa0755 (patch) | |
tree | ff1831612cec84d91cf557aafc8ae361a10f13f2 /drivers/bcma/driver_mips.c | |
parent | 4581d91b7717152001192112027596fbdeec06f6 (diff) |
bcma: fix regression in interrupt assignment on mips
The wrong interrupts where assigned to the cores in
bcma_core_mips_init(). This caused at least my serial console not to
response to any input.
This was caused by this patch which changed the order of the cores in
the list:
commit c334e25c9f3a95f2bd6b79fedc5170f17245b1c7
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Wed Jul 11 12:37:00 2012 +0200
bcma: add new cores at the end of list
This should be fixed properly later so that the correct interrupt
numbers are assigned to the cores independently from the ordering of
the list. This patch restores the old behavior again. I will look into
the problem more deeply later.
I also changed the order of the list with the cores and their assigned
interrupt number which gets printed to the log. Now they are printed in
the same order like all the other lists of cores and like it was done
before the patch which changed the order.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/driver_mips.c')
-rw-r--r-- | drivers/bcma/driver_mips.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c index b013b049476d..cc65b45b4368 100644 --- a/drivers/bcma/driver_mips.c +++ b/drivers/bcma/driver_mips.c | |||
@@ -131,7 +131,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) | |||
131 | /* backplane irq line is in use, find out who uses | 131 | /* backplane irq line is in use, find out who uses |
132 | * it and set user to irq 0 | 132 | * it and set user to irq 0 |
133 | */ | 133 | */ |
134 | list_for_each_entry_reverse(core, &bus->cores, list) { | 134 | list_for_each_entry(core, &bus->cores, list) { |
135 | if ((1 << bcma_core_mips_irqflag(core)) == | 135 | if ((1 << bcma_core_mips_irqflag(core)) == |
136 | oldirqflag) { | 136 | oldirqflag) { |
137 | bcma_core_mips_set_irq(core, 0); | 137 | bcma_core_mips_set_irq(core, 0); |
@@ -161,7 +161,7 @@ static void bcma_core_mips_dump_irq(struct bcma_bus *bus) | |||
161 | { | 161 | { |
162 | struct bcma_device *core; | 162 | struct bcma_device *core; |
163 | 163 | ||
164 | list_for_each_entry_reverse(core, &bus->cores, list) { | 164 | list_for_each_entry(core, &bus->cores, list) { |
165 | bcma_core_mips_print_irq(core, bcma_core_mips_irq(core)); | 165 | bcma_core_mips_print_irq(core, bcma_core_mips_irq(core)); |
166 | } | 166 | } |
167 | } | 167 | } |
@@ -224,7 +224,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) | |||
224 | mcore->assigned_irqs = 1; | 224 | mcore->assigned_irqs = 1; |
225 | 225 | ||
226 | /* Assign IRQs to all cores on the bus */ | 226 | /* Assign IRQs to all cores on the bus */ |
227 | list_for_each_entry_reverse(core, &bus->cores, list) { | 227 | list_for_each_entry(core, &bus->cores, list) { |
228 | int mips_irq; | 228 | int mips_irq; |
229 | if (core->irq) | 229 | if (core->irq) |
230 | continue; | 230 | continue; |