Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Nov 2014 11:49:36 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r274040 - in head/sys: conf dev/agp
Message-ID:  <201411031149.sA3BnaNe053503@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Mon Nov  3 11:49:35 2014
New Revision: 274040
URL: https://svnweb.freebsd.org/changeset/base/274040

Log:
  agp_intel.c provides support for AGP on Intel chipsets from 440/BX to
  875.  This intersects with the agp_i810.c, which supports all Intels
  from i810 to Core i5/7.  Both agp_intel.c and agp_i810.c are compiled
  into kernel when device agp is specified in config, and agp_i810
  attach seems to be selected by chance due to linking order.
  
  Strip support for 810 and later from agp_intel.c.  Since 440-class
  chipsets do not support any long-mode capable CPUs, remove agp_intel.c
  from amd64 kernel file list.  Note that agp_intel.c is not compiled
  into agp.ko on amd64 already.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/sys/conf/files.amd64
  head/sys/dev/agp/agp_intel.c

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Mon Nov  3 11:43:39 2014	(r274039)
+++ head/sys/conf/files.amd64	Mon Nov  3 11:49:35 2014	(r274040)
@@ -143,7 +143,6 @@ dev/acpica/acpi_if.m		standard
 dev/acpi_support/acpi_wmi_if.m	standard
 dev/agp/agp_amd64.c		optional	agp
 dev/agp/agp_i810.c		optional	agp
-dev/agp/agp_intel.c		optional	agp
 dev/agp/agp_via.c		optional	agp
 dev/amdsbwd/amdsbwd.c		optional	amdsbwd
 dev/amdtemp/amdtemp.c		optional	amdtemp

Modified: head/sys/dev/agp/agp_intel.c
==============================================================================
--- head/sys/dev/agp/agp_intel.c	Mon Nov  3 11:43:39 2014	(r274039)
+++ head/sys/dev/agp/agp_intel.c	Mon Nov  3 11:49:35 2014	(r274040)
@@ -76,35 +76,6 @@ agp_intel_match(device_t dev)
  		return ("Intel 82443GX host to PCI bridge");
  	case 0x71a18086:
  		return ("Intel 82443GX host to AGP bridge");
-	case 0x11308086:
-		return ("Intel 82815 (i815 GMCH) host to PCI bridge");
-	case 0x25008086:
-	case 0x25018086:
-		return ("Intel 82820 host to AGP bridge");
-	case 0x35758086:
-		return ("Intel 82830 host to AGP bridge");
-	case 0x1a218086:
-		return ("Intel 82840 host to AGP bridge");
-	case 0x1a308086:
-		return ("Intel 82845 host to AGP bridge");
-	case 0x25308086:
-		return ("Intel 82850 host to AGP bridge");
-	case 0x33408086:
-		return ("Intel 82855 host to AGP bridge");
-	case 0x25318086:
-		return ("Intel 82860 host to AGP bridge");
-	case 0x25708086:
-		return ("Intel 82865 host to AGP bridge");
-	case 0x255d8086:
-		return ("Intel E7205 host to AGP bridge");
-	case 0x25508086:
-		return ("Intel E7505 host to AGP bridge");
-	case 0x25788086:
-		return ("Intel 82875P host to AGP bridge");
-	case 0x25608086:
-		return ("Intel 82845G host to AGP bridge");
-	case 0x35808086:
-		return ("Intel 82855GM host to AGP bridge");
 	}
 
 	return (NULL);
