lkml.org 
[lkml]   [2003]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCHSET] PC-9800 subarch. support for 2.5.60 (27/34) PCI
    This is patchset to support NEC PC-9800 subarchitecture
    against 2.5.60 (27/34).

    PCI support.

    - Osamu Tomita

    diff -Nru linux/arch/i386/pci/irq.c linux98/arch/i386/pci/irq.c
    --- linux/arch/i386/pci/irq.c 2002-10-12 13:22:46.000000000 +0900
    +++ linux98/arch/i386/pci/irq.c 2002-10-12 14:18:52.000000000 +0900
    @@ -5,6 +5,7 @@
    */

    #include <linux/config.h>
    +#include <linux/pci_ids.h>
    #include <linux/types.h>
    #include <linux/kernel.h>
    #include <linux/pci.h>
    @@ -25,6 +26,7 @@

    static struct irq_routing_table *pirq_table;

    +#ifndef CONFIG_X86_PC9800
    /*
    * Never use: 0, 1, 2 (timer, keyboard, and cascade)
    * Avoid using: 13, 14 and 15 (FP error and IDE).
    @@ -36,6 +38,20 @@
    1000000, 1000000, 1000000, 1000, 1000, 0, 1000, 1000,
    0, 0, 0, 0, 1000, 100000, 100000, 100000
    };
    +#else
    +/*
    + * Never use: 0, 1, 2, 7 (timer, keyboard, CRT VSYNC and cascade)
    + * Avoid using: 8, 9 and 15 (FP error and IDE).
    + * Penalize: 4, 5, 11, 12, 13, 14 (known ISA uses: serial, floppy, sound, mouse
    + * and parallel)
    + */
    +unsigned int pcibios_irq_mask = 0xff78;
    +
    +static int pirq_penalty[16] = {
    + 1000000, 1000000, 1000000, 0, 1000, 1000, 0, 1000000,
    + 100000, 100000, 0, 1000, 1000, 1000, 1000, 100000
    +};
    +#endif

    struct irq_router {
    char *name;
    @@ -612,6 +628,17 @@
    r->set(pirq_router_dev, dev, pirq, 11);
    }

    +#ifdef CONFIG_X86_PC9800
    + if ((dev->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) {
    + if (pci_find_device(PCI_VENDOR_ID_INTEL,
    + PCI_DEVICE_ID_INTEL_82439TX, NULL) != NULL) {
    + if (mask & 0x0040) {
    + mask &= 0x0040; /* assign IRQ 6 only */
    + printk("pci-irq: Use IRQ6 for CardBus controller\n");
    + }
    + }
    + }
    +#endif
    /*
    * Find the best IRQ to assign: use the one
    * reported by the device if possible.
    diff -Nru linux/drivers/pcmcia/yenta.c linux98/drivers/pcmcia/yenta.c
    --- linux/drivers/pcmcia/yenta.c 2002-11-18 13:29:48.000000000 +0900
    +++ linux98/drivers/pcmcia/yenta.c 2002-11-19 11:02:09.000000000 +0900
    @@ -8,6 +8,7 @@
    * Dynamically adjust the size of the bridge resource
    *
    */
    +#include <linux/config.h>
    #include <linux/init.h>
    #include <linux/pci.h>
    #include <linux/sched.h>
    @@ -510,6 +511,7 @@
    add_timer(&socket->poll_timer);
    }

    +#ifndef CONFIG_X86_PC9800
    /*
    * Only probe "regular" interrupts, don't
    * touch dangerous spots like the mouse irq,
    @@ -520,6 +522,10 @@
    * Default to 11, 10, 9, 7, 6, 5, 4, 3.
    */
    static u32 isa_interrupts = 0x0ef8;
    +#else
    +/* Default to 12, 10, 6, 5, 3. */
    +static u32 isa_interrupts = 0x1468;
    +#endif

    static unsigned int yenta_probe_irq(pci_socket_t *socket, u32 isa_irq_mask)
    {
    diff -Nru linux/include/asm-i386/pci.h linux98/include/asm-i386/pci.h
    --- linux/include/asm-i386/pci.h 2002-06-09 14:29:24.000000000 +0900
    +++ linux98/include/asm-i386/pci.h 2002-06-10 20:49:15.000000000 +0900
    @@ -17,7 +17,11 @@
    #endif

    extern unsigned long pci_mem_start;
    +#ifndef CONFIG_X86_PC9800
    #define PCIBIOS_MIN_IO 0x1000
    +#else
    +#define PCIBIOS_MIN_IO 0x4000
    +#endif
    #define PCIBIOS_MIN_MEM (pci_mem_start)

    void pcibios_config_init(void);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 13:33    [W:0.045 / U:34.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site