diff options
| author |   dlg <dlg@openbsd.org> | 2013-09-12 04:23:28 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2013-09-12 04:23:28 +0000 |
| commit | c12df08021661dff8bc743674e61d384728b4485 (patch) | |
| tree | 4f88b0a8cbb71d4f51da8c78ccbf1d87269956e8 | |
| parent | whitespace tweaks (diff) | |
| download | wireguard-openbsd-c12df08021661dff8bc743674e61d384728b4485.tar.xz wireguard-openbsd-c12df08021661dff8bc743674e61d384728b4485.zip | |
print version on attach
| -rw-r--r-- | sys/arch/armv7/omap/if_cpsw.c | 8 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/if_cpswreg.h | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/arch/armv7/omap/if_cpsw.c b/sys/arch/armv7/omap/if_cpsw.c index 4b8fec1b208..eb8f8f27fc8 100644 --- a/sys/arch/armv7/omap/if_cpsw.c +++ b/sys/arch/armv7/omap/if_cpsw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cpsw.c,v 1.15 2013/09/12 03:09:34 dlg Exp $ */ +/* $OpenBSD: if_cpsw.c,v 1.16 2013/09/12 04:23:28 dlg Exp $ */ /* $NetBSD: if_cpsw.c,v 1.3 2013/04/17 14:36:34 bouyer Exp $ */ /* @@ -326,6 +326,7 @@ cpsw_attach(struct device *parent, struct device *self, void *aux) struct omap_attach_args *oa = aux; struct arpcom * const ac = &sc->sc_ac; struct ifnet * const ifp = &ac->ac_if; + u_int32_t idver; int error; u_int i; @@ -404,7 +405,10 @@ cpsw_attach(struct device *parent, struct device *self, void *aux) bus_dmamap_sync(sc->sc_bdt, sc->sc_txpad_dm, 0, ETHER_MIN_LEN, BUS_DMASYNC_PREWRITE); - printf(": address %s\n", ether_sprintf(ac->ac_enaddr)); + idver = cpsw_read_4(sc, CPSW_SS_IDVER); + printf(": version %d.%d (%d), address %s\n", + CPSW_SS_IDVER_MAJ(idver), CPSW_SS_IDVER_MIN(idver), + CPSW_SS_IDVER_RTL(idver), ether_sprintf(ac->ac_enaddr)); ifp->if_softc = sc; ifp->if_capabilities = 0; diff --git a/sys/arch/armv7/omap/if_cpswreg.h b/sys/arch/armv7/omap/if_cpswreg.h index f60fdbaf39c..6e2399488e8 100644 --- a/sys/arch/armv7/omap/if_cpswreg.h +++ b/sys/arch/armv7/omap/if_cpswreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cpswreg.h,v 1.3 2013/09/12 03:16:59 dlg Exp $ */ +/* $OpenBSD: if_cpswreg.h,v 1.4 2013/09/12 04:23:28 dlg Exp $ */ /*- * Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org> @@ -33,6 +33,9 @@ #define CPSW_SS_OFFSET 0x0000 #define CPSW_SS_IDVER (CPSW_SS_OFFSET + 0x00) +#define CPSW_SS_IDVER_RTL(_r) (((_r) >> 11) & 0x1f) +#define CPSW_SS_IDVER_MAJ(_r) (((_r) >> 8) & 0x7) +#define CPSW_SS_IDVER_MIN(_r) ((_r) & 0xff) #define CPSW_SS_SOFT_RESET (CPSW_SS_OFFSET + 0x08) #define CPSW_SS_STAT_PORT_EN (CPSW_SS_OFFSET + 0x0C) #define CPSW_SS_PTYPE (CPSW_SS_OFFSET + 0x10) |