@@ -158,31 +129,6 @@ agp_intel_commit_gatt(device_t dev)
 
 	/* Enable aperture accesses. */
 	switch (type) {
-	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);
-		break;
-	case 0x1a308086: /* i845 */
-	case 0x25608086: /* i845G */
-	case 0x33408086: /* i855 */
-	case 0x35808086: /* i855GM */
-	case 0x25708086: /* i865 */
-	case 0x25788086: /* i875P */
-		pci_write_config(dev, AGP_INTEL_I845_AGPM,
-				 (pci_read_config(dev, AGP_INTEL_I845_AGPM, 1)
-				  | (1 << 1)), 1);
-		break;
-	case 0x1a218086: /* i840 */
-	case 0x25308086: /* i850 */
-	case 0x25318086: /* i860 */
-	case 0x255d8086: /* E7205 */
-	case 0x25508086: /* E7505 */
-		pci_write_config(dev, AGP_INTEL_MCHCFG,
-				 (pci_read_config(dev, AGP_INTEL_MCHCFG, 2)
-				  | (1 << 9)), 2);
-		break;
 	default: /* Intel Generic (maybe) */
 		pci_write_config(dev, AGP_INTEL_NBXCFG,
 				 (pci_read_config(dev, AGP_INTEL_NBXCFG, 4)
@@ -191,22 +137,6 @@ agp_intel_commit_gatt(device_t dev)
 
 	/* Clear errors. */
 	switch (type) {
-	case 0x1a218086: /* i840 */
-		pci_write_config(dev, AGP_INTEL_I8XX_ERRSTS, 0xc000, 2);
-		break;
-	case 0x25008086: /* i820 */
-	case 0x25018086: /* i820 */
-	case 0x1a308086: /* i845 */
-	case 0x25608086: /* i845G */
-	case 0x25308086: /* i850 */
-	case 0x33408086: /* i855 */
-	case 0x25318086: /* i860 */
-	case 0x25708086: /* i865 */
-	case 0x25788086: /* i875P */
-	case 0x255d8086: /* E7205 */
-	case 0x25508086: /* E7505 */
-		pci_write_config(dev, AGP_INTEL_I8XX_ERRSTS, 0x00ff, 2);
-		break;
 	default: /* Intel Generic (maybe) */
 		pci_write_config(dev, AGP_INTEL_ERRSTS + 1, 7, 1);
 	}
@@ -267,31 +197,6 @@ agp_intel_detach(device_t dev)
 
 	/* Disable aperture accesses. */
 	switch (pci_get_devid(dev)) {
-	case 0x25008086: /* i820 */
-	case 0x25018086: /* i820 */
-		reg = pci_read_config(dev, AGP_INTEL_I820_RDCR, 1) & ~(1 << 1);
-		printf("%s: set RDCR to %02x\n", __func__, reg & 0xff);
-		pci_write_config(dev, AGP_INTEL_I820_RDCR, reg, 1);
-		break;
-	case 0x1a308086: /* i845 */
-	case 0x25608086: /* i845G */
-	case 0x33408086: /* i855 */
-	case 0x35808086: /* i855GM */
-	case 0x25708086: /* i865 */
-	case 0x25788086: /* i875P */
-		reg = pci_read_config(dev, AGP_INTEL_I845_AGPM, 1) & ~(1 << 1);
-		printf("%s: set AGPM to %02x\n", __func__, reg & 0xff);
-		pci_write_config(dev, AGP_INTEL_I845_AGPM, reg, 1);
-		break;
-	case 0x1a218086: /* i840 */
-	case 0x25308086: /* i850 */
-	case 0x25318086: /* i860 */
-	case 0x255d8086: /* E7205 */
-	case 0x25508086: /* E7505 */
-		reg = pci_read_config(dev, AGP_INTEL_MCHCFG, 2) & ~(1 << 9);
-		printf("%s: set MCHCFG to %x04\n", __func__, reg & 0xffff);
-		pci_write_config(dev, AGP_INTEL_MCHCFG, reg, 2);
-		break;
 	default: /* Intel Generic (maybe) */
 		reg = pci_read_config(dev, AGP_INTEL_NBXCFG, 4) & ~(1 << 9);
 		printf("%s: set NBXCFG to %08x\n", __func__, reg);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411031149.sA3BnaNe053503>