[PATCH 2/4] ibmveth: White space, comment and formatting changes only
Stephen Rothwell
sfr at canb.auug.org.au
Wed Sep 7 13:47:06 EST 2005
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
drivers/net/ibmveth.c | 663 ++++++++++++++++++++++++++-----------------------
drivers/net/ibmveth.h | 253 +++++++++----------
2 files changed, 482 insertions(+), 434 deletions(-)
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
59f175c61878fef914654329662e172707619710
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1,37 +1,34 @@
-/**************************************************************************/
-/* */
-/* IBM eServer i/pSeries Virtual Ethernet Device Driver */
-/* Copyright (C) 2003 IBM Corp. */
-/* Originally written by Dave Larson (larson1 at us.ibm.com) */
-/* Maintained by Santiago Leon (santil at us.ibm.com) */
-/* */
-/* 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 */
-/* the Free Software Foundation; either version 2 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program; if not, write to the Free Software */
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */
-/* USA */
-/* */
-/* This module contains the implementation of a virtual ethernet device */
-/* for use with IBM i/pSeries LPAR Linux. It utilizes the logical LAN */
-/* option of the RS/6000 Platform Architechture to interface with virtual */
-/* ethernet NICs that are presented to the partition by the hypervisor. */
-/* */
-/**************************************************************************/
/*
- TODO:
- - remove frag processing code - no longer needed
- - add support for sysfs
- - possibly remove procfs support
-*/
+ * IBM eServer i/pSeries Virtual Ethernet Device Driver
+ * Copyright (C) 2003 IBM Corp.
+ * Originally written by Dave Larson (larson1 at us.ibm.com)
+ * Maintained by Santiago Leon (santil at us.ibm.com)
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ *
+ * This module contains the implementation of a virtual ethernet device
+ * for use with IBM i/pSeries LPAR Linux. It utilizes the logical LAN
+ * option of the RS/6000 Platform Architechture to interface with virtual
+ * ethernet NICs that are presented to the partition by the hypervisor.
+ *
+ * TODO:
+ * - remove frag processing code - no longer needed
+ * - add support for sysfs
+ * - possibly remove procfs support
+ */
#include <linux/config.h>
#include <linux/module.h>
@@ -49,6 +46,7 @@
#include <linux/mm.h>
#include <linux/ethtool.h>
#include <linux/proc_fs.h>
+
#include <asm/semaphore.h>
#include <asm/hvcall.h>
#include <asm/atomic.h>
@@ -61,26 +59,30 @@
#define DEBUG 1
-#define ibmveth_printk(fmt, args...) \
- printk(KERN_INFO "%s: " fmt, __FILE__, ## args)
+#define ibmveth_printk(fmt, args...) \
+ printk(KERN_INFO "%s: " fmt, __FILE__, ## args)
-#define ibmveth_error_printk(fmt, args...) \
- printk(KERN_ERR "(%s:%3.3d ua:%x) ERROR: " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
+#define ibmveth_error_printk(fmt, args...) \
+ printk(KERN_ERR "(%s:%3.3d ua:%x) ERROR: " fmt, __FILE__, __LINE__, \
+ adapter->vdev->unit_address, ## args)
#ifdef DEBUG
-#define ibmveth_debug_printk_no_adapter(fmt, args...) \
- printk(KERN_DEBUG "(%s:%3.3d): " fmt, __FILE__, __LINE__ , ## args)
-#define ibmveth_debug_printk(fmt, args...) \
- printk(KERN_DEBUG "(%s:%3.3d ua:%x): " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
-#define ibmveth_assert(expr) \
- if(!(expr)) { \
- printk(KERN_DEBUG "assertion failed (%s:%3.3d ua:%x): %s\n", __FILE__, __LINE__, adapter->vdev->unit_address, #expr); \
- BUG(); \
- }
+#define ibmveth_debug_printk_no_adapter(fmt, args...) \
+ printk(KERN_DEBUG "(%s:%3.3d): " fmt, __FILE__, __LINE__, ## args)
+#define ibmveth_debug_printk(fmt, args...) \
+ printk(KERN_DEBUG "(%s:%3.3d ua:%x): " fmt, __FILE__, __LINE__, \
+ adapter->vdev->unit_address, ## args)
+#define ibmveth_assert(expr) \
+ if (!(expr)) { \
+ printk(KERN_DEBUG "assertion failed (%s:%3.3d ua:%x): %s\n", \
+ __FILE__, __LINE__, \
+ adapter->vdev->unit_address, #expr); \
+ BUG(); \
+ }
#else
#define ibmveth_debug_printk_no_adapter(fmt, args...)
#define ibmveth_debug_printk(fmt, args...)
-#define ibmveth_assert(expr)
+#define ibmveth_assert(expr)
#endif
static int ibmveth_open(struct net_device *dev);
@@ -95,7 +97,8 @@ static void ibmveth_proc_register_driver
static void ibmveth_proc_unregister_driver(void);
static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter);
static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter);
-static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance,
+ struct pt_regs *regs);
static inline void ibmveth_schedule_replenishing(struct ibmveth_adapter*);
#ifdef CONFIG_PROC_FS
@@ -104,7 +107,8 @@ static struct proc_dir_entry *ibmveth_pr
#endif
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"
MODULE_AUTHOR("Santiago Leon <santil at us.ibm.com>");
@@ -115,26 +119,28 @@ MODULE_VERSION(ibmveth_driver_version);
/* simple methods of getting data from the current rxq entry */
static inline int ibmveth_rxq_pending_buffer(struct ibmveth_adapter *adapter)
{
- return (adapter->rx_queue.queue_addr[adapter->rx_queue.index].toggle == adapter->rx_queue.toggle);
+ return adapter->rx_queue.queue_addr[adapter->rx_queue.index].toggle
+ == adapter->rx_queue.toggle;
}
static inline int ibmveth_rxq_buffer_valid(struct ibmveth_adapter *adapter)
{
- return (adapter->rx_queue.queue_addr[adapter->rx_queue.index].valid);
+ return adapter->rx_queue.queue_addr[adapter->rx_queue.index].valid;
}
static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter)
{
- return (adapter->rx_queue.queue_addr[adapter->rx_queue.index].offset);
+ return adapter->rx_queue.queue_addr[adapter->rx_queue.index].offset;
}
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;
}
/* 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)
+static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool,
+ u32 pool_index, u32 pool_size, u32 buff_size)
{
pool->size = pool_size;
pool->index = pool_index;
@@ -147,22 +153,20 @@ static int ibmveth_alloc_buffer_pool(str
{
int i;
- pool->free_map = kmalloc(sizeof(u16) * pool->size, GFP_KERNEL);
-
- if(!pool->free_map) {
+ pool->free_map = kmalloc(sizeof(u16) * pool->size, GFP_KERNEL);
+ if (!pool->free_map)
return -1;
- }
- pool->dma_addr = kmalloc(sizeof(dma_addr_t) * pool->size, GFP_KERNEL);
- if(!pool->dma_addr) {
+ pool->dma_addr = kmalloc(sizeof(dma_addr_t) * pool->size, GFP_KERNEL);
+ if (!pool->dma_addr) {
kfree(pool->free_map);
pool->free_map = NULL;
return -1;
}
- pool->skbuff = kmalloc(sizeof(void*) * pool->size, GFP_KERNEL);
+ pool->skbuff = kmalloc(sizeof(void *) * pool->size, GFP_KERNEL);
- if(!pool->skbuff) {
+ if (!pool->skbuff) {
kfree(pool->dma_addr);
pool->dma_addr = NULL;
@@ -171,12 +175,11 @@ static int ibmveth_alloc_buffer_pool(str
return -1;
}
- memset(pool->skbuff, 0, sizeof(void*) * pool->size);
+ memset(pool->skbuff, 0, sizeof(void *) * 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;
- }
atomic_set(&pool->available, 0);
pool->producer_index = 0;
@@ -185,10 +188,12 @@ static int ibmveth_alloc_buffer_pool(str
return 0;
}
-/* 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...
*/
-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 count = pool->size - atomic_read(&pool->available);
@@ -196,17 +201,17 @@ static void ibmveth_replenish_buffer_poo
mb();
- for(i = 0; i < count; ++i) {
+ for (i = 0; i < count; ++i) {
struct sk_buff *skb;
- unsigned int free_index, index;
+ unsigned int free_index;
+ unsigned int index;
u64 correlator;
union ibmveth_buf_desc desc;
unsigned long lpar_rc;
dma_addr_t dma_addr;
skb = alloc_skb(pool->buff_size, GFP_ATOMIC);
-
- if(!skb) {
+ if (!skb) {
ibmveth_debug_printk("replenish: unable to allocate skb\n");
adapter->replenish_no_mem++;
break;
@@ -214,7 +219,7 @@ static void ibmveth_replenish_buffer_poo
free_index = pool->consumer_index++ % pool->size;
index = pool->free_map[free_index];
-
+
ibmveth_assert(index != IBM_VETH_INVALID_MAP);
ibmveth_assert(pool->skbuff[index] == NULL);
@@ -231,11 +236,12 @@ static void ibmveth_replenish_buffer_poo
desc.desc = 0;
desc.fields.valid = 1;
desc.fields.length = pool->buff_size;
- desc.fields.address = dma_addr;
+ desc.fields.address = dma_addr;
- lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);
-
- if(lpar_rc != H_Success) {
+ lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address,
+ desc.desc);
+
+ if (lpar_rc != H_Success) {
pool->free_map[free_index] = IBM_VETH_INVALID_MAP;
pool->skbuff[index] = NULL;
pool->consumer_index--;
@@ -250,30 +256,38 @@ static void ibmveth_replenish_buffer_poo
adapter->replenish_add_buff_success++;
}
}
-
+
mb();
atomic_add(buffers_added, &(pool->available));
}
/* check if replenishing is needed. */
-static inline int ibmveth_is_replenishing_needed(struct ibmveth_adapter *adapter)
+static inline int ibmveth_is_replenishing_needed(
+ struct ibmveth_adapter *adapter)
{
- return ((atomic_read(&adapter->rx_buff_pool[0].available) < adapter->rx_buff_pool[0].threshold) ||
- (atomic_read(&adapter->rx_buff_pool[1].available) < adapter->rx_buff_pool[1].threshold) ||
- (atomic_read(&adapter->rx_buff_pool[2].available) < adapter->rx_buff_pool[2].threshold));
+ return (atomic_read(&adapter->rx_buff_pool[0].available)
+ < adapter->rx_buff_pool[0].threshold)
+ || (atomic_read(&adapter->rx_buff_pool[1].available)
+ < adapter->rx_buff_pool[1].threshold)
+ || (atomic_read(&adapter->rx_buff_pool[2].available)
+ < adapter->rx_buff_pool[2].threshold);
}
-/* kick the replenish tasklet if we need replenishing and it isn't already running */
-static inline void ibmveth_schedule_replenishing(struct ibmveth_adapter *adapter)
+/*
+ * kick the replenish tasklet if we need replenishing and it
+ * isn't already running
+ */
+static inline void ibmveth_schedule_replenishing(
+ struct ibmveth_adapter *adapter)
{
- if(ibmveth_is_replenishing_needed(adapter) &&
- (atomic_dec_if_positive(&adapter->not_replenishing) == 0)) {
+ if (ibmveth_is_replenishing_needed(adapter)
+ && (atomic_dec_if_positive(&adapter->not_replenishing)
+ == 0))
schedule_work(&adapter->replenish_task);
- }
}
/* replenish tasklet routine */
-static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)
+static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)
{
adapter->replenish_task_cycles++;
@@ -281,7 +295,8 @@ static void ibmveth_replenish_task(struc
ibmveth_replenish_buffer_pool(adapter, &adapter->rx_buff_pool[1]);
ibmveth_replenish_buffer_pool(adapter, &adapter->rx_buff_pool[2]);
- adapter->rx_no_buffer = *(u64*)(((char*)adapter->buffer_list_addr) + 4096 - 8);
+ adapter->rx_no_buffer = *(u64*)(((char*)adapter->buffer_list_addr)
+ + 4096 - 8);
atomic_inc(&adapter->not_replenishing);
@@ -289,19 +304,21 @@ static void ibmveth_replenish_task(struc
}
/* 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;
- if(pool->free_map) {
+ if (pool->free_map) {
kfree(pool->free_map);
pool->free_map = NULL;
}
- if(pool->skbuff && pool->dma_addr) {
- for(i = 0; i < pool->size; ++i) {
+ if (pool->skbuff && pool->dma_addr) {
+ for (i = 0; i < pool->size; ++i) {
struct sk_buff *skb = pool->skbuff[i];
- if(skb) {
+
+ if (skb) {
dma_unmap_single(&adapter->vdev->dev,
pool->dma_addr[i],
pool->buff_size,
@@ -312,21 +329,22 @@ static void ibmveth_free_buffer_pool(str
}
}
- if(pool->dma_addr) {
+ if (pool->dma_addr) {
kfree(pool->dma_addr);
pool->dma_addr = NULL;
}
- if(pool->skbuff) {
+ if (pool->skbuff) {
kfree(pool->skbuff);
pool->skbuff = NULL;
}
}
/* 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 free_index;
struct sk_buff *skb;
@@ -345,7 +363,8 @@ static void ibmveth_remove_buffer_from_p
adapter->rx_buff_pool[pool].buff_size,
DMA_FROM_DEVICE);
- free_index = adapter->rx_buff_pool[pool].producer_index++ % adapter->rx_buff_pool[pool].size;
+ free_index = adapter->rx_buff_pool[pool].producer_index++
+ % adapter->rx_buff_pool[pool].size;
adapter->rx_buff_pool[pool].free_map[free_index] = index;
mb();
@@ -354,7 +373,8 @@ static void ibmveth_remove_buffer_from_p
}
/* get the current buffer on the rx queue */
-static inline struct sk_buff *ibmveth_rxq_get_buffer(struct ibmveth_adapter *adapter)
+static inline struct sk_buff *ibmveth_rxq_get_buffer(
+ struct ibmveth_adapter *adapter)
{
u64 correlator = adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator;
unsigned int pool = correlator >> 32;
@@ -384,14 +404,16 @@ static void ibmveth_rxq_recycle_buffer(s
desc.fields.length = adapter->rx_buff_pool[pool].buff_size;
desc.fields.address = adapter->rx_buff_pool[pool].dma_addr[index];
- lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);
-
- if(lpar_rc != H_Success) {
- ibmveth_debug_printk("h_add_logical_lan_buffer failed during recycle rc=%ld", lpar_rc);
- ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
+ lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address,
+ desc.desc);
+ if (lpar_rc != H_Success) {
+ ibmveth_debug_printk("h_add_logical_lan_buffer failed "
+ "during recycle rc=%ld", lpar_rc);
+ 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.toggle = !adapter->rx_queue.toggle;
}
@@ -399,9 +421,10 @@ static void ibmveth_rxq_recycle_buffer(s
static inline 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.toggle = !adapter->rx_queue.toggle;
}
@@ -409,8 +432,8 @@ static inline void ibmveth_rxq_harvest_b
static void ibmveth_cleanup(struct ibmveth_adapter *adapter)
{
- if(adapter->buffer_list_addr != NULL) {
- if(!dma_mapping_error(adapter->buffer_list_dma)) {
+ if (adapter->buffer_list_addr != NULL) {
+ if (!dma_mapping_error(adapter->buffer_list_dma)) {
dma_unmap_single(&adapter->vdev->dev,
adapter->buffer_list_dma, 4096,
DMA_BIDIRECTIONAL);
@@ -418,10 +441,10 @@ static void ibmveth_cleanup(struct ibmve
}
free_page((unsigned long)adapter->buffer_list_addr);
adapter->buffer_list_addr = NULL;
- }
+ }
- if(adapter->filter_list_addr != NULL) {
- if(!dma_mapping_error(adapter->filter_list_dma)) {
+ if (adapter->filter_list_addr != NULL) {
+ if (!dma_mapping_error(adapter->filter_list_dma)) {
dma_unmap_single(&adapter->vdev->dev,
adapter->filter_list_dma, 4096,
DMA_BIDIRECTIONAL);
@@ -431,8 +454,8 @@ static void ibmveth_cleanup(struct ibmve
adapter->filter_list_addr = NULL;
}
- if(adapter->rx_queue.queue_addr != NULL) {
- if(!dma_mapping_error(adapter->rx_queue.queue_dma)) {
+ if (adapter->rx_queue.queue_addr != NULL) {
+ if (!dma_mapping_error(adapter->rx_queue.queue_dma)) {
dma_unmap_single(&adapter->vdev->dev,
adapter->rx_queue.queue_dma,
adapter->rx_queue.queue_len,
@@ -459,24 +482,26 @@ static int ibmveth_open(struct net_devic
ibmveth_debug_printk("open starting\n");
- rxq_entries =
- adapter->rx_buff_pool[0].size +
+ rxq_entries = adapter->rx_buff_pool[0].size +
adapter->rx_buff_pool[1].size +
adapter->rx_buff_pool[2].size + 1;
-
- adapter->buffer_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) {
- ibmveth_error_printk("unable to allocate filter or buffer list pages\n");
+
+ adapter->buffer_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) {
+ ibmveth_error_printk("unable to allocate filter or "
+ "buffer list pages\n");
ibmveth_cleanup(adapter);
return -ENOMEM;
}
- adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) * rxq_entries;
- adapter->rx_queue.queue_addr = kmalloc(adapter->rx_queue.queue_len, GFP_KERNEL);
+ adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) *
+ 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) {
ibmveth_error_printk("unable to allocate rx queue pages\n");
ibmveth_cleanup(adapter);
return -ENOMEM;
@@ -490,10 +515,11 @@ static int ibmveth_open(struct net_devic
adapter->rx_queue.queue_addr,
adapter->rx_queue.queue_len, DMA_BIDIRECTIONAL);
- if((dma_mapping_error(adapter->buffer_list_dma) ) ||
- (dma_mapping_error(adapter->filter_list_dma)) ||
- (dma_mapping_error(adapter->rx_queue.queue_dma))) {
- ibmveth_error_printk("unable to map filter or buffer list pages\n");
+ if (dma_mapping_error(adapter->buffer_list_dma) ||
+ dma_mapping_error(adapter->filter_list_dma) ||
+ dma_mapping_error(adapter->rx_queue.queue_dma)) {
+ ibmveth_error_printk("unable to map filter or "
+ "buffer list pages\n");
ibmveth_cleanup(adapter);
return -ENOMEM;
}
@@ -502,10 +528,9 @@ static int ibmveth_open(struct net_devic
adapter->rx_queue.num_slots = rxq_entries;
adapter->rx_queue.toggle = 1;
- if(ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[0]) ||
- ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[1]) ||
- ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[2]))
- {
+ if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[0]) ||
+ ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[1]) ||
+ ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[2])) {
ibmveth_error_printk("unable to allocate buffer pools\n");
ibmveth_cleanup(adapter);
return -ENOMEM;
@@ -521,29 +546,31 @@ static int ibmveth_open(struct net_devic
ibmveth_debug_printk("buffer list @ 0x%p\n", adapter->buffer_list_addr);
ibmveth_debug_printk("filter list @ 0x%p\n", adapter->filter_list_addr);
- ibmveth_debug_printk("receive q @ 0x%p\n", adapter->rx_queue.queue_addr);
+ ibmveth_debug_printk("receive q @ 0x%p\n",
+ adapter->rx_queue.queue_addr);
+
-
lpar_rc = h_register_logical_lan(adapter->vdev->unit_address,
- adapter->buffer_list_dma,
- rxq_desc.desc,
- adapter->filter_list_dma,
- mac_address);
-
- if(lpar_rc != H_Success) {
- ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc);
- ibmveth_error_printk("buffer TCE:0x%x filter TCE:0x%x rxq desc:0x%lx MAC:0x%lx\n",
- adapter->buffer_list_dma,
- adapter->filter_list_dma,
- rxq_desc.desc,
- mac_address);
+ adapter->buffer_list_dma, rxq_desc.desc,
+ adapter->filter_list_dma, mac_address);
+ if (lpar_rc != H_Success) {
+ ibmveth_error_printk("h_register_logical_lan failed with %ld\n",
+ lpar_rc);
+ ibmveth_error_printk("buffer TCE:0x%x filter TCE:0x%x "
+ "rxq desc:0x%lx MAC:0x%lx\n",
+ adapter->buffer_list_dma,
+ adapter->filter_list_dma, rxq_desc.desc,
+ mac_address);
ibmveth_cleanup(adapter);
- return -ENONET;
+ return -ENONET;
}
ibmveth_debug_printk("registering irq 0x%x\n", netdev->irq);
- if((rc = request_irq(netdev->irq, &ibmveth_interrupt, 0, netdev->name, netdev)) != 0) {
- ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc);
+ rc = request_irq(netdev->irq, &ibmveth_interrupt, 0, netdev->name,
+ netdev);
+ if (rc != 0) {
+ ibmveth_error_printk("unable to request irq 0x%x, rc %d\n",
+ netdev->irq, rc);
do {
rc = h_free_logical_lan(adapter->vdev->unit_address);
} while (H_isLongBusy(rc) || (rc == H_Busy));
@@ -566,7 +593,7 @@ static int ibmveth_close(struct net_devi
{
struct ibmveth_adapter *adapter = netdev->priv;
long lpar_rc;
-
+
ibmveth_debug_printk("close starting\n");
netif_stop_queue(netdev);
@@ -580,13 +607,12 @@ static int ibmveth_close(struct net_devi
lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
} while (H_isLongBusy(lpar_rc) || (lpar_rc == H_Busy));
- if(lpar_rc != H_Success)
- {
- ibmveth_error_printk("h_free_logical_lan failed with %lx, continuing with close\n",
- lpar_rc);
- }
+ if (lpar_rc != H_Success)
+ ibmveth_error_printk("h_free_logical_lan failed with %lx, "
+ "continuing with close\n", lpar_rc);
- 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);
@@ -595,9 +621,12 @@ static int ibmveth_close(struct net_devi
return 0;
}
-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);
+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->speed = SPEED_1000;
cmd->duplex = DUPLEX_FULL;
cmd->port = PORT_FIBRE;
@@ -609,21 +638,25 @@ static int netdev_get_settings(struct ne
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->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;
}
static struct ethtool_ops netdev_ethtool_ops = {
- .get_drvinfo = netdev_get_drvinfo,
- .get_settings = netdev_get_settings,
- .get_link = netdev_get_link,
- .get_sg = ethtool_op_get_sg,
- .get_tx_csum = ethtool_op_get_tx_csum,
+ .get_drvinfo = netdev_get_drvinfo,
+ .get_settings = netdev_get_settings,
+ .get_link = netdev_get_link,
+ .get_sg = ethtool_op_get_sg,
+ .get_tx_csum = ethtool_op_get_tx_csum,
};
static int ibmveth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -653,7 +686,7 @@ static int ibmveth_start_xmit(struct sk_
/* nfrags = number of frags after the initial fragment */
nfrags = skb_shinfo(skb)->nr_frags;
- if(nfrags)
+ if (nfrags)
adapter->tx_multidesc_send++;
/* map the initial fragment */
@@ -662,7 +695,7 @@ static int ibmveth_start_xmit(struct sk_
desc[0].fields.length, DMA_TO_DEVICE);
desc[0].fields.valid = 1;
- if(dma_mapping_error(desc[0].fields.address)) {
+ if (dma_mapping_error(desc[0].fields.address)) {
ibmveth_error_printk("tx: unable to map initial fragment\n");
adapter->tx_map_failed++;
adapter->stats.tx_dropped++;
@@ -682,8 +715,9 @@ static int ibmveth_start_xmit(struct sk_
desc[curfrag+1].fields.length = frag->size;
desc[curfrag+1].fields.valid = 1;
- if(dma_mapping_error(desc[curfrag+1].fields.address)) {
- ibmveth_error_printk("tx: unable to map fragment %d\n", curfrag);
+ if (dma_mapping_error(desc[curfrag+1].fields.address)) {
+ ibmveth_error_printk("tx: unable to map fragment %d\n",
+ curfrag);
adapter->tx_map_failed++;
adapter->stats.tx_dropped++;
/* Free all the mappings we just created */
@@ -704,21 +738,22 @@ static int ibmveth_start_xmit(struct sk_
retry_count = 1024;
do {
lpar_rc = h_send_logical_lan(adapter->vdev->unit_address,
- desc[0].desc,
- desc[1].desc,
- desc[2].desc,
- desc[3].desc,
- desc[4].desc,
- desc[5].desc,
- correlator);
+ desc[0].desc, desc[1].desc, desc[2].desc,
+ desc[3].desc, desc[4].desc, desc[5].desc,
+ correlator);
} while ((lpar_rc == H_Busy) && (retry_count--));
-
- if(lpar_rc != H_Success && lpar_rc != H_Dropped) {
+
+ if (lpar_rc != H_Success && lpar_rc != H_Dropped) {
int i;
- ibmveth_error_printk("tx: h_send_logical_lan failed with rc=%ld\n", lpar_rc);
- for(i = 0; i < 6; i++) {
- ibmveth_error_printk("tx: desc[%i] valid=%d, len=%d, address=0x%d\n", i,
- desc[i].fields.valid, desc[i].fields.length, desc[i].fields.address);
+
+ ibmveth_error_printk("tx: h_send_logical_lan failed with "
+ "rc=%ld\n", lpar_rc);
+ for (i = 0; i < 6; i++) {
+ ibmveth_error_printk("tx: desc[%i] valid=%d, len=%d, "
+ "address=0x%d\n", i,
+ desc[i].fields.valid,
+ desc[i].fields.length,
+ desc[i].fields.address);
}
adapter->tx_send_failed++;
adapter->stats.tx_dropped++;
@@ -731,7 +766,7 @@ static int ibmveth_start_xmit(struct sk_
dma_unmap_single(&adapter->vdev->dev,
desc[nfrags].fields.address,
desc[nfrags].fields.length, DMA_TO_DEVICE);
- } while(--nfrags >= 0);
+ } while (--nfrags >= 0);
dev_kfree_skb(skb);
return 0;
@@ -745,19 +780,20 @@ static int ibmveth_poll(struct net_devic
int more_work = 1;
unsigned long lpar_rc;
- restart_poll:
+restart_poll:
do {
struct net_device *netdev = adapter->netdev;
- if(ibmveth_rxq_pending_buffer(adapter)) {
+ if (ibmveth_rxq_pending_buffer(adapter)) {
struct sk_buff *skb;
rmb();
- if(!ibmveth_rxq_buffer_valid(adapter)) {
+ if (!ibmveth_rxq_buffer_valid(adapter)) {
wmb(); /* suggested by larson1 */
adapter->rx_invalid_buffer++;
- ibmveth_debug_printk("recycling invalid buffer\n");
+ ibmveth_debug_printk("recycling invalid "
+ "buffer\n");
ibmveth_rxq_recycle_buffer(adapter);
} else {
int length = ibmveth_rxq_frame_length(adapter);
@@ -780,26 +816,29 @@ static int ibmveth_poll(struct net_devic
} else {
more_work = 0;
}
- } while(more_work && (frames_processed < max_frames_to_process));
+ } while (more_work && (frames_processed < max_frames_to_process));
ibmveth_schedule_replenishing(adapter);
- if(more_work) {
+ if (more_work) {
/* more work to do - return that we are not done yet */
netdev->quota -= frames_processed;
*budget -= frames_processed;
- return 1;
+ return 1;
}
- /* we think we are done - reenable interrupts, then check once more to make sure we are done */
+ /*
+ * we think we are done - reenable interrupts, then check
+ * once more to make sure we are done
+ */
lpar_rc = vio_enable_interrupts(adapter->vdev);
ibmveth_assert(lpar_rc == H_Success);
netif_rx_complete(netdev);
- if(ibmveth_rxq_pending_buffer(adapter) && netif_rx_reschedule(netdev, frames_processed))
- {
+ if (ibmveth_rxq_pending_buffer(adapter) &&
+ netif_rx_reschedule(netdev, frames_processed)) {
lpar_rc = vio_disable_interrupts(adapter->vdev);
ibmveth_assert(lpar_rc == H_Success);
more_work = 1;
@@ -813,13 +852,14 @@ static int ibmveth_poll(struct net_devic
return 0;
}
-static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
-{
+static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance,
+ struct pt_regs *regs)
+{
struct net_device *netdev = dev_instance;
struct ibmveth_adapter *adapter = netdev->priv;
unsigned long lpar_rc;
- if(netif_rx_schedule_prep(netdev)) {
+ if (netif_rx_schedule_prep(netdev)) {
lpar_rc = vio_disable_interrupts(adapter->vdev);
ibmveth_assert(lpar_rc == H_Success);
__netif_rx_schedule(netdev);
@@ -838,88 +878,90 @@ static void ibmveth_set_multicast_list(s
struct ibmveth_adapter *adapter = netdev->priv;
unsigned long lpar_rc;
- if((netdev->flags & IFF_PROMISC) || (netdev->mc_count > adapter->mcastFilterSize)) {
+ if ((netdev->flags & IFF_PROMISC) ||
+ (netdev->mc_count > adapter->mcastFilterSize)) {
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
IbmVethMcastEnableRecv |
IbmVethMcastDisableFiltering,
0);
- if(lpar_rc != H_Success) {
- ibmveth_error_printk("h_multicast_ctrl rc=%ld when entering promisc mode\n", lpar_rc);
- }
+ if (lpar_rc != H_Success)
+ ibmveth_error_printk("h_multicast_ctrl rc=%ld when "
+ "entering promisc mode\n", lpar_rc);
} else {
struct dev_mc_list *mclist = netdev->mc_list;
int i;
+
/* clear the filter table & disable filtering */
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
IbmVethMcastEnableRecv |
IbmVethMcastDisableFiltering |
- IbmVethMcastClearFilterTable,
- 0);
- if(lpar_rc != H_Success) {
- ibmveth_error_printk("h_multicast_ctrl rc=%ld when attempting to clear filter table\n", lpar_rc);
- }
+ IbmVethMcastClearFilterTable, 0);
+ if (lpar_rc != H_Success)
+ ibmveth_error_printk("h_multicast_ctrl rc=%ld when "
+ "attempting to clear filter table\n",
+ lpar_rc);
/* add the addresses to the filter table */
- for(i = 0; i < netdev->mc_count; ++i, mclist = mclist->next) {
- // add the multicast address to the filter table
+ for (i = 0; i < netdev->mc_count; ++i, mclist = mclist->next) {
+ /* add the multicast address to the filter table */
unsigned long mcast_addr = 0;
- memcpy(((char *)&mcast_addr)+2, mclist->dmi_addr, 6);
+
+ memcpy(((char *)&mcast_addr) + 2, mclist->dmi_addr, 6);
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
IbmVethMcastAddFilter,
mcast_addr);
- if(lpar_rc != H_Success) {
- ibmveth_error_printk("h_multicast_ctrl rc=%ld when adding an entry to the filter table\n", lpar_rc);
- }
+ if (lpar_rc != H_Success)
+ ibmveth_error_printk("h_multicast_ctrl rc=%ld "
+ "when adding an entry to the "
+ "filter table\n", lpar_rc);
}
-
+
/* re-enable filtering */
lpar_rc = h_multicast_ctrl(adapter->vdev->unit_address,
- IbmVethMcastEnableFiltering,
- 0);
- if(lpar_rc != H_Success) {
- ibmveth_error_printk("h_multicast_ctrl rc=%ld when enabling filtering\n", lpar_rc);
- }
+ IbmVethMcastEnableFiltering, 0);
+ if (lpar_rc != H_Success)
+ ibmveth_error_printk("h_multicast_ctrl rc=%ld when "
+ "enabling filtering\n", lpar_rc);
}
}
static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)
{
- if ((new_mtu < 68) || (new_mtu > (1<<20)))
+ if ((new_mtu < 68) || (new_mtu > (1 << 20)))
return -EINVAL;
dev->mtu = new_mtu;
- return 0;
+ return 0;
}
-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;
struct net_device *netdev;
struct ibmveth_adapter *adapter;
-
unsigned char *mac_addr_p;
unsigned int *mcastFilterSize_p;
+ ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",
+ dev->unit_address);
- ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",
- dev->unit_address);
-
- mac_addr_p = (unsigned char *) vio_get_attribute(dev, VETH_MAC_ADDR, 0);
- if(!mac_addr_p) {
+ mac_addr_p = (unsigned char *)vio_get_attribute(dev, VETH_MAC_ADDR, 0);
+ if (!mac_addr_p) {
printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find VETH_MAC_ADDR "
"attribute\n", __FILE__, __LINE__);
return 0;
}
-
- mcastFilterSize_p= (unsigned int *) vio_get_attribute(dev, VETH_MCAST_FILTER_SIZE, 0);
- if(!mcastFilterSize_p) {
+
+ mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev,
+ VETH_MCAST_FILTER_SIZE, 0);
+ if (!mcastFilterSize_p) {
printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find "
"VETH_MCAST_FILTER_SIZE attribute\n",
__FILE__, __LINE__);
return 0;
}
-
- netdev = alloc_etherdev(sizeof(struct ibmveth_adapter));
- if(!netdev)
+ netdev = alloc_etherdev(sizeof(struct ibmveth_adapter));
+ if (!netdev)
return -ENOMEM;
SET_MODULE_OWNER(netdev);
@@ -931,15 +973,16 @@ static int __devinit ibmveth_probe(struc
adapter->vdev = dev;
adapter->netdev = netdev;
adapter->mcastFilterSize= *mcastFilterSize_p;
-
- /* Some older boxes running PHYP non-natively have an OF that
- returns a 8-byte local-mac-address field (and the first
- 2 bytes have to be ignored) while newer boxes' OF return
- a 6-byte field. Note that 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
- we'll just look for it to solve this 8 vs. 6 byte field issue */
+ /*
+ * Some older boxes running PHYP non-natively have an OF that
+ * returns a 8-byte local-mac-address field (and the first
+ * 2 bytes have to be ignored) while newer boxes' OF return
+ * a 6-byte field. Note that 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 we'll just
+ * look for it to solve this 8 vs. 6 byte field issue
+ */
if ((*mac_addr_p & 0x3) != 0x02)
mac_addr_p += 2;
@@ -947,48 +990,47 @@ static int __devinit ibmveth_probe(struc
memcpy(&adapter->mac_addr, mac_addr_p, 6);
adapter->liobn = dev->iommu_table->it_index;
-
+
netdev->irq = dev->irq;
- netdev->open = ibmveth_open;
- netdev->poll = ibmveth_poll;
- netdev->weight = 16;
- netdev->stop = ibmveth_close;
- netdev->hard_start_xmit = ibmveth_start_xmit;
- netdev->get_stats = ibmveth_get_stats;
+ netdev->open = ibmveth_open;
+ netdev->poll = ibmveth_poll;
+ netdev->weight = 16;
+ netdev->stop = ibmveth_close;
+ netdev->hard_start_xmit = ibmveth_start_xmit;
+ netdev->get_stats = ibmveth_get_stats;
netdev->set_multicast_list = ibmveth_set_multicast_list;
- netdev->do_ioctl = ibmveth_ioctl;
- netdev->ethtool_ops = &netdev_ethtool_ops;
- netdev->change_mtu = ibmveth_change_mtu;
+ netdev->do_ioctl = ibmveth_ioctl;
+ netdev->ethtool_ops = &netdev_ethtool_ops;
+ netdev->change_mtu = ibmveth_change_mtu;
SET_NETDEV_DEV(netdev, &dev->dev);
memcpy(&netdev->dev_addr, &adapter->mac_addr, netdev->addr_len);
- ibmveth_init_buffer_pool(&adapter->rx_buff_pool[0], 0, IbmVethPool0DftCnt, IbmVethPool0DftSize);
- ibmveth_init_buffer_pool(&adapter->rx_buff_pool[1], 1, IbmVethPool1DftCnt, IbmVethPool1DftSize);
- ibmveth_init_buffer_pool(&adapter->rx_buff_pool[2], 2, IbmVethPool2DftCnt, IbmVethPool2DftSize);
+ ibmveth_init_buffer_pool(&adapter->rx_buff_pool[0], 0,
+ IbmVethPool0DftCnt, IbmVethPool0DftSize);
+ ibmveth_init_buffer_pool(&adapter->rx_buff_pool[1], 1,
+ IbmVethPool1DftCnt, IbmVethPool1DftSize);
+ ibmveth_init_buffer_pool(&adapter->rx_buff_pool[2], 2,
+ IbmVethPool2DftCnt, IbmVethPool2DftSize);
ibmveth_debug_printk("adapter @ 0x%p\n", adapter);
- INIT_WORK(&adapter->replenish_task, (void*)ibmveth_replenish_task, (void*)adapter);
+ INIT_WORK(&adapter->replenish_task, (void *)ibmveth_replenish_task,
+ (void *)adapter);
adapter->buffer_list_dma = DMA_ERROR_CODE;
adapter->filter_list_dma = DMA_ERROR_CODE;
adapter->rx_queue.queue_dma = DMA_ERROR_CODE;
-
atomic_set(&adapter->not_replenishing, 1);
-
ibmveth_debug_printk("registering netdev...\n");
rc = register_netdev(netdev);
-
- if(rc) {
+ if (rc) {
ibmveth_debug_printk("failed to register netdev rc=%d\n", rc);
free_netdev(netdev);
return rc;
}
-
ibmveth_debug_printk("registered\n");
-
ibmveth_proc_register_adapter(adapter);
return 0;
@@ -1000,9 +1042,7 @@ static int __devexit ibmveth_remove(stru
struct ibmveth_adapter *adapter = netdev->priv;
unregister_netdev(netdev);
-
ibmveth_proc_unregister_adapter(adapter);
-
free_netdev(netdev);
return 0;
}
@@ -1010,10 +1050,10 @@ static int __devexit ibmveth_remove(stru
#ifdef CONFIG_PROC_FS
static void ibmveth_proc_register_driver(void)
{
- ibmveth_proc_dir = create_proc_entry(IBMVETH_PROC_DIR, S_IFDIR, proc_net);
- if (ibmveth_proc_dir) {
+ ibmveth_proc_dir = create_proc_entry(IBMVETH_PROC_DIR, S_IFDIR,
+ proc_net);
+ if (ibmveth_proc_dir)
SET_MODULE_OWNER(ibmveth_proc_dir);
- }
}
static void ibmveth_proc_unregister_driver(void)
@@ -1021,13 +1061,12 @@ static void ibmveth_proc_unregister_driv
remove_proc_entry(IBMVETH_PROC_DIR, proc_net);
}
-static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos)
+static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos)
{
- if (*pos == 0) {
+ if (*pos == 0)
return (void *)1;
- } else {
+ else
return NULL;
- }
}
static void *ibmveth_seq_next(struct seq_file *seq, void *v, loff_t *pos)
@@ -1036,18 +1075,18 @@ static void *ibmveth_seq_next(struct seq
return NULL;
}
-static void ibmveth_seq_stop(struct seq_file *seq, void *v)
+static void ibmveth_seq_stop(struct seq_file *seq, void *v)
{
}
-static int ibmveth_seq_show(struct seq_file *seq, void *v)
+static int ibmveth_seq_show(struct seq_file *seq, void *v)
{
struct ibmveth_adapter *adapter = seq->private;
- char *current_mac = ((char*) &adapter->netdev->dev_addr);
- char *firmware_mac = ((char*) &adapter->mac_addr) ;
+ char *current_mac = (char *)&adapter->netdev->dev_addr;
+ char *firmware_mac = (char *)&adapter->mac_addr;
- seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);
-
+ seq_printf(seq, "%s %s\n\n", ibmveth_driver_string,
+ ibmveth_driver_version);
seq_printf(seq, "Unit Address: 0x%x\n", adapter->vdev->unit_address);
seq_printf(seq, "LIOBN: 0x%lx\n", adapter->liobn);
seq_printf(seq, "Current MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
@@ -1056,19 +1095,27 @@ static int ibmveth_seq_show(struct seq_f
seq_printf(seq, "Firmware MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
firmware_mac[0], firmware_mac[1], firmware_mac[2],
firmware_mac[3], firmware_mac[4], firmware_mac[5]);
-
seq_printf(seq, "\nAdapter Statistics:\n");
- seq_printf(seq, " TX: skbuffs linearized: %ld\n", adapter->tx_linearized);
- seq_printf(seq, " multi-descriptor sends: %ld\n", adapter->tx_multidesc_send);
- seq_printf(seq, " skb_linearize failures: %ld\n", adapter->tx_linearize_failed);
- seq_printf(seq, " vio_map_single failres: %ld\n", adapter->tx_map_failed);
- seq_printf(seq, " send failures: %ld\n", adapter->tx_send_failed);
- seq_printf(seq, " RX: replenish task cycles: %ld\n", adapter->replenish_task_cycles);
- seq_printf(seq, " alloc_skb_failures: %ld\n", adapter->replenish_no_mem);
- seq_printf(seq, " add buffer failures: %ld\n", adapter->replenish_add_buff_failure);
- seq_printf(seq, " invalid buffers: %ld\n", adapter->rx_invalid_buffer);
- seq_printf(seq, " no buffers: %ld\n", adapter->rx_no_buffer);
-
+ seq_printf(seq, " TX: skbuffs linearized: %ld\n",
+ adapter->tx_linearized);
+ seq_printf(seq, " multi-descriptor sends: %ld\n",
+ adapter->tx_multidesc_send);
+ seq_printf(seq, " skb_linearize failures: %ld\n",
+ adapter->tx_linearize_failed);
+ seq_printf(seq, " vio_map_single failres: %ld\n",
+ adapter->tx_map_failed);
+ seq_printf(seq, " send failures: %ld\n",
+ adapter->tx_send_failed);
+ seq_printf(seq, " RX: replenish task cycles: %ld\n",
+ adapter->replenish_task_cycles);
+ seq_printf(seq, " alloc_skb_failures: %ld\n",
+ adapter->replenish_no_mem);
+ seq_printf(seq, " add buffer failures: %ld\n",
+ adapter->replenish_add_buff_failure);
+ seq_printf(seq, " invalid buffers: %ld\n",
+ adapter->rx_invalid_buffer);
+ seq_printf(seq, " no buffers: %ld\n",
+ adapter->rx_no_buffer);
return 0;
}
static struct seq_operations ibmveth_seq_ops = {
@@ -1095,42 +1142,42 @@ static int ibmveth_proc_open(struct inod
}
static struct file_operations ibmveth_proc_fops = {
- .owner = THIS_MODULE,
- .open = ibmveth_proc_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = seq_release,
+ .owner = THIS_MODULE,
+ .open = ibmveth_proc_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = seq_release,
};
static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
{
struct proc_dir_entry *entry;
+
if (ibmveth_proc_dir) {
- entry = create_proc_entry(adapter->netdev->name, S_IFREG, ibmveth_proc_dir);
- if (!entry) {
+ entry = create_proc_entry(adapter->netdev->name, S_IFREG,
+ ibmveth_proc_dir);
+ if (!entry)
ibmveth_error_printk("Cannot create adapter proc entry");
- } else {
- entry->data = (void *) adapter;
+ else {
+ entry->data = adapter;
entry->proc_fops = &ibmveth_proc_fops;
SET_MODULE_OWNER(entry);
}
}
- return;
}
static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)
{
- if (ibmveth_proc_dir) {
+ if (ibmveth_proc_dir)
remove_proc_entry(adapter->netdev->name, ibmveth_proc_dir);
- }
}
#else /* CONFIG_PROC_FS */
-static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
+static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
{
}
-static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)
+static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)
{
}
static void ibmveth_proc_register_driver(void)
@@ -1146,7 +1193,6 @@ static struct vio_device_id ibmveth_devi
{ "network", "IBM,l-lan"},
{ "", "" }
};
-
MODULE_DEVICE_TABLE(vio, ibmveth_device_table);
static struct vio_driver ibmveth_driver = {
@@ -1158,10 +1204,9 @@ static struct vio_driver ibmveth_driver
static int __init ibmveth_module_init(void)
{
- ibmveth_printk("%s: %s %s\n", ibmveth_driver_name, ibmveth_driver_string, ibmveth_driver_version);
-
+ ibmveth_printk("%s: %s %s\n", ibmveth_driver_name,
+ ibmveth_driver_string, ibmveth_driver_version);
ibmveth_proc_register_driver();
-
return vio_register_driver(&ibmveth_driver);
}
@@ -1169,7 +1214,7 @@ static void __exit ibmveth_module_exit(v
{
vio_unregister_driver(&ibmveth_driver);
ibmveth_proc_unregister_driver();
-}
+}
module_init(ibmveth_module_init);
module_exit(ibmveth_module_exit);
diff --git a/drivers/net/ibmveth.h b/drivers/net/ibmveth.h
--- a/drivers/net/ibmveth.h
+++ b/drivers/net/ibmveth.h
@@ -1,26 +1,24 @@
-/**************************************************************************/
-/* */
-/* IBM eServer i/[Series Virtual Ethernet Device Driver */
-/* Copyright (C) 2003 IBM Corp. */
-/* Dave Larson (larson1 at us.ibm.com) */
-/* Santiago Leon (santil at us.ibm.com) */
-/* */
-/* 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 */
-/* the Free Software Foundation; either version 2 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program; if not, write to the Free Software */
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */
-/* USA */
-/* */
-/**************************************************************************/
+/*
+ * IBM eServer i/[Series Virtual Ethernet Device Driver
+ * Copyright (C) 2003 IBM Corp.
+ * Dave Larson (larson1 at us.ibm.com)
+ * Santiago Leon (santil at us.ibm.com)
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
#ifndef _IBMVETH_H
#define _IBMVETH_H
@@ -28,131 +26,136 @@
#define IbmVethMaxSendFrags 6
/* constants for H_MULTICAST_CTRL */
-#define IbmVethMcastReceptionModifyBit 0x80000UL
-#define IbmVethMcastReceptionEnableBit 0x20000UL
-#define IbmVethMcastFilterModifyBit 0x40000UL
-#define IbmVethMcastFilterEnableBit 0x10000UL
-
-#define IbmVethMcastEnableRecv (IbmVethMcastReceptionModifyBit | IbmVethMcastReceptionEnableBit)
-#define IbmVethMcastDisableRecv (IbmVethMcastReceptionModifyBit)
-#define IbmVethMcastEnableFiltering (IbmVethMcastFilterModifyBit | IbmVethMcastFilterEnableBit)
-#define IbmVethMcastDisableFiltering (IbmVethMcastFilterModifyBit)
-#define IbmVethMcastAddFilter 0x1UL
-#define IbmVethMcastRemoveFilter 0x2UL
-#define IbmVethMcastClearFilterTable 0x3UL
+#define IbmVethMcastReceptionModifyBit 0x80000UL
+#define IbmVethMcastReceptionEnableBit 0x20000UL
+#define IbmVethMcastFilterModifyBit 0x40000UL
+#define IbmVethMcastFilterEnableBit 0x10000UL
+
+#define IbmVethMcastEnableRecv (IbmVethMcastReceptionModifyBit | \
+ IbmVethMcastReceptionEnableBit)
+#define IbmVethMcastDisableRecv (IbmVethMcastReceptionModifyBit)
+#define IbmVethMcastEnableFiltering (IbmVethMcastFilterModifyBit | \
+ IbmVethMcastFilterEnableBit)
+#define IbmVethMcastDisableFiltering (IbmVethMcastFilterModifyBit)
+#define IbmVethMcastAddFilter 0x1UL
+#define IbmVethMcastRemoveFilter 0x2UL
+#define IbmVethMcastClearFilterTable 0x3UL
/* hcall numbers */
-#define H_VIO_SIGNAL 0x104
-#define H_REGISTER_LOGICAL_LAN 0x114
-#define H_FREE_LOGICAL_LAN 0x118
-#define H_ADD_LOGICAL_LAN_BUFFER 0x11C
-#define H_SEND_LOGICAL_LAN 0x120
-#define H_MULTICAST_CTRL 0x130
-#define H_CHANGE_LOGICAL_LAN_MAC 0x14C
+#define H_VIO_SIGNAL 0x104
+#define H_REGISTER_LOGICAL_LAN 0x114
+#define H_FREE_LOGICAL_LAN 0x118
+#define H_ADD_LOGICAL_LAN_BUFFER 0x11C
+#define H_SEND_LOGICAL_LAN 0x120
+#define H_MULTICAST_CTRL 0x130
+#define H_CHANGE_LOGICAL_LAN_MAC 0x14C
/* hcall macros */
-#define h_register_logical_lan(ua, buflst, rxq, fltlst, mac) \
- plpar_hcall_norets(H_REGISTER_LOGICAL_LAN, ua, buflst, rxq, fltlst, mac)
+#define h_register_logical_lan(ua, buflst, rxq, fltlst, mac) \
+ plpar_hcall_norets(H_REGISTER_LOGICAL_LAN, (ua), (buflst), \
+ (rxq), (fltlst), (mac))
-#define h_free_logical_lan(ua) \
- plpar_hcall_norets(H_FREE_LOGICAL_LAN, ua)
+#define h_free_logical_lan(ua) \
+ plpar_hcall_norets(H_FREE_LOGICAL_LAN, (ua))
-#define h_add_logical_lan_buffer(ua, buf) \
- plpar_hcall_norets(H_ADD_LOGICAL_LAN_BUFFER, ua, buf)
+#define h_add_logical_lan_buffer(ua, buf) \
+ plpar_hcall_norets(H_ADD_LOGICAL_LAN_BUFFER, (ua), (buf))
#define h_send_logical_lan(ua, buf1, buf2, buf3, buf4, buf5, buf6, correlator) \
- plpar_hcall_8arg_2ret(H_SEND_LOGICAL_LAN, ua, buf1, buf2, buf3, buf4, buf5, buf6, correlator, &correlator)
+ plpar_hcall_8arg_2ret(H_SEND_LOGICAL_LAN, (ua), (buf1), \
+ (buf2), (buf3), (buf4), (buf5), (buf6), \
+ (correlator), &(correlator))
+
+#define h_multicast_ctrl(ua, cmd, mac) \
+ plpar_hcall_norets(H_MULTICAST_CTRL, (ua), (cmd), (mac))
+
+#define h_change_logical_lan_mac(ua, mac) \
+ plpar_hcall_norets(H_CHANGE_LOGICAL_LAN_MAC, (ua), (mac))
+
+#define IbmVethNumBufferPools 3
+#define IbmVethPool0DftSize (1024 * 2)
+#define IbmVethPool1DftSize (1024 * 4)
+#define IbmVethPool2DftSize (1024 * 10)
+#define IbmVethPool0DftCnt 256
+#define IbmVethPool1DftCnt 256
+#define IbmVethPool2DftCnt 256
-#define h_multicast_ctrl(ua, cmd, mac) \
- plpar_hcall_norets(H_MULTICAST_CTRL, ua, cmd, mac)
-
-#define h_change_logical_lan_mac(ua, mac) \
- plpar_hcall_norets(H_CHANGE_LOGICAL_LAN_MAC, ua, mac)
-
-#define IbmVethNumBufferPools 3
-#define IbmVethPool0DftSize (1024 * 2)
-#define IbmVethPool1DftSize (1024 * 4)
-#define IbmVethPool2DftSize (1024 * 10)
-#define IbmVethPool0DftCnt 256
-#define IbmVethPool1DftCnt 256
-#define IbmVethPool2DftCnt 256
-
-#define IBM_VETH_INVALID_MAP ((u16)0xffff)
+#define IBM_VETH_INVALID_MAP ((u16)0xffff)
struct ibmveth_buff_pool {
- u32 size;
- u32 index;
- u32 buff_size;
- u32 threshold;
- atomic_t available;
- u32 consumer_index;
- u32 producer_index;
- u16 *free_map;
- dma_addr_t *dma_addr;
- struct sk_buff **skbuff;
+ u32 size;
+ u32 index;
+ u32 buff_size;
+ u32 threshold;
+ atomic_t available;
+ u32 consumer_index;
+ u32 producer_index;
+ u16 *free_map;
+ dma_addr_t *dma_addr;
+ struct sk_buff **skbuff;
};
struct ibmveth_rx_q {
- u64 index;
- u64 num_slots;
- u64 toggle;
- dma_addr_t queue_dma;
- u32 queue_len;
- struct ibmveth_rx_q_entry *queue_addr;
+ u64 index;
+ u64 num_slots;
+ u64 toggle;
+ dma_addr_t queue_dma;
+ u32 queue_len;
+ struct ibmveth_rx_q_entry *queue_addr;
};
struct ibmveth_adapter {
- struct vio_dev *vdev;
- struct net_device *netdev;
- struct net_device_stats stats;
- unsigned int mcastFilterSize;
- unsigned long mac_addr;
- unsigned long liobn;
- void * buffer_list_addr;
- void * filter_list_addr;
- dma_addr_t buffer_list_dma;
- dma_addr_t filter_list_dma;
- struct ibmveth_buff_pool rx_buff_pool[IbmVethNumBufferPools];
- struct ibmveth_rx_q rx_queue;
- atomic_t not_replenishing;
-
- /* helper tasks */
- struct work_struct replenish_task;
-
- /* adapter specific stats */
- u64 replenish_task_cycles;
- u64 replenish_no_mem;
- u64 replenish_add_buff_failure;
- u64 replenish_add_buff_success;
- u64 rx_invalid_buffer;
- u64 rx_no_buffer;
- u64 tx_multidesc_send;
- u64 tx_linearized;
- u64 tx_linearize_failed;
- u64 tx_map_failed;
- u64 tx_send_failed;
-};
-
-struct ibmveth_buf_desc_fields {
- u32 valid : 1;
- u32 toggle : 1;
- u32 reserved : 6;
- u32 length : 24;
- u32 address;
+ struct vio_dev *vdev;
+ struct net_device *netdev;
+ struct net_device_stats stats;
+ unsigned int mcastFilterSize;
+ unsigned long mac_addr;
+ unsigned long liobn;
+ void *buffer_list_addr;
+ void *filter_list_addr;
+ dma_addr_t buffer_list_dma;
+ dma_addr_t filter_list_dma;
+ struct ibmveth_buff_pool rx_buff_pool[IbmVethNumBufferPools];
+ struct ibmveth_rx_q rx_queue;
+ atomic_t not_replenishing;
+
+ /* helper tasks */
+ struct work_struct replenish_task;
+
+ /* adapter specific stats */
+ u64 replenish_task_cycles;
+ u64 replenish_no_mem;
+ u64 replenish_add_buff_failure;
+ u64 replenish_add_buff_success;
+ u64 rx_invalid_buffer;
+ u64 rx_no_buffer;
+ u64 tx_multidesc_send;
+ u64 tx_linearized;
+ u64 tx_linearize_failed;
+ u64 tx_map_failed;
+ u64 tx_send_failed;
+};
+
+struct ibmveth_buf_desc_fields {
+ u32 valid : 1;
+ u32 toggle : 1;
+ u32 reserved : 6;
+ u32 length : 24;
+ u32 address;
};
union ibmveth_buf_desc {
- u64 desc;
- struct ibmveth_buf_desc_fields fields;
+ u64 desc;
+ struct ibmveth_buf_desc_fields fields;
};
struct ibmveth_rx_q_entry {
- u16 toggle : 1;
- u16 valid : 1;
- u16 reserved : 14;
- u16 offset;
- u32 length;
- u64 correlator;
+ u16 toggle : 1;
+ u16 valid : 1;
+ u16 reserved : 14;
+ u16 offset;
+ u32 length;
+ u64 correlator;
};
#endif /* _IBMVETH_H */
More information about the Linuxppc64-dev
mailing list