powerpc: Merge i8259.c into arch/powerpc/sysdev

This changes the parameters for i8259_init so that it takes two
parameters: a physical address for generating an interrupt
acknowledge cycle, and an interrupt number offset.  i8259_init
now sets the irq_desc[] for its interrupts; all the callers
were doing this, and that code is gone now.  This also defines
a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and
makes the platforms that need it select that symbol.

Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 8 insertions, 219 deletions

diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index 5739a19b9ed9..e6e6aa4d291e 100644
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -36,14 +36,12 @@ endif
 endif
 obj-$(CONFIG_8xx)               += m8xx_setup.o ppc8xx_pic.o $(wdt-mpc8xx-y) \
                                    ppc_sys.o mpc8xx_devices.o mpc8xx_sys.o
-ifeq ($(CONFIG_8xx),y)
-obj-$(CONFIG_PCI)               += qspan_pci.o i8259.o
-endif
+obj-$(CONFIG_PCI_QSPAN)         += qspan_pci.o
 obj-$(CONFIG_PPC_OF)            += prom_init.o prom.o
 obj-$(CONFIG_PPC_PMAC)          += open_pic.o
 obj-$(CONFIG_POWER4)            += open_pic2.o
-obj-$(CONFIG_PPC_CHRP)          += open_pic.o i8259.o
-obj-$(CONFIG_PPC_PREP)          += open_pic.o i8259.o todc_time.o
+obj-$(CONFIG_PPC_CHRP)          += open_pic.o
+obj-$(CONFIG_PPC_PREP)          += open_pic.o todc_time.o
 obj-$(CONFIG_BAMBOO)            += pci_auto.o todc_time.o
 obj-$(CONFIG_CPCI690)           += todc_time.o pci_auto.o
 obj-$(CONFIG_EBONY)             += pci_auto.o todc_time.o
@@ -51,7 +49,7 @@ obj-$(CONFIG_EV64260)		+= todc_time.o pci_auto.o
 obj-$(CONFIG_CHESTNUT)          += mv64360_pic.o pci_auto.o
 obj-$(CONFIG_GEMINI)            += open_pic.o
 obj-$(CONFIG_GT64260)           += gt64260_pic.o
-obj-$(CONFIG_LOPEC)             += i8259.o pci_auto.o todc_time.o
+obj-$(CONFIG_LOPEC)             += pci_auto.o todc_time.o
 obj-$(CONFIG_HDPU)              += pci_auto.o
 obj-$(CONFIG_LUAN)              += pci_auto.o todc_time.o
 obj-$(CONFIG_KATANA)            += pci_auto.o
@@ -59,18 +57,17 @@ obj-$(CONFIG_MV64360)		+= mv64360_pic.o
 obj-$(CONFIG_MV64X60)           += mv64x60.o mv64x60_win.o
 obj-$(CONFIG_MVME5100)          += open_pic.o todc_time.o \
                                         pci_auto.o hawk_common.o
-obj-$(CONFIG_MVME5100_IPMC761_PRESENT)  += i8259.o
 obj-$(CONFIG_OCOTEA)            += pci_auto.o todc_time.o
 obj-$(CONFIG_PAL4)              += cpc700_pic.o
 obj-$(CONFIG_POWERPMC250)       += pci_auto.o
-obj-$(CONFIG_PPLUS)             += hawk_common.o open_pic.o i8259.o \
+obj-$(CONFIG_PPLUS)             += hawk_common.o open_pic.o \
                                    todc_time.o pci_auto.o
 obj-$(CONFIG_PRPMC750)          += open_pic.o pci_auto.o \
                                         hawk_common.o
 obj-$(CONFIG_HARRIER)           += harrier.o
 obj-$(CONFIG_PRPMC800)          += open_pic.o pci_auto.o
