From owner-freebsd-stable Sun May 24 02:56:31 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA23247 for freebsd-stable-outgoing; Sun, 24 May 1998 02:56:31 -0700 (PDT) (envelope-from owner-freebsd-stable@FreeBSD.ORG) Received: from baloon.mimi.com (sjx-ca126-41.ix.netcom.com [207.92.177.233]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA23232 for ; Sun, 24 May 1998 02:56:25 -0700 (PDT) (envelope-from asami@vader.cs.berkeley.edu) Received: (from asami@localhost) by baloon.mimi.com (8.8.8/8.8.8) id CAA01969; Sun, 24 May 1998 02:56:25 -0700 (PDT) (envelope-from asami) Date: Sun, 24 May 1998 02:56:25 -0700 (PDT) Message-Id: <199805240956.CAA01969@baloon.mimi.com> To: stable@FreeBSD.ORG Subject: chipset identification code merge from -current From: asami@cs.berkeley.edu (Satoshi Asami) Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk I've made a diff to bring -stable's PCI chipset identification code almost up to par to -current's. Can people test it? I get this on my FIC PA-2007: === May 23 13:54:10 baloon /kernel: Probing for devices on PCI bus 0: May 23 13:54:10 baloon /kernel: chip0 rev 6 on pci0:0:0 May 23 13:54:10 baloon /kernel: chip1 rev 39 on pci0:7:0 May 23 13:54:10 baloon /kernel: pci0:7:1: VIA Technologies, device=0x0571, class=storage (ide) [no driver assigned] === I guess the IDE controller is not there yet. While I was there, I fixed the few lines that had inconsistent capitalization. Now only proper nouns and acronyms are capitalized. I intend to commit that part to -current too. Satoshi ------- Index: pcisupport.c =================================================================== RCS file: /usr/cvs/src/sys/pci/pcisupport.c,v retrieving revision 1.40.2.7 diff -u -r1.40.2.7 pcisupport.c --- pcisupport.c 1998/03/26 22:28:42 1.40.2.7 +++ pcisupport.c 1998/05/24 09:49:49 @@ -114,13 +114,16 @@ char *descr; switch (type) { + case 0x00088086: + /* Silently ignore this one! What is it, anyway ??? */ + return (""); case 0x04868086: return ("Intel 82425EX PCI system controller"); case 0x04848086: rev = (unsigned) pci_conf_read (tag, PCI_CLASS_REG) & 0xff; if (rev == 3) - return ("Intel 82378ZB PCI-ISA bridge"); - return ("Intel 82378IB PCI-ISA bridge"); + return ("Intel 82378ZB PCI to ISA bridge"); + return ("Intel 82378IB PCI to ISA bridge"); case 0x04838086: return ("Intel 82424ZX (Saturn) cache DRAM controller"); case 0x04828086: @@ -132,12 +135,12 @@ if (rev == 16 || rev == 17) return ("Intel 82434NX (Neptune) PCI cache memory controller"); return ("Intel 82434LX (Mercury) PCI cache memory controller"); + case 0x12258086: + return ("Intel 824?? host to PCI bridge"); case 0x122d8086: return ("Intel 82437FX PCI cache memory controller"); case 0x122e8086: - return ("Intel 82371FB PCI-ISA bridge"); - case 0x12308086: - return ("Intel 82371FB IDE interface"); + return ("Intel 82371FB PCI to ISA bridge"); case 0x12348086: return ("Intel 82371MX mobile PCI I/O IDE accelerator (MPIIX)"); case 0x12358086: @@ -151,33 +154,84 @@ case 0x06011039: return ("SiS 85c601"); case 0x70008086: - return ("Intel 82371SB PCI-ISA bridge"); - case 0x70108086: - return ("Intel 82371SB IDE interface"); + return ("Intel 82371SB PCI to ISA bridge"); + case 0x70208086: + return ("Intel 82371SB USB host controller"); case 0x70308086: return ("Intel 82437VX PCI cache memory controller"); case 0x71008086: - return ("Intel 82439TX PCI cache memory controller"); + return ("Intel 82439TX system controller (MTXC)"); case 0x71108086: - return ("Intel 82371AB PCI-ISA bridge"); - case 0x71118086: - return ("Intel 82371AB IDE interface"); + return ("Intel 82371AB PCI to ISA bridge"); case 0x71128086: - return ("Intel 82371AB USB interface"); + return ("Intel 82371AB USB host controller"); case 0x71138086: - return ("Intel 82371AB Power management controller"); + return ("Intel 82371AB power management controller"); + case 0x71908086: + return ("Intel 82443BX host to PCI bridge"); + case 0x71918086: + return ("Intel 82443BX host to AGP bridge"); + case 0x71928086: + return ("Intel 82443BX host to PCI bridge (AGP disabled)"); case 0x12378086: return ("Intel 82440FX (Natoma) PCI and memory controller"); case 0x84c48086: - return ("Intel 82450KX (Orion) PCI memory controller"); + return ("Intel 82454KX/GX (Orion) host to PCI bridge"); case 0x84c58086: - return ("Intel 82454GX (Orion) host to PCI bridge"); - case 0x00051166: - return ("Ross (?) host to PCI bridge"); + return ("Intel 82453KX/GX (Orion) PCI memory controller"); case 0x00221014: return ("IBM 82351 PCI-PCI bridge"); case 0x00011011: return ("DEC 21050 PCI-PCI bridge"); + case 0x124b8086: + return ("Intel 82380FB mobile PCI to PCI bridge"); + /* VLSI -- vendor 0x1004 */ + case 0x00051004: + return ("VLSI 82C592 host to PCI bridge"); + case 0x00061004: + return ("VLSI 82C593 PCI to ISA bridge"); + case 0x01011004: + return ("VLSI 82C532 Eagle II peripheral controller"); + case 0x01021004: + return ("VLSI 82C534 Eagle II PCI bus bridge"); + case 0x01031004: + return ("VLSI 82C538 Eagle II PCI docking bridge"); + case 0x01041004: + return ("VLSI 82C535 Eagle II system controller"); + case 0x01051004: + return ("VLSI 82C147 IrDA Controller"); + + /* VIA Technologies -- vendor 0x1106 + * Note that the old Apollo Master chipset is not in here, as VIA + * does not seem to have any docs on their website for it, and I do + * not have a Master board in my posession. -LC */ + + case 0x05851106: + return("VIA 82C585 (Apollo VP1/VPX) system controller"); + case 0x05861106: /* south bridge section -- IDE is covered in ide_pci.c */ + return("VIA 82C586 PCI-ISA bridge"); + case 0x05951106: + case 0x15951106: + return("VIA 82C595 (Apollo VP2) system controller"); + case 0x05971106: + return("VIA 82C597 (Apollo VP3) system controller"); + /* XXX need info on the MVP3 -- any takers? */ + case 0x30381106: + return("VIA 82C586B USB host controller"); + case 0x30401106: + return("VIA 82C586B ACPI interface"); + + /* NEC -- vendor 0x1033 */ + case 0x00011033: + return ("NEC 0001 PCI to PC-98 C-bus bridge"); + case 0x00021033: + return ("NEC 0002 PCI to PC-98 local bus bridge"); + case 0x00161033: + return ("NEC 0016 PCI to PC-98 local bus bridge"); + case 0x002c1033: + return ("NEC 002C PCI to PC-98 C-bus bridge"); + case 0x003b1033: + return ("NEC 003B PCI to PC-98 C-bus bridge"); }; if (descr = generic_pci_bridge(tag)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message