2011-07-15 Till Straumann <strauman@slac.stanford.edu>

	* shared/irq/init_irq.c, shared/irq/openpic_i8259_irq.c,
	shared/pci/detect_raven_bridge.c: conditionally compile
	ISA and PCI-interrupt related stuff only if BSP defines
	BSP_ISA_IRQ_NUMBER > 0 and/or BSP_PCI_IRQ_NUMBER > 0,
	respectively.

4 files changed, 101 insertions, 27 deletions

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index ad8c711f6b..9064c6cb55 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-15  Till Straumann <strauman@slac.stanford.edu>
+
+	* shared/irq/init_irq.c, shared/irq/openpic_i8259_irq.c,
+	shared/pci/detect_raven_bridge.c: conditionally compile
+	ISA and PCI-interrupt related stuff only if BSP defines
+	BSP_ISA_IRQ_NUMBER > 0 and/or BSP_PCI_IRQ_NUMBER > 0,
+	respectively.
+	
 2011-06-19	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove references to non-existing files.
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
index 9565d5f933..8d05d02f4b 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
@@ -22,8 +22,10 @@
 #include <libcpu/spr.h>
 #include <bsp/pci.h>
 #include <bsp/residual.h>
-#include <bsp/openpic.h>
 #include <bsp/irq.h>
+#if BSP_PCI_IRQ_NUMBER > 0
+#include <bsp/openpic.h>
+#endif
 #include <bsp/irq_supp.h>
 #include <bsp.h>
 #include <bsp/motorola.h>
@@ -36,7 +38,9 @@ typedef struct {
 } pci_isa_bridge_device;
 
 pci_isa_bridge_device* via_82c586 = 0;
+#ifndef qemu
 static pci_isa_bridge_device bridge;
+#endif
 
 /*
  * default methods
@@ -83,16 +87,19 @@ static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={
   0,0,
   255,
   0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+#if BSP_PCI_IRQ_NUMBER > 0
   /*
    * PCI Interrupts
    */
   8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, /* for raven prio 0 means unactive... */
+#endif
   /*
    * Processor exceptions handled as interrupts
    */
   0
 };
 
+#if BSP_PCI_IRQ_NUMBER > 0
 #if defined(mvme2100)
 static unsigned char mvme2100_openpic_initpolarities[16] = {
     0,  /* Not used - should be disabled */
@@ -156,7 +163,9 @@ static unsigned char mcp750_openpic_initsenses[] = {
     1,	/* MCP750_INT_PCI_BUS2_INTD */
 };
 #endif
+#endif
 
+#if BSP_ISA_IRQ_NUMBER > 0 && !defined(qemu)
 void VIA_isa_bridge_interrupts_setup(void)
 {
   pci_isa_bridge_device pci_dev;
@@ -259,6 +268,7 @@ loop_exit:
 #endif
   }
 }
