coreboot September 2007

coreboot@coreboot.org

81 participants
367 discussions

[LinuxBIOS] r2794 - trunk/util/superiotool
by svn＠openbios.org 21 Sep '07

21 Sep '07

Author: uwe Date: 2007-09-21 01:37:56 +0200 (Fri, 21 Sep 2007) New Revision: 2794 Modified: trunk/util/superiotool/fintek.c trunk/util/superiotool/ite.c trunk/util/superiotool/superiotool.c trunk/util/superiotool/superiotool.h trunk/util/superiotool/winbond.c Log: Decouple the ITE code from fintek.c, it doesn't belong there. Add common 'enter configuration mode' function for most Winbond/Fintek/ITE chips which use the 0x87 0x87 sequence for that reason. Signed-off-by: Uwe … [View More]Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/util/superiotool/fintek.c =================================================================== --- trunk/util/superiotool/fintek.c 2007-09-20 22:13:48 UTC (rev 2793) +++ trunk/util/superiotool/fintek.c 2007-09-20 23:37:56 UTC (rev 2794) @@ -102,68 +102,32 @@ regval(port, 0xf6), regval(port, 0xf7), regval(port, 0xf8)); } -static void enter_conf_mode_fintek(uint16_t port) -{ - /* Enable configuration sequence (Fintek uses this for example) - * Older ITE chips have the same enable sequence. - */ - outb(0x87, port); - outb(0x87, port); -} - -static void exit_conf_mode_fintek(uint16_t port) -{ - /* Exit MB PnP mode (for Fintek, doesn't hurt ITE). */ - outb(0xaa, port); -} - void probe_idregs_fintek(uint16_t port) { - uint16_t vid, did, did_ite, success = 0; + uint16_t vid, did; - enter_conf_mode_fintek(port); + enter_conf_mode_winbond_fintek_ite_8787(port); did = regval(port, DEVICE_ID_BYTE1_REG); did |= (regval(port, DEVICE_ID_BYTE2_REG) << 8); - did_ite = ((did & 0xff) << 8) | ((did & 0xff00) >> 8); vid = regval(port, VENDOR_ID_BYTE1_REG); vid |= (regval(port, VENDOR_ID_BYTE2_REG) << 8); - /* FIXME */ - if (vid != 0x3419 && did_ite != 0x8708 && did_ite != 0x8710) { + if (vid != 0x3419) { no_superio_found(port); - exit_conf_mode_fintek(port); + exit_conf_mode_winbond_fintek_ite_8787(port); return; } - if (did_ite == 0x8708 || did_ite == 0x8701) { - printf("Found ITE IT%04xF (id=0x%04x, rev=0x%01x) at port=0x%x\n", did_ite, did_ite, 0, port); /* FIXME */ - dump_ite(port, did_ite); - regwrite(port, 0x02, 0x02); /* FIXME */ - return; - } - - if (vid == 0xff || vid == 0xffff) { - exit_conf_mode_fintek(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); - switch (vid) { - case 0x3419: - success = 1; - dump_fintek(port, did); - break; - default: - break; - } + dump_superio("Fintek", reg_table, port, did); - if (!success) - printf("No dump for vid 0x%04x, did 0x%04x\n", vid, did); + /* TODO: Revive this as --dump-human-readable output. */ + /* dump_fintek(port, did); */ - exit_conf_mode_fintek(port); + exit_conf_mode_winbond_fintek_ite_8787(port); } Modified: trunk/util/superiotool/ite.c =================================================================== --- trunk/util/superiotool/ite.c 2007-09-20 22:13:48 UTC (rev 2793) +++ trunk/util/superiotool/ite.c 2007-09-20 23:37:56 UTC (rev 2794) @@ -226,12 +226,10 @@ regwrite(port, 0x02, 0x02); } -void probe_idregs_ite(uint16_t port) +static void probe_idregs_ite_helper(uint16_t port) { uint16_t id, chipver; - enter_conf_mode_ite(port); - id = regval(port, CHIP_ID_BYTE1_REG) << 8; id |= regval(port, CHIP_ID_BYTE2_REG); chipver = regval(port, CHIP_VERSION_REG) & 0x0f; /* Only bits 3..0 */ @@ -246,7 +244,16 @@ get_superio_name(reg_table, id), id, chipver, port); dump_superio("ITE", reg_table, port, id); +} +void probe_idregs_ite(uint16_t port) +{ + enter_conf_mode_ite(port); + probe_idregs_ite_helper(port); exit_conf_mode_ite(port); + + enter_conf_mode_winbond_fintek_ite_8787(port); + probe_idregs_ite_helper(port); + exit_conf_mode_winbond_fintek_ite_8787(port); } Modified: trunk/util/superiotool/superiotool.c =================================================================== --- trunk/util/superiotool/superiotool.c 2007-09-20 22:13:48 UTC (rev 2793) +++ trunk/util/superiotool/superiotool.c 2007-09-20 23:37:56 UTC (rev 2794) @@ -37,6 +37,18 @@ outb(val, port + 1); } +void enter_conf_mode_winbond_fintek_ite_8787(uint16_t port) +{ + outb(0x87, port); + outb(0x87, port); +} + +void exit_conf_mode_winbond_fintek_ite_8787(uint16_t port) +{ + outb(0xaa, port); /* Fintek, Winbond */ + regwrite(port, 0x02, 0x02); /* ITE */ +} + int superio_unknown(const struct superio_registers reg_table[], uint16_t id) { return !strncmp(get_superio_name(reg_table, id), "<unknown>", 9); Modified: trunk/util/superiotool/superiotool.h =================================================================== --- trunk/util/superiotool/superiotool.h 2007-09-20 22:13:48 UTC (rev 2793) +++ trunk/util/superiotool/superiotool.h 2007-09-20 23:37:56 UTC (rev 2794) @@ -70,6 +70,8 @@ /* superiotool.c */ uint8_t regval(uint16_t port, uint8_t reg); void regwrite(uint16_t port, uint8_t reg, uint8_t val); +void enter_conf_mode_winbond_fintek_ite_8787(uint16_t port); +void exit_conf_mode_winbond_fintek_ite_8787(uint16_t port); int superio_unknown(const struct superio_registers reg_table[], uint16_t id); const char *get_superio_name(const struct superio_registers reg_table[], uint16_t id); Modified: trunk/util/superiotool/winbond.c =================================================================== --- trunk/util/superiotool/winbond.c 2007-09-20 22:13:48 UTC (rev 2793) +++ trunk/util/superiotool/winbond.c 2007-09-20 23:37:56 UTC (rev 2794) @@ -126,23 +126,12 @@ {EOT} }; -static void enter_conf_mode_winbond(uint16_t port) -{ - outb(0x87, port); - outb(0x87, port); -} - -static void exit_conf_mode_winbond(uint16_t port) -{ - outb(0xaa, port); -} - void probe_idregs_winbond(uint16_t port) { uint16_t id; uint8_t devid, rev; - enter_conf_mode_winbond(port); + enter_conf_mode_winbond_fintek_ite_8787(port); devid = regval(port, DEVICE_ID_REG); rev = regval(port, DEVICE_REV_REG); @@ -152,7 +141,7 @@ if (superio_unknown(reg_table, id)) { no_superio_found(port); - exit_conf_mode_winbond(port); + exit_conf_mode_winbond_fintek_ite_8787(port); return; } @@ -162,6 +151,6 @@ /* TODO: Special notes in dump output for the MISC entries. */ dump_superio("Winbond", reg_table, port, id); - exit_conf_mode_winbond(port); + exit_conf_mode_winbond_fintek_ite_8787(port); } [View Less]

