summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2021-02-06 10:03:21 -1000
committerChris Johns <chrisj@rtems.org>2021-02-08 09:43:48 +1100
commit6d9843e189d584a3a18cb4f8fd96f5016175514d (patch)
tree3bcdea23f7c749b263d908e58a9e391539cb34bd
parentscore: Add barrier thread queue operations (diff)
downloadrtems-6d9843e189d584a3a18cb4f8fd96f5016175514d.tar.bz2
powerpc/shared: ISA bus bridge fails to enable the openpic irq
- The call to enable the openpic irq for the ISA bridge fails because the IRQ used is offset by the ISA bus signals and the openpic call expects an IRQ relative to its signals. - Add the MVME 2600/2700 to the list of boards with an ISA bridge. Closes #4233
-rw-r--r--bsps/powerpc/shared/irq/irq_init.c2
-rw-r--r--bsps/powerpc/shared/irq/openpic_i8259_irq.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/bsps/powerpc/shared/irq/irq_init.c b/bsps/powerpc/shared/irq/irq_init.c
index 1a44992a5b..1042c9d1a8 100644
--- a/bsps/powerpc/shared/irq/irq_init.c
+++ b/bsps/powerpc/shared/irq/irq_init.c
@@ -310,7 +310,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
#endif
known_cpi_isa_bridge = 1;
}
- if ( currentBoard == MVME_2300 ) {
+ if ( currentBoard == MVME_2300 || currentBoard == MVME_2600_2700_W_MVME761 ) {
/* nothing to do for W83C553 bridge */
known_cpi_isa_bridge = 1;
}
diff --git a/bsps/powerpc/shared/irq/openpic_i8259_irq.c b/bsps/powerpc/shared/irq/openpic_i8259_irq.c
index 4a9c393f7f..513b9ac3e0 100644
--- a/bsps/powerpc/shared/irq/openpic_i8259_irq.c
+++ b/bsps/powerpc/shared/irq/openpic_i8259_irq.c
@@ -214,7 +214,7 @@ int BSP_setup_the_pic(rtems_irq_global_settings* config)
/*
* Must enable PCI/ISA bridge IRQ
*/
- openpic_enable_irq (BSP_PCI_ISA_BRIDGE_IRQ);
+ openpic_enable_irq (BSP_PCI_ISA_BRIDGE_IRQ - BSP_PCI_IRQ_LOWEST_OFFSET);
#endif
#endif