Netdev List
 help / color / mirror / Atom feed
* Re: [PATCH 0/4 v3] mv643xx_eth: use mvmdio MDIO bus driver
From: Thomas Petazzoni @ 2013-03-22 13:53 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: davem, Grant Likely, Rob Herring, Rob Landley, Jason Cooper,
	Andrew Lunn, Russell King, Benjamin Herrenschmidt, Paul Mackerras,
	Lennert Buytenhek, Greg Kroah-Hartman, devicetree-discuss,
	linux-doc, linux-kernel, linux-arm-kernel, linuxppc-dev, netdev
In-Reply-To: <1363959568-16976-1-git-send-email-florian@openwrt.org>

Hello,

On Fri, 22 Mar 2013 14:39:24 +0100, Florian Fainelli wrote:
> Hi all,
> 
> This patch converts the mv643xx_eth driver to use the mvmdio MDIO bus driver
> instead of rolling its own implementation. As a result, all users of this
> mv643xx_eth driver are converted to register an "orion-mdio" platform_device.
> The mvmdio driver is also updated to support an interrupt line which reports
> SMI error/completion, and to allow traditionnal platform device registration
> instead of just device tree.
> 
> David, I think it makes sense for you to merge all of this, since we do
> not want the architecture files to be desynchronized from the mv643xx_eth to
> avoid runtime breakage. The potential for merge conflicts should be very small.
> 
> Florian Fainelli (4):
>   net: mvmdio: allow platform device style registration
>   net: mvmdio: rename base register cookie from smireg to regs
>   net: mvmdio: enhance driver to support SMI error/done interrupts
>   mv643xx_eth: convert to use the Marvell Orion MDIO driver

For the entire series:

Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

tested on:

 * Armada XP DB, DT-based, which uses the mvneta driver. It is affected
   by the 3 first commits since Armada XP also uses the mvmdio driver.

 * Kirkwood development board, non-DT, which uses the mv643xx_eth
   driver.

Thanks Florian for this work,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply

* Re: [PATCH 2/2] thermal: shorten too long mcast group name
From: David Miller @ 2013-03-22 14:04 UTC (permalink / raw)
  To: yamato; +Cc: netdev, linux-acpi
In-Reply-To: <20130322.124306.147839510158679545.yamato@redhat.com>

From: Masatake YAMATO <yamato@redhat.com>
Date: Fri, 22 Mar 2013 12:43:06 +0900 (JST)

> I read but I didn't understand the meaning of applying because
> I cannot find my 2nd patch for thermal in net-next tree when I 
> pulled.

These are bug fixes, so they appear in the 'net' tree not 'net-next'.

^ permalink raw reply

* Re: [PATCH] net: Add support for handling queueing in hardware
From: David Miller @ 2013-03-22 14:11 UTC (permalink / raw)
  To: afleming; +Cc: linux-kernel, netdev
In-Reply-To: <E1UJ1fR-0004hs-4l@swissweb.swissdisk.com>

From: Andy Fleming <afleming@freescale.com>
Date: Wed, 13 Jul 2011 08:52:04 -0500

> The QDisc code does a bunch of locking which is unnecessary if
> you have hardware which handles all of the queueing. Add
> support for this, and skip over all of the queueing code if
> the feature is enabled on a given device, which breaks QDisc
> support on dpaa_eth, and also coopts the FCOE feature bit.
> 
> Signed-off-by: Andy Fleming <afleming@freescale.com>
> Signed-off-by: Ben Collins <ben.c@servergy.com>

Sorry, no.

If we are going to support something like this then there needs to
be full coordination, configuration wise, so that if we enable
a qdisc that the hardware supports we submit it directly, but if
we enable a qdisc the HW does not support, we still use the software
qdisc.

This also means that we need to have a way to determine if the qdisc
configuration exceeds that parametorial limits of the device's HW
capabilities, and fallback to software qdisc in those cases too.

