lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ibmveth: Coding style fixes

Browse Source 
Fix most of the kernel coding style issues in ibmveth.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Santiago Leon <santil@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Santiago Leon
2010-09-03 18:29:30 +00:00
committed by David S. Miller
parent 517e80e678
commit f148f61d89
1 changed files with 172 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

317
drivers/net/ibmveth.c
View File

@@ -1,31 +1,29 @@
/**************************************************************************/ /*
/* */ * IBM eServer i/pSeries Virtual Ethernet Device Driver
/* IBM eServer i/pSeries Virtual Ethernet Device Driver */ * Copyright (C) 2003 IBM Corp.
/* Copyright (C) 2003 IBM Corp. */ * Originally written by Dave Larson (larson1@us.ibm.com)
/* Originally written by Dave Larson (larson1@us.ibm.com) */ * Maintained by Santiago Leon (santil@us.ibm.com)
/* Maintained by Santiago Leon (santil@us.ibm.com) */ *
/* */ * This program is free software; you can redistribute it and/or modify
/* This program is free software; you can redistribute it and/or modify */ * it under the terms of the GNU General Public License as published by
/* it under the terms of the GNU General Public License as published by */ * the Free Software Foundation; either version 2 of the License, or
/* the Free Software Foundation; either version 2 of the License, or */ * (at your option) any later version.
/* (at your option) any later version. */ *
/* */ * This program is distributed in the hope that it will be useful,
/* This program is distributed in the hope that it will be useful, */ * but WITHOUT ANY WARRANTY; without even the implied warranty of
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ * GNU General Public License for more details.
/* GNU General Public License for more details. */ *
/* */ * You should have received a copy of the GNU General Public License
/* You should have received a copy of the GNU General Public License */ * along with this program; if not, write to the Free Software
/* along with this program; if not, write to the Free Software */ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */ * USA
/* USA */ *
/* */ * This module contains the implementation of a virtual ethernet device
/* This module contains the implementation of a virtual ethernet device */ * for use with IBM i/pSeries LPAR Linux. It utilizes the logical LAN
/* for use with IBM i/pSeries LPAR Linux. It utilizes the logical LAN */ * option of the RS/6000 Platform Architechture to interface with virtual
/* option of the RS/6000 Platform Architechture to interface with virtual */ * ethernet NICs that are presented to the partition by the hypervisor.
/* ethernet NICs that are presented to the partition by the hypervisor. */ */
/* */
/**************************************************************************/
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
@@ -59,7 +57,7 @@
#ifdef DEBUG #ifdef DEBUG
#define ibmveth_assert(expr) \ #define ibmveth_assert(expr) \
if(!(expr)) { \ if (!(expr)) { \
printk(KERN_DEBUG "assertion failed (%s:%3.3d ua:%x): %s\n", __FILE__, __LINE__, adapter->vdev->unit_address, #expr); \ printk(KERN_DEBUG "assertion failed (%s:%3.3d ua:%x): %s\n", __FILE__, __LINE__, adapter->vdev->unit_address, #expr); \
BUG(); \ BUG(); \
} }
@@ -75,7 +73,8 @@ static struct kobj_type ktype_veth_pool;
static const char ibmveth_driver_name[] = "ibmveth"; static const char ibmveth_driver_name[] = "ibmveth";
static const char ibmveth_driver_string[] = "IBM i/pSeries Virtual Ethernet Driver"; static const char ibmveth_driver_string[] = "IBM i/pSeries Virtual Ethernet "
"Driver";
#define ibmveth_driver_version "1.03" #define ibmveth_driver_version "1.03"
MODULE_AUTHOR("Santiago Leon <santil@us.ibm.com>"); MODULE_AUTHOR("Santiago Leon <santil@us.ibm.com>");
@@ -108,8 +107,10 @@ struct ibmveth_stat {
struct ibmveth_stat ibmveth_stats[] = { struct ibmveth_stat ibmveth_stats[] = {
{ "replenish_task_cycles", IBMVETH_STAT_OFF(replenish_task_cycles) }, { "replenish_task_cycles", IBMVETH_STAT_OFF(replenish_task_cycles) },
{ "replenish_no_mem", IBMVETH_STAT_OFF(replenish_no_mem) }, { "replenish_no_mem", IBMVETH_STAT_OFF(replenish_no_mem) },
{ "replenish_add_buff_failure", IBMVETH_STAT_OFF(replenish_add_buff_failure) }, { "replenish_add_buff_failure",
{ "replenish_add_buff_success", IBMVETH_STAT_OFF(replenish_add_buff_success) }, IBMVETH_STAT_OFF(replenish_add_buff_failure) },
{ "replenish_add_buff_success",
IBMVETH_STAT_OFF(replenish_add_buff_success) },
{ "rx_invalid_buffer", IBMVETH_STAT_OFF(rx_invalid_buffer) }, { "rx_invalid_buffer", IBMVETH_STAT_OFF(rx_invalid_buffer) },
{ "rx_no_buffer", IBMVETH_STAT_OFF(rx_no_buffer) }, { "rx_no_buffer", IBMVETH_STAT_OFF(rx_no_buffer) },
{ "tx_map_failed", IBMVETH_STAT_OFF(tx_map_failed) }, { "tx_map_failed", IBMVETH_STAT_OFF(tx_map_failed) },
@@ -126,36 +127,39 @@ static inline u32 ibmveth_rxq_flags(struct ibmveth_adapter *adapter)
static inline int ibmveth_rxq_toggle(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_toggle(struct ibmveth_adapter *adapter)
{ {
return (ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_TOGGLE) >> IBMVETH_RXQ_TOGGLE_SHIFT; return (ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_TOGGLE) >>
IBMVETH_RXQ_TOGGLE_SHIFT;
} }
static inline int ibmveth_rxq_pending_buffer(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_pending_buffer(struct ibmveth_adapter *adapter)
{ {
return (ibmveth_rxq_toggle(adapter) == adapter->rx_queue.toggle); return ibmveth_rxq_toggle(adapter) == adapter->rx_queue.toggle;
} }
static inline int ibmveth_rxq_buffer_valid(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_buffer_valid(struct ibmveth_adapter *adapter)
{ {
return (ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_VALID); return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_VALID;
} }
static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter)
{ {
return (ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_OFF_MASK); return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_OFF_MASK;
} }
static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter)
{ {
return (adapter->rx_queue.queue_addr[adapter->rx_queue.index].length); return adapter->rx_queue.queue_addr[adapter->rx_queue.index].length;
} }
static inline int ibmveth_rxq_csum_good(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_csum_good(struct ibmveth_adapter *adapter)
{ {
return (ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_CSUM_GOOD); return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_CSUM_GOOD;
} }
/* setup the initial settings for a buffer pool */ /* setup the initial settings for a buffer pool */
static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool, u32 pool_index, u32 pool_size, u32 buff_size, u32 pool_active) static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool,
u32 pool_index, u32 pool_size,
u32 buff_size, u32 pool_active)
{ {
pool->size = pool_size; pool->size = pool_size;
pool->index = pool_index; pool->index = pool_index;
@@ -171,12 +175,11 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
pool->free_map = kmalloc(sizeof(u16) * pool->size, GFP_KERNEL); pool->free_map = kmalloc(sizeof(u16) * pool->size, GFP_KERNEL);
if(!pool->free_map) { if (!pool->free_map)
return -1; return -1;
}
pool->dma_addr = kmalloc(sizeof(dma_addr_t) * pool->size, GFP_KERNEL); pool->dma_addr = kmalloc(sizeof(dma_addr_t) * pool->size, GFP_KERNEL);
if(!pool->dma_addr) { if (!pool->dma_addr) {
kfree(pool->free_map); kfree(pool->free_map);
pool->free_map = NULL; pool->free_map = NULL;
return -1; return -1;
@@ -184,7 +187,7 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
pool->skbuff = kcalloc(pool->size, sizeof(void *), GFP_KERNEL); pool->skbuff = kcalloc(pool->size, sizeof(void *), GFP_KERNEL);
if(!pool->skbuff) { if (!pool->skbuff) {
kfree(pool->dma_addr); kfree(pool->dma_addr);
pool->dma_addr = NULL; pool->dma_addr = NULL;
@@ -195,9 +198,8 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size); memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size);
for(i = 0; i < pool->size; ++i) { for (i = 0; i < pool->size; ++i)
pool->free_map[i] = i; pool->free_map[i] = i;
}
atomic_set(&pool->available, 0); atomic_set(&pool->available, 0);
pool->producer_index = 0; pool->producer_index = 0;
@@ -217,7 +219,8 @@ static inline void ibmveth_flush_buffer(void *addr, unsigned long length)
/* replenish the buffers for a pool. note that we don't need to /* replenish the buffers for a pool. note that we don't need to
* skb_reserve these since they are used for incoming... * skb_reserve these since they are used for incoming...
*/ */
static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struct ibmveth_buff_pool *pool) static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter,
struct ibmveth_buff_pool *pool)
{ {
u32 i; u32 i;
u32 count = pool->size - atomic_read(&pool->available); u32 count = pool->size - atomic_read(&pool->available);
@@ -230,12 +233,12 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
mb(); mb();
for(i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
union ibmveth_buf_desc desc; union ibmveth_buf_desc desc;
skb = netdev_alloc_skb(adapter->netdev, pool->buff_size); skb = netdev_alloc_skb(adapter->netdev, pool->buff_size);
if(!skb) { if (!skb) {
netdev_dbg(adapter->netdev, netdev_dbg(adapter->netdev,
"replenish: unable to allocate skb\n"); "replenish: unable to allocate skb\n");
adapter->replenish_no_mem++; adapter->replenish_no_mem++;
@@ -262,7 +265,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
pool->skbuff[index] = skb; pool->skbuff[index] = skb;
correlator = ((u64)pool->index << 32) | index; correlator = ((u64)pool->index << 32) | index;
*(u64*)skb->data = correlator; *(u64 *)skb->data = correlator;
desc.fields.flags_len = IBMVETH_BUF_VALID | pool->buff_size; desc.fields.flags_len = IBMVETH_BUF_VALID | pool->buff_size;
desc.fields.address = dma_addr; desc.fields.address = dma_addr;
@@ -273,11 +276,12 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
IBMVETH_BUFF_OH); IBMVETH_BUFF_OH);
ibmveth_flush_buffer(skb->data, len); ibmveth_flush_buffer(skb->data, len);
} }
lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc); lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address,
desc.desc);
if (lpar_rc != H_SUCCESS) if (lpar_rc != H_SUCCESS) {
goto failure; goto failure;
else { } else {
buffers_added++; buffers_added++;
adapter->replenish_add_buff_success++; adapter->replenish_add_buff_success++;
} }
@@ -320,21 +324,23 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)
ibmveth_replenish_buffer_pool(adapter, pool); ibmveth_replenish_buffer_pool(adapter, pool);
} }
adapter->rx_no_buffer = *(u64*)(((char*)adapter->buffer_list_addr) + 4096 - 8); adapter->rx_no_buffer = *(u64 *)(((char*)adapter->buffer_list_addr) +
4096 - 8);
} }
/* empty and free ana buffer pool - also used to do cleanup in error paths */ /* empty and free ana buffer pool - also used to do cleanup in error paths */
static void ibmveth_free_buffer_pool(struct ibmveth_adapter *adapter, struct ibmveth_buff_pool *pool) static void ibmveth_free_buffer_pool(struct ibmveth_adapter *adapter,
struct ibmveth_buff_pool *pool)
{ {
int i; int i;
kfree(pool->free_map); kfree(pool->free_map);
pool->free_map = NULL; pool->free_map = NULL;
if(pool->skbuff && pool->dma_addr) { if (pool->skbuff && pool->dma_addr) {
for(i = 0; i < pool->size; ++i) { for (i = 0; i < pool->size; ++i) {
struct sk_buff *skb = pool->skbuff[i]; struct sk_buff *skb = pool->skbuff[i];
if(skb) { if (skb) {
dma_unmap_single(&adapter->vdev->dev, dma_unmap_single(&adapter->vdev->dev,
pool->dma_addr[i], pool->dma_addr[i],
pool->buff_size, pool->buff_size,
@@ -345,19 +351,20 @@ static void ibmveth_free_buffer_pool(struct ibmveth_adapter *adapter, struct ibm
} }
} }
if(pool->dma_addr) { if (pool->dma_addr) {
kfree(pool->dma_addr); kfree(pool->dma_addr);
pool->dma_addr = NULL; pool->dma_addr = NULL;
} }
if(pool->skbuff) { if (pool->skbuff) {
kfree(pool->skbuff); kfree(pool->skbuff);
pool->skbuff = NULL; pool->skbuff = NULL;
} }
} }
/* remove a buffer from a pool */ /* remove a buffer from a pool */
static void ibmveth_remove_buffer_from_pool(struct ibmveth_adapter *adapter, u64 correlator) static void ibmveth_remove_buffer_from_pool(struct ibmveth_adapter *adapter,
u64 correlator)
{ {
unsigned int pool = correlator >> 32; unsigned int pool = correlator >> 32;
unsigned int index = correlator & 0xffffffffUL; unsigned int index = correlator & 0xffffffffUL;
@@ -416,7 +423,7 @@ static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
ibmveth_assert(pool < IBMVETH_NUM_BUFF_POOLS); ibmveth_assert(pool < IBMVETH_NUM_BUFF_POOLS);
ibmveth_assert(index < adapter->rx_buff_pool[pool].size); ibmveth_assert(index < adapter->rx_buff_pool[pool].size);
if(!adapter->rx_buff_pool[pool].active) { if (!adapter->rx_buff_pool[pool].active) {
ibmveth_rxq_harvest_buffer(adapter); ibmveth_rxq_harvest_buffer(adapter);
ibmveth_free_buffer_pool(adapter, &adapter->rx_buff_pool[pool]); ibmveth_free_buffer_pool(adapter, &adapter->rx_buff_pool[pool]);
return; return;
@@ -428,13 +435,13 @@ static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc); lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);
if(lpar_rc != H_SUCCESS) { if (lpar_rc != H_SUCCESS) {
netdev_dbg(adapter->netdev, "h_add_logical_lan_buffer failed " netdev_dbg(adapter->netdev, "h_add_logical_lan_buffer failed "
"during recycle rc=%ld", lpar_rc); "during recycle rc=%ld", lpar_rc);
ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator); ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
} }
if(++adapter->rx_queue.index == adapter->rx_queue.num_slots) { if (++adapter->rx_queue.index == adapter->rx_queue.num_slots) {
adapter->rx_queue.index = 0; adapter->rx_queue.index = 0;
adapter->rx_queue.toggle = !adapter->rx_queue.toggle; adapter->rx_queue.toggle = !adapter->rx_queue.toggle;
} }
@@ -444,7 +451,7 @@ static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
{ {
ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator); ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
if(++adapter->rx_queue.index == adapter->rx_queue.num_slots) { if (++adapter->rx_queue.index == adapter->rx_queue.num_slots) {
adapter->rx_queue.index = 0; adapter->rx_queue.index = 0;
adapter->rx_queue.toggle = !adapter->rx_queue.toggle; adapter->rx_queue.toggle = !adapter->rx_queue.toggle;
} }
@@ -455,7 +462,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
int i; int i;
struct device *dev = &adapter->vdev->dev; struct device *dev = &adapter->vdev->dev;
if(adapter->buffer_list_addr != NULL) { if (adapter->buffer_list_addr != NULL) {
if (!dma_mapping_error(dev, adapter->buffer_list_dma)) { if (!dma_mapping_error(dev, adapter->buffer_list_dma)) {
dma_unmap_single(dev, adapter->buffer_list_dma, 4096, dma_unmap_single(dev, adapter->buffer_list_dma, 4096,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
@@ -465,7 +472,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
adapter->buffer_list_addr = NULL; adapter->buffer_list_addr = NULL;
} }
if(adapter->filter_list_addr != NULL) { if (adapter->filter_list_addr != NULL) {
if (!dma_mapping_error(dev, adapter->filter_list_dma)) { if (!dma_mapping_error(dev, adapter->filter_list_dma)) {
dma_unmap_single(dev, adapter->filter_list_dma, 4096, dma_unmap_single(dev, adapter->filter_list_dma, 4096,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
@@ -475,7 +482,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
adapter->filter_list_addr = NULL; adapter->filter_list_addr = NULL;
} }
if(adapter->rx_queue.queue_addr != NULL) { if (adapter->rx_queue.queue_addr != NULL) {
if (!dma_mapping_error(dev, adapter->rx_queue.queue_dma)) { if (!dma_mapping_error(dev, adapter->rx_queue.queue_dma)) {
dma_unmap_single(dev, dma_unmap_single(dev,
adapter->rx_queue.queue_dma, adapter->rx_queue.queue_dma,
@@ -487,7 +494,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
adapter->rx_queue.queue_addr = NULL; adapter->rx_queue.queue_addr = NULL;
} }
for(i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
if (adapter->rx_buff_pool[i].active) if (adapter->rx_buff_pool[i].active)
ibmveth_free_buffer_pool(adapter, ibmveth_free_buffer_pool(adapter,
&adapter->rx_buff_pool[i]); &adapter->rx_buff_pool[i]);
@@ -510,9 +517,11 @@ static int ibmveth_register_logical_lan(struct ibmveth_adapter *adapter,
{ {
int rc, try_again = 1; int rc, try_again = 1;
/* After a kexec the adapter will still be open, so our attempt to /*
* open it will fail. So if we get a failure we free the adapter and * After a kexec the adapter will still be open, so our attempt to
* try again, but only once. */ * open it will fail. So if we get a failure we free the adapter and
* try again, but only once.
*/
retry: retry:
rc = h_register_logical_lan(adapter->vdev->unit_address, rc = h_register_logical_lan(adapter->vdev->unit_address,
adapter->buffer_list_dma, rxq_desc.desc, adapter->buffer_list_dma, rxq_desc.desc,
@@ -551,7 +560,7 @@ static int ibmveth_open(struct net_device *netdev)
adapter->buffer_list_addr = (void*) get_zeroed_page(GFP_KERNEL); adapter->buffer_list_addr = (void*) get_zeroed_page(GFP_KERNEL);
adapter->filter_list_addr = (void*) get_zeroed_page(GFP_KERNEL); adapter->filter_list_addr = (void*) get_zeroed_page(GFP_KERNEL);
if(!adapter->buffer_list_addr || !adapter->filter_list_addr) { if (!adapter->buffer_list_addr || !adapter->filter_list_addr) {
netdev_err(netdev, "unable to allocate filter or buffer list " netdev_err(netdev, "unable to allocate filter or buffer list "
"pages\n"); "pages\n");
ibmveth_cleanup(adapter); ibmveth_cleanup(adapter);
@@ -559,10 +568,12 @@ static int ibmveth_open(struct net_device *netdev)
return -ENOMEM; return -ENOMEM;
} }
adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) * rxq_entries; adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) *
adapter->rx_queue.queue_addr = kmalloc(adapter->rx_queue.queue_len, GFP_KERNEL); rxq_entries;
adapter->rx_queue.queue_addr = kmalloc(adapter->rx_queue.queue_len,
GFP_KERNEL);
if(!adapter->rx_queue.queue_addr) { if (!adapter->rx_queue.queue_addr) {
netdev_err(netdev, "unable to allocate rx queue pages\n"); netdev_err(netdev, "unable to allocate rx queue pages\n");
ibmveth_cleanup(adapter); ibmveth_cleanup(adapter);
napi_disable(&adapter->napi); napi_disable(&adapter->napi);
@@ -596,7 +607,8 @@ static int ibmveth_open(struct net_device *netdev)
memcpy(&mac_address, netdev->dev_addr, netdev->addr_len); memcpy(&mac_address, netdev->dev_addr, netdev->addr_len);
mac_address = mac_address >> 16; mac_address = mac_address >> 16;
rxq_desc.fields.flags_len = IBMVETH_BUF_VALID | adapter->rx_queue.queue_len; rxq_desc.fields.flags_len = IBMVETH_BUF_VALID |
adapter->rx_queue.queue_len;
rxq_desc.fields.address = adapter->rx_queue.queue_dma; rxq_desc.fields.address = adapter->rx_queue.queue_dma;
netdev_dbg(netdev, "buffer list @ 0x%p\n", adapter->buffer_list_addr); netdev_dbg(netdev, "buffer list @ 0x%p\n", adapter->buffer_list_addr);
@@ -607,7 +619,7 @@ static int ibmveth_open(struct net_device *netdev)
lpar_rc = ibmveth_register_logical_lan(adapter, rxq_desc, mac_address); lpar_rc = ibmveth_register_logical_lan(adapter, rxq_desc, mac_address);
if(lpar_rc != H_SUCCESS) { if (lpar_rc != H_SUCCESS) {
netdev_err(netdev, "h_register_logical_lan failed with %ld\n", netdev_err(netdev, "h_register_logical_lan failed with %ld\n",
lpar_rc); lpar_rc);
netdev_err(netdev, "buffer TCE:0x%llx filter TCE:0x%llx rxq " netdev_err(netdev, "buffer TCE:0x%llx filter TCE:0x%llx rxq "
@@ -621,8 +633,8 @@ static int ibmveth_open(struct net_device *netdev)
return -ENONET; return -ENONET;
} }
for(i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
if(!adapter->rx_buff_pool[i].active) if (!adapter->rx_buff_pool[i].active)
continue; continue;
if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[i])) { if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[i])) {
netdev_err(netdev, "unable to alloc pool\n"); netdev_err(netdev, "unable to alloc pool\n");
@@ -634,7 +646,9 @@ static int ibmveth_open(struct net_device *netdev)
} }
netdev_dbg(netdev, "registering irq 0x%x\n", netdev->irq); netdev_dbg(netdev, "registering irq 0x%x\n", netdev->irq);
if((rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name, netdev)) != 0) { rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name,
netdev);
if (rc != 0) {
netdev_err(netdev, "unable to request irq 0x%x, rc %d\n", netdev_err(netdev, "unable to request irq 0x%x, rc %d\n",
netdev->irq, rc); netdev->irq, rc);
do { do {
@@ -692,15 +706,15 @@ static int ibmveth_close(struct net_device *netdev)
lpar_rc = h_free_logical_lan(adapter->vdev->unit_address); lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
} while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY)); } while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY));
if(lpar_rc != H_SUCCESS) if (lpar_rc != H_SUCCESS) {
{
netdev_err(netdev, "h_free_logical_lan failed with %lx, " netdev_err(netdev, "h_free_logical_lan failed with %lx, "
"continuing with close\n", lpar_rc); "continuing with close\n", lpar_rc);
} }
free_irq(netdev->irq, netdev); free_irq(netdev->irq, netdev);
adapter->rx_no_buffer = *(u64*)(((char*)adapter->buffer_list_addr) + 4096 - 8); adapter->rx_no_buffer = *(u64 *)(((char *)adapter->buffer_list_addr) +
4096 - 8);
ibmveth_cleanup(adapter); ibmveth_cleanup(adapter);
@@ -709,9 +723,12 @@ static int ibmveth_close(struct net_device *netdev)
return 0; return 0;
} }
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
cmd->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg | SUPPORTED_FIBRE); {
cmd->advertising = (ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg | ADVERTISED_FIBRE); cmd->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |
SUPPORTED_FIBRE);
cmd->advertising = (ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg |
ADVERTISED_FIBRE);
cmd->speed = SPEED_1000; cmd->speed = SPEED_1000;
cmd->duplex = DUPLEX_FULL; cmd->duplex = DUPLEX_FULL;
cmd->port = PORT_FIBRE; cmd->port = PORT_FIBRE;
@@ -723,12 +740,16 @@ static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
return 0; return 0;
} }
static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info) { static void netdev_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
strncpy(info->driver, ibmveth_driver_name, sizeof(info->driver) - 1); strncpy(info->driver, ibmveth_driver_name, sizeof(info->driver) - 1);
strncpy(info->version, ibmveth_driver_version, sizeof(info->version) - 1); strncpy(info->version, ibmveth_driver_version,
sizeof(info->version) - 1);
} }
static u32 netdev_get_link(struct net_device *dev) { static u32 netdev_get_link(struct net_device *dev)
{
return 1; return 1;
} }
@@ -736,15 +757,16 @@ static void ibmveth_set_rx_csum_flags(struct net_device *dev, u32 data)
{ {
struct ibmveth_adapter *adapter = netdev_priv(dev); struct ibmveth_adapter *adapter = netdev_priv(dev);
if (data) if (data) {
adapter->rx_csum = 1; adapter->rx_csum = 1;
else { } else {
/* /*
* Since the ibmveth firmware interface does not have the concept of * Since the ibmveth firmware interface does not have the
* separate tx/rx checksum offload enable, if rx checksum is disabled * concept of separate tx/rx checksum offload enable, if rx
* we also have to disable tx checksum offload. Once we disable rx * checksum is disabled we also have to disable tx checksum
* checksum offload, we are no longer allowed to send tx buffers that * offload. Once we disable rx checksum offload, we are no
* are not properly checksummed. * longer allowed to send tx buffers that are not properly
* checksummed.
*/ */
adapter->rx_csum = 0; adapter->rx_csum = 0;
dev->features &= ~NETIF_F_IP_CSUM; dev->features &= ~NETIF_F_IP_CSUM;
@@ -811,8 +833,9 @@ static int ibmveth_set_csum_offload(struct net_device *dev, u32 data,
ret = h_illan_attributes(adapter->vdev->unit_address, ret = h_illan_attributes(adapter->vdev->unit_address,
set_attr, clr_attr, &ret_attr); set_attr, clr_attr, &ret_attr);
} else } else {
adapter->fw_ipv4_csum_support = data; adapter->fw_ipv4_csum_support = data;
}
ret6 = h_illan_attributes(adapter->vdev->unit_address, ret6 = h_illan_attributes(adapter->vdev->unit_address,
clr_attr6, set_attr6, &ret_attr); clr_attr6, set_attr6, &ret_attr);
@@ -866,7 +889,8 @@ static int ibmveth_set_tx_csum(struct net_device *dev, u32 data)
return 0; return 0;
if (data && !adapter->rx_csum) if (data && !adapter->rx_csum)
rc = ibmveth_set_csum_offload(dev, data, ibmveth_set_tx_csum_flags); rc = ibmveth_set_csum_offload(dev, data,
ibmveth_set_tx_csum_flags);
else else
ibmveth_set_tx_csum_flags(dev, data); ibmveth_set_tx_csum_flags(dev, data);
@@ -1091,12 +1115,13 @@ map_failed:
static int ibmveth_poll(struct napi_struct *napi, int budget) static int ibmveth_poll(struct napi_struct *napi, int budget)
{ {
struct ibmveth_adapter *adapter = container_of(napi, struct ibmveth_adapter, napi); struct ibmveth_adapter *adapter =
container_of(napi, struct ibmveth_adapter, napi);
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
int frames_processed = 0; int frames_processed = 0;
unsigned long lpar_rc; unsigned long lpar_rc;
restart_poll: restart_poll:
do { do {
if (!ibmveth_rxq_pending_buffer(adapter)) if (!ibmveth_rxq_pending_buffer(adapter))
break; break;
@@ -1197,7 +1222,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
IbmVethMcastEnableRecv | IbmVethMcastEnableRecv |
IbmVethMcastDisableFiltering, IbmVethMcastDisableFiltering,
0); 0);
if(lpar_rc != H_SUCCESS) { if (lpar_rc != H_SUCCESS) {
netdev_err(netdev, "h_multicast_ctrl rc=%ld when " netdev_err(netdev, "h_multicast_ctrl rc=%ld when "
"entering promisc mode\n", lpar_rc); "entering promisc mode\n", lpar_rc);
} }
@@ -1209,20 +1234,20 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
IbmVethMcastDisableFiltering | IbmVethMcastDisableFiltering |
IbmVethMcastClearFilterTable, IbmVethMcastClearFilterTable,
0); 0);
if(lpar_rc != H_SUCCESS) { if (lpar_rc != H_SUCCESS) {
netdev_err(netdev, "h_multicast_ctrl rc=%ld when " netdev_err(netdev, "h_multicast_ctrl rc=%ld when "
"attempting to clear filter table\n", "attempting to clear filter table\n",
lpar_rc); lpar_rc);
} }
/* add the addresses to the filter table */ /* add the addresses to the filter table */
netdev_for_each_mc_addr(ha, netdev) { netdev_for_each_mc_addr(ha, netdev) {
// add the multicast address to the filter table /* add the multicast address to the filter table */
unsigned long mcast_addr = 0; unsigned long mcast_addr = 0;
memcpy(((char *)&mcast_addr)+2, ha->addr, 6); memcpy(((char *)&mcast_addr)+2, ha->addr, 6);
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address, lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
IbmVethMcastAddFilter, IbmVethMcastAddFilter,
mcast_addr); mcast_addr);
if(lpar_rc != H_SUCCESS) { if (lpar_rc != H_SUCCESS) {
netdev_err(netdev, "h_multicast_ctrl rc=%ld " netdev_err(netdev, "h_multicast_ctrl rc=%ld "
"when adding an entry to the filter " "when adding an entry to the filter "
"table\n", lpar_rc); "table\n", lpar_rc);
@@ -1233,7 +1258,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address, lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
IbmVethMcastEnableFiltering, IbmVethMcastEnableFiltering,
0); 0);
if(lpar_rc != H_SUCCESS) { if (lpar_rc != H_SUCCESS) {
netdev_err(netdev, "h_multicast_ctrl rc=%ld when " netdev_err(netdev, "h_multicast_ctrl rc=%ld when "
"enabling filtering\n", lpar_rc); "enabling filtering\n", lpar_rc);
} }
@@ -1268,7 +1293,7 @@ static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)
} }
/* Look for an active buffer pool that can hold the new MTU */ /* Look for an active buffer pool that can hold the new MTU */
for(i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
adapter->rx_buff_pool[i].active = 1; adapter->rx_buff_pool[i].active = 1;
if (new_mtu_oh < adapter->rx_buff_pool[i].buff_size) { if (new_mtu_oh < adapter->rx_buff_pool[i].buff_size) {
@@ -1351,29 +1376,28 @@ static const struct net_device_ops ibmveth_netdev_ops = {
#endif #endif
}; };
static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) static int __devinit ibmveth_probe(struct vio_dev *dev,
const struct vio_device_id *id)
{ {
int rc, i; int rc, i;
struct net_device *netdev; struct net_device *netdev;
struct ibmveth_adapter *adapter; struct ibmveth_adapter *adapter;
unsigned char *mac_addr_p; unsigned char *mac_addr_p;
unsigned int *mcastFilterSize_p; unsigned int *mcastFilterSize_p;
dev_dbg(&dev->dev, "entering ibmveth_probe for UA 0x%x\n", dev_dbg(&dev->dev, "entering ibmveth_probe for UA 0x%x\n",
dev->unit_address); dev->unit_address);
mac_addr_p = (unsigned char *) vio_get_attribute(dev, mac_addr_p = (unsigned char *)vio_get_attribute(dev, VETH_MAC_ADDR,
VETH_MAC_ADDR, NULL); NULL);
if(!mac_addr_p) { if (!mac_addr_p) {
dev_err(&dev->dev, "Can't find VETH_MAC_ADDR attribute\n"); dev_err(&dev->dev, "Can't find VETH_MAC_ADDR attribute\n");
return 0; return 0;
} }
mcastFilterSize_p = (unsigned int *) vio_get_attribute(dev, mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev,
VETH_MCAST_FILTER_SIZE, NULL); VETH_MCAST_FILTER_SIZE, NULL);
if(!mcastFilterSize_p) { if (!mcastFilterSize_p) {
dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE " dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE "
"attribute\n"); "attribute\n");
return 0; return 0;
@@ -1381,7 +1405,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
netdev = alloc_etherdev(sizeof(struct ibmveth_adapter)); netdev = alloc_etherdev(sizeof(struct ibmveth_adapter));
if(!netdev) if (!netdev)
return -ENOMEM; return -ENOMEM;
adapter = netdev_priv(netdev); adapter = netdev_priv(netdev);
@@ -1389,19 +1413,19 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
adapter->vdev = dev; adapter->vdev = dev;
adapter->netdev = netdev; adapter->netdev = netdev;
adapter->mcastFilterSize= *mcastFilterSize_p; adapter->mcastFilterSize = *mcastFilterSize_p;
adapter->pool_config = 0; adapter->pool_config = 0;
netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16); netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16);
/* Some older boxes running PHYP non-natively have an OF that /*
returns a 8-byte local-mac-address field (and the first * Some older boxes running PHYP non-natively have an OF that returns
2 bytes have to be ignored) while newer boxes' OF return * a 8-byte local-mac-address field (and the first 2 bytes have to be
a 6-byte field. Note that IEEE 1275 specifies that * ignored) while newer boxes' OF return a 6-byte field. Note that
local-mac-address must be a 6-byte field. * IEEE 1275 specifies that local-mac-address must be a 6-byte field.
The RPA doc specifies that the first byte must be 10b, so * The RPA doc specifies that the first byte must be 10b, so we'll
we'll just look for it to solve this 8 vs. 6 byte field issue */ * just look for it to solve this 8 vs. 6 byte field issue
*/
if ((*mac_addr_p & 0x3) != 0x02) if ((*mac_addr_p & 0x3) != 0x02)
mac_addr_p += 2; mac_addr_p += 2;
@@ -1416,7 +1440,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
memcpy(netdev->dev_addr, &adapter->mac_addr, netdev->addr_len); memcpy(netdev->dev_addr, &adapter->mac_addr, netdev->addr_len);
for(i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
struct kobject *kobj = &adapter->rx_buff_pool[i].kobj; struct kobject *kobj = &adapter->rx_buff_pool[i].kobj;
int error; int error;
@@ -1441,7 +1465,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
rc = register_netdev(netdev); rc = register_netdev(netdev);
if(rc) { if (rc) {
netdev_dbg(netdev, "failed to register netdev rc=%d\n", rc); netdev_dbg(netdev, "failed to register netdev rc=%d\n", rc);
free_netdev(netdev); free_netdev(netdev);
return rc; return rc;
@@ -1458,7 +1482,7 @@ static int __devexit ibmveth_remove(struct vio_dev *dev)
struct ibmveth_adapter *adapter = netdev_priv(netdev); struct ibmveth_adapter *adapter = netdev_priv(netdev);
int i; int i;
for(i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
kobject_put(&adapter->rx_buff_pool[i].kobj); kobject_put(&adapter->rx_buff_pool[i].kobj);
unregister_netdev(netdev); unregister_netdev(netdev);
@@ -1473,8 +1497,8 @@ static struct attribute veth_active_attr;
static struct attribute veth_num_attr; static struct attribute veth_num_attr;
static struct attribute veth_size_attr; static struct attribute veth_size_attr;
static ssize_t veth_pool_show(struct kobject * kobj, static ssize_t veth_pool_show(struct kobject *kobj,
struct attribute * attr, char * buf) struct attribute *attr, char *buf)
{ {
struct ibmveth_buff_pool *pool = container_of(kobj, struct ibmveth_buff_pool *pool = container_of(kobj,
struct ibmveth_buff_pool, struct ibmveth_buff_pool,
@@ -1489,8 +1513,8 @@ static ssize_t veth_pool_show(struct kobject * kobj,
return 0; return 0;
} }
static ssize_t veth_pool_store(struct kobject * kobj, struct attribute * attr, static ssize_t veth_pool_store(struct kobject *kobj, struct attribute *attr,
const char * buf, size_t count) const char *buf, size_t count)
{ {
struct ibmveth_buff_pool *pool = container_of(kobj, struct ibmveth_buff_pool *pool = container_of(kobj,
struct ibmveth_buff_pool, struct ibmveth_buff_pool,
@@ -1504,7 +1528,7 @@ const char * buf, size_t count)
if (attr == &veth_active_attr) { if (attr == &veth_active_attr) {
if (value && !pool->active) { if (value && !pool->active) {
if (netif_running(netdev)) { if (netif_running(netdev)) {
if(ibmveth_alloc_buffer_pool(pool)) { if (ibmveth_alloc_buffer_pool(pool)) {
netdev_err(netdev, netdev_err(netdev,
"unable to alloc pool\n"); "unable to alloc pool\n");
return -ENOMEM; return -ENOMEM;
@@ -1515,8 +1539,9 @@ const char * buf, size_t count)
adapter->pool_config = 0; adapter->pool_config = 0;
if ((rc = ibmveth_open(netdev))) if ((rc = ibmveth_open(netdev)))
return rc; return rc;
} else } else {
pool->active = 1; pool->active = 1;
}
} else if (!value && pool->active) { } else if (!value && pool->active) {
int mtu = netdev->mtu + IBMVETH_BUFF_OH; int mtu = netdev->mtu + IBMVETH_BUFF_OH;
int i; int i;
@@ -1547,9 +1572,9 @@ const char * buf, size_t count)
pool->active = 0; pool->active = 0;
} }
} else if (attr == &veth_num_attr) { } else if (attr == &veth_num_attr) {
if (value <= 0 || value > IBMVETH_MAX_POOL_COUNT) if (value <= 0 || value > IBMVETH_MAX_POOL_COUNT) {
return -EINVAL; return -EINVAL;
else { } else {
if (netif_running(netdev)) { if (netif_running(netdev)) {
adapter->pool_config = 1; adapter->pool_config = 1;
ibmveth_close(netdev); ibmveth_close(netdev);
@@ -1557,13 +1582,14 @@ const char * buf, size_t count)
pool->size = value; pool->size = value;
if ((rc = ibmveth_open(netdev))) if ((rc = ibmveth_open(netdev)))
return rc; return rc;
} else } else {
pool->size = value; pool->size = value;
}
} }
} else if (attr == &veth_size_attr) { } else if (attr == &veth_size_attr) {
if (value <= IBMVETH_BUFF_OH || value > IBMVETH_MAX_BUF_SIZE) if (value <= IBMVETH_BUFF_OH || value > IBMVETH_MAX_BUF_SIZE) {
return -EINVAL; return -EINVAL;
else { } else {
if (netif_running(netdev)) { if (netif_running(netdev)) {
adapter->pool_config = 1; adapter->pool_config = 1;
ibmveth_close(netdev); ibmveth_close(netdev);
@@ -1571,8 +1597,9 @@ const char * buf, size_t count)
pool->buff_size = value; pool->buff_size = value;
if ((rc = ibmveth_open(netdev))) if ((rc = ibmveth_open(netdev)))
return rc; return rc;
} else } else {
pool->buff_size = value; pool->buff_size = value;
}
} }
} }
@@ -1582,16 +1609,16 @@ const char * buf, size_t count)
} }
#define ATTR(_name, _mode) \ #define ATTR(_name, _mode) \
struct attribute veth_##_name##_attr = { \ struct attribute veth_##_name##_attr = { \
.name = __stringify(_name), .mode = _mode, \ .name = __stringify(_name), .mode = _mode, \
}; };
static ATTR(active, 0644); static ATTR(active, 0644);
static ATTR(num, 0644); static ATTR(num, 0644);
static ATTR(size, 0644); static ATTR(size, 0644);
static struct attribute * veth_pool_attrs[] = { static struct attribute *veth_pool_attrs[] = {
&veth_active_attr, &veth_active_attr,
&veth_num_attr, &veth_num_attr,
&veth_size_attr, &veth_size_attr,
@@ -1616,7 +1643,7 @@ static int ibmveth_resume(struct device *dev)
return 0; return 0;
} }
static struct vio_device_id ibmveth_device_table[] __devinitdata= { static struct vio_device_id ibmveth_device_table[] __devinitdata = {
{ "network", "IBM,l-lan"}, { "network", "IBM,l-lan"},
{ "", "" } { "", "" }
}; };