diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-06-14 20:35:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-06-14 20:35:46 +0000 |
| commit | 4729e5285b543b98164d968fbc2cb3ca2c43fc46 (patch) | |
| tree | 16d5de687935836b4e123132fabf805001ea70b8 /sys/arch/i386 | |
| parent | 9771a638a8bd04e3f2f591121fe326152055d39d (diff) | |
back out SMM lockdown patch until some other solution is found.
SMM lockdown breaks apm on a few machines.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/pci/pchb.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c index a45d90922fa..0126cc12b0b 100644 --- a/sys/arch/i386/pci/pchb.c +++ b/sys/arch/i386/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.48 2005/05/29 17:29:37 grange Exp $ */ +/* $OpenBSD: pchb.c,v 1.49 2005/06/14 20:35:45 deraadt Exp $ */ /* $NetBSD: pchb.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /* @@ -77,7 +77,6 @@ #include <dev/rndvar.h> #include <dev/ic/i82802reg.h> -#include <dev/ic/i82810reg.h> #define PCISET_INTEL_BRIDGETYPE_MASK 0x3 #define PCISET_INTEL_TYPE_COMPAT 0x1 @@ -379,40 +378,6 @@ pchbattach(parent, self, aux) default: break; } - - /* Lock down SMM space on i82810 and later chipsets */ - switch (PCI_PRODUCT(pa->pa_id)) { - case PCI_PRODUCT_INTEL_82810_MCH: - case PCI_PRODUCT_INTEL_82810_DC100_MCH: - case PCI_PRODUCT_INTEL_82810E_MCH: - case PCI_PRODUCT_INTEL_82815_DC100_HUB: - case PCI_PRODUCT_INTEL_82815_NOGRAPH_HUB: - case PCI_PRODUCT_INTEL_82815_FULL_HUB: - case PCI_PRODUCT_INTEL_82815_NOAGP_HUB: - bcreg = pci_conf_read(pa->pa_pc, pa->pa_tag, - I82810_SMRAM); - bcreg |= I82810_SMRAM_D_LCK; - pci_conf_write(pa->pa_pc, pa->pa_tag, - I82810_SMRAM, bcreg); - break; - case PCI_PRODUCT_INTEL_82820_MCH: - case PCI_PRODUCT_INTEL_82840_HB: - case PCI_PRODUCT_INTEL_82845_HB: - case PCI_PRODUCT_INTEL_82845G: - case PCI_PRODUCT_INTEL_82850_HB: - case PCI_PRODUCT_INTEL_82855PE: - case PCI_PRODUCT_INTEL_82860_HB: - case PCI_PRODUCT_INTEL_82875P_HB: - case PCI_PRODUCT_INTEL_E7221_HB: - case PCI_PRODUCT_INTEL_E7501_HB: - case PCI_PRODUCT_INTEL_E7710_SMCH: - bcreg = pci_conf_read(pa->pa_pc, pa->pa_tag, - I82820_SMRAM); - bcreg |= (I82820_SMRAM_D_LCK << I82820_SMRAM_SHIFT); - pci_conf_write(pa->pa_pc, pa->pa_tag, - I82820_SMRAM, bcreg); - break; - } } if (neednl) printf("\n"); |