Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 256143
b: refs/heads/master
c: 57d6fa3
h: refs/heads/master
i:
  256141: 7ced7d7
  256139: 7684519
  256135: f3b58a5
  256127: 1707a06
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Jul 7, 2011
1 parent e64011b commit 5156b8a
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c074304c2bcf4b45e2b7ff86011beaa035ee52fd
refs/heads/master: 57d6fa37f56ca594a1becaf5b8774382ddb7d720
9 changes: 9 additions & 0 deletions trunk/drivers/net/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2303,6 +2303,15 @@ config SKGE_DEBUG

If unsure, say N.

config SKGE_GENESIS
bool "Support for older SysKonnect Genesis boards"
depends on SKGE
help
This enables support for the older and uncommon SysKonnect Genesis
chips, which support MII via an external transceiver, instead of
an internal one. Disabling this option will save some memory
by making code smaller. If unsure say Y.

config SKY2
tristate "SysKonnect Yukon2 support"
depends on PCI
Expand Down
79 changes: 47 additions & 32 deletions trunk/drivers/net/skge.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
static DEFINE_PCI_DEVICE_TABLE(skge_id_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_3COM, 0x1700) }, /* 3Com 3C940 */
{ PCI_DEVICE(PCI_VENDOR_ID_3COM, 0x80EB) }, /* 3Com 3C940B */
#ifdef CONFIG_SKGE_GENESIS
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x4300) }, /* SK-9xx */
#endif
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x4320) }, /* SK-98xx V2.0 */
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) }, /* D-Link DGE-530T (rev.B) */
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4c00) }, /* D-Link DGE-530T */
Expand Down Expand Up @@ -119,6 +122,15 @@ static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F };
static const u32 napimask[] = { IS_R1_F|IS_XA1_F, IS_R2_F|IS_XA2_F };
static const u32 portmask[] = { IS_PORT_1, IS_PORT_2 };

static inline bool is_genesis(const struct skge_hw *hw)
{
#ifdef CONFIG_SKGE_GENESIS
return hw->chip_id == CHIP_ID_GENESIS;
#else
return false;
#endif
}

static int skge_get_regs_len(struct net_device *dev)
{
return 0x4000;
Expand Down Expand Up @@ -146,7 +158,7 @@ static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs,
/* Wake on Lan only supported on Yukon chips with rev 1 or above */
static u32 wol_supported(const struct skge_hw *hw)
{
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
return 0;

if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev == 0)
Expand Down Expand Up @@ -270,7 +282,7 @@ static u32 skge_supported_modes(const struct skge_hw *hw)
SUPPORTED_Autoneg |
SUPPORTED_TP);