+#endif
 
   /*
    * This code assumes the exceptions management setup has already
@@ -268,7 +278,7 @@ loop_exit:
    */
 void BSP_rtems_irq_mng_init(unsigned cpuId)
 {
-#if !defined(mvme2100)
+#if BSP_ISA_IRQ_NUMBER > 0 && !defined(mvme2100)
   int known_cpi_isa_bridge = 0;
 #endif
   int i;
@@ -285,6 +295,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
    */
   openpic_init(1, mvme2100_openpic_initpolarities, mvme2100_openpic_initsenses, 16, 16, BSP_bus_frequency);
 #else
+#if BSP_PCI_IRQ_NUMBER > 0
 #ifdef TRACE_IRQ_INIT
   printk("Going to initialize raven interrupt controller (openpic compliant)\n");
 #endif
@@ -292,8 +303,13 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
 #ifdef TRACE_IRQ_INIT
   printk("Going to initialize the PCI/ISA bridge IRQ related setting (VIA 82C586)\n");
 #endif
+#endif
+
+#if BSP_ISA_IRQ_NUMBER > 0
   if ( currentBoard == MESQUITE ) {
+#ifndef qemu
     VIA_isa_bridge_interrupts_setup();
+#endif
     known_cpi_isa_bridge = 1;
   }
   if ( currentBoard == MVME_2300 ) {
@@ -316,6 +332,8 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
   BSP_i8259s_init();
 #endif
 
+#endif
+
   /*
    * Initialize RTEMS management interrupt table
    */
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
index 8721c2934b..78c86c959f 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
@@ -20,15 +20,22 @@
 #ifndef BSP_HAS_NO_VME
 #include <bsp/VMEConfig.h>
 #endif
+#if BSP_PCI_IRQ_NUMBER > 0
 #include <bsp/openpic.h>
+#endif
 #include <libcpu/io.h>
 #include <bsp/vectors.h>
 #include <stdlib.h>
 
 #include <rtems/bspIo.h> /* for printk */
+
+#ifndef qemu
 #define RAVEN_INTR_ACK_REG 0xfeff0030
+#else
+#define RAVEN_INTR_ACK_REG 0xbffffff0
+#endif
 
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
 /*
  * pointer to the mask representing the additionnal irq vectors
  * that must be disabled when a particular entry is activated.
@@ -47,33 +54,35 @@ static rtems_irq_connect_data	default_rtems_entry;
 
 static rtems_irq_connect_data*		rtems_hdl_tbl;
 
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
 /*
  * Check if IRQ is an ISA IRQ
  */
 static inline int is_isa_irq(const rtems_irq_number irqLine)
 {
-  return (((int) irqLine <= BSP_ISA_IRQ_MAX_OFFSET) &
+  return (((int) irqLine <= BSP_ISA_IRQ_MAX_OFFSET) &&
 	  ((int) irqLine >= BSP_ISA_IRQ_LOWEST_OFFSET)
 	 );
 }
 #endif
 
+#if BSP_PCI_IRQ_NUMBER > 0
 /*
  * Check if IRQ is an OPENPIC IRQ
  */
 static inline int is_pci_irq(const rtems_irq_number irqLine)
 {
-  return (((int) irqLine <= BSP_PCI_IRQ_MAX_OFFSET) &
+  return OpenPIC && (((int) irqLine <= BSP_PCI_IRQ_MAX_OFFSET) &&
 	  ((int) irqLine >= BSP_PCI_IRQ_LOWEST_OFFSET)
 	 );
 }
+#endif
 
 /*
  * ------------------------ RTEMS Irq helper functions ----------------
  */
 
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
 /*
  * Caution : this function assumes the variable "*config"
  * is already set and that the tables it contains are still valid
@@ -103,7 +112,7 @@ static void compute_i8259_masks_from_prio (rtems_irq_global_settings* config)
 void
 BSP_enable_irq_at_pic(const rtems_irq_number name)
 {
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
     if (is_isa_irq(name)) {
       /*
        * Enable interrupt at PIC level
@@ -112,18 +121,20 @@ BSP_enable_irq_at_pic(const rtems_irq_number name)
     }
 #endif
 
+#if BSP_PCI_IRQ_NUMBER > 0
     if (is_pci_irq(name)) {
       /*
        * Enable interrupt at OPENPIC level
        */
       openpic_enable_irq ((int) name - BSP_PCI_IRQ_LOWEST_OFFSET);
     }
+#endif
 }
 
 int
 BSP_disable_irq_at_pic(const rtems_irq_number name)
 {
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
     if (is_isa_irq(name)) {
       /*
        * disable interrupt at PIC level
@@ -131,12 +142,14 @@ BSP_disable_irq_at_pic(const rtems_irq_number name)
       return BSP_irq_disable_at_i8259s ((int) name - BSP_ISA_IRQ_LOWEST_OFFSET);
     }
 #endif
+#if BSP_PCI_IRQ_NUMBER > 0
     if (is_pci_irq(name)) {
       /*
        * disable interrupt at OPENPIC level
        */
       return openpic_disable_irq ((int) name - BSP_PCI_IRQ_LOWEST_OFFSET);
     }
+#endif
 	return -1;
 }
 
@@ -156,7 +169,7 @@ int BSP_setup_the_pic(rtems_irq_global_settings* config)
      * set up internal tables used by rtems interrupt prologue
      */
 
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
     /*
      * start with ISA IRQ
      */
@@ -179,6 +192,9 @@ int BSP_setup_the_pic(rtems_irq_global_settings* config)
 	}
 #endif
 
+#if BSP_PCI_IRQ_NUMBER > 0
+	if ( ! OpenPIC )
+		return 1;
     /*
      * continue with PCI IRQ
      */
@@ -197,12 +213,11 @@ int BSP_setup_the_pic(rtems_irq_global_settings* config)
     }
 
 #ifdef BSP_PCI_ISA_BRIDGE_IRQ
-	if ( BSP_ISA_IRQ_NUMBER > 0 ) {
-    	/*
-	     * Must enable PCI/ISA bridge IRQ
-	     */
-    	openpic_enable_irq (0);
-	}
+   	/*
+     * Must enable PCI/ISA bridge IRQ
+     */
+   	openpic_enable_irq (BSP_PCI_ISA_BRIDGE_IRQ);
+#endif
 #endif
 
     return 1;
