diff -urpN linux/arch/mips/Makefile linux.pdh/arch/mips/Makefile --- linux/arch/mips/Makefile Sun Feb 22 02:17:52 2004 +++ linux.pdh/arch/mips/Makefile Sun Feb 22 11:58:34 2004 @@ -294,6 +294,7 @@ load-$(CONFIG_BAGET_MIPS) += 0x80001000 # Cobalt Server # core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ +cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/cobalt load-$(CONFIG_MIPS_COBALT) += 0x80080000 # diff -urpN linux/arch/mips/cobalt/int-handler.S linux.pdh/arch/mips/cobalt/int-handler.S --- linux/arch/mips/cobalt/int-handler.S Thu Nov 13 14:30:45 2003 +++ linux.pdh/arch/mips/cobalt/int-handler.S Sun Feb 22 11:58:34 2004 @@ -19,7 +19,7 @@ CLI la ra, ret_from_irq - move a1, sp + move a0, sp j cobalt_irq END(cobalt_handle_int) diff -urpN linux/arch/mips/cobalt/irq.c linux.pdh/arch/mips/cobalt/irq.c --- linux/arch/mips/cobalt/irq.c Thu Nov 13 14:30:45 2003 +++ linux.pdh/arch/mips/cobalt/irq.c Sun Feb 22 12:07:39 2004 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -25,7 +26,7 @@ extern void cobalt_handle_int(void); * the CPU interrupt lines, and ones that come in on the via chip. The CPU * mappings are: * - * 16, - Software interrupt 0 (unused) IE_SW0 + * 16 - Software interrupt 0 (unused) IE_SW0 * 17 - Software interrupt 1 (unused) IE_SW0 * 18 - Galileo chip (timer) IE_IRQ0 * 19 - Tulip 0 + NCR SCSI IE_IRQ1 @@ -87,6 +88,10 @@ asmlinkage void cobalt_irq(struct pt_reg } } +static struct irqaction irq_via = { + no_action, 0, 0, "cascade", NULL, NULL +}; + void __init init_IRQ(void) { set_except_vector(0, cobalt_handle_int); @@ -99,4 +104,6 @@ void __init init_IRQ(void) * (except IE4, we already masked those at VIA level) */ change_c0_status(ST0_IM, IE_IRQ4); + + setup_irq(COBALT_VIA_IRQ, &irq_via); } diff -urpN linux/arch/mips/cobalt/setup.c linux.pdh/arch/mips/cobalt/setup.c --- linux/arch/mips/cobalt/setup.c Wed Jan 28 22:16:39 2004 +++ linux.pdh/arch/mips/cobalt/setup.c Sun Feb 22 12:17:41 2004 @@ -31,27 +31,25 @@ extern void cobalt_machine_power_off(voi int cobalt_board_id; -static char my_cmdline[CL_SIZE] = { - "console=ttyS0,115200 " -#ifdef CONFIG_IP_PNP - "ip=on " -#endif -#ifdef CONFIG_ROOT_NFS - "root=/dev/nfs " -#else - "root=/dev/hda1 " -#endif - }; - const char *get_system_type(void) { + switch (cobalt_board_id) { + case COBALT_BRD_ID_QUBE1: + return "Cobalt Qube"; + case COBALT_BRD_ID_RAQ1: + return "Cobalt RaQ"; + case COBALT_BRD_ID_QUBE2: + return "Cobalt Qube2"; + case COBALT_BRD_ID_RAQ2: + return "Cobalt RaQ2"; + } return "MIPS Cobalt"; } static void __init cobalt_timer_setup(struct irqaction *irq) { - /* Load timer value for 150 Hz */ - GALILEO_OUTL(500000, GT_TC0_OFS); + /* Load timer value for 1KHz */ + GALILEO_OUTL(50*1000*1000 / 1000, GT_TC0_OFS); /* Register our timer interrupt */ setup_irq(COBALT_TIMER_IRQ, irq); @@ -59,17 +57,17 @@ static void __init cobalt_timer_setup(st /* Enable timer ints */ GALILEO_OUTL((GALILEO_ENTC0 | GALILEO_SELTC0), GT_TC_CONTROL_OFS); /* Unmask timer int */ - GALILEO_OUTL(0x100, GT_INTRMASK_OFS); + GALILEO_OUTL(GALILEO_T0EXP, GT_INTRMASK_OFS); } extern struct pci_ops gt64111_pci_ops; static struct resource cobalt_mem_resource = { - "GT64111 PCI MEM", GT64111_IO_BASE, 0xffffffffUL, IORESOURCE_MEM + "GT64111 PCI MEM", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM }; static struct resource cobalt_io_resource = { - "GT64111 IO MEM", 0x00001000UL, 0x0fffffffUL, IORESOURCE_IO + "GT64111 IO MEM", 0x00001000UL, GT64111_IO_END - GT64111_IO_BASE, IORESOURCE_IO }; static struct resource cobalt_io_resources[] = { @@ -87,10 +85,10 @@ static struct pci_controller cobalt_pci_ .mem_resource = &cobalt_mem_resource, .mem_offset = 0, .io_resource = &cobalt_io_resource, - .io_offset = 0x00001000UL - GT64111_IO_BASE + .io_offset = 0 - GT64111_IO_BASE }; -static void __init cobalt_setup(void) +static int __init cobalt_setup(void) { unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0); int i; @@ -103,6 +101,9 @@ static void __init cobalt_setup(void) set_io_port_base(KSEG1ADDR(GT64111_IO_BASE)); + /* IO region should cover all Galileo IO */ + ioport_resource.end = 0x0fffffff; + /* * This is a prom style console. We just poke at the * UART to make it talk. @@ -121,9 +122,13 @@ static void __init cobalt_setup(void) cobalt_board_id >>= ((VIA_COBALT_BRD_ID_REG & 3) * 8); cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id); + printk("Cobalt board ID: %d\n", cobalt_board_id); + #ifdef CONFIG_PCI register_pci_controller(&cobalt_pci_controller); #endif + + return 0; } early_initcall(cobalt_setup); @@ -135,13 +140,29 @@ early_initcall(cobalt_setup); void __init prom_init(void) { - int argc = fw_arg0; - - strcpy(arcs_cmdline, my_cmdline); + int narg, indx, posn, nchr; + char **argv; mips_machgroup = MACH_GROUP_COBALT; - add_memory_region(0x0, argc & 0x7fffffff, BOOT_MEM_RAM); + narg = fw_arg0 & 0xfff; + + add_memory_region(0x0, (fw_arg0 - narg) & 0x7fffffff, BOOT_MEM_RAM); + + if (narg) { + arcs_cmdline[0] = '\0'; + argv = (char **) fw_arg1; + posn = 0; + for (indx = 1; indx < narg; ++indx) { + nchr = strlen(argv[indx]); + if (posn + 1 + nchr + 1 > sizeof(arcs_cmdline)) + break; + if (posn) + arcs_cmdline[posn++] = ' '; + strcpy(arcs_cmdline + posn, argv[indx]); + posn += nchr; + } + } } unsigned long __init prom_free_prom_memory(void) diff -urpN linux/arch/mips/configs/cobalt_defconfig linux.pdh/arch/mips/configs/cobalt_defconfig --- linux/arch/mips/configs/cobalt_defconfig Thu Feb 19 03:06:23 2004 +++ linux.pdh/arch/mips/configs/cobalt_defconfig Sun Feb 22 12:29:13 2004 @@ -24,7 +24,7 @@ CONFIG_SYSCTL=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y -CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS is not set CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_IOSCHED_NOOP=y @@ -157,8 +157,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set @@ -180,14 +179,43 @@ CONFIG_BLK_DEV_IDEDISK=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_TASKFILE_IO=y +# CONFIG_IDE_TASKFILE_IO is not set # # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y -# CONFIG_BLK_DEV_IDEPCI is not set -# CONFIG_BLK_DEV_IDEDMA is not set +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_IDEDMA_PCI_AUTO is not set +CONFIG_BLK_DEV_ADMA=y +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +CONFIG_BLK_DEV_VIA82CXXX=y +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_AUTO is not set # CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set @@ -303,7 +331,15 @@ CONFIG_NET_ETHERNET=y # # Tulip family network device support # -# CONFIG_NET_TULIP is not set +CONFIG_NET_TULIP=y +# CONFIG_DE2104X is not set +CONFIG_TULIP=y +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +# CONFIG_DE4X5 is not set +# CONFIG_WINBOND_840 is not set +# CONFIG_DM9102 is not set # CONFIG_HP100 is not set # CONFIG_NET_PCI is not set @@ -380,10 +416,7 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set # CONFIG_INPUT_EVDEV is not set @@ -394,11 +427,8 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # # CONFIG_GAMEPORT is not set CONFIG_SOUND_GAMEPORT=y -CONFIG_SERIO=y +# CONFIG_SERIO is not set # CONFIG_SERIO_I8042 is not set -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PCIPS2 is not set # # Input Device Drivers @@ -412,9 +442,7 @@ CONFIG_SERIO_SERPORT=y # # Character devices # -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y +# CONFIG_VT is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -482,13 +510,6 @@ CONFIG_RTC=y # # -# Console display driver support -# -# CONFIG_VGA_CONSOLE is not set -# CONFIG_MDA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y - -# # Sound # # CONFIG_SOUND is not set @@ -507,15 +528,11 @@ CONFIG_DUMMY_CONSOLE=y # File systems # CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -542,8 +559,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y # CONFIG_DEVFS_FS is not set CONFIG_DEVPTS_FS=y -CONFIG_DEVPTS_FS_XATTR=y -CONFIG_DEVPTS_FS_SECURITY=y +# CONFIG_DEVPTS_FS_XATTR is not set # CONFIG_TMPFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y @@ -567,15 +583,9 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y -# CONFIG_NFS_V3 is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFS_FS is not set # CONFIG_NFSD is not set -CONFIG_LOCKD=y # CONFIG_EXPORTFS is not set -CONFIG_SUNRPC=y -# CONFIG_SUNRPC_GSS is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set @@ -598,7 +608,7 @@ CONFIG_MSDOS_PARTITION=y # Kernel hacking # CONFIG_CROSSCOMPILE=y -CONFIG_CMDLINE="" +CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/hda2" # CONFIG_DEBUG_KERNEL is not set # @@ -614,4 +624,4 @@ CONFIG_CMDLINE="" # # Library routines # -# CONFIG_CRC32 is not set +CONFIG_CRC32=y diff -urpN linux/arch/mips/lib-32/dump_tlb.c linux.pdh/arch/mips/lib-32/dump_tlb.c --- linux/arch/mips/lib-32/dump_tlb.c Wed Feb 11 15:05:41 2004 +++ linux.pdh/arch/mips/lib-32/dump_tlb.c Sun Feb 22 11:58:34 2004 @@ -32,6 +32,7 @@ static inline const char *msk2str(unsign case PM_256M: return "256Mb"; #endif } + return NULL; } #define BARRIER() \ diff -urpN linux/arch/mips/mm/c-r4k.c linux.pdh/arch/mips/mm/c-r4k.c --- linux/arch/mips/mm/c-r4k.c Mon Feb 16 16:59:35 2004 +++ linux.pdh/arch/mips/mm/c-r4k.c Sun Feb 22 12:20:48 2004 @@ -425,6 +425,15 @@ static void r4k_flush_icache_range(unsig * which is significantly more expensive than the real thing. Otoh we at * least know the kernel address of the page so we can flush it * selectivly. + * + * The Cobalt ifdefs work around a D-cache alias bug that shows up on + * those devices. For read-only mappings of pages read by PIO the D-cache + * can contain a copy at the kernel's address which is then mapped into + * user space *without* an intervening cache operation to maintain + * coherency. This should affect all platforms with write allocate caches + * using PIO, but for some reason only the Cobalts seem to trip up. The + * work around here 'cos this function gets called for both situations + * where this problem arises. */ static void r4k_flush_icache_page(struct vm_area_struct *vma, struct page *page) @@ -433,8 +442,10 @@ static void r4k_flush_icache_page(struct * If there's no context yet, or the page isn't executable, no icache * flush is needed. */ +#ifndef CONFIG_MIPS_COBALT if (!(vma->vm_flags & VM_EXEC)) return; +#endif /* * Tricky ... Because we don't know the virtual address we've got the @@ -458,6 +469,11 @@ static void r4k_flush_icache_page(struct r4k_blast_dcache_page(addr); ClearPageDcacheDirty(page); } + +#ifdef CONFIG_MIPS_COBALT + if (!(vma->vm_flags & VM_EXEC)) + return; +#endif /* * We're not sure of the virtual address(es) involved here, so diff -urpN linux/arch/mips/pci/fixup-cobalt.c linux.pdh/arch/mips/pci/fixup-cobalt.c --- linux/arch/mips/pci/fixup-cobalt.c Sat Nov 15 10:47:57 2003 +++ linux.pdh/arch/mips/pci/fixup-cobalt.c Sun Feb 22 12:25:30 2004 @@ -44,6 +44,7 @@ static void qube_raq_via_bmIDE_fixup(str static void qube_raq_galileo_fixup(struct pci_dev *dev) { unsigned short galileo_id; + int i; /* Fix PCI latency-timer and cache-line-size values in Galileo * host bridge. @@ -52,6 +53,13 @@ static void qube_raq_galileo_fixup(struc pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 7); /* + * The code described by the comment below has been removed + * as it causes bus mastering by the Ethernet controllers + * to break under any kind of network load. We always set + * the retry timeouts to their maximum. + * + * --x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x-- + * * On all machines prior to Q2, we had the STOP line disconnected * from Galileo to VIA on PCI. The new Galileo does not function * correctly unless we have it connected. @@ -61,16 +69,31 @@ static void qube_raq_galileo_fixup(struc */ pci_read_config_word(dev, PCI_REVISION_ID, &galileo_id); galileo_id &= 0xff; /* mask off class info */ + + printk("Galileo ID: %u\n", galileo_id); + +#if 0 if (galileo_id >= 0x10) { /* New Galileo, assumes PCI stop line to VIA is connected. */ - GALILEO_OUTL(0x4020, GT_PCI0_TOR_OFS); - } else if (galileo_id == 0x1 || galileo_id == 0x2) { + GALILEO_OUTL(0xffff/*0x4020*/, GT_PCI0_TOR_OFS); + } else if (galileo_id == 0x1 || galileo_id == 0x2) +#endif + { signed int timeo; /* XXX WE MUST DO THIS ELSE GALILEO LOCKS UP! -DaveM */ timeo = GALILEO_INL(GT_PCI0_TOR_OFS); /* Old Galileo, assumes PCI STOP line to VIA is disconnected. */ GALILEO_OUTL(0xffff, GT_PCI0_TOR_OFS); } + + /* + * hide Galileo from the kernel's PCI resource assignment. The BARs + * on Galileo will already have been set up by the boot loader to + * match the DRAM configuration so we don't want them being monkeyed + * around with. + */ + for (i = 0; i < DEVICE_COUNT_RESOURCE; ++i) + dev->resource[i].start = dev->resource[i].end = dev->resource[i].flags = 0; } struct pci_fixup pcibios_fixups[] __initdata = { @@ -78,7 +101,7 @@ struct pci_fixup pcibios_fixups[] __init qube_raq_via_bmIDE_fixup}, {PCI_FIXUP_HEADER, PCI_VENDOR_ID_GALILEO, PCI_ANY_ID, qube_raq_galileo_fixup}, - 0 + {0} }; static char irq_tab_cobalt[] __initdata = { diff -urpN linux/arch/mips/pci/pci.c linux.pdh/arch/mips/pci/pci.c --- linux/arch/mips/pci/pci.c Mon Jan 19 16:28:13 2004 +++ linux.pdh/arch/mips/pci/pci.c Sun Feb 22 11:58:34 2004 @@ -234,6 +234,8 @@ static void __init pcibios_fixup_device_ unsigned long offset; int i; + offset = 0; + for (i = 0; i < PCI_NUM_RESOURCES; i++) { if (!dev->resource[i].start) continue; diff -urpN linux/drivers/char/lcd.c linux.pdh/drivers/char/lcd.c --- linux/drivers/char/lcd.c Sat Dec 20 13:29:39 2003 +++ linux.pdh/drivers/char/lcd.c Sun Feb 22 11:58:34 2004 @@ -526,7 +526,7 @@ static inline int button_pressed(void) static int lcd_waiters = 0; -static long lcd_read(struct inode *inode, struct file *file, char *buf, unsigned long count) +static ssize_t lcd_read(struct file *file, char *buf, size_t count, loff_t *pos) { long buttons_now; diff -urpN linux/drivers/net/tulip/eeprom.c linux.pdh/drivers/net/tulip/eeprom.c --- linux/drivers/net/tulip/eeprom.c Sat Nov 2 20:02:01 2002 +++ linux.pdh/drivers/net/tulip/eeprom.c Sun Feb 22 11:58:34 2004 @@ -62,6 +62,10 @@ static struct eeprom_fixup eeprom_fixups */ { 0x1e00, 0x0000, 0x000b, 0x8f01, 0x0103, 0x0300, 0x0821, 0x000, 0x0001, 0x0000, 0x01e1 } }, + {"Cobalt MicroServer", 0, 0x10, 0xE0, { 0x1e00, 0x0000, 0x0800, 0x8001, + 0x0003, 0x0400, 0x0801, 0x0000, + 0x0800, 0x0000, 0x7800, 0x01e0, + 0x5000, 0x1800, 0x0000 }}, {0, 0, 0, 0, {}}}; diff -urpN linux/drivers/net/tulip/media.c linux.pdh/drivers/net/tulip/media.c --- linux/drivers/net/tulip/media.c Sun Jun 1 13:07:41 2003 +++ linux.pdh/drivers/net/tulip/media.c Sun Feb 22 11:58:34 2004 @@ -363,6 +363,9 @@ void tulip_select_media(struct net_devic } tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0); + + udelay(1000); + return; } diff -urpN linux/drivers/net/tulip/tulip_core.c linux.pdh/drivers/net/tulip/tulip_core.c --- linux/drivers/net/tulip/tulip_core.c Thu Feb 19 03:06:29 2004 +++ linux.pdh/drivers/net/tulip/tulip_core.c Sun Feb 22 11:58:34 2004 @@ -1483,8 +1483,8 @@ static int __devinit tulip_init_one (str (PCI_SLOT(pdev->devfn) == 12))) { /* Cobalt MAC address in first EEPROM locations. */ sa_offset = 0; - /* No media table either */ - tp->flags &= ~HAS_MEDIA_TABLE; + /* Ensure our media table fixup get's applied */ + memcpy(ee_data + 16, ee_data, 8); } #endif #ifdef __hppa__ diff -urpN linux/include/asm-mips/cobalt/cobalt.h linux.pdh/include/asm-mips/cobalt/cobalt.h --- linux/include/asm-mips/cobalt/cobalt.h Thu Nov 13 16:56:16 2003 +++ linux.pdh/include/asm-mips/cobalt/cobalt.h Sun Feb 22 12:13:16 2004 @@ -69,13 +69,16 @@ * Most of this really should go into a separate GT64111 header file. */ #define GT64111_IO_BASE 0x10000000UL +#define GT64111_IO_END 0x11ffffffUL +#define GT64111_MEM_BASE 0x12000000UL +#define GT64111_MEM_END 0x13ffffffUL #define GT64111_BASE 0x14000000UL -#define GALILEO_REG(ofs) (KSEG0 + GT64111_BASE + (unsigned long)(ofs)) +#define GALILEO_REG(ofs) (KSEG1 + GT64111_BASE + (unsigned long)(ofs)) #define GALILEO_INL(port) (*(volatile unsigned int *) GALILEO_REG(port)) #define GALILEO_OUTL(val, port) \ do { \ - *(volatile unsigned int *) GALILEO_REG(port) = (port); \ + *(volatile unsigned int *) GALILEO_REG(port) = (val); \ } while (0) #define GALILEO_T0EXP 0x0100 diff -urpN linux/include/asm-mips/cobalt/mach-gt64120.h linux.pdh/include/asm-mips/cobalt/mach-gt64120.h --- linux/include/asm-mips/cobalt/mach-gt64120.h Thu Jan 1 01:00:00 1970 +++ linux.pdh/include/asm-mips/cobalt/mach-gt64120.h Sun Feb 22 11:58:34 2004 @@ -0,0 +1 @@ +/* there's something here ... in the dark */ diff -urpN linux/include/asm-mips/pci.h linux.pdh/include/asm-mips/pci.h --- linux/include/asm-mips/pci.h Thu Feb 19 03:06:34 2004 +++ linux.pdh/include/asm-mips/pci.h Sun Feb 22 11:58:34 2004 @@ -11,6 +11,9 @@ #ifdef __KERNEL__ +extern void pcibios_resource_to_bus(struct pci_dev *dev, + struct pci_bus_region *region, struct resource *res); + /* Can be used to override the logic in pci_scan_bus for skipping already-configured bus numbers - to be used for buggy BIOSes or architectures with incomplete PCI setup by the loader */