From 9083b6057b457c41daad32efeca7a464611864b0 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 25 Oct 2018 04:10:41 +0000 Subject: Deprecate a number of less used 10 and 10/100 Ethernet devices. The current deprecated list is: ae, bm, cs, de, dme, ed, ep, ex, fe, pcn, sf, sn, tl, tx, txp, vx, wb, xe The list as refined as part of FCP-0101. Per the FCP, devices may be removed from the deprecation list if enough users are found or they are converted to iflib. FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md --- sys/dev/ae/if_ae.c | 2 ++ sys/dev/bm/if_bm.c | 2 ++ sys/dev/cs/if_cs.c | 2 ++ sys/dev/de/if_de.c | 2 ++ sys/dev/dme/if_dme.c | 3 +++ sys/dev/ed/if_ed.c | 3 +++ sys/dev/ep/if_ep.c | 2 ++ sys/dev/ex/if_ex.c | 2 ++ sys/dev/fe/if_fe.c | 2 ++ sys/dev/pcn/if_pcn.c | 2 ++ sys/dev/sf/if_sf.c | 2 ++ sys/dev/sn/if_sn.c | 3 +++ sys/dev/tl/if_tl.c | 2 ++ sys/dev/tx/if_tx.c | 2 ++ sys/dev/txp/if_txp.c | 2 ++ sys/dev/vx/if_vx.c | 2 ++ sys/dev/wb/if_wb.c | 2 ++ sys/dev/xe/if_xe.c | 2 ++ sys/sys/systm.h | 3 +++ 19 files changed, 42 insertions(+) (limited to 'sys') diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c index cb9474db8553..d2b57d216297 100644 --- a/sys/dev/ae/if_ae.c +++ b/sys/dev/ae/if_ae.c @@ -396,6 +396,8 @@ ae_attach(device_t dev) goto fail; } + gone_by_fcp101_dev(dev); + fail: if (error != 0) ae_detach(dev); diff --git a/sys/dev/bm/if_bm.c b/sys/dev/bm/if_bm.c index 3ab20e79f3c4..fc267e098f73 100644 --- a/sys/dev/bm/if_bm.c +++ b/sys/dev/bm/if_bm.c @@ -483,6 +483,8 @@ bm_attach(device_t dev) ether_ifattach(ifp, sc->sc_enaddr); ifp->if_hwassist = 0; + gone_by_fcp101_dev(dev); + return (0); } diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c index f7011172db09..79857f5b9077 100644 --- a/sys/dev/cs/if_cs.c +++ b/sys/dev/cs/if_cs.c @@ -574,6 +574,8 @@ cs_attach(device_t dev) return (error); } + gone_by_fcp101_dev(dev); + return (0); } diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 09cc3a09d9c8..665687e33d58 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -4432,6 +4432,8 @@ tulip_attach(tulip_softc_t * const sc) TULIP_LOCK(sc); sc->tulip_flags &= ~TULIP_DEVICEPROBE; TULIP_UNLOCK(sc); + + gone_by_fcp101_dev(sc->tulip_dev); } /* Release memory for a single descriptor ring. */ diff --git a/sys/dev/dme/if_dme.c b/sys/dev/dme/if_dme.c index b18b97753d10..226937bd6212 100644 --- a/sys/dev/dme/if_dme.c +++ b/sys/dev/dme/if_dme.c @@ -915,6 +915,9 @@ dme_attach(device_t dev) ether_ifdetach(ifp); goto fail; } + + gone_by_fcp101_dev(dev); + fail: if (error != 0) dme_detach(dev); diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index d4b06127ef56..20a5b876bf94 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -365,6 +365,9 @@ ed_attach(device_t dev) #endif printf("\n"); } + + gone_by_fcp101_dev(dev); + return (0); } diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index af3f3d82b4cc..62b0418fc080 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -350,6 +350,8 @@ ep_attach(struct ep_softc *sc) epstop(sc); EP_UNLOCK(sc); + gone_by_fcp101_dev(sc->dev); + return (0); } diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index a978aa38f660..0584ca835d43 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -276,6 +276,8 @@ ex_attach(device_t dev) return (error); } + gone_by_fcp101_dev(dev); + return(0); } diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c index 22ffcb3d9719..633061e95281 100644 --- a/sys/dev/fe/if_fe.c +++ b/sys/dev/fe/if_fe.c @@ -861,6 +861,8 @@ fe_attach (device_t dev) if (sc->stability & UNSTABLE_TYPE) device_printf(dev, "warning: hardware type was not validated\n"); + gone_by_fcp101_dev(dev); + return 0; } diff --git a/sys/dev/pcn/if_pcn.c b/sys/dev/pcn/if_pcn.c index 0e91df03ea18..87fea8f9fe0b 100644 --- a/sys/dev/pcn/if_pcn.c +++ b/sys/dev/pcn/if_pcn.c @@ -684,6 +684,8 @@ fail: if (error) pcn_detach(dev); + gone_by_fcp101_dev(dev); + return(error); } diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index 9c0a7014ae30..59ec14aa290f 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -917,6 +917,8 @@ sf_attach(device_t dev) goto fail; } + gone_by_fcp101_dev(dev); + fail: if (error) sf_detach(dev); diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c index df5e2adaf9ce..dec62dde5a19 100644 --- a/sys/dev/sn/if_sn.c +++ b/sys/dev/sn/if_sn.c @@ -227,6 +227,9 @@ sn_attach(device_t dev) sn_detach(dev); return err; } + + gone_by_fcp101_dev(dev); + return 0; } diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c index 3a36f3079f95..ed78cb2871b8 100644 --- a/sys/dev/tl/if_tl.c +++ b/sys/dev/tl/if_tl.c @@ -1242,6 +1242,8 @@ tl_attach(dev) goto fail; } + gone_by_fcp101_dev(dev); + fail: if (error) tl_detach(dev); diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index c3bcffa70bd0..a89f48efe3c1 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -428,6 +428,8 @@ epic_attach(device_t dev) goto fail; } + gone_by_fcp101_dev(dev); + return (0); fail: epic_release(sc); diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c index 0de96c512b5e..67dc800e55c4 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -472,6 +472,8 @@ txp_attach(device_t dev) goto fail; } + gone_by_fcp101_dev(dev); + return (0); fail: diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c index 75769fd70a00..9de56525980a 100644 --- a/sys/dev/vx/if_vx.c +++ b/sys/dev/vx/if_vx.c @@ -206,6 +206,8 @@ vx_attach(device_t dev) vx_stop(sc); VX_UNLOCK(sc); + gone_by_fcp101_dev(dev); + return 1; } diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c index 5b09923b106c..7b2eaf855083 100644 --- a/sys/dev/wb/if_wb.c +++ b/sys/dev/wb/if_wb.c @@ -694,6 +694,8 @@ wb_attach(dev) goto fail; } + gone_by_fcp101_dev(dev); + fail: if (error) wb_detach(dev); diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c index 02ecbdd69a3c..b421f36ff674 100644 --- a/sys/dev/xe/if_xe.c +++ b/sys/dev/xe/if_xe.c @@ -317,6 +317,8 @@ xe_attach(device_t dev) return (err); } + gone_by_fcp101_dev(dev); + /* Done */ return (0); } diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 4e0427927d72..e02a4e3a34c5 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -542,6 +542,9 @@ void _gone_in_dev(struct device *dev, int major, const char *msg); #endif #define gone_in(major, msg) __gone_ok(major, msg) _gone_in(major, msg) #define gone_in_dev(dev, major, msg) __gone_ok(major, msg) _gone_in_dev(dev, major, msg) +#define gone_by_fcp101_dev(dev) \ + gone_in_dev((dev), 13, \ + "see https://github.com/freebsd/fcp/blob/master/fcp-0101.md") __NULLABILITY_PRAGMA_POP -- cgit v1.2.3