@@ -218,7 +233,7 @@ unsigned BSP_spuriousIntr = 0;
 int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
 {
   register unsigned int irq;
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
   register unsigned isaIntr;                  /* boolean */
   register unsigned oldMask = 0;	      /* old isa pic masks */
   register unsigned newMask;                  /* new isa pic masks */
@@ -231,17 +246,39 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
     return 0;
 
   }
-  irq = openpic_irq(0);
-  if (irq == OPENPIC_VEC_SPURIOUS) {
-    ++BSP_spuriousIntr;
-    return 0;
-  }
 
-  /* some BSPs might want to use a different numbering... */
-  irq = irq - OPENPIC_VEC_SOURCE + BSP_PCI_IRQ_LOWEST_OFFSET;
+#if BSP_PCI_IRQ_NUMBER > 0
+  if ( OpenPIC ) {
+    irq = openpic_irq(0);
+    if (irq == OPENPIC_VEC_SPURIOUS) {
+      ++BSP_spuriousIntr;
+      return 0;
+    }
+
+    /* some BSPs might want to use a different numbering... */
+    irq = irq - OPENPIC_VEC_SOURCE + BSP_PCI_IRQ_LOWEST_OFFSET;
+  } else {
+#if BSP_ISA_IRQ_NUMBER > 0
+#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+	irq = BSP_PCI_ISA_BRIDGE_IRQ;
+#else
+#error "Configuration Error -- BSP with ISA + PCI IRQs MUST define BSP_PCI_ISA_BRIDGE_IRQ"
+#endif
+#else
+	rtems_panic("MUST have an OpenPIC if BSP has PCI IRQs but no ISA IRQs");
+#endif
+  }
+#endif
 
+#if BSP_ISA_IRQ_NUMBER > 0
 #ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if 0 == BSP_PCI_IRQ_NUMBER 
+#error "Configuration Error -- BSP w/o PCI IRQs MUST NOT define BSP_PCI_ISA_BRIDGE_IRQ"
+#endif
   isaIntr = (irq == BSP_PCI_ISA_BRIDGE_IRQ);
+#else
+  isaIntr = 1;
+#endif
   if (isaIntr)  {
     /*
      * Acknowledge and read 8259 vector
@@ -256,14 +293,17 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
     outport_byte(PIC_MASTER_IMR_IO_PORT, i8259s_cache & 0xff);
     outport_byte(PIC_SLAVE_IMR_IO_PORT, ((i8259s_cache & 0xff00) >> 8));
     BSP_irq_ack_at_i8259s (irq);
-    openpic_eoi(0);
+#if BSP_PCI_IRQ_NUMBER > 0
+	if ( OpenPIC )
+      openpic_eoi(0);
+#endif
   }
 #endif
 
   /* dispatch handlers */
   bsp_irq_dispatch_list(rtems_hdl_tbl, irq, default_rtems_entry.hdl);
 
-#ifdef BSP_PCI_ISA_BRIDGE_IRQ
+#if BSP_ISA_IRQ_NUMBER > 0
   if (isaIntr)  {
     i8259s_cache = oldMask;
     outport_byte(PIC_MASTER_IMR_IO_PORT, i8259s_cache & 0xff);
@@ -272,14 +312,18 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
   else
 #endif
   {
+#if BSP_PCI_IRQ_NUMBER > 0
 #ifdef BSP_PCI_VME_DRIVER_DOES_EOI
 	/* leave it to the VME bridge driver to do EOI, so
      * it can re-enable the openpic while handling
      * VME interrupts (-> VME priorities in software)
 	 */
-	if (_BSP_vme_bridge_irq != irq)
+	if (_BSP_vme_bridge_irq != irq && OpenPIC)
 #endif
     		openpic_eoi(0);
+#else
+	do {} while (0);
+#endif
   }
   return 0;
 }
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c b/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
index fd9a7a3dac..69b2c277c6 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
+++ b/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
@@ -10,6 +10,7 @@
 #include <bsp/consoleIo.h>
 #include <bsp/residual.h>
 #include <bsp/openpic.h>
+#include <bsp/irq.h>
 
 #include <rtems/bspIo.h>
 #include <libcpu/cpuIdent.h>
@@ -187,9 +188,12 @@ void detect_host_bridge(void)
       printk("OpenPIC found at %x.\n", OpenPIC);
     }
   }
+
+#if BSP_PCI_IRQ_NUMBER > 0
   if (OpenPIC == (volatile struct OpenPIC *)0) {
     BSP_panic("OpenPic Not found\n");
   }
+#endif
 
 }