Add support for some more Fintek chips and an ALi chip.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2813 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2007-09-28 15:39:10 +00:00
parent 5f45fc234f
commit 945045b1ea
4 changed files with 111 additions and 6 deletions

View File

@ -28,7 +28,7 @@ PREFIX = /usr/local
CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
-Werror-implicit-function-declaration -ansi
OBJS = superiotool.o fintek.o ite.o nsc.o smsc.o winbond.o
OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
all: $(PROGRAM)

95
util/superiotool/ali.c Normal file
View File

@ -0,0 +1,95 @@
/*
* This file is part of the LinuxBIOS project.
*
* Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "superiotool.h"
#define DEVICE_ID_BYTE1_REG 0x20
#define DEVICE_ID_BYTE2_REG 0x21
#define DEVICE_REV_REG 0x1f
const static struct superio_registers reg_table[] = {
/* TODO: M5113 doesn't seem to have ID registers? */
{0x5315, "M1535/M1535D/M1535+/M1535D+", {
{NOLDN, NULL,
{0x07,0x1f,0x20,0x21,0x22,0x23,0x2c,0x2d,0x2e,EOT},
{NANA,NANA,0x53,0x15,0x00,0x00,RSVD,RSVD,RSVD,EOT}},
{0x0, "Floppy",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,EOT},
{0x00,0x03,0xf0,0x06,0x02,0x08,0x00,0xff,0x00,EOT}},
{0x3, "Parallel port",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
{0x00,0x03,0x78,0x05,0x04,0x8c,0xc5,EOT}},
{0x4, "COM1",
{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
{0x00,0x03,0xf8,0x04,0x00,0x00,0x0c,EOT}},
{0x5, "COM2",
{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,EOT},
{0x00,0x03,0xe8,0x09,0x04,0x80,0x00,0x0c,EOT}},
{0x7, "Keyboard",
{0x30,0x70,0x72,0xf0,EOT},
{NANA,0x01,0x00,0x00,EOT}},
{0x8, "COM3",
{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
{0x00,0x02,0xf8,0x03,0x00,0x00,0x0c,EOT}},
{0xc, "Hotkey",
{0x30,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,EOT},
{0x00,0x35,0x14,0x11,0x71,RSVD,0x05,EOT}},
{EOT}}},
{EOT}
};
static void enter_conf_mode_ali(uint16_t port)
{
outb(0x51, port);
outb(0x23, port);
}
static void exit_conf_mode_ali(uint16_t port)
{
outb(0xbb, port);
}
void probe_idregs_ali(uint16_t port)
{
uint16_t id;
uint8_t rev;
enter_conf_mode_ali(port);
id = regval(port, DEVICE_ID_BYTE1_REG) << 8;
id |= regval(port, DEVICE_ID_BYTE2_REG);
rev = regval(port, DEVICE_REV_REG);
if (superio_unknown(reg_table, id)) {
no_superio_found(port);
exit_conf_mode_ali(port);
return;
}
printf("Found ALi %s (id=0x%04x, rev=0x%02x) at 0x%x\n",
get_superio_name(reg_table, id), id, rev, port);
dump_superio("ALi", reg_table, port, id);
dump_superio_readable(port); /* TODO */
exit_conf_mode_ali(port);
}

View File

@ -2,6 +2,7 @@
* This file is part of the LinuxBIOS project.
*
* Copyright (C) 2006 coresystems GmbH <info@coresystems.de>
* Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -22,13 +23,20 @@
#define DEVICE_ID_BYTE1_REG 0x20
#define DEVICE_ID_BYTE2_REG 0x21
#define VENDOR_ID_BYTE1_REG 0x23
#define VENDOR_ID_BYTE2_REG 0x24
#define FINTEK_VENDOR_ID 0x3419
const static struct superio_registers reg_table[] = {
{0x0604, "F71805", {
{0x0106, "F71862FG", {
{EOT}}},
{0x4103, "F71872F/FG / F71806F/FG", { /* Same ID? Datasheet typo? */
{EOT}}},
{0x4105, "F71882FG/F71883FG", { /* Same ID? Datasheet typo? */
{EOT}}},
{0x0604, "F71805F/FG", {
/* We assume reserved bits are read as 0. */
{NOLDN, NULL,
{0x07,0x20,0x21,0x23,0x24,0x25,0x26,0x27,0x28,
@ -59,8 +67,6 @@ const static struct superio_registers reg_table[] = {
{0x30,0xf0,0xf1,EOT},
{0x00,0x00,0x00,EOT}},
{EOT}}},
{0x4103, "F71872", {
{EOT}}},
{EOT}
};
@ -144,8 +150,8 @@ void probe_idregs_fintek(uint16_t port)
return;
}
printf("Found Fintek %s (vid=0x%04x, id=0x%04x) at port=0x%x\n",
get_superio_name(reg_table, did), vid, did, port);
printf("Found Fintek %s (vid=0x%04x, id=0x%04x) at port=0x%x\n",
get_superio_name(reg_table, did), vid, did, port);
dump_superio("Fintek", reg_table, port, did);
dump_readable_fintek(port, did);

View File

@ -81,6 +81,9 @@ void dump_superio(const char *name, const struct superio_registers reg_table[],
void dump_superio_readable(uint16_t port);
void no_superio_found(uint16_t port);
/* ali.c */
void probe_idregs_ali(uint16_t port);
/* fintek.c */
void probe_idregs_fintek(uint16_t port);
@ -101,6 +104,7 @@ const static struct {
void (*probe_idregs) (uint16_t port);
int ports[MAXNUMPORTS]; /* Signed, as we need EOT. */
} superio_ports_table[] = {
{probe_idregs_ali, {0x3f0, 0x370, EOT}},
{probe_idregs_simple, {0x2e, 0x4e, EOT}},
{probe_idregs_fintek, {0x2e, 0x4e, EOT}},
{probe_idregs_ite, {0x2e, 0x4e, EOT}},