diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-04-22 10:09:58 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-04-22 10:09:58 +0000 |
| commit | 8d25bab8671b0806e6ded1c09bd5cba62a9fcbab (patch) | |
| tree | 02165381afbe61abc91f8e1a011555e222033ca5 /sys/dev/pci/if_em.c | |
| parent | 1366352376f1311ca2317b2b23aaae682ff2f500 (diff) | |
Add support for PCH2 (Sandy Bridge) MAC with 82579 PHY.
From Laurence Tratt.
ok claudio@ deraadt@
Diffstat (limited to 'sys/dev/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 7d1a39b6065..43804c17872 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.255 2011/04/14 21:14:28 jsg Exp $ */ +/* $OpenBSD: if_em.c,v 1.256 2011/04/22 10:09:57 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -128,6 +128,8 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82577LM }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82578DC }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82578DM }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82579LM }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82579V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES }, @@ -756,6 +758,9 @@ em_init(void *arg) case em_pchlan: pba = E1000_PBA_10K; break; + case em_pch2lan: + pba = E1000_PBA_26K; + break; default: /* Devices before 82547 had a Packet Buffer of 64K. */ if (sc->hw.max_frame_size > EM_RXBUFFER_8192) @@ -1594,7 +1599,8 @@ em_allocate_pci_resources(struct em_softc *sc) if (sc->hw.mac_type == em_ich8lan || sc->hw.mac_type == em_ich9lan || sc->hw.mac_type == em_ich10lan || - sc->hw.mac_type == em_pchlan) { + sc->hw.mac_type == em_pchlan || + sc->hw.mac_type == em_pch2lan) { val = pci_conf_read(pa->pa_pc, pa->pa_tag, EM_FLASH); if (PCI_MAPREG_TYPE(val) != PCI_MAPREG_TYPE_MEM) { printf(": flash is not mem space\n"); |