* [RFC, PATCH 4/4] net: sh_eth: add support for SH7757's GETHER
From: Yoshihiro Shimoda @ 2011-02-15 11:47 UTC (permalink / raw)
To: netdev; +Cc: SH-Linux
The SH7757 have GETHER and ETHER both. This patch supports them.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
drivers/net/sh_eth.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 135 insertions(+), 1 deletions(-)
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index ca7ff4e..330f608 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -87,7 +87,8 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
.rpadir_value = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */
};
#elif defined(CONFIG_CPU_SUBTYPE_SH7757)
-#define SH_ETH_RESET_DEFAULT 1
+#define SH_ETH_HAS_BOTH_MODULES 1
+#define SH_ETH_HAS_TSU 1
static void sh_eth_set_duplex(struct net_device *ndev)
{
struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -134,6 +135,135 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
.no_ade = 1,
};
+#define SH_GIGA_ETH_BASE 0xfee00000
+#define GIGA_MALR(port) (SH_GIGA_ETH_BASE + 0x800 * (port) + 0x05c8)
+#define GIGA_MAHR(port) (SH_GIGA_ETH_BASE + 0x800 * (port) + 0x05c0)
+static void sh_eth_chip_reset_giga(struct net_device *ndev)
+{
+ int i;
+ unsigned long mahr[2], malr[2];
+
+ /* save MAHR and MALR */
+ for (i = 0; i < 2; i++) {
+ malr[i] = readl(GIGA_MALR(i));
+ mahr[i] = readl(GIGA_MAHR(i));
+ }
+
+ /* reset device */
+ writel(ARSTR_ARSTR, SH_GIGA_ETH_BASE + 0x1800);
+ mdelay(1);
+
+ /* restore MAHR and MALR */
+ for (i = 0; i < 2; i++) {
+ writel(malr[i], GIGA_MALR(i));
+ writel(mahr[i], GIGA_MAHR(i));
+ }
+}
+
+static int sh_eth_is_gether(struct sh_eth_private *mdp);
+static void sh_eth_reset(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+ int cnt = 100;
+
+ if (sh_eth_is_gether(mdp)) {
+ sh_eth_write(ndev, 0x03, EDSR);
+ sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER,
+ EDMR);
+ while (cnt > 0) {
+ if (!(sh_eth_read(ndev, EDMR) & 0x3))
+ break;
+ mdelay(1);
+ cnt--;
+ }
+ if (cnt < 0)
+ printk(KERN_ERR "Device reset fail\n");
+
+ /* Table Init */
+ sh_eth_write(ndev, 0x0, TDLAR);
+ sh_eth_write(ndev, 0x0, TDFAR);
+ sh_eth_write(ndev, 0x0, TDFXR);
+ sh_eth_write(ndev, 0x0, TDFFR);
+ sh_eth_write(ndev, 0x0, RDLAR);
+ sh_eth_write(ndev, 0x0, RDFAR);
+ sh_eth_write(ndev, 0x0, RDFXR);
+ sh_eth_write(ndev, 0x0, RDFFR);
+ } else {
+ sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_ETHER,
+ EDMR);
+ mdelay(3);
+ sh_eth_write(ndev, sh_eth_read(ndev, EDMR) & ~EDMR_SRST_ETHER,
+ EDMR);
+ }
+}
+
+static void sh_eth_set_duplex_giga(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ if (mdp->duplex) /* Full */
+ sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR);
+ else /* Half */
+ sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
+}
+
+static void sh_eth_set_rate_giga(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ switch (mdp->speed) {
+ case 10: /* 10BASE */
+ sh_eth_write(ndev, 0x00000000, GECMR);
+ break;
+ case 100:/* 100BASE */
+ sh_eth_write(ndev, 0x00000010, GECMR);
+ break;
+ case 1000: /* 1000BASE */
+ sh_eth_write(ndev, 0x00000020, GECMR);
+ break;
+ default:
+ break;
+ }
+}
+
+/* SH7757(GETHERC) */
+static struct sh_eth_cpu_data sh_eth_my_cpu_data_giga = {
+ .chip_reset = sh_eth_chip_reset_giga,
+ .set_duplex = sh_eth_set_duplex_giga,
+ .set_rate = sh_eth_set_rate_giga,
+
+ .ecsr_value = ECSR_ICD | ECSR_MPD,
+ .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
+ .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
+
+ .tx_check = EESR_TC1 | EESR_FTC,
+ .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \
+ EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \
+ EESR_ECI,
+ .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \
+ EESR_TFE,
+ .fdr_value = 0x0000072f,
+ .rmcr_value = 0x00000001,
+
+ .apr = 1,
+ .mpr = 1,
+ .tpauser = 1,
+ .bculr = 1,
+ .hw_swap = 1,
+ .rpadir = 1,
+ .rpadir_value = 2 << 16,
+ .no_trimd = 1,
+ .no_ade = 1,
+};
+
+static struct sh_eth_cpu_data *sh_eth_get_cpu_data(struct sh_eth_private *mdp)
+{
+ if (sh_eth_is_gether(mdp))
+ return &sh_eth_my_cpu_data_giga;
+ else
+ return &sh_eth_my_cpu_data;
+}
+
#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
#define SH_ETH_HAS_TSU 1
static void sh_eth_chip_reset(struct net_device *ndev)
@@ -1515,7 +1645,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
mdp->reg_offset = sh_eth_get_register_offset(pd->register_type);
/* set cpu data */
+#if defined(SH_ETH_HAS_BOTH_MODULES)
+ mdp->cd = sh_eth_get_cpu_data(mdp);
+#else
mdp->cd = &sh_eth_my_cpu_data;
+#endif
sh_eth_set_default_cpu_data(mdp->cd);
/* set function */
--
1.7.1
^ permalink raw reply related
* [PATCH] drivers/net: Call netif_carrier_off at the end of the probe
From: Ivan Vecera @ 2011-02-15 12:08 UTC (permalink / raw)
To: netdev; +Cc: romieu, davem, aabdulla
Without calling of netif_carrier_off at the end of the probe the operstate
is unknown when the device is initially opened. By default the carrier is
on so when the device is opened and netif_carrier_on is called the link
watch event is not fired and operstate remains zero (unknown).
This patch fixes this behavior in forcedeth and r8169.
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
---
drivers/net/forcedeth.c | 2 ++
drivers/net/r8169.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index af09296..9c0b1ba 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5645,6 +5645,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
goto out_error;
}
+ netif_carrier_off(dev);
+
dev_info(&pci_dev->dev, "ifname %s, PHY OUI 0x%x @ %d, addr %pM\n",
dev->name, np->phy_oui, np->phyaddr, dev->dev_addr);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 59ccf0c..469ab0b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3190,6 +3190,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (pci_dev_run_wake(pdev))
pm_runtime_put_noidle(&pdev->dev);
+ netif_carrier_off(dev);
+
out:
return rc;
--
1.7.3.4
^ permalink raw reply related
* Re: [PATCH] virtio: use __GFP_NOWARN for try_fill_recv in virtnet_poll
From: Michal Hocko @ 2011-02-15 12:39 UTC (permalink / raw)
To: Rusty Russell; +Cc: Michael S. Tsirkin, virtualization, netdev, linux-kernel
In-Reply-To: <20110215093527.GB8341@tiehlicka.suse.cz>
On Tue 15-02-11 10:35:27, Michal Hocko wrote:
[...]
> [22798.508903] The following is only an harmless informational message.
> [22798.508909] Unless you get a _continuous_flood_ of these messages it means
> [22798.508911] everything is working fine. Allocations from irqs cannot be
> [22798.508913] perfectly reliable and the kernel is designed to handle that.
I have just realized that the above text is SLES specific so only the
line below with stack trace and memory info is printed. Sorry for confusion
> [22798.508917] loop3: page allocation failure. order:0, mode:0x20, alloc_flags:0x30 pflags:0x80208040
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
^ permalink raw reply
* Re: [PATCH] virtio: use __GFP_NOWARN for try_fill_recv in virtnet_poll
From: Michal Hocko @ 2011-02-15 12:42 UTC (permalink / raw)
To: Rusty Russell; +Cc: Michael S. Tsirkin, virtualization, netdev, linux-kernel
In-Reply-To: <201102152139.03451.rusty@rustcorp.com.au>
On Tue 15-02-11 21:39:03, Rusty Russell wrote:
> On Tue, 15 Feb 2011 08:55:50 pm Michal Hocko wrote:
> > On Tue 15-02-11 20:41:29, Rusty Russell wrote:
> > > On Tue, 15 Feb 2011 08:05:27 pm Michal Hocko wrote:
> > > > Hi,
> > > > we have started seeing a lot of allocator messages complaining about
> > > > failed allocations from virtnet_poll in soft IRQ. Could you consider the
> > > > following patch, please?
> > >
> > > Do we really want to silence this? Isn't warning about it kind of the
> > > point? Your network is probably sucking if this happens...
> >
> > What can user do about it? Is the low level memory allocator message
> > very much usefull for him? Maybe we can add a printk_once in the fail
> > path with some more useful and virtio specific message.
>
> That's an argument against ever printing any message.
Well, honestly, I do not see much point for this message but it is there
for ages so it maybe it is valueable for somebody...
>
> What we need to know is why does this happen with virtio_net and not other
> cards?
The machine just happened to be short on memory due to a strong memory
pressure.
> If it happens to them too, and they silently fall back, all good.
>
> I want to make sure we're not papering over a real problem...
>
> Thanks,
> Rusty.
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
^ permalink raw reply
* [PATCH] TX timestamp IPv6 support
From: Anders Berggren @ 2011-02-15 13:56 UTC (permalink / raw)
To: netdev; +Cc: John Ronciak
This patch enables UDP IPv6 TX timestamping (using SO_TIMESTAMPING, enabled by CONFIG_NETWORK_PHY_TIMESTAMPING) as Marcus D. Leech suggested in http://kerneltrap.org/mailarchive/linux-netdev/2009/11/10/6260604 and http://kerneltrap.org/mailarchive/linux-netdev/2009/11/11/6260643
It's mostly copied from net/ipv4/udp.c. I guess it would be better to run sock_tx_timestamp in ipv6/udp.c and pass it to ipv6/ip6_output.c's ip6_append_data somehow, but I didn't find a suitable struct to extend for this purpose.
Anders Berggren
Halon Security
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 94b5bf1..74d9343 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1115,6 +1115,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
int err;
int offset = 0;
int csummode = CHECKSUM_NONE;
+ __u8 tx_flags = 0;
if (flags&MSG_PROBE)
return 0;
@@ -1199,6 +1200,13 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
}
}
+ /* For UDP, check if TX timestamp is enabled */
+ if (sk->sk_type == SOCK_DGRAM) {
+ err = sock_tx_timestamp(sk, &tx_flags);
+ if (err)
+ goto error;
+ }
+
/*
* Let's try using as much space as possible.
* Use MTU if total length of the message fits into the MTU.
@@ -1303,6 +1311,10 @@ alloc_new_skb:
sk->sk_allocation);
if (unlikely(skb == NULL))
err = -ENOBUFS;
+ else
+ /* only the initial fragment is
+ time stamped */
+ tx_flags = 0;
}
if (skb == NULL)
goto error;
@@ -1314,6 +1326,9 @@ alloc_new_skb:
/* reserve for fragmentation */
skb_reserve(skb, hh_len+sizeof(struct frag_hdr));
+ if (sk->sk_type == SOCK_DGRAM)
+ skb_shinfo(skb)->tx_flags = tx_flags;
+
/*
* Find where to start putting bytes
*/
^ permalink raw reply related
* 3x59x WOL and CONFIG_SUSPEND
From: Markku Pesonen @ 2011-02-15 13:55 UTC (permalink / raw)
To: netdev; +Cc: Steffen Klassert, Rafael J. Wysocki
Hi,
Since commit 074037ec79bea73edf1b1ec72fef1010e83e3cc5
(PM / Wakeup: Introduce wakeup source objects and event statistics (v3)),
Wake-On-Lan on my 3c905C has not worked unless I enable CONFIG_SUSPEND.
The driver says "0000:00:0b.0: WOL not supported."
Enabling CONFIG_SUSPEND makes Wake-On-Lan work on 2.6.37 while 2.6.36
works just fine without it. Is this a regression or intended behavior?
^ permalink raw reply
* [PATCH] Add basic support for smsc9311 in smsc911x Driver
From: Fernando @ 2011-02-15 14:57 UTC (permalink / raw)
To: netdev
The smsc9311 chip is an switch chip with 3 ports that have almost the same
register structure of the LAN9115. There are some differences in IRQ regs,
but that doesn't seem to be a problem right now.
This patch was tested on a Torpedo (OMAP35x) based board and is based on
v2.6.38-rc4.
Fernando
>From e987729802dd3980041fd7e48e68f3a9f53424bd Mon Sep 17 00:00:00 2001
From: Fernando Governatore <fernando@syspac.com.br>
Date: Tue, 15 Feb 2011 12:10:22 -0200
Subject: [PATCH] Add basic support for smsc9311 in smsc911x Driver
The smsc9311 chip is an switch chip with three ports.
Here is assumed that only the first one is connected to
the host.
Makes the driver aware of the chip revision id.
If no external phy is being used, mask out all the PHY
IDs that are not present by default.
The default switch configuration is not changed.
---
drivers/net/smc911x.h | 2 ++
drivers/net/smsc911x.c | 15 ++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 3269292..5e336d2 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -687,6 +687,7 @@ smc_pxa_dma_outsl(struct smc911x_local *lp, u_long physaddr,
#define CHIP_9215 0x115A
#define CHIP_9217 0x117A
#define CHIP_9218 0x118A
+#define CHIP_9311 0x9311
struct chip_id {
u16 id;
@@ -702,6 +703,7 @@ static const struct chip_id chip_ids[] = {
{ CHIP_9215, "LAN9215" },
{ CHIP_9217, "LAN9217" },
{ CHIP_9218, "LAN9218" },
+ { CHIP_9311, "LAN9311" },
{ 0, NULL },
};
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index 64bfdae..483fdbd 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -856,6 +856,7 @@ static int __devinit smsc911x_mii_init(struct platform_device *pdev,
case 0x01150000:
case 0x117A0000:
case 0x115A0000:
+ case 0x93110000:
/* External PHY supported, try to autodetect */
smsc911x_phy_initialise_external(pdata);
break;
@@ -867,8 +868,15 @@ static int __devinit smsc911x_mii_init(struct platform_device *pdev,
}
if (!pdata->using_extphy) {
- /* Mask all PHYs except ID 1 (internal) */
- pdata->mii_bus->phy_mask = ~(1 << 1);
+ /* Mask all PHYs except internal IDs */
+ switch(pdata->idrev & 0xFFFF0000){
+ case 0x93110000:
+ pdata->mii_bus->phy_mask = ~(1 << 0) & ~(1 << 1) & ~(1 << 2);
+ break;
+ default:
+ pdata->mii_bus->phy_mask = ~(1 << 1);
+ break;
+ }
}
if (mdiobus_register(pdata->mii_bus)) {
@@ -1870,7 +1878,8 @@ static int __devinit smsc911x_init(struct net_device *dev)
case 0x92110000:
case 0x92200000:
case 0x92210000:
- /* LAN9210/LAN9211/LAN9220/LAN9221 */
+ case 0x93110000:
+ /* LAN9210/LAN9211/LAN9220/LAN9221/LAN9311 */
pdata->generation = 4;
break;
--
1.7.1
^ permalink raw reply related
* Re: [PATCH] drivers/net: Call netif_carrier_off at the end of the probe
From: Francois Romieu @ 2011-02-15 15:22 UTC (permalink / raw)
To: Ivan Vecera; +Cc: netdev, davem, aabdulla, Ben Hutchings
In-Reply-To: <1297771719-14202-1-git-send-email-ivecera@redhat.com>
Ivan Vecera <ivecera@redhat.com> :
> Without calling of netif_carrier_off at the end of the probe the operstate
> is unknown when the device is initially opened. By default the carrier is
> on so when the device is opened and netif_carrier_on is called the link
> watch event is not fired and operstate remains zero (unknown).
Stated this way it sounds like a core dev layer issue.
I am not completely sure after reading some history. Namely:
- (37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 ?)
- c276e098d3ee33059b4a1c747354226cec58487c
- 22604c866889c4b2e12b73cbf1683bda1b72a313
- b47300168e770b60ab96c8924854c3b0eb4260eb
I am confused.
--
Ueimor
^ permalink raw reply
* Re: [PATCH] drivers/net: Call netif_carrier_off at the end of the probe
From: Ben Hutchings @ 2011-02-15 15:58 UTC (permalink / raw)
To: Francois Romieu; +Cc: Ivan Vecera, netdev, davem, aabdulla, Ben Hutchings
In-Reply-To: <20110215152246.GA11719@electric-eye.fr.zoreil.com>
On Tue, 2011-02-15 at 16:22 +0100, Francois Romieu wrote:
> Ivan Vecera <ivecera@redhat.com> :
> > Without calling of netif_carrier_off at the end of the probe the operstate
> > is unknown when the device is initially opened. By default the carrier is
> > on so when the device is opened and netif_carrier_on is called the link
> > watch event is not fired and operstate remains zero (unknown).
>
> Stated this way it sounds like a core dev layer issue.
Due to hardware limitations, some network drivers cannot report the
carrier state and they never call netif_carrier_{on,off}(). Therefore
the initial operstate of 'unknown' is correct.
> I am not completely sure after reading some history. Namely:
> - (37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 ?)
> - c276e098d3ee33059b4a1c747354226cec58487c
> - 22604c866889c4b2e12b73cbf1683bda1b72a313
> - b47300168e770b60ab96c8924854c3b0eb4260eb
>
> I am confused.
Drivers that can report carrier state should do so initially some time
between registering a device and bringing it up (either in the bus probe
function or the ndo_open function). It generally seems to be safe to
assume that the link is down initially, and then to rely on
notifications from the hardware. However, that does depend on the
behaviour of the hardware.
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* [PATCH] bnx2x: Support for managing RX indirection table
From: Tom Herbert @ 2011-02-15 16:24 UTC (permalink / raw)
To: davem, eilong, netdev
Support fetching and retrieving RX indirection table via ethtool.
Signed-off-by: Tom Herbert <therbert@google.com>
---
drivers/net/bnx2x/bnx2x.h | 2 +
drivers/net/bnx2x/bnx2x_ethtool.c | 58 +++++++++++++++++++++++++++++++++++++
drivers/net/bnx2x/bnx2x_main.c | 23 +++++++++++----
3 files changed, 77 insertions(+), 6 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 236d79a..bf16119 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1076,6 +1076,7 @@ struct bnx2x {
int num_queues;
int disable_tpa;
int int_mode;
+ u32 rx_indir_table[128];
struct tstorm_eth_mac_filter_config mac_filters;
#define BNX2X_ACCEPT_NONE 0x0000
@@ -1799,5 +1800,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
BNX2X_EXTERN int load_count[2][3]; /* per path: 0-common, 1-port0, 2-port1 */
extern void bnx2x_set_ethtool_ops(struct net_device *netdev);
+extern void bnx2x_push_indir_table(struct bnx2x *bp);
#endif /* bnx2x.h */
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 816fef6..a99fee4 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -2134,6 +2134,61 @@ static int bnx2x_phys_id(struct net_device *dev, u32 data)
return 0;
}
+static int
+bnx2x_get_rxnfc(struct net_device *dev,
+ struct ethtool_rxnfc *info, void *rules __always_unused)
+{
+ struct bnx2x *bp = netdev_priv(dev);
+
+ switch (info->cmd) {
+ case ETHTOOL_GRXRINGS:
+ info->data = bp->num_queues - NONE_ETH_CONTEXT_USE;
+ return 0;
+
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static int bnx2x_get_rxfh_indir(struct net_device *dev,
+ struct ethtool_rxfh_indir *indir)
+{
+ struct bnx2x *bp = netdev_priv(dev);
+ size_t copy_size =
+ min_t(size_t, indir->size, TSTORM_INDIRECTION_TABLE_SIZE);
+
+ if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
+ return -ENOENT;
+
+ indir->size = TSTORM_INDIRECTION_TABLE_SIZE;
+ memcpy(indir->ring_index, bp->rx_indir_table,
+ copy_size * sizeof(bp->rx_indir_table[0]));
+ return 0;
+}
+
+static int bnx2x_set_rxfh_indir(struct net_device *dev,
+ const struct ethtool_rxfh_indir *indir)
+{
+ struct bnx2x *bp = netdev_priv(dev);
+ size_t i;
+
+ if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
+ return -ENOENT;
+
+ /* Validate size and indices */
+ if (indir->size != TSTORM_INDIRECTION_TABLE_SIZE)
+ return -EINVAL;
+ for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
+ if (indir->ring_index[i] >=
+ bp->num_queues - NONE_ETH_CONTEXT_USE)
+ return -EINVAL;
+
+ memcpy(bp->rx_indir_table, indir->ring_index,
+ sizeof(bp->rx_indir_table));
+ bnx2x_push_indir_table(bp);
+ return 0;
+}
+
static const struct ethtool_ops bnx2x_ethtool_ops = {
.get_settings = bnx2x_get_settings,
.set_settings = bnx2x_set_settings,
@@ -2170,6 +2225,9 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
.get_strings = bnx2x_get_strings,
.phys_id = bnx2x_phys_id,
.get_ethtool_stats = bnx2x_get_ethtool_stats,
+ .get_rxnfc = bnx2x_get_rxnfc,
+ .get_rxfh_indir = bnx2x_get_rxfh_indir,
+ .set_rxfh_indir = bnx2x_set_rxfh_indir,
};
void bnx2x_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index c238c4d..b1a84d4 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -4254,7 +4254,7 @@ static void bnx2x_init_eq_ring(struct bnx2x *bp)
min_t(int, MAX_SP_DESC_CNT - MAX_SPQ_PENDING, NUM_EQ_DESC) - 1);
}
-static void bnx2x_init_ind_table(struct bnx2x *bp)
+void bnx2x_push_indir_table(struct bnx2x *bp)
{
int func = BP_FUNC(bp);
int i;
@@ -4262,13 +4262,24 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
return;
- DP(NETIF_MSG_IFUP,
- "Initializing indirection table multi_mode %d\n", bp->multi_mode);
for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
REG_WR8(bp, BAR_TSTRORM_INTMEM +
TSTORM_INDIRECTION_TABLE_OFFSET(func) + i,
- bp->fp->cl_id + (i % (bp->num_queues -
- NONE_ETH_CONTEXT_USE)));
+ bp->fp->cl_id + bp->rx_indir_table[i]);
+}
+
+static void bnx2x_init_indir_table(struct bnx2x *bp)
+{
+ int i;
+
+ BUG_ON(ARRAY_SIZE(bp->rx_indir_table) <
+ TSTORM_INDIRECTION_TABLE_SIZE);
+
+ for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
+ bp->rx_indir_table[i] =
+ (i % (bp->num_queues - NONE_ETH_CONTEXT_USE));
+
+ bnx2x_push_indir_table(bp);
}
void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
@@ -4496,7 +4507,7 @@ void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
bnx2x_init_eq_ring(bp);
bnx2x_init_internal(bp, load_code);
bnx2x_pf_init(bp);
- bnx2x_init_ind_table(bp);
+ bnx2x_init_indir_table(bp);
bnx2x_stats_init(bp);
/* At this point, we are ready for interrupts */
--
1.7.3.1
^ permalink raw reply related
* Re: [PATCH] bnx2x: Support for managing RX indirection table
From: Eric Dumazet @ 2011-02-15 16:35 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, eilong, netdev
In-Reply-To: <alpine.DEB.2.00.1102150815060.27695@pokey.mtv.corp.google.com>
Le mardi 15 février 2011 à 08:24 -0800, Tom Herbert a écrit :
> Support fetching and retrieving RX indirection table via ethtool.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> drivers/net/bnx2x/bnx2x.h | 2 +
> drivers/net/bnx2x/bnx2x_ethtool.c | 58 +++++++++++++++++++++++++++++++++++++
> drivers/net/bnx2x/bnx2x_main.c | 23 +++++++++++----
> 3 files changed, 77 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
> index 236d79a..bf16119 100644
> --- a/drivers/net/bnx2x/bnx2x.h
> +++ b/drivers/net/bnx2x/bnx2x.h
> @@ -1076,6 +1076,7 @@ struct bnx2x {
> int num_queues;
> int disable_tpa;
> int int_mode;
> + u32 rx_indir_table[128];
>
> struct tstorm_eth_mac_filter_config mac_filters;
> #define BNX2X_ACCEPT_NONE 0x0000
> @@ -1799,5 +1800,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
> BNX2X_EXTERN int load_count[2][3]; /* per path: 0-common, 1-port0, 2-port1 */
>
> extern void bnx2x_set_ethtool_ops(struct net_device *netdev);
> +extern void bnx2x_push_indir_table(struct bnx2x *bp);
>
> #endif /* bnx2x.h */
> diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
> index 816fef6..a99fee4 100644
> --- a/drivers/net/bnx2x/bnx2x_ethtool.c
> +++ b/drivers/net/bnx2x/bnx2x_ethtool.c
> @@ -2134,6 +2134,61 @@ static int bnx2x_phys_id(struct net_device *dev, u32 data)
> return 0;
> }
>
> +static int
> +bnx2x_get_rxnfc(struct net_device *dev,
> + struct ethtool_rxnfc *info, void *rules __always_unused)
> +{
> + struct bnx2x *bp = netdev_priv(dev);
> +
> + switch (info->cmd) {
> + case ETHTOOL_GRXRINGS:
> + info->data = bp->num_queues - NONE_ETH_CONTEXT_USE;
> + return 0;
> +
> + default:
> + return -EOPNOTSUPP;
> + }
> +}
> +
> +static int bnx2x_get_rxfh_indir(struct net_device *dev,
> + struct ethtool_rxfh_indir *indir)
> +{
> + struct bnx2x *bp = netdev_priv(dev);
> + size_t copy_size =
> + min_t(size_t, indir->size, TSTORM_INDIRECTION_TABLE_SIZE);
> +
> + if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
> + return -ENOENT;
> +
> + indir->size = TSTORM_INDIRECTION_TABLE_SIZE;
> + memcpy(indir->ring_index, bp->rx_indir_table,
> + copy_size * sizeof(bp->rx_indir_table[0]));
> + return 0;
> +}
> +
> +static int bnx2x_set_rxfh_indir(struct net_device *dev,
> + const struct ethtool_rxfh_indir *indir)
> +{
> + struct bnx2x *bp = netdev_priv(dev);
> + size_t i;
> +
> + if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
> + return -ENOENT;
> +
> + /* Validate size and indices */
> + if (indir->size != TSTORM_INDIRECTION_TABLE_SIZE)
> + return -EINVAL;
> + for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
> + if (indir->ring_index[i] >=
> + bp->num_queues - NONE_ETH_CONTEXT_USE)
BNX2X_NUM_ETH_QUEUES(bp) instead of
(bp->num_queues - NONE_ETH_CONTEXT_USE)
> + return -EINVAL;
> +
> + memcpy(bp->rx_indir_table, indir->ring_index,
> + sizeof(bp->rx_indir_table));
> + bnx2x_push_indir_table(bp);
> + return 0;
> +}
> +
> static const struct ethtool_ops bnx2x_ethtool_ops = {
> .get_settings = bnx2x_get_settings,
> .set_settings = bnx2x_set_settings,
> @@ -2170,6 +2225,9 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
> .get_strings = bnx2x_get_strings,
> .phys_id = bnx2x_phys_id,
> .get_ethtool_stats = bnx2x_get_ethtool_stats,
> + .get_rxnfc = bnx2x_get_rxnfc,
> + .get_rxfh_indir = bnx2x_get_rxfh_indir,
> + .set_rxfh_indir = bnx2x_set_rxfh_indir,
> };
>
> void bnx2x_set_ethtool_ops(struct net_device *netdev)
> diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
> index c238c4d..b1a84d4 100644
> --- a/drivers/net/bnx2x/bnx2x_main.c
> +++ b/drivers/net/bnx2x/bnx2x_main.c
> @@ -4254,7 +4254,7 @@ static void bnx2x_init_eq_ring(struct bnx2x *bp)
> min_t(int, MAX_SP_DESC_CNT - MAX_SPQ_PENDING, NUM_EQ_DESC) - 1);
> }
>
> -static void bnx2x_init_ind_table(struct bnx2x *bp)
> +void bnx2x_push_indir_table(struct bnx2x *bp)
> {
> int func = BP_FUNC(bp);
> int i;
> @@ -4262,13 +4262,24 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
> if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
> return;
>
> - DP(NETIF_MSG_IFUP,
> - "Initializing indirection table multi_mode %d\n", bp->multi_mode);
> for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
> REG_WR8(bp, BAR_TSTRORM_INTMEM +
> TSTORM_INDIRECTION_TABLE_OFFSET(func) + i,
> - bp->fp->cl_id + (i % (bp->num_queues -
> - NONE_ETH_CONTEXT_USE)));
ditto
> + bp->fp->cl_id + bp->rx_indir_table[i]);
> +}
> +
> +static void bnx2x_init_indir_table(struct bnx2x *bp)
> +{
> + int i;
> +
> + BUG_ON(ARRAY_SIZE(bp->rx_indir_table) <
> + TSTORM_INDIRECTION_TABLE_SIZE);
> +
> + for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
> + bp->rx_indir_table[i] =
> + (i % (bp->num_queues - NONE_ETH_CONTEXT_USE));
and here
> +
> + bnx2x_push_indir_table(bp);
> }
>
> void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
> @@ -4496,7 +4507,7 @@ void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
> bnx2x_init_eq_ring(bp);
> bnx2x_init_internal(bp, load_code);
> bnx2x_pf_init(bp);
> - bnx2x_init_ind_table(bp);
> + bnx2x_init_indir_table(bp);
> bnx2x_stats_init(bp);
>
> /* At this point, we are ready for interrupts */
^ permalink raw reply
* Re: [Bugme-new] [Bug 27212] New: Warning kmemcheck: Caught 64-bit read from uninitialized memory in netlink_broadcast_filtered
From: Christoph Lameter @ 2011-02-15 16:40 UTC (permalink / raw)
To: Pekka Enberg
Cc: Eric Dumazet, Andrew Morton, netdev, bugzilla-daemon,
bugme-daemon, casteyde.christian, Changli Gao, Vegard Nossum,
David Miller, linux-kernel, David Rientjes
In-Reply-To: <AANLkTinKTdeO5mnE38n==aZMz5P1XKKM+kykhoBu0=9k@mail.gmail.com>
On Tue, 15 Feb 2011, Pekka Enberg wrote:
> Looks good to me. Christoph, David, any objections to the patch?
My eyes hurt. Is there some way you could use tabs or spaces instead of
these weird symbols?
If the kmemcheck people are fine with checking data beyond the last byte
of the object then its fine with me.
Acked-by: Christoph Lameter <cl@linux.com>
^ permalink raw reply
* Re: [PATCH] bnx2x: Support for managing RX indirection table
From: Ben Hutchings @ 2011-02-15 16:48 UTC (permalink / raw)
To: Tom Herbert; +Cc: davem, eilong, netdev
In-Reply-To: <alpine.DEB.2.00.1102150815060.27695@pokey.mtv.corp.google.com>
On Tue, 2011-02-15 at 08:24 -0800, Tom Herbert wrote:
> Support fetching and retrieving RX indirection table via ethtool.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> drivers/net/bnx2x/bnx2x.h | 2 +
> drivers/net/bnx2x/bnx2x_ethtool.c | 58 +++++++++++++++++++++++++++++++++++++
> drivers/net/bnx2x/bnx2x_main.c | 23 +++++++++++----
> 3 files changed, 77 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
> index 236d79a..bf16119 100644
> --- a/drivers/net/bnx2x/bnx2x.h
> +++ b/drivers/net/bnx2x/bnx2x.h
> @@ -1076,6 +1076,7 @@ struct bnx2x {
> int num_queues;
> int disable_tpa;
> int int_mode;
> + u32 rx_indir_table[128];
Shouldn't the dimension be TSTORM_INDIRECTION_TABLE_SIZE?
[...]
> +static int bnx2x_set_rxfh_indir(struct net_device *dev,
> + const struct ethtool_rxfh_indir *indir)
> +{
> + struct bnx2x *bp = netdev_priv(dev);
> + size_t i;
> +
> + if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
> + return -ENOENT;
[...]
I think the error code for this should be -EOPNOTSUPP. Similarly in
bnx2x_get_rxfh_indir().
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH V10 12/15] ptp: Added a brand new class driver for ptp clocks.
From: Richard Cochran @ 2011-02-15 17:29 UTC (permalink / raw)
To: John Stultz
Cc: linux-kernel, linux-api, netdev, Alan Cox, Arnd Bergmann,
Christoph Lameter, David Miller, Krzysztof Halasa, Peter Zijlstra,
Rodolfo Giometti, Thomas Gleixner, Benjamin Herrenschmidt,
H. Peter Anvin, Ingo Molnar, Mike Frysinger, Paul Mackerras,
Russell King
In-Reply-To: <20110211081524.GA12270@riccoc20.at.omicron.at>
On Fri, Feb 11, 2011 at 09:15:24AM +0100, Richard Cochran wrote:
> On Tue, Feb 01, 2011 at 06:00:31PM -0800, John Stultz wrote:
> > So what is serializing access to the timestamp_event_queue here? I don't
> > see any usage of tsevq_mux by the callers. Am I missing it? It looks
> > like its called from interrupt context, so do you really need a spinlock
> > and not a mutex here?
>
> The external timestamp FIFO is written only from interrupt context.
Oops, I lied. After reworking the phyter driver, I find that I want to
enqueue time stamps from non-interrupt contexts, too.
So, you are right. This will need a spin lock...
Thanks,
Richard
^ permalink raw reply
* Re: [PATCH] bnx2x: Support for managing RX indirection table
From: Vlad Zolotarov @ 2011-02-15 17:31 UTC (permalink / raw)
To: Tom Herbert; +Cc: netdev@vger.kernel.org
In-Reply-To: <alpine.DEB.2.00.1102150815060.27695@pokey.mtv.corp.google.com>
On Tuesday 15 February 2011 18:24:40 Tom Herbert wrote:
> Support fetching and retrieving RX indirection table via ethtool.
>
> Signed-off-by: Tom Herbert <therbert@google.com>
> ---
> drivers/net/bnx2x/bnx2x.h | 2 +
> drivers/net/bnx2x/bnx2x_ethtool.c | 58 +++++++++++++++++++++++++++++++++++++
> drivers/net/bnx2x/bnx2x_main.c | 23 +++++++++++----
> 3 files changed, 77 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
> index 236d79a..bf16119 100644
> --- a/drivers/net/bnx2x/bnx2x.h
> +++ b/drivers/net/bnx2x/bnx2x.h
> @@ -1076,6 +1076,7 @@ struct bnx2x {
> int num_queues;
> int disable_tpa;
> int int_mode;
> + u32 rx_indir_table[128];
>
> struct tstorm_eth_mac_filter_config mac_filters;
> #define BNX2X_ACCEPT_NONE 0x0000
> @@ -1799,5 +1800,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
> BNX2X_EXTERN int load_count[2][3]; /* per path: 0-common, 1-port0, 2-port1 */
>
> extern void bnx2x_set_ethtool_ops(struct net_device *netdev);
> +extern void bnx2x_push_indir_table(struct bnx2x *bp);
Why to use "extern" for the prototype here and "static" for the implementation
below? Pls., declare it in .h (without an "extern") and use it as u do in
bnx2x_ethtool.c and bnx2x_main.c as u do.
thanks,
vlad
>
> #endif /* bnx2x.h */
> diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
> index 816fef6..a99fee4 100644
> --- a/drivers/net/bnx2x/bnx2x_ethtool.c
> +++ b/drivers/net/bnx2x/bnx2x_ethtool.c
> @@ -2134,6 +2134,61 @@ static int bnx2x_phys_id(struct net_device *dev, u32 data)
> return 0;
> }
>
> +static int
> +bnx2x_get_rxnfc(struct net_device *dev,
> + struct ethtool_rxnfc *info, void *rules __always_unused)
> +{
> + struct bnx2x *bp = netdev_priv(dev);
> +
> + switch (info->cmd) {
> + case ETHTOOL_GRXRINGS:
> + info->data = bp->num_queues - NONE_ETH_CONTEXT_USE;
> + return 0;
> +
> + default:
> + return -EOPNOTSUPP;
> + }
> +}
> +
> +static int bnx2x_get_rxfh_indir(struct net_device *dev,
> + struct ethtool_rxfh_indir *indir)
> +{
> + struct bnx2x *bp = netdev_priv(dev);
> + size_t copy_size =
> + min_t(size_t, indir->size, TSTORM_INDIRECTION_TABLE_SIZE);
> +
> + if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
> + return -ENOENT;
> +
> + indir->size = TSTORM_INDIRECTION_TABLE_SIZE;
> + memcpy(indir->ring_index, bp->rx_indir_table,
> + copy_size * sizeof(bp->rx_indir_table[0]));
> + return 0;
> +}
> +
> +static int bnx2x_set_rxfh_indir(struct net_device *dev,
> + const struct ethtool_rxfh_indir *indir)
> +{
> + struct bnx2x *bp = netdev_priv(dev);
> + size_t i;
> +
> + if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
> + return -ENOENT;
> +
> + /* Validate size and indices */
> + if (indir->size != TSTORM_INDIRECTION_TABLE_SIZE)
> + return -EINVAL;
> + for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
> + if (indir->ring_index[i] >=
> + bp->num_queues - NONE_ETH_CONTEXT_USE)
> + return -EINVAL;
> +
> + memcpy(bp->rx_indir_table, indir->ring_index,
> + sizeof(bp->rx_indir_table));
> + bnx2x_push_indir_table(bp);
> + return 0;
> +}
> +
> static const struct ethtool_ops bnx2x_ethtool_ops = {
> .get_settings = bnx2x_get_settings,
> .set_settings = bnx2x_set_settings,
> @@ -2170,6 +2225,9 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
> .get_strings = bnx2x_get_strings,
> .phys_id = bnx2x_phys_id,
> .get_ethtool_stats = bnx2x_get_ethtool_stats,
> + .get_rxnfc = bnx2x_get_rxnfc,
> + .get_rxfh_indir = bnx2x_get_rxfh_indir,
> + .set_rxfh_indir = bnx2x_set_rxfh_indir,
> };
>
> void bnx2x_set_ethtool_ops(struct net_device *netdev)
> diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
> index c238c4d..b1a84d4 100644
> --- a/drivers/net/bnx2x/bnx2x_main.c
> +++ b/drivers/net/bnx2x/bnx2x_main.c
> @@ -4254,7 +4254,7 @@ static void bnx2x_init_eq_ring(struct bnx2x *bp)
> min_t(int, MAX_SP_DESC_CNT - MAX_SPQ_PENDING, NUM_EQ_DESC) - 1);
> }
>
> -static void bnx2x_init_ind_table(struct bnx2x *bp)
> +void bnx2x_push_indir_table(struct bnx2x *bp)
> {
> int func = BP_FUNC(bp);
> int i;
> @@ -4262,13 +4262,24 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
> if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
> return;
>
> - DP(NETIF_MSG_IFUP,
> - "Initializing indirection table multi_mode %d\n", bp->multi_mode);
> for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
> REG_WR8(bp, BAR_TSTRORM_INTMEM +
> TSTORM_INDIRECTION_TABLE_OFFSET(func) + i,
> - bp->fp->cl_id + (i % (bp->num_queues -
> - NONE_ETH_CONTEXT_USE)));
> + bp->fp->cl_id + bp->rx_indir_table[i]);
> +}
> +
> +static void bnx2x_init_indir_table(struct bnx2x *bp)
> +{
> + int i;
> +
> + BUG_ON(ARRAY_SIZE(bp->rx_indir_table) <
> + TSTORM_INDIRECTION_TABLE_SIZE);
> +
> + for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
> + bp->rx_indir_table[i] =
> + (i % (bp->num_queues - NONE_ETH_CONTEXT_USE));
> +
> + bnx2x_push_indir_table(bp);
> }
>
> void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
> @@ -4496,7 +4507,7 @@ void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
> bnx2x_init_eq_ring(bp);
> bnx2x_init_internal(bp, load_code);
> bnx2x_pf_init(bp);
> - bnx2x_init_ind_table(bp);
> + bnx2x_init_indir_table(bp);
> bnx2x_stats_init(bp);
>
> /* At this point, we are ready for interrupts */
>
^ permalink raw reply
* Re: [PATCH] bnx2x: Support for managing RX indirection table
From: Vlad Zolotarov @ 2011-02-15 17:39 UTC (permalink / raw)
To: Tom Herbert; +Cc: netdev@vger.kernel.org
In-Reply-To: <alpine.DEB.2.00.1102150815060.27695@pokey.mtv.corp.google.com>
> void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
> @@ -4496,7 +4507,7 @@ void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
> bnx2x_init_eq_ring(bp);
> bnx2x_init_internal(bp, load_code);
> bnx2x_pf_init(bp);
> - bnx2x_init_ind_table(bp);
> + bnx2x_init_indir_table(bp);
Tom, one more thing: could u, pls., cancel this rename? ;)
thanks,
vlad
^ permalink raw reply
* Re: [PATCH] drivers/net: Call netif_carrier_off at the end of the probe
From: Ivan Vecera @ 2011-02-15 18:01 UTC (permalink / raw)
To: Ben Hutchings; +Cc: netdev, davem, aabdulla, Ben Hutchings, Francois Romieu
In-Reply-To: <1297785532.2584.10.camel@bwh-desktop>
----- Original Message -----
> On Tue, 2011-02-15 at 16:22 +0100, Francois Romieu wrote:
> > Stated this way it sounds like a core dev layer issue.
>
> ...
> > I am not completely sure after reading some history. Namely:
> > - (37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 ?)
> > - c276e098d3ee33059b4a1c747354226cec58487c
> > - 22604c866889c4b2e12b73cbf1683bda1b72a313
> > - b47300168e770b60ab96c8924854c3b0eb4260eb
> >
> > I am confused.
>
> Drivers that can report carrier state should do so initially some time
> between registering a device and bringing it up (either in the bus
> probe
> function or the ndo_open function). It generally seems to be safe to
> assume that the link is down initially, and then to rely on
> notifications from the hardware. However, that does depend on the
> behaviour of the hardware.
>
Yes,that's true... forcedeth and r8169 are the drivers that detect link
state when device is opened and call netif_carrier_on(off) appropriately.
Ivan
^ permalink raw reply
* Re: [PATCH] net: provide capability and group sets via SCM
From: Casey Schaufler @ 2011-02-15 18:09 UTC (permalink / raw)
To: David Miller
Cc: linux-kernel, netdev, ext-jarkko.2.sakkinen, Janne.Karhunen,
elena.reshetova, Casey Schaufler
In-Reply-To: <20110214.174919.48492611.davem@davemloft.net>
On 2/14/2011 5:49 PM, David Miller wrote:
> From: Casey Schaufler <casey@schaufler-ca.com>
> Date: Tue, 08 Feb 2011 14:28:27 -0800
>
>> Subject: [PATCH] net: provide group lists and capability set via CMSG
>>
>> Provide the namespace converted group list of the peer
>> process using the SCM mechanism. Provide the capability
>> set of the peer process. The capability set is not
>> namespace converted on the assumption that there is no
>> such conversion available or required.
>>
>> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
> You can't just hit the asm-generic header, you have to also hit
> all of the architectures that don't use the asm-generic header,
> including sparc, powerpc, mips, s390, arm, alpha, cris, frv, h8300,
> ia64, m32r, m68k, m68knommu, mn10300, parisc, and xtensa.
OK, I was afraid of that. Updated version will include those.
Thank you.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>
^ permalink raw reply
* Re: mac addresses of local interfaces do not obey setageing 0
From: Stephen Hemminger @ 2011-02-15 18:25 UTC (permalink / raw)
To: Veaceslav Falico; +Cc: netdev, bridge
In-Reply-To: <20110209181752.GA2042@darkmag.usersys.redhat.com>
On Wed, 9 Feb 2011 19:17:52 +0100
Veaceslav Falico <vfalico@redhat.com> wrote:
> Hello,
>
> I have a host and a VM inside this host bridged. I've set ageing_time and
> forward_delay to 0 and trying to capture all the traffic that goes through that
> bridge from my VM, but it fails to capture the traffic that has dst ether
> address the same as the hosts address (i.e. I can't capture the traffic to the
> host).
>
> From the code, I see that br->ageing_time doesn't really work with local mac
> addresses - has_expired() function never says that a local interface mac address
> is expired, because it verifies if fdb->is_static is set and returns right away.
>
> Is this the desired behaviour? If so, is there a way to capture packets with
> destination to a local interface from another interface?
>
> I've also done a small patch and it seems to fix the situation, but I am not
> sure if it's the right way to do it.
>
>
> Regards,
> Veaceslav
>
> ---
> net/bridge/br_fdb.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
> index 88485cc..3d380c2 100644
> --- a/net/bridge/br_fdb.c
> +++ b/net/bridge/br_fdb.c
> @@ -61,8 +61,8 @@ static inline unsigned long hold_time(const struct net_bridge *br)
> static inline int has_expired(const struct net_bridge *br,
> const struct net_bridge_fdb_entry *fdb)
> {
> - return !fdb->is_static &&
> - time_before_eq(fdb->ageing_timer + hold_time(br), jiffies);
> + return (br->ageing_time == 0) || (!fdb->is_static &&
> + time_before_eq(fdb->ageing_timer + hold_time(br), jiffies));
> }
>
No.
Local addresses should never age.
The proper way to capture packet is to us AF_PACKET or tc actions.
--
^ permalink raw reply
* Re: [PATCH 02/14] net/fec: release mem_region requested in probe in error path and remove
From: David Miller @ 2011-02-15 18:31 UTC (permalink / raw)
To: u.kleine-koenig; +Cc: netdev, shawn.guo, kernel
In-Reply-To: <20110215085305.GL13279@pengutronix.de>
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue, 15 Feb 2011 09:53:05 +0100
> On Mon, Feb 14, 2011 at 11:05:49AM -0800, David Miller wrote:
>> These merge commits look ugly and Linus wants them minimized.
> Hmm, right, I don't get why this looks uglier for Linus than a merge of
> a tree that bases on something you already have. I guess you're too
> annoyed by now to explain why you think it does.
What's so hard to understand about the fact that when I pull from
someone I do not want any commits unrelated to the work that person
is sending me?
>> Either you follow the rules and my expectations, which is that when you
>> give me a GIT tree to pull from it's based upon one of my trees, or
>> I don't pull from you.
> So I rebased my tree on something older. It now starts at
>
> c69b909 (pch_can: fix module reload issue with MSI)
>
> which is already in net-next/master.
You need to send a new pull request so that it gets properly tracked
in patchwork.
^ permalink raw reply
* Re: [PATCH] arp_notify: unconditionally send gratuitous ARP for NETDEV_NOTIFY_PEERS.
From: David Miller @ 2011-02-15 18:51 UTC (permalink / raw)
To: Ian.Campbell; +Cc: netdev
In-Reply-To: <1297761225.21980.3663.camel@zakaz.uk.xensource.com>
From: Ian Campbell <Ian.Campbell@eu.citrix.com>
Date: Tue, 15 Feb 2011 09:13:45 +0000
> On Tue, 2011-02-15 at 01:46 +0000, David Miller wrote:
>> From: Ian Campbell <ian.campbell@citrix.com>
>> Date: Fri, 11 Feb 2011 17:44:16 +0000
>>
>> > NETDEV_NOTIFY_PEER is an explicit request by the driver to send a link
>> > notification while NETDEV_UP/NETDEV_CHANGEADDR generate link
>> > notifications as a sort of side effect.
...
> I nearly forgot -- the NETDEV_NOTIFY_PEER stuff was tagged for
> stable/longterm backport (it appeared in 2.6.32.19 or so). I think this
> change should likewise go back, what do you think?
Sure, I've queued it up for -stable.
^ permalink raw reply
* Re: [PATCH 02/14] net/fec: release mem_region requested in probe in error path and remove
From: Uwe Kleine-König @ 2011-02-15 20:00 UTC (permalink / raw)
To: David Miller; +Cc: netdev, shawn.guo, kernel
In-Reply-To: <20110215.103159.193730541.davem@davemloft.net>
On Tue, Feb 15, 2011 at 10:31:59AM -0800, David Miller wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Date: Tue, 15 Feb 2011 09:53:05 +0100
>
> > On Mon, Feb 14, 2011 at 11:05:49AM -0800, David Miller wrote:
> >> These merge commits look ugly and Linus wants them minimized.
> > Hmm, right, I don't get why this looks uglier for Linus than a merge of
> > a tree that bases on something you already have. I guess you're too
> > annoyed by now to explain why you think it does.
>
> What's so hard to understand about the fact that when I pull from
> someone I do not want any commits unrelated to the work that person
> is sending me?
Perfectly fine, I can live with this explanation. Next time say that at
once :-)
> >> Either you follow the rules and my expectations, which is that when you
> >> give me a GIT tree to pull from it's based upon one of my trees, or
> >> I don't pull from you.
> > So I rebased my tree on something older. It now starts at
> >
> > c69b909 (pch_can: fix module reload issue with MSI)
> >
> > which is already in net-next/master.
>
> You need to send a new pull request so that it gets properly tracked
> in patchwork.
Oh, I didn't know that patchwork tracks pull requests, too:
The following changes since commit c69b90920a36b88ab0d649963d81355d865eeb05:
pch_can: fix module reload issue with MSI (2011-02-08 16:37:20 -0800)
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git fec
Uwe Kleine-König (14):
net/fec: no need to cast arguments for memcpy
net/fec: release mem_region requested in probe in error path and remove
net/fec: don't free an irq that failed to be requested
net/fec: no need to check for validity of ndev in suspend and resume
net/fec: no need to memzero private data
net/fec: put the ioremap cookie immediately into a void __iomem pointer
net/fec: consolidate all i.MX options to CONFIG_ARM
net/fec: add phy_stop to fec_enet_close
net/fec: consistenly name struct net_device pointers "ndev"
net/fec: some whitespace cleanup
net/fec: reorder functions a bit allows removing forward declarations
net/fec: provide device for dma functions and matching sizes for map and unmap
net/fec: postpone unsetting driver data until the hardware is stopped
net/fec: enable flow control and length check on enet-mac
drivers/net/Kconfig | 3 +-
drivers/net/fec.c | 650 ++++++++++++++++++++++++++-------------------------
2 files changed, 328 insertions(+), 325 deletions(-)
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: potential null pointer dereference in drivers/isdn/hisax/isdnl2.c
From: Milton Miller @ 2011-02-15 20:09 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, netdev, tj, isdn, jj
In-Reply-To: <20110213.165309.123985803.davem@davemloft.net>
On Mon, 14 Feb 2011 00:53:09 -0000, Dave Miler wrote:
> From: Jesper Juhl <jj@chaosbits.net>
>
> > In drivers/isdn/hisax/isdnl2.c:l2_pull_iqueue() we have this:
> >
> > ...
> > skb = alloc_skb(oskb->len + i, GFP_ATOMIC);
> > memcpy(skb_put(skb, i), header, i);
> > ...
> >
> > If alloc_skb() fails and returns NULL then the second line will cause a
> > NULL pointer dereference - skb_put() gives the pointer to
> > skb_tail_pointer() which dereferences it.
> >
> > I'm not quite sure how this should be dealt with, so I'll just report it
> > rather than submit a patch. Happy bug fixing :-)
>
> Thanks Jesper, I'll fix this like so:
>
> --------------------
> hisax: Fix unchecked alloc_skb() return.
>
> Jesper Juhl noticed that l2_pull_iqueue() does not
> check to see if alloc_skb() fails.
>
> Fix this by first trying to reallocate the headroom
> if necessary, rather than later after we've made hard
> to undo state changes.
>
> Reported-by: Jesper Juhl <jj@chaosbits.net>
> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> ---
> drivers/isdn/hisax/isdnl2.c | 35 ++++++++++++++++++++---------------
> 1 files changed, 20 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
> index 0858791..98ac835 100644
> --- a/drivers/isdn/hisax/isdnl2.c
> +++ b/drivers/isdn/hisax/isdnl2.c
> @@ -1243,14 +1243,21 @@ l2_st7_tout_203(struct FsmInst *fi, int event, void *arg)
> st->l2.rc = 0;
> }
>
> +static int l2_hdr_space_needed(struct Layer2 *l2)
> +{
> + int len = test_bit(FLG_LAPD, &l2->flag) ? 2 : 1;
> +
> + return len + (test_bit(FLG_LAPD, &l2->flag) ? 2 : 1);
> +}
> +
That struck me as an funny way to write 2 * len, so I finally looked
at the code. I think one of those should be FLG_MOD128, but then
at that point why not use the existing l2headersize(l2, ui) with
ui = 0?
I see this is in linux-next of Feb 15, 2011.
milton
^ permalink raw reply
* pull request: sfc-next-2.6 2011-02-15
From: Ben Hutchings @ 2011-02-15 20:12 UTC (permalink / raw)
To: David Miller; +Cc: netdev, sf-linux-drivers, Tom Herbert, John Fastabend
The following changes since commit 263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea:
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (2011-02-08 17:19:01 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6.git for-davem
Multiqueue TX priority support for sfc, and some necessary fixes
elsewhere.
Ben.
Ben Hutchings (5):
sch_mqprio: Always set num_tc to 0 in mqprio_destroy()
net: Adjust TX queue kobjects if number of queues changes during unregister
sfc: Move TX queue core queue mapping into tx.c
sfc: Distinguish queue lookup from test for queue existence
sfc: Add TX queues for high-priority traffic
drivers/net/sfc/efx.c | 31 ++++----------
drivers/net/sfc/efx.h | 2 +
drivers/net/sfc/ethtool.c | 6 +-
drivers/net/sfc/net_driver.h | 64 +++++++++++++++++++++++-------
drivers/net/sfc/nic.c | 51 ++++++++++++++++++------
drivers/net/sfc/regs.h | 6 +++
drivers/net/sfc/selftest.c | 2 +-
drivers/net/sfc/tx.c | 90 ++++++++++++++++++++++++++++++++++++++++-
net/core/dev.c | 3 +-
net/sched/sch_mqprio.c | 14 +++---
10 files changed, 204 insertions(+), 65 deletions(-)
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* [PATCH net-next-2.6 1/5] sch_mqprio: Always set num_tc to 0 in mqprio_destroy()
From: Ben Hutchings @ 2011-02-15 20:14 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-net-drivers, Tom Herbert, John Fastabend
In-Reply-To: <1297800733.2584.15.camel@bwh-desktop>
All the cleanup code in mqprio_destroy() is currently conditional on
priv->qdiscs being non-null, but that condition should only apply to
the per-queue qdisc cleanup. We should always set the number of
traffic classes back to 0 here.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
net/sched/sch_mqprio.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index effd4ee..ace37f9 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -29,18 +29,18 @@ static void mqprio_destroy(struct Qdisc *sch)
struct mqprio_sched *priv = qdisc_priv(sch);
unsigned int ntx;
- if (!priv->qdiscs)
- return;
-
- for (ntx = 0; ntx < dev->num_tx_queues && priv->qdiscs[ntx]; ntx++)
- qdisc_destroy(priv->qdiscs[ntx]);
+ if (priv->qdiscs) {
+ for (ntx = 0;
+ ntx < dev->num_tx_queues && priv->qdiscs[ntx];
+ ntx++)
+ qdisc_destroy(priv->qdiscs[ntx]);
+ kfree(priv->qdiscs);
+ }
if (priv->hw_owned && dev->netdev_ops->ndo_setup_tc)
dev->netdev_ops->ndo_setup_tc(dev, 0);
else
netdev_set_num_tc(dev, 0);
-
- kfree(priv->qdiscs);
}
static int mqprio_parse_opt(struct net_device *dev, struct tc_mqprio_qopt *qopt)
--
1.7.3.4
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply related
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