Commit db5824dd authored by Richard Röjfors's avatar Richard Röjfors Committed by David S. Miller

ks8842: Support 100Mbps when accessed via timberdale

This patch removes the code which disables 100Mbps advertising when
the ks8842 is accessed via timberdale.

At higher speed it's good to be nice to the internal state machine
of timberdale by acking interrupts. That is done by a write to the
interrupt ack register (IAR).
Signed-off-by: default avatarRichard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b7b0b90
...@@ -34,7 +34,12 @@ ...@@ -34,7 +34,12 @@
#define DRV_NAME "ks8842" #define DRV_NAME "ks8842"
/* Timberdale specific Registers */ /* Timberdale specific Registers */
#define REG_TIMB_RST 0x1c #define REG_TIMB_RST 0x1c
#define REG_TIMB_FIFO 0x20
#define REG_TIMB_ISR 0x24
#define REG_TIMB_IER 0x28
#define REG_TIMB_IAR 0x2C
#define REQ_TIMB_DMA_RESUME 0x30
/* KS8842 registers */ /* KS8842 registers */
...@@ -282,10 +287,6 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter) ...@@ -282,10 +287,6 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter)
/* restart port auto-negotiation */ /* restart port auto-negotiation */
ks8842_enable_bits(adapter, 49, 1 << 13, REG_P1CR4); ks8842_enable_bits(adapter, 49, 1 << 13, REG_P1CR4);
if (!(adapter->conf_flags & MICREL_KS884X))
/* only advertise 10Mbps */
ks8842_clear_bits(adapter, 49, 3 << 2, REG_P1CR4);
/* Enable the transmitter */ /* Enable the transmitter */
ks8842_enable_tx(adapter); ks8842_enable_tx(adapter);
...@@ -543,6 +544,10 @@ void ks8842_tasklet(unsigned long arg) ...@@ -543,6 +544,10 @@ void ks8842_tasklet(unsigned long arg)
/* Ack */ /* Ack */
ks8842_write16(adapter, 18, isr, REG_ISR); ks8842_write16(adapter, 18, isr, REG_ISR);
if (!(adapter->conf_flags & MICREL_KS884X))
/* Ack in the timberdale IP as well */
iowrite32(0x1, adapter->hw_addr + REG_TIMB_IAR);
if (!netif_running(netdev)) if (!netif_running(netdev))
return; return;
......
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