1 0

[LinuxBIOS] r2793 build service
by LinuxBIOS information 21 Sep '07

21 Sep '07

Dear LinuxBIOS readers! This is the automated build check service of LinuxBIOS. The developer "uwe" checked in revision 2793 to the LinuxBIOS source repository and caused the following changes: Change Log: Fix up and generalize the ITE IT8708F code. It was only working out of pure luck (and broken code elsewhere). Needs some more fixing. Add more LDN descriptions to various Super I/Os. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de&… [View More]

1 0

[LinuxBIOS] r2793 - trunk/util/superiotool
by svn＠openbios.org 21 Sep '07

21 Sep '07

Author: uwe Date: 2007-09-21 00:13:48 +0200 (Fri, 21 Sep 2007) New Revision: 2793 Modified: trunk/util/superiotool/fintek.c trunk/util/superiotool/ite.c trunk/util/superiotool/nsc.c trunk/util/superiotool/smsc.c trunk/util/superiotool/winbond.c Log: Fix up and generalize the ITE IT8708F code. It was only working out of pure luck (and broken code elsewhere). Needs some more fixing. Add more LDN descriptions to various Super I/Os. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.… [View More]de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/util/superiotool/fintek.c =================================================================== --- trunk/util/superiotool/fintek.c 2007-09-20 15:01:14 UTC (rev 2792) +++ trunk/util/superiotool/fintek.c 2007-09-20 22:13:48 UTC (rev 2793) @@ -20,6 +20,19 @@ #include "superiotool.h" +#define DEVICE_ID_BYTE1_REG 0x20 +#define DEVICE_ID_BYTE2_REG 0x21 +#define VENDOR_ID_BYTE1_REG 0x23 +#define VENDOR_ID_BYTE2_REG 0x24 + +const static struct superio_registers reg_table[] = { + {0x0604, "F71805", { + {EOT}}}, + {0x4103, "F71872", { + {EOT}}}, + {EOT} +}; + void dump_fintek(uint16_t port, uint16_t did) { switch (did) { @@ -106,39 +119,39 @@ void probe_idregs_fintek(uint16_t port) { - uint16_t vid, did, success = 0; + uint16_t vid, did, did_ite, success = 0; enter_conf_mode_fintek(port); - outb(0x20, port); - if (inb(port) != 0x20) { + did = regval(port, DEVICE_ID_BYTE1_REG); + did |= (regval(port, DEVICE_ID_BYTE2_REG) << 8); + did_ite = ((did & 0xff) << 8) | ((did & 0xff00) >> 8); + + vid = regval(port, VENDOR_ID_BYTE1_REG); + vid |= (regval(port, VENDOR_ID_BYTE2_REG) << 8); + + /* FIXME */ + if (vid != 0x3419 && did_ite != 0x8708 && did_ite != 0x8710) { no_superio_found(port); + exit_conf_mode_fintek(port); return; } - did = inb(port + 1); - did |= (regval(port, 0x21) << 8); - vid = regval(port, 0x23); - vid |= (regval(port, 0x24) << 8); - - printf("Super I/O found at 0x%02x: vid=0x%04x/did=0x%04x\n", - port, vid, did); - - if (vid == 0xff || vid == 0xffff) + if (did_ite == 0x8708 || did_ite == 0x8701) { + printf("Found ITE IT%04xF (id=0x%04x, rev=0x%01x) at port=0x%x\n", did_ite, did_ite, 0, port); /* FIXME */ + dump_ite(port, did_ite); + regwrite(port, 0x02, 0x02); /* FIXME */ return; - - /* printf("%s\n", familyid[id]); */ - switch (did) { - case 0x0887: /* Pseudoreversed for ITE8708 */ - case 0x1087: /* Pseudoreversed for ITE8710 */ - success = 1; - dump_ite(port, ((did & 0xff) << 8) | ((did & 0xff00) >> 8)); - regwrite(port, 0x02, 0x02); /* Exit MB PnP mode. */ - break; - default: - break; } + + if (vid == 0xff || vid == 0xffff) { + exit_conf_mode_fintek(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); + switch (vid) { case 0x3419: success = 1; Modified: trunk/util/superiotool/ite.c =================================================================== --- trunk/util/superiotool/ite.c 2007-09-20 15:01:14 UTC (rev 2792) +++ trunk/util/superiotool/ite.c 2007-09-20 22:13:48 UTC (rev 2793) @@ -21,44 +21,49 @@ #include "superiotool.h" +#define CHIP_ID_BYTE1_REG 0x20 +#define CHIP_ID_BYTE2_REG 0x21 +#define CHIP_VERSION_REG 0x22 + +/* Note: IT8726F has ID 0x8726 (datasheet wrongly says 0x8716). */ const static struct superio_registers reg_table[] = { - {0x8702, "IT8702", { + {0x8702, "IT8702F", { {EOT}}}, - {0x8705, "IT8705 or IT8700", { + {0x8705, "IT8705F or IT8700F", { {EOT}}}, - {0x8708, "IT8708", { + {0x8708, "IT8708F", { {NOLDN, NULL, {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28, 0x29,0x2a,0x2e,0x2f,EOT}, {NANA,0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff, 0xff,0xff,0x00,0x00,EOT}}, - {0x0, NULL, + {0x0, "Floppy", {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT}, {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}}, - {0x1, NULL, + {0x1, "COM1", {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0xf8,0x04,0x00,EOT}}, - {0x2, NULL, + {0x2, "COM2", {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}}, - {0x3, NULL, + {0x3, "Parallel port", {0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x70,0x74, 0xf0,EOT}, {0x00,0x03,0x78,0x07,0x78,0x00,0x80,0x07,0x03, 0x03,EOT}}, - {0x4, NULL, + {0x4, "SWC", {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7, 0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,EOT}, {NANA,NANA,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,NANA,NANA,EOT}}, - {0x5, NULL, + {0x5, "Keyboard", /* Note: 0x30 can actually be 0x00 _or_ 0x01. */ {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT}, {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}}, - {0x6, NULL, + {0x6, "Mouse", {0x30,0x70,0x71,0xf0,EOT}, {0x00,0x0c,0x02,0x00,EOT}}, - {0x7, NULL, + {0x7, "GPIO", {0x70,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba, 0xbb,0xbc,0xbd,0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc8, 0xc9,0xca,0xcb,0xcc,0xcd,0xd0,0xd1,0xd2,0xd3,0xd4, @@ -71,46 +76,47 @@ 0x00,0x00,NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA, 0x00,EOT}}, - {0x8, NULL, + {0x8, "Game port", {0x30,0x60,0x61,EOT}, {0x00,0x02,0x01,EOT}}, - {0x9, NULL, + {0x9, "Consumer IR", {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x10,0x0b,0x00,EOT}}, - {0xa, NULL, + {0xa, "MIDI port", {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x00,0x0a,0x00,EOT}}, {EOT}}}, - {0x8710, "IT8710", { + {0x8710, "IT8710F", { {EOT}}}, - {0x8712, "IT8712", { + {0x8712, "IT8712F", { {NOLDN, NULL, {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT}, {NANA,0x87,0x12,0x08,0x00,0x00,0x00,EOT}}, - {0x0, NULL, + {0x0, "Floppy", {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT}, {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}}, - {0x1, NULL, + {0x1, "COM1", {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}}, - {0x2, NULL, + {0x2, "COM2", {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}}, - {0x3, NULL, + {0x3, "Parallel port", {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT}, {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}}, - {0x4, NULL, + {0x4, "Environment controller", {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,0xf6,EOT}, {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00, 0x00,NANA,NANA,EOT}}, - {0x5, NULL, + {0x5, "Keyboard", + /* TODO: 0xf0: Error in datasheet? */ {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT}, {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x08,EOT}}, - {0x6, NULL, + {0x6, "Mouse", {0x30,0x70,0x71,0xf0,EOT}, {0x00,0x0c,0x02,0x00,EOT}}, - {0x7, NULL, + {0x7, "GPIO", /* TODO: 0x72, 0x73: Errors in datasheet? */ {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62, 0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1, 0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd, @@ -118,22 +124,22 @@ 0xe0,0xe1,0xe2,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4, 0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,EOT}, {0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x30,0x38,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}}, - {0x8, NULL, + {0x8, "MIDI port", {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x00,0x0a,0x00,EOT}}, - {0x9, NULL, + {0x9, "Game port", {0x30,0x60,0x61,EOT}, {0x00,0x02,0x01,EOT}}, - {0xa, NULL, + {0xa, "Consumer IR", {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x10,0x0b,0x00,EOT}}, {EOT}}}, - {0x8716, "IT8716", { + {0x8716, "IT8716F", { {NOLDN, NULL, {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT}, {NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}}, @@ -183,52 +189,36 @@ {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x10,0x0b,0x00,EOT}}, {EOT}}}, - {0x8718, "IT8718", { + {0x8718, "IT8718F", { {EOT}}}, {EOT} }; +/* TODO: Drop this function later. */ void dump_ite(uint16_t port, uint16_t id) { - int i; - - /* TODO: Get datasheets for IT8711 and IT8712. */ - switch (id) { - case 0x8702: - case 0x8705: /* IT8700F or IT8705F */ - case 0x8708: - case 0x8710: - case 0x8712: - case 0x8716: - /* Note: IT8726F has ID 0x8726 (datasheet wrongly says 0x8716). */ - case 0x8718: - dump_superio("ITE", reg_table, port, id); - break; - default: - printf("Unknown ITE chip, id=%04x\n", id); - for (i = 0x20; i <= 0x24; i++) - printf("index %02x=%02x\n", i, regval(port, i)); - break; - } + dump_superio("ITE", reg_table, port, id); } +/** + * Enable configuration sequence (ITE uses this for newer IT87[012]xF). + * + * IT871[01]F uses 0x87, 0x87 -> Fintek detection should handle it + * IT8708F uses 0x87, 0x87 -> Fintek detection should handle it + * IT8761F uses 0x87, 0x61, 0x55, 0x55/0xaa + * IT86xxF series uses different ports + * IT8661F uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes + * IT8673F uses 0x86, 0x80, 0x55/0xaa, 0x55/0xaa and 32 more writes + */ static void enter_conf_mode_ite(uint16_t port) { - /* Enable configuration sequence (ITE uses this for newer IT87[012]x) - * IT871[01] uses 0x87, 0x87 -> fintek detection should handle it - * IT8708 uses 0x87, 0x87 -> fintek detection should handle it - * IT8761 uses 0x87, 0x61, 0x55, 0x55/0xaa - * IT86xx series uses different ports - * IT8661 uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes - * IT8673 uses 0x86, 0x80, 0x55/0xaa, 0x55/0xaa and 32 more writes - */ outb(0x87, port); outb(0x01, port); outb(0x55, port); if (port == 0x2e) outb(0x55, port); else - outb(0xAA, port); + outb(0xaa, port); } static void exit_conf_mode_ite(uint16_t port) @@ -242,26 +232,21 @@ enter_conf_mode_ite(port); - /* Read Chip ID Byte 1. */ - id = regval(port, 0x20); - if (id != 0x87) { + id = regval(port, CHIP_ID_BYTE1_REG) << 8; + id |= regval(port, CHIP_ID_BYTE2_REG); + chipver = regval(port, CHIP_VERSION_REG) & 0x0f; /* Only bits 3..0 */ + + if (superio_unknown(reg_table, id)) { no_superio_found(port); + exit_conf_mode_ite(port); return; } - id <<= 8; + printf("Found ITE %s (id=0x%04x, rev=0x%01x) at port=0x%x\n", + get_superio_name(reg_table, id), id, chipver, port); - /* Read Chip ID Byte 2. */ - id |= regval(port, 0x21); + dump_superio("ITE", reg_table, port, id); - /* Read chip version, only bits 3..0 for all IT87xx. */ - chipver = regval(port, 0x22) & 0x0f; - - printf("Super I/O found at 0x%02x: id=0x%04x, chipver=0x%01x\n", - port, id, chipver); - - dump_ite(port, id); - exit_conf_mode_ite(port); } Modified: trunk/util/superiotool/nsc.c =================================================================== --- trunk/util/superiotool/nsc.c 2007-09-20 15:01:14 UTC (rev 2792) +++ trunk/util/superiotool/nsc.c 2007-09-20 22:13:48 UTC (rev 2793) @@ -63,6 +63,7 @@ outb(0x20, port); if (inb(port) != 0x20) { no_superio_found(port); + /* TODO: Exit config mode? */ return; } id = inb(port + 1); Modified: trunk/util/superiotool/smsc.c =================================================================== --- trunk/util/superiotool/smsc.c 2007-09-20 15:01:14 UTC (rev 2792) +++ trunk/util/superiotool/smsc.c 2007-09-20 22:13:48 UTC (rev 2793) @@ -61,6 +61,7 @@ if (superio_unknown(reg_table, id)) { no_superio_found(port); + exit_conf_mode_smsc(port); return; } Modified: trunk/util/superiotool/winbond.c =================================================================== --- trunk/util/superiotool/winbond.c 2007-09-20 15:01:14 UTC (rev 2792) +++ trunk/util/superiotool/winbond.c 2007-09-20 22:13:48 UTC (rev 2793) @@ -31,10 +31,9 @@ const static struct superio_registers reg_table[] = { {0x601, "W83697HF/F", { {NOLDN, NULL, - /* TODO: 0x02, 0x07. */ - {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29, + {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29, 0x2a,EOT}, - {0x60,NANA,0xff,0x00,0x00,0x00,0x00,0x00,0x00, + {NANA,0x60,NANA,0xff,0x00,0x00,0x00,0x00,0x00,0x00, MISC,EOT}}, /* Some register defaults depend on the value of PNPCSV. */ {0x0, "Floppy", @@ -51,18 +50,18 @@ {0x3, "COM2", {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT}, {0x01,0x02,0xf8,0x03,0x00,0x00,EOT}}, - {0x6, "CIR", + {0x6, "Consumer IR", {0x30,0x60,0x61,0x70,EOT}, {0x00,0x00,0x00,0x00,EOT}}, - {0x7, "Game port, GPIO port 1", + {0x7, "Game port, GPIO 1", {0x30,0x60,0x61,0x62,0x63,0xf0,0xf1,0xf2,EOT}, {0x00,0x02,0x01,0x00,0x00,0xff,0x00,0x00,EOT}}, - {0x8, "MIDI port, GPIO port 5", + {0x8, "MIDI port, GPIO 5", {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,EOT}, {0x00,0x03,0x30,0x00,0x00,0x09,0xff,0x00,0x00,0x00, 0x00,0x00,EOT}}, - {0x9, "GPIO port 2, 3, and 4", + {0x9, "GPIO 2, GPIO 3, GPIO 4", {0x30,0x60,0x61,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6, 0xf7,0xf8,0xf5,EOT}, {0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff, @@ -80,47 +79,47 @@ {NOLDN, NULL, {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28, 0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT}, - {0x88,NANA,0xff,0x00,MISC,0x00,MISC,RSVD,0x50, + {0x88,MISC,0xff,0x00,MISC,0x00,MISC,RSVD,0x50, 0x04,0x00,RSVD,0x00,0x21,0x00,0x00,EOT}}, - {0x0, NULL, + {0x0, "Floppy", {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4, 0xf5,EOT}, {0x01,0x03,0xf0,0x06,0x02,0x8e,0x00,0xff,0x00, 0x00,EOT}}, - {0x1, NULL, + {0x1, "Parallel port", {0x30,0x60,0x61,0x70,0x74,0xf0,EOT}, {0x01,0x03,0x78,0x07,0x04,0x3f,EOT}}, - {0x2, NULL, + {0x2, "COM1", {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x01,0x03,0xf8,0x04,0x00,EOT}}, - {0x3, NULL, + {0x3, "COM2", {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT}, {0x01,0x02,0xf8,0x03,0x00,0x00,EOT}}, - {0x5, NULL, + {0x5, "Keyboard", {0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT}, {0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}}, - {0x6, NULL, + {0x6, "Serial flash interface", {0x30,0x62,0x63,EOT}, {0x00,0x00,0x00,EOT}}, - {0x7, NULL, + {0x7, "GPIO 1, GPIO 6, game port, MIDI port", {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,0xf6,0xf7,EOT}, {0x00,0x02,0x01,0x03,0x30,0x09,0xff,0x00,0x00,0x00, 0xff,0x00,0x00,0x00,EOT}}, - {0x8, NULL, + {0x8, "WDTO#, PLED", {0x30,0xf5,0xf6,0xf7,EOT}, {0x00,0x00,0x00,0x00,EOT}}, - {0x9, NULL, + {0x9, "GPIO 2, GPIO 3, GPIO 4, GPIO 5, SUSLED", {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xf0,0xf1,0xf2, 0xf3,0xf4,0xf5,0xf6,0xf7,EOT}, {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x00, 0x00,0xff,0x00,0x00,0x00,EOT}}, - {0xa, NULL, + {0xa, "ACPI", {0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7, 0xe8,0xf2,0xf3,0xf4,0xf6,0xf7,EOT}, {0x00,0x00,0x01,0x00,0xff,0x08,0x00,RSVD,0x00,0x00, RSVD,0x7c,0x00,0x00,0x00,0x00,EOT}}, - {0xb, NULL, + {0xb, "Hardware monitor", {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT}, {0x00,0x00,0x00,0x00,0xc1,0x00,EOT}}, {EOT}}}, @@ -153,6 +152,7 @@ if (superio_unknown(reg_table, id)) { no_superio_found(port); + exit_conf_mode_winbond(port); return; } [View Less]

