diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2019-05-23 10:51:38 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2019-05-23 10:51:38 +0000 |
| commit | bd4636dc0c8bd783f583bb9780de462addcff499 (patch) | |
| tree | 7497086602430c5e8d2a70373587bbfcbf8e9ce1 /sys | |
| parent | cdc7047931fcea5618c867fcf0e53cd481386685 (diff) | |
No functional change:
- Simplify MII structure initialization and reference.
- u_int*_t -> uint*_t.
- KNF
Diffstat (limited to 'sys')
30 files changed, 1356 insertions, 1335 deletions
diff --git a/sys/arch/arm/at91/at91emac.c b/sys/arch/arm/at91/at91emac.c index c62288cdc38..b5679c4020c 100644 --- a/sys/arch/arm/at91/at91emac.c +++ b/sys/arch/arm/at91/at91emac.c @@ -1,5 +1,5 @@ -/* $Id: at91emac.c,v 1.25 2019/04/22 08:05:00 msaitoh Exp $ */ -/* $NetBSD: at91emac.c,v 1.25 2019/04/22 08:05:00 msaitoh Exp $ */ +/* $Id: at91emac.c,v 1.26 2019/05/23 10:51:38 msaitoh Exp $ */ +/* $NetBSD: at91emac.c,v 1.26 2019/05/23 10:51:38 msaitoh Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.25 2019/04/22 08:05:00 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.26 2019/05/23 10:51:38 msaitoh Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -112,9 +112,9 @@ CFATTACH_DECL_NEW(at91emac, sizeof(struct emac_softc), #ifdef EMAC_DEBUG int emac_debug = EMAC_DEBUG; -#define DPRINTFN(n,fmt) if (emac_debug >= (n)) printf fmt +#define DPRINTFN(n, fmt) if (emac_debug >= (n)) printf fmt #else -#define DPRINTFN(n,fmt) +#define DPRINTFN(n, fmt) #endif static int @@ -149,15 +149,16 @@ emac_attach(device_t parent, device_t self, void *aux) EMAC_WRITE(ETH_CTL, 0); // disable everything EMAC_WRITE(ETH_IDR, -1); // disable interrupts EMAC_WRITE(ETH_RBQP, 0); // clear receive - EMAC_WRITE(ETH_CFG, ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); + EMAC_WRITE(ETH_CFG, + ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); EMAC_WRITE(ETH_TCR, 0); // send nothing //(void)EMAC_READ(ETH_ISR); u = EMAC_READ(ETH_TSR); EMAC_WRITE(ETH_TSR, (u & (ETH_TSR_UND | ETH_TSR_COMP | ETH_TSR_BNQ | ETH_TSR_IDLE | ETH_TSR_RLE - | ETH_TSR_COL|ETH_TSR_OVR))); + | ETH_TSR_COL | ETH_TSR_OVR))); u = EMAC_READ(ETH_RSR); - EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA))); + EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR | ETH_RSR_REC | ETH_RSR_BNA))); /* Fetch the Ethernet address from property if set. */ enaddr = prop_dictionary_get(device_properties(self), "mac-address"); @@ -174,7 +175,8 @@ emac_attach(device_t parent, device_t self, void *aux) memcpy(sc->sc_enaddr, hardcoded, ETHER_ADDR_LEN); } - at91_intr_establish(sc->sc_pid, IPL_NET, INTR_HIGH_LEVEL, emac_intr, sc); + at91_intr_establish(sc->sc_pid, IPL_NET, INTR_HIGH_LEVEL, emac_intr, + sc); emac_init(sc); } @@ -194,10 +196,11 @@ emac_gctx(struct emac_softc *sc) while (sc->txqc > (tsr & ETH_TSR_IDLE ? 0 : 1)) { int i = sc->txqi % TX_QLEN; bus_dmamap_sync(sc->sc_dmat, sc->txq[i].m_dmamap, 0, - sc->txq[i].m->m_pkthdr.len, BUS_DMASYNC_POSTWRITE); + sc->txq[i].m->m_pkthdr.len, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->sc_dmat, sc->txq[i].m_dmamap); m_freem(sc->txq[i].m); - DPRINTFN(2,("%s: freed idx #%i mbuf %p (txqc=%i)\n", __FUNCTION__, i, sc->txq[i].m, sc->txqc)); + DPRINTFN(2,("%s: freed idx #%i mbuf %p (txqc=%i)\n", + __FUNCTION__, i, sc->txq[i].m, sc->txqc)); sc->txq[i].m = NULL; sc->txqi = (i + 1) % TX_QLEN; sc->txqc--; @@ -222,18 +225,20 @@ emac_intr(void *arg) int bi; imr = ~EMAC_READ(ETH_IMR); - if (!(imr & (ETH_ISR_RCOM|ETH_ISR_TBRE|ETH_ISR_TIDLE|ETH_ISR_RBNA|ETH_ISR_ROVR))) { + if (!(imr & (ETH_ISR_RCOM | ETH_ISR_TBRE | ETH_ISR_TIDLE + | ETH_ISR_RBNA | ETH_ISR_ROVR))) { // interrupt not enabled, can't be us return 0; } isr = EMAC_READ(ETH_ISR) & imr; -#ifdef EMAC_DEBUG - uint32_t rsr = +#ifdef EMAC_DEBUG + uint32_t rsr = #endif EMAC_READ(ETH_RSR); // get receive status register - DPRINTFN(2, ("%s: isr=0x%08X rsr=0x%08X imr=0x%08X\n", __FUNCTION__, isr, rsr, imr)); + DPRINTFN(2, ("%s: isr=0x%08X rsr=0x%08X imr=0x%08X\n", __FUNCTION__, + isr, rsr, imr)); if (isr & ETH_ISR_RBNA) { // out of receive buffers EMAC_WRITE(ETH_RSR, ETH_RSR_BNA); // clear interrupt @@ -251,13 +256,14 @@ emac_intr(void *arg) ifp->if_ipackets++; DPRINTFN(1,("%s: receive overrun\n", __FUNCTION__)); } - + if (isr & ETH_ISR_RCOM) { // packet has been received! uint32_t nfo; // @@@ if memory is NOT coherent, then we're in trouble @@@@ // bus_dmamap_sync(sc->sc_dmat, sc->rbqpage_dmamap, 0, sc->rbqlen, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); // printf("## RDSC[%i].ADDR=0x%08X\n", sc->rxqi % RX_QLEN, sc->RDSC[sc->rxqi % RX_QLEN].Addr); - DPRINTFN(2,("#2 RDSC[%i].INFO=0x%08X\n", sc->rxqi % RX_QLEN, sc->RDSC[sc->rxqi % RX_QLEN].Info)); + DPRINTFN(2,("#2 RDSC[%i].INFO=0x%08X\n", sc->rxqi % RX_QLEN, + sc->RDSC[sc->rxqi % RX_QLEN].Info)); while (sc->RDSC[(bi = sc->rxqi % RX_QLEN)].Addr & ETH_RDSC_F_USED) { int fl; struct mbuf *m; @@ -269,12 +275,13 @@ emac_intr(void *arg) MGETHDR(m, M_DONTWAIT, MT_DATA); if (m != NULL) MCLGET(m, M_DONTWAIT); if (m != NULL && (m->m_flags & M_EXT)) { - bus_dmamap_sync(sc->sc_dmat, sc->rxq[bi].m_dmamap, 0, - MCLBYTES, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->sc_dmat, + bus_dmamap_sync(sc->sc_dmat, + sc->rxq[bi].m_dmamap, 0, + MCLBYTES, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->sc_dmat, sc->rxq[bi].m_dmamap); m_set_rcvif(sc->rxq[bi].m, ifp); - sc->rxq[bi].m->m_pkthdr.len = + sc->rxq[bi].m->m_pkthdr.len = sc->rxq[bi].m->m_len = fl; DPRINTFN(2,("received %u bytes packet\n", fl)); if_percpuq_enqueue(ifp->if_percpuq, sc->rxq[bi].m); @@ -282,12 +289,13 @@ emac_intr(void *arg) m_adj(m, mtod(m, intptr_t) & 3); } sc->rxq[bi].m = m; - bus_dmamap_load(sc->sc_dmat, - sc->rxq[bi].m_dmamap, + bus_dmamap_load(sc->sc_dmat, + sc->rxq[bi].m_dmamap, m->m_ext.ext_buf, MCLBYTES, NULL, BUS_DMA_NOWAIT); - bus_dmamap_sync(sc->sc_dmat, sc->rxq[bi].m_dmamap, 0, - MCLBYTES, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->sc_dmat, + sc->rxq[bi].m_dmamap, 0, + MCLBYTES, BUS_DMASYNC_PREREAD); sc->RDSC[bi].Info = 0; sc->RDSC[bi].Addr = sc->rxq[bi].m_dmamap->dm_segs[0].ds_addr @@ -300,7 +308,7 @@ emac_intr(void *arg) m_freem(m); } ifp->if_ierrors++; - } + } sc->rxqi++; } // bus_dmamap_sync(sc->sc_dmat, sc->rbqpage_dmamap, 0, sc->rbqlen, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); @@ -310,7 +318,7 @@ emac_intr(void *arg) if_schedule_deferred_start(ifp); #if 0 // reloop irq = EMAC_READ(IntStsC); - if ((irq & (IntSts_RxSQ|IntSts_ECI)) != 0) + if ((irq & (IntSts_RxSQ | IntSts_ECI)) != 0) goto begin; #endif @@ -325,6 +333,7 @@ emac_init(struct emac_softc *sc) void *addr; int rsegs, err, i; struct ifnet * ifp = &sc->sc_ec.ec_if; + struct mii_data * const mii = &sc->sc_mii; uint32_t u; #if 0 int mdcdiv = DEFAULT_MDCDIV; @@ -336,18 +345,20 @@ emac_init(struct emac_softc *sc) EMAC_WRITE(ETH_CTL, ETH_CTL_MPE); // disable everything EMAC_WRITE(ETH_IDR, -1); // disable interrupts EMAC_WRITE(ETH_RBQP, 0); // clear receive - EMAC_WRITE(ETH_CFG, ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); + EMAC_WRITE(ETH_CFG, + ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); EMAC_WRITE(ETH_TCR, 0); // send nothing // (void)EMAC_READ(ETH_ISR); u = EMAC_READ(ETH_TSR); EMAC_WRITE(ETH_TSR, (u & (ETH_TSR_UND | ETH_TSR_COMP | ETH_TSR_BNQ | ETH_TSR_IDLE | ETH_TSR_RLE - | ETH_TSR_COL|ETH_TSR_OVR))); + | ETH_TSR_COL | ETH_TSR_OVR))); u = EMAC_READ(ETH_RSR); - EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA))); + EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR | ETH_RSR_REC | ETH_RSR_BNA))); /* configure EMAC */ - EMAC_WRITE(ETH_CFG, ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); + EMAC_WRITE(ETH_CFG, + ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); EMAC_WRITE(ETH_CTL, ETH_CTL_MPE); #if 0 if (device_cfdata(sc->sc_dev)->cf_flags) @@ -377,7 +388,7 @@ emac_init(struct emac_softc *sc) if (err == 0) { DPRINTFN(1,("%s: -> bus_dmamem_map\n", __FUNCTION__)); err = bus_dmamem_map(sc->sc_dmat, &segs, 1, sc->rbqlen, - &sc->rbqpage, (BUS_DMA_WAITOK|BUS_DMA_COHERENT)); + &sc->rbqpage, (BUS_DMA_WAITOK | BUS_DMA_COHERENT)); } if (err == 0) { DPRINTFN(1,("%s: -> bus_dmamap_create\n", __FUNCTION__)); @@ -404,26 +415,28 @@ emac_init(struct emac_softc *sc) /* Populate the RXQ with mbufs */ sc->rxqi = 0; - for(i = 0; i < RX_QLEN; i++) { + for (i = 0; i < RX_QLEN; i++) { struct mbuf *m; - err = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES, PAGE_SIZE, - BUS_DMA_WAITOK, &sc->rxq[i].m_dmamap); - if (err) { - panic("%s: dmamap_create failed: %i\n", __FUNCTION__, err); - } + err = bus_dmamap_create(sc->sc_dmat, MCLBYTES, 1, MCLBYTES, + PAGE_SIZE, BUS_DMA_WAITOK, &sc->rxq[i].m_dmamap); + if (err) + panic("%s: dmamap_create failed: %i\n", + __FUNCTION__, err); + MGETHDR(m, M_WAIT, MT_DATA); MCLGET(m, M_WAIT); sc->rxq[i].m = m; if (mtod(m, intptr_t) & 3) { m_adj(m, mtod(m, intptr_t) & 3); } - err = bus_dmamap_load(sc->sc_dmat, sc->rxq[i].m_dmamap, - m->m_ext.ext_buf, MCLBYTES, NULL, + err = bus_dmamap_load(sc->sc_dmat, sc->rxq[i].m_dmamap, + m->m_ext.ext_buf, MCLBYTES, NULL, BUS_DMA_WAITOK); - if (err) { - panic("%s: dmamap_load failed: %i\n", __FUNCTION__, err); - } + if (err) + panic("%s: dmamap_load failed: %i\n", + __FUNCTION__, err); + sc->RDSC[i].Addr = sc->rxq[i].m_dmamap->dm_segs[0].ds_addr | (i == (RX_QLEN-1) ? ETH_RDSC_F_WRAP : 0); sc->RDSC[i].Info = 0; @@ -442,7 +455,7 @@ emac_init(struct emac_softc *sc) } /* Program each queue's start addr, cur addr, and len registers - * with the physical addresses. + * with the physical addresses. */ bus_dmamap_sync(sc->sc_dmat, sc->rbqpage_dmamap, 0, sc->rbqlen, BUS_DMASYNC_PREREAD); @@ -450,16 +463,16 @@ emac_init(struct emac_softc *sc) EMAC_WRITE(ETH_RBQP, (uint32_t)addr); /* Divide HCLK by 32 for MDC clock */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = emac_mii_readreg; - sc->sc_mii.mii_writereg = emac_mii_writereg; - sc->sc_mii.mii_statchg = emac_statchg; - sc->sc_ec.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, emac_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = emac_mii_readreg; + mii->mii_writereg = emac_mii_writereg; + mii->mii_statchg = emac_statchg; + sc->sc_ec.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, emac_mediachange, emac_mediastatus); - mii_attach((device_t )sc, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach((device_t )sc, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); // enable / disable interrupts @@ -524,7 +537,8 @@ emac_mii_readreg(device_t self, int phy, int reg, uint16_t *val) | ((phy << ETH_MAN_PHYA_SHIFT) & ETH_MAN_PHYA) | ((reg << ETH_MAN_REGA_SHIFT) & ETH_MAN_REGA) | ETH_MAN_CODE_IEEE802_3)); - while (!(EMAC_READ(ETH_SR) & ETH_SR_IDLE)) ; + while (!(EMAC_READ(ETH_SR) & ETH_SR_IDLE)) + ; *val = EMAC_READ(ETH_MAN) & ETH_MAN_DATA; return 0; @@ -542,12 +556,12 @@ emac_mii_writereg(device_t self, int phy, int reg, uint16_t val) | ((reg << ETH_MAN_REGA_SHIFT) & ETH_MAN_REGA) | ETH_MAN_CODE_IEEE802_3 | (val & ETH_MAN_DATA))); - while (!(EMAC_READ(ETH_SR) & ETH_SR_IDLE)) ; + while (!(EMAC_READ(ETH_SR) & ETH_SR_IDLE)) + ; return 0; } - void emac_statchg(struct ifnet *ifp) { @@ -577,7 +591,7 @@ emac_tick(void *arg) ifp->if_collisions += EMAC_READ(ETH_SCOL) + EMAC_READ(ETH_MCOL); /* These misses are ok, they will happen if the RAM/CPU can't keep up */ misses = EMAC_READ(ETH_DRFC); - if (misses > 0) + if (misses > 0) printf("%s: %d rx misses\n", device_xname(sc->sc_dev), misses); s = splnet(); @@ -598,7 +612,7 @@ emac_ifioctl(struct ifnet *ifp, u_long cmd, void *data) int s, error; s = splnet(); - switch(cmd) { + switch (cmd) { default: error = ether_ioctl(ifp, cmd, data); if (error == ENETRESET) { @@ -619,7 +633,7 @@ emac_ifstart(struct ifnet *ifp) bus_dma_segment_t *segs; int s, bi, err, nsegs; - s = splnet(); + s = splnet(); start: if (emac_gctx(sc) == 0) { /* Enable transmit-buffer-free interrupt */ @@ -640,13 +654,13 @@ start: //more: bi = (sc->txqi + sc->txqc) % TX_QLEN; if ((err = bus_dmamap_load_mbuf(sc->sc_dmat, sc->txq[bi].m_dmamap, m, - BUS_DMA_NOWAIT)) || + BUS_DMA_NOWAIT)) || sc->txq[bi].m_dmamap->dm_segs[0].ds_addr & 0x3 || sc->txq[bi].m_dmamap->dm_nsegs > 1) { /* Copy entire mbuf chain to new single */ struct mbuf *mn; - if (err == 0) + if (err == 0) bus_dmamap_unload(sc->sc_dmat, sc->txq[bi].m_dmamap); MGETHDR(mn, M_DONTWAIT, MT_DATA); @@ -688,8 +702,8 @@ start: } #endif - bus_dmamap_sync(sc->sc_dmat, sc->txq[bi].m_dmamap, 0, - sc->txq[bi].m_dmamap->dm_mapsize, + bus_dmamap_sync(sc->sc_dmat, sc->txq[bi].m_dmamap, 0, + sc->txq[bi].m_dmamap->dm_mapsize, BUS_DMASYNC_PREWRITE); EMAC_WRITE(ETH_TAR, segs->ds_addr); @@ -747,15 +761,16 @@ emac_ifstop(struct ifnet *ifp, int disable) EMAC_WRITE(ETH_CTL, ETH_CTL_MPE); // disable everything EMAC_WRITE(ETH_IDR, -1); // disable interrupts // EMAC_WRITE(ETH_RBQP, 0); // clear receive - EMAC_WRITE(ETH_CFG, ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); + EMAC_WRITE(ETH_CFG, + ETH_CFG_CLK_32 | ETH_CFG_SPD | ETH_CFG_FD | ETH_CFG_BIG); EMAC_WRITE(ETH_TCR, 0); // send nothing // (void)EMAC_READ(ETH_ISR); u = EMAC_READ(ETH_TSR); EMAC_WRITE(ETH_TSR, (u & (ETH_TSR_UND | ETH_TSR_COMP | ETH_TSR_BNQ | ETH_TSR_IDLE | ETH_TSR_RLE - | ETH_TSR_COL|ETH_TSR_OVR))); + | ETH_TSR_COL | ETH_TSR_OVR))); u = EMAC_READ(ETH_RSR); - EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA))); + EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR | ETH_RSR_REC | ETH_RSR_BNA))); #endif callout_stop(&sc->emac_tick_ch); diff --git a/sys/arch/arm/gemini/if_gmc.c b/sys/arch/arm/gemini/if_gmc.c index 0c9400a5ffe..0eba7970332 100644 --- a/sys/arch/arm/gemini/if_gmc.c +++ b/sys/arch/arm/gemini/if_gmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gmc.c,v 1.8 2019/04/22 08:05:00 msaitoh Exp $ */ +/* $NetBSD: if_gmc.c,v 1.9 2019/05/23 10:51:38 msaitoh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -47,7 +47,7 @@ #include <net/if_ether.h> #include <net/if_dl.h> -__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.8 2019/04/22 08:05:00 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.9 2019/05/23 10:51:38 msaitoh Exp $"); #define MAX_TXSEG 32 @@ -128,7 +128,7 @@ gmc_txqueue(struct gmc_softc *sc, gmac_hwqueue_t *hwq, struct mbuf *m) } error = bus_dmamap_load_mbuf(sc->sc_dmat, map, m, - BUS_DMA_WRITE|BUS_DMA_NOWAIT); + BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "ifstart: load failed: %d\n", error); @@ -171,7 +171,7 @@ gmc_txqueue(struct gmc_softc *sc, gmac_hwqueue_t *hwq, struct mbuf *m) desc3 = 0; } while (++i < map->dm_nsegs); - d->d_desc3 |= htole32(DESC3_EOF|DESC3_EOFIE); + d->d_desc3 |= htole32(DESC3_EOF | DESC3_EOFIE); #if 0 aprint_debug_dev(sc->sc_dev, "gmac_txqueue: %zu@%p=%#x/%#x/%#x/%#x\n", @@ -311,7 +311,7 @@ gmc_mii_statchg(struct ifnet *ifp) { struct gmc_softc * const sc = ifp->if_softc; uint32_t gmac_status; - + gmac_status = sc->sc_gmac_status; gmac_status &= ~STATUS_PHYMODE_MASK; @@ -363,7 +363,7 @@ gmc_ifioctl(struct ifnet *ifp, u_long cmd, void *data) if (error == ENETRESET) { if (ifp->if_flags & IFF_RUNNING) { /* - * If the interface is running, we have to + * If the interface is running, we have to * update its multicast filter. */ gmc_filter_change(sc); @@ -450,7 +450,7 @@ gmc_ifinit(struct ifnet *ifp) if (sc->sc_rxq == NULL) { gmac_hwqmem_t *hqm; hqm = gmac_hwqmem_create(psc->sc_rxmaps, 16, /*RXQ_NDESCS,*/ 1, - HQM_CONSUMER|HQM_RX); + HQM_CONSUMER | HQM_RX); sc->sc_rxq = gmac_hwqueue_create(hqm, sc->sc_iot, sc->sc_ioh, GMAC_DEF_RXQn_RWPTR(sc->sc_port1), GMAC_DEF_RXQn_BASE(sc->sc_port1), 0); @@ -468,7 +468,7 @@ gmc_ifinit(struct ifnet *ifp) size_t i; hqm = gmac_hwqmem_create(psc->sc_txmaps, TXQ_NDESCS, 6, - HQM_PRODUCER|HQM_TX); + HQM_PRODUCER | HQM_TX); KASSERT(hqm != NULL); for (i = 0; i < __arraycount(sc->sc_txq); i++) { sc->sc_txq[i] = gmac_hwqueue_create(hqm, sc->sc_iot, @@ -500,15 +500,15 @@ gmc_ifinit(struct ifnet *ifp) gmc_filter_change(sc); - mask = DMAVR_LOOPBACK|DMAVR_DROP_SMALL_ACK|DMAVR_EXTRABYTES_MASK - |DMAVR_RXBURSTSIZE_MASK|DMAVR_RXBUSWIDTH_MASK - |DMAVR_TXBURSTSIZE_MASK|DMAVR_TXBUSWIDTH_MASK; - new = DMAVR_RXDMA_ENABLE|DMAVR_TXDMA_ENABLE - |DMAVR_EXTRABYTES(2) - |DMAVR_RXBURSTSIZE(DMAVR_BURSTSIZE_32W) - |DMAVR_RXBUSWIDTH(DMAVR_BUSWIDTH_32BITS) - |DMAVR_TXBURSTSIZE(DMAVR_BURSTSIZE_32W) - |DMAVR_TXBUSWIDTH(DMAVR_BUSWIDTH_32BITS); + mask = DMAVR_LOOPBACK | DMAVR_DROP_SMALL_ACK | DMAVR_EXTRABYTES_MASK + | DMAVR_RXBURSTSIZE_MASK | DMAVR_RXBUSWIDTH_MASK + | DMAVR_TXBURSTSIZE_MASK | DMAVR_TXBUSWIDTH_MASK; + new = DMAVR_RXDMA_ENABLE | DMAVR_TXDMA_ENABLE + | DMAVR_EXTRABYTES(2) + | DMAVR_RXBURSTSIZE(DMAVR_BURSTSIZE_32W) + | DMAVR_RXBUSWIDTH(DMAVR_BUSWIDTH_32BITS) + | DMAVR_TXBURSTSIZE(DMAVR_BURSTSIZE_32W) + | DMAVR_TXBUSWIDTH(DMAVR_BUSWIDTH_32BITS); new |= sc->sc_dmavr & ~mask; if (sc->sc_dmavr != new) { sc->sc_dmavr = new; @@ -519,10 +519,10 @@ gmc_ifinit(struct ifnet *ifp) bus_space_read_4(sc->sc_iot, sc->sc_dma_ioh, GMAC_DMAVR)); } - mask = CONFIG0_MAXLEN_MASK|CONFIG0_TX_DISABLE|CONFIG0_RX_DISABLE - |CONFIG0_LOOPBACK|/*CONFIG0_SIM_TEST|*/CONFIG0_INVERSE_RXC_RGMII - |CONFIG0_RGMII_INBAND_STATUS_ENABLE; - new = CONFIG0_MAXLEN(CONFIG0_MAXLEN_1536)|CONFIG0_R_LATCHED_MMII; + mask = CONFIG0_MAXLEN_MASK | CONFIG0_TX_DISABLE | CONFIG0_RX_DISABLE + | CONFIG0_LOOPBACK |/*CONFIG0_SIM_TEST|*/CONFIG0_INVERSE_RXC_RGMII + | CONFIG0_RGMII_INBAND_STATUS_ENABLE; + new = CONFIG0_MAXLEN(CONFIG0_MAXLEN_1536) | CONFIG0_R_LATCHED_MMII; new |= (sc->sc_gmac_config[0] & ~mask); if (sc->sc_gmac_config[0] != new) { sc->sc_gmac_config[0] = new; @@ -550,8 +550,8 @@ gmc_ifinit(struct ifnet *ifp) & (INT0_TXDERR|INT0_TXPERR|INT0_RXDERR|INT0_RXPERR|INT0_SWTXQ_EOF); sc->sc_int_enabled[1] = sc->sc_int_mask[1] & INT1_DEF_RXQ_EOF; sc->sc_int_enabled[4] = INT4_SW_FREEQ_EMPTY | (sc->sc_int_mask[4] - & (INT4_TX_FAIL|INT4_MIB_HEMIWRAP|INT4_RX_FIFO_OVRN - |INT4_RGMII_STSCHG)); + & (INT4_TX_FAIL | INT4_MIB_HEMIWRAP | INT4_RX_FIFO_OVRN + | INT4_RGMII_STSCHG)); psc->sc_int_enabled[0] |= sc->sc_int_enabled[0]; psc->sc_int_enabled[1] |= sc->sc_int_enabled[1]; @@ -566,7 +566,7 @@ gmc_ifinit(struct ifnet *ifp) psc->sc_running |= (sc->sc_port1 ? 2 : 1); callout_schedule(&sc->sc_mii_ch, hz); - + return 0; failed: @@ -608,7 +608,7 @@ gmc_intr(void *arg) #endif status = int0_status & sc->sc_int_mask[0]; - if (status & (INT0_TXDERR|INT0_TXPERR)) { + if (status & (INT0_TXDERR | INT0_TXPERR)) { aprint_error_dev(sc->sc_dev, "transmit%s%s error: %#x %08x bufaddr %#x\n", status & INT0_TXDERR ? " data" : "", @@ -620,10 +620,10 @@ gmc_intr(void *arg) bus_space_read_4(sc->sc_iot, sc->sc_dma_ioh, GMAC_DMA_TX_DESC2)); bus_space_write_4(sc->sc_iot, sc->sc_ioh, GMAC_INT0_STATUS, - status & (INT0_TXDERR|INT0_TXPERR)); + status & (INT0_TXDERR | INT0_TXPERR)); Debugger(); } - if (status & (INT0_RXDERR|INT0_RXPERR)) { + if (status & (INT0_RXDERR | INT0_RXPERR)) { aprint_error_dev(sc->sc_dev, "receive%s%s error: %#x %#x=%#x/%#x/%#x/%#x\n", status & INT0_RXDERR ? " data" : "", @@ -641,7 +641,7 @@ gmc_intr(void *arg) bus_space_read_4(sc->sc_iot, sc->sc_dma_ioh, GMAC_DMA_RX_DESC3)); bus_space_write_4(sc->sc_iot, sc->sc_ioh, GMAC_INT0_STATUS, - status & (INT0_RXDERR|INT0_RXPERR)); + status & (INT0_RXDERR | INT0_RXPERR)); Debugger(); } if (status & INT0_SWTXQ_EOF) { @@ -651,7 +651,8 @@ gmc_intr(void *arg) gmac_hwqueue_sync(sc->sc_txq[i]); bus_space_write_4(sc->sc_iot, sc->sc_ioh, GMAC_INT0_STATUS, - sc->sc_int_mask[0] & (INT0_SWTXQn_EOF(i)|INT0_SWTXQn_FIN(i))); + sc->sc_int_mask[0] & (INT0_SWTXQn_EOF(i) + | INT0_SWTXQn_FIN(i))); status &= ~INT0_SWTXQn_EOF(i); } } @@ -744,6 +745,7 @@ gmc_attach(device_t parent, device_t self, void *aux) struct gmc_softc * const sc = device_private(self); struct gmac_attach_args *gma = aux; struct ifnet * const ifp = &sc->sc_if; + struct mii_data * const mii = &sc->sc_mii; static const char eaddrs[2][6] = { "\x0\x52\xc3\x11\x22\x33", "\x0\x52\xc3\x44\x55\x66", @@ -759,17 +761,17 @@ gmc_attach(device_t parent, device_t self, void *aux) sc->sc_ioh = psc->sc_ioh; sc->sc_dmat = psc->sc_dmat; - bus_space_subregion(sc->sc_iot, sc->sc_ioh, + bus_space_subregion(sc->sc_iot, sc->sc_ioh, GMAC_PORTn_DMA_OFFSET(gma->gma_port), GMAC_PORTn_DMA_SIZE, &sc->sc_dma_ioh); - bus_space_subregion(sc->sc_iot, sc->sc_ioh, + bus_space_subregion(sc->sc_iot, sc->sc_ioh, GMAC_PORTn_GMAC_OFFSET(gma->gma_port), GMAC_PORTn_GMAC_SIZE, &sc->sc_gmac_ioh); aprint_normal("\n"); aprint_naive("\n"); strlcpy(ifp->if_xname, device_xname(self), sizeof(ifp->if_xname)); - ifp->if_flags = IFF_SIMPLEX|IFF_MULTICAST|IFF_BROADCAST; + ifp->if_flags = IFF_SIMPLEX | IFF_MULTICAST | IFF_BROADCAST; ifp->if_softc = sc; ifp->if_ioctl = gmc_ifioctl; ifp->if_stop = gmc_ifstop; @@ -779,28 +781,27 @@ gmc_attach(device_t parent, device_t self, void *aux) IFQ_SET_READY(&ifp->if_snd); sc->sc_ec.ec_capabilities = ETHERCAP_VLAN_MTU | ETHERCAP_JUMBO_MTU; - sc->sc_ec.ec_mii = &sc->sc_mii; + sc->sc_ec.ec_mii = mii; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_statchg = gmc_mii_statchg; - sc->sc_mii.mii_readreg = gma->gma_mii_readreg; - sc->sc_mii.mii_writereg = gma->gma_mii_writereg; + mii->mii_ifp = ifp; + mii->mii_statchg = gmc_mii_statchg; + mii->mii_readreg = gma->gma_mii_readreg; + mii->mii_writereg = gma->gma_mii_writereg; - ifmedia_init(&sc->sc_mii.mii_media, 0, gmc_mediachange, - gmc_mediastatus); + ifmedia_init(&mii->mii_media, 0, gmc_mediachange, gmc_mediastatus); if_attach(ifp); if_deferred_start_init(ifp, NULL); ether_ifattach(ifp, eaddrs[gma->gma_port]); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, + mii_attach(sc->sc_dev, mii, 0xffffffff, gma->gma_phy, MII_OFFSET_ANY, 0); - if (LIST_EMPTY(&sc->sc_mii.mii_phys)) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_EMPTY(&mii->mii_phys)) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); -// ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_1000_T|IFM_FDX); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); +// ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_1000_T | IFM_FDX); } sc->sc_gmac_status = bus_space_read_4(sc->sc_iot, sc->sc_gmac_ioh, diff --git a/sys/arch/mips/alchemy/dev/if_aumac.c b/sys/arch/mips/alchemy/dev/if_aumac.c index 81888e56500..cf396026e7e 100644 --- a/sys/arch/mips/alchemy/dev/if_aumac.c +++ b/sys/arch/mips/alchemy/dev/if_aumac.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_aumac.c,v 1.45 2019/01/22 03:42:25 msaitoh Exp $ */ +/* $NetBSD: if_aumac.c,v 1.46 2019/05/23 10:51:38 msaitoh Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.45 2019/01/22 03:42:25 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.46 2019/05/23 10:51:38 msaitoh Exp $"); @@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.45 2019/01/22 03:42:25 msaitoh Exp $" #include <sys/callout.h> #include <sys/device.h> #include <sys/endian.h> -#include <sys/errno.h> +#include <sys/errno.h> #include <sys/intr.h> #include <sys/ioctl.h> #include <sys/kernel.h> @@ -207,9 +207,9 @@ aumac_match(device_t parent, struct cfdata *cf, void *aux) struct aubus_attach_args *aa = aux; if (strcmp(aa->aa_name, cf->cf_name) == 0) - return (1); + return 1; - return (0); + return 0; } static void @@ -220,6 +220,7 @@ aumac_attach(device_t parent, device_t self, void *aux) struct aumac_softc *sc = device_private(self); struct aubus_attach_args *aa = aux; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; struct pglist pglist; paddr_t bufaddr; vaddr_t vbufaddr; @@ -309,22 +310,22 @@ aumac_attach(device_t parent, device_t self, void *aux) /* * Initialize the media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = aumac_mii_readreg; - sc->sc_mii.mii_writereg = aumac_mii_writereg; - sc->sc_mii.mii_statchg = aumac_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange, - ether_mediastatus); - - mii_attach(self, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii->mii_ifp = ifp; + mii->mii_readreg = aumac_mii_readreg; + mii->mii_writereg = aumac_mii_writereg; + mii->mii_statchg = aumac_mii_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus); + + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, + 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); strcpy(ifp->if_xname, device_xname(self)); ifp->if_softc = sc; @@ -337,7 +338,7 @@ aumac_attach(device_t parent, device_t self, void *aux) IFQ_SET_READY(&ifp->if_snd); /* Attach the interface. */ - if_attach(ifp); + if_attach(ifp); if_deferred_start_init(ifp, NULL); ether_ifattach(ifp, enaddr); @@ -394,7 +395,7 @@ aumac_start(struct ifnet *ifp) struct mbuf *m; int nexttx; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* @@ -505,7 +506,7 @@ aumac_ioctl(struct ifnet *ifp, u_long cmd, void *data) aumac_start(ifp); splx(s); - return (error); + return error; } /* @@ -527,7 +528,7 @@ aumac_intr(void *arg) * (for status updating). */ if ((sc->sc_ethercom.ec_if.if_flags & IFF_RUNNING) == 0) - return (0); + return 0; status = aumac_rxintr(sc); status += aumac_txintr(sc); @@ -806,14 +807,14 @@ aumac_init(struct ifnet *ifp) callout_reset(&sc->sc_tick_ch, hz, aumac_tick, sc); /* ...all done! */ - ifp->if_flags |= IFF_RUNNING; + ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; au_intr_enable(sc->sc_irq); out: if (error) printf("%s: interface not running\n", device_xname(sc->sc_dev)); - return (error); + return error; } /* @@ -870,11 +871,11 @@ aumac_powerup(struct aumac_softc *sc) { /* Enable clocks to the MAC. */ - bus_space_write_4(sc->sc_st, sc->sc_macen_sh, 0, MACEN_JP|MACEN_CE); + bus_space_write_4(sc->sc_st, sc->sc_macen_sh, 0, MACEN_JP | MACEN_CE); /* Enable MAC, coherent transactions, pass only valid frames. */ bus_space_write_4(sc->sc_st, sc->sc_macen_sh, 0, - MACEN_E2|MACEN_E1|MACEN_E0|MACEN_CE); + MACEN_E2 | MACEN_E1 | MACEN_E0 | MACEN_CE); delay(20000); } @@ -978,7 +979,7 @@ aumac_mii_wait(struct aumac_softc *sc, const char *msg) for (i = 0; i < 10000; i++) { if ((bus_space_read_4(sc->sc_st, sc->sc_mac_sh, MAC_MIICTRL) & MIICTRL_MB) == 0) - return (0); + return 0; delay(10); } diff --git a/sys/arch/mips/atheros/dev/if_ae.c b/sys/arch/mips/atheros/dev/if_ae.c index 999b1d15e11..aa9dccc389c 100644 --- a/sys/arch/mips/atheros/dev/if_ae.c +++ b/sys/arch/mips/atheros/dev/if_ae.c @@ -1,4 +1,4 @@ -/* $Id: if_ae.c,v 1.33 2019/03/08 08:35:58 msaitoh Exp $ */ +/* $Id: if_ae.c,v 1.34 2019/05/23 10:51:38 msaitoh Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. * Copyright (c) 2006 Garrett D'Amore. @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.33 2019/03/08 08:35:58 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.34 2019/05/23 10:51:38 msaitoh Exp $"); #include <sys/param.h> @@ -132,7 +132,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.33 2019/03/08 08:35:58 msaitoh Exp $"); #include <mips/atheros/dev/aevar.h> static const struct { - u_int32_t txth_opmode; /* OPMODE bits */ + uint32_t txth_opmode; /* OPMODE bits */ const char *txth_name; /* name of mode */ } ae_txthresh[] = { { OPMODE_TR_32, "32 words" }, @@ -150,7 +150,7 @@ static int ae_activate(device_t, enum devact); static int ae_ifflags_cb(struct ethercom *); static void ae_reset(struct ae_softc *); -static void ae_idle(struct ae_softc *, u_int32_t); +static void ae_idle(struct ae_softc *, uint32_t); static void ae_start(struct ifnet *); static void ae_watchdog(struct ifnet *); @@ -223,6 +223,7 @@ ae_attach(device_t parent, device_t self, void *aux) struct ae_softc *sc = device_private(self); struct arbus_attach_args *aa = aux; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; int i, error; sc->sc_dev = self; @@ -345,21 +346,20 @@ ae_attach(device_t parent, device_t self, void *aux) * Initialize our media structures. This may probe the MII, if * present. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = ae_mii_readreg; - sc->sc_mii.mii_writereg = ae_mii_writereg; - sc->sc_mii.mii_statchg = ae_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange, - ether_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii->mii_ifp = ifp; + mii->mii_readreg = ae_mii_readreg; + mii->mii_writereg = ae_mii_writereg; + mii->mii_statchg = ae_mii_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus); + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); sc->sc_tick = ae_mii_tick; @@ -556,7 +556,7 @@ ae_start(struct ifnet *ifp) device_xname(sc->sc_dev), sc->sc_flags, ifp->if_flags)); - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* @@ -594,7 +594,7 @@ ae_start(struct ifnet *ifp) */ if (((mtod(m0, uintptr_t) & 3) != 0) || bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { + BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) { MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { printf("%s: unable to allocate Tx mbuf\n", @@ -614,7 +614,7 @@ ae_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { printf("%s: unable to load Tx buffer, " "error = %d\n", device_xname(sc->sc_dev), @@ -710,7 +710,7 @@ ae_start(struct ifnet *ifp) /* Sync the descriptors we're using. */ AE_CDTXSYNC(sc, sc->sc_txnext, dmamap->dm_nsegs, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Store a pointer to the packet so we can free it later, @@ -749,7 +749,7 @@ ae_start(struct ifnet *ifp) */ sc->sc_txdescs[lasttx].ad_ctl |= ADCTL_Tx_IC; AE_CDTXSYNC(sc, lasttx, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * The entire packet chain is set up. Give the @@ -757,7 +757,7 @@ ae_start(struct ifnet *ifp) */ sc->sc_txdescs[firsttx].ad_status |= ADSTAT_OWN; AE_CDTXSYNC(sc, firsttx, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Wake up the transmitter. */ /* XXX USE AUTOPOLLING? */ @@ -806,7 +806,7 @@ ae_ifflags_cb(struct ethercom *ec) struct ae_softc *sc = ifp->if_softc; int change = ifp->if_flags ^ sc->sc_if_flags; - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) return ENETRESET; else if ((change & IFF_PROMISC) != 0) ae_filter_setup(sc); @@ -857,7 +857,7 @@ ae_intr(void *arg) { struct ae_softc *sc = arg; struct ifnet *ifp = &sc->sc_ethercom.ec_if; - u_int32_t status, rxstatus, txstatus; + uint32_t status, rxstatus, txstatus; int handled = 0, txthresh; DPRINTF(sc, ("%s: ae_intr\n", device_xname(sc->sc_dev))); @@ -927,8 +927,7 @@ ae_intr(void *arg) ae_idle(sc, OPMODE_ST); sc->sc_txthresh = txthresh; - opmode &= - ~(OPMODE_TR|OPMODE_SF); + opmode &= ~(OPMODE_TR | OPMODE_SF); opmode |= ae_txthresh[txthresh].txth_opmode; printf("%s: transmit underrun; new " @@ -950,7 +949,7 @@ ae_intr(void *arg) } } - if (status & (STATUS_TPS|STATUS_RPS)) { + if (status & (STATUS_TPS | STATUS_RPS)) { if (status & STATUS_TPS) printf("%s: transmit process stopped\n", device_xname(sc->sc_dev)); @@ -1012,14 +1011,14 @@ ae_rxintr(struct ae_softc *sc) struct ifnet *ifp = &sc->sc_ethercom.ec_if; struct ae_rxsoft *rxs; struct mbuf *m; - u_int32_t rxstat; + uint32_t rxstat; int i, len; for (i = sc->sc_rxptr;; i = AE_NEXTRX(i)) { rxs = &sc->sc_rxsoft[i]; AE_CDRXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); rxstat = sc->sc_rxdescs[i].ad_status; @@ -1150,7 +1149,7 @@ ae_txintr(struct ae_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; struct ae_txsoft *txs; - u_int32_t txstat; + uint32_t txstat; DPRINTF(sc, ("%s: ae_txintr: sc_flags 0x%08x\n", device_xname(sc->sc_dev), sc->sc_flags)); @@ -1164,7 +1163,7 @@ ae_txintr(struct ae_softc *sc) while ((txs = SIMPLEQ_FIRST(&sc->sc_txdirtyq)) != NULL) { AE_CDTXSYNC(sc, txs->txs_lastdesc, txs->txs_ndescs, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); #ifdef AE_DEBUG if (ifp->if_flags & IFF_DEBUG) { @@ -1217,7 +1216,7 @@ ae_txintr(struct ae_softc *sc) sc->sc_stats.ts_tx_lc++; #endif - if (txstat & (ADSTAT_Tx_UF|ADSTAT_Tx_TO)) + if (txstat & (ADSTAT_Tx_UF | ADSTAT_Tx_TO)) ifp->if_oerrors++; if (txstat & ADSTAT_Tx_EC) @@ -1334,7 +1333,7 @@ ae_init(struct ifnet *ifp) } sc->sc_txdescs[AE_NTXDESC - 1].ad_ctl |= ADCTL_ER; AE_CDTXSYNC(sc, 0, AE_NTXDESC, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc->sc_txfree = AE_NTXDESC; sc->sc_txnext = 0; @@ -1382,8 +1381,8 @@ ae_init(struct ifnet *ifp) sc->sc_inten |= STATUS_TPS | STATUS_TJT | STATUS_UNF | STATUS_RU | STATUS_RPS | STATUS_SE | STATUS_AIS; - sc->sc_rxint_mask = STATUS_RI|STATUS_RU; - sc->sc_txint_mask = STATUS_TI|STATUS_UNF|STATUS_TJT; + sc->sc_rxint_mask = STATUS_RI | STATUS_RU; + sc->sc_txint_mask = STATUS_TI | STATUS_UNF | STATUS_TJT; sc->sc_rxint_mask &= sc->sc_inten; sc->sc_txint_mask &= sc->sc_inten; @@ -1641,7 +1640,7 @@ ae_add_rxbuf(struct ae_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmat, rxs->rxs_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { printf("%s: can't load rx DMA map %d, error = %d\n", device_xname(sc->sc_dev), idx, error); @@ -1742,7 +1741,7 @@ ae_filter_setup(struct ae_softc *sc) * Cause the transmit and/or receive processes to go idle. */ void -ae_idle(struct ae_softc *sc, u_int32_t bits) +ae_idle(struct ae_softc *sc, uint32_t bits) { static const char * const txstate_names[] = { "STOPPED", @@ -1765,7 +1764,7 @@ ae_idle(struct ae_softc *sc, u_int32_t bits) "RUNNING - QUEUE", }; - u_int32_t csr, ackmask = 0; + uint32_t csr, ackmask = 0; int i; if (bits & OPMODE_ST) @@ -1840,7 +1839,7 @@ ae_mii_statchg(struct ifnet *ifp) /* XXX: do we need to do this? */ /* Idle the transmit and receive processes. */ - //ae_idle(sc, OPMODE_ST|OPMODE_SR); + //ae_idle(sc, OPMODE_ST | OPMODE_SR); if (sc->sc_mii.mii_media_active & IFM_FDX) { flowc = FLOWC_FCE; diff --git a/sys/arch/powerpc/booke/dev/pq3etsec.c b/sys/arch/powerpc/booke/dev/pq3etsec.c index 67cd49062f6..eb1722ed060 100644 --- a/sys/arch/powerpc/booke/dev/pq3etsec.c +++ b/sys/arch/powerpc/booke/dev/pq3etsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: pq3etsec.c,v 1.43 2019/04/26 06:33:33 msaitoh Exp $ */ +/* $NetBSD: pq3etsec.c,v 1.44 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -41,7 +41,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.43 2019/04/26 06:33:33 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.44 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -93,27 +93,27 @@ __KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.43 2019/04/26 06:33:33 msaitoh Exp $" #define ETSEC_NRXSEGS 1 #define IFCAP_RCTRL_IPCSEN IFCAP_CSUM_IPv4_Rx -#define IFCAP_RCTRL_TUCSEN (IFCAP_CSUM_TCPv4_Rx\ - |IFCAP_CSUM_UDPv4_Rx\ - |IFCAP_CSUM_TCPv6_Rx\ - |IFCAP_CSUM_UDPv6_Rx) +#define IFCAP_RCTRL_TUCSEN (IFCAP_CSUM_TCPv4_Rx \ + | IFCAP_CSUM_UDPv4_Rx \ + | IFCAP_CSUM_TCPv6_Rx \ + | IFCAP_CSUM_UDPv6_Rx) #define IFCAP_TCTRL_IPCSEN IFCAP_CSUM_IPv4_Tx -#define IFCAP_TCTRL_TUCSEN (IFCAP_CSUM_TCPv4_Tx\ - |IFCAP_CSUM_UDPv4_Tx\ - |IFCAP_CSUM_TCPv6_Tx\ - |IFCAP_CSUM_UDPv6_Tx) - -#define IFCAP_ETSEC (IFCAP_RCTRL_IPCSEN|IFCAP_RCTRL_TUCSEN\ - |IFCAP_TCTRL_IPCSEN|IFCAP_TCTRL_TUCSEN) - -#define M_CSUM_IP (M_CSUM_CIP|M_CSUM_CTU) -#define M_CSUM_IP6 (M_CSUM_TCPv6|M_CSUM_UDPv6) -#define M_CSUM_TUP (M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_TCPv6|M_CSUM_UDPv6) -#define M_CSUM_UDP (M_CSUM_UDPv4|M_CSUM_UDPv6) -#define M_CSUM_IP4 (M_CSUM_IPv4|M_CSUM_UDPv4|M_CSUM_TCPv4) -#define M_CSUM_CIP (M_CSUM_IPv4) -#define M_CSUM_CTU (M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_TCPv6|M_CSUM_UDPv6) +#define IFCAP_TCTRL_TUCSEN (IFCAP_CSUM_TCPv4_Tx \ + | IFCAP_CSUM_UDPv4_Tx \ + | IFCAP_CSUM_TCPv6_Tx \ + | IFCAP_CSUM_UDPv6_Tx) + +#define IFCAP_ETSEC (IFCAP_RCTRL_IPCSEN | IFCAP_RCTRL_TUCSEN \ + | IFCAP_TCTRL_IPCSEN | IFCAP_TCTRL_TUCSEN) + +#define M_CSUM_IP (M_CSUM_CIP | M_CSUM_CTU) +#define M_CSUM_IP6 (M_CSUM_TCPv6 | M_CSUM_UDPv6) +#define M_CSUM_TUP (M_CSUM_TCPv4 | M_CSUM_UDPv4 | M_CSUM_TCPv6 | M_CSUM_UDPv6) +#define M_CSUM_UDP (M_CSUM_UDPv4 | M_CSUM_UDPv6) +#define M_CSUM_IP4 (M_CSUM_IPv4 | M_CSUM_UDPv4 | M_CSUM_TCPv4) +#define M_CSUM_CIP (M_CSUM_IPv4) +#define M_CSUM_CTU (M_CSUM_TCPv4 | M_CSUM_UDPv4 | M_CSUM_TCPv6 | M_CSUM_UDPv6) struct pq3etsec_txqueue { bus_dmamap_t txq_descmap; @@ -482,8 +482,8 @@ pq3etsec_mii_statchg(struct ifnet *ifp) uint32_t maccfg2 = sc->sc_maccfg2; uint32_t ecntrl = sc->sc_ecntrl; - maccfg1 &= ~(MACCFG1_TX_FLOW|MACCFG1_RX_FLOW); - maccfg2 &= ~(MACCFG2_IFMODE|MACCFG2_FD); + maccfg1 &= ~(MACCFG1_TX_FLOW | MACCFG1_RX_FLOW); + maccfg2 &= ~(MACCFG2_IFMODE | MACCFG2_FD); if (sc->sc_mii.mii_media_active & IFM_FDX) { maccfg2 |= MACCFG2_FD; @@ -567,6 +567,7 @@ pq3etsec_attach(device_t parent, device_t self, void *aux) { struct cpunode_softc * const psc = device_private(parent); struct pq3etsec_softc * const sc = device_private(self); + struct mii_data * const mii = &sc->sc_mii; struct cpunode_attach_args * const cna = aux; struct cpunode_locators * const cnl = &cna->cna_locs; cfdata_t cf = device_cfdata(self); @@ -750,30 +751,31 @@ pq3etsec_attach(device_t parent, device_t self, void *aux) struct ethercom * const ec = &sc->sc_ec; struct ifnet * const ifp = &ec->ec_if; - ec->ec_mii = &sc->sc_mii; + ec->ec_mii = mii; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = pq3mdio_mii_readreg; - sc->sc_mii.mii_writereg = pq3mdio_mii_writereg; - sc->sc_mii.mii_statchg = pq3etsec_mii_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = pq3mdio_mii_readreg; + mii->mii_writereg = pq3mdio_mii_writereg; + mii->mii_statchg = pq3etsec_mii_statchg; - ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange, - ether_mediastatus); + ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus); if (sc->sc_mdio_dev != NULL && sc->sc_phy_addr < 32) { - mii_attach(sc->sc_mdio_dev, &sc->sc_mii, 0xffffffff, + mii_attach(sc->sc_mdio_dev, mii, 0xffffffff, sc->sc_phy_addr, MII_OFFSET_ANY, MIIF_DOPAUSE); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, + 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { callout_schedule(&sc->sc_mii_callout, hz); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } else { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_1000_T|IFM_FDX, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_1000_T|IFM_FDX); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_1000_T | IFM_FDX, + 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_1000_T | IFM_FDX); } ec->ec_capabilities = ETHERCAP_VLAN_MTU | ETHERCAP_VLAN_HWTAGGING @@ -826,8 +828,8 @@ pq3etsec_attach(device_t parent, device_t self, void *aux) return; fail_10: - ifmedia_removeall(&sc->sc_mii.mii_media); - mii_detach(&sc->sc_mii, sc->sc_phy_addr, MII_OFFSET_ANY); + ifmedia_removeall(&mii->mii_media); + mii_detach(mii, sc->sc_phy_addr, MII_OFFSET_ANY); fail_9: softint_disestablish(sc->sc_soft_ih); fail_8: @@ -912,7 +914,8 @@ pq3etsec_ifinit(struct ifnet *ifp) } uint32_t rctrl_prsdep = 0; - sc->sc_rctrl &= ~(RCTRL_IPCSEN|RCTRL_TUCSEN|RCTRL_VLEX|RCTRL_PRSDEP); + sc->sc_rctrl &= + ~(RCTRL_IPCSEN | RCTRL_TUCSEN | RCTRL_VLEX | RCTRL_PRSDEP); if (VLAN_ATTACHED(&sc->sc_ec)) { sc->sc_rctrl |= RCTRL_VLEX; rctrl_prsdep = RCTRL_PRSDEP_L2; @@ -927,7 +930,8 @@ pq3etsec_ifinit(struct ifnet *ifp) } sc->sc_rctrl |= rctrl_prsdep; #if 0 - if (sc->sc_rctrl & (RCTRL_IPCSEN|RCTRL_TUCSEN|RCTRL_VLEX|RCTRL_PRSDEP)) + if (sc->sc_rctrl + & (RCTRL_IPCSEN | RCTRL_TUCSEN | RCTRL_VLEX | RCTRL_PRSDEP)) aprint_normal_dev(sc->sc_dev, "rctrl=%#x ipcsen=%"PRIuMAX" tucsen=%"PRIuMAX" vlex=%"PRIuMAX" prsdep=%"PRIuMAX"\n", sc->sc_rctrl, @@ -937,7 +941,7 @@ pq3etsec_ifinit(struct ifnet *ifp) __SHIFTOUT(sc->sc_rctrl, RCTRL_PRSDEP)); #endif - sc->sc_tctrl &= ~(TCTRL_IPCSEN|TCTRL_TUCSEN|TCTRL_VLINS); + sc->sc_tctrl &= ~(TCTRL_IPCSEN | TCTRL_TUCSEN | TCTRL_VLINS); if (VLAN_ATTACHED(&sc->sc_ec)) /* is this really true */ sc->sc_tctrl |= TCTRL_VLINS; if (ifp->if_capenable & IFCAP_TCTRL_IPCSEN) @@ -945,7 +949,7 @@ pq3etsec_ifinit(struct ifnet *ifp) if (ifp->if_capenable & IFCAP_TCTRL_TUCSEN) sc->sc_tctrl |= TCTRL_TUCSEN; #if 0 - if (sc->sc_tctrl & (TCTRL_IPCSEN|TCTRL_TUCSEN|TCTRL_VLINS)) + if (sc->sc_tctrl & (TCTRL_IPCSEN | TCTRL_TUCSEN | TCTRL_VLINS)) aprint_normal_dev(sc->sc_dev, "tctrl=%#x ipcsen=%"PRIuMAX" tucsen=%"PRIuMAX" vlins=%"PRIuMAX"\n", sc->sc_tctrl, @@ -954,7 +958,7 @@ pq3etsec_ifinit(struct ifnet *ifp) __SHIFTOUT(sc->sc_tctrl, TCTRL_VLINS)); #endif - sc->sc_maccfg1 &= ~(MACCFG1_TX_EN|MACCFG1_RX_EN); + sc->sc_maccfg1 &= ~(MACCFG1_TX_EN | MACCFG1_RX_EN); const uint64_t macstnaddr = pq3etsec_macaddr_create(CLLADDR(ifp->if_sadl)); @@ -989,13 +993,13 @@ pq3etsec_ifinit(struct ifnet *ifp) /* 11. Enable transmit queues in TQUEUE, and ensure that the transmit scheduling mode is correctly set in TCTRL. */ etsec_write(sc, TQUEUE, TQUEUE_EN0); - sc->sc_imask |= IEVENT_TXF|IEVENT_TXE|IEVENT_TXC; + sc->sc_imask |= IEVENT_TXF | IEVENT_TXE | IEVENT_TXC; etsec_write(sc, TCTRL, sc->sc_tctrl); /* for TOE stuff */ /* 12. Enable receive queues in RQUEUE, */ - etsec_write(sc, RQUEUE, RQUEUE_EN0|RQUEUE_EX0); - sc->sc_imask |= IEVENT_RXF|IEVENT_BSY|IEVENT_RXC; + etsec_write(sc, RQUEUE, RQUEUE_EN0 | RQUEUE_EX0); + sc->sc_imask |= IEVENT_RXF | IEVENT_BSY | IEVENT_RXC; /* and optionally set TOE functionality in RCTRL. */ etsec_write(sc, RCTRL, sc->sc_rctrl); @@ -1010,7 +1014,7 @@ pq3etsec_ifinit(struct ifnet *ifp) etsec_write(sc, RSTAT, RSTAT_QHLT | RSTAT_RXF); /* 15. Clear GRS/GTS bits in DMACTRL (do not change other bits) */ - sc->sc_dmactrl &= ~(DMACTRL_GRS|DMACTRL_GTS); + sc->sc_dmactrl &= ~(DMACTRL_GRS | DMACTRL_GTS); etsec_write(sc, DMACTRL, sc->sc_dmactrl); /* 16. Enable Tx_EN/Rx_EN in MACCFG1 register */ @@ -1032,7 +1036,7 @@ pq3etsec_ifstop(struct ifnet *ifp, int disable) struct pq3etsec_softc * const sc = ifp->if_softc; KASSERT(!cpu_intr_p()); - const uint32_t imask_gsc_mask = IEVENT_GTSC|IEVENT_GRSC; + const uint32_t imask_gsc_mask = IEVENT_GTSC | IEVENT_GRSC; /* * Clear the GTSC and GRSC from the interrupt mask until * we are ready for them. Then clear them from IEVENT, @@ -1045,12 +1049,12 @@ pq3etsec_ifstop(struct ifnet *ifp, int disable) /* * 1. Set GRS/GTS bits in DMACTRL register */ - sc->sc_dmactrl |= DMACTRL_GRS|DMACTRL_GTS; + sc->sc_dmactrl |= DMACTRL_GRS | DMACTRL_GTS; etsec_write(sc, IMASK, sc->sc_imask & ~imask_gsc_mask); etsec_write(sc, IEVENT, imask_gsc_mask); etsec_write(sc, DMACTRL, sc->sc_dmactrl); - if (etsec_read(sc, MACCFG1) & (MACCFG1_TX_EN|MACCFG1_RX_EN)) { + if (etsec_read(sc, MACCFG1) & (MACCFG1_TX_EN | MACCFG1_RX_EN)) { /* * 2. Poll GRSC/GTSC bits in IEVENT register until both are set */ @@ -1240,7 +1244,7 @@ pq3etsec_rxq_desc_presync( { bus_dmamap_sync(sc->sc_dmat, rxq->rxq_descmap, (rxbd - rxq->rxq_first) * sizeof(*rxbd), count * sizeof(*rxbd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } static void @@ -1252,7 +1256,7 @@ pq3etsec_rxq_desc_postsync( { bus_dmamap_sync(sc->sc_dmat, rxq->rxq_descmap, (rxbd - rxq->rxq_first) * sizeof(*rxbd), count * sizeof(*rxbd), - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); } static void @@ -1264,7 +1268,7 @@ pq3etsec_txq_desc_presync( { bus_dmamap_sync(sc->sc_dmat, txq->txq_descmap, (txbd - txq->txq_first) * sizeof(*txbd), count * sizeof(*txbd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } static void @@ -1276,7 +1280,7 @@ pq3etsec_txq_desc_postsync( { bus_dmamap_sync(sc->sc_dmat, txq->txq_descmap, (txbd - txq->txq_first) * sizeof(*txbd), count * sizeof(*txbd), - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); } static bus_dmamap_t @@ -1335,7 +1339,7 @@ pq3etsec_mapcache_create( for (u_int i = 0; i < maxmaps; i++) { int error = bus_dmamap_create(sc->sc_dmat, dmc->dmc_maxmapsize, dmc->dmc_maxseg, dmc->dmc_maxmapsize, 0, - BUS_DMA_WAITOK|BUS_DMA_ALLOCNOW, &dmc->dmc_maps[i]); + BUS_DMA_WAITOK | BUS_DMA_ALLOCNOW, &dmc->dmc_maps[i]); if (error) { aprint_error_dev(sc->sc_dev, "failed to creat dma map cache " @@ -1438,7 +1442,7 @@ pq3etsec_rx_buf_alloc( M_SETCTX(m, map); m->m_len = m->m_pkthdr.len = MCLBYTES; int error = bus_dmamap_load_mbuf(sc->sc_dmat, map, m, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "fail to load rx dmamap: %d\n", error); @@ -1549,10 +1553,10 @@ pq3etsec_rx_offload( vlan_set_tag(m, fcb->rxfcb_vlctl); } if ((fcb->rxfcb_flags & RXFCB_IP) == 0 - || (fcb->rxfcb_flags & (RXFCB_CIP|RXFCB_CTU)) == 0) + || (fcb->rxfcb_flags & (RXFCB_CIP | RXFCB_CTU)) == 0) return true; int csum_flags = 0; - if ((fcb->rxfcb_flags & (RXFCB_IP6|RXFCB_CIP)) == RXFCB_CIP) { + if ((fcb->rxfcb_flags & (RXFCB_IP6 | RXFCB_CIP)) == RXFCB_CIP) { csum_flags |= M_CSUM_IPv4; if (fcb->rxfcb_flags & RXFCB_EIP) csum_flags |= M_CSUM_IPv4_BAD; @@ -1560,13 +1564,13 @@ pq3etsec_rx_offload( if ((fcb->rxfcb_flags & RXFCB_CTU) == RXFCB_CTU) { int ipv_flags; if (fcb->rxfcb_flags & RXFCB_IP6) - ipv_flags = M_CSUM_TCPv6|M_CSUM_UDPv6; + ipv_flags = M_CSUM_TCPv6 | M_CSUM_UDPv6; else - ipv_flags = M_CSUM_TCPv4|M_CSUM_UDPv4; + ipv_flags = M_CSUM_TCPv4 | M_CSUM_UDPv4; if (fcb->rxfcb_pro == IPPROTO_TCP) { - csum_flags |= (M_CSUM_TCPv4|M_CSUM_TCPv6) & ipv_flags; + csum_flags |= (M_CSUM_TCPv4 |M_CSUM_TCPv6) & ipv_flags; } else { - csum_flags |= (M_CSUM_UDPv4|M_CSUM_UDPv6) & ipv_flags; + csum_flags |= (M_CSUM_UDPv4 |M_CSUM_UDPv6) & ipv_flags; } if (fcb->rxfcb_flags & RXFCB_ETU) csum_flags |= M_CSUM_TCP_UDP_BAD; @@ -1654,13 +1658,13 @@ pq3etsec_rxq_consume( * We own this packet again. Clear all flags except wrap. */ rxconsumed++; - consumer->rxbd_flags = rxbd_flags & (RXBD_W|RXBD_I); + consumer->rxbd_flags = rxbd_flags & (RXBD_W | RXBD_I); /* * If this descriptor has the LAST bit set and no errors, * it's a valid input packet. */ - if ((rxbd_flags & (RXBD_L|RXBD_ERRORS)) == RXBD_L) { + if ((rxbd_flags & (RXBD_L | RXBD_ERRORS)) == RXBD_L) { size_t rxbd_len = consumer->rxbd_len; struct mbuf *m = rxq->rxq_mhead; struct mbuf *m_last = rxq->rxq_mconsumer; @@ -1765,7 +1769,7 @@ pq3etsec_rxq_reset( /* * Last descriptor has the wrap flag. */ - rxbd->rxbd_flags = RXBD_W|RXBD_I; + rxbd->rxbd_flags = RXBD_W | RXBD_I; /* * Reset the producer consumer indexes. @@ -1776,7 +1780,7 @@ pq3etsec_rxq_reset( if (rxq->rxq_threshold < ETSEC_MINRXMBUFS) rxq->rxq_threshold = ETSEC_MINRXMBUFS; - sc->sc_imask |= IEVENT_RXF|IEVENT_BSY; + sc->sc_imask |= IEVENT_RXF | IEVENT_BSY; /* * Restart the transmit at the first descriptor @@ -2317,7 +2321,7 @@ pq3etsec_txq_reset( /* * What do we want to get interrupted on? */ - sc->sc_imask |= IEVENT_TXF|IEVENT_TXE; + sc->sc_imask |= IEVENT_TXF | IEVENT_TXE; /* * Restart the transmit at the first descriptor @@ -2330,7 +2334,7 @@ pq3etsec_ifstart(struct ifnet *ifp) { struct pq3etsec_softc * const sc = ifp->if_softc; - if (__predict_false((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING)) { + if (__predict_false((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)) { return; } @@ -2348,7 +2352,8 @@ pq3etsec_tx_error( if (pq3etsec_txq_fillable_p(sc, txq)) sc->sc_if.if_flags &= ~IFF_OACTIVE; - if (sc->sc_txerrors & (IEVENT_LC|IEVENT_CRL|IEVENT_XFUN|IEVENT_BABT)) { + if (sc->sc_txerrors + & (IEVENT_LC | IEVENT_CRL | IEVENT_XFUN | IEVENT_BABT)) { } else if (sc->sc_txerrors & IEVENT_EBERR) { } @@ -2372,7 +2377,7 @@ pq3etsec_tx_intr(void *arg) sc->sc_ev_tx_intr.ev_count++; uint32_t ievent = etsec_read(sc, IEVENT); - ievent &= IEVENT_TXF|IEVENT_TXB; + ievent &= IEVENT_TXF | IEVENT_TXB; etsec_write(sc, IEVENT, ievent); /* write 1 to clear */ #if 0 @@ -2385,7 +2390,7 @@ pq3etsec_tx_intr(void *arg) return 0; } - sc->sc_imask &= ~(IEVENT_TXF|IEVENT_TXB); + sc->sc_imask &= ~(IEVENT_TXF | IEVENT_TXB); atomic_or_uint(&sc->sc_soft_flags, SOFT_TXINTR); etsec_write(sc, IMASK, sc->sc_imask); softint_schedule(sc->sc_soft_ih); @@ -2405,7 +2410,7 @@ pq3etsec_rx_intr(void *arg) sc->sc_ev_rx_intr.ev_count++; uint32_t ievent = etsec_read(sc, IEVENT); - ievent &= IEVENT_RXF|IEVENT_RXB; + ievent &= IEVENT_RXF | IEVENT_RXB; etsec_write(sc, IEVENT, ievent); /* write 1 to clear */ if (ievent == 0) { mutex_exit(sc->sc_hwlock); @@ -2416,7 +2421,7 @@ pq3etsec_rx_intr(void *arg) aprint_normal_dev(sc->sc_dev, "%s: ievent=%#x\n", __func__, ievent); #endif - sc->sc_imask &= ~(IEVENT_RXF|IEVENT_RXB); + sc->sc_imask &= ~(IEVENT_RXF | IEVENT_RXB); atomic_or_uint(&sc->sc_soft_flags, SOFT_RXINTR); etsec_write(sc, IMASK, sc->sc_imask); softint_schedule(sc->sc_soft_ih); @@ -2437,7 +2442,7 @@ pq3etsec_error_intr(void *arg) for (int rv = 0, soft_flags = 0;; rv = 1) { uint32_t ievent = etsec_read(sc, IEVENT); - ievent &= ~(IEVENT_RXF|IEVENT_RXB|IEVENT_TXF|IEVENT_TXB); + ievent &= ~(IEVENT_RXF | IEVENT_RXB | IEVENT_TXF | IEVENT_TXB); etsec_write(sc, IEVENT, ievent); /* write 1 to clear */ if (ievent == 0) { if (soft_flags) { @@ -2452,13 +2457,13 @@ pq3etsec_error_intr(void *arg) __func__, ievent, etsec_read(sc, IMASK)); #endif - if (ievent & (IEVENT_GRSC|IEVENT_GTSC)) { - sc->sc_imask &= ~(IEVENT_GRSC|IEVENT_GTSC); + if (ievent & (IEVENT_GRSC | IEVENT_GTSC)) { + sc->sc_imask &= ~(IEVENT_GRSC | IEVENT_GTSC); etsec_write(sc, IMASK, sc->sc_imask); wakeup(sc); } - if (ievent & (IEVENT_MMRD|IEVENT_MMWR)) { - sc->sc_imask &= ~(IEVENT_MMRD|IEVENT_MMWR); + if (ievent & (IEVENT_MMRD | IEVENT_MMWR)) { + sc->sc_imask &= ~(IEVENT_MMRD | IEVENT_MMWR); etsec_write(sc, IMASK, sc->sc_imask); wakeup(&sc->sc_mii); } @@ -2536,7 +2541,7 @@ pq3etsec_soft_intr(void *arg) imask |= IEVENT_TXF; } - if (soft_flags & (SOFT_RXINTR|SOFT_RXBSY)) { + if (soft_flags & (SOFT_RXINTR | SOFT_RXBSY)) { /* Let's consume */ pq3etsec_rxq_consume(sc, &sc->sc_rxq); imask |= IEVENT_RXF; @@ -2736,7 +2741,7 @@ static void pq3etsec_sysctl_setup(struct sysctllog **clog, goto bad; if (sysctl_createv(clog, 0, &rnode, &cnode, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLFLAG_PERMANENT | CTLFLAG_READWRITE, CTLTYPE_INT, "rx_time", SYSCTL_DESCR("RX time threshold (0-65535)"), pq3etsec_sysctl_ic_rx_time_helper, 0, (void *)sc, 0, @@ -2744,7 +2749,7 @@ static void pq3etsec_sysctl_setup(struct sysctllog **clog, goto bad; if (sysctl_createv(clog, 0, &rnode, &cnode, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLFLAG_PERMANENT | CTLFLAG_READWRITE, CTLTYPE_INT, "rx_count", SYSCTL_DESCR("RX frame count threshold (0-255)"), pq3etsec_sysctl_ic_rx_count_helper, 0, (void *)sc, 0, @@ -2752,7 +2757,7 @@ static void pq3etsec_sysctl_setup(struct sysctllog **clog, goto bad; if (sysctl_createv(clog, 0, &rnode, &cnode, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLFLAG_PERMANENT | CTLFLAG_READWRITE, CTLTYPE_INT, "tx_time", SYSCTL_DESCR("TX time threshold (0-65535)"), pq3etsec_sysctl_ic_tx_time_helper, 0, (void *)sc, 0, @@ -2760,7 +2765,7 @@ static void pq3etsec_sysctl_setup(struct sysctllog **clog, goto bad; if (sysctl_createv(clog, 0, &rnode, &cnode, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLFLAG_PERMANENT | CTLFLAG_READWRITE, CTLTYPE_INT, "tx_count", SYSCTL_DESCR("TX frame count threshold (0-255)"), pq3etsec_sysctl_ic_tx_count_helper, 0, (void *)sc, 0, diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c index 00e9b325b79..197080ff47b 100644 --- a/sys/dev/ic/aic6915.c +++ b/sys/dev/ic/aic6915.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic6915.c,v 1.37 2019/01/22 03:42:26 msaitoh Exp $ */ +/* $NetBSD: aic6915.c,v 1.38 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.37 2019/01/22 03:42:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.38 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> @@ -137,9 +137,10 @@ void sf_attach(struct sf_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; int i, rseg, error; bus_dma_segment_t seg; - u_int8_t enaddr[ETHER_ADDR_LEN]; + uint8_t enaddr[ETHER_ADDR_LEN]; callout_init(&sc->sc_tick_callout, 0); @@ -182,7 +183,7 @@ sf_attach(struct sf_softc *sc) if ((error = bus_dmamem_map(sc->sc_dmat, &seg, rseg, sizeof(struct sf_control_data), (void **)&sc->sc_control_data, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { aprint_error_dev(sc->sc_dev, "unable to map control data, error = %d\n", error); goto fail_1; @@ -254,20 +255,20 @@ sf_attach(struct sf_softc *sc) /* * Initialize our media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = sf_mii_read; - sc->sc_mii.mii_writereg = sf_mii_write; - sc->sc_mii.mii_statchg = sf_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ether_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = sf_mii_read; + mii->mii_writereg = sf_mii_write; + mii->mii_statchg = sf_mii_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ether_mediachange, ether_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ); ifp->if_softc = sc; @@ -395,7 +396,7 @@ sf_start(struct ifnet *ifp) * again. */ if (bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { + BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) { MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { aprint_error_dev(sc->sc_dev, @@ -414,7 +415,7 @@ sf_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "unable to load Tx buffer, error = %d\n", @@ -565,7 +566,7 @@ sf_intr(void *arg) sf_rxintr(sc); /* Handle transmit completion interrupts. */ - if (isr & (IS_TxDmaDoneInt|IS_TxQueueDoneInt)) + if (isr & (IS_TxDmaDoneInt | IS_TxQueueDoneInt)) sf_txintr(sc); /* Handle abnormal interrupts. */ @@ -710,9 +711,9 @@ sf_rxintr(struct sf_softc *sc) while (consumer != producer) { rcd = &sc->sc_rxcomp[consumer]; SF_CDRXCSYNC(sc, consumer, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); SF_CDRXCSYNC(sc, consumer, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); word0 = le32toh(rcd->rcd_word0); rxidx = RCD_W0_EndIndex(word0); @@ -946,7 +947,7 @@ sf_init(struct ifnet *ifp) */ for (i = 0; i < SF_NTCD; i++) { sc->sc_txcomp[i].tcd_word0 = TCD_DMA_ID; - SF_CDTXCSYNC(sc, i, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + SF_CDTXCSYNC(sc, i, BUS_DMASYNC_PREREAD |BUS_DMASYNC_PREWRITE); } sf_funcreg_write(sc, SF_CompletionQueueHighAddr, 0); sf_funcreg_write(sc, SF_TxCompletionQueueCtrl, SF_CDTXCADDR(sc, 0)); @@ -983,7 +984,7 @@ sf_init(struct ifnet *ifp) sc->sc_rxcomp[i].rcd_word1 = 0; sc->sc_rxcomp[i].rcd_word2 = 0; sc->sc_rxcomp[i].rcd_timestamp = 0; - SF_CDRXCSYNC(sc, i, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + SF_CDRXCSYNC(sc, i, BUS_DMASYNC_PREREAD |BUS_DMASYNC_PREWRITE); } sf_funcreg_write(sc, SF_RxCompletionQueue1Ctrl, SF_CDRXCADDR(sc, 0) | RCQ1C_RxCompletionQ1Type(3)); @@ -1079,7 +1080,7 @@ sf_init(struct ifnet *ifp) * Start the transmit and receive processes. */ sf_funcreg_write(sc, SF_GeneralEthernetCtrl, - GEC_TxDmaEn|GEC_RxDmaEn|GEC_TransmitEn|GEC_ReceiveEn); + GEC_TxDmaEn | GEC_RxDmaEn | GEC_TransmitEn | GEC_ReceiveEn); /* Start the on second clock. */ callout_reset(&sc->sc_tick_callout, hz, sf_tick, sc); @@ -1210,7 +1211,7 @@ sf_add_rxbuf(struct sf_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmat, ds->ds_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "can't load rx DMA map %d, error = %d\n", idx, error); diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c index 7eea5e1857c..f9d5e0e521c 100644 --- a/sys/dev/ic/elinkxl.c +++ b/sys/dev/ic/elinkxl.c @@ -1,4 +1,4 @@ -/* $NetBSD: elinkxl.c,v 1.128 2019/04/22 08:05:01 msaitoh Exp $ */ +/* $NetBSD: elinkxl.c,v 1.129 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.128 2019/04/22 08:05:01 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.129 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -120,23 +120,23 @@ struct ex_media { * `native' media. */ static const struct ex_media ex_native_media[] = { - { ELINK_PCI_10BASE_T, "10baseT", IFM_ETHER|IFM_10_T, + { ELINK_PCI_10BASE_T, "10baseT", IFM_ETHER | IFM_10_T, ELINKMEDIA_10BASE_T }, - { ELINK_PCI_10BASE_T, "10baseT-FDX", IFM_ETHER|IFM_10_T|IFM_FDX, + { ELINK_PCI_10BASE_T, "10baseT-FDX", IFM_ETHER | IFM_10_T | IFM_FDX, ELINKMEDIA_10BASE_T }, - { ELINK_PCI_AUI, "10base5", IFM_ETHER|IFM_10_5, + { ELINK_PCI_AUI, "10base5", IFM_ETHER | IFM_10_5, ELINKMEDIA_AUI }, - { ELINK_PCI_BNC, "10base2", IFM_ETHER|IFM_10_2, + { ELINK_PCI_BNC, "10base2", IFM_ETHER | IFM_10_2, ELINKMEDIA_10BASE_2 }, - { ELINK_PCI_100BASE_TX, "100baseTX", IFM_ETHER|IFM_100_TX, + { ELINK_PCI_100BASE_TX, "100baseTX", IFM_ETHER | IFM_100_TX, ELINKMEDIA_100BASE_TX }, - { ELINK_PCI_100BASE_TX, "100baseTX-FDX",IFM_ETHER|IFM_100_TX|IFM_FDX, + { ELINK_PCI_100BASE_TX, "100baseTX-FDX",IFM_ETHER | IFM_100_TX|IFM_FDX, ELINKMEDIA_100BASE_TX }, - { ELINK_PCI_100BASE_FX, "100baseFX", IFM_ETHER|IFM_100_FX, + { ELINK_PCI_100BASE_FX, "100baseFX", IFM_ETHER | IFM_100_FX, ELINKMEDIA_100BASE_FX }, - { ELINK_PCI_100BASE_MII,"manual", IFM_ETHER|IFM_MANUAL, + { ELINK_PCI_100BASE_MII,"manual", IFM_ETHER | IFM_MANUAL, ELINKMEDIA_MII }, - { ELINK_PCI_100BASE_T4, "100baseT4", IFM_ETHER|IFM_100_T4, + { ELINK_PCI_100BASE_T4, "100baseT4", IFM_ETHER | IFM_100_T4, ELINKMEDIA_100BASE_T4 }, { 0, NULL, 0, 0 }, @@ -167,6 +167,7 @@ void ex_config(struct ex_softc *sc) { struct ifnet *ifp; + struct mii_data * const mii = &sc->ex_mii; uint16_t val; uint8_t macaddr[ETHER_ADDR_LEN] = {0}; bus_space_tag_t iot = sc->sc_iot; @@ -189,9 +190,10 @@ ex_config(struct ex_softc *sc) macaddr[4] = val >> 8; macaddr[5] = val & 0xff; - aprint_normal_dev(sc->sc_dev, "MAC address %s\n", ether_sprintf(macaddr)); + aprint_normal_dev(sc->sc_dev, "MAC address %s\n", + ether_sprintf(macaddr)); - if (sc->ex_conf & (EX_CONF_INV_LED_POLARITY|EX_CONF_PHY_POWER)) { + if (sc->ex_conf & (EX_CONF_INV_LED_POLARITY | EX_CONF_PHY_POWER)) { GO_WINDOW(2); val = bus_space_read_2(iot, ioh, ELINK_W2_RESET_OPTIONS); if (sc->ex_conf & EX_CONF_INV_LED_POLARITY) @@ -224,7 +226,7 @@ ex_config(struct ex_softc *sc) if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_useg, sc->sc_urseg, EX_NUPD * sizeof (struct ex_upd), (void **)&sc->sc_upd, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { aprint_error_dev(sc->sc_dev, "can't map upload descriptors, error = %d\n", error); goto fail; @@ -269,7 +271,7 @@ ex_config(struct ex_softc *sc) if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_dseg, sc->sc_drseg, DPDMEM_SIZE + EX_IP4CSUMTX_PADLEN, (void **)&sc->sc_dpd, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { aprint_error_dev(sc->sc_dev, "can't map download descriptors, error = %d\n", error); goto fail; @@ -353,7 +355,7 @@ ex_config(struct ex_softc *sc) bus_dmamap_sync(sc->sc_dmat, sc->sc_upd_dmamap, 0, EX_NUPD * sizeof (struct ex_upd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ex_init_txdescs(sc); @@ -371,13 +373,12 @@ ex_config(struct ex_softc *sc) * Initialize our media structures and MII info. We'll * probe the MII if we discover that we have one. */ - sc->ex_mii.mii_ifp = ifp; - sc->ex_mii.mii_readreg = ex_mii_readreg; - sc->ex_mii.mii_writereg = ex_mii_writereg; - sc->ex_mii.mii_statchg = ex_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->ex_mii; - ifmedia_init(&sc->ex_mii.mii_media, IFM_IMASK, ex_media_chg, - ex_media_stat); + mii->mii_ifp = ifp; + mii->mii_readreg = ex_mii_readreg; + mii->mii_writereg = ex_mii_writereg; + mii->mii_statchg = ex_mii_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ex_media_chg, ex_media_stat); if (sc->ex_conf & EX_CONF_MII) { /* @@ -386,14 +387,14 @@ ex_config(struct ex_softc *sc) */ ex_set_xcvr(sc, val); - mii_attach(sc->sc_dev, &sc->ex_mii, 0xffffffff, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->ex_mii.mii_phys) == NULL) { - ifmedia_add(&sc->ex_mii.mii_media, IFM_ETHER|IFM_NONE, + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); - ifmedia_set(&sc->ex_mii.mii_media, IFM_ETHER|IFM_NONE); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { - ifmedia_set(&sc->ex_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } else ex_probemedia(sc); @@ -538,8 +539,8 @@ ex_probemedia(struct ex_softc *sc) /* Sanity check that there are any media! */ if ((reset_options & ELINK_PCI_MEDIAMASK) == 0) { aprint_error_dev(sc->sc_dev, "no media present!\n"); - ifmedia_add(ifm, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(ifm, IFM_ETHER|IFM_NONE); + ifmedia_add(ifm, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(ifm, IFM_ETHER | IFM_NONE); return; } @@ -927,7 +928,7 @@ ex_set_media(struct ex_softc *sc) switch (IFM_SUBTYPE(sc->ex_mii.mii_media.ifm_cur->ifm_media)) { case IFM_10_T: bus_space_write_2(iot, ioh, ELINK_W4_MEDIA_TYPE, - JABBER_GUARD_ENABLE|LINKBEAT_ENABLE); + JABBER_GUARD_ENABLE | LINKBEAT_ENABLE); break; case IFM_10_2: @@ -978,7 +979,7 @@ ex_media_stat(struct ifnet *ifp, struct ifmediareq *req) struct ex_softc *sc = ifp->if_softc; uint16_t help; - if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) == (IFF_UP|IFF_RUNNING)) { + if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == (IFF_UP|IFF_RUNNING)) { if (sc->ex_conf & EX_CONF_MII) { mii_pollstat(&sc->ex_mii); req->ifm_status = sc->ex_mii.mii_media_status; @@ -1052,7 +1053,7 @@ ex_start(struct ifnet *ifp) */ reload: error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - mb_head, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + mb_head, BUS_DMA_WRITE | BUS_DMA_NOWAIT); switch (error) { case 0: /* Success. */ @@ -1160,13 +1161,13 @@ ex_start(struct ifnet *ifp) dpd->dpd_fsh |= csum_flags; } else { KDASSERT((mb_head->m_pkthdr.csum_flags & - (M_CSUM_IPv4|M_CSUM_TCPv4|M_CSUM_UDPv4)) == 0); + (M_CSUM_IPv4 | M_CSUM_TCPv4 | M_CSUM_UDPv4)) == 0); } bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, ((const char *)(intptr_t)dpd - (const char *)sc->sc_dpd), sizeof (struct ex_dpd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * No need to stall the download engine, we know it's @@ -1180,11 +1181,11 @@ ex_start(struct ifnet *ifp) offset = ((const char *)(intptr_t)prevdpd - (const char *)sc->sc_dpd); bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, offset, sizeof (struct ex_dpd), - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); prevdpd->dpd_nextptr = htole32(DPD_DMADDR(sc, txp)); bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, offset, sizeof (struct ex_dpd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc->tx_tail->tx_next = txp; sc->tx_tail = txp; } else { @@ -1202,7 +1203,7 @@ ex_start(struct ifnet *ifp) bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, ((char *)sc->tx_tail->tx_dpd - (char *)sc->sc_dpd), sizeof (struct ex_dpd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ifp->if_flags |= IFF_OACTIVE; bus_space_write_2(iot, ioh, ELINK_COMMAND, ELINK_DNUNSTALL); bus_space_write_4(iot, ioh, ELINK_DNLISTPTR, @@ -1332,11 +1333,11 @@ ex_intr(void *arg) bus_dmamap_sync(sc->sc_dmat, rxmap, 0, rxmap->dm_mapsize, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); bus_dmamap_sync(sc->sc_dmat, sc->sc_upd_dmamap, ((char *)upd - (char *)sc->sc_upd), sizeof (struct ex_upd), - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); pktstat = le32toh(upd->upd_pktstatus); if (pktstat & EX_UPD_COMPLETE) { @@ -1428,8 +1429,8 @@ ex_ifflags_cb(struct ethercom *ec) struct ifnet *ifp = &ec->ec_if; struct ex_softc *sc = ifp->if_softc; int change = ifp->if_flags ^ sc->sc_if_flags; - - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) + + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) return ENETRESET; else if ((change & IFF_PROMISC) != 0) ex_set_mc(sc); @@ -1603,7 +1604,7 @@ ex_stop(struct ifnet *ifp, int disable) bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, ((char *)tx->tx_dpd - (char *)sc->sc_dpd), sizeof (struct ex_dpd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } sc->tx_tail = sc->tx_head = NULL; ex_init_txdescs(sc); @@ -1825,7 +1826,7 @@ ex_add_rxbuf(struct ex_softc *sc, struct ex_rxdesc *rxd) bus_dmamap_unload(sc->sc_dmat, rxmap); error = bus_dmamap_load(sc->sc_dmat, rxmap, m->m_ext.ext_buf, MCLBYTES, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "can't load rx buffer, error = %d\n", error); @@ -1854,17 +1855,17 @@ ex_add_rxbuf(struct ex_softc *sc, struct ex_rxdesc *rxd) bus_dmamap_sync(sc->sc_dmat, sc->sc_upd_dmamap, (char *)sc->rx_tail->rx_upd - (char *)sc->sc_upd, sizeof (struct ex_upd), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } else { sc->rx_head = rxd; } sc->rx_tail = rxd; bus_dmamap_sync(sc->sc_dmat, rxmap, 0, rxmap->dm_mapsize, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); bus_dmamap_sync(sc->sc_dmat, sc->sc_upd_dmamap, ((char *)rxd->rx_upd - (char *)sc->sc_upd), - sizeof (struct ex_upd), BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + sizeof (struct ex_upd), BUS_DMASYNC_PREREAD |BUS_DMASYNC_PREWRITE); return (rval); } diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 6cfb4a10b05..712e86e39dd 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $NetBSD: gem.c,v 1.116 2019/04/11 04:50:47 msaitoh Exp $ */ +/* $NetBSD: gem.c,v 1.117 2019/05/23 10:51:39 msaitoh Exp $ */ /* * @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.116 2019/04/11 04:50:47 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.117 2019/05/23 10:51:39 msaitoh Exp $"); #include "opt_inet.h" @@ -409,7 +409,7 @@ gem_attach(struct gem_softc *sc, const uint8_t *enaddr) aprint_debug_dev(sc->sc_dev, "using external PHY\n"); #endif /* Look for internal PHY if no external PHY was found */ - if (LIST_EMPTY(&mii->mii_phys) && + if (LIST_EMPTY(&mii->mii_phys) && ((sc->sc_mif_config & GEM_MIF_CONFIG_MDI0) || (sc->sc_variant == GEM_APPLE_K2_GMAC))) { sc->sc_mif_config &= ~GEM_MIF_CONFIG_PHY_SEL; @@ -474,7 +474,7 @@ gem_attach(struct gem_softc *sc, const uint8_t *enaddr) * XXX - we can really do the following ONLY if the * PHY indeed has the auto negotiation capability!! */ - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } else { ifmedia_init(&mii->mii_media, IFM_IMASK, gem_ser_mediachange, @@ -492,20 +492,20 @@ gem_attach(struct gem_softc *sc, const uint8_t *enaddr) aprint_normal_dev(sc->sc_dev, "using external PCS %s: ", sc->sc_flags & GEM_SERDES ? "SERDES" : "Serialink"); - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO, 0, NULL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_AUTO, 0, NULL); /* Check for FDX and HDX capabilities */ sc->sc_mii_anar = bus_space_read_4(t, h, GEM_MII_ANAR); if (sc->sc_mii_anar & GEM_MII_ANEG_FUL_DUPLX) { - ifmedia_add(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_1000_SX|IFM_MANUAL|IFM_FDX, 0, NULL); + ifmedia_add(&mii->mii_media, IFM_ETHER | + IFM_1000_SX | IFM_MANUAL | IFM_FDX, 0, NULL); aprint_normal("1000baseSX-FDX, "); } if (sc->sc_mii_anar & GEM_MII_ANEG_HLF_DUPLX) { - ifmedia_add(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_1000_SX|IFM_MANUAL|IFM_HDX, 0, NULL); + ifmedia_add(&mii->mii_media, IFM_ETHER | + IFM_1000_SX | IFM_MANUAL | IFM_HDX, 0, NULL); aprint_normal("1000baseSX-HDX, "); } - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); sc->sc_mii_media = IFM_AUTO; aprint_normal("auto\n"); @@ -559,7 +559,7 @@ gem_attach(struct gem_softc *sc, const uint8_t *enaddr) * If we support GigE media, we support jumbo frames too. * Unless we are Apple. */ - TAILQ_FOREACH(ifm, &sc->sc_mii.mii_media.ifm_list, ifm_list) { + TAILQ_FOREACH(ifm, &mii->mii_media.ifm_list, ifm_list) { if (IFM_SUBTYPE(ifm->ifm_media) == IFM_1000_T || IFM_SUBTYPE(ifm->ifm_media) == IFM_1000_SX || IFM_SUBTYPE(ifm->ifm_media) == IFM_1000_LX || @@ -673,7 +673,7 @@ gem_reset(struct gem_softc *sc) gem_reset_tx(sc); /* Do a full reset */ - bus_space_write_4(t, h, GEM_RESET, GEM_RESET_RX|GEM_RESET_TX); + bus_space_write_4(t, h, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX); if (!gem_bitwait(sc, h, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX, 0)) aprint_error_dev(sc->sc_dev, "cannot reset device\n"); splx(s); @@ -949,7 +949,7 @@ gem_meminit(struct gem_softc *sc) sc->sc_txdescs[i].gd_addr = 0; } GEM_CDTXSYNC(sc, 0, GEM_NTXDESC, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc->sc_txfree = GEM_NTXDESC-1; sc->sc_txnext = 0; sc->sc_txwin = 0; @@ -1408,7 +1408,7 @@ gem_start(struct ifnet *ifp) * again. */ if (bus_dmamap_load_mbuf(sc->sc_dmatag, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0 || + BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0 || (m0->m_pkthdr.len < ETHER_MIN_TX && dmamap->dm_nsegs == GEM_NTXSEGS)) { if (m0->m_pkthdr.len > MCLBYTES) { @@ -1437,7 +1437,7 @@ gem_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmatag, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "unable to load Tx buffer, error = %d\n", @@ -1587,7 +1587,7 @@ gem_start(struct ifnet *ifp) /* Sync the descriptors we're using. */ GEM_CDTXSYNC(sc, txs->txs_firstdesc, txs->txs_ndescs, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Advance the tx pointer. */ sc->sc_txfree -= txs->txs_ndescs; @@ -1692,7 +1692,7 @@ gem_tint(struct gem_softc *sc) break; GEM_CDTXSYNC(sc, txs->txs_firstdesc, txs->txs_ndescs, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); #ifdef GEM_DEBUG /* XXX DMA synchronization? */ if (ifp->if_flags & IFF_DEBUG) { @@ -1794,7 +1794,7 @@ gem_rint(struct gem_softc *sc) rxs = &sc->sc_rxsoft[i]; GEM_CDRXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); rxstat = GEM_DMA_READ(sc, sc->sc_rxdescs[i].gd_flags); @@ -2029,7 +2029,7 @@ gem_add_rxbuf(struct gem_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmatag, rxs->rxs_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "can't load rx DMA map %d, error = %d\n", idx, error); @@ -2074,7 +2074,7 @@ gem_eint(struct gem_softc *sc, u_int status) } snprintb(bits, sizeof(bits), GEM_INTR_BITS, status); printf("%s: status=%s\n", device_xname(sc->sc_dev), bits); - + return (1); } @@ -2186,7 +2186,6 @@ gem_intr(void *v) #endif DPRINTF(sc, ("%s: gem_intr: cplt 0x%x status %s\n", device_xname(sc->sc_dev), (status >> 19), bits)); - if ((status & (GEM_INTR_RX_TAG_ERR | GEM_INTR_BERR)) != 0) r |= gem_eint(sc, status); @@ -2608,7 +2607,7 @@ gem_ifflags_cb(struct ethercom *ec) struct gem_softc *sc = ifp->if_softc; int change = ifp->if_flags ^ sc->sc_if_flags; - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) return ENETRESET; else if ((change & IFF_PROMISC) != 0) gem_setladrf(sc); @@ -2661,8 +2660,8 @@ gem_inten(struct gem_softc *sc) ~(GEM_INTR_TX_INTME | GEM_INTR_TX_EMPTY | GEM_INTR_TX_MAC | - GEM_INTR_RX_DONE | GEM_INTR_RX_NOBUF| - GEM_INTR_RX_TAG_ERR | GEM_INTR_MAC_CONTROL| + GEM_INTR_RX_DONE | GEM_INTR_RX_NOBUF | + GEM_INTR_RX_TAG_ERR | GEM_INTR_MAC_CONTROL | GEM_INTR_BERR | v)); } @@ -2724,7 +2723,7 @@ gem_setladrf(struct gem_softc *sc) * and hash filter. Depending on the case, the right bit will be * enabled. */ - v &= ~(GEM_MAC_RX_PROMISCUOUS|GEM_MAC_RX_HASH_FILTER| + v &= ~(GEM_MAC_RX_PROMISCUOUS | GEM_MAC_RX_HASH_FILTER | GEM_MAC_RX_PROMISC_GRP); if ((ifp->if_flags & IFF_PROMISC) != 0) { diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c index 69cbfb2b8ee..3fd0538c484 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $NetBSD: hme.c,v 1.102 2019/02/05 06:17:02 msaitoh Exp $ */ +/* $NetBSD: hme.c,v 1.103 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.102 2019/02/05 06:17:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.103 2019/05/23 10:51:39 msaitoh Exp $"); /* #define HMEDEBUG */ @@ -86,7 +86,7 @@ static bool hme_shutdown(device_t, int); static int hme_init(struct ifnet *); static void hme_meminit(struct hme_softc *); static void hme_mifinit(struct hme_softc *); -static void hme_reset(struct hme_softc *); +static void hme_reset(struct hme_softc *); static void hme_chipreset(struct hme_softc *); static void hme_setladrf(struct hme_softc *); @@ -195,7 +195,7 @@ hme_config(struct hme_softc *sc) /* Map DMA memory in CPU addressable space */ if ((error = bus_dmamem_map(dmatag, &seg, rseg, size, &sc->sc_rb.rb_membase, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { aprint_error_dev(sc->sc_dev, "DMA buffer map error %d\n", error); bus_dmamap_unload(dmatag, sc->sc_dmamap); @@ -213,7 +213,7 @@ hme_config(struct hme_softc *sc) /* Load the buffer */ if ((error = bus_dmamap_load(dmatag, sc->sc_dmamap, sc->sc_rb.rb_membase, size, NULL, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { aprint_error_dev(sc->sc_dev, "DMA buffer map load error %d\n", error); bus_dmamem_free(dmatag, &seg, rseg); @@ -256,8 +256,8 @@ hme_config(struct hme_softc *sc) child = LIST_FIRST(&mii->mii_phys); if (child == NULL) { /* No PHY attached */ - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else { /* * Walk along the list of attached MII devices and @@ -289,8 +289,8 @@ hme_config(struct hme_softc *sc) * the auto negotiation capability. * XXX; What to do otherwise? */ - if (ifmedia_match(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO, 0)) - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + if (ifmedia_match(&mii->mii_media, IFM_ETHER | IFM_AUTO, 0)) + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); /* else ifmedia_set(&sc->sc_mii.mii_media, sc->sc_defaultmedia); @@ -1115,7 +1115,7 @@ hme_eint(struct hme_softc *sc, u_int status) snprintb(bits, sizeof(bits), HME_SEB_STAT_BITS, status); printf("%s: status=%s\n", device_xname(sc->sc_dev), bits); - + return (1); } @@ -1449,7 +1449,7 @@ hme_ioctl(struct ifnet *ifp, unsigned long cmd, void *data) if ((error = ifioctl_common(ifp, cmd, data)) != 0) break; - switch (ifp->if_flags & (IFF_UP|IFF_RUNNING)) { + switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) { case IFF_RUNNING: /* * If interface is marked down and it is running, then @@ -1465,7 +1465,7 @@ hme_ioctl(struct ifnet *ifp, unsigned long cmd, void *data) */ error = hme_init(ifp); break; - case IFF_UP|IFF_RUNNING: + case IFF_UP | IFF_RUNNING: /* * If setting debug or promiscuous mode, do not reset * the chip; for everything else, call hme_init() diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c index 0e90d1da9c4..f5855d0e790 100644 --- a/sys/dev/ic/i82557.c +++ b/sys/dev/ic/i82557.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82557.c,v 1.151 2019/04/22 07:51:16 msaitoh Exp $ */ +/* $NetBSD: i82557.c,v 1.152 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.151 2019/04/22 07:51:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.152 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -181,7 +181,7 @@ void fxp_stop(struct ifnet *, int); void fxp_txintr(struct fxp_softc *); int fxp_rxintr(struct fxp_softc *); -void fxp_rx_hwcksum(struct fxp_softc *,struct mbuf *, +void fxp_rx_hwcksum(struct fxp_softc *, struct mbuf *, const struct fxp_rfa *, u_int); void fxp_rxdrain(struct fxp_softc *); @@ -462,37 +462,39 @@ fxp_attach(struct fxp_softc *sc) void fxp_mii_initmedia(struct fxp_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; int flags; sc->sc_flags |= FXPF_MII; - sc->sc_mii.mii_ifp = &sc->sc_ethercom.ec_if; - sc->sc_mii.mii_readreg = fxp_mdi_read; - sc->sc_mii.mii_writereg = fxp_mdi_write; - sc->sc_mii.mii_statchg = fxp_statchg; + mii->mii_ifp = &sc->sc_ethercom.ec_if; + mii->mii_readreg = fxp_mdi_read; + mii->mii_writereg = fxp_mdi_write; + mii->mii_statchg = fxp_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ether_mediachange, + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ether_mediachange, fxp_mii_mediastatus); flags = MIIF_NOISOLATE; if (sc->sc_flags & FXPF_FC) - flags |= MIIF_FORCEANEG|MIIF_DOPAUSE; + flags |= MIIF_FORCEANEG | MIIF_DOPAUSE; /* * The i82557 wedges if all of its PHYs are isolated! */ - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, flags); - if (LIST_EMPTY(&sc->sc_mii.mii_phys)) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_EMPTY(&mii->mii_phys)) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } void fxp_80c24_initmedia(struct fxp_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; /* * The Seeq 80c24 AutoDUPLEX(tm) Ethernet Interface Adapter @@ -502,10 +504,10 @@ fxp_80c24_initmedia(struct fxp_softc *sc) */ aprint_normal_dev(sc->sc_dev, "Seeq 80c24 AutoDUPLEX media interface present\n"); - ifmedia_init(&sc->sc_mii.mii_media, 0, fxp_80c24_mediachange, + ifmedia_init(&mii->mii_media, 0, fxp_80c24_mediachange, fxp_80c24_mediastatus); - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } /* @@ -812,7 +814,7 @@ fxp_start(struct ifnet *ifp) return; } - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* @@ -858,7 +860,7 @@ fxp_start(struct ifnet *ifp) * again. */ if (bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { + BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) { MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { log(LOG_ERR, "%s: unable to allocate Tx mbuf\n", @@ -879,7 +881,7 @@ fxp_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { log(LOG_ERR, "%s: unable to load Tx buffer, " "error = %d\n", @@ -989,7 +991,7 @@ fxp_start(struct ifnet *ifp) } FXP_CDTXSYNC(sc, nexttx, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Advance the tx pointer. */ sc->sc_txpending++; @@ -1036,18 +1038,18 @@ fxp_start(struct ifnet *ifp) txd->txd_txcb.cb_command = htole16(FXP_CB_COMMAND_NOP | FXP_CB_COMMAND_I | FXP_CB_COMMAND_S); FXP_CDTXSYNC(sc, sc->sc_txlast, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * The entire packet chain is set up. Clear the suspend bit * on the command prior to the first packet we set up. */ FXP_CDTXSYNC(sc, lasttx, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); FXP_CDTX(sc, lasttx)->txd_txcb.cb_command &= htole16(~FXP_CB_COMMAND_S); FXP_CDTXSYNC(sc, lasttx, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Issue a Resume command in case the chip was suspended. @@ -1111,7 +1113,7 @@ fxp_intr(void *arg) /* * Free any finished transmit mbuf chains. */ - if (statack & (FXP_SCB_STATACK_CXTNO|FXP_SCB_STATACK_CNA)) { + if (statack & (FXP_SCB_STATACK_CXTNO | FXP_SCB_STATACK_CNA)) { FXP_EVCNT_INCR(&sc->sc_ev_txintr); fxp_txintr(sc); @@ -1165,7 +1167,7 @@ fxp_txintr(struct fxp_softc *sc) txs = FXP_DSTX(sc, i); FXP_CDTXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); /* skip dummy NOP TX descriptor */ if ((le16toh(txd->txd_txcb.cb_command) & FXP_CB_COMMAND_CMD) @@ -1228,7 +1230,7 @@ fxp_rx_hwcksum(struct fxp_softc *sc, struct mbuf *m, const struct fxp_rfa *rfa, } if (csum_stat & FXP_RFDX_CS_TCPUDP_CSUM_BIT_VALID) { - csum_flags |= (M_CSUM_TCPv4|M_CSUM_UDPv4); /* XXX */ + csum_flags |= (M_CSUM_TCPv4 | M_CSUM_UDPv4); /* XXX */ if ((csum_stat & FXP_RFDX_CS_TCPUDP_CSUM_VALID) == 0) csum_flags |= M_CSUM_TCP_UDP_BAD; } @@ -1346,7 +1348,7 @@ fxp_rxintr(struct fxp_softc *sc) rxmap = M_GETCTX(m, bus_dmamap_t); FXP_RFASYNC(sc, m, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); rxstat = le16toh(rfa->rfa_status); @@ -1388,9 +1390,9 @@ fxp_rxintr(struct fxp_softc *sc) * order to receive the larger ones). */ if ((ec->ec_capenable & ETHERCAP_VLAN_MTU) != 0 && - (rxstat & (FXP_RFA_STATUS_OVERRUN| - FXP_RFA_STATUS_RNR| - FXP_RFA_STATUS_ALIGN| + (rxstat & (FXP_RFA_STATUS_OVERRUN | + FXP_RFA_STATUS_RNR | + FXP_RFA_STATUS_ALIGN | FXP_RFA_STATUS_CRC)) != 0) { FXP_INIT_RFABUF(sc, m); continue; @@ -1404,7 +1406,8 @@ fxp_rxintr(struct fxp_softc *sc) vlan_set_tag(m, be16toh(rfa->vlan_id)); /* Do checksum checking. */ - if ((ifp->if_csum_flags_rx & (M_CSUM_TCPv4|M_CSUM_UDPv4)) != 0) + if ((ifp->if_csum_flags_rx & + (M_CSUM_TCPv4 | M_CSUM_UDPv4)) != 0) fxp_rx_hwcksum(sc, m, rfa, len); /* @@ -1844,7 +1847,7 @@ fxp_init(struct ifnet *ifp) cbp->ext_stats_dis = 0; /* enable extended stats */ } - FXP_CDCONFIGSYNC(sc, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + FXP_CDCONFIGSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Start the config command/DMA. @@ -1855,13 +1858,13 @@ fxp_init(struct ifnet *ifp) /* ...and wait for it to complete. */ for (i = 1000; i > 0; i--) { FXP_CDCONFIGSYNC(sc, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le16toh(cbp->cb_status); FXP_CDCONFIGSYNC(sc, BUS_DMASYNC_PREREAD); if ((status & FXP_CB_STATUS_C) != 0) break; DELAY(1); - } + } if (i == 0) { log(LOG_WARNING, "%s: line %d: dmasync timeout\n", device_xname(sc->sc_dev), __LINE__); @@ -1879,7 +1882,7 @@ fxp_init(struct ifnet *ifp) cb_ias->link_addr = 0xffffffff; memcpy(cb_ias->macaddr, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); - FXP_CDIASSYNC(sc, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + FXP_CDIASSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Start the IAS (Individual Address Setup) command/DMA. @@ -1890,7 +1893,7 @@ fxp_init(struct ifnet *ifp) /* ...and wait for it to complete. */ for (i = 1000; i > 0; i++) { FXP_CDIASSYNC(sc, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le16toh(cb_ias->cb_status); FXP_CDIASSYNC(sc, BUS_DMASYNC_PREREAD); if ((status & FXP_CB_STATUS_C) != 0) @@ -1922,7 +1925,8 @@ fxp_init(struct ifnet *ifp) else txd->txd_txcb.tbd_array_addr = htole32(FXP_CDTBDADDR(sc, i)); - FXP_CDTXSYNC(sc, i, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + FXP_CDTXSYNC(sc, i, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } sc->sc_txpending = 0; sc->sc_txdirty = 0; @@ -1986,7 +1990,7 @@ fxp_init(struct ifnet *ifp) ifp->if_flags &= ~IFF_OACTIVE; /* - * Request a software generated interrupt that will be used to + * Request a software generated interrupt that will be used to * (re)start the RU processing. If we direct the chip to start * receiving from the start of queue now, instead of letting the * interrupt handler first process all received packets, we run @@ -1994,7 +1998,7 @@ fxp_init(struct ifnet *ifp) * being processed or after they have been returned to the pool. */ CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTRCNTL_REQUEST_SWI); - + /* * Start the one second timer. */ @@ -2084,7 +2088,7 @@ fxp_add_rfabuf(struct fxp_softc *sc, bus_dmamap_t rxmap, int unload) m->m_len = m->m_pkthdr.len = m->m_ext.ext_size; error = bus_dmamap_load_mbuf(sc->sc_dmat, rxmap, m, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { /* XXX XXX XXX */ aprint_error_dev(sc->sc_dev, @@ -2257,7 +2261,7 @@ fxp_mc_setup(struct fxp_softc *sc) mcsp->link_addr = htole32(FXP_CDTXADDR(sc, FXP_NEXTTX(sc->sc_txlast))); mcsp->mc_cnt = htole16(nmcasts * ETHER_ADDR_LEN); - FXP_CDMCSSYNC(sc, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + FXP_CDMCSSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Wait until the command unit is not active. This should never @@ -2283,7 +2287,7 @@ fxp_mc_setup(struct fxp_softc *sc) /* ...and wait for it to complete. */ for (count = 1000; count > 0; count--) { FXP_CDMCSSYNC(sc, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le16toh(mcsp->cb_status); FXP_CDMCSSYNC(sc, BUS_DMASYNC_PREREAD); if ((status & FXP_CB_STATUS_C) != 0) @@ -2384,7 +2388,7 @@ fxp_load_ucode(struct fxp_softc *sc) *(volatile uint16_t *) &cbp->ucode[uc->bundle_max_offset] = htole16(fxp_bundle_max); - FXP_CDUCODESYNC(sc, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + FXP_CDUCODESYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Download the uCode to the chip. @@ -2396,7 +2400,7 @@ fxp_load_ucode(struct fxp_softc *sc) /* ...and wait for it to complete. */ for (count = 10000; count > 0; count--) { FXP_CDUCODESYNC(sc, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le16toh(cbp->cb_status); FXP_CDUCODESYNC(sc, BUS_DMASYNC_PREREAD); if ((status & FXP_CB_STATUS_C) != 0) diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 7aae06a7757..95153482812 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9.c,v 1.104 2019/01/22 03:42:26 msaitoh Exp $ */ +/* $NetBSD: rtl81x9.c,v 1.105 2019/05/23 10:51:39 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998 @@ -86,7 +86,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.104 2019/01/22 03:42:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.105 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> @@ -242,7 +242,7 @@ rtk_mii_sync(struct rtk_softc *sc) { int i; - MII_SET(RTK_MII_DIR|RTK_MII_DATAOUT); + MII_SET(RTK_MII_DIR | RTK_MII_DATAOUT); for (i = 0; i < 32; i++) { MII_SET(RTK_MII_CLK); @@ -311,7 +311,7 @@ rtk_mii_readreg(struct rtk_softc *sc, struct rtk_mii_frame *frame) rtk_mii_send(sc, frame->mii_regaddr, 5); /* Idle bit */ - MII_CLR((RTK_MII_CLK|RTK_MII_DATAOUT)); + MII_CLR((RTK_MII_CLK | RTK_MII_DATAOUT)); DELAY(1); MII_SET(RTK_MII_CLK); DELAY(1); @@ -616,6 +616,7 @@ rtk_attach(struct rtk_softc *sc) { device_t self = sc->sc_dev; struct ifnet *ifp; + struct mii_data * const mii = &sc->mii; struct rtk_tx_desc *txd; uint16_t val; uint8_t eaddr[ETHER_ADDR_LEN]; @@ -655,7 +656,7 @@ rtk_attach(struct rtk_softc *sc) if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_dmaseg, sc->sc_dmanseg, RTK_RXBUFLEN + 16, (void **)&sc->rtk_rx_buf, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { aprint_error_dev(self, "can't map recv buffer, error = %d\n", error); goto fail_1; @@ -671,7 +672,7 @@ rtk_attach(struct rtk_softc *sc) if ((error = bus_dmamap_load(sc->sc_dmat, sc->recv_dmamap, sc->rtk_rx_buf, RTK_RXBUFLEN + 16, - NULL, BUS_DMA_READ|BUS_DMA_NOWAIT)) != 0) { + NULL, BUS_DMA_READ | BUS_DMA_NOWAIT)) != 0) { aprint_error_dev(self, "can't load recv buffer DMA map, error = %d\n", error); goto fail_3; @@ -719,23 +720,21 @@ rtk_attach(struct rtk_softc *sc) /* * Do ifmedia setup. */ - sc->mii.mii_ifp = ifp; - sc->mii.mii_readreg = rtk_phy_readreg; - sc->mii.mii_writereg = rtk_phy_writereg; - sc->mii.mii_statchg = rtk_phy_statchg; - sc->ethercom.ec_mii = &sc->mii; - ifmedia_init(&sc->mii.mii_media, IFM_IMASK, ether_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = rtk_phy_readreg; + mii->mii_writereg = rtk_phy_writereg; + mii->mii_statchg = rtk_phy_statchg; + sc->ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ether_mediachange, ether_mediastatus); - mii_attach(self, &sc->mii, 0xffffffff, - MII_PHY_ANY, MII_OFFSET_ANY, 0); + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); /* Choose a default media. */ - if (LIST_FIRST(&sc->mii.mii_phys) == NULL) { - ifmedia_add(&sc->mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->mii.mii_media, IFM_ETHER|IFM_NONE); - } else { - ifmedia_set(&sc->mii.mii_media, IFM_ETHER|IFM_AUTO); - } + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); + } else + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); /* * Call MI attach routines. @@ -962,12 +961,12 @@ rtk_rxeof(struct rtk_softc *sc) * */ #if 0 - if (rxstat & (RTK_RXSTAT_BADSYM|RTK_RXSTAT_RUNT| - RTK_RXSTAT_GIANT|RTK_RXSTAT_CRCERR| + if (rxstat & (RTK_RXSTAT_BADSYM | RTK_RXSTAT_RUNT | + RTK_RXSTAT_GIANT | RTK_RXSTAT_CRCERR | RTK_RXSTAT_ALIGNERR)) { CSR_WRITE_2(sc, RTK_COMMAND, RTK_CMD_TX_ENB); CSR_WRITE_2(sc, RTK_COMMAND, - RTK_CMD_TX_ENB|RTK_CMD_RX_ENB); + RTK_CMD_TX_ENB | RTK_CMD_RX_ENB); CSR_WRITE_4(sc, RTK_RXCFG, RTK_RXCFG_CONFIG); CSR_WRITE_4(sc, RTK_RXADDR, sc->recv_dmamap->dm_segs[0].ds_addr); @@ -1102,8 +1101,8 @@ rtk_txeof(struct rtk_softc *sc) */ while ((txd = SIMPLEQ_FIRST(&sc->rtk_tx_dirty)) != NULL) { txstat = CSR_READ_4(sc, txd->txd_txstat); - if ((txstat & (RTK_TXSTAT_TX_OK| - RTK_TXSTAT_TX_UNDERRUN|RTK_TXSTAT_TXABRT)) == 0) + if ((txstat & (RTK_TXSTAT_TX_OK | + RTK_TXSTAT_TX_UNDERRUN | RTK_TXSTAT_TXABRT)) == 0) break; SIMPLEQ_REMOVE_HEAD(&sc->rtk_tx_dirty, txd_q); @@ -1141,7 +1140,7 @@ rtk_txeof(struct rtk_softc *sc) printf("\n"); #endif } - if (txstat & (RTK_TXSTAT_TXABRT|RTK_TXSTAT_OUTOFWIN)) + if (txstat & (RTK_TXSTAT_TXABRT | RTK_TXSTAT_OUTOFWIN)) CSR_WRITE_4(sc, RTK_TXCFG, RTK_TXCFG_CONFIG); } SIMPLEQ_INSERT_TAIL(&sc->rtk_tx_free, txd, txd_q); @@ -1193,7 +1192,7 @@ rtk_intr(void *arg) if (status & RTK_ISR_RX_ERR) rtk_rxeof(sc); - if (status & (RTK_ISR_TX_OK|RTK_ISR_TX_ERR)) + if (status & (RTK_ISR_TX_OK | RTK_ISR_TX_ERR)) rtk_txeof(sc); if (status & RTK_ISR_SYSTEM_ERR) { @@ -1242,7 +1241,7 @@ rtk_start(struct ifnet *ifp) if ((mtod(m_head, uintptr_t) & 3) != 0 || m_head->m_pkthdr.len < ETHER_PAD_LEN || bus_dmamap_load_mbuf(sc->sc_dmat, txd->txd_dmamap, - m_head, BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { + m_head, BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) { MGETHDR(m_new, M_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("%s: unable to allocate Tx mbuf\n", @@ -1272,7 +1271,7 @@ rtk_start(struct ifnet *ifp) } error = bus_dmamap_load_mbuf(sc->sc_dmat, txd->txd_dmamap, m_new, - BUS_DMA_WRITE|BUS_DMA_NOWAIT); + BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { printf("%s: unable to load Tx buffer, " "error = %d\n", @@ -1357,7 +1356,7 @@ rtk_init(struct ifnet *ifp) /* * Enable transmit and receive. */ - CSR_WRITE_1(sc, RTK_COMMAND, RTK_CMD_TX_ENB|RTK_CMD_RX_ENB); + CSR_WRITE_1(sc, RTK_COMMAND, RTK_CMD_TX_ENB | RTK_CMD_RX_ENB); /* * Set the initial TX and RX configuration. @@ -1403,9 +1402,9 @@ rtk_init(struct ifnet *ifp) CSR_WRITE_4(sc, RTK_MISSEDPKT, 0); /* Enable receiver and transmitter. */ - CSR_WRITE_1(sc, RTK_COMMAND, RTK_CMD_TX_ENB|RTK_CMD_RX_ENB); + CSR_WRITE_1(sc, RTK_COMMAND, RTK_CMD_TX_ENB | RTK_CMD_RX_ENB); - CSR_WRITE_1(sc, RTK_CFG1, RTK_CFG1_DRVLOAD|RTK_CFG1_FULLDUPLEX); + CSR_WRITE_1(sc, RTK_CFG1, RTK_CFG1_DRVLOAD | RTK_CFG1_FULLDUPLEX); /* * Set current media. diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c index ceef9bd333b..4ea67f49969 100644 --- a/sys/dev/ic/smc83c170.c +++ b/sys/dev/ic/smc83c170.c @@ -1,4 +1,4 @@ -/* $NetBSD: smc83c170.c,v 1.87 2019/01/22 03:42:26 msaitoh Exp $ */ +/* $NetBSD: smc83c170.c,v 1.88 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.87 2019/01/22 03:42:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.88 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> @@ -104,6 +104,7 @@ epic_attach(struct epic_softc *sc) bus_space_tag_t st = sc->sc_st; bus_space_handle_t sh = sc->sc_sh; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; int rseg, error, miiflags; u_int i; bus_dma_segment_t seg; @@ -120,7 +121,7 @@ epic_attach(struct epic_softc *sc) if ((error = bus_dmamem_alloc(sc->sc_dmat, sizeof(struct epic_control_data) + ETHER_PAD_LEN, PAGE_SIZE, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(sc->sc_dev, + aprint_error_dev(sc->sc_dev, "unable to allocate control data, error = %d\n", error); goto fail_0; } @@ -128,7 +129,7 @@ epic_attach(struct epic_softc *sc) if ((error = bus_dmamem_map(sc->sc_dmat, &seg, rseg, sizeof(struct epic_control_data) + ETHER_PAD_LEN, (void **)&sc->sc_control_data, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { + BUS_DMA_NOWAIT | BUS_DMA_COHERENT)) != 0) { aprint_error_dev(sc->sc_dev, "unable to map control data, error = %d\n", error); goto fail_1; @@ -150,7 +151,7 @@ epic_attach(struct epic_softc *sc) if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_cddmamap, sc->sc_control_data, sizeof(struct epic_control_data), NULL, BUS_DMA_NOWAIT)) != 0) { - aprint_error_dev(sc->sc_dev, + aprint_error_dev(sc->sc_dev, "unable to load control data DMA map, error = %d\n", error); goto fail_3; @@ -246,26 +247,26 @@ epic_attach(struct epic_softc *sc) /* * Initialize our media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = epic_mii_read; - sc->sc_mii.mii_writereg = epic_mii_write; - sc->sc_mii.mii_statchg = epic_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = epic_mii_read; + mii->mii_writereg = epic_mii_write; + mii->mii_statchg = epic_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, epic_mediachange, + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, epic_mediachange, ether_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, miiflags); - if (LIST_EMPTY(&sc->sc_mii.mii_phys)) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_EMPTY(&mii->mii_phys)) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); if (sc->sc_hwflags & EPIC_HAS_BNC) { /* use the next free media instance */ - sc->sc_serinst = sc->sc_mii.mii_instance++; - ifmedia_add(&sc->sc_mii.mii_media, + sc->sc_serinst = mii->mii_instance++; + ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, IFM_10_2, 0, sc->sc_serinst), 0, NULL); aprint_normal_dev(sc->sc_dev, "10base2/BNC\n"); @@ -401,7 +402,7 @@ epic_start(struct ifnet *ifp) * again. */ if ((error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT)) != 0 || + BUS_DMA_WRITE | BUS_DMA_NOWAIT)) != 0 || (m0->m_pkthdr.len < ETHER_PAD_LEN && dmamap-> dm_nsegs == EPIC_NFRAGS)) { if (error == 0) @@ -426,7 +427,7 @@ epic_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { printf("%s: unable to load Tx buffer, " "error = %d\n", device_xname(sc->sc_dev), @@ -484,7 +485,7 @@ epic_start(struct ifnet *ifp) TXSTAT_TXLENGTH(len) | ET_TXSTAT_OWNER; EPIC_CDTXSYNC(sc, nexttx, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Advance the tx pointer. */ sc->sc_txpending++; @@ -515,7 +516,7 @@ epic_start(struct ifnet *ifp) */ EPIC_CDTX(sc, sc->sc_txlast)->et_control |= ET_TXCTL_IAF; EPIC_CDTXSYNC(sc, sc->sc_txlast, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * The entire packet chain is set up. Give the @@ -523,7 +524,7 @@ epic_start(struct ifnet *ifp) */ EPIC_CDTX(sc, firsttx)->et_txstatus |= ET_TXSTAT_OWNER; EPIC_CDTXSYNC(sc, firsttx, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Start the transmitter. */ bus_space_write_4(sc->sc_st, sc->sc_sh, EPIC_COMMAND, @@ -620,7 +621,7 @@ epic_intr(void *arg) ds = EPIC_DSRX(sc, i); EPIC_CDRXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); rxstatus = rxd->er_rxstatus; if (rxstatus & ER_RXSTAT_OWNER) { @@ -743,7 +744,7 @@ epic_intr(void *arg) ds = EPIC_DSTX(sc, i); EPIC_CDTXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); txstatus = txd->et_txstatus; if (txstatus & ET_TXSTAT_OWNER) @@ -975,7 +976,8 @@ epic_init(struct ifnet *ifp) memset(txd, 0, sizeof(struct epic_txdesc)); txd->et_bufaddr = EPIC_CDFLADDR(sc, i); txd->et_nextdesc = EPIC_CDTXADDR(sc, EPIC_NEXTTX(i)); - EPIC_CDTXSYNC(sc, i, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + EPIC_CDTXSYNC(sc, i, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } sc->sc_txpending = 0; sc->sc_txdirty = 0; @@ -1146,17 +1148,18 @@ epic_read_eeprom(struct epic_softc *sc, int word, int wordcnt, uint16_t *data) for (i = 0; i < wordcnt; i++) { /* Send CHIP SELECT for one clock tick. */ - bus_space_write_4(st, sh, EPIC_EECTL, EECTL_ENABLE|EECTL_EECS); + bus_space_write_4(st, sh, EPIC_EECTL, + EECTL_ENABLE | EECTL_EECS); EEPROM_WAIT_READY(st, sh); /* Shift in the READ opcode. */ for (x = 3; x > 0; x--) { - reg = EECTL_ENABLE|EECTL_EECS; + reg = EECTL_ENABLE | EECTL_EECS; if (EPIC_EEPROM_OPC_READ & (1 << (x - 1))) reg |= EECTL_EEDI; bus_space_write_4(st, sh, EPIC_EECTL, reg); EEPROM_WAIT_READY(st, sh); - bus_space_write_4(st, sh, EPIC_EECTL, reg|EECTL_EESK); + bus_space_write_4(st, sh, EPIC_EECTL, reg |EECTL_EESK); EEPROM_WAIT_READY(st, sh); bus_space_write_4(st, sh, EPIC_EECTL, reg); EEPROM_WAIT_READY(st, sh); @@ -1164,22 +1167,22 @@ epic_read_eeprom(struct epic_softc *sc, int word, int wordcnt, uint16_t *data) /* Shift in address. */ for (x = 6; x > 0; x--) { - reg = EECTL_ENABLE|EECTL_EECS; + reg = EECTL_ENABLE | EECTL_EECS; if ((word + i) & (1 << (x - 1))) reg |= EECTL_EEDI; bus_space_write_4(st, sh, EPIC_EECTL, reg); EEPROM_WAIT_READY(st, sh); - bus_space_write_4(st, sh, EPIC_EECTL, reg|EECTL_EESK); + bus_space_write_4(st, sh, EPIC_EECTL, reg |EECTL_EESK); EEPROM_WAIT_READY(st, sh); bus_space_write_4(st, sh, EPIC_EECTL, reg); EEPROM_WAIT_READY(st, sh); } /* Shift out data. */ - reg = EECTL_ENABLE|EECTL_EECS; + reg = EECTL_ENABLE | EECTL_EECS; data[i] = 0; for (x = 16; x > 0; x--) { - bus_space_write_4(st, sh, EPIC_EECTL, reg|EECTL_EESK); + bus_space_write_4(st, sh, EPIC_EECTL, reg |EECTL_EESK); EEPROM_WAIT_READY(st, sh); if (bus_space_read_4(st, sh, EPIC_EECTL) & EECTL_EEDO) data[i] |= (1 << (x - 1)); @@ -1227,7 +1230,7 @@ epic_add_rxbuf(struct epic_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmat, ds->ds_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { printf("%s: can't load rx DMA map %d, error = %d\n", device_xname(sc->sc_dev), idx, error); @@ -1390,9 +1393,9 @@ epic_statchg(struct ifnet *ifp) */ txcon = bus_space_read_4(sc->sc_st, sc->sc_sh, EPIC_TXCON); if (sc->sc_mii.mii_media_active & IFM_FDX) - txcon |= (TXCON_LOOPBACK_D1|TXCON_LOOPBACK_D2); + txcon |= (TXCON_LOOPBACK_D1 | TXCON_LOOPBACK_D2); else - txcon &= ~(TXCON_LOOPBACK_D1|TXCON_LOOPBACK_D2); + txcon &= ~(TXCON_LOOPBACK_D1 | TXCON_LOOPBACK_D2); bus_space_write_4(sc->sc_st, sc->sc_sh, EPIC_TXCON, txcon); /* On some cards we need manualy set fullduplex led */ diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c index bc92f722449..02dff0979d0 100644 --- a/sys/dev/ic/tulip.c +++ b/sys/dev/ic/tulip.c @@ -1,4 +1,4 @@ -/* $NetBSD: tulip.c,v 1.193 2019/04/22 08:05:01 msaitoh Exp $ */ +/* $NetBSD: tulip.c,v 1.194 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.193 2019/04/22 08:05:01 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.194 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> @@ -268,7 +268,7 @@ tlp_attach(struct tulip_softc *sc, const uint8_t *enaddr) */ switch (sc->sc_chip) { case TULIP_CHIP_X3201_3: - sc->sc_setup_fsls = TDCTL_Tx_FS|TDCTL_Tx_LS; + sc->sc_setup_fsls = TDCTL_Tx_FS | TDCTL_Tx_LS; break; default: @@ -603,7 +603,7 @@ tlp_detach(struct tulip_softc *sc) * Succeed now if there isn't any work to do. */ if ((sc->sc_flags & TULIPF_ATTACHED) == 0) - return (0); + return 0; s = splnet(); /* Stop the interface. Callouts are stopped in it. */ @@ -656,7 +656,7 @@ tlp_detach(struct tulip_softc *sc) if (sc->sc_srom) free(sc->sc_srom, M_DEVBUF); - return (0); + return 0; } /* @@ -685,7 +685,7 @@ tlp_start(struct ifnet *ifp) if (sc->sc_flags & TULIPF_WANT_SETUP) ifp->if_flags |= IFF_OACTIVE; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; if (sc->sc_tick == tlp_2114x_nway_tick && @@ -733,7 +733,7 @@ tlp_start(struct ifnet *ifp) */ if ((sc->sc_ntxsegs == 1 && (mtod(m0, uintptr_t) & 3) != 0) || bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { + BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) { MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { aprint_error_dev(sc->sc_dev, "unable to allocate Tx mbuf\n"); @@ -752,7 +752,7 @@ tlp_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "unable to load Tx buffer, error = %d", @@ -850,7 +850,7 @@ tlp_start(struct ifnet *ifp) /* Sync the descriptors we're using. */ TULIP_CDTXSYNC(sc, sc->sc_txnext, dmamap->dm_nsegs, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Store a pointer to the packet so we can free it later, @@ -891,7 +891,7 @@ tlp_start(struct ifnet *ifp) */ sc->sc_txdescs[lasttx].td_ctl |= htole32(TDCTL_Tx_IC); TULIP_CDTXSYNC(sc, lasttx, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Some clone chips want IC on the *first* segment in @@ -903,7 +903,7 @@ tlp_start(struct ifnet *ifp) sc->sc_txdescs[last_txs->txs_firstdesc].td_ctl |= htole32(TDCTL_Tx_IC); TULIP_CDTXSYNC(sc, last_txs->txs_firstdesc, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } /* @@ -912,7 +912,7 @@ tlp_start(struct ifnet *ifp) */ sc->sc_txdescs[firsttx].td_status |= htole32(TDSTAT_OWN); TULIP_CDTXSYNC(sc, firsttx, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Wake up the transmitter. */ /* XXX USE AUTOPOLLING? */ @@ -967,7 +967,7 @@ tlp_ifflags_cb(struct ethercom *ec) struct tulip_softc *sc = ifp->if_softc; int change = ifp->if_flags ^ sc->sc_if_flags; - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) return ENETRESET; if ((change & IFF_PROMISC) != 0) (*sc->sc_filter_setup)(sc); @@ -1009,7 +1009,7 @@ tlp_ioctl(struct ifnet *ifp, u_long cmd, void *data) sc->sc_if_flags = ifp->if_flags; splx(s); - return (error); + return error; } /* @@ -1038,7 +1038,7 @@ tlp_intr(void *arg) */ if ((ifp->if_flags & IFF_RUNNING) == 0 || !device_is_active(sc->sc_dev)) - return (0); + return 0; /* Disable interrupts on the DM9102 (interrupt edge bug). */ switch (sc->sc_chip) { @@ -1130,7 +1130,7 @@ tlp_intr(void *arg) } } - if (status & (STATUS_TPS|STATUS_RPS)) { + if (status & (STATUS_TPS | STATUS_RPS)) { if (status & STATUS_TPS) printf("%s: transmit process stopped\n", device_xname(sc->sc_dev)); @@ -1200,7 +1200,7 @@ tlp_intr(void *arg) if (handled) rnd_add_uint32(&sc->sc_rnd_source, status); - return (handled); + return handled; } /* @@ -1222,7 +1222,7 @@ tlp_rxintr(struct tulip_softc *sc) rxs = &sc->sc_rxsoft[i]; TULIP_CDRXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); rxstat = le32toh(sc->sc_rxdescs[i].td_status); @@ -1239,8 +1239,8 @@ tlp_rxintr(struct tulip_softc *sc) * has an awful receive engine bug, which may require * a very icky work-around. */ - if ((rxstat & (TDSTAT_Rx_FS|TDSTAT_Rx_LS)) != - (TDSTAT_Rx_FS|TDSTAT_Rx_LS)) { + if ((rxstat & (TDSTAT_Rx_FS | TDSTAT_Rx_LS)) != + (TDSTAT_Rx_FS | TDSTAT_Rx_LS)) { printf("%s: incoming packet spilled, resetting\n", device_xname(sc->sc_dev)); (void) tlp_init(ifp); @@ -1421,9 +1421,8 @@ tlp_txintr(struct tulip_softc *sc) * frames that have been transmitted. */ while ((txs = SIMPLEQ_FIRST(&sc->sc_txdirtyq)) != NULL) { - TULIP_CDTXSYNC(sc, txs->txs_lastdesc, - txs->txs_ndescs, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + TULIP_CDTXSYNC(sc, txs->txs_lastdesc, txs->txs_ndescs, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); #ifdef TLP_DEBUG if (ifp->if_flags & IFF_DEBUG) { @@ -1493,7 +1492,7 @@ tlp_txintr(struct tulip_softc *sc) sc->sc_stats.ts_tx_lc++; #endif - if (txstat & (TDSTAT_Tx_UF|TDSTAT_Tx_TO)) + if (txstat & (TDSTAT_Tx_UF | TDSTAT_Tx_TO)) ifp->if_oerrors++; if (txstat & TDSTAT_Tx_EC) @@ -1785,7 +1784,7 @@ tlp_init(struct ifnet *ifp) } sc->sc_txdescs[TULIP_NTXDESC - 1].td_ctl |= htole32(sc->sc_tdctl_er); TULIP_CDTXSYNC(sc, 0, TULIP_NTXDESC, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc->sc_txfree = TULIP_NTXDESC; sc->sc_txnext = 0; @@ -1833,8 +1832,8 @@ tlp_init(struct ifnet *ifp) sc->sc_inten |= STATUS_TPS | STATUS_TJT | STATUS_UNF | STATUS_RU | STATUS_RPS | STATUS_RWT | STATUS_SE | STATUS_AIS; - sc->sc_rxint_mask = STATUS_RI|STATUS_RU|STATUS_RWT; - sc->sc_txint_mask = STATUS_TI|STATUS_UNF|STATUS_TJT; + sc->sc_rxint_mask = STATUS_RI | STATUS_RU | STATUS_RWT; + sc->sc_txint_mask = STATUS_TI | STATUS_UNF | STATUS_TJT; switch (sc->sc_chip) { case TULIP_CHIP_WB89C840F: @@ -1842,7 +1841,7 @@ tlp_init(struct ifnet *ifp) * Clear bits that we don't want that happen to * overlap or don't exist. */ - sc->sc_inten &= ~(STATUS_WINB_REI|STATUS_RWT); + sc->sc_inten &= ~(STATUS_WINB_REI | STATUS_RWT); break; default: @@ -1930,7 +1929,7 @@ tlp_init(struct ifnet *ifp) /* * Set the current media. */ - (void) (*sc->sc_mediasw->tmsw_set)(sc); + (void)(*sc->sc_mediasw->tmsw_set)(sc); /* * Start the receive process. @@ -1955,7 +1954,7 @@ tlp_init(struct ifnet *ifp) ifp->if_timer = 0; printf("%s: interface not running\n", device_xname(sc->sc_dev)); } - return (error); + return error; } /* @@ -1970,11 +1969,11 @@ tlp_enable(struct tulip_softc *sc) if (TULIP_IS_ENABLED(sc) == 0 && sc->sc_enable != NULL) { if ((*sc->sc_enable)(sc) != 0) { aprint_error_dev(sc->sc_dev, "device enable failed\n"); - return (EIO); + return EIO; } sc->sc_flags |= TULIPF_ENABLED; } - return (0); + return 0; } /* @@ -2056,7 +2055,7 @@ tlp_stop(struct ifnet *ifp, int disable) SIMPLEQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q); } - sc->sc_flags &= ~(TULIPF_WANT_SETUP|TULIPF_DOING_SETUP); + sc->sc_flags &= ~(TULIPF_WANT_SETUP | TULIPF_DOING_SETUP); /* * Mark the interface down and cancel the watchdog timer. @@ -2102,12 +2101,12 @@ tlp_srom_idle(struct tulip_softc *sc) miirom |= MIIROM_SROMCS; SROM_EMIT(sc, miirom); - SROM_EMIT(sc, miirom|MIIROM_SROMSK); + SROM_EMIT(sc, miirom | MIIROM_SROMSK); /* Strobe the clock 32 times. */ for (i = 0; i < 32; i++) { SROM_EMIT(sc, miirom); - SROM_EMIT(sc, miirom|MIIROM_SROMSK); + SROM_EMIT(sc, miirom | MIIROM_SROMSK); } SROM_EMIT(sc, miirom); @@ -2147,7 +2146,7 @@ tlp_srom_size(struct tulip_softc *sc) else miirom &= ~MIIROM_SROMDI; SROM_EMIT(sc, miirom); - SROM_EMIT(sc, miirom|MIIROM_SROMSK); + SROM_EMIT(sc, miirom | MIIROM_SROMSK); SROM_EMIT(sc, miirom); } @@ -2155,7 +2154,7 @@ tlp_srom_size(struct tulip_softc *sc) for (x = 1; x <= 12; x++) { miirom &= ~MIIROM_SROMDI; SROM_EMIT(sc, miirom); - SROM_EMIT(sc, miirom|MIIROM_SROMSK); + SROM_EMIT(sc, miirom | MIIROM_SROMSK); if (!TULIP_ISSET(sc, CSR_MIIROM, MIIROM_SROMDO)) break; SROM_EMIT(sc, miirom); @@ -2171,12 +2170,12 @@ tlp_srom_size(struct tulip_softc *sc) if (x < 4 || x > 12) { aprint_debug_dev(sc->sc_dev, "broken MicroWire interface " "detected; setting SROM size to 1Kb\n"); - return (6); + return 6; } else { if (tlp_srom_debug) printf("%s: SROM size is 2^%d*16 bits (%d bytes)\n", device_xname(sc->sc_dev), x, (1 << (x + 4)) >> 3); - return (x); + return x; } } @@ -2197,7 +2196,7 @@ tlp_read_srom(struct tulip_softc *sc) sc->sc_srom_addrbits = tlp_srom_size(sc); if (sc->sc_srom_addrbits == 0) - return (0); + return 0; size = TULIP_ROM_SIZE(sc->sc_srom_addrbits); sc->sc_srom = malloc(size, M_DEVBUF, M_NOWAIT); @@ -2220,7 +2219,7 @@ tlp_read_srom(struct tulip_softc *sc) else miirom &= ~MIIROM_SROMDI; SROM_EMIT(sc, miirom); - SROM_EMIT(sc, miirom|MIIROM_SROMSK); + SROM_EMIT(sc, miirom | MIIROM_SROMSK); SROM_EMIT(sc, miirom); } @@ -2231,7 +2230,7 @@ tlp_read_srom(struct tulip_softc *sc) else miirom &= ~MIIROM_SROMDI; SROM_EMIT(sc, miirom); - SROM_EMIT(sc, miirom|MIIROM_SROMSK); + SROM_EMIT(sc, miirom | MIIROM_SROMSK); SROM_EMIT(sc, miirom); } @@ -2239,7 +2238,7 @@ tlp_read_srom(struct tulip_softc *sc) miirom &= ~MIIROM_SROMDI; datain = 0; for (x = 16; x > 0; x--) { - SROM_EMIT(sc, miirom|MIIROM_SROMSK); + SROM_EMIT(sc, miirom | MIIROM_SROMSK); if (TULIP_ISSET(sc, CSR_MIIROM, MIIROM_SROMDO)) datain |= (1 << (x - 1)); SROM_EMIT(sc, miirom); @@ -2268,7 +2267,7 @@ tlp_read_srom(struct tulip_softc *sc) printf("\n"); } - return (1); + return 1; } #undef SROM_EMIT @@ -2287,13 +2286,13 @@ tlp_add_rxbuf(struct tulip_softc *sc, int idx) MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) - return (ENOBUFS); + return ENOBUFS; MCLAIM(m, &sc->sc_ethercom.ec_rx_mowner); MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); - return (ENOBUFS); + return ENOBUFS; } if (rxs->rxs_mbuf != NULL) @@ -2303,7 +2302,7 @@ tlp_add_rxbuf(struct tulip_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmat, rxs->rxs_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { aprint_error_dev(sc->sc_dev, "can't load rx DMA map %d, error = %d\n", idx, error); @@ -2315,7 +2314,7 @@ tlp_add_rxbuf(struct tulip_softc *sc, int idx) TULIP_INIT_RXDESC(sc, idx); - return (0); + return 0; } /* @@ -2331,7 +2330,7 @@ tlp_srom_crcok(const uint8_t *romdata) crc = ether_crc32_le(romdata, TULIP_ROM_CRC32_CHECKSUM); crc = (crc & 0xffff) ^ 0xffff; if (crc == TULIP_ROM_GETW(romdata, TULIP_ROM_CRC32_CHECKSUM)) - return (1); + return 1; /* * Try an alternate checksum. @@ -2339,9 +2338,9 @@ tlp_srom_crcok(const uint8_t *romdata) crc = ether_crc32_le(romdata, TULIP_ROM_CRC32_CHECKSUM1); crc = (crc & 0xffff) ^ 0xffff; if (crc == TULIP_ROM_GETW(romdata, TULIP_ROM_CRC32_CHECKSUM1)) - return (1); + return 1; - return (0); + return 0; } /* @@ -2359,7 +2358,7 @@ tlp_isv_srom(const uint8_t *romdata) /* * SROM CRC checks out; must be in the new format. */ - return (1); + return 1; } cksum = TULIP_ROM_GETW(romdata, TULIP_ROM_CRC32_CHECKSUM); @@ -2371,16 +2370,16 @@ tlp_isv_srom(const uint8_t *romdata) */ for (i = 0; i < TULIP_ROM_SROM_FORMAT_VERION; i++) { if (romdata[i] != 0) - return (0); + return 0; } if (romdata[TULIP_ROM_SROM_FORMAT_VERION] != 1) - return (0); + return 0; if (romdata[TULIP_ROM_CHIP_COUNT] == 0) - return (0); - return (1); + return 0; + return 1; } - return (0); + return 0; } /* @@ -2394,7 +2393,7 @@ tlp_isv_srom_enaddr(struct tulip_softc *sc, uint8_t *enaddr) int i, devcnt; if (tlp_isv_srom(sc->sc_srom) == 0) - return (0); + return 0; devcnt = sc->sc_srom[TULIP_ROM_CHIP_COUNT]; for (i = 0; i < devcnt; i++) { @@ -2406,13 +2405,13 @@ tlp_isv_srom_enaddr(struct tulip_softc *sc, uint8_t *enaddr) } if (i == devcnt) - return (0); + return 0; memcpy(enaddr, &sc->sc_srom[TULIP_ROM_IEEE_NETWORK_ADDRESS], ETHER_ADDR_LEN); enaddr[5] += i; - return (1); + return 1; } /* @@ -2445,7 +2444,7 @@ tlp_parse_old_srom(struct tulip_softc *sc, uint8_t *enaddr) enaddr[i] = sc->sc_srom[i + 1]; enaddr[i + 1] = sc->sc_srom[i]; } - return (1); + return 1; } /* @@ -2462,7 +2461,7 @@ tlp_parse_old_srom(struct tulip_softc *sc, uint8_t *enaddr) enaddr[i] = sc->sc_srom[20 + i + 1]; enaddr[i + 1] = sc->sc_srom[20 + i]; } - return (1); + return 1; } /* @@ -2474,7 +2473,7 @@ tlp_parse_old_srom(struct tulip_softc *sc, uint8_t *enaddr) sc->sc_srom[1] == 0x10 && sc->sc_srom[2] == 0xe0) { memcpy(enaddr, sc->sc_srom, ETHER_ADDR_LEN); - return (1); + return 1; } /* @@ -2486,7 +2485,7 @@ tlp_parse_old_srom(struct tulip_softc *sc, uint8_t *enaddr) for (i = 8; i < 32; i++) { if (sc->sc_srom[i] != 0xff && sc->sc_srom[i] != 0) - return (0); + return 0; } /* @@ -2497,13 +2496,13 @@ tlp_parse_old_srom(struct tulip_softc *sc, uint8_t *enaddr) * - Make sure it has a non-0 OUI */ if (sc->sc_srom[0] & 3) - return (0); + return 0; if (sc->sc_srom[0] == 0 && sc->sc_srom[1] == 0 && sc->sc_srom[2] == 0) - return (0); + return 0; memcpy(enaddr, sc->sc_srom, ETHER_ADDR_LEN); - return (1); + return 1; } /* @@ -2511,11 +2510,11 @@ tlp_parse_old_srom(struct tulip_softc *sc, uint8_t *enaddr) */ if (memcmp(&sc->sc_srom[24], testpat, 8) != 0) - return (0); + return 0; for (i = 0; i < 8; i++) { if (sc->sc_srom[i] != sc->sc_srom[15 - i]) - return (0); + return 0; } memcpy(enaddr, sc->sc_srom, ETHER_ADDR_LEN); @@ -2539,9 +2538,9 @@ tlp_parse_old_srom(struct tulip_softc *sc, uint8_t *enaddr) cksum -= 0xffff; if (cksum != *(uint16_t *) &sc->sc_srom[6]) - return (0); + return 0; - return (1); + return 1; } /* @@ -2597,9 +2596,9 @@ tlp_filter_setup(struct tulip_softc *sc) * in motion. */ if (ifp->if_flags & IFF_RUNNING) - tlp_idle(sc, OPMODE_ST|OPMODE_SR); + tlp_idle(sc, OPMODE_ST | OPMODE_SR); - sc->sc_opmode &= ~(OPMODE_PR|OPMODE_PM); + sc->sc_opmode &= ~(OPMODE_PR | OPMODE_PM); if (ifp->if_flags & IFF_PROMISC) { sc->sc_opmode |= OPMODE_PR; @@ -2764,7 +2763,7 @@ tlp_filter_setup(struct tulip_softc *sc) TDCTL_Tx_IC | sc->sc_tdctl_ch | (nexttx == (TULIP_NTXDESC - 1) ? sc->sc_tdctl_er : 0)); TULIP_CDTXSYNC(sc, nexttx, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); #ifdef TLP_DEBUG if (ifp->if_flags & IFF_DEBUG) { @@ -2781,7 +2780,7 @@ tlp_filter_setup(struct tulip_softc *sc) txd->td_status = htole32(TDSTAT_OWN); TULIP_CDTXSYNC(sc, nexttx, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Advance the tx pointer. */ sc->sc_txfree -= 1; @@ -2829,7 +2828,7 @@ tlp_winb_filter_setup(struct tulip_softc *sc) DPRINTF(sc, ("%s: tlp_winb_filter_setup: sc_flags 0x%08x\n", device_xname(sc->sc_dev), sc->sc_flags)); - sc->sc_opmode &= ~(OPMODE_WINB_APP|OPMODE_WINB_AMP|OPMODE_WINB_ABP); + sc->sc_opmode &= ~(OPMODE_WINB_APP | OPMODE_WINB_AMP |OPMODE_WINB_ABP); if (ifp->if_flags & IFF_MULTICAST) sc->sc_opmode |= OPMODE_WINB_AMP; @@ -2911,7 +2910,7 @@ tlp_al981_filter_setup(struct tulip_softc *sc) DPRINTF(sc, ("%s: tlp_al981_filter_setup: sc_flags 0x%08x\n", device_xname(sc->sc_dev), sc->sc_flags)); - sc->sc_opmode &= ~(OPMODE_PR|OPMODE_PM); + sc->sc_opmode &= ~(OPMODE_PR | OPMODE_PM); if (ifp->if_flags & IFF_PROMISC) { sc->sc_opmode |= OPMODE_PR; @@ -2970,7 +2969,7 @@ tlp_asix_filter_setup(struct tulip_softc *sc) DPRINTF(sc, ("%s: tlp_asix_filter_setup: sc_flags 0x%08x\n", device_xname(sc->sc_dev), sc->sc_flags)); - sc->sc_opmode &= ~(OPMODE_PM|OPMODE_AX_RB|OPMODE_PR); + sc->sc_opmode &= ~(OPMODE_PM | OPMODE_AX_RB | OPMODE_PR); if (ifp->if_flags & IFF_MULTICAST) sc->sc_opmode |= OPMODE_PM; @@ -3176,8 +3175,8 @@ tlp_mediachange(struct ifnet *ifp) struct tulip_softc *sc = ifp->if_softc; if ((ifp->if_flags & IFF_UP) == 0) - return (0); - return ((*sc->sc_mediasw->tmsw_set)(sc)); + return 0; + return (*sc->sc_mediasw->tmsw_set)(sc); } /***************************************************************************** @@ -3216,9 +3215,9 @@ tlp_mii_statchg(struct ifnet *ifp) struct tulip_softc *sc = ifp->if_softc; /* Idle the transmit and receive processes. */ - tlp_idle(sc, OPMODE_ST|OPMODE_SR); + tlp_idle(sc, OPMODE_ST | OPMODE_SR); - sc->sc_opmode &= ~(OPMODE_TTM|OPMODE_FD|OPMODE_HBD); + sc->sc_opmode &= ~(OPMODE_TTM | OPMODE_FD | OPMODE_HBD); if (IFM_SUBTYPE(sc->sc_mii.mii_media_active) == IFM_10_T) sc->sc_opmode |= OPMODE_TTM; @@ -3226,7 +3225,7 @@ tlp_mii_statchg(struct ifnet *ifp) sc->sc_opmode |= OPMODE_HBD; if (sc->sc_mii.mii_media_active & IFM_FDX) - sc->sc_opmode |= OPMODE_FD|OPMODE_HBD; + sc->sc_opmode |= OPMODE_FD | OPMODE_HBD; /* * Write new OPMODE bits. This also restarts the transmit @@ -3247,9 +3246,9 @@ tlp_winb_mii_statchg(struct ifnet *ifp) struct tulip_softc *sc = ifp->if_softc; /* Idle the transmit and receive processes. */ - tlp_idle(sc, OPMODE_ST|OPMODE_SR); + tlp_idle(sc, OPMODE_ST | OPMODE_SR); - sc->sc_opmode &= ~(OPMODE_WINB_FES|OPMODE_FD); + sc->sc_opmode &= ~(OPMODE_WINB_FES | OPMODE_FD); if (IFM_SUBTYPE(sc->sc_mii.mii_media_active) == IFM_100_TX) sc->sc_opmode |= OPMODE_WINB_FES; @@ -3279,7 +3278,7 @@ tlp_dm9102_mii_statchg(struct ifnet *ifp) * Don't idle the transmit and receive processes, here. It * seems to fail, and just causes excess noise. */ - sc->sc_opmode &= ~(OPMODE_TTM|OPMODE_FD); + sc->sc_opmode &= ~(OPMODE_TTM | OPMODE_FD); if (IFM_SUBTYPE(sc->sc_mii.mii_media_active) != IFM_100_TX) sc->sc_opmode |= OPMODE_TTM; @@ -3301,10 +3300,11 @@ tlp_dm9102_mii_statchg(struct ifnet *ifp) static void tlp_mii_getmedia(struct tulip_softc *sc, struct ifmediareq *ifmr) { + struct mii_data * const mii = &sc->sc_mii; - mii_pollstat(&sc->sc_mii); - ifmr->ifm_status = sc->sc_mii.mii_media_status; - ifmr->ifm_active = sc->sc_mii.mii_media_active; + mii_pollstat(mii); + ifmr->ifm_status = mii->mii_media_status; + ifmr->ifm_active = mii->mii_media_active; } /* @@ -3372,7 +3372,7 @@ tlp_sio_mii_bitbang_read(device_t self) { struct tulip_softc *sc = device_private(self); - return (TULIP_READ(sc, CSR_MIIROM)); + return TULIP_READ(sc, CSR_MIIROM); } /* @@ -3549,7 +3549,7 @@ tlp_2114x_mii_preinit(struct tulip_softc *sc) * Always set the Must-Be-One bit, and Port Select (to select MII). * We'll never be called during a media change. */ - sc->sc_opmode |= OPMODE_MBO|OPMODE_PS; + sc->sc_opmode |= OPMODE_MBO | OPMODE_PS; TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode); } @@ -3589,7 +3589,7 @@ tlp_asix_preinit(struct tulip_softc *sc) case TULIP_CHIP_AX88140: case TULIP_CHIP_AX88141: /* XXX Handle PHY. */ - sc->sc_opmode |= OPMODE_HBD|OPMODE_PS; + sc->sc_opmode |= OPMODE_HBD | OPMODE_PS; break; default: /* Nothing */ @@ -3610,7 +3610,7 @@ tlp_dm9102_preinit(struct tulip_softc *sc) switch (sc->sc_chip) { case TULIP_CHIP_DM9102: - sc->sc_opmode |= OPMODE_MBO|OPMODE_HBD|OPMODE_PS; + sc->sc_opmode |= OPMODE_MBO | OPMODE_HBD | OPMODE_PS; break; case TULIP_CHIP_DM9102A: @@ -3618,7 +3618,7 @@ tlp_dm9102_preinit(struct tulip_softc *sc) * XXX Figure out how to actually deal with the HomePNA * XXX portion of the DM9102A. */ - sc->sc_opmode |= OPMODE_MBO|OPMODE_HBD; + sc->sc_opmode |= OPMODE_MBO | OPMODE_HBD; break; default: @@ -3642,7 +3642,7 @@ tlp_21140_reset(struct tulip_softc *sc) int i; /* First, set the direction on the GPIO pins. */ - TULIP_WRITE(sc, CSR_GPP, GPP_GPC|sc->sc_gp_dir); + TULIP_WRITE(sc, CSR_GPP, GPP_GPC | sc->sc_gp_dir); /* Now, issue the reset sequence. */ for (i = 0; i < tm->tm_reset_length; i++) { @@ -3742,7 +3742,7 @@ static void tlp_dm9102_reset(struct tulip_softc *sc) { - TULIP_WRITE(sc, CSR_DM_PHYSTAT, DM_PHYSTAT_GEPC|DM_PHYSTAT_GPED); + TULIP_WRITE(sc, CSR_DM_PHYSTAT, DM_PHYSTAT_GEPC | DM_PHYSTAT_GPED); delay(100); TULIP_WRITE(sc, CSR_DM_PHYSTAT, 0); } @@ -3812,7 +3812,7 @@ static const struct tulip_srom_to_ifmedia tulip_srom_to_ifmedia_table[] = { { TULIP_ROM_MB_MEDIA_100TX, IFM_100_TX, 0, "100baseTX", - OPMODE_PS|OPMODE_PCS|OPMODE_SCR|OPMODE_HBD, + OPMODE_PS | OPMODE_PCS | OPMODE_SCR | OPMODE_HBD, BMSR_100TXHDX, { 0, 0, @@ -3828,7 +3828,7 @@ static const struct tulip_srom_to_ifmedia tulip_srom_to_ifmedia_table[] = { { TULIP_ROM_MB_MEDIA_TP_FDX, IFM_10_T, IFM_FDX, "10baseT-FDX", - OPMODE_TTM|OPMODE_FD|OPMODE_HBD, + OPMODE_TTM | OPMODE_FD | OPMODE_HBD, BMSR_10TFDX, { SIACONN_21040_10BASET_FDX, SIATXRX_21040_10BASET_FDX, @@ -3844,7 +3844,7 @@ static const struct tulip_srom_to_ifmedia tulip_srom_to_ifmedia_table[] = { { TULIP_ROM_MB_MEDIA_100TX_FDX, IFM_100_TX, IFM_FDX, "100baseTX-FDX", - OPMODE_PS|OPMODE_PCS|OPMODE_SCR|OPMODE_FD|OPMODE_HBD, + OPMODE_PS | OPMODE_PCS | OPMODE_SCR | OPMODE_FD | OPMODE_HBD, BMSR_100TXFDX, { 0, 0, @@ -3860,7 +3860,7 @@ static const struct tulip_srom_to_ifmedia tulip_srom_to_ifmedia_table[] = { { TULIP_ROM_MB_MEDIA_100T4, IFM_100_T4, 0, "100baseT4", - OPMODE_PS|OPMODE_PCS|OPMODE_SCR|OPMODE_HBD, + OPMODE_PS | OPMODE_PCS | OPMODE_SCR | OPMODE_HBD, BMSR_100T4, { 0, 0, @@ -3876,7 +3876,7 @@ static const struct tulip_srom_to_ifmedia tulip_srom_to_ifmedia_table[] = { { TULIP_ROM_MB_MEDIA_100FX, IFM_100_FX, 0, "100baseFX", - OPMODE_PS|OPMODE_PCS|OPMODE_HBD, + OPMODE_PS | OPMODE_PCS | OPMODE_HBD, 0, { 0, 0, @@ -3892,7 +3892,7 @@ static const struct tulip_srom_to_ifmedia tulip_srom_to_ifmedia_table[] = { { TULIP_ROM_MB_MEDIA_100FX_FDX, IFM_100_FX, IFM_FDX, "100baseFX-FDX", - OPMODE_PS|OPMODE_PCS|OPMODE_FD|OPMODE_HBD, + OPMODE_PS | OPMODE_PCS | OPMODE_FD | OPMODE_HBD, 0, { 0, 0, @@ -3942,10 +3942,10 @@ tlp_srom_to_ifmedia(uint8_t sm) for (tsti = tulip_srom_to_ifmedia_table; tsti->tsti_name != NULL; tsti++) { if (tsti->tsti_srom == sm) - return (tsti); + return tsti; } - return (NULL); + return NULL; } static void @@ -3996,7 +3996,7 @@ tlp_add_srom_media(struct tulip_softc *sc, int type, for (i = 0; i < cnt; i++) { tsti = tlp_srom_to_ifmedia(list[i]); - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tlp_srom_media_info(sc, tsti, tm); tm->tm_type = type; tm->tm_get = get; @@ -4086,7 +4086,7 @@ tlp_sia_update_link(struct tulip_softc *sc) ife = TULIP_CURRENT_MEDIA(sc); tm = ife->ifm_aux; - sc->sc_flags &= ~(TULIPF_LINK_UP|TULIPF_LINK_VALID); + sc->sc_flags &= ~(TULIPF_LINK_UP | TULIPF_LINK_VALID); siastat = TULIP_READ(sc, CSR_SIASTAT); @@ -4210,7 +4210,7 @@ static int tlp_sia_set(struct tulip_softc *sc) { - return (tlp_sia_media(sc, TULIP_CURRENT_MEDIA(sc))); + return tlp_sia_media(sc, TULIP_CURRENT_MEDIA(sc)); } static int @@ -4228,7 +4228,7 @@ tlp_sia_media(struct tulip_softc *sc, struct ifmedia_entry *ife) /* * Idle the chip. */ - tlp_idle(sc, OPMODE_ST|OPMODE_SR); + tlp_idle(sc, OPMODE_ST | OPMODE_SR); /* * Program the SIA. It's important to write in this order, @@ -4258,7 +4258,7 @@ tlp_sia_media(struct tulip_softc *sc, struct ifmedia_entry *ife) sc->sc_opmode = (sc->sc_opmode & ~OPMODE_MEDIA_BITS) | tm->tm_opmode; TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode); - return (0); + return 0; } /* @@ -4275,7 +4275,7 @@ tlp_21140_gpio_update_link(struct tulip_softc *sc) ife = TULIP_CURRENT_MEDIA(sc); tm = ife->ifm_aux; - sc->sc_flags &= ~(TULIPF_LINK_UP|TULIPF_LINK_VALID); + sc->sc_flags &= ~(TULIPF_LINK_UP | TULIPF_LINK_VALID); if (tm->tm_actmask != 0) { sc->sc_flags |= TULIPF_LINK_VALID; @@ -4315,13 +4315,13 @@ tlp_21140_gpio_set(struct tulip_softc *sc) /* * Idle the chip. */ - tlp_idle(sc, OPMODE_ST|OPMODE_SR); + tlp_idle(sc, OPMODE_ST | OPMODE_SR); /* * Set the GPIO pins for this media, to flip any * relays, etc. */ - TULIP_WRITE(sc, CSR_GPP, GPP_GPC|sc->sc_gp_dir); + TULIP_WRITE(sc, CSR_GPP, GPP_GPC | sc->sc_gp_dir); delay(10); TULIP_WRITE(sc, CSR_GPP, tm->tm_gpdata); @@ -4332,7 +4332,7 @@ tlp_21140_gpio_set(struct tulip_softc *sc) sc->sc_opmode = (sc->sc_opmode & ~OPMODE_MEDIA_BITS) | tm->tm_opmode; TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode); - return (0); + return 0; } /* @@ -4362,6 +4362,7 @@ const struct tulip_mediasw tlp_21041_mediasw = { static void tlp_21040_tmsw_init(struct tulip_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; static const uint8_t media[] = { TULIP_ROM_MB_MEDIA_TP, TULIP_ROM_MB_MEDIA_TP_FDX, @@ -4369,22 +4370,21 @@ tlp_21040_tmsw_init(struct tulip_softc *sc) }; struct tulip_21x4x_media *tm; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); tlp_add_srom_media(sc, 0, NULL, NULL, media, 3); /* * No SROM type for External SIA. */ - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_name = "manual"; tm->tm_opmode = 0; tm->tm_siaconn = SIACONN_21040_EXTSIA; tm->tm_siatxrx = SIATXRX_21040_EXTSIA; tm->tm_siagen = SIAGEN_21040_EXTSIA; - ifmedia_add(&sc->sc_mii.mii_media, + ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, IFM_MANUAL, 0, sc->sc_tlp_minst), 0, tm); /* @@ -4392,7 +4392,7 @@ tlp_21040_tmsw_init(struct tulip_softc *sc) */ /* XXX This should be auto-sense. */ - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_10_T); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_T); tlp_print_media(sc); } @@ -4400,18 +4400,18 @@ tlp_21040_tmsw_init(struct tulip_softc *sc) static void tlp_21040_tp_tmsw_init(struct tulip_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; static const uint8_t media[] = { TULIP_ROM_MB_MEDIA_TP, TULIP_ROM_MB_MEDIA_TP_FDX, }; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); tlp_add_srom_media(sc, 0, NULL, NULL, media, 2); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_10_T); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_T); tlp_print_media(sc); } @@ -4419,17 +4419,17 @@ tlp_21040_tp_tmsw_init(struct tulip_softc *sc) static void tlp_21040_auibnc_tmsw_init(struct tulip_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; static const uint8_t media[] = { TULIP_ROM_MB_MEDIA_AUI, }; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); tlp_add_srom_media(sc, 0, NULL, NULL, media, 1); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_10_5); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_5); tlp_print_media(sc); } @@ -4437,6 +4437,7 @@ tlp_21040_auibnc_tmsw_init(struct tulip_softc *sc) static void tlp_21041_tmsw_init(struct tulip_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; static const uint8_t media[] = { TULIP_ROM_MB_MEDIA_TP, TULIP_ROM_MB_MEDIA_TP_FDX, @@ -4449,9 +4450,8 @@ tlp_21041_tmsw_init(struct tulip_softc *sc) uint16_t romdef; uint8_t mb; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); if (tlp_isv_srom(sc->sc_srom) == 0) { not_isv_srom: @@ -4467,7 +4467,7 @@ tlp_21041_tmsw_init(struct tulip_softc *sc) */ /* XXX This should be auto-sense. */ - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_10_T); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_T); tlp_print_media(sc); return; @@ -4493,7 +4493,7 @@ tlp_21041_tmsw_init(struct tulip_softc *sc) for (; m_cnt != 0; m_cnt--, mb_offset += TULIP_ROM_MB_SIZE(mb)) { mb = sc->sc_srom[mb_offset]; - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); switch (mb & TULIP_ROM_MB_MEDIA_CODE) { case TULIP_ROM_MB_MEDIA_TP_FDX: case TULIP_ROM_MB_MEDIA_TP: @@ -4517,7 +4517,7 @@ tlp_21041_tmsw_init(struct tulip_softc *sc) mb_offset + TULIP_ROM_MB_CSR15); } - ifmedia_add(&sc->sc_mii.mii_media, + ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, tsti->tsti_subtype, tsti->tsti_options, sc->sc_tlp_minst), 0, tm); break; @@ -4540,24 +4540,24 @@ tlp_21041_tmsw_init(struct tulip_softc *sc) case SELECT_CONN_TYPE_TP: case SELECT_CONN_TYPE_TP_AUTONEG: case SELECT_CONN_TYPE_TP_NOLINKPASS: - defmedia = IFM_ETHER|IFM_10_T; + defmedia = IFM_ETHER | IFM_10_T; break; case SELECT_CONN_TYPE_TP_FDX: - defmedia = IFM_ETHER|IFM_10_T|IFM_FDX; + defmedia = IFM_ETHER | IFM_10_T | IFM_FDX; break; case SELECT_CONN_TYPE_BNC: - defmedia = IFM_ETHER|IFM_10_2; + defmedia = IFM_ETHER | IFM_10_2; break; case SELECT_CONN_TYPE_AUI: - defmedia = IFM_ETHER|IFM_10_5; + defmedia = IFM_ETHER | IFM_10_5; break; #if 0 /* XXX */ case SELECT_CONN_TYPE_ASENSE: case SELECT_CONN_TYPE_ASENSE_AUTONEG: - defmedia = IFM_ETHER|IFM_AUTO; + defmedia = IFM_ETHER | IFM_AUTO; break; #endif default: @@ -4568,10 +4568,10 @@ tlp_21041_tmsw_init(struct tulip_softc *sc) /* * XXX We should default to auto-sense. */ - defmedia = IFM_ETHER|IFM_10_T; + defmedia = IFM_ETHER | IFM_10_T; } - ifmedia_set(&sc->sc_mii.mii_media, defmedia); + ifmedia_set(&mii->mii_media, defmedia); tlp_print_media(sc); } @@ -4600,6 +4600,7 @@ static void tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; struct ifmedia_entry *ife; struct mii_softc *phy; struct tulip_21x4x_media *tm; @@ -4611,11 +4612,11 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) defmedia = miidef = 0; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg; - sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_bitbang_mii_readreg; + mii->mii_writereg = tlp_bitbang_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; /* * Ignore `instance'; we may get a mixture of SIA and MII @@ -4623,7 +4624,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) * PHY on the MII as appropriate. Note that duplicate media * are disallowed, so ignoring `instance' is safe. */ - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, tlp_mediachange, + ifmedia_init(&mii->mii_media, IFM_IMASK, tlp_mediachange, tlp_mediastatus); devcnt = sc->sc_srom[TULIP_ROM_CHIP_COUNT]; @@ -4700,7 +4701,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) tlp_get_minst(sc); sc->sc_media_seen |= 1 << TULIP_ROM_MB_21140_GPR; - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_type = TULIP_ROM_MB_21140_GPR; tm->tm_get = tlp_21140_gpio_get; @@ -4737,7 +4738,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) 0 : tm->tm_actmask; } - ifmedia_add(&sc->sc_mii.mii_media, + ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, tsti->tsti_subtype, tsti->tsti_options, sc->sc_tlp_minst), 0, tm); break; @@ -4745,7 +4746,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) case TULIP_ROM_MB_21140_MII: sc->sc_media_seen |= 1 << TULIP_ROM_MB_21140_MII; - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_type = TULIP_ROM_MB_21140_MII; tm->tm_get = tlp_mii_getmedia; @@ -4787,7 +4788,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) */ /* Set the direction of the pins... */ - TULIP_WRITE(sc, CSR_GPP, GPP_GPC|sc->sc_gp_dir); + TULIP_WRITE(sc, CSR_GPP, GPP_GPC | sc->sc_gp_dir); for (i = 0; i < tm->tm_reset_length; i++) { delay(10); @@ -4813,7 +4814,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) * particularly care; the MII code just likes to * search the whole thing anyhow. */ - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, tm->tm_phyno, 0); /* @@ -4822,7 +4823,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) * kernel, we lose. The PHY's default media always * takes priority. */ - LIST_FOREACH(phy, &sc->sc_mii.mii_phys, mii_list) { + LIST_FOREACH(phy, &mii->mii_phys, mii_list) { if (phy->mii_offset == tm->tm_phyno) break; } @@ -4847,7 +4848,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) * We do this by looking for media with our * PHY's `instance'. */ - TAILQ_FOREACH(ife, &sc->sc_mii.mii_media.ifm_list, + TAILQ_FOREACH(ife, &mii->mii_media.ifm_list, ifm_list) { if (IFM_INST(ife->ifm_media) != phy->mii_inst) continue; @@ -4859,7 +4860,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) tlp_get_minst(sc); sc->sc_media_seen |= 1 << TULIP_ROM_MB_21142_SIA; - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_type = TULIP_ROM_MB_21142_SIA; tm->tm_get = tlp_sia_get; @@ -4893,7 +4894,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) tm->tm_gpctl = TULIP_ROM_GETW(cp, 0) << 16; tm->tm_gpdata = TULIP_ROM_GETW(cp, 2) << 16; - ifmedia_add(&sc->sc_mii.mii_media, + ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, tsti->tsti_subtype, tsti->tsti_options, sc->sc_tlp_minst), 0, tm); break; @@ -4901,7 +4902,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) case TULIP_ROM_MB_21142_MII: sc->sc_media_seen |= 1 << TULIP_ROM_MB_21142_MII; - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_type = TULIP_ROM_MB_21142_MII; tm->tm_get = tlp_mii_getmedia; @@ -4969,7 +4970,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) * particularly care; the MII code just likes to * search the whole thing anyhow. */ - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, tm->tm_phyno, 0); /* @@ -4978,7 +4979,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) * kernel, we lose. The PHY's default media always * takes priority. */ - LIST_FOREACH(phy, &sc->sc_mii.mii_phys, mii_list) { + LIST_FOREACH(phy, &mii->mii_phys, mii_list) { if (phy->mii_offset == tm->tm_phyno) break; } @@ -5003,7 +5004,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) * We do this by looking for media with our * PHY's `instance'. */ - TAILQ_FOREACH(ife, &sc->sc_mii.mii_media.ifm_list, + TAILQ_FOREACH(ife, &mii->mii_media.ifm_list, ifm_list) { if (IFM_INST(ife->ifm_media) != phy->mii_inst) continue; @@ -5015,7 +5016,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) tlp_get_minst(sc); sc->sc_media_seen |= 1 << TULIP_ROM_MB_21143_SYM; - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_type = TULIP_ROM_MB_21143_SYM; tm->tm_get = tlp_sia_get; @@ -5053,7 +5054,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) 0 : tm->tm_actmask; } - ifmedia_add(&sc->sc_mii.mii_media, + ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, tsti->tsti_subtype, tsti->tsti_options, sc->sc_tlp_minst), 0, tm); break; @@ -5071,10 +5072,10 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) /* * Deal with the case where no media is configured. */ - if (TAILQ_FIRST(&sc->sc_mii.mii_media.ifm_list) == NULL) { + if (TAILQ_FIRST(&mii->mii_media.ifm_list) == NULL) { aprint_error_dev(sc->sc_dev, "no media found!\n"); - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); return; } @@ -5089,13 +5090,13 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) case TULIP_CHIP_21140A: /* XXX should come from SROM */ defmedia = IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, 0); - if (ifmedia_match(&sc->sc_mii.mii_media, defmedia, - sc->sc_mii.mii_media.ifm_mask) == NULL) { + if (ifmedia_match(&mii->mii_media, defmedia, + mii->mii_media.ifm_mask) == NULL) { /* * There is not a 10baseT media. * Fall back to the first found one. */ - ife = TAILQ_FIRST(&sc->sc_mii.mii_media.ifm_list); + ife = TAILQ_FIRST(&mii->mii_media.ifm_list); defmedia = ife->ifm_media; } break; @@ -5107,13 +5108,13 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) case TULIP_CHIP_MX98715A: case TULIP_CHIP_MX98715AEC_X: case TULIP_CHIP_MX98725: - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_name = "auto"; tm->tm_get = tlp_2114x_nway_get; tm->tm_set = tlp_2114x_nway_set; defmedia = IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, 0); - ifmedia_add(&sc->sc_mii.mii_media, defmedia, 0, tm); + ifmedia_add(&mii->mii_media, defmedia, 0, tm); sc->sc_statchg = tlp_2114x_nway_statchg; sc->sc_tick = tlp_2114x_nway_tick; @@ -5125,7 +5126,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_softc *sc) } } - ifmedia_set(&sc->sc_mii.mii_media, defmedia); + ifmedia_set(&mii->mii_media, defmedia); /* * Display any non-MII media we've located. @@ -5150,7 +5151,7 @@ static int tlp_2114x_nway_set(struct tulip_softc *sc) { - return (tlp_2114x_nway_service(sc, MII_MEDIACHG)); + return tlp_2114x_nway_service(sc, MII_MEDIACHG); } static void @@ -5215,7 +5216,7 @@ tlp_2114x_nway_service(struct tulip_softc *sc, int cmd) struct ifmedia_entry *ife = mii->mii_media.ifm_cur; if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); + return 0; switch (cmd) { case MII_POLLSTAT: @@ -5229,7 +5230,7 @@ tlp_2114x_nway_service(struct tulip_softc *sc, int cmd) default: /* Manual setting doesn't go through here. */ printf("tlp_2114x_nway_service: oops!\n"); - return (EINVAL); + return EINVAL; } break; @@ -5276,7 +5277,7 @@ tlp_2114x_nway_service(struct tulip_softc *sc, int cmd) (*sc->sc_statchg)(mii->mii_ifp); ife->ifm_data = mii->mii_media_active; } - return (0); + return 0; } static void @@ -5284,10 +5285,10 @@ tlp_2114x_nway_auto(struct tulip_softc *sc) { uint32_t siastat, siatxrx; - tlp_idle(sc, OPMODE_ST|OPMODE_SR); + tlp_idle(sc, OPMODE_ST | OPMODE_SR); - sc->sc_opmode &= ~(OPMODE_PS|OPMODE_PCS|OPMODE_SCR|OPMODE_FD); - sc->sc_opmode |= OPMODE_TTM|OPMODE_HBD; + sc->sc_opmode &= ~(OPMODE_PS | OPMODE_PCS | OPMODE_SCR | OPMODE_FD); + sc->sc_opmode |= OPMODE_TTM | OPMODE_HBD; siatxrx = 0xffbf; /* XXX magic number */ /* Compute the link code word to advertise. */ @@ -5310,8 +5311,8 @@ tlp_2114x_nway_auto(struct tulip_softc *sc) TULIP_WRITE(sc, CSR_SIACONN, SIACONN_SRL); siastat = TULIP_READ(sc, CSR_SIASTAT); - siastat &= ~(SIASTAT_ANS|SIASTAT_LPC|SIASTAT_TRA|SIASTAT_ARA| - SIASTAT_LS100|SIASTAT_LS10|SIASTAT_MRA); + siastat &= ~(SIASTAT_ANS | SIASTAT_LPC | SIASTAT_TRA | SIASTAT_ARA | + SIASTAT_LS100 | SIASTAT_LS10 | SIASTAT_MRA); siastat |= SIASTAT_ANS_TXDIS; TULIP_WRITE(sc, CSR_SIASTAT, siastat); } @@ -5348,13 +5349,13 @@ tlp_2114x_nway_status(struct tulip_softc *sc) mii->mii_media_active |= IFM_100_T4; else if (anlpar & ANLPAR_TX_FD && sc->sc_sia_cap & BMSR_100TXFDX) - mii->mii_media_active |= IFM_100_TX|IFM_FDX; + mii->mii_media_active |= IFM_100_TX | IFM_FDX; else if (anlpar & ANLPAR_TX && sc->sc_sia_cap & BMSR_100TXHDX) mii->mii_media_active |= IFM_100_TX; else if (anlpar & ANLPAR_10_FD && sc->sc_sia_cap & BMSR_10TFDX) - mii->mii_media_active |= IFM_10_T|IFM_FDX; + mii->mii_media_active |= IFM_10_T | IFM_FDX; else if (anlpar & ANLPAR_10 && sc->sc_sia_cap & BMSR_10THDX) mii->mii_media_active |= IFM_10_T; @@ -5410,9 +5411,9 @@ tlp_2114x_isv_tmsw_set(struct tulip_softc *sc) * time through. */ if (TULIP_MEDIA_NEEDSRESET(sc, tm->tm_opmode)) - return (tlp_init(&sc->sc_ethercom.ec_if)); + return tlp_init(&sc->sc_ethercom.ec_if); - return ((*tm->tm_set)(sc)); + return (*tm->tm_set)(sc); } /* @@ -5428,6 +5429,7 @@ static void tlp_sio_mii_tmsw_init(struct tulip_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; /* * We don't attach any media info structures to the ifmedia @@ -5437,22 +5439,21 @@ tlp_sio_mii_tmsw_init(struct tulip_softc *sc) if (sc->sc_preinit == tlp_2114x_preinit) sc->sc_preinit = tlp_2114x_mii_preinit; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg; - sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_bitbang_mii_readreg; + mii->mii_writereg = tlp_bitbang_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } @@ -5479,59 +5480,59 @@ static void tlp_pnic_nway_acomp(struct tulip_softc *); static void tlp_pnic_tmsw_init(struct tulip_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; struct ifnet *ifp = &sc->sc_ethercom.ec_if; const char *sep = ""; -#define ADD(m, c) ifmedia_add(&sc->sc_mii.mii_media, (m), (c), NULL) +#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) #define PRINT(str) aprint_normal("%s%s", sep, str); sep = ", " - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_pnic_mii_readreg; - sc->sc_mii.mii_writereg = tlp_pnic_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_pnic_mii_readreg; + mii->mii_writereg = tlp_pnic_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { + if (LIST_FIRST(&mii->mii_phys) == NULL) { /* XXX What about AUI/BNC support? */ aprint_normal_dev(sc->sc_dev, ""); tlp_pnic_nway_reset(sc); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, 0), - PNIC_NWAY_TW|PNIC_NWAY_CAP10T); + PNIC_NWAY_TW | PNIC_NWAY_CAP10T); PRINT("10baseT"); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, IFM_FDX, 0), - PNIC_NWAY_TW|PNIC_NWAY_FD|PNIC_NWAY_CAP10TFDX); + PNIC_NWAY_TW | PNIC_NWAY_FD | PNIC_NWAY_CAP10TFDX); PRINT("10baseT-FDX"); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, 0, 0), - PNIC_NWAY_TW|PNIC_NWAY_100|PNIC_NWAY_CAP100TX); + PNIC_NWAY_TW | PNIC_NWAY_100 | PNIC_NWAY_CAP100TX); PRINT("100baseTX"); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_FDX, 0), - PNIC_NWAY_TW|PNIC_NWAY_100|PNIC_NWAY_FD| + PNIC_NWAY_TW | PNIC_NWAY_100 | PNIC_NWAY_FD | PNIC_NWAY_CAP100TXFDX); PRINT("100baseTX-FDX"); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, 0), - PNIC_NWAY_TW|PNIC_NWAY_RN|PNIC_NWAY_NW| - PNIC_NWAY_CAP10T|PNIC_NWAY_CAP10TFDX| - PNIC_NWAY_CAP100TXFDX|PNIC_NWAY_CAP100TX); + PNIC_NWAY_TW | PNIC_NWAY_RN | PNIC_NWAY_NW | + PNIC_NWAY_CAP10T | PNIC_NWAY_CAP10TFDX | + PNIC_NWAY_CAP100TXFDX | PNIC_NWAY_CAP100TX); PRINT("auto"); aprint_normal("\n"); sc->sc_statchg = tlp_pnic_nway_statchg; sc->sc_tick = tlp_pnic_nway_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } else { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } #undef ADD @@ -5549,8 +5550,8 @@ tlp_pnic_tmsw_get(struct tulip_softc *sc, struct ifmediareq *ifmr) mii->mii_media_status = 0; mii->mii_media_active = IFM_NONE; tlp_pnic_nway_service(sc, MII_POLLSTAT); - ifmr->ifm_status = sc->sc_mii.mii_media_status; - ifmr->ifm_active = sc->sc_mii.mii_media_active; + ifmr->ifm_status = mii->mii_media_status; + ifmr->ifm_active = mii->mii_media_active; } } @@ -5566,16 +5567,16 @@ tlp_pnic_tmsw_set(struct tulip_softc *sc) */ TULIP_WRITE(sc, CSR_PNIC_ENDEC, PNIC_ENDEC_JDIS); - return (tlp_mii_setmedia(sc)); + return tlp_mii_setmedia(sc); } if (ifp->if_flags & IFF_UP) { mii->mii_media_status = 0; mii->mii_media_active = IFM_NONE; - return (tlp_pnic_nway_service(sc, MII_MEDIACHG)); + return tlp_pnic_nway_service(sc, MII_MEDIACHG); } - return (0); + return 0; } static void @@ -5584,10 +5585,10 @@ tlp_pnic_nway_statchg(struct ifnet *ifp) struct tulip_softc *sc = ifp->if_softc; /* Idle the transmit and receive processes. */ - tlp_idle(sc, OPMODE_ST|OPMODE_SR); + tlp_idle(sc, OPMODE_ST | OPMODE_SR); - sc->sc_opmode &= ~(OPMODE_TTM|OPMODE_FD|OPMODE_PS|OPMODE_PCS| - OPMODE_SCR|OPMODE_HBD); + sc->sc_opmode &= ~(OPMODE_TTM | OPMODE_FD | OPMODE_PS | OPMODE_PCS | + OPMODE_SCR | OPMODE_HBD); if (IFM_SUBTYPE(sc->sc_mii.mii_media_active) == IFM_10_T) { sc->sc_opmode |= OPMODE_TTM; @@ -5595,14 +5596,14 @@ tlp_pnic_nway_statchg(struct ifnet *ifp) GPP_PNIC_OUT(GPP_PNIC_PIN_SPEED_RLY, 0) | GPP_PNIC_OUT(GPP_PNIC_PIN_100M_LPKB, 1)); } else { - sc->sc_opmode |= OPMODE_PS|OPMODE_PCS|OPMODE_SCR|OPMODE_HBD; + sc->sc_opmode |= OPMODE_PS |OPMODE_PCS |OPMODE_SCR |OPMODE_HBD; TULIP_WRITE(sc, CSR_GPP, GPP_PNIC_OUT(GPP_PNIC_PIN_SPEED_RLY, 1) | GPP_PNIC_OUT(GPP_PNIC_PIN_100M_LPKB, 1)); } if (sc->sc_mii.mii_media_active & IFM_FDX) - sc->sc_opmode |= OPMODE_FD|OPMODE_HBD; + sc->sc_opmode |= OPMODE_FD | OPMODE_HBD; /* * Write new OPMODE bits. This also restarts the transmit @@ -5639,7 +5640,7 @@ tlp_pnic_nway_service(struct tulip_softc *sc, int cmd) struct ifmedia_entry *ife = mii->mii_media.ifm_cur; if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); + return 0; switch (cmd) { case MII_POLLSTAT: @@ -5655,7 +5656,7 @@ tlp_pnic_nway_service(struct tulip_softc *sc, int cmd) /* * XXX Not supported as a manual setting right now. */ - return (EINVAL); + return EINVAL; default: /* * NWAY register data is stored in the ifmedia entry. @@ -5669,25 +5670,25 @@ tlp_pnic_nway_service(struct tulip_softc *sc, int cmd) * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) - return (0); + return 0; /* * Check to see if we have link. If we do, we don't * need to restart the autonegotiation process. */ if (sc->sc_flags & TULIPF_LINK_UP) - return (0); + return 0; /* * Only retry autonegotiation every 5 seconds. */ if (++sc->sc_nway_ticks != 5) - return (0); + return 0; sc->sc_nway_ticks = 0; tlp_pnic_nway_reset(sc); if (tlp_pnic_nway_auto(sc, 0) == EJUSTRETURN) - return (0); + return 0; break; } @@ -5701,7 +5702,7 @@ tlp_pnic_nway_service(struct tulip_softc *sc, int cmd) (*sc->sc_statchg)(mii->mii_ifp); tlp_nway_activate(sc, mii->mii_media_active); } - return (0); + return 0; } static void @@ -5730,7 +5731,7 @@ tlp_pnic_nway_auto(struct tulip_softc *sc, int waitfor) reg = TULIP_READ(sc, CSR_PNIC_NWAY); if (reg & PNIC_NWAY_LPAR_MASK) { tlp_pnic_nway_acomp(sc); - return (0); + return 0; } delay(1000); } @@ -5745,7 +5746,7 @@ tlp_pnic_nway_auto(struct tulip_softc *sc, int waitfor) * If that's set, a timeout is pending, and it will * clear the flag. */ - return (EIO); + return EIO; } /* @@ -5758,7 +5759,7 @@ tlp_pnic_nway_auto(struct tulip_softc *sc, int waitfor) callout_reset(&sc->sc_nway_callout, hz >> 1, tlp_pnic_nway_auto_timeout, sc); } - return (EJUSTRETURN); + return EJUSTRETURN; } static void @@ -5781,7 +5782,7 @@ tlp_pnic_nway_auto_timeout(void *arg) tlp_pnic_nway_acomp(sc); /* Update the media status. */ - (void) tlp_pnic_nway_service(sc, MII_POLLSTAT); + (void)tlp_pnic_nway_service(sc, MII_POLLSTAT); splx(s); } @@ -5812,11 +5813,11 @@ tlp_pnic_nway_status(struct tulip_softc *sc) else #endif if (reg & PNIC_NWAY_LPAR100TXFDX) - mii->mii_media_active |= IFM_100_TX|IFM_FDX; + mii->mii_media_active |= IFM_100_TX | IFM_FDX; else if (reg & PNIC_NWAY_LPAR100TX) mii->mii_media_active |= IFM_100_TX; else if (reg & PNIC_NWAY_LPAR10TFDX) - mii->mii_media_active |= IFM_10_T|IFM_FDX; + mii->mii_media_active |= IFM_10_T | IFM_FDX; else if (reg & PNIC_NWAY_LPAR10T) mii->mii_media_active |= IFM_10_T; else @@ -5837,11 +5838,11 @@ tlp_pnic_nway_acomp(struct tulip_softc *sc) uint32_t reg; reg = TULIP_READ(sc, CSR_PNIC_NWAY); - reg &= ~(PNIC_NWAY_FD|PNIC_NWAY_100|PNIC_NWAY_RN); + reg &= ~(PNIC_NWAY_FD | PNIC_NWAY_100 | PNIC_NWAY_RN); - if (reg & (PNIC_NWAY_LPAR100TXFDX|PNIC_NWAY_LPAR100TX)) + if (reg & (PNIC_NWAY_LPAR100TXFDX | PNIC_NWAY_LPAR100TX)) reg |= PNIC_NWAY_100; - if (reg & (PNIC_NWAY_LPAR10TFDX|PNIC_NWAY_LPAR100TXFDX)) + if (reg & (PNIC_NWAY_LPAR10TFDX | PNIC_NWAY_LPAR100TXFDX)) reg |= PNIC_NWAY_FD; TULIP_WRITE(sc, CSR_PNIC_NWAY, reg); @@ -5874,6 +5875,7 @@ const struct tulip_mediasw tlp_pmac_mii_mediasw = { static void tlp_pmac_tmsw_init(struct tulip_softc *sc) { + struct mii_data * const mii = &sc->sc_mii; static const uint8_t media[] = { TULIP_ROM_MB_MEDIA_TP, TULIP_ROM_MB_MEDIA_TP_FDX, @@ -5883,24 +5885,22 @@ tlp_pmac_tmsw_init(struct tulip_softc *sc) struct ifnet *ifp = &sc->sc_ethercom.ec_if; struct tulip_21x4x_media *tm; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg; - sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_bitbang_mii_readreg; + mii->mii_writereg = tlp_bitbang_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); if (sc->sc_chip == TULIP_CHIP_MX98713 || sc->sc_chip == TULIP_CHIP_MX98713A) { - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) != NULL) { + if (LIST_FIRST(&mii->mii_phys) != NULL) { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; sc->sc_preinit = tlp_2114x_mii_preinit; sc->sc_mediasw = &tlp_pmac_mii_mediasw; - ifmedia_set(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); return; } } @@ -5914,7 +5914,7 @@ tlp_pmac_tmsw_init(struct tulip_softc *sc) * XXX Should implement auto-sense for this someday, * XXX when we do the same for the 21140. */ - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_10_T); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_T); break; default: @@ -5923,14 +5923,14 @@ tlp_pmac_tmsw_init(struct tulip_softc *sc) tlp_add_srom_media(sc, TULIP_ROM_MB_21143_SYM, tlp_sia_get, tlp_sia_set, media + 2, 2); - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); tm->tm_name = "auto"; tm->tm_get = tlp_2114x_nway_get; tm->tm_set = tlp_2114x_nway_set; - ifmedia_add(&sc->sc_mii.mii_media, + ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, 0), 0, tm); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); sc->sc_statchg = tlp_2114x_nway_statchg; sc->sc_tick = tlp_2114x_nway_tick; break; @@ -5958,23 +5958,23 @@ static void tlp_al981_tmsw_init(struct tulip_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; - - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_al981_mii_readreg; - sc->sc_mii.mii_writereg = tlp_al981_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + struct mii_data * const mii = &sc->sc_mii; + + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_al981_mii_readreg; + mii->mii_writereg = tlp_al981_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } @@ -5994,23 +5994,22 @@ static void tlp_an985_tmsw_init(struct tulip_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; - - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg; - sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, 1, - MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + struct mii_data * const mii = &sc->sc_mii; + + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_bitbang_mii_readreg; + mii->mii_writereg = tlp_bitbang_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); + mii_attach(sc->sc_dev, mii, 0xffffffff, 1, MII_OFFSET_ANY, 0); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } @@ -6031,15 +6030,15 @@ static void tlp_dm9102_tmsw_init(struct tulip_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; uint32_t opmode; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg; - sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_bitbang_mii_readreg; + mii->mii_writereg = tlp_bitbang_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); /* PHY block already reset via tlp_reset(). */ @@ -6048,11 +6047,11 @@ tlp_dm9102_tmsw_init(struct tulip_softc *sc) */ switch (sc->sc_chip) { case TULIP_CHIP_DM9102: - opmode = OPMODE_MBO|OPMODE_HBD|OPMODE_PS; + opmode = OPMODE_MBO | OPMODE_HBD | OPMODE_PS; break; case TULIP_CHIP_DM9102A: - opmode = OPMODE_MBO|OPMODE_HBD; + opmode = OPMODE_MBO | OPMODE_HBD; break; default: @@ -6063,7 +6062,7 @@ tlp_dm9102_tmsw_init(struct tulip_softc *sc) TULIP_WRITE(sc, CSR_OPMODE, opmode); /* Now, probe the internal MII for the internal PHY. */ - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); /* @@ -6072,12 +6071,12 @@ tlp_dm9102_tmsw_init(struct tulip_softc *sc) */ if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } @@ -6094,7 +6093,7 @@ tlp_dm9102_tmsw_setmedia(struct tulip_softc *sc) { /* XXX HomePNA on DM9102A. */ - return (tlp_mii_setmedia(sc)); + return tlp_mii_setmedia(sc); } /* @@ -6115,15 +6114,15 @@ static void tlp_asix_tmsw_init(struct tulip_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; uint32_t opmode; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg; - sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_bitbang_mii_readreg; + mii->mii_writereg = tlp_bitbang_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); /* * Configure OPMODE properly for the internal MII interface. @@ -6131,7 +6130,7 @@ tlp_asix_tmsw_init(struct tulip_softc *sc) switch (sc->sc_chip) { case TULIP_CHIP_AX88140: case TULIP_CHIP_AX88141: - opmode = OPMODE_HBD|OPMODE_PS; + opmode = OPMODE_HBD | OPMODE_PS; break; default: opmode = 0; @@ -6141,18 +6140,18 @@ tlp_asix_tmsw_init(struct tulip_softc *sc) TULIP_WRITE(sc, CSR_OPMODE, opmode); /* Now, probe the internal MII for the internal PHY. */ - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); /* XXX Figure how to handle the PHY. */ - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } @@ -6171,7 +6170,7 @@ tlp_asix_tmsw_setmedia(struct tulip_softc *sc) { /* XXX PHY handling. */ - return (tlp_mii_setmedia(sc)); + return tlp_mii_setmedia(sc); } /* @@ -6188,6 +6187,7 @@ void tlp_rs7112_tmsw_init(struct tulip_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; /* * We don't attach any media info structures to the ifmedia @@ -6197,28 +6197,26 @@ tlp_rs7112_tmsw_init(struct tulip_softc *sc) if (sc->sc_preinit == tlp_2114x_preinit) sc->sc_preinit = tlp_2114x_mii_preinit; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg; - sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg; - sc->sc_mii.mii_statchg = sc->sc_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + mii->mii_ifp = ifp; + mii->mii_readreg = tlp_bitbang_mii_readreg; + mii->mii_writereg = tlp_bitbang_mii_writereg; + mii->mii_statchg = sc->sc_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); /* * The RS7112 reports a PHY at 0 (possibly HomePNA?) * and 1 (ethernet). We attach ethernet only. */ - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, 1, - MII_OFFSET_ANY, 0); + mii_attach(sc->sc_dev, mii, 0xffffffff, 1, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else { sc->sc_flags |= TULIPF_HAS_MII; sc->sc_tick = tlp_mii_tick; - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } } diff --git a/sys/dev/marvell/if_mvgbe.c b/sys/dev/marvell/if_mvgbe.c index 7d6a6154b1f..b267b45d832 100644 --- a/sys/dev/marvell/if_mvgbe.c +++ b/sys/dev/marvell/if_mvgbe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mvgbe.c,v 1.54 2019/04/22 08:05:01 msaitoh Exp $ */ +/* $NetBSD: if_mvgbe.c,v 1.55 2019/05/23 10:51:39 msaitoh Exp $ */ /* * Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.54 2019/04/22 08:05:01 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.55 2019/05/23 10:51:39 msaitoh Exp $"); #include "opt_multiprocessor.h" @@ -69,11 +69,11 @@ __KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.54 2019/04/22 08:05:01 msaitoh Exp $" /* #define MVGBE_DEBUG 3 */ #ifdef MVGBE_DEBUG #define DPRINTF(x) if (mvgbe_debug) printf x -#define DPRINTFN(n,x) if (mvgbe_debug >= (n)) printf x +#define DPRINTFN(n, x) if (mvgbe_debug >= (n)) printf x int mvgbe_debug = MVGBE_DEBUG; #else #define DPRINTF(x) -#define DPRINTFN(n,x) +#define DPRINTFN(n, x) #endif @@ -227,7 +227,7 @@ struct mvgbe_softc { struct ethercom sc_ethercom; struct mii_data sc_mii; - u_int8_t sc_enaddr[ETHER_ADDR_LEN]; /* station addr */ + uint8_t sc_enaddr[ETHER_ADDR_LEN]; /* station addr */ callout_t sc_tick_ch; /* tick callout */ @@ -713,6 +713,7 @@ mvgbe_attach(device_t parent, device_t self, void *aux) prop_dictionary_t dict; prop_data_t enaddrp; struct ifnet *ifp; + struct mii_data * const mii = &sc->sc_mii; bus_dma_segment_t seg; bus_dmamap_t dmamap; int rseg, i; @@ -891,23 +892,21 @@ mvgbe_attach(device_t parent, device_t self, void *aux) /* * Do MII setup. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = mvgbec_miibus_readreg; - sc->sc_mii.mii_writereg = mvgbec_miibus_writereg; - sc->sc_mii.mii_statchg = mvgbec_miibus_statchg; - - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, - mvgbe_mediachange, mvgbe_mediastatus); - mii_attach(self, &sc->sc_mii, 0xffffffff, - MII_PHY_ANY, parent == mvgbec0 ? 0 : 1, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { + mii->mii_ifp = ifp; + mii->mii_readreg = mvgbec_miibus_readreg; + mii->mii_writereg = mvgbec_miibus_writereg; + mii->mii_statchg = mvgbec_miibus_statchg; + + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, mvgbe_mediachange, mvgbe_mediastatus); + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, + parent == mvgbec0 ? 0 : 1, 0); + if (LIST_FIRST(&mii->mii_phys) == NULL) { aprint_error_dev(self, "no PHY found!\n"); - ifmedia_add(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); /* * Call MI attach routines. @@ -1073,7 +1072,7 @@ mvgbe_start(struct ifnet *ifp) DPRINTFN(3, ("mvgbe_start (idx %d, tx_chain[idx] %p)\n", idx, sc->sc_cdata.mvgbe_tx_chain[idx].mvgbe_mbuf)); - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* If Link is DOWN, can't start TX */ if (!MVGBE_IS_LINKUP(sc)) @@ -1473,7 +1472,7 @@ mvgbe_ifflags_cb(struct ethercom *ec) if (change != 0) sc->sc_if_flags = ifp->if_flags; - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) return ENETRESET; if ((change & IFF_PROMISC) != 0) @@ -2152,7 +2151,7 @@ mvgbe_crc8(const uint8_t *data, size_t size) uint8_t crc = 0; const uint8_t poly = 0x07; - while(size--) + while (size--) for (byte = *data++, bit = NBBY-1; bit >= 0; bit--) crc = (crc << 1) ^ ((((crc >> 7) ^ (byte >> bit)) & 1) ? poly : 0); @@ -2177,7 +2176,7 @@ mvgbe_filter_setup(struct mvgbe_softc *sc) memset(dfsmt, 0, sizeof(dfsmt)); memset(dfomt, 0, sizeof(dfomt)); - if (ifp->if_flags & (IFF_ALLMULTI|IFF_PROMISC)) { + if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) { goto allmulti; } @@ -2203,7 +2202,7 @@ mvgbe_filter_setup(struct mvgbe_softc *sc) goto set; allmulti: - if (ifp->if_flags & (IFF_ALLMULTI|IFF_PROMISC)) { + if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) { for (i = 0; i < MVGBE_NDFSMT; i++) { dfsmt[i] = dfomt[i] = MVGBE_DF(0, MVGBE_DF_QUEUE(0) | MVGBE_DF_PASS) | diff --git a/sys/dev/marvell/if_mvxpe.c b/sys/dev/marvell/if_mvxpe.c index 926d3d91f21..6931c8d96fe 100644 --- a/sys/dev/marvell/if_mvxpe.c +++ b/sys/dev/marvell/if_mvxpe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mvxpe.c,v 1.23 2019/04/24 10:56:24 msaitoh Exp $ */ +/* $NetBSD: if_mvxpe.c,v 1.24 2019/05/23 10:51:39 msaitoh Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.23 2019/04/24 10:56:24 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.24 2019/05/23 10:51:39 msaitoh Exp $"); #include "opt_multiprocessor.h" @@ -288,6 +288,7 @@ mvxpe_attach(device_t parent, device_t self, void *aux) struct mvxpe_softc *sc = device_private(self); struct mii_softc *mii; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; struct marvell_attach_args *mva = aux; prop_dictionary_t dict; prop_data_t enaddrp = NULL; @@ -333,7 +334,7 @@ mvxpe_attach(device_t parent, device_t self, void *aux) goto fail; } aprint_normal_dev(self, - "Using Buffer Manager: %s\n", mvxpbm_xname(sc->sc_bm)); + "Using Buffer Manager: %s\n", mvxpbm_xname(sc->sc_bm)); aprint_normal_dev(sc->sc_dev, "%zu kbytes managed buffer, %zu bytes * %u entries allocated.\n", mvxpbm_buf_size(sc->sc_bm) / 1024, @@ -471,29 +472,26 @@ mvxpe_attach(device_t parent, device_t self, void *aux) mutex_init(&mii_mutex, MUTEX_DEFAULT, IPL_NET); mii_init = 1; } - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = mvxpe_miibus_readreg; - sc->sc_mii.mii_writereg = mvxpe_miibus_writereg; - sc->sc_mii.mii_statchg = mvxpe_miibus_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = mvxpe_miibus_readreg; + mii->mii_writereg = mvxpe_miibus_writereg; + mii->mii_statchg = mvxpe_miibus_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, - mvxpe_mediachange, mvxpe_mediastatus); + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, mvxpe_mediachange, mvxpe_mediastatus); /* * XXX: phy addressing highly depends on Board Design. - * we assume phyaddress == MAC unit number here, + * we assume phyaddress == MAC unit number here, * but some boards may not. */ - mii_attach(self, &sc->sc_mii, 0xffffffff, - MII_PHY_ANY, sc->sc_dev->dv_unit, 0); - mii = LIST_FIRST(&sc->sc_mii.mii_phys); + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, sc->sc_dev->dv_unit, 0); + mii = LIST_FIRST(&mii->mii_phys); if (mii == NULL) { aprint_error_dev(self, "no PHY found!\n"); - ifmedia_add(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else { - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); phyaddr = MVXPE_PHYADDR_PHYAD(mii->mii_phy); MVXPE_WRITE(sc, MVXPE_PHYADDR, phyaddr); DPRINTSC(sc, 1, "PHYADDR: %#x\n", MVXPE_READ(sc, MVXPE_PHYADDR)); @@ -922,7 +920,7 @@ mvxpe_initreg(struct ifnet *ifp) /* Port MAC Control set 1 is only used for loop-back test */ - /* Port MAC Control set 2 */ + /* Port MAC Control set 2 */ reg = MVXPE_READ(sc, MVXPE_PMACC2); reg &= (MVXPE_PMACC2_PCSEN | MVXPE_PMACC2_RGMIIEN); reg |= MVXPE_PMACC2_MUSTSET; @@ -1129,7 +1127,7 @@ mvxpe_ring_init_queue(struct mvxpe_softc *sc, int q) if (bus_dmamap_create(sc->sc_dmat, mvxpbm_chunk_size(sc->sc_bm), MVXPE_TX_SEGLIMIT, mvxpbm_chunk_size(sc->sc_bm), 0, - BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, + BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &MVXPE_TX_MAP(sc, q, i))) { aprint_error_dev(sc->sc_dev, "can't create dma map (tx ring %d)\n", i); @@ -1664,7 +1662,7 @@ mvxpe_start(struct ifnet *ifp) struct mbuf *m; int q; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) { + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) { DPRINTIFNET(ifp, 1, "not running\n"); return; } @@ -1691,7 +1689,7 @@ mvxpe_start(struct ifnet *ifp) * don't use IFQ_POLL(). * there is lock problem between IFQ_POLL and IFQ_DEQUEUE * on SMP enabled networking stack. - */ + */ IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; @@ -1894,7 +1892,7 @@ mvxpe_stop(struct ifnet *ifp, int disable) if (disable) { /* - * Hold Reset state of DMA Engine + * Hold Reset state of DMA Engine * (must write 0x0 to restart it) */ MVXPE_WRITE(sc, MVXPE_PRXINIT, 0x00000001); @@ -1968,7 +1966,7 @@ mvxpe_ifflags_cb(struct ethercom *ec) if (change != 0) sc->sc_if_flags = ifp->if_flags; - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) { + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) { mvxpe_sc_unlock(sc); return ENETRESET; } @@ -2182,7 +2180,7 @@ mvxpe_tx_queue(struct mvxpe_softc *sc, struct mbuf *m, int q) } #endif mvxpe_ring_sync_tx(sc, q, start, used, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); while (used > 255) { ptxsu = MVXPE_PTXSU_NOWD(255); @@ -2218,7 +2216,6 @@ mvxpe_tx_set_csumflag(struct ifnet *ifp, int csum_flags; uint32_t iphl = 0, ipoff = 0; - csum_flags = ifp->if_csum_flags_tx & m->m_pkthdr.csum_flags; eh = mtod(m, struct ether_header *); @@ -2232,11 +2229,11 @@ mvxpe_tx_set_csumflag(struct ifnet *ifp, break; } - if (csum_flags & (M_CSUM_IPv4|M_CSUM_TCPv4|M_CSUM_UDPv4)) { + if (csum_flags & (M_CSUM_IPv4 | M_CSUM_TCPv4 | M_CSUM_UDPv4)) { iphl = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data); t->command |= MVXPE_TX_CMD_L3_IP4; } - else if (csum_flags & (M_CSUM_TCPv6|M_CSUM_UDPv6)) { + else if (csum_flags & (M_CSUM_TCPv6 | M_CSUM_UDPv6)) { iphl = M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data); t->command |= MVXPE_TX_CMD_L3_IP6; } @@ -2252,8 +2249,8 @@ mvxpe_tx_set_csumflag(struct ifnet *ifp, } /* L4 */ - if ((csum_flags & - (M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_TCPv6|M_CSUM_UDPv6)) == 0) { + if ((csum_flags & + (M_CSUM_TCPv4 | M_CSUM_UDPv4 | M_CSUM_TCPv6 | M_CSUM_UDPv6)) == 0) { t->command |= MVXPE_TX_CMD_L4_CHECKSUM_NONE; } else if (csum_flags & M_CSUM_TCPv4) { @@ -2320,7 +2317,7 @@ mvxpe_tx_queue_complete(struct mvxpe_softc *sc, int q) "tx complete queue %d, %d descriptors.\n", q, ndesc); mvxpe_ring_sync_tx(sc, q, tx->tx_dma, ndesc, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); for (i = 0; i < ndesc; i++) { int error = 0; @@ -2415,7 +2412,7 @@ mvxpe_rx_queue(struct mvxpe_softc *sc, int q, int npkt) KASSERT_RX_MTX(sc, q); mvxpe_ring_sync_rx(sc, q, rx->rx_dma, npkt, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); for (i = 0; i < npkt; i++) { /* get descriptor and packet */ @@ -2528,7 +2525,7 @@ mvxpe_rx_queue_select(struct mvxpe_softc *sc, uint32_t queues, int *queue) if (npkt == 0) continue; - DPRINTSC(sc, 2, + DPRINTSC(sc, 2, "queue %d selected: prxs=%#x, %u packet received.\n", q, prxs, npkt); *queue = q; @@ -2633,7 +2630,7 @@ mvxpe_rx_set_csumflag(struct ifnet *ifp, { uint32_t csum_flags = 0; - if ((r->status & (MVXPE_RX_IP_HEADER_OK|MVXPE_RX_L3_IP)) == 0) + if ((r->status & (MVXPE_RX_IP_HEADER_OK | MVXPE_RX_L3_IP)) == 0) return; /* not a IP packet */ /* L3 */ @@ -2689,7 +2686,7 @@ mvxpe_crc8(const uint8_t *data, size_t size) uint8_t crc = 0; const uint8_t poly = 0x07; - while(size--) + while (size--) for (byte = *data++, bit = NBBY-1; bit >= 0; bit--) crc = (crc << 1) ^ ((((crc >> 7) ^ (byte >> bit)) & 1) ? poly : 0); @@ -2716,7 +2713,7 @@ mvxpe_filter_setup(struct mvxpe_softc *sc) memset(dfsmt, 0, sizeof(dfsmt)); memset(dfomt, 0, sizeof(dfomt)); - if (ifp->if_flags & (IFF_ALLMULTI|IFF_PROMISC)) { + if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) { goto allmulti; } @@ -2742,9 +2739,9 @@ mvxpe_filter_setup(struct mvxpe_softc *sc) goto set; allmulti: - if (ifp->if_flags & (IFF_ALLMULTI|IFF_PROMISC)) { + if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) { for (i = 0; i < MVXPE_NDFSMT; i++) { - dfsmt[i] = dfomt[i] = + dfsmt[i] = dfomt[i] = MVXPE_DF(0, MVXPE_DF_QUEUE(0) | MVXPE_DF_PASS) | MVXPE_DF(1, MVXPE_DF_QUEUE(0) | MVXPE_DF_PASS) | MVXPE_DF(2, MVXPE_DF_QUEUE(0) | MVXPE_DF_PASS) | @@ -2828,7 +2825,7 @@ sysctl_read_mib(SYSCTLFN_ARGS) return EINVAL; if (arg->index < 0 || arg->index > __arraycount(mvxpe_mib_list)) return EINVAL; - + mvxpe_sc_lock(sc); val = arg->counter; mvxpe_sc_unlock(sc); @@ -2932,9 +2929,9 @@ sysctl_set_queue_length(SYSCTLFN_ARGS) case MVXPE_SYSCTL_RX: mvxpe_rx_lockq(sc, arg->queue); rx->rx_queue_len = val; - rx->rx_queue_th_received = + rx->rx_queue_th_received = rx->rx_queue_len / MVXPE_RXTH_RATIO; - rx->rx_queue_th_free = + rx->rx_queue_th_free = rx->rx_queue_len / MVXPE_RXTH_REFILL_RATIO; reg = MVXPE_PRXDQTH_ODT(rx->rx_queue_th_received); @@ -3100,7 +3097,7 @@ sysctl_mvxpe_init(struct mvxpe_softc *sc) struct mvxpe_sysctl_mib *mib_arg = &sc->sc_sysctl_mib[i]; mib_arg->sc = sc; - mib_arg->index = i; + mib_arg->index = i; if (sysctl_createv(&sc->sc_mvxpe_clog, 0, NULL, &node, CTLFLAG_READONLY, CTLTYPE_QUAD, name, desc, sysctl_read_mib, 0, (void *)mib_arg, 0, diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 8c365204a58..1e620976320 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_age.c,v 1.56 2019/03/05 08:25:02 msaitoh Exp $ */ +/* $NetBSD: if_age.c,v 1.57 2019/05/23 10:51:39 msaitoh Exp $ */ /* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */ /*- @@ -31,7 +31,7 @@ /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.56 2019/03/05 08:25:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.57 2019/05/23 10:51:39 msaitoh Exp $"); #include "vlan.h" @@ -143,6 +143,7 @@ age_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; struct ifnet *ifp = &sc->sc_ec.ec_if; + struct mii_data * const mii = &sc->sc_miibus; pcireg_t memtype; int error = 0; char intrbuf[PCI_INTRSTR_LEN]; @@ -264,24 +265,22 @@ age_attach(device_t parent, device_t self, void *aux) #endif /* Set up MII bus. */ - sc->sc_miibus.mii_ifp = ifp; - sc->sc_miibus.mii_readreg = age_miibus_readreg; - sc->sc_miibus.mii_writereg = age_miibus_writereg; - sc->sc_miibus.mii_statchg = age_miibus_statchg; - - sc->sc_ec.ec_mii = &sc->sc_miibus; - ifmedia_init(&sc->sc_miibus.mii_media, 0, age_mediachange, - age_mediastatus); - mii_attach(self, &sc->sc_miibus, 0xffffffff, MII_PHY_ANY, + mii->mii_ifp = ifp; + mii->mii_readreg = age_miibus_readreg; + mii->mii_writereg = age_miibus_writereg; + mii->mii_statchg = age_miibus_statchg; + + sc->sc_ec.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, age_mediachange, age_mediastatus); + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, MIIF_DOPAUSE); - if (LIST_FIRST(&sc->sc_miibus.mii_phys) == NULL) { + if (LIST_FIRST(&mii->mii_phys) == NULL) { aprint_error_dev(self, "no PHY found!\n"); - ifmedia_add(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL, - 0, NULL); - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); if_attach(ifp); if_deferred_start_init(ifp, NULL); @@ -504,7 +503,7 @@ age_intr(void *arg) bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_cmb_block_map, 0, sc->age_cdata.age_cmb_block_map->dm_mapsize, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le32toh(cmb->intr_status); /* ACK/reenable interrupts */ CSR_WRITE_4(sc, AGE_INTR_STATUS, status); @@ -518,7 +517,7 @@ age_intr(void *arg) cmb->intr_status = 0; bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_cmb_block_map, 0, sc->age_cdata.age_cmb_block_map->dm_mapsize, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); if (ifp->if_flags & IFF_RUNNING) { if (status & INTR_CMB_RX) @@ -547,7 +546,7 @@ age_intr(void *arg) /* check if more interrupts did came in */ bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_cmb_block_map, 0, sc->age_cdata.age_cmb_block_map->dm_mapsize, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le32toh(cmb->intr_status); } @@ -1108,8 +1107,7 @@ age_shutdown(device_t self, int howto) age_stop(ifp, 1); return true; -} - +} static int age_ioctl(struct ifnet *ifp, u_long cmd, void *data) @@ -1278,8 +1276,8 @@ age_encap(struct age_softc *sc, struct mbuf **m_head) sc->age_cdata.age_tx_cnt++; if (i == (nsegs - 1)) break; - - /* sync this descriptor and go to the next one */ + + /* Sync this descriptor and go to the next one */ bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_tx_ring_map, prod * sizeof(struct tx_desc), sizeof(struct tx_desc), BUS_DMASYNC_PREWRITE); @@ -1319,7 +1317,6 @@ age_txintr(struct age_softc *sc, int tpd_cons) struct age_txdesc *txd; int cons, prog; - if (sc->age_cdata.age_tx_cnt <= 0) { if (ifp->if_timer != 0) printf("timer running without packets\n"); @@ -2183,7 +2180,7 @@ age_init_cmb_block(struct age_softc *sc) memset(rd->age_cmb_block, 0, AGE_CMB_BLOCK_SZ); bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_cmb_block_map, 0, sc->age_cdata.age_cmb_block_map->dm_mapsize, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } static void diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index 6783e5f3a72..131e7b58e6c 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_alc.c,v 1.34 2019/05/01 14:10:26 msaitoh Exp $ */ +/* $NetBSD: if_alc.c,v 1.35 2019/05/23 10:51:39 msaitoh Exp $ */ /* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org> @@ -536,7 +536,7 @@ alc_dsp_fixup(struct alc_softc *sc, int media) } } } - + static void alc_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr) { @@ -1181,6 +1181,7 @@ alc_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; struct ifnet *ifp; + struct mii_data * const mii = &sc->sc_miibus; pcireg_t memtype; const char *aspm_state[] = { "L0s/L1", "L0s", "L1", "L0s/L1" }; uint16_t burst; @@ -1460,27 +1461,26 @@ alc_attach(device_t parent, device_t self, void *aux) } /* Set up MII bus. */ - sc->sc_miibus.mii_ifp = ifp; - sc->sc_miibus.mii_readreg = alc_miibus_readreg; - sc->sc_miibus.mii_writereg = alc_miibus_writereg; - sc->sc_miibus.mii_statchg = alc_miibus_statchg; - - sc->sc_ec.ec_mii = &sc->sc_miibus; - ifmedia_init(&sc->sc_miibus.mii_media, 0, alc_mediachange, - alc_mediastatus); + mii->mii_ifp = ifp; + mii->mii_readreg = alc_miibus_readreg; + mii->mii_writereg = alc_miibus_writereg; + mii->mii_statchg = alc_miibus_statchg; + + sc->sc_ec.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, alc_mediachange, alc_mediastatus); mii_flags = 0; if ((sc->alc_flags & ALC_FLAG_JUMBO) != 0) mii_flags |= MIIF_DOPAUSE; - mii_attach(self, &sc->sc_miibus, 0xffffffff, MII_PHY_ANY, + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, mii_flags); - if (LIST_FIRST(&sc->sc_miibus.mii_phys) == NULL) { + if (LIST_FIRST(&mii->mii_phys) == NULL) { printf("%s: no PHY found!\n", device_xname(sc->sc_dev)); - ifmedia_add(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL, + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); if_attach(ifp); if_deferred_start_init(ifp, NULL); @@ -2004,7 +2004,7 @@ alc_start(struct ifnet *ifp) break; } enq = 1; - + /* * If there's a BPF listener, bounce a copy of this frame * to him. @@ -2079,7 +2079,7 @@ alc_ioctl(struct ifnet *ifp, u_long cmd, void *data) error = ether_ioctl(ifp, cmd, data); break; } - + if (error == ENETRESET) { if (ifp->if_flags & IFF_RUNNING) alc_iff(sc); @@ -2589,7 +2589,7 @@ alc_rxeof(struct alc_softc *sc, struct rx_rdesc *rrd) * was intentionally disabled. */ if (status & RRD_VLAN_TAG) { - u_int32_t vtag = RRD_VLAN(le32toh(rrd->vtag)); + uint32_t vtag = RRD_VLAN(le32toh(rrd->vtag)); vlan_set_tag(m, ntohs(vtag)); } #endif @@ -2790,7 +2790,6 @@ alc_init_backend(struct ifnet *ifp, bool init) IDLE_DECISN_TIMER_DEFAULT_1MS); } else CSR_WRITE_4(sc, ALC_CLK_GATING_CFG, 0); - /* Reprogram the station address. */ memcpy(eaddr, CLLADDR(ifp->if_sadl), sizeof(eaddr)); diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index b4af903d747..366aee5b068 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ale.c,v 1.28 2019/03/05 08:25:02 msaitoh Exp $ */ +/* $NetBSD: if_ale.c,v 1.29 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -32,7 +32,7 @@ /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.28 2019/03/05 08:25:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.29 2019/05/23 10:51:39 msaitoh Exp $"); #include "vlan.h" @@ -388,6 +388,7 @@ ale_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; struct ifnet *ifp; + struct mii_data * const mii = &sc->sc_miibus; pcireg_t memtype; int mii_flags, error = 0; uint32_t rxf_len, txf_len; @@ -555,27 +556,25 @@ ale_attach(device_t parent, device_t self, void *aux) #endif /* Set up MII bus. */ - sc->sc_miibus.mii_ifp = ifp; - sc->sc_miibus.mii_readreg = ale_miibus_readreg; - sc->sc_miibus.mii_writereg = ale_miibus_writereg; - sc->sc_miibus.mii_statchg = ale_miibus_statchg; - - sc->sc_ec.ec_mii = &sc->sc_miibus; - ifmedia_init(&sc->sc_miibus.mii_media, 0, ale_mediachange, - ale_mediastatus); + mii->mii_ifp = ifp; + mii->mii_readreg = ale_miibus_readreg; + mii->mii_writereg = ale_miibus_writereg; + mii->mii_statchg = ale_miibus_statchg; + + sc->sc_ec.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, ale_mediachange, ale_mediastatus); mii_flags = 0; if ((sc->ale_flags & ALE_FLAG_JUMBO) != 0) mii_flags |= MIIF_DOPAUSE; - mii_attach(self, &sc->sc_miibus, 0xffffffff, MII_PHY_ANY, + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, mii_flags); - if (LIST_FIRST(&sc->sc_miibus.mii_phys) == NULL) { + if (LIST_FIRST(&mii->mii_phys) == NULL) { aprint_error_dev(self, "no PHY found!\n"); - ifmedia_add(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL, - 0, NULL); - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); if_attach(ifp); if_deferred_start_init(ifp, NULL); diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 11693b36007..d5b40f76533 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.330 2019/04/26 06:33:34 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.331 2019/05/23 10:51:39 msaitoh Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.330 2019/04/26 06:33:34 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.331 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -273,14 +273,14 @@ static void bge_ape_driver_state_change(struct bge_softc *, int); #ifdef BGE_DEBUG #define DPRINTF(x) if (bgedebug) printf x -#define DPRINTFN(n,x) if (bgedebug >= (n)) printf x +#define DPRINTFN(n, x) if (bgedebug >= (n)) printf x #define BGE_TSO_PRINTF(x) do { if (bge_tso_debug) printf x ;} while (0) int bgedebug = 0; int bge_tso_debug = 0; void bge_debug_info(struct bge_softc *); #else #define DPRINTF(x) -#define DPRINTFN(n,x) +#define DPRINTFN(n, x) #define BGE_TSO_PRINTF(x) #endif @@ -1496,7 +1496,7 @@ bge_newbuf_std(struct bge_softc *sc, int i, struct mbuf *m, if (!(sc->bge_flags & BGEF_RX_ALIGNBUG)) m_adj(m_new, ETHER_ALIGN); if (bus_dmamap_load_mbuf(sc->bge_dmatag, dmamap, m_new, - BUS_DMA_READ|BUS_DMA_NOWAIT)) { + BUS_DMA_READ | BUS_DMA_NOWAIT)) { m_freem(m_new); return ENOBUFS; } @@ -1514,7 +1514,7 @@ bge_newbuf_std(struct bge_softc *sc, int i, struct mbuf *m, offsetof(struct bge_ring_data, bge_rx_std_ring) + i * sizeof (struct bge_rx_bd), sizeof (struct bge_rx_bd), - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return 0; } @@ -1565,7 +1565,7 @@ bge_newbuf_jumbo(struct bge_softc *sc, int i, struct mbuf *m) r = &sc->bge_rdata->bge_rx_jumbo_ring[i]; sc->bge_cdata.bge_rx_jumbo_chain[i] = m_new; BGE_HOSTADDR(r->bge_addr, BGE_JUMBO_DMA_ADDR(sc, m_new)); - r->bge_flags = BGE_RXBDFLAG_END|BGE_RXBDFLAG_JUMBO_RING; + r->bge_flags = BGE_RXBDFLAG_END | BGE_RXBDFLAG_JUMBO_RING; r->bge_len = m_new->m_len; r->bge_idx = i; @@ -1573,7 +1573,7 @@ bge_newbuf_jumbo(struct bge_softc *sc, int i, struct mbuf *m) offsetof(struct bge_ring_data, bge_rx_jumbo_ring) + i * sizeof (struct bge_rx_bd), sizeof (struct bge_rx_bd), - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return 0; } @@ -2542,7 +2542,7 @@ bge_blockinit(struct bge_softc *sc) bus_dmamap_sync(sc->bge_dmatag, sc->bge_ring_map, offsetof(struct bge_ring_data, bge_info), sizeof (struct bge_gib), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } /* Choose de-pipeline mode for BCM5906 A0, A1 and A2. */ @@ -3179,6 +3179,7 @@ bge_attach(device_t parent, device_t self, void *aux) uint32_t hwcfg, hwcfg2, hwcfg3, hwcfg4, hwcfg5; uint32_t command; struct ifnet *ifp; + struct mii_data * const mii = &sc->bge_mii; uint32_t misccfg, mimode; void * kva; u_char eaddr[ETHER_ADDR_LEN]; @@ -3293,7 +3294,7 @@ bge_attach(device_t parent, device_t self, void *aux) * device into D0 state before starting initialization. */ pm_ctl = pci_conf_read(pc, sc->sc_pcitag, BGE_PCI_PWRMGMT_CMD); - pm_ctl &= ~(PCI_PWR_D0|PCI_PWR_D1|PCI_PWR_D2|PCI_PWR_D3); + pm_ctl &= ~(PCI_PWR_D0 | PCI_PWR_D1 | PCI_PWR_D2 | PCI_PWR_D3); pm_ctl |= (1 << 8) | PCI_PWR_D0 ; /* D0 state */ pci_conf_write(pc, sc->sc_pcitag, BGE_PCI_PWRMGMT_CMD, pm_ctl); DELAY(1000); /* 27 usec is allegedly sufficent */ @@ -3837,10 +3838,10 @@ bge_attach(device_t parent, device_t self, void *aux) * Do MII setup. */ DPRINTFN(5, ("mii setup\n")); - sc->bge_mii.mii_ifp = ifp; - sc->bge_mii.mii_readreg = bge_miibus_readreg; - sc->bge_mii.mii_writereg = bge_miibus_writereg; - sc->bge_mii.mii_statchg = bge_miibus_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = bge_miibus_readreg; + mii->mii_writereg = bge_miibus_writereg; + mii->mii_statchg = bge_miibus_statchg; /* * Figure out what sort of media we have by checking the hardware @@ -3871,7 +3872,7 @@ bge_attach(device_t parent, device_t self, void *aux) ifmedia_init(&sc->bge_ifmedia, IFM_IMASK, bge_ifmedia_upd, bge_ifmedia_sts); ifmedia_add(&sc->bge_ifmedia, IFM_ETHER |IFM_1000_SX, 0, NULL); - ifmedia_add(&sc->bge_ifmedia, IFM_ETHER | IFM_1000_SX|IFM_FDX, + ifmedia_add(&sc->bge_ifmedia, IFM_ETHER | IFM_1000_SX |IFM_FDX, 0, NULL); ifmedia_add(&sc->bge_ifmedia, IFM_ETHER | IFM_AUTO, 0, NULL); ifmedia_set(&sc->bge_ifmedia, IFM_ETHER | IFM_AUTO); @@ -3888,23 +3889,21 @@ bge_attach(device_t parent, device_t self, void *aux) BGE_CLRBIT(sc, BGE_MODE_CTL, BGE_MODECTL_STACKUP); bge_asf_driver_up(sc); - ifmedia_init(&sc->bge_mii.mii_media, 0, bge_ifmedia_upd, + ifmedia_init(&mii->mii_media, 0, bge_ifmedia_upd, bge_ifmedia_sts); mii_flags = MIIF_DOPAUSE; if (sc->bge_flags & BGEF_FIBER_MII) mii_flags |= MIIF_HAVEFIBER; - mii_attach(sc->bge_dev, &sc->bge_mii, capmask, sc->bge_phy_addr, + mii_attach(sc->bge_dev, mii, capmask, sc->bge_phy_addr, MII_OFFSET_ANY, mii_flags); - if (LIST_EMPTY(&sc->bge_mii.mii_phys)) { + if (LIST_EMPTY(&mii->mii_phys)) { aprint_error_dev(sc->bge_dev, "no PHY found!\n"); - ifmedia_add(&sc->bge_mii.mii_media, - IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->bge_mii.mii_media, - IFM_ETHER|IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, + 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->bge_mii.mii_media, - IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); /* * Now tell the firmware we are going up after probing the PHY @@ -4483,8 +4482,7 @@ bge_rxcsum(struct bge_softc *sc, struct bge_rx_bd *cur_rx, struct mbuf *m) m->m_pkthdr.csum_data = cur_rx->bge_tcp_udp_csum; m->m_pkthdr.csum_flags |= - (M_CSUM_TCPv4|M_CSUM_UDPv4| - M_CSUM_DATA); + (M_CSUM_TCPv4 | M_CSUM_UDPv4 |M_CSUM_DATA); } } } else { @@ -4503,8 +4501,7 @@ bge_rxcsum(struct bge_softc *sc, struct bge_rx_bd *cur_rx, struct mbuf *m) m->m_pkthdr.csum_data = cur_rx->bge_tcp_udp_csum; m->m_pkthdr.csum_flags |= - (M_CSUM_TCPv4|M_CSUM_UDPv4| - M_CSUM_DATA); + (M_CSUM_TCPv4 | M_CSUM_UDPv4 | M_CSUM_DATA); } } } @@ -4540,13 +4537,13 @@ bge_txeof(struct bge_softc *sc) tlen = (BGE_TX_RING_CNT - sc->bge_tx_saved_considx) * sizeof (struct bge_tx_bd); bus_dmamap_sync(sc->bge_dmatag, sc->bge_ring_map, - toff, tlen, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + toff, tlen, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); tosync = -tosync; } bus_dmamap_sync(sc->bge_dmatag, sc->bge_ring_map, offset, tosync * sizeof (struct bge_tx_bd), - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); /* * Go through our tx ring and free mbufs for those @@ -4906,7 +4903,7 @@ bge_compact_dma_runt(struct mbuf *pkt) prev = NULL; totlen = 0; - for (m = pkt; m != NULL; prev = m,m = m->m_next) { + for (m = pkt; m != NULL; prev = m, m = m->m_next) { int mlen = m->m_len; int shortfall = 8 - mlen ; @@ -5029,7 +5026,7 @@ bge_encap(struct bge_softc *sc, struct mbuf *m_head, uint32_t *txidx) if (m_head->m_pkthdr.csum_flags) { if (m_head->m_pkthdr.csum_flags & M_CSUM_IPv4) csum_flags |= BGE_TXBDFLAG_IP_CSUM; - if (m_head->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) + if (m_head->m_pkthdr.csum_flags & (M_CSUM_TCPv4 |M_CSUM_UDPv4)) csum_flags |= BGE_TXBDFLAG_TCP_UDP_CSUM; } @@ -5360,7 +5357,7 @@ bge_start(struct ifnet *ifp) sc = ifp->if_softc; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; prodidx = sc->bge_tx_prodidx; @@ -5770,7 +5767,7 @@ bge_ifflags_cb(struct ethercom *ec) struct bge_softc *sc = ifp->if_softc; int change = ifp->if_flags ^ sc->bge_if_flags; - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) return ENETRESET; else if ((change & (IFF_PROMISC | IFF_ALLMULTI)) == 0) return 0; @@ -6135,8 +6132,8 @@ bge_link_upd(struct bge_softc *sc) CSR_WRITE_4(sc, BGE_MISC_CFG, reg); } /* Clear the attention */ - CSR_WRITE_4(sc, BGE_MAC_STS, BGE_MACSTAT_SYNC_CHANGED| - BGE_MACSTAT_CFG_CHANGED|BGE_MACSTAT_MI_COMPLETE| + CSR_WRITE_4(sc, BGE_MAC_STS, BGE_MACSTAT_SYNC_CHANGED | + BGE_MACSTAT_CFG_CHANGED | BGE_MACSTAT_MI_COMPLETE | BGE_MACSTAT_LINK_CHANGED); } diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index 88d62dfd56a..eaf7352fd5c 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bnx.c,v 1.82 2019/04/24 10:38:09 msaitoh Exp $ */ +/* $NetBSD: if_bnx.c,v 1.83 2019/05/23 10:51:39 msaitoh Exp $ */ /* $OpenBSD: if_bnx.c,v 1.101 2013/03/28 17:21:44 brad Exp $ */ /*- @@ -35,7 +35,7 @@ #if 0 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $"); #endif -__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.82 2019/04/24 10:38:09 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.83 2019/05/23 10:51:39 msaitoh Exp $"); /* * The following controllers are supported by this driver: @@ -581,6 +581,7 @@ bnx_attach(device_t parent, device_t self, void *aux) const char *intrstr = NULL; uint32_t command; struct ifnet *ifp; + struct mii_data * const mii = &sc->bnx_mii; uint32_t val; int mii_flags = MIIF_FORCEANEG; pcireg_t memtype; @@ -875,17 +876,16 @@ bnx_attach(device_t parent, device_t self, void *aux) goto bnx_attach_fail; } - sc->bnx_mii.mii_ifp = ifp; - sc->bnx_mii.mii_readreg = bnx_miibus_read_reg; - sc->bnx_mii.mii_writereg = bnx_miibus_write_reg; - sc->bnx_mii.mii_statchg = bnx_miibus_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = bnx_miibus_read_reg; + mii->mii_writereg = bnx_miibus_write_reg; + mii->mii_statchg = bnx_miibus_statchg; /* Handle any special PHY initialization for SerDes PHYs. */ bnx_init_media(sc); - sc->bnx_ec.ec_mii = &sc->bnx_mii; - ifmedia_init(&sc->bnx_mii.mii_media, 0, bnx_ifmedia_upd, - bnx_ifmedia_sts); + sc->bnx_ec.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, bnx_ifmedia_upd, bnx_ifmedia_sts); /* set phyflags and chipid before mii_attach() */ dict = device_properties(self); @@ -900,21 +900,20 @@ bnx_attach(device_t parent, device_t self, void *aux) mii_flags |= MIIF_DOPAUSE; if (sc->bnx_phy_flags & BNX_PHY_SERDES_FLAG) mii_flags |= MIIF_HAVEFIBER; - mii_attach(self, &sc->bnx_mii, 0xffffffff, + mii_attach(self, mii, 0xffffffff, sc->bnx_phy_addr, MII_OFFSET_ANY, mii_flags); - if (LIST_EMPTY(&sc->bnx_mii.mii_phys)) { + if (LIST_EMPTY(&mii->mii_phys)) { aprint_error_dev(self, "no PHY found!\n"); - ifmedia_add(&sc->bnx_mii.mii_media, - IFM_ETHER|IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->bnx_mii.mii_media, IFM_ETHER | IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->bnx_mii.mii_media, IFM_ETHER | IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); /* Attach to the Ethernet interface list. */ if_attach(ifp); if_deferred_start_init(ifp, NULL); - ether_ifattach(ifp,sc->eaddr); + ether_ifattach(ifp, sc->eaddr); callout_init(&sc->bnx_timeout, 0); @@ -1711,7 +1710,7 @@ bnx_init_nvram(struct bnx_softc *sc) int j, entry_count, rc = 0; struct flash_spec *flash; - DBPRINT(sc,BNX_VERBOSE_RESET, "Entering %s()\n", __func__); + DBPRINT(sc, BNX_VERBOSE_RESET, "Entering %s()\n", __func__); if (BNX_CHIP_NUM(sc) == BNX_CHIP_NUM_5709) { sc->bnx_flash_info = &flash_5709; @@ -1733,7 +1732,7 @@ bnx_init_nvram(struct bnx_softc *sc) if (val & 0x40000000) { /* Flash interface reconfigured by bootcode. */ - DBPRINT(sc,BNX_INFO_LOAD, + DBPRINT(sc, BNX_INFO_LOAD, "bnx_init_nvram(): Flash WAS reconfigured.\n"); for (j = 0, flash = &flash_table[0]; j < entry_count; @@ -1748,7 +1747,7 @@ bnx_init_nvram(struct bnx_softc *sc) /* Flash interface not yet reconfigured. */ uint32_t mask; - DBPRINT(sc,BNX_INFO_LOAD, + DBPRINT(sc, BNX_INFO_LOAD, "bnx_init_nvram(): Flash was NOT reconfigured.\n"); if (val & (1 << 23)) @@ -2316,7 +2315,7 @@ bnx_dma_free(struct bnx_softc *sc) { int i; - DBPRINT(sc,BNX_VERBOSE_RESET, "Entering %s()\n", __func__); + DBPRINT(sc, BNX_VERBOSE_RESET, "Entering %s()\n", __func__); /* Destroy the status block. */ if (sc->status_block != NULL && sc->status_map != NULL) { @@ -2562,7 +2561,7 @@ bnx_dma_alloc(struct bnx_softc *sc) memset(sc->stats_block, 0, BNX_STATS_BLK_SZ); /* DRC - Fix for 64 bit address. */ - DBPRINT(sc,BNX_INFO, "stats_block_paddr = 0x%08X\n", + DBPRINT(sc, BNX_INFO, "stats_block_paddr = 0x%08X\n", (uint32_t) sc->stats_block_paddr); /* @@ -5296,7 +5295,7 @@ bnx_start(struct ifnet *ifp) /* If there's no link or the transmit queue is empty then just exit. */ if (!sc->bnx_link - ||(ifp->if_flags & (IFF_OACTIVE|IFF_RUNNING)) != IFF_RUNNING) { + ||(ifp->if_flags & (IFF_OACTIVE | IFF_RUNNING)) != IFF_RUNNING) { DBPRINT(sc, BNX_INFO_SEND, "%s(): output active or device not running.\n", __func__); goto bnx_start_exit; @@ -5898,7 +5897,7 @@ bnx_tick(void *xsc) /* Now that link is up, handle any outstanding TX traffic. */ if_schedule_deferred_start(ifp); } - + bnx_tick_exit: /* try to get more RX buffers, just in case */ prod = sc->rx_prod; diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c index 9c8f1adba8d..999968d558c 100644 --- a/sys/dev/pci/if_et.c +++ b/sys/dev/pci/if_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_et.c,v 1.22 2019/04/22 08:05:01 msaitoh Exp $ */ +/* $NetBSD: if_et.c,v 1.23 2019/05/23 10:51:39 msaitoh Exp $ */ /* $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.22 2019/04/22 08:05:01 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.23 2019/05/23 10:51:39 msaitoh Exp $"); #include "opt_inet.h" #include "vlan.h" @@ -189,6 +189,7 @@ et_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_miibus; pcireg_t memtype; int error; char intrbuf[PCI_INTRSTR_LEN]; @@ -266,23 +267,22 @@ et_attach(device_t parent, device_t self, void *aux) et_chip_attach(sc); - sc->sc_miibus.mii_ifp = ifp; - sc->sc_miibus.mii_readreg = et_miibus_readreg; - sc->sc_miibus.mii_writereg = et_miibus_writereg; - sc->sc_miibus.mii_statchg = et_miibus_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = et_miibus_readreg; + mii->mii_writereg = et_miibus_writereg; + mii->mii_statchg = et_miibus_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_miibus; - ifmedia_init(&sc->sc_miibus.mii_media, 0, ether_mediachange, + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus); - mii_attach(self, &sc->sc_miibus, 0xffffffff, MII_PHY_ANY, - MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_miibus.mii_phys) == NULL) { + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); + if (LIST_FIRST(&mii->mii_phys) == NULL) { aprint_error_dev(self, "no PHY found!\n"); - ifmedia_add(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL, + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); if_attach(ifp); if_deferred_start_init(ifp, NULL); @@ -738,7 +738,7 @@ et_dma_free(struct et_softc *sc) * Destroy RX stat ring DMA stuffs */ et_dma_mem_destroy(sc, rxst_ring->rsr_stat, rxst_ring->rsr_dmap); - + /* * Destroy RX status DMA stuffs */ @@ -1903,7 +1903,6 @@ et_encap(struct et_softc *sc, struct mbuf **m0) bus_dmamap_sync(sc->sc_dmat, tx_ring->tr_dmap, 0, tx_ring->tr_dmap->dm_mapsize, BUS_DMASYNC_PREWRITE); - tx_ready_pos = __SHIFTIN(tx_ring->tr_ready_index, ET_TX_READY_POS_INDEX); diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 8167bcbe45d..0c33ac98d1c 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.87 2019/04/11 08:50:59 msaitoh Exp $ */ +/* $NetBSD: if_msk.c,v 1.88 2019/05/23 10:51:39 msaitoh Exp $ */ /* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */ /* @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.87 2019/04/11 08:50:59 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.88 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -136,7 +136,7 @@ static void msk_fill_rx_tick(void *); /* #define MSK_DEBUG 1 */ #ifdef MSK_DEBUG #define DPRINTF(x) if (mskdebug) printf x -#define DPRINTFN(n,x) if (mskdebug >= (n)) printf x +#define DPRINTFN(n, x) if (mskdebug >= (n)) printf x int mskdebug = MSK_DEBUG; void msk_dump_txdesc(struct msk_tx_desc *, int); @@ -144,7 +144,7 @@ void msk_dump_mbuf(struct mbuf *); void msk_dump_bytes(const char *, int); #else #define DPRINTF(x) -#define DPRINTFN(n,x) +#define DPRINTFN(n, x) #endif static int msk_sysctl_handler(SYSCTLFN_PROTO); @@ -442,12 +442,12 @@ msk_init_rx_ring(struct sk_if_softc *sc_if) r->sk_ctl = 0; r->sk_opcode = SK_Y2_BMUOPC_ADDR64 | SK_Y2_RXOPC_OWN; MSK_CDRXSYNC(sc_if, cd->sk_rx_prod, - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); SK_INC(sc_if->sk_cdata.sk_rx_prod, MSK_RX_RING_CNT); sc_if->sk_cdata.sk_rx_cnt++; msk_fill_rx_ring(sc_if); - return (0); + return 0; } int @@ -474,12 +474,12 @@ msk_init_tx_ring(struct sk_if_softc *sc_if) if (bus_dmamap_create(sc->sc_dmatag, SK_JLEN, SK_NTXSEG, SK_JLEN, 0, BUS_DMA_NOWAIT, &dmamap)) - return (ENOBUFS); + return ENOBUFS; entry = malloc(sizeof(*entry), M_DEVBUF, M_NOWAIT); if (!entry) { bus_dmamap_destroy(sc->sc_dmatag, dmamap); - return (ENOBUFS); + return ENOBUFS; } entry->dmamap = dmamap; SIMPLEQ_INSERT_HEAD(&sc_if->sk_txmap_head, entry, link); @@ -498,11 +498,11 @@ msk_init_tx_ring(struct sk_if_softc *sc_if) t->sk_ctl = 0; t->sk_opcode = SK_Y2_BMUOPC_ADDR64 | SK_Y2_TXOPC_OWN; MSK_CDTXSYNC(sc_if, 0, MSK_TX_RING_CNT, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); SK_INC(sc_if->sk_cdata.sk_tx_prod, MSK_TX_RING_CNT); sc_if->sk_cdata.sk_tx_cnt++; - return (0); + return 0; } int @@ -516,7 +516,7 @@ msk_newbuf(struct sk_if_softc *sc_if, bus_dmamap_t dmamap) MGETHDR(m_new, M_DONTWAIT, MT_DATA); if (m_new == NULL) - return (ENOBUFS); + return ENOBUFS; /* Allocate the jumbo buffer */ buf = msk_jalloc(sc_if); @@ -524,7 +524,7 @@ msk_newbuf(struct sk_if_softc *sc_if, bus_dmamap_t dmamap) m_freem(m_new); DPRINTFN(1, ("%s jumbo allocation failed -- packet " "dropped!\n", sc_if->sk_ethercom.ec_if.if_xname)); - return (ENOBUFS); + return ENOBUFS; } /* Attach the buffer to the mbuf */ @@ -548,7 +548,7 @@ msk_newbuf(struct sk_if_softc *sc_if, bus_dmamap_t dmamap) sc_if->sk_cdata.sk_rx_hiaddr = MSK_ADDR_HI(addr); MSK_CDRXSYNC(sc_if, sc_if->sk_cdata.sk_rx_prod, - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); SK_INC(sc_if->sk_cdata.sk_rx_prod, MSK_RX_RING_CNT); sc_if->sk_cdata.sk_rx_cnt++; @@ -567,12 +567,12 @@ msk_newbuf(struct sk_if_softc *sc_if, bus_dmamap_t dmamap) r->sk_opcode = SK_Y2_RXOPC_PACKET | SK_Y2_RXOPC_OWN; MSK_CDRXSYNC(sc_if, sc_if->sk_cdata.sk_rx_prod, - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); SK_INC(sc_if->sk_cdata.sk_rx_prod, MSK_RX_RING_CNT); sc_if->sk_cdata.sk_rx_cnt++; - return (0); + return 0; } /* @@ -594,7 +594,7 @@ msk_alloc_jumbo_mem(struct sk_if_softc *sc_if) &sc_if->sk_cdata.sk_jumbo_seg, 1, &sc_if->sk_cdata.sk_jumbo_nseg, BUS_DMA_NOWAIT)) { aprint_error(": can't alloc rx buffers"); - return (ENOBUFS); + return ENOBUFS; } state = 1; @@ -709,7 +709,7 @@ msk_jalloc(struct sk_if_softc *sc_if) LIST_REMOVE(entry, jpool_entries); LIST_INSERT_HEAD(&sc_if->sk_jinuse_listhead, entry, jpool_entries); mutex_exit(&sc_if->sk_jpool_mtx); - return (sc_if->sk_cdata.sk_jslots[entry->slot]); + return sc_if->sk_cdata.sk_jslots[entry->slot]; } /* @@ -846,8 +846,8 @@ msk_update_int_mod(struct sk_softc *sc, int verbose) aprint_verbose_dev(sc->sk_dev, "interrupt moderation is %d us\n", sc->sk_int_mod); sk_win_write_4(sc, SK_IMTIMERINIT, SK_IM_USECS(sc->sk_int_mod)); - sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF|SK_ISR_TX2_S_EOF| - SK_ISR_RX1_EOF|SK_ISR_RX2_EOF); + sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF | SK_ISR_TX2_S_EOF | + SK_ISR_RX1_EOF | SK_ISR_RX2_EOF); sk_win_write_1(sc, SK_IMTIMERCTL, SK_IMCTL_START); sc->sk_int_mod_pending = 0; } @@ -906,9 +906,9 @@ mskc_reset(struct sk_softc *sc) /* enable all clocks. */ sk_win_write_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG3), 0); our = sk_win_read_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG4)); - our &= (SK_Y2_REG4_FORCE_ASPM_REQUEST| - SK_Y2_REG4_ASPM_GPHY_LINK_DOWN| - SK_Y2_REG4_ASPM_INT_FIFO_EMPTY| + our &= (SK_Y2_REG4_FORCE_ASPM_REQUEST | + SK_Y2_REG4_ASPM_GPHY_LINK_DOWN | + SK_Y2_REG4_ASPM_INT_FIFO_EMPTY | SK_Y2_REG4_ASPM_CLKRUN_REQUEST); /* Set all bits to 0 except bits 15..12 */ sk_win_write_4(sc, SK_Y2_PCI_REG(SK_PCI_OURREG4), our); @@ -1074,7 +1074,7 @@ msk_probe(device_t parent, cfdata_t match, void *aux) struct skc_attach_args *sa = aux; if (sa->skc_port != SK_PORT_A && sa->skc_port != SK_PORT_B) - return (0); + return 0; switch (sa->skc_type) { case SK_YUKON_XL: @@ -1088,10 +1088,10 @@ msk_probe(device_t parent, cfdata_t match, void *aux) case SK_YUKON_OPTIMA: case SK_YUKON_PRM: case SK_YUKON_OPTIMA2: - return (1); + return 1; } - return (0); + return 0; } void @@ -1126,6 +1126,7 @@ msk_attach(device_t parent, device_t self, void *aux) struct sk_softc *sc = device_private(parent); struct skc_attach_args *sa = aux; struct ifnet *ifp; + struct mii_data * const mii = &sc_if->sk_mii; void *kva; int i; uint32_t chunk; @@ -1242,26 +1243,24 @@ msk_attach(device_t parent, device_t self, void *aux) DPRINTFN(2, ("msk_attach: 1\n")); - sc_if->sk_mii.mii_ifp = ifp; - sc_if->sk_mii.mii_readreg = msk_miibus_readreg; - sc_if->sk_mii.mii_writereg = msk_miibus_writereg; - sc_if->sk_mii.mii_statchg = msk_miibus_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = msk_miibus_readreg; + mii->mii_writereg = msk_miibus_writereg; + mii->mii_statchg = msk_miibus_statchg; - sc_if->sk_ethercom.ec_mii = &sc_if->sk_mii; - ifmedia_init(&sc_if->sk_mii.mii_media, 0, - ether_mediachange, ether_mediastatus); + sc_if->sk_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus); mii_flags = MIIF_DOPAUSE; if (sc->sk_fibertype) mii_flags |= MIIF_HAVEFIBER; - mii_attach(self, &sc_if->sk_mii, 0xffffffff, 0, - MII_OFFSET_ANY, mii_flags); - if (LIST_FIRST(&sc_if->sk_mii.mii_phys) == NULL) { + mii_attach(self, mii, 0xffffffff, 0, MII_OFFSET_ANY, mii_flags); + if (LIST_FIRST(&mii->mii_phys) == NULL) { aprint_error_dev(sc_if->sk_dev, "no PHY found!\n"); - ifmedia_add(&sc_if->sk_mii.mii_media, IFM_ETHER|IFM_MANUAL, + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); - ifmedia_set(&sc_if->sk_mii.mii_media, IFM_ETHER|IFM_MANUAL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc_if->sk_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); callout_init(&sc_if->sk_tick_ch, 0); callout_setfunc(&sc_if->sk_tick_ch, msk_tick, sc_if); @@ -1308,7 +1307,7 @@ msk_detach(device_t self, int flags) struct ifnet *ifp = &sc_if->sk_ethercom.ec_if; if (sc->sk_if[sc_if->sk_port] == NULL) - return (0); + return 0; msk_stop(ifp, 1); @@ -1342,7 +1341,7 @@ msk_detach(device_t self, int flags) bus_dmamap_destroy(sc->sc_dmatag, sc_if->sk_ring_map); sc->sk_if[sc_if->sk_port] = NULL; - return (0); + return 0; } int @@ -1356,7 +1355,7 @@ mskcprint(void *aux, const char *pnp) else aprint_normal(" port %c", (sa->skc_port == SK_PORT_A) ? 'A' : 'B'); - return (UNCONF); + return UNCONF; } /* @@ -1764,7 +1763,7 @@ mskc_detach(device_t self, int flags) rv = config_detach_children(self, flags); if (rv != 0) - return (rv); + return rv; if (sc->sk_status_nseg > 0) { bus_dmamap_destroy(sc->sc_dmatag, sc->sk_status_map); @@ -1777,7 +1776,7 @@ mskc_detach(device_t self, int flags) if (sc->sk_bsize > 0) bus_space_unmap(sc->sk_btag, sc->sk_bhandle, sc->sk_bsize); - return(0); + return 0; } int @@ -1797,7 +1796,7 @@ msk_encap(struct sk_if_softc *sc_if, struct mbuf *m_head, uint32_t *txidx) entry = SIMPLEQ_FIRST(&sc_if->sk_txmap_head); if (entry == NULL) { DPRINTFN(2, ("msk_encap: no txmap available\n")); - return (ENOBUFS); + return ENOBUFS; } txmap = entry->dmamap; @@ -1816,7 +1815,7 @@ msk_encap(struct sk_if_softc *sc_if, struct mbuf *m_head, uint32_t *txidx) if (bus_dmamap_load_mbuf(sc->sc_dmatag, txmap, m_head, BUS_DMA_NOWAIT)) { DPRINTFN(2, ("msk_encap: dmamap failed\n")); - return (ENOBUFS); + return ENOBUFS; } /* Count how many tx descriptors needed. */ @@ -1832,7 +1831,7 @@ msk_encap(struct sk_if_softc *sc_if, struct mbuf *m_head, uint32_t *txidx) if (total > MSK_TX_RING_CNT - sc_if->sk_cdata.sk_tx_cnt - 2) { DPRINTFN(2, ("msk_encap: too few descriptors free\n")); bus_dmamap_unload(sc->sc_dmatag, txmap); - return (ENOBUFS); + return ENOBUFS; } DPRINTFN(2, ("msk_encap: dm_nsegs=%d total desc=%u\n", @@ -1890,13 +1889,13 @@ msk_encap(struct sk_if_softc *sc_if, struct mbuf *m_head, uint32_t *txidx) /* Sync descriptors before handing to chip */ MSK_CDTXSYNC(sc_if, *txidx, entries, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc_if->sk_rdata->sk_tx_ring[*txidx].sk_opcode |= SK_Y2_TXOPC_OWN; /* Sync first descriptor to hand it off */ MSK_CDTXSYNC(sc_if, *txidx, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc_if->sk_cdata.sk_tx_cnt += entries; @@ -1915,7 +1914,7 @@ msk_encap(struct sk_if_softc *sc_if, struct mbuf *m_head, uint32_t *txidx) DPRINTFN(2, ("msk_encap: successful: %u entries\n", entries)); - return (0); + return 0; } void @@ -2022,9 +2021,9 @@ msk_rxvalid(struct sk_softc *sc, uint32_t stat, uint32_t len) YU_RXSTAT_JABBER)) != 0 || (stat & YU_RXSTAT_RXOK) != YU_RXSTAT_RXOK || YU_RXSTAT_BYTES(stat) != len) - return (0); + return 0; - return (1); + return 1; } void @@ -2040,7 +2039,7 @@ msk_rxeof(struct sk_if_softc *sc_if, uint16_t len, uint32_t rxstat) prod = sc_if->sk_cdata.sk_rx_prod; /* Sync the descriptor */ - MSK_CDRXSYNC(sc_if, cur, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + MSK_CDRXSYNC(sc_if, cur, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); DPRINTFN(2, ("msk_rxeof: cur %u prod %u rx_cnt %u\n", cur, prod, sc_if->sk_cdata.sk_rx_cnt)); @@ -2105,7 +2104,7 @@ msk_txeof(struct sk_if_softc *sc_if) idx = sc_if->sk_cdata.sk_tx_cons; while (idx != sk_win_read_2(sc, reg)) { MSK_CDTXSYNC(sc_if, idx, 1, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); cur_tx = &sc_if->sk_rdata->sk_tx_ring[idx]; sk_ctl = cur_tx->sk_ctl; @@ -2227,10 +2226,10 @@ msk_intr(void *xsc) status = CSR_READ_4(sc, SK_Y2_ISSR2); if (status == 0xffffffff) - return (0); + return 0; if (status == 0) { CSR_WRITE_4(sc, SK_Y2_ICR, 2); - return (0); + return 0; } status = CSR_READ_4(sc, SK_ISR); @@ -2251,7 +2250,7 @@ msk_intr(void *xsc) } MSK_CDSTSYNC(sc, sc->sk_status_idx, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); cur_st = &sc->sk_status_ring[sc->sk_status_idx]; while (cur_st->sk_opcode & SK_Y2_STOPC_OWN) { @@ -2279,7 +2278,7 @@ msk_intr(void *xsc) SK_INC(sc->sk_status_idx, MSK_STATUS_RING_CNT); MSK_CDSTSYNC(sc, sc->sk_status_idx, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); cur_st = &sc->sk_status_ring[sc->sk_status_idx]; } @@ -2458,7 +2457,7 @@ msk_init(struct ifnet *ifp) /* Configure transmit arbiter(s) */ SK_IF_WRITE_1(sc_if, 0, SK_TXAR1_COUNTERCTL, SK_TXARCTL_ON); #if 0 - SK_TXARCTL_ON|SK_TXARCTL_FSYNC_ON); + SK_TXARCTL_ON | SK_TXARCTL_FSYNC_ON); #endif if (sc->sk_ramsize) { @@ -2601,7 +2600,7 @@ msk_stop(struct ifnet *ifp, int disable) callout_stop(&sc_if->sk_tick_ch); callout_stop(&sc_if->sk_tick_rx); - ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE); + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); /* Stop transfer of Tx descriptors */ @@ -2612,9 +2611,9 @@ msk_stop(struct ifnet *ifp, int disable) SK_IF_WRITE_1(sc_if, 0, SK_RXMF1_CTRL_TEST, SK_RFCTL_RESET_SET); SK_IF_WRITE_1(sc_if, 0, SK_TXMF1_CTRL_TEST, SK_TFCTL_RESET_SET); SK_IF_WRITE_4(sc_if, 0, SK_RXQ1_BMU_CSR, SK_RXBMU_OFFLINE); - SK_IF_WRITE_4(sc_if, 0, SK_RXRB1_CTLTST, SK_RBCTL_RESET|SK_RBCTL_OFF); + SK_IF_WRITE_4(sc_if, 0, SK_RXRB1_CTLTST, SK_RBCTL_RESET | SK_RBCTL_OFF); SK_IF_WRITE_4(sc_if, 1, SK_TXQA1_BMU_CSR, SK_TXBMU_OFFLINE); - SK_IF_WRITE_4(sc_if, 1, SK_TXRBA1_CTLTST, SK_RBCTL_RESET|SK_RBCTL_OFF); + SK_IF_WRITE_4(sc_if, 1, SK_TXRBA1_CTLTST, SK_RBCTL_RESET | SK_RBCTL_OFF); SK_IF_WRITE_1(sc_if, 0, SK_TXAR1_COUNTERCTL, SK_TXARCTL_OFF); SK_IF_WRITE_1(sc_if, 0, SK_RXLED1_CTL, SK_RXLEDCTL_COUNTER_STOP); SK_IF_WRITE_1(sc_if, 0, SK_TXLED1_CTL, SK_TXLEDCTL_COUNTER_STOP); diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 73af4f13f01..a2000a00f6e 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_nfe.c,v 1.68 2019/04/11 08:50:59 msaitoh Exp $ */ +/* $NetBSD: if_nfe.c,v 1.69 2019/05/23 10:51:39 msaitoh Exp $ */ /* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */ /*- @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.68 2019/04/11 08:50:59 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.69 2019/05/23 10:51:39 msaitoh Exp $"); #include "opt_inet.h" #include "vlan.h" @@ -120,10 +120,10 @@ CFATTACH_DECL_NEW(nfe, sizeof(struct nfe_softc), #ifdef NFE_DEBUG int nfedebug = 0; #define DPRINTF(x) do { if (nfedebug) printf x; } while (0) -#define DPRINTFN(n,x) do { if (nfedebug >= (n)) printf x; } while (0) +#define DPRINTFN(n, x) do { if (nfedebug >= (n)) printf x; } while (0) #else #define DPRINTF(x) -#define DPRINTFN(n,x) +#define DPRINTFN(n, x) #endif /* deal with naming differences */ @@ -219,6 +219,7 @@ nfe_attach(device_t parent, device_t self, void *aux) pci_intr_handle_t ih; const char *intrstr; struct ifnet *ifp; + struct mii_data * const mii = &sc->sc_mii; pcireg_t memtype, csr; int mii_flags = 0; char intrbuf[PCI_INTRSTR_LEN]; @@ -390,24 +391,22 @@ nfe_attach(device_t parent, device_t self, void *aux) IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx; } - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = nfe_miibus_readreg; - sc->sc_mii.mii_writereg = nfe_miibus_writereg; - sc->sc_mii.mii_statchg = nfe_miibus_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = nfe_miibus_readreg; + mii->mii_writereg = nfe_miibus_writereg; + mii->mii_statchg = nfe_miibus_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange, - ether_mediastatus); + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus); - mii_attach(self, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, 0, mii_flags); + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, 0, mii_flags); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { + if (LIST_FIRST(&mii->mii_phys) == NULL) { aprint_error_dev(self, "no PHY found!\n"); - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER | IFM_MANUAL, - 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_MANUAL); + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); if_attach(ifp); if_deferred_start_init(ifp, NULL); @@ -622,7 +621,7 @@ nfe_intr(void *arg) handled = 1; DPRINTFN(5, ("nfe_intr: interrupt register %x\n", r)); - if ((r & (NFE_IRQ_RXERR|NFE_IRQ_RX_NOBUF|NFE_IRQ_RX)) != 0) { + if ((r & (NFE_IRQ_RXERR |NFE_IRQ_RX_NOBUF |NFE_IRQ_RX)) != 0) { /* check Rx ring */ nfe_rxeof(sc); } @@ -656,7 +655,7 @@ nfe_ifflags_cb(struct ethercom *ec) * don't do a full re-init of the chip, just update * the Rx filter. */ - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0) + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) return ENETRESET; else if ((change & IFF_PROMISC) != 0) nfe_setmulti(sc); @@ -801,14 +800,14 @@ nfe_rxeof(struct nfe_softc *sc) if (sc->sc_flags & NFE_40BIT_ADDR) { desc64 = &sc->rxq.desc64[i]; nfe_rxdesc64_sync(sc, desc64, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); flags = le16toh(desc64->flags); len = le16toh(desc64->length) & 0x3fff; } else { desc32 = &sc->rxq.desc32[i]; nfe_rxdesc32_sync(sc, desc32, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); flags = le16toh(desc32->flags); len = le16toh(desc32->length) & 0x3fff; @@ -970,13 +969,13 @@ skip: desc64->flags = htole16(NFE_RX_READY); nfe_rxdesc64_sync(sc, desc64, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } else { desc32->length = htole16(sc->rxq.bufsz); desc32->flags = htole16(NFE_RX_READY); nfe_rxdesc32_sync(sc, desc32, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } } /* update current RX pointer */ @@ -1000,13 +999,13 @@ nfe_txeof(struct nfe_softc *sc) if (sc->sc_flags & NFE_40BIT_ADDR) { desc64 = &sc->txq.desc64[i]; nfe_txdesc64_sync(sc, desc64, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); flags = le16toh(desc64->flags); } else { desc32 = &sc->txq.desc32[i]; nfe_txdesc32_sync(sc, desc32, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); flags = le16toh(desc32->flags); } @@ -1216,10 +1215,10 @@ nfe_start(struct ifnet *ifp) /* packets are queued */ if (sc->sc_flags & NFE_40BIT_ADDR) nfe_txdesc64_rsync(sc, old, sc->txq.cur, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); else nfe_txdesc32_rsync(sc, old, sc->txq.cur, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* kick Tx */ NFE_WRITE(sc, NFE_RXTX_CTL, NFE_RXTX_KICKTX | sc->rxtxctl); diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index 745055856e6..3221b13c402 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_pcn.c,v 1.68 2019/04/22 07:51:16 msaitoh Exp $ */ +/* $NetBSD: if_pcn.c,v 1.69 2019/05/23 10:51:39 msaitoh Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.68 2019/04/22 07:51:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.69 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -375,9 +375,9 @@ do { \ __rmd->rmd0 = \ htole32(__rxs->rxs_dmamap->dm_segs[0].ds_addr + 2); \ } \ - __rmd->rmd1 = htole32(LE_R1_OWN|LE_R1_ONES| \ + __rmd->rmd1 = htole32(LE_R1_OWN | LE_R1_ONES | \ (LE_BCNT(MCLBYTES - 2) & LE_R1_BCNT_MASK)); \ - PCN_CDRXSYNC((sc), (x), BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);\ + PCN_CDRXSYNC((sc), (x), BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);\ } while(/*CONSTCOND*/0) static void pcn_start(struct ifnet *); @@ -466,7 +466,7 @@ pcn_csr_read(struct pcn_softc *sc, int reg) { bus_space_write_4(sc->sc_st, sc->sc_sh, PCN32_RAP, reg); - return (bus_space_read_4(sc->sc_st, sc->sc_sh, PCN32_RDP)); + return bus_space_read_4(sc->sc_st, sc->sc_sh, PCN32_RDP); } static inline void @@ -482,7 +482,7 @@ pcn_bcr_read(struct pcn_softc *sc, int reg) { bus_space_write_4(sc->sc_st, sc->sc_sh, PCN32_RAP, reg); - return (bus_space_read_4(sc->sc_st, sc->sc_sh, PCN32_BDP)); + return bus_space_read_4(sc->sc_st, sc->sc_sh, PCN32_BDP); } static inline void @@ -502,16 +502,16 @@ pcn_is_vmware(const char *enaddr) * addresses. */ if (enaddr[0] == 0x00 && enaddr[1] == 0x0c && enaddr[2] == 0x29) - return (TRUE); + return TRUE; /* * VMware uses the OUI 00:50:56 for manually-set MAC * addresses (and some auto-generated ones). */ if (enaddr[0] == 0x00 && enaddr[1] == 0x50 && enaddr[2] == 0x56) - return (TRUE); + return TRUE; - return (FALSE); + return FALSE; } static const struct pcn_variant * @@ -521,14 +521,14 @@ pcn_lookup_variant(uint16_t chipid) for (pcv = pcn_variants; pcv->pcv_chipid != 0; pcv++) { if (chipid == pcv->pcv_chipid) - return (pcv); + return pcv; } /* * This covers unknown chips, which we simply treat like * a generic PCnet-FAST. */ - return (pcv); + return pcv; } static int @@ -546,18 +546,18 @@ pcn_match(device_t parent, cfdata_t cf, void *aux) if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_TRIDENT && PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_TRIDENT_4DWAVE_DX && PCI_CLASS(pa->pa_class) == PCI_CLASS_NETWORK) - return(1); + return 1; if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_AMD) - return (0); + return 0; switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_AMD_PCNET_PCI: /* Beat if_le_pci.c */ - return (10); + return 10; } - return (0); + return 0; } static void @@ -591,7 +591,7 @@ pcn_attach(device_t parent, device_t self, void *aux) ioh_valid = (pci_mapreg_map(pa, PCN_PCI_CBIO, PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, NULL) == 0); memh_valid = (pci_mapreg_map(pa, PCN_PCI_CBMEM, - PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0, + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, NULL, NULL) == 0); if (memh_valid) { @@ -921,7 +921,7 @@ pcn_start(struct ifnet *ifp) bus_dmamap_t dmamap; int error, nexttx, lasttx = -1, ofree, seg; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* @@ -958,7 +958,7 @@ pcn_start(struct ifnet *ifp) * and try again. */ if (bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { + BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) { PCN_EVCNT_INCR(&sc->sc_ev_txcopy); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { @@ -979,7 +979,7 @@ pcn_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { printf("%s: unable to load Tx buffer, " "error = %d\n", device_xname(sc->sc_dev), @@ -1104,14 +1104,14 @@ pcn_start(struct ifnet *ifp) /* Set `start of packet' and `end of packet' appropriately. */ sc->sc_txdescs[lasttx].tmd1 |= htole32(LE_T1_ENP); sc->sc_txdescs[sc->sc_txnext].tmd1 |= - htole32(LE_T1_OWN|LE_T1_STP); + htole32(LE_T1_OWN | LE_T1_STP); /* Sync the descriptors we're using. */ PCN_CDTXSYNC(sc, sc->sc_txnext, dmamap->dm_nsegs, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* Kick the transmitter. */ - pcn_csr_write(sc, LE_CSR0, LE_C0_INEA|LE_C0_TDMD); + pcn_csr_write(sc, LE_CSR0, LE_C0_INEA | LE_C0_TDMD); /* * Store a pointer to the packet so we can free it later, @@ -1205,7 +1205,7 @@ pcn_ioctl(struct ifnet *ifp, u_long cmd, void *data) pcn_start(ifp); splx(s); - return (error); + return error; } /* @@ -1230,8 +1230,8 @@ pcn_intr(void *arg) /* ACK the bits and re-enable interrupts. */ pcn_csr_write(sc, LE_CSR0, csr0 & - (LE_C0_INEA|LE_C0_BABL|LE_C0_MISS|LE_C0_MERR|LE_C0_RINT| - LE_C0_TINT|LE_C0_IDON)); + (LE_C0_INEA | LE_C0_BABL | LE_C0_MISS | LE_C0_MERR | + LE_C0_RINT | LE_C0_TINT | LE_C0_IDON)); handled = 1; @@ -1286,7 +1286,7 @@ pcn_intr(void *arg) if_schedule_deferred_start(ifp); } - return (handled); + return handled; } /* @@ -1335,7 +1335,7 @@ pcn_txintr(struct pcn_softc *sc) txs = &sc->sc_txsoft[i]; PCN_CDTXSYNC(sc, txs->txs_firstdesc, txs->txs_dmamap->dm_nsegs, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); tmd1 = le32toh(sc->sc_txdescs[txs->txs_lastdesc].tmd1); if (tmd1 & LE_T1_OWN) @@ -1432,7 +1432,8 @@ pcn_rxintr(struct pcn_softc *sc) for (i = sc->sc_rxptr;; i = PCN_NEXTRX(i)) { rxs = &sc->sc_rxsoft[i]; - PCN_CDRXSYNC(sc, i, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + PCN_CDRXSYNC(sc, i, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); rmd1 = le32toh(sc->sc_rxdescs[i].rmd1); @@ -1445,14 +1446,14 @@ pcn_rxintr(struct pcn_softc *sc) * code the way it is in order to compress it into * one test in the common case (no error). */ - if (__predict_false((rmd1 & (LE_R1_STP|LE_R1_ENP|LE_R1_ERR)) != - (LE_R1_STP|LE_R1_ENP))) { + if (__predict_false((rmd1 & (LE_R1_STP | LE_R1_ENP |LE_R1_ERR)) + != (LE_R1_STP | LE_R1_ENP))) { /* Make sure the packet is in a single buffer. */ - if ((rmd1 & (LE_R1_STP|LE_R1_ENP)) != - (LE_R1_STP|LE_R1_ENP)) { + if ((rmd1 & (LE_R1_STP | LE_R1_ENP)) != + (LE_R1_STP | LE_R1_ENP)) { printf("%s: packet spilled into next buffer\n", device_xname(sc->sc_dev)); - return (1); /* pcn_intr() will re-init */ + return 1; /* pcn_intr() will re-init */ } /* @@ -1548,7 +1549,7 @@ pcn_rxintr(struct pcn_softc *sc) /* Update the receive pointer. */ sc->sc_rxptr = i; - return (0); + return 0; } /* @@ -1640,7 +1641,7 @@ pcn_init(struct ifnet *ifp) /* Initialize the transmit descriptor ring. */ memset(sc->sc_txdescs, 0, sizeof(sc->sc_txdescs)); PCN_CDTXSYNC(sc, 0, PCN_NTXDESC, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc->sc_txfree = PCN_NTXDESC; sc->sc_txnext = 0; @@ -1720,14 +1721,14 @@ pcn_init(struct ifnet *ifp) pcn_set_filter(sc); /* Initialize CSR3. */ - pcn_csr_write(sc, LE_CSR3, LE_C3_MISSM|LE_C3_IDONM|LE_C3_DXSUFLO); + pcn_csr_write(sc, LE_CSR3, LE_C3_MISSM | LE_C3_IDONM | LE_C3_DXSUFLO); /* Initialize CSR4. */ - pcn_csr_write(sc, LE_CSR4, LE_C4_DMAPLUS|LE_C4_APAD_XMT| - LE_C4_MFCOM|LE_C4_RCVCCOM|LE_C4_TXSTRTM); + pcn_csr_write(sc, LE_CSR4, LE_C4_DMAPLUS | LE_C4_APAD_XMT | + LE_C4_MFCOM | LE_C4_RCVCCOM | LE_C4_TXSTRTM); /* Initialize CSR5. */ - sc->sc_csr5 = LE_C5_LTINTEN|LE_C5_SINTE; + sc->sc_csr5 = LE_C5_LTINTEN | LE_C5_SINTE; pcn_csr_write(sc, LE_CSR5, sc->sc_csr5); /* @@ -1763,11 +1764,11 @@ pcn_init(struct ifnet *ifp) break; case PARTID_Am79c970A: - reg |= LE_B18_BREADE|LE_B18_BWRITE; + reg |= LE_B18_BREADE | LE_B18_BWRITE; break; default: - reg |= LE_B18_BREADE|LE_B18_BWRITE|LE_B18_NOUFLO; + reg |= LE_B18_BREADE | LE_B18_BWRITE | LE_B18_NOUFLO; break; } pcn_bcr_write(sc, LE_BCR18, reg); @@ -1805,7 +1806,7 @@ pcn_init(struct ifnet *ifp) goto out; /* Enable interrupts and external activity (and ACK IDON). */ - pcn_csr_write(sc, LE_CSR0, LE_C0_INEA|LE_C0_STRT|LE_C0_IDON); + pcn_csr_write(sc, LE_CSR0, LE_C0_INEA | LE_C0_STRT | LE_C0_IDON); if (sc->sc_flags & PCN_F_HAS_MII) { /* Start the one second MII clock. */ @@ -1819,7 +1820,7 @@ pcn_init(struct ifnet *ifp) out: if (error) printf("%s: interface not running\n", device_xname(sc->sc_dev)); - return (error); + return error; } /* @@ -1898,12 +1899,12 @@ pcn_add_rxbuf(struct pcn_softc *sc, int idx) MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) - return (ENOBUFS); + return ENOBUFS; MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); - return (ENOBUFS); + return ENOBUFS; } if (rxs->rxs_mbuf != NULL) @@ -1913,7 +1914,7 @@ pcn_add_rxbuf(struct pcn_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmat, rxs->rxs_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { printf("%s: can't load rx DMA map %d, error = %d\n", device_xname(sc->sc_dev), idx, error); @@ -1925,7 +1926,7 @@ pcn_add_rxbuf(struct pcn_softc *sc, int idx) PCN_INIT_RXDESC(sc, idx); - return (0); + return 0; } /* @@ -2004,33 +2005,34 @@ static void pcn_79c970_mediainit(struct pcn_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; const char *sep = ""; - sc->sc_mii.mii_ifp = ifp; + mii->mii_ifp = ifp; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, pcn_79c970_mediachange, + ifmedia_init(&mii->mii_media, IFM_IMASK, pcn_79c970_mediachange, pcn_79c970_mediastatus); #define ADD(str, m, d) \ do { \ - aprint_normal("%s%s", sep, str); \ - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|(m), (d), NULL); \ + aprint_normal("%s%s", sep, str); \ + ifmedia_add(&mii->mii_media, IFM_ETHER | (m), (d), NULL); \ sep = ", "; \ } while (/*CONSTCOND*/0) aprint_normal("%s: ", device_xname(sc->sc_dev)); ADD("10base5", IFM_10_5, PORTSEL_AUI); if (sc->sc_variant->pcv_chipid == PARTID_Am79c970A) - ADD("10base5-FDX", IFM_10_5|IFM_FDX, PORTSEL_AUI); + ADD("10base5-FDX", IFM_10_5 | IFM_FDX, PORTSEL_AUI); ADD("10baseT", IFM_10_T, PORTSEL_10T); if (sc->sc_variant->pcv_chipid == PARTID_Am79c970A) - ADD("10baseT-FDX", IFM_10_T|IFM_FDX, PORTSEL_10T); + ADD("10baseT-FDX", IFM_10_T | IFM_FDX, PORTSEL_10T); ADD("auto", IFM_AUTO, 0); if (sc->sc_variant->pcv_chipid == PARTID_Am79c970A) - ADD("auto-FDX", IFM_AUTO|IFM_FDX, 0); + ADD("auto-FDX", IFM_AUTO | IFM_FDX, 0); aprint_normal("\n"); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } /* @@ -2091,7 +2093,7 @@ pcn_79c970_mediachange(struct ifnet *ifp) } else pcn_bcr_write(sc, LE_BCR9, 0); - return (0); + return 0; } /* @@ -2103,6 +2105,7 @@ static void pcn_79c971_mediainit(struct pcn_softc *sc) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; /* We have MII. */ sc->sc_flags |= PCN_F_HAS_MII; @@ -2119,22 +2122,21 @@ pcn_79c971_mediainit(struct pcn_softc *sc) */ /* Initialize our media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = pcn_mii_readreg; - sc->sc_mii.mii_writereg = pcn_mii_writereg; - sc->sc_mii.mii_statchg = pcn_mii_statchg; + mii->mii_ifp = ifp; + mii->mii_readreg = pcn_mii_readreg; + mii->mii_writereg = pcn_mii_writereg; + mii->mii_statchg = pcn_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange, - ether_mediastatus); + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } /* diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c index c1a164153b3..6b054a8453e 100644 --- a/sys/dev/pci/if_sip.c +++ b/sys/dev/pci/if_sip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sip.c,v 1.171 2019/04/26 06:33:34 msaitoh Exp $ */ +/* $NetBSD: if_sip.c,v 1.172 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.171 2019/04/26 06:33:34 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.172 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -532,7 +532,7 @@ sip_init_rxdesc(struct sip_softc *sc, int x) *sipd_cmdsts(sc, sipd) = htole32(CMDSTS_INTR | (sc->sc_parm->p_rxbuf_len & sc->sc_bits.b_cmdsts_size_mask)); sipd->sipd_extsts = 0; - sip_cdrxsync(sc, x, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + sip_cdrxsync(sc, x, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } #define SIP_CHIP_VERS(sc, v, p, r) \ @@ -824,7 +824,7 @@ sipcom_dp83820_attach(struct sip_softc *sc, struct pci_attach_args *pa) sc->sc_cfg |= CFG_T64ADDR; #endif - if (reg & (CFG_TBI_EN|CFG_EXT_125)) { + if (reg & (CFG_TBI_EN | CFG_EXT_125)) { const char *sep = ""; printf("%s: using ", device_xname(sc->sc_dev)); if (reg & CFG_EXT_125) { @@ -975,6 +975,7 @@ sipcom_attach(device_t parent, device_t self, void *aux) struct sip_softc *sc = device_private(self); struct pci_attach_args *pa = aux; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; const char *intrstr = NULL; @@ -1054,7 +1055,7 @@ sipcom_attach(device_t parent, device_t self, void *aux) } } else { memh_valid = (pci_mapreg_map(pa, SIP_PCI_CFGMA, - PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0, + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, NULL, &memsz) == 0); } @@ -1188,13 +1189,13 @@ sipcom_attach(device_t parent, device_t self, void *aux) */ sc->sc_cfg = 0; if (!sc->sc_gigabit) { - if (SIP_SIS900_REV(sc,SIS_REV_635) || - SIP_SIS900_REV(sc,SIS_REV_900B)) + if (SIP_SIS900_REV(sc, SIS_REV_635) || + SIP_SIS900_REV(sc, SIS_REV_900B)) sc->sc_cfg |= (CFG_PESEL | CFG_RNDCNT); - if (SIP_SIS900_REV(sc,SIS_REV_635) || - SIP_SIS900_REV(sc,SIS_REV_960) || - SIP_SIS900_REV(sc,SIS_REV_900B)) + if (SIP_SIS900_REV(sc, SIS_REV_635) || + SIP_SIS900_REV(sc, SIS_REV_960) || + SIP_SIS900_REV(sc, SIS_REV_900B)) sc->sc_cfg |= (bus_space_read_4(sc->sc_st, sc->sc_sh, SIP_CFG) & CFG_EDBMASTEN); @@ -1218,28 +1219,28 @@ sipcom_attach(device_t parent, device_t self, void *aux) /* * Initialize our media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = sip->sip_variant->sipv_mii_readreg; - sc->sc_mii.mii_writereg = sip->sip_variant->sipv_mii_writereg; - sc->sc_mii.mii_statchg = sip->sip_variant->sipv_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ether_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = sip->sip_variant->sipv_mii_readreg; + mii->mii_writereg = sip->sip_variant->sipv_mii_writereg; + mii->mii_statchg = sip->sip_variant->sipv_mii_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ether_mediachange, sipcom_mediastatus); /* * XXX We cannot handle flow control on the DP83815. */ if (SIP_CHIP_MODEL(sc, PCI_VENDOR_NS, PCI_PRODUCT_NS_DP83815)) - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); else - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, MIIF_DOPAUSE); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); ifp = &sc->sc_ethercom.ec_if; strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ); @@ -1452,7 +1453,7 @@ sipcom_start(struct ifnet *ifp) if (!sc->sc_gigabit && sc->sc_paused) ifp->if_flags |= IFF_OACTIVE; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* @@ -1483,7 +1484,7 @@ sipcom_start(struct ifnet *ifp) * were short on resources. */ error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT); + BUS_DMA_WRITE | BUS_DMA_NOWAIT); /* In the non-gigabit case, we'll copy and try again. */ if (error != 0 && !sc->sc_gigabit) { MGETHDR(m, M_DONTWAIT, MT_DATA); @@ -1506,7 +1507,7 @@ sipcom_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { printf("%s: unable to load Tx buffer, error = " "%d\n", device_xname(sc->sc_dev), error); @@ -1611,7 +1612,7 @@ sipcom_start(struct ifnet *ifp) /* Sync the descriptors we're using. */ sip_cdtxsync(sc, sc->sc_txnext, dmamap->dm_nsegs, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * The entire packet is set up. Give the first descrptor @@ -1620,7 +1621,7 @@ sipcom_start(struct ifnet *ifp) *sipd_cmdsts(sc, &sc->sc_txdescs[sc->sc_txnext]) |= htole32(CMDSTS_OWN); sip_cdtxsync(sc, sc->sc_txnext, 1, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Store a pointer to the packet so we can free it later, @@ -1728,7 +1729,7 @@ sip_ifflags_cb(struct ethercom *ec) struct sip_softc *sc = ifp->if_softc; int change = ifp->if_flags ^ sc->sc_if_flags; - if ((change & ~(IFF_CANTCHANGE|IFF_DEBUG)) != 0 || !COMPARE_EC(sc) || + if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0 || !COMPARE_EC(sc) || !COMPARE_IC(sc, ifp)) return ENETRESET; /* Set up the receive filter. */ @@ -1840,7 +1841,7 @@ sipcom_intr(void *arg) if ((ifp->if_flags & IFF_RUNNING) == 0) break; - if (isr & (ISR_RXORN|ISR_RXIDLE|ISR_RXDESC)) { + if (isr & (ISR_RXORN | ISR_RXIDLE | ISR_RXDESC)) { SIP_EVCNT_INCR(&sc->sc_ev_rxintr); /* Grab any new packets. */ @@ -1865,7 +1866,7 @@ sipcom_intr(void *arg) } } - if (isr & (ISR_TXURN|ISR_TXDESC|ISR_TXIDLE)) { + if (isr & (ISR_TXURN | ISR_TXDESC | ISR_TXIDLE)) { #ifdef SIP_EVENT_COUNTERS if (isr & ISR_TXDESC) SIP_EVCNT_INCR(&sc->sc_ev_txdintr); @@ -1900,7 +1901,7 @@ sipcom_intr(void *arg) } } - if (sc->sc_imr & (ISR_PAUSE_END|ISR_PAUSE_ST)) { + if (sc->sc_imr & (ISR_PAUSE_END | ISR_PAUSE_ST)) { if (isr & ISR_PAUSE_ST) { sc->sc_paused = 1; SIP_EVCNT_INCR(&sc->sc_ev_rxpause); @@ -1973,7 +1974,7 @@ sipcom_txintr(struct sip_softc *sc) */ while ((txs = SIMPLEQ_FIRST(&sc->sc_txdirtyq)) != NULL) { sip_cdtxsync(sc, txs->txs_firstdesc, txs->txs_dmamap->dm_nsegs, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); cmdsts = le32toh(*sipd_cmdsts(sc, &sc->sc_txdescs[txs->txs_lastdesc])); @@ -1993,8 +1994,8 @@ sipcom_txintr(struct sip_softc *sc) SIMPLEQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q); /* Check for errors and collisions. */ - if (cmdsts & - (CMDSTS_Tx_TXA|CMDSTS_Tx_TFU|CMDSTS_Tx_ED|CMDSTS_Tx_EC)) { + if (cmdsts & (CMDSTS_Tx_TXA | CMDSTS_Tx_TFU | CMDSTS_Tx_ED | + CMDSTS_Tx_EC)) { ifp->if_oerrors++; if (cmdsts & CMDSTS_Tx_EC) ifp->if_collisions += 16; @@ -2040,7 +2041,8 @@ gsip_rxintr(struct sip_softc *sc) for (i = sc->sc_rxptr;; i = sip_nextrx(sc, i)) { rxs = &sc->sc_rxsoft[i]; - sip_cdrxsync(sc, i, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + sip_cdrxsync(sc, i, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); cmdsts = le32toh(*sipd_cmdsts(sc, &sc->sc_rxdescs[i])); extsts = le32toh(sc->sc_rxdescs[i].sipd_extsts); @@ -2118,8 +2120,8 @@ gsip_rxintr(struct sip_softc *sc) sip_rxchain_reset(sc); /* If an error occurred, update stats and drop the packet. */ - if (cmdsts & (CMDSTS_Rx_RXA|CMDSTS_Rx_RUNT| - CMDSTS_Rx_ISE|CMDSTS_Rx_CRCE|CMDSTS_Rx_FAE)) { + if (cmdsts & (CMDSTS_Rx_RXA | CMDSTS_Rx_RUNT | + CMDSTS_Rx_ISE | CMDSTS_Rx_CRCE | CMDSTS_Rx_FAE)) { ifp->if_ierrors++; if ((cmdsts & CMDSTS_Rx_RXA) != 0 && (cmdsts & CMDSTS_Rx_RXO) == 0) { @@ -2250,7 +2252,8 @@ sip_rxintr(struct sip_softc *sc) for (i = sc->sc_rxptr;; i = sip_nextrx(sc, i)) { rxs = &sc->sc_rxsoft[i]; - sip_cdrxsync(sc, i, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + sip_cdrxsync(sc, i, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); cmdsts = le32toh(*sipd_cmdsts(sc, &sc->sc_rxdescs[i])); @@ -2275,8 +2278,8 @@ sip_rxintr(struct sip_softc *sc) * word, and leave the packet buffer in place. It will * simply be reused the next time the ring comes around. */ - if (cmdsts & (CMDSTS_Rx_RXA|CMDSTS_Rx_RUNT| - CMDSTS_Rx_ISE|CMDSTS_Rx_CRCE|CMDSTS_Rx_FAE)) { + if (cmdsts & (CMDSTS_Rx_RXA | CMDSTS_Rx_RUNT | + CMDSTS_Rx_ISE | CMDSTS_Rx_CRCE | CMDSTS_Rx_FAE)) { ifp->if_ierrors++; if ((cmdsts & CMDSTS_Rx_RXA) != 0 && (cmdsts & CMDSTS_Rx_RXO) == 0) { @@ -2476,10 +2479,10 @@ sipcom_dp83820_init(struct sip_softc *sc, uint64_t capenable) */ reg = 0; if (capenable & - (IFCAP_CSUM_IPv4_Rx|IFCAP_CSUM_TCPv4_Rx|IFCAP_CSUM_UDPv4_Rx)) + (IFCAP_CSUM_IPv4_Rx | IFCAP_CSUM_TCPv4_Rx | IFCAP_CSUM_UDPv4_Rx)) reg |= VRCR_IPEN; if (VLAN_ATTACHED(&sc->sc_ethercom)) - reg |= VRCR_VTDEN|VRCR_VTREN; + reg |= VRCR_VTDEN | VRCR_VTREN; bus_space_write_4(st, sh, SIP_VRCR, reg); /* @@ -2489,7 +2492,7 @@ sipcom_dp83820_init(struct sip_softc *sc, uint64_t capenable) */ reg = 0; if (capenable & - (IFCAP_CSUM_IPv4_Tx|IFCAP_CSUM_TCPv4_Tx|IFCAP_CSUM_UDPv4_Tx)) + (IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx)) reg |= VTCR_PPCHK; if (VLAN_ATTACHED(&sc->sc_ethercom)) reg |= VTCR_VPPTI; @@ -2573,7 +2576,7 @@ sipcom_init(struct ifnet *ifp) sipd->sipd_link = htole32(SIP_CDTXADDR(sc, sip_nexttx(sc, i))); } sip_cdtxsync(sc, 0, sc->sc_ntxdesc, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); sc->sc_txfree = sc->sc_ntxdesc; sc->sc_txnext = 0; sc->sc_txwin = 0; @@ -2677,15 +2680,15 @@ sipcom_init(struct ifnet *ifp) */ if (sc->sc_gigabit && ifp->if_mtu > 8109 && (ifp->if_capenable & - (IFCAP_CSUM_IPv4_Tx|IFCAP_CSUM_IPv4_Rx| - IFCAP_CSUM_TCPv4_Tx|IFCAP_CSUM_TCPv4_Rx| - IFCAP_CSUM_UDPv4_Tx|IFCAP_CSUM_UDPv4_Rx))) { + (IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx | + IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx | + IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx))) { printf("%s: Checksum offloading does not work if MTU > 8109 - " "disabled.\n", device_xname(sc->sc_dev)); ifp->if_capenable &= - ~(IFCAP_CSUM_IPv4_Tx|IFCAP_CSUM_IPv4_Rx| - IFCAP_CSUM_TCPv4_Tx|IFCAP_CSUM_TCPv4_Rx| - IFCAP_CSUM_UDPv4_Tx|IFCAP_CSUM_UDPv4_Rx); + ~(IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx | + IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_TCPv4_Rx | + IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx); ifp->if_csum_flags_tx = 0; ifp->if_csum_flags_rx = 0; } @@ -2707,8 +2710,9 @@ sipcom_init(struct ifnet *ifp) sc->sc_imr = sc->sc_bits.b_isr_dperr | sc->sc_bits.b_isr_sserr | sc->sc_bits.b_isr_rmabt | - sc->sc_bits.b_isr_rtabt | ISR_RXSOVR | - ISR_TXURN|ISR_TXDESC|ISR_TXIDLE|ISR_RXORN|ISR_RXIDLE|ISR_RXDESC; + sc->sc_bits.b_isr_rtabt | + ISR_RXSOVR | ISR_TXURN | ISR_TXDESC | ISR_TXIDLE | ISR_RXORN | + ISR_RXIDLE | ISR_RXDESC; bus_space_write_4(st, sh, SIP_IMR, sc->sc_imr); /* Set up the receive filter. */ @@ -2964,7 +2968,7 @@ sipcom_add_rxbuf(struct sip_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmat, rxs->rxs_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { printf("%s: can't load rx DMA map %d, error = %d\n", device_xname(sc->sc_dev), idx, error); @@ -3557,10 +3561,10 @@ sipcom_sis900_mii_statchg(struct ifnet *ifp) * Update IMR for use of 802.3x flow control. */ if (sc->sc_flowflags & IFM_FLOW) { - sc->sc_imr |= (ISR_PAUSE_END|ISR_PAUSE_ST); + sc->sc_imr |= (ISR_PAUSE_END | ISR_PAUSE_ST); flowctl = FLOWCTL_FLOWEN; } else { - sc->sc_imr &= ~(ISR_PAUSE_END|ISR_PAUSE_ST); + sc->sc_imr &= ~(ISR_PAUSE_END | ISR_PAUSE_ST); flowctl = 0; } @@ -3781,11 +3785,11 @@ sipcom_sis900_read_macaddr(struct sip_softc *sc, case SIS_REV_960: { -#define SIS_SET_EROMAR(x,y) \ +#define SIS_SET_EROMAR(x, y) \ bus_space_write_4(x->sc_st, x->sc_sh, SIP_EROMAR, \ bus_space_read_4(x->sc_st, x->sc_sh, SIP_EROMAR) | (y)) -#define SIS_CLR_EROMAR(x,y) \ +#define SIS_CLR_EROMAR(x, y) \ bus_space_write_4(x->sc_st, x->sc_sh, SIP_EROMAR, \ bus_space_read_4(x->sc_st, x->sc_sh, SIP_EROMAR) & ~(y)) diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index 7e9fb4e5adc..1ec5219853f 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ste.c,v 1.53 2019/01/22 03:42:27 msaitoh Exp $ */ +/* $NetBSD: if_ste.c,v 1.54 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.53 2019/01/22 03:42:27 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.54 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> @@ -186,7 +186,7 @@ do { \ __rfd->rfd_frag.frag_len = htole32((MCLBYTES - 2) | FRAG_LAST); \ __rfd->rfd_next = htole32(STE_CDRXADDR((sc), STE_NEXTRX((x)))); \ __rfd->rfd_status = 0; \ - STE_CDRXSYNC((sc), (x), BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); \ + STE_CDRXSYNC((sc), (x), BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); \ } while (/*CONSTCOND*/0) #define STE_TIMEOUT 1000 @@ -199,9 +199,9 @@ static void ste_stop(struct ifnet *, int); static bool ste_shutdown(device_t, int); -static void ste_reset(struct ste_softc *, u_int32_t); +static void ste_reset(struct ste_softc *, uint32_t); static void ste_setthresh(struct ste_softc *); -static void ste_txrestart(struct ste_softc *, u_int8_t); +static void ste_txrestart(struct ste_softc *, uint8_t); static void ste_rxdrain(struct ste_softc *); static int ste_add_rxbuf(struct ste_softc *, int); static void ste_read_eeprom(struct ste_softc *, int, uint16_t *); @@ -293,6 +293,7 @@ ste_attach(device_t parent, device_t self, void *aux) struct ste_softc *sc = device_private(self); struct pci_attach_args *pa = aux; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; const char *intrstr = NULL; @@ -325,7 +326,7 @@ ste_attach(device_t parent, device_t self, void *aux) PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, NULL) == 0); memh_valid = (pci_mapreg_map(pa, STE_PCI_MMBA, - PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0, + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, NULL, NULL) == 0); if (memh_valid) { @@ -459,20 +460,20 @@ ste_attach(device_t parent, device_t self, void *aux) /* * Initialize our media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = ste_mii_readreg; - sc->sc_mii.mii_writereg = ste_mii_writereg; - sc->sc_mii.mii_statchg = ste_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ether_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = ste_mii_readreg; + mii->mii_writereg = ste_mii_writereg; + mii->mii_statchg = ste_mii_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ether_mediachange, ether_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0,NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); ifp = &sc->sc_ethercom.ec_if; strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ); @@ -594,7 +595,7 @@ ste_start(struct ifnet *ifp) bus_dmamap_t dmamap; int error, olasttx, nexttx, opending, seg, totlen; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* @@ -634,7 +635,7 @@ ste_start(struct ifnet *ifp) * and try again. */ if (bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0, - BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) { + BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) { MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { printf("%s: unable to allocate Tx mbuf\n", @@ -654,7 +655,7 @@ ste_start(struct ifnet *ifp) m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *)); m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len; error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, - m, BUS_DMA_WRITE|BUS_DMA_NOWAIT); + m, BUS_DMA_WRITE | BUS_DMA_NOWAIT); if (error) { printf("%s: unable to load Tx buffer, " "error = %d\n", device_xname(sc->sc_dev), @@ -693,7 +694,7 @@ ste_start(struct ifnet *ifp) /* Sync the descriptor. */ STE_CDTXSYNC(sc, nexttx, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Store a pointer to the packet so we can free it later, @@ -735,7 +736,7 @@ ste_start(struct ifnet *ifp) sc->sc_txdescs[sc->sc_txlast].tfd_control |= htole32(TFD_TxDMAIndicate); STE_CDTXSYNC(sc, sc->sc_txlast, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Link up the new chain of descriptors to the @@ -744,7 +745,7 @@ ste_start(struct ifnet *ifp) sc->sc_txdescs[olasttx].tfd_next = htole32(STE_CDTXADDR(sc, STE_NEXTTX(olasttx))); STE_CDTXSYNC(sc, olasttx, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Kick the transmit DMA logic. Note that since we're @@ -848,7 +849,7 @@ ste_intr(void *arg) ste_rxintr(sc); /* Transmit interrupts. */ - if (isr & (IE_TxDMAComplete|IE_TxComplete)) + if (isr & (IE_TxDMAComplete | IE_TxComplete)) ste_txintr(sc); /* Statistics overflow. */ @@ -943,7 +944,7 @@ ste_txintr(struct ste_softc *sc) ds = &sc->sc_txsoft[i]; STE_CDTXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); control = le32toh(sc->sc_txdescs[i].tfd_control); if ((control & TFD_TxDMAComplete) == 0) @@ -984,7 +985,8 @@ ste_rxintr(struct ste_softc *sc) for (i = sc->sc_rxptr;; i = STE_NEXTRX(i)) { ds = &sc->sc_rxsoft[i]; - STE_CDRXSYNC(sc, i, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + STE_CDRXSYNC(sc, i, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le32toh(sc->sc_rxdescs[i].rfd_status); @@ -1127,7 +1129,7 @@ ste_stats_update(struct ste_softc *sc) * Perform a soft reset on the ST-201. */ static void -ste_reset(struct ste_softc *sc, u_int32_t rstbits) +ste_reset(struct ste_softc *sc, uint32_t rstbits) { uint32_t ac; int i; @@ -1173,15 +1175,15 @@ ste_setthresh(struct ste_softc *sc) * restart TX at the given frame ID in the transmitter ring */ static void -ste_txrestart(struct ste_softc *sc, u_int8_t id) +ste_txrestart(struct ste_softc *sc, uint8_t id) { - u_int32_t control; + uint32_t control; - STE_CDTXSYNC(sc, id, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + STE_CDTXSYNC(sc, id, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); control = le32toh(sc->sc_txdescs[id].tfd_control); control &= ~TFD_TxDMAComplete; sc->sc_txdescs[id].tfd_control = htole32(control); - STE_CDTXSYNC(sc, id, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + STE_CDTXSYNC(sc, id, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); bus_space_write_4(sc->sc_st, sc->sc_sh, STE_TxDMAListPtr, 0); bus_space_write_2(sc->sc_st, sc->sc_sh, STE_MacCtrl1, MC1_TxEnable); @@ -1486,7 +1488,7 @@ ste_add_rxbuf(struct ste_softc *sc, int idx) error = bus_dmamap_load(sc->sc_dmat, ds->ds_dmamap, m->m_ext.ext_buf, m->m_ext.ext_size, NULL, - BUS_DMA_READ|BUS_DMA_NOWAIT); + BUS_DMA_READ | BUS_DMA_NOWAIT); if (error) { printf("%s: can't load rx DMA map %d, error = %d\n", device_xname(sc->sc_dev), idx, error); diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index 491795d33f0..221113ca32c 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_stge.c,v 1.67 2019/01/22 03:42:27 msaitoh Exp $ */ +/* $NetBSD: if_stge.c,v 1.68 2019/05/23 10:51:39 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.67 2019/01/22 03:42:27 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.68 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> @@ -251,7 +251,7 @@ do { \ __rfd->rfd_next = \ htole64((uint64_t)STGE_CDRXADDR((sc), STGE_NEXTRX((x)))); \ __rfd->rfd_status = 0; \ - STGE_CDRXSYNC((sc), (x), BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); \ + STGE_CDRXSYNC((sc), (x), BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); \ } while (/*CONSTCOND*/0) #define STGE_TIMEOUT 1000 @@ -375,6 +375,7 @@ stge_attach(device_t parent, device_t self, void *aux) struct stge_softc *sc = device_private(self); struct pci_attach_args *pa = aux; struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; const char *intrstr = NULL; @@ -407,7 +408,7 @@ stge_attach(device_t parent, device_t self, void *aux) PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, NULL) == 0); memh_valid = (pci_mapreg_map(pa, STGE_PCI_MMBA, - PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0, + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, NULL, NULL) == 0); if (memh_valid) { @@ -595,20 +596,20 @@ stge_attach(device_t parent, device_t self, void *aux) /* * Initialize our media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = stge_mii_readreg; - sc->sc_mii.mii_writereg = stge_mii_writereg; - sc->sc_mii.mii_statchg = stge_mii_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ether_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = stge_mii_readreg; + mii->mii_writereg = stge_mii_writereg; + mii->mii_statchg = stge_mii_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ether_mediachange, ether_mediastatus); - mii_attach(self, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, MIIF_DOPAUSE); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); ifp = &sc->sc_ethercom.ec_if; strlcpy(ifp->if_xname, device_xname(self), IFNAMSIZ); @@ -790,7 +791,7 @@ stge_start(struct ifnet *ifp) int error, firsttx, nexttx, opending, seg, totlen; uint64_t csum_flags; - if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; /* @@ -939,7 +940,7 @@ stge_start(struct ifnet *ifp) #if 0 struct ether_header *eh = mtod(m0, struct ether_header *); - u_int16_t etype = ntohs(eh->ether_type); + uint16_t etype = ntohs(eh->ether_type); printf("%s: xmit (tag %d) etype %x\n", ifp->if_xname, *mtod(n, int *), etype); #endif @@ -953,7 +954,7 @@ stge_start(struct ifnet *ifp) /* Sync the descriptor. */ STGE_CDTXSYNC(sc, nexttx, - BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* * Kick the transmit DMA logic. @@ -1086,7 +1087,7 @@ stge_intr(void *arg) } /* Receive interrupts. */ - if (isr & (IS_RxDMAComplete|IS_RFDListEnd)) { + if (isr & (IS_RxDMAComplete | IS_RFDListEnd)) { STGE_EVCNT_INCR(&sc->sc_ev_rxintr); stge_rxintr(sc); if (isr & IS_RFDListEnd) { @@ -1101,7 +1102,7 @@ stge_intr(void *arg) } /* Transmit interrupts. */ - if (isr & (IS_TxDMAComplete|IS_TxComplete)) { + if (isr & (IS_TxDMAComplete | IS_TxComplete)) { #ifdef STGE_EVENT_COUNTERS if (isr & IS_TxDMAComplete) STGE_EVCNT_INCR(&sc->sc_ev_txdmaintr); @@ -1175,7 +1176,7 @@ stge_txintr(struct stge_softc *sc) ds = &sc->sc_txsoft[i]; STGE_CDTXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); control = le64toh(sc->sc_txdescs[i].tfd_control); if ((control & TFD_TFDDone) == 0) @@ -1217,7 +1218,7 @@ stge_rxintr(struct stge_softc *sc) ds = &sc->sc_rxsoft[i]; STGE_CDRXSYNC(sc, i, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); status = le64toh(sc->sc_rxdescs[i].rfd_status); @@ -1368,12 +1369,12 @@ stge_rxintr(struct stge_softc *sc) #if 0 if (status & RFD_VLANDetected) { struct ether_header *eh; - u_int16_t etype; + uint16_t etype; eh = mtod(m, struct ether_header *); etype = ntohs(eh->ether_type); printf("%s: VLANtag detected (TCI %d) etype %x\n", - ifp->if_xname, (u_int16_t) RFD_TCI(status), + ifp->if_xname, (uint16_t) RFD_TCI(status), etype); } #endif diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 364feed1731..635d765111f 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tl.c,v 1.113 2019/04/24 08:54:35 msaitoh Exp $ */ +/* $NetBSD: if_tl.c,v 1.114 2019/05/23 10:51:39 msaitoh Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.113 2019/04/24 08:54:35 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.114 2019/05/23 10:51:39 msaitoh Exp $"); #undef TLDEBUG #define TL_PRIV_STATS @@ -206,11 +206,11 @@ static const struct tl_product_desc tl_compaq_products[] = { "Compaq Netelligent 10 T/2 UTP/Coax" }, { PCI_PRODUCT_COMPAQ_IntNF3P, TLPHY_MEDIA_10_2, "Compaq Integrated NetFlex 3/P" }, - { PCI_PRODUCT_COMPAQ_IntPL100TX, TLPHY_MEDIA_10_2|TLPHY_MEDIA_NO_10_T, + { PCI_PRODUCT_COMPAQ_IntPL100TX, TLPHY_MEDIA_10_2 |TLPHY_MEDIA_NO_10_T, "Compaq ProLiant Integrated Netelligent 10/100 TX" }, - { PCI_PRODUCT_COMPAQ_DPNet100TX, TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T, + { PCI_PRODUCT_COMPAQ_DPNet100TX, TLPHY_MEDIA_10_5 |TLPHY_MEDIA_NO_10_T, "Compaq Dual Port Netelligent 10/100 TX" }, - { PCI_PRODUCT_COMPAQ_DP4000, TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T, + { PCI_PRODUCT_COMPAQ_DP4000, TLPHY_MEDIA_10_5 | TLPHY_MEDIA_NO_10_T, "Compaq Deskpro 4000 5233MMX" }, { PCI_PRODUCT_COMPAQ_NF3P_BNC, TLPHY_MEDIA_10_2, "Compaq NetFlex 3/P w/ BNC" }, @@ -283,6 +283,7 @@ tl_pci_attach(device_t parent, device_t self, void *aux) struct pci_attach_args * const pa = (struct pci_attach_args *)aux; const struct tl_product_desc *tp; struct ifnet * const ifp = &sc->tl_if; + struct mii_data * const mii = &sc->tl_mii; bus_space_tag_t iot, memt; bus_space_handle_t ioh, memh; pci_intr_handle_t intrhandle; @@ -425,20 +426,19 @@ tl_pci_attach(device_t parent, device_t self, void *aux) * 10baseT. By ignoring the instance, it allows us to not have * to specify it on the command line when switching media. */ - sc->tl_mii.mii_ifp = ifp; - sc->tl_mii.mii_readreg = tl_mii_read; - sc->tl_mii.mii_writereg = tl_mii_write; - sc->tl_mii.mii_statchg = tl_statchg; - sc->tl_ec.ec_mii = &sc->tl_mii; - ifmedia_init(&sc->tl_mii.mii_media, IFM_IMASK, tl_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = tl_mii_read; + mii->mii_writereg = tl_mii_write; + mii->mii_statchg = tl_statchg; + sc->tl_ec.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, tl_mediachange, ether_mediastatus); - mii_attach(self, &sc->tl_mii, 0xffffffff, MII_PHY_ANY, - MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->tl_mii.mii_phys) == NULL) { - ifmedia_add(&sc->tl_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->tl_mii.mii_media, IFM_ETHER|IFM_NONE); + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->tl_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); /* * We can support 802.1Q VLAN-sized frames. @@ -632,9 +632,9 @@ tl_init(struct ifnet *ifp) /* Pre-allocate receivers mbuf, make the lists */ sc->Rx_list = malloc(sizeof(struct Rx_list) * TL_NBUF, M_DEVBUF, - M_NOWAIT|M_ZERO); + M_NOWAIT | M_ZERO); sc->Tx_list = malloc(sizeof(struct Tx_list) * TL_NBUF, M_DEVBUF, - M_NOWAIT|M_ZERO); + M_NOWAIT | M_ZERO); if (sc->Rx_list == NULL || sc->Tx_list == NULL) { errstring = "out of memory for lists"; error = ENOMEM; @@ -976,7 +976,7 @@ tl_i2cbb_set_bits(void *cookie, uint32_t bits) uint8_t reg; reg = tl_intreg_read_byte(sc, TL_INT_NET + TL_INT_NetSio); - reg = (reg & ~(TL_NETSIO_EDATA|TL_NETSIO_ECLOCK)) | bits; + reg = (reg & ~(TL_NETSIO_EDATA | TL_NETSIO_ECLOCK)) | bits; tl_intreg_write_byte(sc, TL_INT_NET + TL_INT_NetSio, reg); } @@ -1022,12 +1022,12 @@ tl_intr(void *v) #endif /* disable interrupts */ TL_HR_WRITE(sc, TL_HOST_CMD, HOST_CMD_IntOff); - switch(int_type & TL_INTR_MASK) { + switch (int_type & TL_INTR_MASK) { case TL_INTR_RxEOF: bus_dmamap_sync(sc->tl_dmatag, sc->Rx_dmamap, 0, sizeof(struct tl_Rx_list) * TL_NBUF, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - while(le32toh(sc->active_Rx->hw_list->stat) & + while (le32toh(sc->active_Rx->hw_list->stat) & TL_RX_CSTAT_CPLT) { /* dequeue and requeue at end of list */ ack++; @@ -1130,7 +1130,8 @@ tl_intr(void *v) sizeof(struct tl_Tx_list) * TL_NBUF, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); while ((Tx = sc->active_Tx) != NULL) { - if((le32toh(Tx->hw_list->stat) & TL_TX_CSTAT_CPLT) == 0) + if ((le32toh(Tx->hw_list->stat) & TL_TX_CSTAT_CPLT) + == 0) break; ack++; #ifdef TLDEBUG_TX @@ -1255,7 +1256,7 @@ tl_ifstart(struct ifnet *ifp) int segment, size; int again, error; - if ((sc->tl_if.if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING) + if ((sc->tl_if.if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; txloop: /* If we don't have more space ... */ @@ -1607,8 +1608,8 @@ tl_multicast_hash(uint8_t *a) { int hash; -#define DA(addr,bit) (addr[5 - (bit / 8)] & (1 << (bit % 8))) -#define xor8(a,b,c,d,e,f,g,h) \ +#define DA(addr, bit) (addr[5 - (bit / 8)] & (1 << (bit % 8))) +#define xor8(a, b, c, d, e, f, g, h) \ (((a != 0) + (b != 0) + (c != 0) + (d != 0) + \ (e != 0) + (f != 0) + (g != 0) + (h != 0)) & 1) diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c index 8b19bd763d4..0b3dd06b3e3 100644 --- a/sys/dev/pci/if_vte.c +++ b/sys/dev/pci/if_vte.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vte.c,v 1.23 2019/02/05 06:17:03 msaitoh Exp $ */ +/* $NetBSD: if_vte.c,v 1.24 2019/05/23 10:51:39 msaitoh Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. All rights reserved. @@ -55,7 +55,7 @@ /* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.23 2019/02/05 06:17:03 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.24 2019/05/23 10:51:39 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -165,6 +165,7 @@ vte_attach(device_t parent, device_t self, void *aux) struct vte_softc *sc = device_private(self); struct pci_attach_args * const pa = (struct pci_attach_args *)aux; struct ifnet * const ifp = &sc->vte_if; + struct mii_data * const mii = &sc->vte_mii; int h_valid; pcireg_t reg, csr; pci_intr_handle_t intrhandle; @@ -237,20 +238,20 @@ vte_attach(device_t parent, device_t self, void *aux) aprint_normal_dev(self, "interrupting at %s\n", intrstr); sc->vte_if.if_softc = sc; - sc->vte_mii.mii_ifp = ifp; - sc->vte_mii.mii_readreg = vte_miibus_readreg; - sc->vte_mii.mii_writereg = vte_miibus_writereg; - sc->vte_mii.mii_statchg = vte_miibus_statchg; - sc->vte_ec.ec_mii = &sc->vte_mii; - ifmedia_init(&sc->vte_mii.mii_media, IFM_IMASK, vte_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = vte_miibus_readreg; + mii->mii_writereg = vte_miibus_writereg; + mii->mii_statchg = vte_miibus_statchg; + sc->vte_ec.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, vte_mediachange, ether_mediastatus); - mii_attach(self, &sc->vte_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->vte_mii.mii_phys) == NULL) { - ifmedia_add(&sc->vte_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->vte_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->vte_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); /* * We can support 802.1Q VLAN-sized frames. @@ -1603,7 +1604,8 @@ vte_rxfilter(struct vte_softc *sc) ETHER_FIRST_MULTI(step, &sc->vte_ec, enm); nperf = 0; while (enm != NULL) { - if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN) != 0) { + if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN) + != 0) { sc->vte_if.if_flags |= IFF_ALLMULTI; mcr |= MCR0_MULTICAST; mchash[0] = 0xFFFF; diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c index 3787a3223af..ec9100e0005 100644 --- a/sys/dev/pcmcia/if_xi.c +++ b/sys/dev/pcmcia/if_xi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_xi.c,v 1.87 2019/04/22 08:36:03 msaitoh Exp $ */ +/* $NetBSD: if_xi.c,v 1.88 2019/05/23 10:51:39 msaitoh Exp $ */ /* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */ /* @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.87 2019/04/22 08:36:03 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.88 2019/05/23 10:51:39 msaitoh Exp $"); #include "opt_inet.h" @@ -133,7 +133,7 @@ int xidebug = 0; STATIC int xi_enable(struct xi_softc *); STATIC void xi_disable(struct xi_softc *); STATIC void xi_cycle_power(struct xi_softc *); -STATIC int xi_ether_ioctl(struct ifnet *, u_long cmd, void *); +STATIC int xi_ether_ioctl(struct ifnet *, u_long, void *); STATIC void xi_full_reset(struct xi_softc *); STATIC void xi_init(struct xi_softc *); STATIC int xi_ioctl(struct ifnet *, u_long, void *); @@ -152,6 +152,7 @@ void xi_attach(struct xi_softc *sc, uint8_t *myea) { struct ifnet *ifp = &sc->sc_ethercom.ec_if; + struct mii_data * const mii = &sc->sc_mii; #ifdef XIDEBUG uint16_t bmsr; #endif @@ -201,7 +202,7 @@ xi_attach(struct xi_softc *sc, uint8_t *myea) /* Reset and initialize the card. */ xi_full_reset(sc); - printf("%s: MAC address %s\n", device_xname(sc->sc_dev), ether_sprintf(myea)); + device_printf(sc->sc_dev, "MAC address %s\n", ether_sprintf(myea)); ifp = &sc->sc_ethercom.ec_if; /* Initialize the ifnet structure. */ @@ -224,24 +225,22 @@ xi_attach(struct xi_softc *sc, uint8_t *myea) /* * Initialize our media structures and probe the MII. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = xi_mdi_read; - sc->sc_mii.mii_writereg = xi_mdi_write; - sc->sc_mii.mii_statchg = xi_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, 0, xi_mediachange, - ether_mediastatus); + mii->mii_ifp = ifp; + mii->mii_readreg = xi_mdi_read; + mii->mii_writereg = xi_mdi_write; + mii->mii_statchg = xi_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, 0, xi_mediachange, ether_mediastatus); #ifdef XIDEBUG xi_mdi_read(sc->sc_dev, 0, 1, &bmsr); DPRINTF(XID_MII | XID_CONFIG, ("xi: bmsr %x\n", bmsr)); #endif - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER | IFM_AUTO, 0, - NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_AUTO); + if (LIST_FIRST(&mii->mii_phys) == NULL) + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_AUTO, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dev), RND_TYPE_NET, RND_FLAG_DEFAULT); @@ -885,7 +884,7 @@ xi_ioctl(struct ifnet *ifp, u_long cmd, void *data) if ((error = ifioctl_common(ifp, cmd, data)) != 0) break; /* XXX re-use ether_ioctl() */ - switch (ifp->if_flags & (IFF_UP|IFF_RUNNING)) { + switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) { case IFF_RUNNING: /* * If interface is marked down and it is running, @@ -904,7 +903,7 @@ xi_ioctl(struct ifnet *ifp, u_long cmd, void *data) break; xi_init(sc); break; - case IFF_UP|IFF_RUNNING: + case IFF_UP | IFF_RUNNING: /* * Reset the interface to pick up changes in any * other flags that affect hardware registers. @@ -1034,7 +1033,7 @@ done: x = SWC1_IND_ADDR; if (ifp->if_flags & IFF_PROMISC) x |= SWC1_PROMISC; - if (ifp->if_flags & (IFF_ALLMULTI|IFF_PROMISC)) + if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) x |= SWC1_MCAST_PROM; if (!LIST_FIRST(&sc->sc_mii.mii_phys)) x |= SWC1_AUTO_MEDIA; |