^ permalink raw reply

* Re: [PATCH] phy: Add XGMII phy interface type
From: David Miller @ 2013-03-22 14:12 UTC (permalink / raw)
  To: ben.c; +Cc: linux-kernel, netdev
In-Reply-To: <E1UJ1fR-0004hy-AI@swissweb.swissdisk.com>

From: Ben Collins <ben.c@servergy.com>
Date: Mon, 18 Mar 2013 19:53:42 -0400

> Used by systems based on certain Freescale SoCs (specifically the
> Servergy CTS-1000 system).
> 
> Signed-off-by: Ben Collins <ben.c@servergy.com>

You can resubmit this patch when you submit a driver upstream that
uses it, so we can see what the use case looks like.

^ permalink raw reply

* Re: [PATCH] phy: Add support for VSC8234
From: David Miller @ 2013-03-22 14:13 UTC (permalink / raw)
  To: afleming; +Cc: linux-kernel, kumar.gala, netdev
In-Reply-To: <E1UJ1fR-0004hp-2j@swissweb.swissdisk.com>

From: Andy Fleming <afleming@freescale.com>
Date: Sun, 16 Oct 2011 01:49:49 -0500

> No functional changes other than to recognize this PHYID.
> 
> Signed-off-by: Andy Fleming <afleming@freescale.com>
> Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
> Signed-off-by: Ben Collins <ben.c@servergy.com>

Please do not submit patches with the commit date integrated
into your formal email headers.

This screws up archives and patch queue maintainence systems which
order submissions by date.

Thanks.

^ permalink raw reply

* Re: [PATCH 0/4 v3] mv643xx_eth: use mvmdio MDIO bus driver
From: Jason Cooper @ 2013-03-22 14:14 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: davem, Grant Likely, Rob Herring, Rob Landley, Andrew Lunn,
	Russell King, Benjamin Herrenschmidt, Paul Mackerras,
	Lennert Buytenhek, Thomas Petazzoni, Greg Kroah-Hartman,
	devicetree-discuss, linux-doc, linux-kernel, linux-arm-kernel,
	linuxppc-dev, netdev
In-Reply-To: <1363959568-16976-1-git-send-email-florian@openwrt.org>

On Fri, Mar 22, 2013 at 02:39:24PM +0100, Florian Fainelli wrote:
> Hi all,
> 
> This patch converts the mv643xx_eth driver to use the mvmdio MDIO bus driver
> instead of rolling its own implementation. As a result, all users of this
> mv643xx_eth driver are converted to register an "orion-mdio" platform_device.
> The mvmdio driver is also updated to support an interrupt line which reports
> SMI error/completion, and to allow traditionnal platform device registration
> instead of just device tree.
> 
> David, I think it makes sense for you to merge all of this, since we do
> not want the architecture files to be desynchronized from the mv643xx_eth to
> avoid runtime breakage. The potential for merge conflicts should be very small.
> 
> Florian Fainelli (4):
>   net: mvmdio: allow platform device style registration
>   net: mvmdio: rename base register cookie from smireg to regs
>   net: mvmdio: enhance driver to support SMI error/done interrupts
>   mv643xx_eth: convert to use the Marvell Orion MDIO driver
> 
>  .../devicetree/bindings/net/marvell-orion-mdio.txt |    3 +
>  arch/arm/plat-orion/common.c                       |   54 +++---
>  arch/powerpc/platforms/chrp/pegasos_eth.c          |   20 ++
>  arch/powerpc/sysdev/mv64x60_dev.c                  |   16 +-
>  drivers/net/ethernet/marvell/Kconfig               |    5 +-
>  drivers/net/ethernet/marvell/Makefile              |    2 +-
>  drivers/net/ethernet/marvell/mv643xx_eth.c         |  195 ++------------------
>  drivers/net/ethernet/marvell/mvmdio.c              |  130 ++++++++++---
>  include/linux/mv643xx_eth.h                        |    1 -
>  9 files changed, 187 insertions(+), 239 deletions(-)