1 0

[LinuxBIOS] r2792 build service
by LinuxBIOS information 20 Sep '07

20 Sep '07

Dear LinuxBIOS readers! This is the automated build check service of LinuxBIOS. The developer "ward" checked in revision 2792 to the LinuxBIOS source repository and caused the following changes: Change Log: The s2891 ships with a 1MB rom chip. The targets/tyan/s2891/Config.lb file assumes a 1MB rom chip. Hence the default position for the VGA bios should also assume a 1MB rom chip, instead of a 512KB chip. Signed-off-by: Ward Vandewege <ward(a)gnu.org> Acked-by: Uwe Hermann <uwe(… [View More]

1 0

[LinuxBIOS] [PATCH] tyan s2891: assume 1MB rom chip for onboard VGA rom detection
by Ward Vandewege 20 Sep '07

20 Sep '07

-- Ward Vandewege <ward(a)fsf.org> Free Software Foundation - Senior System Administrator

2 2

[LinuxBIOS] r2792 - trunk/LinuxBIOSv2/src/mainboard/tyan/s2891
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: ward Date: 2007-09-20 17:01:14 +0200 (Thu, 20 Sep 2007) New Revision: 2792 Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/Config.lb Log: The s2891 ships with a 1MB rom chip. The targets/tyan/s2891/Config.lb file assumes a 1MB rom chip. Hence the default position for the VGA bios should also assume a 1MB rom chip, instead of a 512KB chip. Signed-off-by: Ward Vandewege <ward(a)gnu.org> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/LinuxBIOSv2/src/… [View More]

1 0

[LinuxBIOS] Epia MII, Compact Flash and device nodes
by Markus Tornqvist 20 Sep '07

20 Sep '07

Hello! I hope I'm not too far off the mark, and this is semi-offtopic, but what I'm wondering about is udev and compact flash. What I'm doing is installing Debian with FAI[1] and afterwards would be flashing the bios with LinuxBios. The FAI installation works on a regular hard drive just perfectly. The problem: I'm not seeing the cflash /dev/hde. It's found a-ok by lspcmcia and pccardctl, as well as cating /sys (which is apparently pretty much what udevinfo does as well) I searched the … [View More]

4 7

[LinuxBIOS] r2791 build service
by LinuxBIOS information 20 Sep '07

20 Sep '07

Dear LinuxBIOS readers! This is the automated build check service of LinuxBIOS. The developer "uwe" checked in revision 2791 to the LinuxBIOS source repository and caused the following changes: Change Log: Superiotool: Add dump support to the Winbond W83697HF/F. Minor coding style changes and code simplifications. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Build Log: Compilation of arima:hdama is still broken See the error … [View More]

1 0

[LinuxBIOS] r2791 - trunk/util/superiotool
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: uwe Date: 2007-09-20 02:00:49 +0200 (Thu, 20 Sep 2007) New Revision: 2791 Modified: trunk/util/superiotool/ite.c trunk/util/superiotool/smsc.c trunk/util/superiotool/superiotool.c trunk/util/superiotool/superiotool.h trunk/util/superiotool/winbond.c Log: Superiotool: Add dump support to the Winbond W83697HF/F. Minor coding style changes and code simplifications. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> … [View More]Modified: trunk/util/superiotool/ite.c =================================================================== --- trunk/util/superiotool/ite.c 2007-09-19 16:26:18 UTC (rev 2790) +++ trunk/util/superiotool/ite.c 2007-09-20 00:00:49 UTC (rev 2791) @@ -27,37 +27,38 @@ {0x8705, "IT8705 or IT8700", { {EOT}}}, {0x8708, "IT8708", { - {NOLDN, + {NOLDN, NULL, {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28, 0x29,0x2a,0x2e,0x2f,EOT}, {NANA,0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff, 0xff,0xff,0x00,0x00,EOT}}, - {0x0, + {0x0, NULL, {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT}, {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}}, - {0x1, + {0x1, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0xf8,0x04,0x00,EOT}}, - {0x2, + {0x2, NULL, {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}}, - {0x3, + {0x3, NULL, {0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x70,0x74, 0xf0,EOT}, {0x00,0x03,0x78,0x07,0x78,0x00,0x80,0x07,0x03, 0x03,EOT}}, - {0x4, + {0x4, NULL, {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7, 0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,EOT}, {NANA,NANA,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,NANA,NANA,EOT}}, - {0x5, /* Note: 0x30 can actually be 0x00 _or_ 0x01. */ + {0x5, NULL, + /* Note: 0x30 can actually be 0x00 _or_ 0x01. */ {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT}, {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}}, - {0x6, + {0x6, NULL, {0x30,0x70,0x71,0xf0,EOT}, {0x00,0x0c,0x02,0x00,EOT}}, - {0x7, + {0x7, NULL, {0x70,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba, 0xbb,0xbc,0xbd,0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc8, 0xc9,0xca,0xcb,0xcc,0xcd,0xd0,0xd1,0xd2,0xd3,0xd4, @@ -70,46 +71,46 @@ 0x00,0x00,NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA, 0x00,EOT}}, - {0x8, + {0x8, NULL, {0x30,0x60,0x61,EOT}, {0x00,0x02,0x01,EOT}}, - {0x9, + {0x9, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x10,0x0b,0x00,EOT}}, - {0xa, + {0xa, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x00,0x0a,0x00,EOT}}, {EOT}}}, {0x8710, "IT8710", { {EOT}}}, {0x8712, "IT8712", { - {NOLDN, + {NOLDN, NULL, {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT}, {NANA,0x87,0x12,0x08,0x00,0x00,0x00,EOT}}, - {0x0, + {0x0, NULL, {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT}, {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}}, - {0x1, + {0x1, NULL, {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}}, - {0x2, + {0x2, NULL, {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}}, - {0x3, + {0x3, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT}, {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}}, - {0x4, + {0x4, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,0xf6,EOT}, {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00, 0x00,NANA,NANA,EOT}}, - {0x5, + {0x5, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT}, {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x08,EOT}}, - {0x6, + {0x6, NULL, {0x30,0x70,0x71,0xf0,EOT}, {0x00,0x0c,0x02,0x00,EOT}}, - {0x7, + {0x7, NULL, {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62, 0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1, 0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd, @@ -122,44 +123,44 @@ 0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}}, - {0x8, + {0x8, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x00,0x0a,0x00,EOT}}, - {0x9, + {0x9, NULL, {0x30,0x60,0x61,EOT}, {0x00,0x02,0x01,EOT}}, - {0xa, + {0xa, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x10,0x0b,0x00,EOT}}, {EOT}}}, {0x8716, "IT8716", { - {NOLDN, + {NOLDN, NULL, {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT}, {NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}}, - {0x0, + {0x0, NULL, {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT}, {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}}, - {0x1, + {0x1, NULL, {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}}, - {0x2, + {0x2, NULL, {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT}, {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}}, - {0x3, + {0x3, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT}, {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}}, - {0x4, + {0x4, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,0xf6,EOT}, {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00, 0x00,NANA,NANA,EOT}}, - {0x5, + {0x5, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT}, {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}}, - {0x6, + {0x6, NULL, {0x30,0x70,0x71,0xf0,EOT}, {0x00,0x0c,0x02,0x00,EOT}}, - {0x7, + {0x7, NULL, {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62, 0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1, 0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd, @@ -172,13 +173,13 @@ 0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}}, - {0x8, + {0x8, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x00,0x0a,0x00,EOT}}, - {0x9, + {0x9, NULL, {0x30,0x60,0x61,EOT}, {0x00,0x02,0x01,EOT}}, - {0xa, + {0xa, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x03,0x10,0x0b,0x00,EOT}}, {EOT}}}, Modified: trunk/util/superiotool/smsc.c =================================================================== --- trunk/util/superiotool/smsc.c 2007-09-19 16:26:18 UTC (rev 2790) +++ trunk/util/superiotool/smsc.c 2007-09-20 00:00:49 UTC (rev 2791) @@ -25,7 +25,7 @@ const static struct superio_registers reg_table[] = { {0x28, "FDC37N769", { - {NOLDN, + {NOLDN, NULL, {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09, 0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d, Modified: trunk/util/superiotool/superiotool.c =================================================================== --- trunk/util/superiotool/superiotool.c 2007-09-19 16:26:18 UTC (rev 2790) +++ trunk/util/superiotool/superiotool.c 2007-09-20 00:00:49 UTC (rev 2791) @@ -60,11 +60,58 @@ return "<unknown>"; } -void dump_superio(const char *vendor, const struct superio_registers reg_table[], +static void dump_regs(const struct superio_registers reg_table[], + int i, int j, uint16_t port) +{ + int k, *idx; + + if (reg_table[i].ldn[j].ldn != NOLDN) { + printf("LDN 0x%02x ", reg_table[i].ldn[j].ldn); + if (reg_table[i].ldn[j].name != NULL) + printf("(%s)", reg_table[i].ldn[j].name); + regwrite(port, 0x07, reg_table[i].ldn[j].ldn); + } else { + printf("Register dump:"); + } + + idx = reg_table[i].ldn[j].idx; + + printf("\nidx "); + for (k = 0; /* Nothing */; k++) { + if (idx[k] == EOT) + break; + printf("%02x ", idx[k]); + } + + printf("\nval "); + for (k = 0; /* Nothing */; k++) { + if (idx[k] == EOT) + break; + printf("%02x ", regval(port, idx[k])); + } + + printf("\ndef "); + idx = reg_table[i].ldn[j].def; + for (k = 0; /* Nothing */; k++) { + if (idx[k] == EOT) + break; + else if (idx[k] == NANA) + printf("NA "); + else if (idx[k] == RSVD) + printf("RR "); + else if (idx[k] == MISC) /* TODO */ + printf("MM "); + else + printf("%02x ", idx[k]); + } + printf("\n"); +} + +void dump_superio(const char *vendor, + const struct superio_registers reg_table[], uint16_t port, uint16_t id) { - int i, j, k, nodump; - int *idx; + int i, j, no_dump_available = 1; if (!dump) return; @@ -76,66 +123,28 @@ if ((uint16_t)reg_table[i].superio_id != id) continue; - nodump = 1; - for (j = 0; /* Nothing */; j++) { if (reg_table[i].ldn[j].ldn == EOT) break; - - nodump = 0; - - if (reg_table[i].ldn[j].ldn != NOLDN) { - printf("Switching to LDN 0x%02x\n", - reg_table[i].ldn[j].ldn); - regwrite(port, 0x07, reg_table[i].ldn[j].ldn); - } - - idx = reg_table[i].ldn[j].idx; - - printf("idx "); - for (k = 0; /* Nothing */; k++) { - if (idx[k] == EOT) - break; - printf("%02x ", idx[k]); - } - - printf("\nval "); - for (k = 0; /* Nothing */; k++) { - if (idx[k] == EOT) - break; - printf("%02x ", regval(port, idx[k])); - } - - printf("\ndef "); - idx = reg_table[i].ldn[j].def; - for (k = 0; /* Nothing */; k++) { - if (idx[k] == EOT) - break; - else if (idx[k] == NANA) - printf("NA "); - else if (idx[k] == RSVD) - printf("RR "); - else if (idx[k] == MISC) /* TODO */ - printf("MM "); - else - printf("%02x ", idx[k]); - } - printf("\n"); + no_dump_available = 0; + dump_regs(reg_table, i, j, port); } - if (nodump) - printf("No dump for %s %s\n", vendor, reg_table[i].name); + if (no_dump_available) + printf("No dump available for this Super I/O\n"); } } -void no_superio_found(uint16_t port) { +void no_superio_found(uint16_t port) +{ if (!verbose) return; if (inb(port) == 0xff) printf("No Super I/O chip found at 0x%04x\n", port); else - printf("Probing 0x%04x, failed (0x%02x), data returns 0x%02x\n", port, inb(port), inb(port + 1)); + printf("Probing 0x%04x, failed (0x%02x), data returns 0x%02x\n", + port, inb(port), inb(port + 1)); } int main(int argc, char *argv[]) Modified: trunk/util/superiotool/superiotool.h =================================================================== --- trunk/util/superiotool/superiotool.h 2007-09-19 16:26:18 UTC (rev 2790) +++ trunk/util/superiotool/superiotool.h 2007-09-20 00:00:49 UTC (rev 2791) @@ -61,6 +61,7 @@ const char name[MAXNAMELEN]; struct { int ldn; + const char *name; int idx[IDXSIZE]; int def[IDXSIZE]; } ldn[LDNSIZE]; Modified: trunk/util/superiotool/winbond.c =================================================================== --- trunk/util/superiotool/winbond.c 2007-09-19 16:26:18 UTC (rev 2790) +++ trunk/util/superiotool/winbond.c 2007-09-20 00:00:49 UTC (rev 2791) @@ -30,57 +30,97 @@ */ const static struct superio_registers reg_table[] = { {0x601, "W83697HF/F", { - /* - {NOLDN, - {0x20,0x21,EOT}, - {0x60,NANA,EOT}}, - */ + {NOLDN, NULL, + /* TODO: 0x02, 0x07. */ + {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x28,0x29, + 0x2a,EOT}, + {0x60,NANA,0xff,0x00,0x00,0x00,0x00,0x00,0x00, + MISC,EOT}}, + /* Some register defaults depend on the value of PNPCSV. */ + {0x0, "Floppy", + {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4, + 0xf5,EOT}, + {0x01,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00, + 0x00,EOT}}, + {0x1, "Parallel port", + {0x30,0x60,0x61,0x70,0x74,0xf0,EOT}, + {0x01,0x03,0x78,0x07,0x04,0x3f,EOT}}, + {0x2, "COM1", + {0x30,0x60,0x61,0x70,0xf0,EOT}, + {0x01,0x03,0xf8,0x04,0x00,EOT}}, + {0x3, "COM2", + {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT}, + {0x01,0x02,0xf8,0x03,0x00,0x00,EOT}}, + {0x6, "CIR", + {0x30,0x60,0x61,0x70,EOT}, + {0x00,0x00,0x00,0x00,EOT}}, + {0x7, "Game port, GPIO port 1", + {0x30,0x60,0x61,0x62,0x63,0xf0,0xf1,0xf2,EOT}, + {0x00,0x02,0x01,0x00,0x00,0xff,0x00,0x00,EOT}}, + {0x8, "MIDI port, GPIO port 5", + {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3, + 0xf4,0xf5,EOT}, + {0x00,0x03,0x30,0x00,0x00,0x09,0xff,0x00,0x00,0x00, + 0x00,0x00,EOT}}, + {0x9, "GPIO port 2, 3, and 4", + {0x30,0x60,0x61,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6, + 0xf7,0xf8,0xf5,EOT}, + {0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff, + 0x00,0x00,0x00,EOT}}, + {0xa, "ACPI", + {0x30,0x70,0xe0,0xe1,0xe2,0xe5,0xe6,0xe7, + 0xf0,0xf1,0xf3,0xf4,0xf6,0xf7,0xf9,EOT}, + {0x00,0x00,0x00,0x00,NANA,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}}, + {0xb, "Hardware monitor", + {0x30,0x60,0x61,0x70,EOT}, + {0x00,0x00,0x00,0x00,EOT}}, {EOT}}}, {0x886, "W83627EHF/EF/EHG/EG", { - {NOLDN, + {NOLDN, NULL, {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28, 0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT}, {0x88,NANA,0xff,0x00,MISC,0x00,MISC,RSVD,0x50, 0x04,0x00,RSVD,0x00,0x21,0x00,0x00,EOT}}, - {0x0, + {0x0, NULL, {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4, 0xf5,EOT}, {0x01,0x03,0xf0,0x06,0x02,0x8e,0x00,0xff,0x00, 0x00,EOT}}, - {0x1, + {0x1, NULL, {0x30,0x60,0x61,0x70,0x74,0xf0,EOT}, {0x01,0x03,0x78,0x07,0x04,0x3f,EOT}}, - {0x2, + {0x2, NULL, {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x01,0x03,0xf8,0x04,0x00,EOT}}, - {0x3, + {0x3, NULL, {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT}, {0x01,0x02,0xf8,0x03,0x00,0x00,EOT}}, - {0x5, + {0x5, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT}, {0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}}, - {0x6, + {0x6, NULL, {0x30,0x62,0x63,EOT}, {0x00,0x00,0x00,EOT}}, - {0x7, + {0x7, NULL, {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,0xf6,0xf7,EOT}, {0x00,0x02,0x01,0x03,0x30,0x09,0xff,0x00,0x00,0x00, 0xff,0x00,0x00,0x00,EOT}}, - {0x8, + {0x8, NULL, {0x30,0xf5,0xf6,0xf7,EOT}, {0x00,0x00,0x00,0x00,EOT}}, - {0x9, + {0x9, NULL, {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xf0,0xf1,0xf2, 0xf3,0xf4,0xf5,0xf6,0xf7,EOT}, {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0xff,0x00,0x00, 0x00,0xff,0x00,0x00,0x00,EOT}}, - {0xa, + {0xa, NULL, {0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7, 0xe8,0xf2,0xf3,0xf4,0xf6,0xf7,EOT}, {0x00,0x00,0x01,0x00,0xff,0x08,0x00,RSVD,0x00,0x00, RSVD,0x7c,0x00,0x00,0x00,0x00,EOT}}, - {0xb, + {0xb, NULL, {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT}, {0x00,0x00,0x00,0x00,0xc1,0x00,EOT}}, {EOT}}}, [View Less]

1 0

[LinuxBIOS] ADLO flakiness
by Myles Watson 20 Sep '07

20 Sep '07

I'd appreciate your help with this: I haven't programmed with bcc or as86 before, and I'm having trouble using the Bochs BIOS print routines. I don't know what I've done, but adding printfs regularly breaks the code. Adding another (or two) will sometimes fix it again. Does anyone have an idea of what to look for? I have the FILO driver working as far as identifying my drives and populating the BIOS structures. There is only a little bit left to do, and if it didn't hang so often it would … [View More]

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot September 2007