i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtl8139, ipro1000: Don't shadow "ticks" global variable.

Browse Source 
The next commit will make it a "#define" instead of an "extern".
I've already submitted this for upstream inclusion in FreeBSD.

Sorry for the noisy diff with all the whitespace changes...
This commit is contained in:
Augustin Cavalier
2018-10-31 19:03:39 -04:00
parent 18033c30dc
commit 04b07407ef
3 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/if_em.c
+90 -90
View File
@@ -1,31 +1,31 @@
/****************************************************************************** /******************************************************************************
Copyright (c) 2001-2015, Intel Corporation Copyright (c) 2001-2015, Intel Corporation
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
3. Neither the name of the Intel Corporation nor the names of its 3. Neither the name of the Intel Corporation nor the names of its
contributors may be used to endorse or promote products derived from contributors may be used to endorse or promote products derived from
this software without specific prior written permission. this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
@@ -570,7 +570,7 @@ em_attach(device_t dev)
/* /*
** For ICH8 and family we need to ** For ICH8 and family we need to
** map the flash memory, and this ** map the flash memory, and this
** must happen after the MAC is ** must happen after the MAC is
** identified ** identified
*/ */
if ((hw->mac.type == e1000_ich8lan) || if ((hw->mac.type == e1000_ich8lan) ||
@@ -697,7 +697,7 @@ em_attach(device_t dev)
*/ */
hw->mac.report_tx_early = 1; hw->mac.report_tx_early = 1;
/* /*
** Get queue/ring memory ** Get queue/ring memory
*/ */
if (em_allocate_queues(adapter)) { if (em_allocate_queues(adapter)) {
@@ -798,7 +798,7 @@ em_attach(device_t dev)
adapter->vlan_attach = EVENTHANDLER_REGISTER(vlan_config, adapter->vlan_attach = EVENTHANDLER_REGISTER(vlan_config,
em_register_vlan, adapter, EVENTHANDLER_PRI_FIRST); em_register_vlan, adapter, EVENTHANDLER_PRI_FIRST);
adapter->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig, adapter->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig,
em_unregister_vlan, adapter, EVENTHANDLER_PRI_FIRST); em_unregister_vlan, adapter, EVENTHANDLER_PRI_FIRST);
em_add_hw_stats(adapter); em_add_hw_stats(adapter);
@@ -883,7 +883,7 @@ em_detach(device_t dev)
if (adapter->vlan_attach != NULL) if (adapter->vlan_attach != NULL)
EVENTHANDLER_DEREGISTER(vlan_config, adapter->vlan_attach); EVENTHANDLER_DEREGISTER(vlan_config, adapter->vlan_attach);
if (adapter->vlan_detach != NULL) if (adapter->vlan_detach != NULL)
EVENTHANDLER_DEREGISTER(vlan_unconfig, adapter->vlan_detach); EVENTHANDLER_DEREGISTER(vlan_unconfig, adapter->vlan_detach);
ether_ifdetach(adapter->ifp); ether_ifdetach(adapter->ifp);
callout_drain(&adapter->timer); callout_drain(&adapter->timer);
@@ -1035,7 +1035,7 @@ em_start(if_t ifp)
} }
#else /* EM_MULTIQUEUE */ #else /* EM_MULTIQUEUE */
/********************************************************************* /*********************************************************************
* Multiqueue Transmit routines * Multiqueue Transmit routines
* *
* em_mq_start is called by the stack to initiate a transmit. * em_mq_start is called by the stack to initiate a transmit.
* however, if busy the driver can queue the request rather * however, if busy the driver can queue the request rather
@@ -1066,7 +1066,7 @@ em_mq_start(if_t ifp, struct mbuf *m)
if (EM_TX_TRYLOCK(txr)) { if (EM_TX_TRYLOCK(txr)) {
em_mq_start_locked(ifp, txr); em_mq_start_locked(ifp, txr);
EM_TX_UNLOCK(txr); EM_TX_UNLOCK(txr);
} else } else
taskqueue_enqueue(txr->tq, &txr->tx_task); taskqueue_enqueue(txr->tq, &txr->tx_task);
return (0); return (0);
@@ -1093,7 +1093,7 @@ em_mq_start_locked(if_t ifp, struct tx_ring *txr)
/* It was freed, move forward */ /* It was freed, move forward */
drbr_advance(ifp, txr->br); drbr_advance(ifp, txr->br);
} else { } else {
/* /*
* Still have one left, it may not be * Still have one left, it may not be
* the same since the transmit function * the same since the transmit function
* may have changed it. * may have changed it.
@@ -1410,7 +1410,7 @@ em_init_locked(struct adapter *adapter)
if_clearhwassist(ifp); if_clearhwassist(ifp);
if (if_getcapenable(ifp) & IFCAP_TXCSUM) if (if_getcapenable(ifp) & IFCAP_TXCSUM)
if_sethwassistbits(ifp, CSUM_TCP | CSUM_UDP, 0); if_sethwassistbits(ifp, CSUM_TCP | CSUM_UDP, 0);
/* /*
** There have proven to be problems with TSO when not ** There have proven to be problems with TSO when not
** at full gigabit speed, so disable the assist automatically ** at full gigabit speed, so disable the assist automatically
** when at lower speeds. -jfv ** when at lower speeds. -jfv
@@ -1561,7 +1561,7 @@ em_poll(if_t ifp, enum poll_cmd cmd, int count)
/********************************************************************* /*********************************************************************
* *
* Fast Legacy/MSI Combined Interrupt Service routine * Fast Legacy/MSI Combined Interrupt Service routine
* *
*********************************************************************/ *********************************************************************/
static int static int
@@ -1953,7 +1953,7 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
* which also has similar restrictions. * which also has similar restrictions.
*/ */
if (do_tso || m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD) { if (do_tso || m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD) {
if (do_tso || (m_head->m_next != NULL && if (do_tso || (m_head->m_next != NULL &&
m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD)) { m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD)) {
if (M_WRITABLE(*m_headp) == 0) { if (M_WRITABLE(*m_headp) == 0) {
m_head = m_dup(*m_headp, M_NOWAIT); m_head = m_dup(*m_headp, M_NOWAIT);
@@ -2162,7 +2162,7 @@ retry:
if (++i == adapter->num_tx_desc) if (++i == adapter->num_tx_desc)
i = 0; i = 0;
/* Now make the sentinel */ /* Now make the sentinel */
txr->tx_avail--; txr->tx_avail--;
ctxd = &txr->tx_base[i]; ctxd = &txr->tx_base[i];
tx_buffer = &txr->tx_buffers[i]; tx_buffer = &txr->tx_buffers[i];
@@ -2289,7 +2289,7 @@ em_set_multi(struct adapter *adapter)
mta = adapter->mta; mta = adapter->mta;
bzero(mta, sizeof(u8) * ETH_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES); bzero(mta, sizeof(u8) * ETH_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES);
if (adapter->hw.mac.type == e1000_82542 && if (adapter->hw.mac.type == e1000_82542 &&
adapter->hw.revision_id == E1000_REVISION_2) { adapter->hw.revision_id == E1000_REVISION_2) {
reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL);
if (adapter->hw.bus.pci_cmd_word & CMD_MEM_WRT_INVALIDATE) if (adapter->hw.bus.pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
@@ -2308,7 +2308,7 @@ em_set_multi(struct adapter *adapter)
} else } else
e1000_update_mc_addr_list(&adapter->hw, mta, mcnt); e1000_update_mc_addr_list(&adapter->hw, mta, mcnt);
if (adapter->hw.mac.type == e1000_82542 && if (adapter->hw.mac.type == e1000_82542 &&
adapter->hw.revision_id == E1000_REVISION_2) { adapter->hw.revision_id == E1000_REVISION_2) {
reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL);
reg_rctl &= ~E1000_RCTL_RST; reg_rctl &= ~E1000_RCTL_RST;
@@ -2361,7 +2361,7 @@ em_local_timer(void *arg)
trigger = E1000_ICS_RXDMT0; trigger = E1000_ICS_RXDMT0;
/* /*
** Check on the state of the TX queue(s), this ** Check on the state of the TX queue(s), this
** can be done without the lock because its RO ** can be done without the lock because its RO
** and the HUNG state will be static if set. ** and the HUNG state will be static if set.
*/ */
@@ -2374,7 +2374,7 @@ em_local_timer(void *arg)
if (txr->tx_avail <= EM_MAX_SCATTER) if (txr->tx_avail <= EM_MAX_SCATTER)
taskqueue_enqueue(txr->tq, &txr->tx_task); taskqueue_enqueue(txr->tq, &txr->tx_task);
} }
callout_reset(&adapter->timer, hz, em_local_timer, adapter); callout_reset(&adapter->timer, hz, em_local_timer, adapter);
#ifndef DEVICE_POLLING #ifndef DEVICE_POLLING
/* Trigger an RX interrupt to guarantee mbuf refresh */ /* Trigger an RX interrupt to guarantee mbuf refresh */
@@ -2616,7 +2616,7 @@ em_allocate_legacy(struct adapter *adapter)
adapter->tq = NULL; adapter->tq = NULL;
return (error); return (error);
} }
return (0); return (0);
} }
@@ -2871,7 +2871,7 @@ em_setup_msix(struct adapter *adapter)
"Unable to map MSIX table \n"); "Unable to map MSIX table \n");
goto msi; goto msi;
} }
val = pci_msix_count(dev); val = pci_msix_count(dev);
#ifdef EM_MULTIQUEUE #ifdef EM_MULTIQUEUE
/* We need 5 vectors in the multiqueue case */ /* We need 5 vectors in the multiqueue case */
@@ -2922,7 +2922,7 @@ msi:
if (pci_alloc_msi(dev, &val) == 0) { if (pci_alloc_msi(dev, &val) == 0) {
device_printf(adapter->dev, "Using an MSI interrupt\n"); device_printf(adapter->dev, "Using an MSI interrupt\n");
return (val); return (val);
} }
/* Should only happen due to manual configuration */ /* Should only happen due to manual configuration */
device_printf(adapter->dev,"No MSI/MSIX using a Legacy IRQ\n"); device_printf(adapter->dev,"No MSI/MSIX using a Legacy IRQ\n");
return (0); return (0);
@@ -3019,12 +3019,12 @@ em_flush_desc_rings(struct adapter *adapter)
device_t dev = adapter->dev; device_t dev = adapter->dev;
u16 hang_state; u16 hang_state;
u32 fext_nvm11, tdlen; u32 fext_nvm11, tdlen;
/* First, disable MULR fix in FEXTNVM11 */ /* First, disable MULR fix in FEXTNVM11 */
fext_nvm11 = E1000_READ_REG(hw, E1000_FEXTNVM11); fext_nvm11 = E1000_READ_REG(hw, E1000_FEXTNVM11);
fext_nvm11 |= E1000_FEXTNVM11_DISABLE_MULR_FIX; fext_nvm11 |= E1000_FEXTNVM11_DISABLE_MULR_FIX;
E1000_WRITE_REG(hw, E1000_FEXTNVM11, fext_nvm11); E1000_WRITE_REG(hw, E1000_FEXTNVM11, fext_nvm11);
/* do nothing if we're not in faulty state, or if the queue is empty */ /* do nothing if we're not in faulty state, or if the queue is empty */
tdlen = E1000_READ_REG(hw, E1000_TDLEN(0)); tdlen = E1000_READ_REG(hw, E1000_TDLEN(0));
hang_state = pci_read_config(dev, PCICFG_DESC_RING_STATUS, 2); hang_state = pci_read_config(dev, PCICFG_DESC_RING_STATUS, 2);
@@ -3176,7 +3176,7 @@ em_reset(struct adapter *adapter)
hw->fc.high_water = 0x2800; hw->fc.high_water = 0x2800;
hw->fc.low_water = hw->fc.high_water - 8; hw->fc.low_water = hw->fc.high_water - 8;
break; break;
} }
/* else fall thru */ /* else fall thru */
default: default:
if (hw->mac.type == e1000_80003es2lan) if (hw->mac.type == e1000_80003es2lan)
@@ -3243,7 +3243,7 @@ em_setup_interface(device_t dev, struct adapter *adapter)
if_setstartfn(ifp, em_start); if_setstartfn(ifp, em_start);
if_setsendqlen(ifp, adapter->num_tx_desc - 1); if_setsendqlen(ifp, adapter->num_tx_desc - 1);
if_setsendqready(ifp); if_setsendqready(ifp);
#endif #endif
ether_ifattach(ifp, adapter->hw.mac.addr); ether_ifattach(ifp, adapter->hw.mac.addr);
@@ -3281,7 +3281,7 @@ em_setup_interface(device_t dev, struct adapter *adapter)
if_setcapabilitiesbit(ifp, IFCAP_WOL, 0); if_setcapabilitiesbit(ifp, IFCAP_WOL, 0);
if_setcapenablebit(ifp, IFCAP_WOL_MAGIC, 0); if_setcapenablebit(ifp, IFCAP_WOL_MAGIC, 0);
} }
/* /*
* Specify the media types supported by this adapter and register * Specify the media types supported by this adapter and register
* callbacks to update media and link information * callbacks to update media and link information
@@ -3292,7 +3292,7 @@ em_setup_interface(device_t dev, struct adapter *adapter)
(adapter->hw.phy.media_type == e1000_media_type_internal_serdes)) { (adapter->hw.phy.media_type == e1000_media_type_internal_serdes)) {
u_char fiber_type = IFM_1000_SX; /* default type */ u_char fiber_type = IFM_1000_SX; /* default type */
ifmedia_add(&adapter->media, IFM_ETHER | fiber_type | IFM_FDX, ifmedia_add(&adapter->media, IFM_ETHER | fiber_type | IFM_FDX,
0, NULL); 0, NULL);
ifmedia_add(&adapter->media, IFM_ETHER | fiber_type, 0, NULL); ifmedia_add(&adapter->media, IFM_ETHER | fiber_type, 0, NULL);
} else { } else {
@@ -3445,7 +3445,7 @@ em_allocate_queues(struct adapter *adapter)
* Now set up the TX queues, txconf is needed to handle the * Now set up the TX queues, txconf is needed to handle the
* possibility that things fail midcourse and we need to * possibility that things fail midcourse and we need to
* undo memory gracefully * undo memory gracefully
*/ */
for (i = 0; i < adapter->num_queues; i++, txconf++) { for (i = 0; i < adapter->num_queues; i++, txconf++) {
/* Set up some basics */ /* Set up some basics */
txr = &adapter->tx_rings[i]; txr = &adapter->tx_rings[i];
@@ -3484,7 +3484,7 @@ em_allocate_queues(struct adapter *adapter)
/* /*
* Next the RX queues... * Next the RX queues...
*/ */
rsize = roundup2(adapter->num_rx_desc * rsize = roundup2(adapter->num_rx_desc *
sizeof(union e1000_rx_desc_extended), EM_DBA_ALIGN); sizeof(union e1000_rx_desc_extended), EM_DBA_ALIGN);
for (i = 0; i < adapter->num_queues; i++, rxconf++) { for (i = 0; i < adapter->num_queues; i++, rxconf++) {
@@ -3898,7 +3898,7 @@ em_free_transmit_buffers(struct tx_ring *txr)
* until the previous request completes. This means setting up * until the previous request completes. This means setting up
* a new context effectively disables pipelined Tx data DMA which * a new context effectively disables pipelined Tx data DMA which
* in turn greatly slow down performance to send small sized * in turn greatly slow down performance to send small sized
* frames. * frames.
**********************************************************************/ **********************************************************************/
static void static void
em_transmit_checksum_setup(struct tx_ring *txr, struct mbuf *mp, int ip_off, em_transmit_checksum_setup(struct tx_ring *txr, struct mbuf *mp, int ip_off,
@@ -4029,7 +4029,7 @@ em_transmit_checksum_setup(struct tx_ring *txr, struct mbuf *mp, int ip_off,
TXD->upper_setup.tcp_fields.tucse = htole16(0); TXD->upper_setup.tcp_fields.tucse = htole16(0);
TXD->upper_setup.tcp_fields.tucso = tucso; TXD->upper_setup.tcp_fields.tucso = tucso;
} }
if (offload & CSUM_IP) { if (offload & CSUM_IP) {
txr->last_hw_ipcss = ipcss; txr->last_hw_ipcss = ipcss;
txr->last_hw_ipcso = ipcso; txr->last_hw_ipcso = ipcso;
@@ -4164,7 +4164,7 @@ em_txeof(struct tx_ring *txr)
/* /*
* What this does is get the index of the * What this does is get the index of the
* first descriptor AFTER the EOP of the * first descriptor AFTER the EOP of the
* first packet, that way we can do the * first packet, that way we can do the
* simple comparison on the inner while loop. * simple comparison on the inner while loop.
*/ */
@@ -4233,7 +4233,7 @@ em_txeof(struct tx_ring *txr)
* If we have a minimum free, clear IFF_DRV_OACTIVE * If we have a minimum free, clear IFF_DRV_OACTIVE
* to tell the stack that it is OK to send packets. * to tell the stack that it is OK to send packets.
* Notice that all writes of OACTIVE happen under the * Notice that all writes of OACTIVE happen under the
* TX lock which, with a single queue, guarantees * TX lock which, with a single queue, guarantees
* sanity. * sanity.
*/ */
if (txr->tx_avail >= EM_MAX_SCATTER) { if (txr->tx_avail >= EM_MAX_SCATTER) {
@@ -4712,7 +4712,7 @@ em_initialize_receive_unit(struct adapter *adapter)
E1000_WRITE_REG(hw, E1000_RETA(i), reta); E1000_WRITE_REG(hw, E1000_RETA(i), reta);
} }
E1000_WRITE_REG(hw, E1000_MRQC, E1000_MRQC_RSS_ENABLE_2Q | E1000_WRITE_REG(hw, E1000_MRQC, E1000_MRQC_RSS_ENABLE_2Q |
E1000_MRQC_RSS_FIELD_IPV4_TCP | E1000_MRQC_RSS_FIELD_IPV4_TCP |
E1000_MRQC_RSS_FIELD_IPV4 | E1000_MRQC_RSS_FIELD_IPV4 |
E1000_MRQC_RSS_FIELD_IPV6_TCP_EX | E1000_MRQC_RSS_FIELD_IPV6_TCP_EX |
@@ -4787,7 +4787,7 @@ em_initialize_receive_unit(struct adapter *adapter)
E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl); E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl);
} }
} }
if (adapter->hw.mac.type >= e1000_pch2lan) { if (adapter->hw.mac.type >= e1000_pch2lan) {
if (if_getmtu(ifp) > ETHERMTU) if (if_getmtu(ifp) > ETHERMTU)
e1000_lv_jumbo_workaround_ich8lan(hw, TRUE); e1000_lv_jumbo_workaround_ich8lan(hw, TRUE);
@@ -4822,7 +4822,7 @@ em_initialize_receive_unit(struct adapter *adapter)
* *
* We loop at most count times if count is > 0, or until done if * We loop at most count times if count is > 0, or until done if
* count < 0. * count < 0.
* *
* For polling we also now return the number of cleaned packets * For polling we also now return the number of cleaned packets
*********************************************************************/ *********************************************************************/
static bool static bool
@@ -4910,7 +4910,7 @@ em_rxeof(struct rx_ring *rxr, int count, int *done)
goto skip; goto skip;
#endif #endif
if (status & E1000_RXD_STAT_VP) { if (status & E1000_RXD_STAT_VP) {
if_setvtag(sendmp, if_setvtag(sendmp,
le16toh(cur->wb.upper.vlan)); le16toh(cur->wb.upper.vlan));
sendmp->m_flags |= M_VLANTAG; sendmp->m_flags |= M_VLANTAG;
} }
@@ -5177,7 +5177,7 @@ em_enable_intr(struct adapter *adapter)
if (hw->mac.type == e1000_82574) { if (hw->mac.type == e1000_82574) {
E1000_WRITE_REG(hw, EM_EIAC, EM_MSIX_MASK); E1000_WRITE_REG(hw, EM_EIAC, EM_MSIX_MASK);
ims_mask |= EM_MSIX_MASK; ims_mask |= EM_MSIX_MASK;
} }
E1000_WRITE_REG(hw, E1000_IMS, ims_mask); E1000_WRITE_REG(hw, E1000_IMS, ims_mask);
} }
@@ -5194,7 +5194,7 @@ em_disable_intr(struct adapter *adapter)
/* /*
* Bit of a misnomer, what this really means is * Bit of a misnomer, what this really means is
* to enable OS management of the system... aka * to enable OS management of the system... aka
* to disable special hardware management features * to disable special hardware management features
*/ */
static void static void
em_init_manageability(struct adapter *adapter) em_init_manageability(struct adapter *adapter)
@@ -5525,7 +5525,7 @@ static void
em_led_func(void *arg, int onoff) em_led_func(void *arg, int onoff)
{ {
struct adapter *adapter = arg; struct adapter *adapter = arg;
EM_CORE_LOCK(adapter); EM_CORE_LOCK(adapter);
if (onoff) { if (onoff) {
e1000_setup_led(&adapter->hw); e1000_setup_led(&adapter->hw);
@@ -5649,17 +5649,17 @@ em_update_stats_counters(struct adapter *adapter)
adapter->stats.icrxoc += E1000_READ_REG(&adapter->hw, E1000_ICRXOC); adapter->stats.icrxoc += E1000_READ_REG(&adapter->hw, E1000_ICRXOC);
if (adapter->hw.mac.type >= e1000_82543) { if (adapter->hw.mac.type >= e1000_82543) {
adapter->stats.algnerrc += adapter->stats.algnerrc +=
E1000_READ_REG(&adapter->hw, E1000_ALGNERRC); E1000_READ_REG(&adapter->hw, E1000_ALGNERRC);
adapter->stats.rxerrc += adapter->stats.rxerrc +=
E1000_READ_REG(&adapter->hw, E1000_RXERRC); E1000_READ_REG(&adapter->hw, E1000_RXERRC);
adapter->stats.tncrs += adapter->stats.tncrs +=
E1000_READ_REG(&adapter->hw, E1000_TNCRS); E1000_READ_REG(&adapter->hw, E1000_TNCRS);
adapter->stats.cexterr += adapter->stats.cexterr +=
E1000_READ_REG(&adapter->hw, E1000_CEXTERR); E1000_READ_REG(&adapter->hw, E1000_CEXTERR);
adapter->stats.tsctc += adapter->stats.tsctc +=
E1000_READ_REG(&adapter->hw, E1000_TSCTC); E1000_READ_REG(&adapter->hw, E1000_TSCTC);
adapter->stats.tsctfc += adapter->stats.tsctfc +=
E1000_READ_REG(&adapter->hw, E1000_TSCTFC); E1000_READ_REG(&adapter->hw, E1000_TSCTFC);
} }
} }
@@ -5723,18 +5723,18 @@ em_add_hw_stats(struct adapter *adapter)
#define QUEUE_NAME_LEN 32 #define QUEUE_NAME_LEN 32
char namebuf[QUEUE_NAME_LEN]; char namebuf[QUEUE_NAME_LEN];
/* Driver Statistics */ /* Driver Statistics */
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "dropped", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "dropped",
CTLFLAG_RD, &adapter->dropped_pkts, CTLFLAG_RD, &adapter->dropped_pkts,
"Driver dropped packets"); "Driver dropped packets");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_irq", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_irq",
CTLFLAG_RD, &adapter->link_irq, CTLFLAG_RD, &adapter->link_irq,
"Link MSIX IRQ Handled"); "Link MSIX IRQ Handled");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "mbuf_defrag_fail", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "mbuf_defrag_fail",
CTLFLAG_RD, &adapter->mbuf_defrag_failed, CTLFLAG_RD, &adapter->mbuf_defrag_failed,
"Defragmenting mbuf chain failed"); "Defragmenting mbuf chain failed");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "tx_dma_fail", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "tx_dma_fail",
CTLFLAG_RD, &adapter->no_tx_dma_setup, CTLFLAG_RD, &adapter->no_tx_dma_setup,
"Driver tx dma failure in xmit"); "Driver tx dma failure in xmit");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "rx_overruns", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "rx_overruns",
@@ -5743,7 +5743,7 @@ em_add_hw_stats(struct adapter *adapter)
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "watchdog_timeouts", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "watchdog_timeouts",
CTLFLAG_RD, &adapter->watchdog_events, CTLFLAG_RD, &adapter->watchdog_events,
"Watchdog timeouts"); "Watchdog timeouts");
SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "device_control", SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "device_control",
CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_CTRL, CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_CTRL,
em_sysctl_reg_handler, "IU", em_sysctl_reg_handler, "IU",
@@ -5755,7 +5755,7 @@ em_add_hw_stats(struct adapter *adapter)
SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_high_water", SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_high_water",
CTLFLAG_RD, &adapter->hw.fc.high_water, 0, CTLFLAG_RD, &adapter->hw.fc.high_water, 0,
"Flow Control High Watermark"); "Flow Control High Watermark");
SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_low_water", SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_low_water",
CTLFLAG_RD, &adapter->hw.fc.low_water, 0, CTLFLAG_RD, &adapter->hw.fc.low_water, 0,
"Flow Control Low Watermark"); "Flow Control Low Watermark");
@@ -5765,12 +5765,12 @@ em_add_hw_stats(struct adapter *adapter)
CTLFLAG_RD, NULL, "TX Queue Name"); CTLFLAG_RD, NULL, "TX Queue Name");
queue_list = SYSCTL_CHILDREN(queue_node); queue_list = SYSCTL_CHILDREN(queue_node);
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_head", SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_head",
CTLTYPE_UINT | CTLFLAG_RD, adapter, CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_TDH(txr->me), E1000_TDH(txr->me),
em_sysctl_reg_handler, "IU", em_sysctl_reg_handler, "IU",
"Transmit Descriptor Head"); "Transmit Descriptor Head");
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_tail", SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_tail",
CTLTYPE_UINT | CTLFLAG_RD, adapter, CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_TDT(txr->me), E1000_TDT(txr->me),
em_sysctl_reg_handler, "IU", em_sysctl_reg_handler, "IU",
@@ -5778,7 +5778,7 @@ em_add_hw_stats(struct adapter *adapter)
SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "tx_irq", SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "tx_irq",
CTLFLAG_RD, &txr->tx_irq, CTLFLAG_RD, &txr->tx_irq,
"Queue MSI-X Transmit Interrupts"); "Queue MSI-X Transmit Interrupts");
SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "no_desc_avail", SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "no_desc_avail",
CTLFLAG_RD, &txr->no_desc_avail, CTLFLAG_RD, &txr->no_desc_avail,
"Queue No Descriptor Available"); "Queue No Descriptor Available");
@@ -5787,12 +5787,12 @@ em_add_hw_stats(struct adapter *adapter)
CTLFLAG_RD, NULL, "RX Queue Name"); CTLFLAG_RD, NULL, "RX Queue Name");
queue_list = SYSCTL_CHILDREN(queue_node); queue_list = SYSCTL_CHILDREN(queue_node);
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head", SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head",
CTLTYPE_UINT | CTLFLAG_RD, adapter, CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_RDH(rxr->me), E1000_RDH(rxr->me),
em_sysctl_reg_handler, "IU", em_sysctl_reg_handler, "IU",
"Receive Descriptor Head"); "Receive Descriptor Head");
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_tail", SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_tail",
CTLTYPE_UINT | CTLFLAG_RD, adapter, CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_RDT(rxr->me), E1000_RDT(rxr->me),
em_sysctl_reg_handler, "IU", em_sysctl_reg_handler, "IU",
@@ -5804,7 +5804,7 @@ em_add_hw_stats(struct adapter *adapter)
/* MAC stats get their own sub node */ /* MAC stats get their own sub node */
stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac_stats", stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac_stats",
CTLFLAG_RD, NULL, "Statistics"); CTLFLAG_RD, NULL, "Statistics");
stat_list = SYSCTL_CHILDREN(stat_node); stat_list = SYSCTL_CHILDREN(stat_node);
@@ -5908,13 +5908,13 @@ em_add_hw_stats(struct adapter *adapter)
CTLFLAG_RD, &adapter->stats.prc1522, CTLFLAG_RD, &adapter->stats.prc1522,
"1023-1522 byte frames received"); "1023-1522 byte frames received");
SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_recvd", SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_recvd",
CTLFLAG_RD, &adapter->stats.gorc, CTLFLAG_RD, &adapter->stats.gorc,
"Good Octets Received"); "Good Octets Received");
/* Packet Transmission Stats */ /* Packet Transmission Stats */
SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_txd", SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_txd",
CTLFLAG_RD, &adapter->stats.gotc, CTLFLAG_RD, &adapter->stats.gotc,
"Good Octets Transmitted"); "Good Octets Transmitted");
SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_txd", SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_txd",
CTLFLAG_RD, &adapter->stats.tpt, CTLFLAG_RD, &adapter->stats.tpt,
"Total Packets Transmitted"); "Total Packets Transmitted");
@@ -5955,7 +5955,7 @@ em_add_hw_stats(struct adapter *adapter)
/* Interrupt Stats */ /* Interrupt Stats */
int_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "interrupts", int_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "interrupts",
CTLFLAG_RD, NULL, "Interrupt Statistics"); CTLFLAG_RD, NULL, "Interrupt Statistics");
int_list = SYSCTL_CHILDREN(int_node); int_list = SYSCTL_CHILDREN(int_node);
@@ -6053,7 +6053,7 @@ em_sysctl_int_delay(SYSCTL_HANDLER_ARGS)
struct em_int_delay_info *info; struct em_int_delay_info *info;
struct adapter *adapter; struct adapter *adapter;
u32 regval; u32 regval;
int error, usecs, ticks; int error, usecs, _ticks;
info = (struct em_int_delay_info *)arg1; info = (struct em_int_delay_info *)arg1;
usecs = info->value; usecs = info->value;
@@ -6063,21 +6063,21 @@ em_sysctl_int_delay(SYSCTL_HANDLER_ARGS)
if (usecs < 0 || usecs > EM_TICKS_TO_USECS(65535)) if (usecs < 0 || usecs > EM_TICKS_TO_USECS(65535))
return (EINVAL); return (EINVAL);
info->value = usecs; info->value = usecs;
ticks = EM_USECS_TO_TICKS(usecs); _ticks = EM_USECS_TO_TICKS(usecs);
if (info->offset == E1000_ITR) /* units are 256ns here */ if (info->offset == E1000_ITR) /* units are 256ns here */
ticks *= 4; _ticks *= 4;
adapter = info->adapter; adapter = info->adapter;
EM_CORE_LOCK(adapter); EM_CORE_LOCK(adapter);
regval = E1000_READ_OFFSET(&adapter->hw, info->offset); regval = E1000_READ_OFFSET(&adapter->hw, info->offset);
regval = (regval & ~0xffff) | (ticks & 0xffff); regval = (regval & ~0xffff) | (_ticks & 0xffff);
/* Handle a few special cases. */ /* Handle a few special cases. */
switch (info->offset) { switch (info->offset) {
case E1000_RDTR: case E1000_RDTR:
break; break;
case E1000_TIDV: case E1000_TIDV:
if (ticks == 0) { if (_ticks == 0) {
adapter->txd_cmd &= ~E1000_TXD_CMD_IDE; adapter->txd_cmd &= ~E1000_TXD_CMD_IDE;
/* Don't write 0 into the TIDV register. */ /* Don't write 0 into the TIDV register. */
regval++; regval++;
@@ -6125,16 +6125,16 @@ em_set_sysctl_value(struct adapter *adapter, const char *name,
*/ */
static int static int
em_set_flowcntl(SYSCTL_HANDLER_ARGS) em_set_flowcntl(SYSCTL_HANDLER_ARGS)
{ {
int error; int error;
static int input = 3; /* default is full */ static int input = 3; /* default is full */
struct adapter *adapter = (struct adapter *) arg1; struct adapter *adapter = (struct adapter *) arg1;
error = sysctl_handle_int(oidp, &input, 0, req); error = sysctl_handle_int(oidp, &input, 0, req);
if ((error) || (req->newptr == NULL)) if ((error) || (req->newptr == NULL))
return (error); return (error);
if (input == adapter->fc) /* no change? */ if (input == adapter->fc) /* no change? */
return (error); return (error);
src/add-ons/kernel/drivers/network/ipro1000/dev/e1000/if_lem.c
+73 -73
View File
@@ -1,31 +1,31 @@
/****************************************************************************** /******************************************************************************
Copyright (c) 2001-2015, Intel Corporation Copyright (c) 2001-2015, Intel Corporation
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
3. Neither the name of the Intel Corporation nor the names of its 3. Neither the name of the Intel Corporation nor the names of its
contributors may be used to endorse or promote products derived from contributors may be used to endorse or promote products derived from
this software without specific prior written permission. this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
@@ -623,7 +623,7 @@ lem_attach(device_t dev)
error = ENOMEM; error = ENOMEM;
goto err_tx_desc; goto err_tx_desc;
} }
adapter->tx_desc_base = adapter->tx_desc_base =
(struct e1000_tx_desc *)adapter->txdma.dma_vaddr; (struct e1000_tx_desc *)adapter->txdma.dma_vaddr;
/* /*
@@ -745,7 +745,7 @@ lem_attach(device_t dev)
adapter->vlan_attach = EVENTHANDLER_REGISTER(vlan_config, adapter->vlan_attach = EVENTHANDLER_REGISTER(vlan_config,
lem_register_vlan, adapter, EVENTHANDLER_PRI_FIRST); lem_register_vlan, adapter, EVENTHANDLER_PRI_FIRST);
adapter->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig, adapter->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig,
lem_unregister_vlan, adapter, EVENTHANDLER_PRI_FIRST); lem_unregister_vlan, adapter, EVENTHANDLER_PRI_FIRST);
lem_add_hw_stats(adapter); lem_add_hw_stats(adapter);
@@ -843,7 +843,7 @@ lem_detach(device_t dev)
if (adapter->vlan_attach != NULL) if (adapter->vlan_attach != NULL)
EVENTHANDLER_DEREGISTER(vlan_config, adapter->vlan_attach); EVENTHANDLER_DEREGISTER(vlan_config, adapter->vlan_attach);
if (adapter->vlan_detach != NULL) if (adapter->vlan_detach != NULL)
EVENTHANDLER_DEREGISTER(vlan_unconfig, adapter->vlan_detach); EVENTHANDLER_DEREGISTER(vlan_unconfig, adapter->vlan_detach);
ether_ifdetach(adapter->ifp); ether_ifdetach(adapter->ifp);
callout_drain(&adapter->timer); callout_drain(&adapter->timer);
@@ -1117,7 +1117,7 @@ lem_ioctl(if_t ifp, u_long command, caddr_t data)
EM_CORE_LOCK(adapter); EM_CORE_LOCK(adapter);
lem_disable_intr(adapter); lem_disable_intr(adapter);
lem_set_multi(adapter); lem_set_multi(adapter);
if (adapter->hw.mac.type == e1000_82542 && if (adapter->hw.mac.type == e1000_82542 &&
adapter->hw.revision_id == E1000_REVISION_2) { adapter->hw.revision_id == E1000_REVISION_2) {
lem_initialize_receive_unit(adapter); lem_initialize_receive_unit(adapter);
} }
@@ -1259,7 +1259,7 @@ lem_init_locked(struct adapter *adapter)
INIT_DEBUGOUT1("lem_init: pba=%dK",pba); INIT_DEBUGOUT1("lem_init: pba=%dK",pba);
E1000_WRITE_REG(&adapter->hw, E1000_PBA, pba); E1000_WRITE_REG(&adapter->hw, E1000_PBA, pba);
/* Get the latest mac address, User can use a LAA */ /* Get the latest mac address, User can use a LAA */
bcopy(if_getlladdr(adapter->ifp), adapter->hw.mac.addr, bcopy(if_getlladdr(adapter->ifp), adapter->hw.mac.addr,
ETHER_ADDR_LEN); ETHER_ADDR_LEN);
@@ -1355,7 +1355,7 @@ lem_init(void *arg)
#ifdef DEVICE_POLLING #ifdef DEVICE_POLLING
/********************************************************************* /*********************************************************************
* *
* Legacy polling routine * Legacy polling routine
* *
*********************************************************************/ *********************************************************************/
static int static int
@@ -1395,7 +1395,7 @@ lem_poll(if_t ifp, enum poll_cmd cmd, int count)
/********************************************************************* /*********************************************************************
* *
* Legacy Interrupt Service routine * Legacy Interrupt Service routine
* *
*********************************************************************/ *********************************************************************/
static void static void
@@ -1491,7 +1491,7 @@ lem_handle_rxtx(void *context, int pending)
/********************************************************************* /*********************************************************************
* *
* Fast Legacy/MSI Combined Interrupt Service routine * Fast Legacy/MSI Combined Interrupt Service routine
* *
*********************************************************************/ *********************************************************************/
static int static int
@@ -1743,7 +1743,7 @@ lem_xmit(struct adapter *adapter, struct mbuf **m_headp)
&txd_upper, &txd_lower); &txd_upper, &txd_lower);
i = adapter->next_avail_tx_desc; i = adapter->next_avail_tx_desc;
if (adapter->pcix_82544) if (adapter->pcix_82544)
txd_saved = i; txd_saved = i;
/* Set up our transmit descriptors */ /* Set up our transmit descriptors */
@@ -1906,7 +1906,7 @@ lem_82547_move_tail(void *arg)
hw_tdt = E1000_READ_REG(&adapter->hw, E1000_TDT(0)); hw_tdt = E1000_READ_REG(&adapter->hw, E1000_TDT(0));
sw_tdt = adapter->next_avail_tx_desc; sw_tdt = adapter->next_avail_tx_desc;
while (hw_tdt != sw_tdt) { while (hw_tdt != sw_tdt) {
tx_desc = &adapter->tx_desc_base[hw_tdt]; tx_desc = &adapter->tx_desc_base[hw_tdt];
length += tx_desc->lower.flags.length; length += tx_desc->lower.flags.length;
@@ -1925,12 +1925,12 @@ lem_82547_move_tail(void *arg)
lem_82547_update_fifo_head(adapter, length); lem_82547_update_fifo_head(adapter, length);
length = 0; length = 0;
} }
} }
} }
static int static int
lem_82547_fifo_workaround(struct adapter *adapter, int len) lem_82547_fifo_workaround(struct adapter *adapter, int len)
{ {
int fifo_space, fifo_pkt_len; int fifo_space, fifo_pkt_len;
fifo_pkt_len = roundup2(len + EM_FIFO_HDR, EM_FIFO_HDR); fifo_pkt_len = roundup2(len + EM_FIFO_HDR, EM_FIFO_HDR);
@@ -1953,7 +1953,7 @@ static void
lem_82547_update_fifo_head(struct adapter *adapter, int len) lem_82547_update_fifo_head(struct adapter *adapter, int len)
{ {
int fifo_pkt_len = roundup2(len + EM_FIFO_HDR, EM_FIFO_HDR); int fifo_pkt_len = roundup2(len + EM_FIFO_HDR, EM_FIFO_HDR);
/* tx_fifo_head is always 16 byte aligned */ /* tx_fifo_head is always 16 byte aligned */
adapter->tx_fifo_head += fifo_pkt_len; adapter->tx_fifo_head += fifo_pkt_len;
if (adapter->tx_fifo_head >= adapter->tx_fifo_size) { if (adapter->tx_fifo_head >= adapter->tx_fifo_size) {
@@ -1969,7 +1969,7 @@ lem_82547_tx_fifo_reset(struct adapter *adapter)
if ((E1000_READ_REG(&adapter->hw, E1000_TDT(0)) == if ((E1000_READ_REG(&adapter->hw, E1000_TDT(0)) ==
E1000_READ_REG(&adapter->hw, E1000_TDH(0))) && E1000_READ_REG(&adapter->hw, E1000_TDH(0))) &&
(E1000_READ_REG(&adapter->hw, E1000_TDFT) == (E1000_READ_REG(&adapter->hw, E1000_TDFT) ==
E1000_READ_REG(&adapter->hw, E1000_TDFH)) && E1000_READ_REG(&adapter->hw, E1000_TDFH)) &&
(E1000_READ_REG(&adapter->hw, E1000_TDFTS) == (E1000_READ_REG(&adapter->hw, E1000_TDFTS) ==
E1000_READ_REG(&adapter->hw, E1000_TDFHS)) && E1000_READ_REG(&adapter->hw, E1000_TDFHS)) &&
@@ -2066,7 +2066,7 @@ lem_set_multi(struct adapter *adapter)
mta = adapter->mta; mta = adapter->mta;
bzero(mta, sizeof(u8) * ETH_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES); bzero(mta, sizeof(u8) * ETH_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES);
if (adapter->hw.mac.type == e1000_82542 && if (adapter->hw.mac.type == e1000_82542 &&
adapter->hw.revision_id == E1000_REVISION_2) { adapter->hw.revision_id == E1000_REVISION_2) {
reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL);
if (adapter->hw.bus.pci_cmd_word & CMD_MEM_WRT_INVALIDATE) if (adapter->hw.bus.pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
@@ -2085,7 +2085,7 @@ lem_set_multi(struct adapter *adapter)
} else } else
e1000_update_mc_addr_list(&adapter->hw, mta, mcnt); e1000_update_mc_addr_list(&adapter->hw, mta, mcnt);
if (adapter->hw.mac.type == e1000_82542 && if (adapter->hw.mac.type == e1000_82542 &&
adapter->hw.revision_id == E1000_REVISION_2) { adapter->hw.revision_id == E1000_REVISION_2) {
reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL);
reg_rctl &= ~E1000_RCTL_RST; reg_rctl &= ~E1000_RCTL_RST;
@@ -2384,7 +2384,7 @@ lem_allocate_irq(struct adapter *adapter)
adapter->tq = NULL; adapter->tq = NULL;
return (error); return (error);
} }
return (0); return (0);
} }
@@ -2538,7 +2538,7 @@ lem_setup_interface(device_t dev, struct adapter *adapter)
if_setcapabilitiesbit(ifp, IFCAP_WOL, 0); if_setcapabilitiesbit(ifp, IFCAP_WOL, 0);
if_setcapenablebit(ifp, IFCAP_WOL_MAGIC, 0); if_setcapenablebit(ifp, IFCAP_WOL_MAGIC, 0);
} }
/* /*
* Specify the media types supported by this adapter and register * Specify the media types supported by this adapter and register
* callbacks to update media and link information * callbacks to update media and link information
@@ -2551,7 +2551,7 @@ lem_setup_interface(device_t dev, struct adapter *adapter)
if (adapter->hw.mac.type == e1000_82545) if (adapter->hw.mac.type == e1000_82545)
fiber_type = IFM_1000_LX; fiber_type = IFM_1000_LX;
ifmedia_add(&adapter->media, IFM_ETHER | fiber_type | IFM_FDX, ifmedia_add(&adapter->media, IFM_ETHER | fiber_type | IFM_FDX,
0, NULL); 0, NULL);
ifmedia_add(&adapter->media, IFM_ETHER | fiber_type, 0, NULL); ifmedia_add(&adapter->media, IFM_ETHER | fiber_type, 0, NULL);
} else { } else {
@@ -2911,7 +2911,7 @@ lem_initialize_transmit_unit(struct adapter *adapter)
/* This write will effectively turn on the transmit unit. */ /* This write will effectively turn on the transmit unit. */
E1000_WRITE_REG(&adapter->hw, E1000_TCTL, tctl); E1000_WRITE_REG(&adapter->hw, E1000_TCTL, tctl);
/* Setup Transmit Descriptor Base Settings */ /* Setup Transmit Descriptor Base Settings */
adapter->txd_cmd = E1000_TXD_CMD_IFCS; adapter->txd_cmd = E1000_TXD_CMD_IFCS;
if (adapter->tx_int_delay.value > 0) if (adapter->tx_int_delay.value > 0)
@@ -3153,7 +3153,7 @@ lem_txeof(struct adapter *adapter)
/* /*
* What this does is get the index of the * What this does is get the index of the
* first descriptor AFTER the EOP of the * first descriptor AFTER the EOP of the
* first packet, that way we can do the * first packet, that way we can do the
* simple comparison on the inner while loop. * simple comparison on the inner while loop.
*/ */
@@ -3223,7 +3223,7 @@ lem_txeof(struct adapter *adapter)
* tell the stack that it is OK to send packets. * tell the stack that it is OK to send packets.
* If there are no pending descriptors, clear the watchdog. * If there are no pending descriptors, clear the watchdog.
*/ */
if (adapter->num_tx_desc_avail > EM_TX_CLEANUP_THRESHOLD) { if (adapter->num_tx_desc_avail > EM_TX_CLEANUP_THRESHOLD) {
if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE); if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
#ifdef NIC_PARAVIRT #ifdef NIC_PARAVIRT
if (adapter->csb) { // XXX also csb_on ? if (adapter->csb) { // XXX also csb_on ?
@@ -3234,7 +3234,7 @@ lem_txeof(struct adapter *adapter)
if (adapter->num_tx_desc_avail == adapter->num_tx_desc) { if (adapter->num_tx_desc_avail == adapter->num_tx_desc) {
adapter->watchdog_check = FALSE; adapter->watchdog_check = FALSE;
return; return;
} }
} }
} }
@@ -3603,7 +3603,7 @@ lem_free_receive_structures(struct adapter *adapter)
* *
* We loop at most count times if count is > 0, or until done if * We loop at most count times if count is > 0, or until done if
* count < 0. * count < 0.
* *
* For polling we also now return the number of cleaned packets * For polling we also now return the number of cleaned packets
*********************************************************************/ *********************************************************************/
static bool static bool
@@ -3716,7 +3716,7 @@ lem_rxeof(struct adapter *adapter, int count, int *done)
if (adapter->fmp != NULL) if (adapter->fmp != NULL)
pkt_len += adapter->fmp->m_pkthdr.len; pkt_len += adapter->fmp->m_pkthdr.len;
last_byte = *(mtod(mp, caddr_t) + desc_len - 1); last_byte = *(mtod(mp, caddr_t) + desc_len - 1);
if (TBI_ACCEPT(&adapter->hw, status, if (TBI_ACCEPT(&adapter->hw, status,
current_desc->errors, pkt_len, last_byte, current_desc->errors, pkt_len, last_byte,
adapter->min_frame_size, adapter->max_frame_size)) { adapter->min_frame_size, adapter->max_frame_size)) {
@@ -4081,7 +4081,7 @@ lem_disable_intr(struct adapter *adapter)
/* /*
* Bit of a misnomer, what this really means is * Bit of a misnomer, what this really means is
* to enable OS management of the system... aka * to enable OS management of the system... aka
* to disable special hardware management features * to disable special hardware management features
*/ */
static void static void
lem_init_manageability(struct adapter *adapter) lem_init_manageability(struct adapter *adapter)
@@ -4328,7 +4328,7 @@ lem_enable_phy_wakeup(struct adapter *adapter)
for (int i = 0; i < adapter->hw.mac.mta_reg_count; i++) { for (int i = 0; i < adapter->hw.mac.mta_reg_count; i++) {
#else #else
for (i = 0; i < adapter->hw.mac.mta_reg_count; i++) { for (i = 0; i < adapter->hw.mac.mta_reg_count; i++) {
#endif #endif
mreg = E1000_READ_REG_ARRAY(hw, E1000_MTA, i); mreg = E1000_READ_REG_ARRAY(hw, E1000_MTA, i);
e1000_write_phy_reg(hw, BM_MTA(i), (u16)(mreg & 0xFFFF)); e1000_write_phy_reg(hw, BM_MTA(i), (u16)(mreg & 0xFFFF));
e1000_write_phy_reg(hw, BM_MTA(i) + 1, e1000_write_phy_reg(hw, BM_MTA(i) + 1,
@@ -4527,17 +4527,17 @@ lem_update_stats_counters(struct adapter *adapter)
adapter->stats.bptc += E1000_READ_REG(&adapter->hw, E1000_BPTC); adapter->stats.bptc += E1000_READ_REG(&adapter->hw, E1000_BPTC);
if (adapter->hw.mac.type >= e1000_82543) { if (adapter->hw.mac.type >= e1000_82543) {
adapter->stats.algnerrc += adapter->stats.algnerrc +=
E1000_READ_REG(&adapter->hw, E1000_ALGNERRC); E1000_READ_REG(&adapter->hw, E1000_ALGNERRC);
adapter->stats.rxerrc += adapter->stats.rxerrc +=
E1000_READ_REG(&adapter->hw, E1000_RXERRC); E1000_READ_REG(&adapter->hw, E1000_RXERRC);
adapter->stats.tncrs += adapter->stats.tncrs +=
E1000_READ_REG(&adapter->hw, E1000_TNCRS); E1000_READ_REG(&adapter->hw, E1000_TNCRS);
adapter->stats.cexterr += adapter->stats.cexterr +=
E1000_READ_REG(&adapter->hw, E1000_CEXTERR); E1000_READ_REG(&adapter->hw, E1000_CEXTERR);
adapter->stats.tsctc += adapter->stats.tsctc +=
E1000_READ_REG(&adapter->hw, E1000_TSCTC); E1000_READ_REG(&adapter->hw, E1000_TSCTC);
adapter->stats.tsctfc += adapter->stats.tsctfc +=
E1000_READ_REG(&adapter->hw, E1000_TSCTFC); E1000_READ_REG(&adapter->hw, E1000_TSCTFC);
} }
} }
@@ -4596,16 +4596,16 @@ lem_add_hw_stats(struct adapter *adapter)
struct sysctl_oid_list *stat_list; struct sysctl_oid_list *stat_list;
/* Driver Statistics */ /* Driver Statistics */
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "cluster_alloc_fail", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "cluster_alloc_fail",
CTLFLAG_RD, &adapter->mbuf_cluster_failed, CTLFLAG_RD, &adapter->mbuf_cluster_failed,
"Std mbuf cluster failed"); "Std mbuf cluster failed");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "mbuf_defrag_fail", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "mbuf_defrag_fail",
CTLFLAG_RD, &adapter->mbuf_defrag_failed, CTLFLAG_RD, &adapter->mbuf_defrag_failed,
"Defragmenting mbuf chain failed"); "Defragmenting mbuf chain failed");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "dropped", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "dropped",
CTLFLAG_RD, &adapter->dropped_pkts, CTLFLAG_RD, &adapter->dropped_pkts,
"Driver dropped packets"); "Driver dropped packets");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "tx_dma_fail", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "tx_dma_fail",
CTLFLAG_RD, &adapter->no_tx_dma_setup, CTLFLAG_RD, &adapter->no_tx_dma_setup,
"Driver tx dma failure in xmit"); "Driver tx dma failure in xmit");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "tx_desc_fail1", SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "tx_desc_fail1",
@@ -4632,7 +4632,7 @@ lem_add_hw_stats(struct adapter *adapter)
SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_high_water", SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_high_water",
CTLFLAG_RD, &adapter->hw.fc.high_water, 0, CTLFLAG_RD, &adapter->hw.fc.high_water, 0,
"Flow Control High Watermark"); "Flow Control High Watermark");
SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_low_water", SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "fc_low_water",
CTLFLAG_RD, &adapter->hw.fc.low_water, 0, CTLFLAG_RD, &adapter->hw.fc.low_water, 0,
"Flow Control Low Watermark"); "Flow Control Low Watermark");
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "fifo_workaround", SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "fifo_workaround",
@@ -4642,27 +4642,27 @@ lem_add_hw_stats(struct adapter *adapter)
CTLFLAG_RD, &adapter->tx_fifo_reset_cnt, CTLFLAG_RD, &adapter->tx_fifo_reset_cnt,
"TX FIFO resets"); "TX FIFO resets");
SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "txd_head", SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "txd_head",
CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_TDH(0), CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_TDH(0),
lem_sysctl_reg_handler, "IU", lem_sysctl_reg_handler, "IU",
"Transmit Descriptor Head"); "Transmit Descriptor Head");
SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "txd_tail", SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "txd_tail",
CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_TDT(0), CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_TDT(0),
lem_sysctl_reg_handler, "IU", lem_sysctl_reg_handler, "IU",
"Transmit Descriptor Tail"); "Transmit Descriptor Tail");
SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rxd_head", SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rxd_head",
CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_RDH(0), CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_RDH(0),
lem_sysctl_reg_handler, "IU", lem_sysctl_reg_handler, "IU",
"Receive Descriptor Head"); "Receive Descriptor Head");
SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rxd_tail", SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rxd_tail",
CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_RDT(0), CTLTYPE_UINT | CTLFLAG_RD, adapter, E1000_RDT(0),
lem_sysctl_reg_handler, "IU", lem_sysctl_reg_handler, "IU",
"Receive Descriptor Tail"); "Receive Descriptor Tail");
/* MAC stats get their own sub node */ /* MAC stats get their own sub node */
stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac_stats", stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac_stats",
CTLFLAG_RD, NULL, "Statistics"); CTLFLAG_RD, NULL, "Statistics");
stat_list = SYSCTL_CHILDREN(stat_node); stat_list = SYSCTL_CHILDREN(stat_node);
@@ -4765,13 +4765,13 @@ lem_add_hw_stats(struct adapter *adapter)
CTLFLAG_RD, &adapter->stats.prc1522, CTLFLAG_RD, &adapter->stats.prc1522,
"1023-1522 byte frames received"); "1023-1522 byte frames received");
SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_recvd", SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_recvd",
CTLFLAG_RD, &adapter->stats.gorc, CTLFLAG_RD, &adapter->stats.gorc,
"Good Octets Received"); "Good Octets Received");
/* Packet Transmission Stats */ /* Packet Transmission Stats */
SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_txd", SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "good_octets_txd",
CTLFLAG_RD, &adapter->stats.gotc, CTLFLAG_RD, &adapter->stats.gotc,
"Good Octets Transmitted"); "Good Octets Transmitted");
SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_txd", SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_txd",
CTLFLAG_RD, &adapter->stats.tpt, CTLFLAG_RD, &adapter->stats.tpt,
"Total Packets Transmitted"); "Total Packets Transmitted");
@@ -4872,7 +4872,7 @@ lem_sysctl_int_delay(SYSCTL_HANDLER_ARGS)
u32 regval; u32 regval;
int error; int error;
int usecs; int usecs;
int ticks; int _ticks;
info = (struct em_int_delay_info *)arg1; info = (struct em_int_delay_info *)arg1;
usecs = info->value; usecs = info->value;
@@ -4882,21 +4882,21 @@ lem_sysctl_int_delay(SYSCTL_HANDLER_ARGS)
if (usecs < 0 || usecs > EM_TICKS_TO_USECS(65535)) if (usecs < 0 || usecs > EM_TICKS_TO_USECS(65535))
return (EINVAL); return (EINVAL);
info->value = usecs; info->value = usecs;
ticks = EM_USECS_TO_TICKS(usecs); _ticks = EM_USECS_TO_TICKS(usecs);
if (info->offset == E1000_ITR) /* units are 256ns here */ if (info->offset == E1000_ITR) /* units are 256ns here */
ticks *= 4; _ticks *= 4;
adapter = info->adapter; adapter = info->adapter;
EM_CORE_LOCK(adapter); EM_CORE_LOCK(adapter);
regval = E1000_READ_OFFSET(&adapter->hw, info->offset); regval = E1000_READ_OFFSET(&adapter->hw, info->offset);
regval = (regval & ~0xffff) | (ticks & 0xffff); regval = (regval & ~0xffff) | (_ticks & 0xffff);
/* Handle a few special cases. */ /* Handle a few special cases. */
switch (info->offset) { switch (info->offset) {
case E1000_RDTR: case E1000_RDTR:
break; break;
case E1000_TIDV: case E1000_TIDV:
if (ticks == 0) { if (_ticks == 0) {
adapter->txd_cmd &= ~E1000_TXD_CMD_IDE; adapter->txd_cmd &= ~E1000_TXD_CMD_IDE;
/* Don't write 0 into the TIDV register. */ /* Don't write 0 into the TIDV register. */
regval++; regval++;
src/add-ons/kernel/drivers/network/rtl8139/dev/rl/if_rl.c
+8 -8
View File
@@ -586,7 +586,7 @@ rl_probe(device_t dev)
const struct rl_type *t; const struct rl_type *t;
uint16_t devid, revid, vendor; uint16_t devid, revid, vendor;
int i; int i;
vendor = pci_get_vendor(dev); vendor = pci_get_vendor(dev);
devid = pci_get_device(dev); devid = pci_get_device(dev);
revid = pci_get_revid(dev); revid = pci_get_revid(dev);
@@ -1389,7 +1389,7 @@ rl_twister_update(struct rl_softc *sc)
case DONE: case DONE:
break; break;
} }
} }
static void static void
@@ -1397,7 +1397,7 @@ rl_tick(void *xsc)
{ {
struct rl_softc *sc = xsc; struct rl_softc *sc = xsc;
struct mii_data *mii; struct mii_data *mii;
int ticks; int _ticks;
RL_LOCK_ASSERT(sc); RL_LOCK_ASSERT(sc);
/* /*
@@ -1421,15 +1421,15 @@ rl_tick(void *xsc)
else else
rl_twister_update(sc); rl_twister_update(sc);
if (sc->rl_twister == DONE) if (sc->rl_twister == DONE)
ticks = hz; _ticks = hz;
else else
ticks = hz / 10; _ticks = hz / 10;
} else { } else {
rl_watchdog(sc); rl_watchdog(sc);
ticks = hz; _ticks = hz;
} }
callout_reset(&sc->rl_stat_callout, ticks, rl_tick, sc); callout_reset(&sc->rl_stat_callout, _ticks, rl_tick, sc);
} }
#ifdef DEVICE_POLLING #ifdef DEVICE_POLLING
@@ -1856,7 +1856,7 @@ rl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
ifp->if_capenable |= IFCAP_POLLING; ifp->if_capenable |= IFCAP_POLLING;
RL_UNLOCK(sc); RL_UNLOCK(sc);
return (error); return (error);
} }
if (!(ifr->ifr_reqcap & IFCAP_POLLING) && if (!(ifr->ifr_reqcap & IFCAP_POLLING) &&
ifp->if_capenable & IFCAP_POLLING) { ifp->if_capenable & IFCAP_POLLING) {