Whole series applied on top of v3.9-rc3 and tested on dreamplug
(kirkwood DT boot with legacy mv643xx_eth init)

Tested-by: Jason Cooper <jason@lakedaemon.net>

also, for the bits changing plat-orion:

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

^ permalink raw reply

* Re: [PATCH] phy: Add support for VSC8234
From: Ben Collins @ 2013-03-22 14:16 UTC (permalink / raw)
  To: David Miller; +Cc: afleming, linux-kernel, kumar.gala, netdev
In-Reply-To: <20130322.101351.803684806942512280.davem@davemloft.net>

On Mar 22, 2013, at 10:13 AM, David Miller <davem@davemloft.net> wrote:

> From: Andy Fleming <afleming@freescale.com>
> Date: Sun, 16 Oct 2011 01:49:49 -0500
> 
>> No functional changes other than to recognize this PHYID.
>> 
>> Signed-off-by: Andy Fleming <afleming@freescale.com>
>> Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
>> Signed-off-by: Ben Collins <ben.c@servergy.com>
> 
> Please do not submit patches with the commit date integrated
> into your formal email headers.
> 
> This screws up archives and patch queue maintainence systems which
> order submissions by date.


For the record, this wasn't Andy, it was me. Noted.

--
Servergy  : http://www.servergy.com/
SwissDisk : http://www.swissdisk.com/
Ubuntu    : http://www.ubuntu.com/
My Blog   : http://ben-collins.blogspot.com/

^ permalink raw reply

* Re: [PATCH] phy: Add XGMII phy interface type
From: Ben Collins @ 2013-03-22 14:17 UTC (permalink / raw)
  To: David Miller; +Cc: ben.c, linux-kernel, netdev
In-Reply-To: <20130322.101259.1120794715082991238.davem@davemloft.net>

On Mar 22, 2013, at 10:12 AM, David Miller <davem@davemloft.net> wrote:

> From: Ben Collins <ben.c@servergy.com>
> Date: Mon, 18 Mar 2013 19:53:42 -0400
> 
>> Used by systems based on certain Freescale SoCs (specifically the
>> Servergy CTS-1000 system).
>> 
>> Signed-off-by: Ben Collins <ben.c@servergy.com>
> 
> You can resubmit this patch when you submit a driver upstream that
> uses it, so we can see what the use case looks like.

That patch is getting sent soon. It's starting out in staging. Should I Cc you on that?

--
Servergy  : http://www.servergy.com/
SwissDisk : http://www.swissdisk.com/
Ubuntu    : http://www.ubuntu.com/
My Blog   : http://ben-collins.blogspot.com/

^ permalink raw reply

* Re: [PATCH] phy: Add XGMII phy interface type
From: David Miller @ 2013-03-22 14:19 UTC (permalink / raw)
  To: benmcollins13; +Cc: ben.c, linux-kernel, netdev
In-Reply-To: <5BDCE647-67A3-423B-AB9C-8C50CC0B6C02@gmail.com>

From: Ben Collins <benmcollins13@gmail.com>
Date: Fri, 22 Mar 2013 10:17:35 -0400

> On Mar 22, 2013, at 10:12 AM, David Miller <davem@davemloft.net> wrote:
> 
>> From: Ben Collins <ben.c@servergy.com>
>> Date: Mon, 18 Mar 2013 19:53:42 -0400
>> 
>>> Used by systems based on certain Freescale SoCs (specifically the
>>> Servergy CTS-1000 system).
>>> 
>>> Signed-off-by: Ben Collins <ben.c@servergy.com>
>> 
>> You can resubmit this patch when you submit a driver upstream that
>> uses it, so we can see what the use case looks like.
> 
> That patch is getting sent soon. It's starting out in staging. Should I Cc you on that?

Why don't you wait until the driver is good enough for drivers/net proper?

^ permalink raw reply

* Re: [PATCH] appletalk: remove "config IPDDP_DECAP"
From: David Miller @ 2013-03-22 14:21 UTC (permalink / raw)
  To: pebolle; +Cc: acme, netdev, linux-kernel
In-Reply-To: <1363908924.1390.164.camel@x61.thuisdomein>

From: Paul Bolle <pebolle@tiscali.nl>
Date: Fri, 22 Mar 2013 00:35:24 +0100

> The Kconfig symbol IPDDP_DECAP got added in v2.1.75. It has never been
> used. Its entry can safely be removed.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

Applied, thanks.

^ permalink raw reply

* Re: [PATCH v2] net: Fix p3_gelic_net sparse warnings
From: David Miller @ 2013-03-22 14:21 UTC (permalink / raw)
  To: geoff; +Cc: netdev
In-Reply-To: <1363910819.1075.60.camel@smoke>

From: Geoff Levand <geoff@infradead.org>
Date: Thu, 21 Mar 2013 17:06:59 -0700

> Rearrange routines to avoid local declarations and remove
> unnecessary inline tags.  No functional changes.
> 
> Fixes sparse warnings like these:
> 
>   ps3_gelic_net.c: error: marked inline, but without a definition
> 
> Signed-off-by: Geoff Levand <geoff@infradead.org>

This looks a lot better, applied, thanks Geoff.

^ permalink raw reply

* Re: [PATCH] phy: Add XGMII phy interface type
From: Ben Collins @ 2013-03-22 14:22 UTC (permalink / raw)
  To: David Miller; +Cc: linux-kernel, netdev
In-Reply-To: <20130322.101900.1947638393872492900.davem@davemloft.net>

On Mar 22, 2013, at 10:19 AM, David Miller <davem@davemloft.net> wrote:

> From: Ben Collins <benmcollins13@gmail.com>
> Date: Fri, 22 Mar 2013 10:17:35 -0400
> 
>> On Mar 22, 2013, at 10:12 AM, David Miller <davem@davemloft.net> wrote:
>> 
>>> From: Ben Collins <ben.c@servergy.com>
>>> Date: Mon, 18 Mar 2013 19:53:42 -0400
>>> 
>>>> Used by systems based on certain Freescale SoCs (specifically the
>>>> Servergy CTS-1000 system).
>>>> 
>>>> Signed-off-by: Ben Collins <ben.c@servergy.com>
>>> 
>>> You can resubmit this patch when you submit a driver upstream that
>>> uses it, so we can see what the use case looks like.
>> 
>> That patch is getting sent soon. It's starting out in staging. Should I Cc you on that?
> 
> Why don't you wait until the driver is good enough for drivers/net proper?


