* [PATCH 05/12] NET: hp100: Fix section mismatches
From: Ralf Baechle @ 2011-06-26 11:24 UTC (permalink / raw)
To: David S. Miller; +Cc: Jaroslav Kysela, netdev, linux-mips
In-Reply-To: <17dd5038b15d7135791aadbe80464a13c80758d3.1309182742.git.ralf@linux-mips.org>
WARNING: drivers/net/hp100.o(.data+0x70): Section mismatch in reference from the variable hp100_eisa_driver to the function .init.text:hp100_eisa_probe()
The variable hp100_eisa_driver references
the function __init hp100_eisa_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
---
drivers/net/hp100.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index c3ecb11..9cd575f 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -2843,7 +2843,7 @@ static void cleanup_dev(struct net_device *d)
}
#ifdef CONFIG_EISA
-static int __init hp100_eisa_probe (struct device *gendev)
+static int __devinit hp100_eisa_probe(struct device *gendev)
{
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
struct eisa_device *edev = to_eisa_device(gendev);
--
1.7.4.4
^ permalink raw reply related
* [PATCH 03/12] NET: 3c59x: Fix section mismatch.
From: Ralf Baechle @ 2011-06-26 11:22 UTC (permalink / raw)
To: David S. Miller; +Cc: Steffen Klassert, netdev, linux-kernel, linux-mips
In-Reply-To: <17dd5038b15d7135791aadbe80464a13c80758d3.1309182742.git.ralf@linux-mips.org>
WARNING: drivers/net/3c59x.o(.data+0x40): Section mismatch in reference from the variable vortex_eisa_driver to the function .init.text:vortex_eisa_probe()
The variable vortex_eisa_driver references
the function __init vortex_eisa_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
---
drivers/net/3c59x.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 8cc2256..f33fecc 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -908,7 +908,7 @@ static struct eisa_device_id vortex_eisa_ids[] = {
};
MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);
-static int __init vortex_eisa_probe(struct device *device)
+static int __devinit vortex_eisa_probe(struct device *device)
{
void __iomem *ioaddr;
struct eisa_device *edev;
--
1.7.4.4
^ permalink raw reply related
* Re: [PATCH V7 2/4 net-next] skbuff: Add userspace zero-copy buffers in skb
From: Shirley Ma @ 2011-06-27 15:45 UTC (permalink / raw)
To: David Miller
Cc: mst, Eric Dumazet, Avi Kivity, Arnd Bergmann, netdev, kvm,
linux-kernel
In-Reply-To: <1306610588.5180.87.camel@localhost.localdomain>
Hello Dave,
To support skb zero-copy, a pointer is needed to add to skb share info.
Do you agree with this approach? If not, do you have any other
suggestions?
Thanks
Shirley
On Sat, 2011-05-28 at 12:23 -0700, Shirley Ma wrote:
> From:
> Shirley Ma <mashirle@us.ibm.com>
> To:
> David Miller <davem@davemloft.net>,
> mst@redhat.com, Eric Dumazet
> <eric.dumazet@gmail.com>, Avi
> Kivity <avi@redhat.com>, Arnd
> Bergmann <arnd@arndb.de>
> Cc:
> netdev@vger.kernel.org,
> kvm@vger.kernel.org,
> linux-kernel@vger.kernel.org
> Subject:
> [PATCH V7 2/4 net-next] skbuff: Add
> userspace zero-copy buffers in skb
> Date:
> 05/28/2011 12:23:08 PM
>
>
> This patch adds userspace buffers support in skb shared info. A new
> struct skb_ubuf_info is needed to maintain the userspace buffers
> argument and index, a callback is used to notify userspace to release
> the buffers once lower device has done DMA (Last reference to that skb
> has gone).
>
> If there is any userspace apps to reference these userspace buffers,
> then these userspaces buffers will be copied into kernel. This way we
> can prevent userspace apps to hold these userspace buffers too long.
>
> One userspace buffer info pointer is added in skb_shared_info. Is that
> safe to use destructor_arg? From the comments, this destructor_arg is
> used for destructor, destructor calls doesn't wait for last reference
> to
> that skb is gone.
>
> Signed-off-by: Shirley Ma <xma@us.ibm.com>
> ---
> include/linux/skbuff.h | 24 ++++++++++++++++
> net/core/skbuff.c | 73
> ++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 97 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
> index e8b78ce..37a2cb4 100644
> --- a/include/linux/skbuff.h
> +++ b/include/linux/skbuff.h
> @@ -189,6 +189,17 @@ enum {
> SKBTX_DRV_NEEDS_SK_REF = 1 << 3,
> };
>
> +/*
> + * The callback notifies userspace to release buffers when skb DMA is
> done in
> + * lower device, the skb last reference should be 0 when calling
> this.
> + * The desc is used to track userspace buffer index.
> + */
> +struct ubuf_info {
> + void (*callback)(void *);
> + void *arg;
> + unsigned long desc;
> +};
> +
> /* This data is invariant across clones and lives at
> * the end of the header data, ie. at skb->end.
> */
> @@ -203,6 +214,9 @@ struct skb_shared_info {
> struct sk_buff *frag_list;
> struct skb_shared_hwtstamps hwtstamps;
>
> + /* DMA mapping from/to userspace buffers info */
> + void *ubuf_arg;
> +
> /*
> * Warning : all fields before dataref are cleared in
> __alloc_skb()
> */
> @@ -2261,5 +2275,15 @@ static inline void
> skb_checksum_none_assert(struct sk_buff *skb)
> }
>
> bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
> +
> +/*
> + * skb *uarg - is the buffer from userspace
> + * @skb: buffer to check
> + */
> +static inline int skb_ubuf(const struct sk_buff *skb)
> +{
> + return skb_shinfo(skb)->ubuf_arg != NULL;
> +}
> +
> #endif /* __KERNEL__ */
> #endif /* _LINUX_SKBUFF_H */
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 46cbd28..115c5ca 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -329,6 +329,19 @@ static void skb_release_data(struct sk_buff *skb)
> put_page(skb_shinfo(skb)->frags[i].page);
> }
>
> + /*
> + * If skb buf is from userspace, we need to notify the
> caller
> + * the lower device DMA has done;
> + */
> + if (skb_ubuf(skb)) {
> + struct ubuf_info *uarg;
> +
> + uarg = (struct ubuf_info
> *)skb_shinfo(skb)->ubuf_arg;
> +
> + if (uarg->callback)
> + uarg->callback(uarg);
> + }
> +
> if (skb_has_frag_list(skb))
> skb_drop_fraglist(skb);
>
> @@ -481,6 +494,9 @@ bool skb_recycle_check(struct sk_buff *skb, int
> skb_size)
> if (irqs_disabled())
> return false;
>
> + if (skb_ubuf(skb))
> + return false;
> +
> if (skb_is_nonlinear(skb) || skb->fclone !=
> SKB_FCLONE_UNAVAILABLE)
> return false;
>
> @@ -573,6 +589,7 @@ static struct sk_buff *__skb_clone(struct sk_buff
> *n, struct sk_buff *skb)
> atomic_set(&n->users, 1);
>
> atomic_inc(&(skb_shinfo(skb)->dataref));
> + skb_shinfo(skb)->ubuf_arg = NULL;
> skb->cloned = 1;
>
> return n;
> @@ -596,6 +613,51 @@ struct sk_buff *skb_morph(struct sk_buff *dst,
> struct sk_buff *src)
> }
> EXPORT_SYMBOL_GPL(skb_morph);
>
> +/* skb frags copy userspace buffers to kernel */
> +static int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)
> +{
> + int i;
> + int num_frags = skb_shinfo(skb)->nr_frags;
> + struct page *page, *head = NULL;
> + struct ubuf_info *uarg = skb_shinfo(skb)->ubuf_arg;
> +
> + for (i = 0; i < num_frags; i++) {
> + u8 *vaddr;
> + skb_frag_t *f = &skb_shinfo(skb)->frags[i];
> +
> + page = alloc_page(GFP_ATOMIC);
> + if (!page) {
> + while (head) {
> + put_page(head);
> + head = (struct page *)head->private;
> + }
> + return -ENOMEM;
> + }
> + vaddr = kmap_skb_frag(&skb_shinfo(skb)->frags[i]);
> + memcpy(page_address(page),
> + vaddr + f->page_offset, f->size);
> + kunmap_skb_frag(vaddr);
> + page->private = (unsigned long)head;
> + head = page;
> + }
> +
> + /* skb frags release userspace buffers */
> + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
> + put_page(skb_shinfo(skb)->frags[i].page);
> +
> + uarg->callback(uarg);
> + skb_shinfo(skb)->ubuf_arg = NULL;
> +
> + /* skb frags point to kernel buffers */
> + for (i = skb_shinfo(skb)->nr_frags; i > 0; i--) {
> + skb_shinfo(skb)->frags[i - 1].page_offset = 0;
> + skb_shinfo(skb)->frags[i - 1].page = head;
> + head = (struct page *)head->private;
> + }
> + return 0;
> +}
> +
> +
> /**
> * skb_clone - duplicate an sk_buff
> * @skb: buffer to clone
> @@ -614,6 +676,11 @@ struct sk_buff *skb_clone(struct sk_buff *skb,
> gfp_t gfp_mask)
> {
> struct sk_buff *n;
>
> + if (skb_ubuf(skb)) {
> + if (skb_copy_ubufs(skb, gfp_mask))
> + return NULL;
> + }
> +
> n = skb + 1;
> if (skb->fclone == SKB_FCLONE_ORIG &&
> n->fclone == SKB_FCLONE_UNAVAILABLE) {
> @@ -731,6 +798,12 @@ struct sk_buff *pskb_copy(struct sk_buff *skb,
> gfp_t gfp_mask)
> if (skb_shinfo(skb)->nr_frags) {
> int i;
>
> + if (skb_ubuf(skb)) {
> + if (skb_copy_ubufs(skb, gfp_mask)) {
> + kfree(n);
> + goto out;
> + }
> + }
> for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
> skb_shinfo(n)->frags[i] =
> skb_shinfo(skb)->frags[i];
> get_page(skb_shinfo(n)->frags[i].page);
^ permalink raw reply
* Re: [PATCH 3/9] myri10ge: rework parity error check and cleanup
From: Joe Perches @ 2011-06-27 16:01 UTC (permalink / raw)
To: Jon Mason; +Cc: davem, netdev, Andrew Gallatin
In-Reply-To: <1309187108-12715-3-git-send-email-mason@myri.com>
On Mon, 2011-06-27 at 10:05 -0500, Jon Mason wrote:
> Clean up watchdog reset code:
> - unless there is a confirmed h/w fault, verify that a stuck
> slice is still stuck in the watchdog worker; if the slice is no
> longer stuck, abort the reset.
[]
> @@ -3498,23 +3536,24 @@ static void myri10ge_watchdog(struct work_struct *work)
[]
> + if (!reset_needed) {
> + netdev_err(mgp->dev, "not resetting\n");
> + return;
> + }
Probably the wrong level. Maybe netdev_dbg() or netdev_info()
^ permalink raw reply
* Re: [PATCH 7/9] myri10ge: misc style cleanups
From: Joe Perches @ 2011-06-27 16:05 UTC (permalink / raw)
To: Jon Mason; +Cc: davem, netdev, Andrew Gallatin
In-Reply-To: <1309187108-12715-7-git-send-email-mason@myri.com>
On Mon, 2011-06-27 at 10:05 -0500, Jon Mason wrote:
> Miscellaneous white space, style, and other cleanups
[]
> diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
[]
> @@ -1538,9 +1538,10 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)
> } else {
> if (netif_msg_link(mgp))
> netdev_info(mgp->dev, "link %s\n",
> - link_up == MXGEFW_LINK_MYRINET ?
> - "mismatch (Myrinet detected)" :
> - "down");
> + (link_up ==
> + MXGEFW_LINK_MYRINET ?
> + "mismatch (Myrinet detected)"
> + : "down"));
This could be:
netif_info(mgp, link, mgp->dev, "link %s\n"
link_up == MXGEFW_LINK_MYRINET ?
"mismatch (Myrinet detected)" :
"down");
^ permalink raw reply
* Re: [PATCH net-next-2.6 1/3] be2net: fix netdev_stats_update
From: Stephen Hemminger @ 2011-06-27 16:43 UTC (permalink / raw)
To: Sathya Perla; +Cc: netdev
In-Reply-To: <4da4117c-a24a-4512-9b79-fbed126e03bc@exht1.ad.emulex.com>
On Mon, 27 Jun 2011 12:10:48 +0530
Sathya Perla <sathya.perla@emulex.com> wrote:
> Problem initially reproted and fixed by Eric Dumazet <eric.dumazet@gmail.com>
>
> netdev_stats_update() resets netdev->stats and then accumulates stats from
> various rings. This is wrong as stats readers can sometimes catch zero values.
> Use temporary variables instead for accumulating per-ring values.
>
> Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Should also use u64_stats_sync to ensure correct rollover or 32 bit SMP
platform.
^ permalink raw reply
* Re: [PATCH net-next-2.6 1/3] be2net: fix netdev_stats_update
From: Eric Dumazet @ 2011-06-27 17:20 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Sathya Perla, netdev
In-Reply-To: <20110627094337.5108b5f6@nehalam.ftrdhcpuser.net>
Le lundi 27 juin 2011 à 09:43 -0700, Stephen Hemminger a écrit :
> On Mon, 27 Jun 2011 12:10:48 +0530
> Sathya Perla <sathya.perla@emulex.com> wrote:
>
> > Problem initially reproted and fixed by Eric Dumazet <eric.dumazet@gmail.com>
> >
> > netdev_stats_update() resets netdev->stats and then accumulates stats from
> > various rings. This is wrong as stats readers can sometimes catch zero values.
> > Use temporary variables instead for accumulating per-ring values.
> >
> > Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
>
> Should also use u64_stats_sync to ensure correct rollover or 32 bit SMP
> platform.
These are "unsigned long" fields, you dont need u64_stats_sync.
^ permalink raw reply
* [PATCH 06/19] mlx4: remove unnecessary read of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:42 UTC (permalink / raw)
To: Yevgeny Petrilin; +Cc: netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/mlx4/reset.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/mlx4/reset.c b/drivers/net/mlx4/reset.c
index e5741da..11e7c1c 100644
--- a/drivers/net/mlx4/reset.c
+++ b/drivers/net/mlx4/reset.c
@@ -77,7 +77,7 @@ int mlx4_reset(struct mlx4_dev *dev)
goto out;
}
- pcie_cap = pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
+ pcie_cap = pci_pcie_cap(dev->pdev);
for (i = 0; i < 64; ++i) {
if (i == 22 || i == 23)
--
1.7.5.4
^ permalink raw reply related
* [PATCH 07/19] cxgb3: remove unnecessary read of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:42 UTC (permalink / raw)
To: Divy Le Ray; +Cc: netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/cxgb3/common.h | 1 -
drivers/net/cxgb3/t3_hw.c | 11 ++++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 056ee8c..df01b63 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -367,7 +367,6 @@ struct vpd_params {
struct pci_params {
unsigned int vpd_cap_addr;
- unsigned int pcie_cap_addr;
unsigned short speed;
unsigned char width;
unsigned char variant;
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index c688421..44ac2f4 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -3290,22 +3290,20 @@ static void config_pcie(struct adapter *adap)
unsigned int fst_trn_rx, fst_trn_tx, acklat, rpllmt;
pci_read_config_word(adap->pdev,
- adap->params.pci.pcie_cap_addr + PCI_EXP_DEVCTL,
+ adap->pdev->pcie_cap + PCI_EXP_DEVCTL,
&val);
pldsize = (val & PCI_EXP_DEVCTL_PAYLOAD) >> 5;
pci_read_config_word(adap->pdev, 0x2, &devid);
if (devid == 0x37) {
pci_write_config_word(adap->pdev,
- adap->params.pci.pcie_cap_addr +
- PCI_EXP_DEVCTL,
+ adap->pdev->pcie_cap + PCI_EXP_DEVCTL,
val & ~PCI_EXP_DEVCTL_READRQ &
~PCI_EXP_DEVCTL_PAYLOAD);
pldsize = 0;
}
- pci_read_config_word(adap->pdev,
- adap->params.pci.pcie_cap_addr + PCI_EXP_LNKCTL,
+ pci_read_config_word(adap->pdev, adap->pdev->pcie_cap + PCI_EXP_LNKCTL,
&val);
fst_trn_tx = G_NUMFSTTRNSEQ(t3_read_reg(adap, A_PCIE_PEX_CTRL0));
@@ -3429,12 +3427,11 @@ static void get_pci_mode(struct adapter *adapter, struct pci_params *p)
static unsigned short speed_map[] = { 33, 66, 100, 133 };
u32 pci_mode, pcie_cap;
- pcie_cap = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
+ pcie_cap = pci_pcie_cap(adapter->pdev);
if (pcie_cap) {
u16 val;
p->variant = PCI_VARIANT_PCIE;
- p->pcie_cap_addr = pcie_cap;
pci_read_config_word(adapter->pdev, pcie_cap + PCI_EXP_LNKSTA,
&val);
p->width = (val >> 4) & 0x3f;
--
1.7.5.4
^ permalink raw reply related
* [PATCH 08/19] e1000e: remove unnecessary reads of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:43 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: e1000-devel, netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/e1000e/lib.c | 2 +-
drivers/net/e1000e/netdev.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index dd8ab05..bd72b81 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -56,7 +56,7 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw)
struct e1000_adapter *adapter = hw->adapter;
u16 pcie_link_status, cap_offset;
- cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
+ cap_offset = adapter->pdev->pcie_cap;
if (!cap_offset) {
bus->width = e1000_bus_width_unknown;
} else {
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 3bf5249..ed7a93d 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5318,7 +5318,7 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
*/
if (adapter->flags & FLAG_IS_QUAD_PORT) {
struct pci_dev *us_dev = pdev->bus->self;
- int pos = pci_find_capability(us_dev, PCI_CAP_ID_EXP);
+ int pos = pci_pcie_cap(us_dev);
u16 devctl;
pci_read_config_word(us_dev, pos + PCI_EXP_DEVCTL, &devctl);
--
1.7.5.4
^ permalink raw reply related
* [PATCH 09/19] igb: remove unnecessary reads of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:44 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: e1000-devel, netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/igb/igb_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 6e67258..d6c4bd8 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -6267,7 +6267,7 @@ s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
struct igb_adapter *adapter = hw->back;
u16 cap_offset;
- cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
+ cap_offset = adapter->pdev->pcie_cap;
if (!cap_offset)
return -E1000_ERR_CONFIG;
@@ -6281,7 +6281,7 @@ s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
struct igb_adapter *adapter = hw->back;
u16 cap_offset;
- cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
+ cap_offset = adapter->pdev->pcie_cap;
if (!cap_offset)
return -E1000_ERR_CONFIG;
--
1.7.5.4
^ permalink raw reply related
* [PATCH 10/19] bnx2: remove unnecessary read of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:44 UTC (permalink / raw)
To: Michael Chan; +Cc: netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it. Also, pci_is_pcie is a
better way of determining if the device is PCIE or not (as it uses the
same saved PCIE capability offset).
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/bnx2.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 74580bb..7915d14 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7911,9 +7911,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
if (CHIP_NUM(bp) == CHIP_NUM_5709) {
- if (pci_find_capability(pdev, PCI_CAP_ID_EXP) == 0) {
- dev_err(&pdev->dev,
- "Cannot find PCIE capability, aborting\n");
+ if (!pci_is_pcie(pdev)) {
+ dev_err(&pdev->dev, "Not PCIE, aborting\n");
rc = -EIO;
goto err_out_unmap;
}
--
1.7.5.4
^ permalink raw reply related
* [PATCH 11/19] bnx2x: remove unnecessary read of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:45 UTC (permalink / raw)
To: Eilon Greenstein; +Cc: netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it. Also, pci_is_pcie is a
better way of determining if the device is PCIE or not (as it uses the
same saved PCIE capability offset).
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/bnx2x/bnx2x.h | 1 -
drivers/net/bnx2x/bnx2x_main.c | 10 ++++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index eff78a4..0d4b981 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1156,7 +1156,6 @@ struct bnx2x {
#define NO_FCOE(bp) ((bp)->flags & NO_FCOE_FLAG)
int pm_cap;
- int pcie_cap;
int mrrs;
struct delayed_work sp_task;
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index af57217..b6f82eb 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -1222,7 +1222,7 @@ static inline u8 bnx2x_is_pcie_pending(struct pci_dev *dev)
int pos;
u16 status;
- pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+ pos = pci_pcie_cap(dev);
if (!pos)
return false;
@@ -5498,7 +5498,7 @@ static void bnx2x_init_pxp(struct bnx2x *bp)
int r_order, w_order;
pci_read_config_word(bp->pdev,
- bp->pcie_cap + PCI_EXP_DEVCTL, &devctl);
+ bp->pdev->pcie_cap + PCI_EXP_DEVCTL, &devctl);
DP(NETIF_MSG_HW, "read 0x%x from devctl\n", devctl);
w_order = ((devctl & PCI_EXP_DEVCTL_PAYLOAD) >> 5);
if (bp->mrrs == -1)
@@ -9759,10 +9759,8 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
goto err_out_release;
}
- bp->pcie_cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
- if (bp->pcie_cap == 0) {
- dev_err(&bp->pdev->dev,
- "Cannot find PCI Express capability, aborting\n");
+ if (!pci_is_pcie(pdev)) {
+ dev_err(&bp->pdev->dev, "Not PCI Express, aborting\n");
rc = -EIO;
goto err_out_release;
}
--
1.7.5.4
^ permalink raw reply related
* [PATCH 12/19] niu: remove unnecessary read of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:45 UTC (permalink / raw)
To: davem; +Cc: netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/niu.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 1c7b790..cd6c231 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -9797,7 +9797,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
goto err_out_disable_pdev;
}
- pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+ pos = pci_pcie_cap(pdev);
if (pos <= 0) {
dev_err(&pdev->dev, "Cannot find PCI Express capability, aborting\n");
goto err_out_free_res;
--
1.7.5.4
^ permalink raw reply related
* [PATCH 13/19] r8169: remove unnecessary read of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:46 UTC (permalink / raw)
To: nic_swsd; +Cc: Francois Romieu, netdev
The PCIE capability offset is saved during PCI bus walking. Use the
value from pci_dev instead of checking in the driver and saving it off
the the driver specific structure. Also, it will remove an unnecessary
search in the PCI configuration space if this value is referenced
instead of reacquiring it.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/r8169.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f8c4435..fbd6838 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -659,7 +659,6 @@ struct rtl8169_private {
unsigned int (*phy_reset_pending)(struct rtl8169_private *tp);
unsigned int (*link_ok)(void __iomem *);
int (*do_ioctl)(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd);
- int pcie_cap;
struct delayed_work task;
unsigned features;
@@ -3444,9 +3443,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
tp->mmio_addr = ioaddr;
- tp->pcie_cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
- if (!tp->pcie_cap)
- netif_info(tp, probe, dev, "no PCI Express capability\n");
+ if (!pci_is_pcie(pdev))
+ netif_info(tp, probe, dev, "not PCI Express\n");
RTL_W16(IntrMask, 0x0000);
@@ -3898,9 +3896,7 @@ static void rtl_hw_start_8169(struct net_device *dev)
static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
{
- struct net_device *dev = pci_get_drvdata(pdev);
- struct rtl8169_private *tp = netdev_priv(dev);
- int cap = tp->pcie_cap;
+ int cap = pci_pcie_cap(pdev);
if (cap) {
u16 ctl;
@@ -3948,9 +3944,7 @@ static void rtl_ephy_init(void __iomem *ioaddr, const struct ephy_info *e, int l
static void rtl_disable_clock_request(struct pci_dev *pdev)
{
- struct net_device *dev = pci_get_drvdata(pdev);
- struct rtl8169_private *tp = netdev_priv(dev);
- int cap = tp->pcie_cap;
+ int cap = pci_pcie_cap(pdev);
if (cap) {
u16 ctl;
@@ -3963,9 +3957,7 @@ static void rtl_disable_clock_request(struct pci_dev *pdev)
static void rtl_enable_clock_request(struct pci_dev *pdev)
{
- struct net_device *dev = pci_get_drvdata(pdev);
- struct rtl8169_private *tp = netdev_priv(dev);
- int cap = tp->pcie_cap;
+ int cap = pci_pcie_cap(pdev);
if (cap) {
u16 ctl;
@@ -4395,7 +4387,7 @@ static void rtl_hw_start_8101(struct net_device *dev)
if (tp->mac_version == RTL_GIGA_MAC_VER_13 ||
tp->mac_version == RTL_GIGA_MAC_VER_16) {
- int cap = tp->pcie_cap;
+ int cap = pci_pcie_cap(pdev);
if (cap) {
pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL,
--
1.7.5.4
^ permalink raw reply related
* [PATCH 14/19] sky2: remove unnecessary reads of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:46 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it. Also, pci_is_pcie is a
better way of determining if the device is PCIE or not (as it uses the
same saved PCIE capability offset).
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/sky2.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index d252cb1..e14b86e 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1449,7 +1449,7 @@ static void sky2_rx_start(struct sky2_port *sky2)
sky2_qset(hw, rxq);
/* On PCI express lowering the watermark gives better performance */
- if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP))
+ if (pci_is_pcie(hw->pdev))
sky2_write32(hw, Q_ADDR(rxq, Q_WM), BMU_WM_PEX);
/* These chips have no ram buffer?
@@ -3072,7 +3072,7 @@ static void sky2_reset(struct sky2_hw *hw)
{
struct pci_dev *pdev = hw->pdev;
u16 status;
- int i, cap;
+ int i;
u32 hwe_mask = Y2_HWE_ALL_MASK;
/* disable ASF */
@@ -3108,8 +3108,7 @@ static void sky2_reset(struct sky2_hw *hw)
sky2_write8(hw, B0_CTST, CS_MRST_CLR);
- cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
- if (cap) {
+ if (pci_is_pcie(pdev)) {
sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
0xfffffffful);
@@ -3171,11 +3170,11 @@ static void sky2_reset(struct sky2_hw *hw)
/* check if PSMv2 was running before */
reg = sky2_pci_read16(hw, PSM_CONFIG_REG3);
- if (reg & PCI_EXP_LNKCTL_ASPMC) {
- cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+ if (reg & PCI_EXP_LNKCTL_ASPMC)
/* restore the PCIe Link Control register */
- sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
- }
+ sky2_pci_write16(hw, pdev->pcie_cap + PCI_EXP_LNKCTL,
+ reg);
+
sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
/* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
--
1.7.5.4
^ permalink raw reply related
* [PATCH 16/19] vxge: remove unnecessary reads of PCI_CAP_ID_EXP
From: Jon Mason @ 2011-06-27 17:48 UTC (permalink / raw)
To: davem; +Cc: netdev
The PCIE capability offset is saved during PCI bus walking. It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/vxge/vxge-config.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 857618a..1520c57 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -753,12 +753,11 @@ static void __vxge_hw_device_host_info_get(struct __vxge_hw_device *hldev)
static enum vxge_hw_status
__vxge_hw_verify_pci_e_info(struct __vxge_hw_device *hldev)
{
- int exp_cap;
+ struct pci_dev *dev = hldev->pdev;
u16 lnk;
/* Get the negotiated link width and speed from PCI config space */
- exp_cap = pci_find_capability(hldev->pdev, PCI_CAP_ID_EXP);
- pci_read_config_word(hldev->pdev, exp_cap + PCI_EXP_LNKSTA, &lnk);
+ pci_read_config_word(dev, dev->pcie_cap + PCI_EXP_LNKSTA, &lnk);
if ((lnk & PCI_EXP_LNKSTA_CLS) != 1)
return VXGE_HW_ERR_INVALID_PCI_INFO;
@@ -1982,13 +1981,11 @@ exit:
u16 vxge_hw_device_link_width_get(struct __vxge_hw_device *hldev)
{
- int link_width, exp_cap;
+ struct pci_dev *dev = hldev->pdev;
u16 lnk;
- exp_cap = pci_find_capability(hldev->pdev, PCI_CAP_ID_EXP);
- pci_read_config_word(hldev->pdev, exp_cap + PCI_EXP_LNKSTA, &lnk);
- link_width = (lnk & VXGE_HW_PCI_EXP_LNKCAP_LNK_WIDTH) >> 4;
- return link_width;
+ pci_read_config_word(dev, dev->pcie_cap + PCI_EXP_LNKSTA, &lnk);
+ return (lnk & VXGE_HW_PCI_EXP_LNKCAP_LNK_WIDTH) >> 4;
}
/*
--
1.7.5.4
^ permalink raw reply related
* [PATCH 1/5] ixgb: use PCI_VENDOR_ID_*
From: Jon Mason @ 2011-06-27 18:03 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: e1000-devel, netdev
Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/ixgb/ixgb_hw.c | 5 +++--
drivers/net/ixgb/ixgb_ids.h | 5 -----
drivers/net/ixgb/ixgb_main.c | 10 +++++-----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 6cb2e42..f32e25b 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -32,6 +32,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/pci_ids.h>
#include "ixgb_hw.h"
#include "ixgb_ids.h"
@@ -96,7 +97,7 @@ static u32 ixgb_mac_reset(struct ixgb_hw *hw)
ASSERT(!(ctrl_reg & IXGB_CTRL0_RST));
#endif
- if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) {
+ if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) {
ctrl_reg = /* Enable interrupt from XFP and SerDes */
IXGB_CTRL1_GPI0_EN |
IXGB_CTRL1_SDP6_DIR |
@@ -270,7 +271,7 @@ ixgb_identify_phy(struct ixgb_hw *hw)
}
/* update phy type for sun specific board */
- if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID)
+ if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN)
phy_type = ixgb_phy_type_bcm;
return phy_type;
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h
index 2a58847..32c1b30 100644
--- a/drivers/net/ixgb/ixgb_ids.h
+++ b/drivers/net/ixgb/ixgb_ids.h
@@ -33,11 +33,6 @@
** The Device and Vendor IDs for 10 Gigabit MACs
**********************************************************************/
-#define INTEL_VENDOR_ID 0x8086
-#define INTEL_SUBVENDOR_ID 0x8086
-#define SUN_VENDOR_ID 0x108E
-#define SUN_SUBVENDOR_ID 0x108E
-
#define IXGB_DEVICE_ID_82597EX 0x1048
#define IXGB_DEVICE_ID_82597EX_SR 0x1A48
#define IXGB_DEVICE_ID_82597EX_LR 0x1B48
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 6a130eb..7dd4f8b 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -54,13 +54,13 @@ MODULE_PARM_DESC(copybreak,
* Class, Class Mask, private data (not used) }
*/
static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = {
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
+ {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
+ {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_CX4,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
+ {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_SR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,
+ {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_LR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
/* required last entry */
@@ -195,7 +195,7 @@ ixgb_irq_enable(struct ixgb_adapter *adapter)
{
u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |
IXGB_INT_TXDW | IXGB_INT_LSC;
- if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)
+ if (adapter->hw.subsystem_vendor_id == PCI_VENDOR_ID_SUN)
val |= IXGB_INT_GPI0;
IXGB_WRITE_REG(&adapter->hw, IMS, val);
IXGB_WRITE_FLUSH(&adapter->hw);
--
1.7.5.4
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related
* [PATCH 2/5] ixgbe: remove unused #define
From: Jon Mason @ 2011-06-27 18:03 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: e1000-devel, netdev
Remove unused IXGBE_INTEL_VENDOR_ID #define
Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
drivers/net/ixgbe/ixgbe_type.h | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index e0d970e..b5bf2e1 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -32,9 +32,6 @@
#include <linux/mdio.h>
#include <linux/netdevice.h>
-/* Vendor ID */
-#define IXGBE_INTEL_VENDOR_ID 0x8086
-
/* Device IDs */
#define IXGBE_DEV_ID_82598 0x10B6
#define IXGBE_DEV_ID_82598_BX 0x1508
--
1.7.5.4
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related
* [PATCH] MAINTAINERS: drop Michael from bfin_mac driver
From: Mike Frysinger @ 2011-06-27 18:24 UTC (permalink / raw)
To: uclinux-dist-devel, netdev, David S. Miller
Cc: michael.hennerich, linux-kernel
We want people to just use the list now rather than hitting up people
who are no longer responsible for it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
MAINTAINERS | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1cb0d86..d4aa639 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1424,7 +1424,6 @@ S: Supported
F: arch/blackfin/
BLACKFIN EMAC DRIVER
-M: Michael Hennerich <michael.hennerich@analog.com>
L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org
S: Supported
--
1.7.5.3
^ permalink raw reply related
* RE: [PATCH] MAINTAINERS: drop Michael from bfin_mac driver
From: Hennerich, Michael @ 2011-06-27 18:28 UTC (permalink / raw)
To: Mike Frysinger, uclinux-dist-devel@blackfin.uclinux.org,
netdev@vger.kernel.org, "David S.
Cc: linux-kernel@vger.kernel.org
In-Reply-To: <1309199047-18843-1-git-send-email-vapier@gentoo.org>
Mike Frysinger wrote on 2011-06-27:
> We want people to just use the list now rather than hitting up people
> who are no longer responsible for it.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> MAINTAINERS | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
> diff --git a/MAINTAINERS b/MAINTAINERS index 1cb0d86..d4aa639 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1424,7 +1424,6 @@ S: Supported
> F: arch/blackfin/
>
BLACKFIN EMAC DRIVER -M: Michael Hennerich <michael.hennerich@analog.com>
L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org
S: Supported
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368; Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif
^ permalink raw reply
* Re: [PATCH 1/5] ixgb: use PCI_VENDOR_ID_*
From: Brandeburg, Jesse @ 2011-06-27 18:29 UTC (permalink / raw)
To: Jon Mason; +Cc: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org
In-Reply-To: <1309197803-16724-1-git-send-email-jdmason@kudzu.us>
On Mon, 2011-06-27 at 11:03 -0700, Jon Mason wrote:
> Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally.
>
> Signed-off-by: Jon Mason <jdmason@kudzu.us>
Looks fine.
Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply
* Re: [E1000-devel] [PATCH] e1000: Allow the driver to be used on PA RISC C8000 workstation
From: Rolf Eike Beer @ 2011-06-27 18:42 UTC (permalink / raw)
To: Jesse Brandeburg
Cc: Guy Martin, Kirsher, Jeffrey T, kyle@mcmartin.ca,
e1000-devel@lists.sourceforge.net, linux-parisc@vger.kernel.org,
mikulas@artax.karlin.mff.cuni.cz, netdev
In-Reply-To: <2567734.3Tpd1BeV4a@donald.sf-tec.de>
[-- Attachment #1: Type: text/plain, Size: 1789 bytes --]
Rolf Eike Beer wrote:
> Am Freitag, 18. März 2011, 17:39:57 schrieb Rolf Eike Beer:
> > Am Mittwoch, 2. März 2011, 21:19:24 schrieb Jesse Brandeburg:
> > > On Mon, Feb 28, 2011 at 5:40 AM, Guy Martin <gmsoft@tuxicoman.be> wrote:
> > > > Hi Jeff,
> > > >
> > > > Any luck getting this into mainline ?
> > >
> > > Hi Guy, sorry for the delay,
> > > We haven't been able to get our contacts in HP to give us a decent
> > > response so far, we are following up with them to see whats up. We
> > > have not lost the patch and are still tracking it internally.
> > >
> > > Give us a couple more weeks if that is okay and we should be able to
> > > settle this by then.
> >
> > I wonder what exactly you are waiting for? This is a sanity check that
> > we
> > disable, so no working systems could get broken by this. And every
> > single
> > C8000 seems to be affected by this and is working fine with that patch.
> > So maybe people at HP might have a clue _why_ this is screwed, but
> > until then I don't see any point in waiting.
> >
> > So please just add my tested-by and push this upstream soon. Since this
> > is basically a hardware quirk I would like to get this into stable also
> > so we may run vanilla 2.6.38.1 or something like that on C8000.
> >
> > Tested-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
>
> For the netdev folks: it's this patch we are talking about
>
> http://www.spinics.net/lists/linux-parisc/msg03091.html
>
> I would love to see that someone finally picks this up and pushes this
> upstream, CC stable. This is absolutely annoying as it breaks every time
> anyone touches the kernel on one of this machines.
>
> Jeff, David, James: can you please make a decision of who takes this and
> then just do it?
Ping?
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* RE: [RFC 55/72] bfin_mac: Move the Blackfin driver
From: Hennerich, Michael @ 2011-06-27 18:41 UTC (permalink / raw)
To: Jeff Kirsher, davem@davemloft.net
Cc: netdev@vger.kernel.org, uclinux-dist-devel@blackfin.uclinux.org,
Frysinger, Michael, Zhang, Sonic
In-Reply-To: <1309010363-22750-56-git-send-email-jeffrey.t.kirsher@intel.com>
Jeff Kirsher wrote on 2011-06-25:
> Move the Blackfin driver into drivers/net/ethernet/blackfin/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Michael Hennerich <michael.hennerich@analog.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 46 ----------------
> - drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/blackfin/Kconfig | 65
> ++++++++++++++++++++++++ drivers/net/ethernet/blackfin/Makefile
> | 5 ++ drivers/net/{ => ethernet/blackfin}/bfin_mac.c | 0
> drivers/net/{ => ethernet/blackfin}/bfin_mac.h | 0 9 files changed,
> 73 insertions(+), 48 deletions(-) create mode 100644
> drivers/net/ethernet/blackfin/Kconfig create mode 100644
> drivers/net/ethernet/blackfin/Makefile rename drivers/net/{ =>
> ethernet/blackfin}/bfin_mac.c (100%) rename
> drivers/net/{ => ethernet/blackfin}/bfin_mac.h (100%)
Hi Jeff,
I'm no longer maintaining this driver, please use the MAINTAINERS L(ist): entry instead.
We'll update the MAINTAINERS entry shortly.
This patch looks good to me. I really don't have a preference blackfin/ sounds good
for the time being, but /adi might be more future proof.
I'll ACK this one and add the list, maybe someone else wants to comment, too.
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368; Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif
>
> diff --git a/MAINTAINERS b/MAINTAINERS index 53e2d11..506d4d0 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1426,7 +1426,7 @@ M: Michael Hennerich
> <michael.hennerich@analog.com>
> L: uclinux-dist-devel@blackfin.uclinux.org
> W: http://blackfin.uclinux.org S: Supported
> -F: drivers/net/bfin_mac.*
> +F: drivers/net/ethernet/blackfin/
>
> BLACKFIN RTC DRIVER
> M: Mike Frysinger <vapier.adi@gmail.com>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index
> 29eca29..9709106 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -250,52 +250,6 @@ config SH_ETH
> This driver supporting CPUs are:
> - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
> -config BFIN_MAC - tristate "Blackfin on-chip MAC support" - depends on
> NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
> - select CRC32 - select MII - select PHYLIB - select BFIN_MAC_USE_L1 if
> DMA_UNCACHED_NONE - help - This is the driver for Blackfin on-chip mac
> device. Say Y if you want it - compiled into the kernel. This driver
> is also available as a module - ( = code which can be inserted in and
> removed from the running kernel - whenever you want). The module will
> be called bfin_mac. - -config BFIN_MAC_USE_L1 - bool "Use L1 memory for
> rx/tx packets" - depends on BFIN_MAC && (BF527 || BF537) - default y
> - help - To get maximum network performance, you should use L1 memory
> as rx/tx buffers. - Say N here if you want to reserve L1 memory for
> other uses. - -config BFIN_TX_DESC_NUM - int "Number of transmit buffer
> packets" - depends on BFIN_MAC - range 6 10 if BFIN_MAC_USE_L1 - range
> 10 100 - default "10" - help - Set the number of buffer packets used
> in driver. - -config BFIN_RX_DESC_NUM - int "Number of receive buffer
> packets" - depends on BFIN_MAC - range 20 100 if BFIN_MAC_USE_L1 - range
> 20 800 - default "20" - help - Set the number of buffer packets used
> in driver. - -config BFIN_MAC_USE_HWSTAMP - bool "Use IEEE 1588 hwstamp"
> - depends on BFIN_MAC && BF518 - default y - help - To support the
> IEEE 1588 Precision Time Protocol (PTP), select y here -
> config NET_NETX
> tristate "NetX Ethernet support"
> select MII
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile index
> 4315328..5c189ab 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -62,7 +62,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
> obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o
> obj-$(CONFIG_NET_NETX) += netx-eth.o -obj-$(CONFIG_BFIN_MAC) +=
> bfin_mac.o obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_ENC28J60) +=
> enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o
> diff --git a/drivers/net/ethernet/Kconfig
> b/drivers/net/ethernet/Kconfig index ef622d2..fede911 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -39,6 +39,7 @@ config ARIADNE
>
> source "drivers/net/ethernet/arm/Kconfig" source
> "drivers/net/ethernet/atheros/Kconfig" +source
> "drivers/net/ethernet/blackfin/Kconfig" source
> "drivers/net/ethernet/broadcom/Kconfig" source
> "drivers/net/ethernet/brocade/Kconfig" source
> "drivers/net/ethernet/chelsio/Kconfig"
> diff --git a/drivers/net/ethernet/Makefile
> b/drivers/net/ethernet/Makefile index 1ab5f1f..b8cc6ef 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
> obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_NET_ARM) += arm/
> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/ +obj-$(CONFIG_NET_BFIN) +=
> blackfin/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
> obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
> obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ diff --git
a/drivers/net/ethernet/blackfin/Kconfig
b/drivers/net/ethernet/blackfin/Kconfig new file mode 100644 index
0000000..a2c8a3b --- /dev/null +++
b/drivers/net/ethernet/blackfin/Kconfig @@ -0,0 +1,65 @@ +# +# Blackfin
device configuration +# + +config NET_BFIN + bool "Blackfin devices"
+ depends on BF516 || BF518 || BF526 || BF527 || BF536 || BF537
+ ---help--- + If you have a network (Ethernet) card belonging to this
class, say Y. + Make sure you know the name of your card. Read the
Ethernet- HOWTO, + available from
<http://www.tldp.org/docs.html#howto>. + + If unsure, say Y. + + Note
that the answer to this question doesn't directly affect the + kernel:
saying N will just cause the configurator to skip all + the remaining
Blackfin card questions. If you say Y, you will be + asked for your
specific card in the following questions. + +config BFIN_MAC + tristate
"Blackfin on-chip MAC support" + depends on NET_BFIN && (BF516 || BF518
|| BF526 || BF527 || \ + BF536 || BF537) + select CRC32 + select MII
+ select PHYLIB + select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
+ ---help--- + This is the driver for Blackfin on-chip mac device. Say
Y if you want + it compiled into the kernel. This driver is also
available as a + module ( = code which can be inserted in and removed
from the running + kernel whenever you want). The module will be called
bfin_mac. + +config BFIN_MAC_USE_L1 + bool "Use L1 memory for rx/tx
packets" + depends on BFIN_MAC && (BF527 || BF537) + default y
+ ---help--- + To get maximum network performance, you should use L1
memory as rx/tx + buffers. Say N here if you want to reserve L1 memory
for other uses. + +config BFIN_TX_DESC_NUM + int "Number of transmit
buffer packets" + depends on BFIN_MAC + range 6 10 if BFIN_MAC_USE_L1
+ range 10 100 + default "10" + ---help--- + Set the number of buffer
packets used in driver. + +config BFIN_RX_DESC_NUM + int "Number of
receive buffer packets" + depends on BFIN_MAC + range 20 100 if
BFIN_MAC_USE_L1 + range 20 800 + default "20" + ---help--- + Set the
number of buffer packets used in driver. + +config BFIN_MAC_USE_HWSTAMP
+ bool "Use IEEE 1588 hwstamp" + depends on BFIN_MAC && BF518 + default y
+ ---help--- + To support the IEEE 1588 Precision Time Protocol (PTP),
select y +here diff --git a/drivers/net/ethernet/blackfin/Makefile
b/drivers/net/ethernet/blackfin/Makefile new file mode 100644 index
0000000..b1fbe19 --- /dev/null +++
b/drivers/net/ethernet/blackfin/Makefile @@ -0,0 +1,5 @@ +# +# Makefile
for the Blackfin device drivers. +# + +obj-$(CONFIG_BFIN_MAC) +=
bfin_mac.o diff --git a/drivers/net/bfin_mac.c
b/drivers/net/ethernet/blackfin/bfin_mac.c similarity index 100% rename
from drivers/net/bfin_mac.c rename to
drivers/net/ethernet/blackfin/bfin_mac.c diff --git
a/drivers/net/bfin_mac.h b/drivers/net/ethernet/blackfin/bfin_mac.h
similarity index 100% rename from drivers/net/bfin_mac.h rename to
drivers/net/ethernet/blackfin/bfin_mac.h
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368; Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif
^ permalink raw reply
* [PATCH net-next] benet: convert to 64 bit stats
From: Stephen Hemminger @ 2011-06-27 18:43 UTC (permalink / raw)
To: David Miller; +Cc: Sathya Perla, netdev
In-Reply-To: <20110627094337.5108b5f6@nehalam.ftrdhcpuser.net>
This changes how the benet driver does statistics:
* use 64 bit statistics interface (old api was only 32 bit on 32 bit platform)
* use u64_stats_sync to ensure atomic 64 bit on 32 bit SMP
* only update statistics when needed
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
---
drivers/net/benet/be.h | 4 -
drivers/net/benet/be_cmds.c | 1
drivers/net/benet/be_main.c | 161 ++++++++++++++++++++++++--------------------
3 files changed, 93 insertions(+), 73 deletions(-)
--- a/drivers/net/benet/be.h 2011-06-27 10:37:01.519999268 -0700
+++ b/drivers/net/benet/be.h 2011-06-27 11:00:02.691999144 -0700
@@ -29,6 +29,7 @@
#include <linux/interrupt.h>
#include <linux/firmware.h>
#include <linux/slab.h>
+#include <linux/u64_stats_sync.h>
#include "be_hw.h"
@@ -176,6 +177,7 @@ struct be_tx_stats {
u64 be_tx_bytes_prev;
u64 be_tx_pkts;
u32 be_tx_rate;
+ struct u64_stats_sync syncp;
};
struct be_tx_obj {
@@ -210,6 +212,7 @@ struct be_rx_stats {
u32 rx_frags;
u32 prev_rx_frags;
u32 rx_fps; /* Rx frags per second */
+ struct u64_stats_sync syncp;
};
struct be_rx_compl_info {
@@ -526,7 +529,6 @@ static inline bool be_multi_rxq(const st
extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,
u16 num_popped);
extern void be_link_status_update(struct be_adapter *adapter, bool link_up);
-extern void netdev_stats_update(struct be_adapter *adapter);
extern void be_parse_stats(struct be_adapter *adapter);
extern int be_load_fw(struct be_adapter *adapter, u8 *func);
#endif /* BE_H */
--- a/drivers/net/benet/be_main.c 2011-06-27 10:26:59.635999322 -0700
+++ b/drivers/net/benet/be_main.c 2011-06-27 10:59:37.923999145 -0700
@@ -418,77 +418,6 @@ void be_parse_stats(struct be_adapter *a
}
}
-void netdev_stats_update(struct be_adapter *adapter)
-{
- struct be_drv_stats *drvs = &adapter->drv_stats;
- struct net_device_stats *dev_stats = &adapter->netdev->stats;
- struct be_rx_obj *rxo;
- struct be_tx_obj *txo;
- unsigned long pkts = 0, bytes = 0, mcast = 0, drops = 0;
- int i;
-
- for_all_rx_queues(adapter, rxo, i) {
- pkts += rx_stats(rxo)->rx_pkts;
- bytes += rx_stats(rxo)->rx_bytes;
- mcast += rx_stats(rxo)->rx_mcast_pkts;
- /* no space in linux buffers: best possible approximation */
- if (adapter->generation == BE_GEN3) {
- if (!(lancer_chip(adapter))) {
- struct be_erx_stats_v1 *erx =
- be_erx_stats_from_cmd(adapter);
- drops += erx->rx_drops_no_fragments[rxo->q.id];
- }
- } else {
- struct be_erx_stats_v0 *erx =
- be_erx_stats_from_cmd(adapter);
- drops += erx->rx_drops_no_fragments[rxo->q.id];
- }
- }
- dev_stats->rx_packets = pkts;
- dev_stats->rx_bytes = bytes;
- dev_stats->multicast = mcast;
- dev_stats->rx_dropped = drops;
-
- pkts = bytes = 0;
- for_all_tx_queues(adapter, txo, i) {
- pkts += tx_stats(txo)->be_tx_pkts;
- bytes += tx_stats(txo)->be_tx_bytes;
- }
- dev_stats->tx_packets = pkts;
- dev_stats->tx_bytes = bytes;
-
- /* bad pkts received */
- dev_stats->rx_errors = drvs->rx_crc_errors +
- drvs->rx_alignment_symbol_errors +
- drvs->rx_in_range_errors +
- drvs->rx_out_range_errors +
- drvs->rx_frame_too_long +
- drvs->rx_dropped_too_small +
- drvs->rx_dropped_too_short +
- drvs->rx_dropped_header_too_small +
- drvs->rx_dropped_tcp_length +
- drvs->rx_dropped_runt +
- drvs->rx_tcp_checksum_errs +
- drvs->rx_ip_checksum_errs +
- drvs->rx_udp_checksum_errs;
-
- /* detailed rx errors */
- dev_stats->rx_length_errors = drvs->rx_in_range_errors +
- drvs->rx_out_range_errors +
- drvs->rx_frame_too_long;
-
- dev_stats->rx_crc_errors = drvs->rx_crc_errors;
-
- /* frame alignment errors */
- dev_stats->rx_frame_errors = drvs->rx_alignment_symbol_errors;
-
- /* receiver fifo overrun */
- /* drops_no_pbuf is no per i/f, it's per BE card */
- dev_stats->rx_fifo_errors = drvs->rxpp_fifo_overflow_drop +
- drvs->rx_input_fifo_overflow_drop +
- drvs->rx_drops_no_pbuf;
-}
-
void be_link_status_update(struct be_adapter *adapter, bool link_up)
{
struct net_device *netdev = adapter->netdev;
@@ -586,8 +515,10 @@ static void be_tx_stats_update(struct be
stats->be_tx_reqs++;
stats->be_tx_wrbs += wrb_cnt;
+ u64_stats_update_begin(&stats->syncp);
stats->be_tx_bytes += copied;
stats->be_tx_pkts += (gso_segs ? gso_segs : 1);
+ u64_stats_update_end(&stats->syncp);
if (stopped)
stats->be_tx_stops++;
}
@@ -793,6 +724,89 @@ static netdev_tx_t be_xmit(struct sk_buf
return NETDEV_TX_OK;
}
+static struct rtnl_link_stats64 *be_get_stats(struct net_device *netdev,
+ struct rtnl_link_stats64 *stats)
+{
+ struct be_adapter *adapter = netdev_priv(netdev);
+ struct be_drv_stats *drvs = &adapter->drv_stats;
+ const struct be_rx_obj *rxo;
+ const struct be_tx_obj *txo;
+ u64 pkts, bytes;
+ unsigned int start;
+ int i;
+
+ for_all_rx_queues(adapter, rxo, i) {
+ const struct be_rx_stats *rx_stats = rx_stats(rxo);
+ do {
+ start = u64_stats_fetch_begin(&rx_stats->syncp);
+ pkts = rx_stats->rx_pkts;
+ bytes = rx_stats->rx_bytes;
+ } while (u64_stats_fetch_retry(&rx_stats->syncp, start));
+
+ stats->rx_packets += pkts;
+ stats->rx_bytes += bytes;
+ stats->multicast += rx_stats->rx_mcast_pkts;
+
+ /* no space in linux buffers: best possible approximation */
+ if (adapter->generation == BE_GEN3) {
+ if (!(lancer_chip(adapter))) {
+ const struct be_erx_stats_v1 *erx =
+ be_erx_stats_from_cmd(adapter);
+ stats->rx_dropped += erx->rx_drops_no_fragments[rxo->q.id];
+ }
+ } else {
+ const struct be_erx_stats_v0 *erx =
+ be_erx_stats_from_cmd(adapter);
+ stats->rx_dropped += erx->rx_drops_no_fragments[rxo->q.id];
+ }
+ }
+
+ for_all_tx_queues(adapter, txo, i) {
+ const struct be_tx_stats *tx_stats = tx_stats(txo);
+ do {
+ start = u64_stats_fetch_begin(&tx_stats->syncp);
+ pkts = tx_stats->be_tx_pkts;
+ bytes = tx_stats->be_tx_bytes;
+ } while (u64_stats_fetch_retry(&tx_stats->syncp, start));
+
+ stats->tx_packets += pkts;
+ stats->tx_bytes += bytes;
+ }
+
+ /* bad pkts received */
+ stats->rx_errors = drvs->rx_crc_errors +
+ drvs->rx_alignment_symbol_errors +
+ drvs->rx_in_range_errors +
+ drvs->rx_out_range_errors +
+ drvs->rx_frame_too_long +
+ drvs->rx_dropped_too_small +
+ drvs->rx_dropped_too_short +
+ drvs->rx_dropped_header_too_small +
+ drvs->rx_dropped_tcp_length +
+ drvs->rx_dropped_runt +
+ drvs->rx_tcp_checksum_errs +
+ drvs->rx_ip_checksum_errs +
+ drvs->rx_udp_checksum_errs;
+
+ /* detailed rx errors */
+ stats->rx_length_errors = drvs->rx_in_range_errors +
+ drvs->rx_out_range_errors +
+ drvs->rx_frame_too_long;
+
+ stats->rx_crc_errors = drvs->rx_crc_errors;
+
+ /* frame alignment errors */
+ stats->rx_frame_errors = drvs->rx_alignment_symbol_errors;
+
+ /* receiver fifo overrun */
+ /* drops_no_pbuf is no per i/f, it's per BE card */
+ stats->rx_fifo_errors = drvs->rxpp_fifo_overflow_drop +
+ drvs->rx_input_fifo_overflow_drop +
+ drvs->rx_drops_no_pbuf;
+
+ return stats;
+}
+
static int be_change_mtu(struct net_device *netdev, int new_mtu)
{
struct be_adapter *adapter = netdev_priv(netdev);
@@ -1040,8 +1054,12 @@ static void be_rx_stats_update(struct be
stats->rx_compl++;
stats->rx_frags += rxcp->num_rcvd;
+
+ u64_stats_update_begin(&stats->syncp);
stats->rx_bytes += rxcp->pkt_size;
stats->rx_pkts++;
+ u64_stats_update_end(&stats->syncp);
+
if (rxcp->pkt_type == BE_MULTICAST_PACKET)
stats->rx_mcast_pkts++;
if (rxcp->err)
@@ -2918,6 +2936,7 @@ static struct net_device_ops be_netdev_o
.ndo_set_rx_mode = be_set_multicast_list,
.ndo_set_mac_address = be_mac_addr_set,
.ndo_change_mtu = be_change_mtu,
+ .ndo_get_stats64 = be_get_stats,
.ndo_validate_addr = eth_validate_addr,
.ndo_vlan_rx_register = be_vlan_register,
.ndo_vlan_rx_add_vid = be_vlan_add_vid,
--- a/drivers/net/benet/be_cmds.c 2011-06-27 10:59:50.935999145 -0700
+++ b/drivers/net/benet/be_cmds.c 2011-06-27 10:59:54.643999144 -0700
@@ -103,7 +103,6 @@ static int be_mcc_compl_process(struct b
sizeof(resp->hw_stats));
}
be_parse_stats(adapter);
- netdev_stats_update(adapter);
adapter->stats_cmd_sent = false;
}
} else if ((compl_status != MCC_STATUS_NOT_SUPPORTED) &&
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox