diff options
| author | Dariusz Swiderski <dms@cvs.openbsd.org> | 2015-06-04 18:33:42 +0000 |
|---|---|---|
| committer | Dariusz Swiderski <dms@cvs.openbsd.org> | 2015-06-04 18:33:42 +0000 |
| commit | 922c7461f69f15eeca5b4a0a69b366cb3b993af0 (patch) | |
| tree | d5938f89b3ccdbdc45b27c6a3475db9b09550536 /sys/dev/pci/if_em.c | |
| parent | 8e9fa9b73fd950ca43c9118cb5b0d0be01e26018 (diff) | |
Add support for em(4) on Teak 3020, a Tolopai (EP80579)
based devices. This introduces Realtek PHY into em driver
code and is only a temporary solution to the problem.
OK deraadt@
Diffstat (limited to 'sys/dev/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 908e74ff506..efc3f7f3ad5 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.297 2015/05/12 20:20:18 kettenis Exp $ */ +/* $OpenBSD: if_em.c,v 1.298 2015/06/04 18:33:41 dms Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -187,7 +187,10 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH10_R_BM_V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_LAN_1 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_LAN_2 }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_LAN_3 } + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_LAN_3 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_LAN_4 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_LAN_5 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EP80579_LAN_6 } }; /********************************************************************* @@ -298,6 +301,8 @@ em_defer_attach(struct device *self) pci_chipset_tag_t pc = pa->pa_pc; void *gcu; + INIT_DEBUGOUT("em_defer_attach: begin"); + if ((gcu = em_lookup_gcu(self)) == 0) { printf("%s: No GCU found, defered attachment failed\n", sc->sc_dv.dv_xname); @@ -321,9 +326,9 @@ em_defer_attach(struct device *self) em_setup_interface(sc); - em_update_link_status(sc); - em_setup_link(&sc->hw); + + em_update_link_status(sc); } /********************************************************************* |