Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f28b9cfb65 | ||
|
|
0677a383e0 | ||
|
|
15b46c5763 | ||
|
|
389eefd0cd | ||
|
|
78e54426c0 | ||
|
|
7296f1f21c | ||
|
|
489bd2f396 | ||
|
|
224ef7f483 | ||
|
|
251926f631 | ||
|
|
04cb1cde5c | ||
|
|
db3e054fe5 | ||
|
|
d07f79de35 | ||
|
|
0ea6e5c221 | ||
|
|
b0b0b8f65c | ||
|
|
3fa2779208 | ||
|
|
584e378241 | ||
|
|
1bb420448c |
+1
-1
@@ -129,7 +129,7 @@ install :
|
||||
#
|
||||
VERSION_MAJOR = 0
|
||||
VERSION_MINOR = 9
|
||||
VERSION_PATCH = 8
|
||||
VERSION_PATCH = 9
|
||||
EXTRAVERSION =
|
||||
MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
|
||||
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
|
||||
|
||||
@@ -410,7 +410,7 @@ endif
|
||||
#
|
||||
COMPILE_c = $(CC) $(CFLAGS) $(CFLAGS_c) $(OBJ_CFLAGS)
|
||||
RULE_c = $(Q)$(COMPILE_c) -c $< -o $@ $(POST_O)
|
||||
RULE_c_to_dbg%.o = $(Q)$(COMPILE_c) -Ddebug_$(OBJECT)=$* -c $< -o $@ $(POST_O)
|
||||
RULE_c_to_dbg%.o = $(Q)$(COMPILE_c) -Ddebug_$(subst -,_,$(OBJECT))=$* -c $< -o $@ $(POST_O)
|
||||
RULE_c_to_c = $(Q)$(COMPILE_c) -E -c $< > $@
|
||||
RULE_c_to_s = $(Q)$(COMPILE_c) -S -g0 -c $< -o $@
|
||||
|
||||
|
||||
@@ -619,13 +619,13 @@ static void a3c90x_remove(struct pci_device *pci)
|
||||
|
||||
DBGP("a3c90x_remove\n");
|
||||
|
||||
unregister_netdev(netdev);
|
||||
a3c90x_reset(inf_3c90x);
|
||||
|
||||
/* Disable the receiver and transmitter. */
|
||||
outw(cmdRxDisable, inf_3c90x->IOAddr + regCommandIntStatus_w);
|
||||
outw(cmdTxDisable, inf_3c90x->IOAddr + regCommandIntStatus_w);
|
||||
|
||||
a3c90x_reset(inf_3c90x);
|
||||
unregister_netdev(netdev);
|
||||
netdev_nullify(netdev);
|
||||
netdev_put(netdev);
|
||||
}
|
||||
@@ -845,9 +845,9 @@ static void a3c90x_close(struct net_device *netdev)
|
||||
|
||||
DBGP("a3c90x_close\n");
|
||||
|
||||
a3c90x_reset(inf_3c90x);
|
||||
outw(cmdRxDisable, inf_3c90x->IOAddr + regCommandIntStatus_w);
|
||||
outw(cmdTxDisable, inf_3c90x->IOAddr + regCommandIntStatus_w);
|
||||
a3c90x_reset(inf_3c90x);
|
||||
a3c90x_free_resources(inf_3c90x);
|
||||
}
|
||||
|
||||
|
||||
@@ -306,7 +306,8 @@ static int ath5k_probe(struct pci_device *pdev,
|
||||
* DMA to work so force a reasonable value here if it
|
||||
* comes up zero.
|
||||
*/
|
||||
pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 16);
|
||||
csz = 16;
|
||||
pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, csz);
|
||||
}
|
||||
/*
|
||||
* The default setting of latency timer yields poor results,
|
||||
@@ -1195,11 +1196,12 @@ ath5k_handle_rx(struct ath5k_softc *sc)
|
||||
|
||||
if (rs.rs_status) {
|
||||
if (rs.rs_status & AR5K_RXERR_PHY) {
|
||||
DBG("ath5k: rx PHY error\n");
|
||||
/* These are uncommon, and may indicate a real problem. */
|
||||
net80211_rx_err(sc->dev, NULL, EIO);
|
||||
goto next;
|
||||
}
|
||||
if (rs.rs_status & AR5K_RXERR_CRC) {
|
||||
net80211_rx_err(sc->dev, NULL, EIO);
|
||||
/* These occur *all the time*. */
|
||||
goto next;
|
||||
}
|
||||
if (rs.rs_status & AR5K_RXERR_DECRYPT) {
|
||||
@@ -1358,6 +1360,8 @@ ath5k_init(struct ath5k_softc *sc)
|
||||
if (ret)
|
||||
goto done;
|
||||
|
||||
ath5k_rfkill_hw_start(ah);
|
||||
|
||||
/*
|
||||
* Reset the key cache since some parts do not reset the
|
||||
* contents on initial power up or resume from suspend.
|
||||
@@ -1405,6 +1409,8 @@ ath5k_stop_hw(struct ath5k_softc *sc)
|
||||
} else
|
||||
sc->rxlink = NULL;
|
||||
|
||||
ath5k_rfkill_hw_stop(sc->ah);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1153,6 +1153,10 @@ extern u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio);
|
||||
extern int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val);
|
||||
extern void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, u32 interrupt_level);
|
||||
|
||||
/* rfkill Functions */
|
||||
extern void ath5k_rfkill_hw_start(struct ath5k_hw *ah);
|
||||
extern void ath5k_rfkill_hw_stop(struct ath5k_hw *ah);
|
||||
|
||||
/* Misc functions */
|
||||
int ath5k_hw_set_capabilities(struct ath5k_hw *ah);
|
||||
extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
|
||||
|
||||
@@ -146,6 +146,17 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
|
||||
ee->ee_db[AR5K_EEPROM_MODE_11G][0] = (val >> 3) & 0x7;
|
||||
}
|
||||
|
||||
AR5K_EEPROM_READ(AR5K_EEPROM_IS_HB63, val);
|
||||
|
||||
if ((ah->ah_mac_version == (AR5K_SREV_AR2425 >> 4)) && val)
|
||||
ee->ee_is_hb63 = 1;
|
||||
else
|
||||
ee->ee_is_hb63 = 0;
|
||||
|
||||
AR5K_EEPROM_READ(AR5K_EEPROM_RFKILL, val);
|
||||
ee->ee_rfkill_pin = (u8) AR5K_REG_MS(val, AR5K_EEPROM_RFKILL_GPIO_SEL);
|
||||
ee->ee_rfkill_pol = val & AR5K_EEPROM_RFKILL_POLARITY ? 1 : 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -723,7 +723,7 @@ static const struct ath5k_ini_mode ar5212_ini_mode_start[] = {
|
||||
{ AR5K_PHY_SETTLING,
|
||||
{ 0x1372161c, 0x13721c25, 0x13721722, 0x137216a2, 0x13721c25 } },
|
||||
{ AR5K_PHY_AGCCTL,
|
||||
{ 0x00009d10, 0x00009d10, 0x00009d18, 0x00009d18, 0x00009d18 } },
|
||||
{ 0x00009d10, 0x00009d10, 0x00009d18, 0x00009d18, 0x00009d10 } },
|
||||
{ AR5K_PHY_NF,
|
||||
{ 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 } },
|
||||
{ AR5K_PHY_WEAK_OFDM_HIGH_THR,
|
||||
@@ -804,7 +804,7 @@ static const struct ath5k_ini_mode rf5112_ini_mode_end[] = {
|
||||
{ AR5K_PHY_DESIRED_SIZE,
|
||||
{ 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0 } },
|
||||
{ AR5K_PHY_SIG,
|
||||
{ 0x7e800d2e, 0x7e800d2e, 0x7ee80d2e, 0x7ee80d2e, 0x7ee80d2e } },
|
||||
{ 0x7e800d2e, 0x7e800d2e, 0x7ee80d2e, 0x7ee80d2e, 0x7e800d2e } },
|
||||
{ AR5K_PHY_AGCCOARSE,
|
||||
{ 0x3137665e, 0x3137665e, 0x3137665e, 0x3137665e, 0x3137665e } },
|
||||
{ AR5K_PHY_WEAK_OFDM_LOW_THR,
|
||||
|
||||
@@ -520,7 +520,7 @@ int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry)
|
||||
* Note2: Windows driver (ndiswrapper) sets this to
|
||||
* 0x00000714 instead of 0x00000007
|
||||
*/
|
||||
if (ah->ah_version > AR5K_AR5211) {
|
||||
if (ah->ah_version >= AR5K_AR5211) {
|
||||
ath5k_hw_reg_write(ah, AR5K_KEYTABLE_TYPE_NULL,
|
||||
AR5K_KEYTABLE_TYPE(entry));
|
||||
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
/*
|
||||
* RFKILL support for ath5k
|
||||
*
|
||||
* Copyright (c) 2009 Tobias Doerffel <tobias.doerffel@gmail.com>
|
||||
* Lightly modified for gPXE, Sep 2008 by Joshua Oreman <oremanj@rwcr.net>
|
||||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer,
|
||||
* without modification.
|
||||
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
||||
* similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
|
||||
* redistribution must be conditioned upon including a substantially
|
||||
* similar Disclaimer requirement for further binary redistribution.
|
||||
* 3. Neither the names of the above-listed copyright holders nor the names
|
||||
* of any contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* NO WARRANTY
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
|
||||
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
|
||||
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
|
||||
* IN 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 POSSIBILITY OF SUCH DAMAGES.
|
||||
*/
|
||||
|
||||
FILE_LICENCE ( MIT );
|
||||
|
||||
#include "base.h"
|
||||
|
||||
|
||||
static inline void ath5k_rfkill_disable(struct ath5k_softc *sc)
|
||||
{
|
||||
DBG("ath5k: rfkill disable (gpio:%d polarity:%d)\n",
|
||||
sc->rf_kill.gpio, sc->rf_kill.polarity);
|
||||
ath5k_hw_set_gpio_output(sc->ah, sc->rf_kill.gpio);
|
||||
ath5k_hw_set_gpio(sc->ah, sc->rf_kill.gpio, !sc->rf_kill.polarity);
|
||||
}
|
||||
|
||||
|
||||
static inline void ath5k_rfkill_enable(struct ath5k_softc *sc)
|
||||
{
|
||||
DBG("ath5k: rfkill enable (gpio:%d polarity:%d)\n",
|
||||
sc->rf_kill.gpio, sc->rf_kill.polarity);
|
||||
ath5k_hw_set_gpio_output(sc->ah, sc->rf_kill.gpio);
|
||||
ath5k_hw_set_gpio(sc->ah, sc->rf_kill.gpio, sc->rf_kill.polarity);
|
||||
}
|
||||
|
||||
static inline void ath5k_rfkill_set_intr(struct ath5k_softc *sc, int enable)
|
||||
{
|
||||
struct ath5k_hw *ah = sc->ah;
|
||||
u32 curval;
|
||||
|
||||
ath5k_hw_set_gpio_input(ah, sc->rf_kill.gpio);
|
||||
curval = ath5k_hw_get_gpio(ah, sc->rf_kill.gpio);
|
||||
ath5k_hw_set_gpio_intr(ah, sc->rf_kill.gpio, enable ?
|
||||
!!curval : !curval);
|
||||
}
|
||||
|
||||
static int __unused
|
||||
ath5k_is_rfkill_set(struct ath5k_softc *sc)
|
||||
{
|
||||
/* configuring GPIO for input for some reason disables rfkill */
|
||||
/*ath5k_hw_set_gpio_input(sc->ah, sc->rf_kill.gpio);*/
|
||||
return (ath5k_hw_get_gpio(sc->ah, sc->rf_kill.gpio) ==
|
||||
sc->rf_kill.polarity);
|
||||
}
|
||||
|
||||
void
|
||||
ath5k_rfkill_hw_start(struct ath5k_hw *ah)
|
||||
{
|
||||
struct ath5k_softc *sc = ah->ah_sc;
|
||||
|
||||
/* read rfkill GPIO configuration from EEPROM header */
|
||||
sc->rf_kill.gpio = ah->ah_capabilities.cap_eeprom.ee_rfkill_pin;
|
||||
sc->rf_kill.polarity = ah->ah_capabilities.cap_eeprom.ee_rfkill_pol;
|
||||
|
||||
ath5k_rfkill_disable(sc);
|
||||
|
||||
/* enable interrupt for rfkill switch */
|
||||
if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header))
|
||||
ath5k_rfkill_set_intr(sc, 1);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ath5k_rfkill_hw_stop(struct ath5k_hw *ah)
|
||||
{
|
||||
struct ath5k_softc *sc = ah->ah_sc;
|
||||
|
||||
/* disable interrupt for rfkill switch */
|
||||
if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header))
|
||||
ath5k_rfkill_set_intr(sc, 0);
|
||||
|
||||
/* enable RFKILL when stopping HW so Wifi LED is turned off */
|
||||
ath5k_rfkill_enable(sc);
|
||||
}
|
||||
@@ -123,6 +123,11 @@ struct ath5k_softc {
|
||||
unsigned int txbuf_len; /* buf count in txbuf list */
|
||||
struct ath5k_txq txq; /* tx queue */
|
||||
|
||||
struct {
|
||||
u16 gpio;
|
||||
unsigned polarity;
|
||||
} rf_kill;
|
||||
|
||||
int last_calib_ticks;
|
||||
|
||||
int power_level; /* Requested tx power in dbm */
|
||||
|
||||
@@ -26,6 +26,13 @@
|
||||
#define AR5K_EEPROM_MAGIC_5210 0x0000145a /* 5210 */
|
||||
|
||||
#define AR5K_EEPROM_IS_HB63 0x000b /* Talon detect */
|
||||
|
||||
#define AR5K_EEPROM_RFKILL 0x0f
|
||||
#define AR5K_EEPROM_RFKILL_GPIO_SEL 0x0000001c
|
||||
#define AR5K_EEPROM_RFKILL_GPIO_SEL_S 2
|
||||
#define AR5K_EEPROM_RFKILL_POLARITY 0x00000002
|
||||
#define AR5K_EEPROM_RFKILL_POLARITY_S 1
|
||||
|
||||
#define AR5K_EEPROM_REG_DOMAIN 0x00bf /* EEPROM regdom */
|
||||
#define AR5K_EEPROM_CHECKSUM 0x00c0 /* EEPROM checksum */
|
||||
#define AR5K_EEPROM_INFO_BASE 0x00c0 /* EEPROM header */
|
||||
@@ -369,6 +376,9 @@ struct ath5k_eeprom_info {
|
||||
u16 ee_version;
|
||||
u16 ee_header;
|
||||
u16 ee_ant_gain;
|
||||
u8 ee_rfkill_pin;
|
||||
int ee_rfkill_pol;
|
||||
int ee_is_hb63;
|
||||
u16 ee_misc0;
|
||||
u16 ee_misc1;
|
||||
u16 ee_misc2;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -73,6 +73,7 @@ e1000_get_hw_control ( struct e1000_adapter *adapter )
|
||||
break;
|
||||
case e1000_82571:
|
||||
case e1000_82572:
|
||||
case e1000_82576:
|
||||
case e1000_80003es2lan:
|
||||
case e1000_ich8lan:
|
||||
ctrl_ext = E1000_READ_REG(&adapter->hw, CTRL_EXT);
|
||||
@@ -253,6 +254,7 @@ e1000_configure_tx ( struct e1000_adapter *adapter )
|
||||
{
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
uint32_t tctl;
|
||||
uint32_t txdctl;
|
||||
|
||||
DBG ( "e1000_configure_tx\n" );
|
||||
|
||||
@@ -271,6 +273,12 @@ e1000_configure_tx ( struct e1000_adapter *adapter )
|
||||
adapter->tx_tail = 0;
|
||||
adapter->tx_fill_ctr = 0;
|
||||
|
||||
if (hw->mac_type == e1000_82576) {
|
||||
txdctl = E1000_READ_REG ( hw, TXDCTL );
|
||||
txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
|
||||
E1000_WRITE_REG ( hw, TXDCTL, txdctl );
|
||||
}
|
||||
|
||||
/* Setup Transmit Descriptor Settings for eop descriptor */
|
||||
tctl = E1000_TCTL_PSP | E1000_TCTL_EN |
|
||||
(E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT) |
|
||||
@@ -359,13 +367,15 @@ static void
|
||||
e1000_configure_rx ( struct e1000_adapter *adapter )
|
||||
{
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
uint32_t rctl;
|
||||
uint32_t rctl, rxdctl, mrqc, rxcsum;
|
||||
|
||||
DBG ( "e1000_configure_rx\n" );
|
||||
|
||||
/* disable receives while setting up the descriptors */
|
||||
rctl = E1000_READ_REG ( hw, RCTL );
|
||||
E1000_WRITE_REG ( hw, RCTL, rctl & ~E1000_RCTL_EN );
|
||||
E1000_WRITE_FLUSH ( hw );
|
||||
mdelay(10);
|
||||
|
||||
adapter->rx_curr = 0;
|
||||
|
||||
@@ -377,16 +387,57 @@ e1000_configure_rx ( struct e1000_adapter *adapter )
|
||||
E1000_WRITE_REG ( hw, RDLEN, adapter->rx_ring_size );
|
||||
|
||||
E1000_WRITE_REG ( hw, RDH, 0 );
|
||||
E1000_WRITE_REG ( hw, RDT, NUM_RX_DESC - 1 );
|
||||
|
||||
/* Enable Receives */
|
||||
rctl = ( E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
|
||||
E1000_RCTL_MPE
|
||||
);
|
||||
if (hw->mac_type == e1000_82576)
|
||||
E1000_WRITE_REG ( hw, RDT, 0 );
|
||||
else
|
||||
E1000_WRITE_REG ( hw, RDT, NUM_RX_DESC - 1 );
|
||||
|
||||
/* This doesn't seem to be necessary for correct operation,
|
||||
* but it seems as well to be implicit
|
||||
*/
|
||||
if (hw->mac_type == e1000_82576) {
|
||||
rxdctl = E1000_READ_REG ( hw, RXDCTL );
|
||||
rxdctl |= E1000_RXDCTL_QUEUE_ENABLE;
|
||||
rxdctl &= 0xFFF00000;
|
||||
rxdctl |= IGB_RX_PTHRESH;
|
||||
rxdctl |= IGB_RX_HTHRESH << 8;
|
||||
rxdctl |= IGB_RX_WTHRESH << 16;
|
||||
E1000_WRITE_REG ( hw, RXDCTL, rxdctl );
|
||||
E1000_WRITE_FLUSH ( hw );
|
||||
|
||||
rxcsum = E1000_READ_REG(hw, RXCSUM);
|
||||
rxcsum &= ~( E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPPCSE );
|
||||
E1000_WRITE_REG ( hw, RXCSUM, 0 );
|
||||
|
||||
/* The initial value for MRQC disables multiple receive
|
||||
* queues, however this setting is not recommended.
|
||||
* - Intel® 82576 Gigabit Ethernet Controller Datasheet r2.41
|
||||
* Section 8.10.9 Multiple Queues Command Register - MRQC
|
||||
*/
|
||||
mrqc = E1000_MRQC_ENABLE_VMDQ;
|
||||
E1000_WRITE_REG ( hw, MRQC, mrqc );
|
||||
}
|
||||
|
||||
/* Enable Receives */
|
||||
rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
|
||||
E1000_RCTL_MPE;
|
||||
E1000_WRITE_REG ( hw, RCTL, rctl );
|
||||
E1000_WRITE_FLUSH ( hw );
|
||||
|
||||
/* On the 82576, RDT([0]) must not be "bumped" before
|
||||
* the enable bit of RXDCTL([0]) is set.
|
||||
* - Intel® 82576 Gigabit Ethernet Controller Datasheet r2.41
|
||||
* Section 4.5.9 receive Initialization
|
||||
*
|
||||
* By observation I have found to occur when the enable bit of
|
||||
* RCTL is set. The datasheet recommends polling for this bit,
|
||||
* however as I see no evidence of this in the Linux igb driver
|
||||
* I have omitted that step.
|
||||
* - Simon Horman, May 2009
|
||||
*/
|
||||
if (hw->mac_type == e1000_82576)
|
||||
E1000_WRITE_REG ( hw, RDT, NUM_RX_DESC - 1 );
|
||||
|
||||
DBG ( "RDBAL: %#08x\n", E1000_READ_REG ( hw, RDBAL ) );
|
||||
DBG ( "RDLEN: %d\n", E1000_READ_REG ( hw, RDLEN ) );
|
||||
DBG ( "RCTL: %#08x\n", E1000_READ_REG ( hw, RCTL ) );
|
||||
@@ -433,6 +484,9 @@ e1000_reset ( struct e1000_adapter *adapter )
|
||||
case e1000_82573:
|
||||
pba = E1000_PBA_20K;
|
||||
break;
|
||||
case e1000_82576:
|
||||
pba = E1000_PBA_64K;
|
||||
break;
|
||||
case e1000_ich8lan:
|
||||
pba = E1000_PBA_8K;
|
||||
case e1000_undefined:
|
||||
@@ -446,6 +500,7 @@ e1000_reset ( struct e1000_adapter *adapter )
|
||||
/* Set the FC high water mark to 90% of the FIFO size.
|
||||
* Required to clear last 3 LSB */
|
||||
fc_high_water_mark = ((pba * 9216)/10) & 0xFFF8;
|
||||
|
||||
/* We can't use 90% on small FIFOs because the remainder
|
||||
* would be less than 1 full frame. In this case, we size
|
||||
* it to allow at least a full frame above the high water
|
||||
@@ -453,9 +508,20 @@ e1000_reset ( struct e1000_adapter *adapter )
|
||||
if (pba < E1000_PBA_16K)
|
||||
fc_high_water_mark = (pba * 1024) - 1600;
|
||||
|
||||
adapter->hw.fc_high_water = fc_high_water_mark;
|
||||
adapter->hw.fc_low_water = fc_high_water_mark - 8;
|
||||
if (adapter->hw.mac_type == e1000_80003es2lan)
|
||||
/* This actually applies to < e1000_82575, one revision less than
|
||||
* e1000_82576, but e1000_82575 isn't currently defined in the code */
|
||||
if (adapter->hw.mac_type < e1000_82576) {
|
||||
/* 8-byte granularity */
|
||||
adapter->hw.fc_high_water = fc_high_water_mark & 0xFFF8;
|
||||
adapter->hw.fc_low_water = adapter->hw.fc_high_water - 8;
|
||||
} else {
|
||||
/* 16-byte granularity */
|
||||
adapter->hw.fc_high_water = fc_high_water_mark & 0xFFF0;
|
||||
adapter->hw.fc_low_water = adapter->hw.fc_high_water - 16;
|
||||
}
|
||||
|
||||
if (adapter->hw.mac_type == e1000_80003es2lan ||
|
||||
adapter->hw.mac_type == e1000_82576)
|
||||
adapter->hw.fc_pause_time = 0xFFFF;
|
||||
else
|
||||
adapter->hw.fc_pause_time = E1000_FC_PAUSE_TIME;
|
||||
@@ -1102,6 +1168,7 @@ static struct pci_device_id e1000_nics[] = {
|
||||
PCI_ROM(0x8086, 0x10bc, "e1000-0x10bc", "e1000-0x10bc", 0),
|
||||
PCI_ROM(0x8086, 0x10c4, "e1000-0x10c4", "e1000-0x10c4", 0),
|
||||
PCI_ROM(0x8086, 0x10c5, "e1000-0x10c5", "e1000-0x10c5", 0),
|
||||
PCI_ROM(0x8086, 0x10c9, "e1000-0x10c9", "e1000-0x10c9", 0),
|
||||
PCI_ROM(0x8086, 0x10d9, "e1000-0x10d9", "e1000-0x10d9", 0),
|
||||
PCI_ROM(0x8086, 0x10da, "e1000-0x10da", "e1000-0x10da", 0),
|
||||
};
|
||||
|
||||
@@ -419,6 +419,9 @@ e1000_set_mac_type(struct e1000_hw *hw)
|
||||
case E1000_DEV_ID_ICH8_IGP_M:
|
||||
hw->mac_type = e1000_ich8lan;
|
||||
break;
|
||||
case E1000_DEV_ID_82576:
|
||||
hw->mac_type = e1000_82576;
|
||||
break;
|
||||
default:
|
||||
/* Should never have loaded on this device */
|
||||
return -E1000_ERR_MAC_TYPE;
|
||||
@@ -426,6 +429,7 @@ e1000_set_mac_type(struct e1000_hw *hw)
|
||||
|
||||
switch (hw->mac_type) {
|
||||
case e1000_ich8lan:
|
||||
case e1000_82576:
|
||||
hw->swfwhw_semaphore_present = TRUE;
|
||||
hw->asf_firmware_present = TRUE;
|
||||
break;
|
||||
@@ -504,6 +508,7 @@ e1000_set_media_type(struct e1000_hw *hw)
|
||||
break;
|
||||
case e1000_ich8lan:
|
||||
case e1000_82573:
|
||||
case e1000_82576:
|
||||
/* The STATUS_TBIMODE bit is reserved or reused for the this
|
||||
* device.
|
||||
*/
|
||||
@@ -750,7 +755,8 @@ e1000_reset_hw(struct e1000_hw *hw)
|
||||
static void
|
||||
e1000_initialize_hardware_bits(struct e1000_hw *hw)
|
||||
{
|
||||
if ((hw->mac_type >= e1000_82571) && (!hw->initialize_hw_bits_disable)) {
|
||||
if ((hw->mac_type >= e1000_82571 && hw->mac_type < e1000_82576) &&
|
||||
(!hw->initialize_hw_bits_disable)) {
|
||||
/* Settings common to all PCI-express silicon */
|
||||
uint32_t reg_ctrl, reg_ctrl_ext;
|
||||
uint32_t reg_tarc0, reg_tarc1;
|
||||
@@ -907,11 +913,27 @@ e1000_init_hw(struct e1000_hw *hw)
|
||||
|
||||
/* Disabling VLAN filtering. */
|
||||
DEBUGOUT("Initializing the IEEE VLAN\n");
|
||||
/* VET hardcoded to standard value and VFTA removed in ICH8 LAN */
|
||||
if (hw->mac_type != e1000_ich8lan) {
|
||||
switch (hw->mac_type) {
|
||||
case e1000_ich8lan:
|
||||
/* VET hardcoded to standard value and VFTA removed in ICH8 LAN */
|
||||
break;
|
||||
case e1000_82576:
|
||||
/* There is no need to clear vfta on 82576 if VLANs are not used.
|
||||
* - Intel® 82576 Gigabit Ethernet Controller Datasheet r2.41
|
||||
* Section 8.10.19 Table Array - VFTA
|
||||
*
|
||||
* Setting VET may also be unnecessary, however the documentation
|
||||
* isn't specific on this point. The value used here is as advised in
|
||||
* - Intel® 82576 Gigabit Ethernet Controller Datasheet r2.41
|
||||
* Section 8.2.7 VLAN Ether Type - VET
|
||||
*/
|
||||
E1000_WRITE_REG(hw, VET, ETHERNET_IEEE_VLAN_TYPE);
|
||||
break;
|
||||
default:
|
||||
if (hw->mac_type < e1000_82545_rev_3)
|
||||
E1000_WRITE_REG(hw, VET, 0);
|
||||
e1000_clear_vfta(hw);
|
||||
break;
|
||||
}
|
||||
|
||||
/* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
|
||||
@@ -1477,9 +1499,13 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
/* Wait 15ms for MAC to configure PHY from eeprom settings */
|
||||
msleep(15);
|
||||
if (hw->mac_type != e1000_ich8lan) {
|
||||
/*
|
||||
* Wait 100ms for MAC to configure PHY from NVM settings, to avoid
|
||||
* timeout issues when LFS is enabled.
|
||||
*/
|
||||
msleep(100);
|
||||
|
||||
if (hw->mac_type != e1000_ich8lan && hw->mac_type != e1000_82576) {
|
||||
/* Configure activity LED after PHY reset */
|
||||
led_ctrl = E1000_READ_REG(hw, LEDCTL);
|
||||
led_ctrl &= IGP_ACTIVITY_LED_MASK;
|
||||
@@ -3493,7 +3519,7 @@ e1000_read_phy_reg(struct e1000_hw *hw,
|
||||
|
||||
DEBUGFUNC("e1000_read_phy_reg");
|
||||
|
||||
if ((hw->mac_type == e1000_80003es2lan) &&
|
||||
if ((hw->mac_type == e1000_80003es2lan || hw->mac_type == e1000_82576) &&
|
||||
(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)) {
|
||||
swfw = E1000_SWFW_PHY1_SM;
|
||||
} else {
|
||||
@@ -3631,7 +3657,7 @@ e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr,
|
||||
|
||||
DEBUGFUNC("e1000_write_phy_reg");
|
||||
|
||||
if ((hw->mac_type == e1000_80003es2lan) &&
|
||||
if ((hw->mac_type == e1000_80003es2lan || hw->mac_type == e1000_82576) &&
|
||||
(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)) {
|
||||
swfw = E1000_SWFW_PHY1_SM;
|
||||
} else {
|
||||
@@ -3751,7 +3777,7 @@ e1000_read_kmrn_reg(struct e1000_hw *hw,
|
||||
uint16_t swfw;
|
||||
DEBUGFUNC("e1000_read_kmrn_reg");
|
||||
|
||||
if ((hw->mac_type == e1000_80003es2lan) &&
|
||||
if ((hw->mac_type == e1000_80003es2lan || hw->mac_type == e1000_82576) &&
|
||||
(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)) {
|
||||
swfw = E1000_SWFW_PHY1_SM;
|
||||
} else {
|
||||
@@ -3784,7 +3810,7 @@ e1000_write_kmrn_reg(struct e1000_hw *hw,
|
||||
uint16_t swfw;
|
||||
DEBUGFUNC("e1000_write_kmrn_reg");
|
||||
|
||||
if ((hw->mac_type == e1000_80003es2lan) &&
|
||||
if ((hw->mac_type == e1000_80003es2lan || hw->mac_type == e1000_82576) &&
|
||||
(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)) {
|
||||
swfw = E1000_SWFW_PHY1_SM;
|
||||
} else {
|
||||
@@ -3826,7 +3852,8 @@ e1000_phy_hw_reset(struct e1000_hw *hw)
|
||||
DEBUGOUT("Resetting Phy...\n");
|
||||
|
||||
if (hw->mac_type > e1000_82543) {
|
||||
if ((hw->mac_type == e1000_80003es2lan) &&
|
||||
if ((hw->mac_type == e1000_80003es2lan ||
|
||||
hw->mac_type == e1000_82576) &&
|
||||
(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)) {
|
||||
swfw = E1000_SWFW_PHY1_SM;
|
||||
} else {
|
||||
@@ -4136,6 +4163,9 @@ e1000_detect_gig_phy(struct e1000_hw *hw)
|
||||
if (hw->phy_id == IFE_PLUS_E_PHY_ID) match = TRUE;
|
||||
if (hw->phy_id == IFE_C_E_PHY_ID) match = TRUE;
|
||||
break;
|
||||
case e1000_82576:
|
||||
match = TRUE;
|
||||
break;
|
||||
default:
|
||||
DEBUGOUT1("Invalid MAC type %d\n", hw->mac_type);
|
||||
return -E1000_ERR_CONFIG;
|
||||
@@ -4607,6 +4637,38 @@ e1000_init_eeprom_params(struct e1000_hw *hw)
|
||||
|
||||
hw->flash_bank_size /= 2 * sizeof(uint16_t);
|
||||
|
||||
break;
|
||||
}
|
||||
case e1000_82576:
|
||||
{
|
||||
uint16_t size;
|
||||
|
||||
eeprom->type = e1000_eeprom_spi;
|
||||
eeprom->opcode_bits = 8;
|
||||
eeprom->delay_usec = 1;
|
||||
if (eecd & E1000_EECD_ADDR_BITS) {
|
||||
eeprom->page_size = 32;
|
||||
eeprom->address_bits = 16;
|
||||
} else {
|
||||
eeprom->page_size = 8;
|
||||
eeprom->address_bits = 8;
|
||||
}
|
||||
eeprom->use_eerd = TRUE;
|
||||
eeprom->use_eewr = FALSE;
|
||||
|
||||
size = (uint16_t)((eecd & E1000_EECD_SIZE_EX_MASK) >>
|
||||
E1000_EECD_SIZE_EX_SHIFT);
|
||||
/*
|
||||
* Added to a constant, "size" becomes the left-shift value
|
||||
* for setting word_size.
|
||||
*/
|
||||
size += EEPROM_WORD_SIZE_SHIFT;
|
||||
|
||||
/* EEPROM access above 16k is unsupported */
|
||||
if (size > 14)
|
||||
size = 14;
|
||||
eeprom->word_size = 1 << size;
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -5014,8 +5076,7 @@ e1000_read_eeprom(struct e1000_hw *hw,
|
||||
* directly. In this case, we need to acquire the EEPROM so that
|
||||
* FW or other port software does not interrupt.
|
||||
*/
|
||||
if (e1000_is_onboard_nvm_eeprom(hw) == TRUE &&
|
||||
hw->eeprom.use_eerd == FALSE) {
|
||||
if (hw->eeprom.use_eerd == FALSE && e1000_is_onboard_nvm_eeprom(hw)) {
|
||||
/* Prepare the EEPROM for bit-bang reading */
|
||||
if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
|
||||
return -E1000_ERR_EEPROM;
|
||||
@@ -5198,6 +5259,8 @@ e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw)
|
||||
|
||||
DEBUGFUNC("e1000_is_onboard_nvm_eeprom");
|
||||
|
||||
assert(hw->mac_type != e1000_82576);
|
||||
|
||||
if (hw->mac_type == e1000_ich8lan)
|
||||
return FALSE;
|
||||
|
||||
@@ -5732,6 +5795,7 @@ e1000_read_mac_addr(struct e1000_hw * hw)
|
||||
case e1000_82546:
|
||||
case e1000_82546_rev_3:
|
||||
case e1000_82571:
|
||||
case e1000_82576:
|
||||
case e1000_80003es2lan:
|
||||
if (E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)
|
||||
hw->perm_mac_addr[5] ^= 0x01;
|
||||
@@ -5944,6 +6008,13 @@ e1000_rar_set(struct e1000_hw *hw,
|
||||
case e1000_80003es2lan:
|
||||
if (hw->leave_av_bit_off == TRUE)
|
||||
break;
|
||||
case e1000_82576:
|
||||
/* If MAC address zero, no need to set the AV bit */
|
||||
if (rar_low || rar_high)
|
||||
rar_high |= E1000_RAH_AV;
|
||||
// Only neded when Multiple Receive Queues are enabmed in MRQC
|
||||
rar_high |= E1000_RAH_POOL_1;
|
||||
break;
|
||||
default:
|
||||
/* Indicate to hardware the Address is Valid. */
|
||||
rar_high |= E1000_RAH_AV;
|
||||
@@ -6609,6 +6680,7 @@ e1000_get_bus_info(struct e1000_hw *hw)
|
||||
case e1000_82572:
|
||||
case e1000_82573:
|
||||
case e1000_80003es2lan:
|
||||
case e1000_82576:
|
||||
hw->bus_type = e1000_bus_type_pci_express;
|
||||
hw->bus_speed = e1000_bus_speed_2500;
|
||||
ret_val = e1000_read_pcie_cap_reg(hw,
|
||||
@@ -8027,6 +8099,7 @@ e1000_get_auto_rd_done(struct e1000_hw *hw)
|
||||
case e1000_82573:
|
||||
case e1000_80003es2lan:
|
||||
case e1000_ich8lan:
|
||||
case e1000_82576:
|
||||
while (timeout) {
|
||||
if (E1000_READ_REG(hw, EECD) & E1000_EECD_AUTO_RD)
|
||||
break;
|
||||
@@ -8072,6 +8145,7 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw)
|
||||
mdelay(10);
|
||||
break;
|
||||
case e1000_80003es2lan:
|
||||
case e1000_82576:
|
||||
/* Separate *_CFG_DONE_* bit for each port */
|
||||
if (E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)
|
||||
cfg_mask = E1000_EEPROM_CFG_DONE_PORT_1;
|
||||
@@ -8282,6 +8356,7 @@ e1000_arc_subsystem_valid(struct e1000_hw *hw)
|
||||
case e1000_82572:
|
||||
case e1000_82573:
|
||||
case e1000_80003es2lan:
|
||||
case e1000_82576:
|
||||
fwsm = E1000_READ_REG(hw, FWSM);
|
||||
if ((fwsm & E1000_FWSM_MODE_MASK) != 0)
|
||||
return TRUE;
|
||||
|
||||
@@ -64,6 +64,7 @@ typedef enum {
|
||||
e1000_82573,
|
||||
e1000_80003es2lan,
|
||||
e1000_ich8lan,
|
||||
e1000_82576,
|
||||
e1000_num_macs
|
||||
} e1000_mac_type;
|
||||
|
||||
@@ -502,6 +503,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);
|
||||
#define E1000_DEV_ID_ICH8_IFE_G 0x10C5
|
||||
#define E1000_DEV_ID_ICH8_IGP_M 0x104D
|
||||
|
||||
#define E1000_DEV_ID_82576 0x10C9
|
||||
|
||||
#define NODE_ADDRESS_SIZE 6
|
||||
#define ETH_LENGTH_OF_ADDRESS 6
|
||||
@@ -569,7 +571,8 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);
|
||||
E1000_IMS_TXDW | \
|
||||
E1000_IMS_RXDMT0 | \
|
||||
E1000_IMS_RXSEQ | \
|
||||
E1000_IMS_LSC)
|
||||
E1000_IMS_LSC | \
|
||||
E1000_IMS_DOUTSYNC)
|
||||
|
||||
/* Additional interrupts need to be handled for e1000_ich8lan:
|
||||
DSW = The FW changed the status of the DISSW bit in FWSM
|
||||
@@ -1748,12 +1751,16 @@ struct e1000_hw {
|
||||
/* Receive Address */
|
||||
#define E1000_RAH_AV 0x80000000 /* Receive descriptor valid */
|
||||
|
||||
#define E1000_RAH_POOL_1 0x00040000
|
||||
|
||||
/* Interrupt Cause Read */
|
||||
#define E1000_ICR_TXDW 0x00000001 /* Transmit desc written back */
|
||||
#define E1000_ICR_TXQE 0x00000002 /* Transmit Queue empty */
|
||||
#define E1000_ICR_LSC 0x00000004 /* Link Status Change */
|
||||
#define E1000_ICR_RXSEQ 0x00000008 /* rx sequence error */
|
||||
#define E1000_ICR_RXDMT0 0x00000010 /* rx desc min. threshold (0) */
|
||||
/* LAN connected device generates an interrupt */
|
||||
#define E1000_ICR_DOUTSYNC 0x10000000 /* NIC DMA out of sync */
|
||||
#define E1000_ICR_RXO 0x00000040 /* rx overrun */
|
||||
#define E1000_ICR_RXT0 0x00000080 /* rx timer intr (ring 0) */
|
||||
#define E1000_ICR_MDAC 0x00000200 /* MDIO access complete */
|
||||
@@ -1815,6 +1822,7 @@ struct e1000_hw {
|
||||
#define E1000_IMS_RXSEQ E1000_ICR_RXSEQ /* rx sequence error */
|
||||
#define E1000_IMS_RXDMT0 E1000_ICR_RXDMT0 /* rx desc min. threshold */
|
||||
#define E1000_IMS_RXO E1000_ICR_RXO /* rx overrun */
|
||||
#define E1000_IMS_DOUTSYNC E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
|
||||
#define E1000_IMS_RXT0 E1000_ICR_RXT0 /* rx timer intr */
|
||||
#define E1000_IMS_MDAC E1000_ICR_MDAC /* MDIO access complete */
|
||||
#define E1000_IMS_RXCFG E1000_ICR_RXCFG /* RX /c/ ordered set */
|
||||
@@ -1975,6 +1983,10 @@ struct e1000_hw {
|
||||
#define E1000_RXDCTL_HTHRESH 0x00003F00 /* RXDCTL Host Threshold */
|
||||
#define E1000_RXDCTL_WTHRESH 0x003F0000 /* RXDCTL Writeback Threshold */
|
||||
#define E1000_RXDCTL_GRAN 0x01000000 /* RXDCTL Granularity */
|
||||
#define E1000_RXDCTL_QUEUE_ENABLE 0x02000000 /* Enable specific Rx Queue */
|
||||
#define IGB_RX_PTHRESH 16
|
||||
#define IGB_RX_HTHRESH 8
|
||||
#define IGB_RX_WTHRESH 1
|
||||
|
||||
/* Transmit Descriptor Control */
|
||||
#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
|
||||
@@ -1985,6 +1997,7 @@ struct e1000_hw {
|
||||
#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
|
||||
#define E1000_TXDCTL_COUNT_DESC 0x00400000 /* Enable the counting of desc.
|
||||
still to be processed. */
|
||||
#define E1000_TXDCTL_QUEUE_ENABLE 0x02000000 /* Enable specific Tx Queue */
|
||||
/* Transmit Configuration Word */
|
||||
#define E1000_TXCW_FD 0x00000020 /* TXCW full duplex */
|
||||
#define E1000_TXCW_HD 0x00000040 /* TXCW half duplex */
|
||||
@@ -2034,6 +2047,7 @@ struct e1000_hw {
|
||||
|
||||
/* Multiple Receive Queue Control */
|
||||
#define E1000_MRQC_ENABLE_MASK 0x00000003
|
||||
#define E1000_MRQC_ENABLE_VMDQ 0x00000003
|
||||
#define E1000_MRQC_ENABLE_RSS_2Q 0x00000001
|
||||
#define E1000_MRQC_ENABLE_RSS_INT 0x00000004
|
||||
#define E1000_MRQC_RSS_FIELD_MASK 0xFFFF0000
|
||||
@@ -2437,6 +2451,7 @@ struct e1000_host_command_info {
|
||||
#define E1000_PBA_38K 0x0026
|
||||
#define E1000_PBA_40K 0x0028
|
||||
#define E1000_PBA_48K 0x0030 /* 48KB, default RX allocation */
|
||||
#define E1000_PBA_64K 0x0040 /* 64KB */
|
||||
|
||||
#define E1000_PBS_16K E1000_PBA_16K
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,310 @@
|
||||
|
||||
#ifndef __SIS190_H__
|
||||
#define __SIS190_H__
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <assert.h>
|
||||
#include <byteswap.h>
|
||||
#include <errno.h>
|
||||
#include <mii.h>
|
||||
#include <gpxe/ethernet.h>
|
||||
#include <gpxe/if_ether.h>
|
||||
#include <gpxe/io.h>
|
||||
#include <gpxe/iobuf.h>
|
||||
#include <gpxe/malloc.h>
|
||||
#include <gpxe/netdevice.h>
|
||||
#include <gpxe/pci.h>
|
||||
#include <gpxe/timer.h>
|
||||
|
||||
#define PCI_VENDOR_ID_SI 0x1039
|
||||
|
||||
#define PHY_MAX_ADDR 32
|
||||
#define PHY_ID_ANY 0x1f
|
||||
#define MII_REG_ANY 0x1f
|
||||
|
||||
#define DRV_VERSION "1.3"
|
||||
#define DRV_NAME "sis190"
|
||||
#define SIS190_DRIVER_NAME DRV_NAME " Gigabit Ethernet driver " DRV_VERSION
|
||||
#define PFX DRV_NAME ": "
|
||||
|
||||
#define sis190_rx_quota(count, quota) count
|
||||
|
||||
#define NUM_TX_DESC 8 /* [8..1024] */
|
||||
#define NUM_RX_DESC 8 /* [8..8192] */
|
||||
#define TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc))
|
||||
#define RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc))
|
||||
#define RX_BUF_SIZE 1536
|
||||
#define RX_BUF_MASK 0xfff8
|
||||
|
||||
#define RING_ALIGNMENT 256
|
||||
|
||||
#define SIS190_REGS_SIZE 0x80
|
||||
|
||||
/* Enhanced PHY access register bit definitions */
|
||||
#define EhnMIIread 0x0000
|
||||
#define EhnMIIwrite 0x0020
|
||||
#define EhnMIIdataShift 16
|
||||
#define EhnMIIpmdShift 6 /* 7016 only */
|
||||
#define EhnMIIregShift 11
|
||||
#define EhnMIIreq 0x0010
|
||||
#define EhnMIInotDone 0x0010
|
||||
|
||||
/* Write/read MMIO register */
|
||||
#define SIS_W8(reg, val) writeb ((val), ioaddr + (reg))
|
||||
#define SIS_W16(reg, val) writew ((val), ioaddr + (reg))
|
||||
#define SIS_W32(reg, val) writel ((val), ioaddr + (reg))
|
||||
#define SIS_R8(reg) readb (ioaddr + (reg))
|
||||
#define SIS_R16(reg) readw (ioaddr + (reg))
|
||||
#define SIS_R32(reg) readl (ioaddr + (reg))
|
||||
|
||||
#define SIS_PCI_COMMIT() SIS_R32(IntrControl)
|
||||
|
||||
enum sis190_registers {
|
||||
TxControl = 0x00,
|
||||
TxDescStartAddr = 0x04,
|
||||
rsv0 = 0x08, // reserved
|
||||
TxSts = 0x0c, // unused (Control/Status)
|
||||
RxControl = 0x10,
|
||||
RxDescStartAddr = 0x14,
|
||||
rsv1 = 0x18, // reserved
|
||||
RxSts = 0x1c, // unused
|
||||
IntrStatus = 0x20,
|
||||
IntrMask = 0x24,
|
||||
IntrControl = 0x28,
|
||||
IntrTimer = 0x2c, // unused (Interupt Timer)
|
||||
PMControl = 0x30, // unused (Power Mgmt Control/Status)
|
||||
rsv2 = 0x34, // reserved
|
||||
ROMControl = 0x38,
|
||||
ROMInterface = 0x3c,
|
||||
StationControl = 0x40,
|
||||
GMIIControl = 0x44,
|
||||
GIoCR = 0x48, // unused (GMAC IO Compensation)
|
||||
GIoCtrl = 0x4c, // unused (GMAC IO Control)
|
||||
TxMacControl = 0x50,
|
||||
TxLimit = 0x54, // unused (Tx MAC Timer/TryLimit)
|
||||
RGDelay = 0x58, // unused (RGMII Tx Internal Delay)
|
||||
rsv3 = 0x5c, // reserved
|
||||
RxMacControl = 0x60,
|
||||
RxMacAddr = 0x62,
|
||||
RxHashTable = 0x68,
|
||||
// Undocumented = 0x6c,
|
||||
RxWolCtrl = 0x70,
|
||||
RxWolData = 0x74, // unused (Rx WOL Data Access)
|
||||
RxMPSControl = 0x78, // unused (Rx MPS Control)
|
||||
rsv4 = 0x7c, // reserved
|
||||
};
|
||||
|
||||
enum sis190_register_content {
|
||||
/* IntrStatus */
|
||||
SoftInt = 0x40000000, // unused
|
||||
Timeup = 0x20000000, // unused
|
||||
PauseFrame = 0x00080000, // unused
|
||||
MagicPacket = 0x00040000, // unused
|
||||
WakeupFrame = 0x00020000, // unused
|
||||
LinkChange = 0x00010000,
|
||||
RxQEmpty = 0x00000080,
|
||||
RxQInt = 0x00000040,
|
||||
TxQ1Empty = 0x00000020, // unused
|
||||
TxQ1Int = 0x00000010,
|
||||
TxQ0Empty = 0x00000008, // unused
|
||||
TxQ0Int = 0x00000004,
|
||||
RxHalt = 0x00000002,
|
||||
TxHalt = 0x00000001,
|
||||
|
||||
/* {Rx/Tx}CmdBits */
|
||||
CmdReset = 0x10,
|
||||
CmdRxEnb = 0x08, // unused
|
||||
CmdTxEnb = 0x01,
|
||||
RxBufEmpty = 0x01, // unused
|
||||
|
||||
/* Cfg9346Bits */
|
||||
Cfg9346_Lock = 0x00, // unused
|
||||
Cfg9346_Unlock = 0xc0, // unused
|
||||
|
||||
/* RxMacControl */
|
||||
AcceptErr = 0x20, // unused
|
||||
AcceptRunt = 0x10, // unused
|
||||
AcceptBroadcast = 0x0800,
|
||||
AcceptMulticast = 0x0400,
|
||||
AcceptMyPhys = 0x0200,
|
||||
AcceptAllPhys = 0x0100,
|
||||
|
||||
/* RxConfigBits */
|
||||
RxCfgFIFOShift = 13,
|
||||
RxCfgDMAShift = 8, // 0x1a in RxControl ?
|
||||
|
||||
/* TxConfigBits */
|
||||
TxInterFrameGapShift = 24,
|
||||
TxDMAShift = 8, /* DMA burst value (0-7) is shift this many bits */
|
||||
|
||||
LinkStatus = 0x02, // unused
|
||||
FullDup = 0x01, // unused
|
||||
|
||||
/* TBICSRBit */
|
||||
TBILinkOK = 0x02000000, // unused
|
||||
};
|
||||
|
||||
struct TxDesc {
|
||||
volatile u32 PSize;
|
||||
volatile u32 status;
|
||||
volatile u32 addr;
|
||||
volatile u32 size;
|
||||
};
|
||||
|
||||
struct RxDesc {
|
||||
volatile u32 PSize;
|
||||
volatile u32 status;
|
||||
volatile u32 addr;
|
||||
volatile u32 size;
|
||||
};
|
||||
|
||||
enum _DescStatusBit {
|
||||
/* _Desc.status */
|
||||
OWNbit = 0x80000000, // RXOWN/TXOWN
|
||||
INTbit = 0x40000000, // RXINT/TXINT
|
||||
CRCbit = 0x00020000, // CRCOFF/CRCEN
|
||||
PADbit = 0x00010000, // PREADD/PADEN
|
||||
/* _Desc.size */
|
||||
RingEnd = 0x80000000,
|
||||
/* TxDesc.status */
|
||||
LSEN = 0x08000000, // TSO ? -- FR
|
||||
IPCS = 0x04000000,
|
||||
TCPCS = 0x02000000,
|
||||
UDPCS = 0x01000000,
|
||||
BSTEN = 0x00800000,
|
||||
EXTEN = 0x00400000,
|
||||
DEFEN = 0x00200000,
|
||||
BKFEN = 0x00100000,
|
||||
CRSEN = 0x00080000,
|
||||
COLEN = 0x00040000,
|
||||
THOL3 = 0x30000000,
|
||||
THOL2 = 0x20000000,
|
||||
THOL1 = 0x10000000,
|
||||
THOL0 = 0x00000000,
|
||||
|
||||
WND = 0x00080000,
|
||||
TABRT = 0x00040000,
|
||||
FIFO = 0x00020000,
|
||||
LINK = 0x00010000,
|
||||
ColCountMask = 0x0000ffff,
|
||||
/* RxDesc.status */
|
||||
IPON = 0x20000000,
|
||||
TCPON = 0x10000000,
|
||||
UDPON = 0x08000000,
|
||||
Wakup = 0x00400000,
|
||||
Magic = 0x00200000,
|
||||
Pause = 0x00100000,
|
||||
DEFbit = 0x00200000,
|
||||
BCAST = 0x000c0000,
|
||||
MCAST = 0x00080000,
|
||||
UCAST = 0x00040000,
|
||||
/* RxDesc.PSize */
|
||||
TAGON = 0x80000000,
|
||||
RxDescCountMask = 0x7f000000, // multi-desc pkt when > 1 ? -- FR
|
||||
ABORT = 0x00800000,
|
||||
SHORT = 0x00400000,
|
||||
LIMIT = 0x00200000,
|
||||
MIIER = 0x00100000,
|
||||
OVRUN = 0x00080000,
|
||||
NIBON = 0x00040000,
|
||||
COLON = 0x00020000,
|
||||
CRCOK = 0x00010000,
|
||||
RxSizeMask = 0x0000ffff
|
||||
/*
|
||||
* The asic could apparently do vlan, TSO, jumbo (sis191 only) and
|
||||
* provide two (unused with Linux) Tx queues. No publically
|
||||
* available documentation alas.
|
||||
*/
|
||||
};
|
||||
|
||||
enum sis190_eeprom_access_register_bits {
|
||||
EECS = 0x00000001, // unused
|
||||
EECLK = 0x00000002, // unused
|
||||
EEDO = 0x00000008, // unused
|
||||
EEDI = 0x00000004, // unused
|
||||
EEREQ = 0x00000080,
|
||||
EEROP = 0x00000200,
|
||||
EEWOP = 0x00000100 // unused
|
||||
};
|
||||
|
||||
/* EEPROM Addresses */
|
||||
enum sis190_eeprom_address {
|
||||
EEPROMSignature = 0x00,
|
||||
EEPROMCLK = 0x01, // unused
|
||||
EEPROMInfo = 0x02,
|
||||
EEPROMMACAddr = 0x03
|
||||
};
|
||||
|
||||
enum sis190_feature {
|
||||
F_HAS_RGMII = 1,
|
||||
F_PHY_88E1111 = 2,
|
||||
F_PHY_BCM5461 = 4
|
||||
};
|
||||
|
||||
struct sis190_private {
|
||||
void *mmio_addr;
|
||||
struct pci_device *pci_device;
|
||||
struct net_device *dev;
|
||||
u32 cur_rx;
|
||||
u32 cur_tx;
|
||||
u32 dirty_rx;
|
||||
u32 dirty_tx;
|
||||
u32 rx_dma;
|
||||
u32 tx_dma;
|
||||
struct RxDesc *RxDescRing;
|
||||
struct TxDesc *TxDescRing;
|
||||
struct io_buffer *Rx_iobuf[NUM_RX_DESC];
|
||||
struct io_buffer *Tx_iobuf[NUM_TX_DESC];
|
||||
struct mii_if_info mii_if;
|
||||
struct list_head first_phy;
|
||||
u32 features;
|
||||
};
|
||||
|
||||
struct sis190_phy {
|
||||
struct list_head list;
|
||||
int phy_id;
|
||||
u16 id[2];
|
||||
u16 status;
|
||||
u8 type;
|
||||
};
|
||||
|
||||
enum sis190_phy_type {
|
||||
UNKNOWN = 0x00,
|
||||
HOME = 0x01,
|
||||
LAN = 0x02,
|
||||
MIX = 0x03
|
||||
};
|
||||
|
||||
static struct mii_chip_info {
|
||||
const char *name;
|
||||
u16 id[2];
|
||||
unsigned int type;
|
||||
u32 feature;
|
||||
} mii_chip_table[] = {
|
||||
{ "Atheros PHY", { 0x004d, 0xd010 }, LAN, 0 },
|
||||
{ "Atheros PHY AR8012", { 0x004d, 0xd020 }, LAN, 0 },
|
||||
{ "Broadcom PHY BCM5461", { 0x0020, 0x60c0 }, LAN, F_PHY_BCM5461 },
|
||||
{ "Broadcom PHY AC131", { 0x0143, 0xbc70 }, LAN, 0 },
|
||||
{ "Agere PHY ET1101B", { 0x0282, 0xf010 }, LAN, 0 },
|
||||
{ "Marvell PHY 88E1111", { 0x0141, 0x0cc0 }, LAN, F_PHY_88E1111 },
|
||||
{ "Realtek PHY RTL8201", { 0x0000, 0x8200 }, LAN, 0 },
|
||||
{ NULL, { 0x00, 0x00 }, 0, 0 }
|
||||
};
|
||||
|
||||
static const struct {
|
||||
const char *name;
|
||||
} sis_chip_info[] = {
|
||||
{ "SiS 190 PCI Fast Ethernet adapter" },
|
||||
{ "SiS 191 PCI Gigabit Ethernet adapter" },
|
||||
};
|
||||
|
||||
static void sis190_phy_task(struct sis190_private *tp);
|
||||
static void sis190_free(struct net_device *dev);
|
||||
static inline void sis190_init_rxfilter(struct net_device *dev);
|
||||
|
||||
#endif
|
||||
@@ -1183,8 +1183,12 @@ static int
|
||||
sis900_poll(struct nic *nic, int retrieve)
|
||||
{
|
||||
u32 rx_status = rxd[cur_rx].cmdsts;
|
||||
u32 intr_status;
|
||||
int retstat = 0;
|
||||
|
||||
/* acknowledge interrupts by reading interrupt status register */
|
||||
intr_status = inl(ioaddr + isr);
|
||||
|
||||
if (sis900_debug > 2)
|
||||
printf("sis900_poll: cur_rx:%d, status:%X\n", cur_rx,
|
||||
(unsigned int) rx_status);
|
||||
@@ -1264,8 +1268,10 @@ sis900_irq(struct nic *nic __unused, irq_action_t action __unused)
|
||||
{
|
||||
switch ( action ) {
|
||||
case DISABLE :
|
||||
outl(0, ioaddr + imr);
|
||||
break;
|
||||
case ENABLE :
|
||||
outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
|
||||
break;
|
||||
case FORCE :
|
||||
break;
|
||||
|
||||
@@ -113,6 +113,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
#define ERRFILE_rtl818x ( ERRFILE_DRIVER | 0x004e0000 )
|
||||
#define ERRFILE_sky2 ( ERRFILE_DRIVER | 0x004f0000 )
|
||||
#define ERRFILE_ath5k ( ERRFILE_DRIVER | 0x00500000 )
|
||||
#define ERRFILE_atl1e ( ERRFILE_DRIVER | 0x00510000 )
|
||||
#define ERRFILE_sis190 ( ERRFILE_DRIVER | 0x00520000 )
|
||||
|
||||
#define ERRFILE_scsi ( ERRFILE_DRIVER | 0x00700000 )
|
||||
#define ERRFILE_arbel ( ERRFILE_DRIVER | 0x00710000 )
|
||||
|
||||
@@ -310,7 +310,9 @@ static void ib_cm_path_complete ( struct ib_device *ibdev,
|
||||
private_data_len );
|
||||
|
||||
/* Create connection request */
|
||||
conn->madx = ib_create_madx ( ibdev, ibdev->gsi, &mad, NULL,
|
||||
av->qpn = IB_QPN_GSI;
|
||||
av->qkey = IB_QKEY_GSI;
|
||||
conn->madx = ib_create_madx ( ibdev, ibdev->gsi, &mad, av,
|
||||
&ib_cm_req_op );
|
||||
if ( ! conn->madx ) {
|
||||
DBGC ( conn, "CM %p could not create connection request\n",
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ case $# in
|
||||
esac
|
||||
|
||||
case "`mtools -V`" in
|
||||
Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|Mtools\ version\ 4.*)
|
||||
Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|[mM]tools\ *\ [4-9].*)
|
||||
;;
|
||||
*)
|
||||
echo Mtools version 3.9.9 or later is required
|
||||
|
||||
Regular → Executable
+1
-1
@@ -15,7 +15,7 @@ case $# in
|
||||
;;
|
||||
esac
|
||||
case "`mtools -V`" in
|
||||
Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|Mtools\ version\ 4.*)
|
||||
Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|[mM]tools\ *\ [4-9].*)
|
||||
;;
|
||||
*)
|
||||
echo Mtools version 3.9.9 or later is required
|
||||
|
||||
+2
-2
@@ -131,9 +131,9 @@ sub writerom ($$) {
|
||||
sub checksum ($) {
|
||||
my ($romref) = @_;
|
||||
|
||||
substr($$romref, 5, 1) = "\x00";
|
||||
substr($$romref, 6, 1) = "\x00";
|
||||
my $sum = unpack('%8C*', $$romref);
|
||||
substr($$romref, 5, 1) = chr(256 - $sum);
|
||||
substr($$romref, 6, 1) = chr(256 - $sum);
|
||||
# Double check
|
||||
$sum = unpack('%8C*', $$romref);
|
||||
if ($sum != 0) {
|
||||
|
||||
+11
-11
@@ -81,13 +81,13 @@ static int read_file ( const char *filename, void **buf, size_t *len ) {
|
||||
*len = stat.st_size;
|
||||
*buf = malloc ( *len );
|
||||
if ( ! *buf ) {
|
||||
fprintf ( stderr, "Could not malloc() %d bytes for %s: %s\n",
|
||||
fprintf ( stderr, "Could not malloc() %zd bytes for %s: %s\n",
|
||||
*len, filename, strerror ( errno ) );
|
||||
goto err;
|
||||
}
|
||||
|
||||
if ( fread ( *buf, 1, *len, file ) != *len ) {
|
||||
fprintf ( stderr, "Could not read %d bytes from %s: %s\n",
|
||||
fprintf ( stderr, "Could not read %zd bytes from %s: %s\n",
|
||||
*len, filename, strerror ( errno ) );
|
||||
goto err;
|
||||
}
|
||||
@@ -115,7 +115,7 @@ static int read_zinfo_file ( const char *filename,
|
||||
return -1;
|
||||
|
||||
if ( ( len % sizeof ( *(zinfo->zinfo) ) ) != 0 ) {
|
||||
fprintf ( stderr, ".zinfo file %s has invalid length %d\n",
|
||||
fprintf ( stderr, ".zinfo file %s has invalid length %zd\n",
|
||||
filename, len );
|
||||
return -1;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ static int alloc_output_file ( size_t max_len, struct output_file *output ) {
|
||||
output->max_len = ( max_len );
|
||||
output->buf = malloc ( max_len );
|
||||
if ( ! output->buf ) {
|
||||
fprintf ( stderr, "Could not allocate %d bytes for output\n",
|
||||
fprintf ( stderr, "Could not allocate %zd bytes for output\n",
|
||||
max_len );
|
||||
return -1;
|
||||
}
|
||||
@@ -197,7 +197,7 @@ static int process_zinfo_pack ( struct input_file *input,
|
||||
if ( DEBUG ) {
|
||||
fprintf ( stderr, "PACK [%#zx,%#zx) to [%#zx,%#zx)\n",
|
||||
offset, ( offset + len ), output->len,
|
||||
( output->len + packed_len ) );
|
||||
( size_t )( output->len + packed_len ) );
|
||||
}
|
||||
|
||||
output->len += packed_len;
|
||||
@@ -240,7 +240,7 @@ static int process_zinfo_add ( struct input_file *input,
|
||||
addend = *( ( int32_t * ) target );
|
||||
break;
|
||||
default:
|
||||
fprintf ( stderr, "Unsupported add datasize %d\n",
|
||||
fprintf ( stderr, "Unsupported add datasize %zd\n",
|
||||
datasize );
|
||||
return -1;
|
||||
}
|
||||
@@ -252,18 +252,18 @@ static int process_zinfo_add ( struct input_file *input,
|
||||
( ( 1UL << ( 8 * datasize ) ) - 1 ) : ~0UL );
|
||||
|
||||
if ( val < 0 ) {
|
||||
fprintf ( stderr, "Add %s%#lx+%#lx at %#zx %sflows field\n",
|
||||
fprintf ( stderr, "Add %s%#x+%#lx at %#zx %sflows field\n",
|
||||
( ( addend < 0 ) ? "-" : "" ), abs ( addend ), size,
|
||||
offset, ( ( addend < 0 ) ? "under" : "over" ) );
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ( val & ~mask ) {
|
||||
fprintf ( stderr, "Add %s%#lx+%#lx at %#zx overflows %d-byte "
|
||||
fprintf ( stderr, "Add %s%#x+%#lx at %#zx overflows %zd-byte "
|
||||
"field (%d bytes too big)\n",
|
||||
( ( addend < 0 ) ? "-" : "" ), abs ( addend ), size,
|
||||
offset, datasize,
|
||||
( ( val - mask - 1 ) * add->divisor ) );
|
||||
( int )( ( val - mask - 1 ) * add->divisor ) );
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -280,7 +280,7 @@ static int process_zinfo_add ( struct input_file *input,
|
||||
}
|
||||
|
||||
if ( DEBUG ) {
|
||||
fprintf ( stderr, "ADDx [%#zx,%#zx) (%s%#lx+(%#lx/%#x)) = "
|
||||
fprintf ( stderr, "ADDx [%#zx,%#zx) (%s%#x+(%#zx/%#x)) = "
|
||||
"%#lx\n", offset, ( offset + datasize ),
|
||||
( ( addend < 0 ) ? "-" : "" ), abs ( addend ),
|
||||
output->len, add->divisor, val );
|
||||
@@ -344,7 +344,7 @@ static int process_zinfo ( struct input_file *input,
|
||||
|
||||
static int write_output_file ( struct output_file *output ) {
|
||||
if ( fwrite ( output->buf, 1, output->len, stdout ) != output->len ) {
|
||||
fprintf ( stderr, "Could not write %d bytes of output: %s\n",
|
||||
fprintf ( stderr, "Could not write %zd bytes of output: %s\n",
|
||||
output->len, strerror ( errno ) );
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user