etherlabmaster: comparison devices/8139too.c

equal deleted inserted replaced

-:c21e7c12dd50
+:674071846ee3
 /******************************************************************************
 *
 *  8 1 3 9 t o o . c
 *
-*  EtherCAT-Treiber für RTL8139-kompatible Netzwerkkarten.
+*  EtherCAT driver for RTL8139-compatible NICs.
 *
-*  Autoren: Wilhelm Hagemeister, Florian Pose
+*  Authors: Florian Pose <fp@igh-essen.com>
+*           Wilhelm Hagemeister <hm@igh-essen.com>
 *
 *  $Date$
 *  $Author$
 *
-*  (C) Copyright IgH 2005
+*  (C) Copyright IgH 2006
 *  Ingenieurgemeinschaft IgH
 *  Heinz-Bäcker Str. 34
 *  D-45356 Essen
 *  Tel.: +49 201/61 99 31
 *  Fax.: +49 201/61 98 36
 */
 #define DRV_NAME	"8139too_ec"
 #define DRV_VERSION	"0.9.27"
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/compiler.h>
 	unsigned long fifo_copy_timeout;
 };
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-MODULE_AUTHOR ("Wilhelm Hagemeister <hm@igh-essen.com>, Florian Pose <fp@igh-essen.com>");
+MODULE_AUTHOR("Wilhelm Hagemeister <hm@igh-essen.com>,"
-MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver with EtherCAT functionality");
+" Florian Pose <fp@igh-essen.com>");
+MODULE_DESCRIPTION("RealTek RTL-8139 Fast Ethernet"
+" driver with EtherCAT functionality");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(COMPILE_INFO);
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 module_param(ec_device_index, int, -1);
 module_param(ec_device_master_index, int, 0);
-MODULE_PARM_DESC(ec_device_index, "Index of the device reserved for EtherCAT.");
+MODULE_PARM_DESC(ec_device_index,
-MODULE_PARM_DESC(ec_device_master_index, "Index of the EtherCAT master to register the device.");
+"Index of the device reserved for EtherCAT.");
+MODULE_PARM_DESC(ec_device_master_index,
+"Index of the EtherCAT master to register the device.");
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 static int read_eeprom (void __iomem *ioaddr, int location, int addr_len);
 static int rtl8139_open (struct net_device *dev);
 	/* dev is fully set up and ready to use now */
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	/* EtherCAT-Karten nicht beim Stack anmelden. */
+if (dev != rtl_ec_net_dev) {
-if (dev != rtl_ec_net_dev)
+DPRINTK("About to register device named %s (%p)...\n",
-	{
+dev->name, dev);
-DPRINTK("About to register device named %s (%p)...\n", dev->name, dev);
+i = register_netdev (dev);
-i = register_netdev (dev);
+if (i) goto err_out;
-if (i) goto err_out;
 	}
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	pci_set_drvdata (pdev, dev);
 	assert (dev != NULL);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+unregister_netdev (dev);
-unregister_netdev (dev);
 	}
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	__rtl8139_cleanup_dev (dev);
 #ifdef EC_DEBUG
 printk(KERN_DEBUG "%s: open\n", dev->name);
 #endif
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+retval = request_irq(dev->irq, rtl8139_interrupt,
-retval = request_irq(dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev);
+SA_SHIRQ, dev->name, dev);
 if (retval)
 return retval;
 }
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	tp->tx_bufs = pci_alloc_consistent(tp->pci_dev, TX_BUF_TOT_LEN,
 					   &tp->rx_ring_dma);
 	if (tp->tx_bufs == NULL || tp->rx_ring == NULL)
 {
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+free_irq(dev->irq, dev);
-free_irq(dev->irq, dev);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 if (tp->tx_bufs)
 	rtl8139_init_ring (dev);
 	rtl8139_hw_start (dev);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+netif_start_queue (dev);
-netif_start_queue (dev);
+if (netif_msg_ifup(tp)) {
-if (netif_msg_ifup(tp))
+printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"
-{
+" GP Pins %2.2x %s-duplex.\n",
-printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"
+dev->name, pci_resource_start (tp->pci_dev, 1),
-" GP Pins %2.2x %s-duplex.\n",
+dev->irq, RTL_R8 (MediaStatus),
-dev->name, pci_resource_start (tp->pci_dev, 1),
+tp->mii.full_duplex ? "full" : "half");
-dev->irq, RTL_R8 (MediaStatus),
+}
-tp->mii.full_duplex ? "full" : "half");
-}
+rtl8139_start_thread(dev);
-rtl8139_start_thread(dev);
 }
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	return 0;
 	if ((!(tmp & CmdRxEnb)) || (!(tmp & CmdTxEnb)))
 		RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+/* Enable all known interrupts by setting the interrupt mask. */
