Commit c3f45d32 authored by Ondrej Zary's avatar Ondrej Zary Committed by David S. Miller

dl2k: Add support for IP1000A-based cards

Add support for IP1000A chips to dl2k driver.
IP1000A chip looks like a TC9020 with integrated PHY.

This allows IP1000A chips to work reliably because the ipg driver is
buggy - it loses packets under load and then completely stops
transmitting data.

Tested with Asus NX1101 v2.0 at 10, 100 and 1000Mbps:
vendor=0x13f0 device=0x1023 (rev 0x41)
subsystem vendor=0x1043 device=0x8180

MAC address registers access needed to be changed from 8-bit to 16-bit
because 8-bit does not work on IP1000A. 8-bit access is not even
allowed in the TC9020 datasheet (although it worked). 16-bit access
works on both.

Tested that it does not break D-Link DGE-550T (DL-2000 chip, probably
a rebranded TC9020):
vendor=0x1186 device=0x4000 (rev 0x0c)
subsystem vendor=0x1186 device=0x4000
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41033f02
...@@ -17,15 +17,16 @@ config NET_VENDOR_DLINK ...@@ -17,15 +17,16 @@ config NET_VENDOR_DLINK
if NET_VENDOR_DLINK if NET_VENDOR_DLINK
config DL2K config DL2K
tristate "DL2000/TC902x-based Gigabit Ethernet support" tristate "DL2000/TC902x/IP1000A-based Gigabit Ethernet support"
depends on PCI depends on PCI
select CRC32 select CRC32
---help--- ---help---
This driver supports DL2000/TC902x-based Gigabit ethernet cards, This driver supports DL2000/TC902x/IP1000A-based Gigabit ethernet cards,
which includes which includes
D-Link DGE-550T Gigabit Ethernet Adapter. D-Link DGE-550T Gigabit Ethernet Adapter.
D-Link DL2000-based Gigabit Ethernet Adapter. D-Link DL2000-based Gigabit Ethernet Adapter.
Sundance/Tamarack TC902x Gigabit Ethernet Adapter. Sundance/Tamarack TC902x Gigabit Ethernet Adapter.
ICPlus IP1000A-based cards
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called dl2k. module will be called dl2k.
......
...@@ -253,6 +253,19 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -253,6 +253,19 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
if (err) if (err)
goto err_out_unmap_rx; goto err_out_unmap_rx;
if (np->chip_id == CHIP_IP1000A &&
(np->pdev->revision == 0x40 || np->pdev->revision == 0x41)) {
/* PHY magic taken from ipg driver, undocumented registers */
mii_write(dev, np->phy_addr, 31, 0x0001);
mii_write(dev, np->phy_addr, 27, 0x01e0);
mii_write(dev, np->phy_addr, 31, 0x0002);
mii_write(dev, np->phy_addr, 27, 0xeb8e);
mii_write(dev, np->phy_addr, 31, 0x0000);
mii_write(dev, np->phy_addr, 30, 0x005e);
/* advertise 1000BASE-T half & full duplex, prefer MASTER */
mii_write(dev, np->phy_addr, MII_CTRL1000, 0x0700);
}
/* Fiber device? */ /* Fiber device? */
np->phy_media = (dr16(ASICCtrl) & PhyMedia) ? 1 : 0; np->phy_media = (dr16(ASICCtrl) & PhyMedia) ? 1 : 0;
np->link_status = 0; np->link_status = 0;
...@@ -361,6 +374,11 @@ parse_eeprom (struct net_device *dev) ...@@ -361,6 +374,11 @@ parse_eeprom (struct net_device *dev)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = psrom->mac_addr[i]; dev->dev_addr[i] = psrom->mac_addr[i];
if (np->chip_id == CHIP_IP1000A) {
np->led_mode = psrom->led_mode;
return 0;
}
if (np->pdev->vendor != PCI_VENDOR_ID_DLINK) { if (np->pdev->vendor != PCI_VENDOR_ID_DLINK) {
return 0; return 0;
} }
...@@ -406,6 +424,28 @@ parse_eeprom (struct net_device *dev) ...@@ -406,6 +424,28 @@ parse_eeprom (struct net_device *dev)
return 0; return 0;
} }
static void rio_set_led_mode(struct net_device *dev)
{
struct netdev_private *np = netdev_priv(dev);
void __iomem *ioaddr = np->ioaddr;
u32 mode;
if (np->chip_id != CHIP_IP1000A)
return;
mode = dr32(ASICCtrl);
mode &= ~(IPG_AC_LED_MODE_BIT_1 | IPG_AC_LED_MODE | IPG_AC_LED_SPEED);
if (np->led_mode & 0x01)
mode |= IPG_AC_LED_MODE;
if (np->led_mode & 0x02)
mode |= IPG_AC_LED_MODE_BIT_1;
if (np->led_mode & 0x08)
mode |= IPG_AC_LED_SPEED;
dw32(ASICCtrl, mode);
}
static int static int
rio_open (struct net_device *dev) rio_open (struct net_device *dev)
{ {
...@@ -424,6 +464,8 @@ rio_open (struct net_device *dev) ...@@ -424,6 +464,8 @@ rio_open (struct net_device *dev)
GlobalReset | DMAReset | FIFOReset | NetworkReset | HostReset); GlobalReset | DMAReset | FIFOReset | NetworkReset | HostReset);
mdelay(10); mdelay(10);
rio_set_led_mode(dev);
/* DebugCtrl bit 4, 5, 9 must set */ /* DebugCtrl bit 4, 5, 9 must set */
dw32(DebugCtrl, dr32(DebugCtrl) | 0x0230); dw32(DebugCtrl, dr32(DebugCtrl) | 0x0230);
...@@ -433,9 +475,13 @@ rio_open (struct net_device *dev) ...@@ -433,9 +475,13 @@ rio_open (struct net_device *dev)
alloc_list (dev); alloc_list (dev);
/* Get station address */ /* Set station address */
for (i = 0; i < 6; i++) /* 16 or 32-bit access is required by TC9020 datasheet but 8-bit works
dw8(StationAddr0 + i, dev->dev_addr[i]); * too. However, it doesn't work on IP1000A so we use 16-bit access.
*/
for (i = 0; i < 3; i++)
dw16(StationAddr0 + 2 * i,
cpu_to_le16(((u16 *)dev->dev_addr)[i]));
set_multicast (dev); set_multicast (dev);
if (np->coalesce) { if (np->coalesce) {
...@@ -780,6 +826,7 @@ tx_error (struct net_device *dev, int tx_status) ...@@ -780,6 +826,7 @@ tx_error (struct net_device *dev, int tx_status)
break; break;
mdelay (1); mdelay (1);
} }
rio_set_led_mode(dev);
rio_free_tx (dev, 1); rio_free_tx (dev, 1);
/* Reset TFDListPtr */ /* Reset TFDListPtr */
dw32(TFDListPtr0, np->tx_ring_dma + dw32(TFDListPtr0, np->tx_ring_dma +
...@@ -799,6 +846,7 @@ tx_error (struct net_device *dev, int tx_status) ...@@ -799,6 +846,7 @@ tx_error (struct net_device *dev, int tx_status)
break; break;
mdelay (1); mdelay (1);
} }
rio_set_led_mode(dev);
/* Let TxStartThresh stay default value */ /* Let TxStartThresh stay default value */
} }
/* Maximum Collisions */ /* Maximum Collisions */
...@@ -965,6 +1013,7 @@ rio_error (struct net_device *dev, int int_status) ...@@ -965,6 +1013,7 @@ rio_error (struct net_device *dev, int int_status)
dev->name, int_status); dev->name, int_status);
dw16(ASICCtrl + 2, GlobalReset | HostReset); dw16(ASICCtrl + 2, GlobalReset | HostReset);
mdelay (500); mdelay (500);
rio_set_led_mode(dev);
} }
} }
......
...@@ -211,6 +211,10 @@ enum ASICCtrl_HiWord_bits { ...@@ -211,6 +211,10 @@ enum ASICCtrl_HiWord_bits {
ResetBusy = 0x0400, ResetBusy = 0x0400,
}; };
#define IPG_AC_LED_MODE BIT(14)
#define IPG_AC_LED_SPEED BIT(27)
#define IPG_AC_LED_MODE_BIT_1 BIT(29)
/* Transmit Frame Control bits */ /* Transmit Frame Control bits */
enum TFC_bits { enum TFC_bits {
DwordAlign = 0x00000000, DwordAlign = 0x00000000,
...@@ -332,7 +336,10 @@ typedef struct t_SROM { ...@@ -332,7 +336,10 @@ typedef struct t_SROM {
u16 asic_ctrl; /* 0x02 */ u16 asic_ctrl; /* 0x02 */
u16 sub_vendor_id; /* 0x04 */ u16 sub_vendor_id; /* 0x04 */
u16 sub_system_id; /* 0x06 */ u16 sub_system_id; /* 0x06 */
u16 reserved1[12]; /* 0x08-0x1f */ u16 pci_base_1; /* 0x08 (IP1000A only) */
u16 pci_base_2; /* 0x0a (IP1000A only) */
u16 led_mode; /* 0x0c (IP1000A only) */
u16 reserved1[9]; /* 0x0e-0x1f */
u8 mac_addr[6]; /* 0x20-0x25 */ u8 mac_addr[6]; /* 0x20-0x25 */
u8 reserved2[10]; /* 0x26-0x2f */ u8 reserved2[10]; /* 0x26-0x2f */
u8 sib[204]; /* 0x30-0xfb */ u8 sib[204]; /* 0x30-0xfb */
...@@ -397,6 +404,7 @@ struct netdev_private { ...@@ -397,6 +404,7 @@ struct netdev_private {
u16 advertising; /* NWay media advertisement */ u16 advertising; /* NWay media advertisement */
u16 negotiate; /* Negotiated media */ u16 negotiate; /* Negotiated media */
int phy_addr; /* PHY addresses. */ int phy_addr; /* PHY addresses. */
u16 led_mode; /* LED mode read from EEPROM (IP1000A only) */
}; };
/* The station address location in the EEPROM. */ /* The station address location in the EEPROM. */
...@@ -407,10 +415,15 @@ struct netdev_private { ...@@ -407,10 +415,15 @@ struct netdev_private {
class_mask of the class are honored during the comparison. class_mask of the class are honored during the comparison.
driver_data Data private to the driver. driver_data Data private to the driver.
*/ */
#define CHIP_IP1000A 1
static const struct pci_device_id rio_pci_tbl[] = { static const struct pci_device_id rio_pci_tbl[] = {
{0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, }, {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, },
{0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, }, {0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VDEVICE(SUNDANCE, 0x1023), CHIP_IP1000A },
{ PCI_VDEVICE(SUNDANCE, 0x2021), CHIP_IP1000A },
{ PCI_VDEVICE(DLINK, 0x9021), CHIP_IP1000A },
{ PCI_VDEVICE(DLINK, 0x4020), CHIP_IP1000A },
{ } { }
}; };
MODULE_DEVICE_TABLE (pci, rio_pci_tbl); MODULE_DEVICE_TABLE (pci, rio_pci_tbl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment