GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the code a bit more generic (trivial). Different Super I/Os 

use different config ports.

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@2782 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2007-09-18 23:30:24 +00:00
parent 6ff6af7621
commit d754d2c6c4
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/superiotool/Makefile
View File

@ -32,7 +32,7 @@ OBJS = superiotool.o fintek.o ite.o nsc.o smsc.o
all: $(PROGRAM) all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(PROGRAM): $(OBJS) superiotool.h
$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
install: $(PROGRAM) install: $(PROGRAM)

2
util/superiotool/smsc.c
View File

@ -53,7 +53,7 @@ void dump_smsc(uint32_t port, uint32_t id)
} }
} }
void probe_idregs_smsc(uint32_t port) void probe_idregs_smsc(unsigned short port)
{ {
uint16_t id, rev; uint16_t id, rev;

18
util/superiotool/superiotool.c
View File

@ -97,22 +97,18 @@ void dump_superio(const char *name, const struct superio_registers reg_table[],
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int i, j;
if (iopl(3) < 0) { if (iopl(3) < 0) {
perror("iopl"); perror("iopl");
exit(1); exit(1);
} }
probe_idregs_simple(0x2e); for (i = 0; i < ARRAY_SIZE(superio_ports_table); i++) {
probe_idregs_simple(0x4e); for (j = 0; superio_ports_table[i].ports[j] != EOT; j++)
superio_ports_table[i].probe_idregs(
probe_idregs_fintek(0x2e); superio_ports_table[i].ports[j]);
probe_idregs_fintek(0x4e); }
probe_idregs_ite(0x2e);
probe_idregs_ite(0x4e);
probe_idregs_smsc(0x3f0);
probe_idregs_smsc(0x370);
return 0; return 0;
} }

16
util/superiotool/superiotool.h
View File

@ -27,6 +27,8 @@
#include <stdint.h> #include <stdint.h>
#include <sys/io.h> #include <sys/io.h>
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#define EOT -1 /* End Of Table */ #define EOT -1 /* End Of Table */
#define NOLDN -2 /* NO LDN needed */ #define NOLDN -2 /* NO LDN needed */
#define NANA -3 /* Not Available */ #define NANA -3 /* Not Available */
@ -36,6 +38,7 @@
#define LDNSIZE (MAXLDN + 3) /* Biggest LDN + 0 + NOLDN + EOT */ #define LDNSIZE (MAXLDN + 3) /* Biggest LDN + 0 + NOLDN + EOT */
#define MAXNUMIDX 70 /* Maximum number of indexes */ #define MAXNUMIDX 70 /* Maximum number of indexes */
#define IDXSIZE (MAXNUMIDX + 1) #define IDXSIZE (MAXNUMIDX + 1)
#define MAXNUMPORTS (2 + 1) /* Maximum number of Super I/O ports */
struct superio_registers { struct superio_registers {
/* Yes, superio_id should be unsigned, but EOT has to be negative. */ /* Yes, superio_id should be unsigned, but EOT has to be negative. */
@ -69,6 +72,17 @@ void probe_idregs_simple(unsigned short port);
/* smsc.c */ /* smsc.c */
void dump_smsc(uint32_t port, uint32_t id); void dump_smsc(uint32_t port, uint32_t id);
void probe_idregs_smsc(uint32_t port); void probe_idregs_smsc(unsigned short port);
/** Table of which config ports to probe on each Super I/O. */
const static struct {
void (*probe_idregs) (unsigned short port);
signed short ports[MAXNUMPORTS]; /* Signed, as we need EOT. */
} superio_ports_table[] = {
{probe_idregs_simple, {0x2e, 0x4e, EOT}},
{probe_idregs_fintek, {0x2e, 0x4e, EOT}},
{probe_idregs_ite, {0x2e, 0x4e, EOT}},
{probe_idregs_smsc, {0x3f0, 0x370, EOT}},
};
#endif #endif