It's code that I've manually stripped down as a subset of a larger code base for Freescale's DPAA driver. I've only tested it on our (Servergy's) platform, so until it gets more broad testing (and some code review), I want to at least get it into staging so our hardware is supported.

--
Servergy  : http://www.servergy.com/
SwissDisk : http://www.swissdisk.com/
Ubuntu    : http://www.ubuntu.com/
My Blog   : http://ben-collins.blogspot.com/

^ permalink raw reply

* Re: [PATCH] net: Add support for handling queueing in hardware
From: Eric Dumazet @ 2013-03-22 14:23 UTC (permalink / raw)
  To: Andy Fleming; +Cc: linux-kernel, netdev
In-Reply-To: <E1UJ1fR-0004hs-4l@swissweb.swissdisk.com>

On Wed, 2011-07-13 at 08:52 -0500, Andy Fleming wrote:
> The QDisc code does a bunch of locking which is unnecessary if
> you have hardware which handles all of the queueing. Add
> support for this, and skip over all of the queueing code if
> the feature is enabled on a given device, which breaks QDisc
> support on dpaa_eth, and also coopts the FCOE feature bit.
> 
> Signed-off-by: Andy Fleming <afleming@freescale.com>
> Signed-off-by: Ben Collins <ben.c@servergy.com>
> Cc: netdev@vger.kernel.org
> ---
>  include/linux/netdev_features.h | 2 ++
>  net/core/dev.c                  | 6 ++++++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
> index 3dd3934..ffb4587 100644
> --- a/include/linux/netdev_features.h
> +++ b/include/linux/netdev_features.h
> @@ -56,6 +56,7 @@ enum {
>  	NETIF_F_LOOPBACK_BIT,		/* Enable loopback */
>  	NETIF_F_RXFCS_BIT,		/* Append FCS to skb pkt data */
>  	NETIF_F_RXALL_BIT,		/* Receive errored frames too */
> +	NETIF_F_HW_QDISC_BIT,		/* Supports hardware Qdisc */
>  
>  	/*
>  	 * Add your fresh new feature above and remember to update
> @@ -80,6 +81,7 @@ enum {
>  #define NETIF_F_GSO_ROBUST	__NETIF_F(GSO_ROBUST)
>  #define NETIF_F_HIGHDMA		__NETIF_F(HIGHDMA)
>  #define NETIF_F_HW_CSUM		__NETIF_F(HW_CSUM)
> +#define NETIF_F_HW_QDISC	__NETIF_F(HW_QDISC)
>  #define NETIF_F_HW_VLAN_FILTER	__NETIF_F(HW_VLAN_FILTER)
>  #define NETIF_F_HW_VLAN_RX	__NETIF_F(HW_VLAN_RX)
>  #define NETIF_F_HW_VLAN_TX	__NETIF_F(HW_VLAN_TX)
> diff --git a/net/core/dev.c b/net/core/dev.c
> index dffbef7..6818b18 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2743,6 +2743,12 @@ int dev_queue_xmit(struct sk_buff *skb)
>  
>  	skb_update_prio(skb);
>  
> +	if (dev->features & NETIF_F_HW_QDISC) {
> +		txq = netdev_pick_tx(dev, skb);
> +		rc = dev_hard_start_xmit(skb, dev, txq);
> +		goto out;
> +	}
> +
>  	txq = netdev_pick_tx(dev, skb);
>  	q = rcu_dereference_bh(txq->qdisc);
>  

Nobody forces you to use a qdisc.

And if your device really is lockless, it can use NETIF_F_LLTX feature.

^ permalink raw reply

* Re: [PATCH net-next] bnx2x: increase inner ip id during encapsulated tso
From: David Miller @ 2013-03-22 14:23 UTC (permalink / raw)
  To: eric.dumazet; +Cc: dmitry, netdev, eilong, ariele, maze, jesse
In-Reply-To: <1363926874.4431.57.camel@edumazet-glaptop>

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 21 Mar 2013 21:34:34 -0700

> On Fri, 2013-03-22 at 03:38 +0200, Dmitry Kravkov wrote:
>> 57712/578xx devices during handling of encapsulated TSO can
>> properly increase ip id for only one ip header.
>> The patch selects inner header to be increased.
>> 
>> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
>> CC: Eilon Greenstein <eilong@broadcom.com>
>> CC: Ariel Elior <ariele@broadcom.com>
>> CC: Maciej Zenczykowski <maze@google.com>
>> CC: Jesse Gross <jesse@nicira.com>
>> ---
>> tested over 1bc277f79
>> ---
>>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c  |   22 ++++++++++------------
>>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c |    1 +
>>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c   |    2 ++
>>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h   |    3 ++-
>>  4 files changed, 15 insertions(+), 13 deletions(-)
> 
> Fine, GRO is back 
> 
> Reported-by: Eric Dumazet <edumazet@google.com>
> Tested-by: Eric Dumazet <edumazet@google.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-next 1/2] ip_gre: increase inner ip header ID during segmentation
From: David Miller @ 2013-03-22 14:24 UTC (permalink / raw)
  To: amwang; +Cc: netdev, pshelar, edumazet
In-Reply-To: <1363948292-9902-1-git-send-email-amwang@redhat.com>

From: Cong Wang <amwang@redhat.com>
Date: Fri, 22 Mar 2013 18:31:31 +0800

> From: Cong Wang <amwang@redhat.com>
> 
> According to the previous discussion [1] on netdev list, DaveM insists
> we should increase the IP header ID for each segmented packets.
> This patch fixes it.
> 
> Cc: Pravin B Shelar <pshelar@nicira.com>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-next 2/2] udp: increase inner ip header ID during segmentation
From: David Miller @ 2013-03-22 14:24 UTC (permalink / raw)
  To: amwang; +Cc: netdev, pshelar, edumazet
In-Reply-To: <1363948292-9902-2-git-send-email-amwang@redhat.com>

From: Cong Wang <amwang@redhat.com>
Date: Fri, 22 Mar 2013 18:31:32 +0800

> From: Cong Wang <amwang@redhat.com>
> 
> Similar to GRE tunnel, UDP tunnel should take care of IP header ID
> too.
> 
> Cc: Pravin B Shelar <pshelar@nicira.com>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>

Applied.

^ permalink raw reply

* Re: [PATCH -next] caif_virtio: fix error return code in cfv_create_genpool()
From: David Miller @ 2013-03-22 14:24 UTC (permalink / raw)
  To: weiyj.lk; +Cc: sjur.brandeland, rusty, yongjun_wei, netdev
In-Reply-To: <CAPgLHd-VdCq3qfDGYpCE1VmPeHGFneyR3TaarS=bMROqWmj2uA@mail.gmail.com>

From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Fri, 22 Mar 2013 21:16:52 +0800

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
>  drivers/net/caif/caif_virtio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

I can't apply this as this file doesn't exist in my tree.

^ permalink raw reply

* Re: [PATCH -next] s6gmac: fix error return code in s6gmac_probe()
From: David Miller @ 2013-03-22 14:24 UTC (permalink / raw)
  To: weiyj.lk; +Cc: jim.cromie, gregkh, jkosina, oskar, yongjun_wei, netdev
In-Reply-To: <CAPgLHd87mx9eMA1O_Nr9uxtKq=uMvmVW=uzaUPwhcjrAe43eaw@mail.gmail.com>

From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Fri, 22 Mar 2013 21:17:47 +0800

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Applied.

^ permalink raw reply

* Re: [PATCH 0/4 v3] mv643xx_eth: use mvmdio MDIO bus driver
From: Florian Fainelli @ 2013-03-22 14:24 UTC (permalink / raw)
  To: Jason Cooper
  Cc: davem, Grant Likely, Rob Herring, Rob Landley, Andrew Lunn,
	Russell King, Benjamin Herrenschmidt, Paul Mackerras,
	Lennert Buytenhek, Thomas Petazzoni, Greg Kroah-Hartman,
	devicetree-discuss, linux-doc, linux-kernel, linux-arm-kernel,
	linuxppc-dev, netdev
In-Reply-To: <20130322141423.GJ13280@titan.lakedaemon.net>

Le 03/22/13 15:14, Jason Cooper a écrit :
> On Fri, Mar 22, 2013 at 02:39:24PM +0100, Florian Fainelli wrote:
>> Hi all,
>>
>> This patch converts the mv643xx_eth driver to use the mvmdio MDIO bus driver
>> instead of rolling its own implementation. As a result, all users of this
>> mv643xx_eth driver are converted to register an "orion-mdio" platform_device.
>> The mvmdio driver is also updated to support an interrupt line which reports
>> SMI error/completion, and to allow traditionnal platform device registration
>> instead of just device tree.
>>
>> David, I think it makes sense for you to merge all of this, since we do
>> not want the architecture files to be desynchronized from the mv643xx_eth to
>> avoid runtime breakage. The potential for merge conflicts should be very small.
>>
>> Florian Fainelli (4):
>>    net: mvmdio: allow platform device style registration
>>    net: mvmdio: rename base register cookie from smireg to regs
>>    net: mvmdio: enhance driver to support SMI error/done interrupts
>>    mv643xx_eth: convert to use the Marvell Orion MDIO driver
>>
>>   .../devicetree/bindings/net/marvell-orion-mdio.txt |    3 +
>>   arch/arm/plat-orion/common.c                       |   54 +++---
>>   arch/powerpc/platforms/chrp/pegasos_eth.c          |   20 ++
>>   arch/powerpc/sysdev/mv64x60_dev.c                  |   16 +-
>>   drivers/net/ethernet/marvell/Kconfig               |    5 +-
>>   drivers/net/ethernet/marvell/Makefile              |    2 +-
>>   drivers/net/ethernet/marvell/mv643xx_eth.c         |  195 ++------------------
>>   drivers/net/ethernet/marvell/mvmdio.c              |  130 ++++++++++---
>>   include/linux/mv643xx_eth.h                        |    1 -
>>   9 files changed, 187 insertions(+), 239 deletions(-)
>
> Whole series applied on top of v3.9-rc3 and tested on dreamplug
> (kirkwood DT boot with legacy mv643xx_eth init)

Ok, thanks! Does that mean that you want these changes to go via your 
tree? David initially applied my v2 of this patchset, and since it 
thouches mostly ethernet driver stuff, I would rather make it go via his 
tree if both of you agree.
--
Florian

^ permalink raw reply

* RE: [PATCH -next] caif_virtio: fix error return code in cfv_create_genpool()
From: Sjur BRENDELAND @ 2013-03-22 14:02 UTC (permalink / raw)
  To: Wei Yongjun, rusty@rustcorp.com.au
  Cc: yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org
In-Reply-To: <CAPgLHd-VdCq3qfDGYpCE1VmPeHGFneyR3TaarS=bMROqWmj2uA@mail.gmail.com>

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Yes, this looks good to me,
Acked-by: Sjur Brændeland <sjur.brandeland@stericsson.com>

^ permalink raw reply

* Re: [PATCH 0/4 v3] mv643xx_eth: use mvmdio MDIO bus driver
From: David Miller @ 2013-03-22 14:26 UTC (permalink / raw)
  To: florian
  Cc: grant.likely, rob.herring, rob, jason, andrew, linux, benh,
	paulus, buytenh, thomas.petazzoni, gregkh, devicetree-discuss,
	linux-doc, linux-kernel, linux-arm-kernel, linuxppc-dev, netdev
In-Reply-To: <1363959568-16976-1-git-send-email-florian@openwrt.org>

From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 22 Mar 2013 14:39:24 +0100

> This patch converts the mv643xx_eth driver to use the mvmdio MDIO bus driver
> instead of rolling its own implementation. As a result, all users of this
> mv643xx_eth driver are converted to register an "orion-mdio" platform_device.
> The mvmdio driver is also updated to support an interrupt line which reports
> SMI error/completion, and to allow traditionnal platform device registration
> instead of just device tree.
> 
> David, I think it makes sense for you to merge all of this, since we do
> not want the architecture files to be desynchronized from the mv643xx_eth to
> avoid runtime breakage. The potential for merge conflicts should be very small.

Series applied to net-next, thanks Florian.

^ permalink raw reply

* Re: [PATCH] phy: Add support for VSC8234
From: Fleming Andy-AFLEMING @ 2013-03-22 14:27 UTC (permalink / raw)
  To: David Miller
  Cc: linux-kernel@vger.kernel.org, Gala Kumar-B11780,
	netdev@vger.kernel.org
In-Reply-To: <20130322.101351.803684806942512280.davem@davemloft.net>



On Mar 22, 2013, at 9:13, "David Miller" <davem@davemloft.net> wrote:

> From: Andy Fleming <afleming@freescale.com>
> Date: Sun, 16 Oct 2011 01:49:49 -0500
> 
>> No functional changes other than to recognize this PHYID.
>> 
>> Signed-off-by: Andy Fleming <afleming@freescale.com>
>> Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
>> Signed-off-by: Ben Collins <ben.c@servergy.com>
> 
> Please do not submit patches with the commit date integrated
> into your formal email headers.
> 
> This screws up archives and patch queue maintainence systems which
> order submissions by date.


Yes, I'm very confused, as I didn't send any of these.

Andy

^ permalink raw reply

* Re: [PATCH] phy: Add XGMII phy interface type
From: David Miller @ 2013-03-22 14:27 UTC (permalink / raw)
  To: benmcollins13; +Cc: linux-kernel, netdev
In-Reply-To: <9CC1FA76-1620-4E0F-82DC-89535633329F@gmail.com>

From: Ben Collins <benmcollins13@gmail.com>
Date: Fri, 22 Mar 2013 10:22:05 -0400

> It's code that I've manually stripped down as a subset of a larger
> code base for Freescale's DPAA driver. I've only tested it on our
> (Servergy's) platform, so until it gets more broad testing (and some
> code review), I want to at least get it into staging so our hardware
> is supported.

Then why don't you submit the PHY type addition with the staging
driver, which will be the only user, and you can add my:

Acked-by: David S. Miller <davem@davemloft.net>

to that.

Thanks.

^ permalink raw reply

* Re: [PATCH net-next 1/2] decnet: Parse netlink attributes on our own
From: Thomas Graf @ 2013-03-22 14:27 UTC (permalink / raw)
  To: Steven Whitehouse; +Cc: davem, netdev, linux-decnet-user
In-Reply-To: <1363889099.2707.14.camel@menhir>

On 03/21/13 at 06:04pm, Steven Whitehouse wrote:
> You shouldn't need any special hardware to test this. A copy of iproute2
> should be enough as you should be able to use that to create an
> interface or two and a route between them, etc. Although DECnet routing
> works in a different way to ip routing, the Linux implementation tries
> to stick fairly closely to the ip way of doing things whenever it can in
> order to share infrastructure. Now that ip has diverged a fair bit over
> time that isn't quite as true as it was, but there shouldn't be anything
> too surprising in there.

Alright, I did some basic testing with iproute2. I do not claim
to understand what I did but I ran the following:

$ ip -f dnet route add 1.661 dev em1
$ ip -f dnet route list
1.661 dev em1  scope link

$ ip -f dnet neigh add 6.662 dev em1
$ ip -f dnet neigh list
6.662 dev em1 lladdr aa:00:04:00:96:1a PERMANENT

$ ip -f dnet addr add 1.111 dev em1
$ ip -f dnet addr list
2: em1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc pfifo_fast state DOWN qlen 1000
    dnet 1.111/16 scope global em1

^ permalink raw reply

* RE: [PATCH -next] caif_virtio: fix error return code in cfv_create_genpool()
From: Sjur BRENDELAND @ 2013-03-22 14:27 UTC (permalink / raw)
  To: David Miller, weiyj.lk@gmail.com
  Cc: rusty@rustcorp.com.au, yongjun_wei@trendmicro.com.cn,
	netdev@vger.kernel.org
In-Reply-To: <20130322.102425.1728735565421860819.davem@davemloft.net>

> From: David Miller [mailto:davem@davemloft.net]
> > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> >
> > Fix to return a negative error code from the error handling
> > case instead of 0, as returned elsewhere in this function.
> >
> > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> > ---
> >  drivers/net/caif/caif_virtio.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> I can't apply this as this file doesn't exist in my tree.

caif_virtio.c lives in Rusty's "virtio-next" tree. 
I guess this patch should have been tagged "virtio-next" instead.

Thanks,
Sjur

^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox