From ga9@buffy.york.ac.uk  Tue Mar 22 17:54:35 2005
Return-Path: <ga9@buffy.york.ac.uk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9940416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Mar 2005 17:54:35 +0000 (GMT)
Received: from mail-gw0.york.ac.uk (mail-gw0.york.ac.uk [144.32.128.245])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7970A43D31
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Mar 2005 17:54:34 +0000 (GMT)
	(envelope-from ga9@buffy.york.ac.uk)
Received: from buffy.york.ac.uk (buffy-128.york.ac.uk [144.32.128.165])
	by mail-gw0.york.ac.uk (8.12.10/8.12.10) with ESMTP id j2MHsTW5023442
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Mar 2005 17:54:29 GMT
Received: from buffy.york.ac.uk (localhost [127.0.0.1])
	by buffy.york.ac.uk (8.13.3/8.13.1) with ESMTP id j2MHsSVA080018
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Mar 2005 17:54:28 GMT
	(envelope-from ga9@buffy.york.ac.uk)
Received: (from ga9@localhost)
	by buffy.york.ac.uk (8.13.3/8.13.1/Submit) id j2MHsSVI079911;
	Tue, 22 Mar 2005 17:54:28 GMT
	(envelope-from ga9)
Message-Id: <200503221754.j2MHsSVI079911@buffy.york.ac.uk>
Date: Tue, 22 Mar 2005 17:54:28 GMT
From: Gavin Atkinson <gavin.atkinson@ury.york.ac.uk>
Reply-To: Gavin Atkinson <gavin.atkinson@ury.york.ac.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Support for more PCIe chipsets
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         79139
>Category:       kern
>Synopsis:       [pci] [patch] Support for more PCIe chipsets
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rodrigc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 22 18:00:06 GMT 2005
>Closed-Date:    Sun Nov 08 15:41:17 UTC 2009
>Last-Modified:  Sun Nov 08 15:41:17 UTC 2009
>Originator:     Gavin Atkinson
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD buffy.york.ac.uk 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #11: Sat Mar 12 10:56:24 GMT 2005 root@buffy.york.ac.uk:/usr/obj/usr/src/sys/BUFFY i386

>Description:

	Add support for the Intel 7320 and 915 PCIe chipsets. Also
restructure code slightly to make more chipsets easier to add in the
future.

>How-To-Repeat:
	N/A
>Fix:

--- pcie.diff begins here ---
Index: src/sys/i386/pci/pci_cfgreg.c
===================================================================
RCS file: /usr/cvs/src/sys/i386/pci/pci_cfgreg.c,v
retrieving revision 1.116
diff -u -r1.116 pci_cfgreg.c
--- src/sys/i386/pci/pci_cfgreg.c	6 Jan 2005 22:18:17 -0000	1.116
+++ src/sys/i386/pci/pci_cfgreg.c	22 Mar 2005 17:50:15 -0000
@@ -153,15 +153,19 @@
 	 * This also implies that it can do PCIe extended config cycles.
 	 */
 
-	/* Check for the Intel 7520 and 925 chipsets */
+	/* Check for supported chipsets */
 	vid = pci_cfgregread(0, 0, 0, 0x0, 2);
 	did = pci_cfgregread(0, 0, 0, 0x2, 2);
-	if ((vid == 0x8086) && (did == 0x3590)) {
-		pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16;
-		pciereg_cfgopen();
-	} else if ((vid == 0x8086) && (did == 0x2580)) {
-		pciebar = pci_cfgregread(0, 0, 0, 0x48, 4);
-		pciereg_cfgopen();
+	if (vid == 0x8086) {
+		if (did == 0x3590 || did == 0x3592) {
+			/* Intel 7520 or 7320 */
+			pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16;
+			pciereg_cfgopen();
+		} else if (did == 0x2580 || did == 0x2584) {
+			/* Intel 915 or 925 */
+			pciebar = pci_cfgregread(0, 0, 0, 0x48, 4);
+			pciereg_cfgopen();
+		}
 	}
 
 	return(1);
--- pcie.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->rodrigc 
Responsible-Changed-By: rodrigc 
Responsible-Changed-When: Thu Dec 8 18:49:01 GMT 2005 
Responsible-Changed-Why:  
Can you provide an ACPI dump of the systems you have access 
to with 7320 and 915 PCIe chipsets?  This information is *supposed* to 
be in ACPI, so that we don't need to add ID's to pci_cfgreg.c 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79139 
State-Changed-From-To: open->patched 
State-Changed-By: rodrigc 
State-Changed-When: Thu Dec 8 18:55:28 GMT 2005 
State-Changed-Why:  
Committed to CURRENT. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79139 
State-Changed-From-To: patched->closed 
State-Changed-By: gavin 
State-Changed-When: Sun Nov 8 15:40:11 UTC 2009 
State-Changed-Why:  
This is in 7.x and later, and I can't see it being merged to 6.x. 
Close it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=79139 
>Unformatted:
