Skip to contentSkip to conversation

ks8842: Support 100Mbps when accessed via timberdale

PATCH Superseded Richard Röjfors 2 participants 3 messages Jul 25, 2010 – Jul 26, 2010

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ks8842: Support 100Mbps when accessed via timberdale

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

At higher speed it's good to be nice to the internal state machine in timberdale, by acking interrupts, a write to it's interrupt ack register (IAR).

The flow control setting is removed from TX and RX control registers. Full duplex flow control was not enabled in SGCR3, but we tend to get better performance without flow control.

drivers/net/ks8842.c +14 -12
index 634dad1..9cbf9af 100644
@@ -34,7 +34,12 @@
 #define DRV_NAME "ks8842"
 
 /* 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 */
 
@@ -256,11 +261,8 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter)
 	/* Enable QMU Transmit flow control / transmit padding / Transmit CRC */
 	ks8842_write16(adapter, 16, 0x000E, REG_TXCR);
 
-	/* enable the receiver, uni + multi + broadcast + flow ctrl
-		+ crc strip */
-	ks8842_write16(adapter, 16, 0x8 | 0x20 | 0x40 | 0x80 | 0x400,
-		REG_RXCR);
-
+	/* enable the receiver, uni + multi + broadcast + crc strip */
+	ks8842_write16(adapter, 16, 0x8 | 0x20 | 0x40 | 0x80, REG_RXCR);
 	/* TX frame pointer autoincrement */
 	ks8842_write16(adapter, 17, 0x4000, REG_TXFDPR);
 
@@ -276,16 +278,12 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter)
 	/* enable no excessive collison drop */
 	ks8842_enable_bits(adapter, 32, 1 << 3, REG_SGCR2);
 
-	/* Enable port 1 force flow control / back pressure / transmit / recv */
-	ks8842_write16(adapter, 48, 0x1E07, REG_P1CR2);
+	/* Enable port 1 / back pressure / transmit / recv */
+	ks8842_write16(adapter, 48, 0xE07, REG_P1CR2);
 
 	/* restart port auto-negotiation */
 	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 */
 	ks8842_enable_tx(adapter);
 
@@ -543,6 +541,10 @@ void ks8842_tasklet(unsigned long arg)
 	/* Ack */
 	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))
 		return;
 
maintainer
#1 lore raw

From: Richard Röjfors <[email protected]>
Date: Sun, 25 Jul 2010 22:55:27 +0200

Quoted 3 lines

The flow control setting is removed from TX and RX control registers. Full duplex flow control was not enabled in SGCR3, but we tend to get better performance without flow control.

Flow control is not just for you, it's for the other end too.

If you're getting bad flow control enabled performance then either:

1) the flow control is configured to kick in too late or too soon

or

2) your ring sizes need adjustment

I'm not applying this patch, flow control is important and should be enabled by default whenever possible. Please instead go try and figure out if flow control trigger points or RX/TX ring sizes need adjustment instead.

Thanks.

#2 lore raw
Quoted 5 lines · David Miller

I'm not applying this patch, flow control is important and should be enabled by default whenever possible. Please instead go try and figure out if flow control trigger points or RX/TX ring sizes need adjustment instead.

I agree, I will look at the flow control.

--Richard