netdev: Added KS8842 driver
Subsystems (2)
PATCH v2 1/1 netdev: Added KS8842 driver
This is a driver for the Micrel KS8842 ethernet switch.
The supplied code is for driving the KS8842 through the Timberdale FPGA on the Russellville board, a development board for Intel Atom CPU in the automotive area.
---
drivers/net/Kconfig +5 -0
@@ -1722,6 +1722,11 @@ Please email feedback to <[email protected]>. +config KS8842 + tristate "Micrel KSZ8842" + help + This platform driver is for Micrel KSZ8842 chip. + config VIA_RHINE tristate "VIA Rhine support" depends on NET_PCI && PCI
drivers/net/Makefile +1 -0
@@ -84,6 +84,7 @@ obj-$(CONFIG_SKGE) += skge.o obj-$(CONFIG_SKY2) += sky2.o obj-$(CONFIG_SKFP) += skfp/ +obj-$(CONFIG_KS8842) += ks8842.o obj-$(CONFIG_VIA_RHINE) += via-rhine.o obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
drivers/net/ks8842.c +749 -0
749 lines not on this page · raw message
Richard R?öjfors <[email protected]> :
[...]
Quoted 4 lines
Index:
linux-2.6.30-rc7/drivers/net/ks8842.c
===================================================================drivers/net/ks8842.c +0
-0
[...]
drivers/net/ks8842.c line 115
Quoted 2 lines
drivers/net/ks8842.c +2
-0+struct ks8842_adapter { +u8 __iomem *hw_addr;
void __iomem *hw_addr;
(nit)
drivers/net/ks8842.c line 119
Quoted 4 lines
drivers/net/ks8842.c +4
-0+int irq; +struct tasklet_struct tasklet; +spinlock_t lock;/* spinlock to be interrupt safe */ +struct net_device_stats net_stats;
Redundant with include/linux/netdevice.h::struct net_device.stats
[...]
Quoted 5 lines
drivers/net/ks8842.c +5
-0+static int ks8842_tx_frame (struct sk_buff *skb,struct net_device *netdev) +{ +struct ks8842_adapter *adapter =netdev_priv (netdev); +int len = skb->len; +u32 *ptr = (u32 *)skb->data;
drivers/net/ks8842.c line 325
Quoted 10 lines
drivers/net/ks8842.c +10
-0+u32 ctrl; + +dev_dbg (&adapter->pdev->dev, +"%s: len %u head %p data %p tail %p end %p\n" , + __func__, skb->len, skb->head, skb->data, +skb_tail_pointer (skb),skb_end_pointer (skb)); + +/* check FIFO buffer space, we need space for CRC and command bits */ +if (ks8842_tx_fifo_space (adapter) < len +8 ) +return -ENOBUFS ;
NETDEV_TX_BUSY
(it should complain loudly)
Quoted 10 lines
drivers/net/ks8842.c +10
-0+ +/* the control word, enable IRQ, port 1 and the length */ + ctrl =0x8000 |0x100 | (len <<16 ); +ks8842_write32 (adapter,17 , ctrl,REG_QMU_DATA_LO ); + + adapter->net_stats.tx_bytes += len; + +/* copy buffer */ +while (len >0 ) { +iowrite32 (*ptr, adapter->hw_addr +REG_QMU_DATA_LO );
drivers/net/ks8842.c line 345
Quoted 10 lines
drivers/net/ks8842.c +10
-0+ len -=sizeof (u32); + ptr++; + } + +/* enqueue packet */ +ks8842_write16 (adapter,17 ,1 ,REG_TXQCR ); + +dev_kfree_skb (skb); + +return 0 ;
NETDEV_TX_OK
Quoted 6 lines
drivers/net/ks8842.c +6
-0+} + +static void ks8842_rx_frame (struct net_device *netdev, +struct ks8842_adapter *adapter) +{ +u32 status =ks8842_read32 (adapter,17 ,REG_QMU_DATA_LO );
drivers/net/ks8842.c line 361
Quoted 10 lines
drivers/net/ks8842.c +10
-0+int len = (status >>16 ) &0x7ff ; + + status &=0xffff ; + +dev_dbg (&adapter->pdev->dev,"%s - rx_data: status: %x\n" , + __func__, status); + +/* check the status */ +if ((status &RXSR_VALID ) && !(status &RXSR_ERROR )) { +struct sk_buff *skb =dev_alloc_skb (len +2 );
Please use netdev_alloc_skb and remove 'skb->dev = netdev;' below.
Quoted 16 lines
drivers/net/ks8842.c +16
-0+ +dev_dbg (&adapter->pdev->dev,"%s, got package, len: %d\n" , + __func__, len); +if (skb) { +u32 *data; + + adapter->net_stats.rx_packets++; + adapter->net_stats.rx_bytes += len; +if (status &RXSR_MULTICAST ) + adapter->net_stats.multicast++; + +/* Align socket buffer in 4-byte boundary for +better performance. */ +skb_reserve (skb,2 ); + data = (u32 *)skb_put (skb, len); +
drivers/net/ks8842.c line 387
Quoted 10 lines
drivers/net/ks8842.c +10
-0+ks8842_select_bank (adapter,17 ); +while (len >0 ) { + *data++ =ioread32 (adapter->hw_addr + +REG_QMU_DATA_LO ); + len -=sizeof (u32); + } + + skb->dev = netdev; + skb->protocol =eth_type_trans (skb, netdev); + netdev->last_rx = jiffies;
last_rx is obsolete here.
See commit babcda74e9d96bb58fd9c6c5112dbdbff169e695 for specifics.
[...]
drivers/net/ks8842.c line 493
Quoted 3 lines
drivers/net/ks8842.c +3
-0+static irqreturn_t ks8842_irq (int irq,void *devid) +{ +struct ks8842_adapter *adapter = (struct ks8842_adapter *)devid;
Needless cast from void *.
[...]
Quoted 9 lines
drivers/net/ks8842.c +9
-0+static int ks8842_open (struct net_device *netdev) +{ +struct ks8842_adapter *adapter =netdev_priv (netdev); +int err; + +dev_dbg (&adapter->pdev->dev,"%s - entry\n" , __func__); + +/* reset the HW */ +ks8842_reset_hw (adapter);
drivers/net/ks8842.c line 537
Quoted 10 lines
drivers/net/ks8842.c +10
-0+ +ks8842_update_link_status (netdev, adapter); + + err =request_irq (adapter->irq, ks8842_irq,IRQF_SHARED ,DRV_NAME , + adapter); +if (err) { +printk (KERN_ERR "Failed to request IRQ: %d: %d\n" , + adapter->irq, err); +return err; + }
Does the platform ensure that it produces the same result as a reset/request_irq/enable cycle ?
[...]
Quoted 28 lines
drivers/net/ks8842.c +28
-0+static int __devinit ks8842_probe (struct platform_device *pdev) +{ +int err = -ENOMEM ; +struct resource *iomem; +struct net_device *netdev; +struct ks8842_adapter *adapter; +u16 id; + + iomem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!request_mem_region (iomem->start,resource_size (iomem),DRV_NAME )) + goto err_mem_region; + + netdev =alloc_etherdev (sizeof (struct ks8842_adapter )); +if (!netdev) + goto err_alloc_etherdev; + +SET_NETDEV_DEV (netdev, &pdev->dev); + + adapter =netdev_priv (netdev); + adapter->hw_addr =ioremap (iomem->start,resource_size (iomem)); +if (!adapter->hw_addr) + goto err_ioremap; + + adapter->irq =platform_get_irq (pdev,0 ); +if (adapter->irq <0 ) { + err = adapter->irq; + goto err_get_irq; + }
drivers/net/ks8842.c line 673
Quoted 10 lines
drivers/net/ks8842.c +10
-0+ + adapter->pdev = pdev; + +tasklet_init (&adapter->tasklet, ks8842_tasklet, (unsigned long )netdev); +spin_lock_init (&adapter->lock); + + netdev->netdev_ops = &ks8842_netdev_ops; + netdev->ethtool_ops = &ks8842_ethtool_ops; + +strncpy (netdev->name,DRV_NAME ,sizeof (netdev->name) -1 );
What's the point ?
drivers/net/ks8842.c line 681
Quoted 8 lines
drivers/net/ks8842.c +8
-0+ +ks8842_read_mac_addr (adapter, netdev->dev_addr); + + id =ks8842_read16 (adapter,32 ,REG_SW_ID_AND_ENABLE ); + +/* tell the stack to leave us alone until ks8842_open() is called */ +netif_carrier_off (netdev); +netif_stop_queue (netdev);
Useless.
Quoted 8 lines
drivers/net/ks8842.c +8
-0+strcpy (netdev->name,"eth%d" ); + err =register_netdev (netdev); +if (err) + goto err_register; + +platform_set_drvdata (pdev, netdev); + + printk(KERN_INFO DRV_NAME
drivers/net/ks8842.c line 700
Quoted 10 lines
drivers/net/ks8842.c +10
-0+" Found chip, family: 0x%x, id: 0x%x, rev: 0x%x\n" , + (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7); + +return 0 ; + +err_register: +err_get_irq: +iounmap (adapter->hw_addr); +err_ioremap: +kfree (netdev);
free_netdev(netdev);
Quoted 6 lines
drivers/net/ks8842.c +6
-0+err_alloc_etherdev: +release_mem_region (iomem->start,resource_size (iomem)); +err_mem_region: +return err; +} +
drivers/net/ks8842.c line 716
Quoted 10 lines
drivers/net/ks8842.c +10
-0+static int __devexit ks8842_remove(struct platform_device *pdev) +{ +struct net_device *netdev =platform_get_drvdata (pdev); +struct ks8842_adapter *adapter =netdev_priv (netdev); +struct resource *iomem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + +unregister_netdev (netdev); +tasklet_kill (&adapter->tasklet); +iounmap (adapter->hw_addr); +kfree (netdev);
free_netdev(netdev);
drivers/net/ks8842.c line 720
Quoted 4 lines
drivers/net/ks8842.c +4
-0+release_mem_region (iomem->start,resource_size (iomem)); +platform_set_drvdata (pdev,NULL ); +return 0 ; +}
The tasklet seems right but I have not looked too closely at it.
Signature · 1 line
Ueimor
Quoted 7 lines · Francois Romieu
Richard R?öjfors <[email protected]> :
[...]Quoted 4 lines
Index:
linux-2.6.30-rc7/drivers/net/ks8842.c
===================================================================drivers/net/ks8842.c +0
-0[...]
Quoted 6 lines
drivers/net/ks8842.c line 115
Quoted 2 lines
drivers/net/ks8842.c +2
-0+struct ks8842_adapter { +u8 __iomem *hw_addr;void
__iomem*hw_addr;(nit)
Thanks for the feedback, I will post an updated patch.
--Richard