etherlabmaster: comparison drivers/8139too.c

equal deleted inserted replaced

-:39364fbcd069
+:d417dd9bdc2f
 		"rtl8139-diag -mmmaaavvveefN" output
 		enable RTL8139_DEBUG below, and look at 'dmesg' or kernel log
 */
-#define DRV_NAME	"8139too-ecat"
+#define DRV_NAME	"8139too_ecat"
 #define DRV_VERSION	"0.9.27"
 #include <linux/config.h>
 #include <linux/module.h>
 static int ec_device_index = -1;
 //#define ECAT_DEBUG
 EtherCAT_device_t rtl_ecat_dev;
-EXPORT_SYMBOL(rtl_ecat_dev);
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 /*
 * Receive ring size
 netif_start_queue (dev);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
+	//FIXME muß das hier raus ??
 	if (netif_msg_ifup(tp))
 		printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"
 			" GP Pins %2.2x %s-duplex.\n",
 			dev->name, pci_resource_start (tp->pci_dev, 1),
 			dev->irq, RTL_R8 (MediaStatus),
 if (dev != rtl_ecat_dev.dev) dev_kfree_skb(skb);
 tp->stats.tx_dropped++;
 return 0;
 	}
+	if (dev != rtl_ecat_dev.dev)  //CHANGED HM spinlock falsch
+	    spin_lock_irq(&tp->lock);
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-spin_lock_irq(&tp->lock);
 	RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
 		   tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
 	dev->trans_start = jiffies;
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (dev == rtl_ecat_dev.dev)
 {
 rtl_ecat_dev.tx_intr_cnt++;
+	  //printk("ECAT tx interrupt\n"); // HM
 rdtscl(rtl_ecat_dev.tx_time); // Get CPU cycles
 	}
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 		 RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd));
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (dev == rtl_ecat_dev.dev)
-{
+	{
-rtl_ecat_dev.rx_intr_cnt++;
+	    rtl_ecat_dev.rx_intr_cnt++;
-rdtscl(rtl_ecat_dev.rx_time); // Get CPU cycles
+	    rdtscl(rtl_ecat_dev.rx_time); // Get CPU cycles
 	}
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-	while (netif_running(dev) && received < budget
+	while ((dev == rtl_ecat_dev.dev || netif_running(dev)) //HM
+	       && received < budget
 	       && (RTL_R8 (ChipCmd) & RxBufEmpty) == 0) {
 		u32 ring_offset = cur_rx % RX_BUF_LEN;
 		u32 rx_status;
 		unsigned int pkt_size;
 		struct sk_buff *skb;
 		pkt_size = rx_size - 4;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 		if (dev != rtl_ecat_dev.dev && netif_msg_rx_status(tp))
-printk(KERN_DEBUG "%s:  rtl8139_rx() status %4.4x, size %4.4x,"
+		    printk(KERN_DEBUG "%s:  rtl8139_rx() status %4.4x, size %4.4x,"
-" cur %4.4x.\n", dev->name, rx_status,
+			   " cur %4.4x.\n", dev->name, rx_status,
-rx_size, cur_rx);
+			   rx_size, cur_rx);
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 #if RTL8139_DEBUG > 2
 		{
 	if (done) {
 		/*
 		 * Order is important since data can get interrupted
 		 * again when we think we are done.
 		 */
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+	    if (dev != rtl_ecat_dev.dev) {
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 		local_irq_disable();
-		RTL_W16_F(IntrMask, rtl8139_intr_mask);
+		RTL_W16_F(IntrMask, rtl8139_intr_mask);  //Interrupts werden nicht enabled ?? HM
 		__netif_rx_complete(dev);
 		local_irq_enable();
+	    }
+//	    else
 	}
 	spin_unlock(&tp->rx_lock);
 	return !done;
 }
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (dev == rtl_ecat_dev.dev)
 {
 rtl_ecat_dev.intr_cnt++;
 	}
 	else
 {
 spin_lock(&tp->lock);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	status = RTL_R16 (IntrStatus);
 /* shared irq? */
-	if (unlikely((status & rtl8139_intr_mask) == 0))
+/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
+	if (dev != rtl_ecat_dev.dev)
+	    if (unlikely((status & rtl8139_intr_mask) == 0))
 		goto out;
+/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	handled = 1;
 	/* h/w no longer present (hotplug?) or major error, bail */
 	if (unlikely(status == 0xFFFF))
 		goto out;
 	/* close possible race's with dev_close */
-	if (unlikely(!netif_running(dev))) {
+/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
+	if (dev != rtl_ecat_dev.dev) {
+	    if (unlikely(!netif_running(dev))) {
 		RTL_W16 (IntrMask, 0);
 		goto out;
-	}
+	    }
+	}
+/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	/* Acknowledge all of the current interrupt sources ASAP, but
 	   an first get an additional status bit from CSCR. */
 	if (unlikely(status & RxUnderrun))
 		link_changed = RTL_R16 (CSCR) & CSCR_LinkChangeBit;
 	ackstat = status & ~(RxAckBits | TxErr);
-	if (ackstat)
+	if (ackstat) {
 		RTL_W16 (IntrStatus, ackstat);
+		//printk("ECAT-NIC ack\n"); //HM
+	}
 	/* Receive packets are processed by poll routine.
 	   If not running start it now. */
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (status & RxAckBits){
+	    // printk("ECAT-NIC RX-Intr Flag\n"); // HM
+	    if (dev != rtl_ecat_dev.dev) {
 		if (netif_rx_schedule_prep(dev)) {
-			RTL_W16_F (IntrMask, rtl8139_norx_intr_mask);
+		    RTL_W16_F (IntrMask, rtl8139_norx_intr_mask);
-			__netif_rx_schedule (dev);
+		    __netif_rx_schedule (dev);
 		}
+	    }
+//	    else
 	}
 	/* Check uncommon events with one test. */
 	if (unlikely(status & (PCIErr | PCSTimeout | RxUnderrun | RxErr)))
 		rtl8139_weird_interrupt (dev, tp, ioaddr,
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 if (dev != rtl_ecat_dev.dev)
 {
 	    netif_stop_queue(dev);
-}
+	    if (tp->thr_pid >= 0) {
-/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-if (tp->thr_pid >= 0) {
 		tp->time_to_die = 1;
 		wmb();
 		ret = kill_proc (tp->thr_pid, SIGTERM, 1);
 		if (ret) {
-			printk (KERN_ERR "%s: unable to signal thread\n", dev->name);
+		    printk (KERN_ERR "%s: unable to signal thread\n", dev->name);
-			return ret;
+		    return ret;
 		}
 		wait_for_completion (&tp->thr_exited);
-}
+	    }
+	}
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 if (dev != rtl_ecat_dev.dev)
 {
 dev->name, RTL_R16 (IntrStatus));
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-spin_lock_irqsave (&tp->lock, flags);
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+if (dev != rtl_ecat_dev.dev)
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+	    spin_lock_irqsave (&tp->lock, flags);
 	/* Stop the chip's Tx and Rx DMA processes. */
 	RTL_W8 (ChipCmd, 0);
 	/* Disable interrupts by clearing the interrupt mask. */
 	/* Update the error counts. */
 	tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
 	RTL_W32 (RxMissed, 0);
-spin_unlock_irqrestore (&tp->lock, flags);
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+if (dev != rtl_ecat_dev.dev)
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+	    spin_unlock_irqrestore (&tp->lock, flags);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 if (dev != rtl_ecat_dev.dev)
 {
 }
 module_init(rtl8139_init_module);
 module_exit(rtl8139_cleanup_module);
+EXPORT_SYMBOL(rtl_ecat_dev);

branch	kernel2.6
changeset 24	d417dd9bdc2f
parent 23	39364fbcd069
child 25	7d124bfba3ce