Author: mkarcher Date: Tue Jun 1 18:09:06 2010 New Revision: 1025 URL: http://flashrom.org/trac/coreboot/changeset/1025
Log: Add hp xw9400 board enable. Also modifies nvidia_mcp_gpio_set to cope with multiple MCP55 chips on the same board, like on the Tyan S2915-E. Signed-off-by: Michael Karcher <[email protected]> Acked-by: Adis Salcin <[email protected]> Acked-by: Carl-Daniel Hailfinger <[email protected]> Modified: trunk/board_enable.c trunk/print.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Tue Jun 1 12:13:17 2010 (r1024) +++ trunk/board_enable.c Tue Jun 1 18:09:06 2010 (r1025) @@ -551,6 +551,7 @@ { struct pci_dev *dev; uint16_t base; + uint16_t devclass; uint8_t tmp; if ((gpio < 0) || (gpio >= 0x40)) { @@ -565,17 +566,33 @@ case 0x0050: /* MCP04 */ case 0x0060: /* MCP2 */ break; - default: - /* Newer MCPs use the SMBus Controller */ - dev = pci_dev_find_vendorclass(0x10DE, 0x0C05); - switch (dev->device_id) { - case 0x0264: /* MCP51 */ + case 0x0260: /* MCP51 */ + case 0x0364: /* MCP55 */ + /* find SMBus controller on *this* southbridge */ + /* The infamous Tyan S2915-E has two south bridges; they are + easily told apart from each other by the class of the + LPC bridge, but have the same SMBus bridge IDs */ + if (dev->func != 0) { + msg_perr("MCP LPC bridge at unexpected function" + " number %d\n", dev->func); + return -1; + } + + dev = pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, 1); + if (!dev) { + msg_perr("MCP SMBus controller could not be found\n"); + return -1; + } + devclass = pci_read_word(dev, PCI_CLASS_DEVICE); + if (devclass != 0x0C05) { + msg_perr("Unexpected device class %04x for SMBus" + " controller\n", devclass); + return -1; + } break; - default: + default: msg_perr("\nERROR: no NVIDIA LPC/SMBus controller found.\n"); return -1; - } - break; } base = pci_read_long(dev, 0x64) & 0x0000FF00; /* System control area */ @@ -617,6 +634,22 @@ return nvidia_mcp_gpio_set(0x02, 1); } + +/** + * Suited for HP xw9400 (Tyan S2915-E OEM): Dual(!) nVidia MCP55. + * Notes: a) There are two MCP55 chips, so also two SMBus bridges on that + * board. We can't tell the SMBus logical devices apart, but we + * can tell the LPC bridge functions apart. + * We need to choose the SMBus bridge next to the LPC bridge with + * ID 0x364 and the "LPC bridge" class. + * b) #TBL is hardwired on that board to a pull-down. It can be + * overridden by connecting the two solder points next to F2. + */ +static int nvidia_mcp_gpio5_raise(const char *name) +{ + return nvidia_mcp_gpio_set(0x05, 1); +} + /** * Suited for Abit NF7-S: NVIDIA CK804. */ @@ -1436,6 +1469,7 @@ {0x1166, 0x0223, 0x103c, 0x320d, 0x102b, 0x0522, 0x103c, 0x31fa, NULL, "hp", "dl145_g3", "HP", "DL145 G3", 0, OK, board_hp_dl145_g3_enable}, {0x8086, 0x2415, 0x103c, 0x1249, 0x10b7, 0x9200, 0x103c, 0x1246, NULL, NULL, NULL, "HP", "Vectra VL400", 0, OK, board_hp_vl400}, {0x8086, 0x1a30, 0x103c, 0x1a30, 0x8086, 0x2443, 0x103c, 0x2440, "^VL420$", NULL, NULL, "HP", "VL420 SFF", 0, OK, intel_ich_gpio22_raise}, + {0x10de, 0x0369, 0x103c, 0x12fe, 0x10de, 0x0364, 0x103c, 0x12fe, NULL, NULL, NULL, "HP", "xw9400", 0, OK, nvidia_mcp_gpio5_raise}, {0x8086, 0x27A0, 0, 0, 0x8086, 0x27B9, 0, 0, NULL, "ibase", "mb899", "iBASE", "MB899", 0, NT, intel_ich_gpio26_raise}, {0x1166, 0x0205, 0x1014, 0x0347, 0x1002, 0x515E, 0x1014, 0x0325, NULL, NULL, NULL, "IBM", "x3455", 0, OK, board_ibm_x3455}, {0x1039, 0x5513, 0x8086, 0xd61f, 0x1039, 0x6330, 0x8086, 0xd61f, NULL, NULL, NULL, "Intel", "D201GLY", 0, OK, wbsio_check_for_spi}, Modified: trunk/print.c ============================================================================== --- trunk/print.c Tue Jun 1 12:13:17 2010 (r1024) +++ trunk/print.c Tue Jun 1 18:09:06 2010 (r1025) @@ -353,6 +353,7 @@ B("HP", "DL145 G3", 1, "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c00816835&lang=en&cc=us&taskId=101&prodSeriesId=3219755&prodTypeId=15351";, NULL), B("HP", "Vectra VL400 PC", 1, "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c00060658&lang=en&cc=us";, NULL), B("HP", "Vectra VL420 SFF PC", 1, "http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c00060661&lang=en&cc=us";, NULL), + B("HP", "xw9400", 1, "http://h20000.www2.hp.com/bizsupport/TechSupport/Home.jsp?lang=en&cc=us&prodSeriesId=3211286&prodTypeId=12454";, "Boot block is write protected unless the solder points next to F2 are shorted." ), B("IBM", "x3455", 1, "http://www-03.ibm.com/systems/x/hardware/rack/x3455/index.html";, NULL), B("Intel", "D201GLY", 1, "http://www.intel.com/support/motherboards/desktop/d201gly/index.htm";, NULL), B("Intel", "EP80759", 1, NULL, NULL), _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
