Skip to content

L
linux
Commit e5331d92 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] (forwarded) Olympic fixes 

Looks like they escaped your notice
parent 4c2ca1d7
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 21 deletions
drivers/net/tokenring/olympic.c
View file @ e5331d92
...@@ -56,8 +56,15 @@ ...@@ -56,8 +56,15 @@
* 07/19/01 - Improve bad LAA reporting, strip out freemem * 07/19/01 - Improve bad LAA reporting, strip out freemem
* into a separate function, its called from 3 * into a separate function, its called from 3
* different places now. * different places now.
* 02/09/01 - Replaced sleep_on. * 02/09/02 - Replaced sleep_on.
* * 03/01/02 - Replace access to several registers from 32 bit to
* 16 bit. Fixes alignment errors on PPC 64 bit machines.
* Thanks to Al Trautman for this one.
* 03/10/02 - Fix BUG in arb_cmd. Bug was there all along but was
* silently ignored until the error checking code
* went into version 1.0.0
* 06/04/02 - Add correct start up sequence for the cardbus adapters.
* Required for strict compliance with pci power mgmt specs.
* To Do: * To Do:
* *
* Wake on lan * Wake on lan
...@@ -111,7 +118,7 @@ ...@@ -111,7 +118,7 @@
*/ */
static char version[] __devinitdata = static char version[] __devinitdata =
"Olympic.c v1.0.0 2/9/02 - Peter De Schrijver & Mike Phillips" ; "Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ;
static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion", static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion",
"Address Verification", "Neighbor Notification (Ring Poll)", "Address Verification", "Neighbor Notification (Ring Poll)",
...@@ -296,9 +303,10 @@ static int __devinit olympic_init(struct net_device *dev) ...@@ -296,9 +303,10 @@ static int __devinit olympic_init(struct net_device *dev)
spin_lock_init(&olympic_priv->olympic_lock) ; spin_lock_init(&olympic_priv->olympic_lock) ;
/* Needed for cardbus */ /* Needed for cardbus */
if(!(readl(olympic_mmio+BCTL) & BCTL_MODE_INDICATOR)) if(!(readl(olympic_mmio+BCTL) & BCTL_MODE_INDICATOR)) {
writel(readl(olympic_priv->olympic_mmio+FERMASK)|FERMASK_INT_BIT, olympic_mmio+FERMASK); writel(readl(olympic_priv->olympic_mmio+FERMASK)|FERMASK_INT_BIT, olympic_mmio+FERMASK);
}
#if OLYMPIC_DEBUG #if OLYMPIC_DEBUG
printk("BCTL: %x\n",readl(olympic_mmio+BCTL)); printk("BCTL: %x\n",readl(olympic_mmio+BCTL));
printk("GPR: %x\n",readw(olympic_mmio+GPR)); printk("GPR: %x\n",readw(olympic_mmio+GPR));
...@@ -311,24 +319,42 @@ static int __devinit olympic_init(struct net_device *dev) ...@@ -311,24 +319,42 @@ static int __devinit olympic_init(struct net_device *dev)
writel(readl(olympic_mmio+BCTL)|BCTL_MIMREB,olympic_mmio+BCTL); writel(readl(olympic_mmio+BCTL)|BCTL_MIMREB,olympic_mmio+BCTL);
if (olympic_priv->olympic_ring_speed == 0) { /* Autosense */ if (olympic_priv->olympic_ring_speed == 0) { /* Autosense */
writel(readl(olympic_mmio+GPR)|GPR_AUTOSENSE,olympic_mmio+GPR); writew(readw(olympic_mmio+GPR)|GPR_AUTOSENSE,olympic_mmio+GPR);
if (olympic_priv->olympic_message_level) if (olympic_priv->olympic_message_level)
printk(KERN_INFO "%s: Ringspeed autosense mode on\n",olympic_priv->olympic_card_name); printk(KERN_INFO "%s: Ringspeed autosense mode on\n",olympic_priv->olympic_card_name);
} else if (olympic_priv->olympic_ring_speed == 16) { } else if (olympic_priv->olympic_ring_speed == 16) {
if (olympic_priv->olympic_message_level) if (olympic_priv->olympic_message_level)
printk(KERN_INFO "%s: Trying to open at 16 Mbps as requested\n", olympic_priv->olympic_card_name); printk(KERN_INFO "%s: Trying to open at 16 Mbps as requested\n", olympic_priv->olympic_card_name);
writel(GPR_16MBPS, olympic_mmio+GPR); writew(GPR_16MBPS, olympic_mmio+GPR);
} else if (olympic_priv->olympic_ring_speed == 4) { } else if (olympic_priv->olympic_ring_speed == 4) {
if (olympic_priv->olympic_message_level) if (olympic_priv->olympic_message_level)
printk(KERN_INFO "%s: Trying to open at 4 Mbps as requested\n", olympic_priv->olympic_card_name) ; printk(KERN_INFO "%s: Trying to open at 4 Mbps as requested\n", olympic_priv->olympic_card_name) ;
writel(0, olympic_mmio+GPR); writew(0, olympic_mmio+GPR);
} }
writel(readl(olympic_mmio+GPR)|GPR_NEPTUNE_BF,olympic_mmio+GPR); writew(readw(olympic_mmio+GPR)|GPR_NEPTUNE_BF,olympic_mmio+GPR);
#if OLYMPIC_DEBUG #if OLYMPIC_DEBUG
printk("GPR = %x\n",readw(olympic_mmio + GPR) ) ; printk("GPR = %x\n",readw(olympic_mmio + GPR) ) ;
#endif #endif
/* Solo has been paused to meet the Cardbus power
* specs if the adapter is cardbus. Check to
* see its been paused and then restart solo. The
* adapter should set the pause bit within 1 second.
*/
if(!(readl(olympic_mmio+BCTL) & BCTL_MODE_INDICATOR)) {
t=jiffies;
while (!readl(olympic_mmio+CLKCTL) & CLKCTL_PAUSE) {
schedule() ;
if(jiffies-t > 2*HZ) {
printk(KERN_ERR "IBM Cardbus tokenring adapter not responsing.\n") ;
return -ENODEV;
}
}
writel(readl(olympic_mmio+CLKCTL) & ~CLKCTL_PAUSE, olympic_mmio+CLKCTL) ;
}
/* start solo init */ /* start solo init */
writel((1<<15),olympic_mmio+SISR_MASK_SUM); writel((1<<15),olympic_mmio+SISR_MASK_SUM);
...@@ -341,13 +367,13 @@ static int __devinit olympic_init(struct net_device *dev) ...@@ -341,13 +367,13 @@ static int __devinit olympic_init(struct net_device *dev)
} }
} }
writel(readl(olympic_mmio+LAPWWO),olympic_mmio+LAPA); writel(readw(olympic_mmio+LAPWWO),olympic_mmio+LAPA);
#if OLYMPIC_DEBUG #if OLYMPIC_DEBUG
printk("LAPWWO: %x, LAPA: %x\n",readl(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA)); printk("LAPWWO: %x, LAPA: %x\n",readl(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA));
#endif #endif
init_srb=olympic_priv->olympic_lap + ((readl(olympic_mmio+LAPWWO)) & (~0xf800)); init_srb=olympic_priv->olympic_lap + ((readw(olympic_mmio+LAPWWO)) & (~0xf800));
#if OLYMPIC_DEBUG #if OLYMPIC_DEBUG
{ {
...@@ -422,11 +448,11 @@ static int olympic_open(struct net_device *dev) ...@@ -422,11 +448,11 @@ static int olympic_open(struct net_device *dev)
/* adapter is closed, so SRB is pointed to by LAPWWO */ /* adapter is closed, so SRB is pointed to by LAPWWO */
writel(readl(olympic_mmio+LAPWWO),olympic_mmio+LAPA); writel(readw(olympic_mmio+LAPWWO),olympic_mmio+LAPA);
init_srb=olympic_priv->olympic_lap + ((readl(olympic_mmio+LAPWWO)) & (~0xf800)); init_srb=olympic_priv->olympic_lap + ((readw(olympic_mmio+LAPWWO)) & (~0xf800));
#if OLYMPIC_DEBUG #if OLYMPIC_DEBUG
printk("LAPWWO: %x, LAPA: %x\n",readl(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA)); printk("LAPWWO: %x, LAPA: %x\n",readw(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA));
printk("SISR Mask = %04x\n", readl(olympic_mmio+SISR_MASK)); printk("SISR Mask = %04x\n", readl(olympic_mmio+SISR_MASK));
printk("Before the open command \n"); printk("Before the open command \n");
#endif #endif
...@@ -486,7 +512,7 @@ static int olympic_open(struct net_device *dev) ...@@ -486,7 +512,7 @@ static int olympic_open(struct net_device *dev)
olympic_priv->srb_queued=0; olympic_priv->srb_queued=0;
break; break;
} }
if ((jiffies-t) > 60*HZ) { if ((jiffies-t) > 10*HZ) {
printk(KERN_WARNING "%s: SRB timed out. \n",dev->name) ; printk(KERN_WARNING "%s: SRB timed out. \n",dev->name) ;
olympic_priv->srb_queued=0; olympic_priv->srb_queued=0;
break ; break ;
...@@ -495,7 +521,7 @@ static int olympic_open(struct net_device *dev) ...@@ -495,7 +521,7 @@ static int olympic_open(struct net_device *dev)
} }
remove_wait_queue(&olympic_priv->srb_wait,&wait) ; remove_wait_queue(&olympic_priv->srb_wait,&wait) ;
set_current_state(TASK_RUNNING) ; set_current_state(TASK_RUNNING) ;
olympic_priv->srb_queued = 0 ;
#if OLYMPIC_DEBUG #if OLYMPIC_DEBUG
printk("init_srb(%p): ",init_srb); printk("init_srb(%p): ",init_srb);
for(i=0;i<20;i++) for(i=0;i<20;i++)
...@@ -629,7 +655,8 @@ static int olympic_open(struct net_device *dev) ...@@ -629,7 +655,8 @@ static int olympic_open(struct net_device *dev)
printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7]) ); printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7]) );
printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]); printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = %08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ; printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =
%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
#endif #endif
writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ); writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);
...@@ -790,7 +817,7 @@ static void olympic_rx(struct net_device *dev) ...@@ -790,7 +817,7 @@ static void olympic_rx(struct net_device *dev)
first. Ideally all frames would be in a single buffer, this can be tuned by first. Ideally all frames would be in a single buffer, this can be tuned by
altering the buffer size. If the length of the packet is less than altering the buffer size. If the length of the packet is less than
1500 bytes we're going to copy it over anyway to stop packets getting 1500 bytes we're going to copy it over anyway to stop packets getting
dropped from sockets with buffers small than our pkt_buf_sz. */ dropped from sockets with buffers smaller than our pkt_buf_sz. */
if (buffer_cnt==1) { if (buffer_cnt==1) {
olympic_priv->rx_ring_last_received++ ; olympic_priv->rx_ring_last_received++ ;
...@@ -1097,10 +1124,13 @@ static int olympic_close(struct net_device *dev) ...@@ -1097,10 +1124,13 @@ static int olympic_close(struct net_device *dev)
writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL); writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL);
#if OLYMPIC_DEBUG #if OLYMPIC_DEBUG
{
int i ;
printk("srb(%p): ",srb); printk("srb(%p): ",srb);
for(i=0;i<4;i++) for(i=0;i<4;i++)
printk("%x ",readb(srb+i)); printk("%x ",readb(srb+i));
printk("\n"); printk("\n");
}
#endif #endif
free_irq(dev->irq,dev); free_irq(dev->irq,dev);
...@@ -1369,8 +1399,7 @@ static void olympic_arb_cmd(struct net_device *dev) ...@@ -1369,8 +1399,7 @@ static void olympic_arb_cmd(struct net_device *dev)
arb_block = (u8 *)(olympic_priv->olympic_lap + olympic_priv->arb) ; arb_block = (u8 *)(olympic_priv->olympic_lap + olympic_priv->arb) ;
asb_block = (u8 *)(olympic_priv->olympic_lap + olympic_priv->asb) ; asb_block = (u8 *)(olympic_priv->olympic_lap + olympic_priv->asb) ;
srb = (u8 *)(olympic_priv->olympic_lap + olympic_priv->srb) ; srb = (u8 *)(olympic_priv->olympic_lap + olympic_priv->srb) ;
writel(readl(olympic_mmio+LAPA),olympic_mmio+LAPWWO);
if (readb(arb_block+0) == ARB_RECEIVE_DATA) { /* Receive.data, MAC frames */ if (readb(arb_block+0) == ARB_RECEIVE_DATA) { /* Receive.data, MAC frames */
header_len = readb(arb_block+8) ; /* 802.5 Token-Ring Header Length */ header_len = readb(arb_block+8) ; /* 802.5 Token-Ring Header Length */
...@@ -1423,7 +1452,7 @@ static void olympic_arb_cmd(struct net_device *dev) ...@@ -1423,7 +1452,7 @@ static void olympic_arb_cmd(struct net_device *dev)
/* Now tell the card we have dealt with the received frame */ /* Now tell the card we have dealt with the received frame */
/* Set LISR Bit 1 */ /* Set LISR Bit 1 */
writel(LISR_ARB_FREE,olympic_priv->olympic_lap + LISR_SUM); writel(LISR_ARB_FREE,olympic_priv->olympic_mmio + LISR_SUM);
/* Is the ASB free ? */ /* Is the ASB free ? */
......
drivers/net/tokenring/olympic.h
View file @ e5331d92
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
#define TIMER 0x50 #define TIMER 0x50
#define CLKCTL 0x74 #define CLKCTL 0x74
#define CLKCTL_PAUSE (1<<15)
#define PM_CON 0x4 #define PM_CON 0x4
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7