-obj-$(CONFIG_RADSTONE_PPC7D)    += i8259.o pci_auto.o
-obj-$(CONFIG_SANDPOINT)         += i8259.o pci_auto.o todc_time.o
+obj-$(CONFIG_RADSTONE_PPC7D)    += pci_auto.o
+obj-$(CONFIG_SANDPOINT)         += pci_auto.o todc_time.o
 obj-$(CONFIG_SBC82xx)           += todc_time.o
 obj-$(CONFIG_SPRUCE)            += cpc700_pic.o pci_auto.o \
                                    todc_time.o
@@ -92,7 +89,7 @@ obj-$(CONFIG_MPC10X_OPENPIC)	+= open_pic.o
 obj-$(CONFIG_40x)               += dcr.o
 obj-$(CONFIG_BOOKE)             += dcr.o
 obj-$(CONFIG_85xx)              += open_pic.o ppc85xx_common.o ppc85xx_setup.o \
-                                        ppc_sys.o i8259.o mpc85xx_sys.o \
+                                        ppc_sys.o mpc85xx_sys.o \
                                         mpc85xx_devices.o
 ifeq ($(CONFIG_85xx),y)
 obj-$(CONFIG_PCI)               += pci_auto.o
diff --git a/arch/ppc/syslib/i8259.c b/arch/ppc/syslib/i8259.c
deleted file mode 100644
index 5c7908c20e43..000000000000
--- a/arch/ppc/syslib/i8259.c
+++ /dev/null
@@ -1,208 +0,0 @@
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <asm/io.h>
-#include <asm/i8259.h>
-
-static volatile unsigned char *pci_intack; /* RO, gives us the irq vector */
-
-unsigned char cached_8259[2] = { 0xff, 0xff };
-#define cached_A1 (cached_8259[0])
-#define cached_21 (cached_8259[1])
-
-static DEFINE_SPINLOCK(i8259_lock);
-
-int i8259_pic_irq_offset;
-
-/*
- * Acknowledge the IRQ using either the PCI host bridge's interrupt
- * acknowledge feature or poll.  How i8259_init() is called determines
- * which is called.  It should be noted that polling is broken on some
- * IBM and Motorola PReP boxes so we must use the int-ack feature on them.
- */
-int
-i8259_irq(struct pt_regs *regs)
-{
-        int irq;
-
-        spin_lock(&i8259_lock);
-
-        /* Either int-ack or poll for the IRQ */
-        if (pci_intack)
-                irq = *pci_intack;
-        else {
-                /* Perform an interrupt acknowledge cycle on controller 1. */
-                outb(0x0C, 0x20);               /* prepare for poll */
-                irq = inb(0x20) & 7;
-                if (irq == 2 ) {
-                        /*
-                         * Interrupt is cascaded so perform interrupt
-                         * acknowledge on controller 2.
-                         */
-                        outb(0x0C, 0xA0);       /* prepare for poll */
-                        irq = (inb(0xA0) & 7) + 8;
-                }
-        }
-
-        if (irq == 7) {
-                /*
-                 * This may be a spurious interrupt.
-                 *
-                 * Read the interrupt status register (ISR). If the most
-                 * significant bit is not set then there is no valid
-                 * interrupt.
-                 */
-                if (!pci_intack)
-                        outb(0x0B, 0x20);       /* ISR register */
-                if(~inb(0x20) & 0x80)
-                        irq = -1;
-        }
-
-        spin_unlock(&i8259_lock);
-        return irq;
-}
-
-static void i8259_mask_and_ack_irq(unsigned int irq_nr)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&i8259_lock, flags);
-        if ( irq_nr >= i8259_pic_irq_offset )
-                irq_nr -= i8259_pic_irq_offset;
-
-        if (irq_nr > 7) {
-                cached_A1 |= 1 << (irq_nr-8);
-                inb(0xA1); /* DUMMY */
-                outb(cached_A1,0xA1);
-                outb(0x20,0xA0); /* Non-specific EOI */
-                outb(0x20,0x20); /* Non-specific EOI to cascade */
-        } else {
-                cached_21 |= 1 << irq_nr;
-                inb(0x21); /* DUMMY */
-                outb(cached_21,0x21);
-                outb(0x20,0x20); /* Non-specific EOI */
-        }
-        spin_unlock_irqrestore(&i8259_lock, flags);
-}
-
-static void i8259_set_irq_mask(int irq_nr)
-{
-        outb(cached_A1,0xA1);
-        outb(cached_21,0x21);
-}
-
-static void i8259_mask_irq(unsigned int irq_nr)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&i8259_lock, flags);
-        if ( irq_nr >= i8259_pic_irq_offset )
-                irq_nr -= i8259_pic_irq_offset;
-        if ( irq_nr < 8 )
-                cached_21 |= 1 << irq_nr;
-        else
-                cached_A1 |= 1 << (irq_nr-8);
-        i8259_set_irq_mask(irq_nr);
-        spin_unlock_irqrestore(&i8259_lock, flags);
-}
-
-static void i8259_unmask_irq(unsigned int irq_nr)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&i8259_lock, flags);
-        if ( irq_nr >= i8259_pic_irq_offset )
-                irq_nr -= i8259_pic_irq_offset;
-        if ( irq_nr < 8 )
-                cached_21 &= ~(1 << irq_nr);
-        else
-                cached_A1 &= ~(1 << (irq_nr-8));
-        i8259_set_irq_mask(irq_nr);
-        spin_unlock_irqrestore(&i8259_lock, flags);
-}
-
-static void i8259_end_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))
-            && irq_desc[irq].action)
-                i8259_unmask_irq(irq);
-}
-
-struct hw_interrupt_type i8259_pic = {
-        .typename = " i8259    ",
-        .enable = i8259_unmask_irq,
-        .disable = i8259_mask_irq,
-        .ack = i8259_mask_and_ack_irq,
-        .end = i8259_end_irq,
-};
-
-static struct resource pic1_iores = {
-        .name = "8259 (master)",
-        .start = 0x20,
-        .end = 0x21,
-        .flags = IORESOURCE_BUSY,
-};
-
-static struct resource pic2_iores = {
-        .name = "8259 (slave)",
-        .start = 0xa0,
-        .end = 0xa1,
-        .flags = IORESOURCE_BUSY,
-};
-
-static struct resource pic_edgectrl_iores = {
-        .name = "8259 edge control",
-        .start = 0x4d0,
-        .end = 0x4d1,
-        .flags = IORESOURCE_BUSY,
-};
-
-static struct irqaction i8259_irqaction = {
-        .handler = no_action,
-        .flags = SA_INTERRUPT,
-        .mask = CPU_MASK_NONE,
-        .name = "82c59 secondary cascade",
-};
-
-/*
- * i8259_init()
- * intack_addr - PCI interrupt acknowledge (real) address which will return
- *               the active irq from the 8259
- */
-void __init
-i8259_init(long intack_addr)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&i8259_lock, flags);
-        /* init master interrupt controller */
-        outb(0x11, 0x20); /* Start init sequence */
-        outb(0x00, 0x21); /* Vector base */
-        outb(0x04, 0x21); /* edge tiggered, Cascade (slave) on IRQ2 */
-        outb(0x01, 0x21); /* Select 8086 mode */
-
-        /* init slave interrupt controller */
-        outb(0x11, 0xA0); /* Start init sequence */
-        outb(0x08, 0xA1); /* Vector base */
-        outb(0x02, 0xA1); /* edge triggered, Cascade (slave) on IRQ2 */
-        outb(0x01, 0xA1); /* Select 8086 mode */
-
-        /* always read ISR */
-        outb(0x0B, 0x20);
-        outb(0x0B, 0xA0);
-
-        /* Mask all interrupts */
-        outb(cached_A1, 0xA1);
-        outb(cached_21, 0x21);
-
-        spin_unlock_irqrestore(&i8259_lock, flags);
-
-        /* reserve our resources */
-        setup_irq( i8259_pic_irq_offset + 2, &i8259_irqaction);
-        request_resource(&ioport_resource, &pic1_iores);
-        request_resource(&ioport_resource, &pic2_iores);
-        request_resource(&ioport_resource, &pic_edgectrl_iores);
-
-        if (intack_addr != 0)
-                pci_intack = ioremap(intack_addr, 1);
-}