if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
supported &= ~(SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Half |
Expand Down Expand Up @@ -433,7 +445,7 @@ static void skge_get_ethtool_stats(struct net_device *dev,
{
struct skge_port *skge = netdev_priv(dev);

if (skge->hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(skge->hw))
genesis_get_stats(skge, data);
else
yukon_get_stats(skge, data);
Expand All @@ -448,7 +460,7 @@ static struct net_device_stats *skge_get_stats(struct net_device *dev)
struct skge_port *skge = netdev_priv(dev);
u64 data[ARRAY_SIZE(skge_stats)];

if (skge->hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(skge->hw))
genesis_get_stats(skge, data);
else
yukon_get_stats(skge, data);
Expand Down Expand Up @@ -589,7 +601,7 @@ static int skge_set_pauseparam(struct net_device *dev,
/* Chip internal frequency for clock calculations */
static inline u32 hwkhz(const struct skge_hw *hw)
{
return (hw->chip_id == CHIP_ID_GENESIS) ? 53125 : 78125;
return is_genesis(hw) ? 53125 : 78125;
}

/* Chip HZ to microseconds */
Expand Down Expand Up @@ -674,7 +686,7 @@ static void skge_led(struct skge_port *skge, enum led_mode mode)
int port = skge->port;

spin_lock_bh(&hw->phy_lock);
if (hw->chip_id == CHIP_ID_GENESIS) {
if (is_genesis(hw)) {
switch (mode) {
case LED_MODE_OFF:
if (hw->phy_type == SK_PHY_BCOM)
Expand Down Expand Up @@ -1053,7 +1065,6 @@ static void skge_link_down(struct skge_port *skge)
netif_info(skge, link, skge->netdev, "Link is down\n");
}


static void xm_link_down(struct skge_hw *hw, int port)
{
struct net_device *dev = hw->dev[port];
Expand Down Expand Up @@ -1172,7 +1183,6 @@ static void genesis_reset(struct skge_hw *hw, int port)
xm_write32(hw, port, XM_MODE, reg | XM_MD_FRF);
}


/* Convert mode to MII values */
static const u16 phy_pause_map[] = {
[FLOW_MODE_NONE] = 0,
Expand Down Expand Up @@ -2405,7 +2415,7 @@ static void skge_phy_reset(struct skge_port *skge)
netif_carrier_off(skge->netdev);

spin_lock_bh(&hw->phy_lock);
if (hw->chip_id == CHIP_ID_GENESIS) {
if (is_genesis(hw)) {
genesis_reset(hw, port);
genesis_mac_init(hw, port);
} else {
Expand Down Expand Up @@ -2436,7 +2446,8 @@ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case SIOCGMIIREG: {
u16 val = 0;
spin_lock_bh(&hw->phy_lock);
if (hw->chip_id == CHIP_ID_GENESIS)

if (is_genesis(hw))
err = __xm_phy_read(hw, skge->port, data->reg_num & 0x1f, &val);
else
err = __gm_phy_read(hw, skge->port, data->reg_num & 0x1f, &val);
Expand All @@ -2447,7 +2458,7 @@ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

case SIOCSMIIREG:
spin_lock_bh(&hw->phy_lock);
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
err = xm_phy_write(hw, skge->port, data->reg_num & 0x1f,
data->val_in);
else
Expand Down Expand Up @@ -2559,7 +2570,7 @@ static int skge_up(struct net_device *dev)

/* Initialize MAC */
spin_lock_bh(&hw->phy_lock);
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
genesis_mac_init(hw, port);
else
yukon_mac_init(hw, port);
Expand Down Expand Up @@ -2621,7 +2632,7 @@ static int skge_down(struct net_device *dev)

netif_tx_disable(dev);

if (hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC)
if (is_genesis(hw) && hw->phy_type == SK_PHY_XMAC)
del_timer_sync(&skge->link_timer);

napi_disable(&skge->napi);
Expand All @@ -2633,7 +2644,7 @@ static int skge_down(struct net_device *dev)
spin_unlock_irq(&hw->hw_lock);

skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF);
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
genesis_stop(skge);
else
yukon_stop(skge);
Expand Down Expand Up @@ -2661,7 +2672,7 @@ static int skge_down(struct net_device *dev)

skge_rx_stop(hw, port);

if (hw->chip_id == CHIP_ID_GENESIS) {
if (is_genesis(hw)) {
skge_write8(hw, SK_REG(port, TX_MFF_CTRL2), MFF_RST_SET);
skge_write8(hw, SK_REG(port, RX_MFF_CTRL2), MFF_RST_SET);
} else {
Expand Down Expand Up @@ -2957,15 +2968,15 @@ static void yukon_set_multicast(struct net_device *dev)

static inline u16 phy_length(const struct skge_hw *hw, u32 status)
{
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
return status >> XMR_FS_LEN_SHIFT;
else
return status >> GMR_FS_LEN_SHIFT;
}

static inline int bad_phy_status(const struct skge_hw *hw, u32 status)
{
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
return (status & (XMR_FS_ERR | XMR_FS_2L_VLAN)) != 0;
else
return (status & GMR_FS_ANY_ERR) ||
Expand All @@ -2975,9 +2986,8 @@ static inline int bad_phy_status(const struct skge_hw *hw, u32 status)
static void skge_set_multicast(struct net_device *dev)
{
struct skge_port *skge = netdev_priv(dev);
struct skge_hw *hw = skge->hw;

if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(skge->hw))
genesis_set_multicast(dev);
else
yukon_set_multicast(dev);
Expand Down Expand Up @@ -3057,7 +3067,7 @@ static struct sk_buff *skge_rx_get(struct net_device *dev,
"rx err, slot %td control 0x%x status 0x%x\n",
e - skge->rx_ring.start, control, status);

if (skge->hw->chip_id == CHIP_ID_GENESIS) {
if (is_genesis(skge->hw)) {
if (status & (XMR_FS_RUNT|XMR_FS_LNG_ERR))
dev->stats.rx_length_errors++;
if (status & XMR_FS_FRA_ERR)
Expand Down Expand Up @@ -3171,7 +3181,7 @@ static void skge_mac_parity(struct skge_hw *hw, int port)

++dev->stats.tx_heartbeat_errors;

if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
skge_write16(hw, SK_REG(port, TX_MFF_CTRL1),
MFF_CLR_PERR);
else
Expand All @@ -3183,7 +3193,7 @@ static void skge_mac_parity(struct skge_hw *hw, int port)

static void skge_mac_intr(struct skge_hw *hw, int port)
{
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
genesis_mac_intr(hw, port);
else
yukon_mac_intr(hw, port);
Expand All @@ -3195,7 +3205,7 @@ static void skge_error_irq(struct skge_hw *hw)
struct pci_dev *pdev = hw->pdev;
u32 hwstatus = skge_read32(hw, B0_HWE_ISRC);

if (hw->chip_id == CHIP_ID_GENESIS) {
if (is_genesis(hw)) {
/* clear xmac errors */
if (hwstatus & (IS_NO_STAT_M1|IS_NO_TIST_M1))
skge_write16(hw, RX_MFF_CTRL1, MFF_CLR_INSTAT);
Expand Down Expand Up @@ -3278,7 +3288,7 @@ static void skge_extirq(unsigned long arg)
struct skge_port *skge = netdev_priv(dev);

spin_lock(&hw->phy_lock);
if (hw->chip_id != CHIP_ID_GENESIS)
if (!is_genesis(hw))
yukon_phy_intr(skge);
else if (hw->phy_type == SK_PHY_BCOM)
bcom_phy_intr(skge);
Expand Down Expand Up @@ -3397,7 +3407,7 @@ static int skge_set_mac_address(struct net_device *dev, void *p)
memcpy_toio(hw->regs + B2_MAC_1 + port*8, dev->dev_addr, ETH_ALEN);
memcpy_toio(hw->regs + B2_MAC_2 + port*8, dev->dev_addr, ETH_ALEN);

if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
xm_outaddr(hw, port, XM_SA, dev->dev_addr);
else {
gma_set_addr(hw, port, GM_SRC_ADDR_1L, dev->dev_addr);
Expand Down Expand Up @@ -3473,6 +3483,7 @@ static int skge_reset(struct skge_hw *hw)

switch (hw->chip_id) {
case CHIP_ID_GENESIS:
#ifdef CONFIG_SKGE_GENESIS
switch (hw->phy_type) {
case SK_PHY_XMAC:
hw->phy_addr = PHY_ADDR_XMAC;
Expand All @@ -3486,6 +3497,10 @@ static int skge_reset(struct skge_hw *hw)
return -EOPNOTSUPP;
}
break;
#else
dev_err(&hw->pdev->dev, "Genesis chip detected but not configured\n");
return -EOPNOTSUPP;
#endif

case CHIP_ID_YUKON:
case CHIP_ID_YUKON_LITE:
Expand All @@ -3508,7 +3523,7 @@ static int skge_reset(struct skge_hw *hw)

/* read the adapters RAM size */
t8 = skge_read8(hw, B2_E_0);
if (hw->chip_id == CHIP_ID_GENESIS) {
if (is_genesis(hw)) {
if (t8 == 3) {
/* special case: 4 x 64k x 36, offset = 0x80000 */
hw->ram_size = 0x100000;
Expand All @@ -3523,10 +3538,10 @@ static int skge_reset(struct skge_hw *hw)
hw->intr_mask = IS_HW_ERR;

/* Use PHY IRQ for all but fiber based Genesis board */
if (!(hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC))
if (!(is_genesis(hw) && hw->phy_type == SK_PHY_XMAC))
hw->intr_mask |= IS_EXT_REG;

if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
genesis_init(hw);
else {
/* switch power to VCC (WA for VAUX problem) */
Expand Down Expand Up @@ -3591,7 +3606,7 @@ static int skge_reset(struct skge_hw *hw)
skge_write32(hw, B0_IMSK, hw->intr_mask);

for (i = 0; i < hw->ports; i++) {
if (hw->chip_id == CHIP_ID_GENESIS)
if (is_genesis(hw))
genesis_reset(hw, i);
else
yukon_reset(hw, i);
Expand Down Expand Up @@ -3802,9 +3817,9 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
skge->port = port;

/* Only used for Genesis XMAC */
setup_timer(&skge->link_timer, xm_link_timer, (unsigned long) skge);

if (hw->chip_id != CHIP_ID_GENESIS) {
if (is_genesis(hw))
setup_timer(&skge->link_timer, xm_link_timer, (unsigned long) skge);
else {
dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
NETIF_F_RXCSUM;
dev->features |= dev->hw_features;
Expand Down

0 comments on commit 5156b8a

Please sign in to comment.