Add support for velocity network driver on platform devices
v4 cover Add support for velocity network driver on platform devices
v4 changes:
Code tidyup as requested by Francois Romieu
Removed '#ifdef PCI' around PCI code. Compile tested on (!)PCI and (!)PM.
v3 changes:
Rebased against net-next.
Fix errors in pm code.
v2 changes:
Drop patch #1 as requested by David Miller.
Correct the PHYID_ICPLUS_IP101A MII bits - should be ON, rather than OFF. Read the platform rev_id from the correct register [regs->rev_id]. It's possible this would work for the PCI version as well and would remove the need for the 'if (pci)' test to set vptr->rev_id.
v1:
The first three patches are general tidyup.
[DROPPED] Patch ## just alphabetizes the #includes to make it easier to read.
Patch #1 replaces vptr->dev with vptr->netdev, in preparation of adding a struct device *dev in Patch #3
Patch #2 replaces the pci dma functions with the generic versions.
I have build tested these patches but don't have a PCI velocity to run-test it. I can't see that they should introduce any problems as it is all renames and function swapping.
Patch #3 adds support for the velocity driver on devicetree platform devices. Binding document included. This patch is compile-tested for PCI, and boot tested on a VIA APC8750.
I think it would be pertinent to get some tested-by's for PCI users.
Regards
Tony Prisk
Tony Prisk (3):
net: velocity: Rename vptr->dev to vptr->netdev
net: velocity: Convert to generic dma functions
net: velocity: Add platform device support to VIA velocity driver
.../devicetree/bindings/net/via-velocity.txt | 20 + drivers/net/ethernet/via/Kconfig | 3 +- drivers/net/ethernet/via/via-velocity.c | 546 ++++++++++++++------ drivers/net/ethernet/via/via-velocity.h | 40 +- 4 files changed, 438 insertions(+), 171 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/via-velocity.txt
Signature · 1 line
1.7.9.5
PATCH v4 1/3 net: velocity: Rename vptr->dev to vptr->netdev
Improve the clarity of the code in preparation for converting the dma functions to generic versions, which require a struct device *.
This makes it possible to store a 'struct device *dev' in the velocity_info structure.
--- drivers/net/ethernet/via/via-velocity.c | 66 +++++++++++++++---------------- drivers/net/ethernet/via/via-velocity.h | 4 +- 2 files changed, 35 insertions(+), 35 deletions(-)
drivers/net/ethernet/via/via-velocity.c +33 -33
@@ -998,9 +998,9 @@ static void velocity_print_link_status(struct velocity_info *vptr) {if (vptr->mii_status &VELOCITY_LINK_FAIL ) { -VELOCITY_PRT (MSG_LEVEL_INFO ,KERN_NOTICE "%s: failed to detect cable link\n" , vptr->dev->name); +VELOCITY_PRT (MSG_LEVEL_INFO ,KERN_NOTICE "%s: failed to detect cable link\n" , vptr->netdev->name); }else if (vptr->options.spd_dpx ==SPD_DPX_AUTO ) { -VELOCITY_PRT (MSG_LEVEL_INFO ,KERN_NOTICE "%s: Link auto-negotiation" , vptr->dev->name); +VELOCITY_PRT (MSG_LEVEL_INFO ,KERN_NOTICE "%s: Link auto-negotiation" , vptr->netdev->name);if (vptr->mii_status &VELOCITY_SPEED_1000 )VELOCITY_PRT (MSG_LEVEL_INFO ," speed 1000M bps" );
@@ -1014,7 +1014,7 @@ static void velocity_print_link_status(struct velocity_info *vptr)else VELOCITY_PRT (MSG_LEVEL_INFO ," half duplex\n" ); }else { -VELOCITY_PRT (MSG_LEVEL_INFO ,KERN_NOTICE "%s: Link forced" , vptr->dev->name); +VELOCITY_PRT (MSG_LEVEL_INFO ,KERN_NOTICE "%s: Link forced" , vptr->netdev->name);switch (vptr->options.spd_dpx) {case SPD_DPX_1000_FULL :VELOCITY_PRT (MSG_LEVEL_INFO ," speed 1000M bps full duplex\n" );
@@ -1319,7 +1319,7 @@ static void velocity_init_registers(struct velocity_info *vptr,case VELOCITY_INIT_RESET :case VELOCITY_INIT_WOL : -netif_stop_queue (vptr->dev); +netif_stop_queue (vptr->netdev);/* * Reset RX to prevent RX pointer not on the 4X location
@@ -1332,7 +1332,7 @@ static void velocity_init_registers(struct velocity_info *vptr,if (velocity_set_media_mode (vptr, mii_status) !=VELOCITY_LINK_CHANGE ) {velocity_print_link_status (vptr);if (!(vptr->mii_status &VELOCITY_LINK_FAIL )) -netif_wake_queue (vptr->dev); +netif_wake_queue (vptr->netdev); }enable_flow_control_ability (vptr);
@@ -1354,7 +1354,7 @@ static void velocity_init_registers(struct velocity_info *vptr,mac_eeprom_reload (regs);for (i =0 ; i <6 ; i++) -writeb (vptr->dev->dev_addr[i], &(regs->PAR[i])); +writeb (vptr->netdev->dev_addr[i], &(regs->PAR[i]));/* * clear Pre_ACPI bit.
@@ -1377,7 +1377,7 @@ static void velocity_init_registers(struct velocity_info *vptr,/* * Set packet filter: Receive directed and broadcast address */ -velocity_set_multi (vptr->dev); +velocity_set_multi (vptr->netdev);/* * Enable MII auto-polling
@@ -1404,14 +1404,14 @@ static void velocity_init_registers(struct velocity_info *vptr,writel ((CR0_DPOLL |CR0_TXON |CR0_RXON |CR0_STRT ), ®s->CR0Set); mii_status =velocity_get_opt_media_mode (vptr); -netif_stop_queue (vptr->dev); +netif_stop_queue (vptr->netdev);mii_init (vptr, mii_status);if (velocity_set_media_mode (vptr, mii_status) !=VELOCITY_LINK_CHANGE ) {velocity_print_link_status (vptr);if (!(vptr->mii_status &VELOCITY_LINK_FAIL )) -netif_wake_queue (vptr->dev); +netif_wake_queue (vptr->netdev); }enable_flow_control_ability (vptr);
@@ -1474,7 +1474,7 @@ static int velocity_init_dma_rings(struct velocity_info *vptr) rx_ring_size, &pool_dma);if (!pool) {dev_err (&pdev->dev,"%s : DMA memory allocation failed.\n" , - vptr->dev->name); + vptr->netdev->name);return -ENOMEM ; }
@@ -1514,7 +1514,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)struct rx_desc *rd = &(vptr->rx.ring[idx]);struct velocity_rd_info *rd_info = &(vptr->rx.info[idx]); - rd_info->skb =netdev_alloc_skb (vptr->dev, vptr->rx.buf_sz +64 ); + rd_info->skb =netdev_alloc_skb (vptr->netdev, vptr->rx.buf_sz +64 );if (rd_info->skb ==NULL )return -ENOMEM ;
@@ -1620,7 +1620,7 @@ static int velocity_init_rd_ring(struct velocity_info *vptr)if (velocity_rx_refill (vptr) != vptr->options.numrx) {VELOCITY_PRT (MSG_LEVEL_ERR ,KERN_ERR -"%s: failed to allocate RX buffer.\n" , vptr->dev->name); +"%s: failed to allocate RX buffer.\n" , vptr->netdev->name);velocity_free_rd_ring (vptr); goto out; }
@@ -1809,7 +1809,7 @@ static void velocity_error(struct velocity_info *vptr, int status)printk (KERN_ERR "TD structure error TDindex=%hx\n" ,readw (®s->TDIdx[0 ]));BYTE_REG_BITS_ON (TXESR_TDSTR , ®s->TXESR);writew (TRDCSR_RUN , ®s->TDCSRClr); -netif_stop_queue (vptr->dev); +netif_stop_queue (vptr->netdev);/* FIXME: port over the pci_device_failed code and use it here */
@@ -1850,10 +1850,10 @@ static void velocity_error(struct velocity_info *vptr, int status)if (linked) { vptr->mii_status &= ~VELOCITY_LINK_FAIL ; -netif_carrier_on (vptr->dev); +netif_carrier_on (vptr->netdev); }else { vptr->mii_status |=VELOCITY_LINK_FAIL ; -netif_carrier_off (vptr->dev); +netif_carrier_off (vptr->netdev); }velocity_print_link_status (vptr);
@@ -1867,9 +1867,9 @@ static void velocity_error(struct velocity_info *vptr, int status)enable_mii_autopoll (regs);if (vptr->mii_status &VELOCITY_LINK_FAIL ) -netif_stop_queue (vptr->dev); +netif_stop_queue (vptr->netdev);else -netif_wake_queue (vptr->dev); +netif_wake_queue (vptr->netdev); }if (status &ISR_MIBFI )
@@ -1894,7 +1894,7 @@ static int velocity_tx_srv(struct velocity_info *vptr)int idx;int works =0 ;struct velocity_td_info *tdinfo; -struct net_device_stats *stats = &vptr->dev->stats; +struct net_device_stats *stats = &vptr->netdev->stats;for (qnum =0 ; qnum < vptr->tx.numq; qnum++) { for (idx = vptr->tx.tail[qnum]; vptr->tx.used[qnum] > 0;
@@ -1939,9 +1939,9 @@ static int velocity_tx_srv(struct velocity_info *vptr)* Look to see if we should kick the transmit network * layer for more work. */ -if (netif_queue_stopped (vptr->dev) && (full ==0 ) && +if (netif_queue_stopped (vptr->netdev) && (full ==0 ) && (!(vptr->mii_status &VELOCITY_LINK_FAIL ))) { -netif_wake_queue (vptr->dev); +netif_wake_queue (vptr->netdev); }return works; }
@@ -1989,7 +1989,7 @@ static int velocity_rx_copy(struct sk_buff **rx_skb, int pkt_size,if (pkt_size < rx_copybreak) {struct sk_buff *new_skb; - new_skb =netdev_alloc_skb_ip_align (vptr->dev, pkt_size); + new_skb =netdev_alloc_skb_ip_align (vptr->netdev, pkt_size);if (new_skb) { new_skb->ip_summed = rx_skb[0 ]->ip_summed;skb_copy_from_linear_data (*rx_skb, new_skb->data, pkt_size);
@@ -2030,14 +2030,14 @@ static inline void velocity_iph_realign(struct velocity_info *vptr,static int velocity_receive_frame (struct velocity_info *vptr,int idx) {void (*pci_action)(struct pci_dev *,dma_addr_t ,size_t ,int ); -struct net_device_stats *stats = &vptr->dev->stats; +struct net_device_stats *stats = &vptr->netdev->stats;struct velocity_rd_info *rd_info = &(vptr->rx.info[idx]);struct rx_desc *rd = &(vptr->rx.ring[idx]);int pkt_len =le16_to_cpu (rd->rdesc0.len) &0x3fff ;struct sk_buff *skb;if (rd->rdesc0.RSR & (RSR_STP |RSR_EDP )) { -VELOCITY_PRT (MSG_LEVEL_VERBOSE ,KERN_ERR " %s : the received frame span multple RDs.\n" , vptr->dev->name); +VELOCITY_PRT (MSG_LEVEL_VERBOSE ,KERN_ERR " %s : the received frame span multple RDs.\n" , vptr->netdev->name); stats->rx_length_errors++;return -EINVAL ; }
@@ -2075,7 +2075,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx) PCI_DMA_FROMDEVICE);skb_put (skb, pkt_len -4 ); - skb->protocol =eth_type_trans (skb, vptr->dev); + skb->protocol =eth_type_trans (skb, vptr->netdev);if (rd->rdesc0.RSR &RSR_DETAG ) {u16 vid =swab16 (le16_to_cpu (rd->rdesc1.PQTAG));
@@ -2100,7 +2100,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)*/ static int velocity_rx_srv (struct velocity_info *vptr,int budget_left) { -struct net_device_stats *stats = &vptr->dev->stats; +struct net_device_stats *stats = &vptr->netdev->stats;int rd_curr = vptr->rx.curr;int works =0 ;
@@ -2292,7 +2292,7 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu)if ((new_mtu <VELOCITY_MIN_MTU ) || new_mtu > (VELOCITY_MAX_MTU )) {VELOCITY_PRT (MSG_LEVEL_ERR ,KERN_NOTICE "%s: Invalid MTU.\n" , - vptr->dev->name); + vptr->netdev->name); ret = -EINVAL ; goto out_0; }
@@ -2314,7 +2314,7 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu) goto out_0; } - tmp_vptr->dev = dev; + tmp_vptr->netdev = dev; tmp_vptr->pdev = vptr->pdev; tmp_vptr->options = vptr->options; tmp_vptr->tx.numq = vptr->tx.numq;
@@ -2692,7 +2692,7 @@ static int velocity_get_pci_info(struct velocity_info *vptr,*/ static void velocity_print_info (struct velocity_info *vptr) { -struct net_device *dev = vptr->dev; +struct net_device *dev = vptr->netdev;printk (KERN_INFO "%s: %s\n" , dev->name,get_chip_name (vptr->chip_id)); printk(KERN_INFO "%s: Ethernet Address: %pM\n",
@@ -2755,7 +2755,7 @@ static int velocity_found1(struct pci_dev *pdev,velocity_init_info (pdev, vptr, info); - vptr->dev = dev; + vptr->netdev = dev; ret =pci_enable_device (pdev);if (ret <0 )
@@ -3010,10 +3010,10 @@ static int velocity_suspend(struct pci_dev *pdev, pm_message_t state)struct velocity_info *vptr =netdev_priv (dev);unsigned long flags; -if (!netif_running (vptr->dev)) +if (!netif_running (vptr->netdev))return 0 ; -netif_device_detach (vptr->dev); +netif_device_detach (vptr->netdev);spin_lock_irqsave (&vptr->lock, flags);pci_save_state (pdev);
@@ -3078,7 +3078,7 @@ static int velocity_resume(struct pci_dev *pdev)unsigned long flags;int i; -if (!netif_running (vptr->dev)) +if (!netif_running (vptr->netdev))return 0 ;pci_set_power_state (pdev,PCI_D0 );
@@ -3101,7 +3101,7 @@ static int velocity_resume(struct pci_dev *pdev)mac_enable_int (vptr->mac_regs);spin_unlock_irqrestore (&vptr->lock, flags); -netif_device_attach (vptr->dev); +netif_device_attach (vptr->netdev);return 0 ; }
drivers/net/ethernet/via/via-velocity.h +2 -2
@@ -1435,7 +1435,7 @@ struct velocity_opt {struct velocity_info {struct pci_dev *pdev; -struct net_device *dev; +struct net_device *netdev;unsigned long active_vlans[BITS_TO_LONGS (VLAN_N_VID )];u8 ip_addr[4 ];
@@ -1514,7 +1514,7 @@ static inline int velocity_get_ip(struct velocity_info *vptr)int res = -ENOENT ;rcu_read_lock (); - in_dev =__in_dev_get_rcu (vptr->dev); + in_dev =__in_dev_get_rcu (vptr->netdev);if (in_dev !=NULL ) { ifa = (struct in_ifaddr *) in_dev->ifa_list;if (ifa !=NULL ) {
Signature · 1 line
1.7.9.5
PATCH v4 2/3 net: velocity: Convert to generic dma functions
In reply to Tony PriskRemove the pci_* dma functions and replace with the more generic versions.
In preparation of adding platform support, a new struct device *dev is added to struct velocity_info which can be used by both the pci and platform code.
--- drivers/net/ethernet/via/via-velocity.c | 51 +++++++++++++++---------------- drivers/net/ethernet/via/via-velocity.h | 1 + 2 files changed, 26 insertions(+), 26 deletions(-)
drivers/net/ethernet/via/via-velocity.c +25 -26
@@ -46,6 +46,7 @@#include <linux/types.h> #include <linux/bitops.h> #include <linux/init.h> +#include <linux/dma-mapping.h> #include <linux/mm.h> #include <linux/errno.h> #include <linux/ioport.h>
@@ -1459,7 +1460,6 @@ static int velocity_init_dma_rings(struct velocity_info *vptr)struct velocity_opt *opt = &vptr->options;const unsigned int rx_ring_size = opt->numrx *sizeof (struct rx_desc );const unsigned int tx_ring_size = opt->numtx *sizeof (struct tx_desc ); -struct pci_dev *pdev = vptr->pdev;dma_addr_t pool_dma;void *pool;unsigned int i;
@@ -1467,13 +1467,13 @@ static int velocity_init_dma_rings(struct velocity_info *vptr)/* * Allocate all RD/TD rings a single pool. * -* pci_alloc_consistent() fulfills the requirement for 64 bytes +* dma_alloc_coherent() fulfills the requirement for 64 bytes * alignment */ - pool =pci_alloc_consistent (pdev, tx_ring_size * vptr->tx.numq + - rx_ring_size, &pool_dma); + pool =dma_alloc_coherent (vptr->dev, tx_ring_size * vptr->tx.numq + + rx_ring_size, &pool_dma,GFP_ATOMIC );if (!pool) { -dev_err (&pdev->dev,"%s : DMA memory allocation failed.\n" , +dev_err (vptr->dev,"%s : DMA memory allocation failed.\n" , vptr->netdev->name);return -ENOMEM ; }
@@ -1524,8 +1524,8 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)*/ skb_reserve (rd_info->skb,64 - ((unsigned long ) rd_info->skb->data &63 )); - rd_info->skb_dma =pci_map_single (vptr->pdev, rd_info->skb->data, - vptr->rx.buf_sz,PCI_DMA_FROMDEVICE ); + rd_info->skb_dma =dma_map_single (vptr->dev, rd_info->skb->data, + vptr->rx.buf_sz,DMA_FROM_DEVICE );/* * Fill in the descriptor to match
@@ -1588,8 +1588,8 @@ static void velocity_free_rd_ring(struct velocity_info *vptr)if (!rd_info->skb)continue ; -pci_unmap_single (vptr->pdev, rd_info->skb_dma, vptr->rx.buf_sz, -PCI_DMA_FROMDEVICE ); +dma_unmap_single (vptr->dev, rd_info->skb_dma, vptr->rx.buf_sz, +DMA_FROM_DEVICE ); rd_info->skb_dma =0 ;dev_kfree_skb (rd_info->skb);
@@ -1670,7 +1670,7 @@ static void velocity_free_dma_rings(struct velocity_info *vptr)const int size = vptr->options.numrx *sizeof (struct rx_desc ) + vptr->options.numtx *sizeof (struct tx_desc ) * vptr->tx.numq; -pci_free_consistent (vptr->pdev, size, vptr->rx.ring, vptr->rx.pool_dma); +dma_free_coherent (vptr->dev, size, vptr->rx.ring, vptr->rx.pool_dma); }static int velocity_init_rings (struct velocity_info *vptr,int mtu)
@@ -1727,8 +1727,8 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, pktlen =max_t (size_t, pktlen, td->td_buf[i].size & ~TD_QUEUE ); -pci_unmap_single (vptr->pdev, tdinfo->skb_dma[i], -le16_to_cpu (pktlen),PCI_DMA_TODEVICE ); +dma_unmap_single (vptr->dev, tdinfo->skb_dma[i], +le16_to_cpu (pktlen),DMA_TO_DEVICE ); } }dev_kfree_skb_irq (skb);
@@ -1750,8 +1750,8 @@ static void velocity_free_td_ring_entry(struct velocity_info *vptr,if (td_info->skb) {for (i =0 ; i < td_info->nskb_dma; i++) {if (td_info->skb_dma[i]) { -pci_unmap_single (vptr->pdev, td_info->skb_dma[i], - td_info->skb->len,PCI_DMA_TODEVICE ); +dma_unmap_single (vptr->dev, td_info->skb_dma[i], + td_info->skb->len,DMA_TO_DEVICE ); td_info->skb_dma[i] =0 ; } }
@@ -2029,7 +2029,6 @@ static inline void velocity_iph_realign(struct velocity_info *vptr,*/ static int velocity_receive_frame (struct velocity_info *vptr,int idx) { -void (*pci_action)(struct pci_dev *,dma_addr_t ,size_t ,int );struct net_device_stats *stats = &vptr->netdev->stats;struct velocity_rd_info *rd_info = &(vptr->rx.info[idx]);struct rx_desc *rd = &(vptr->rx.ring[idx]);
@@ -2047,8 +2046,8 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx) skb = rd_info->skb; -pci_dma_sync_single_for_cpu (vptr->pdev, rd_info->skb_dma, - vptr->rx.buf_sz,PCI_DMA_FROMDEVICE ); +dma_sync_single_for_cpu (vptr->dev, rd_info->skb_dma, + vptr->rx.buf_sz,DMA_FROM_DEVICE );/* * Drop frame not meeting IEEE 802.3
@@ -2061,19 +2060,18 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx) } } - pci_action = pci_dma_sync_single_for_device; -velocity_rx_csum (rd, skb);if (velocity_rx_copy (&skb, pkt_len, vptr) <0 ) {velocity_iph_realign (vptr, skb, pkt_len); - pci_action = pci_unmap_single; rd_info->skb =NULL ; +dma_unmap_single (vptr->dev, rd_info->skb_dma, vptr->rx.buf_sz, +DMA_FROM_DEVICE ); + }else { +dma_sync_single_for_device (vptr->dev, rd_info->skb_dma, + vptr->rx.buf_sz,DMA_FROM_DEVICE ); } -pci_action (vptr->pdev, rd_info->skb_dma, vptr->rx.buf_sz, -PCI_DMA_FROMDEVICE ); -skb_put (skb, pkt_len -4 ); skb->protocol =eth_type_trans (skb, vptr->netdev);
@@ -2550,7 +2548,8 @@ static netdev_tx_t velocity_xmit(struct sk_buff *skb,* add it to the transmit ring. */ tdinfo->skb = skb; - tdinfo->skb_dma[0 ] =pci_map_single (vptr->pdev, skb->data, pktlen,PCI_DMA_TODEVICE ); + tdinfo->skb_dma[0 ] =dma_map_single (vptr->dev, skb->data, pktlen, +DMA_TO_DEVICE ); td_ptr->tdesc0.len =cpu_to_le16 (pktlen); td_ptr->td_buf[0 ].pa_low =cpu_to_le32 (tdinfo->skb_dma[0 ]); td_ptr->td_buf[0 ].pa_high =0 ;
@@ -2560,7 +2559,7 @@ static netdev_tx_t velocity_xmit(struct sk_buff *skb,for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) {const skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; - tdinfo->skb_dma[i +1 ] =skb_frag_dma_map (&vptr->pdev->dev, + tdinfo->skb_dma[i +1 ] =skb_frag_dma_map (vptr->dev, frag,0 ,skb_frag_size (frag),DMA_TO_DEVICE );
@@ -2637,6 +2636,7 @@ static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr, {memset (vptr,0 ,sizeof (struct velocity_info )); + vptr->dev = &pdev->dev; vptr->pdev = pdev; vptr->chip_id = info->chip_id; vptr->tx.numq = info->txqueue;
@@ -2744,7 +2744,6 @@ static int velocity_found1(struct pci_dev *pdev,SET_NETDEV_DEV (dev, &pdev->dev); vptr =netdev_priv (dev); -if (first) {printk (KERN_INFO "%s Ver. %s\n" ,VELOCITY_FULL_DRV_NAM ,VELOCITY_VERSION );
drivers/net/ethernet/via/via-velocity.h +1 -0
@@ -1434,6 +1434,7 @@ struct velocity_opt {#define GET_RD_BY_IDX (vptr, idx) (vptr->rd_ring[idx])struct velocity_info { +struct device *dev;struct pci_dev *pdev;struct net_device *netdev;
Signature · 1 line
1.7.9.5
PATCH v4 3/3 net: velocity: Add platform device support to VIA velocity driver
In reply to Tony PriskAdd support for the VIA Velocity network driver to be bound to a OF created platform device.
--- .../devicetree/bindings/net/via-velocity.txt | 20 + drivers/net/ethernet/via/Kconfig | 3 +- drivers/net/ethernet/via/via-velocity.c | 435 +++++++++++++++----- drivers/net/ethernet/via/via-velocity.h | 35 +- 4 files changed, 380 insertions(+), 113 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/via-velocity.txt
Documentation/devicetree/bindings/net/via-velocity.txt new file +20 -0
@@ -0,0 +1,20 @@ +* VIA Velocity 10/100/1000 Network Controller + +Required properties: +- compatible : Should be "via,velocity-vt6110" +- reg : Address and length of the io space +- interrupts : Should contain the controller interrupt line + +Optional properties: +- no-eeprom : PCI network cards use an external EEPROM to store data. Embedded + devices quite often set this data in uboot and do not provide an eeprom. + Specify this option if you have no external eeprom. + +Examples: + +eth0@d8004000 { + compatible = "via,velocity-vt6110"; + reg = <0xd8004000 0x400>; + interrupts = <10>; + no-eeprom; +};
drivers/net/ethernet/via/Kconfig +1 -2
@@ -5,7 +5,6 @@ config NET_VENDOR_VIA bool "VIA devices" default y - depends on PCI ---help--- If you have a network (Ethernet) card belonging to this class, say Y and read the Ethernet-HOWTO, available from
@@ -45,7 +44,7 @@ config VIA_RHINE_MMIO config VIA_VELOCITY tristate "VIA Velocity support" - depends on PCI + depends on (PCI || USE_OF) select CRC32 select CRC_CCITT select NET_CORE
drivers/net/ethernet/via/via-velocity.c +326 -109
694 lines not on this page · raw message
drivers/net/ethernet/via/via-velocity.h +33 -2
@@ -1265,7 +1265,7 @@ struct velocity_context {#define PHYID_VT3216_64BIT 0x000FC600UL#define PHYID_MARVELL_1000 0x01410C50UL#define PHYID_MARVELL_1000S 0x01410C40UL - +#define PHYID_ICPLUS_IP101A 0x02430C54UL#define PHYID_REV_ID_MASK 0x0000000FUL#define PHYID_GET_PHY_ID (i) ((i) & ~PHYID_REV_ID_MASK)
@@ -1433,10 +1433,41 @@ struct velocity_opt {#define GET_RD_BY_IDX (vptr, idx) (vptr->rd_ring[idx]) +static inline char velocity_choose_state (struct device *dev, +pm_message_t state) + +{ +switch (state.event) { +case PM_EVENT_ON : +return PCI_D0 ; +case PM_EVENT_FREEZE : +case PM_EVENT_PRETHAW : +/* REVISIT both freeze and pre-thaw "should" use D0 */ +case PM_EVENT_SUSPEND : +case PM_EVENT_HIBERNATE : +return PCI_D3hot; +default : +dev_info (dev,"unrecognized suspend event %d\n" , state.event); +BUG (); + } + +return PCI_D0 ; +} + +enum velocity_bus_type { +BUS_PCI , +BUS_PLATFORM , +}; +struct velocity_info { +union { +struct pci_dev *pcidev; +struct platform_device *platdev; + } pdev;struct device *dev; -struct pci_dev *pdev;struct net_device *netdev; +enum velocity_bus_type bustype; +int no_eeprom;unsigned long active_vlans[BITS_TO_LONGS (VLAN_N_VID )];u8 ip_addr[4 ];
Signature · 1 line
1.7.9.5
David Miller
maintainerFrom: Tony Prisk <[email protected]>
Date: Tue, 30 Apr 2013 18:16:57 +1200
Quoted 1 line
I think it would be pertinent to get some tested-by's for PCI users.
Tony, this came in a bit late, and there hasn't been any PCI test reports so I have to defer this to the next merge window, sorry.
Quoted 6 lines · David Miller
From: Tony Prisk <[email protected]>
Date: Tue, 30 Apr 2013 18:16:57 +1200Quoted 1 line
I think it would be pertinent to get some tested-by's for PCI users.
Tony, this came in a bit late, and there hasn't been any PCI test reports so I have to defer this to the next merge window, sorry.
No problems - I didn't honestly expect it to go in for 3.10 any way. I was trying to get in nice and earlier for 3.11 to give people plenty of time to test.
Regards
Tony P