From sa2c@sa2c.net  Fri Aug  9 01:05:36 2002
Return-Path: <sa2c@sa2c.net>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9ABA237B400
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Aug 2002 01:05:36 -0700 (PDT)
Received: from berkeley.sa2c.net (berkeley.sa2c.net [61.194.193.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0A3C843E5E
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Aug 2002 01:05:36 -0700 (PDT)
	(envelope-from sa2c@sa2c.net)
Received: by berkeley.sa2c.net (Postfix, from userid 3104)
	id 796D2259; Fri,  9 Aug 2002 17:05:34 +0900 (JST)
Message-Id: <20020809080534.796D2259@berkeley.sa2c.net>
Date: Fri,  9 Aug 2002 17:05:34 +0900 (JST)
From: NIIMI Satoshi <sa2c@sa2c.net>
Reply-To: NIIMI Satoshi <sa2c@sa2c.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Add support for 82801 MCH UP only SKU to sys/pci/agp_intel.c
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         41466
>Category:       kern
>Synopsis:       Add support for 82801 MCH UP only SKU to sys/pci/agp_intel.c
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    dfr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 09 01:10:00 PDT 2002
>Closed-Date:    Sat Jan 11 12:08:46 PST 2003
>Last-Modified:  Sat Jan 11 12:08:46 PST 2003
>Originator:     NIIMI Satoshi
>Release:        FreeBSD 4.6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD berkeley.sa2c.net 4.6.1-RELEASE-p10 FreeBSD 4.6.1-RELEASE-p10 #4: Tue Aug 6 04:14:18 JST 2002 sa2c@berkeley.sa2c.net:/usr/obj/usr/src/sys/SA2C_NET i386


	
>Description:
According to "Specification Update for Intel 82820 MCH Datasheet"
(http://developer.intel.com/design/chipsets/specupdt/290696.htm),
Intel added some Device IDs for 82820 MCH.
	
>How-To-Repeat:
	
>Fix:
Although I tested this patch only on my RELENG_4_6 box (Intel VC820
with MCH those ID is 25018086), I think the same fix should work with
-stable and -current.

For RELENG_4_6 and RELENG_4
Index: agp_intel.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/agp_intel.c,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 agp_intel.c
--- agp_intel.c	13 Feb 2002 01:23:22 -0000	1.1.2.3
+++ agp_intel.c	9 Aug 2002 07:05:43 -0000
@@ -76,6 +76,7 @@
  		return ("Intel 82443GX host to AGP bridge");
 
 	case 0x25008086:
+	case 0x25018086:
  		return ("Intel 82820 host to AGP bridge");
 
 	case 0x35758086:
@@ -160,6 +161,7 @@
 		break;
 
 	case 0x25008086: /* i820 */
+	case 0x25018086: /* i820 */
 		pci_write_config(dev, AGP_INTEL_AGPCTRL, 0x0000, 4);
 		pci_write_config(dev, AGP_INTEL_I820_RDCR,
 				 (pci_read_config(dev, AGP_INTEL_I820_RDCR, 1)
@@ -186,6 +188,7 @@
 		break;
 
 	case 0x25008086: /* i820 */
+	case 0x25018086: /* i820 */
 	case 0x1a308086: /* i845 */
 	case 0x25308086: /* i850 */
 	case 0x25318086: /* i860 */
@@ -222,6 +225,7 @@
 				& ~(1 << 9)), 2);
 
 	case 0x25008086: /* i820 */
+	case 0x25018086: /* i820 */
 		printf("%s: set RDCR to %x\n", __FUNCTION__, (unsigned)
 				(pci_read_config(dev, AGP_INTEL_I820_RDCR, 1)
 				& ~(1 << 1)));

For -current
Index: agp_intel.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/agp_intel.c,v
retrieving revision 1.8
diff -u -r1.8 agp_intel.c
--- agp_intel.c	17 Jul 2002 02:52:01 -0000	1.8
+++ agp_intel.c	9 Aug 2002 07:20:50 -0000
@@ -81,6 +81,7 @@
 		return ("Intel 82815 (i815 GMCH) host to PCI bridge");
 
 	case 0x25008086:
+	case 0x25018086:
 		return ("Intel 82820 host to AGP bridge");
 
 	case 0x35758086:
@@ -180,6 +181,7 @@
 		break;
 
 	case 0x25008086: /* i820 */
+	case 0x25018086: /* i820 */
 		pci_write_config(dev, AGP_INTEL_I820_RDCR,
 				 (pci_read_config(dev, AGP_INTEL_I820_RDCR, 1)
 				  | (1 << 1)), 1);
@@ -203,6 +205,7 @@
 		break;
 
 	case 0x25008086: /* i820 */
+	case 0x25018086: /* i820 */
 	case 0x1a308086: /* i845 */
 	case 0x25308086: /* i850 */
 	case 0x25318086: /* i860 */
@@ -239,6 +242,7 @@
 				& ~(1 << 9)), 2);
 
 	case 0x25008086: /* i820 */
+	case 0x25018086: /* i820 */
 		printf("%s: set RDCR to %x\n", __func__, (unsigned)
 				(pci_read_config(dev, AGP_INTEL_I820_RDCR, 1)
 				& ~(1 << 1)));
	

>Release-Note:
>Audit-Trail:

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: NIIMI Satoshi <sa2c@sa2c.net>
Subject: Re: kern/41466: Add support for 82801 MCH UP only SKU to sys/pci/agp_intel.c
Date: Fri, 9 Aug 2002 18:42:13 +0900

 On Fri,  9 Aug 2002 17:05:34 +0900 (JST)
 "NIIMI Satoshi" <sa2c@sa2c.net> wrote:
 > >Synopsis:       Add support for 82801 MCH UP only SKU to sys/pci/agp_intel.c
 
 	That's so cool!
Responsible-Changed-From-To: freebsd-bugs->dfr 
Responsible-Changed-By: njl 
Responsible-Changed-When: Fri Aug 23 17:19:51 PDT 2002 
Responsible-Changed-Why:  
Patch looks straightforward.  Over to Doug for comments.  If you're too busy 
I could look into this and commit it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41466 

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Nate Lawson <njl@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org, NIIMI Satoshi <sa2c@sa2c.net>,
	Doug Rabson <dfr@FreeBSD.org>
Subject: Re: kern/41466: Add support for 82801 MCH UP only SKU to sys/pci/agp_intel.c
Date: Sun, 17 Nov 2002 06:55:14 +0900

 Hi Nate.
 
 	Doug is too busy(about 3 months timeout).  So would you commit this?

From: Nate Lawson <nate@root.org>
To: Norikatsu Shigemura <nork@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org, NIIMI Satoshi <sa2c@sa2c.net>,
	Doug Rabson <dfr@FreeBSD.org>
Subject: Re: kern/41466: Add support for 82801 MCH UP only SKU to
 sys/pci/agp_intel.c
Date: Mon, 18 Nov 2002 22:50:15 -0800 (PST)

 On Sun, 17 Nov 2002, Norikatsu Shigemura wrote:
 > Hi Nate.
 > 
 > 	Doug is too busy(about 3 months timeout).  So would you commit this?
 
 I am tremendously busy also but will look into it when I do my weekly PR
 batch processing.
 
 -Nate
 

From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Nate Lawson <nate@root.org>
Cc: freebsd-gnats-submit@FreeBSD.org, sa2c@sa2c.net, dfr@FreeBSD.org
Subject: Re: kern/41466: Add support for 82801 MCH UP only SKU to sys/pci/agp_intel.c
Date: Tue, 19 Nov 2002 17:57:10 +0900

 On Mon, 18 Nov 2002 22:50:15 -0800 (PST)
 Nate Lawson <nate@root.org> wrote:
 > > 	Doug is too busy(about 3 months timeout).  So would you commit this?
 > I am tremendously busy also but will look into it when I do my weekly PR
 > batch processing.
 
 	Thank you.  Please.  m(_ _)m
State-Changed-From-To: open->closed 
State-Changed-By: anholt 
State-Changed-When: Sat Jan 11 12:08:34 PST 2003 
State-Changed-Why:  
Committed, thanks! 

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