Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Sun, 15 Dec 2002 07:51:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Sun, 15 Dec 2002 07:51:32 -0500 Received: from gateway.cinet.co.jp ([210.166.75.129]:46657 "EHLO precia.cinet.co.jp") by vger.kernel.org with ESMTP id ; Sun, 15 Dec 2002 07:51:30 -0500 Message-ID: <3DFC7C17.906E3211@cinet.co.jp> Date: Sun, 15 Dec 2002 21:56:55 +0900 From: Osamu Tomita X-Mailer: Mozilla 4.8C-ja [ja/Vine] (X11; U; Linux 2.5.50-ac1-pc98smp i686) X-Accept-Language: ja MIME-Version: 1.0 To: Linux Kernel Mailing List CC: Alan Cox Subject: [PATCHSET] PC-9800 addtional for 2.5.50-ac1 (16/21) References: <3DFC50E9.656B96D0@cinet.co.jp> Content-Type: multipart/mixed; boundary="------------FEC924EC18FC38D75963DCAB" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3851 Lines: 134 This is a multi-part message in MIME format. --------------FEC924EC18FC38D75963DCAB Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit NEC PC-9800 subarchitecture support patch for 2.5.50-ac1 (16/21) This is patch for IRQ number differences in pci drivers. diffstat: arch/i386/pci/irq.c | 27 +++++++++++++++++++++++++++ drivers/pcmcia/yenta.c | 6 ++++++ include/asm-i386/pci.h | 4 ++++ 3 files changed, 37 insertions(+) Regards, Osamu Tomita --------------FEC924EC18FC38D75963DCAB Content-Type: text/plain; charset=iso-2022-jp; name="pci.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="pci.patch" diff -urN linux/arch/i386/pci/irq.c linux98/arch/i386/pci/irq.c --- linux/arch/i386/pci/irq.c Sat Oct 12 13:22:46 2002 +++ linux98/arch/i386/pci/irq.c Sat Oct 12 14:18:52 2002 @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -25,6 +26,7 @@ static struct irq_routing_table *pirq_table; +#ifndef CONFIG_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_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 -urN linux/drivers/pcmcia/yenta.c linux98/drivers/pcmcia/yenta.c --- linux/drivers/pcmcia/yenta.c Mon Nov 18 13:29:48 2002 +++ linux98/drivers/pcmcia/yenta.c Tue Nov 19 11:02:09 2002 @@ -8,6 +8,7 @@ * Dynamically adjust the size of the bridge resource * */ +#include #include #include #include @@ -510,6 +511,7 @@ add_timer(&socket->poll_timer); } +#ifndef CONFIG_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 -urN linux/include/asm-i386/pci.h linux98/include/asm-i386/pci.h --- linux/include/asm-i386/pci.h Sun Jun 9 14:29:24 2002 +++ linux98/include/asm-i386/pci.h Mon Jun 10 20:49:15 2002 @@ -17,7 +17,11 @@ #endif extern unsigned long pci_mem_start; +#ifndef CONFIG_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); --------------FEC924EC18FC38D75963DCAB-- - 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/