Author: np
Date: Mon Apr 29 05:35:52 2019
New Revision: 346883
URL: https://svnweb.freebsd.org/changeset/base/346883
Log:
MFC r338218:
cxgbev(4): Updates to the VF driver to cope with recent ifmedia and
ctrlq changes in the base driver.
Sponsored by: Chelsio Communications
Modified:
stable/11/sys/dev/cxgbe/adapter.h
stable/11/sys/dev/cxgbe/t4_main.c
stable/11/sys/dev/cxgbe/t4_sge.c
stable/11/sys/dev/cxgbe/t4_vf.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/11/sys/dev/cxgbe/adapter.h Mon Apr 29 05:26:27 2019
(r346882)
+++ stable/11/sys/dev/cxgbe/adapter.h Mon Apr 29 05:35:52 2019
(r346883)
@@ -1133,6 +1133,8 @@ int alloc_atid(struct adapter *, void *);
void *lookup_atid(struct adapter *, int);
void free_atid(struct adapter *, int);
void release_tid(struct adapter *, int, struct sge_wrq *);
+int cxgbe_media_change(struct ifnet *);
+void cxgbe_media_status(struct ifnet *, struct ifmediareq *);
#ifdef DEV_NETMAP
/* t4_netmap.c */
Modified: stable/11/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_main.c Mon Apr 29 05:26:27 2019
(r346882)
+++ stable/11/sys/dev/cxgbe/t4_main.c Mon Apr 29 05:35:52 2019
(r346883)
@@ -219,13 +219,11 @@ static driver_t vcc_driver = {
sizeof(struct vi_info)
};
-/* ifnet + media interface */
+/* ifnet interface */
static void cxgbe_init(void *);
static int cxgbe_ioctl(struct ifnet *, unsigned long, caddr_t);
static int cxgbe_transmit(struct ifnet *, struct mbuf *);
static void cxgbe_qflush(struct ifnet *);
-static int cxgbe_media_change(struct ifnet *);
-static void cxgbe_media_status(struct ifnet *, struct ifmediareq *);
MALLOC_DEFINE(M_CXGBE, "cxgbe", "Chelsio T4/T5 Ethernet driver and services");
@@ -2150,7 +2148,7 @@ cxgbe_get_counter(struct ifnet *ifp, ift_counter c)
* The kernel picks a media from the list we had provided but we still validate
* the requeste.
*/
-static int
+int
cxgbe_media_change(struct ifnet *ifp)
{
struct vi_info *vi = ifp->if_softc;
@@ -2339,7 +2337,7 @@ port_mword(struct port_info *pi, uint32_t speed)
return (IFM_UNKNOWN);
}
-static void
+void
cxgbe_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct vi_info *vi = ifp->if_softc;
@@ -4532,7 +4530,9 @@ apply_link_config(struct port_info *pi)
#endif
rc = -t4_link_l1cfg(sc, sc->mbox, pi->tx_chan, lc);
if (rc != 0) {
- device_printf(pi->dev, "l1cfg failed: %d\n", rc);
+ /* Don't complain if the VF driver gets back an EPERM. */
+ if (!(sc->flags & IS_VF) || rc != FW_EPERM)
+ device_printf(pi->dev, "l1cfg failed: %d\n", rc);
} else {
/*
* An L1_CFG will almost always result in a link-change event if
Modified: stable/11/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_sge.c Mon Apr 29 05:26:27 2019
(r346882)
+++ stable/11/sys/dev/cxgbe/t4_sge.c Mon Apr 29 05:35:52 2019
(r346883)
@@ -1053,8 +1053,10 @@ t4_teardown_adapter_queues(struct adapter *sc)
sc->flags &= ~ADAP_SYSCTL_CTX;
}
- for_each_port(sc, i)
- free_wrq(sc, &sc->sge.ctrlq[i]);
+ if (!(sc->flags & IS_VF)) {
+ for_each_port(sc, i)
+ free_wrq(sc, &sc->sge.ctrlq[i]);
+ }
free_fwq(sc);
return (0);
Modified: stable/11/sys/dev/cxgbe/t4_vf.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_vf.c Mon Apr 29 05:26:27 2019
(r346882)
+++ stable/11/sys/dev/cxgbe/t4_vf.c Mon Apr 29 05:35:52 2019
(r346883)
@@ -637,6 +637,10 @@ t4vf_attach(device_t dev)
mtx_init(&pi->pi_lock, pi->lockname, 0, MTX_DEF);
sc->chan_map[pi->tx_chan] = i;
+ /* All VIs on this port share this media. */
+ ifmedia_init(&pi->media, IFM_IMASK, cxgbe_media_change,
+ cxgbe_media_status);
+
pi->dev = device_add_child(dev, sc->names->vf_ifnet_name, -1);
if (pi->dev == NULL) {
device_printf(dev,
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
