diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cesa/cesa.c | 20 | ||||
| -rw-r--r-- | sys/dev/mge/if_mge.c | 35 | ||||
| -rw-r--r-- | sys/dev/mvs/mvs_soc.c | 5 |
3 files changed, 9 insertions, 51 deletions
diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c index 2dcdb0258844..405b619d6e5b 100644 --- a/sys/dev/cesa/cesa.c +++ b/sys/dev/cesa/cesa.c @@ -1183,31 +1183,11 @@ cesa_attach_late(device_t dev) soc_id(&d, &r); switch (d) { - case MV_DEV_88F6281: - case MV_DEV_88F6282: - /* Check if CESA peripheral device has power turned on */ - if (soc_power_ctrl_get(CPU_PM_CTRL_CRYPTO) == - CPU_PM_CTRL_CRYPTO) { - device_printf(dev, "not powered on\n"); - return (ENXIO); - } - sc->sc_tperr = 0; - break; case MV_DEV_88F6828: case MV_DEV_88F6820: case MV_DEV_88F6810: sc->sc_tperr = 0; break; - case MV_DEV_MV78100: - case MV_DEV_MV78100_Z0: - /* Check if CESA peripheral device has power turned on */ - if (soc_power_ctrl_get(CPU_PM_CTRL_CRYPTO) != - CPU_PM_CTRL_CRYPTO) { - device_printf(dev, "not powered on\n"); - return (ENXIO); - } - sc->sc_tperr = CESA_ICR_TPERR; - break; default: return (ENXIO); } diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c index e657cb1ad5c7..25d213ff16ee 100644 --- a/sys/dev/mge/if_mge.c +++ b/sys/dev/mge/if_mge.c @@ -398,33 +398,16 @@ mge_ver_params(struct mge_softc *sc) uint32_t d, r; soc_id(&d, &r); - if (d == MV_DEV_88F6281 || d == MV_DEV_88F6781 || - d == MV_DEV_88F6282 || - d == MV_DEV_MV78100 || - d == MV_DEV_MV78100_Z0 || - (d & MV_DEV_FAMILY_MASK) == MV_DEV_DISCOVERY) { - sc->mge_ver = 2; - sc->mge_mtu = 0x4e8; - sc->mge_tfut_ipg_max = 0xFFFF; - sc->mge_rx_ipg_max = 0xFFFF; - sc->mge_tx_arb_cfg = 0xFC0000FF; - sc->mge_tx_tok_cfg = 0xFFFF7FFF; - sc->mge_tx_tok_cnt = 0x3FFFFFFF; - } else { - sc->mge_ver = 1; - sc->mge_mtu = 0x458; - sc->mge_tfut_ipg_max = 0x3FFF; - sc->mge_rx_ipg_max = 0x3FFF; - sc->mge_tx_arb_cfg = 0x000000FF; - sc->mge_tx_tok_cfg = 0x3FFFFFFF; - sc->mge_tx_tok_cnt = 0x3FFFFFFF; - } - if (d == MV_DEV_88RC8180) - sc->mge_intr_cnt = 1; - else - sc->mge_intr_cnt = 2; + sc->mge_ver = 1; + sc->mge_mtu = 0x458; + sc->mge_tfut_ipg_max = 0x3FFF; + sc->mge_rx_ipg_max = 0x3FFF; + sc->mge_tx_arb_cfg = 0x000000FF; + sc->mge_tx_tok_cfg = 0x3FFFFFFF; + sc->mge_tx_tok_cnt = 0x3FFFFFFF; + sc->mge_intr_cnt = 2; - if (d == MV_DEV_MV78160 || d == MV_DEV_MV78260 || d == MV_DEV_MV78460) + if (d == MV_DEV_MV78260 || d == MV_DEV_MV78460) sc->mge_hw_csum = 0; else sc->mge_hw_csum = 1; diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index 8712dc0123e8..bc53e2d5b24c 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -61,11 +61,6 @@ static struct { int ports; int quirks; } mvs_ids[] = { - {MV_DEV_88F5182, 0x00, "Marvell 88F5182", 2, MVS_Q_GENIIE|MVS_Q_SOC}, - {MV_DEV_88F6281, 0x00, "Marvell 88F6281", 2, MVS_Q_GENIIE|MVS_Q_SOC}, - {MV_DEV_88F6282, 0x00, "Marvell 88F6282", 2, MVS_Q_GENIIE|MVS_Q_SOC}, - {MV_DEV_MV78100, 0x00, "Marvell MV78100", 2, MVS_Q_GENIIE|MVS_Q_SOC}, - {MV_DEV_MV78100_Z0, 0x00,"Marvell MV78100", 2, MVS_Q_GENIIE|MVS_Q_SOC}, {MV_DEV_MV78260, 0x00, "Marvell MV78260", 2, MVS_Q_GENIIE|MVS_Q_SOC}, {MV_DEV_MV78460, 0x00, "Marvell MV78460", 2, MVS_Q_GENIIE|MVS_Q_SOC}, {0, 0x00, NULL, 0, 0} |