diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2019-10-17 09:13:48 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2019-10-17 09:13:48 +0000 |
| commit | 41caec81cf7a39ec41ce2c3371730dd696f564d2 (patch) | |
| tree | 1fb8b59c312c256426535654578cc7e25be076a5 /sys/dev | |
| parent | 71af1e43b9aea986c1ac03342c0aab9d3938550f (diff) | |
Add support for Killer E2400 and E2500.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_alc.c | 22 | ||||
| -rw-r--r-- | sys/dev/pci/if_alcreg.h | 5 |
2 files changed, 22 insertions, 5 deletions
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index 2173263a503..7fba1de1b5c 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_alc.c,v 1.41 2019/10/17 09:12:12 msaitoh Exp $ */ +/* $NetBSD: if_alc.c,v 1.42 2019/10/17 09:13:48 msaitoh Exp $ */ /* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org> @@ -101,6 +101,10 @@ static struct alc_ident alc_ident_table[] = { "Atheros AR8172 PCIe Fast Ethernet" }, { PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_E2200, 9 * 1024, "Killer E2200 Gigabit Ethernet" }, + { PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_E2400, 9 * 1024, + "Killer E2400 Gigabit Ethernet" }, + { PCI_VENDOR_ATTANSIC, PCI_PRODUCT_ATTANSIC_E2500, 9 * 1024, + "Killer E2500 Gigabit Ethernet" }, { 0, 0, 0, NULL }, }; @@ -1002,6 +1006,8 @@ alc_phy_down(struct alc_softc *sc) switch (sc->alc_ident->deviceid) { case PCI_PRODUCT_ATTANSIC_AR8161: case PCI_PRODUCT_ATTANSIC_E2200: + case PCI_PRODUCT_ATTANSIC_E2400: + case PCI_PRODUCT_ATTANSIC_E2500: case PCI_PRODUCT_ATTANSIC_AR8162: case PCI_PRODUCT_ATTANSIC_AR8171: case PCI_PRODUCT_ATTANSIC_AR8172: @@ -1342,7 +1348,13 @@ alc_attach(device_t parent, device_t self, void *aux) sc->alc_dma_rd_burst = 3; if (alc_dma_burst[sc->alc_dma_wr_burst] > 1024) sc->alc_dma_wr_burst = 3; - + /* + * Force maximum payload size to 128 bytes for + * E2200/E2400/E2500. + * Otherwise it triggers DMA write error. + */ + if ((sc->alc_flags & ALC_FLAG_E2X00) != 0) + sc->alc_dma_wr_burst = 0; alc_init_pcie(sc); } @@ -1361,13 +1373,17 @@ alc_attach(device_t parent, device_t self, void *aux) * shows the same PHY model/revision number of AR8131. */ switch (sc->alc_ident->deviceid) { + case PCI_PRODUCT_ATTANSIC_E2200: + case PCI_PRODUCT_ATTANSIC_E2400: + case PCI_PRODUCT_ATTANSIC_E2500: + sc->alc_flags |= ALC_FLAG_E2X00; + /* FALLTHROUGH */ case PCI_PRODUCT_ATTANSIC_AR8161: if (PCI_SUBSYS_ID(pci_conf_read( sc->sc_pct, sc->sc_pcitag, PCI_SUBSYS_ID_REG)) == 0x0091 && sc->alc_rev == 0) sc->alc_flags |= ALC_FLAG_LINK_WAR; /* FALLTHROUGH */ - case PCI_PRODUCT_ATTANSIC_E2200: case PCI_PRODUCT_ATTANSIC_AR8171: sc->alc_flags |= ALC_FLAG_AR816X_FAMILY; break; diff --git a/sys/dev/pci/if_alcreg.h b/sys/dev/pci/if_alcreg.h index dae77244026..7b13127bc80 100644 --- a/sys/dev/pci/if_alcreg.h +++ b/sys/dev/pci/if_alcreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_alcreg.h,v 1.7 2019/09/03 14:29:26 msaitoh Exp $ */ +/* $NetBSD: if_alcreg.h,v 1.8 2019/10/17 09:13:48 msaitoh Exp $ */ /* $OpenBSD: if_alcreg.h,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org> @@ -1475,7 +1475,8 @@ struct alc_softc { #define ALC_FLAG_APS 0x1000 #define ALC_FLAG_AR816X_FAMILY 0x2000 #define ALC_FLAG_LINK_WAR 0x4000 -#define ALC_FLAG_LINK 0x8000 +#define ALC_FLAG_E2X00 0x8000 +#define ALC_FLAG_LINK 0x10000 callout_t sc_tick_ch; struct alc_hw_stats alc_stats; |
