summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRiccardo Ghetta <birrachiara@tin.it>2010-02-17 09:28:58 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-17 13:38:10 -0800
commit08326dbe7b5825295ec3711eec53b093549749e5 (patch)
tree684dc4907ea770c3660500961e4559e0df2bf2bd /drivers
parent7af3351f71f4b3b5dbccb66cdc9b097052760a7f (diff)
downloadlinux-stable-08326dbe7b5825295ec3711eec53b093549749e5.tar.gz
linux-stable-08326dbe7b5825295ec3711eec53b093549749e5.tar.bz2
linux-stable-08326dbe7b5825295ec3711eec53b093549749e5.zip
SiS190/191 half-duplex initialization fix
Adds half-duplex specific setup code (taken from SiS own GPL driver). Without those, half-duplex connections are very unreliable, often working on small transfers and failing after a while. Signed-off-by: Riccardo Ghetta <birrachiara@tin.it> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sis190.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 8c4e38f9ebf7..bf2ffbb913ff 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -47,7 +47,7 @@
#define PHY_ID_ANY 0x1f
#define MII_REG_ANY 0x1f
-#define DRV_VERSION "1.3"
+#define DRV_VERSION "1.4"
#define DRV_NAME "sis190"
#define SIS190_DRIVER_NAME DRV_NAME " Gigabit Ethernet driver " DRV_VERSION
#define PFX DRV_NAME ": "
@@ -294,6 +294,7 @@ struct sis190_private {
struct mii_if_info mii_if;
struct list_head first_phy;
u32 features;
+ u32 negotiated_lpa;
};
struct sis190_phy {
@@ -1004,6 +1005,8 @@ static void sis190_phy_task(struct work_struct *work)
SIS_W32(RGDelay, 0x0440);
}
+ tp->negotiated_lpa = p->val;
+
net_link(tp, KERN_INFO "%s: link on %s mode.\n", dev->name,
p->msg);
netif_carrier_on(dev);
@@ -1211,6 +1214,12 @@ static netdev_tx_t sis190_start_xmit(struct sk_buff *skb,
wmb();
desc->status = cpu_to_le32(OWNbit | INTbit | DEFbit | CRCbit | PADbit);
+ if (tp->negotiated_lpa & (LPA_1000HALF | LPA_100HALF | LPA_10HALF)) {
+ /* Half Duplex */
+ desc->status |= cpu_to_le32(COLEN | CRSEN | BKFEN);
+ if (tp->negotiated_lpa & (LPA_1000HALF | LPA_1000FULL))
+ desc->status |= cpu_to_le32(EXTEN | BSTEN); /* gigabit HD */
+ }
tp->cur_tx++;