-/* Enable all known interrupts by setting the interrupt mask. */
+RTL_W16 (IntrMask, rtl8139_intr_mask);
-RTL_W16 (IntrMask, rtl8139_intr_mask);
 	}
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 }
 RTL_W8 (ChipCmd, CmdRxEnb);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+spin_lock(&tp->rx_lock);
-spin_lock(&tp->rx_lock);
+/* Disable interrupts by clearing the interrupt mask. */
-/* Disable interrupts by clearing the interrupt mask. */
+RTL_W16 (IntrMask, 0x0000);
-RTL_W16 (IntrMask, 0x0000);
+/* Stop a shared interrupt from scavenging while we are. */
-/* Stop a shared interrupt from scavenging while we are. */
+spin_lock_irqsave (&tp->lock, flags);
-spin_lock_irqsave (&tp->lock, flags);
+rtl8139_tx_clear (tp);
-rtl8139_tx_clear (tp);
+spin_unlock_irqrestore (&tp->lock, flags);
-spin_unlock_irqrestore (&tp->lock, flags);
+/* ...and finally, reset everything */
-/* ...and finally, reset everything */
+if (netif_running(dev)) {
-if (netif_running(dev))
+rtl8139_hw_start (dev);
-{
+netif_wake_queue (dev);
-rtl8139_hw_start (dev);
+}
-netif_wake_queue (dev);
-}
+spin_unlock(&tp->rx_lock);
-spin_unlock(&tp->rx_lock);
 }
-else
+else {
-{
+rtl8139_tx_clear (tp);
-rtl8139_tx_clear (tp);
+rtl8139_hw_start(dev);
-rtl8139_hw_start(dev);
 }
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 }
 if (dev != rtl_ec_net_dev) dev_kfree_skb(skb);
 tp->stats.tx_dropped++;
 return 0;
 	}
