lkml.org 
[lkml]   [2003]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] PC-9800 subarch. support for 2.5.64-ac3 (18/20) setup resources
    This is the patch to support NEC PC-9800 subarchitecture
    against 2.5.64-ac3. (18/20)

    Support difference of IO port/memory address, using mach-* scheme.

    Regards,
    Osamu tomita


    diff -Nru linux-2.5.64/arch/i386/kernel/setup.c linux98-2.5.64/arch/i386/kernel/setup.c
    --- linux-2.5.64/arch/i386/kernel/setup.c 2003-03-05 11:30:00.000000000 +0900
    +++ linux98-2.5.64/arch/i386/kernel/setup.c 2003-03-05 11:58:20.000000000 +0900
    @@ -43,6 +43,7 @@
    #include <asm/setup.h>
    #include <asm/arch_hooks.h>
    #include "setup_arch_pre.h"
    +#include "mach_resources.h"

    int disable_pse __initdata = 0;

    @@ -104,97 +105,20 @@
    static char command_line[COMMAND_LINE_SIZE];
    char saved_command_line[COMMAND_LINE_SIZE];

    -struct resource standard_io_resources[] = {
    - { "dma1", 0x00, 0x1f, IORESOURCE_BUSY },
    - { "pic1", 0x20, 0x3f, IORESOURCE_BUSY },
    - { "timer", 0x40, 0x5f, IORESOURCE_BUSY },
    - { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },
    - { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },
    - { "pic2", 0xa0, 0xbf, IORESOURCE_BUSY },
    - { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
    - { "fpu", 0xf0, 0xff, IORESOURCE_BUSY }
    -};
    -#ifdef CONFIG_MELAN
    -standard_io_resources[1] = { "pic1", 0x20, 0x21, IORESOURCE_BUSY };
    -standard_io_resources[5] = { "pic2", 0xa0, 0xa1, IORESOURCE_BUSY };
    -#endif
    -
    -#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
    -
    static struct resource code_resource = { "Kernel code", 0x100000, 0 };
    static struct resource data_resource = { "Kernel data", 0, 0 };
    -static struct resource vram_resource = { "Video RAM area", 0xa0000, 0xbffff, IORESOURCE_BUSY };
    -
    -/* System ROM resources */
    -#define MAXROMS 6
    -static struct resource rom_resources[MAXROMS] = {
    - { "System ROM", 0xF0000, 0xFFFFF, IORESOURCE_BUSY },
    - { "Video ROM", 0xc0000, 0xc7fff, IORESOURCE_BUSY }
    -};
    -
    -#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)

    static void __init probe_roms(void)
    {
    int roms = 1;
    - unsigned long base;
    - unsigned char *romstart;

    request_resource(&iomem_resource, rom_resources+0);

    /* Video ROM is standard at C000:0000 - C7FF:0000, check signature */
    - for (base = 0xC0000; base < 0xE0000; base += 2048) {
    - romstart = isa_bus_to_virt(base);
    - if (!romsignature(romstart))
    - continue;
    - request_resource(&iomem_resource, rom_resources + roms);
    - roms++;
    - break;
    - }
    + probe_video_rom(roms);

    - /* Extension roms at C800:0000 - DFFF:0000 */
    - for (base = 0xC8000; base < 0xE0000; base += 2048) {
    - unsigned long length;
    -
    - romstart = isa_bus_to_virt(base);
    - if (!romsignature(romstart))
    - continue;
    - length = romstart[2] * 512;
    - if (length) {
    - unsigned int i;
    - unsigned char chksum;
    -
    - chksum = 0;
    - for (i = 0; i < length; i++)
    - chksum += romstart[i];
    -
    - /* Good checksum? */
    - if (!chksum) {
    - rom_resources[roms].start = base;
    - rom_resources[roms].end = base + length - 1;
    - rom_resources[roms].name = "Extension ROM";
    - rom_resources[roms].flags = IORESOURCE_BUSY;
    -
    - request_resource(&iomem_resource, rom_resources + roms);
    - roms++;
    - if (roms >= MAXROMS)
    - return;
    - }
    - }
    - }
    -
    - /* Final check for motherboard extension rom at E000:0000 */
    - base = 0xE0000;
    - romstart = isa_bus_to_virt(base);
    -
    - if (romsignature(romstart)) {
    - rom_resources[roms].start = base;
    - rom_resources[roms].end = base + 65535;
    - rom_resources[roms].name = "Extension ROM";
    - rom_resources[roms].flags = IORESOURCE_BUSY;
    -
    - request_resource(&iomem_resource, rom_resources + roms);
    - }
    + /* Extension roms */
    + probe_extension_roms(roms);
    }

    static void __init limit_regions (unsigned long long size)
    @@ -838,7 +762,8 @@
    request_resource(res, &data_resource);
    }
    }
    - request_resource(&iomem_resource, &vram_resource);
    +
    + request_graphics_resource();

    /* request I/O space for devices used on all i[345]86 PCs */
    for (i = 0; i < STANDARD_IO_RESOURCES; i++)
    @@ -923,6 +848,8 @@
    #ifdef CONFIG_VT
    #if defined(CONFIG_VGA_CONSOLE)
    conswitchp = &vga_con;
    +#elif defined(CONFIG_GDC_CONSOLE)
    + conswitchp = &gdc_con;
    #elif defined(CONFIG_DUMMY_CONSOLE)
    conswitchp = &dummy_con;
    #endif
    diff -Nru linux/include/asm-i386/mach-default/mach_resources.h linux98/include/asm-i386/mach-default/mach_resources.h
    --- linux/include/asm-i386/mach-default/mach_resources.h 1970-01-01 09:00:00.000000000 +0900
    +++ linux98/include/asm-i386/mach-default/mach_resources.h 2003-03-01 11:10:47.000000000 +0900
    @@ -0,0 +1,110 @@
    +/*
    + * include/asm-i386/mach-default/mach_resources.h
    + *
    + * Machine specific resource allocation for generic.
    + * Split out from setup.c by Osamu Tomita <tomita@cinet.co.jp>
    + */
    +#ifndef _MACH_RESOURCES_H
    +#define _MACH_RESOURCES_H
    +
    +struct resource standard_io_resources[] = {
    + { "dma1", 0x00, 0x1f, IORESOURCE_BUSY },
    + { "pic1", 0x20, 0x3f, IORESOURCE_BUSY },
    + { "timer", 0x40, 0x5f, IORESOURCE_BUSY },
    + { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },
    + { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },
    + { "pic2", 0xa0, 0xbf, IORESOURCE_BUSY },
    + { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
    + { "fpu", 0xf0, 0xff, IORESOURCE_BUSY }
    +};
    +#ifdef CONFIG_MELAN
    +standard_io_resources[1] = { "pic1", 0x20, 0x21, IORESOURCE_BUSY };
    +standard_io_resources[5] = { "pic2", 0xa0, 0xa1, IORESOURCE_BUSY };
    +#endif
    +
    +#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
    +
    +static struct resource vram_resource = { "Video RAM area", 0xa0000, 0xbffff, IORESOURCE_BUSY };
    +
    +/* System ROM resources */
    +#define MAXROMS 6
    +static struct resource rom_resources[MAXROMS] = {
    + { "System ROM", 0xF0000, 0xFFFFF, IORESOURCE_BUSY },
    + { "Video ROM", 0xc0000, 0xc7fff, IORESOURCE_BUSY }
    +};
    +
    +#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
    +
    +static inline void probe_video_rom(int roms)
    +{
    + unsigned long base;
    + unsigned char *romstart;
    +
    +
    + /* Video ROM is standard at C000:0000 - C7FF:0000, check signature */
    + for (base = 0xC0000; base < 0xE0000; base += 2048) {
    + romstart = isa_bus_to_virt(base);
    + if (!romsignature(romstart))
    + continue;
    + request_resource(&iomem_resource, rom_resources + roms);
    + roms++;
    + break;
    + }
    +}
    +
    +static inline void probe_extension_roms(int roms)
    +{
    + unsigned long base;
    + unsigned char *romstart;
    +
    + /* Extension roms at C800:0000 - DFFF:0000 */
    + for (base = 0xC8000; base < 0xE0000; base += 2048) {
    + unsigned long length;
    +
    + romstart = isa_bus_to_virt(base);
    + if (!romsignature(romstart))
    + continue;
    + length = romstart[2] * 512;
    + if (length) {
    + unsigned int i;
    + unsigned char chksum;
    +
    + chksum = 0;
    + for (i = 0; i < length; i++)
    + chksum += romstart[i];
    +
    + /* Good checksum? */
    + if (!chksum) {
    + rom_resources[roms].start = base;
    + rom_resources[roms].end = base + length - 1;
    + rom_resources[roms].name = "Extension ROM";
    + rom_resources[roms].flags = IORESOURCE_BUSY;
    +
    + request_resource(&iomem_resource, rom_resources + roms);
    + roms++;
    + if (roms >= MAXROMS)
    + return;
    + }
    + }
    + }
    +
    + /* Final check for motherboard extension rom at E000:0000 */
    + base = 0xE0000;
    + romstart = isa_bus_to_virt(base);
    +
    + if (romsignature(romstart)) {
    + rom_resources[roms].start = base;
    + rom_resources[roms].end = base + 65535;
    + rom_resources[roms].name = "Extension ROM";
    + rom_resources[roms].flags = IORESOURCE_BUSY;
    +
    + request_resource(&iomem_resource, rom_resources + roms);
    + }
    +}
    +
    +static inline void request_graphics_resource(void)
    +{
    + request_resource(&iomem_resource, &vram_resource);
    +}
    +
    +#endif /* !_MACH_RESOURCES_H */
    diff -Nru linux/include/asm-i386/mach-pc9800/mach_resources.h linux98/include/asm-i386/mach-pc9800/mach_resources.h
    --- linux/include/asm-i386/mach-pc9800/mach_resources.h 1970-01-01 09:00:00.000000000 +0900
    +++ linux98/include/asm-i386/mach-pc9800/mach_resources.h 2003-03-01 11:12:46.000000000 +0900
    @@ -0,0 +1,191 @@
    +/*
    + * include/asm-i386/mach-pc9800/mach_resources.h
    + *
    + * Machine specific resource allocation for PC-9800.
    + * Written by Osamu Tomita <tomita@cinet.co.jp>
    + */
    +#ifndef _MACH_RESOURCES_H
    +#define _MACH_RESOURCES_H
    +
    +static char str_pic1[] = "pic1";
    +static char str_dma[] = "dma";
    +static char str_pic2[] = "pic2";
    +static char str_calender_clock[] = "calender clock";
    +static char str_system[] = "system";
    +static char str_nmi_control[] = "nmi control";
    +static char str_kanji_rom[] = "kanji rom";
    +static char str_keyboard[] = "keyboard";
    +static char str_text_gdc[] = "text gdc";
    +static char str_crtc[] = "crtc";
    +static char str_timer[] = "timer";
    +static char str_graphic_gdc[] = "graphic gdc";
    +static char str_dma_ex_bank[] = "dma ex. bank";
    +static char str_beep_freq[] = "beep freq.";
    +static char str_mouse_pio[] = "mouse pio";
    +struct resource standard_io_resources[] = {
    + { str_pic1, 0x00, 0x00, IORESOURCE_BUSY },
    + { str_dma, 0x01, 0x01, IORESOURCE_BUSY },
    + { str_pic1, 0x02, 0x02, IORESOURCE_BUSY },
    + { str_dma, 0x03, 0x03, IORESOURCE_BUSY },
    + { str_dma, 0x05, 0x05, IORESOURCE_BUSY },
    + { str_dma, 0x07, 0x07, IORESOURCE_BUSY },
    + { str_pic2, 0x08, 0x08, IORESOURCE_BUSY },
    + { str_dma, 0x09, 0x09, IORESOURCE_BUSY },
    + { str_pic2, 0x0a, 0x0a, IORESOURCE_BUSY },
    + { str_dma, 0x0b, 0x0b, IORESOURCE_BUSY },
    + { str_dma, 0x0d, 0x0d, IORESOURCE_BUSY },
    + { str_dma, 0x0f, 0x0f, IORESOURCE_BUSY },
    + { str_dma, 0x11, 0x11, IORESOURCE_BUSY },
    + { str_dma, 0x13, 0x13, IORESOURCE_BUSY },
    + { str_dma, 0x15, 0x15, IORESOURCE_BUSY },
    + { str_dma, 0x17, 0x17, IORESOURCE_BUSY },
    + { str_dma, 0x19, 0x19, IORESOURCE_BUSY },
    + { str_dma, 0x1b, 0x1b, IORESOURCE_BUSY },
    + { str_dma, 0x1d, 0x1d, IORESOURCE_BUSY },
    + { str_dma, 0x1f, 0x1f, IORESOURCE_BUSY },
    + { str_calender_clock, 0x20, 0x20, 0 },
    + { str_dma, 0x21, 0x21, IORESOURCE_BUSY },
    + { str_calender_clock, 0x22, 0x22, 0 },
    + { str_dma, 0x23, 0x23, IORESOURCE_BUSY },
    + { str_dma, 0x25, 0x25, IORESOURCE_BUSY },
    + { str_dma, 0x27, 0x27, IORESOURCE_BUSY },
    + { str_dma, 0x29, 0x29, IORESOURCE_BUSY },
    + { str_dma, 0x2b, 0x2b, IORESOURCE_BUSY },
    + { str_dma, 0x2d, 0x2d, IORESOURCE_BUSY },
    + { str_system, 0x31, 0x31, IORESOURCE_BUSY },
    + { str_system, 0x33, 0x33, IORESOURCE_BUSY },
    + { str_system, 0x35, 0x35, IORESOURCE_BUSY },
    + { str_system, 0x37, 0x37, IORESOURCE_BUSY },
    + { str_nmi_control, 0x50, 0x50, IORESOURCE_BUSY },
    + { str_nmi_control, 0x52, 0x52, IORESOURCE_BUSY },
    + { "time stamp", 0x5c, 0x5f, IORESOURCE_BUSY },
    + { str_kanji_rom, 0xa1, 0xa1, IORESOURCE_BUSY },
    + { str_kanji_rom, 0xa3, 0xa3, IORESOURCE_BUSY },
    + { str_kanji_rom, 0xa5, 0xa5, IORESOURCE_BUSY },
    + { str_kanji_rom, 0xa7, 0xa7, IORESOURCE_BUSY },
    + { str_kanji_rom, 0xa9, 0xa9, IORESOURCE_BUSY },
    + { str_keyboard, 0x41, 0x41, IORESOURCE_BUSY },
    + { str_keyboard, 0x43, 0x43, IORESOURCE_BUSY },
    + { str_text_gdc, 0x60, 0x60, IORESOURCE_BUSY },
    + { str_text_gdc, 0x62, 0x62, IORESOURCE_BUSY },
    + { str_text_gdc, 0x64, 0x64, IORESOURCE_BUSY },
    + { str_text_gdc, 0x66, 0x66, IORESOURCE_BUSY },
    + { str_text_gdc, 0x68, 0x68, IORESOURCE_BUSY },
    + { str_text_gdc, 0x6a, 0x6a, IORESOURCE_BUSY },
    + { str_text_gdc, 0x6c, 0x6c, IORESOURCE_BUSY },
    + { str_text_gdc, 0x6e, 0x6e, IORESOURCE_BUSY },
    + { str_crtc, 0x70, 0x70, IORESOURCE_BUSY },
    + { str_crtc, 0x72, 0x72, IORESOURCE_BUSY },
    + { str_crtc, 0x74, 0x74, IORESOURCE_BUSY },
    + { str_crtc, 0x74, 0x74, IORESOURCE_BUSY },
    + { str_crtc, 0x76, 0x76, IORESOURCE_BUSY },
    + { str_crtc, 0x78, 0x78, IORESOURCE_BUSY },
    + { str_crtc, 0x7a, 0x7a, IORESOURCE_BUSY },
    + { str_timer, 0x71, 0x71, IORESOURCE_BUSY },
    + { str_timer, 0x73, 0x73, IORESOURCE_BUSY },
    + { str_timer, 0x75, 0x75, IORESOURCE_BUSY },
    + { str_timer, 0x77, 0x77, IORESOURCE_BUSY },
    + { str_graphic_gdc, 0xa0, 0xa0, IORESOURCE_BUSY },
    + { str_graphic_gdc, 0xa2, 0xa2, IORESOURCE_BUSY },
    + { str_graphic_gdc, 0xa4, 0xa4, IORESOURCE_BUSY },
    + { str_graphic_gdc, 0xa6, 0xa6, IORESOURCE_BUSY },
    + { "cpu", 0xf0, 0xf7, IORESOURCE_BUSY },
    + { "fpu", 0xf8, 0xff, IORESOURCE_BUSY },
    + { str_dma_ex_bank, 0x0e05, 0x0e05, 0 },
    + { str_dma_ex_bank, 0x0e07, 0x0e07, 0 },
    + { str_dma_ex_bank, 0x0e09, 0x0e09, 0 },
    + { str_dma_ex_bank, 0x0e0b, 0x0e0b, 0 },
    + { str_beep_freq, 0x3fd9, 0x3fd9, IORESOURCE_BUSY },
    + { str_beep_freq, 0x3fdb, 0x3fdb, IORESOURCE_BUSY },
    + { str_beep_freq, 0x3fdd, 0x3fdd, IORESOURCE_BUSY },
    + { str_beep_freq, 0x3fdf, 0x3fdf, IORESOURCE_BUSY },
    + /* All PC-9800 have (exactly) one mouse interface. */
    + { str_mouse_pio, 0x7fd9, 0x7fd9, 0 },
    + { str_mouse_pio, 0x7fdb, 0x7fdb, 0 },
    + { str_mouse_pio, 0x7fdd, 0x7fdd, 0 },
    + { str_mouse_pio, 0x7fdf, 0x7fdf, 0 },
    + { "mouse timer", 0xbfdb, 0xbfdb, 0 },
    + { "mouse irq", 0x98d7, 0x98d7, 0 },
    +};
    +
    +#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
    +
    +static struct resource tvram_resource = { "Text VRAM/CG window", 0xa0000, 0xa4fff, IORESOURCE_BUSY };
    +static struct resource gvram_brg_resource = { "Graphic VRAM (B/R/G)", 0xa8000, 0xbffff, IORESOURCE_BUSY };
    +static struct resource gvram_e_resource = { "Graphic VRAM (E)", 0xe0000, 0xe7fff, IORESOURCE_BUSY };
    +
    +/* System ROM resources */
    +#define MAXROMS 6
    +static struct resource rom_resources[MAXROMS] = {
    + { "System ROM", 0xe8000, 0xfffff, IORESOURCE_BUSY }
    +};
    +
    +static inline void probe_video_rom(int roms)
    +{
    + /* PC-9800 has no video ROM */
    +}
    +
    +static inline void probe_extension_roms(int roms)
    +{
    + int i;
    + __u8 *xrom_id;
    +
    + xrom_id = (__u8 *) isa_bus_to_virt(PC9800SCA_XROM_ID + 0x10);
    +
    + for (i = 0; i < 16; i++) {
    + if (xrom_id[i] & 0x80) {
    + int j;
    +
    + for (j = i + 1; j < 16 && (xrom_id[j] & 0x80); j++)
    + ;
    + rom_resources[roms].start = 0x0d0000 + i * 0x001000;
    + rom_resources[roms].end = 0x0d0000 + j * 0x001000 - 1;
    + rom_resources[roms].name = "Extension ROM";
    + rom_resources[roms].flags = IORESOURCE_BUSY;
    +
    + request_resource(&iomem_resource,
    + rom_resources + roms);
    + if (++roms >= MAXROMS)
    + return;
    + }
    + }
    +}
    +
    +static inline void request_graphics_resource(void)
    +{
    + int i;
    +
    + if (PC9800_HIGHRESO_P()) {
    + tvram_resource.start = 0xe0000;
    + tvram_resource.end = 0xe4fff;
    + gvram_brg_resource.name = "Graphic VRAM";
    + gvram_brg_resource.start = 0xc0000;
    + gvram_brg_resource.end = 0xdffff;
    + }
    +
    + request_resource(&iomem_resource, &tvram_resource);
    + request_resource(&iomem_resource, &gvram_brg_resource);
    + if (!PC9800_HIGHRESO_P())
    + request_resource(&iomem_resource, &gvram_e_resource);
    +
    + if (PC9800_HIGHRESO_P() || PC9800_9821_P()) {
    + static char graphics[] = "graphics";
    + static struct resource graphics_resources[] = {
    + { graphics, 0x9a0, 0x9a0, 0 },
    + { graphics, 0x9a2, 0x9a2, 0 },
    + { graphics, 0x9a4, 0x9a4, 0 },
    + { graphics, 0x9a6, 0x9a6, 0 },
    + { graphics, 0x9a8, 0x9a8, 0 },
    + { graphics, 0x9aa, 0x9aa, 0 },
    + { graphics, 0x9ac, 0x9ac, 0 },
    + { graphics, 0x9ae, 0x9ae, 0 },
    + };
    +
    +#define GRAPHICS_RESOURCES (sizeof(graphics_resources)/sizeof(struct resource))
    +
    + for (i = 0; i < GRAPHICS_RESOURCES; i++)
    + request_resource(&ioport_resource, graphics_resources + i);
    + }
    +}
    +
    +#endif /* !_MACH_RESOURCES_H */
    -
    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.042 / U:181.156 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site