On 8/2/21 9:48 am, Joel Sherrill wrote: > Does this have a ticket for the 5 branch? :)
Yes #4233. It is in the commit message. Chris > > Patch is ok otherwise. > > On Sun, Feb 7, 2021, 4:45 PM <chr...@rtems.org <mailto:chr...@rtems.org>> > wrote: > > From: Chris Johns <chr...@rtems.org <mailto:chr...@rtems.org>> > > - 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 > --- > bsps/powerpc/shared/irq/irq_init.c | 2 +- > bsps/powerpc/shared/irq/openpic_i8259_irq.c | 2 +- > 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 > > -- > 2.24.1 > > _______________________________________________ > devel mailing list > devel@rtems.org <mailto:devel@rtems.org> > http://lists.rtems.org/mailman/listinfo/devel > <http://lists.rtems.org/mailman/listinfo/devel> > _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