-	if (dev != rtl_ec_net_dev)
+	if (dev != rtl_ec_net_dev) {
-{
+spin_lock_irq(&tp->lock);
-spin_lock_irq(&tp->lock);
 }
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
 	tp->cur_tx++;
 	wmb();
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (dev != rtl_ec_net_dev)
+	if (dev != rtl_ec_net_dev) {
-{
 if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
 netif_stop_queue (dev);
 spin_unlock_irq(&tp->lock);
 		tp->dirty_tx = dirty_tx;
 		mb();
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-		if (dev != rtl_ec_net_dev)
+		if (dev != rtl_ec_net_dev) {
-{
+netif_wake_queue (dev);
-netif_wake_queue (dev);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	}
 }
 			goto out;
 		}
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+/* Malloc up new buffer, compatible with net-2e. */
-/* Malloc up new buffer, compatible with net-2e. */
+/* Omit the four octet CRC from the length. */
-/* Omit the four octet CRC from the length. */
+skb = dev_alloc_skb(pkt_size + 2);
-skb = dev_alloc_skb(pkt_size + 2);
+if (likely(skb)) {
-if (likely(skb)) {
+skb->dev = dev;
-skb->dev = dev;
+skb_reserve (skb, 2);	/* 16 byte align the IP fields. */
-skb_reserve (skb, 2);	/* 16 byte align the IP fields. */
 #if RX_BUF_IDX == 3
 wrap_copy(skb, rx_ring, ring_offset+4, pkt_size);
 #else
 eth_copy_and_sum (skb, &rx_ring[ring_offset + 4], pkt_size, 0);
 #endif
 skb_put (skb, pkt_size);
 skb->protocol = eth_type_trans (skb, dev);
 dev->last_rx = jiffies;
 tp->stats.rx_bytes += pkt_size;
 tp->stats.rx_packets++;
 netif_receive_skb (skb);
 } else {
 if (net_ratelimit())
 printk (KERN_WARNING
 "%s: Memory squeeze, dropping packet.\n",
 dev->name);
 tp->stats.rx_dropped++;
 }
 }
 else
 {
 ecdev_receive(rtl_ec_dev,
 &rx_ring[ring_offset + 4] + ETH_HLEN,
 pkt_size - ETH_HLEN);
 dev->last_rx = jiffies;
 tp->stats.rx_bytes += pkt_size;
 tp->stats.rx_packets++;
 }
 	int link_changed = 0; /* avoid bogus "uninit" warning */
 	int handled = 0;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (dev == rtl_ec_net_dev)
+	if (dev == rtl_ec_net_dev) {
-{
+status = RTL_R16 (IntrStatus);
-status = RTL_R16 (IntrStatus);
+	}
-	}
+	else {
-	else
+spin_lock(&tp->lock);
-{
-spin_lock(&tp->lock);
+status = RTL_R16 (IntrStatus);
-status = RTL_R16 (IntrStatus);
+if (unlikely((status & rtl8139_intr_mask) == 0))
+goto out;
-if (unlikely((status & rtl8139_intr_mask) == 0))
-goto out;
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	handled = 1;
 	if (unlikely(status == 0xFFFF))
 		goto out;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (dev != rtl_ec_net_dev)
+	if (dev != rtl_ec_net_dev) {
-{
+/* close possible race's with dev_close */
-/* close possible race's with dev_close */
+if (unlikely(!netif_running(dev))) {
-if (unlikely(!netif_running(dev))) {
+RTL_W16 (IntrMask, 0);
-RTL_W16 (IntrMask, 0);
+goto out;
-goto out;
+}
-}
 	}
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	/* Acknowledge all of the current interrupt sources ASAP, but
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (status & RxAckBits)
 {
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+/* Mark for polling */
-/* Polling vormerken */
+if (netif_rx_schedule_prep(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 {
-else
+/* EtherCAT device: Just receive all frames */
-{
+rtl8139_rx(dev, tp, 100); // FIXME
-/* Beim EtherCAT-Device einfach alle Frames empfangen */
+}
-rtl8139_rx(dev, tp, 100); // FIXME
-}
 	}
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	/* Check uncommon events with one test. */
 			RTL_W16 (IntrStatus, TxErr);
 	}
 out:
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (dev != rtl_ec_net_dev)
+	if (dev != rtl_ec_net_dev) {
-{
+spin_unlock (&tp->lock);
-spin_unlock (&tp->lock);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	DPRINTK ("%s: exiting interrupt, intr_status=%#4.4x.\n",
 	int ret = 0;
 	unsigned long flags;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (dev != rtl_ec_net_dev)
+if (dev != rtl_ec_net_dev) {
-{
+netif_stop_queue(dev);
-netif_stop_queue(dev);
+if (tp->thr_pid >= 0) {
-if (tp->thr_pid >= 0) {
+tp->time_to_die = 1;
-tp->time_to_die = 1;
+wmb();
-wmb();
+ret = kill_proc (tp->thr_pid, SIGTERM, 1);
-ret = kill_proc (tp->thr_pid, SIGTERM, 1);
+if (ret) {
-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);
 }
+wait_for_completion (&tp->thr_exited);
-if (netif_msg_ifdown(tp))
+}
-printk(KERN_DEBUG "%s: Shutting down ethercard, status was 0x%4.4x.\n",
-dev->name, RTL_R16 (IntrStatus));
+if (netif_msg_ifdown(tp))
+printk(KERN_DEBUG "%s: Shutting down ethercard, status was 0x%4.4x.\n",
-spin_lock_irqsave (&tp->lock, flags);
+dev->name, RTL_R16 (IntrStatus));
-/* Stop the chip's Tx and Rx DMA processes. */
+spin_lock_irqsave (&tp->lock, flags);
-RTL_W8 (ChipCmd, 0);
+/* Stop the chip's Tx and Rx DMA processes. */
-/* Disable interrupts by clearing the interrupt mask. */
+RTL_W8 (ChipCmd, 0);
-RTL_W16 (IntrMask, 0);
+/* Disable interrupts by clearing the interrupt mask. */
-/* Update the error counts. */
+RTL_W16 (IntrMask, 0);
-tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
-RTL_W32 (RxMissed, 0);
+/* Update the error counts. */
+tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
-spin_unlock_irqrestore (&tp->lock, flags);
+RTL_W32 (RxMissed, 0);
-synchronize_irq (dev->irq);	/* racy, but that's ok here */
+spin_unlock_irqrestore (&tp->lock, flags);
-free_irq (dev->irq, dev);
+synchronize_irq (dev->irq);	/* racy, but that's ok here */
+free_irq (dev->irq, dev);
 }
-else
+else {
-{
+/* Stop the chip's Tx and Rx DMA processes. */
-/* Stop the chip's Tx and Rx DMA processes. */
+RTL_W8 (ChipCmd, 0);
-RTL_W8 (ChipCmd, 0);
+/* Disable interrupts by clearing the interrupt mask. */
-/* Disable interrupts by clearing the interrupt mask. */
+RTL_W16 (IntrMask, 0);
-RTL_W16 (IntrMask, 0);
+/* Update the error counts. */
-/* Update the error counts. */
+tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
-tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
+RTL_W32 (RxMissed, 0);
-RTL_W32 (RxMissed, 0);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	rtl8139_tx_clear (tp);
 	int rc;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (dev == rtl_ec_net_dev || !netif_running(dev))
-		return -EINVAL;
+return -EINVAL;
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	spin_lock_irq(&np->lock);
 	rc = generic_mii_ioctl(&np->mii, if_mii(rq), cmd, NULL);
 	void __iomem *ioaddr = tp->mmio_addr;
 	unsigned long flags;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (dev == rtl_ec_net_dev || netif_running(dev))
+	if (dev == rtl_ec_net_dev || netif_running(dev)) {
-{
+spin_lock_irqsave (&tp->lock, flags);
-spin_lock_irqsave (&tp->lock, flags);
+tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
-tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
+RTL_W32 (RxMissed, 0);
-RTL_W32 (RxMissed, 0);
+spin_unlock_irqrestore (&tp->lock, flags);
-spin_unlock_irqrestore (&tp->lock, flags);
 	}
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	return &tp->stats;
 	pci_save_state (pdev);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (dev == rtl_ec_net_dev || !netif_running (dev))
 return 0;
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	netif_device_detach (dev);
 	pci_restore_state (pdev);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (dev == rtl_ec_net_dev || !netif_running (dev))
 return 0;
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	pci_set_power_state (pdev, PCI_D0);
 	rtl8139_init_ring (dev);
 }
 static void __exit rtl8139_cleanup_module (void)
 {
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 printk(KERN_INFO "Cleaning up RTL8139-EtherCAT module...\n");
 if (rtl_ec_net_dev) {
 printk(KERN_INFO "Stopping device...\n");
 ecdev_stop(ec_device_master_index);
 printk(KERN_INFO "Unregistering device...\n");
 ecdev_unregister(ec_device_master_index, rtl_ec_dev);
 rtl_ec_dev = NULL;
 }
 pci_unregister_driver(&rtl8139_pci_driver);
 printk(KERN_INFO "RTL8139-EtherCAT module cleaned up.\n");
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 }
 module_init(rtl8139_init_module);
 module_exit(rtl8139_cleanup_module);

changeset 195	674071846ee3
parent 192	8d7bd5082ed5
child 197	b9a6e2c22745
child 1618	5cff10efb927