d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if_muge: Add LAN78xx family USB ids but attach only to LAN7800

Browse Source 
This driver was developed for the LAN7800 and the register-compatible
LAN7515 and has only been tested on those devices.  Adding support for
other members of the family should be straightforward, once we have
devices to test.

With this change the driver will probe but fail to attach due to the
Chip ID check, but will leave a hint leading to the driver that needs
work.

Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D15537
This commit is contained in:
Ed Maste 2018-05-24 16:34:06 +00:00
parent b1988d44b3
commit 49b2a5fede
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/usb/net/if_muge.c
View File

@ -122,6 +122,8 @@ SYSCTL_INT(_hw_usb_muge, OID_AUTO, debug, CTLFLAG_RWTUN, &muge_debug, 0,
static const struct usb_device_id lan78xx_devs[] = {
#define MUGE_DEV(p,i) { USB_VPI(USB_VENDOR_SMC2, USB_PRODUCT_SMC2_##p, i) }
MUGE_DEV(LAN7800_ETH, 0),
MUGE_DEV(LAN7801_ETH, 0),
MUGE_DEV(LAN7850_ETH, 0),
#undef MUGE_DEV
};
@ -174,7 +176,8 @@ struct muge_softc {
uint32_t sc_pfilter_table[MUGE_NUM_PFILTER_ADDRS_][2];
uint32_t sc_flags;
#define MUGE_FLAG_LINK 0x0001
#define MUGE_FLAG_LINK 0x0001
#define MUGE_FLAG_INIT_DONE 0x0002
};
#define MUGE_IFACE_IDX 0
@ -1125,6 +1128,7 @@ lan78xx_chip_init(struct muge_softc *sc)
buf |= ETH_FCT_TX_CTL_EN_;
err = lan78xx_write_reg(sc, ETH_FCT_RX_CTL, buf);
sc->sc_flags |= MUGE_FLAG_INIT_DONE;
return (0);
init_failed:
@ -2116,7 +2120,7 @@ muge_attach(device_t dev)
muge_config, MUGE_N_TRANSFER, sc, &sc->sc_mtx);
if (err) {
device_printf(dev, "error: allocating USB transfers failed\n");
goto detach;
goto err;
}
ue->ue_sc = sc;
@ -2128,12 +2132,22 @@ muge_attach(device_t dev)
err = uether_ifattach(ue);
if (err) {
device_printf(dev, "error: could not attach interface\n");
goto detach;
goto err_usbd;
}
/* Wait for lan78xx_chip_init from post-attach callback to complete. */
uether_ifattach_wait(ue);
if (!(sc->sc_flags & MUGE_FLAG_INIT_DONE))
goto err_attached;
return (0);
detach:
muge_detach(dev);
err_attached:
uether_ifdetach(ue);
err_usbd:
usbd_transfer_unsetup(sc->sc_xfer, MUGE_N_TRANSFER);
err:
mtx_destroy(&sc->sc_mtx);
return (ENXIO);
}